From f151e203da870dbe281defcb1daf84a1a38ecac1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 29 十二月 2025 09:59:57 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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..5e96e8f 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 {
@@ -424,13 +423,14 @@
if (e.getCode() == 10019) {
//鐢ㄦ埛宸茬粡琚攣瀹氶敊璇爜
try {
- if (e.getmExtra() != null) {
- if (System.currentTimeMillis() < e.getmExtra().getUnlockTime()) {
- long time = e.getmExtra().getUnlockTime() - System.currentTimeMillis();
- int minute = Integer.parseInt(TimeUtils.getMinuteTime(time));
- HdlThreadLogic.toast(_mActivity, e.getMsg() + getString(R.string.residue) + minute + getString(R.string.minute) + "(" + e.getCode() + ")");
- }
- }
+// if (e.getmExtra() != null) {
+// if (System.currentTimeMillis() < e.getmExtra().getUnlockTime()) {
+// long time = e.getmExtra().getUnlockTime() - System.currentTimeMillis();
+// int minute = Integer.parseInt(TimeUtils.getMinuteTime(time));
+// HdlThreadLogic.toast(_mActivity, e.getMsg() + getString(R.string.residue) + minute + getString(R.string.minute) + "(" + e.getCode() + ")");
+// }
+// }
+ HdlThreadLogic.toast(_mActivity, e.getMsg());
} catch (Exception ee) {
HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
}
@@ -598,7 +598,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 +624,7 @@
//璁剧疆瀛椾綋棰滆壊
ds.setColor(getResources().getColor(text_color, null));
// 鍘绘帀涓嬪垝绾�
- ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
+ ds.setUnderlineText(!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh));
}
@@ -647,7 +647,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