From 9684f355da650b3183e0e0a039c9e22f85676ed8 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 01 六月 2024 20:43:22 +0800
Subject: [PATCH] 2024年06月01日20:43:20

---
 app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java     |   12 ++++++
 app/src/main/res/layout/null_data_view.xml                                       |    1 
 app/src/main/res/values-zh/strings.xml                                           |    9 +---
 app/src/main/res/layout/activity_search_messge.xml                               |   12 ++++++
 app/src/main/res/layout/fragment_home_page.xml                                   |    2 
 app/src/main/res/values/strings.xml                                              |    8 ++--
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java  |   13 ++++++
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java |   13 ++++++
 app/src/main/res/values-en/strings.xml                                           |    2 
 app/src/main/res/layout/activity_device_search.xml                               |   13 ++++++
 app/src/main/res/layout/activity_house_search.xml                                |   11 +++++
 11 files changed, 83 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
index 41cb83e..c6610c4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
@@ -20,6 +20,7 @@
 import com.hdl.photovoltaic.base.CustomBaseActivity;
 import com.hdl.photovoltaic.databinding.ActivitySearchMessgeBinding;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
+import com.hdl.photovoltaic.other.HdlCommonLogic;
 import com.hdl.photovoltaic.other.HdlFileLogic;
 import com.hdl.photovoltaic.other.HdlLogLogic;
 import com.hdl.photovoltaic.other.HdlMessageLogic;
@@ -152,6 +153,7 @@
                 currSearchText = "";
                 viewBinding.messageSearchEt.setText("");
                 viewBinding.historyListParent.setVisibility(View.VISIBLE);
+                viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
                 viewBinding.listParent.setVisibility(View.GONE);
                 searchHistoryAdapter.setList(searchHistoryTitleList);
                 clearCacheData();
@@ -163,6 +165,7 @@
             public void onClick(View v) {
                 searchHistoryTitleList = new ArrayList<>();
                 searchHistoryAdapter.setList(searchHistoryTitleList);
+                viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
                 HdlFileLogic.getInstance().deleteFile(getHistoryFileNamePath());
             }
         });
@@ -271,6 +274,7 @@
                 if (searchMessageAdapter != null) {
                     searchMessageAdapter.setList(mList);
                 }
+                nullDataUpdateUi();
             }
         });
     }
@@ -426,6 +430,14 @@
     }
 
     /**
+     * 娌℃湁娑堟伅鍒楄〃鐨勬牱寮�
+     */
+    private void nullDataUpdateUi() {
+        boolean is_data = mList != null && mList.size() > 0;
+        HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, viewBinding.deviceNullDataIc.getRoot(), viewBinding.deviceNullDataIc.nullDataGifAnimationIv, viewBinding.deviceNullDataIc.nullDataTv, getString(R.string.message_alarm_data_null), is_data);
+    }
+
+    /**
      * 鑾峰彇銆愭悳绱㈠巻鍙茶褰曟枃浠躲�戝叏璺緞
      */
     public String getHistoryFileNamePath() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
index a0a4a62..a3db417 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
@@ -21,6 +21,7 @@
 import com.hdl.photovoltaic.databinding.ActivityDeviceSearchBinding;
 import com.hdl.photovoltaic.enums.ShowErrorMode;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
+import com.hdl.photovoltaic.other.HdlCommonLogic;
 import com.hdl.photovoltaic.other.HdlDeviceLogic;
 import com.hdl.photovoltaic.other.HdlFileLogic;
 import com.hdl.photovoltaic.other.HdlLogLogic;
@@ -162,6 +163,7 @@
                 viewBinding.powerStationSearchEt.setText("");
                 viewBinding.historyListParent.setVisibility(View.VISIBLE);
                 viewBinding.listParent.setVisibility(View.GONE);
+                viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
                 searchHistoryAdapter.setList(searchHistoryTitleList);
                 clearData();
             }
@@ -172,6 +174,7 @@
             public void onClick(View v) {
                 searchHistoryTitleList = new ArrayList<>();
                 searchHistoryAdapter.setList(searchHistoryTitleList);
+                viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
                 HdlFileLogic.getInstance().deleteFile(getHistoryFileNamePath());
             }
         });
@@ -354,6 +357,7 @@
                                 //鏇存柊UI
                                 searchDeviceAdapter.setList(deviceList);
                             }
+                            nullDataUpdateUi();
                         }
                     }
                 }, _mActivity, ShowErrorMode.YES);
@@ -428,6 +432,15 @@
         }
     }
 
+
+    /**
+     * 娌℃湁璁惧鍒楄〃鐨勬牱寮�
+     */
+    private void nullDataUpdateUi() {
+        boolean is_data = deviceList != null && deviceList.size() > 0;
+        HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, viewBinding.deviceNullDataIc.getRoot(), viewBinding.deviceNullDataIc.nullDataGifAnimationIv, viewBinding.deviceNullDataIc.nullDataTv, getString(R.string.no_equipment), is_data);
+    }
+
     /**
      * 娣诲姞鍘嗗彶璁板綍
      */
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java
index 61f9934..1938a25 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java
@@ -21,6 +21,7 @@
 import com.hdl.photovoltaic.enums.ShowErrorMode;
 import com.hdl.photovoltaic.enums.SortType;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
+import com.hdl.photovoltaic.other.HdlCommonLogic;
 import com.hdl.photovoltaic.other.HdlFileLogic;
 import com.hdl.photovoltaic.other.HdlLogLogic;
 import com.hdl.photovoltaic.other.HdlResidenceLogic;
@@ -156,6 +157,7 @@
                 viewBinding.powerStationSearchEt.setText("");
                 viewBinding.historyListParent.setVisibility(View.VISIBLE);
                 viewBinding.listParent.setVisibility(View.GONE);
+                viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
                 searchHistoryAdapter.setList(searchHistoryTitleList);
                 clearData();
             }
@@ -166,6 +168,7 @@
             public void onClick(View v) {
                 searchHistoryTitleList = new ArrayList<>();
                 searchHistoryAdapter.setList(searchHistoryTitleList);
+                viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
                 HdlFileLogic.getInstance().deleteFile(getHistoryFileNamePath());
             }
         });
@@ -331,6 +334,7 @@
                                         //鏇存柊UI
                                         searchHouseAdapter.setList(houseListBeanIDList);
                                     }
+                                    nullDataUpdateUi();
                                 }
                             }
                         }, _mActivity, ShowErrorMode.YES);
@@ -405,6 +409,7 @@
         }
     }
 
+
     /**
      * 娣诲姞鍘嗗彶璁板綍
      */
@@ -424,6 +429,14 @@
     }
 
     /**
+     * 娌℃湁鐢电珯鍒楄〃鐨勬牱寮�
+     */
+    private void nullDataUpdateUi() {
+        boolean is_data = houseListBeanIDList != null && houseListBeanIDList.size() > 0;
+        HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, viewBinding.deviceNullDataIc.getRoot(), viewBinding.deviceNullDataIc.nullDataGifAnimationIv, viewBinding.deviceNullDataIc.nullDataTv, getString(R.string.my_power_station_data_null), is_data);
+    }
+
+    /**
      * 鑾峰彇銆愭悳绱㈠巻鍙茶褰曟枃浠躲�戝叏璺緞
      */
     public String getHistoryFileNamePath() {
diff --git a/app/src/main/res/layout/activity_device_search.xml b/app/src/main/res/layout/activity_device_search.xml
index d240c1f..d947aea 100644
--- a/app/src/main/res/layout/activity_device_search.xml
+++ b/app/src/main/res/layout/activity_device_search.xml
@@ -165,4 +165,17 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+
+    <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
+    <include
+        android:id="@+id/device_null_data_ic"
+        layout="@layout/null_data_view"
+        android:layout_width="match_parent"
+        android:layout_height="224dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_house_search.xml b/app/src/main/res/layout/activity_house_search.xml
index c17c4a5..3041598 100644
--- a/app/src/main/res/layout/activity_house_search.xml
+++ b/app/src/main/res/layout/activity_house_search.xml
@@ -163,5 +163,16 @@
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
+    <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
+    <include
+        android:id="@+id/device_null_data_ic"
+        layout="@layout/null_data_view"
+        android:layout_width="match_parent"
+        android:layout_height="224dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search_messge.xml b/app/src/main/res/layout/activity_search_messge.xml
index 2a464ab..1d8ecd4 100644
--- a/app/src/main/res/layout/activity_search_messge.xml
+++ b/app/src/main/res/layout/activity_search_messge.xml
@@ -164,4 +164,16 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
+    <include
+        android:id="@+id/device_null_data_ic"
+        layout="@layout/null_data_view"
+        android:layout_width="match_parent"
+        android:layout_height="224dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/message_search_cl" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 5cdcd0f..3071df6 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -14,7 +14,7 @@
         android:layout_height="@dimen/dp_26"
         android:layout_marginStart="@dimen/dp_16"
         android:layout_marginTop="58dp"
-        android:text="@string/power_shome_page"
+        android:text="@string/summarize"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout/null_data_view.xml b/app/src/main/res/layout/null_data_view.xml
index 24a235e..5b7d34f 100644
--- a/app/src/main/res/layout/null_data_view.xml
+++ b/app/src/main/res/layout/null_data_view.xml
@@ -20,7 +20,6 @@
         android:layout_height="22.5dp"
         android:layout_marginTop="11.5dp"
         android:gravity="center"
-        android:text="鏁版嵁涓虹┖,璧跺揩鍒涘缓涓�涓惂"
         android:textColor="@color/text_7C8590"
         android:textSize="@dimen/text_16"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 3eae335..ec0454d 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -104,7 +104,7 @@
     <string name="message_alarm_details_time">Alarm time</string>
     <string name="message_alarm_details_back">Back</string>
     <string name="message_alarm_details_resolved">Solved</string>
-    <string name="message_alarm_data_null">No alarm</string>
+    <string name="message_alarm_data_null">No alarm!</string>
 
 
     <!--鎴戠殑-->
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index d18aa6b..ad01087 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -83,7 +83,7 @@
     <string name="my_power_station_malfunction">鏁呴殰</string>
     <string name="my_power_station_operation">杩愯</string>
     <string name="my_power_station_await">寰呮満</string>
-    <string name="my_power_station_data_null">鏁版嵁涓虹┖,璧跺揩鍒涘缓涓�涓惂!</string>
+    <string name="my_power_station_data_null">鏆傛棤鐢电珯!</string>
 
     <!--璁惧-->
     <string name="device_manual_connection">鎵嬪姩杩炴帴</string>
@@ -104,7 +104,7 @@
     <string name="message_alarm_details_time">鎶ヨ鏃堕棿</string>
     <string name="message_alarm_details_back">杩斿洖</string>
     <string name="message_alarm_details_resolved">宸茶В鍐�</string>
-    <string name="message_alarm_data_null">鏆傛棤鎶ヨ</string>
+    <string name="message_alarm_data_null">鏆傛棤鎶ヨ!</string>
 
 
     <!--鎴戠殑-->
@@ -222,7 +222,6 @@
     <string name="exception_unable_location_move10_meters_later">鏃犳硶鑾峰彇浣嶇疆,璇风Щ鍔ㄦ墜鏈�10绫冲悗,鍐嶉噸鏂拌幏鍙�.</string>
     <string name="succeed">鎴愬姛.</string>
 
-
     <string name="delete_power_station">鏄惁瑕佸垹闄�%s鐢电珯?</string>
     <string name="power_station_selection">鐢电珯閫夋嫨</string>
     <string name="alarm_all_device">鍏ㄩ儴璁惧</string>
@@ -246,8 +245,6 @@
     <string name="already_the_first_one">宸茬粡鏄涓�涓簡.</string>
     <string name="restarting_please_wait">閲嶅惎涓�,璇风瓑寰呪��</string>
     <string name="port_conflict">搴旂敤鍐茬獊锛岄渶瑕佸叧闂璷npro鎴栬�呭叾瀹冪増鏈殑璋冭瘯杞欢鐒跺悗鍐嶉噸鏂板惎鍔ㄨ繖涓蒋浠惰瘯璇�</string>
-
-
 
     <string name="cancel_download_successfully">鍙栨秷涓嬭浇鎴愬姛.</string>
     <string name="writing_firmware_upgrade_memory_succeeded">鍐欏叆鏂板浐浠舵枃浠跺埌鍐呭瓨鎴愬姛.</string>
@@ -281,7 +278,7 @@
     <string name="search">鎼滅储</string>
     <string name="history_search">鍘嗗彶鎼滅储</string>
     <string name="search_content_null">鎼滅储鍐呭涓嶈兘涓虹┖.</string>
-    <string name="no_equipment">鏆傛棤璁惧.</string>
+    <string name="no_equipment">鏆傛棤璁惧!</string>
     <string name="filtering">绛涢��</string>
     <string name="reset">閲嶇疆</string>
     <string name="string_capacity">缁勪覆瀹归噺锛坘Wp)</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ae83604..d768dca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -83,7 +83,7 @@
     <string name="my_power_station_malfunction">鏁呴殰</string>
     <string name="my_power_station_operation">杩愯</string>
     <string name="my_power_station_await">寰呮満</string>
-    <string name="my_power_station_data_null">鏁版嵁涓虹┖,璧跺揩鍒涘缓涓�涓惂!</string>
+    <string name="my_power_station_data_null">鏆傛棤鐢电珯!</string>
 
     <!--璁惧-->
     <string name="device_manual_connection">鎵嬪姩杩炴帴</string>
@@ -104,7 +104,7 @@
     <string name="message_alarm_details_time">鎶ヨ鏃堕棿</string>
     <string name="message_alarm_details_back">杩斿洖</string>
     <string name="message_alarm_details_resolved">宸茶В鍐�</string>
-    <string name="message_alarm_data_null">鏆傛棤鎶ヨ</string>
+    <string name="message_alarm_data_null">鏆傛棤鎶ヨ!</string>
 
 
     <!--鎴戠殑-->
@@ -246,7 +246,6 @@
     <string name="restarting_please_wait">閲嶅惎涓�,璇风瓑寰呪��</string>
     <string name="port_conflict">搴旂敤鍐茬獊锛岄渶瑕佸叧闂璷npro鎴栬�呭叾瀹冪増鏈殑璋冭瘯杞欢鐒跺悗鍐嶉噸鏂板惎鍔ㄨ繖涓蒋浠惰瘯璇�</string>
 
-
     <string name="cancel_download_successfully">鍙栨秷涓嬭浇鎴愬姛.</string>
     <string name="writing_firmware_upgrade_memory_succeeded">鍐欏叆鏂板浐浠舵枃浠跺埌鍐呭瓨鎴愬姛.</string>
     <string name="download_firmware_upgrade_file_failed">涓嬭浇鍥轰欢鍗囩骇鏂囦欢澶辫触.</string>
@@ -279,7 +278,7 @@
     <string name="search">鎼滅储</string>
     <string name="history_search">鍘嗗彶鎼滅储</string>
     <string name="search_content_null">鎼滅储鍐呭涓嶈兘涓虹┖.</string>
-    <string name="no_equipment">鏆傛棤璁惧.</string>
+    <string name="no_equipment">鏆傛棤璁惧!</string>
     <string name="filtering">绛涢��</string>
     <string name="reset">閲嶇疆</string>
     <string name="string_capacity">缁勪覆瀹归噺锛坘Wp)</string>
@@ -307,5 +306,6 @@
     <string name="t">鍚�</string>
     <string name="number">妫�</string>
     <string name="device_off">璁惧宸茬绾�!</string>
+    <string name="summarize">姒傝</string>
 
 </resources>
\ No newline at end of file

--
Gitblit v1.8.0