From: snickersun Date: Mon, 10 Aug 2020 11:25:01 +0000 (+0800) Subject: release V489 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.js?a=commitdiff_plain;h=5258ed19759815b0cc052199591e01318a513bc5;p=protocol_srv.git 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 613e450b..77075df2 100644 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 3cb7f715..86d809c6 100644 --- 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; import android.widget.Toast; +import com.enqualcomm.support.bean.Contact; import com.enqualcomm.support.bean.ICLocation; import com.enqualcomm.support.bean.SleepInfo; import com.enqualcomm.support.bean.SleepRecord; @@ -25,6 +26,7 @@ import com.enqualcomm.support.utils.StorageUtils; import com.enqualcomm.support.utils.TemperatureUtil; import com.enqualcomm.support.utils.TimeUtil; import com.enqualcomm.support.utils.VibrateUtil; +import com.enqualcomm.support.utils.WakeLockUtil; import com.ic.jni.ICJniUtils; import com.enqualcomm.support.adapter.LBSHelper; import com.ic.protocols.protocolAPIHelper; @@ -62,6 +64,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.IntentFilter; +import java.util.ArrayList; import java.util.Random; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; @@ -550,6 +553,20 @@ public class CoreService extends Service { Config.setConfigInitFlag(this, 1); } + }else if (Config.custom_branch_name.equals("AK")) { + if (Config.getConfigInitFlag(this)==0) { + Config.setPPGTestCycle(this, 0); + Config.setTemperatureTestCycle(runtime, 0); + Config.setConfigInitFlag(this, 1); + int contactcount=runtime.getDbHelper().getContactCount(getContentResolver()); + ICLogger.i("=====Contact count "+contactcount); + if(contactcount==0){ //如果没有SOS + ICLogger.i("=====add SOS 07522312120 "); + ArrayList contactArray=new ArrayList(); + contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos1", "07522312120")); + runtime.getDbHelper().saveContacts(contactArray,false,false,false,false,false,true); + } + } }else{ if (Config.getConfigInitFlag(this)==0) { @@ -710,8 +727,14 @@ public class CoreService extends Service { if ( (runtime.getTotalStepCount() - Runtime.lastSitCheckStepCount)/minutes < Config.KeepSitJudgementRefValue){ //平均 每分钟活动数 小于参考久坐计步值，表示久坐 ICLogger.i("SitCheck 平均 每分钟活动数 小于参考久坐计步值，表示久坐"); - runtime.getContextProxy().sendBroadcastSitLongAlarm(); //广播久坐消息 + WakeLockUtil.ScreenOnWakeLockTemperary(this); VibrateUtil.getInstance(this).VibrateOn(true); + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + runtime.getContextProxy().sendBroadcastSitLongAlarm(); //广播久坐消息 //提醒后 重置 lastCheckSitTime 以及 lastSitCheckStepCount ， 重新计时 Runtime.lastSitCheckStepCount=runtime.getTotalStepCount(); Runtime.lastSitCheckTiimeyyyyMMddHHmmss=TimeUtil.getSystemTime3(); 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 4d8a235e..a5d5dd51 100644 --- 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; import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; + +import com.enqualcomm.support.Config; import com.enqualcomm.support.CoreService; import com.enqualcomm.support.ICContentProvider; import com.enqualcomm.support.MainActivity; @@ -94,8 +96,11 @@ public class SilentManager extends AbstractInvokeHandlerService { private PhoneStateListener phoneStateListener = new PhoneStateListener() { public void onCallStateChanged(int state, String incomingNumber) { super.onCallStateChanged(state, incomingNumber); - - ICLogger.i("========onCallStateChanged state "+state+", incomingNumber "+incomingNumber); + if (ICAudioManager.needMute == false){ + if (Config.custom_branch_name.equals("AK")) + ICAudioManager.setVoiceCallMaxVolumn(mContext); //设置最大音量 + } + ICLogger.i("========onCallStateChanged state "+state+", incomingNumber "+incomingNumber); switch(state) { case 0: //挂电话 isCalling = false; @@ -113,7 +118,7 @@ public class SilentManager extends AbstractInvokeHandlerService { }); } - ICLogger.i("========Hung up!"); + ICLogger.i("========Ring!"); break; case 1: //来电 isCalling = true; @@ -121,7 +126,7 @@ public class SilentManager extends AbstractInvokeHandlerService { var3.setAction(ACTION_CLOSE_UNREAD_MSG); mContext.sendBroadcast(var3); - ICLogger.i("========Ring!"); + ICLogger.i("========Hung up!"); if(ICAudioManager.needMute==true) { ICAudioManager.setVolumnMute(mContext); @@ -134,8 +139,9 @@ public class SilentManager extends AbstractInvokeHandlerService { } break; case 2://接电话 + case 8://接电话 isCalling = true; - ICLogger.i("========OutGoing !"); + ICLogger.i("========Answer Call !"); if(ICAudioManager.needMute==true) { ICAudioManager.setVolumnMute(mContext); 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 286c90da..50f0be1c 100644 --- 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"); intent.putExtra("msgType", 0); //0 代表 server下发消息，1代表 SMS消息 intent.putExtra("txtMsg", msg); + intent.addFlags(FLAG_ACTIVITY_NEW_TASK); _context.sendBroadcast(intent); } }); @@ -382,6 +383,7 @@ public class ContextProxy { Intent intent = new Intent("action.ic.srvPushTxt"); intent.putExtra("msgType", 0); //0 代表 server下发消息，1代表 SMS消息 intent.putExtra("txtMsg", msg); + intent.addFlags(FLAG_ACTIVITY_NEW_TASK); _context.sendBroadcast(intent); } }); @@ -400,6 +402,7 @@ public class ContextProxy { public void sendBroadcastSitLongAlarm() { Intent intent = new Intent(); intent.setAction(ACTION_KEEPSIT_ALARM); + intent.addFlags(FLAG_ACTIVITY_NEW_TASK); this.context.sendBroadcast(intent); } 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 3ccb0fee..65655918 100644 --- 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 { } + public int getContactCount(ContentResolver resolver) + { + StringBuilder sb = new StringBuilder(); + + Cursor cursor = resolver.query(ICContentProvider.CONTACT_URI, (String[])null, null, (String[])null, "CATEGORY ASC"); + + return cursor.getCount(); + + } private void deleteAllContact(ArrayList contactArraylist, String where, ContentResolver resolver) { StringBuilder sb = new StringBuilder(); sb.append("where="); 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 93ba0131..7e311820 100644 --- 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 98cf7493..3b9efc93 100644 --- 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))); ArrayList contactArray=new ArrayList(); - if (!phNum1.isEmpty()) contactArray.add(new Contact(Contact.CATEGORY_SOS,"sos1",phNum1)); - if (!phNum2.isEmpty()) contactArray.add(new Contact(Contact.CATEGORY_SOS,"sos2",phNum2)); - if (!phNum3.isEmpty()) contactArray.add(new Contact(Contact.CATEGORY_SOS,"sos3",phNum3)); + if(Config.custom_branch_name.equals("AK")){ + contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos1", "07522312120")); + if (!phNum1.isEmpty()) + contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos2", phNum1)); + if (!phNum2.isEmpty()) + contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos3", phNum2)); + }else { + if (!phNum1.isEmpty()) + contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos1", phNum1)); + if (!phNum2.isEmpty()) + contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos2", phNum2)); + if (!phNum3.isEmpty()) + contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos3", phNum3)); + } runtime.getDbHelper().saveContacts(contactArray,false,false,false,false,false,true); }else{ diff --git a/app/version_code.properties b/app/version_code.properties index 66dcdc73..ec3daaea 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Sat Aug 08 16:45:08 CST 2020 -VERSION_CODE=486 +#Mon Aug 10 19:20:04 CST 2020 +VERSION_CODE=489