From: snickersun <scy@incartech.cn>
Date: Tue, 29 Sep 2020 02:31:36 +0000 (+0800)
Subject: release V155
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=e0f5bc02291845ea70701c041652536da0475fe0;p=launcher4.git

release V155
添加设备ViTrack S123支持
---

diff --git a/app/release/ICL02Launcher_V151_202009161505_release.apk b/app/release/ICL02Launcher_V155_202009282036_release.apk
similarity index 53%
rename from app/release/ICL02Launcher_V151_202009161505_release.apk
rename to app/release/ICL02Launcher_V155_202009282036_release.apk
index 6402728..d39c9af 100644
Binary files a/app/release/ICL02Launcher_V151_202009161505_release.apk and b/app/release/ICL02Launcher_V155_202009282036_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index d6165cc..79a0b2d 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":151,"versionName":"202009161505","enabled":true,"outputFile":"ICL02Launcher_V151_202009161505_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Launcher_V151_202009161505_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":155,"versionName":"202009282036","enabled":true,"outputFile":"ICL02Launcher_V155_202009282036_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Launcher_V155_202009282036_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java b/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java
index e9764a3..35d77f2 100644
--- a/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java
+++ b/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java
@@ -33,6 +33,8 @@ public class L02AppInfo {
         String language = locale.getLanguage();
         if (SystemUtils.isH88()) {
             return mH88AppList;
+        }else if (SystemUtils.isS123()){
+            return mS123DefaultAppList;
         }else{
             if (language.contains("zh")) {
                 return mL02DefaultAppList;
@@ -41,6 +43,66 @@ public class L02AppInfo {
             }
         }
     }
+    /**
+     * 拨号的顺序不能变 在低电量模式下会查找这个列表，然后查找索引为1的拨号，
+     * 如果要修改 请到 {@link  LowPowerModeFragment} 中一并修改
+     **/
+    private static final List<AppInfoEntity> mS123DefaultAppList = new ArrayList<AppInfoEntity>() {
+        {
+
+            //体温
+            if(temperature_sensor_available) {
+                add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_temperature_h88, R.string.app_h88_temperature,
+                        "com.ic.launcher", "com.ic.launcher.AnimalHeatActivity"));
+            }
+            //心率
+            if(ppg_ecg_sensor_available) {
+                add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_heartrate_l02, R.string.app_name_heartRate,
+                        "com.ic.blood", "com.ic.blood.BloodActivity"));
+            }
+            //运动
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_pedometer_l02, R.string.app_Sport,
+                    "com.ic.hardware", "com.ic.hardware.PedometerActivity"));
+            //联系人
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_contacts_l02, R.string.app_ContactName,
+                    "com.enqualcomm.imessage", "com.enqualcomm.imessage.ui.PhoneDirectoryActivity"));
+            //拨号
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_dialer_l02, R.string.app_dialer,
+                    "com.ic.dial", "com.ic.dial.MainActivity"));
+
+//            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_talk_l02, R.string.app_VideoCall,
+//                    "com.ic.somo.meeting", "com.ic.somo.meeting.MainActivity"));
+
+
+            //微聊
+//            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_talk_l02, R.string.app_Chat,
+//                    "com.enqualcomm.imessage", "com.enqualcomm.imessage.ui.MicroChatActivity"));
+//            //天气
+//            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_weather_l02, R.string.app_Weather,
+//                    "com.ic.weather", "com.ic.weather.WeatherActivity"));
+
+
+
+//            //支付包
+//            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_alipay_l02, R.string.app_AliPay,
+//                    "com.eg.android.AlipayGphone", "com.alipay.watch.ui.MainActivity"));
+            //相机
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_camera_l02, R.string.app_Camera,
+                    "com.eqc.camera", "com.eqc.camera.TakePictureActivity"));
+            //相册
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_albumn_l02, R.string.app_Album,
+                    "com.eqc.gallery", "com.eqc.gallery.ui.LocalAlbumDetail"));
+            //短信
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_sms_l02, R.string.app_Sms,
+                    "com.zmapp.sms", "com.zmapp.sms.MainActivity"));
+
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_language_h88, R.string.app_h88_language,
+                    "com.eqc.eqcguide", "com.eqc.eqcguide.MainActivity"));
+            //设置
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_settings_l02, R.string.main_manu_settings,
+                    "com.eqc.settings", "com.eqc.settings.MainActivity"));
+        }
+    };
 
     /**
      * 拨号的顺序不能变 在低电量模式下会查找这个列表，然后查找索引为1的拨号，
@@ -54,19 +116,23 @@ public class L02AppInfo {
             //拨号
             add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_dialer_l02, R.string.app_dialer,
                     "com.ic.dial", "com.ic.dial.MainActivity"));
+
+//            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_talk_l02, R.string.app_VideoCall,
+//                    "com.ic.somo.meeting", "com.ic.somo.meeting.MainActivity"));
+
             //运动
             add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_pedometer_l02, R.string.app_Sport,
                     "com.ic.hardware", "com.ic.hardware.PedometerActivity"));
             //微聊
-           add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_talk_l02, R.string.app_Chat,
-                    "com.enqualcomm.imessage", "com.enqualcomm.imessage.ui.MicroChatActivity"));
+//            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_talk_l02, R.string.app_Chat,
+//                    "com.enqualcomm.imessage", "com.enqualcomm.imessage.ui.MicroChatActivity"));
 //            //天气
 //            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_weather_l02, R.string.app_Weather,
 //                    "com.ic.weather", "com.ic.weather.WeatherActivity"));
             //心率
 
             if(ppg_ecg_sensor_available) {
-                add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_heartrate_l02, R.string.app_name_heart,
+                add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_heartrate_l02, R.string.app_name_heartRate,
                         "com.ic.blood", "com.ic.blood.BloodActivity"));
             }
             if(temperature_sensor_available) {
@@ -74,9 +140,9 @@ public class L02AppInfo {
                         "com.ic.launcher", "com.ic.launcher.AnimalHeatActivity"));
             }
 
-            //支付包
-            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_alipay_l02, R.string.app_AliPay,
-                    "com.eg.android.AlipayGphone", "com.alipay.watch.ui.MainActivity"));
+//            //支付包
+//            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_alipay_l02, R.string.app_AliPay,
+//                    "com.eg.android.AlipayGphone", "com.alipay.watch.ui.MainActivity"));
             //相机
             add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_camera_l02, R.string.app_Camera,
                     "com.eqc.camera", "com.eqc.camera.TakePictureActivity"));
@@ -108,7 +174,7 @@ public class L02AppInfo {
                     "com.ic.hardware", "com.ic.hardware.PedometerActivity"));
             //心率
             if(ppg_ecg_sensor_available) {
-                add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_heartrate_l02, R.string.app_name_heart,
+                add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_heartrate_l02, R.string.app_name_heartRate,
                         "com.ic.blood", "com.ic.blood.BloodActivity"));
             }
 
diff --git a/app/src/main/java/com/ic/launcher/util/SystemUtils.java b/app/src/main/java/com/ic/launcher/util/SystemUtils.java
index 7336eb2..af2b27a 100644
--- a/app/src/main/java/com/ic/launcher/util/SystemUtils.java
+++ b/app/src/main/java/com/ic/launcher/util/SystemUtils.java
@@ -51,6 +51,14 @@ public class SystemUtils {
         }
         return false;
     }
+    public static boolean isS123()
+    {
+        String launcher=getLauncherName();
+        if (launcher.equals("s123")){
+            return true;
+        }
+        return false;
+    }
 
     public static String getLauncherName(){
         String launchername=getSystemPropertiesString("persist.sys.launcherName","l02");
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index dccf667..b698bab 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -3,6 +3,7 @@
 	<!-- 主菜单文本 -->
 
 	<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>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index fe7c380..61c65f8 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
         <string name="app_name_heart">爱健康</string>
+    <string name="app_name_heartRate">心率监控</string>
         <string name="error_start_activity">应用程序启动失败</string>
 
     <string name="app_name">手表</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e87b4f5..ff1d733 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <?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" translatable="false">手表</string>
diff --git a/app/version_code.properties b/app/version_code.properties
index e869fd3..f76327e 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Sep 16 15:05:50 CST 2020
-VERSION_CODE=151
+#Mon Sep 28 20:36:41 CST 2020
+VERSION_CODE=155