From 222287395b876d6c145add8bfbb383a65246ab39 Mon Sep 17 00:00:00 2001 From: TrillGates Date: Tue, 15 Mar 2022 20:19:13 +0800 Subject: [PATCH] =?utf8?q?=E6=8A=8A=E6=97=A0=E7=BD=91=E7=8A=B6=E6=80=81?= =?utf8?q?=E4=B8=8B=E7=9A=84AP01=E6=94=B9=E6=88=90APH1?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../enqualcomm/support/service/Deliver.java | 2 ++ .../enqualcomm/support/utils/DBHelper.java | 27 +++++++++++++++++++ .../com/ic/protocols/protocolAPIHelper.java | 1 + .../com/ic/protocols/protocol_beehome.java | 18 ++++++++++++- 4 files changed, 47 insertions(+), 1 deletion(-) 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 8887f805..6de8b965 100644 --- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java +++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java @@ -276,6 +276,7 @@ public class Deliver extends AbstractConnectionService { } else { //如果网络服务器未链接,则表示数据不需要传, //但是有些协议要求此数据 需要转变为 盲点续传数据(已经是盲点的跳过) mRuntime.getDbHelper().updateCMDRecordForUD2(0, msgSent); //重发时无网络 //把UD改为UD2 保存到数据库 + mRuntime.getDbHelper().updateCMDRecordForAPH1(0, msgSent); //把UD改为UD2 保存到数据库 } //ICLogger.i("\n"+queue.size()+" left in Queue!"); } finally { @@ -327,6 +328,7 @@ public class Deliver extends AbstractConnectionService { triggerSendThread(); } else { mRuntime.getDbHelper().updateCMDRecordForUD2(0, Msg); //把UD改为UD2 保存到数据库 + mRuntime.getDbHelper().updateCMDRecordForAPH1(0, Msg); //把UD改为UD2 保存到数据库 } } else { if (checkNetwork()) { 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 f754c1ae..5c63d35e 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java +++ b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java @@ -1151,6 +1151,33 @@ public class DBHelper { } } + public void updateCMDRecordForAPH1(int flag, StringMessage msg) { + String WhereClause = null; + if (msg != null) { + int id = msg.getIndex(); + String topic = msg.cmd(); + if (id >= 0 && topic.equals("AP01")) { + StringMessage UD2 = protocolAPIHelper.genMissedUD2Msg(msg); + if (UD2 != null) { + WhereClause = new StringBuilder("_id=").append(id).toString(); + ContentValues flagcontent = new ContentValues(); + flagcontent.put("FLAG", flag); + flagcontent.put("TOPIC", UD2.cmd()); + flagcontent.put("CMD", UD2.isFromCache()); + this.cr.update(ICContentProvider.PROTOCOL_CMD_RECORDS_URI, flagcontent, WhereClause, null); + ICLogger.d(" 更新 AP01 " + msg.isFromCache() + "\nto APH1 " + UD2.isFromCache()); + } else { + ICLogger.e("genMissedAPH1Msg failed, skip gen APH1 msg"); + } + } else { + ICLogger.e("not AP01(" + topic + ") or id(" + id + ") <0 , skip gen APH1 msg "); + } + } else { + ICLogger.e("msg is null , skip gen APH1 msg"); + } + } + + public void updateCMDRecord(int id, int flag) { String WhereClause = null; if (id >= 0) { diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java index b822d557..feae43e7 100644 --- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java +++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java @@ -1209,6 +1209,7 @@ public class protocolAPIHelper { ret = null; break; case Config.PROTOCOL_BEEHOME: + ret = protocol_beehome.genUD2FromUD(msg); ret = null; break; case Config.PROTOCOL_IC: 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 de51647e..683f86e0 100644 --- a/app/src/main/java/com/ic/protocols/protocol_beehome.java +++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java @@ -84,6 +84,20 @@ public class protocol_beehome { return sentbuf; } + public static StringMessage genUD2FromUD(StringMessage ud) { + String cmd, data, tmp; + tmp = ud.isFromCache(); + if (isCmdStr(tmp).equals("AP01")) { + cmd = ud.cmd().equals("AP01") ? "APH1 " : ud.cmd(); + tmp = ud.isFromCache().replace("]", ""); + int index = tmp.indexOf("AP01,"); + data = tmp.substring(index + 3); + return genStringMessage("APH1 ", data); + } else { + return null; + } + } + /** * 解析测试指令 * @@ -224,6 +238,7 @@ public class protocol_beehome { BP46, AP42,//图片上传 BP42, + APH1,//无网络状态下的定位数据 } private static HashMap cmdStrMap = null; @@ -329,6 +344,7 @@ public class protocol_beehome { cmdStrMap.put(CMD_TYPE.BP46, "BP46"); cmdStrMap.put(CMD_TYPE.AP42, "AP42"); cmdStrMap.put(CMD_TYPE.BP42, "BP42"); + cmdStrMap.put(CMD_TYPE.APH1, "APH1"); // cmdMap = new HashMap<>(); cmdMap.put("AP00", CMD_TYPE.AP00); @@ -427,6 +443,7 @@ public class protocol_beehome { cmdMap.put("AP46", CMD_TYPE.AP46); cmdMap.put("BP42", CMD_TYPE.BP42); cmdMap.put("AP42", CMD_TYPE.AP42); + cmdMap.put("APH1", CMD_TYPE.APH1); } @@ -1050,7 +1067,6 @@ public class protocol_beehome { if (!phNum1.isEmpty()) { contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos1", phNum1)); } - Toast.makeText(mContext, "", Toast.LENGTH_SHORT).show(); if (!phNum2.isEmpty()) { contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos2", phNum2)); } -- 2.17.1