网页拼接中英文字段

This commit is contained in:
18401019693 2023-10-06 17:04:52 +08:00
parent ce37918745
commit ea0ff70595
39 changed files with 122 additions and 65 deletions

View File

@ -48,6 +48,7 @@ import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.common.utils.MicStatusManager; import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.HintCustomPopup; import com.yunbao.common.views.HintCustomPopup;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
@ -255,7 +256,7 @@ public class WebViewActivity extends AbsActivity {
mIsLive = isLive; mIsLive = isLive;
if (Constants.LoginKefu) { if (Constants.LoginKefu) {
if (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, WebViewActivity.class); Intent intent = new Intent(context, WebViewActivity.class);

View File

@ -5,6 +5,7 @@ import android.content.Context;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import com.yunbao.common.CommonAppConfig; import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.WordUtil;
/** /**
* 活动 * 活动
@ -105,7 +106,7 @@ public class ActiveModel extends BaseModel {
"?uid=" + userInfo.getId() + "?uid=" + userInfo.getId() +
"&token=" + userInfo.getToken() "&token=" + userInfo.getToken()
+ "&anchorUid=" + liveUid + "&anchorUid=" + liveUid
+ "&active_id=" + activeId; + "&active_id=" + activeId+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
return url; return url;
} }
} }

View File

@ -5,6 +5,7 @@ import androidx.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import com.yunbao.common.CommonAppConfig; import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.WordUtil;
public class LiveUserMailBoxModel extends BaseModel { public class LiveUserMailBoxModel extends BaseModel {
@SerializedName("id") @SerializedName("id")
@ -127,7 +128,7 @@ public class LiveUserMailBoxModel extends BaseModel {
url += "?"; url += "?";
} }
url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token=" url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken(); + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
} }
return url; return url;
} }

View File

@ -123,10 +123,10 @@ public class JavascriptInterfaceUtils {
url = CommonAppConfig.HOST + url; url = CommonAppConfig.HOST + url;
if (url.contains("?")) { if (url.contains("?")) {
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken(); + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
} else { } else {
url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken(); + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
} }
if (LiveZhuangBana) { if (LiveZhuangBana) {
RouteUtil.forwardLiveZhuangBanActivity(url, false); RouteUtil.forwardLiveZhuangBanActivity(url, false);
@ -146,10 +146,10 @@ public class JavascriptInterfaceUtils {
url = CommonAppConfig.HOST + url; url = CommonAppConfig.HOST + url;
if (url.contains("?")) { if (url.contains("?")) {
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken(); + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
} else { } else {
url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken(); + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
} }
if (LiveZhuangBana) { if (LiveZhuangBana) {
RouteUtil.forwardLiveZhuangBanActivity(url, title); RouteUtil.forwardLiveZhuangBanActivity(url, title);

View File

@ -183,7 +183,7 @@ public class RouteUtil {
* 跳转到充值页面 * 跳转到充值页面
*/ */
public static void forwardMyCoin(Context context) { 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(); ARouter.getInstance().build(PATH_COIN).withString("url", url).navigation();
} }

View File

@ -17,6 +17,7 @@ import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
@ -48,7 +49,8 @@ public class DrawerRecommendChildViewHolder extends RecyclerView.ViewHolder {
.append("&uid=") .append("&uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()); .append(userInfo.getToken()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
} else { } else {
htmlUrl.append(CommonAppConfig.HOST) htmlUrl.append(CommonAppConfig.HOST)
.append("/") .append("/")
@ -56,7 +58,8 @@ public class DrawerRecommendChildViewHolder extends RecyclerView.ViewHolder {
.append("?uid=") .append("?uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()); .append(userInfo.getToken()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
} }
Bus.get().post(new CustomDrawerPopupEvent() Bus.get().post(new CustomDrawerPopupEvent()
.setDisMiss(true) .setDisMiss(true)

View File

@ -17,6 +17,7 @@ import com.yunbao.common.event.CustomDrawerPopupEvent;
import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
/** /**
@ -56,7 +57,8 @@ public class DrawerRecommendViewHolder extends RecyclerView.ViewHolder {
.append("&uid=") .append("&uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()); .append(userInfo.getToken()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
} else { } else {
htmlUrl.append(CommonAppConfig.HOST) htmlUrl.append(CommonAppConfig.HOST)
.append("/") .append("/")
@ -64,7 +66,8 @@ public class DrawerRecommendViewHolder extends RecyclerView.ViewHolder {
.append("&uid=") .append("&uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()); .append(userInfo.getToken()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
} }
Bus.get().post(new CustomDrawerPopupEvent() Bus.get().post(new CustomDrawerPopupEvent()

View File

@ -17,6 +17,7 @@ import com.yunbao.common.event.CustomDrawerPopupEvent;
import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
/** /**
@ -61,7 +62,8 @@ public class DrawerTaskViewHolder extends RecyclerView.ViewHolder {
.append("&uid=") .append("&uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()); .append(userInfo.getToken()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
} else { } else {
htmlUrl.append(CommonAppConfig.HOST) htmlUrl.append(CommonAppConfig.HOST)
.append("/") .append("/")
@ -69,7 +71,8 @@ public class DrawerTaskViewHolder extends RecyclerView.ViewHolder {
.append("?uid=") .append("?uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()); .append(userInfo.getToken()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
}//资料 }//资料
Bus.get().post(new CustomDrawerPopupEvent() Bus.get().post(new CustomDrawerPopupEvent()
.setDisMiss(true) .setDisMiss(true)

View File

@ -16,6 +16,7 @@ import com.yunbao.common.event.CustomDrawerPopupEvent;
import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
public class FunGamesChildViewHolder extends RecyclerView.ViewHolder { public class FunGamesChildViewHolder extends RecyclerView.ViewHolder {
@ -58,7 +59,8 @@ public class FunGamesChildViewHolder extends RecyclerView.ViewHolder {
.append("&uid=") .append("&uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()); .append(userInfo.getToken()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
} else { } else {
htmlUrl.append(CommonAppConfig.HOST) htmlUrl.append(CommonAppConfig.HOST)
.append("/") .append("/")
@ -66,7 +68,8 @@ public class FunGamesChildViewHolder extends RecyclerView.ViewHolder {
.append("?uid=") .append("?uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()); .append(userInfo.getToken()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
} }
Bus.get().post(new CustomDrawerPopupEvent() Bus.get().post(new CustomDrawerPopupEvent()
.setHtmlUrl(htmlUrl.toString()) .setHtmlUrl(htmlUrl.toString())

View File

@ -21,6 +21,7 @@ import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
import java.util.HashMap; import java.util.HashMap;
@ -69,7 +70,8 @@ public class FunGamesViewHolder extends RecyclerView.ViewHolder {
.append("&uid=") .append("&uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()); .append(userInfo.getToken()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
} else { } else {
htmlUrl.append(CommonAppConfig.HOST) htmlUrl.append(CommonAppConfig.HOST)
.append("/") .append("/")
@ -77,7 +79,8 @@ public class FunGamesViewHolder extends RecyclerView.ViewHolder {
.append("?uid=") .append("?uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()); .append(userInfo.getToken()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
} }
Bus.get().post(new CustomDrawerPopupEvent() Bus.get().post(new CustomDrawerPopupEvent()

View File

@ -18,6 +18,7 @@ import com.yunbao.common.event.NewRoleCustomDrawerPopupEvent;
import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
public class NewRoleFunGamesChildViewHolder extends RecyclerView.ViewHolder { public class NewRoleFunGamesChildViewHolder extends RecyclerView.ViewHolder {
@ -68,7 +69,8 @@ public class NewRoleFunGamesChildViewHolder extends RecyclerView.ViewHolder {
.append("&uid=") .append("&uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()); .append(userInfo.getToken()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
} else { } else {
htmlUrl.append(CommonAppConfig.HOST) htmlUrl.append(CommonAppConfig.HOST)
.append("/") .append("/")
@ -76,7 +78,8 @@ public class NewRoleFunGamesChildViewHolder extends RecyclerView.ViewHolder {
.append("?uid=") .append("?uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()); .append(userInfo.getToken()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
} }
Bus.get().post(new NewRoleCustomDrawerPopupEvent() Bus.get().post(new NewRoleCustomDrawerPopupEvent()
.setHtmlUrl(htmlUrl.toString()) .setHtmlUrl(htmlUrl.toString())

View File

@ -92,6 +92,7 @@ import com.yunbao.common.utils.ProcessResultUtil;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.CustomDrawerPopupView; import com.yunbao.common.views.CustomDrawerPopupView;
import com.yunbao.common.views.floatingview.APPEasyFloat; import com.yunbao.common.views.floatingview.APPEasyFloat;
import com.yunbao.common.views.weight.VerticalViewPager; 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)) { if (LiveAudienceActivity.is_fans == null || "2".equals(LiveAudienceActivity.is_fans)) {
bundle.putString(Constants.URL, bundle.putString(Constants.URL,
CommonAppConfig.HOST + "/h5/live/joinFansClub.html" + (CommonAppConfig.HOST + "/h5/live/joinFansClub.html" +
"?uid=" + userInfo.getId() + "?uid=" + userInfo.getId() +
"&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid); "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid)+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
} else { } else {
bundle.putString(Constants.URL, bundle.putString(Constants.URL,
CommonAppConfig.HOST + "/h5/live/fansClub.html" + ( CommonAppConfig.HOST + "/h5/live/fansClub.html" +
"?uid=" + userInfo.getId() + "?uid=" + userInfo.getId() +
"&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid); "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid)+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
} }
bundle.putString("liveUid", mLiveUid); bundle.putString("liveUid", mLiveUid);
bundle.putString("anchorName", mAncherName); bundle.putString("anchorName", mAncherName);
@ -1124,7 +1125,7 @@ public class LiveAudienceActivity extends LiveActivity {
case LIVE_WKS://周星榜 case LIVE_WKS://周星榜
String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid="
+ userInfo.getId() + + userInfo.getId() +
"&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid; "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
ZhuangBanActivity.forward(mContext, weeklyStarUrl, false, 1); ZhuangBanActivity.forward(mContext, weeklyStarUrl, false, 1);
break; break;
case NOBLE: case NOBLE:
@ -1134,7 +1135,7 @@ public class LiveAudienceActivity extends LiveActivity {
+ "&token=" + userInfo.getToken() + "&token=" + userInfo.getToken()
+ "&anchorUid=" + mLiveBean.getUid() + "&anchorUid=" + mLiveBean.getUid()
+ "&ancherName=" + mLiveBean.getUserNiceName() + "&ancherName=" + mLiveBean.getUserNiceName()
+ "&uid=" + userInfo.getId(); + "&uid=" + userInfo.getId()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
ZhuangBanActivity.forward(mContext, nobleUrl, false, 1); ZhuangBanActivity.forward(mContext, nobleUrl, false, 1);
break; break;
case LIAN_MAI: case LIAN_MAI:
@ -1211,7 +1212,7 @@ public class LiveAudienceActivity extends LiveActivity {
case ACTIVITY_CENTER://活动中心 case ACTIVITY_CENTER://活动中心
String url = CommonAppConfig.HOST + "/h5/live/hallOfFame/index.html?g=Appapi&m=Turntable&a=tricky"; String url = CommonAppConfig.HOST + "/h5/live/hallOfFame/index.html?g=Appapi&m=Turntable&a=tricky";
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" 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); Log.i("tag", url);
Intent intent = new Intent(mContext, ZhuangBanActivity.class); Intent intent = new Intent(mContext, ZhuangBanActivity.class);
intent.putExtra("url", url); intent.putExtra("url", url);
@ -1236,7 +1237,7 @@ public class LiveAudienceActivity extends LiveActivity {
url += "?anchorUid=" + mLiveUid url += "?anchorUid=" + mLiveUid
+ "&stream=" + mStream + "&stream=" + mStream
+ "&uid=" + CommonAppConfig.getInstance().getUid() + "&uid=" + CommonAppConfig.getInstance().getUid()
+ "&token=" + CommonAppConfig.getInstance().getToken(); + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
LiveHDDialogFragment liveHDDialogFragment = new LiveHDDialogFragment(); LiveHDDialogFragment liveHDDialogFragment = new LiveHDDialogFragment();
bundle.putString("url", url); bundle.putString("url", url);
bundle.putInt("show_type", 0); bundle.putInt("show_type", 0);

View File

@ -211,7 +211,7 @@ public class MedalQuestionWebViewActivity extends AbsActivity {
public static void forward(Context context, String url, boolean addArgs) { public static void forward(Context context, String url, boolean addArgs) {
if (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 intent = new Intent(context, MedalQuestionWebViewActivity.class);
intent.putExtra(Constants.URL, url); intent.putExtra(Constants.URL, url);

View File

@ -51,6 +51,7 @@ import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.share.ui.InvitePopDialog; 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) { public static void forward(Context context, String url, boolean addArgs, int isLive) {
if (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, ZhuangBanActivity.class); Intent intent = new Intent(context, ZhuangBanActivity.class);
Log.i("tag", url); Log.i("tag", url);

View File

@ -53,6 +53,7 @@ import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.SpUtil; import com.yunbao.common.utils.SpUtil;
import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ClipPathCircleImage; import com.yunbao.common.views.weight.ClipPathCircleImage;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.live.activity.LiveAudienceActivity; import com.yunbao.live.activity.LiveAudienceActivity;
@ -285,7 +286,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
//点击打开活动 //点击打开活动
tv_chat_active_into.setOnClickListener(v -> { 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 bundle = new Bundle();
bundle.putString("url", url); bundle.putString("url", url);
LiveHDDialogFragment fragment = new LiveHDDialogFragment(); LiveHDDialogFragment fragment = new LiveHDDialogFragment();

View File

@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.yunbao.common.CommonAppConfig; import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.adapter.RefreshAdapter; import com.yunbao.common.adapter.RefreshAdapter;
import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.live.activity.LiveAudienceActivity; import com.yunbao.live.activity.LiveAudienceActivity;
import com.yunbao.live.bean.LivePromotionBean; import com.yunbao.live.bean.LivePromotionBean;
@ -75,7 +76,7 @@ public class LivePromotionAdapter extends RefreshAdapter<LivePromotionBean> {
public void onClick(View v) { public void onClick(View v) {
String url = CommonAppConfig.HOST + "/" + bean.getActive_src() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() String url = CommonAppConfig.HOST + "/" + bean.getActive_src() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()
+ "&anchorUid=" + mLiveUid + "&anchorUid=" + mLiveUid
+ "&active_id=" + bean.getActive_id(); + "&active_id=" + bean.getActive_id()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", url); bundle.putString("url", url);
int show = TextUtils.isEmpty(bean.getShow_type()) ? 0 : Integer.parseInt(bean.getShow_type()); int show = TextUtils.isEmpty(bean.getShow_type()) ? 0 : Integer.parseInt(bean.getShow_type());

View File

@ -14,6 +14,7 @@ import android.widget.TextView;
import com.yunbao.common.CommonAppConfig; import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.adapter.RefreshAdapter; import com.yunbao.common.adapter.RefreshAdapter;
import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.live.bean.SystemMessageBean; import com.yunbao.live.bean.SystemMessageBean;
import com.yunbao.live.activity.ZhuangBanActivity; import com.yunbao.live.activity.ZhuangBanActivity;
@ -68,7 +69,7 @@ public class SystemMessageAdapter extends RefreshAdapter<SystemMessageBean> {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (bean.getLink() != null && !bean.getLink().equals("")) { 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")));
} }
} }
}); });

View File

@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.yunbao.common.adapter.RefreshAdapter; import com.yunbao.common.adapter.RefreshAdapter;
import com.yunbao.common.bean.IMLoginModel; import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.live.activity.ZhuangBanActivity; import com.yunbao.live.activity.ZhuangBanActivity;
import com.yunbao.live.bean.SystemMessageBean; import com.yunbao.live.bean.SystemMessageBean;
@ -71,7 +72,8 @@ public class SystemMessageNewAdapter extends RefreshAdapter<SystemMessageBean> {
.append("&uid=") .append("&uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()); .append(userInfo.getToken()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
mContext.startActivity( mContext.startActivity(
new Intent(mContext, ZhuangBanActivity.class) new Intent(mContext, ZhuangBanActivity.class)
.putExtra("url", urlBuffer.toString())); .putExtra("url", urlBuffer.toString()));

View File

@ -13,6 +13,7 @@ import com.yunbao.common.Constants;
import com.yunbao.common.bean.UserBean; import com.yunbao.common.bean.UserBean;
import com.yunbao.common.dialog.AbsDialogFragment; import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.live.activity.ZhuangBanActivity; import com.yunbao.live.activity.ZhuangBanActivity;
@ -54,7 +55,7 @@ public class HighNobilityDialog extends AbsDialogFragment {
UserBean u = CommonAppConfig.getInstance().getUserBean(); UserBean u = CommonAppConfig.getInstance().getUserBean();
String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname="
+ u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&uid=" + 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); ZhuangBanActivity.forward(mContext, url, false,0);
}); });

View File

@ -42,6 +42,7 @@ import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity; import com.yunbao.live.activity.LiveActivity;
import com.yunbao.live.activity.LiveAudienceActivity; import com.yunbao.live.activity.LiveAudienceActivity;
@ -293,7 +294,7 @@ public class LiveGameDialogFragment extends AbsDialogFragment {
url += "?"; url += "?";
} }
url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token=" 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); Log.i("debug", "selectTab: " + url);
mWebView.loadUrl(url); mWebView.loadUrl(url);
} else { } else {

View File

@ -69,6 +69,7 @@ import com.yunbao.common.utils.NobleUtil;
import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity; 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("/h5/info/index.html?uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()); .append(userInfo.getToken()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString()); bundle.putString("url", htmlUrl.toString());
LiveHDDialogFragment fragment = new LiveHDDialogFragment(); LiveHDDialogFragment fragment = new LiveHDDialogFragment();

View File

@ -319,7 +319,9 @@ public class LiveGiftPopup extends AbsDialogFragment {
.append("&no_back=1") .append("&no_back=1")
.append("&type=") .append("&type=")
.append(blindBoxType-1) .append(blindBoxType-1)
;
.append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString()); bundle.putString("url", htmlUrl.toString());
// System.out.println("盲盒页面 = "+htmlUrl.toString()); // System.out.println("盲盒页面 = "+htmlUrl.toString());
@ -387,7 +389,8 @@ public class LiveGiftPopup extends AbsDialogFragment {
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()) .append(userInfo.getToken())
.append("&for"); .append("&for") .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString()); bundle.putString("url", htmlUrl.toString());
bundle.putInt("height", DeviceUtils.getScreenHeight(getActivity()) / 5 * 3); bundle.putInt("height", DeviceUtils.getScreenHeight(getActivity()) / 5 * 3);

View File

@ -45,6 +45,7 @@ import com.yunbao.common.utils.L;
import com.yunbao.common.utils.MicStatusManager; import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity; import com.yunbao.live.activity.LiveActivity;
import com.yunbao.live.activity.LiveAudienceActivity; import com.yunbao.live.activity.LiveAudienceActivity;
@ -370,7 +371,7 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
UserBean u = CommonAppConfig.getInstance().getUserBean(); UserBean u = CommonAppConfig.getInstance().getUserBean();
String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname="
+ u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&uid=" + 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); ZhuangBanActivity.forward(mContext, url, false,0);
} }

View File

@ -12,6 +12,7 @@ import com.yunbao.common.Constants;
import com.yunbao.common.bean.JsWishBean; import com.yunbao.common.bean.JsWishBean;
import com.yunbao.common.dialog.AbsDialogFragment; import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.live.activity.LiveAudienceActivity; import com.yunbao.live.activity.LiveAudienceActivity;
import com.yunbao.live.views.WishlistWebViewHolder; import com.yunbao.live.views.WishlistWebViewHolder;
@ -64,7 +65,7 @@ public class LiveTrickeryDialogFragment4Audience extends AbsDialogFragment {
if (mWishWebViewHolder == null) { if (mWishWebViewHolder == null) {
String url= CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=prank"; String url= CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=prank";
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" 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); Log.i("tag",url);
mWishWebViewHolder = new WishlistWebViewHolder(mContext, rlWebview, url); mWishWebViewHolder = new WishlistWebViewHolder(mContext, rlWebview, url);
mWishWebViewHolder.subscribeActivityLifeCycle(); mWishWebViewHolder.subscribeActivityLifeCycle();

View File

@ -16,6 +16,7 @@ import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager; import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.live.activity.ZhuangBanActivity; import com.yunbao.live.activity.ZhuangBanActivity;
@ -110,7 +111,8 @@ public class MedalAchievementPopup extends BottomPopupView {
.append("&token=") .append("&token=")
.append(userInfo.getToken()) .append(userInfo.getToken())
.append("&uid=") .append("&uid=")
.append(userInfo.getId()); .append(userInfo.getId()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
ZhuangBanActivity.forward(getContext(), htmlUrl.toString(), false,0); ZhuangBanActivity.forward(getContext(), htmlUrl.toString(), false,0);
} }
}); });

View File

@ -39,6 +39,7 @@ import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ProcessResultUtil; import com.yunbao.common.utils.ProcessResultUtil;
import com.yunbao.common.utils.SpUtil; import com.yunbao.common.utils.SpUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity; import com.yunbao.live.activity.LiveActivity;
@ -408,7 +409,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
String url = newPeopleUrl + (newPeopleUrl.contains("?") ? "&" : "?") + "g=Appapi&m=Turntable&a=tricky"; String url = newPeopleUrl + (newPeopleUrl.contains("?") ? "&" : "?") + "g=Appapi&m=Turntable&a=tricky";
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" 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.putString("url", url);
bundle.putInt("show_type", 0); bundle.putInt("show_type", 0);
//bundle.putInt("height", DpUtil.dp2px(1)); //bundle.putInt("height", DpUtil.dp2px(1));
@ -447,7 +448,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
public void openZGListWindow() { public void openZGListWindow() {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=tricky"; String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=tricky";
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" 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); Log.i("tag", url);
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", url); bundle1.putString("url", url);

View File

@ -583,7 +583,8 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
url.append("&uid=") url.append("&uid=")
.append(model.getId()) .append(model.getId())
.append("&token=") .append("&token=")
.append(model.getToken()); .append(model.getToken()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
RouteUtil.forwardLiveZhuangBanActivity(url.toString(), false); RouteUtil.forwardLiveZhuangBanActivity(url.toString(), false);
} else if (i == R.id.btn_live_anchor_say) { } else if (i == R.id.btn_live_anchor_say) {
openAnchorSayDialog(); openAnchorSayDialog();

View File

@ -124,6 +124,7 @@ import com.yunbao.common.utils.SpUtil;
import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.TimeUtils; import com.yunbao.common.utils.TimeUtils;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.utils.formatBigNum; import com.yunbao.common.utils.formatBigNum;
import com.yunbao.common.views.AbsViewHolder; import com.yunbao.common.views.AbsViewHolder;
import com.yunbao.common.views.weight.ClipPathCircleImage; import com.yunbao.common.views.weight.ClipPathCircleImage;
@ -1165,7 +1166,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} else if (bean.getType() == -5) { } else if (bean.getType() == -5) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=tricky"; String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=tricky";
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" 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); Log.i("tag", url);
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", url); bundle1.putString("url", url);

View File

@ -40,6 +40,7 @@ import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.live.activity.LiveRyAnchorActivity; import com.yunbao.live.activity.LiveRyAnchorActivity;
import com.yunbao.live.activity.ZhuangBanActivity; import com.yunbao.live.activity.ZhuangBanActivity;
@ -476,7 +477,8 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
.append("&uid=") .append("&uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&k=") .append("&k=")
.append(System.currentTimeMillis()); .append(System.currentTimeMillis()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
} else { } else {
type = bean.getShow_type(); type = bean.getShow_type();
htmlUrl.append(bean.getLink()) htmlUrl.append(bean.getLink())
@ -487,7 +489,8 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
.append("&anchorUid=") .append("&anchorUid=")
.append(mLiveUid) .append(mLiveUid)
.append("&t=") .append("&t=")
.append(System.currentTimeMillis()); .append(System.currentTimeMillis()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
} }
if (TextUtils.equals(type, "1")) { if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,0); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,0);
@ -532,7 +535,8 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
.append("&uid=") .append("&uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&k=") .append("&k=")
.append(System.currentTimeMillis()); .append(System.currentTimeMillis()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
} else { } else {
type = bean.getShow_type(); type = bean.getShow_type();
htmlUrl.append(bean.getLink()) htmlUrl.append(bean.getLink())
@ -546,7 +550,8 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
.append(mLiveUid) .append(mLiveUid)
.append("&t=") .append("&t=")
.append(System.currentTimeMillis()) .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")) { if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,0); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,0);

View File

@ -53,6 +53,7 @@ import com.yunbao.common.utils.ProcessImageUtil;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.activity.LiveAudienceActivity; import com.yunbao.live.activity.LiveAudienceActivity;
import com.yunbao.common.event.LiveRoomChangeEvent; import com.yunbao.common.event.LiveRoomChangeEvent;
import com.yunbao.common.http.LiveHttpUtil; 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) { public static void forward(Context context, String url, boolean addArgs) {
if (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 intent = new Intent(context, MyWebViewActivity.class);
intent.putExtra(Constants.URL, url); intent.putExtra(Constants.URL, url);

View File

@ -38,6 +38,7 @@ import com.yunbao.common.utils.L;
import com.yunbao.common.utils.MicStatusManager; import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.activity.SystemMessageActivity; import com.yunbao.live.activity.SystemMessageActivity;
import com.yunbao.common.event.LiveRoomChangeEvent; import com.yunbao.common.event.LiveRoomChangeEvent;
import com.yunbao.common.http.LiveHttpUtil; 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) { public static void forward(Context context, String url, boolean addArgs) {
if (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 intent = new Intent(context, MyWebViewActivity2.class);
intent.putExtra(Constants.URL, url); intent.putExtra(Constants.URL, url);

View File

@ -271,7 +271,7 @@ public class ThreeDistributActivity extends AbsActivity implements View.OnClickL
public static void forward(Context context, String title, String url) { 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 intent = new Intent(context, ThreeDistributActivity.class);
intent.putExtra(Constants.URL, url); intent.putExtra(Constants.URL, url);
intent.putExtra(Constants.TIP, title); intent.putExtra(Constants.TIP, title);

View File

@ -35,6 +35,7 @@ import com.yunbao.common.utils.JavascriptInterfaceUtils;
import com.yunbao.common.utils.L; import com.yunbao.common.utils.L;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.activity.WebViewActivityMedal; import com.yunbao.live.activity.WebViewActivityMedal;
import com.yunbao.live.dialog.LiveUserDialogFragment; import com.yunbao.live.dialog.LiveUserDialogFragment;
import com.yunbao.common.http.LiveHttpUtil; 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) { public static void forward(Context context, String url, boolean addArgs) {
if (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 intent = new Intent(context, WeekWebViewActivity.class);
intent.putExtra(Constants.URL, url); intent.putExtra(Constants.URL, url);

View File

@ -50,6 +50,7 @@ import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.main.R; import com.yunbao.main.R;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
@ -282,9 +283,9 @@ public class ZhuangBanActivity extends AbsActivity {
public static void forward(Context context, String url, boolean addArgs) { public static void forward(Context context, String url, boolean addArgs) {
if (addArgs) { if (addArgs) {
if (url.contains("?")) { 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 { } else {
url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
} }
} }

View File

@ -15,6 +15,7 @@ import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.dialog.AbsDialogFragment; import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.activity.ZhuangBanActivity; import com.yunbao.live.activity.ZhuangBanActivity;
import com.yunbao.main.R; import com.yunbao.main.R;
@ -77,7 +78,8 @@ public class ReturnUserDialog extends AbsDialogFragment {
.append("&uid=") .append("&uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()); .append(userInfo.getToken()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,0); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,0);
} }
}); });

View File

@ -15,6 +15,7 @@ import com.alibaba.android.arouter.launcher.ARouter;
import com.yunbao.common.CommonAppConfig; import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.dialog.AbsDialogFragment; import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.main.R; import com.yunbao.main.R;
public class SigninDialog extends AbsDialogFragment { public class SigninDialog extends AbsDialogFragment {
@ -57,7 +58,7 @@ public class SigninDialog extends AbsDialogFragment {
goto_sign.setOnClickListener(new View.OnClickListener() { goto_sign.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { 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(); dismiss();
} }

View File

@ -23,6 +23,7 @@ import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.L; import com.yunbao.common.utils.L;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.bean.LiveBean; import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.main.R; import com.yunbao.main.R;
import com.yunbao.main.utils.BottomBarUtil; import com.yunbao.main.utils.BottomBarUtil;
@ -48,7 +49,7 @@ public class MainHomeShopViewHolder extends AbsMainHomeChildViewHolder implement
@Override @Override
public void init() { 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(); // String url = HtmlConfig.SHOP + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
L.e("H5---88>" + url); L.e("H5---88>" + url);

View File

@ -48,6 +48,7 @@ import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.AbsMainViewHolder; import com.yunbao.common.views.AbsMainViewHolder;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.activity.LiveRecordActivity; import com.yunbao.live.activity.LiveRecordActivity;
@ -531,7 +532,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
MobclickAgent.onEvent(mContext, "my_noble", "个人中心点贵族"); MobclickAgent.onEvent(mContext, "my_noble", "个人中心点贵族");
Constants.isTitle = true; Constants.isTitle = true;
UserBean u = CommonAppConfig.getInstance().getUserBean(); 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); ZhuangBanActivity.forward(mContext, url, false);
} }
@ -624,7 +625,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
SlideBean bean = mBannerList.get(p); SlideBean bean = mBannerList.get(p);
if (!bean.getSlide_url().equals("")) { if (!bean.getSlide_url().equals("")) {
Constants.isTitle = true; 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); WebViewActivity.forward(mContext, url, false, false);
Map<String, String> map_ekv = new HashMap<String, String>(); Map<String, String> map_ekv = new HashMap<String, String>();
@ -650,7 +651,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
SlideBean bean = mBannerList.get(p); SlideBean bean = mBannerList.get(p);
if (!bean.getSlide_url().equals("")) { if (!bean.getSlide_url().equals("")) {
Constants.isTitle = true; 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); RouteUtil.forwardCustomerService(url);
Map<String, String> map_ekv = new HashMap<String, String>(); Map<String, String> map_ekv = new HashMap<String, String>();

View File

@ -30,6 +30,7 @@ import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.AbsMainViewHolder; import com.yunbao.common.views.AbsMainViewHolder;
import com.yunbao.live.activity.LiveRecordActivity; import com.yunbao.live.activity.LiveRecordActivity;
import com.yunbao.live.activity.RoomManageActivity; import com.yunbao.live.activity.RoomManageActivity;
@ -147,7 +148,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
mLevelAnchor.setOnClickListener(new View.OnClickListener() { mLevelAnchor.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { 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); WebViewActivity.forward(mContext, url,false);
} }
}); });
@ -155,7 +156,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
mLevel.setOnClickListener(new View.OnClickListener() { mLevel.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { 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); WebViewActivity.forward(mContext, url,false);
} }
}); });
@ -405,7 +406,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
forwardSetting(); forwardSetting();
} else if (i == R.id.v_noble) { } else if (i == R.id.v_noble) {
UserBean u = CommonAppConfig.getInstance().getUserBean(); 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); ZhuangBanActivity.forward(mContext, url, false);
} }