From 0ccb78cfb85fbba31ee16a57b13752747585b9a9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 15 九月 2025 10:15:12 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java
index 73f9c81..8a7e8c9 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java
@@ -183,11 +183,11 @@
@Override
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;
@@ -283,21 +283,19 @@
hideLoading();
}
if (list != null && !list.isEmpty()) {
- if (!comparableList(houseListBeanIDList, list)) {
- //鏇存柊缂撳瓨
- HdlResidenceLogic.getInstance().setHouseIdList(list, true);
- if (houseListAdapter != null) {
- //閲嶆柊鑾峰彇鍒楄〃鏁版嵁
- initData();
- refreshDetails("");
- //鏇存柊鐢电珯閫変腑鐘舵��
- setSelectState();
- //鏇存柊鍒楄〃鏁版嵁
- houseListAdapter.setList(houseListBeanIDList);
- }
-
-
+// if (!comparableList(houseListBeanIDList, list)) {
+ //鏇存柊缂撳瓨
+ HdlResidenceLogic.getInstance().setHouseIdList(list, true);
+ if (houseListAdapter != null) {
+ //閲嶆柊鑾峰彇鍒楄〃鏁版嵁
+ initData();
+ refreshDetails("");
+ //鏇存柊鐢电珯閫変腑鐘舵��
+ setSelectState();
+ //鏇存柊鍒楄〃鏁版嵁
+ houseListAdapter.setList(houseListBeanIDList);
}
+// }
}
nullDataUpdateUi(list);
}
--
Gitblit v1.8.0