From 48e53c091965c3510d97ad4fa94e7bea736c90f6 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 14:37:18 +0800
Subject: [PATCH] 2024年05月30日14:37:13

---
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java |   42 +++++++++++++++++++++++++++++++++++++-----
 1 files changed, 37 insertions(+), 5 deletions(-)

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 3a0a6c9..61f9934 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
@@ -30,6 +30,7 @@
 import com.hdl.photovoltaic.ui.adapter.SearchHouseAdapter;
 import com.hdl.photovoltaic.ui.bean.HouseIdBean;
 import com.hdl.photovoltaic.uni.HDLUniMP;
+import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -173,6 +174,16 @@
             @Override
             public void onClick(int position, String title) {
                 viewBinding.powerStationSearchEt.setText(title);
+                //鎼滅储鍏抽敭瀛�
+                currSearchText = viewBinding.powerStationSearchEt.getText().toString().replace(" ", "");
+                if (TextUtils.isEmpty(currSearchText)) {
+                    HdlThreadLogic.toast(_mActivity, R.string.search_content_null);
+                    return;
+                }
+                viewBinding.historyListParent.setVisibility(View.GONE);
+                viewBinding.listParent.setVisibility(View.VISIBLE);
+                addSearchTextToList();
+                loadNextPageHouseList(true, 1, true);
             }
         });
         //鐢电珯鐐瑰嚮鏄簨浠�
@@ -202,6 +213,29 @@
         searchHouseAdapter = new SearchHouseAdapter(_mActivity);
         viewBinding.listRcv.setLayoutManager(new LinearLayoutManager(_mActivity));
         viewBinding.listRcv.setAdapter(searchHouseAdapter);
+        viewBinding.powerStationSearchEt.post(new Runnable() {
+            @Override
+            public void run() {
+                viewBinding.powerStationSearchEt.requestFocus();
+            }
+        });
+
+        //鍦ㄧ晫闈腑浣跨敤
+        KeyboardStateObserverUtils.getKeyboardStateObserver(_mActivity).setKeyboardVisibilityListener(new KeyboardStateObserverUtils.OnKeyboardVisibilityListener() {
+            @Override
+            public void onKeyboardShow(int h) {
+                //Toast.makeText(MainActivity.this,"閿洏寮瑰嚭",Toast.LENGTH_SHORT).show();
+                viewBinding.powerStationSearchEt.requestFocus();
+
+            }
+
+            @Override
+
+            public void onKeyboardHide(int h) {
+                viewBinding.powerStationSearchEt.clearFocus();
+            }
+
+        });
     }
 
 
@@ -375,18 +409,16 @@
      * 娣诲姞鍘嗗彶璁板綍
      */
     private void addSearchTextToList() {
-        int maxValue = 10;
         for (int i = 0; i < searchHistoryTitleList.size(); i++) {
             if (searchHistoryTitleList.get(i).equals(currSearchText)) {
                 searchHistoryTitleList.remove(searchHistoryTitleList.get(i));
             }
         }
-        searchHistoryTitleList.add(currSearchText);
-        // 鍊掑簭鎺掑垪鏁版嵁(鎼滅储鏈�鍚庢帓鍦ㄥ墠闈�)
-        Collections.reverse(searchHistoryTitleList);
+        int maxValue = 10;
+        searchHistoryTitleList.add(0, currSearchText);
         if (searchHistoryTitleList.size() > maxValue) {
             //鍘嗗彶璁板綍涓嶈兘瓒呭嚭10
-            searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue + 1));
+            searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue));
         }
 
     }

--
Gitblit v1.8.0