yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

网页拼接中英文字段

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
View File

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

3
common/src/main/java/com/yunbao/common/bean/ActiveModel.java
View File

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

3
common/src/main/java/com/yunbao/common/bean/LiveUserMailBoxModel.java
View File

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

8
common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
View File

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

2
common/src/main/java/com/yunbao/common/utils/RouteUtil.java
View File

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

7
common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java
View File

@@ -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)

7
common/src/main/java/com/yunbao/common/views/DrawerRecommendViewHolder.java
View File

@@ -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()

7
common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java
View File

@@ -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)

7
common/src/main/java/com/yunbao/common/views/FunGamesChildViewHolder.java
View File

@@ -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())

7
common/src/main/java/com/yunbao/common/views/FunGamesViewHolder.java
View File

@@ -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()

7
common/src/main/java/com/yunbao/common/views/NewRoleFunGamesChildViewHolder.java
View File

@@ -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())