同步何春辉代码，更改pay_type字段的来源接口

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>

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/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();
-                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);
+                // 链接包
+                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&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();
-                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);
+                    googleFragment1 = new GoogleFragment();
+                    Bundle bundle1 = new Bundle();
+                    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);
+
+                    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();
-                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);
+                    googleFragment1 = new GoogleFragment();
+                    Bundle bundle1 = 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"));
+                    googleFragment1.setArguments(bundle1);
 
-                googleFragment1 = new GoogleFragment();
-                Bundle bundle1 = 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"));
-                googleFragment1.setArguments(bundle1);
+                    googleFragment2 = new GoogleFragment();
+                    Bundle bundle2 = 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"));
+                    googleFragment2.setArguments(bundle2);
+                } else  {
+                    // Google支付
+                    rView.setVisibility(View.VISIBLE);
 
-                googleFragment2 = new GoogleFragment();
-                Bundle bundle2 = 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"));
-                googleFragment2.setArguments(bundle2);
+                    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);
+                }
             }
         }
 

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);
     }
 

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");
-            MobclickAgent.onEvent(mContext, "my_recharge", map_ekv);
-            mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1));
+            // 星币充值
+            if (CommonAppConfig.IS_GOOGLE_PLAY == 0 && CommonAppConfig.getInstance().getConfig().getPay_type() == 3) {
+                // 链接包并且设置不能点击跳转
+                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");
-            MobclickAgent.onEvent(mContext, "my_recharge", map_ekv);
-            mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 0));
+            //  钻石充值
+            if (CommonAppConfig.IS_GOOGLE_PLAY == 0 && CommonAppConfig.getInstance().getConfig().getPay_type() == 3) {
+                // 链接包并且设置不能点击跳转
+                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" />