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/widget/FlashingBoxDialog.java | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/FlashingBoxDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/FlashingBoxDialog.java
index c0f974d..4083a68 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/FlashingBoxDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/FlashingBoxDialog.java
@@ -1,6 +1,6 @@
+
package com.hdl.photovoltaic.widget;
-import android.app.Dialog;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
@@ -9,6 +9,7 @@
import androidx.annotation.NonNull;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogFlashingBoxBinding;
import java.util.Timer;
@@ -17,7 +18,7 @@
/**
* 鑷畾涔夎嚜鍔ㄥ叧闂璬ialog
*/
-public class FlashingBoxDialog extends Dialog {
+public class FlashingBoxDialog extends BaseDialog {
private DialogFlashingBoxBinding viewBinding;
@@ -28,7 +29,7 @@
private int mMillisecond = 1500;
public FlashingBoxDialog(@NonNull Context context) {
- super(context, R.style.Custom_Dialog);
+ super(context, R.style.Custom_List_Dialog);
}
/**
@@ -45,26 +46,13 @@
super.onCreate(savedInstanceState);
viewBinding = DialogFlashingBoxBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
- if (this.mDrawable != null) {
- viewBinding.tipImageTv.setBackground(this.mDrawable);
- }
+
if (!TextUtils.isEmpty(this.mContentStr)) {
viewBinding.tipContentTv.setText(this.mContentStr);
}
flashing();
}
- /**
- * 璁剧疆鍥炬爣
- *
- * @param drawable 鎴愬姛鎴栬�呭け璐ュ浘鏍�
- */
- public void setImage(Drawable drawable) {
- this.mDrawable = drawable;
- if (viewBinding != null && this.mDrawable != null) {
- viewBinding.tipImageTv.setBackground(drawable);
- }
- }
/**
* 璁剧疆鎻愮ず鏂囨湰
--
Gitblit v1.8.0