From: TrillGates Date: Fri, 7 Jan 2022 09:11:50 +0000 (+0800) Subject: 解决健康数据上传回复的问题 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=7ba6f72d9dbb5dd8b1465920d8a6f27119ede726;p=icsupport.git 解决健康数据上传回复的问题 --- 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 cc997252..6e76db90 100644 --- a/app/src/main/java/com/ic/protocols/protocol_beehome.java +++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java @@ -464,10 +464,10 @@ public class protocol_beehome { boolean ret = true; String last_inCompletecmd = ""; String cmd_msgbuf = new String(bytes); - log("bytes.size " + bytes.length); + ICLogger.d("bytes.size " + bytes.length); // cmdbuf.append(cmd_msgbuf); cmdbuf.append(cmd_msgbuf); - log("cmdbuf.size " + cmdbuf.length() + " " + cmdbuf.toString()); + ICLogger.d("cmdbuf.size " + cmdbuf.length() + " " + cmdbuf.toString()); /* 如果不是 #结尾,就认为 接收数据不全,置位。 */ @@ -476,14 +476,14 @@ public class protocol_beehome { } String[] cmdlist = cmd_msgbuf.split(CMDEND); int listlen = cmdlist.length; - log("listlen " + listlen); + ICLogger.d("listlen " + listlen); /* 如果解析出来的cmdlist不是空,且数据不是完整cmd则保留 最后一条数据到last_inCompletecmd */ if (cmdlist.length > 0 && iscmdComplete == false) { listlen -= 1; last_inCompletecmd = cmdlist[listlen]; - log("cmd not complete , " + last_inCompletecmd); + ICLogger.d("cmd not complete , " + last_inCompletecmd); } for (int i = 0; i < listlen; i++) { String cmdItem = cmdlist[i]; @@ -492,10 +492,9 @@ public class protocol_beehome { String cmdStr = cmdItem.substring(2, 6); ICLogger.d("cmdStr ==> " + cmdStr); CMD_TYPE key = cmdMap.get(cmdStr); - log("found cmd keyid=" + key + " ,keyname=" + cmdStrMap.get(key) + " , " + cmdlist[i]); + ICLogger.d("found cmd keyid=" + key + " ,keyname=" + cmdStrMap.get(key) + " , " + cmdlist[i]); if (key == CMD_TYPE.BP28) { //如果是BP28则 后面的数据是音频,需要保留 - byte[] amrBuf; int amrLen = getBP28Amrlen(cmdlist[i]); if (bytes.length > amrLen) { handleCmd(key, cmdlist[i], bytes); @@ -2880,6 +2879,7 @@ public class protocol_beehome { handleBPPH(cmd); break; case BPJK: + mConnection.DeliverCMDMessageToSystem("APJK", cmd);//通知下面线程状态变化 ICLogger.d("服务器收到健康数据上报" + cmd); break; case BPSM: