release IcAkLauncher V1_6.0

1、支持A9 A9英文 AK 版本动态识别。
2、解决A9 有时充电时弹出Dialog显示错误，造成触摸无效问题。

diff --git a/app/IcA9LauncherCN/release/IcA9LauncherCN_V1_5.0_202009151121_release.apk b/app/IcA9LauncherCN/release/IcA9LauncherCN_V1_5.0_202009151121_release.apk
deleted file mode 100644 (file)
index 9b435bb..0000000
Binary files a/app/IcA9LauncherCN/release/IcA9LauncherCN_V1_5.0_202009151121_release.apk and /dev/null differ

diff --git a/app/IcAkLauncher/release/IcAkLauncher_V1_6.0_202010211045_release.apk b/app/IcAkLauncher/release/IcAkLauncher_V1_6.0_202010211045_release.apk
new file mode 100644 (file)
index 0000000..4d23611
Binary files /dev/null and b/app/IcAkLauncher/release/IcAkLauncher_V1_6.0_202010211045_release.apk differ

diff --git a/app/IcAkLauncher/release/output-metadata.json b/app/IcAkLauncher/release/output-metadata.json
index efeab5b..4bdcf0c 100644 (file)
--- a/app/IcAkLauncher/release/output-metadata.json
+++ b/app/IcAkLauncher/release/output-metadata.json
@@ -12,9 +12,9 @@
       "filters": [],
       "properties": [],
       "versionCode": 1,
-      "versionName": "3.0",
+      "versionName": "6.0",
       "enabled": true,
-      "outputFile": "IcAkLauncher_V1_3.0_202008072245_release.apk"
+      "outputFile": "IcAkLauncher_V1_6.0_202010211045_release.apk"
     }
   ]
 }
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 1ce6a84..76bbd70 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,7 +64,7 @@ android {
         IcAkLauncher{
             flavorDimensions "IcAkLauncher"
             versionCode 1
-            versionName "5.0"
+            versionName "6.0"
             buildConfigField "int", "productType", "1001"
         }
     }

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 dfa3029..bb34e9d 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
@@ -2,12 +2,30 @@ package com.ic.ak.launcher.data.app;
 
 import com.ic.ak.launcher.BuildConfig;
 import com.ic.ak.launcher.R;
+import com.ic.ak.launcher.util.sysProperties;
 
 final public class AppConfig {
 
+
+
+    public static int productType=1001;
+
+
+    static {
+        String customname=sysProperties.get("persist.sys.customname","AK");
+        if( customname.equals("AK")) {
+            productType = 1001;
+        }else if (customname.equals("YQ")) {
+
+            productType = 1003;
+        }else if (customname.equals("YQ_EN")) {
+
+            productType = 1002;
+        }
+    }
     public static AppItem[] getCurrentSystemAppListConfig() {
-        int product = BuildConfig.productType;
-        switch (product){
+
+        switch (productType){
             case 1001:
                 return AK_APP_LIST;
             case 1002:

diff --git a/app/src/main/java/com/ic/ak/launcher/data/app/AppDispose.java b/app/src/main/java/com/ic/ak/launcher/data/app/AppDispose.java
index 411d123..2639017 100644 (file)
--- a/app/src/main/java/com/ic/ak/launcher/data/app/AppDispose.java
+++ b/app/src/main/java/com/ic/ak/launcher/data/app/AppDispose.java
@@ -85,7 +85,7 @@ public class AppDispose {
     }
 
     private Fragment getCurrentProductMainFragment(){
-        int product = BuildConfig.productType;
+        int product = AppConfig.productType;
         switch (product){
             case 1001:
                 return MainFragment.newInstance();

diff --git a/app/src/main/java/com/ic/ak/launcher/data/battery/BatteryDispose.java b/app/src/main/java/com/ic/ak/launcher/data/battery/BatteryDispose.java
index 33531a0..932da75 100644 (file)
--- a/app/src/main/java/com/ic/ak/launcher/data/battery/BatteryDispose.java
+++ b/app/src/main/java/com/ic/ak/launcher/data/battery/BatteryDispose.java
@@ -13,6 +13,7 @@ import androidx.lifecycle.MutableLiveData;
 
 import com.ic.ak.launcher.BuildConfig;
 import com.ic.ak.launcher.R;
+import com.ic.ak.launcher.data.app.AppConfig;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -151,8 +152,7 @@ public class BatteryDispose {
     }
 
     public static int[] getCurrentProductBatteryResId(){
-        int product = BuildConfig.productType;
-        switch (product){
+        switch (AppConfig.productType){
             case 1001:
                 return AKBatteryResId;
             case 1003:

diff --git a/app/src/main/java/com/ic/ak/launcher/data/hardware/HardwareDispose.java b/app/src/main/java/com/ic/ak/launcher/data/hardware/HardwareDispose.java
index 2dd808e..7f3b0d1 100644 (file)
--- a/app/src/main/java/com/ic/ak/launcher/data/hardware/HardwareDispose.java
+++ b/app/src/main/java/com/ic/ak/launcher/data/hardware/HardwareDispose.java
@@ -12,6 +12,7 @@ import androidx.lifecycle.MediatorLiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import com.ic.ak.launcher.BuildConfig;
+import com.ic.ak.launcher.data.app.AppConfig;
 import com.ic.ak.launcher.ui.DialogActivity;
 import com.ic.ak.launcher.ui.MainActivity;
 import com.ic.ak.launcher.util.IcLog;
@@ -83,7 +84,7 @@ public class HardwareDispose {
         filter.addAction(SOS_ACTION);
         filter.addAction(TXT_ACTION);
         Log.i(TAG,"hrt registerHardwareBroadcast");
-        int product = BuildConfig.productType;
+        int product = AppConfig.productType;
         if (product == 1001) {
             filter.addAction(ACTION_KEEPSIT_ALARM);
         }

diff --git a/app/src/main/java/com/ic/ak/launcher/data/phone/PhoneDispose.java b/app/src/main/java/com/ic/ak/launcher/data/phone/PhoneDispose.java
index 40f4cf8..a94c963 100644 (file)
--- a/app/src/main/java/com/ic/ak/launcher/data/phone/PhoneDispose.java
+++ b/app/src/main/java/com/ic/ak/launcher/data/phone/PhoneDispose.java
@@ -15,6 +15,7 @@ import androidx.lifecycle.MutableLiveData;
 import com.ic.ak.launcher.BuildConfig;
 import com.ic.ak.launcher.LauncherApp;
 import com.ic.ak.launcher.R;
+import com.ic.ak.launcher.data.app.AppConfig;
 
 import java.util.List;
 
@@ -226,7 +227,7 @@ public class PhoneDispose extends LoopThread {
     }
 
     public static int[] getCurrentSignalResId() {
-        int product = BuildConfig.productType;
+        int product = AppConfig.productType;
         switch (product){
             case 1001:
                 return akSignalResId;
@@ -239,7 +240,7 @@ public class PhoneDispose extends LoopThread {
     }
 
     public static int[] getCurrentPhoneTypeResId() {
-        int product = BuildConfig.productType;
+        int product = AppConfig.productType;
         switch (product){
             case 1001:
                 return akPhoneTypeResId;

diff --git a/app/src/main/java/com/ic/ak/launcher/data/play/SoundPlayUtils.java b/app/src/main/java/com/ic/ak/launcher/data/play/SoundPlayUtils.java
index 356f493..77b2b84 100644 (file)
--- a/app/src/main/java/com/ic/ak/launcher/data/play/SoundPlayUtils.java
+++ b/app/src/main/java/com/ic/ak/launcher/data/play/SoundPlayUtils.java
@@ -17,6 +17,24 @@ public class SoundPlayUtils {
 
     private SoundPool.OnLoadCompleteListener SoundLoadListener;
 
+    public static int chrg_connect_id=0;
+    public static int chrg_remove_id=1;
+    public static int chrg_complete_id=2;
+    public static int ak_app_voice_living_home_id=3;
+    public static int ak_app_voice_dial_id=4;
+    public static int ak_app_voice_message_id=5;
+    public static int ak_app_voice_ped_id=6;
+    public static int ak_app_voice_health_id=7;
+    public static int ak_app_voice_sleep_id=8;
+    public static int ak_app_voice_sedentary_id=9;
+    public static int ak_app_voice_camera_id=10;
+    public static int ak_app_voice_album_id=11;
+    public static int ak_app_voice_zfb_id=12;
+    public static int ak_app_voice_bind_id=13;
+    public static int ak_app_voice_setting_id=14;
+    public static int ak_app_voice_call_records_id=15;//15
+    public static int a9_antioff_id=16;
+
     private static final int[] NUM_RAW = new int[]{
             R.raw.chrg_connect,
             R.raw.chrg_remove,

diff --git a/app/src/main/java/com/ic/ak/launcher/data/time/TimeDispose.java b/app/src/main/java/com/ic/ak/launcher/data/time/TimeDispose.java
index afa56b1..8177e33 100644 (file)
--- a/app/src/main/java/com/ic/ak/launcher/data/time/TimeDispose.java
+++ b/app/src/main/java/com/ic/ak/launcher/data/time/TimeDispose.java
@@ -12,6 +12,7 @@ import androidx.lifecycle.MediatorLiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import com.ic.ak.launcher.BuildConfig;
+import com.ic.ak.launcher.data.app.AppConfig;
 import com.xhinliang.lunarcalendar.LunarCalendar;
 
 import org.threeten.bp.DayOfWeek;
@@ -127,7 +128,7 @@ public class TimeDispose {
             currDateTime = LocalDateTime.now(ZoneId.systemDefault());
         }
 
-        int product = BuildConfig.productType;
+        int product = AppConfig.productType;
 
         if(product == 1001){
             mTimeLiveData.setValue(currDateTime.format(HH_MM));

diff --git a/app/src/main/java/com/ic/ak/launcher/ui/DialogActivity.java b/app/src/main/java/com/ic/ak/launcher/ui/DialogActivity.java
index c293a2b..f84a1f0 100644 (file)
--- a/app/src/main/java/com/ic/ak/launcher/ui/DialogActivity.java
+++ b/app/src/main/java/com/ic/ak/launcher/ui/DialogActivity.java
@@ -6,8 +6,8 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.KeyEvent;
 
-import com.ic.ak.launcher.BuildConfig;
 import com.ic.ak.launcher.R;
+import com.ic.ak.launcher.data.app.AppConfig;
 import com.ic.ak.launcher.data.play.SoundPlayUtils;
 import com.ic.ak.launcher.ui.dialog.BatteryLowManage;
 import com.ic.ak.launcher.ui.dialog.DialogDismissEvent;
@@ -15,6 +15,7 @@ import com.ic.ak.launcher.ui.dialog.NotificationDialogManage;
 import com.ic.ak.launcher.ui.dialog.SedentaryDialogManage;
 import com.ic.ak.launcher.ui.dialog.SlipTipsManage;
 import com.ic.ak.launcher.ui.dialog.TextShowDialogManage;
+import com.ic.ak.launcher.util.IcLog;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -46,6 +47,13 @@ public class DialogActivity extends AppCompatActivity {
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
+
+        IcLog.i(DialogActivity.class.getSimpleName(),"keyCode "+keyCode+" "+event.getKeyCode());
+
+        if(keyCode==KeyEvent.KEYCODE_BACK || keyCode==KeyEvent.KEYCODE_HOME){
+  //          this.finish();
+            IcLog.i(DialogActivity.class.getSimpleName(),"finish!");
+        }
         return true;
     }
 
@@ -64,7 +72,7 @@ public class DialogActivity extends AppCompatActivity {
     public void onMessageEvent(DialogDismissEvent event) {
         finish();
         if(soundPlayUtils != null){
-            soundPlayUtils.stopSoundPlay(16);
+            soundPlayUtils.stopSoundPlay(SoundPlayUtils.a9_antioff_id);
         }
         switch (event.index) {
             case 1:
@@ -88,6 +96,7 @@ public class DialogActivity extends AppCompatActivity {
                 }
                 break;
             case 5:
+            default:
                 if (showDialogManage != null) {
                     showDialogManage.setTextShowFalse();
                 }
@@ -106,14 +115,14 @@ public class DialogActivity extends AppCompatActivity {
         switch (type) {
             case 1000:
             case 1001:
-                if (BuildConfig.productType == 1002|| BuildConfig.productType == 1003) {
+                if (AppConfig.productType == 1002|| AppConfig.productType == 1003) {
                     if (showDialogManage == null) {
                         showDialogManage = new TextShowDialogManage();
                     } else {
                         showDialogManage.dismissTextShowDialog(getSupportFragmentManager());
                     }
                     showDialogManage.showTextShowDialog(getSupportFragmentManager(), message);
-                } else if (BuildConfig.productType == 1001) {
+                } else if ( AppConfig.productType == 1001) {
                     if (notificationManage == null) {
                         notificationManage = new NotificationDialogManage();
                     } else {
@@ -123,7 +132,7 @@ public class DialogActivity extends AppCompatActivity {
                 }
                 break;
             case 1002:
-                if (BuildConfig.productType == 1001) {
+                if ( AppConfig.productType == 1001) {
                     if (sedentaryManage != null) {
                         return;
                     }
@@ -160,7 +169,7 @@ public class DialogActivity extends AppCompatActivity {
                 break;
             case 1007:
                 playKeyboardSound();
-                if (BuildConfig.productType == 1002 || BuildConfig.productType == 1003) {
+                if ( AppConfig.productType == 1002 || AppConfig.productType == 1003) {
                     if (showDialogManage == null) {
                         showDialogManage = new TextShowDialogManage();
                     } else {
@@ -169,17 +178,25 @@ public class DialogActivity extends AppCompatActivity {
                     showDialogManage.showTextShowDialog(getSupportFragmentManager(), message);
                 }
                 break;
+            default:
+                if (showDialogManage == null) {
+                    showDialogManage = new TextShowDialogManage();
+                } else {
+                    showDialogManage.dismissTextShowDialog(getSupportFragmentManager());
+                }
+                showDialogManage.showTextShowDialog(getSupportFragmentManager(), message);
+                break;
         }
     }
 
     private void playKeyboardSound(){
-        int type = BuildConfig.productType;
+        int type = AppConfig.productType;
         if(type == 1002 || type == 1003){
             //A9
             if(soundPlayUtils == null){
                 soundPlayUtils= new SoundPlayUtils();
-                soundPlayUtils.playKeyboardSound(this,16);
             }
+            soundPlayUtils.playKeyboardSound(this,SoundPlayUtils.a9_antioff_id);
         }
     }
 }
\ No newline at end of file

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 1027e13..843b5af 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
@@ -15,15 +15,19 @@ import android.view.View;
 import com.ic.ak.launcher.BuildConfig;
 import com.ic.ak.launcher.LauncherApp;
 import com.ic.ak.launcher.R;
+import com.ic.ak.launcher.data.app.AppConfig;
 import com.ic.ak.launcher.data.battery.BatteryConnectStateEvent;
 import com.ic.ak.launcher.data.hardware.HardwareDispose;
 import com.ic.ak.launcher.data.play.SoundPlayUtils;
+import com.ic.ak.launcher.util.IcLog;
 import com.ic.ak.launcher.util.ServiceUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.util.Locale;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
@@ -47,9 +51,9 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (BuildConfig.productType == 1002 || BuildConfig.productType == 1003) {
+        if ( AppConfig.productType == 1002 || AppConfig.productType == 1003) {
             setContentView(R.layout.activity_a9_main);
-        } else if (BuildConfig.productType == 1001) {
+        } else if ( AppConfig.productType == 1001) {
             setContentView(R.layout.activity_main);
         }
 
@@ -113,10 +117,11 @@ public class MainActivity extends AppCompatActivity {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(BatteryConnectStateEvent event) {
+        IcLog.i("Launcher2.Main",Locale.getDefault().getDisplayLanguage());
         if (event.state) {
-            soundPlayUtils.playKeyboardSound(this, 0);
+            soundPlayUtils.playKeyboardSound(this, SoundPlayUtils.chrg_connect_id);
         } else {
-            soundPlayUtils.playKeyboardSound(this, 1);
+            soundPlayUtils.playKeyboardSound(this, SoundPlayUtils.chrg_remove_id);
         }
     }
 
@@ -149,7 +154,7 @@ public class MainActivity extends AppCompatActivity {
                 indicatorAdapter.updateIndicatorState(index);
             }
 
-            if (BuildConfig.productType == 1001) {
+            if ( AppConfig.productType == 1001) {
                 int playId = mApp.getAppDispose().getAppItemPlayItem(position);
                 if (playId != -1) {
                     int value = Settings.System.getInt(getContentResolver(), "ak_app_play_voice", 0);

diff --git a/app/src/main/java/com/ic/ak/launcher/ui/dialog/BatteryLowFragment.java b/app/src/main/java/com/ic/ak/launcher/ui/dialog/BatteryLowFragment.java
index 29d6298..9ffa062 100644 (file)
--- a/app/src/main/java/com/ic/ak/launcher/ui/dialog/BatteryLowFragment.java
+++ b/app/src/main/java/com/ic/ak/launcher/ui/dialog/BatteryLowFragment.java
@@ -35,7 +35,7 @@ public class BatteryLowFragment extends DialogFragment {
             DisplayMetrics dm = new DisplayMetrics();
             getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm);
             dialog.getWindow().setLayout((int) (dm.widthPixels*0.85),180);
-            dialog.setCancelable(false);
+            dialog.setCancelable(true);
         }
     }
 

diff --git a/app/src/main/java/com/ic/ak/launcher/ui/dialog/NotificationDialogFragment.java b/app/src/main/java/com/ic/ak/launcher/ui/dialog/NotificationDialogFragment.java
index 8a6bb91..8bb671d 100644 (file)
--- a/app/src/main/java/com/ic/ak/launcher/ui/dialog/NotificationDialogFragment.java
+++ b/app/src/main/java/com/ic/ak/launcher/ui/dialog/NotificationDialogFragment.java
@@ -56,7 +56,7 @@ public class NotificationDialogFragment extends DialogFragment {
             DisplayMetrics dm = new DisplayMetrics();
             getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm);
             dialog.getWindow().setLayout((int) (dm.widthPixels * 0.95), 180);
-            dialog.setCancelable(false);
+            dialog.setCancelable(true);
         }
     }
 

diff --git a/app/src/main/java/com/ic/ak/launcher/ui/dialog/SedentaryAlarmDialogFragment.java b/app/src/main/java/com/ic/ak/launcher/ui/dialog/SedentaryAlarmDialogFragment.java
index 0324aa8..7e30c8a 100644 (file)
--- a/app/src/main/java/com/ic/ak/launcher/ui/dialog/SedentaryAlarmDialogFragment.java
+++ b/app/src/main/java/com/ic/ak/launcher/ui/dialog/SedentaryAlarmDialogFragment.java
@@ -35,7 +35,7 @@ public class SedentaryAlarmDialogFragment extends DialogFragment {
             DisplayMetrics dm = new DisplayMetrics();
             getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm);
             dialog.getWindow().setLayout(dm.widthPixels, dm.heightPixels);
-            dialog.setCancelable(false);
+            dialog.setCancelable(true);
         }
     }
 

diff --git a/app/src/main/java/com/ic/ak/launcher/ui/dialog/SlipTipsFragment.java b/app/src/main/java/com/ic/ak/launcher/ui/dialog/SlipTipsFragment.java
index 52000a0..87dc98f 100644 (file)
--- a/app/src/main/java/com/ic/ak/launcher/ui/dialog/SlipTipsFragment.java
+++ b/app/src/main/java/com/ic/ak/launcher/ui/dialog/SlipTipsFragment.java
@@ -36,7 +36,7 @@ public class SlipTipsFragment extends DialogFragment {
             DisplayMetrics dm = new DisplayMetrics();
             getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm);
             dialog.getWindow().setLayout((int) (dm.widthPixels*0.85),180);
-            dialog.setCancelable(false);
+            dialog.setCancelable(true);
         }
     }
 
@@ -52,4 +52,6 @@ public class SlipTipsFragment extends DialogFragment {
         });
         return view;
     }
+
+
 }

diff --git a/app/src/main/java/com/ic/ak/launcher/ui/dialog/TextShowDialogFragment.java b/app/src/main/java/com/ic/ak/launcher/ui/dialog/TextShowDialogFragment.java
index 289e447..861d916 100644 (file)
--- a/app/src/main/java/com/ic/ak/launcher/ui/dialog/TextShowDialogFragment.java
+++ b/app/src/main/java/com/ic/ak/launcher/ui/dialog/TextShowDialogFragment.java
@@ -46,7 +46,7 @@ public class TextShowDialogFragment extends DialogFragment {
             DisplayMetrics dm = new DisplayMetrics();
             getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm);
             dialog.getWindow().setLayout((int) (dm.widthPixels*0.85),180);
-            dialog.setCancelable(false);
+            dialog.setCancelable(true);
         }
     }
 

diff --git a/app/src/main/java/com/ic/ak/launcher/ui/fragment/AppFragment.java b/app/src/main/java/com/ic/ak/launcher/ui/fragment/AppFragment.java
index 8efd381..7eed880 100644 (file)
--- a/app/src/main/java/com/ic/ak/launcher/ui/fragment/AppFragment.java
+++ b/app/src/main/java/com/ic/ak/launcher/ui/fragment/AppFragment.java
@@ -22,6 +22,7 @@ import android.widget.Toast;
 import com.ic.ak.launcher.BuildConfig;
 import com.ic.ak.launcher.LauncherApp;
 import com.ic.ak.launcher.R;
+import com.ic.ak.launcher.data.app.AppConfig;
 import com.ic.ak.launcher.data.app.AppItem;
 import com.ic.ak.launcher.data.phone.CallPhone;
 
@@ -73,9 +74,9 @@ public class AppFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view=null;
-        if(BuildConfig.productType == 1002 || BuildConfig.productType == 1003){
+        if(AppConfig.productType == 1002 || AppConfig.productType == 1003){
             view = inflater.inflate(R.layout.fragment_a9_app, container, false);
-        } else if(BuildConfig.productType == 1001){
+        } else if( AppConfig.productType == 1001){
             view = inflater.inflate(R.layout.fragment_app, container, false);
         }
         ButterKnife.bind(this,view);

diff --git a/app/src/main/java/com/ic/ak/launcher/util/sysProperties.java b/app/src/main/java/com/ic/ak/launcher/util/sysProperties.java
new file mode 100644 (file)
index 0000000..9732ac7
--- /dev/null
+++ b/app/src/main/java/com/ic/ak/launcher/util/sysProperties.java
@@ -0,0 +1,56 @@
+package com.ic.ak.launcher.util;\r
+\r
+\r
+import java.lang.reflect.InvocationTargetException;\r
+import java.lang.reflect.Method;\r
+\r
+public class sysProperties {\r
+\r
+    private static Method sysPropGet;\r
+    private static Method sysPropSet;\r
+\r
+    private sysProperties() {\r
+    }\r
+\r
+    static {\r
+        try {\r
+            Class S = Class.forName("android.os.SystemProperties");\r
+            Method M[] = S.getMethods();\r
+            for (Method m : M) {\r
+                String n = m.getName();\r
+                if (n.equals("get")) {\r
+                    sysPropGet = m;\r
+                } else if (n.equals("set")) {\r
+                    sysPropSet = m;\r
+                }\r
+            }\r
+        } catch (ClassNotFoundException e) {\r
+            e.printStackTrace();\r
+        }\r
+    }\r
+\r
+    public static String get(String name, String default_value) {\r
+        try {\r
+            return (String) sysPropGet.invoke(null, name, default_value);\r
+        } catch (IllegalArgumentException e) {\r
+            e.printStackTrace();\r
+        } catch (IllegalAccessException e) {\r
+            e.printStackTrace();\r
+        } catch (InvocationTargetException e) {\r
+            e.printStackTrace();\r
+        }\r
+        return default_value;\r
+    }\r
+\r
+    public static void set(String name, String value) {\r
+        try {\r
+            sysPropSet.invoke(null, name, value);\r
+        } catch (IllegalArgumentException e) {\r
+            e.printStackTrace();\r
+        } catch (IllegalAccessException e) {\r
+            e.printStackTrace();\r
+        } catch (InvocationTargetException e) {\r
+            e.printStackTrace();\r
+        }\r
+    }\r
+}
\ No newline at end of file

diff --git a/app/src/main/res/raw-zh/a9_antioff.mp3 b/app/src/main/res/raw-zh/a9_antioff.mp3
new file mode 100644 (file)
index 0000000..791a118
Binary files /dev/null and b/app/src/main/res/raw-zh/a9_antioff.mp3 differ

diff --git a/app/src/main/res/raw-zh/ak_app_voice_album.mp3 b/app/src/main/res/raw-zh/ak_app_voice_album.mp3
new file mode 100644 (file)
index 0000000..3ce52d0
Binary files /dev/null and b/app/src/main/res/raw-zh/ak_app_voice_album.mp3 differ

diff --git a/app/src/main/res/raw-zh/ak_app_voice_bind.mp3 b/app/src/main/res/raw-zh/ak_app_voice_bind.mp3
new file mode 100644 (file)
index 0000000..297876a
Binary files /dev/null and b/app/src/main/res/raw-zh/ak_app_voice_bind.mp3 differ

diff --git a/app/src/main/res/raw-zh/ak_app_voice_call_records.mp3 b/app/src/main/res/raw-zh/ak_app_voice_call_records.mp3
new file mode 100644 (file)
index 0000000..6a6631c
Binary files /dev/null and b/app/src/main/res/raw-zh/ak_app_voice_call_records.mp3 differ

diff --git a/app/src/main/res/raw-zh/ak_app_voice_camera.mp3 b/app/src/main/res/raw-zh/ak_app_voice_camera.mp3
new file mode 100644 (file)
index 0000000..be019a5
Binary files /dev/null and b/app/src/main/res/raw-zh/ak_app_voice_camera.mp3 differ

diff --git a/app/src/main/res/raw-zh/ak_app_voice_dial.mp3 b/app/src/main/res/raw-zh/ak_app_voice_dial.mp3
new file mode 100644 (file)
index 0000000..82d707e
Binary files /dev/null and b/app/src/main/res/raw-zh/ak_app_voice_dial.mp3 differ

diff --git a/app/src/main/res/raw-zh/ak_app_voice_health.mp3 b/app/src/main/res/raw-zh/ak_app_voice_health.mp3
new file mode 100644 (file)
index 0000000..a6073ed
Binary files /dev/null and b/app/src/main/res/raw-zh/ak_app_voice_health.mp3 differ

diff --git a/app/src/main/res/raw-zh/ak_app_voice_living_home.mp3 b/app/src/main/res/raw-zh/ak_app_voice_living_home.mp3
new file mode 100644 (file)
index 0000000..fe4b42d
Binary files /dev/null and b/app/src/main/res/raw-zh/ak_app_voice_living_home.mp3 differ

diff --git a/app/src/main/res/raw-zh/ak_app_voice_message.mp3 b/app/src/main/res/raw-zh/ak_app_voice_message.mp3
new file mode 100644 (file)
index 0000000..b4c5fa6
Binary files /dev/null and b/app/src/main/res/raw-zh/ak_app_voice_message.mp3 differ

diff --git a/app/src/main/res/raw-zh/ak_app_voice_ped.mp3 b/app/src/main/res/raw-zh/ak_app_voice_ped.mp3
new file mode 100644 (file)
index 0000000..13d5fbe
Binary files /dev/null and b/app/src/main/res/raw-zh/ak_app_voice_ped.mp3 differ

diff --git a/app/src/main/res/raw-zh/ak_app_voice_sedentary.mp3 b/app/src/main/res/raw-zh/ak_app_voice_sedentary.mp3
new file mode 100644 (file)
index 0000000..011cf63
Binary files /dev/null and b/app/src/main/res/raw-zh/ak_app_voice_sedentary.mp3 differ

diff --git a/app/src/main/res/raw-zh/ak_app_voice_setting.mp3 b/app/src/main/res/raw-zh/ak_app_voice_setting.mp3
new file mode 100644 (file)
index 0000000..fe2e042
Binary files /dev/null and b/app/src/main/res/raw-zh/ak_app_voice_setting.mp3 differ

diff --git a/app/src/main/res/raw-zh/ak_app_voice_sleep.mp3 b/app/src/main/res/raw-zh/ak_app_voice_sleep.mp3
new file mode 100644 (file)
index 0000000..3844234
Binary files /dev/null and b/app/src/main/res/raw-zh/ak_app_voice_sleep.mp3 differ

diff --git a/app/src/main/res/raw-zh/ak_app_voice_zfb.mp3 b/app/src/main/res/raw-zh/ak_app_voice_zfb.mp3
new file mode 100644 (file)
index 0000000..35e885c
Binary files /dev/null and b/app/src/main/res/raw-zh/ak_app_voice_zfb.mp3 differ

diff --git a/app/src/main/res/raw-zh/chrg_complete.mp3 b/app/src/main/res/raw-zh/chrg_complete.mp3
new file mode 100644 (file)
index 0000000..c56ac5a
Binary files /dev/null and b/app/src/main/res/raw-zh/chrg_complete.mp3 differ

diff --git a/app/src/main/res/raw-zh/chrg_connect.mp3 b/app/src/main/res/raw-zh/chrg_connect.mp3
new file mode 100644 (file)
index 0000000..ba5c0ce
Binary files /dev/null and b/app/src/main/res/raw-zh/chrg_connect.mp3 differ

diff --git a/app/src/main/res/raw-zh/chrg_remove.mp3 b/app/src/main/res/raw-zh/chrg_remove.mp3
new file mode 100644 (file)
index 0000000..4a91c17
Binary files /dev/null and b/app/src/main/res/raw-zh/chrg_remove.mp3 differ

diff --git a/app/src/main/res/raw/chrg_connect.mp3 b/app/src/main/res/raw/chrg_connect.mp3
index ba5c0ce..2003dda 100644 (file)
Binary files a/app/src/main/res/raw/chrg_connect.mp3 and b/app/src/main/res/raw/chrg_connect.mp3 differ

diff --git a/app/src/main/res/raw/chrg_remove.mp3 b/app/src/main/res/raw/chrg_remove.mp3
index 4a91c17..346bf97 100644 (file)
Binary files a/app/src/main/res/raw/chrg_remove.mp3 and b/app/src/main/res/raw/chrg_remove.mp3 differ