From: snickersun <scy@incartech.cn>
Date: Fri, 6 Nov 2020 07:49:42 +0000 (+0800)
Subject: release V175
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=11233cd4fe5a016374e27d59ea8d1a7080536689;p=launcher4.git

release V175
低电提示和关机电压 改为可以配置。
persist.sys.icLowpowerLevel默认15
persist.sys.icShutdownLevel默认5
修改默认语言英文，修改泰文翻译，优化桌面布局。
---

diff --git a/app/release/ICL02Launcher_V173_202011060935_release.apk b/app/release/ICL02Launcher_V175_202011061547_release.apk
similarity index 54%
rename from app/release/ICL02Launcher_V173_202011060935_release.apk
rename to app/release/ICL02Launcher_V175_202011061547_release.apk
index fe87496..509c131 100644
Binary files a/app/release/ICL02Launcher_V173_202011060935_release.apk and b/app/release/ICL02Launcher_V175_202011061547_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 44ca8bc..4160e9a 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":173,"versionName":"202011060935","enabled":true,"outputFile":"ICL02Launcher_V173_202011060935_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Launcher_V173_202011060935_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":175,"versionName":"202011061547","enabled":true,"outputFile":"ICL02Launcher_V175_202011061547_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Launcher_V175_202011061547_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/launcher/presenter/BatteryPresenter.java b/app/src/main/java/com/ic/launcher/presenter/BatteryPresenter.java
index 086e976..4c6b3e4 100644
--- a/app/src/main/java/com/ic/launcher/presenter/BatteryPresenter.java
+++ b/app/src/main/java/com/ic/launcher/presenter/BatteryPresenter.java
@@ -16,6 +16,7 @@ import androidx.lifecycle.MediatorLiveData;
 import com.ic.launcher.configure.l02.L02Icon;
 import com.ic.launcher.util.IcLog;
 import com.ic.launcher.util.SoundPlayUtils;
+import com.ic.launcher.util.SystemUtils;
 import com.ic.launcher.util.VibrateUtil;
 
 import java.util.ArrayList;
@@ -24,9 +25,19 @@ import java.util.ArrayList;
 public class BatteryPresenter extends PresenterCycle {
     private static final String TAG = "BatteryPresenter";
 
-    private static final int LOW_LEVEL = 15;
-    private static final int SHUT_DOWN_LEVEL = 5;
-
+    private static int LOW_LEVEL = 15;
+    private static int SHUT_DOWN_LEVEL = 5;
+
+    static {
+        String lowlevel=SystemUtils.getSystemPropertiesString("persist.sys.icLowpowerLevel","15");
+        try{
+            LOW_LEVEL=Integer.parseInt(lowlevel);
+        }catch (Exception e){}
+        String shutlevel=SystemUtils.getSystemPropertiesString("persist.sys.icShutdownLevel","5");
+        try{
+            SHUT_DOWN_LEVEL=Integer.parseInt(shutlevel);
+        }catch (Exception e){}
+    }
     private Context mContext;
 
     private SoundPlayUtils playUtils;
diff --git a/app/src/main/res/layout/fragment_l02_main.xml b/app/src/main/res/layout/fragment_l02_main.xml
index 49c011d..cf5bb0b 100644
--- a/app/src/main/res/layout/fragment_l02_main.xml
+++ b/app/src/main/res/layout/fragment_l02_main.xml
@@ -72,15 +72,15 @@
             name="gpsStatus"
             type="boolean" />
 
-        <variable
-            name="showHR"
-            type="int" />
         <variable
             name="showTemp"
             type="int" />
         <variable
             name="showStep"
             type="int" />
+        <variable
+            name="showHR"
+            type="int" />
 
         <variable
             name="heartValue"
@@ -104,24 +104,26 @@
             android:id="@+id/main_status"
             android:layout_width="match_parent"
             android:layout_height="@dimen/status_bar_height_dm"
-            android:layout_marginTop="10dp">
+            android:layout_marginTop="20dp">
 
             <com.ic.launcher.widget.WidgetPhoneStateView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 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"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
+                android:layout_marginTop="10dp"
                 android:layout_marginEnd="10dp"
                 app:batteryCharge="@{batteryCharge}"
                 app:batteryDrawable="@{batteryDrawable}"
@@ -135,7 +137,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/main_status"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="25dp"
+            android:layout_marginTop="10dp"
             app:hourBitResId="@{hourBit}"
             app:hourTenResId="@{hourTen}"
             app:minuteBitResId="@{minuteBit}"
@@ -148,69 +150,188 @@
             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>
+    <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:visibility="@{showTemp}"
+                android:gravity="center">
+
+                <ImageView
+                    android:id="@+id/l02_temp_out"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:visibility="@{showTemp}"
+                    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:visibility="@{showTemp}"
+                    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:visibility="@{showTemp}"
+                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>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:visibility="@{showStep}"
+                android:gravity="center">
+                <ImageView
+                    android:id="@+id/l02_pedometer_img"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:layout_alignLeft="@+id/l02_pedometer_value"
+                    android:layout_alignRight="@+id/l02_pedometer_value"
+                    android:visibility="@{showStep}"
+                    android:src="@mipmap/clockl02_pedometer" />
+
+                <TextView
+                    android:id="@+id/l02_pedometer_value"
+                    style="@style/watchDateIconTextS123Style"
+                    android:layout_width="match_parent"
+                    android:layout_below="@+id/l02_pedometer_img"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:visibility="@{showStep}"                    
+                    android:text="@{stepValue}" />
+            </RelativeLayout>
+        </LinearLayout>
 
-        <TextView
-            style="@style/watchDateTextStyle"
-            android:layout_below="@id/l02_time_image"
-            android:layout_marginStart="8dp"
-            android:layout_toEndOf="@id/l02_time_sp"
-            android:text="@{watchWeek}"/>
-
-        <ImageView
-            android:id="@+id/l02_heart_img"
-            style="@style/watchDateIconStyle"
-            android:layout_alignParentStart="true"
-            android:layout_marginStart="10dp"
-            android:visibility="@{showHR}"
-            android:src="@mipmap/clockl02_heartrate_icon" />
-
-        <TextView
-            android:id="@+id/l02_heart_value"
-            style="@style/watchDateIconTextStyle"
-            android:layout_marginStart="5dp"
-            android:visibility="@{showHR}"
-            android:layout_toEndOf="@id/l02_heart_img"
-            android:text="@{heartValue}" />
-        <ImageView
-            android:id="@+id/s123_spo2_img"
-            style="@style/watchDateIconStyle"
-            android:layout_width="44dp"
-            android:layout_height="47dp"
-            android:visibility="@{showHR}"
-            android:layout_toEndOf="@id/l02_heart_value"
-            android:src="@mipmap/spo2" />
-
-        <TextView
-            android:id="@+id/l02_spo2_value"
-            style="@style/watchDateIconTextStyle"
-            android:layout_marginStart="2dp"
-            android:visibility="@{showHR}"
-            android:layout_toEndOf="@id/s123_spo2_img"
-            android:text="@{spo2value}" />
-        <ImageView
-            android:id="@+id/l02_pedometer_img"
-            style="@style/watchDateIconStyle"
-            android:layout_toEndOf="@id/l02_spo2_value"
-            android:visibility="@{showStep}"
-            android:src="@mipmap/clockl02_pedometer" />
-
-        <TextView
-            android:id="@+id/l02_pedometer_value"
-            style="@style/watchDateIconTextStyle"
-            android:layout_marginStart="2dp"
-            android:visibility="@{showStep}"
-            android:layout_toEndOf="@id/l02_pedometer_img"
-            android:text="@{stepValue}" />
 
 
 
+    </RelativeLayout>
     </RelativeLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 4d8199a..f9f53aa 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -1,14 +1,14 @@
 <resources>
-	<string name="app_name">Watch</string>
+
 	<!-- 主菜单文本 -->
 
+  	
 	<string name="app_name_heart">Health</string>
 	<string name="app_name_heartRate">HeartRateMonitor</string>
 	<string name="error_start_activity">failed to run Application !</string>
 
-	<string name="app_h88_qrcode">QR Code</string>
-	<string name="app_h88_temperature">TEMP</string>
-	<string name="app_h88_language">Language</string>
+	<string name="app_name">Watch</string>
+
 
 	<string name="main_manu_settings">Settings</string>
 	<string name="main_manu_family">My Family</string>
@@ -58,6 +58,9 @@
     -->
 	<string name="select_clock_theme">Dial</string>
 	<string name="select_main_menu_background">Background</string>
+	<string name="app_h88_qrcode">QR Code</string>
+	<string name="app_h88_temperature">TEMP</string>
+	<string name="app_h88_language">Language</string>
 	<string name="app_dialer">Dialer</string>
 	<string name="app_ContactName">Contacts</string>
 	<string name="app_TelePhone">Call</string>
@@ -139,6 +142,7 @@
 
 	<string name="activity_temp_str">BODY</string>
 	<string name="activity_temp_wrist_str">WRIST</string>
+    <string name="activity_temp_unit">℃</string>
 	<string name="activity_temp_tips_check">MEASURING</string>
 	<string name="activity_temp_tips_end">COMPLETE</string>
 	<string name="activity_temp_outside">TEMPOut</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 59343d9..7c6b8e0 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -18,7 +18,7 @@
 	<string name="no_qr_code">ไม่มี QR Code</string>
 	<string name="low_power_mode">โหมดพลังงานต่ำ</string>
 	<string name="please_insert_sim_card">กรุณาใส่ซิมการ์ด</string>
-
+	<string name="app_Camera_h88">ขีดกากบาท</string>
 	<string name="pedometer_unit_step">Step</string>
 	<string name="pedometer_setting_unit_step">Step</string>
 	<string name="pedometer_unit_calorie">cal</string>
@@ -124,13 +124,13 @@
     <string name="main_menu_style_single_icon">Single icon</string>
     <string name="program_abnormal">Sorry, the program is abnormal and will quit!</string>
 	<string name="please_wait">Please wait...</string>
-	<string name="monday">จันทร์</string>
-	<string name="tuesday">อังคาร</string>
-	<string name="wednesday">พุธ</string>
-	<string name="thursday">วันพฤหัสบดี</string>
-	<string name="friday">ศุกร์</string>
-	<string name="saturday">วันเสาร์</string>
-	<string name="sunday">อาทิตย์</string>
+	<string name="monday">Mon</string>
+	<string name="tuesday">Tue</string>
+	<string name="wednesday">Wed</string>
+	<string name="thursday">Thu</string>
+	<string name="friday">Fri</string>
+	<string name="saturday">Sat</string>
+	<string name="sunday">Sun</string>
 
 	<string name="activity_temp_str">คน</string>
 	<string name="activity_temp_wrist_str">ข้อมือ</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e4bab21..1aa411f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -140,6 +140,7 @@
 
     <string name="activity_temp_str">体温</string>
     <string name="activity_temp_wrist_str">腕温</string>
+    <string name="activity_temp_unit">℃</string>
     <string name="activity_temp_tips_check">正在测量</string>
     <string name="activity_temp_tips_end">测量完成</string>
     <string name="activity_temp_outside">环境温度</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9fc79e9..678a27d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,147 +1,144 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name_heart" translatable="false">爱健康</string>
-    <string name="app_name_heartRate">心率监控</string>
-    <string name="error_start_activity" translatable="false">应用程序启动失败</string>
+    	
+    	<string name="app_name_heart">Health</string>
+	<string name="app_name_heartRate">HeartRateMonitor</string>
+	<string name="error_start_activity">failed to run Application !</string>
 
-    <string name="app_name" translatable="false">手表</string>
+	<string name="app_name">Watch</string>
 
     <!-- 主菜单文本 -->
-    <string name="main_manu_settings" translatable="false">设置</string>
-    <string name="main_manu_family" translatable="false">我的家人</string>
-    <string name="main_manu_friend" translatable="false">我的朋友</string>
-
-    <string name="weather_network_not_available" translatable="false">当前无可用网络</string>
-    <string name="weather_get_data_failed" translatable="false">无法获取数据，请稍候</string>
-    <string name="weather_forecast" translatable="false">天气</string>
-    <string name="weather_today" translatable="false">今天</string>
-    <string name="weather_tomorrow" translatable="false">明天</string>
-    <string name="weather_yesterday" translatable="false">昨天</string>
-
-    <string name="no_qr_code" translatable="false">没有二维码</string>
-    <string name="low_power_mode" translatable="false">低电量模式</string>
-    <string name="please_insert_sim_card" translatable="false">当前无 SIM 卡</string>
-
-    <string name="pedometer_unit_step" translatable="false">æ­¥</string>
-    <string name="pedometer_setting_unit_step" translatable="false">æ­¥</string>
-    <string name="pedometer_unit_calorie" translatable="false">卡</string>
-    <string name="pedometer_unit_km" translatable="false">公里</string>
-    <string name="pedometer_history_7days" translatable="false">最近记录</string>
-    <string name="pedometer_today" translatable="false">今日</string>
-    <string name="pedometer_goal" translatable="false">目标</string>
-    <string name="pedometer_input_goal" translatable="false">请输入目标步数</string>
-    <string name="pedometer_invalid_input" translatable="false">输入值无效</string>
-    <string name="pedometer_height" translatable="false">身高</string>
-    <string name="pedometer_weight" translatable="false">体重</string>
-    <string name="pedometer_unit_cm" translatable="false">厘米</string>
-    <string name="pedometer_unit_kg" translatable="false">千克</string>
-    <string name="pedometer_personal_info_settings" translatable="false">个人设置</string>
-    <string name="_0" translatable="false">0</string>
-    <string name="averagestep">平均步数</string>
-    <string name="sumstep">总步数</string>
-    <string name="pedometer_unit_lb">磅</string>
-    <string name="pedometer_unit_mile">英里</string>
-    <string name="pedometer_unit_inch">英寸</string>
-    <string name="pedometer_unit_foot">英尺</string>
-    <string name="reached_step_goal">已达到目标步数</string>
-
-    <string name="select_clock_theme">时钟主题</string>
-    <string name="select_main_menu_background">菜单背景</string>
-
-    <string name="app_h88_qrcode">二维码</string>
-    <string name="app_h88_temperature">体温</string>
-    <string name="app_h88_language">语言</string>
-
-    <string name="app_dialer">拨号</string>
-    <string name="app_ContactName" translatable="false">联系人</string>
-    <string name="app_TelePhone">电话</string>
-    <string name="app_VoLTE">高清通话</string>
-    <string name="app_calllog">通话记录</string>
-    <string name="app_Sms">短信</string>
-    <string name="app_VideoCall">视频通话</string>
-    <string name="app_title_sedentary">久坐提醒</string>
-    <string name="app_title_sleep">睡眠监测</string>
-    <string name="app_Wechat">微信</string>
-    <string name="app_Chat">微聊</string>
-    <string name="app_Camera">照相</string>
-    <string name="app_Camera_h88">核验</string>
-    <string name="app_Album">相册</string>
-    <string name="app_Guiding">指路</string>
-    <string name="app_MakeFriends">交友</string>
-    <string name="app_GrindingEars">磨耳朵</string>
-    <string name="app_AnsweredQuestions">有问必答</string>
-    <string name="app_AiKnowledge">爱知识</string>
-    <string name="app_EncyclopediaKnowledge">百科知识</string>
-    <string name="app_MagicEncyclopedia">魔法百科</string>
-    <string name="app_Weather">天气</string>
-    <string name="app_VoiceAssistant">语音助手</string>
-    <string name="app_Tool">工具</string>
-    <string name="app_Settings">设置</string>
-    <string name="app_English">听英语</string>
-    <string name="app_Story">故事</string>
-    <string name="app_Recorder">录音机</string>
-    <string name="app_Music">音乐</string>
-    <string name="app_StopWatch">秒表</string>
-    <string name="app_Calculator">计算器</string>
-    <string name="app_Calendar">日历</string>
-    <string name="app_clearRam">清理内存</string>
-    <string name="app_Sport">运动</string>
-    <string name="app_practise">自由锻炼</string>
-    <string name="app_practising">自由锻炼中</string>
-    <string name="app_practise_stoped">锻炼已停止</string>
-    <string name="app_xu_yuan_xing">许愿星</string>
-    <string name="app_qr_code">CID</string>
-    <string name="app_HeartRate">心率</string>
-    <string name="app_custom_Chat">聊天</string>
-    <string name="app_AliPay">支付宝</string>
-    <string name="app_BloodPressure">血压</string>
-    <string name="app_drama">戏曲</string>
-    <string name="app_down_remote_app">APP下载</string>
-    <string name="down_remote_app">下载手机应用 APP</string>
+	<string name="main_manu_settings">Settings</string>
+	<string name="main_manu_family">My Family</string>
+	<string name="main_manu_friend">My Friends</string>
+	<string name="weather_network_not_available">Network is not available</string>
+	<string name="weather_get_data_failed">Get data failed, please wait</string>
+	<string name="weather_forecast">Weather forecast</string>
+	<string name="weather_today">Today</string>
+	<string name="weather_tomorrow">Tomorrow</string>
+	<string name="weather_yesterday">Yesterday</string>
+
+	<string name="no_qr_code">No qr code</string>
+	<string name="low_power_mode">Low Power Mode</string>
+	<string name="please_insert_sim_card">Please insert the SIM card</string>
+
+	<string name="pedometer_unit_step">Steps</string>
+	<string name="pedometer_setting_unit_step">Steps</string>
+	<string name="pedometer_unit_calorie">Cal</string>
+	<string name="pedometer_unit_km">km</string>
+	<string name="pedometer_history_7days">History</string>
+	<string name="pedometer_today">Today</string>
+	<string name="pedometer_goal">Goal</string>
+	<string name="pedometer_input_goal">Please enter the goal number of steps</string>
+	<string name="pedometer_invalid_input">Invalid input value</string>
+	<string name="pedometer_height">Height</string>
+	<string name="pedometer_weight">Weight</string>
+	<string name="pedometer_unit_cm">cm</string>
+	<string name="pedometer_unit_kg">kg</string>
+	<string name="pedometer_personal_info_settings">Pedometer settings</string>
+	<string name="_0">0</string>
+	<string name="averagestep">Average step</string>
+	<string name="sumstep">Sum step</string>
+	<string name="pedometer_unit_lb">lb</string>
+	<string name="pedometer_unit_mile">mile</string>
+	<string name="pedometer_unit_inch">inch</string>
+	<string name="pedometer_unit_foot">foot</string>
+	<string name="reached_step_goal">Have Reached Target Steps</string>
+
+	<string name="select_clock_theme">Dial</string>
+	<string name="select_main_menu_background">Background</string>
+
+	<string name="app_h88_qrcode">QR Code</string>
+	<string name="app_h88_temperature">TEMP</string>
+	<string name="app_h88_language">Language</string>
+
+	<string name="app_dialer">Dialer</string>
+	<string name="app_ContactName">Contacts</string>
+	<string name="app_TelePhone">Call</string>
+	<string name="app_VoLTE">VoLTE Call</string>
+	<string name="app_calllog">CallLog</string>
+	<string name="app_title_sedentary">Sedentary</string>
+	<string name="app_title_sleep">Sleep</string>
+	<string name="app_Sms">Message</string>
+	<string name="app_VideoCall">VideoCall</string>
+	<string name="app_Wechat">We chat</string>
+	<string name="app_Chat">Chat</string>
+	<string name="app_Camera">Camera</string>
+	<string name="app_Camera_h88">Check</string>
+	<string name="app_Album">Photos</string>
+	<string name="app_Guiding">map</string>
+	<string name="app_MakeFriends">Buddy</string>
+	<string name="app_GrindingEars">GrindingEars</string>
+	<string name="app_AnsweredQuestions">AnsweredQuestions</string>
+	<string name="app_AiKnowledge">AiKnowledge</string>
+	<string name="app_EncyclopediaKnowledge">EncyclopediaKnowledge</string>
+	<string name="app_MagicEncyclopedia">MagicEncyclopedia</string>
+	<string name="app_Weather">Weather</string>
+	<string name="app_VoiceAssistant">VoiceAssistant</string>
+	<string name="app_Tool">Tool</string>
+	<string name="app_Settings">Settings</string>
+	<string name="app_English">English</string>
+	<string name="app_Story">Story</string>
+	<string name="app_Recorder">Recorder</string>
+	<string name="app_Music">Music</string>
+	<string name="app_StopWatch">Timer</string>
+	<string name="app_Calculator">Calculator</string>
+	<string name="app_Calendar">Calendar</string>
+	<string name="app_clearRam">Clear</string>
+	<string name="app_Sport">Fitness</string>
+	<string name="app_practise">Practice</string>
+	<string name="app_practising">Practising</string>
+	<string name="app_practise_stoped">PracticeStoped</string>
+	<string name="app_xu_yuan_xing">Wishing Star</string>
+	<string name="app_qr_code">QR Code</string>
+	<string name="app_HeartRate">Heart Rate</string>
+	<string name="app_custom_Chat">Chat</string>
+	<string name="app_AliPay">AliPay</string>
+	<string name="app_BloodPressure">Blood Pressure</string>
+	<string name="app_drama">Drama</string>
+	<string name="app_down_remote_app">remote app</string>
+	<string name="down_remote_app">Download Remote App</string>
 
     <!--iMessage begin-->
-    <string name="imessage_remind">无联系人,请检测网络</string>
-    <string name="imessage_contact">联系人</string>
+	<string name="imessage_remind">No contact, please check the network</string>
+	<string name="imessage_contact">Contacts</string>
     <!--iMessage end-->
 
-    <string name="change_brightness">更改亮度</string>
-    <string name="change_volume">更改音量</string>
-    <string name="silent_mode">课堂模式</string>
+	<string name="change_brightness">Change brightness</string>
+	<string name="change_volume">Change volume</string>
+	<string name="silent_mode">Classroom mode</string>
 
     <!--系统升级提示-->
-    <string name="system_upgrade" translatable="false">系统升级</string>
-    <string name="is_upgrade_version" translatable="false">发现新版本，是否升级到</string>
-    <string name="system_upgrade_tips" translatable="false">发现新版本，是否升级？</string>
-    <string name="yes" translatable="false">确定</string>
-    <string name="no" translatable="false">取消</string>
-    <string name="question_mark" translatable="false">？</string>
-    <!--系统升级提示-->
-
-    <string name="sim_blocked" translatable="false">此 SIM 卡不支持</string>
-    <string name="select_main_menu_style" translatable="false">主菜单风格</string>
-    <string name="main_menu_style_multi_icon" translatable="false">多图标</string>
-    <string name="main_menu_style_single_icon" translatable="false">单图标</string>
-    <string name="program_abnormal" translatable="false">很抱歉,程序出现异常,即将退出</string>
-    <string name="please_wait" translatable="false">请稍候…</string>
-    <string name="monday" translatable="false">星期一</string>
-    <string name="tuesday" translatable="false">星期二</string>
-    <string name="wednesday" translatable="false">星期三</string>
-    <string name="thursday" translatable="false">星期四</string>
-    <string name="friday" translatable="false">星期五</string>
-    <string name="saturday" translatable="false">星期六</string>
-    <string name="sunday" translatable="false">星期日</string>
-
-
-    <string name="all_group" translatable="false">所有人</string>
+	<string name="system_upgrade">System upgrade</string>
+	<string name="is_upgrade_version">Find the new version, whether to upgrade to</string>
+	<string name="system_upgrade_tips">Find the new version, whether to upgrade?</string>
+	<string name="yes">YES</string>
+	<string name="no">NO</string>
+	<string name="question_mark">"?"</string>
+	<!--系统升级提示-->
+	<string name="sim_blocked">SIM blocked</string>
+	<string name="select_main_menu_style">Select main menu style</string>
+	<string name="main_menu_style_multi_icon">Multi icon</string>
+	<string name="main_menu_style_single_icon">Single icon</string>
+	<string name="program_abnormal">Sorry, the program is abnormal and will quit!</string>
+	<string name="please_wait">Please wait...</string>
+	<string name="monday">Mon</string>
+	<string name="tuesday">Tue</string>
+	<string name="wednesday">Wed</string>
+	<string name="thursday">Thu</string>
+	<string name="friday">Fri</string>
+	<string name="saturday">Sat</string>
+	<string name="sunday">Sun</string>
+	<string name="all_group">All</string>
 
     <!--IC ADD-->
-    <string name="ic_high_pressure" translatable="false">高压</string>
-    <string name="ic_low_pressure" translatable="false">低压</string>
+	<string name="ic_high_pressure">HP</string>
+	<string name="ic_low_pressure">LP</string>
 
-    <string name="activity_temp_str">体温</string>
-    <string name="activity_temp_wrist_str">腕温</string>
+	<string name="activity_temp_str">BODY</string>
+	<string name="activity_temp_wrist_str">WRIST</string>
     <string name="activity_temp_unit">℃</string>
-    <string name="activity_temp_tips_check">正在测量</string>
-    <string name="activity_temp_tips_end">测量完成</string>
-    <string name="activity_temp_outside">环境温度</string>
+	<string name="activity_temp_tips_check">MEASURING</string>
+	<string name="activity_temp_tips_end">COMPLETE</string>
+	<string name="activity_temp_outside">TEMPOut</string>
 </resources>
\ No newline at end of file
diff --git a/app/version_code.properties b/app/version_code.properties
index 2384b78..7309d1f 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Nov 06 09:35:38 CST 2020
-VERSION_CODE=173
+#Fri Nov 06 15:47:04 CST 2020
+VERSION_CODE=175