From beadecb2bbc75b8f153d366df11246719cf97b2f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 23 二月 2024 14:37:25 +0800
Subject: [PATCH] Merge branch 'dev-hxb' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into dev-hxb
---
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
index 16ee961..b1e615a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -19,11 +19,13 @@
import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
+import com.hdl.linkpm.sdk.HDLLinkPMSdk;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.linkpm.sdk.user.bean.HDLLoginBean;
import com.hdl.linkpm.sdk.user.bean.HDLUserRegionBean;
import com.hdl.linkpm.sdk.user.callback.ILoginCallBack;
+import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
@@ -38,6 +40,7 @@
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.me.WebActivity;
+import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.TimeUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
@@ -107,17 +110,17 @@
viewBinding.homeLoginInstallUserTv.setSelected(UserConfigManage.getInstance().isBAccount());
viewBinding.homeLoginPrivacyCheckIv.setSelected(UserConfigManage.getInstance().isAcceiptPolicy());
setStringDifferentColors(viewBinding.homeLoginPrivacyTv);
- if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.cn)) {
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
viewBinding.homeLoginLanguageTv.setText("绠�浣撲腑鏂�");
} else {
viewBinding.homeLoginLanguageTv.setText("English");
}
- String acc = "13375012441";
- String pws = "123456";
- //娴嬭瘯鐢�
- viewBinding.homeLoginAccountEt.setText(acc);
- viewBinding.homeLoginPasswordEt.setText(pws);
+// String acc = "13375012441";
+// String pws = "123456";
+// //娴嬭瘯鐢�
+// viewBinding.homeLoginAccountEt.setText(acc);
+// viewBinding.homeLoginPasswordEt.setText(pws);
isLoginTextViewEnabled();
}
@@ -142,7 +145,15 @@
listDialog.setItemOnclickListener(new ListDialogAdapter.OnclickListener() {
@Override
public void onClick(int position, LanguageAdapter.ItemData itemData) {
-
+ UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage());
+ UserConfigManage.getInstance().Save();
+ //閰嶇疆鎺ュ彛璇锋眰璇█
+ HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage());
+ listDialog.dismiss();
+ AppManagerUtils.getAppManager().finishAllActivity();
+ Intent intent = new Intent();
+ intent.setClass(HDLApp.getInstance(), StartActivity.class);
+ startActivity(intent);
viewBinding.homeLoginLanguageTv.setText(itemData.getTitle());
}
});
@@ -220,8 +231,8 @@
String account = viewBinding.homeLoginAccountEt.getText().toString().replace(" ", "");
String password = viewBinding.homeLoginPasswordEt.getText().toString().replace(" ", "");
- boolean isLogin = isLocalCheckAccountAndPassword(account, password);
- if (!isLogin) {
+ boolean is_login = isLocalCheckAccountAndPassword(account, password);
+ if (!is_login) {
return;
}
boolean isSelected = UserConfigManage.getInstance().isAcceiptPolicy();
--
Gitblit v1.8.0