From f91ef956cf482ed4ce0885dc47794b783c20c415 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 30 四月 2025 10:14:43 +0800
Subject: [PATCH] Merge branch '1.2.0' into 1.5.1_google
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java | 131 ++++++++++++++++++++++++++++---------------
1 files changed, 84 insertions(+), 47 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 5c99ae0..551a345 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
@@ -6,7 +6,10 @@
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.content.Context;
+import android.os.AsyncTask;
import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -36,6 +39,8 @@
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils;
import com.hdl.photovoltaic.utils.URLEncodingUtils;
+import com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout;
+import com.hdl.photovoltaic.widget.refreshlayout.HDLRefreshViewHolder;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
@@ -49,7 +54,8 @@
*/
public class DeviceSearchActivity extends CustomBaseActivity {
-
+ private Handler handler;
+ private Runnable delayedRunnable;
private ActivityDeviceSearchBinding viewBinding;
SearchDeviceAdapter searchDeviceAdapter;//璁惧閫傞厤鍣�
@@ -57,9 +63,9 @@
private List<CloudInverterDeviceBean> deviceList = new ArrayList<>();
- private int currentHouseListPage = 0; // 褰撳墠鐢电珯鍒楄〃椤电爜
- private int currentHouseListTotal = 0; // 鐢电珯鍒楄〃鎬婚〉鐮�
- private boolean isHouseLoadingMore = false; // 鏍囪鐢电珯鍒楄〃姝ｅ湪鍔犺浇鏇村鏁版嵁
+ private int currentDeviceListPage = 0; // 褰撳墠鐢电珯鍒楄〃椤电爜
+ private int currentDeviceListTotal = 0; // 鐢电珯鍒楄〃鎬婚〉鐮�
+ private boolean isDeviceLoadingMore = false; // 鏍囪鐢电珯鍒楄〃姝ｅ湪鍔犺浇鏇村鏁版嵁
private String currSearchText;
@@ -97,6 +103,54 @@
}
}
+ /**
+ * 涓嬫媺鍒锋柊鐨勯�昏緫
+ */
+ protected void pullToRefresh() {
+ viewBinding.listSrl.setDelegate(new BGARefreshLayout.BGARefreshLayoutDelegate() {
+ @Override
+ public void onBGARefreshLayoutBeginRefreshing(BGARefreshLayout refreshLayout) {
+ handler = new Handler(Looper.getMainLooper());
+
+ delayedRunnable = new Runnable() {
+ @Override
+ public void run() {
+ viewBinding.listSrl.endRefreshing();
+ loadNextPageDeviceList(false, 1, true);
+ }
+ };
+ // 寤惰繜 5 绉掓墽琛�
+ handler.postDelayed(delayedRunnable, 1000);
+ }
+
+
+ @Override
+ public boolean onBGARefreshLayoutBeginLoadingMore(BGARefreshLayout refreshLayout) {
+
+ handler = new Handler(Looper.getMainLooper());
+ delayedRunnable = new Runnable() {
+ @Override
+ public void run() {
+ viewBinding.listSrl.endLoadingMore();
+ if (!isDeviceLoadingMore) {
+ // 婊戝姩鍒颁簡搴曢儴锛屾墽琛岀浉搴旂殑鎿嶄綔
+ HdlLogLogic.print("--->婊戝姩鍒颁簡搴曢儴");
+ loadNextPageDeviceList(false, ++currentDeviceListPage, false);
+ }
+ }
+ };
+ // 寤惰繜 5 绉掓墽琛�
+ handler.postDelayed(delayedRunnable, 10);
+
+ return true;
+ }
+ });
+ HDLRefreshViewHolder hdlRefreshViewHolder = new HDLRefreshViewHolder(_mActivity, true);
+ hdlRefreshViewHolder.setPullDownImageResource(R.mipmap.loading_44);
+ hdlRefreshViewHolder.setChangeToReleaseRefreshAnimResId(R.drawable.loading_refresh);
+ hdlRefreshViewHolder.setRefreshingAnimResId(R.drawable.loading_refresh_end);
+ viewBinding.listSrl.setRefreshViewHolder(hdlRefreshViewHolder);
+ }
private void initEvent() {
@@ -125,41 +179,10 @@
viewBinding.historyListParent.setVisibility(View.GONE);
viewBinding.listParent.setVisibility(View.VISIBLE);
addSearchTextToList();
- loadNextPageHouseList(true, 1, true);
+ loadNextPageDeviceList(true, 1, true);
}
});
-
- //涓嬫媺绠ご棰滆壊
- viewBinding.listSrl.setColorSchemeResources(R.color.text_FF245EC3);
- //涓嬫媺璇诲彇
- viewBinding.listSrl.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
- @Override
- public void onRefresh() {
- viewBinding.listSrl.setRefreshing(false);
- loadNextPageHouseList(true, 1, true);
- }
- });
- //涓婃媺璇诲彇
- viewBinding.listRcv.addOnScrollListener(new RecyclerView.OnScrollListener() {
- @Override
- public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
- LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
- if (layoutManager == null) {
- return;
- }
- int visibleItemCount = layoutManager.getChildCount();
- int totalItemCount = layoutManager.getItemCount();
- int firstVisibleItemPosition = layoutManager.findFirstVisibleItemPosition();
- if (visibleItemCount > 0 && visibleItemCount + firstVisibleItemPosition == totalItemCount) {
- if (!isHouseLoadingMore) {
- // 婊戝姩鍒颁簡搴曢儴锛屾墽琛岀浉搴旂殑鎿嶄綔
- HdlLogLogic.print("--->婊戝姩鍒颁簡搴曢儴");
- loadNextPageHouseList(false, ++currentHouseListPage, false);
- }
- }
- }
- });
//娓呴櫎
viewBinding.powerStationClearIv.setOnClickListener(new View.OnClickListener() {
@Override
@@ -204,7 +227,7 @@
viewBinding.historyListParent.setVisibility(View.GONE);
viewBinding.listParent.setVisibility(View.VISIBLE);
addSearchTextToList();
- loadNextPageHouseList(true, 1, true);
+ loadNextPageDeviceList(true, 1, true);
}
});
//璁惧鐐瑰嚮鏄簨浠�
@@ -225,9 +248,19 @@
@Override
public void onSuccess(List<GatewayBean> obj) {
GatewayBean newGatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(deviceBean.getOsn());
+ if (newGatewayBean == null) {
+ HdlThreadLogic.toast(_mActivity, getString(R.string.device_off));
+ return;
+ }
+ if (TextUtils.isEmpty(newGatewayBean.getGatewayId()) || TextUtils.isEmpty(newGatewayBean.getAesKey())) {
+ //杩欓噷鍙敮鎸佽繙绋嬭皟璇曪紝杩滅▼鎷夸笉鍒癿qtt閫氳绉橀挜浠ュ強gatewayId锛�
+ HdlThreadLogic.toast(_mActivity,getString(R.string.Device_failed_to_certificate)+"(124004)");
+ return;
+ }
String jsonEncryption = URLEncodingUtils.encodeURIComponent(new Gson().toJson(newGatewayBean));
String path = HDLUniMP.UNI_EVENT_OPEN_DEVICE_DETAILS + "?inverterInfo=" + jsonEncryption;
HdlUniLogic.getInstance().openUniMP(path, null);
+
}
@Override
@@ -260,6 +293,7 @@
viewBinding.powerStationSearchEt.requestFocus();
}
});
+ pullToRefresh();
//鍦ㄧ晫闈腑浣跨敤
KeyboardStateObserverUtils.getKeyboardStateObserver(_mActivity).setKeyboardVisibilityListener(new KeyboardStateObserverUtils.OnKeyboardVisibilityListener() {
@@ -337,6 +371,9 @@
HdlFileLogic.getInstance().deleteFile(getHistoryFileNamePath());
HdlFileLogic.getInstance().appendFile(getHistoryFileNamePath(), new Gson().toJson(searchHistoryTitleList));
}
+ if (handler != null && delayedRunnable != null) {
+ handler.removeCallbacks(delayedRunnable);
+ }
super.onDestroy();
}
@@ -345,7 +382,7 @@
*
* @param isRefreshing 琛ㄧず鏄笅鎷夊埛鏂扮殑
*/
- private void loadNextPageHouseList(boolean isRefreshing, long pageNo, boolean isClear) {
+ private void loadNextPageDeviceList(boolean isRefreshing, long pageNo, boolean isClear) {
//鎼滅储鍏抽敭瀛�
if (TextUtils.isEmpty(currSearchText)) {
@@ -356,12 +393,12 @@
clearData();
}
//绗竴椤佃鍙栨暟鎹己鍒惰鍙�
- if (pageNo > 1 && currentHouseListPage > currentHouseListTotal) {
- --currentHouseListPage;
+ if (pageNo > 1 && currentDeviceListPage > currentDeviceListTotal) {
+ --currentDeviceListPage;
//褰撳墠椤典笉鑳藉ぇ浜庢�婚〉鏁�
return;
}
- isHouseLoadingMore = true;//鏍囪璇诲彇鐘舵��
+ isDeviceLoadingMore = true;//鏍囪璇诲彇鐘舵��
if (isRefreshing) {
showLoading();
}
@@ -376,10 +413,10 @@
if (isRefreshing) {
hideLoading();
}
- isHouseLoadingMore = false;
+ isDeviceLoadingMore = false;
if (deviceClass != null) {
- currentHouseListTotal = (int) deviceClass.getTotalPage();
- currentHouseListPage = (int) deviceClass.getPageNo();
+ currentDeviceListTotal = (int) deviceClass.getTotalPage();
+ currentDeviceListPage = (int) deviceClass.getPageNo();
//鏇存柊缂撳瓨
setDeviceList(deviceClass.getList());
if (searchDeviceAdapter != null) {
@@ -398,10 +435,10 @@
HdlThreadLogic.runMainThread(new Runnable() {
@Override
public void run() {
- if (currentHouseListPage > 1) {
- --currentHouseListPage;
+ if (currentDeviceListPage > 1) {
+ --currentDeviceListPage;
}
- isHouseLoadingMore = false;
+ isDeviceLoadingMore = false;
if (isRefreshing) {
hideLoading();
}
--
Gitblit v1.8.0