From d4c791b8d9395b74ea86d3b66529b7d6b408b75e Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Tue, 4 Apr 2023 13:50:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0loading=E5=AF=B9?=
 =?UTF-8?q?=E8=AF=9D=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  4 ++--
 .../message/ObtainMessageFragment.kt          | 20 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c477436..68e33ec 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,8 +20,8 @@ android {
         applicationId "com.navinfo.volvo"
         minSdk 24
         targetSdk 32
-        versionCode 2
-        versionName "20230112"
+        versionCode 3
+        versionName "20230327"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageFragment.kt b/app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageFragment.kt
index 719aedf..5b7d84e 100644
--- a/app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageFragment.kt
+++ b/app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageFragment.kt
@@ -5,6 +5,7 @@ import android.content.DialogInterface
 import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.PorterDuff
+import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.LayoutInflater
@@ -85,7 +86,16 @@ class ObtainMessageFragment : BaseFragment() {
     private val binding get() = _binding!!
 
     private lateinit var voiceView: VoicePlayerView
-    private lateinit var loadingDialog: AlertDialog
+    private val loadingDialog by lazy {
+        val progressBar = ProgressBar(context, null, android.R.attr.progressBarStyleLarge)
+        progressBar.indeterminateDrawable.setColorFilter(Color.BLUE, PorterDuff.Mode.SRC_IN)
+        val dialog = AlertDialog.Builder(requireContext())
+            .setView(progressBar)
+            .setCancelable(false)
+            .create()
+        dialog.window!!.setBackgroundDrawable(ColorDrawable(0))
+        dialog
+    }
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -686,14 +696,6 @@ class ObtainMessageFragment : BaseFragment() {
                 } else {
                     messageData.version = "0" // 预约发送
                 }
-                if (loadingDialog == null) {
-                    val progressBar = ProgressBar(context, null, android.R.attr.progressBarStyleLarge)
-                    progressBar.indeterminateDrawable.setColorFilter(Color.BLUE, PorterDuff.Mode.SRC_IN)
-                    loadingDialog = AlertDialog.Builder(requireContext())
-                        .setView(progressBar)
-                        .setCancelable(false)
-                        .create()
-                }
                 loadingDialog.show()
                 // 开始网络提交数据
                 if (obtainMessageViewModel.getMessageLiveData().value?.id == 0L) { // 如果网络id为空，则调用更新操作