fixed ui do not show env value issues.

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 610ece4..ff141a3 100644 (file)
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -10,9 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 20,
-      "versionName": "202102011414",
-      "outputFile": "ICL02Temperature_V20_202102011414_release.apk"
+      "versionCode": 21,
+      "versionName": "202107151454",
+      "outputFile": "ICL02Temperature_V21_202107151454_release.apk"
     }
   ]
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/temperature/MainActivity.kt b/app/src/main/java/com/ic/temperature/MainActivity.kt
index 2fb8d4f..01b7ad0 100644 (file)
--- a/app/src/main/java/com/ic/temperature/MainActivity.kt
+++ b/app/src/main/java/com/ic/temperature/MainActivity.kt
@@ -114,6 +114,7 @@ class MainActivity : AppCompatActivity() {
                 binding.wristTemp = it
             }
             mEnvTemp.observe(that) {
+                println("env temp is == > $it")
                 //环境温度
                 binding.envTemp = it
             }

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a56a3cf..4e3c3a9 100644 (file)
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -66,8 +66,6 @@
             android:layout_height="match_parent"
             android:layout="@layout/stub_view_normal_temp"
             ic:bodyTemp="@{bodyTemp}"
-            ic:disableEnvTemp="@{disableEnvTemp}"
-            ic:disableWristTemp="@{disableWristTemp}"
             ic:envTemp="@{envTemp}"
             ic:wristTemp="@{wristTemp}" />
 

diff --git a/app/src/main/res/layout/stub_view_normal_temp.xml b/app/src/main/res/layout/stub_view_normal_temp.xml
index 5311d28..52ca2f5 100644 (file)
--- a/app/src/main/res/layout/stub_view_normal_temp.xml
+++ b/app/src/main/res/layout/stub_view_normal_temp.xml
@@ -27,13 +27,6 @@
             name="showLoading"
             type="boolean" />
 
-        <variable
-            name="disableWristTemp"
-            type="boolean" />
-
-        <variable
-            name="disableEnvTemp"
-            type="boolean" />
     </data>
 
     <LinearLayout
@@ -133,7 +126,7 @@
             <TextView
                 android:id="@+id/textView2"
                 style="@style/TemperatureTextStyle"
-                android:layout_toRightOf="@id/env_unit"
+                android:layout_toLeftOf="@id/env_unit"
                 android:text="@{envTemp}" />
 
 

diff --git a/app/version_code.properties b/app/version_code.properties
index eb67e12..8867f0d 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Feb 01 14:14:46 CST 2021
-VERSION_CODE=20
+#Thu Jul 15 14:54:27 CST 2021
+VERSION_CODE=21