From 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 11:56:35 +0800
Subject: [PATCH] Merge branch 'master' into 1.2.1_google
---
app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 a5cba25..cc90c09 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java
@@ -1,16 +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.Gravity;
import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
import android.widget.TextView;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.BaseDialog;
@@ -40,7 +39,7 @@
// setCancelable(true);//绯荤粺鍚庨��鍙互鍙栨秷
//绌虹櫧澶勪笉鑳藉彇娑堝姩鐢�
-// setCanceledOnTouchOutside(false);
+ setCanceledOnTouchOutside(false);
//鍒濆鍖栫晫闈㈡帶浠�
initView();
//鍒濆鍖栫晫闈㈡暟鎹�
@@ -65,6 +64,7 @@
}
}
+
/**
* 闅愯棌鑷畾涔�"鏍囬"缁勪欢
@@ -129,6 +129,7 @@
}
}
+
public TextView getContentTextView() {
if (viewBinding == null) {
return null;
@@ -182,7 +183,6 @@
}
-
/**
* 璁剧疆鍙栨秷鎸夐挳鐩戝惉
--
Gitblit v1.8.0