From dcdd7495322c36bc41c7d18fa91dc8884bc976ef Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 18 七月 2025 13:09:24 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 49f2262..67a5ac7 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,10 +127,16 @@
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 del_home = getString(R.string.confirm_deletion) + "\"" + houseIdBean.getHomeName() + "\""+"?";
+ String del_home = getString(R.string.confirm_deletion) + "\"" + houseIdBean.getHomeName() + "\"" + "?";
delayedConfirmationCancelDialog.setContent(del_home);
// delayedConfirmationCancelDialog.startCountdown(4);
@@ -171,11 +177,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;
--
Gitblit v1.8.0