From a9706d1dcf725f950b5fa703e4484db7467be9ef Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 11 三月 2025 17:35:23 +0800
Subject: [PATCH] 2025年03月11日17:35:21
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 74 ++++++++++++++++++++++++++++---------
1 files changed, 56 insertions(+), 18 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 33a4d7b..a995df4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -2,7 +2,11 @@
import android.content.Intent;
+import android.content.res.Configuration;
+import android.graphics.Color;
+import android.os.Build;
import android.os.Bundle;
+import android.os.LocaleList;
import android.text.Editable;
import android.text.SpannableStringBuilder;
import android.text.TextPaint;
@@ -13,6 +17,7 @@
import android.text.method.PasswordTransformationMethod;
import android.text.style.ClickableSpan;
import android.text.style.StyleSpan;
+import android.util.DisplayMetrics;
import android.view.View;
import android.widget.TextView;
@@ -29,8 +34,10 @@
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
+import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
+import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.ui.account.ChangePassword;
import com.hdl.photovoltaic.ui.account.RegisterAccountActivity;
@@ -43,12 +50,14 @@
import com.hdl.photovoltaic.ui.me.WebActivity;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
+import com.hdl.photovoltaic.utils.SharedPreUtils;
import com.hdl.photovoltaic.utils.TimeUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.ListDialog;
import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;
import java.util.List;
+import java.util.Locale;
/**
* 鐧诲綍鐨勭晫闈�
@@ -66,6 +75,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_00000000));
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -123,7 +133,7 @@
//璁剧疆瀛椾綋棰滆壊
ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
// 鍘绘帀涓嬪垝绾�
- ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
+ ds.setUnderlineText(true);
}
@@ -143,7 +153,7 @@
//璁剧疆瀛椾綋棰滆壊
ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
// 鍘绘帀涓嬪垝绾�
- ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
+ ds.setUnderlineText(true);
}
@@ -170,6 +180,14 @@
// 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) {
}
}
@@ -272,11 +290,11 @@
boolean isSelected = UserConfigManage.getInstance().isAcceiptPolicy();
if (!isSelected) {
//闅愮鍗忚鎻愮ず
- getDialog();
+ getAcceiptPolicyDialog();
return;
}
//鐧诲綍
- login(account, password);
+ loginAccount(account, password);
}
@@ -318,7 +336,7 @@
* @param account 璐﹀彿
* @param password 瀵嗙爜
*/
- private void login(String account, String password) {
+ private void loginAccount(String account, String password) {
showLoading(getString(R.string.home_login_be_logging_in));
HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
@Override
@@ -333,11 +351,31 @@
@Override
public void onSuccess(HDLLoginBean obj) {
if (UserConfigManage.getInstance().isBAccount()) {
- restoreButtonStyleToInitializeState();
- //瀹夎鍟嗚烦杞晫闈�
- startActivity(BPowerStationActivity.class);
- hideLoading();
- finish();
+ 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();
+ //瀹夎鍟嗚烦杞晫闈�
+ startActivity(BPowerStationActivity.class);
+ hideLoading();
+ finish();
+ } else {
+ hideLoading();
+ HdlThreadLogic.toast(_mActivity, getString(R.string.forbidden_login));
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ SharedPreUtils.putBoolean("isAuthorization", false);
+ hideLoading();
+ HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
+ }
+ });
+
} else {
//C绔渶瑕佸厛鑾峰彇鐢电珯鍒楄〃;
HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
@@ -424,7 +462,7 @@
return;
}
//绗﹀悎瀵嗙爜瑙勫垯鍚庨殣钘忛敊璇彁绀猴紱
- viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_FF5A5A5A));
+// viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_FF5A5A5A));
viewBinding.homeLoginPasswordTextErrorTv.setText("");
}
@@ -454,19 +492,19 @@
*/
private boolean isLocalCheckAccountAndPassword(String account, String password) {
if (TextUtils.isEmpty(account)) {
- viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_D34545));
+// viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_D34545));
viewBinding.homeLoginAccountTextErrorTv.setText(R.string.home_login_error_account_null);
return false;
}
if (TextUtils.isEmpty(password)) {
- viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_D34545));
+// viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_D34545));
viewBinding.homeLoginPasswordTextErrorTv.setText(R.string.home_login_error_password_null);
return false;
}
if (password.length() < 6 || password.length() > 16) {
- viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_D34545));
+// viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_D34545));
viewBinding.homeLoginPasswordTextErrorTv.setText(R.string.home_login_error_6_16_str);
return false;
}
@@ -481,9 +519,9 @@
HdlThreadLogic.runMainThread(new Runnable() {
@Override
public void run() {
- viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_E1E1E1));
+// viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_E1E1E1));
viewBinding.homeLoginAccountTextErrorTv.setText("");
- viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_E1E1E1));
+// viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_E1E1E1));
viewBinding.homeLoginPasswordTextErrorTv.setText("");
}
}, null, null);
@@ -584,7 +622,7 @@
/**
* 寮圭獥
*/
- private void getDialog() {
+ private void getAcceiptPolicyDialog() {
ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
confirmationCancelDialog.show();
@@ -601,7 +639,7 @@
confirmationCancelDialog.dismiss();
String account = viewBinding.homeLoginAccountEt.getText().toString().replace(" ", "");
String password = viewBinding.homeLoginPasswordEt.getText().toString().replace(" ", "");
- login(account, password);
+ loginAccount(account, password);
}
});
confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
--
Gitblit v1.8.0