From c19f27f32f3c3d2caf82ddbdc3b2602ee3610e46 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 11:11:34 +0800
Subject: [PATCH] Merge branch '1.3.1'
---
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 0c61f1e..1c17dc3 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
@@ -127,11 +127,17 @@
houseListAdapter.setDelOnclickListener(new HouseListAdapter.OnDelClickListener() {
@Override
public void onDelClick(int position, HouseIdBean houseIdBean) {
+ if (houseIdBean.isOtherShare()) {
+ //鍒嗕韩杩囨潵鐨勭數绔欎笉鑳藉垹闄�
+ HdlThreadLogic.toast(_mActivity, getString(R.string.no_permission_delete_home));
+ return;
+ }
+
DelayedConfirmationCancelDialog delayedConfirmationCancelDialog = new DelayedConfirmationCancelDialog(_mActivity);
delayedConfirmationCancelDialog.show();
delayedConfirmationCancelDialog.isHideTitle(true);
- String homeName = "\"" + houseIdBean.getHomeName() + "\"";
- delayedConfirmationCancelDialog.setContent(getString(R.string.delete_power_station).replace("%s", homeName));
+ String del_home = getString(R.string.confirm_deletion) + "\"" + houseIdBean.getHomeName() + "\"" + "?";
+ delayedConfirmationCancelDialog.setContent(del_home);
// delayedConfirmationCancelDialog.startCountdown(4);
delayedConfirmationCancelDialog.setYesOnclickListener(new DelayedConfirmationCancelDialog.onYesOnclickListener() {
--
Gitblit v1.8.0