From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java | 102 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 91 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
index d7decc0..efa0636 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
@@ -5,6 +5,9 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
+import android.os.SystemClock;
+import android.text.TextUtils;
+import android.util.Log;
import android.view.View;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -12,6 +15,7 @@
import com.google.gson.JsonObject;
import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.ConstantManage;
@@ -21,6 +25,7 @@
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlCommonLogic;
+import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
@@ -38,6 +43,7 @@
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
/**
@@ -67,6 +73,8 @@
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
initEvent();
+ //鍚庡彴璇诲彇浣忓畢鍒楄〃
+// downReadData(false);
}
private void initData() {
@@ -126,11 +134,11 @@
public void onClick(View v) {
// 鏈巿鏉� 濡傛灉搴旂敤绋嬪簭娌℃湁鎵�闇�鐨勬潈闄愶紝鍒欐樉绀鸿В閲婅鏄�
-// PermissionExplanationDialog.getInstance().showPortConflictPdDialog(_mActivity, getString(R.string.camera_storage_instructions), getString(R.string.camera_storage_purpose));
+ PermissionExplanationDialog.getInstance().showPortConflictPdDialog(_mActivity, getString(R.string.camera_storage_instructions), getString(R.string.camera_storage_purpose));
PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.CAMERA, new PermissionUtils.PermissionState() {
@Override
public void Success(int value) {
-// PermissionExplanationDialog.getInstance().dismiss();
+ PermissionExplanationDialog.getInstance().dismiss();
if (value == PermissionUtils.STATUS_REFUSE_PERMANENT | value == PermissionUtils.STATUS_REFUSE) {
// HdlThreadLogic.toast(_mActivity, R.string.permission_open);
return;
@@ -176,16 +184,22 @@
//鍏抽棴涓嬫媺鍒锋柊鐨勫湀鍦�
viewBinding.fragmentHouseSrl.setRefreshing(false);
}
- if (list != null && list.size() > 0) {
- //鏇存柊缂撳瓨
- HdlResidenceLogic.getInstance().setHouseIdList(list);
- if (houseListAdapter != null) {
- initData();
- setSelectState();
- //鏇存柊UI
- houseListAdapter.setList(houseListBeanIDList);
- }
+ if (list != null && !list.isEmpty()) {
+ if (!comparableList(houseListBeanIDList, list)) {
+ //鏇存柊缂撳瓨
+ HdlResidenceLogic.getInstance().setHouseIdList(list, true);
+ if (houseListAdapter != null) {
+ //閲嶆柊鑾峰彇鍒楄〃鏁版嵁
+ initData();
+ refreshDetails();
+ //鏇存柊鐢电珯閫変腑鐘舵��
+ setSelectState();
+ //鏇存柊鍒楄〃鏁版嵁
+ houseListAdapter.setList(houseListBeanIDList);
+ }
+
+ }
}
nullDataUpdateUi(list);
}
@@ -202,6 +216,8 @@
//鍏抽棴涓嬫媺鍒锋柊鐨勫湀鍦�
viewBinding.fragmentHouseSrl.setRefreshing(false);
}
+
+ HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
}
}, _mActivity, ShowErrorMode.YES);
@@ -330,4 +346,68 @@
}
}
+
+ /**
+ * 姣旇緝浣忓畢鍒楄〃鏁版嵁鏄惁閮戒竴鏍�
+ *
+ * @param oldList 鏃у垪琛�
+ * @param newList 鏂板垪琛�
+ * @return 鐩稿悓杩斿洖true锛屽惁鍒欒繑鍥瀎alse
+ */
+ boolean comparableList(List<HouseIdBean> oldList, List<HouseIdBean> newList) {
+ if (oldList == null || newList == null) return false;
+ if (oldList.size() != newList.size()) return false;
+ List<String> oidStrList = new ArrayList<>();
+ for (int i = 0; i < oldList.size(); i++) {
+ oidStrList.add(oldList.get(i).getHomeId());
+ }
+
+ List<String> newStrList = new ArrayList<>();
+ for (int i = 0; i < newList.size(); i++) {
+ newStrList.add(newList.get(i).getHomeId());
+ }
+ Collections.sort(oidStrList);
+ Collections.sort(newStrList);
+ return oidStrList.equals(newStrList);
+ }
+
+ /**
+ * 閫氱煡uni鏇存柊鏁版嵁
+ * 锛堝湪骞冲彴涓婂垹闄绔綋鍓嶄綇瀹呭悗,鑾峰彇鍒楄〃瀹炴敹瑕侀�氱煡uni閭ｈ竟鏇存柊鐣岄潰鍗＄墖锛�
+ */
+ private void refreshDetails() {
+ try {
+ List<HouseIdBean> localHouseIdList = HdlResidenceLogic.getInstance().getHouseIdList();
+ if (localHouseIdList.isEmpty()) {
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("homeId", "");
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS);
+ uniCallBackBaseBean.setData(jsonObject);
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+ } else {
+ int select_home = -1;
+ for (int i = 0; i < localHouseIdList.size(); i++) {
+ if (localHouseIdList.get(i).getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+ select_home = i;
+ break;
+ }
+ }
+ if (select_home == -1) {
+ //鎵句笉鍒伴粯璁ょ涓�涓�
+ HouseIdBean houseIdBean = localHouseIdList.get(0);
+ HdlResidenceLogic.getInstance().switchHouse(houseIdBean, true);
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("homeId", houseIdBean.getHomeId());
+ jsonObject.addProperty("homeName", houseIdBean.getHomeName());
+ jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus() + "");
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS);
+ uniCallBackBaseBean.setData(jsonObject);
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+ }
+ }
+ } catch (Exception e) {
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0