From abede488312c289351ea3724e25416e5889b206e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 29 十二月 2025 10:32:57 +0800
Subject: [PATCH] 2025年12月29日10:32:55
---
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 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..b99a249 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
@@ -19,6 +19,7 @@
import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityPowerStationsListBinding;
+import com.hdl.photovoltaic.enums.Languages;
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.listener.CloudCallBeak;
@@ -183,11 +184,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 +284,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);
}
@@ -348,9 +347,10 @@
* @param houseIdBean 閫変腑鏁版嵁
*/
private void houseSelectionDialog(HouseIdBean houseIdBean) {
+ String placeholder = UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.ar) ? "s%" : "%s";
ConfirmationCancelDialog dialog = new ConfirmationCancelDialog(this);
dialog.setTitle(getString(R.string.loading_title_tip));
- dialog.setContent(getString(R.string.switch_power_station).replace("%s", "\"" + houseIdBean.getHomeName() + "\""));
+ dialog.setContent(getString(R.string.switch_power_station).replace(placeholder, "\"" + houseIdBean.getHomeName() + "\""));
dialog.show();
dialog.isHideTitle(true);
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
--
Gitblit v1.8.0