From: TrillGates Date: Mon, 29 Nov 2021 09:48:44 +0000 (+0800) Subject: 修改了时区的问题,发布了版本ICSer_V930_2111291747_release X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=da38b84c9f482e70297a9a0f95f73f3fc87ad3be;p=icsupport.git 修改了时区的问题,发布了版本ICSer_V930_2111291747_release --- diff --git a/app/release/ICSer_V925_2111261433_release.apk b/app/release/ICSer_V930_2111291747_release.apk similarity index 77% rename from app/release/ICSer_V925_2111261433_release.apk rename to app/release/ICSer_V930_2111291747_release.apk index 2c64d5bf..2c523255 100644 Binary files a/app/release/ICSer_V925_2111261433_release.apk and b/app/release/ICSer_V930_2111291747_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 045c0191..b1e373f4 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":925,"versionName":"2111261433","enabled":true,"outputFile":"ICSer_V925_2111261433_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V925_2111261433_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":930,"versionName":"2111291747","enabled":true,"outputFile":"ICSer_V930_2111291747_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V930_2111291747_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 5db4b0fd..6bd432be 100644 --- a/app/src/main/java/com/enqualcomm/support/Constants.java +++ b/app/src/main/java/com/enqualcomm/support/Constants.java @@ -255,6 +255,7 @@ public interface Constants { String ACTION_START_FOTA_UPDATE = "com.ic.action.startfotaUpdate"; String ACTION_SMSCMD = "com.enqualcomm.support.SMSCMD"; + String ACTION_CMD_TESTER = "com.ic.action.CMD_TESTER"; String ACTION_SMSCMD_Reply = "com.ic.action.fotaUpdateReply"; String ACTION_TINTERNAL_TEST = "com.ic.action.internaltest"; diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java index 80657f84..4f0d9a9d 100644 --- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java +++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java @@ -50,6 +50,7 @@ import java.util.List; import chestnut.utils.PhoneUtils; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; +import static com.enqualcomm.support.Constants.ACTION_CMD_TESTER; import static com.enqualcomm.support.Constants.ACTION_SMSCMD; import static com.enqualcomm.support.Constants.ACTION_SMSCMD_Reply; import static com.enqualcomm.support.Constants.ACTION_SMSCMD_TEST; @@ -141,6 +142,13 @@ public class ICSmsManager extends BroadcastReceiver { ContextProxy.sendMsgBroadcast(context, message, 1); } } + } else if (ACTION_CMD_TESTER.equals(action)) { + //模拟指令,传到各个协议里去 + String cmd = intent.getStringExtra("cmd"); + ICLogger.d("cmd ==> " + cmd); + if (!TextUtils.isEmpty(cmd)) { + protocolAPIHelper.parseTestData(cmd); + } } } @@ -167,6 +175,7 @@ public class ICSmsManager extends BroadcastReceiver { intentfilter.addAction(ACTION_SMSCMD_Reply); intentfilter.addAction(ACTION_SMS_RECEIVED); intentfilter.addAction(ACTION_SMSCMD); + intentfilter.addAction(ACTION_CMD_TESTER); intentfilter.addAction(ACTION_TINTERNAL_TEST); mContext.registerReceiver(this, intentfilter); ICLogger.i("ICSmsManager register filter "); @@ -304,7 +313,6 @@ public class ICSmsManager extends BroadcastReceiver { * */ public boolean handleSMS_CMD(String phonenumber, String sms) { if (isAdminNumber(phonenumber)) { - String ENCRYPED_HEADER = Config.getSMSPwd(mContext); if (ENCRYPED_HEADER.equals(Config.DefaultSMSPassword)) { ENCRYPED_HEADER = ""; @@ -522,11 +530,9 @@ public class ICSmsManager extends BroadcastReceiver { sendSMS(phonenumber, "setlocation format error!"); } } - } else { sendSMS(phonenumber, "setlocation format error!"); } - } else if (sms.startsWith(ENCRYPED_HEADER + "#skipmovecheck#=")) { String tmp[] = sms.split("="); if (tmp.length == 2) { @@ -614,7 +620,7 @@ public class ICSmsManager extends BroadcastReceiver { } else { sendSMS(phonenumber, "WiFi Control format error!"); } - } else if (sms.startsWith(ENCRYPED_HEADER + "#logctl#=")) { + } else if (sms.startsWith(ENCRYPED_HEADER + "'#logctl#='")) { needshowToast = sms.contains("SDLogInfo:"); cell_number_to_reply = phonenumber; @@ -845,7 +851,6 @@ public class ICSmsManager extends BroadcastReceiver { }, 2000); } else if (sms.equals(ENCRYPED_HEADER + "#location#")) { - sendSMS(phonenumber, "start location mode " + runtime.getLocationInstance().getWorkingMod() + "!"); cell_number_to_reply = phonenumber; LocationClient locationClient = LocationClient.getInstance(); @@ -857,16 +862,14 @@ public class ICSmsManager extends BroadcastReceiver { } else if (sms.startsWith(ENCRYPED_HEADER + "#setLogSrv#=") && sms.endsWith("#")) { String tmp[] = sms.split("="); if (tmp.length == 2) { - String strtmp = tmp[1].replace("#", ""); - - if (strtmp.contains("/")) { + String strTmp = tmp[1].replace("#", ""); + if (strTmp.contains("/")) { /* #setLogSrv#=http://icfota.snicker.com.cn:8089/UploadFile.jsp*/ - Config.setHttpLogServerUrl(mContext, strtmp); - sendSMS(phonenumber, "set setLogSrv to " + strtmp + "!"); + Config.setHttpLogServerUrl(mContext, strTmp); + sendSMS(phonenumber, "set setLogSrv to " + strTmp + "!"); } else { sendSMS(phonenumber, " setLogSrv cmd Format error!"); } - } else { sendSMS(phonenumber, " setLogSrv cmd Format error!"); } @@ -889,7 +892,6 @@ public class ICSmsManager extends BroadcastReceiver { if (tmp.length == 2) { String tmplist[] = tmp[1].split(","); if (tmplist.length == 3) { - String SSID = tmplist[0]; String PWD = tmplist[1]; String encyptType = tmplist[2]; @@ -1031,14 +1033,12 @@ public class ICSmsManager extends BroadcastReceiver { sendSMS(phonenumber, "setprotocol only support Protocol 0/1/2/3/4 by now! "); break; } - } else { sendSMS(phonenumber, " only support protocol jiAi , ic , beehome , fzd , mqtt !"); } } else { sendSMS(phonenumber, " setprotocol cmd Format error!"); } - } else if (sms.startsWith(ENCRYPED_HEADER + "#maillog#=")) { String tmp[] = sms.split("="); if (tmp.length == 2) { 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 b3059de4..b4722f47 100644 --- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java +++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java @@ -213,12 +213,17 @@ public class HeartRateManager extends AbstractInvokeHandlerService { StringMessage PPGDATA = protocolAPIHelper.getPPG_ECG_MSG(this.runtime); if (PPGDATA != null) { Deliver.sendLocationMSG(PPGDATA); - ICLogger.i("Send PPG " + PPGDATA.isFromCache()); + ICLogger.i("Send 心率 " + PPGDATA.isFromCache()); } - PPGDATA = protocolAPIHelper.getJustBoodPresureMsg(this.runtime); + PPGDATA = protocolAPIHelper.getJustBloodPresureMsg(this.runtime); if (PPGDATA != null) { Deliver.sendLocationMSG(PPGDATA); - ICLogger.i("Send PPG " + PPGDATA.isFromCache()); + ICLogger.i("Send 血压 " + PPGDATA.isFromCache()); + } + PPGDATA = protocolAPIHelper.getJustBloodOxygenMsg(this.runtime); + if (PPGDATA != null) { + Deliver.sendLocationMSG(PPGDATA); + ICLogger.i("Send 血氧 " + PPGDATA.isFromCache()); } //发送给EQC服务器的 sendBroadcastPPGResult(); 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 7722b525..ba30e7ca 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java @@ -296,8 +296,7 @@ public class ProcessReceiver extends BroadcastReceiver { } @Override - public void onRe - ceive(Context paramContext, Intent paramIntent) { + public void onReceive(Context paramContext, Intent paramIntent) { boolean isSilence; Contact contact; diff --git a/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java b/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java index 5a90f587..2f71cebe 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java @@ -37,8 +37,9 @@ public class TimeUtil { } public static String getUTCTimeForCameraMark() { - return (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")) - .format(new Date(System.currentTimeMillis() - TimeZone.getDefault().getRawOffset())); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT+00:00")); + return simpleDateFormat.format(new Date()); } public static String getSystemTime() { @@ -87,13 +88,18 @@ public class TimeUtil { } public static String getUTCSystemDateYYMMDD() { - return (new SimpleDateFormat("yyMMdd")).format(new Date(System.currentTimeMillis() - TimeZone.getDefault().getRawOffset())); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyMMdd"); + simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT+00:00")); + return simpleDateFormat.format(new Date()); } public static String getUTCSystemTimeHHmmss() { - return (new SimpleDateFormat("HHmmss")).format(new Date(System.currentTimeMillis() - TimeZone.getDefault().getRawOffset())); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HHmmss"); + simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT+00:00")); + return simpleDateFormat.format(new Date()); } - public static Date parsetiime( String time) { + + public static Date parsetiime(String time) { SimpleDateFormat df1 = new SimpleDateFormat("HH:mm");//需要转化成的时间格式 08:00:00,2016-01-12 Date date1 = null; try { @@ -108,6 +114,7 @@ public class TimeUtil { } } + public static Date parseDatetiime(String date, String time) { // SimpleDateFormat dff = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS", Locale.ENGLISH);//输入的被转化的时间格式 @@ -266,15 +273,16 @@ public class TimeUtil { android.provider.Settings.Global.putInt(mContext.getContentResolver(), android.provider.Settings.Global.AUTO_TIME, checked); } + public static void setSysDateTime(Context mContext, Date datetime, String timezoneStr, boolean addtimezoneToTime) { AlarmManager alarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE); Locale.getDefault().getDisplayCountry(); String timezone_name = ""; - if(timezoneStr.startsWith("e")||timezoneStr.startsWith("E")){ - timezone_name = String.format("GMT+%1$s:%2$s",timezoneStr.substring(1,3),timezoneStr.substring(3,5)); - }else{ - timezone_name = String.format("GMT-%1$s:%2$s", timezoneStr.substring(1,3),timezoneStr.substring(3,5)); + if (timezoneStr.startsWith("e") || timezoneStr.startsWith("E")) { + timezone_name = String.format("GMT+%1$s:%2$s", timezoneStr.substring(1, 3), timezoneStr.substring(3, 5)); + } else { + timezone_name = String.format("GMT-%1$s:%2$s", timezoneStr.substring(1, 3), timezoneStr.substring(3, 5)); } ICLogger.i("====set timezone " + timezone_name); TimeZone tz = TimeZone.getTimeZone(timezone_name); @@ -284,21 +292,21 @@ public class TimeUtil { ICLogger.i("====origin time " + c.getTime().toString() + " time zone " + c.getTimeZone()); c.setTime(datetime); - int timezonehours=0; - int timezoneminutes=0; + int timezonehours = 0; + int timezoneminutes = 0; try { timezonehours = Integer.parseInt(timezoneStr.substring(1, 3)); timezoneminutes = Integer.parseInt(timezoneStr.substring(3, 5)); - }catch (Exception e){ - ICLogger.e(e.getMessage(),e); + } catch (Exception e) { + ICLogger.e(e.getMessage(), e); } if (addtimezoneToTime) { if (is24Hour(mContext)) { c.add(Calendar.HOUR_OF_DAY, timezonehours);//24小时制 - c.add(Calendar.MINUTE,timezoneminutes); + c.add(Calendar.MINUTE, timezoneminutes); } else { c.add(Calendar.HOUR, timezonehours);//12小时制 - c.add(Calendar.MINUTE,timezoneminutes); + c.add(Calendar.MINUTE, timezoneminutes); } c.setTimeZone(tz); } @@ -322,6 +330,7 @@ public class TimeUtil { } + public static void setSysDateTime(Context mContext, Date datetime, int timezone, boolean addtimezoneToTime) { AlarmManager alarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE); @@ -329,7 +338,6 @@ public class TimeUtil { String timezone_name = ""; if (timezone > 0) { timezone_name = String.format("GMT+%1$02d:00", Math.abs(timezone)); - } else { timezone_name = String.format("GMT-%1$02d:00", Math.abs(timezone)); } @@ -339,7 +347,12 @@ public class TimeUtil { Calendar c = Calendar.getInstance(); ICLogger.i("====origin time " + c.getTime().toString() + " time zone " + c.getTimeZone()); + //先设置为0时区,然后设置时间 + TimeZone defaultTimeZone = TimeZone.getTimeZone("GMT-00:00"); + c.setTimeZone(defaultTimeZone); c.setTime(datetime); + long defaultTime = c.getTimeInMillis(); + ICLogger.d("defaultTime ==> " + defaultTime); if (addtimezoneToTime) { if (is24Hour(mContext)) { c.add(Calendar.HOUR_OF_DAY, timezone);//24小时制 @@ -349,8 +362,9 @@ public class TimeUtil { c.setTimeZone(tz); } -// alarmManager.setTimeZone(); + //alarmManager.setTimeZone(); long when = c.getTimeInMillis(); + ICLogger.d("addtimezoneToTime==> " + addtimezoneToTime + "after when ==> " + when); if (when / 1000 < Integer.MAX_VALUE) { //SystemClock.setCurrentTimeMillis(when); alarmManager.setTime(when); @@ -398,18 +412,20 @@ public class TimeUtil { TimeZone tz = TimeZone.getTimeZone(timeZone); now.setTimeZone(tz); } + //gator 使用,采用 e0800 格式 public static void setTimeZone(Context context, String timeZonedate) { String timezone_name = ""; - if(timeZonedate.startsWith("e")||timeZonedate.startsWith("E")){ - timezone_name = String.format("GMT+%1$s:%2$s",timeZonedate.substring(1,3),timeZonedate.substring(3,5)); - }else{ - timezone_name = String.format("GMT-%1$s:%2$s", timeZonedate.substring(1,3),timeZonedate.substring(3,5)); + if (timeZonedate.startsWith("e") || timeZonedate.startsWith("E")) { + timezone_name = String.format("GMT+%1$s:%2$s", timeZonedate.substring(1, 3), timeZonedate.substring(3, 5)); + } else { + timezone_name = String.format("GMT-%1$s:%2$s", timeZonedate.substring(1, 3), timeZonedate.substring(3, 5)); } ICLogger.i("====set timezone " + timezone_name); //TimeZone tz = TimeZone.getTimeZone(timezone_name); updateTimeZone(context, timezone_name); } + //当前设置timezone的方式,与语言选择方法一致。 public static void setTimeZone(Context context, int timeZone) { diff --git a/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java b/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java index e8aea5cc..d0b86c97 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java +++ b/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java @@ -50,7 +50,6 @@ public class mqttConnection implements Connection { listener = paramConnectionListener; mRuntime = runtime; if (API == null) API = new protocolAPIHelper(this, runtime); - } private Runtime mRuntime = null; diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java index 5f0c9019..291408c0 100644 --- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java +++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java @@ -67,6 +67,7 @@ public class protocolAPIHelper { ); } + public static void doWeatherGet(Connection connection, Runtime runtime) { switch (Config.protocol_no) { case Config.PROTOCOL_JIAI: @@ -95,7 +96,7 @@ public class protocolAPIHelper { } } - public static StringMessage getJustBoodPresureMsg(Runtime runtime) { + public static StringMessage getJustBloodPresureMsg(Runtime runtime) { if (is_protocol_not_Initialled()) return null; StringMessage ret = null; @@ -111,6 +112,32 @@ public class protocolAPIHelper { return ret; } + public static boolean parseTestData(String cmd) { + if (is_protocol_not_Initialled()) return false; + switch (Config.protocol_no) { + case Config.PROTOCOL_BEEHOME: + protocolbeehome_handler.parserTesterCmdStr(cmd); + break; + } + return true; + } + + public static StringMessage getJustBloodOxygenMsg(Runtime runtime) { + if (is_protocol_not_Initialled()) return null; + StringMessage ret = null; + + if (runtime == null || runtime.getHRS().getBPH() <= 0) { + ICLogger.d(" 血压 值 <=0 跳过异常数据!"); + return null; + } + switch (Config.protocol_no) { + case Config.PROTOCOL_BEEHOME: + ret = protocol_beehome.APJK(4, runtime); + break; + } + return ret; + } + /* 返回true 表示 cmd 全部解析成功 返回false表示 cmd至少有一条解析失败,失败的数据归入buffer,下一次识别接着使用 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 3d6e1b25..8f93589e 100644 --- a/app/src/main/java/com/ic/protocols/protocol_beehome.java +++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java @@ -1,11 +1,10 @@ package com.ic.protocols; import android.content.ComponentName; -import android.content.ContentResolver; -import android.content.ContentValues; import android.content.Intent; import android.net.Uri; import android.os.Environment; +import android.text.TextUtils; import com.enqualcomm.support.Config; import com.enqualcomm.support.CoreService; @@ -46,6 +45,23 @@ public class protocol_beehome { public static final String defaultServerIP = "en.beehome360.com"; public static final int defaultServerPort = 5018; + /** + * 解析测试指令 + * + * @param cmd + */ + public void parserTesterCmdStr(String cmd) { + if (cmd.length() < 4) { + ICLogger.d("cmd length error..." + cmd); + return; + } + ICLogger.d("cmd ==> " + cmd); + String cmdKey = cmd.substring(2, 6); + ICLogger.d("cmdKey ==> " + cmdKey); + CMD_TYPE cmd_type = cmdMap.get(cmdKey); + handleCmd(cmd_type, cmd); + } + public enum CMD_TYPE { /*终端发起*/ AP00,//登录包 @@ -138,96 +154,185 @@ public class protocol_beehome { BPJK,//平台响应 } - private static HashMap cmdMap = null; + private static HashMap cmdStrMap = null; + private static HashMap cmdMap = null; static { - cmdMap = new HashMap(); - cmdMap.put(CMD_TYPE.AP00, "AP00"); - cmdMap.put(CMD_TYPE.BP00, "BP00"); - cmdMap.put(CMD_TYPE.AP01, "AP01"); - cmdMap.put(CMD_TYPE.BP01, "BP01"); - cmdMap.put(CMD_TYPE.AP02, "AP02"); - cmdMap.put(CMD_TYPE.BP02, "BP02"); - cmdMap.put(CMD_TYPE.AP92, "AP92"); - cmdMap.put(CMD_TYPE.BP92, "BP92"); - cmdMap.put(CMD_TYPE.AP03, "AP03"); - cmdMap.put(CMD_TYPE.BP03, "BP03"); - cmdMap.put(CMD_TYPE.AP05, "AP05"); - cmdMap.put(CMD_TYPE.BP05, "BP05"); - cmdMap.put(CMD_TYPE.AP07, "AP07"); - cmdMap.put(CMD_TYPE.BP07, "BP07"); - cmdMap.put(CMD_TYPE.AP10, "AP10"); - cmdMap.put(CMD_TYPE.BP10, "BP10"); - cmdMap.put(CMD_TYPE.AP49, "AP49"); - cmdMap.put(CMD_TYPE.BP49, "BP49"); - cmdMap.put(CMD_TYPE.APHT, "APHT"); - cmdMap.put(CMD_TYPE.BPHT, "BPHT"); - cmdMap.put(CMD_TYPE.APTM, "APTM"); - cmdMap.put(CMD_TYPE.BPTM, "BPTM"); - cmdMap.put(CMD_TYPE.BPVR, "BPVR"); - cmdMap.put(CMD_TYPE.APVR, "APVR"); - cmdMap.put(CMD_TYPE.AP12, "AP12"); - cmdMap.put(CMD_TYPE.BP12, "BP12"); - cmdMap.put(CMD_TYPE.AP14, "AP14"); - cmdMap.put(CMD_TYPE.BP14, "BP14"); - cmdMap.put(CMD_TYPE.AP15, "AP15"); - cmdMap.put(CMD_TYPE.BP15, "BP15"); - cmdMap.put(CMD_TYPE.AP16, "AP16"); - cmdMap.put(CMD_TYPE.BP16, "BP16"); - cmdMap.put(CMD_TYPE.AP17, "AP17"); - cmdMap.put(CMD_TYPE.BP17, "BP17"); - cmdMap.put(CMD_TYPE.AP18, "AP18"); - cmdMap.put(CMD_TYPE.BP18, "BP18"); - cmdMap.put(CMD_TYPE.AP21, "AP21"); - cmdMap.put(CMD_TYPE.BP21, "BP21"); - cmdMap.put(CMD_TYPE.AP28, "AP28"); - cmdMap.put(CMD_TYPE.BP28, "BP28"); - cmdMap.put(CMD_TYPE.AP31, "AP31"); - cmdMap.put(CMD_TYPE.BP31, "BP31"); - cmdMap.put(CMD_TYPE.AP33, "AP33"); - cmdMap.put(CMD_TYPE.BP33, "BP33"); - cmdMap.put(CMD_TYPE.AP34, "AP34"); - cmdMap.put(CMD_TYPE.BP34, "BP34"); - cmdMap.put(CMD_TYPE.AP40, "AP40"); - cmdMap.put(CMD_TYPE.BP40, "BP40"); - cmdMap.put(CMD_TYPE.AP68, "AP68"); - cmdMap.put(CMD_TYPE.BP68, "BP68"); - cmdMap.put(CMD_TYPE.APXL, "APXL"); - cmdMap.put(CMD_TYPE.BPXL, "BPXL"); - cmdMap.put(CMD_TYPE.APXY, "APXY"); - cmdMap.put(CMD_TYPE.BPXY, "BPXY"); - cmdMap.put(CMD_TYPE.APJZ, "APJZ"); - cmdMap.put(CMD_TYPE.BPJZ, "BPJZ"); - cmdMap.put(CMD_TYPE.AP84, "AP84"); - cmdMap.put(CMD_TYPE.BP84, "BP84"); - cmdMap.put(CMD_TYPE.AP85, "AP85"); - cmdMap.put(CMD_TYPE.BP85, "BP85"); - cmdMap.put(CMD_TYPE.AP86, "AP86"); - cmdMap.put(CMD_TYPE.BP86, "BP86"); - cmdMap.put(CMD_TYPE.AP88, "AP88"); - cmdMap.put(CMD_TYPE.BP88, "BP88"); - cmdMap.put(CMD_TYPE.AP89, "AP89"); - cmdMap.put(CMD_TYPE.BP89, "BP89"); - cmdMap.put(CMD_TYPE.APTE, "APTE"); - cmdMap.put(CMD_TYPE.BPTE, "BPTE"); - cmdMap.put(CMD_TYPE.APTP, "APTP"); - cmdMap.put(CMD_TYPE.BPTP, "BPTP"); - cmdMap.put(CMD_TYPE.APX1, "APX1"); - cmdMap.put(CMD_TYPE.BPX1, "BPX1"); - cmdMap.put(CMD_TYPE.APS4, "APS4"); - cmdMap.put(CMD_TYPE.BPS4, "BPS4"); - cmdMap.put(CMD_TYPE.APHP, "APHP"); - cmdMap.put(CMD_TYPE.BPHP, "BPHP"); - cmdMap.put(CMD_TYPE.BPTF, "BPTF"); - cmdMap.put(CMD_TYPE.APTF, "APTF"); - cmdMap.put(CMD_TYPE.BPSQ, "BPSQ"); - cmdMap.put(CMD_TYPE.APSQ, "APSQ"); - cmdMap.put(CMD_TYPE.BPMC, "BPMC"); - cmdMap.put(CMD_TYPE.APMC, "APMC"); - cmdMap.put(CMD_TYPE.BPPH, "BPPH"); - cmdMap.put(CMD_TYPE.APPH, "APPH"); - cmdMap.put(CMD_TYPE.APJK, "APJK"); - cmdMap.put(CMD_TYPE.BPJK, "BPJK"); + cmdStrMap = new HashMap<>(); + cmdStrMap.put(CMD_TYPE.AP00, "AP00"); + cmdStrMap.put(CMD_TYPE.BP00, "BP00"); + cmdStrMap.put(CMD_TYPE.AP01, "AP01"); + cmdStrMap.put(CMD_TYPE.BP01, "BP01"); + cmdStrMap.put(CMD_TYPE.AP02, "AP02"); + cmdStrMap.put(CMD_TYPE.BP02, "BP02"); + cmdStrMap.put(CMD_TYPE.AP92, "AP92"); + cmdStrMap.put(CMD_TYPE.BP92, "BP92"); + cmdStrMap.put(CMD_TYPE.AP03, "AP03"); + cmdStrMap.put(CMD_TYPE.BP03, "BP03"); + cmdStrMap.put(CMD_TYPE.AP05, "AP05"); + cmdStrMap.put(CMD_TYPE.BP05, "BP05"); + cmdStrMap.put(CMD_TYPE.AP07, "AP07"); + cmdStrMap.put(CMD_TYPE.BP07, "BP07"); + cmdStrMap.put(CMD_TYPE.AP10, "AP10"); + cmdStrMap.put(CMD_TYPE.BP10, "BP10"); + cmdStrMap.put(CMD_TYPE.AP49, "AP49"); + cmdStrMap.put(CMD_TYPE.BP49, "BP49"); + cmdStrMap.put(CMD_TYPE.APHT, "APHT"); + cmdStrMap.put(CMD_TYPE.BPHT, "BPHT"); + cmdStrMap.put(CMD_TYPE.APTM, "APTM"); + cmdStrMap.put(CMD_TYPE.BPTM, "BPTM"); + cmdStrMap.put(CMD_TYPE.BPVR, "BPVR"); + cmdStrMap.put(CMD_TYPE.APVR, "APVR"); + cmdStrMap.put(CMD_TYPE.AP12, "AP12"); + cmdStrMap.put(CMD_TYPE.BP12, "BP12"); + cmdStrMap.put(CMD_TYPE.AP14, "AP14"); + cmdStrMap.put(CMD_TYPE.BP14, "BP14"); + cmdStrMap.put(CMD_TYPE.AP15, "AP15"); + cmdStrMap.put(CMD_TYPE.BP15, "BP15"); + cmdStrMap.put(CMD_TYPE.AP16, "AP16"); + cmdStrMap.put(CMD_TYPE.BP16, "BP16"); + cmdStrMap.put(CMD_TYPE.AP17, "AP17"); + cmdStrMap.put(CMD_TYPE.BP17, "BP17"); + cmdStrMap.put(CMD_TYPE.AP18, "AP18"); + cmdStrMap.put(CMD_TYPE.BP18, "BP18"); + cmdStrMap.put(CMD_TYPE.AP21, "AP21"); + cmdStrMap.put(CMD_TYPE.BP21, "BP21"); + cmdStrMap.put(CMD_TYPE.AP28, "AP28"); + cmdStrMap.put(CMD_TYPE.BP28, "BP28"); + cmdStrMap.put(CMD_TYPE.AP31, "AP31"); + cmdStrMap.put(CMD_TYPE.BP31, "BP31"); + cmdStrMap.put(CMD_TYPE.AP33, "AP33"); + cmdStrMap.put(CMD_TYPE.BP33, "BP33"); + cmdStrMap.put(CMD_TYPE.AP34, "AP34"); + cmdStrMap.put(CMD_TYPE.BP34, "BP34"); + cmdStrMap.put(CMD_TYPE.AP40, "AP40"); + cmdStrMap.put(CMD_TYPE.BP40, "BP40"); + cmdStrMap.put(CMD_TYPE.AP68, "AP68"); + cmdStrMap.put(CMD_TYPE.BP68, "BP68"); + cmdStrMap.put(CMD_TYPE.APXL, "APXL"); + cmdStrMap.put(CMD_TYPE.BPXL, "BPXL"); + cmdStrMap.put(CMD_TYPE.APXY, "APXY"); + cmdStrMap.put(CMD_TYPE.BPXY, "BPXY"); + cmdStrMap.put(CMD_TYPE.APJZ, "APJZ"); + cmdStrMap.put(CMD_TYPE.BPJZ, "BPJZ"); + cmdStrMap.put(CMD_TYPE.AP84, "AP84"); + cmdStrMap.put(CMD_TYPE.BP84, "BP84"); + cmdStrMap.put(CMD_TYPE.AP85, "AP85"); + cmdStrMap.put(CMD_TYPE.BP85, "BP85"); + cmdStrMap.put(CMD_TYPE.AP86, "AP86"); + cmdStrMap.put(CMD_TYPE.BP86, "BP86"); + cmdStrMap.put(CMD_TYPE.AP88, "AP88"); + cmdStrMap.put(CMD_TYPE.BP88, "BP88"); + cmdStrMap.put(CMD_TYPE.AP89, "AP89"); + cmdStrMap.put(CMD_TYPE.BP89, "BP89"); + cmdStrMap.put(CMD_TYPE.APTE, "APTE"); + cmdStrMap.put(CMD_TYPE.BPTE, "BPTE"); + cmdStrMap.put(CMD_TYPE.APTP, "APTP"); + cmdStrMap.put(CMD_TYPE.BPTP, "BPTP"); + cmdStrMap.put(CMD_TYPE.APX1, "APX1"); + cmdStrMap.put(CMD_TYPE.BPX1, "BPX1"); + cmdStrMap.put(CMD_TYPE.APS4, "APS4"); + cmdStrMap.put(CMD_TYPE.BPS4, "BPS4"); + cmdStrMap.put(CMD_TYPE.APHP, "APHP"); + cmdStrMap.put(CMD_TYPE.BPHP, "BPHP"); + cmdStrMap.put(CMD_TYPE.BPTF, "BPTF"); + cmdStrMap.put(CMD_TYPE.APTF, "APTF"); + cmdStrMap.put(CMD_TYPE.BPSQ, "BPSQ"); + cmdStrMap.put(CMD_TYPE.APSQ, "APSQ"); + cmdStrMap.put(CMD_TYPE.BPMC, "BPMC"); + cmdStrMap.put(CMD_TYPE.APMC, "APMC"); + cmdStrMap.put(CMD_TYPE.BPPH, "BPPH"); + cmdStrMap.put(CMD_TYPE.APPH, "APPH"); + cmdStrMap.put(CMD_TYPE.APJK, "APJK"); + cmdStrMap.put(CMD_TYPE.BPJK, "BPJK"); + // + cmdMap = new HashMap<>(); + cmdMap.put("AP00", CMD_TYPE.AP00); + cmdMap.put("BP00", CMD_TYPE.BP00); + cmdMap.put("AP01", CMD_TYPE.AP01); + cmdMap.put("BP01", CMD_TYPE.BP01); + cmdMap.put("AP02", CMD_TYPE.AP02); + cmdMap.put("BP02", CMD_TYPE.BP02); + cmdMap.put("AP92", CMD_TYPE.AP92); + cmdMap.put("BP92", CMD_TYPE.BP92); + cmdMap.put("AP03", CMD_TYPE.AP03); + cmdMap.put("BP03", CMD_TYPE.BP03); + cmdMap.put("AP05", CMD_TYPE.AP05); + cmdMap.put("BP05", CMD_TYPE.BP05); + cmdMap.put("AP07", CMD_TYPE.AP07); + cmdMap.put("BP07", CMD_TYPE.BP07); + cmdMap.put("AP10", CMD_TYPE.AP10); + cmdMap.put("BP10", CMD_TYPE.BP10); + cmdMap.put("AP49", CMD_TYPE.AP49); + cmdMap.put("BP49", CMD_TYPE.BP49); + cmdMap.put("APHT", CMD_TYPE.APHT); + cmdMap.put("BPHT", CMD_TYPE.BPHT); + cmdMap.put("APTM", CMD_TYPE.APTM); + cmdMap.put("BPTM", CMD_TYPE.BPTM); + cmdMap.put("BPVR", CMD_TYPE.BPVR); + cmdMap.put("APVR", CMD_TYPE.APVR); + cmdMap.put("AP12", CMD_TYPE.AP12); + cmdMap.put("BP12", CMD_TYPE.BP12); + cmdMap.put("AP14", CMD_TYPE.AP14); + cmdMap.put("BP14", CMD_TYPE.BP14); + cmdMap.put("AP15", CMD_TYPE.AP15); + cmdMap.put("BP15", CMD_TYPE.BP15); + cmdMap.put("AP16", CMD_TYPE.AP16); + cmdMap.put("BP16", CMD_TYPE.BP16); + cmdMap.put("AP17", CMD_TYPE.AP17); + cmdMap.put("BP17", CMD_TYPE.BP17); + cmdMap.put("AP18", CMD_TYPE.AP18); + cmdMap.put("BP18", CMD_TYPE.BP18); + cmdMap.put("AP21", CMD_TYPE.AP21); + cmdMap.put("BP21", CMD_TYPE.BP21); + cmdMap.put("AP28", CMD_TYPE.AP28); + cmdMap.put("BP28", CMD_TYPE.BP28); + cmdMap.put("AP31", CMD_TYPE.AP31); + cmdMap.put("BP31", CMD_TYPE.BP31); + cmdMap.put("AP33", CMD_TYPE.AP33); + cmdMap.put("BP33", CMD_TYPE.BP33); + cmdMap.put("AP34", CMD_TYPE.AP34); + cmdMap.put("BP34", CMD_TYPE.BP34); + cmdMap.put("AP40", CMD_TYPE.AP40); + cmdMap.put("BP40", CMD_TYPE.BP40); + cmdMap.put("AP68", CMD_TYPE.AP68); + cmdMap.put("BP68", CMD_TYPE.BP68); + cmdMap.put("APXL", CMD_TYPE.APXL); + cmdMap.put("BPXL", CMD_TYPE.BPXL); + cmdMap.put("APXY", CMD_TYPE.APXY); + cmdMap.put("BPXY", CMD_TYPE.BPXY); + cmdMap.put("APJZ", CMD_TYPE.APJZ); + cmdMap.put("BPJZ", CMD_TYPE.BPJZ); + cmdMap.put("AP84", CMD_TYPE.AP84); + cmdMap.put("BP84", CMD_TYPE.BP84); + cmdMap.put("AP85", CMD_TYPE.AP85); + cmdMap.put("BP85", CMD_TYPE.BP85); + cmdMap.put("AP86", CMD_TYPE.AP86); + cmdMap.put("BP86", CMD_TYPE.BP86); + cmdMap.put("AP88", CMD_TYPE.AP88); + cmdMap.put("BP88", CMD_TYPE.BP88); + cmdMap.put("AP89", CMD_TYPE.AP89); + cmdMap.put("BP89", CMD_TYPE.BP89); + cmdMap.put("APTE", CMD_TYPE.APTE); + cmdMap.put("BPTE", CMD_TYPE.BPTE); + cmdMap.put("APTP", CMD_TYPE.APTP); + cmdMap.put("BPTP", CMD_TYPE.BPTP); + cmdMap.put("APX1", CMD_TYPE.APX1); + cmdMap.put("BPX1", CMD_TYPE.BPX1); + cmdMap.put("APS4", CMD_TYPE.APS4); + cmdMap.put("BPS4", CMD_TYPE.BPS4); + cmdMap.put("APHP", CMD_TYPE.APHP); + cmdMap.put("BPHP", CMD_TYPE.BPHP); + cmdMap.put("BPTF", CMD_TYPE.BPTF); + cmdMap.put("APTF", CMD_TYPE.APTF); + cmdMap.put("BPSQ", CMD_TYPE.BPSQ); + cmdMap.put("APSQ", CMD_TYPE.APSQ); + cmdMap.put("BPMC", CMD_TYPE.BPMC); + cmdMap.put("APMC", CMD_TYPE.APMC); + cmdMap.put("BPPH", CMD_TYPE.BPPH); + cmdMap.put("APPH", CMD_TYPE.APPH); + cmdMap.put("APJK", CMD_TYPE.APJK); + cmdMap.put("BPJK", CMD_TYPE.BPJK); } @@ -259,10 +364,10 @@ public class protocol_beehome { return ""; } - for (CMD_TYPE key : cmdMap.keySet()) { - if (msg.startsWith(CMDHEADER + cmdMap.get(key))) { - ICLogger.i("found cmd keyid=" + key + " ,keyname=" + cmdMap.get(key)); - return cmdMap.get(key); + for (CMD_TYPE key : cmdStrMap.keySet()) { + if (msg.startsWith(CMDHEADER + cmdStrMap.get(key))) { + ICLogger.i("found cmd keyid=" + key + " ,keyname=" + cmdStrMap.get(key)); + return cmdStrMap.get(key); } } @@ -322,19 +427,22 @@ public class protocol_beehome { log("cmd not complete , " + last_inCompletecmd); } for (int i = 0; i < listlen; i++) { - for (CMD_TYPE key : cmdMap.keySet()) { - if (cmdlist[i].startsWith(CMDHEADER + cmdMap.get(key))) { - log("found cmd keyid=" + key + " ,keyname=" + cmdMap.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); - } - } else { - handleCmd(key, cmdlist[i]); + String cmdItem = cmdlist[i]; + if (cmdItem.startsWith(CMDHEADER)) { + //获取到指令 + 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]); + if (key == CMD_TYPE.BP28) { + //如果是BP28则 后面的数据是音频,需要保留 + byte[] amrBuf; + int amrLen = getBP28Amrlen(cmdlist[i]); + if (bytes.length > amrLen) { + handleCmd(key, cmdlist[i], bytes); } + } else { + handleCmd(key, cmdlist[i]); } } } @@ -388,11 +496,11 @@ public class protocol_beehome { // IWAP00860315002003375,12345678901234567890,9466970701492096# 三个参数分别是IMEI,ICCID,IMSI CellInfoUtil.getPhoneStatus(ds);//获取IMSI,ICCID StringBuffer cmdbuf = new StringBuffer(CMDHEADER); - cmdbuf.append(cmdMap.get(CMD_TYPE.AP00)).append(ds.IMEI()) + cmdbuf.append(cmdStrMap.get(CMD_TYPE.AP00)).append(ds.IMEI()) .append(CMDSPLIT).append(ds.getIccid()) .append(CMDSPLIT).append(ds.getImsi()) .append(CMDEND); - return genStringMessage(cmdMap.get(CMD_TYPE.AP00), cmdbuf.toString()); + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP00), cmdbuf.toString()); } //处理 登录 BP00 @@ -410,12 +518,10 @@ public class protocol_beehome { int timezone = Integer.parseInt(msg[2]); if (datetime != null) { ICLogger.i("===" + TimeUtil.getDefaultTimeZone()); - TimeUtil.setTimeZone(runtime.getContextProxy().context, timezone); - + //TimeUtil.setTimeZone(runtime.getContextProxy().context, timezone); ICLogger.i("===" + TimeUtil.getDefaultTimeZone()); - TimeUtil.setSysDateTime(runtime.getContextProxy().context, datetime, timezone, false); + TimeUtil.setSysDateTime(runtime.getContextProxy().context, datetime, timezone, true); ICLogger.i("===" + TimeUtil.getDefaultTimeZone()); - } // Set Datetime 20200505112734 // Set TimeZone 8 @@ -444,7 +550,7 @@ public class protocol_beehome { //02为工作模式 ,(设防,工作模式如果为00,则代表无或未设置) //5555: 计步步数,每次到达 9999 后重 0 开始计 (此处 9999 为示例,可以为2字节int 然后溢出归零) //30: 翻滚次数 - return genStringMessage(cmdMap.get(CMD_TYPE.AP03), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP03)).append(CMDSPLIT).append(String.format("%03d", abs(ds.getSignalStrength()))) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP03), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP03)).append(CMDSPLIT).append(String.format("%03d", abs(ds.getSignalStrength()))) .append(ds.getGPSLocationStarNums()).append(ds.getBattery()).append("0") .append(ds.getProtection()).append(ds.getWorkModeStr()).append(CMDSPLIT) .append(ds.getTotalStepCount()).append(CMDSPLIT).append(ds.getRolltimes()).append(CMDEND).toString()); @@ -469,7 +575,7 @@ public class protocol_beehome { * 00:第一个0:是否需要回复地址信息,0:不回复,1回复. * HOME|74-DE-2B-44-88-8C|97&HOME1|74-DE-2B-44-88-8C|97&HOME2|74-DE-2B-44-88-8C|97&HOME3|74-DE-2B-44-88-8C|97# */ - return genStringMessage(cmdMap.get(CMD_TYPE.AP10), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP10)).append(TimeUtil.getUTCSystemDateYYMMDD()) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP10), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP10)).append(TimeUtil.getUTCSystemDateYYMMDD()) .append(ds.getGPSData()).append(TimeUtil.getUTCSystemTimeHHmmss()).append(ds.getGPSHeading()) .append(String.format("%03d", abs(ds.getSignalStrength()))) .append(ds.getGPSLocationStarNums()).append(ds.getBattery()).append("0") @@ -488,8 +594,8 @@ public class protocol_beehome { // 460,0,9520,3671, // Home|74-DE-2B-44-88-8C|97& Home1|74-DE-2B-44-88-8C|97&Home2|74-DE-2B-44-88-8C|97& Home3|74-DE-2B-44-88-8C|97# // IWAP01191230A2232.9807N11404.9355E000.1161320000.0006000910000000,460,00,9520,3671,# - return genStringMessage(cmdMap.get(CMD_TYPE.AP01), - new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP01)).append(TimeUtil.getUTCSystemDateYYMMDD()) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP01), + new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP01)).append(TimeUtil.getUTCSystemDateYYMMDD()) .append(ds.getGPSData()) .append(TimeUtil.getUTCSystemTimeHHmmss()).append(ds.getGPSHeading()).append(String.format("%03d", abs(ds.getSignalStrength()))) .append(ds.getGPSLocationStarNums()).append(ds.getBattery()).append("0") @@ -532,7 +638,7 @@ public class protocol_beehome { } ICLogger.i("Wifi ap sum " + apsum); - return genStringMessage(cmdMap.get(CMD_TYPE.AP02), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP02)).append(CMDSPLIT) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP02), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP02)).append(CMDSPLIT) .append(ds.getLanguage()).append(CMDSPLIT) .append(0).append(CMDSPLIT) //为0时不回复地址 .append(ds.getLBSMultiStationData()).append(CMDSPLIT) //基站信息数据 @@ -548,7 +654,7 @@ public class protocol_beehome { public static StringMessage APXL(String id) { //设备响应: IWAPXL,080835# //080835:指令流水号 - return genStringMessage(cmdMap.get(CMD_TYPE.APXL), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APXL)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.APXL), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.APXL)) .append(CMDSPLIT).append(id) .append(CMDEND).toString()); } @@ -583,7 +689,7 @@ public class protocol_beehome { public static StringMessage APXY(String id) { //设备响应: IWAPXY,080835# //080835:指令流水号 - return genStringMessage(cmdMap.get(CMD_TYPE.APXY), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APXY)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.APXY), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.APXY)) .append(CMDSPLIT).append(id) .append(CMDEND).toString()); } @@ -620,7 +726,7 @@ public class protocol_beehome { //设备响应: IWAPJZ,792997,120,85,42,1# //792997:指令流水号 // 高压120,低压85,年龄42,1 男性 - return genStringMessage(cmdMap.get(CMD_TYPE.APJZ), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APJZ)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.APJZ), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.APJZ)) .append(CMDSPLIT).append(id) .append(CMDSPLIT).append(BPH) .append(CMDSPLIT).append(BPL) @@ -673,7 +779,7 @@ public class protocol_beehome { public static StringMessage AP18(String index) { - return genStringMessage(cmdMap.get(CMD_TYPE.AP18), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP18)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP18), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP18)) .append(CMDSPLIT).append(index) .append(CMDEND).toString()); } @@ -691,7 +797,7 @@ public class protocol_beehome { //恢复出厂设置 public static StringMessage AP17(String index) { - return genStringMessage(cmdMap.get(CMD_TYPE.AP17), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP17)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP17), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP17)) .append(CMDSPLIT).append(index) .append(CMDEND).toString()); } @@ -711,7 +817,7 @@ public class protocol_beehome { public static StringMessage AP31(String index) { - return genStringMessage(cmdMap.get(CMD_TYPE.AP31), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP31)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP31), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP31)) .append(CMDSPLIT).append(index) .append(CMDEND).toString()); } @@ -726,7 +832,7 @@ public class protocol_beehome { //设置SOS号码 public static StringMessage AP12(String index, String phNum1, String phNum2, String phNum3) { - return genStringMessage(cmdMap.get(CMD_TYPE.AP12), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP12)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP12), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP12)) .append(CMDSPLIT).append(index) .append(CMDSPLIT).append(phNum1) .append(CMDSPLIT).append(phNum2) @@ -763,7 +869,7 @@ public class protocol_beehome { public static StringMessage AP14(String index, String[] phnumbs) { - return genStringMessage(cmdMap.get(CMD_TYPE.AP14), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP14)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP14), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP14)) .append(CMDSPLIT).append(index) .append(CMDSPLIT).append(phnumbs[0]) .append(CMDSPLIT).append(phnumbs[1]) @@ -864,7 +970,7 @@ public class protocol_beehome { public static StringMessage AP85(Runtime ds, String cmddata) { //示例数据:IWAP49,68## - return genStringMessage(cmdMap.get(CMD_TYPE.AP85), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP85)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP85), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP85)) .append(CMDSPLIT).append(cmddata) .append(CMDEND).toString()); @@ -1008,7 +1114,7 @@ public class protocol_beehome { //如果设备回复确认数据包接收失败状态,则重复发送上一个数据包 - String sb = new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP07)) + String sb = new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP07)) .append(CMDSPLIT).append(packetTime) .append(CMDSPLIT).append(count) .append(CMDSPLIT).append(index) @@ -1058,7 +1164,7 @@ public class protocol_beehome { //IWAP33,080835,1# //080835:指令流水号 //1:设置信息,供服务器同步 - return genStringMessage(cmdMap.get(CMD_TYPE.AP33), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP33)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP33), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP33)) .append(CMDSPLIT).append(cmdindex) .append(CMDSPLIT).append(workMode) .append(CMDEND).toString()); @@ -1115,7 +1221,7 @@ public class protocol_beehome { //IWAP34,588854,1# //080835:指令流水号 //8:模式 - return genStringMessage(cmdMap.get(CMD_TYPE.AP34), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP34)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP34), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP34)) .append(CMDSPLIT).append(cmdindex) .append(CMDSPLIT).append(workMode) .append(CMDEND).toString()); @@ -1193,7 +1299,7 @@ public class protocol_beehome { // IWAP40,080835,1# // 080835:指令流水号 // 1:表示设备接受数据成功,0表示设备接受数据失败 - return genStringMessage(cmdMap.get(CMD_TYPE.AP40), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP40)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP40), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP40)) .append(CMDSPLIT).append(cmdindex) .append(CMDSPLIT).append(success) .append(CMDEND).toString()); @@ -1208,7 +1314,7 @@ public class protocol_beehome { */ public static StringMessage AP49(Runtime ds) { //示例数据:IWAP49,68## - return genStringMessage(cmdMap.get(CMD_TYPE.AP49), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP49)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP49), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP49)) .append(CMDSPLIT).append(ds.getHRS().getPPG()) .append(CMDEND).toString()); @@ -1231,7 +1337,7 @@ public class protocol_beehome { //85 : 血压低压 [舒张压] //平台响应: IWBPHT# //表示平台已接收,可不作响应 - return genStringMessage(cmdMap.get(CMD_TYPE.APHT), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APHT)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.APHT), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.APHT)) .append(CMDSPLIT).append(ds.getHRS().getPPG()) .append(CMDSPLIT).append(ds.getHRS().getBPH()) .append(CMDSPLIT).append(ds.getHRS().getBPL()) @@ -1248,7 +1354,7 @@ public class protocol_beehome { //85 : 血压低压 [舒张压] //平台响应: IWBPHT# //表示平台已接收,可不作响应 - return genStringMessage(cmdMap.get(CMD_TYPE.APHT), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APHT)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.APHT), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.APHT)) .append(CMDSPLIT).append(ppg) .append(CMDSPLIT).append(bph) .append(CMDSPLIT).append(bpl) @@ -1260,7 +1366,7 @@ public class protocol_beehome { public static StringMessage AP16(String cmdindex) { //IWAP16,080835# //080835:指令流水号 - return genStringMessage(cmdMap.get(CMD_TYPE.AP16), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP16)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP16), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP16)) .append(CMDSPLIT).append(cmdindex) .append(CMDEND).toString()); } @@ -1296,7 +1402,7 @@ public class protocol_beehome { //9750: LAC //3613: CID - return genStringMessage(cmdMap.get(CMD_TYPE.APTM), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APTM)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.APTM), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.APTM)) .append(CMDSPLIT).append(ds.getLocationInstance().getMCC()) .append(CMDSPLIT).append(ds.getLocationInstance().getMNC()) .append(CMDSPLIT).append(ds.getLocationInstance().getLAC()) @@ -1330,7 +1436,7 @@ public class protocol_beehome { //IMEI: /// Version String - return genStringMessage(cmdMap.get(CMD_TYPE.APVR), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APVR)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.APVR), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.APVR)) .append(CMDSPLIT).append(ds.IMEI()) .append(CMDSPLIT).append(DeviceInfoUtil.getSWVersionDisplayName()) .append(CMDEND).toString()); @@ -1340,7 +1446,7 @@ public class protocol_beehome { public static StringMessage AP15(String index) { //IWAP15, 080835# //080835:指令流水号 - return genStringMessage(cmdMap.get(CMD_TYPE.AP15), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP15)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP15), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP15)) .append(CMDSPLIT).append(index) .append(CMDEND).toString()); } @@ -1380,7 +1486,7 @@ public class protocol_beehome { /*语音下行反馈*/ public static StringMessage AP28(String name, String msg, int packagecount, int currentpackageindex, int received_success) { //示例数据:IWAP28,D3590D54,xxxx,6,1,1# - return genStringMessage(cmdMap.get(CMD_TYPE.AP28), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP28)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP28), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP28)) .append(CMDSPLIT).append(name) .append(CMDSPLIT).append(msg) .append(CMDSPLIT).append(packagecount) @@ -1494,7 +1600,7 @@ public class protocol_beehome { //设备响应: IWAP80,080835,1# //080835:指令流水号 //1:表示设备执行成功,0 表示设备执行失败 - return genStringMessage(cmdMap.get(CMD_TYPE.AP84), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP84)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP84), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP84)) .append(CMDSPLIT).append(index) .append(CMDSPLIT).append(success) .append(CMDEND).toString()); @@ -1535,7 +1641,7 @@ public class protocol_beehome { //设备响应: IWAP86, 080835# //080835:指令流水号 - return genStringMessage(cmdMap.get(CMD_TYPE.AP68), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP68)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP68), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP68)) .append(CMDSPLIT).append(index) .append(CMDEND).toString()); } @@ -1570,7 +1676,7 @@ public class protocol_beehome { //设备响应: IWAP86, 080835# //080835:指令流水号 - return genStringMessage(cmdMap.get(CMD_TYPE.AP86), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP86)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP86), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP86)) .append(CMDSPLIT).append(index) .append(CMDEND).toString()); } @@ -1614,7 +1720,7 @@ public class protocol_beehome { public static StringMessage AP88(String index) { //设备响应: IWAP88, 080835# //080835:指令流水号 - return genStringMessage(cmdMap.get(CMD_TYPE.AP88), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP88)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP88), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP88)) .append(CMDSPLIT).append(index) .append(CMDEND).toString()); } @@ -1638,7 +1744,7 @@ public class protocol_beehome { //设备响应: IWAP89, 080835# //080835:指令流水号 - return genStringMessage(cmdMap.get(CMD_TYPE.AP89), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP89)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP89), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP89)) .append(CMDSPLIT).append(index) .append(CMDEND).toString()); } @@ -1681,7 +1787,7 @@ public class protocol_beehome { //设备响应: IWAPTE,080835,60# //080835:指令流水号 //1:表示设备接受数据成功,0表示设备接受数据失败 - return genStringMessage(cmdMap.get(CMD_TYPE.APTE), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APTE)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.APTE), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.APTE)) .append(CMDSPLIT).append(index) .append(CMDSPLIT).append(freq) .append(CMDEND).toString()); @@ -1733,8 +1839,8 @@ public class protocol_beehome { //APTP : 命令字符 //35.3:测量体温 (摄氏度) //33,132:温补用的参数,此处不用,可以用0 来代替。 - return genStringMessage(cmdMap.get(CMD_TYPE.APTP), - new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APTP)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.APTP), + new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.APTP)) .append(CMDSPLIT).append(String.format("%1$.2f", body_temp)) .append(CMDSPLIT).append(String.format("%1$.2f", wrist_temp)) .append(CMDSPLIT).append(0) @@ -1751,7 +1857,7 @@ public class protocol_beehome { public static StringMessage APX1(String id) { //设备响应: IWAPX1, 080835# //080835:指令流水号 - return genStringMessage(cmdMap.get(CMD_TYPE.APX1), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APX1)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.APX1), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.APX1)) .append(CMDSPLIT).append(id) .append(CMDEND).toString()); } @@ -1809,7 +1915,7 @@ public class protocol_beehome { public static StringMessage APS4(String id) { //设备响应: IWAPS4,080835# //080835:指令流水号 - return genStringMessage(cmdMap.get(CMD_TYPE.APS4), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APS4)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.APS4), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.APS4)) .append(CMDSPLIT).append(id) .append(CMDEND).toString()); } @@ -1828,9 +1934,9 @@ public class protocol_beehome { ICLogger.d("is24Hour == > " + is24Hour); TimeUtil.set24Hour(mRuntime.getContextProxy().context, is24Hour); mConnection.send( - genStringMessage(cmdMap.get(CMD_TYPE.APTF), + genStringMessage(cmdStrMap.get(CMD_TYPE.APTF), new StringBuilder(CMDHEADER) - .append(cmdMap.get(CMD_TYPE.APTF)) + .append(cmdStrMap.get(CMD_TYPE.APTF)) .append(CMDSPLIT) .append(split[2]).append(CMDEND).toString()) ); @@ -1901,8 +2007,8 @@ public class protocol_beehome { public static StringMessage APSQ(String id, int type, int cycle) { //设备响应: IWAPSQ,080835,1,60# //080835:指令流水号 - return genStringMessage(cmdMap.get(CMD_TYPE.APSQ), - new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APSQ)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.APSQ), + new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.APSQ)) .append(CMDSPLIT).append(id) .append(CMDSPLIT).append(type) .append(CMDSPLIT).append(cycle) @@ -1916,7 +2022,7 @@ public class protocol_beehome { * @return */ public static StringMessage APJK(int type, Runtime runtime) { - StringBuilder sb = new StringBuilder(CMDHEADER).append(cmdMap.get(CMD_TYPE.APJK)); + StringBuilder sb = new StringBuilder(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.APJK)); sb.append(CMDSPLIT); //添加时间 sb.append(TimeUtil.getUTCTimeForCameraMark()).append(CMDSPLIT); @@ -1929,11 +2035,13 @@ public class protocol_beehome { sb.append(runtime.getHRS().getPPG()); } else if (type == 3) { sb.append(String.format("%1$.2f", runtime.tempInfo.currentBodyTemp)); + } else if (type == 4) { + sb.append(runtime.getHRS().getSpo2()); } sb.append(CMDEND); String s = sb.toString(); ICLogger.d("apjk ==> " + s); - return genStringMessage(cmdMap.get(CMD_TYPE.APTP), s); + return genStringMessage(cmdStrMap.get(CMD_TYPE.APTP), s); } private void handleBPMC(String cmd) { @@ -1968,7 +2076,7 @@ public class protocol_beehome { } private StringMessage APMC(String index, boolean responseValue) { - return genStringMessage(cmdMap.get(CMD_TYPE.APMC), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APMC)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.APMC), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.APMC)) .append(CMDSPLIT).append(index) .append(CMDSPLIT).append(responseValue) .append(CMDEND).toString()); @@ -2040,7 +2148,7 @@ public class protocol_beehome { //95:血氧 //90:血糖 // 本消息适用所有终端,其中需要每项指标不一定全部有值,如果无值,则留空 - return genStringMessage(cmdMap.get(CMD_TYPE.APHP), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APHP)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.APHP), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.APHP)) .append(CMDSPLIT).append(ds.getHRS().getPPG()) .append(CMDSPLIT).append(ds.getHRS().getBPH()) .append(CMDSPLIT).append(ds.getHRS().getBPL()) @@ -2073,7 +2181,7 @@ public class protocol_beehome { //1 : 表示设备可以拨号 0:表示设备不可拨号, 用于同步平台设置。 Util.setSystemProperties("persist.sys.phone.enable", value); //返回结果 - responseWithId(cmdMap.get(CMD_TYPE.APPH), id, value); + responseWithId(cmdStrMap.get(CMD_TYPE.APPH), id, value); } catch (Exception e) { e.printStackTrace(); } @@ -2106,7 +2214,7 @@ public class protocol_beehome { //95:血氧 //90:血糖 // 本消息适用所有终端,其中需要每项指标不一定全部有值,如果无值,则留空 - return genStringMessage(cmdMap.get(CMD_TYPE.APHP), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APHP)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.APHP), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.APHP)) .append(CMDSPLIT).append(ppg) .append(CMDSPLIT).append(bph) .append(CMDSPLIT).append(bpl) 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 477246a0..dfa7d235 100644 --- a/app/src/main/java/com/ic/protocols/protocol_jiai.java +++ b/app/src/main/java/com/ic/protocols/protocol_jiai.java @@ -1871,7 +1871,6 @@ public class protocol_jiai { } public boolean handleCmd(CMD_TYPE type, String cmd) { - //普通非二进制命令用此函数处理 boolean ret = true; ICLogger.i("handleCmd " + type.name() + " strLen=" + cmd.length()); diff --git a/app/version_code.properties b/app/version_code.properties index d7d17be3..4c7a62fb 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Fri Nov 26 21:20:37 CST 2021 -VERSION_CODE=926 +#Mon Nov 29 17:47:27 CST 2021 +VERSION_CODE=930