From 1793cca452c8d905ec64d26d2bfad6821f5e0c4c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 11:10:36 +0800
Subject: [PATCH] 2025年04月09日11:10:33
---
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java | 5 ++++-
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 11 -----------
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 16 ++++------------
app/src/main/res/values-zh/strings.xml | 3 ++-
app/src/main/res/values/strings.xml | 1 +
app/src/main/res/values-en/strings.xml | 1 +
6 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
index c393640..075d3db 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
@@ -69,7 +69,8 @@
public static HDLException getException(HDLException e) {
try {
- return new HDLException(e.getCode(), getErrorSting(e.getCode()), e.getmExtra());
+ String str = TextUtils.isEmpty(getErrorSting(e.getCode())) ? e.getMsg() : getErrorSting(e.getCode());
+ return new HDLException(e.getCode(), str, e.getmExtra());
} catch (Exception exception) {
return e;
}
@@ -89,6 +90,8 @@
return HDLApp.getInstance().getAppLocaleContext().getString(R.string.ssl_error);
case 1005:
return HDLApp.getInstance().getAppLocaleContext().getString(R.string.timeout_error);
+ case 4:
+ return HDLApp.getInstance().getAppLocaleContext().getString(R.string.signature_error_log_in_again);
}
} catch (Exception e) {
e.printStackTrace();
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 aff6241..930817f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -171,14 +171,6 @@
// viewBinding.homeLoginPasswordEt.setText(pws);
checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString());
isLoginTextViewEnabled();
- if (UserConfigManage.getInstance().isBAccount()) {
- boolean is_Authorization = SharedPreUtils.getBoolean("isAuthorization");
- if (!is_Authorization) {
- //2025骞�03鏈�03鏃�14:45:17 鏉ㄦ稕瑕佹眰b绔处鍙烽渶瑕佹楠屾潈闄�
- HdlThreadLogic.toast(_mActivity, getString(R.string.forbidden_login));
- }
- }
-
} catch (Exception ignored) {
}
}
@@ -342,7 +334,6 @@
@Override
public void onSuccess(HDLLoginBean obj) {
if (UserConfigManage.getInstance().isBAccount()) {
- SharedPreUtils.putBoolean("isAuthorization", true);
restoreButtonStyleToInitializeState();
//瀹夎鍟嗚烦杞晫闈�
startActivity(BPowerStationActivity.class);
@@ -352,7 +343,6 @@
// HdlAccountLogic.getInstance().getCompanyParterMenu_B(new CloudCallBeak<Boolean>() {
// @Override
// public void onSuccess(Boolean isBoolean) {
-// SharedPreUtils.putBoolean("isAuthorization", isBoolean);
// if (isBoolean) {
// //2025骞�03鏈�03鏃�14:45:17 鏉ㄦ稕瑕佹眰b绔处鍙烽渶瑕佹楠屾潈闄�
// restoreButtonStyleToInitializeState();
@@ -368,7 +358,6 @@
//
// @Override
// public void onFailure(HDLException e) {
-// SharedPreUtils.putBoolean("isAuthorization", false);
// hideLoading();
// HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
// }
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
index f2163fb..fe166b3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -84,18 +84,10 @@
//鍒ゆ柇AccessToken鏄惁null
if (!TextUtils.isEmpty(HDLLinkPMUser.getInstance().getAccessToken())) {
if (UserConfigManage.getInstance().isBAccount()) {
- //2025骞�03鏈�03鏃�14:45:17 鏉ㄦ稕瑕佹眰b绔处鍙烽渶瑕佹楠屾潈闄�
- boolean isAuthorization = SharedPreUtils.getBoolean("isAuthorization");
- if (isAuthorization) {
- //瀹夎鍟嗚烦杞晫闈�
- Intent intent = new Intent();
- intent.setClass(StartActivity.this, BPowerStationActivity.class);
- openActivity(intent);
- } else {
- Intent intent = new Intent();
- intent.setClass(StartActivity.this, LoginActivity.class);
- openActivity(intent);
- }
+ //瀹夎鍟嗚烦杞晫闈�
+ Intent intent = new Intent();
+ intent.setClass(StartActivity.this, BPowerStationActivity.class);
+ openActivity(intent);
} else {
//C绔敤鎴疯烦杞晫闈�
// showLoading();
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index a378ae5..7e50b73 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -362,4 +362,5 @@
<string name="parse_error">Data parsing error, please try again later</string>
<string name="ssl_error">Loading certificate error, pls try again later</string>
<string name="timeout_error">Please check your network and try again later</string>
+ <string name="signature_error_log_in_again">Signature error. Log in again</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index c76d166..bdc6c73 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -357,5 +357,6 @@
<string name="parse_error">鏁版嵁瑙ｆ瀽閿欒锛岃绋嶅悗鍐嶈瘯</string>
<string name="ssl_error">鍔犺浇璇佷功鍑洪敊锛岃绋嶅悗鍐嶈瘯</string>
<string name="timeout_error">缃戠粶涓嶇粰鍔涳紝璇风◢鍚庡啀璇�</string>
- v
+ <string name="signature_error_log_in_again">绛惧悕閿欒,閲嶆柊鐧诲綍</string>
+
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index eb4bf5a..f418bac 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -361,6 +361,7 @@
<string name="parse_error">Data parsing error, please try again later</string>
<string name="ssl_error">Loading certificate error, pls try again later</string>
<string name="timeout_error">Please check your network and try again later</string>
+ <string name="signature_error_log_in_again">Signature error. Log in again</string>
--
Gitblit v1.8.0