From ea0ff7059542c90aed942014ab8b474aedd746ca Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Fri, 6 Oct 2023 17:04:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E9=A1=B5=E6=8B=BC=E6=8E=A5=E4=B8=AD?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunbao/common/activity/WebViewActivity.java | 3 ++- .../com/yunbao/common/bean/ActiveModel.java | 3 ++- .../common/bean/LiveUserMailBoxModel.java | 3 ++- .../common/utils/JavascriptInterfaceUtils.java | 8 ++++---- .../java/com/yunbao/common/utils/RouteUtil.java | 2 +- .../views/DrawerRecommendChildViewHolder.java | 7 +++++-- .../common/views/DrawerRecommendViewHolder.java | 7 +++++-- .../common/views/DrawerTaskViewHolder.java | 7 +++++-- .../common/views/FunGamesChildViewHolder.java | 7 +++++-- .../yunbao/common/views/FunGamesViewHolder.java | 7 +++++-- .../views/NewRoleFunGamesChildViewHolder.java | 7 +++++-- .../live/activity/LiveAudienceActivity.java | 17 +++++++++-------- .../activity/MedalQuestionWebViewActivity.java | 2 +- .../yunbao/live/activity/ZhuangBanActivity.java | 3 ++- .../yunbao/live/adapter/LiveChatAdapter.java | 3 ++- .../live/adapter/LivePromotionAdapter.java | 3 ++- .../live/adapter/SystemMessageAdapter.java | 3 ++- .../live/adapter/SystemMessageNewAdapter.java | 4 +++- .../yunbao/live/dialog/HighNobilityDialog.java | 3 ++- .../live/dialog/LiveGameDialogFragment.java | 3 ++- .../live/dialog/LiveGiftDialogFragment.java | 4 +++- .../com/yunbao/live/dialog/LiveGiftPopup.java | 7 +++++-- .../live/dialog/LiveHDDialogFragment.java | 3 ++- .../LiveTrickeryDialogFragment4Audience.java | 3 ++- .../live/dialog/MedalAchievementPopup.java | 4 +++- .../live/views/LiveAudienceViewHolder.java | 5 +++-- .../live/views/LiveNewReadyRyViewHolder.java | 3 ++- .../yunbao/live/views/LiveRoomViewHolder.java | 3 ++- .../live/views/LiveRyAnchorViewHolder.java | 13 +++++++++---- .../yunbao/main/activity/MyWebViewActivity.java | 3 ++- .../main/activity/MyWebViewActivity2.java | 3 ++- .../main/activity/ThreeDistributActivity.java | 2 +- .../main/activity/WeekWebViewActivity.java | 3 ++- .../yunbao/main/activity/ZhuangBanActivity.java | 5 +++-- .../yunbao/main/dialog/ReturnUserDialog.java | 4 +++- .../com/yunbao/main/dialog/SigninDialog.java | 3 ++- .../main/views/MainHomeShopViewHolder.java | 3 ++- .../com/yunbao/main/views/MainMeViewHolder.java | 7 ++++--- .../yunbao/main/views/MainMeViewHolder1.java | 7 ++++--- 39 files changed, 122 insertions(+), 65 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java b/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java index 7bc055371..03729629d 100644 --- a/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java +++ b/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java @@ -48,6 +48,7 @@ import com.yunbao.common.utils.LiveRoomCheckLivePresenter; import com.yunbao.common.utils.MicStatusManager; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.HintCustomPopup; import org.greenrobot.eventbus.EventBus; @@ -255,7 +256,7 @@ public class WebViewActivity extends AbsActivity { mIsLive = isLive; if (Constants.LoginKefu) { if (addArgs) { - url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); } } Intent intent = new Intent(context, WebViewActivity.class); diff --git a/common/src/main/java/com/yunbao/common/bean/ActiveModel.java b/common/src/main/java/com/yunbao/common/bean/ActiveModel.java index 88a8c3559..bdd51d47f 100644 --- a/common/src/main/java/com/yunbao/common/bean/ActiveModel.java +++ b/common/src/main/java/com/yunbao/common/bean/ActiveModel.java @@ -5,6 +5,7 @@ import android.content.Context; import com.google.gson.annotations.SerializedName; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.manager.IMLoginManager; +import com.yunbao.common.utils.WordUtil; /** * 活动 @@ -105,7 +106,7 @@ public class ActiveModel extends BaseModel { "?uid=" + userInfo.getId() + "&token=" + userInfo.getToken() + "&anchorUid=" + liveUid - + "&active_id=" + activeId; + + "&active_id=" + activeId+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); return url; } } diff --git a/common/src/main/java/com/yunbao/common/bean/LiveUserMailBoxModel.java b/common/src/main/java/com/yunbao/common/bean/LiveUserMailBoxModel.java index b68478a05..2ee074cad 100644 --- a/common/src/main/java/com/yunbao/common/bean/LiveUserMailBoxModel.java +++ b/common/src/main/java/com/yunbao/common/bean/LiveUserMailBoxModel.java @@ -5,6 +5,7 @@ import androidx.annotation.NonNull; import com.google.gson.annotations.SerializedName; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.utils.StringUtil; +import com.yunbao.common.utils.WordUtil; public class LiveUserMailBoxModel extends BaseModel { @SerializedName("id") @@ -127,7 +128,7 @@ public class LiveUserMailBoxModel extends BaseModel { url += "?"; } url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token=" - + CommonAppConfig.getInstance().getToken(); + + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); } return url; } diff --git a/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java b/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java index fe911bd3b..3f853d460 100644 --- a/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java +++ b/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java @@ -123,10 +123,10 @@ public class JavascriptInterfaceUtils { url = CommonAppConfig.HOST + url; if (url.contains("?")) { url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" - + CommonAppConfig.getInstance().getToken(); + + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); } else { url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" - + CommonAppConfig.getInstance().getToken(); + + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); } if (LiveZhuangBana) { RouteUtil.forwardLiveZhuangBanActivity(url, false); @@ -146,10 +146,10 @@ public class JavascriptInterfaceUtils { url = CommonAppConfig.HOST + url; if (url.contains("?")) { url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" - + CommonAppConfig.getInstance().getToken(); + + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); } else { url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" - + CommonAppConfig.getInstance().getToken(); + + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); } if (LiveZhuangBana) { RouteUtil.forwardLiveZhuangBanActivity(url, title); diff --git a/common/src/main/java/com/yunbao/common/utils/RouteUtil.java b/common/src/main/java/com/yunbao/common/utils/RouteUtil.java index 79eb53702..203f2448a 100644 --- a/common/src/main/java/com/yunbao/common/utils/RouteUtil.java +++ b/common/src/main/java/com/yunbao/common/utils/RouteUtil.java @@ -183,7 +183,7 @@ public class RouteUtil { * 跳转到充值页面 */ public static void forwardMyCoin(Context context) { - String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=zhifu&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=zhifu&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); ARouter.getInstance().build(PATH_COIN).withString("url", url).navigation(); } diff --git a/common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java b/common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java index 147ec1713..ae47a973d 100644 --- a/common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java @@ -17,6 +17,7 @@ import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; @@ -48,7 +49,8 @@ public class DrawerRecommendChildViewHolder extends RecyclerView.ViewHolder { .append("&uid=") .append(userInfo.getId()) .append("&token=") - .append(userInfo.getToken()); + .append(userInfo.getToken()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); } else { htmlUrl.append(CommonAppConfig.HOST) .append("/") @@ -56,7 +58,8 @@ public class DrawerRecommendChildViewHolder extends RecyclerView.ViewHolder { .append("?uid=") .append(userInfo.getId()) .append("&token=") - .append(userInfo.getToken()); + .append(userInfo.getToken()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); } Bus.get().post(new CustomDrawerPopupEvent() .setDisMiss(true) diff --git a/common/src/main/java/com/yunbao/common/views/DrawerRecommendViewHolder.java b/common/src/main/java/com/yunbao/common/views/DrawerRecommendViewHolder.java index 38d2389e4..fdaa31287 100644 --- a/common/src/main/java/com/yunbao/common/views/DrawerRecommendViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/DrawerRecommendViewHolder.java @@ -17,6 +17,7 @@ import com.yunbao.common.event.CustomDrawerPopupEvent; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; /** @@ -56,7 +57,8 @@ public class DrawerRecommendViewHolder extends RecyclerView.ViewHolder { .append("&uid=") .append(userInfo.getId()) .append("&token=") - .append(userInfo.getToken()); + .append(userInfo.getToken()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); } else { htmlUrl.append(CommonAppConfig.HOST) .append("/") @@ -64,7 +66,8 @@ public class DrawerRecommendViewHolder extends RecyclerView.ViewHolder { .append("&uid=") .append(userInfo.getId()) .append("&token=") - .append(userInfo.getToken()); + .append(userInfo.getToken()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); } Bus.get().post(new CustomDrawerPopupEvent() diff --git a/common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java b/common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java index b0f69758b..17715b42c 100644 --- a/common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java @@ -17,6 +17,7 @@ import com.yunbao.common.event.CustomDrawerPopupEvent; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; /** @@ -61,7 +62,8 @@ public class DrawerTaskViewHolder extends RecyclerView.ViewHolder { .append("&uid=") .append(userInfo.getId()) .append("&token=") - .append(userInfo.getToken()); + .append(userInfo.getToken()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); } else { htmlUrl.append(CommonAppConfig.HOST) .append("/") @@ -69,7 +71,8 @@ public class DrawerTaskViewHolder extends RecyclerView.ViewHolder { .append("?uid=") .append(userInfo.getId()) .append("&token=") - .append(userInfo.getToken()); + .append(userInfo.getToken()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); }//资料 Bus.get().post(new CustomDrawerPopupEvent() .setDisMiss(true) diff --git a/common/src/main/java/com/yunbao/common/views/FunGamesChildViewHolder.java b/common/src/main/java/com/yunbao/common/views/FunGamesChildViewHolder.java index e7bef052d..13023f15c 100644 --- a/common/src/main/java/com/yunbao/common/views/FunGamesChildViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/FunGamesChildViewHolder.java @@ -16,6 +16,7 @@ import com.yunbao.common.event.CustomDrawerPopupEvent; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.Bus; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; public class FunGamesChildViewHolder extends RecyclerView.ViewHolder { @@ -58,7 +59,8 @@ public class FunGamesChildViewHolder extends RecyclerView.ViewHolder { .append("&uid=") .append(userInfo.getId()) .append("&token=") - .append(userInfo.getToken()); + .append(userInfo.getToken()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); } else { htmlUrl.append(CommonAppConfig.HOST) .append("/") @@ -66,7 +68,8 @@ public class FunGamesChildViewHolder extends RecyclerView.ViewHolder { .append("?uid=") .append(userInfo.getId()) .append("&token=") - .append(userInfo.getToken()); + .append(userInfo.getToken()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); } Bus.get().post(new CustomDrawerPopupEvent() .setHtmlUrl(htmlUrl.toString()) diff --git a/common/src/main/java/com/yunbao/common/views/FunGamesViewHolder.java b/common/src/main/java/com/yunbao/common/views/FunGamesViewHolder.java index 1266df02a..e24ddd2db 100644 --- a/common/src/main/java/com/yunbao/common/views/FunGamesViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/FunGamesViewHolder.java @@ -21,6 +21,7 @@ import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; import java.util.HashMap; @@ -69,7 +70,8 @@ public class FunGamesViewHolder extends RecyclerView.ViewHolder { .append("&uid=") .append(userInfo.getId()) .append("&token=") - .append(userInfo.getToken()); + .append(userInfo.getToken()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); } else { htmlUrl.append(CommonAppConfig.HOST) .append("/") @@ -77,7 +79,8 @@ public class FunGamesViewHolder extends RecyclerView.ViewHolder { .append("?uid=") .append(userInfo.getId()) .append("&token=") - .append(userInfo.getToken()); + .append(userInfo.getToken()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); } Bus.get().post(new CustomDrawerPopupEvent() diff --git a/common/src/main/java/com/yunbao/common/views/NewRoleFunGamesChildViewHolder.java b/common/src/main/java/com/yunbao/common/views/NewRoleFunGamesChildViewHolder.java index a3b1fc6fa..3a6b460ad 100644 --- a/common/src/main/java/com/yunbao/common/views/NewRoleFunGamesChildViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/NewRoleFunGamesChildViewHolder.java @@ -18,6 +18,7 @@ import com.yunbao.common.event.NewRoleCustomDrawerPopupEvent; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.Bus; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; public class NewRoleFunGamesChildViewHolder extends RecyclerView.ViewHolder { @@ -68,7 +69,8 @@ public class NewRoleFunGamesChildViewHolder extends RecyclerView.ViewHolder { .append("&uid=") .append(userInfo.getId()) .append("&token=") - .append(userInfo.getToken()); + .append(userInfo.getToken()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); } else { htmlUrl.append(CommonAppConfig.HOST) .append("/") @@ -76,7 +78,8 @@ public class NewRoleFunGamesChildViewHolder extends RecyclerView.ViewHolder { .append("?uid=") .append(userInfo.getId()) .append("&token=") - .append(userInfo.getToken()); + .append(userInfo.getToken()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); } Bus.get().post(new NewRoleCustomDrawerPopupEvent() .setHtmlUrl(htmlUrl.toString()) diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 4284be575..30f9280ce 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -92,6 +92,7 @@ import com.yunbao.common.utils.ProcessResultUtil; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.CustomDrawerPopupView; import com.yunbao.common.views.floatingview.APPEasyFloat; import com.yunbao.common.views.weight.VerticalViewPager; @@ -1099,14 +1100,14 @@ public class LiveAudienceActivity extends LiveActivity { //不是粉絲 if (LiveAudienceActivity.is_fans == null || "2".equals(LiveAudienceActivity.is_fans)) { bundle.putString(Constants.URL, - CommonAppConfig.HOST + "/h5/live/joinFansClub.html" + + (CommonAppConfig.HOST + "/h5/live/joinFansClub.html" + "?uid=" + userInfo.getId() + - "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid); + "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid)+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0)); } else { bundle.putString(Constants.URL, - CommonAppConfig.HOST + "/h5/live/fansClub.html" + + ( CommonAppConfig.HOST + "/h5/live/fansClub.html" + "?uid=" + userInfo.getId() + - "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid); + "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid)+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0)); } bundle.putString("liveUid", mLiveUid); bundle.putString("anchorName", mAncherName); @@ -1124,7 +1125,7 @@ public class LiveAudienceActivity extends LiveActivity { case LIVE_WKS://周星榜 String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" + userInfo.getId() + - "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid; + "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); ZhuangBanActivity.forward(mContext, weeklyStarUrl, false, 1); break; case NOBLE: @@ -1134,7 +1135,7 @@ public class LiveAudienceActivity extends LiveActivity { + "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveBean.getUid() + "&ancherName=" + mLiveBean.getUserNiceName() - + "&uid=" + userInfo.getId(); + + "&uid=" + userInfo.getId()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); ZhuangBanActivity.forward(mContext, nobleUrl, false, 1); break; case LIAN_MAI: @@ -1211,7 +1212,7 @@ public class LiveAudienceActivity extends LiveActivity { case ACTIVITY_CENTER://活动中心 String url = CommonAppConfig.HOST + "/h5/live/hallOfFame/index.html?g=Appapi&m=Turntable&a=tricky"; url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" - + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid; + + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); Log.i("tag", url); Intent intent = new Intent(mContext, ZhuangBanActivity.class); intent.putExtra("url", url); @@ -1236,7 +1237,7 @@ public class LiveAudienceActivity extends LiveActivity { url += "?anchorUid=" + mLiveUid + "&stream=" + mStream + "&uid=" + CommonAppConfig.getInstance().getUid() - + "&token=" + CommonAppConfig.getInstance().getToken(); + + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); LiveHDDialogFragment liveHDDialogFragment = new LiveHDDialogFragment(); bundle.putString("url", url); bundle.putInt("show_type", 0); diff --git a/live/src/main/java/com/yunbao/live/activity/MedalQuestionWebViewActivity.java b/live/src/main/java/com/yunbao/live/activity/MedalQuestionWebViewActivity.java index 6d0be362a..ddf017818 100644 --- a/live/src/main/java/com/yunbao/live/activity/MedalQuestionWebViewActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/MedalQuestionWebViewActivity.java @@ -211,7 +211,7 @@ public class MedalQuestionWebViewActivity extends AbsActivity { public static void forward(Context context, String url, boolean addArgs) { if (addArgs) { - url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); } Intent intent = new Intent(context, MedalQuestionWebViewActivity.class); intent.putExtra(Constants.URL, url); diff --git a/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java b/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java index ba0c6e15f..f86e32423 100644 --- a/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java @@ -51,6 +51,7 @@ import com.yunbao.common.utils.MicStatusManager; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; import com.yunbao.share.ui.InvitePopDialog; @@ -297,7 +298,7 @@ public class ZhuangBanActivity extends AbsActivity { public static void forward(Context context, String url, boolean addArgs, int isLive) { if (addArgs) { - url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); } Intent intent = new Intent(context, ZhuangBanActivity.class); Log.i("tag", url); diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java index c54681fb7..081a1882e 100644 --- a/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java @@ -53,6 +53,7 @@ import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.SpUtil; import com.yunbao.common.utils.StringUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.weight.ClipPathCircleImage; import com.yunbao.live.R; import com.yunbao.live.activity.LiveAudienceActivity; @@ -285,7 +286,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter { //点击打开活动 tv_chat_active_into.setOnClickListener(v -> { - String url = CommonAppConfig.HOST + "/" + bean.getContent() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + LiveRoomViewHolder.mLiveUid; + String url = CommonAppConfig.HOST + "/" + bean.getContent() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + LiveRoomViewHolder.mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); Bundle bundle = new Bundle(); bundle.putString("url", url); LiveHDDialogFragment fragment = new LiveHDDialogFragment(); diff --git a/live/src/main/java/com/yunbao/live/adapter/LivePromotionAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LivePromotionAdapter.java index 4bf30fa6c..451f881f9 100644 --- a/live/src/main/java/com/yunbao/live/adapter/LivePromotionAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/LivePromotionAdapter.java @@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.adapter.RefreshAdapter; import com.yunbao.common.glide.ImgLoader; +import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; import com.yunbao.live.activity.LiveAudienceActivity; import com.yunbao.live.bean.LivePromotionBean; @@ -75,7 +76,7 @@ public class LivePromotionAdapter extends RefreshAdapter { public void onClick(View v) { String url = CommonAppConfig.HOST + "/" + bean.getActive_src() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid - + "&active_id=" + bean.getActive_id(); + + "&active_id=" + bean.getActive_id()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); Bundle bundle = new Bundle(); bundle.putString("url", url); int show = TextUtils.isEmpty(bean.getShow_type()) ? 0 : Integer.parseInt(bean.getShow_type()); diff --git a/live/src/main/java/com/yunbao/live/adapter/SystemMessageAdapter.java b/live/src/main/java/com/yunbao/live/adapter/SystemMessageAdapter.java index bf6195f8e..80df52146 100644 --- a/live/src/main/java/com/yunbao/live/adapter/SystemMessageAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/SystemMessageAdapter.java @@ -14,6 +14,7 @@ import android.widget.TextView; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.adapter.RefreshAdapter; import com.yunbao.common.glide.ImgLoader; +import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; import com.yunbao.live.bean.SystemMessageBean; import com.yunbao.live.activity.ZhuangBanActivity; @@ -68,7 +69,7 @@ public class SystemMessageAdapter extends RefreshAdapter { @Override public void onClick(View v) { if (bean.getLink() != null && !bean.getLink().equals("")) { - startActivity(new Intent(mContext, ZhuangBanActivity.class).putExtra("url", bean.getLink()+ "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken())); + startActivity(new Intent(mContext, ZhuangBanActivity.class).putExtra("url", bean.getLink()+ "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"))); } } }); diff --git a/live/src/main/java/com/yunbao/live/adapter/SystemMessageNewAdapter.java b/live/src/main/java/com/yunbao/live/adapter/SystemMessageNewAdapter.java index 051383f9d..915daf395 100644 --- a/live/src/main/java/com/yunbao/live/adapter/SystemMessageNewAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/SystemMessageNewAdapter.java @@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.yunbao.common.adapter.RefreshAdapter; import com.yunbao.common.bean.IMLoginModel; import com.yunbao.common.manager.IMLoginManager; +import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; import com.yunbao.live.activity.ZhuangBanActivity; import com.yunbao.live.bean.SystemMessageBean; @@ -71,7 +72,8 @@ public class SystemMessageNewAdapter extends RefreshAdapter { .append("&uid=") .append(userInfo.getId()) .append("&token=") - .append(userInfo.getToken()); + .append(userInfo.getToken()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); mContext.startActivity( new Intent(mContext, ZhuangBanActivity.class) .putExtra("url", urlBuffer.toString())); diff --git a/live/src/main/java/com/yunbao/live/dialog/HighNobilityDialog.java b/live/src/main/java/com/yunbao/live/dialog/HighNobilityDialog.java index 7f09f37b0..01ebd2725 100644 --- a/live/src/main/java/com/yunbao/live/dialog/HighNobilityDialog.java +++ b/live/src/main/java/com/yunbao/live/dialog/HighNobilityDialog.java @@ -13,6 +13,7 @@ import com.yunbao.common.Constants; import com.yunbao.common.bean.UserBean; import com.yunbao.common.dialog.AbsDialogFragment; import com.yunbao.common.utils.DpUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; import com.yunbao.live.activity.ZhuangBanActivity; @@ -54,7 +55,7 @@ public class HighNobilityDialog extends AbsDialogFragment { UserBean u = CommonAppConfig.getInstance().getUserBean(); String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&uid=" - + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); ZhuangBanActivity.forward(mContext, url, false,0); }); diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGameDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveGameDialogFragment.java index 1b3c78293..a883b0335 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGameDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGameDialogFragment.java @@ -42,6 +42,7 @@ import com.yunbao.common.utils.LiveRoomCheckLivePresenter; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; import com.yunbao.live.activity.LiveAudienceActivity; @@ -293,7 +294,7 @@ public class LiveGameDialogFragment extends AbsDialogFragment { url += "?"; } url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token=" - + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + roomId + "&active_id=" + model.getActiveId(); + + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + roomId + "&active_id=" + model.getActiveId()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); Log.i("debug", "selectTab: " + url); mWebView.loadUrl(url); } else { diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java index f616599f9..faba1f19b 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java @@ -69,6 +69,7 @@ import com.yunbao.common.utils.NobleUtil; import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; @@ -375,7 +376,8 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On .append("/h5/info/index.html?uid=") .append(userInfo.getId()) .append("&token=") - .append(userInfo.getToken()); + .append(userInfo.getToken()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); Bundle bundle = new Bundle(); bundle.putString("url", htmlUrl.toString()); LiveHDDialogFragment fragment = new LiveHDDialogFragment(); diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java index beaaf7759..3e51d0d99 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java @@ -319,7 +319,9 @@ public class LiveGiftPopup extends AbsDialogFragment { .append("&no_back=1") .append("&type=") .append(blindBoxType-1) - ; + + .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); Bundle bundle = new Bundle(); bundle.putString("url", htmlUrl.toString()); // System.out.println("盲盒页面 = "+htmlUrl.toString()); @@ -387,7 +389,8 @@ public class LiveGiftPopup extends AbsDialogFragment { .append(userInfo.getId()) .append("&token=") .append(userInfo.getToken()) - .append("&for"); + .append("&for") .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); Bundle bundle = new Bundle(); bundle.putString("url", htmlUrl.toString()); bundle.putInt("height", DeviceUtils.getScreenHeight(getActivity()) / 5 * 3); diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java index 06389160d..7c841de73 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java @@ -45,6 +45,7 @@ import com.yunbao.common.utils.L; import com.yunbao.common.utils.MicStatusManager; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; import com.yunbao.live.activity.LiveAudienceActivity; @@ -370,7 +371,7 @@ public class LiveHDDialogFragment extends AbsDialogFragment { UserBean u = CommonAppConfig.getInstance().getUserBean(); String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&uid=" - + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&active=" + event.getData() + "&anchorUid=" + mLiveUid; + + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&active=" + event.getData() + "&anchorUid=" + mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); ZhuangBanActivity.forward(mContext, url, false,0); } diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveTrickeryDialogFragment4Audience.java b/live/src/main/java/com/yunbao/live/dialog/LiveTrickeryDialogFragment4Audience.java index b1ff7361d..69d279a7f 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveTrickeryDialogFragment4Audience.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveTrickeryDialogFragment4Audience.java @@ -12,6 +12,7 @@ import com.yunbao.common.Constants; import com.yunbao.common.bean.JsWishBean; import com.yunbao.common.dialog.AbsDialogFragment; import com.yunbao.common.utils.DpUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; import com.yunbao.live.activity.LiveAudienceActivity; import com.yunbao.live.views.WishlistWebViewHolder; @@ -64,7 +65,7 @@ public class LiveTrickeryDialogFragment4Audience extends AbsDialogFragment { if (mWishWebViewHolder == null) { String url= CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=prank"; url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" - + CommonAppConfig.getInstance().getToken() + "&anchor_id="+mLiveUid; + + CommonAppConfig.getInstance().getToken() + "&anchor_id="+mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); Log.i("tag",url); mWishWebViewHolder = new WishlistWebViewHolder(mContext, rlWebview, url); mWishWebViewHolder.subscribeActivityLifeCycle(); diff --git a/live/src/main/java/com/yunbao/live/dialog/MedalAchievementPopup.java b/live/src/main/java/com/yunbao/live/dialog/MedalAchievementPopup.java index 0342e1b8f..19b44afb8 100644 --- a/live/src/main/java/com/yunbao/live/dialog/MedalAchievementPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/MedalAchievementPopup.java @@ -16,6 +16,7 @@ import com.yunbao.common.http.base.HttpCallback; import com.yunbao.common.http.live.LiveNetManager; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.live.R; import com.yunbao.live.activity.ZhuangBanActivity; @@ -110,7 +111,8 @@ public class MedalAchievementPopup extends BottomPopupView { .append("&token=") .append(userInfo.getToken()) .append("&uid=") - .append(userInfo.getId()); + .append(userInfo.getId()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); ZhuangBanActivity.forward(getContext(), htmlUrl.toString(), false,0); } }); diff --git a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java index 5739da3b7..4d5f04185 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java @@ -39,6 +39,7 @@ import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.ProcessResultUtil; import com.yunbao.common.utils.SpUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; @@ -408,7 +409,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { Bundle bundle = new Bundle(); String url = newPeopleUrl + (newPeopleUrl.contains("?") ? "&" : "?") + "g=Appapi&m=Turntable&a=tricky"; url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" - + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid; + + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); bundle.putString("url", url); bundle.putInt("show_type", 0); //bundle.putInt("height", DpUtil.dp2px(1)); @@ -447,7 +448,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { public void openZGListWindow() { String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=tricky"; url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" - + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid; + + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); Log.i("tag", url); Bundle bundle1 = new Bundle(); bundle1.putString("url", url); diff --git a/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java index 891b108b9..6275453cf 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java @@ -583,7 +583,8 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl url.append("&uid=") .append(model.getId()) .append("&token=") - .append(model.getToken()); + .append(model.getToken()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); RouteUtil.forwardLiveZhuangBanActivity(url.toString(), false); } else if (i == R.id.btn_live_anchor_say) { openAnchorSayDialog(); diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 4664a66aa..67bfe648b 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -124,6 +124,7 @@ import com.yunbao.common.utils.SpUtil; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.TimeUtils; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.utils.formatBigNum; import com.yunbao.common.views.AbsViewHolder; import com.yunbao.common.views.weight.ClipPathCircleImage; @@ -1165,7 +1166,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } else if (bean.getType() == -5) { String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=tricky"; url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" - + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid; + + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); Log.i("tag", url); Bundle bundle1 = new Bundle(); bundle1.putString("url", url); diff --git a/live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java index c16b61d3f..4aef82537 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java @@ -40,6 +40,7 @@ import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; import com.yunbao.live.activity.LiveRyAnchorActivity; import com.yunbao.live.activity.ZhuangBanActivity; @@ -476,7 +477,8 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder { .append("&uid=") .append(userInfo.getId()) .append("&k=") - .append(System.currentTimeMillis()); + .append(System.currentTimeMillis()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); } else { type = bean.getShow_type(); htmlUrl.append(bean.getLink()) @@ -487,7 +489,8 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder { .append("&anchorUid=") .append(mLiveUid) .append("&t=") - .append(System.currentTimeMillis()); + .append(System.currentTimeMillis()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); } if (TextUtils.equals(type, "1")) { ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,0); @@ -532,7 +535,8 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder { .append("&uid=") .append(userInfo.getId()) .append("&k=") - .append(System.currentTimeMillis()); + .append(System.currentTimeMillis()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); } else { type = bean.getShow_type(); htmlUrl.append(bean.getLink()) @@ -546,7 +550,8 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder { .append(mLiveUid) .append("&t=") .append(System.currentTimeMillis()) - .append("&g=Appapi&m=Wish&a=index"); + .append("&g=Appapi&m=Wish&a=index") .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); } if (TextUtils.equals(type, "1")) { ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,0); 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 35d0fd668..453408def 100644 --- a/main/src/main/java/com/yunbao/main/activity/MyWebViewActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/MyWebViewActivity.java @@ -53,6 +53,7 @@ import com.yunbao.common.utils.ProcessImageUtil; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.live.activity.LiveAudienceActivity; import com.yunbao.common.event.LiveRoomChangeEvent; import com.yunbao.common.http.LiveHttpUtil; @@ -415,7 +416,7 @@ public class MyWebViewActivity extends AbsActivity { public static void forward(Context context, String url, boolean addArgs) { if (addArgs) { - url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"); } Intent intent = new Intent(context, MyWebViewActivity.class); intent.putExtra(Constants.URL, url); diff --git a/main/src/main/java/com/yunbao/main/activity/MyWebViewActivity2.java b/main/src/main/java/com/yunbao/main/activity/MyWebViewActivity2.java index 098f8dbab..07b6ddd1c 100644 --- a/main/src/main/java/com/yunbao/main/activity/MyWebViewActivity2.java +++ b/main/src/main/java/com/yunbao/main/activity/MyWebViewActivity2.java @@ -38,6 +38,7 @@ import com.yunbao.common.utils.L; import com.yunbao.common.utils.MicStatusManager; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.live.activity.SystemMessageActivity; import com.yunbao.common.event.LiveRoomChangeEvent; import com.yunbao.common.http.LiveHttpUtil; @@ -324,7 +325,7 @@ public class MyWebViewActivity2 extends AbsActivity { public static void forward(Context context, String url, boolean addArgs) { if (addArgs) { - url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"); } Intent intent = new Intent(context, MyWebViewActivity2.class); intent.putExtra(Constants.URL, url); diff --git a/main/src/main/java/com/yunbao/main/activity/ThreeDistributActivity.java b/main/src/main/java/com/yunbao/main/activity/ThreeDistributActivity.java index 22c76faf1..9e4b8ddd2 100644 --- a/main/src/main/java/com/yunbao/main/activity/ThreeDistributActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/ThreeDistributActivity.java @@ -271,7 +271,7 @@ public class ThreeDistributActivity extends AbsActivity implements View.OnClickL public static void forward(Context context, String title, String url) { - url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"); Intent intent = new Intent(context, ThreeDistributActivity.class); intent.putExtra(Constants.URL, url); intent.putExtra(Constants.TIP, title); diff --git a/main/src/main/java/com/yunbao/main/activity/WeekWebViewActivity.java b/main/src/main/java/com/yunbao/main/activity/WeekWebViewActivity.java index 888e6dfc8..cd1fb5682 100644 --- a/main/src/main/java/com/yunbao/main/activity/WeekWebViewActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/WeekWebViewActivity.java @@ -35,6 +35,7 @@ import com.yunbao.common.utils.JavascriptInterfaceUtils; 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.live.activity.WebViewActivityMedal; import com.yunbao.live.dialog.LiveUserDialogFragment; import com.yunbao.common.http.LiveHttpUtil; @@ -270,7 +271,7 @@ public class WeekWebViewActivity extends AbsActivity { public static void forward(Context context, String url, boolean addArgs) { if (addArgs) { - url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"); } Intent intent = new Intent(context, WeekWebViewActivity.class); intent.putExtra(Constants.URL, url); diff --git a/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java b/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java index 85dd05e37..afff1d698 100644 --- a/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java @@ -50,6 +50,7 @@ import com.yunbao.common.utils.MicStatusManager; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.main.R; import org.greenrobot.eventbus.Subscribe; @@ -282,9 +283,9 @@ public class ZhuangBanActivity extends AbsActivity { public static void forward(Context context, String url, boolean addArgs) { if (addArgs) { if (url.contains("?")) { - url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"); } else { - url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"); } } diff --git a/main/src/main/java/com/yunbao/main/dialog/ReturnUserDialog.java b/main/src/main/java/com/yunbao/main/dialog/ReturnUserDialog.java index 4244760f1..ad1424d45 100644 --- a/main/src/main/java/com/yunbao/main/dialog/ReturnUserDialog.java +++ b/main/src/main/java/com/yunbao/main/dialog/ReturnUserDialog.java @@ -15,6 +15,7 @@ import com.yunbao.common.bean.IMLoginModel; import com.yunbao.common.dialog.AbsDialogFragment; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.manager.IMLoginManager; +import com.yunbao.common.utils.WordUtil; import com.yunbao.live.activity.ZhuangBanActivity; import com.yunbao.main.R; @@ -77,7 +78,8 @@ public class ReturnUserDialog extends AbsDialogFragment { .append("&uid=") .append(userInfo.getId()) .append("&token=") - .append(userInfo.getToken()); + .append(userInfo.getToken()) .append("&isZh=") + .append(WordUtil.isNewZh() ? "1" : 0); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,0); } }); diff --git a/main/src/main/java/com/yunbao/main/dialog/SigninDialog.java b/main/src/main/java/com/yunbao/main/dialog/SigninDialog.java index a7e1b7d58..219ede7e6 100644 --- a/main/src/main/java/com/yunbao/main/dialog/SigninDialog.java +++ b/main/src/main/java/com/yunbao/main/dialog/SigninDialog.java @@ -15,6 +15,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.dialog.AbsDialogFragment; import com.yunbao.common.utils.DpUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.main.R; public class SigninDialog extends AbsDialogFragment { @@ -57,7 +58,7 @@ public class SigninDialog extends AbsDialogFragment { goto_sign.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - ARouter.getInstance().build(PATH_REWARD).withString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index" + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()).navigation(); + ARouter.getInstance().build(PATH_REWARD).withString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index" + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0")).navigation(); dismiss(); } diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeShopViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeShopViewHolder.java index 10420db5c..918d1de8c 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeShopViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeShopViewHolder.java @@ -23,6 +23,7 @@ import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.L; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.bean.LiveBean; +import com.yunbao.common.utils.WordUtil; import com.yunbao.main.R; import com.yunbao.main.utils.BottomBarUtil; @@ -48,7 +49,7 @@ public class MainHomeShopViewHolder extends AbsMainHomeChildViewHolder implement @Override public void init() { - String url = HtmlConfig.SHOP + "?t="+Math.random()+"&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + String url = HtmlConfig.SHOP + "?t="+Math.random()+"&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"); // String url = HtmlConfig.SHOP + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); L.e("H5---88>" + url); diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java index 95e2a3d50..a9837514d 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java @@ -48,6 +48,7 @@ import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.AbsMainViewHolder; import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.live.activity.LiveRecordActivity; @@ -531,7 +532,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi MobclickAgent.onEvent(mContext, "my_noble", "个人中心点贵族"); Constants.isTitle = true; UserBean u = CommonAppConfig.getInstance().getUserBean(); - String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid(); + String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"); ZhuangBanActivity.forward(mContext, url, false); } @@ -624,7 +625,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi SlideBean bean = mBannerList.get(p); if (!bean.getSlide_url().equals("")) { Constants.isTitle = true; - String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"); WebViewActivity.forward(mContext, url, false, false); Map map_ekv = new HashMap(); @@ -650,7 +651,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi SlideBean bean = mBannerList.get(p); if (!bean.getSlide_url().equals("")) { Constants.isTitle = true; - String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); + String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"); RouteUtil.forwardCustomerService(url); Map map_ekv = new HashMap(); diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java index 56ac1dbf3..965f4567e 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java +++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java @@ -30,6 +30,7 @@ import com.yunbao.common.interfaces.CommonCallback; import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.SVGAViewUtils; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.AbsMainViewHolder; import com.yunbao.live.activity.LiveRecordActivity; import com.yunbao.live.activity.RoomManageActivity; @@ -147,7 +148,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL mLevelAnchor.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&for"; + String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0") + "&for"; WebViewActivity.forward(mContext, url,false); } }); @@ -155,7 +156,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL mLevel.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid(); + String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"); WebViewActivity.forward(mContext, url,false); } }); @@ -405,7 +406,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL forwardSetting(); } else if (i == R.id.v_noble) { UserBean u = CommonAppConfig.getInstance().getUserBean(); - String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid(); + String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); ZhuangBanActivity.forward(mContext, url, false); }