release V489

针对AK项目修改
1、SOS默认添加07522312120
2、通话音量默认最大

diff --git a/app/release/ICSer_V486_2008081645_release.apk b/app/release/ICSer_V489_2008101920_release.apk
similarity index 79%
rename from app/release/ICSer_V486_2008081645_release.apk
rename to app/release/ICSer_V489_2008101920_release.apk
index 613e450..77075df 100644 (file)
Binary files a/app/release/ICSer_V486_2008081645_release.apk and b/app/release/ICSer_V489_2008101920_release.apk differ

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 3cb7f71..86d809c 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -15,6 +15,7 @@ import android.os.PowerManager;
 import android.os.SystemClock;\r
 import android.widget.Toast;\r
 \r
+import com.enqualcomm.support.bean.Contact;\r
 import com.enqualcomm.support.bean.ICLocation;\r
 import com.enqualcomm.support.bean.SleepInfo;\r
 import com.enqualcomm.support.bean.SleepRecord;\r
@@ -25,6 +26,7 @@ import com.enqualcomm.support.utils.StorageUtils;
 import com.enqualcomm.support.utils.TemperatureUtil;\r
 import com.enqualcomm.support.utils.TimeUtil;\r
 import com.enqualcomm.support.utils.VibrateUtil;\r
+import com.enqualcomm.support.utils.WakeLockUtil;\r
 import com.ic.jni.ICJniUtils;\r
 import com.enqualcomm.support.adapter.LBSHelper;\r
 import com.ic.protocols.protocolAPIHelper;\r
@@ -62,6 +64,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;\r
 import android.content.IntentFilter;\r
 \r
+import java.util.ArrayList;\r
 import java.util.Random;\r
 import java.util.concurrent.ScheduledThreadPoolExecutor;\r
 import java.util.concurrent.TimeUnit;\r
@@ -550,6 +553,20 @@ public class CoreService extends Service {
                 Config.setConfigInitFlag(this, 1);\r
             }\r
 \r
+        }else if (Config.custom_branch_name.equals("AK")) {\r
+            if (Config.getConfigInitFlag(this)==0) {\r
+                Config.setPPGTestCycle(this, 0);\r
+                Config.setTemperatureTestCycle(runtime, 0);\r
+                Config.setConfigInitFlag(this, 1);\r
+                int contactcount=runtime.getDbHelper().getContactCount(getContentResolver());\r
+                ICLogger.i("=====Contact count "+contactcount);\r
+                if(contactcount==0){ //如果没有SOS\r
+                    ICLogger.i("=====add SOS 07522312120 ");\r
+                    ArrayList<Contact> contactArray=new ArrayList<Contact>();\r
+                    contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos1", "07522312120"));\r
+                    runtime.getDbHelper().saveContacts(contactArray,false,false,false,false,false,true);\r
+                }\r
+            }\r
         }else{\r
 \r
             if (Config.getConfigInitFlag(this)==0) {\r
@@ -710,8 +727,14 @@ public class CoreService extends Service {
                 if ( (runtime.getTotalStepCount() - Runtime.lastSitCheckStepCount)/minutes < Config.KeepSitJudgementRefValue){\r
                     //平均 每分钟活动数 小于参考久坐计步值，表示久坐\r
                     ICLogger.i("SitCheck 平均 每分钟活动数 小于参考久坐计步值，表示久坐");\r
-                    runtime.getContextProxy().sendBroadcastSitLongAlarm(); //广播久坐消息\r
+                    WakeLockUtil.ScreenOnWakeLockTemperary(this);\r
                     VibrateUtil.getInstance(this).VibrateOn(true);\r
+                    try {\r
+                        Thread.sleep(1000);\r
+                    } catch (InterruptedException e) {\r
+                        e.printStackTrace();\r
+                    }\r
+                    runtime.getContextProxy().sendBroadcastSitLongAlarm(); //广播久坐消息\r
                     //提醒后 重置 lastCheckSitTime 以及 lastSitCheckStepCount ， 重新计时\r
                     Runtime.lastSitCheckStepCount=runtime.getTotalStepCount();\r
                     Runtime.lastSitCheckTiimeyyyyMMddHHmmss=TimeUtil.getSystemTime3();\r

diff --git a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
index 4d8a235..a5d5dd5 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
@@ -14,6 +14,8 @@ import android.os.Message;
 import android.os.Messenger;\r
 import android.telephony.PhoneStateListener;\r
 import android.telephony.TelephonyManager;\r
+\r
+import com.enqualcomm.support.Config;\r
 import com.enqualcomm.support.CoreService;\r
 import com.enqualcomm.support.ICContentProvider;\r
 import com.enqualcomm.support.MainActivity;\r
@@ -94,8 +96,11 @@ public class SilentManager extends AbstractInvokeHandlerService {
   private PhoneStateListener phoneStateListener = new PhoneStateListener() {\r
     public void onCallStateChanged(int state, String incomingNumber) {\r
       super.onCallStateChanged(state, incomingNumber);\r
-\r
-      ICLogger.i("========onCallStateChanged state "+state+", incomingNumber "+incomingNumber);\r
+        if (ICAudioManager.needMute == false){\r
+          if (Config.custom_branch_name.equals("AK"))\r
+            ICAudioManager.setVoiceCallMaxVolumn(mContext); //设置最大音量\r
+        }\r
+        ICLogger.i("========onCallStateChanged state "+state+", incomingNumber "+incomingNumber);\r
       switch(state) {\r
         case 0: //挂电话\r
           isCalling = false;\r
@@ -113,7 +118,7 @@ public class SilentManager extends AbstractInvokeHandlerService {
             });\r
 \r
           }\r
-          ICLogger.i("========Hung up!");\r
+          ICLogger.i("========Ring!");\r
           break;\r
         case 1: //来电\r
           isCalling = true;\r
@@ -121,7 +126,7 @@ public class SilentManager extends AbstractInvokeHandlerService {
           var3.setAction(ACTION_CLOSE_UNREAD_MSG);\r
           mContext.sendBroadcast(var3);\r
 \r
-          ICLogger.i("========Ring!");\r
+          ICLogger.i("========Hung up!");\r
           if(ICAudioManager.needMute==true)\r
           {\r
             ICAudioManager.setVolumnMute(mContext);\r
@@ -134,8 +139,9 @@ public class SilentManager extends AbstractInvokeHandlerService {
           }\r
           break;\r
         case 2://接电话\r
+        case 8://接电话\r
           isCalling = true;\r
-          ICLogger.i("========OutGoing !");\r
+          ICLogger.i("========Answer Call !");\r
           if(ICAudioManager.needMute==true)\r
           {\r
             ICAudioManager.setVolumnMute(mContext);\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
index 286c90d..50f0be1 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
@@ -357,6 +357,7 @@ public class ContextProxy {
           Intent intent = new Intent("action.ic.srvPushTxt");\r
           intent.putExtra("msgType", 0); //0 代表 server下发消息，1代表 SMS消息\r
           intent.putExtra("txtMsg", msg);\r
+          intent.addFlags(FLAG_ACTIVITY_NEW_TASK);\r
           _context.sendBroadcast(intent);\r
         }\r
       });\r
@@ -382,6 +383,7 @@ public class ContextProxy {
           Intent intent = new Intent("action.ic.srvPushTxt");\r
           intent.putExtra("msgType", 0); //0 代表 server下发消息，1代表 SMS消息\r
           intent.putExtra("txtMsg", msg);\r
+          intent.addFlags(FLAG_ACTIVITY_NEW_TASK);\r
           _context.sendBroadcast(intent);\r
         }\r
        });\r
@@ -400,6 +402,7 @@ public class ContextProxy {
   public void sendBroadcastSitLongAlarm() {\r
     Intent intent = new Intent();\r
     intent.setAction(ACTION_KEEPSIT_ALARM);\r
+    intent.addFlags(FLAG_ACTIVITY_NEW_TASK);\r
     this.context.sendBroadcast(intent);\r
   }\r
 \r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
index 3ccb0fe..6565591 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
@@ -80,6 +80,15 @@ public class DBHelper {
 \r
   }\r
 \r
+  public int getContactCount(ContentResolver resolver)\r
+  {\r
+    StringBuilder sb = new StringBuilder();\r
+\r
+    Cursor cursor = resolver.query(ICContentProvider.CONTACT_URI, (String[])null, null, (String[])null, "CATEGORY ASC");\r
+\r
+    return cursor.getCount();\r
+\r
+  }\r
   private void deleteAllContact(ArrayList<Contact> contactArraylist, String where, ContentResolver resolver) {\r
     StringBuilder sb = new StringBuilder();\r
     sb.append("where=");\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java b/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java
index 93ba013..7e31182 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java
@@ -39,7 +39,19 @@ public class ICAudioManager {
 //        SimSignalUtil.SetRingMode(context, AudioManager.RINGER_MODE_NORMAL, true);
        // OpenSpeaker(context);
     }
-
+    public static void setVoiceCallMaxVolumn(Context context) {
+        ICLogger.i("======setVoiceCallMaxVolumn ");
+        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+        if (audioManager != null) {
+            audioManager.setMasterMute(false);
+            int currentvolume=audioManager.getStreamVolume(AudioManager.STREAM_VOICE_CALL);
+            int maxvolume=audioManager.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL);
+            audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL,maxvolume,0);
+            int currentvolume1=audioManager.getStreamVolume(AudioManager.STREAM_VOICE_CALL);
+            ICLogger.i("===== current "+currentvolume+" max "+maxvolume+" to "+currentvolume1);
+            audioManager.setSpeakerphoneOn(true);
+        }
+    }
 
     /**
      * 切换到外放

diff --git a/app/src/main/java/com/ic/protocols/protocol_ic.java b/app/src/main/java/com/ic/protocols/protocol_ic.java
index 98cf749..3b9efc9 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -731,10 +731,21 @@ public class protocol_ic {
             connection.send(genStringMessage("AP12",AP12(index,phNum1,phNum2,phNum3)));\r
 \r
             ArrayList<Contact> contactArray=new ArrayList<Contact>();\r
-            if (!phNum1.isEmpty())  contactArray.add(new Contact(Contact.CATEGORY_SOS,"sos1",phNum1));\r
-            if (!phNum2.isEmpty())  contactArray.add(new Contact(Contact.CATEGORY_SOS,"sos2",phNum2));\r
-            if (!phNum3.isEmpty())  contactArray.add(new Contact(Contact.CATEGORY_SOS,"sos3",phNum3));\r
+            if(Config.custom_branch_name.equals("AK")){\r
 \r
+                contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos1", "07522312120"));\r
+                if (!phNum1.isEmpty())\r
+                    contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos2", phNum1));\r
+                if (!phNum2.isEmpty())\r
+                    contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos3", phNum2));\r
+            }else {\r
+                if (!phNum1.isEmpty())\r
+                    contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos1", phNum1));\r
+                if (!phNum2.isEmpty())\r
+                    contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos2", phNum2));\r
+                if (!phNum3.isEmpty())\r
+                    contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos3", phNum3));\r
+            }\r
             runtime.getDbHelper().saveContacts(contactArray,false,false,false,false,false,true);\r
 \r
         }else{\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 66dcdc7..ec3daae 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Aug 08 16:45:08 CST 2020\r
-VERSION_CODE=486\r
+#Mon Aug 10 19:20:04 CST 2020\r
+VERSION_CODE=489\r