release V1_5.0 202008211944

添加A9中文配置，A9英文开启 message图标

diff --git a/.idea/misc.xml b/.idea/misc.xml
index fdba094..0eebcd7 100644 (file)
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,7 +6,7 @@
     <option name="priority" value="Medium" />
     <option name="excludeFilter" value="" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644 (file)
index 0000000..9661ac7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project version="4">\r
+  <component name="VcsDirectoryMappings">\r
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />\r
+  </component>\r
+</project>
\ No newline at end of file

diff --git a/app/IcA9Launcher/release/IcA9Launcher_V1_5.0_202008211944_release.apk b/app/IcA9Launcher/release/IcA9Launcher_V1_5.0_202008211944_release.apk
new file mode 100644 (file)
index 0000000..cce7b33
Binary files /dev/null and b/app/IcA9Launcher/release/IcA9Launcher_V1_5.0_202008211944_release.apk differ

diff --git a/app/IcA9Launcher/release/output-metadata.json b/app/IcA9Launcher/release/output-metadata.json
index 6a30b8a..6494a93 100644 (file)
--- a/app/IcA9Launcher/release/output-metadata.json
+++ b/app/IcA9Launcher/release/output-metadata.json
@@ -14,7 +14,7 @@
       "versionCode": 1,
       "versionName": "5.0",
       "enabled": true,
-      "outputFile": "IcA9Launcher_V1_5.0_202008171714_release.apk"
+      "outputFile": "IcA9Launcher_V1_5.0_202008211944_release.apk"
     }
   ]
 }
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 69ae875..1ce6a84 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,7 +54,13 @@ android {
             buildConfigField "int", "productType", "1002"
 
         }
+        IcA9LauncherCN{
+            flavorDimensions "IcA9LauncherCN"
+            versionCode 1
+            versionName "5.0"
+            buildConfigField "int", "productType", "1003"
 
+        }
         IcAkLauncher{
             flavorDimensions "IcAkLauncher"
             versionCode 1

diff --git a/app/src/main/java/com/ic/ak/launcher/data/app/AppConfig.java b/app/src/main/java/com/ic/ak/launcher/data/app/AppConfig.java
index 4334891..dfa3029 100644 (file)
--- a/app/src/main/java/com/ic/ak/launcher/data/app/AppConfig.java
+++ b/app/src/main/java/com/ic/ak/launcher/data/app/AppConfig.java
@@ -12,6 +12,8 @@ final public class AppConfig {
                 return AK_APP_LIST;
             case 1002:
                 return A9_APP_LIST;
+            case 1003:
+                return A9_CN_APP_LIST;
             default:
                 return AK_APP_LIST;
         }
@@ -60,10 +62,10 @@ final public class AppConfig {
     };
 
     private final static AppItem[] A9_APP_LIST = new AppItem[]{
-        /**    new AppItem(R.string.a9_app_title_message, R.mipmap.a9_app_icon_message,-1,
+            new AppItem(R.string.a9_app_title_message, R.mipmap.a9_app_icon_message,-1,
                     null, null,
                     "com.ic.message", "com.ic.message.MainActivity"),
-        */
+
             new AppItem(R.string.a9_app_title_health, R.mipmap.a9_app_icon_healthy,-1,
                     null, null,
                     "com.ic.ak.hardware", "com.ic.ak.hardware.ui.a9.BloodA9Activity"),
@@ -80,11 +82,42 @@ final public class AppConfig {
                     null, null,
                     "com.ic.ak.hardware", "com.ic.ak.hardware.ui.a9.PedometerA9Activity"),
             /**new AppItem(R.string.a9_app_title_contacts, R.mipmap.a9_app_icon_contacts,-1,
-                    null, null,
-                    "com.enqualcomm.imessage", "com.enqualcomm.imessage.ui.PhoneDirectoryActivity"),
+            null, null,
+            "com.enqualcomm.imessage", "com.enqualcomm.imessage.ui.PhoneDirectoryActivity"),
             new AppItem(R.string.a9_app_title_dial, R.mipmap.a9_app_icon_dial,
+            null, null,
+            "com.ic.dial", "com.ic.dial.MainActivity"),**/
+            new AppItem(R.string.a9_app_title_setting, R.mipmap.a9_app_icon_setting,-1,
+                    null, null,
+                    "com.ic.setting", "com.ic.setting.MainActivity")
+    };
+
+    private final static AppItem[] A9_CN_APP_LIST = new AppItem[]{
+            new AppItem(R.string.a9_app_title_message, R.mipmap.a9_app_icon_message,-1,
+                    null, null,
+                    "com.ic.message", "com.ic.message.MainActivity"),
+
+            new AppItem(R.string.a9_app_title_health, R.mipmap.a9_app_icon_healthy,-1,
+                    null, null,
+                    "com.ic.ak.hardware", "com.ic.ak.hardware.ui.a9.BloodA9Activity"),
+            new AppItem(R.string.a9_app_title_temperature, R.mipmap.a9_app_icon_temp,-1,
+                    null, null,
+                    "com.ic.ak.hardware", "com.ic.ak.hardware.ui.a9.TemperatureA9Activity"),
+            new AppItem(R.string.a9_app_title_camera, R.mipmap.a9_app_icon_camera,-1,
+                    null, null,
+                    "com.ic.camera", "com.ic.camera.MainActivity"),
+            new AppItem(R.string.a9_app_title_album, R.mipmap.a9_app_icon_album,-1,
+                    null, null,
+                    "com.ic.album", "com.ic.album.MainActivity"),
+            new AppItem(R.string.a9_app_title_pedometer, R.mipmap.a9_app_icon_walk,-1,
                     null, null,
-                    "com.ic.dial", "com.ic.dial.MainActivity"),**/
+                    "com.ic.ak.hardware", "com.ic.ak.hardware.ui.a9.PedometerA9Activity"),
+           new AppItem(R.string.a9_app_title_contacts, R.mipmap.a9_app_icon_contacts,-1,
+            null, null,
+            "com.enqualcomm.imessage", "com.enqualcomm.imessage.ui.PhoneDirectoryActivity"),
+            new AppItem(R.string.a9_app_title_dial, R.mipmap.a9_app_icon_dial, -1,
+            null, null,
+            "com.ic.dial", "com.ic.dial.MainActivity"),
             new AppItem(R.string.a9_app_title_setting, R.mipmap.a9_app_icon_setting,-1,
                     null, null,
                     "com.ic.setting", "com.ic.setting.MainActivity")