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/DeviceSearchActivity.java |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 1 deletions(-)

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..5c99ae0 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
@@ -5,11 +5,13 @@
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
+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 com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
@@ -21,6 +23,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;
@@ -71,6 +74,7 @@
     @Override
     public void onBindView(Bundle savedInstanceState) {
         setStatusBarTranslucent();
+        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
         //鍘嗗彶璁板綍鏂囦欢澶瑰垱寤�
         HdlFileLogic.getInstance().createFileDir(HdlFileLogic.getInstance().getCurrentUserRootPath());
         //鍒濆鍖栨暟鎹�
@@ -116,6 +120,8 @@
                     HdlThreadLogic.toast(_mActivity, R.string.search_content_null);
                     return;
                 }
+                viewBinding.powerStationSearchEt.clearFocus();
+                hideSoftInputFromWindow();
                 viewBinding.historyListParent.setVisibility(View.GONE);
                 viewBinding.listParent.setVisibility(View.VISIBLE);
                 addSearchTextToList();
@@ -162,17 +168,24 @@
                 viewBinding.powerStationSearchEt.setText("");
                 viewBinding.historyListParent.setVisibility(View.VISIBLE);
                 viewBinding.listParent.setVisibility(View.GONE);
+                viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
                 searchHistoryAdapter.setList(searchHistoryTitleList);
                 clearData();
+                viewBinding.powerStationSearchEt.requestFocus();
+                showSoftInput();
             }
         });
         //鍒犻櫎
         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());
+
             }
         });
         //鍘嗗彶璁板綍鐐瑰嚮浜嬩欢
@@ -186,6 +199,8 @@
                     HdlThreadLogic.toast(_mActivity, R.string.search_content_null);
                     return;
                 }
+                viewBinding.powerStationSearchEt.clearFocus();
+                hideSoftInputFromWindow();
                 viewBinding.historyListParent.setVisibility(View.GONE);
                 viewBinding.listParent.setVisibility(View.VISIBLE);
                 addSearchTextToList();
@@ -225,6 +240,7 @@
 
     }
 
+
     private void initView() {
         viewBinding.historyListParent.setVisibility(View.VISIBLE);
         viewBinding.listParent.setVisibility(View.GONE);
@@ -250,7 +266,7 @@
             @Override
             public void onKeyboardShow(int h) {
                 //Toast.makeText(MainActivity.this,"閿洏寮瑰嚭",Toast.LENGTH_SHORT).show();
-                viewBinding.powerStationSearchEt.requestFocus();
+//                viewBinding.powerStationSearchEt.requestFocus();
 
             }
 
@@ -263,6 +279,22 @@
         });
     }
 
+    /**
+     * 鏄剧ず杞敭鐩�
+     */
+    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);
+    }
 
     /**
      * 杈撳叆鐢电珯鍚嶇О杩涜杩囨护
@@ -354,6 +386,7 @@
                                 //鏇存柊UI
                                 searchDeviceAdapter.setList(deviceList);
                             }
+                            nullDataUpdateUi();
                         }
                     }
                 }, _mActivity, ShowErrorMode.YES);
@@ -428,6 +461,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);
+    }
+
     /**
      * 娣诲姞鍘嗗彶璁板綍
      */

--
Gitblit v1.8.0