From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev

---
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java |   97 +++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 90 insertions(+), 7 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 cb83d64..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;
@@ -17,9 +19,11 @@
 import com.hdl.photovoltaic.R;
 import com.hdl.photovoltaic.base.CustomBaseActivity;
 import com.hdl.photovoltaic.bean.PageNumberObject;
+import com.hdl.photovoltaic.config.UserConfigManage;
 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;
@@ -30,8 +34,10 @@
 import com.hdl.photovoltaic.ui.adapter.SearchHistoryAdapter;
 import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
 import com.hdl.photovoltaic.uni.HDLUniMP;
+import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils;
 import com.hdl.photovoltaic.utils.URLEncodingUtils;
 import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
+import com.hdl.sdk.link.core.config.HDLLinkConfig;
 import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
 
 import java.util.ArrayList;
@@ -68,6 +74,7 @@
     @Override
     public void onBindView(Bundle savedInstanceState) {
         setStatusBarTranslucent();
+        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
         //鍘嗗彶璁板綍鏂囦欢澶瑰垱寤�
         HdlFileLogic.getInstance().createFileDir(HdlFileLogic.getInstance().getCurrentUserRootPath());
         //鍒濆鍖栨暟鎹�
@@ -113,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();
@@ -159,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());
+
             }
         });
         //鍘嗗彶璁板綍鐐瑰嚮浜嬩欢
@@ -177,15 +193,34 @@
             @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.powerStationSearchEt.clearFocus();
+                hideSoftInputFromWindow();
+                viewBinding.historyListParent.setVisibility(View.GONE);
+                viewBinding.listParent.setVisibility(View.VISIBLE);
+                addSearchTextToList();
+                loadNextPageHouseList(true, 1, true);
             }
         });
         //璁惧鐐瑰嚮鏄簨浠�
         searchDeviceAdapter.setOnclickListener(new DeviceInfoAdapter.OnClickListener() {
             @Override
             public void onClick(int position, CloudInverterDeviceBean deviceBean) {
+                if (deviceBean.getDeviceStatus() == 4) {
+                    HdlThreadLogic.toast(_mActivity, R.string.device_off);
+                    return;
+                }
+                //閰嶇疆鏈湴閫氫俊鐨勪俊鎭�
+                HDLLinkConfig.getInstance().setHomeId(deviceBean.getHomeId());
+                HDLLinkConfig.getInstance().setLocalSecret(deviceBean.getLocalSecret());
                 List<CloudInverterDeviceBean> newList = new ArrayList<>();
                 newList.add(deviceBean);
-                //鐩殑鏄负浜嗚幏鍙栨嬁鍒扮綉鍏矷D锛宮qtt閫氳绉橀挜绛変俊鎭紝缂撳瓨鏈湴閫嗗彉鍣ㄥ垪琛ㄩ噷闈紝鍙戦�佹暟鎹暟鎹椂鑷姩鍘荤紦瀛樺垪琛ㄩ噷闈㈠幓鏌ユ壘锛�
+                //鐩殑鏄负浜嗚幏鍙栨嬁鍒扮綉鍏矷D锛宮qtt閫氳绉橀挜绛変俊鎭紝鎷垮埌鍚庣紦瀛樺埌鏈湴閫嗗彉鍣ㄥ垪琛ㄩ噷闈紝鍙戦�佹暟鎹暟鎹椂鑷姩鍘荤紦瀛樺垪琛ㄩ噷闈㈠幓鏌ユ壘锛�
                 HdlDeviceLogic.getInstance().setDeviceRemoteInfo(newList, deviceBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
                     @Override
                     public void onSuccess(List<GatewayBean> obj) {
@@ -205,6 +240,7 @@
 
     }
 
+
     private void initView() {
         viewBinding.historyListParent.setVisibility(View.VISIBLE);
         viewBinding.listParent.setVisibility(View.GONE);
@@ -218,8 +254,47 @@
         searchDeviceAdapter = new SearchDeviceAdapter(_mActivity);
         viewBinding.listRcv.setLayoutManager(new LinearLayoutManager(_mActivity));
         viewBinding.listRcv.setAdapter(searchDeviceAdapter);
+        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();
+            }
+
+        });
     }
 
+    /**
+     * 鏄剧ず杞敭鐩�
+     */
+    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);
+    }
 
     /**
      * 杈撳叆鐢电珯鍚嶇О杩涜杩囨护
@@ -311,6 +386,7 @@
                                 //鏇存柊UI
                                 searchDeviceAdapter.setList(deviceList);
                             }
+                            nullDataUpdateUi();
                         }
                     }
                 }, _mActivity, ShowErrorMode.YES);
@@ -385,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);
+    }
+
     /**
      * 娣诲姞鍘嗗彶璁板綍
      */
@@ -394,14 +479,12 @@
                 searchHistoryTitleList.remove(searchHistoryTitleList.get(i));
             }
         }
-        searchHistoryTitleList.add(currSearchText);
-        // 鍊掑簭鎺掑垪鏁版嵁(鎼滅储鏈�鍚庢帓鍦ㄥ墠闈�)
-        Collections.reverse(searchHistoryTitleList);
-        if (searchHistoryTitleList.size() > 10) {
+        int maxValue = 10;
+        searchHistoryTitleList.add(0, currSearchText);
+        if (searchHistoryTitleList.size() > maxValue) {
             //鍘嗗彶璁板綍涓嶈兘瓒呭嚭10
-            searchHistoryTitleList.remove(searchHistoryTitleList.get(11));
+            searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue));
         }
-
     }
 
     /**

--
Gitblit v1.8.0