From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDialogLogic.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDialogLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDialogLogic.java
index 7d6ed79..3adbfee 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDialogLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDialogLogic.java
@@ -4,6 +4,7 @@
import android.content.Intent;
import android.net.Uri;
import android.provider.Settings;
+import android.text.TextUtils;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
@@ -38,16 +39,18 @@
*
* @param context 涓婁笅鏂�
*/
- public void showSettingPermissionDialog(Context context) {
-
+ public void showSettingPermissionDialog(Context context, String tip_ext) {
+ if (context == null) {
+ return;
+ }
HdlThreadLogic.runMainThread(new Runnable() {
@Override
public void run() {
-
ConfirmationCancelDialog dialog = new ConfirmationCancelDialog(context);
+ dialog.isHideTitle(true);
dialog.setTitle(context.getString(R.string.loading_title_tip));
- dialog.setContent("璇峰墠寰�璁剧疆鏉冮檺.");
+ dialog.setContent(tip_ext);
dialog.setConfirmation(context.getString(R.string.me_set));
dialog.show();
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@@ -74,4 +77,13 @@
}
+ /**
+ * 璺宠浆鍒版潈闄愯鎯呴〉璁剧疆鏉冮檺(鏈夌殑鎵嬫満鍘傚鍙兘璺宠浆鍒拌缃晫闈�)
+ *
+ * @param context 涓婁笅鏂�
+ */
+ public void showSettingPermissionDialog(Context context) {
+ showSettingPermissionDialog(context, context.getString(R.string.please_go_set_permissions));
+ }
+
}
--
Gitblit v1.8.0