From a034e242fe844a1ca45d2a28710cb7face1f8fe6 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期日, 28 四月 2024 19:07:56 +0800
Subject: [PATCH] 2024年04月28日19:07:49

---
 app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java |   40 ++++++++++++++++------------------------
 1 files changed, 16 insertions(+), 24 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 8c0584d..511cd4e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -47,6 +47,7 @@
 import com.hdl.photovoltaic.widget.ConfirmationCancelDialog1;
 import com.hdl.photovoltaic.widget.ListDialog;
 import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;
+import com.jaeger.library.StatusBarUtil;
 
 import java.util.List;
 
@@ -67,9 +68,7 @@
 
     @Override
     public void onBindView(Bundle savedInstanceState) {
-
-        setNotificationBarBackgroundColor(CustomColor.white);
-        setStatusBarTextColor();
+        setStatusBarTranslucent();
         //鍒濆鍖�
         initView();
         //鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -106,8 +105,7 @@
      * 鍒濆鍖朥I
      */
     private void initView() {
-        viewBinding.homeLoginCheckBCIv.setSelected(UserConfigManage.getInstance().isBAccount());
-        viewBinding.homeLoginInstallUserTv.setSelected(UserConfigManage.getInstance().isBAccount());
+        viewBinding.homeLoginCheckBCCl.setSelected(UserConfigManage.getInstance().isBAccount());
         viewBinding.homeLoginPrivacyCheckIv.setSelected(UserConfigManage.getInstance().isAcceiptPolicy());
         setStringDifferentColors(viewBinding.homeLoginPrivacyTv);
         if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
@@ -115,8 +113,14 @@
         } else {
             viewBinding.homeLoginLanguageTv.setText("English");
         }
+        if (UserConfigManage.getInstance().isBAccount()) {
+            viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
+        } else {
+            viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
+        }
 
         String acc = "13375012441";
+//        String acc = "nuy13368@uzxia.com";
         String pws = "123456";
         //娴嬭瘯鐢�
         viewBinding.homeLoginAccountEt.setText(acc);
@@ -188,27 +192,13 @@
                 }
             }
         });
-
         //閫夋嫨b绔紝c绔�
-        viewBinding.homeLoginInstallUserTv.setOnClickListener(new View.OnClickListener() {
+        viewBinding.homeLoginCheckBCCl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 v.setSelected(!v.isSelected());
                 UserConfigManage.getInstance().setBAccount(v.isSelected());
                 viewBinding.homeLoginCheckBCIv.setSelected(UserConfigManage.getInstance().isBAccount());
-                if (UserConfigManage.getInstance().isBAccount()) {
-                    viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
-                } else {
-                    viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
-                }
-            }
-        });
-        //閫夋嫨b绔紝c绔�
-        viewBinding.homeLoginCheckBCIv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                v.setSelected(!v.isSelected());
-                UserConfigManage.getInstance().setBAccount(v.isSelected());
                 if (UserConfigManage.getInstance().isBAccount()) {
                     viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
                 } else {
@@ -245,10 +235,10 @@
                 HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
                     @Override
                     public void onSuccess(HDLUserRegionBean obj) {
-                        String APP_REGIONURL_TEST = "http://47.114.131.143:27199";
+                        //String APP_REGIONURL_TEST = "http://47.114.131.143:27199";
+                        //AppConfigManage.setUserRegionUrl(APP_REGIONURL_TEST);
                         //鍒濆鍖栨湇鍔″煙鍚�
-//                       AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
-                        AppConfigManage.setUserRegionUrl(APP_REGIONURL_TEST);
+                        AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
                         HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
                         HdlAccountLogic.getInstance().loginByPassword(account, password, new ILoginCallBack() {
                             @Override
@@ -265,8 +255,8 @@
                                         } else {
                                             //C绔敤鎴疯烦杞晫闈�
                                             startActivity(CPowerStationActivity.class);
-                                        }
 
+                                        }
                                         finish();
                                     }
 
@@ -575,4 +565,6 @@
     }
 
 
+
+
 }
\ No newline at end of file

--
Gitblit v1.8.0