新增更新区分潘多拉和pd，拉黑不感兴趣首页消失，谷歌支付页面修改

common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java

@@ -168,6 +168,7 @@ public class CommonHttpUtil {
                 .params("langue", lang)
                 .params("version", "" + VersionUtil.getVersion())
                 .params("from", "android")
+                .params("appType", "1")
                 .execute(new HttpCallback() {
                     @Override
                     public void onSuccess(int code, String msg, String[] info) {

config.gradle

@@ -4,15 +4,15 @@ ext {
             buildToolsVersion: "28.0.3",
             minSdkVersion    : 21,
             targetSdkVersion : 31,
-            versionCode      : 221,
+            versionCode      : 229,
             versionName      : "6.4.3"
     ]
     manifestPlaceholders = [
             //正式
 
-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
             //測試
-            serverHost       : "https://ceshi.yaoulive.com",
+//            serverHost       : "https://ceshi.yaoulive.com",
 
             //腾讯地图
             txMapAppKey      : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",

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

@@ -121,7 +121,9 @@ public class MyWalletActivity extends AbsActivity {
             Log.i("tss", "首充");
             if (CommonAppConfig.IS_GOOGLE_PLAY == false) {
                 //链接版本
-                fragments = new Fragment[]{new WalletFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&first_page=1&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()), new WalletFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()), new WalletFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken())};
+                fragments = new Fragment[]{new GoogleFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&first_page=1&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&package_name=pd"),
+                        new GoogleFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&package_name=pd"),
+                        new WalletFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&package_name=pd")};
 //                fragments = new Fragment[]{new GoogleFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&first_page=1&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()), new GoogleFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()), new GoogleFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken())};
             } else {
                 rView.setVisibility(View.VISIBLE);
@@ -133,7 +135,9 @@ public class MyWalletActivity extends AbsActivity {
             if (CommonAppConfig.IS_GOOGLE_PLAY == false) {
                 Log.i("tss", "不是首充");
                 //链接版本
-                fragments = new Fragment[]{new WalletFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()), new WalletFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()), new WalletFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken())};
+                fragments = new Fragment[]{new GoogleFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&package_name=pd"),
+                        new GoogleFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&package_name=pd"),
+                        new WalletFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&package_name=pd")};
             } else {
                 rView.setVisibility(View.VISIBLE);
                 fragments = new Fragment[]{new GoogleFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd"),

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

@@ -268,6 +268,12 @@ public class MyWebViewActivity extends AbsActivity {
             finish();
         }
 
+        //拉黑不感兴趣
+        @JavascriptInterface
+        public void androidLoseInterest() {
+            EventBus.getDefault().post("blacklist");
+        }
+
         @JavascriptInterface
         public void modifyMydata() {
             indexInto = 1;

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

@@ -56,6 +56,10 @@ public class MainHomeFollLiveViewHolder extends AbsMainHomeChildViewHolder imple
                 mRefreshView.showRefreshBar();
                 mRefreshView.mRecyclerView.scrollToPosition(0);
             }
+        }else  if ("blacklist".equals(str)) {
+            if (mRefreshView != null) {
+                mRefreshView.showRefreshBar();
+            }
         }
     }
 

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

@@ -106,6 +106,10 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
                 mRefreshView.showRefreshBar();
                 mRefreshView.mRecyclerView.scrollToPosition(0);
             }
+        }else  if ("blacklist".equals(str)) {
+            if (mRefreshView != null) {
+                mRefreshView.showRefreshBar();
+            }
         }
     }
 

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

@@ -58,6 +58,10 @@ public class MainHomeRecomLiveViewHolder extends AbsMainHomeChildViewHolder impl
                 mRefreshView.showRefreshBar();
                 mRefreshView.mRecyclerView.scrollToPosition(0);
             }
+        }else  if ("blacklist".equals(str)) {
+            if (mRefreshView != null) {
+                mRefreshView.showRefreshBar();
+            }
         }
     }