From: snickersun Date: Mon, 29 Mar 2021 13:17:03 +0000 (+0800) Subject: release 770 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=0b0a2fd4377bfa3356599cdb917d9548e4d1a9b7;p=protocol_srv.git release 770 1、添加 #testcmd#= 测试命令 2、beehome协议APTP 第一个数据改为体温。 3、beehome协议心率采用APHT上报。 --- diff --git a/app/release/ICSer_V768_2103251412_release.apk b/app/release/ICSer_V770_2103292114_release.apk similarity index 78% rename from app/release/ICSer_V768_2103251412_release.apk rename to app/release/ICSer_V770_2103292114_release.apk index 17f4e399..8cca28a0 100644 Binary files a/app/release/ICSer_V768_2103251412_release.apk and b/app/release/ICSer_V770_2103292114_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 6e16ee5e..c344e1ac 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":768,"versionName":"2103251412","enabled":true,"outputFile":"ICSer_V768_2103251412_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V768_2103251412_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":770,"versionName":"2103292114","enabled":true,"outputFile":"ICSer_V770_2103292114_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V770_2103292114_release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java index feb9652d..8190d7a8 100644 --- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java +++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java @@ -23,6 +23,7 @@ import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.bean.StringMessage; import com.enqualcomm.support.service.AudioService; import com.enqualcomm.support.service.Deliver; +import com.enqualcomm.support.service.HeartRateManager; import com.enqualcomm.support.service.SmsDatabaseChaneObserver; import com.enqualcomm.support.utils.APNUtil; import com.enqualcomm.support.utils.CameraUtil; @@ -34,6 +35,7 @@ import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.LanguageUtils; import com.enqualcomm.support.utils.SendEmail; import com.enqualcomm.support.utils.SimSignalUtil; +import com.enqualcomm.support.utils.TemperatureUtil; import com.enqualcomm.support.utils.TimeUtil; import com.enqualcomm.support.utils.Util; import com.enqualcomm.support.utils.VibrateUtil; @@ -56,6 +58,7 @@ import static com.enqualcomm.support.Constants.ACTION_SMSCMD_TEST; import static com.enqualcomm.support.Constants.ACTION_SMS_RECEIVED; import static com.enqualcomm.support.Constants.ACTION_START_FOTA_UPDATE; import static com.enqualcomm.support.Constants.ACTION_TINTERNAL_TEST; +import static com.enqualcomm.support.Constants.FROM_SERVER; import static com.enqualcomm.support.Constants.KeyReplyData; import static com.enqualcomm.support.utils.SimSignalUtil.send_at_cmd; import static com.enqualcomm.support.utils.SimSignalUtil.send_at_setImei0; @@ -1082,6 +1085,13 @@ public class ICSmsManager extends BroadcastReceiver { * 。。。。。 * 添加新命令道这里 */ + + } else if (sms.startsWith(ENCRYPED_HEADER + "#testcmd#=")) { + String tmp[] = sms.split("="); + if (tmp.length == 2) { + String cmd = tmp[1]; + handle_test_cmd(cmd,""); + } } else { return false; } @@ -1213,6 +1223,29 @@ public class ICSmsManager extends BroadcastReceiver { } + }else if (cmd.startsWith("BPTE,")) { + + String list[] = cmd.split(","); + if (list.length == 2) { + int freq=0; + try{ + freq=Integer.parseInt(list[1]); + }catch (Exception e){ + freq=0; + } + ICLogger.i("收到短信指令：测量体温 " + freq + "分钟一次。"); + Config.setTemperatureTestCycle(runtime, freq * 60); + CoreService.getInstance().setTempAlarm(true); + if (runtime.check_stat_do_temp_test()) + TemperatureUtil.getInstance().doTempTestInThread(FROM_SERVER); + + } + }else if (cmd.startsWith("BPXL")) { + + ICLogger.i("收到短信指令：测量心率。"); + if (CoreService.getInstance().getRuntime().check_stat_do_ppg_test()) + HeartRateManager.getInstance().triggerPPGTest(FROM_SERVER); + } } } \ No newline at end of file diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java index 1a304eba..421b87e8 100644 --- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java +++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java @@ -374,7 +374,7 @@ public class protocolAPIHelper { ret = protocol_jiai.APHT(runtime); break; case Config.PROTOCOL_BEEHOME: - ret = protocol_beehome.APHP(runtime); + ret = protocol_beehome.APHT(runtime); break; case Config.PROTOCOL_IC: ret = protocol_ic.APHP(runtime); @@ -515,7 +515,7 @@ public class protocolAPIHelper { ret = protocol_jiai.APHT(ppg, bph, bpl); break; case Config.PROTOCOL_BEEHOME: - ret = protocol_beehome.APHP(ppg, bph, bpl, spo2); + ret = protocol_beehome.APHT(ppg, bph, bpl); break; case Config.PROTOCOL_IC: ret = protocol_ic.APHP(ppg, bph, bpl, spo2); 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 83fcdf14..d403edb3 100644 --- a/app/src/main/java/com/ic/protocols/protocol_beehome.java +++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java @@ -1691,8 +1691,8 @@ public class protocol_beehome { //35.3：测量体温 （摄氏度） //33，132：温补用的参数，此处不用，可以用0 来代替。 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(String.format("%1$.2f", wrist_temp)) .append(CMDSPLIT).append(0) .append(CMDEND).toString()); } diff --git a/app/version_code.properties b/app/version_code.properties index 02831dbc..e01bca99 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Thu Mar 25 14:12:28 CST 2021 -VERSION_CODE=768 +#Mon Mar 29 21:14:45 CST 2021 +VERSION_CODE=770