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 ++++++++++++++++++-------------
 app/src/main/res/layout/fragment_home_page.xml                                    |    2 
 app/src/main/res/values/strings.xml                                               |    2 
 app/src/main/res/drawable/page_station_generating_bj.png                          |    0 
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java |   17 +++++++-
 app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java           |   14 ++++---
 app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java      |    4 +
 7 files changed, 63 insertions(+), 39 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
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
index ec4bed3..6d5693f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
@@ -166,17 +166,19 @@
                 drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
             }
             break;
-            case 4: {
+            case 4:
+            case 5:
+            {
                 text = mContext.getString(R.string.my_power_station_malfunction);
                 drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
             }
             //5:绂荤嚎鏈夋晠闅淥ffline_fault
             break;
-            case 5: {
-                text = mContext.getString(R.string.Offline_fault);
-                drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
-            }
-            break;
+//            case 5: {
+//                text = mContext.getString(R.string.Offline_fault);
+//                drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
+//            }
+//            break;
         }
         textView.setText(text);
         textView.setBackground(drawable);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java
index 2e4ab40..efa9bbd 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java
@@ -130,7 +130,9 @@
         } else {
             this.mList.clear();
         }
-
+        if (newData == null) {
+            newData = new ArrayList<>();
+        }
         this.mList.addAll(newData);
         notifyDataSetChanged();
     }
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java
index 511f6e9..10c0cd2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java
@@ -42,7 +42,7 @@
     private ActivityHouseListEditBinding viewBinding;
 
     private HouseListAdapter houseListAdapter;
-    private List<HouseIdBean> houseListBeanIDList;
+    private List<HouseIdBean> houseListBeanIDList = new ArrayList<>();
 
 
     @Override
@@ -61,17 +61,20 @@
         initView();
         //鍒濆鍖栫晫闈㈢洃鍚櫒
         initEvent();
+        if (this.houseListBeanIDList.size() == 0) {
+            downReadData(false);
+        }
     }
 
     private void initData() {
-        this.houseListBeanIDList = new ArrayList<>();
+        this.houseListBeanIDList.clear();
         this.houseListBeanIDList.addAll(HdlResidenceLogic.getInstance().getHouseIdList());
         for (int i = 0; i < this.houseListBeanIDList.size(); i++) {
             this.houseListBeanIDList.get(i).setDelIcon(true);
             this.houseListBeanIDList.get(i).setMove(true);
-
         }
     }
+
 
     @Override
     public void onBackPressed() {
@@ -261,6 +264,9 @@
      * @param isRefreshing 琛ㄧず鏄笅鎷夊埛鏂扮殑
      */
     private void downReadData(boolean isRefreshing) {
+        if (!isRefreshing) {
+            showLoading();
+        }
         //鑾峰彇浣忓畢(鐢电珯)ID鍒楄〃
         HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
             @Override
@@ -271,6 +277,8 @@
                         if (isRefreshing) {
                             //鍏抽棴涓嬫媺鍒锋柊鐨勫湀鍦�
                             viewBinding.fragmentHouseSrl.setRefreshing(false);
+                        } else {
+                            hideLoading();
                         }
                         if (list != null && list.size() > 0) {
                             //鏇存柊缂撳瓨
@@ -297,8 +305,11 @@
                         if (isRefreshing) {
                             //鍏抽棴涓嬫媺鍒锋柊鐨勫湀鍦�
                             viewBinding.fragmentHouseSrl.setRefreshing(false);
+                        } else {
+                            hideLoading();
                         }
 
+
                     }
                 }, _mActivity, ShowErrorMode.YES);
             }
diff --git a/app/src/main/res/drawable/page_station_generating_bj.png b/app/src/main/res/drawable/page_station_generating_bj.png
new file mode 100644
index 0000000..d757d86
--- /dev/null
+++ b/app/src/main/res/drawable/page_station_generating_bj.png
Binary files differ
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index c6db385..21b2eac 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -173,7 +173,7 @@
                         android:id="@+id/home_page_station_info_rl2"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/dp_166"
-                        android:background="@drawable/bj_13_ffffff"
+                        android:background="@drawable/page_station_generating_bj"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/home_page_station_info_rl1">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f6adf98..18f0454 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -291,7 +291,7 @@
     <string name="contact_us">鑱旂郴鎴戜滑</string>
     <string name="wechat_id">寰俊鍙�</string>
     <string name="email_address">閭鍦板潃</string>
-    <string name="successful_replication">澶嶅埗鎴愬姛</string>
+    <string name="successful_replication">宸插鍒跺埌鍓垏鏉�</string>
     <string name="to_be_added">寰呮帴鍏�</string>
     <string name="saving_standard_coal">鑺傜害鏍囧噯鐓�</string>
     <string name="co_reduction_rate">CO2鍑忔帓</string>

--
Gitblit v1.8.0