From 3726cf632a28444ebbde344062bc92a0fe7ad85a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 04 六月 2024 10:33:30 +0800
Subject: [PATCH] 2024年06月04日10:33:10

---
 app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java |   39 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 36 insertions(+), 3 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 067e6f3..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;
@@ -27,6 +28,7 @@
 import com.hdl.photovoltaic.ui.adapter.SearchHistoryAdapter;
 import com.hdl.photovoltaic.ui.adapter.SearchMessageAdapter;
 import com.hdl.photovoltaic.ui.bean.MessageBean;
+import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -151,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();
@@ -162,6 +165,7 @@
             public void onClick(View v) {
                 searchHistoryTitleList = new ArrayList<>();
                 searchHistoryAdapter.setList(searchHistoryTitleList);
+                viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
                 HdlFileLogic.getInstance().deleteFile(getHistoryFileNamePath());
             }
         });
@@ -208,6 +212,29 @@
         searchMessageAdapter = new SearchMessageAdapter(_mActivity);
         viewBinding.listRcv.setLayoutManager(new LinearLayoutManager(_mActivity));
         viewBinding.listRcv.setAdapter(searchMessageAdapter);
+        viewBinding.messageSearchEt.post(new Runnable() {
+            @Override
+            public void run() {
+                viewBinding.messageSearchEt.requestFocus();
+            }
+        });
+
+        //鍦ㄧ晫闈腑浣跨敤
+        KeyboardStateObserverUtils.getKeyboardStateObserver(_mActivity).setKeyboardVisibilityListener(new KeyboardStateObserverUtils.OnKeyboardVisibilityListener() {
+            @Override
+            public void onKeyboardShow(int h) {
+                //Toast.makeText(MainActivity.this,"閿洏寮瑰嚭",Toast.LENGTH_SHORT).show();
+                viewBinding.messageSearchEt.requestFocus();
+
+            }
+
+            @Override
+
+            public void onKeyboardHide(int h) {
+                viewBinding.messageSearchEt.clearFocus();
+            }
+
+        });
     }
 
 
@@ -247,6 +274,7 @@
                 if (searchMessageAdapter != null) {
                     searchMessageAdapter.setList(mList);
                 }
+                nullDataUpdateUi();
             }
         });
     }
@@ -394,14 +422,19 @@
                 searchHistoryTitleList.remove(searchHistoryTitleList.get(i));
             }
         }
-        searchHistoryTitleList.add(currSearchText);
-        // 鍊掑簭鎺掑垪鏁版嵁(鎼滅储鏈�鍚庢帓鍦ㄥ墠闈�)
-        Collections.reverse(searchHistoryTitleList);
+        searchHistoryTitleList.add(0, currSearchText);
         if (searchHistoryTitleList.size() > maxValue) {
             //鍘嗗彶璁板綍涓嶈兘瓒呭嚭10
             searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue));
         }
+    }
 
+    /**
+     * 娌℃湁娑堟伅鍒楄〃鐨勬牱寮�
+     */
+    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);
     }
 
     /**

--
Gitblit v1.8.0