From e04d27756095ae24edc590ad4e9cba2bd400a748 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Fri, 2 Jun 2023 11:17:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E6=8A=95?= =?UTF-8?q?=E7=A5=A8=E4=B8=AD=E8=8B=B1=E6=96=87=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=AF=AD=E8=A8=80=E6=B7=B7=E4=B9=B1=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yunbao/common/bean/LiveRoomVoteModel.java | 2 +- common/src/main/java/com/yunbao/common/utils/WordUtil.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/yunbao/common/bean/LiveRoomVoteModel.java b/common/src/main/java/com/yunbao/common/bean/LiveRoomVoteModel.java index 123ea368b..15420bbf1 100644 --- a/common/src/main/java/com/yunbao/common/bean/LiveRoomVoteModel.java +++ b/common/src/main/java/com/yunbao/common/bean/LiveRoomVoteModel.java @@ -128,7 +128,7 @@ public class LiveRoomVoteModel extends BaseModel { } public String getResult() { - return WordUtil.isZh() ? resultZh : resultEn; + return WordUtil.isNewZh() ? resultZh : resultEn; } public String getResultZh() { diff --git a/common/src/main/java/com/yunbao/common/utils/WordUtil.java b/common/src/main/java/com/yunbao/common/utils/WordUtil.java index f3725bef9..9d58b9973 100644 --- a/common/src/main/java/com/yunbao/common/utils/WordUtil.java +++ b/common/src/main/java/com/yunbao/common/utils/WordUtil.java @@ -27,6 +27,11 @@ public class WordUtil { } public static boolean isZh() { + Locale locale = sResources.getConfiguration().locale; + String language = locale.getLanguage(); + return language.endsWith("zh"); + } + public static boolean isNewZh(){ return IMLoginManager.get(CommonAppContext.sInstance).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE; }