From 579da4e0056080c878ed4d0a479a631db9610ee1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 25 三月 2025 21:35:32 +0800
Subject: [PATCH] 2025年03月25日21:35:30

---
 app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java |   50 +++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 43 insertions(+), 7 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 ca94d97..34acf2d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -50,6 +50,7 @@
 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;
@@ -179,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) {
         }
     }
@@ -281,11 +290,11 @@
                 boolean isSelected = UserConfigManage.getInstance().isAcceiptPolicy();
                 if (!isSelected) {
                     //闅愮鍗忚鎻愮ず
-                    getDialog();
+                    getAcceiptPolicyDialog();
                     return;
                 }
                 //鐧诲綍
-                login(account, password);
+                loginAccount(account, password);
 
 
             }
@@ -327,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
@@ -342,11 +351,38 @@
                     @Override
                     public void onSuccess(HDLLoginBean obj) {
                         if (UserConfigManage.getInstance().isBAccount()) {
+                            SharedPreUtils.putBoolean("isAuthorization", true);
                             restoreButtonStyleToInitializeState();
                             //瀹夎鍟嗚烦杞晫闈�
                             startActivity(BPowerStationActivity.class);
                             hideLoading();
                             finish();
+                            //浜戠杩樻病鏈夊尮閰嶅钩鍙板ソ锛屽厛闅愯棌鏍¢獙璐﹀彿鍔熻兘 2025骞�03鏈�24鏃�15:16:37
+//                            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>>() {
@@ -547,7 +583,7 @@
                         //璁剧疆瀛椾綋棰滆壊
                         ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
                         // 鍘绘帀涓嬪垝绾�
-                        ds.setUnderlineText(true);
+                        ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
                     }
 
 
@@ -570,7 +606,7 @@
                         //璁剧疆瀛椾綋棰滆壊
                         ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
                         // 鍘绘帀涓嬪垝绾�
-                        ds.setUnderlineText(true);
+                        ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
                     }
 
 
@@ -593,7 +629,7 @@
     /**
      * 寮圭獥
      */
-    private void getDialog() {
+    private void getAcceiptPolicyDialog() {
 
         ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
         confirmationCancelDialog.show();
@@ -610,7 +646,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