From: TrillGates Date: Wed, 13 Oct 2021 03:31:35 +0000 (+0800) Subject: 重构代码,添加moveCheck协议 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=9a83de2f8e2c386026d4835bf5af6adfde806b9c;p=icsupport.git 重构代码,添加moveCheck协议 --- diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java index cea571d5..cd6e8271 100644 --- a/app/src/main/java/com/enqualcomm/support/Config.java +++ b/app/src/main/java/com/enqualcomm/support/Config.java @@ -34,6 +34,11 @@ public class Config { public static final boolean LOG_TOFILE = true; public static int sw_release_no = -1; + public static boolean needHRSTestOnSOS = Util.getSystemProperties("persist.sys.needHRSOnSOS", "false").equals("true"); + + // + public static boolean isSilentMode = false; + public static HeartRateOxygenTestType testType = HeartRateOxygenTestType.ALL; //默认协议心跳时间 @@ -42,11 +47,14 @@ public class Config { //如果重试都失败,则丢弃命令不进行盲点续传 public static boolean discard_cmd_after_retryfailed = true; - public static boolean enableDataRoaming=false; + public static boolean enableDataRoaming = false; - public static boolean forceMoveCheck = true; + public static boolean GpsForceMoveCheck = true; public static boolean forceWearCheck = true; + + private static final String KEYGlobalSkipMoveCheckFlag = "SkipMoveCheckGlobalFlag"; + private static final String KEYDurationOfVibration = "DurationVib"; private static final String KeyMasterVolume = "MasterVolume"; @@ -60,6 +68,8 @@ public class Config { public static String DefaultWiFiPWD = "87654321"; public static String DefaultWiFiEncryptType = "psk"; + public static final int TemperatureTestResultSendTimeOut = 2; // 温度测试结果发送超时2秒 ,两秒内更新不发送,超过两秒不更新才发送 + public static final int GPSLocationTimeoutInSeconds = 50; public static final int WiFiLocationTimeoutInSeconds = 12; @@ -92,6 +102,26 @@ public class Config { public static boolean needBroadcastCutoffAlarm = true; + //add by TrillGates=================start + //各种阀值:血压,血氧,心率,体温 + //以下值的赋值时机: + //1、服务起来的时候,从数据库中读取记录阀值 + //2、当阀值更新的时候,更新数据的同时,也更新以下的值 + //保存到这里来,方便使用,不需要每次去查询 + public static float LIMIT_VALUE_PPGH = 0; + public static float LIMIT_VALUE_PPGL = 0; + public static float LIMIT_VALUE_BPH_H = 0; + public static float LIMIT_VALUE_BPH_L = 0; + public static float LIMIT_VALUE_BPL_H = 0; + public static float LIMIT_VALUE_BPL_L = 0; + public static float LIMIT_VALUE_OXYGEN = 0; + public static float LIMIT_VALUE_TEMPERATURE_TOP = 0; + public static float LIMIT_VALUE_TEMPERATURE_BOTTOM = 0; + public static float LIMIT_VALUE_WORK_TEMPERATURE_TOP = 0; + public static float LIMIT_VALUE_WORK_TEMPERATURE_BOTTOM = 0; + //add by TrillGates=================end + + //定位是否使用wifi的配置。 public static boolean disableWiFiScan = false; @@ -164,7 +194,6 @@ public class Config { public static int DefaultTemperatureTestCycle = 60 * 60; public static int DefaultWifiStatus = 0; //0 close , 1 open, 2 open and connect using default wifi - public static boolean needHRSTestOnSOS = Util.getSystemProperties("persist.sys.needHRSOnSOS", "false").equals("true"); static void load_config_fromfile() { try { @@ -198,6 +227,23 @@ public class Config { } } + public static void ReloadModCycleSettingsWhenEmergencyStop(Runtime runtime) { + Context context = runtime.getContextProxy().context; + ICLogger.i("current Cycles PPG " + runtime.getPpgTestCycleInMinutes() + " , LocationCycle " + runtime.getLocationInstance().getLocation_cycle() + " LocationMode " + runtime.getLocationInstance().getWorkingMod()); + runtime.setPpgTestCycleInMinutes(Config.getPPGTestCycleInMinutes(context)); + runtime.getLocationInstance().setLocation_cycle(runtime.getLocationInstance().getLocation_cycle()); + runtime.getLocationInstance().setWorkingMod(runtime.getLocationInstance().getLastWorkingMode()); + ICLogger.i("current Cycles PPG " + runtime.getPpgTestCycleInMinutes() + " , LocationCycle " + runtime.getLocationInstance().getLocation_cycle() + " LocationMode " + runtime.getLocationInstance().getWorkingMod()); + } + + + public static void setSkipMoveCheckFlagGlobal(Context context, boolean en) { + SharePreferenceUtil.setPrefBoolean(context, KEYGlobalSkipMoveCheckFlag, en); + } + + public static boolean getSkipMoveCheckFlagGlobal(Context context) { + return SharePreferenceUtil.getPrefBoolean(context, KEYGlobalSkipMoveCheckFlag, false); + } public static void setDurationOfVibration(Context context, int cycle) { SharePreferenceUtil.setPrefInt(context, KEYDurationOfVibration, cycle); } @@ -322,33 +368,25 @@ public class Config { public static void loadModCycleSettings(Runtime runtime) { Context context = runtime.getContextProxy().context; - ICLogger.i("current Cycles PPG " + runtime.getPpgTestCycleInMinutes() + " , LocationCycle " + runtime.getLocationInstance().getLocation_cycle() + " LocationMode " + runtime.getLocationInstance().getWorkingMod()); + //初始化定位模式 + LocationClient.setSkipMoveCheck(Config.getSkipMoveCheckFlagGlobal(context)); +// ICLogger.i("current Cycles PPG " + runtime.getPpgTestCycleInMinutes() + " , LocationCycle " + runtime.getLocationInstance().getLocation_cycle() + " LocationMode " + runtime.getLocationInstance().getWorkingMod()); runtime.setPpgTestCycleInMinutes(Config.getPPGTestCycleInMinutes(context)); runtime.getLocationInstance().setLocation_cycle(Config.getLocationCycle(context)); runtime.getLocationInstance().setWorkingMod(Config.getLocationMode(context)); - ICLogger.i("current Cycles PPG " + runtime.getPpgTestCycleInMinutes() + " , LocationCycle " + runtime.getLocationInstance().getLocation_cycle() + " LocationMode " + runtime.getLocationInstance().getWorkingMod()); + ICLogger.i("current Cycles PPG " + runtime.getPpgTestCycleInMinutes() + " , LocationCycle " + runtime.getLocationInstance().getLocation_cycle() + " LocationMode " + runtime.getLocationInstance().getWorkingMod() + " SkipMoveCheck " +LocationClient.getSkipMoveCheck()); int mastervolume = getMasterVolume(context); - ICAudioManager.setMasterVolumn(context, mastervolume); + ICAudioManager.setMasterVolume(context, mastervolume); int duration = getDurationOfVibration(context); VibrateUtil.setVibPattern(duration * 1000); - } - public static void ReloadModCycleSettingsWhenEmergencyStop(Runtime runtime) { - Context context = runtime.getContextProxy().context; - ICLogger.i("current Cycles PPG " + runtime.getPpgTestCycleInMinutes() + " , LocationCycle " + runtime.getLocationInstance().getLocation_cycle() + " LocationMode " + runtime.getLocationInstance().getWorkingMod()); - runtime.setPpgTestCycleInMinutes(Config.getPPGTestCycleInMinutes(context)); - runtime.getLocationInstance().setLocation_cycle(runtime.getLocationInstance().getLocation_cycle()); - runtime.getLocationInstance().setWorkingMod(runtime.getLocationInstance().getLastWorkingMode()); - ICLogger.i("current Cycles PPG " + runtime.getPpgTestCycleInMinutes() + " , LocationCycle " + runtime.getLocationInstance().getLocation_cycle() + " LocationMode " + runtime.getLocationInstance().getWorkingMod()); } - - public static void loadHearBeatSetting(Runtime runtime) { - if(Config.protocol_no == Config.PROTOCOL_UNKNOWN){ + if (Config.protocol_no == Config.PROTOCOL_UNKNOWN) { Config.HeartBeatAlarmCycle = 65535; //不识别的协议,就设置一个很大的数据相当于没有心跳,这样更省电 } runtime.setHeartBeatCycle(Config.getHeartBeatCycle(runtime.getContextProxy().context)); @@ -507,11 +545,6 @@ public class Config { } } - public static void LoadMessageConfigs() { - - - } - public static void loadTemperatureSettings(Runtime runtime) { runtime.temp_test_Cycle_Seconds = SharePreferenceUtil.getPrefInt(runtime.getContextProxy().context, KeyTempTestCycle, 60 * 60); } @@ -610,6 +643,10 @@ public class Config { case PROTOCOL_MQTT: ICLogger.i("协议 MQTT"); break; + case PROTOCOL_ANAN: + ICLogger.i("协议 ANAN"); + ret = PROTOCOL_ANAN; + break; case PROTOCOL_S123: ICLogger.i("协议 S123 Vitrack"); break; @@ -617,8 +654,8 @@ public class Config { ICLogger.i("协议 Gator"); break; default: - ICLogger.i("协议版本 目前支持0,1,2,3,4,5,6,7"); - ret=PROTOCOL_UNKNOWN; + ICLogger.i("协议版本 目前支持0,1,2,3,4,5,6,7" + tmp); + ret = PROTOCOL_UNKNOWN; break; } } else { @@ -628,12 +665,10 @@ public class Config { return ret; } - public static void setPPGAdjust(Context context, int adjust) { SharePreferenceUtil.setPrefInt(context, KeyPPGadust, adjust); } - public static int getPPGAdjust(Context context) { return SharePreferenceUtil.getPrefInt(context, KeyPPGadust, 0); } @@ -642,12 +677,10 @@ public class Config { SharePreferenceUtil.setPrefInt(context, KeyBPHadust, adjust); } - public static int getBPHAdjust(Context context) { return SharePreferenceUtil.getPrefInt(context, KeyBPHadust, 0); } - public static int getBPLAdjust(Context context) { return SharePreferenceUtil.getPrefInt(context, KeyBPLadust, 0); } @@ -674,7 +707,6 @@ public class Config { ICLogger.i("Load Health adjust value ppg " + ppgadj + ", bph " + bphadj + ", bpl " + bpladj + ", spo2 " + spo2adj); } - //心率血压血氧校准值 public static String getPPG_ECG_adjustValue() { return Util.getSystemProperties("persist.sys." + Constants.SHAREKEY_SETTING_PPG_ECG_ADJUST, "0,0,0,0"); @@ -701,22 +733,17 @@ public class Config { // SharPreferenceUtil.setPrefStringPublic(context,Constants.SHAREKEY_SETTING_SLEEP_SCORE_DATE,dateyyyyMMddHHmmss); } - public static void setSleepScore(Context context, int score) { // SharPreferenceUtil.setPrefIntPublic(context,Constants.SHAREKEY_SETTING_SLEEP_SCORE,score); Util.setSystemProperties("persist.sys." + Constants.SHAREKEY_SETTING_SLEEP_SCORE, score); - } public static String getSleepDate(Context context) { return Util.getSystemProperties("persist.sys." + Constants.SHAREKEY_SETTING_SLEEP_SCORE_DATE, ""); } - public static int getSleepScore(Context context) { - return Util.getSystemPropertiesInt("persist.sys." + Constants.SHAREKEY_SETTING_SLEEP_SCORE, 0); - } public static void setNeedCutOff(Context context, boolean enAnti) { @@ -911,8 +938,8 @@ public class Config { ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH, true); DefaultLocationMode = CUSTOM_MOD8_GPS; DefaultLocationCycle = 10 * 60; - DefaultPPGTestCycleInMinutes = 0; - DefaultTemperatureTestCycle = 0 * 60; + DefaultPPGTestCycleInMinutes = 60; + DefaultTemperatureTestCycle = 60 * 60; noPushTxtNotifyDialog = true; noSMSNotifyDialog = true; noVoiceNotifyDialog = true; @@ -924,8 +951,8 @@ public class Config { noPPGSensor = false; noTempSensor = false; L004_BroadCastActionStrip = true; - enableDataRoaming=true; - forceMoveCheck = true; //即爱对gps不进行运动检测,此变量专门为了给其他协议进行强制运动检测用的。 + enableDataRoaming = true; + Config.GpsForceMoveCheck = false; //即爱对gps不进行运动检测,此变量专门为了给其他协议进行强制运动检测用的。 } else if (Config.custom_name.equals("l005")) { ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF, true); @@ -946,9 +973,8 @@ public class Config { noPPGSensor = true; noTempSensor = true; L004_BroadCastActionStrip = true; - enableDataRoaming=true; - forceMoveCheck = true; //即爱对gps不进行运动检测,此变量专门为了给其他协议进行强制运动检测用的。 - + enableDataRoaming = true; + GpsForceMoveCheck = false; //即爱对gps不进行运动检测,此变量专门为了给其他协议进行强制运动检测用的。 } else if (custom_name.equals("YQ") || custom_name.equals("YQ_EN")) { ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF, true); ConfigAlarm(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF, true); @@ -1021,10 +1047,10 @@ public class Config { ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH, true); ConfigAlarm(Runtime.AlarmType.ALARM_WEARED, true); ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF, true); - forceMoveCheck = false; //对定位不进行运动检测。 + GpsForceMoveCheck = false; //对定位不进行运动检测。 DefaultLocationMode = CUSTOM_MOD8_GPS; - DefaultLocationCycle = 5 * 60; + DefaultLocationCycle = 15 * 60; DefaultPPGTestCycleInMinutes = 0; DefaultTemperatureTestCycle = 0; @@ -1040,8 +1066,10 @@ public class Config { noTempSensor = false; C5_noBroadCastActionStrip = true; - } else if (Config.custom_name.equals("L02") || Config.custom_name.equals("L03") || Config.custom_name.equals("L05")) { //L02 - Config.forceMoveCheck = false; //即爱对gps不进行运动检测,此变量专门为了给其他协议进行强制运动检测用的。 + } else if (Config.custom_name.equals("L02") || + Config.custom_name.equals("L03") || + Config.custom_name.equals("L05")) { //L02 + Config.GpsForceMoveCheck = false; //即爱对gps不进行运动检测,此变量专门为了给其他协议进行强制运动检测用的。 DefaultLocationMode = NORMAL_MOD; DefaultLocationCycle = 900; DefaultPPGTestCycleInMinutes = 0; @@ -1049,17 +1077,26 @@ public class Config { noPushTxtReadReply = false;//即爱需要阅读反馈 noBroadCastPushTxtNotify = true; } else if (Config.custom_name.equals("VitracK") || Config.custom_name.equals("wtsrui")) { - Config.ConfigAlarm(Runtime.AlarmType.ALARM_SOS, true); Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOWBATTERY, true); Config.ConfigAlarm(Runtime.AlarmType.ALARM_WEARED, true); Config.ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF, true); - enableSleep = false; + enableSleep = true; + Config.GpsForceMoveCheck = false; DefaultLocationMode = CUSTOM_MOD8_GPS; DefaultLocationCycle = 15 * 60; DefaultPPGTestCycleInMinutes = 15; DefaultTemperatureTestCycle = 15 * 60; - + } else if (Config.custom_name.equals("Gator") ) { + Config.ConfigAlarm(Runtime.AlarmType.ALARM_SOS, true); + Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOWBATTERY, true); + Config.ConfigAlarm(Runtime.AlarmType.ALARM_WEARED, true); + Config.ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF, true); + Config.GpsForceMoveCheck = true; + DefaultLocationMode = CUSTOM_MOD8_GPS; + DefaultLocationCycle = 5 * 60; + DefaultPPGTestCycleInMinutes = 0; + DefaultTemperatureTestCycle = 0; } else { DefaultLocationMode = NORMAL_MOD; DefaultLocationCycle = 900; @@ -1068,7 +1105,5 @@ public class Config { noBroadCastPushTxtNotify = true; } } - - } diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java index 2497454c..fe192bf1 100644 --- a/app/src/main/java/com/enqualcomm/support/LocationClient.java +++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java @@ -961,11 +961,11 @@ public class LocationClient { updateStepCount();//update StepCount,保证每次定位前,计步数据是最新的。防止丢数据。 //如果没有动,且超时。则跳过定位 NoMoveTimeout = checkNoMoveTimeoutForBT(); - ICLogger.i("BT NoMoveTimeout " + NoMoveTimeout + ", forceLocation=" + forceLocation + ", Config.forceMoveCheck=" + Config.forceMoveCheck + ", skipMoveCheck=" + skipMoveCheck); + ICLogger.i("BT NoMoveTimeout " + NoMoveTimeout + ", forceLocation=" + forceLocation + ", Config.forceMoveCheck=" + Config.GpsForceMoveCheck + ", skipMoveCheck=" + skipMoveCheck); // 不强制定位 且 (WorkingMod 不是紧急模式 或者 强制进行移动检测),且 没有移动过 if ((forceLocation != 1) && - (Config.forceMoveCheck == true) && + (Config.GpsForceMoveCheck == true) && (NoMoveTimeout) && (skipMoveCheck == false)) { ICLogger.i("No Move ,skip BT location!"); @@ -980,11 +980,11 @@ public class LocationClient { updateStepCount();//update StepCount,保证每次定位前,计步数据是最新的。防止丢数据。 //如果没有动,且超时。则跳过定位 NoMoveTimeout = checkNoMoveTimeout(); - ICLogger.i(" NoMoveTimeout " + NoMoveTimeout + ", forceLocation=" + forceLocation + ", Config.forceMoveCheck=" + Config.forceMoveCheck + ", skipMoveCheck=" + skipMoveCheck); + ICLogger.i(" NoMoveTimeout " + NoMoveTimeout + ", forceLocation=" + forceLocation + ", Config.forceMoveCheck=" + Config.GpsForceMoveCheck + ", skipMoveCheck=" + skipMoveCheck); // 不强制定位 且 (WorkingMod 不是紧急模式 或者 强制进行移动检测),且 没有移动过 if ((forceLocation != 1) && - (Config.forceMoveCheck == true) && + (Config.GpsForceMoveCheck == true) && (NoMoveTimeout) && (skipMoveCheck == false)) { ICLogger.i("No Move ,skip BT location2!"); @@ -1010,7 +1010,7 @@ public class LocationClient { 都满足才检测 */ if ((forceLocation != 1) && - (((mod == ICLocation.NORMAL_MOD) || (mod == ICLocation.LOWPOWER_MOD) || (mod == ICLocation.CUSTOM_MOD8_WIFI)) || Config.forceMoveCheck == true) && + (((mod == ICLocation.NORMAL_MOD) || (mod == ICLocation.LOWPOWER_MOD) || (mod == ICLocation.CUSTOM_MOD8_WIFI)) || Config.GpsForceMoveCheck == true) && (NoMoveTimeout) && (skipMoveCheck == false)) { ICLogger.i("No Move ,skip location!"); return; 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 6dcc9c44..c71debaf 100644 --- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java +++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java @@ -366,11 +366,11 @@ public class SilentManager extends AbstractInvokeHandlerService { if (silent) { VibrateUtil.setVibPattern(0); - ICAudioManager.setMasterVolumn(context, 0); + ICAudioManager.setMasterVolume(context, 0); Util.SetRingMode(context, AudioManager.RINGER_MODE_SILENT, false); } else { int mastervolume = Config.getMasterVolume(context); - ICAudioManager.setMasterVolumn(context, mastervolume); + ICAudioManager.setMasterVolume(context, mastervolume); int duration = Config.getDurationOfVibration(context); VibrateUtil.setVibPattern(duration * 1000); Util.SetRingMode(context, AudioManager.MODE_NORMAL, true); diff --git a/app/src/main/java/com/enqualcomm/support/toolActivity.java b/app/src/main/java/com/enqualcomm/support/toolActivity.java index bb2710d7..caae2284 100644 --- a/app/src/main/java/com/enqualcomm/support/toolActivity.java +++ b/app/src/main/java/com/enqualcomm/support/toolActivity.java @@ -138,13 +138,13 @@ public class toolActivity extends Activity { btnSlog.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if(Config.forceMoveCheck) + if(Config.GpsForceMoveCheck) { - Config.forceMoveCheck=false; + Config.GpsForceMoveCheck=false; }else{ - Config.forceMoveCheck=true; + Config.GpsForceMoveCheck=true; } - Util.ShowToast(CoreService.getInstance().runtime,"Set ForceMoveCheck "+ Config.forceMoveCheck); + Util.ShowToast(CoreService.getInstance().runtime,"Set ForceMoveCheck "+ Config.GpsForceMoveCheck); } }); 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 d65d0788..d933ab5d 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java @@ -10,7 +10,7 @@ public class ICAudioManager { private static int saved_volumn = 0; public static boolean needMute = false; - public static void setMasterVolumn(Context context,int volume) { + public static void setMasterVolume(Context context, int volume) { AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); int maxvolume=audioManager.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL); ICLogger.i("======setVolumn "+volume +" maxvolmun "+maxvolume); diff --git a/app/src/main/java/com/ic/protocols/protocol_beehome.java b/app/src/main/java/com/ic/protocols/protocol_beehome.java index ab17943d..1b152cd2 100644 --- a/app/src/main/java/com/ic/protocols/protocol_beehome.java +++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java @@ -7,6 +7,7 @@ import android.os.Environment; import com.enqualcomm.support.Config; import com.enqualcomm.support.CoreService; +import com.enqualcomm.support.LocationClient; import com.enqualcomm.support.bean.Alarm; import com.enqualcomm.support.bean.Contact; import com.enqualcomm.support.bean.Content; @@ -127,6 +128,8 @@ public class protocol_beehome { APTF,//时间设置 BPSQ,//设置体征信息监测间隔 APSQ, + BPMC,//专门控制skipmovecheck + APMC,// } private static HashMap cmdMap = null; @@ -155,8 +158,8 @@ public class protocol_beehome { cmdMap.put(CMD_TYPE.BPHT, "BPHT"); cmdMap.put(CMD_TYPE.APTM, "APTM"); cmdMap.put(CMD_TYPE.BPTM, "BPTM"); - cmdMap.put(CMD_TYPE.BPVR,"BPVR"); - cmdMap.put(CMD_TYPE.APVR,"APVR"); + cmdMap.put(CMD_TYPE.BPVR, "BPVR"); + cmdMap.put(CMD_TYPE.APVR, "APVR"); cmdMap.put(CMD_TYPE.AP12, "AP12"); cmdMap.put(CMD_TYPE.BP12, "BP12"); cmdMap.put(CMD_TYPE.AP14, "AP14"); @@ -213,6 +216,8 @@ public class protocol_beehome { cmdMap.put(CMD_TYPE.APTF, "APTF"); cmdMap.put(CMD_TYPE.BPSQ, "BPSQ"); cmdMap.put(CMD_TYPE.APSQ, "APSQ"); + cmdMap.put(CMD_TYPE.BPMC, "BPMC"); + cmdMap.put(CMD_TYPE.APMC, "APMC"); } @@ -372,7 +377,7 @@ public class protocol_beehome { //示例数据:IWAP00867155030001063# // IWAP00860315002003375,12345678901234567890,9466970701492096# 三个参数分别是IMEI,ICCID,IMSI CellInfoUtil.getPhoneStatus(ds);//获取IMSI,ICCID - StringBuffer cmdbuf=new StringBuffer(CMDHEADER); + StringBuffer cmdbuf = new StringBuffer(CMDHEADER); cmdbuf.append(cmdMap.get(CMD_TYPE.AP00)).append(ds.IMEI()) .append(CMDSPLIT).append(ds.getIccid()) .append(CMDSPLIT).append(ds.getImsi()) @@ -1889,7 +1894,8 @@ public class protocol_beehome { ICLogger.i("BPX1 format error!"); } } - public static StringMessage APSQ(String id,int type , int cycle) { + + public static StringMessage APSQ(String id, int type, int cycle) { //设备响应: IWAPSQ,080835,1,60# //080835:指令流水号 return genStringMessage(cmdMap.get(CMD_TYPE.APSQ), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APSQ)) @@ -1899,6 +1905,44 @@ public class protocol_beehome { .append(CMDEND).toString()); } + private void handleBPMC(String cmd) { + //指令,IMEI,流水,值:0,1,2。 + //0表示关闭,1表示打开,2表示获取当前的状态,不做设置,只返回 + //IWBPMC,353456789012345,080835,1# + String[] split = cmd.split(CMDSPLIT); + if (split.length == 4) { + String index = split[2]; + String value = split[3]; + ICLogger.d("BPMC index ==> " + index + " value==> " + value); + //判断value,返回内容 + boolean responseValue = false; + if ("0".equals(value)) { + responseValue = false; + LocationClient.setSkipMoveCheck(false); + Config.setSkipMoveCheckFlagGlobal(mRuntime.getContextProxy().context, false); + } else if ("1".equals(value)) { + responseValue = true; + LocationClient.setSkipMoveCheck(true); + Config.setSkipMoveCheckFlagGlobal(mRuntime.getContextProxy().context, true); + } else if ("2".equals(value)) { + responseValue = LocationClient.getSkipMoveCheck(); + } + //返回结果 + StringMessage apmc = APMC(index, responseValue); + ICLogger.d("apmc ==> " + apmc); + mConnection.send(apmc); + } else { + ICLogger.d("parse error ==> " + cmd); + } + } + + private StringMessage APMC(String index, boolean responseValue) { + return genStringMessage(cmdMap.get(CMD_TYPE.APMC), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APMC)) + .append(CMDSPLIT).append(index) + .append(CMDSPLIT).append(responseValue) + .append(CMDEND).toString()); + } + public void handleBPSQ(String cmd, Connection connection, Runtime runtime) { //IWBPSQ,353456789012345,080835,1,60# //说明: @@ -1911,48 +1955,49 @@ public class protocol_beehome { String index = list[2]; String typestr = list[3].trim(); String cyclestr = list[4].trim(); - int type=0; - int cycle_seconds=0; - int cycle_minutes=0; - try{ - type=Integer.parseInt(typestr); + int type = 0; + int cycle_seconds = 0; + int cycle_minutes = 0; + try { + type = Integer.parseInt(typestr); cycle_seconds = Integer.parseInt(cyclestr); - connection.send(APSQ(index,type,cycle_seconds)); - cycle_minutes = cycle_seconds/60; - String type_name="未知"; - switch(type){ + connection.send(APSQ(index, type, cycle_seconds)); + cycle_minutes = cycle_seconds / 60; + String type_name = "未知"; + switch (type) { case 1: - type_name="心率"; + type_name = "心率"; //发送重置PPGCycle的广播,会在CoreServer里面执行 CoreService.getInstance().setHeartRateDetectAlarm(cycle_minutes); break; case 2: - type_name="血压"; + type_name = "血压"; //发送重置PPGCycle的广播,会在CoreServer里面执行 CoreService.getInstance().setHeartRateDetectAlarm(cycle_minutes); break; case 3: - type_name="体温"; + type_name = "体温"; Config.setTemperatureTestCycle(runtime, cycle_seconds); CoreService.getInstance().setTempAlarm(true); break; case 4: - type_name="血氧"; + type_name = "血氧"; //发送重置PPGCycle的广播,会在CoreServer里面执行 CoreService.getInstance().setHeartRateDetectAlarm(cycle_minutes); break; default: - type_name="未知"; + type_name = "未知"; break; } - ICLogger.i("收到 BPSQ 指令,设置体征传感器测试周期, IMEI " + imei + ", index " + index + ", 传感器类型 " + type + " "+type_name + " 间隔"+cycle_seconds+"秒,相当于"+cycle_minutes+"分钟"); - }catch (Exception e){ + ICLogger.i("收到 BPSQ 指令,设置体征传感器测试周期, IMEI " + imei + ", index " + index + ", 传感器类型 " + type + " " + type_name + " 间隔" + cycle_seconds + "秒,相当于" + cycle_minutes + "分钟"); + } catch (Exception e) { ICLogger.e(e.getMessage(), e); } } else { ICLogger.i("BPSQ format error!"); } } + public static StringMessage APHP(Runtime ds) { //IWAPHP,60,130,85,95,90, , , , , , , , # //IW:标识符 @@ -2195,15 +2240,20 @@ public class protocol_beehome { ICLogger.d("收到修改时间格式的指令..."); break; case BPSQ: - handleBPSQ(cmd,mConnection,mRuntime); + handleBPSQ(cmd, mConnection, mRuntime); ICLogger.d("收到设置体征信息检测间隔的指令..."); break; + case BPMC: + ICLogger.d("收到服务器下发的修改skipmovecheck"); + handleBPMC(cmd); + break; } return ret; } + public boolean handleCmd(CMD_TYPE type, String cmd, byte[] bytes) { //只有需要传递二级制数据的才需要这个函数,目前只有BP28需要 diff --git a/app/src/main/java/com/ic/protocols/protocol_gator.java b/app/src/main/java/com/ic/protocols/protocol_gator.java index b949aa3a..1954e77c 100644 --- a/app/src/main/java/com/ic/protocols/protocol_gator.java +++ b/app/src/main/java/com/ic/protocols/protocol_gator.java @@ -1,26 +1,17 @@ package com.ic.protocols; -import android.content.ComponentName; import android.content.ContentResolver; import android.content.ContentValues; -import android.content.Context; -import android.content.IClipboard; -import android.content.Intent; import android.net.Uri; import android.os.Environment; import android.os.Handler; import android.os.HandlerThread; -import android.text.TextUtils; -import com.android.internal.telephony.uicc.RuimFileHandler; import com.enqualcomm.support.Config; -import com.enqualcomm.support.Constants; import com.enqualcomm.support.CoreService; -import com.enqualcomm.support.R; import com.enqualcomm.support.bean.Alarm; import com.enqualcomm.support.bean.Contact; import com.enqualcomm.support.bean.Content; -import com.enqualcomm.support.bean.ICLocation; import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.bean.Silent; import com.enqualcomm.support.bean.StringMessage; @@ -29,37 +20,23 @@ import com.enqualcomm.support.bean.voicePacket; import com.enqualcomm.support.provider.FZDDatabaseHelper; import com.enqualcomm.support.provider.FZDMembersProvider; import com.enqualcomm.support.provider.FZDMessageProvider; -import com.enqualcomm.support.service.HeartRateManager; import com.enqualcomm.support.utils.AESCipher; -import com.enqualcomm.support.utils.CameraUtil; import com.enqualcomm.support.utils.Connection; import com.enqualcomm.support.utils.DeviceInfoUtil; import com.enqualcomm.support.utils.ICAudioManager; import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.LanguageUtils; -import com.enqualcomm.support.utils.TemperatureUtil; import com.enqualcomm.support.utils.TimeUtil; import com.enqualcomm.support.utils.Util; -import com.enqualcomm.support.utils.VibrateUtil; -import com.enqualcomm.support.utils.WakeLockUtil; import com.enqualcomm.support.utils.regexUtil; -import com.ic.view.msg.MsgMustReadDialog; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.RandomAccessFile; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import chestnut.utils.RegexUtils; - -import static com.enqualcomm.support.Constants.DIALOG_ACTION; -import static com.enqualcomm.support.Constants.FROM_SERVER; -import static com.enqualcomm.support.LocationClient.LOCATION_MODE; import static com.enqualcomm.support.bean.Contact.GROUP_ALL; import static com.enqualcomm.support.bean.Content.CONTACT_CATEGORY_GROUP; import static java.lang.Math.abs; @@ -1205,7 +1182,7 @@ SOS报警上行WIFI、LBS混合定位数据,步数为255æ­¥,电量等级5,数 if (volume < 0) volume = 0; if (volume >= 14) volume = 15; Config.setMasterVolume(runtime.getContextProxy().context, mastervolume * 2); - ICAudioManager.setMasterVolumn(runtime.getContextProxy().context, mastervolume * 2); + ICAudioManager.setMasterVolume(runtime.getContextProxy().context, mastervolume * 2); connection.send(BPXX_REPLY(runtime, CMD_TYPE.BP21, index, true)); } catch (Exception e) { ICLogger.e(e.getMessage(), e); 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 a3e6838e..f4df4a9b 100644 --- a/app/src/main/java/com/ic/protocols/protocol_ic.java +++ b/app/src/main/java/com/ic/protocols/protocol_ic.java @@ -26,7 +26,6 @@ import com.enqualcomm.support.utils.CameraUtil; import com.enqualcomm.support.utils.Connection; import com.enqualcomm.support.utils.ICAudioManager; import com.enqualcomm.support.utils.ICLogger; -import com.enqualcomm.support.utils.TemperatureUtil; import com.enqualcomm.support.utils.TimeUtil; import com.enqualcomm.support.utils.Util; import com.enqualcomm.support.utils.VibrateUtil; @@ -2937,7 +2936,7 @@ public class protocol_ic { if (volume < 0) volume = 0; if (volume >= 14) volume = 15; Config.setMasterVolume(runtime.getContextProxy().context, mastervolume * 2); - ICAudioManager.setMasterVolumn(runtime.getContextProxy().context, mastervolume * 2); + ICAudioManager.setMasterVolume(runtime.getContextProxy().context, mastervolume * 2); } else { ICLogger.i(" BP65 Format error!"); diff --git a/app/src/main/java/com/ic/protocols/protocol_s123.java b/app/src/main/java/com/ic/protocols/protocol_s123.java index 96a5d494..65a240b2 100644 --- a/app/src/main/java/com/ic/protocols/protocol_s123.java +++ b/app/src/main/java/com/ic/protocols/protocol_s123.java @@ -2962,7 +2962,7 @@ public class protocol_s123 { if (volume < 0) volume = 0; if (volume >= 14) volume = 15; Config.setMasterVolume(runtime.getContextProxy().context, mastervolume * 2); - ICAudioManager.setMasterVolumn(runtime.getContextProxy().context, mastervolume * 2); + ICAudioManager.setMasterVolume(runtime.getContextProxy().context, mastervolume * 2); } else { ICLogger.i(" BP65 Format error!"); diff --git a/local.properties b/local.properties index c6dcf0cf..e1970574 100644 --- a/local.properties +++ b/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Fri Jul 02 14:52:39 CST 2021 -sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk +#Wed Oct 13 10:35:44 CST 2021 +sdk.dir=E\:\\Android\\Sdk