From 216b55f56fe1ec6694e7cca9390765342f570a74 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 28 五月 2024 18:03:16 +0800
Subject: [PATCH] 2024年05月28日18:03:11

---
 app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java |   63 ++++++++++++++++++-------------
 1 files changed, 36 insertions(+), 27 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 f1cfe7e..5a66890 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -244,37 +244,46 @@
                         HdlAccountLogic.getInstance().loginByPassword(account, password, new ILoginCallBack() {
                             @Override
                             public void onSuccess(HDLLoginBean obj) {
-                                HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
-                                    @Override
-                                    public void onSuccess(List<HouseIdBean> obj) {
-                                        hideLoading();
-                                        HdlResidenceLogic.getInstance().setHouseIdList(obj);
-                                        restoreButtonStyleToInitializeState();
-                                        if (UserConfigManage.getInstance().isBAccount()) {
-                                            //瀹夎鍟嗚烦杞晫闈�
-                                            startActivity(BPowerStationActivity.class);
-                                        } else {
-                                            //C绔敤鎴疯烦杞晫闈�
-                                            startActivity(CPowerStationActivity.class);
+                                if (UserConfigManage.getInstance().isBAccount()) {
+                                    restoreButtonStyleToInitializeState();
+                                    //瀹夎鍟嗚烦杞晫闈�
+                                    startActivity(BPowerStationActivity.class);
+                                    hideLoading();
+                                    finish();
+                                } else {
+                                    //C绔渶瑕佸厛鑾峰彇鐢电珯鍒楄〃;
+                                    HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
+                                        @Override
+                                        public void onSuccess(List<HouseIdBean> obj) {
+                                            hideLoading();
+                                            HdlResidenceLogic.getInstance().setHouseIdList(obj);
+                                            restoreButtonStyleToInitializeState();
+                                            if (UserConfigManage.getInstance().isBAccount()) {
+                                                //瀹夎鍟嗚烦杞晫闈�
+                                                startActivity(BPowerStationActivity.class);
+                                            } else {
+                                                //C绔敤鎴疯烦杞晫闈�
+                                                startActivity(CPowerStationActivity.class);
 
+                                            }
+                                            finish();
                                         }
-                                        finish();
-                                    }
 
-                                    @Override
-                                    public void onFailure(HDLException e) {
-                                        hideLoading();
-                                        restoreButtonStyleToInitializeState();
-                                        if (UserConfigManage.getInstance().isBAccount()) {
-                                            //瀹夎鍟嗚烦杞晫闈�
-                                            startActivity(BPowerStationActivity.class);
-                                        } else {
-                                            //C绔敤鎴疯烦杞晫闈�
-                                            startActivity(CPowerStationActivity.class);
+                                        @Override
+                                        public void onFailure(HDLException e) {
+                                            hideLoading();
+                                            restoreButtonStyleToInitializeState();
+                                            if (UserConfigManage.getInstance().isBAccount()) {
+                                                //瀹夎鍟嗚烦杞晫闈�
+                                                startActivity(BPowerStationActivity.class);
+                                            } else {
+                                                //C绔敤鎴疯烦杞晫闈�
+                                                startActivity(CPowerStationActivity.class);
+                                            }
+                                            finish();
                                         }
-                                        finish();
-                                    }
-                                });
+                                    });
+                                }
                             }
 
                             @Override

--
Gitblit v1.8.0