From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'

---
 app/src/main/java/com/hdl/photovoltaic/widget/LoadingDialog.java |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/LoadingDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/LoadingDialog.java
index 99e354e..89af2f3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/LoadingDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/LoadingDialog.java
@@ -1,14 +1,14 @@
 package com.hdl.photovoltaic.widget;
 
-import android.app.Dialog;
 import android.content.Context;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.WindowManager;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 
+import com.bumptech.glide.Glide;
 import com.hdl.photovoltaic.R;
 import com.hdl.photovoltaic.base.BaseDialog;
 
@@ -29,12 +29,20 @@
         setCancelable(true);//绯荤粺鍚庨��鍙互鍙栨秷
         setCanceledOnTouchOutside(false);
         setContentView(R.layout.loading_alert);
-        content = (TextView) findViewById(R.id.load_content_tv);
-        WindowManager.LayoutParams params = getWindow().getAttributes();
-        params.width = WindowManager.LayoutParams.WRAP_CONTENT;
-        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        getWindow().setAttributes(params);
+        try {
+            content = (TextView) findViewById(R.id.load_content_tv);
+            ImageView imageView = (ImageView) findViewById(R.id.load_pb);
+            WindowManager.LayoutParams params = getWindow().getAttributes();
+            params.width = WindowManager.LayoutParams.WRAP_CONTENT;
+            params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+            getWindow().setAttributes(params);
+            Glide.with(context)
+//                .asBitmap() // 寮哄埗浣滀负闈欐�佸浘鐗囧姞杞�
+                    .load(R.drawable.loading)
+                    .into(imageView);
 //        content.setText(R.string.device_鍔犺浇涓�);
+        } catch (Exception e) {
+        }
     }
 
     public void setText(String mes) {

--
Gitblit v1.8.0