From d8d29dd2adf27f0b2861ae7d56a2370ebcd1b56a Mon Sep 17 00:00:00 2001 From: 18142669586 <1669783059@qq.com> Date: Wed, 26 Oct 2022 13:40:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9B=B4=E6=96=B0=E5=8C=BA?= =?UTF-8?q?=E5=88=86=E6=BD=98=E5=A4=9A=E6=8B=89=E5=92=8Cpd=EF=BC=8C?= =?UTF-8?q?=E6=8B=89=E9=BB=91=E4=B8=8D=E6=84=9F=E5=85=B4=E8=B6=A3=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=B6=88=E5=A4=B1=EF=BC=8C=E8=B0=B7=E6=AD=8C=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yunbao/common/http/CommonHttpUtil.java | 1 + config.gradle | 6 +++--- .../java/com/yunbao/main/activity/MyWalletActivity.java | 8 ++++++-- .../java/com/yunbao/main/activity/MyWebViewActivity.java | 6 ++++++ .../com/yunbao/main/views/MainHomeFollLiveViewHolder.java | 4 ++++ .../com/yunbao/main/views/MainHomeLiveViewHolder.java | 4 ++++ .../yunbao/main/views/MainHomeRecomLiveViewHolder.java | 4 ++++ 7 files changed, 28 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java index 0e5e34ab5..8e28515e7 100644 --- a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java +++ b/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) { diff --git a/config.gradle b/config.gradle index 9e347c98c..ddf9b84c6 100644 --- a/config.gradle +++ b/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", diff --git a/main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java b/main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java index 53f204dc1..962e0756e 100644 --- a/main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java +++ b/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"), diff --git a/main/src/main/java/com/yunbao/main/activity/MyWebViewActivity.java b/main/src/main/java/com/yunbao/main/activity/MyWebViewActivity.java index 892baa692..6afb32fd1 100644 --- a/main/src/main/java/com/yunbao/main/activity/MyWebViewActivity.java +++ b/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; diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeFollLiveViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeFollLiveViewHolder.java index 50ad28fc4..1a0c9b5af 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeFollLiveViewHolder.java +++ b/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(); + } } } diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java index 1ddc55e92..ae889d5be 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java +++ b/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(); + } } } diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeRecomLiveViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeRecomLiveViewHolder.java index e8d85e942..d86234c2f 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeRecomLiveViewHolder.java +++ b/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(); + } } }