} else { //如果网络服务器未链接,则表示数据不需要传,
//但是有些协议要求此数据 需要转变为 盲点续传数据(已经是盲点的跳过)
mRuntime.getDbHelper().updateCMDRecordForUD2(0, msgSent); //重发时无网络 //把UD改为UD2 保存到数据库
+ mRuntime.getDbHelper().updateCMDRecordForAPH1(0, msgSent); //把UD改为UD2 保存到数据库
}
//ICLogger.i("\n"+queue.size()+" left in Queue!");
} finally {
triggerSendThread();
} else {
mRuntime.getDbHelper().updateCMDRecordForUD2(0, Msg); //把UD改为UD2 保存到数据库
+ mRuntime.getDbHelper().updateCMDRecordForAPH1(0, Msg); //把UD改为UD2 保存到数据库
}
} else {
if (checkNetwork()) {
}
}
+ 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) {
ret = null;
break;
case Config.PROTOCOL_BEEHOME:
+ ret = protocol_beehome.genUD2FromUD(msg);
ret = null;
break;
case Config.PROTOCOL_IC:
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;
+ }
+ }
+
/**
* 解析测试指令
*
BP46,
AP42,//图片上传
BP42,
+ APH1,//无网络状态下的定位数据
}
private static HashMap<CMD_TYPE, String> cmdStrMap = null;
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);
cmdMap.put("AP46", CMD_TYPE.AP46);
cmdMap.put("BP42", CMD_TYPE.BP42);
cmdMap.put("AP42", CMD_TYPE.AP42);
+ cmdMap.put("APH1", CMD_TYPE.APH1);
}
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));
}