From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
index f2494f3..5d64da3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
@@ -1,13 +1,15 @@
package com.hdl.photovoltaic.widget;
-import android.app.Dialog;
import android.content.Context;
+import android.content.DialogInterface;
import android.os.Bundle;
+import android.os.Message;
import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.BaseDialog;
@@ -34,6 +36,7 @@
super.onCreate(savedInstanceState);
viewBinding = DialogConfirmCancelBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
+
// setCancelable(true);//绯荤粺鍚庨��鍙互鍙栨秷
//绌虹櫧澶勪笉鑳藉彇娑堝姩鐢�
setCanceledOnTouchOutside(false);
@@ -61,6 +64,7 @@
}
}
+
/**
* 闅愯棌鑷畾涔�"鏍囬"缁勪欢
@@ -124,6 +128,7 @@
viewBinding.loadingConfirmationContentTv.setText(contentStr);
}
}
+
public TextView getContentTextView() {
if (viewBinding == null) {
return null;
@@ -177,7 +182,6 @@
}
-
/**
* 璁剧疆鍙栨秷鎸夐挳鐩戝惉
--
Gitblit v1.8.0