From: snickersun <scy@incartech.cn>
Date: Tue, 10 Nov 2020 10:56:16 +0000 (+0800)
Subject: release V178
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=8703ffc8131ce5042088f97952d5bfe9dae65b9b;p=launcher4.git

release V178
修复 C5项目上 隐藏心率图标时的bug
---

diff --git a/app/release/ICL02Launcher_V177_202011071413_release.apk b/app/release/ICL02Launcher_V178_202011101853_release.apk
similarity index 57%
rename from app/release/ICL02Launcher_V177_202011071413_release.apk
rename to app/release/ICL02Launcher_V178_202011101853_release.apk
index f51a906..6d260cc 100644
Binary files a/app/release/ICL02Launcher_V177_202011071413_release.apk and b/app/release/ICL02Launcher_V178_202011101853_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 8e5f670..fc82538 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":177,"versionName":"202011071413","enabled":true,"outputFile":"ICL02Launcher_V177_202011071413_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Launcher_V177_202011071413_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":178,"versionName":"202011101853","enabled":true,"outputFile":"ICL02Launcher_V178_202011101853_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Launcher_V178_202011101853_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_l02_main.xml b/app/src/main/res/layout/fragment_l02_main.xml
index cf5bb0b..42b662b 100644
--- a/app/src/main/res/layout/fragment_l02_main.xml
+++ b/app/src/main/res/layout/fragment_l02_main.xml
@@ -223,6 +223,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:visibility="@{showHR}"
                 android:gravity="center">
 
                 <ImageView
@@ -231,6 +232,7 @@
                     android:layout_height="40dp"
                     android:layout_alignLeft="@+id/l02_heart_value"
                     android:layout_alignRight="@+id/l02_heart_value"
+                    android:visibility="@{showHR}"
                     android:src="@mipmap/heartrate" />
 
                 <TextView
@@ -240,6 +242,7 @@
                     android:layout_below="@+id/l02_heart_img"
                     android:layout_marginStart="0dp"
                     android:layout_weight="1"
+                    android:visibility="@{showHR}"
                     android:gravity="center"
                     android:text="@{heartValue}" />
 
@@ -249,6 +252,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:visibility="@{showHR}"
                 android:gravity="center">
 
                 <ImageView
@@ -257,6 +261,7 @@
                     android:layout_height="40dp"
                     android:layout_alignLeft="@+id/l02_spo2_value"
                     android:layout_alignRight="@+id/l02_spo2_value"
+                    android:visibility="@{showHR}"
                     android:src="@mipmap/spo2" />
 
                 <TextView
@@ -267,6 +272,7 @@
                     android:layout_weight="1"
                     android:gravity="center"
                     android:text="@{spo2value}"
+                    android:visibility="@{showHR}"
                     android:textAlignment="center" />
 
             </RelativeLayout>
diff --git a/app/version_code.properties b/app/version_code.properties
index f5735c2..4dd2d10 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Nov 07 14:13:17 CST 2020
-VERSION_CODE=177
+#Tue Nov 10 18:53:54 CST 2020
+VERSION_CODE=178