From: snickersun <scy@incartech.cn>
Date: Thu, 5 Nov 2020 12:16:10 +0000 (+0800)
Subject: release V172
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=1f4f262927fb61efc01a0ac47ddb4e2d0816efd0;p=launcher4.git

release V172
S123 换图标，优化布局
---

diff --git a/app/release/ICL02Launcher_V171_202011051108_release.apk b/app/release/ICL02Launcher_V172_202011052014_release.apk
similarity index 53%
rename from app/release/ICL02Launcher_V171_202011051108_release.apk
rename to app/release/ICL02Launcher_V172_202011052014_release.apk
index c76c2b8..1875155 100644
Binary files a/app/release/ICL02Launcher_V171_202011051108_release.apk and b/app/release/ICL02Launcher_V172_202011052014_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index fc303ab..b83e0b1 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":171,"versionName":"202011051108","enabled":true,"outputFile":"ICL02Launcher_V171_202011051108_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Launcher_V171_202011051108_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":172,"versionName":"202011052014","enabled":true,"outputFile":"ICL02Launcher_V172_202011052014_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Launcher_V172_202011052014_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_s123_main.xml b/app/src/main/res/layout/fragment_s123_main.xml
index cedbc51..a9b9a5c 100644
--- a/app/src/main/res/layout/fragment_s123_main.xml
+++ b/app/src/main/res/layout/fragment_s123_main.xml
@@ -6,9 +6,11 @@
     tools:context=".fragment.l02.L02StatusBarFragment">
 
     <data>
+
         <variable
             name="phoneShow"
             type="boolean" />
+
         <variable
             name="phoneSignal"
             type="int" />
@@ -65,30 +67,39 @@
         <variable
             name="btStatus"
             type="boolean" />
+
         <variable
             name="wifiStatus"
             type="boolean" />
+
         <variable
             name="gpsStatus"
             type="boolean" />
+
         <variable
             name="showTemp"
             type="int" />
+
         <variable
             name="showStep"
             type="int" />
+
         <variable
             name="showHR"
             type="int" />
+
         <variable
             name="heartValue"
             type="String" />
+
         <variable
             name="TempValue"
             type="String" />
+
         <variable
             name="spo2value"
             type="String" />
+
         <variable
             name="outTempValue"
             type="String" />
@@ -107,15 +118,15 @@
             <com.ic.launcher.widget.WidgetPhoneStateView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
                 android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                app:btenabled="@{btStatus}"
+                app:gpsenabled="@{gpsStatus}"
                 app:netTypeDrawable="@{phoneNetType}"
+                app:phoneShow="@{phoneShow}"
                 app:signalDrawable="@{phoneSignal}"
                 app:transportDrawable="@{phoneTransport}"
-                app:phoneShow="@{phoneShow}"
-                app:btenabled="@{btStatus}"
-                app:wifienabled="@{wifiStatus}"
-                app:gpsenabled="@{gpsStatus}"/>
+                app:wifienabled="@{wifiStatus}" />
 
             <com.ic.launcher.widget.WidgetBatteryStateView
                 android:layout_width="wrap_content"
@@ -135,7 +146,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/main_status"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="15dp"
+            android:layout_marginTop="10dp"
             app:hourBitResId="@{hourBit}"
             app:hourTenResId="@{hourTen}"
             app:minuteBitResId="@{minuteBit}"
@@ -148,89 +159,155 @@
             android:layout_below="@id/l02_time_image"
             android:layout_centerHorizontal="true" />
 
-        <TextView
-            android:id="@+id/l02_watch_data"
-            style="@style/watchDateTextStyle"
+        <LinearLayout
+            android:id="@+id/date_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
             android:layout_below="@id/l02_time_image"
-            android:layout_marginEnd="8dp"
-            android:layout_toStartOf="@id/l02_time_sp"
-            android:text="@{watchDate}" />
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:gravity="center"
+            >
+
+            <TextView
+                style="@style/watchDateTextStyle"
+                android:text="@{watchDate}"
+                android:layout_weight="1"
+                android:gravity="center"
+                />
+
+            <TextView
+                style="@style/watchDateTextStyle"
+                android:layout_weight="1"
+                android:text="@{watchWeek}"
+                android:gravity="center"
+                />
+        </LinearLayout>
 
-        <TextView
-            style="@style/watchDateTextStyle"
-            android:layout_below="@id/l02_time_image"
-            android:layout_marginStart="20dp"
-            android:layout_toEndOf="@id/l02_time_sp"
-            android:text="@{watchWeek}"/>
-
-        <ImageView
-            android:id="@+id/l02_temp_out"
-            style="@style/watchDateIconS123Style"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_alignParentStart="true"
-
-            android:src="@mipmap/outtemp" />
-
-        <TextView
-            android:id="@+id/l02_temp_out_value"
-            style="@style/watchDateIconTextS123Style"
-            android:layout_width="50dp"
-            android:layout_alignParentStart="true"
-
-            android:text="@{outTempValue}"
-            android:textAlignment="textEnd" />
-        <ImageView
-            android:id="@+id/l02_heart_img"
-            style="@style/watchDateIconS123Style"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_toEndOf="@id/l02_temp_out"
-            android:src="@mipmap/clockl02_heartrate_icon" />
-
-        <TextView
-            android:id="@+id/l02_heart_value"
-            style="@style/watchDateIconTextS123Style"
-            android:layout_width="50dp"
-            android:textAlignment="textEnd"
-            android:layout_toEndOf="@id/l02_temp_out_value"
-            android:text="@{heartValue}" />
-
-        <ImageView
-            android:id="@+id/l02_spo2_img"
-            style="@style/watchDateIconS123Style"
-            android:layout_toEndOf="@id/l02_heart_img"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-
-            android:src="@mipmap/spo2" />
-
-        <TextView
-            android:id="@+id/l02_spo2_value"
-            style="@style/watchDateIconTextS123Style"
-            android:textAlignment="textEnd"
-            android:layout_toEndOf="@id/l02_heart_value"
-            android:layout_width="50dp"
-            android:text="@{spo2value}" />
-
-        <ImageView
-            android:id="@+id/s123_temp_img"
-            style="@style/watchDateIconS123Style"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_toEndOf="@id/l02_spo2_img"
-            android:visibility="@{showTemp}"
-            android:src="@mipmap/bodytemp" />
-
-        <TextView
-            android:id="@+id/l02_temp_value"
-            style="@style/watchDateIconTextS123Style"
-            android:layout_width="50dp"
-            android:textAlignment="textEnd"
-            android:visibility="@{showTemp}"
-            android:layout_toEndOf="@id/l02_spo2_value"
-            android:text="@{TempValue}" />
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@+id/date_layout"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:gravity="center">
+
+            <LinearLayout
+                android:id="@+id/img_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:orientation="horizontal">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center">
+
+                    <ImageView
+                        android:id="@+id/l02_temp_out"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:layout_alignLeft="@+id/l02_temp_out_value"
+                        android:layout_alignRight="@+id/l02_temp_out_value"
+                        android:src="@mipmap/outtemp" />
+
+                    <TextView
+                        android:id="@+id/l02_temp_out_value"
+                        style="@style/watchDateIconTextS123Style"
+                        android:layout_width="match_parent"
+                        android:layout_below="@+id/l02_temp_out"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="@{outTempValue}"
+                        android:textAlignment="center" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center">
+
+                    <ImageView
+                        android:id="@+id/l02_heart_img"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:layout_alignLeft="@+id/l02_heart_value"
+                        android:layout_alignRight="@+id/l02_heart_value"
+                        android:src="@mipmap/heartrate" />
+
+                    <TextView
+                        android:id="@+id/l02_heart_value"
+                        style="@style/watchDateIconTextS123Style"
+                        android:layout_width="match_parent"
+                        android:layout_below="@+id/l02_heart_img"
+                        android:layout_marginStart="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="@{heartValue}" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center">
+
+                    <ImageView
+                        android:id="@+id/l02_spo2_img"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:layout_alignLeft="@+id/l02_spo2_value"
+                        android:layout_alignRight="@+id/l02_spo2_value"
+                        android:src="@mipmap/spo2" />
+
+                    <TextView
+                        android:id="@+id/l02_spo2_value"
+                        style="@style/watchDateIconTextS123Style"
+                        android:layout_width="match_parent"
+                        android:layout_below="@+id/l02_spo2_img"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="@{spo2value}"
+                        android:textAlignment="center" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center">
+
+                    <ImageView
+                        android:id="@+id/s123_temp_img"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:layout_alignLeft="@+id/l02_temp_value"
+                        android:layout_alignRight="@+id/l02_temp_value"
+                        android:src="@mipmap/bodytemp"
+                        android:visibility="@{showTemp}" />
+
+
+                    <TextView
+                        android:id="@+id/l02_temp_value"
+                        style="@style/watchDateIconTextS123Style"
+                        android:layout_width="match_parent"
+                        android:layout_below="@+id/s123_temp_img"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="@{TempValue}"
+                        android:textAlignment="center"
+                        android:visibility="@{showTemp}" />
+                </RelativeLayout>
+            </LinearLayout>
 
+        </RelativeLayout>
     </RelativeLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_battery_state_layout.xml b/app/src/main/res/layout/widget_battery_state_layout.xml
index 754ff2c..a592951 100644
--- a/app/src/main/res/layout/widget_battery_state_layout.xml
+++ b/app/src/main/res/layout/widget_battery_state_layout.xml
@@ -6,6 +6,7 @@
 
     <TextView
         android:id="@+id/battery_tv"
+        android:layout_marginTop="5dp"
         android:layout_width="50dp"
         android:layout_height="30dp"
         android:includeFontPadding="false"
diff --git a/app/src/main/res/mipmap-mdpi/bodytemp.png b/app/src/main/res/mipmap-mdpi/bodytemp.png
index 03182ea..ae84dea 100644
Binary files a/app/src/main/res/mipmap-mdpi/bodytemp.png and b/app/src/main/res/mipmap-mdpi/bodytemp.png differ
diff --git a/app/src/main/res/mipmap-mdpi/heartrate.png b/app/src/main/res/mipmap-mdpi/heartrate.png
index 076db9a..6278e47 100644
Binary files a/app/src/main/res/mipmap-mdpi/heartrate.png and b/app/src/main/res/mipmap-mdpi/heartrate.png differ
diff --git a/app/src/main/res/mipmap-mdpi/outtemp.png b/app/src/main/res/mipmap-mdpi/outtemp.png
index 420b4a1..5d809a8 100644
Binary files a/app/src/main/res/mipmap-mdpi/outtemp.png and b/app/src/main/res/mipmap-mdpi/outtemp.png differ
diff --git a/app/src/main/res/mipmap-mdpi/spo2.png b/app/src/main/res/mipmap-mdpi/spo2.png
index aaf2a12..3c24a7b 100644
Binary files a/app/src/main/res/mipmap-mdpi/spo2.png and b/app/src/main/res/mipmap-mdpi/spo2.png differ
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 6bee655..4b1c12c 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -137,6 +137,6 @@
 	<string name="activity_temp_outside">周囲温度</string>
 
 	<string name="app_h88_qrcode">QRコード</string>
-	<string name="app_h88_temperature">たいおん</string>
+	<string name="app_h88_temperature">体温</string>
 	<string name="app_h88_language">言語</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3031f4e..3bb3e1c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -31,7 +31,7 @@
     <style name="watchDateTextStyle">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:textSize">42sp</item>
+        <item name="android:textSize">40sp</item>
         <item name="android:textColor">#FFFFFF</item>
         <item name="android:includeFontPadding">false</item>
         <item name="android:layout_marginTop">5dp</item>
@@ -61,7 +61,6 @@
     <style name="watchDateIconTextS123Style" parent="watchDateIconStyle">
         <item name="android:textSize">26sp</item>
         <item name="android:textColor">#FFFFFF</item>
-        <item name="android:layout_marginStart">20dp</item>
         <item name="android:includeFontPadding">false</item>
         <item name="android:layout_marginBottom">5dp</item>
     </style>
diff --git a/app/version_code.properties b/app/version_code.properties
index 5a8f32e..ea91525 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Nov 05 11:08:58 CST 2020
-VERSION_CODE=171
+#Thu Nov 05 20:14:54 CST 2020
+VERSION_CODE=172