From: k.liang <liangkang648253071@126.com>
Date: Wed, 21 Jul 2021 02:47:07 +0000 (+0800)
Subject: 更新温度的dialog显示
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=f8184b43be763b3125e40493b63c5c5f143bc3da;p=IcTemperature.git

更新温度的dialog显示
---

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index c3dda66..46c8858 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -10,9 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 24,
-      "versionName": "202107081039",
-      "outputFile": "ICL02Temperature_V24_202107081039_release.apk"
+      "versionCode": 25,
+      "versionName": "202107171628",
+      "outputFile": "ICL02Temperature_V25_202107171628_release.apk"
     }
   ]
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt b/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt
index 29e0561..e188812 100644
--- a/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt
+++ b/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt
@@ -1,6 +1,7 @@
 package com.ic.temperature.repository
 
 import android.app.Activity
+import android.app.Dialog
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
@@ -9,6 +10,7 @@ import android.os.Handler
 import android.os.IBinder
 import android.os.Looper
 import android.os.Message
+import android.util.Log
 import android.widget.Toast
 import com.ic.temperature.R
 import com.ic.temperature.utils.Constants
@@ -33,6 +35,8 @@ class TemperatureRepository(context: Context) {
 
     private var mCallback: ITemRepositoryCallback? = null
 
+    private var dialog: Dialog? = null
+
     fun setActivity(mContext: Activity?) {
         mActivity = mContext
     }
@@ -98,6 +102,9 @@ class TemperatureRepository(context: Context) {
                         + temperature.envTemp
             )
             //最后的结果
+            if (dialog != null) {
+                dialog!!.dismiss();
+            }
             mCallback?.onTempFinal(temperature.wristTemp, temperature.bodyTemp, temperature.envTemp)
         }
 
@@ -147,7 +154,7 @@ class TemperatureRepository(context: Context) {
 
     private fun showDialog() {
         val mDialogLoader = DialogLoader.getInstance().setIDialogStrategy(CustomDialogStrategy())
-        mDialogLoader.showTipDialog(
+        dialog = mDialogLoader.showTipDialog(
             mActivity,
             R.mipmap.warn,
             mContext.getString(R.string.dialog_warn),
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2f2e82f..af406a9 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -11,10 +11,9 @@
     <style name="SplashTheme" parent="XUITheme.Phone">
         <item name="android:windowIsTranslucent">true</item>  <!-- 透明背景 -->
         <item name="android:windowNoTitle">true</item>
-        <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowBackground">@color/colorMainBg</item>
         <item name="android:windowFullscreen">true</item>
-        <item name="android:background">@color/colorMainBg</item>
+        <item name="android:background">@color/white</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/version_code.properties b/app/version_code.properties
index c01e49f..b768e2b 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Jul 08 10:39:03 CST 2021
-VERSION_CODE=24
+#Sat Jul 17 16:28:03 CST 2021
+VERSION_CODE=25