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 | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 9 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 6afbe86..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
@@ -25,9 +25,12 @@
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.adapter.SearchHistoryAdapter;
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;
@@ -139,7 +142,7 @@
if (visibleItemCount > 0 && visibleItemCount + firstVisibleItemPosition == totalItemCount) {
if (!isHouseLoadingMore) {
// 婊戝姩鍒颁簡搴曢儴锛屾墽琛岀浉搴旂殑鎿嶄綔
- HdlLogLogic.print("--->婊戝姩鍒颁簡搴曢儴");
+ HdlLogLogic.print("---婊戝姩鍒颁簡搴曢儴");
loadNextPageHouseList(false, ++currentHouseListPage, false);
}
}
@@ -171,13 +174,27 @@
@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);
}
});
//鐢电珯鐐瑰嚮鏄簨浠�
searchHouseAdapter.setOnclickListener(new SearchHouseAdapter.OnClickListener() {
@Override
public void onClick(int position, HouseIdBean houseIdBean) {
-
+ //鐐瑰嚮浣忓畢璇︽儏
+ HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏---" + new Gson().toJson(houseIdBean), false);
+ HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
+ String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
+ HdlUniLogic.getInstance().openUniMP(path, null);
}
});
@@ -196,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();
+ }
+
+ });
}
@@ -288,7 +328,6 @@
//鏇存柊缂撳瓨
setHouseIdList(houseBeanClass.getList());
if (searchHouseAdapter != null) {
- initData();
//鏇存柊UI
searchHouseAdapter.setList(houseListBeanIDList);
}
@@ -362,7 +401,7 @@
}
} catch (Exception e) {
String mes = e.getMessage();
- HdlLogLogic.print("--->" + mes);
+ HdlLogLogic.print("---" + mes);
}
}
@@ -375,12 +414,11 @@
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