Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

 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;
@@ -29,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);
    }

    /**
@@ -46,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);
        }
    }

    /**
     * 设置提示文本