修改名称和图标

app/src/main/java/com/shayu/phonelive/AppContext.java

@@ -381,7 +381,7 @@ public class AppContext extends CommonAppContext {
         if (!CommonAppConfig.IS_UPLOAD_ERROR_LOG) {
             return;
         }
-        if (CommonAppConfig.IS_GOOGLE_PLAY != 2&&CommonAppConfig.IS_GOOGLE_PLAY!=4&&CommonAppConfig.IS_GOOGLE_PLAY!=5) {
+        if (CommonAppConfig.IS_GOOGLE_PLAY != 2) {
             GoogleUtils.newInstance(this).initializeApp(this);
         }
     }
@@ -393,7 +393,7 @@ public class AppContext extends CommonAppContext {
         }
         String uid = CommonAppConfig.getInstance().getUid();
 
-        if (CommonAppConfig.IS_GOOGLE_PLAY != 2&&CommonAppConfig.IS_GOOGLE_PLAY!=4&&CommonAppConfig.IS_GOOGLE_PLAY!=5) {
+        if (CommonAppConfig.IS_GOOGLE_PLAY != 2) {
             GoogleUtils.newInstance(sInstance).setFirebaseCrashData(
                     uid,
                     SpUtil.getInstance().getStringValue(SpUtil.USER_INFO),

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">PDLIVE</string>
+    <string name="app_name">PoYo</string>
     <string name="leak_canary_test_class_name">assertk.Assert</string>
 </resources>

app/src/vivo_online/google-services.json

@@ -1,70 +0,0 @@
-{
-  "project_info": {
-    "project_number": "292494634914",
-    "project_id": "pdlive-1631521064967",
-    "storage_bucket": "pdlive-1631521064967.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb",
-        "android_client_info": {
-          "package_name": "com.pdlive.shayu"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.pdlive.shayu",
-            "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
-          }
-        },
-        {
-          "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.pdlive.shayu",
-            "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
-          }
-        },
-        {
-          "client_id": "292494634914-ejtqvaj86a2lldv0di2pr3d5gngprahd.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.pdlive.shayu",
-            "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
-          }
-        },
-        {
-          "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
-              "client_type": 3
-            },
-            {
-              "client_id": "292494634914-v9j4rei86q2pfh9as4seotb23vr2744a.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "com.live.pd"
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}

app/src/vivo_test/google-services.json

@@ -1,70 +0,0 @@
-{
-  "project_info": {
-    "project_number": "292494634914",
-    "project_id": "pdlive-1631521064967",
-    "storage_bucket": "pdlive-1631521064967.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb",
-        "android_client_info": {
-          "package_name": "com.pdlive.shayu"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.pdlive.shayu",
-            "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
-          }
-        },
-        {
-          "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.pdlive.shayu",
-            "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
-          }
-        },
-        {
-          "client_id": "292494634914-ejtqvaj86a2lldv0di2pr3d5gngprahd.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.pdlive.shayu",
-            "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
-          }
-        },
-        {
-          "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
-              "client_type": 3
-            },
-            {
-              "client_id": "292494634914-v9j4rei86q2pfh9as4seotb23vr2744a.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "com.live.pd"
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}

app/src/xiaomi_online/google-services.json

@@ -1,70 +0,0 @@
-{
-  "project_info": {
-    "project_number": "292494634914",
-    "project_id": "pdlive-1631521064967",
-    "storage_bucket": "pdlive-1631521064967.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb",
-        "android_client_info": {
-          "package_name": "com.pdlive.shayu"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.pdlive.shayu",
-            "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
-          }
-        },
-        {
-          "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.pdlive.shayu",
-            "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
-          }
-        },
-        {
-          "client_id": "292494634914-ejtqvaj86a2lldv0di2pr3d5gngprahd.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.pdlive.shayu",
-            "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
-          }
-        },
-        {
-          "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
-              "client_type": 3
-            },
-            {
-              "client_id": "292494634914-v9j4rei86q2pfh9as4seotb23vr2744a.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "com.live.pd"
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}

app/src/xiaomi_test/google-services.json

@@ -1,70 +0,0 @@
-{
-  "project_info": {
-    "project_number": "292494634914",
-    "project_id": "pdlive-1631521064967",
-    "storage_bucket": "pdlive-1631521064967.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb",
-        "android_client_info": {
-          "package_name": "com.pdlive.shayu"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.pdlive.shayu",
-            "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
-          }
-        },
-        {
-          "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.pdlive.shayu",
-            "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
-          }
-        },
-        {
-          "client_id": "292494634914-ejtqvaj86a2lldv0di2pr3d5gngprahd.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.pdlive.shayu",
-            "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
-          }
-        },
-        {
-          "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
-              "client_type": 3
-            },
-            {
-              "client_id": "292494634914-v9j4rei86q2pfh9as4seotb23vr2744a.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "com.live.pd"
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}

common/src/main/java/com/yunbao/common/CommonAppContext.java

@@ -55,7 +55,7 @@ public class CommonAppContext extends MultiDexApplication {
 //        RongPushClient.setPushConfig(config); //将推送相关配置设置到 SDK
         //设置新加坡融云服务器 有时候国内收不到推送是因为这个
         RongIMClient.setServerInfo("navsg01.cn.ronghub.com", null);
-        if (CommonAppConfig.IS_GOOGLE_PLAY != 2&&CommonAppConfig.IS_GOOGLE_PLAY!=4&&CommonAppConfig.IS_GOOGLE_PLAY!=5) {
+        if (CommonAppConfig.IS_GOOGLE_PLAY != 2) {
             //谷歌推送
             PushConfig gconfig = new PushConfig.Builder().enableFCM(true).build();
             RongPushClient.setPushConfig(gconfig);

common/src/main/java/com/yunbao/common/HtmlConfig.java

@@ -7,7 +7,7 @@ package com.yunbao.common;
 public class HtmlConfig {
 
     //登录即代表同意服务和隐私条款
-    public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=713";
+    public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=3";
     public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=Portal&m=Page&a=index&id=59";
 
     //注册用户协议

common/src/main/java/com/yunbao/common/bean/ConfigBean.java

@@ -62,6 +62,7 @@ public class ConfigBean extends BaseModel {
     private String google_isup;
 
     private String sud_game_speech;
+    private int pay_type = 0;
 
     @SerializedName("is_return_user")//是否需要弹窗（0否，1是）
     private String isReturnUser="";
@@ -72,6 +73,14 @@ public class ConfigBean extends BaseModel {
     @SerializedName("jump_h5_url")//点击跳转H5页面地址
     private String jumpH5Url="";
 
+    public int getPay_type() {
+        return pay_type;
+    }
+
+    public void setPay_type(int pay_type) {
+        this.pay_type = pay_type;
+    }
+
     @JSONField(name = "is_return_user")
     public String getIsReturnUser() {
         return isReturnUser;

common/src/main/java/com/yunbao/common/bean/UserBean.java

@@ -76,6 +76,17 @@ public class UserBean implements Parcelable {
 
     private boolean isRequest = false;
 
+    // 支付方式 1、三方支付，2：官方支付，3：无响应
+    private int pay_type;
+
+    public int getPay_type() {
+        return pay_type;
+    }
+
+    public void setPay_type(int pay_type) {
+        this.pay_type = pay_type;
+    }
+
     public boolean isRequest() {
         return isRequest;
     }

common/src/main/java/com/yunbao/common/manager/IMLoginManager.java

@@ -521,6 +521,7 @@ public class IMLoginManager extends BaseCacheManager {
         HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo")
                 .params("uid", uid)
                 .params("token", token)
+                .params("key1","6tnym1br6lhu7")
                 .execute(new HttpCallback() {
                     @Override
                     public void onSuccess(int code, String msg, String[] info) {

common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java

@@ -51,7 +51,7 @@ public class RongcloudIMManager {
         if (CommonAppConfig.HOST.contains("ceshi")) {
             RONG_IM_KEY = "pvxdm17jpd3hr"; //测试服key
         } else {
-            RONG_IM_KEY = "uwd1c0sxu1p71"; //正式服key
+            RONG_IM_KEY = "6tnym1br6lhu7"; //正式服key
         }
     }
 

common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java

@@ -661,6 +661,7 @@ public class JavascriptInterfaceUtils {
         HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo")
                 .params("uid", IMLoginManager.get(mContext).getUserInfo().getId())
                 .params("token", IMLoginManager.get(mContext).getUserInfo().getToken())
+                .params("key1","6tnym1br6lhu7")
                 .execute(new HttpCallback() {
                     @Override
                     public void onSuccess(int code, String msg, String[] info) {

common/src/main/res/values-zh/strings.xml

@@ -1564,4 +1564,5 @@
     <string name="game_dialog_activity_achievements_5">5連桿</string>
     <string name="game_dialog_activity_achievements_6">6連桿</string>
     <string name="game_dialog_activity_achievements_7">7連桿</string>
+    <string name="pay_type">充值維護中，請稍後再試</string>
 </resources>

common/src/main/res/values/strings.xml

@@ -1572,4 +1572,5 @@
     <string name="game_dialog_activity_achievements_5">5 Combo</string>
     <string name="game_dialog_activity_achievements_6">6 Combo</string>
     <string name="game_dialog_activity_achievements_7">7 Combo</string>
+    <string name="pay_type">Recharge is under maintenance. Please try again later.</string>
 </resources>

config.gradle

@@ -4,7 +4,7 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 23,
             targetSdkVersion : 34,
-            versionCode      : 700,
+            versionCode      : 698,
             versionName      : "6.8.1"
     ]
     manifestPlaceholders = [
@@ -24,7 +24,7 @@ ext {
 
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 
-//            true表示谷歌支付 false    0 链接包(isPluginModel-> true)   1 谷歌包   2华为包  3 samsung包 4 vivo 包
+//            true表示谷歌支付 false    0 链接包(isPluginModel-> true)   1 谷歌包   2华为包  3 samsung包
             isGooglePlay     : 0,
             //是否上报异常日志
             isUploadLog      : true,

lib_xiaomi_pay/.gitignore

@@ -1 +0,0 @@
-/build

lib_xiaomi_pay/build.gradle

@@ -1,39 +0,0 @@
-apply plugin: 'com.android.library'
-apply from: "../package_config.gradle"
-
-android {
-    namespace "com.shayu.lib_xiaomi_pay"
-    compileSdk rootProject.ext.android.compileSdkVersion
-    defaultConfig {
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-        minSdkVersion rootProject.ext.android.minSdkVersion
-        targetSdkVersion rootProject.ext.android.targetSdkVersion
-        versionCode rootProject.ext.android.versionCode
-        versionName rootProject.ext.android.versionName
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_18
-    }
-}
-
-dependencies {
-    implementation rootProject.ext.dependencies["appcompat-androidx"]
-
-    //谷歌内购
-    api ' implementation "com.xiaomi.billingclient:billing:1.1.3"'
-    implementation 'com.android.billingclient:billing:7.1.0'
-
-    //implementation platform('com.google.firebase:firebase-bom:30.5.0')
-    //implementation 'com.google.firebase:firebase-crashlytics'
-
-}

lib_xiaomi_pay/proguard-rules.pro

@@ -1,30 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
--ignorewarnings
--keepattributes *Annotation*
--keepattributes Exceptions
--keepattributes InnerClasses
--keepattributes Signature
--keepattributes SourceFile,LineNumberTable
--keep class com.huawei.hianalytics.**{*;}
--keep class com.huawei.updatesdk.**{*;}
--keep class com.huawei.hms.**{*;}

lib_xiaomi_pay/src/main/AndroidManifest.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>

lib_xiaomi_pay/src/main/java/com/shayu/lib_xiaomi/utils/XiaomiBillingManage.java

@@ -1,129 +0,0 @@
-package com.shayu.lib_xiaomi.utils;
-
-import android.app.Activity;
-import android.content.Context;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.billingclient.api.BillingClient;
-import com.android.billingclient.api.BillingClientStateListener;
-import com.android.billingclient.api.BillingFlowParams;
-import com.android.billingclient.api.BillingResult;
-import com.android.billingclient.api.Purchase;
-import com.android.billingclient.api.PurchasesUpdatedListener;
-import com.android.billingclient.api.SkuDetails;
-import com.android.billingclient.api.SkuDetailsParams;
-import com.android.billingclient.api.SkuDetailsResponseListener;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 小米支付
- */
-public class XiaomiBillingManage {
-    private Activity mContext;
-    private String TAG = "XiaomiBillingManage";
-    BillingClient billingClient;
-    public XiaomiBillingManage(Activity activity) {
-        this.mContext = activity;
-    }
-    /**
-     * 此监听器可接收应用中所有购买交易的更新
-     */
-    private PurchasesUpdatedListener purchasesUpdatedListener = new PurchasesUpdatedListener() {
-        @Override
-        public void onPurchasesUpdated(BillingResult billingResult, List<Purchase> purchases) {
-            // To be implemented in a later section.
-            if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK) {
-                if (purchases != null && purchases.size() > 0) {
-                    //处理购买
-
-                }
-            } else if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.USER_CANCELED) {
-                //支付取消
-            }  else {
-                //处理其他响应码
-            }
-        }
-    };
-
-    /**
-     * 连接到Google Play Billing服务
-     */
-    private final BillingClientStateListener billingClientStateListener = new BillingClientStateListener() {
-        @Override
-        public void onBillingServiceDisconnected() {
-            Log.d("TAG", "onBillingServiceDisconnected");
-        }
-        @Override
-        public void onBillingSetupFinished(BillingResult billingResult) {
-            Log.d("TAG", "Service.code : " + billingResult.getResponseCode() + "        msg : " + billingResult.getDebugMessage());
-            if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK) {
-            }
-        }
-    };
-
-    /**
-     * 初始化小米支付
-     * @param mContext
-     */
-    public void initXiaomiPay(Context mContext) {
-        billingClient = BillingClient.newBuilder(mContext).setListener(purchasesUpdatedListener).build();
-    }
-
-    /**
-     *建立连接
-     */
-    public void connectXiaomiPay(){
-        billingClient.startConnection(billingClientStateListener);
-        //billingClient.launchBillingFlow(mContext,)
-    }
-
-    /**
-     * 判断服务是否可用
-     */
-    public boolean  isReady(){
-        if (billingClient == null) {
-            return false;
-        }
-       return billingClient.isReady();
-    }
-
-    public void querySkuList(){
-        List<String> skuList = new ArrayList<>();
-        skuList.add("Game-10");//以实际业务为准
-        SkuDetailsParams.Builder params = SkuDetailsParams.newBuilder();
-        params.setSkusList(skuList).setType(BillingClient.SkuType.INAPP);
-        billingClient.querySkuDetailsAsync(params.build(),
-                new SkuDetailsResponseListener() {
-                    @Override
-                    public void onSkuDetailsResponse(@NonNull BillingResult billingResult,
-                                                     @Nullable List<SkuDetails> list) {
-                        Log.d("TAG", "onSkuDetailsResponse");
-                        if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK) {
-                            if (list != null && list.size() > 0) {
-                                // get list
-                                Log.e("xiaomi_pay",list.get(0).getSubscriptionPeriod());
-
-                                //创建BillingFlowParams对象
-                                BillingFlowParams params = BillingFlowParams.newBuilder()
-                                        .setSkuDetails(list.get(0))
-                                        .setIsOfferPersonalized(true)
-                                        .setObfuscatedAccountId("xxx")
-                                        .setObfuscatedProfileId("yyy")
-                                        .build();
-                                BillingResult result = billingClient.launchBillingFlow(mContext, params);
-
-
-                            }
-                        }
-                    }
-                });
-
-
-
-    }
-}

live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java

@@ -413,6 +413,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
         HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo")
                 .params("uid", IMLoginManager.get(mContext).getUserInfo().getId())
                 .params("token", IMLoginManager.get(mContext).getUserInfo().getToken())
+                .params("key1","6tnym1br6lhu7")
                 .execute(new HttpCallback() {
                     @Override
                     public void onSuccess(int code, String msg, String[] info) {

live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java

@@ -516,6 +516,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
         HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo")
                 .params("uid", IMLoginManager.get(mContext).getUserInfo().getId())
                 .params("token", IMLoginManager.get(mContext).getUserInfo().getToken())
+                .params("key1","6tnym1br6lhu7")
                 .execute(new HttpCallback() {
                     @Override
                     public void onSuccess(int code, String msg, String[] info) {

main/src/main/java/com/yunbao/main/activity/LoginActivity.java

@@ -168,26 +168,27 @@ public class LoginActivity extends AbsActivity {
 
 
     public void loginClick(View v) {
-        ViewClicksAntiShake.clicksAntiShake(v, new ViewClicksAntiShake.ViewClicksCallBack() {
+        // 去掉防抖
+      /*  ViewClicksAntiShake.clicksAntiShake(v, new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
-                int i = v.getId();
-                if (i == R.id.btn_login) {
-                    //Intent intent = new Intent(LoginActivity.this, NewLiveActivity.class);
-                    //startActivity(intent);
-                    login();
 
-                } else if (i == R.id.btn_register) {
-                    register();
-                } else if (i == R.id.btn_forget_pwd) {
-                    forgetPwd();
-
-                } else if (i == R.id.btn_tip) {
-                    forwardTip();
-                }
             }
-        });
+        });*/
+        int i = v.getId();
+        if (i == R.id.btn_login) {
+            //Intent intent = new Intent(LoginActivity.this, NewLiveActivity.class);
+            //startActivity(intent);
+            login();
 
+        } else if (i == R.id.btn_register) {
+            register();
+        } else if (i == R.id.btn_forget_pwd) {
+            forgetPwd();
+
+        } else if (i == R.id.btn_tip) {
+            forwardTip();
+        }
     }
 
     //注册

main/src/main/java/com/yunbao/main/activity/MainActivity.java

@@ -318,7 +318,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
             WebViewActivity.forward(mContext, getIntent().getStringExtra("activityUrl"), true, false);
         }
 
-        if (CommonAppConfig.IS_GOOGLE_PLAY != 2&&CommonAppConfig.IS_GOOGLE_PLAY!=4&&CommonAppConfig.IS_GOOGLE_PLAY!=5) {
+        if (CommonAppConfig.IS_GOOGLE_PLAY != 2) {
            /* GoogleUtils.newInstance(MainActivity.this).setFirebaseTokenListener(MainActivity.this, new GoogleUtils.FirebaseTokenListener() {
                 @Override
                 public void onResultToken(String token) {

main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java

@@ -31,6 +31,7 @@ import com.yunbao.common.utils.GoogleUtils;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
 import com.yunbao.main.R;
 import com.yunbao.main.http.MainHttpUtil;
 import com.yunbao.main.utils.HXLinePagerIndicator;
@@ -67,14 +68,21 @@ public class MyWalletActivity extends AbsActivity {
     LoadingDialog loadingDialog;
     SamsungUtil samsungUtil;
 
+    int payConfig = 0;
+
     @Override
     protected int getLayoutId() {
         return R.layout.activity_my_wallet;
     }
 
     protected void main() {
-
         super.main();
+        payConfig= CommonAppConfig.getInstance().getConfig().getPay_type();
+        if(CommonAppConfig.IS_GOOGLE_PLAY==0&&payConfig==3){
+                ToastUtil.show(WordUtil.isNewZh()?"充值維護中，請稍後再試":"Recharge is under maintenance. Please try again later.");
+                finish();
+        }
+
         mw = MyWalletActivity.this;
         setTitle(mContext.getString(R.string.wallet));
 
@@ -91,8 +99,8 @@ public class MyWalletActivity extends AbsActivity {
             googleUtils.initGooglePay();
         }
 
-
         vp_content = (ViewPager) findViewById(R.id.vp_content);
+        vp_content.setVisibility(View.VISIBLE);
         TextView rView = (TextView) findViewById(R.id.rView);
         findViewById(R.id.redPacketMain).setVisibility(View.VISIBLE);
         findViewById(R.id.redPacketMain).setOnClickListener(v -> {
@@ -228,20 +236,42 @@ public class MyWalletActivity extends AbsActivity {
                 bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/samsungpaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
                 samsungFragment2.setArguments(bundle2);
             } else {
-                walletFragment = new WalletFragment();
-                Bundle bundle = new Bundle();
-                bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
-                walletFragment.setArguments(bundle);
 
-                googleFragment1 = new GoogleFragment();
+                // 链接包
-                Bundle bundle1 = new Bundle();
+                if (CommonAppConfig.getInstance().getConfig().getPay_type() == 1) {
-                bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&first_page=1&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                    // 三方支付
-                googleFragment1.setArguments(bundle1);
+                    walletFragment = new WalletFragment();
+                    Bundle bundle = new Bundle();
+                    bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                    walletFragment.setArguments(bundle);
 
-                googleFragment2 = new GoogleFragment();
+                    googleFragment1 = new GoogleFragment();
-                Bundle bundle2 = new Bundle();
+                    Bundle bundle1 = new Bundle();
-                bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                    bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&first_page=1&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
-                googleFragment2.setArguments(bundle2);
+                    googleFragment1.setArguments(bundle1);
+
+                    googleFragment2 = new GoogleFragment();
+                    Bundle bundle2 = new Bundle();
+                    bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                    googleFragment2.setArguments(bundle2);
+                } else  {
+                    // Google支付
+                    rView.setVisibility(View.VISIBLE);
+                    walletFragment = new WalletFragment();
+                    Bundle bundle = new Bundle();
+                    bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                    walletFragment.setArguments(bundle);
+
+                    googleFragment1 = new GoogleFragment();
+                    Bundle bundle1 = new Bundle();
+                    bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                    googleFragment1.setArguments(bundle1);
+
+                    googleFragment2 = new GoogleFragment();
+                    Bundle bundle2 = new Bundle();
+                    bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaygole&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                    googleFragment2.setArguments(bundle2);
+                }
             }
         } else {
             if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
@@ -297,21 +327,41 @@ public class MyWalletActivity extends AbsActivity {
             } else {
                 Log.i("tss", "不是首充");
                 //链接版本
+                if (CommonAppConfig.getInstance().getConfig().getPay_type() == 1) {
+                    // 三方支付
+                    walletFragment = new WalletFragment();
+                    Bundle bundle = new Bundle();
+                    bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                    walletFragment.setArguments(bundle);
 
-                walletFragment = new WalletFragment();
+                    googleFragment1 = new GoogleFragment();
-                Bundle bundle = new Bundle();
+                    Bundle bundle1 = new Bundle();
-                bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                    bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
-                walletFragment.setArguments(bundle);
+                    googleFragment1.setArguments(bundle1);
 
-                googleFragment1 = new GoogleFragment();
+                    googleFragment2 = new GoogleFragment();
-                Bundle bundle1 = new Bundle();
+                    Bundle bundle2 = new Bundle();
-                bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                    bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
-                googleFragment1.setArguments(bundle1);
+                    googleFragment2.setArguments(bundle2);
+                } else  {
+                    // Google支付
+                    rView.setVisibility(View.VISIBLE);
 
-                googleFragment2 = new GoogleFragment();
+                    walletFragment = new WalletFragment();
-                Bundle bundle2 = new Bundle();
+                    Bundle bundle = new Bundle();
-                bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                    bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
-                googleFragment2.setArguments(bundle2);
+                    walletFragment.setArguments(bundle);
+
+                    googleFragment1 = new GoogleFragment();
+                    Bundle bundle1 = new Bundle();
+                    bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                    googleFragment1.setArguments(bundle1);
+
+                    googleFragment2 = new GoogleFragment();
+                    Bundle bundle2 = new Bundle();
+                    bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaygole&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                    googleFragment2.setArguments(bundle2);
+                }
             }
         }
 

main/src/main/java/com/yunbao/main/http/MainHttpUtil.java

@@ -52,6 +52,7 @@ public class MainHttpUtil {
                 .params("lastlogindevice", "Android")
                 .params("uuid_Device", uuid)
                 .params("langue", WordUtil.isNewZh()?"chinese":"english")
+                .params("key1", "6tnym1br6lhu7")
                 .execute(callback);
 
     }
@@ -263,6 +264,7 @@ public class MainHttpUtil {
      */
     public static void getBaseInfo(String uid, String token, final CommonCallback<UserBean> commonCallback) {
         HttpClient.getInstance().get("User.getBaseInfos", MainHttpConsts.GET_BASE_INFO)
+                .params("key1","6tnym1br6lhu7")
                 .execute(new HttpCallback() {
                     @Override
                     public void onSuccess(int code, String msg, String[] info) {
@@ -298,6 +300,7 @@ public class MainHttpUtil {
 
     public static void getBaseInfos(String uid, String token, HttpCallback callback) {
         HttpClient.getInstance().get("User.getBaseInfos", MainHttpConsts.GET_BASE_INFO)
+                .params("key1","6tnym1br6lhu7")
                 .execute(callback);
     }
 
@@ -341,7 +344,6 @@ public class MainHttpUtil {
     public static void getSettingList(HttpCallback callback) {
         HttpClient.getInstance().get("User.getPerSetting", MainHttpConsts.GET_SETTING_LIST)
                 .params("version", VersionUtil.getVersion())
-                .params("package_name", "pdxy")
                 .execute(callback);
     }
 

main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java

@@ -528,15 +528,27 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
         } else if (i == R.id.signature) {
             mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
         } else if (i == R.id.lt_star_coin) {
-            Map<String, String> map_ekv = new HashMap<String, String>();
+            // 星币充值
-            map_ekv.put("from", "xb");
+            if (CommonAppConfig.IS_GOOGLE_PLAY == 0 && CommonAppConfig.getInstance().getConfig().getPay_type() == 3) {
-            MobclickAgent.onEvent(mContext, "my_recharge", map_ekv);
+                // 链接包并且设置不能点击跳转
-            mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1));
+                ToastUtil.show(R.string.pay_type);
+            }else {
+                Map<String, String> map_ekv = new HashMap<String, String>();
+                map_ekv.put("from", "xb");
+                MobclickAgent.onEvent(mContext, "my_recharge", map_ekv);
+                mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1));
+            }
         } else if (i == R.id.btn_coin) {
-            Map<String, String> map_ekv = new HashMap<String, String>();
+            //  钻石充值
-            map_ekv.put("from", "zs");
+            if (CommonAppConfig.IS_GOOGLE_PLAY == 0 && CommonAppConfig.getInstance().getConfig().getPay_type() == 3) {
-            MobclickAgent.onEvent(mContext, "my_recharge", map_ekv);
+                // 链接包并且设置不能点击跳转
-            mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 0));
+                ToastUtil.show(R.string.pay_type);
+            }else {
+                Map<String, String> map_ekv = new HashMap<String, String>();
+                map_ekv.put("from", "zs");
+                MobclickAgent.onEvent(mContext, "my_recharge", map_ekv);
+                mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 0));
+            }
         } else if (i == R.id.btn_gold) {
             MobclickAgent.onEvent(mContext, "my_receive", "充值旁边领取金豆的按钮");
             //            mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 2));

main/src/main/res/layout/activity_my_wallet.xml

@@ -17,6 +17,7 @@
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/vp_content"
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1" />

package_config.gradle

@@ -92,54 +92,6 @@ android {
                     isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel
             ]
         }
-        vivo_test {
-            dimension 'packageApk'
-            if (project.getPluginManager().hasPlugin("com.android.application")) {
-                applicationId "com.pdlive.shayu"
-            }
-            manifestPlaceholders = [
-                    serverHost   : rootProject.ext.manifestPlaceholders.testServerHost,
-                    isGooglePlay : 4,
-                    isUploadLog  : true,
-                    isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel
-            ]
-        }
-        vivo_online {
-            dimension 'packageApk'
-            if (project.getPluginManager().hasPlugin("com.android.application")) {
-                applicationId "com.pdlive.shayu"
-            }
-            manifestPlaceholders = [
-                    serverHost   : rootProject.ext.manifestPlaceholders.serverHost,
-                    isGooglePlay : 4,
-                    isUploadLog  : true,
-                    isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel
-            ]
-        }
-        xiaomi_test {
-            dimension 'packageApk'
-            if (project.getPluginManager().hasPlugin("com.android.application")) {
-                applicationId "com.pdlive.shayu"
-            }
-            manifestPlaceholders = [
-                    serverHost   : rootProject.ext.manifestPlaceholders.testServerHost,
-                    isGooglePlay : 5,
-                    isUploadLog  : true,
-                    isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel
-            ]
-        }
-        xiaomi_online {
-            dimension 'packageApk'
-            if (project.getPluginManager().hasPlugin("com.android.application")) {
-                applicationId "com.pdlive.shayu"
-            }
-            manifestPlaceholders = [
-                    serverHost   : rootProject.ext.manifestPlaceholders.serverHost,
-                    isGooglePlay : 5,
-                    isUploadLog  : true,
-                    isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel
-            ]
-        }
 
     }
 }

settings.gradle

@@ -10,4 +10,3 @@ include ':IAP6Helper'
 include ':lib_faceunity'
 //include ':SVGAlibrary'
 include ':TabLayout'
-//include ':lib_xiaomi_pay'