From 4598b51c90c695c9ccbe5350a84e4a46b9d8e587 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 20:19:02 +0800
Subject: [PATCH] 2024年05月22日20:18:54
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java | 116 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 62 insertions(+), 54 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 2131a6f..3a0a6c9 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,11 @@
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 java.util.ArrayList;
import java.util.Collections;
@@ -51,7 +53,7 @@
private String currSearchText;
- List<String> SearchHistoryTitleList = new ArrayList<>();
+ List<String> searchHistoryTitleList = new ArrayList<>();
@Override
public Object getContentView() {
@@ -78,7 +80,7 @@
if (TextUtils.isEmpty(json)) {
return;
}
- SearchHistoryTitleList = new Gson().fromJson(json, new TypeToken<List<String>>() {
+ searchHistoryTitleList = new Gson().fromJson(json, new TypeToken<List<String>>() {
}.getType());
} catch (Exception ignored) {
}
@@ -139,7 +141,7 @@
if (visibleItemCount > 0 && visibleItemCount + firstVisibleItemPosition == totalItemCount) {
if (!isHouseLoadingMore) {
// 婊戝姩鍒颁簡搴曢儴锛屾墽琛岀浉搴旂殑鎿嶄綔
- HdlLogLogic.print("--->婊戝姩鍒颁簡搴曢儴");
+ HdlLogLogic.print("---婊戝姩鍒颁簡搴曢儴");
loadNextPageHouseList(false, ++currentHouseListPage, false);
}
}
@@ -153,7 +155,7 @@
viewBinding.powerStationSearchEt.setText("");
viewBinding.historyListParent.setVisibility(View.VISIBLE);
viewBinding.listParent.setVisibility(View.GONE);
- searchHistoryAdapter.setList(SearchHistoryTitleList);
+ searchHistoryAdapter.setList(searchHistoryTitleList);
clearData();
}
});
@@ -161,8 +163,8 @@
viewBinding.powerStationDelIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- SearchHistoryTitleList = new ArrayList<>();
- searchHistoryAdapter.setList(SearchHistoryTitleList);
+ searchHistoryTitleList = new ArrayList<>();
+ searchHistoryAdapter.setList(searchHistoryTitleList);
HdlFileLogic.getInstance().deleteFile(getHistoryFileNamePath());
}
});
@@ -177,7 +179,11 @@
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);
}
});
@@ -191,7 +197,7 @@
searchHistoryAdapter = new SearchHistoryAdapter(_mActivity);
viewBinding.historyListRcv.setLayoutManager(new LinearLayoutManager(_mActivity));
viewBinding.historyListRcv.setAdapter(searchHistoryAdapter);
- searchHistoryAdapter.setList(SearchHistoryTitleList);
+ searchHistoryAdapter.setList(searchHistoryTitleList);
//鍒濆鍖栫數绔欓�傞厤鍣�
searchHouseAdapter = new SearchHouseAdapter(_mActivity);
viewBinding.listRcv.setLayoutManager(new LinearLayoutManager(_mActivity));
@@ -236,9 +242,9 @@
@Override
protected void onDestroy() {
viewBinding.powerStationSearchEt.removeTextChangedListener(textWatcher);
- if (SearchHistoryTitleList.size() > 0) {
+ if (searchHistoryTitleList.size() > 0) {
HdlFileLogic.getInstance().deleteFile(getHistoryFileNamePath());
- HdlFileLogic.getInstance().appendFile(getHistoryFileNamePath(), new Gson().toJson(SearchHistoryTitleList));
+ HdlFileLogic.getInstance().appendFile(getHistoryFileNamePath(), new Gson().toJson(searchHistoryTitleList));
}
super.onDestroy();
}
@@ -270,49 +276,50 @@
}
//鑾峰彇浣忓畢(鐢电珯)ID鍒楄〃
- HdlResidenceLogic.getInstance().getResidenceIdList(SortType.homeName, currSearchText, pageNo, 20, new CloudCallBeak<HdlResidenceLogic.HouseBeanClass>() {
- @Override
- public void onSuccess(HdlResidenceLogic.HouseBeanClass houseBeanClass) {
- HdlThreadLogic.runMainThread(new Runnable() {
+ HdlResidenceLogic.getInstance().getResidenceIdList(SortType.homeName, currSearchText,
+ "", "", "", "",
+ pageNo, 20, new CloudCallBeak<HdlResidenceLogic.HouseBeanClass>() {
@Override
- public void run() {
- if (isRefreshing) {
- hideLoading();
- }
- isHouseLoadingMore = false;
- if (houseBeanClass != null) {
- currentHouseListTotal = (int) houseBeanClass.getTotalPage();
- currentHouseListPage = (int) houseBeanClass.getPageNo();
- //鏇存柊缂撳瓨
- setHouseIdList(houseBeanClass.getList());
- if (searchHouseAdapter != null) {
- initData();
- //鏇存柊UI
- searchHouseAdapter.setList(houseListBeanIDList);
+ public void onSuccess(HdlResidenceLogic.HouseBeanClass houseBeanClass) {
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+ if (isRefreshing) {
+ hideLoading();
+ }
+ isHouseLoadingMore = false;
+ if (houseBeanClass != null) {
+ currentHouseListTotal = (int) houseBeanClass.getTotalPage();
+ currentHouseListPage = (int) houseBeanClass.getPageNo();
+ //鏇存柊缂撳瓨
+ setHouseIdList(houseBeanClass.getList());
+ if (searchHouseAdapter != null) {
+ //鏇存柊UI
+ searchHouseAdapter.setList(houseListBeanIDList);
+ }
+ }
}
- }
+ }, _mActivity, ShowErrorMode.YES);
+
}
- }, _mActivity, ShowErrorMode.YES);
- }
-
- @Override
- public void onFailure(HDLException e) {
- HdlThreadLogic.runMainThread(new Runnable() {
@Override
- public void run() {
- if (currentHouseListPage > 1) {
- --currentHouseListPage;
- }
- isHouseLoadingMore = false;
- if (isRefreshing) {
- hideLoading();
- }
+ public void onFailure(HDLException e) {
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+ if (currentHouseListPage > 1) {
+ --currentHouseListPage;
+ }
+ isHouseLoadingMore = false;
+ if (isRefreshing) {
+ hideLoading();
+ }
+ }
+ }, _mActivity, ShowErrorMode.YES);
}
- }, _mActivity, ShowErrorMode.YES);
- }
- });
+ });
}
private void clearData() {
@@ -360,7 +367,7 @@
}
} catch (Exception e) {
String mes = e.getMessage();
- HdlLogLogic.print("--->" + mes);
+ HdlLogLogic.print("---" + mes);
}
}
@@ -368,17 +375,18 @@
* 娣诲姞鍘嗗彶璁板綍
*/
private void addSearchTextToList() {
- for (int i = 0; i < SearchHistoryTitleList.size(); i++) {
- if (SearchHistoryTitleList.get(i).equals(currSearchText)) {
- SearchHistoryTitleList.remove(SearchHistoryTitleList.get(i));
+ 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);
+ searchHistoryTitleList.add(currSearchText);
// 鍊掑簭鎺掑垪鏁版嵁(鎼滅储鏈�鍚庢帓鍦ㄥ墠闈�)
- Collections.reverse(SearchHistoryTitleList);
- if (SearchHistoryTitleList.size() > 10) {
+ Collections.reverse(searchHistoryTitleList);
+ if (searchHistoryTitleList.size() > maxValue) {
//鍘嗗彶璁板綍涓嶈兘瓒呭嚭10
- SearchHistoryTitleList.remove(SearchHistoryTitleList.get(11));
+ searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue + 1));
}
}
--
Gitblit v1.8.0