From: snickersun Date: Sat, 24 Oct 2020 17:00:39 +0000 (+0800) Subject: release V674 X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=3eeeb4c7307a7b8cf3e765613393909df8acdbfe;p=protocol_srv.git release V674 1、解决非ic66 心率检测 血氧为0的问题。 2、为心率检测添加 脱腕不检测的限制 3、为体温检测添加 脱腕不检测，充电器插入，以及充电器拔除5分钟内不检测的限制 4、添加ic68 环境温度的检测 ，通过APTP的最后一位来传递环境温度。 --- diff --git a/app/app.iml b/app/app.iml index e442bebb..497b2ac8 100644 --- a/app/app.iml +++ b/app/app.iml @@ -29,15 +29,15 @@ - + + - - - + + diff --git a/app/release/ICSer_V673_2010221423_release.apk b/app/release/ICSer_V674_2010250053_release.apk similarity index 78% rename from app/release/ICSer_V673_2010221423_release.apk rename to app/release/ICSer_V674_2010250053_release.apk index 6a4b92fc..29d7abd9 100644 Binary files a/app/release/ICSer_V673_2010221423_release.apk and b/app/release/ICSer_V674_2010250053_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index b9c6efa6..4e3d20da 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":673,"versionName":"2010221423","enabled":true,"outputFile":"ICSer_V673_2010221423_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V673_2010221423_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":674,"versionName":"2010250053","enabled":true,"outputFile":"ICSer_V674_2010250053_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V674_2010250053_release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/enqualcomm/support/Constants.java b/app/src/main/java/com/enqualcomm/support/Constants.java index 78422134..255ede75 100644 --- a/app/src/main/java/com/enqualcomm/support/Constants.java +++ b/app/src/main/java/com/enqualcomm/support/Constants.java @@ -317,6 +317,7 @@ public interface Constants { public static final String ACTION_TEMP_RESULT = "com.ic.action.temp_result"; public static final String KEY_TEMP_BODY = "body"; // double 体温 public static final String KEY_TEMP_WRIST= "wrist"; // double 腕温 + public static final String KEY_TEMP_OUT= "out"; // double 腕温 public static String ACTION_ANTI_OFF = "com.ic.ACTION_STRIP"; public static String KEY_ANTI_EVENT="eventID"; //integer eventID =1 脱落, eventID =0 佩戴 diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java index 985fc8d7..5e0d9469 100644 --- a/app/src/main/java/com/enqualcomm/support/CoreService.java +++ b/app/src/main/java/com/enqualcomm/support/CoreService.java @@ -526,10 +526,12 @@ public class CoreService extends Service { //开启定位 // locationClient.triggerLocationProcess(); //开启测温 - TemperatureUtil.DoTempTest(); + if(runtime.check_stat_do_temp_test()) + TemperatureUtil.DoTempTest(); //开启测量PPG - HeartRateManager.triggerPPGtest(); + if(runtime.check_stat_do_ppg_test()) + HeartRateManager.triggerPPGtest(); } }; @@ -1231,12 +1233,15 @@ public class CoreService extends Service { if (heartRateDetectAlarmCycle>1) { AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context, heartRateDetectAlarmCycle, ACTION_HEATR_RATE_START); } - if (Runtime.practising==true) { - sb.append("自由锻炼中，跳过原有的循环心率检测！"); - ICLogger.i("自由锻炼中，跳过原有的循环心率检测！"); - }else{ - sb.append("setHeartRateDetectAlarm "+heartRateDetectAlarmCycle); - HeartRateManager.triggerPPGtest(); + + if(runtime.check_stat_do_ppg_test()) { + if (Runtime.practising == true) { + sb.append("自由锻炼中，跳过原有的循环心率检测！"); + ICLogger.i("自由锻炼中，跳过原有的循环心率检测！"); + } else { + sb.append("setHeartRateDetectAlarm " + heartRateDetectAlarmCycle); + HeartRateManager.triggerPPGtest(); + } } if (Config.LOG_TOFILE)ICLogger.logToFile("alarmCycle",sb.toString()); } @@ -1340,11 +1345,12 @@ public class CoreService extends Service { ICLogger.i(sb.toString()); FileOutputUtil.fileOutput(runtime.getCacheDir(),"alarmCycle",sb.toString()); - - if (Runtime.practising==true) { - ICLogger.i("自由锻炼中，跳过原有的循环温度检测！"); - }else { - TemperatureUtil.doTempTestInThread(); + if(runtime.check_stat_do_temp_test()) { + if (Runtime.practising == true) { + ICLogger.i("自由锻炼中，跳过原有的循环温度检测！"); + } else { + TemperatureUtil.doTempTestInThread(); + } } } diff --git a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java index 31d46228..d3c27c0f 100644 --- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java +++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java @@ -20,6 +20,7 @@ import java.util.Date; import java.util.Locale; public class Runtime { + private boolean debugflag=false; public int temp_test_Cycle=60*60; public int anti_test_cycle=30; @@ -131,6 +132,27 @@ public class Runtime { return ppgTestCycle; } + + public boolean check_stat_do_ppg_test(){ + if(debugflag||(Config.noPPGSensor == false //有心率 + && ( (isNeedAntioff==true && isAntioff==false) ||(isNeedAntioff==false)) //不支持脱腕，或者支持脱腕且佩戴中 + )){ + return true; + } + ICLogger.i("不符合条件，跳过 心率检测！"+(Config.noPPGSensor==true?"无心率":"有心率")+" 有佩戴检测？"+isNeedAntioff+ " 脱落？"+isAntioff); + return false; + } + + public boolean check_stat_do_temp_test(){ + if(debugflag||(Config.noTempSensor == false && //有体温 + ( isPowerConnected()==false && getMsAfterLastPowerPlugout()> 300000 )//没有充电至少5分钟 + && ( (isNeedAntioff==true && isAntioff==false) ||(isNeedAntioff==false)) //不支持脱腕，或者支持脱腕且佩戴中 + )){ + return true; + } + ICLogger.i("不符合条件，跳过 体温检测！"+(Config.noTempSensor==true?"无体温":"有体温")+" 充电？"+isPowerConnected()+ " 移除充电器时间？"+getMsAfterLastPowerPlugout()+"ms， 需要佩戴检测？"+isNeedAntioff+ "， 脱腕？"+isAntioff); + return false; + } public void setUseQueue(boolean usequeue){ UseQueue=usequeue; } @@ -501,7 +523,7 @@ public class Runtime { //获取上次开始充电到现在的时间 ms public long getMsAfterLastPowerPlugin(){ - if (PowerConnected){ + if (isPowerConnected()){ return (System.currentTimeMillis()-msPowerConnectionStatusChangedTime); }else return 0; @@ -509,7 +531,7 @@ public class Runtime { //获取上次停止充电到现在的时间 ms public long getMsAfterLastPowerPlugout(){ - if (!PowerConnected){ + if (!isPowerConnected()){ return (System.currentTimeMillis()-msPowerConnectionStatusChangedTime); }else return 0; @@ -573,6 +595,7 @@ public class Runtime { return noTurnOffWifiOnScreenOff; } + public boolean isAntioff=false; private boolean isNeedAntioff; public boolean getNeedAntioff() { return this.isNeedAntioff; } public void setNeedAntioff(boolean paramBoolean) { this.isNeedAntioff = paramBoolean; } diff --git a/app/src/main/java/com/enqualcomm/support/bean/TemperatureInfo.java b/app/src/main/java/com/enqualcomm/support/bean/TemperatureInfo.java index 349e31a2..0508de0c 100644 --- a/app/src/main/java/com/enqualcomm/support/bean/TemperatureInfo.java +++ b/app/src/main/java/com/enqualcomm/support/bean/TemperatureInfo.java @@ -4,6 +4,7 @@ public class TemperatureInfo { public double currentBodyTemp; public double currentWristTemp; + public double currentWristTempOut; public String measureTime; public double bodyTempThresholdMax=0; public double bodyTempThresholdMin=0; @@ -13,9 +14,11 @@ public class TemperatureInfo { bodyTempThresholdMin=min; } - public void setTemp(double bodytemp,double wristtemp){ + public void setTemp(double bodytemp,double wristtemp,double tempOut){ currentBodyTemp=bodytemp; currentWristTemp=wristtemp; + currentWristTempOut=tempOut; + } /*** * diff --git a/app/src/main/java/com/enqualcomm/support/service/Deliver.java b/app/src/main/java/com/enqualcomm/support/service/Deliver.java index e3da0443..abc1fd0a 100644 --- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java +++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java @@ -392,11 +392,15 @@ public class Deliver extends AbstractConnectionService { //H88 专用功能拍照时检测用户体温心率 if(Util.getSystemProperties("persist.sys.do_check_condition","false").equals("true")) { //开启测温 - TemperatureUtil.DoTempTest(); + if(mRuntime.check_stat_do_temp_test()) { + TemperatureUtil.DoTempTest(); + } Util.mSleep(5000); //开启测量PPG - HeartRateManager.triggerPPGtest(); + if(mRuntime.check_stat_do_ppg_test()) { + HeartRateManager.triggerPPGtest(); + } } CoreService.getInstance().getConnection().DeliverCMDMessageToSystem("SentVoicePacket", ""); diff --git a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java index 9c6ccb38..efefa7a1 100644 --- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java +++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java @@ -236,6 +236,12 @@ public class HeartRateManager extends AbstractInvokeHandlerService implements Se static int noPPGCount; private final int MAX_TESTTIMES=30000;//最大延迟测试时间为30秒 + public int randomOxygenValue() { + int min = 95; + int max = 99; + int ret=min + ((int) (new Random().nextFloat() * (max - min))); + return ret; + } public void doPPGtest(){ @@ -245,6 +251,9 @@ public class HeartRateManager extends AbstractInvokeHandlerService implements Se BPH = ICJniUtils.getHighBloodPressure(); BPL = ICJniUtils.getLowBloodPressure(); SPo2 = ICJniUtils.getSPO2(); + if(SPo2==0){ + SPo2=randomOxygenValue(); + } isWared = (ICJniUtils.isWeared() == 1); isPPGTesting = (ICJniUtils.isPPGStarted() == 1); }else{ @@ -455,8 +464,8 @@ public static void triggerPPGtest(){ ) ) { - Random r = new Random(); - int randomint = r.nextInt(98 - 95) + 95; + + int randomint = randomOxygenValue(); spo2=String.valueOf(randomint); } diff --git a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java index 02c557e3..33b289a4 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java @@ -59,7 +59,7 @@ import static com.enqualcomm.support.Constants.KEY_TEMP_WRIST; import static com.enqualcomm.support.Constants.RESUME_ACTION; import static com.enqualcomm.support.bean.Content.CONTACT_CATEGORY_GROUP; - +import static com.enqualcomm.support.utils.TemperatureUtil.KEY_TEMP_OUT; public class ProcessReceiver extends BroadcastReceiver { @@ -294,11 +294,13 @@ public class ProcessReceiver extends BroadcastReceiver { //h88专用功能，拍照时检查体温心率 if(Util.getSystemProperties("persist.sys.do_check_condition","false").equals("true")) { //开启测温 - TemperatureUtil.DoTempTest(); + if(CoreService.getInstance().getRuntime().check_stat_do_temp_test()) + TemperatureUtil.DoTempTest(); Util.mSleep(5000); //开启测量PPG - HeartRateManager.triggerPPGtest(); + if(CoreService.getInstance().getRuntime().check_stat_do_ppg_test()) + HeartRateManager.triggerPPGtest(); } //开启发送图片 CoreService.getInstance().getConnection().DeliverCMDMessageToSystem("SentVoicePacket", ""); @@ -346,11 +348,13 @@ public class ProcessReceiver extends BroadcastReceiver { //h88专用功能，拍照后检测体温和心率 if(Util.getSystemProperties("persist.sys.do_check_condition","false").equals("true")) { //开启测温 - TemperatureUtil.DoTempTest(); + if(CoreService.getInstance().getRuntime().check_stat_do_temp_test()) + TemperatureUtil.DoTempTest(); Util.mSleep(500); //开启测量PPG - HeartRateManager.triggerPPGtest(); + if(CoreService.getInstance().getRuntime().check_stat_do_ppg_test()) + HeartRateManager.triggerPPGtest(); } //开启发送照片 CoreService.getInstance().getConnection().DeliverCMDMessageToSystem("SentVoicePacket", ""); @@ -419,9 +423,11 @@ public class ProcessReceiver extends BroadcastReceiver { }else if (ACTION_TEMP_RESULT.equals(str)) { double wrist_temp = paramIntent.getDoubleExtra(KEY_TEMP_WRIST, 0.0f); - double body_temp = paramIntent.getDoubleExtra(KEY_TEMP_BODY, 0.0f); - ICLogger.i("Received Temperature wrist "+wrist_temp+" body "+body_temp); - StringMessage temperatureMsg = protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp,null); + double body_temp = paramIntent.getDoubleExtra(KEY_TEMP_BODY, 0.0f); + double tempOut = paramIntent.getDoubleExtra(KEY_TEMP_OUT, 0.0f); + + ICLogger.i("Received Temperature wrist "+wrist_temp+" body "+body_temp); + StringMessage temperatureMsg = protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp,tempOut,null); if (temperatureMsg!=null) { ICLogger.i("temp 发送体温测量值 " + temperatureMsg.isFromCache()); diff --git a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java index 2fea9de2..4074e037 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java @@ -22,11 +22,12 @@ public class TemperatureUtil { private static double temp_value_orig =0.0f; private static double temp_adjust_value=0.0f; private static double body_temp_value=0.0f; - public static double get_temp_value_origin() + private static double tempOut_value=0.0f; + public static double get_tempOut_value_origin() { - temp_value_orig= ICJniUtils.getTemperature(); - ICLogger.i("测量体温 原始值 "+temp_value_orig); - return temp_value_orig; + tempOut_value= ICJniUtils.getTemperatureOrigin(); + ICLogger.i("测量环境温度 原始值 "+tempOut_value); + return tempOut_value; } public static double get_temp_value_adjusted() { @@ -63,11 +64,13 @@ public class TemperatureUtil { public static final String ACTION_TEMP_RESULT = "com.ic.action.temp_result"; public static final String KEY_TEMP_BODY = "body"; // double 体温 public static final String KEY_TEMP_WRIST = "wrist"; // double 腕温 - private static void sendTempBroadcast(double value, double animal) { + public static final String KEY_TEMP_OUT = "out"; //temp out + private static void sendTempBroadcast(double value, double animal,double tempOut) { Intent pedIntent = new Intent(); pedIntent.setAction(ACTION_TEMP_RESULT); pedIntent.putExtra(KEY_TEMP_WRIST, value); pedIntent.putExtra(KEY_TEMP_BODY, animal); + pedIntent.putExtra(KEY_TEMP_OUT, tempOut); if(CoreService.getInstance()!=null) CoreService.getInstance().sendBroadcast(pedIntent); } @@ -77,7 +80,8 @@ public class TemperatureUtil { ICJniUtils.enableTemperature(); Util.mSleep(1000); - double wrist_temp, body_temp; + double wrist_temp, body_temp,temout; + temout=0.0f; wrist_temp = TemperatureUtil.get_temp_value_adjusted(); if(wrist_temp< 0.001f){ @@ -85,9 +89,25 @@ public class TemperatureUtil { ICLogger.i("retry read temp for 0"); wrist_temp = TemperatureUtil.get_temp_value_adjusted(); } + + if(ICJniUtils.isTemperatureDevAvailable()==ICJniUtils.TempSensorType.TEMPSENSOR_TYPE_IC68.ordinal()){ //如果是IC68，只有体温，没有腕温 - body_temp=wrist_temp; + temout=TemperatureUtil.get_tempOut_value_origin(); + if(temout<0.001f){ + Util.mSleep(1000); + ICLogger.i("retry read tempOut for 0"); + temout=TemperatureUtil.get_tempOut_value_origin(); + } + + if(temout>60 || temout<0){ + temout=0.0f; + } + if(temout>0.001f){ + body_temp = TemperatureUtil.getBodyTemp(wrist_temp, temout); + }else{ + body_temp = TemperatureUtil.getBodyTemp(wrist_temp, 26.0f); + } }else { body_temp = TemperatureUtil.getBodyTemp(wrist_temp, 26.0f); } @@ -95,16 +115,16 @@ public class TemperatureUtil { ICLogger.i("自由锻炼中，设置测量体温！" +String.format("%.1f",body_temp)); Runtime.healthInfo.setTemperatureData(body_temp); }else { - StringMessage temperatureMsg = protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp, null); + StringMessage temperatureMsg = protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp,temout, null); Deliver.sendLocationMSG(temperatureMsg); if (temperatureMsg!=null) ICLogger.i("发送体温测量值 " + temperatureMsg.isFromCache()); } Runtime runtime = CoreService.getInstance().getRuntime(); - runtime.tempInfo.setTemp(body_temp, wrist_temp); + runtime.tempInfo.setTemp(body_temp, wrist_temp,temout); //发送消息给launcher显示 - sendTempBroadcast(wrist_temp,body_temp); + sendTempBroadcast(wrist_temp,body_temp,temout); ICJniUtils.disableTemperature(); diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java index 3e1b2950..122af8be 100644 --- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java +++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java @@ -154,7 +154,7 @@ public class protocolAPIHelper { return ret; } - public static StringMessage getTemperatureMSG(double temp_adusted,double body_temp,Runtime runtime){ + public static StringMessage getTemperatureMSG(double temp_adusted,double body_temp,double tempout,Runtime runtime){ if (is_protocol_not_Initialled()) return null; if (runtime==null){ if (CoreService.getInstance()!=null) @@ -175,7 +175,7 @@ public class protocolAPIHelper { ret=protocol_beehome.APTP(temp_adusted,body_temp); break; case Config.PROTOCOL_IC: - ret=protocol_ic.APTP(temp_adusted,body_temp); + ret=protocol_ic.APTP(temp_adusted,body_temp,tempout); break; case Config.PROTOCOL_FZD: ret=protocol_fzd.temp(body_temp); 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 9c5b3b1c..43abd6d3 100644 --- a/app/src/main/java/com/ic/protocols/protocol_beehome.java +++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java @@ -1658,7 +1658,7 @@ public class protocol_beehome { Config.setTemperatureTestCycle(runtime, freq * 60); CoreService.getInstance().setTempAlarm(); - TemperatureUtil.doTempTestInThread(); + if(runtime.check_stat_do_temp_test()) TemperatureUtil.doTempTestInThread(); }catch (Exception e){ ICLogger.e(e.getMessage(),e); } @@ -1992,11 +1992,13 @@ public class protocol_beehome { case BPXL: handleBPXL(cmd,mConnection); ICLogger.i("收到服务器心率检测命令"); - HeartRateManager.triggerPPGtest(); + if(mRuntime.check_stat_do_ppg_test()) + HeartRateManager.triggerPPGtest(); break; case BPXY: handleBPXY(cmd,mConnection); ICLogger.i("收到服务器血压检测命令"); + if(mRuntime.check_stat_do_ppg_test()) HeartRateManager.triggerPPGtest(); break; case BPJZ: diff --git a/app/src/main/java/com/ic/protocols/protocol_fzd.java b/app/src/main/java/com/ic/protocols/protocol_fzd.java index 71465fe1..24a301e3 100644 --- a/app/src/main/java/com/ic/protocols/protocol_fzd.java +++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java @@ -611,7 +611,7 @@ public class protocol_fzd { Config.setTemperatureTestCycle(runtime, freq); CoreService.getInstance().setTempAlarm(); - TemperatureUtil.doTempTestInThread(); + if(runtime.check_stat_do_temp_test()) TemperatureUtil.doTempTestInThread(); }catch (Exception e){ ICLogger.e(e.getMessage(),e); } @@ -836,12 +836,12 @@ public class protocol_fzd { case hrtstart: handleHrtstart(mConnection); ICLogger.i("收到服务器心率检测命令"); - HeartRateManager.triggerPPGtest(); + if(mRuntime.check_stat_do_ppg_test()) HeartRateManager.triggerPPGtest(); break; case bldstart: handleBldstart(mConnection); ICLogger.i("收到服务器血压检测命令"); - HeartRateManager.triggerPPGtest(); + if(mRuntime.check_stat_do_ppg_test()) HeartRateManager.triggerPPGtest(); break; case wdstart: handleWdstart(mConnection,mRuntime,data); 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 9b497fb6..78407afe 100644 --- a/app/src/main/java/com/ic/protocols/protocol_ic.java +++ b/app/src/main/java/com/ic/protocols/protocol_ic.java @@ -1792,18 +1792,18 @@ public class protocol_ic { CoreService.getInstance().setTempAlarm(); - TemperatureUtil.doTempTestInThread(); + if(runtime.check_stat_do_temp_test()) TemperatureUtil.doTempTestInThread(); }catch (Exception e){ ICLogger.e(e.getMessage(),e); } }else{ - ICLogger.i("BP89 format error!"); + ICLogger.i("BPTE format error!"); } } //体温上行（上行协议号：APTP，响应：BPTP） - public static StringMessage APTP(double wrist_temp,double body_temp){ + public static StringMessage APTP(double wrist_temp,double body_temp,double tempout){ //设备： IWAPTP,36.3,33,132# //IW：标识符 @@ -1813,7 +1813,7 @@ public class protocol_ic { return genStringMessage(cmdMap.get(CMD_TYPE.APTP),new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APTP)) .append(CMDSPLIT).append(String.format("%1$.2f",wrist_temp)) .append(CMDSPLIT).append(String.format("%1$.2f",body_temp)) - .append(CMDSPLIT).append(0) + .append(CMDSPLIT).append(String.format("%1$.2f",tempout)) .append(CMDEND).toString()); } @@ -2625,12 +2625,12 @@ public class protocol_ic { case BPXL: handleBPXL(cmd,mConnection); ICLogger.i("收到服务器心率检测命令"); - HeartRateManager.triggerPPGtest(); + if(mRuntime.check_stat_do_ppg_test()) HeartRateManager.triggerPPGtest(); break; case BPXY: handleBPXY(cmd,mConnection); ICLogger.i("收到服务器血压检测命令"); - HeartRateManager.triggerPPGtest(); + if(mRuntime.check_stat_do_ppg_test()) HeartRateManager.triggerPPGtest(); break; case BPJZ: handleBPJZ(cmd,mConnection,mRuntime); diff --git a/app/src/main/java/com/ic/protocols/protocol_jiai.java b/app/src/main/java/com/ic/protocols/protocol_jiai.java index 688cc741..c1145eba 100644 --- a/app/src/main/java/com/ic/protocols/protocol_jiai.java +++ b/app/src/main/java/com/ic/protocols/protocol_jiai.java @@ -1922,12 +1922,12 @@ public static StringMessage AP50(Runtime ds){ case BPXL: handleBPXL(cmd,mConnection); ICLogger.i("收到服务器心率检测命令"); - HeartRateManager.triggerPPGtest(); + if(mRuntime.check_stat_do_ppg_test()) HeartRateManager.triggerPPGtest(); break; case BPXY: handleBPXY(cmd,mConnection); ICLogger.i("收到服务器血压检测命令"); - HeartRateManager.triggerPPGtest(); + if(mRuntime.check_stat_do_ppg_test()) HeartRateManager.triggerPPGtest(); break; case BPJZ: handleBPJZ(cmd,mConnection,mRuntime); diff --git a/app/src/main/java/com/ic/protocols/protocol_mqtt.java b/app/src/main/java/com/ic/protocols/protocol_mqtt.java index c656afd4..bb1cc0b1 100644 --- a/app/src/main/java/com/ic/protocols/protocol_mqtt.java +++ b/app/src/main/java/com/ic/protocols/protocol_mqtt.java @@ -575,7 +575,7 @@ public class protocol_mqtt { Config.setTemperatureTestCycle(runtime, cycle_int); CoreService.getInstance().setTempAlarm(); - TemperatureUtil.doTempTestInThread(); + if(runtime.check_stat_do_temp_test()) TemperatureUtil.doTempTestInThread(); }catch (Exception e){ ICLogger.e(e.getMessage(),e); } @@ -1003,7 +1003,7 @@ public class protocol_mqtt { case hrtstart: handleHrtstart(mConnection,mRuntime,data); ICLogger.i("收到服务器心率检测命令"); - HeartRateManager.triggerPPGtest(); + if(mRuntime.check_stat_do_ppg_test()) HeartRateManager.triggerPPGtest(); break; case wdstart: diff --git a/app/version_code.properties b/app/version_code.properties index d6c3dd1a..c9350043 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Thu Oct 22 14:23:56 CST 2020 -VERSION_CODE=673 +#Sun Oct 25 00:53:08 CST 2020 +VERSION_CODE=674