From 3e904bfa8a1bb53dcf461e5c717f9b808e179245 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 08 一月 2025 16:27:48 +0800
Subject: [PATCH] 2025年01月08日16:27:46

---
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java |   37 +++++++++++++++++++++++++++++++++++--
 1 files changed, 35 insertions(+), 2 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 1938a25..e5e58ce 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
@@ -1,11 +1,13 @@
 package com.hdl.photovoltaic.ui.powerstation;
 
 
+import android.content.Context;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -66,6 +68,7 @@
     @Override
     public void onBindView(Bundle savedInstanceState) {
         setStatusBarTranslucent();
+        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
         //鍘嗗彶璁板綍鏂囦欢澶瑰垱寤�
         HdlFileLogic.getInstance().createFileDir(HdlFileLogic.getInstance().getCurrentUserRootPath());
         //鍒濆鍖栨暟鎹�
@@ -113,6 +116,8 @@
                 }
                 viewBinding.historyListParent.setVisibility(View.GONE);
                 viewBinding.listParent.setVisibility(View.VISIBLE);
+                viewBinding.powerStationSearchEt.clearFocus();
+                hideSoftInputFromWindow();
                 addSearchTextToList();
                 loadNextPageHouseList(true, 1, true);
             }
@@ -147,6 +152,7 @@
                         loadNextPageHouseList(false, ++currentHouseListPage, false);
                     }
                 }
+
             }
         });
         //娓呴櫎
@@ -159,6 +165,8 @@
                 viewBinding.listParent.setVisibility(View.GONE);
                 viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
                 searchHistoryAdapter.setList(searchHistoryTitleList);
+                viewBinding.powerStationSearchEt.requestFocus();
+                showSoftInput();
                 clearData();
             }
         });
@@ -166,10 +174,13 @@
         viewBinding.powerStationDelIv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                viewBinding.powerStationSearchEt.clearFocus();
+                hideSoftInputFromWindow();
                 searchHistoryTitleList = new ArrayList<>();
                 searchHistoryAdapter.setList(searchHistoryTitleList);
                 viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
                 HdlFileLogic.getInstance().deleteFile(getHistoryFileNamePath());
+
             }
         });
         //鍘嗗彶璁板綍鐐瑰嚮浜嬩欢
@@ -183,10 +194,13 @@
                     HdlThreadLogic.toast(_mActivity, R.string.search_content_null);
                     return;
                 }
+                viewBinding.powerStationSearchEt.clearFocus();
+                hideSoftInputFromWindow();
                 viewBinding.historyListParent.setVisibility(View.GONE);
                 viewBinding.listParent.setVisibility(View.VISIBLE);
                 addSearchTextToList();
                 loadNextPageHouseList(true, 1, true);
+
             }
         });
         //鐢电珯鐐瑰嚮鏄簨浠�
@@ -195,12 +209,29 @@
             public void onClick(int position, HouseIdBean houseIdBean) {
                 //鐐瑰嚮浣忓畢璇︽儏
                 HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏---" + new Gson().toJson(houseIdBean), false);
-                HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
+                HdlResidenceLogic.getInstance().switchHouse(houseIdBean,true);
                 String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
                 HdlUniLogic.getInstance().openUniMP(path, null);
             }
         });
 
+    }
+
+    /**
+     * 鏄剧ず杞敭鐩�
+     */
+    public void showSoftInput() {
+        InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        inputMethodManager.showSoftInput(viewBinding.powerStationSearchEt, 0);
+
+    }
+
+    /**
+     * 闅愯棌杞敭鐩�
+     */
+    public void hideSoftInputFromWindow() {
+        InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        inputMethodManager.hideSoftInputFromWindow(viewBinding.getRoot().getWindowToken(), 0);
     }
 
     private void initView() {
@@ -228,7 +259,7 @@
             @Override
             public void onKeyboardShow(int h) {
                 //Toast.makeText(MainActivity.this,"閿洏寮瑰嚭",Toast.LENGTH_SHORT).show();
-                viewBinding.powerStationSearchEt.requestFocus();
+//                viewBinding.powerStationSearchEt.requestFocus();
 
             }
 
@@ -442,4 +473,6 @@
     public String getHistoryFileNamePath() {
         return HdlFileLogic.getInstance().getCurrentUserRootPath() + "/house_history.txt";
     }
+
+
 }
\ No newline at end of file

--
Gitblit v1.8.0