From: snickersun Date: Fri, 4 Dec 2020 10:56:07 +0000 (+0800) Subject: release L02ProtocolV2 V725 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=f8b3d6c3467f43076897fbe0ef67c296116d0b62;p=protocol_srv.git release L02ProtocolV2 V725 jiai协议改为用APHT 作为心率上传 --- diff --git a/app/release/ICSer_V724_2012041255_release.apk b/app/release/ICSer_V725_2012041851_release.apk similarity index 79% rename from app/release/ICSer_V724_2012041255_release.apk rename to app/release/ICSer_V725_2012041851_release.apk index 0e0cd497..caf96588 100644 Binary files a/app/release/ICSer_V724_2012041255_release.apk and b/app/release/ICSer_V725_2012041851_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index bb80efa0..459405f2 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":724,"versionName":"2012041255","enabled":true,"outputFile":"ICSer_V724_2012041255_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V724_2012041255_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":725,"versionName":"2012041851","enabled":true,"outputFile":"ICSer_V725_2012041851_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V725_2012041851_release.apk","properties":{}}] \ 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 4be6a7fc..289f44f5 100644 --- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java +++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java @@ -1,713 +1,715 @@ -package com.ic.protocols; - -import com.enqualcomm.support.Config; -import com.enqualcomm.support.CoreService; -import com.enqualcomm.support.bean.Runtime; -import com.enqualcomm.support.bean.SleepInfo; -import com.enqualcomm.support.bean.StringMessage; -import com.enqualcomm.support.utils.Connection; -import com.enqualcomm.support.utils.ICLogger; -import com.enqualcomm.support.utils.TimeUtil; - - -public class protocolAPIHelper { - - private static protocol_jiai protocoljiai_handler=null; - private static protocol_beehome protocolbeehome_handler=null; - private static protocol_ic protocolic_handler=null; - private static protocol_fzd protocolfzd_handler=null; - private static protocol_mqtt protocolmqtt_handler=null; - - public protocolAPIHelper(Connection connect, Runtime runtime) { - ICLogger.i("init Protocol "+Config.getProtocolNumber()); - if (protocolbeehome_handler==null) - protocolbeehome_handler=new protocol_beehome(connect,runtime); - if (protocoljiai_handler==null) - protocoljiai_handler=new protocol_jiai(connect,runtime); - if (protocolic_handler==null) - protocolic_handler=new protocol_ic(connect,runtime); - if (protocolfzd_handler==null) - protocolfzd_handler=new protocol_fzd(connect,runtime); - if (protocolmqtt_handler==null) - protocolmqtt_handler=new protocol_mqtt(connect,runtime); - } - - private static boolean is_protocol_not_Initialled(){ - return (protocolbeehome_handler==null || protocoljiai_handler == null || protocolic_handler==null|| protocolfzd_handler==null ||protocolmqtt_handler==null); - - } - /* - 返回true 表示 cmd 全部解析成功 - 返回false表示 cmd至少有一条解析失败,失败的数据归入buffer,下一次识别接着使用 - 字符串通过#号进行识别。 - 每个字符串如果发现 #,却又没有Header,“IW”则会被丢弃 - */ - public boolean parserCmd(String cmd_type,byte[] bytes) { - - //只要服务器收到消息,就认为服务器是联通的,保存联通的时间 - Runtime.lastLinkReceiveStamp=System.currentTimeMillis(); - - if (is_protocol_not_Initialled()) return false; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - protocoljiai_handler.parserCmd(bytes); - break; - case Config.PROTOCOL_BEEHOME: - protocolbeehome_handler.parserCmd(bytes); - break; - case Config.PROTOCOL_IC: - protocolic_handler.parserCmd(bytes); - break; - case Config.PROTOCOL_FZD: - protocolfzd_handler.parserCmd(bytes); - break; - case Config.PROTOCOL_MQTT: - protocolmqtt_handler.parserCmd(cmd_type,bytes); - break; - } - return true; - } - public static StringMessage genStringMessage(String cmdName, byte[] rawdata){ - StringMessage sm=new StringMessage(new String[]{cmdName,new String(rawdata) }); - sm.setDate(TimeUtil.getSystemDateYYMMDD(),TimeUtil.getSystemTimeHHmmss()); - return sm; - } - public static StringMessage genStringMessage(String cmdName, String msg){ - StringMessage sm=new StringMessage(new String[]{cmdName,msg}); - sm.refresh(msg); - sm.setDate(TimeUtil.getSystemDateYYMMDD(),TimeUtil.getSystemTimeHHmmss()); - return sm; - } - - /*** - * its only used for message sending by mConnection.DeliverCMDMessageToSystem - * @param msg - * @return - */ - public static String isCmdStr(StringMessage msg){ - if(msg==null) - ICLogger.i("isCmdStr StringMessage is null"); - if (is_protocol_not_Initialled()) { - ICLogger.i("isCmdStr is_protocol_not_Initialled "); - return ""; - } - String ret=""; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=protocol_jiai.isCmdStr(msg.isFromCache()); - break; - case Config.PROTOCOL_BEEHOME: - ret=protocol_beehome.isCmdStr(msg.isFromCache()); - break; - case Config.PROTOCOL_IC: - ret=protocol_ic.isCmdStr(msg.isFromCache()); - break; - case Config.PROTOCOL_FZD: - ret=protocol_fzd.isCmdStr(msg.isFromCache()); - break; - case Config.PROTOCOL_MQTT: - ret=protocol_mqtt.isCmdStr(msg); - break; - } - return ret; - } - public static StringMessage getBindingMSG(Runtime runtime){ - if (is_protocol_not_Initialled()) return null; - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=null; - break; - case Config.PROTOCOL_BEEHOME: - ret=null; - break; - case Config.PROTOCOL_IC: - ret=null; - break; - case Config.PROTOCOL_FZD: - ret=protocol_fzd.PING(); - break; - case Config.PROTOCOL_MQTT: - ret=protocol_mqtt.LGZONE(runtime); - break; - } - return ret; - } - public static StringMessage getSyncTimeMSG(Runtime runtime){ - if (is_protocol_not_Initialled()) return null; - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=null; - break; - case Config.PROTOCOL_BEEHOME: - ret=null; - break; - case Config.PROTOCOL_IC: - ret=null; - break; - case Config.PROTOCOL_FZD: - ret=protocol_fzd.LGZONE(runtime); - break; - case Config.PROTOCOL_MQTT: - ret=null; - break; - } - return ret; - } - - public static StringMessage getTemperatureMSG(double temp_adusted,double body_temp,double tempout,Runtime runtime){ - if (is_protocol_not_Initialled()) return null; - if (runtime==null){ - if (CoreService.getInstance()!=null) - runtime=CoreService.getInstance().getRuntime(); - else - { - ICLogger.i("Runtime == null !"); - return null; - } - } - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=protocol_jiai.AP50(runtime); - break; - case Config.PROTOCOL_BEEHOME: - ret=protocol_beehome.APTP(temp_adusted,body_temp); - break; - case Config.PROTOCOL_IC: - ret=protocol_ic.APTP(temp_adusted,body_temp,tempout); - break; - case Config.PROTOCOL_FZD: - ret=protocol_fzd.temp(body_temp); - break; - case Config.PROTOCOL_MQTT: - ret=protocol_mqtt.temp(body_temp,runtime);; - break; - } - return ret; - } - - public static StringMessage getChargingMSG(int charging){ - if (is_protocol_not_Initialled()) return null; - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - break; - case Config.PROTOCOL_BEEHOME: - break; - case Config.PROTOCOL_IC: - if(Config.custom_name.equals("VitracK")) - ret=protocol_ic.APCH(charging); - break; - case Config.PROTOCOL_FZD: - break; - case Config.PROTOCOL_MQTT: - break; - } - return ret; - } - - public static StringMessage getWarningMSG(Runtime runtime){ - if (is_protocol_not_Initialled()) return null; - StringMessage ret=null; - runtime.dumpDevStatus(); - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=protocol_jiai.AP10(runtime); - break; - case Config.PROTOCOL_BEEHOME: - ret=protocol_beehome.AP10(runtime); - break; - case Config.PROTOCOL_IC: - ret=protocol_ic.AP10(runtime); - break; - case Config.PROTOCOL_FZD: - ret=protocol_fzd.AL(runtime); - break; - case Config.PROTOCOL_MQTT: - ret=protocol_mqtt.AL(runtime); - break; - } - return ret; - } - - public static StringMessage getLoginMSG(Runtime runtime){ - if (is_protocol_not_Initialled()) return null; - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=protocol_jiai.AP00(runtime); - break; - case Config.PROTOCOL_BEEHOME: - ret=protocol_beehome.AP00(runtime); - break; - case Config.PROTOCOL_IC: - ret=protocol_ic.AP00(runtime); - break; - case Config.PROTOCOL_FZD: - ret=protocol_fzd.LK(); - break; - case Config.PROTOCOL_MQTT: - ret=protocol_mqtt.BREQ(runtime); - break; - } - return ret; - } - - public static StringMessage getHeartbeatMSG(Runtime runtime){ - if (is_protocol_not_Initialled()) return null; - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=protocol_jiai.AP03(runtime); - break; - case Config.PROTOCOL_BEEHOME: - ret=protocol_beehome.AP03(runtime); - break; - case Config.PROTOCOL_IC: - ret=protocol_ic.AP03(runtime); - break; - case Config.PROTOCOL_FZD: - ret=protocol_fzd.KA(runtime); - break; - case Config.PROTOCOL_MQTT: - ret=protocol_mqtt.KA(runtime); - break; - } - return ret; - } - - public static StringMessage getGPSLocationMSG(Runtime runtime){ - if (is_protocol_not_Initialled()) return null; - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=protocol_jiai.AP01(runtime); - break; - case Config.PROTOCOL_BEEHOME: - ret=protocol_beehome.AP01(runtime); - break; - case Config.PROTOCOL_IC: - ret=protocol_ic.AP01(runtime); - break; - case Config.PROTOCOL_FZD: - ret=protocol_fzd.UD(runtime); - break; - case Config.PROTOCOL_MQTT: - ret=protocol_mqtt.UD(runtime); - break; - } - return ret; - } - public static StringMessage getLBSLocationMSG(Runtime runtime){ - if (is_protocol_not_Initialled()) return null; - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=protocol_jiai.AP02(runtime); - break; - case Config.PROTOCOL_BEEHOME: - ret=protocol_beehome.AP02(runtime); - break; - case Config.PROTOCOL_IC: - ret=protocol_ic.AP02(runtime); - break; - case Config.PROTOCOL_FZD: - ret=protocol_fzd.UD(runtime); - break; - case Config.PROTOCOL_MQTT: - ret=protocol_mqtt.UD(runtime); - break; - } - return ret; - } - - public static byte[] getVoicePacketItem(String packetTime,int count,int index,int datalen,byte[] amrdata,int filetype,int datatype){ - byte[] ret=null; - if (is_protocol_not_Initialled()) return null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=protocol_jiai.AP07(packetTime,count,index,datalen,amrdata); - break; - case Config.PROTOCOL_BEEHOME: - ret=protocol_beehome.AP07(packetTime,count,index,datalen,amrdata); - break; - case Config.PROTOCOL_IC: - /*** - * * 1 语音—— 1.监听语音 * 2.SOS语音 * 3.扩展 - * * 2 图片—— 1.签到图片 * 2.指令图片 * 3.设备图片 * 4.扩展 - */ - if(filetype==1 && datatype==3){ - //对讲用的类型 - ret=protocol_ic.AP07(packetTime,count,index,datalen,amrdata); - }else { - ret = protocol_ic.APTU(packetTime, filetype, datatype, count, index, datalen, amrdata); - } - break; - case Config.PROTOCOL_FZD: - ret=null;//protocol_fzd.AP07(packetTime,count,index,datalen,amrdata); - break; - case Config.PROTOCOL_MQTT: - ret=null;//protocol_fzd.AP07(packetTime,count,index,datalen,amrdata); - break; - } - return ret; - } - public static StringMessage getPPG_ECG_MSG(Runtime runtime){ - if (is_protocol_not_Initialled()) return null; - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=protocol_jiai.APHP(runtime); - break; - case Config.PROTOCOL_BEEHOME: - ret=protocol_beehome.APHP(runtime); - break; - case Config.PROTOCOL_IC: - ret = protocol_ic.APHP(runtime); - break; - case Config.PROTOCOL_FZD: - ret=null; - break; - case Config.PROTOCOL_MQTT: - ret=null; - break; - } - return ret; - } - public static StringMessage getPPG_ECG_MSG(int ppg,int bph,int bpl){ - if (is_protocol_not_Initialled()) return null; - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=protocol_jiai.APHT(ppg,bph,bpl); - break; - case Config.PROTOCOL_BEEHOME: - ret=protocol_beehome.APHT(ppg,bph,bpl); - break; - case Config.PROTOCOL_IC: - ret=protocol_ic.APHT(ppg,bph,bpl); - break; - case Config.PROTOCOL_FZD: - ret=null; - break; - case Config.PROTOCOL_MQTT: - ret=null; - break; - } - return ret; - } - - public static StringMessage getBlood_MSG(int pbh, int pbl,Runtime runtime){ - if (is_protocol_not_Initialled()) return null; - if (runtime==null){ - if (CoreService.getInstance()!=null) - runtime=CoreService.getInstance().getRuntime(); - else - { - ICLogger.i("Runtime == null !"); - return null; - } - } - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=null; - break; - case Config.PROTOCOL_BEEHOME: - ret=null; - break; - case Config.PROTOCOL_IC: - ret=null; - break; - case Config.PROTOCOL_FZD: - ret=protocol_fzd.blood(pbl,pbh); - break; - case Config.PROTOCOL_MQTT: - ret=protocol_mqtt.blood(pbl,pbh,runtime); - break; - } - return ret; - } - - public static StringMessage getOxygen_MSG(int ox,Runtime runtime){ - if (is_protocol_not_Initialled()) return null; - if (runtime==null){ - if (CoreService.getInstance()!=null) - runtime=CoreService.getInstance().getRuntime(); - else - { - ICLogger.i("Runtime == null !"); - return null; - } - } - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=null; - break; - case Config.PROTOCOL_BEEHOME: - ret=null; - break; - case Config.PROTOCOL_IC: - ret=null; - break; - case Config.PROTOCOL_FZD: - ret=protocol_fzd.oxygen(ox); - break; - case Config.PROTOCOL_MQTT: - ret=protocol_mqtt.oxygen(ox,runtime); - break; - } - return ret; - } - public static StringMessage getPPG_MSG(int ppg,Runtime runtime){ - if (is_protocol_not_Initialled()) return null; - if (runtime==null){ - if (CoreService.getInstance()!=null) - runtime=CoreService.getInstance().getRuntime(); - else - { - ICLogger.i("Runtime == null !"); - return null; - } - } - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=null; - break; - case Config.PROTOCOL_BEEHOME: - ret=null; - break; - case Config.PROTOCOL_IC: - ret=null; - break; - case Config.PROTOCOL_FZD: - ret=protocol_fzd.heart(ppg); - break; - case Config.PROTOCOL_MQTT: - ret=protocol_mqtt.heart(ppg,runtime); - break; - } - return ret; - } - public static StringMessage getPPG_ECG_MSG(int ppg,int bph,int bpl,int spo2,Runtime runtime){ - if (is_protocol_not_Initialled()) return null; - - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=protocol_jiai.APHP(ppg,bph,bpl,spo2); - break; - case Config.PROTOCOL_BEEHOME: - ret=protocol_beehome.APHP(ppg,bph,bpl,spo2); - break; - case Config.PROTOCOL_IC: - ret = protocol_ic.APHP(ppg, bph, bpl, spo2); - break; - case Config.PROTOCOL_FZD: - ret=null; - break; - case Config.PROTOCOL_MQTT: - ret=null; - break; - } - return ret; - } - public static StringMessage getWeatherMSG(Runtime runtime){ - if (is_protocol_not_Initialled()) return null; - - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=protocol_jiai.APWT(); - break; - case Config.PROTOCOL_BEEHOME: - ret=null; - break; - case Config.PROTOCOL_IC: - ret = protocol_ic.APTQ(runtime); - break; - case Config.PROTOCOL_FZD: - ret=null; - break; - case Config.PROTOCOL_MQTT: - ret=null; - break; - } - return ret; - } - - public static String getDefaultServerIP(){ - - String ret=""; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=protocol_jiai.defaultServerIP; - break; - case Config.PROTOCOL_BEEHOME: - ret=protocol_beehome.defaultServerIP; - break; - case Config.PROTOCOL_IC: - ret=protocol_ic.defaultServerIP; - break; - case Config.PROTOCOL_FZD: - ret=protocol_fzd.defaultServerIP; - break; - case Config.PROTOCOL_MQTT: - ret=protocol_mqtt.defaultServerIP; - break; - } - return ret; - } - public static int getDefaultServerPort(){ - - int ret=8090; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=protocol_jiai.defaultServerPort; - break; - case Config.PROTOCOL_BEEHOME: - ret=protocol_beehome.defaultServerPort; - break; - case Config.PROTOCOL_IC: - ret=protocol_ic.defaultServerPort; - break; - case Config.PROTOCOL_FZD: - ret=protocol_fzd.defaultServerPort; - break; - case Config.PROTOCOL_MQTT: - ret=protocol_mqtt.defaultServerPort; - break; - } - return ret; - } - public static StringMessage getSleepMSG(SleepInfo sr,Runtime runtime){ - if (is_protocol_not_Initialled()) return null; - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=null; - break; - case Config.PROTOCOL_BEEHOME: - ret=null; - break; - case Config.PROTOCOL_IC: - if(Config.getProtocolServerHost(runtime.getContextProxy().context).equals(protocol_jiai.defaultServerIP)) - { - ret=null; - }else { - ret = protocol_ic.APSL(sr.getCurrentDate(), sr.getDeepsleep_minutes(), sr.getLightsleep_minutes(), sr.getScore()); - } - break; - case Config.PROTOCOL_FZD: - ret=null; - break; - case Config.PROTOCOL_MQTT: - ret=null; - break; - } - return ret; - } - - public static StringMessage getPushTxtReadFlagToSrvMSG(Runtime runtime ){ - if (is_protocol_not_Initialled()) return null; - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=protocoljiai_handler.AP94(); - break; - case Config.PROTOCOL_BEEHOME: - ret=null; - break; - case Config.PROTOCOL_IC: - if(Config.getProtocolServerHost(runtime.getContextProxy().context).equals(protocol_jiai.defaultServerIP)) - { - ret=protocolic_handler.AP94();; - }else { - ret = null; - } - break; - case Config.PROTOCOL_FZD: - ret=null; - break; - case Config.PROTOCOL_MQTT: - ret=null; - break; - } - return ret; - } - - public static StringMessage getPRACTICE(){ - if (is_protocol_not_Initialled()) return null; - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=null; - break; - case Config.PROTOCOL_BEEHOME: - ret=null; - break; - case Config.PROTOCOL_IC: - ret = null; - break; - case Config.PROTOCOL_FZD: - ret=protocol_fzd.PRACTICE(Runtime.healthInfo); - break; - case Config.PROTOCOL_MQTT: - ret=null; - break; - } - return ret; - } - - public static StringMessage getBLEScanResult(Runtime runtime){ - if (is_protocol_not_Initialled()) return null; - StringMessage ret=null; - switch(Config.protocol_no) - { - case Config.PROTOCOL_JIAI: - ret=null; - break; - case Config.PROTOCOL_BEEHOME: - ret=null; - break; - case Config.PROTOCOL_IC: - ret = protocol_ic.APBR(runtime); - break; - case Config.PROTOCOL_FZD: - ret=null; - break; - case Config.PROTOCOL_MQTT: - ret=null; - break; - } - return ret; - } -} +package com.ic.protocols; + +import com.enqualcomm.support.Config; +import com.enqualcomm.support.CoreService; +import com.enqualcomm.support.bean.Runtime; +import com.enqualcomm.support.bean.SleepInfo; +import com.enqualcomm.support.bean.StringMessage; +import com.enqualcomm.support.utils.Connection; +import com.enqualcomm.support.utils.ICLogger; +import com.enqualcomm.support.utils.TimeUtil; + + +public class protocolAPIHelper { + + private static protocol_jiai protocoljiai_handler=null; + private static protocol_beehome protocolbeehome_handler=null; + private static protocol_ic protocolic_handler=null; + private static protocol_fzd protocolfzd_handler=null; + private static protocol_mqtt protocolmqtt_handler=null; + + public protocolAPIHelper(Connection connect, Runtime runtime) { + ICLogger.i("init Protocol "+Config.getProtocolNumber()); + if (protocolbeehome_handler==null) + protocolbeehome_handler=new protocol_beehome(connect,runtime); + if (protocoljiai_handler==null) + protocoljiai_handler=new protocol_jiai(connect,runtime); + if (protocolic_handler==null) + protocolic_handler=new protocol_ic(connect,runtime); + if (protocolfzd_handler==null) + protocolfzd_handler=new protocol_fzd(connect,runtime); + if (protocolmqtt_handler==null) + protocolmqtt_handler=new protocol_mqtt(connect,runtime); + } + + private static boolean is_protocol_not_Initialled(){ + return (protocolbeehome_handler==null || protocoljiai_handler == null || protocolic_handler==null|| protocolfzd_handler==null ||protocolmqtt_handler==null); + + } + /* + 返回true 表示 cmd 全部解析成功 + 返回false表示 cmd至少有一条解析失败,失败的数据归入buffer,下一次识别接着使用 + 字符串通过#号进行识别。 + 每个字符串如果发现 #,却又没有Header,“IW”则会被丢弃 + */ + public boolean parserCmd(String cmd_type,byte[] bytes) { + + //只要服务器收到消息,就认为服务器是联通的,保存联通的时间 + Runtime.lastLinkReceiveStamp=System.currentTimeMillis(); + + if (is_protocol_not_Initialled()) return false; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + protocoljiai_handler.parserCmd(bytes); + break; + case Config.PROTOCOL_BEEHOME: + protocolbeehome_handler.parserCmd(bytes); + break; + case Config.PROTOCOL_IC: + protocolic_handler.parserCmd(bytes); + break; + case Config.PROTOCOL_FZD: + protocolfzd_handler.parserCmd(bytes); + break; + case Config.PROTOCOL_MQTT: + protocolmqtt_handler.parserCmd(cmd_type,bytes); + break; + } + return true; + } + public static StringMessage genStringMessage(String cmdName, byte[] rawdata){ + StringMessage sm=new StringMessage(new String[]{cmdName,new String(rawdata) }); + sm.setDate(TimeUtil.getSystemDateYYMMDD(),TimeUtil.getSystemTimeHHmmss()); + return sm; + } + public static StringMessage genStringMessage(String cmdName, String msg){ + StringMessage sm=new StringMessage(new String[]{cmdName,msg}); + sm.refresh(msg); + sm.setDate(TimeUtil.getSystemDateYYMMDD(),TimeUtil.getSystemTimeHHmmss()); + return sm; + } + + /*** + * its only used for message sending by mConnection.DeliverCMDMessageToSystem + * @param msg + * @return + */ + public static String isCmdStr(StringMessage msg){ + if(msg==null) + ICLogger.i("isCmdStr StringMessage is null"); + if (is_protocol_not_Initialled()) { + ICLogger.i("isCmdStr is_protocol_not_Initialled "); + return ""; + } + String ret=""; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=protocol_jiai.isCmdStr(msg.isFromCache()); + break; + case Config.PROTOCOL_BEEHOME: + ret=protocol_beehome.isCmdStr(msg.isFromCache()); + break; + case Config.PROTOCOL_IC: + ret=protocol_ic.isCmdStr(msg.isFromCache()); + break; + case Config.PROTOCOL_FZD: + ret=protocol_fzd.isCmdStr(msg.isFromCache()); + break; + case Config.PROTOCOL_MQTT: + ret=protocol_mqtt.isCmdStr(msg); + break; + } + return ret; + } + public static StringMessage getBindingMSG(Runtime runtime){ + if (is_protocol_not_Initialled()) return null; + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=null; + break; + case Config.PROTOCOL_BEEHOME: + ret=null; + break; + case Config.PROTOCOL_IC: + ret=null; + break; + case Config.PROTOCOL_FZD: + ret=protocol_fzd.PING(); + break; + case Config.PROTOCOL_MQTT: + ret=protocol_mqtt.LGZONE(runtime); + break; + } + return ret; + } + public static StringMessage getSyncTimeMSG(Runtime runtime){ + if (is_protocol_not_Initialled()) return null; + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=null; + break; + case Config.PROTOCOL_BEEHOME: + ret=null; + break; + case Config.PROTOCOL_IC: + ret=null; + break; + case Config.PROTOCOL_FZD: + ret=protocol_fzd.LGZONE(runtime); + break; + case Config.PROTOCOL_MQTT: + ret=null; + break; + } + return ret; + } + + public static StringMessage getTemperatureMSG(double temp_adusted,double body_temp,double tempout,Runtime runtime){ + if (is_protocol_not_Initialled()) return null; + if (runtime==null){ + if (CoreService.getInstance()!=null) + runtime=CoreService.getInstance().getRuntime(); + else + { + ICLogger.i("Runtime == null !"); + return null; + } + } + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=protocol_jiai.AP50(runtime); + break; + case Config.PROTOCOL_BEEHOME: + ret=protocol_beehome.APTP(temp_adusted,body_temp); + break; + case Config.PROTOCOL_IC: + ret=protocol_ic.APTP(temp_adusted,body_temp,tempout); + break; + case Config.PROTOCOL_FZD: + ret=protocol_fzd.temp(body_temp); + break; + case Config.PROTOCOL_MQTT: + ret=protocol_mqtt.temp(body_temp,runtime);; + break; + } + return ret; + } + + public static StringMessage getChargingMSG(int charging){ + if (is_protocol_not_Initialled()) return null; + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + break; + case Config.PROTOCOL_BEEHOME: + break; + case Config.PROTOCOL_IC: + if(Config.custom_name.equals("VitracK")) + ret=protocol_ic.APCH(charging); + break; + case Config.PROTOCOL_FZD: + break; + case Config.PROTOCOL_MQTT: + break; + } + return ret; + } + + public static StringMessage getWarningMSG(Runtime runtime){ + if (is_protocol_not_Initialled()) return null; + StringMessage ret=null; + runtime.dumpDevStatus(); + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=protocol_jiai.AP10(runtime); + break; + case Config.PROTOCOL_BEEHOME: + ret=protocol_beehome.AP10(runtime); + break; + case Config.PROTOCOL_IC: + ret=protocol_ic.AP10(runtime); + break; + case Config.PROTOCOL_FZD: + ret=protocol_fzd.AL(runtime); + break; + case Config.PROTOCOL_MQTT: + ret=protocol_mqtt.AL(runtime); + break; + } + return ret; + } + + public static StringMessage getLoginMSG(Runtime runtime){ + if (is_protocol_not_Initialled()) return null; + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=protocol_jiai.AP00(runtime); + break; + case Config.PROTOCOL_BEEHOME: + ret=protocol_beehome.AP00(runtime); + break; + case Config.PROTOCOL_IC: + ret=protocol_ic.AP00(runtime); + break; + case Config.PROTOCOL_FZD: + ret=protocol_fzd.LK(); + break; + case Config.PROTOCOL_MQTT: + ret=protocol_mqtt.BREQ(runtime); + break; + } + return ret; + } + + public static StringMessage getHeartbeatMSG(Runtime runtime){ + if (is_protocol_not_Initialled()) return null; + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=protocol_jiai.AP03(runtime); + break; + case Config.PROTOCOL_BEEHOME: + ret=protocol_beehome.AP03(runtime); + break; + case Config.PROTOCOL_IC: + ret=protocol_ic.AP03(runtime); + break; + case Config.PROTOCOL_FZD: + ret=protocol_fzd.KA(runtime); + break; + case Config.PROTOCOL_MQTT: + ret=protocol_mqtt.KA(runtime); + break; + } + return ret; + } + + public static StringMessage getGPSLocationMSG(Runtime runtime){ + if (is_protocol_not_Initialled()) return null; + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=protocol_jiai.AP01(runtime); + break; + case Config.PROTOCOL_BEEHOME: + ret=protocol_beehome.AP01(runtime); + break; + case Config.PROTOCOL_IC: + ret=protocol_ic.AP01(runtime); + break; + case Config.PROTOCOL_FZD: + ret=protocol_fzd.UD(runtime); + break; + case Config.PROTOCOL_MQTT: + ret=protocol_mqtt.UD(runtime); + break; + } + return ret; + } + public static StringMessage getLBSLocationMSG(Runtime runtime){ + if (is_protocol_not_Initialled()) return null; + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=protocol_jiai.AP02(runtime); + break; + case Config.PROTOCOL_BEEHOME: + ret=protocol_beehome.AP02(runtime); + break; + case Config.PROTOCOL_IC: + ret=protocol_ic.AP02(runtime); + break; + case Config.PROTOCOL_FZD: + ret=protocol_fzd.UD(runtime); + break; + case Config.PROTOCOL_MQTT: + ret=protocol_mqtt.UD(runtime); + break; + } + return ret; + } + + public static byte[] getVoicePacketItem(String packetTime,int count,int index,int datalen,byte[] amrdata,int filetype,int datatype){ + byte[] ret=null; + if (is_protocol_not_Initialled()) return null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=protocol_jiai.AP07(packetTime,count,index,datalen,amrdata); + break; + case Config.PROTOCOL_BEEHOME: + ret=protocol_beehome.AP07(packetTime,count,index,datalen,amrdata); + break; + case Config.PROTOCOL_IC: + /*** + * * 1 语音—— 1.监听语音 * 2.SOS语音 * 3.扩展 + * * 2 图片—— 1.签到图片 * 2.指令图片 * 3.设备图片 * 4.扩展 + */ + if(filetype==1 && datatype==3){ + //对讲用的类型 + ret=protocol_ic.AP07(packetTime,count,index,datalen,amrdata); + }else { + ret = protocol_ic.APTU(packetTime, filetype, datatype, count, index, datalen, amrdata); + } + break; + case Config.PROTOCOL_FZD: + ret=null;//protocol_fzd.AP07(packetTime,count,index,datalen,amrdata); + break; + case Config.PROTOCOL_MQTT: + ret=null;//protocol_fzd.AP07(packetTime,count,index,datalen,amrdata); + break; + } + return ret; + } + public static StringMessage getPPG_ECG_MSG(Runtime runtime){ + if (is_protocol_not_Initialled()) return null; + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + //ret=protocol_jiai.APHP(runtime); + ret=protocol_jiai.APHT(runtime); + break; + case Config.PROTOCOL_BEEHOME: + ret=protocol_beehome.APHP(runtime); + break; + case Config.PROTOCOL_IC: + ret = protocol_ic.APHP(runtime); + break; + case Config.PROTOCOL_FZD: + ret=null; + break; + case Config.PROTOCOL_MQTT: + ret=null; + break; + } + return ret; + } + public static StringMessage getPPG_ECG_MSG(int ppg,int bph,int bpl){ + if (is_protocol_not_Initialled()) return null; + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=protocol_jiai.APHT(ppg,bph,bpl); + break; + case Config.PROTOCOL_BEEHOME: + ret=protocol_beehome.APHT(ppg,bph,bpl); + break; + case Config.PROTOCOL_IC: + ret=protocol_ic.APHT(ppg,bph,bpl); + break; + case Config.PROTOCOL_FZD: + ret=null; + break; + case Config.PROTOCOL_MQTT: + ret=null; + break; + } + return ret; + } + + public static StringMessage getBlood_MSG(int pbh, int pbl,Runtime runtime){ + if (is_protocol_not_Initialled()) return null; + if (runtime==null){ + if (CoreService.getInstance()!=null) + runtime=CoreService.getInstance().getRuntime(); + else + { + ICLogger.i("Runtime == null !"); + return null; + } + } + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=null; + break; + case Config.PROTOCOL_BEEHOME: + ret=null; + break; + case Config.PROTOCOL_IC: + ret=null; + break; + case Config.PROTOCOL_FZD: + ret=protocol_fzd.blood(pbl,pbh); + break; + case Config.PROTOCOL_MQTT: + ret=protocol_mqtt.blood(pbl,pbh,runtime); + break; + } + return ret; + } + + public static StringMessage getOxygen_MSG(int ox,Runtime runtime){ + if (is_protocol_not_Initialled()) return null; + if (runtime==null){ + if (CoreService.getInstance()!=null) + runtime=CoreService.getInstance().getRuntime(); + else + { + ICLogger.i("Runtime == null !"); + return null; + } + } + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=null; + break; + case Config.PROTOCOL_BEEHOME: + ret=null; + break; + case Config.PROTOCOL_IC: + ret=null; + break; + case Config.PROTOCOL_FZD: + ret=protocol_fzd.oxygen(ox); + break; + case Config.PROTOCOL_MQTT: + ret=protocol_mqtt.oxygen(ox,runtime); + break; + } + return ret; + } + public static StringMessage getPPG_MSG(int ppg,Runtime runtime){ + if (is_protocol_not_Initialled()) return null; + if (runtime==null){ + if (CoreService.getInstance()!=null) + runtime=CoreService.getInstance().getRuntime(); + else + { + ICLogger.i("Runtime == null !"); + return null; + } + } + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=null; + break; + case Config.PROTOCOL_BEEHOME: + ret=null; + break; + case Config.PROTOCOL_IC: + ret=null; + break; + case Config.PROTOCOL_FZD: + ret=protocol_fzd.heart(ppg); + break; + case Config.PROTOCOL_MQTT: + ret=protocol_mqtt.heart(ppg,runtime); + break; + } + return ret; + } + public static StringMessage getPPG_ECG_MSG(int ppg,int bph,int bpl,int spo2,Runtime runtime){ + if (is_protocol_not_Initialled()) return null; + + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + // ret=protocol_jiai.APHP(ppg,bph,bpl,spo2); + ret=protocol_jiai.APHT(ppg,bph,bpl); + break; + case Config.PROTOCOL_BEEHOME: + ret=protocol_beehome.APHP(ppg,bph,bpl,spo2); + break; + case Config.PROTOCOL_IC: + ret = protocol_ic.APHP(ppg, bph, bpl, spo2); + break; + case Config.PROTOCOL_FZD: + ret=null; + break; + case Config.PROTOCOL_MQTT: + ret=null; + break; + } + return ret; + } + public static StringMessage getWeatherMSG(Runtime runtime){ + if (is_protocol_not_Initialled()) return null; + + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=protocol_jiai.APWT(); + break; + case Config.PROTOCOL_BEEHOME: + ret=null; + break; + case Config.PROTOCOL_IC: + ret = protocol_ic.APTQ(runtime); + break; + case Config.PROTOCOL_FZD: + ret=null; + break; + case Config.PROTOCOL_MQTT: + ret=null; + break; + } + return ret; + } + + public static String getDefaultServerIP(){ + + String ret=""; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=protocol_jiai.defaultServerIP; + break; + case Config.PROTOCOL_BEEHOME: + ret=protocol_beehome.defaultServerIP; + break; + case Config.PROTOCOL_IC: + ret=protocol_ic.defaultServerIP; + break; + case Config.PROTOCOL_FZD: + ret=protocol_fzd.defaultServerIP; + break; + case Config.PROTOCOL_MQTT: + ret=protocol_mqtt.defaultServerIP; + break; + } + return ret; + } + public static int getDefaultServerPort(){ + + int ret=8090; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=protocol_jiai.defaultServerPort; + break; + case Config.PROTOCOL_BEEHOME: + ret=protocol_beehome.defaultServerPort; + break; + case Config.PROTOCOL_IC: + ret=protocol_ic.defaultServerPort; + break; + case Config.PROTOCOL_FZD: + ret=protocol_fzd.defaultServerPort; + break; + case Config.PROTOCOL_MQTT: + ret=protocol_mqtt.defaultServerPort; + break; + } + return ret; + } + public static StringMessage getSleepMSG(SleepInfo sr,Runtime runtime){ + if (is_protocol_not_Initialled()) return null; + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=null; + break; + case Config.PROTOCOL_BEEHOME: + ret=null; + break; + case Config.PROTOCOL_IC: + if(Config.getProtocolServerHost(runtime.getContextProxy().context).equals(protocol_jiai.defaultServerIP)) + { + ret=null; + }else { + ret = protocol_ic.APSL(sr.getCurrentDate(), sr.getDeepsleep_minutes(), sr.getLightsleep_minutes(), sr.getScore()); + } + break; + case Config.PROTOCOL_FZD: + ret=null; + break; + case Config.PROTOCOL_MQTT: + ret=null; + break; + } + return ret; + } + + public static StringMessage getPushTxtReadFlagToSrvMSG(Runtime runtime ){ + if (is_protocol_not_Initialled()) return null; + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=protocoljiai_handler.AP94(); + break; + case Config.PROTOCOL_BEEHOME: + ret=null; + break; + case Config.PROTOCOL_IC: + if(Config.getProtocolServerHost(runtime.getContextProxy().context).equals(protocol_jiai.defaultServerIP)) + { + ret=protocolic_handler.AP94();; + }else { + ret = null; + } + break; + case Config.PROTOCOL_FZD: + ret=null; + break; + case Config.PROTOCOL_MQTT: + ret=null; + break; + } + return ret; + } + + public static StringMessage getPRACTICE(){ + if (is_protocol_not_Initialled()) return null; + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=null; + break; + case Config.PROTOCOL_BEEHOME: + ret=null; + break; + case Config.PROTOCOL_IC: + ret = null; + break; + case Config.PROTOCOL_FZD: + ret=protocol_fzd.PRACTICE(Runtime.healthInfo); + break; + case Config.PROTOCOL_MQTT: + ret=null; + break; + } + return ret; + } + + public static StringMessage getBLEScanResult(Runtime runtime){ + if (is_protocol_not_Initialled()) return null; + StringMessage ret=null; + switch(Config.protocol_no) + { + case Config.PROTOCOL_JIAI: + ret=null; + break; + case Config.PROTOCOL_BEEHOME: + ret=null; + break; + case Config.PROTOCOL_IC: + ret = protocol_ic.APBR(runtime); + break; + case Config.PROTOCOL_FZD: + ret=null; + break; + case Config.PROTOCOL_MQTT: + ret=null; + break; + } + return ret; + } +} diff --git a/app/version_code.properties b/app/version_code.properties index 3a83c3f5..2624e4f8 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Fri Dec 04 12:55:54 CST 2020 -VERSION_CODE=724 +#Fri Dec 04 18:51:56 CST 2020 +VERSION_CODE=725