From e57e1c01a52a326343122d458ad3bd330fc9d347 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 07 二月 2025 16:40:29 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 9548f9a..b48aa9d 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
@@ -31,6 +31,7 @@
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
+import com.hdl.photovoltaic.widget.PermissionExplanationDialog;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -123,22 +124,22 @@
viewBinding.addPowerStationTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+
+ // 鏈巿鏉� 濡傛灉搴旂敤绋嬪簭娌℃湁鎵�闇�鐨勬潈闄愶紝鍒欐樉绀鸿В閲婅鏄�
+ 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) {
- if (value == PermissionUtils.STATUS_REFUSE_PERMANENT) {
+ PermissionExplanationDialog.getInstance().dismiss();
+ if (value == PermissionUtils.STATUS_REFUSE_PERMANENT | value == PermissionUtils.STATUS_REFUSE) {
// HdlThreadLogic.toast(_mActivity, R.string.permission_open);
return;
}
-// startActivity(CaptureActivity.class);
startActivity(ScanActivity.class);
}
}, true);
-// String path = HDLUniMP.UNI_EVENT_OPEN_DEVICESCAN + "?scanType=addPowerStation";
-// HdlUniLogic.getInstance().openUniMP(path, null);
-// startActivity(FastScanActivity.class);
}
});
--
Gitblit v1.8.0