更新体温测试UI上显示的toast和测量完成的提示

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 46c8858..638f3dd 100644 (file)
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -10,9 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 25,
-      "versionName": "202107171628",
-      "outputFile": "ICL02Temperature_V25_202107171628_release.apk"
+      "versionCode": 27,
+      "versionName": "202202231730",
+      "outputFile": "ICL02Temperature_V27_202202231730_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 e188812..cd8baa1 100644 (file)
--- a/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt
+++ b/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt
@@ -10,11 +10,11 @@ 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
 import com.ic.temperature.utils.IcLog
+import com.ic.temperature.utils.SystemUtils
 import com.ic.temperature.widget.CustomDialogStrategy
 import com.ic.work.ITempSensorCallback
 import com.ic.work.ITempSensorService
@@ -121,7 +121,10 @@ class TemperatureRepository(context: Context) {
             //正在获取
             IcLog.d(TAG, "正在获取 ...")
             if (mUiRefreshHandler != null) {
-                mUiRefreshHandler.sendEmptyMessage(RUNING_TASK_TYPE)
+                val customname: String = SystemUtils.getSystemProperties("persist.sys.customname")
+                if (!customname.equals("Gator")) {
+                    mUiRefreshHandler.sendEmptyMessage(RUNING_TASK_TYPE)
+                }
             }
         }
 
@@ -142,11 +145,12 @@ class TemperatureRepository(context: Context) {
         override fun handleMessage(msg: Message) {
             super.handleMessage(msg)
             when (msg.what) {
-                RUNING_TASK_TYPE -> Toast.makeText(
-                    mContext,
-                    mContext.getString(R.string.background_test),
-                    Toast.LENGTH_SHORT
-                ).show()
+                RUNING_TASK_TYPE ->
+                    Toast.makeText(
+                        mContext,
+                        mContext.getString(R.string.background_test),
+                        Toast.LENGTH_SHORT
+                    ).show()
                 WAITING_TASK_TYPE -> showDialog()
             }
         }

diff --git a/app/src/main/java/com/ic/temperature/viewmodel/TemperatureViewModel.kt b/app/src/main/java/com/ic/temperature/viewmodel/TemperatureViewModel.kt
index 90c7a0e..19b13b8 100644 (file)
--- a/app/src/main/java/com/ic/temperature/viewmodel/TemperatureViewModel.kt
+++ b/app/src/main/java/com/ic/temperature/viewmodel/TemperatureViewModel.kt
@@ -44,17 +44,17 @@ class TemperatureViewModel() : ViewModel() {
         override fun handleMessage(msg: Message) {
             val viewModelValue = this.viewModel?.get() ?: return
             val isWearEnoughTime = viewModelValue.checkWearTimeEnough()
+            if (isWearEnoughTime) {
+                viewModelValue.mCheckTips.postValue(viewModelValue.mContext.getString(R.string.activity_temp_tips_end))
+            } else {
+                viewModelValue.mCheckTips.postValue(viewModelValue.mContext.getString(R.string.activity_temp_tips_wear_too_short))
+            }
             when (msg.what) {
                 UPDATE_TEMPERATURE_FINAL_DATA -> {
                     println("UPDATE_TEMPERATURE_FINAL_DATA...")
                     //最终结果
                     //结束一些loading和文字提示
                     viewModelValue.mShowLoading.postValue(false)
-                    if (isWearEnoughTime) {
-                        viewModelValue.mCheckTips.postValue(viewModelValue.mContext.getString(R.string.activity_temp_tips_end))
-                    } else {
-                        viewModelValue.mCheckTips.postValue(viewModelValue.mContext.getString(R.string.activity_temp_tips_wear_too_short))
-                    }
                     val temperature = msg.obj as Temperature
                     viewModelValue.updateUIData(temperature)
                 }

diff --git a/app/version_code.properties b/app/version_code.properties
index b768e2b..f12a8ba 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Jul 17 16:28:03 CST 2021
-VERSION_CODE=25
+#Wed Feb 23 17:30:34 CST 2022
+VERSION_CODE=27