From 4bc924d0ce29560a5e1ad1adf1042de032d954a1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 04 十二月 2025 14:50:56 +0800
Subject: [PATCH] 2025年12月04日14:50:54
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
index cfb88e9..d53c49e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -31,7 +31,9 @@
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
+import com.hdl.photovoltaic.enums.Languages;
import com.hdl.photovoltaic.other.HdlLogLogic;
+import com.hdl.photovoltaic.other.HdlPushLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.account.ChangePassword;
@@ -155,12 +157,9 @@
}, 0, forgetPasswordTvStr.length(), 0);
viewBinding.homeLoginForgetPasswordTv.setText(forgetPasswordTvStrSpannable);
+ LanguageAdapter.ItemData language= LocalManageUtil.getLanguage(UserConfigManage.getInstance().getCurrentAppLanguage());
+ viewBinding.homeLoginLanguageTv.setText(language.getTitle());
- if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
- viewBinding.homeLoginLanguageTv.setText("绠�浣撲腑鏂�");
- } else {
- viewBinding.homeLoginLanguageTv.setText("English");
- }
if (UserConfigManage.getInstance().isBAccount()) {
viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
} else {
@@ -598,7 +597,7 @@
int startIndex2 = s.lastIndexOf("銆�");
int endIndex2 = s.lastIndexOf("銆�") + 1;
- if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.en)) {
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.en)) {
s = s.replace("銆�", "").replace("銆�", "");
endIndex1 -= 1;
startIndex2 -= 2;//绉婚櫎"銆�"鍜�"銆�"鎬婚暱搴﹀彂鐢熷彉鍖栵紝绱㈠紩涔熸敼鍙�;
@@ -624,7 +623,7 @@
//璁剧疆瀛椾綋棰滆壊
ds.setColor(getResources().getColor(text_color, null));
// 鍘绘帀涓嬪垝绾�
- ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
+ ds.setUnderlineText(!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh));
}
@@ -647,7 +646,7 @@
//璁剧疆瀛椾綋棰滆壊
ds.setColor(getResources().getColor(text_color, null));
// 鍘绘帀涓嬪垝绾�
- ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
+ ds.setUnderlineText(!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh));
}
}, startIndex2, endIndex2, 0);
--
Gitblit v1.8.0