From 0a18a8180bc6040c941b07df1be1f7b726b4c155 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 21 八月 2023 14:19:26 +0800
Subject: [PATCH] Merge branch 'master' into wjc
---
app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationDialog.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationDialog.java
index 8eca038..b12b44a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationDialog.java
@@ -16,7 +16,7 @@
*/
public class ConfirmationDialog extends Dialog {
public ConfirmationDialog(@NonNull Context context) {
- super(context, R.style.Custom_AlertDialog);
+ super(context, R.style.Custom_Dialog);
this.mContext = context;
}
@@ -100,7 +100,7 @@
*
* @param content 鍐呭
*/
- public void setContentText(String content) {
+ public void setContent(String content) {
if (TextUtils.isEmpty(content)) {
return;
}
--
Gitblit v1.8.0