release IcAkLauncher V1_5.0 202101031149

AK 去掉语音播报，修改app绑定为设备绑定

diff --git a/app/IcAkLauncher/release/IcAkLauncher_V1_5.0_202101031149_release.apk b/app/IcAkLauncher/release/IcAkLauncher_V1_5.0_202101031149_release.apk
new file mode 100644 (file)
index 0000000..70cf7c6
Binary files /dev/null and b/app/IcAkLauncher/release/IcAkLauncher_V1_5.0_202101031149_release.apk differ

diff --git a/app/IcAkLauncher/release/output-metadata.json b/app/IcAkLauncher/release/output-metadata.json
index 4bdcf0c..e52688d 100644 (file)
--- a/app/IcAkLauncher/release/output-metadata.json
+++ b/app/IcAkLauncher/release/output-metadata.json
@@ -1,20 +1,18 @@
 {
-  "version": 1,
+  "version": 2,
   "artifactType": {
     "type": "APK",
     "kind": "Directory"
   },
   "applicationId": "com.ic.ak.launcher",
-  "variantName": "IcAkLauncherRelease",
+  "variantName": "processIcAkLauncherReleaseResources",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
-      "properties": [],
       "versionCode": 1,
-      "versionName": "6.0",
-      "enabled": true,
-      "outputFile": "IcAkLauncher_V1_6.0_202010211045_release.apk"
+      "versionName": "5.0",
+      "outputFile": "IcAkLauncher_V1_5.0_202101031149_release.apk"
     }
   ]
 }
\ No newline at end of file

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 bb34e9d..28e8337 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
@@ -24,10 +24,14 @@ final public class AppConfig {
         }
     }
     public static AppItem[] getCurrentSystemAppListConfig() {
+        String launchername=sysProperties.get("persist.sys.launchername","ak");
 
         switch (productType){
             case 1001:
-                return AK_APP_LIST;
+                if(launchername.equals("ak"))
+                    return AK_APP_LIST;
+                else if(launchername.equals("ak2"))
+                    return AK2_APP_LIST;
             case 1002:
                 return A9_APP_LIST;
             case 1003:
@@ -37,6 +41,48 @@ final public class AppConfig {
         }
     }
 
+    private final static AppItem[] AK2_APP_LIST = new AppItem[]{
+//            new AppItem(R.string.app_title_living_home, R.mipmap.ak_app_icon_hotline,3,
+//                    null, null,
+//                    null, null),
+            new AppItem(R.string.app_title_dial, R.mipmap.ak_app_icon_dial,4,
+                    null, null,
+                    "com.ic.dial", "com.ic.dial.MainActivity"),
+            new AppItem(R.string.app_title_call_records, R.mipmap.ak_app_icon_call_records,15,
+                    null, null,
+                    "com.yjsoft.phonelog", "com.yjsoft.phonelog.MainActivity"),
+            new AppItem(R.string.app_title_message, R.mipmap.ak_app_icon_message,5,
+                    null, null,
+                    "com.ic.message", "com.ic.message.MainActivity"),
+            new AppItem(R.string.app_title_pedometer, R.mipmap.ak_app_icon_walk,6,
+                    null, null,
+                    "com.ic.ak.hardware", "com.ic.ak.hardware.ui.PedometerActivity"),
+            new AppItem(R.string.app_title_health, R.mipmap.ak_app_icon_healthy,7,
+                    null, null,
+                    "com.ic.ak.hardware", "com.ic.ak.hardware.ui.BloodActivity"),
+            new AppItem(R.string.app_title_sleep, R.mipmap.ak_app_icon_sleep,8,
+                    null, null,
+                    "com.ic.ak.hardware", "com.ic.ak.hardware.ui.SleepActivity"),
+            new AppItem(R.string.app_title_sedentary, R.mipmap.ak_app_icon_sedentary,9,
+                    null, null,
+                    "com.ic.ak.hardware", "com.ic.ak.hardware.ui.SedentaryActivity"),
+            new AppItem(R.string.app_title_camera, R.mipmap.ak_app_icon_camera,10,
+                    null, null,
+                    "com.eqc.camera", "com.eqc.camera.TakePictureActivity"),
+            new AppItem(R.string.app_title_album, R.mipmap.ak_app_icon_album,11,
+                    null, null,
+                    "com.eqc.gallery", "com.eqc.gallery.ui.LocalAlbumDetail"),
+            /**new AppItem(R.string.app_title_alipay, R.mipmap.ak_app_icon_alipay,12,
+            null, null,
+            "com.eg.android.AlipayGphone", "com.alipay.watch.ui.MainActivity"),**/
+            new AppItem(R.string.app_title_dev_bind, R.mipmap.ak_app_icon_app_bind,13,
+                    null, null,
+                    "com.ic.ak.hardware", "com.ic.ak.hardware.ui.AppBindActivity"),
+            new AppItem(R.string.app_title_setting, R.mipmap.ak_app_icon_setting,14,
+                    null, null,
+                    "com.ic.setting", "com.ic.setting.MainActivity")
+    };
+
     private final static AppItem[] AK_APP_LIST = new AppItem[]{
             new AppItem(R.string.app_title_living_home, R.mipmap.ak_app_icon_hotline,3,
                     null, null,

diff --git a/app/src/main/java/com/ic/ak/launcher/ui/MainActivity.java b/app/src/main/java/com/ic/ak/launcher/ui/MainActivity.java
index ae2a040..acc08da 100644 (file)
--- a/app/src/main/java/com/ic/ak/launcher/ui/MainActivity.java
+++ b/app/src/main/java/com/ic/ak/launcher/ui/MainActivity.java
@@ -23,6 +23,7 @@ import com.ic.ak.launcher.data.play.SoundPlayUtils;
 import com.ic.ak.launcher.ui.dialog.AlertDialogManage;
 import com.ic.ak.launcher.ui.dialog.ShowDialogEvent;
 import com.ic.ak.launcher.util.ServiceUtil;
+import com.ic.ak.launcher.util.sysProperties;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -46,7 +47,7 @@ public class MainActivity extends AppCompatActivity {
 
     private FragmentAdapter ftAdapter;
     private IndicatorAdapter indicatorAdapter;
-
+    private static String launchername= sysProperties.get("persist.sys.launchername","ak");
     private LauncherApp mApp;
     private SoundPlayUtils soundPlayUtils;
 
@@ -194,9 +195,11 @@ public class MainActivity extends AppCompatActivity {
             if (BuildConfig.productType == 1001) {
                 int playId = mApp.getAppDispose().getAppItemPlayItem(position);
                 if (playId != -1) {
-                    int value = Settings.System.getInt(getContentResolver(), "ak_app_play_voice", 0);
-                    if (value == 1001) {
-                        soundPlayUtils.playKeyboardSound(getApplicationContext(), playId);
+                    if(launchername.equals("ak")) {
+                        int value = Settings.System.getInt(getContentResolver(), "ak_app_play_voice", 0);
+                        if (value == 1001) {
+                            soundPlayUtils.playKeyboardSound(getApplicationContext(), playId);
+                        }
                     }
                 }
             }

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 4fad51a..18f5cc6 100644 (file)
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -13,6 +13,7 @@
     <string name="app_title_album">相册</string>
     <string name="app_title_alipay">支付宝</string>
     <string name="app_title_app_bind">App绑定</string>
+    <string name="app_title_dev_bind">设备绑定</string>
     <string name="app_title_setting">设置</string>
 
 

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index c796138..064a4cc 100644 (file)
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -12,6 +12,7 @@
     <string name="app_title_album">相册</string>
     <string name="app_title_alipay">支付宝</string>
     <string name="app_title_app_bind">App绑定</string>
+    <string name="app_title_dev_bind">设备绑定</string>
     <string name="app_title_setting">设置</string>
 
     <string name="a9_app_title_message">短信</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f489169..483190d 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,6 +14,7 @@
     <string name="app_title_album">相册</string>
     <string name="app_title_alipay">支付宝</string>
     <string name="app_title_app_bind">App绑定</string>
+    <string name="app_title_dev_bind">设备绑定</string>
     <string name="app_title_setting">设置</string>
 
     <string name="a9_app_title_message">短信</string>