临时提交

diff --git a/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java b/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java
index fe0dd0a..ec455f9 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java
@@ -315,14 +315,17 @@ public class NettyConnection implements Connection {
             return;
         }
         sendMsg(msg.isFromCache());
-        ICLogger.logToFile("APILog", "send " + msg.getIndex() + " " + msg.getDate() + msg.getTime() + " " + msg.cmd() + " " + msg.isFromCache());
-        //  ICLogger.i(paramStringMessage.isFromCache());
-
+        if (msg.isFromCache().startsWith("GT")) {
+            String originalmsg=msg.size()>1?msg.all()[1]:"";
+            ICLogger.logToFile("APILog", "send " + msg.getIndex() + " " + msg.getDate() + msg.getTime() + " " + msg.cmd() + " " +originalmsg+" " + msg.isFromCache());
+        } else{
+            ICLogger.logToFile("APILog", "send " + msg.getIndex() + " " + msg.getDate() + msg.getTime() + " " + msg.cmd() + " " + msg.isFromCache());
+        }
     }
 
     @Override
     public void send(String cmd, byte[] bytes) {
-        ICLogger.d("cmd==> " + cmd);
+        ICLogger.d("rawcmd==> " + cmd);
         sendMsg(bytes);
     }
 

diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index be327e5..ccbb586 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
@@ -108,16 +108,67 @@ public class protocolAPIHelper {
     }
 
     public static StringMessage genStringMessage(String cmdName, byte[] rawdata) {
+        /*
+        暂时未使用，byte[]被转换为 String是会出现错误的！
         StringMessage sm = new StringMessage(new String[]{cmdName, new String(rawdata)});
         sm.setDate(TimeUtil.getSystemDateYYMMDD(), TimeUtil.getSystemTimeHHmmss());
         return sm;
+         */
+        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 = null;
+                break;
+            case Config.PROTOCOL_MQTT:
+                ret = null;
+                break;
+            case Config.PROTOCOL_S123:
+                ret = null;
+                break;
+            case Config.PROTOCOL_GATOR:
+                ret = null;
+                break;
+        }
+        return ret;
     }
 
     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;
+        if (is_protocol_not_Initialled()) return null;
+        StringMessage ret = null;
+        switch (Config.protocol_no) {
+            case Config.PROTOCOL_JIAI:
+                ret = protocol_jiai.genStringMessage(cmdName,msg);
+                break;
+            case Config.PROTOCOL_BEEHOME:
+                ret = protocol_beehome.genStringMessage(cmdName,msg);
+                break;
+            case Config.PROTOCOL_IC:
+                ret = protocol_ic.genStringMessage(cmdName,msg);
+                break;
+            case Config.PROTOCOL_FZD:
+                ret = protocol_fzd.genStringMessage(cmdName,msg);
+                break;
+            case Config.PROTOCOL_MQTT:
+                ret = protocol_mqtt.genStringMessage(cmdName,msg);
+                break;
+            case Config.PROTOCOL_S123:
+                ret = protocol_s123.genStringMessage(cmdName,msg);
+                break;
+            case Config.PROTOCOL_GATOR:
+                ret = protocol_gator.genStringMessage(cmdName,msg);
+                break;
+        }
+        return ret;
     }
 
     /***
@@ -279,7 +330,7 @@ public class protocolAPIHelper {
                 ret = protocol_mqtt.temp(body_temp, runtime);
                 break;
             case Config.PROTOCOL_S123:
-                ret = null;
+                ret = protocol_s123.APTP(temp_adusted, body_temp, tempout);
                 break;
             case Config.PROTOCOL_GATOR:
                 ret = null;
@@ -308,7 +359,7 @@ public class protocolAPIHelper {
                 ret = protocol_anan.APCH(charging);
                 break;
             case Config.PROTOCOL_S123:
-                ret = null;
+                ret = protocol_s123.APCH(charging);
                 break;
             case Config.PROTOCOL_GATOR:
                 ret = null;
@@ -341,10 +392,10 @@ public class protocolAPIHelper {
                 ret = protocol_anan.AP10(runtime);
                 break;
             case Config.PROTOCOL_S123:
-                ret = null;
+                ret =  protocol_s123.AP10(runtime);
                 break;
             case Config.PROTOCOL_GATOR:
-                ret = null;
+                ret =  null;
                 break;
         }
         return ret;
@@ -373,10 +424,10 @@ public class protocolAPIHelper {
                 ret = protocol_anan.AP00(runtime);
                 break;
             case Config.PROTOCOL_S123:
-                ret = null;
+                ret = protocol_s123.AP00(runtime);
                 break;
             case Config.PROTOCOL_GATOR:
-                ret = null;
+                ret = protocol_gator.BP00(runtime);
                 break;
         }
         return ret;
@@ -405,10 +456,10 @@ public class protocolAPIHelper {
                 ret = protocol_anan.AP03(runtime);
                 break;
             case Config.PROTOCOL_S123:
-                ret = null;
+                ret = protocol_s123.AP03(runtime);
                 break;
             case Config.PROTOCOL_GATOR:
-                ret = null;
+                ret = protocol_gator.BP33(runtime);
                 break;
         }
         return ret;
@@ -437,7 +488,7 @@ public class protocolAPIHelper {
                 ret = protocol_anan.AP01(runtime);
                 break;
             case Config.PROTOCOL_S123:
-                ret = null;
+                ret = protocol_s123.AP01(runtime);
                 break;
             case Config.PROTOCOL_GATOR:
                 ret = null;
@@ -469,7 +520,7 @@ public class protocolAPIHelper {
                 ret = protocol_anan.AP02(runtime);
                 break;
             case Config.PROTOCOL_S123:
-                ret = null;
+                ret = protocol_s123.AP02(runtime);
                 break;
             case Config.PROTOCOL_GATOR:
                 ret = null;
@@ -510,7 +561,16 @@ public class protocolAPIHelper {
                 ret = protocol_anan.AP07(packetTime, count, index, datalen, amrdata);
                 break;
             case Config.PROTOCOL_S123:
-                ret = null;
+                /***
+                 *          * 1 语音——   1.监听语音      *   2.SOS语音      *      3.扩展
+                 *          * 2 图片——   1.签到图片      *   2.指令图片      *   3.设备图片      *   4.扩展
+                 */
+                if (filetype == 1 && datatype == 3) {
+                    //对讲用的类型
+                    ret = protocol_s123.AP07(packetTime, count, index, datalen, amrdata);
+                } else {
+                    ret = protocol_s123.APTU(packetTime, filetype, datatype, count, index, datalen, amrdata);
+                }
                 break;
             case Config.PROTOCOL_GATOR:
                 ret = null;
@@ -548,7 +608,7 @@ public class protocolAPIHelper {
                 ret = protocol_anan.APHT(runtime);
                 break;
             case Config.PROTOCOL_S123:
-                ret = null;
+                ret = protocol_s123.APHP(runtime);
                 break;
             case Config.PROTOCOL_GATOR:
                 ret = null;
@@ -584,7 +644,7 @@ public class protocolAPIHelper {
                 ret = protocol_anan.APHT(runtime);
                 break;
             case Config.PROTOCOL_S123:
-                ret = null;
+                ret = protocol_s123.APHT(ppg, bph, bpl);
                 break;
             case Config.PROTOCOL_GATOR:
                 ret = null;
@@ -726,7 +786,7 @@ public class protocolAPIHelper {
                 ret = null;
                 break;
             case Config.PROTOCOL_S123:
-                ret = null;
+                ret = protocol_s123.APHP(ppg, bph, bpl, spo2);
                 break;
             case Config.PROTOCOL_GATOR:
                 ret = null;
@@ -759,7 +819,7 @@ public class protocolAPIHelper {
                 //ret = protocol_anan.APTQ(runtime);
                 break;
             case Config.PROTOCOL_S123:
-                ret = null;
+                ret =  protocol_s123.APTQ(runtime);
                 break;
             case Config.PROTOCOL_GATOR:
                 ret = null;
@@ -857,7 +917,7 @@ public class protocolAPIHelper {
                 ret = null;
                 break;
             case Config.PROTOCOL_S123:
-                ret = null;
+                ret = protocol_s123.APSL(sr.getCurrentDate(), sr.getDeepsleep_minutes(), sr.getLightsleep_minutes(), sr.getScore());
                 break;
             case Config.PROTOCOL_GATOR:
                 ret = null;

diff --git a/app/src/main/java/com/ic/protocols/protocol_anan.java b/app/src/main/java/com/ic/protocols/protocol_anan.java
index 3da65b5..2c04e0d 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_anan.java
+++ b/app/src/main/java/com/ic/protocols/protocol_anan.java
@@ -647,8 +647,11 @@ public class protocol_anan {
     }
 
     public static StringMessage genStringMessage(String cmdName, String msg) {
+        //设置cmdName，在这里配置进去的msg没有实际用到
         StringMessage sm = new StringMessage(new String[]{cmdName, msg});
+        //用此函数设置要发送的内容
         sm.refresh(msg);
+        //设置信息创建时间
         sm.setDate(TimeUtil.getSystemDateYYMMDD(), TimeUtil.getSystemTimeHHmmss());
         return sm;
     }

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 ebd45aa..5aa1530 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_beehome.java
+++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java
@@ -260,8 +260,11 @@ public class protocol_beehome {
 
     /**/
     public static StringMessage genStringMessage(String cmdName, String msg) {
+        //设置cmdName，在这里配置进去的msg没有实际用到
         StringMessage sm = new StringMessage(new String[]{cmdName, msg});
+        //用此函数设置要发送的内容
         sm.refresh(msg);
+        //设置信息创建时间
         sm.setDate(TimeUtil.getSystemDateYYMMDD(), TimeUtil.getSystemTimeHHmmss());
         return sm;
     }

diff --git a/app/src/main/java/com/ic/protocols/protocol_fzd.java b/app/src/main/java/com/ic/protocols/protocol_fzd.java
index 4bfebee..7c6010c 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_fzd.java
+++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java
@@ -535,8 +535,11 @@ public class protocol_fzd {
 
     /**/
     public static StringMessage genStringMessage(String cmdName, String msg) {
+        //设置cmdName，在这里配置进去的msg没有实际用到
         StringMessage sm = new StringMessage(new String[]{cmdName, msg});
+        //用此函数设置要发送的内容
         sm.refresh(msg);
+        //设置信息创建时间
         sm.setDate(TimeUtil.getSystemDateYYMMDD(), TimeUtil.getSystemTimeHHmmss());
         return sm;
     }

diff --git a/app/src/main/java/com/ic/protocols/protocol_gator.java b/app/src/main/java/com/ic/protocols/protocol_gator.java
index 0bb9cf6..bd2f5c7 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_gator.java
+++ b/app/src/main/java/com/ic/protocols/protocol_gator.java
@@ -22,6 +22,7 @@ import com.enqualcomm.support.bean.StringMessage;
 import com.enqualcomm.support.bean.VoiceContent;
 import com.enqualcomm.support.bean.voicePacket;
 import com.enqualcomm.support.service.HeartRateManager;
+import com.enqualcomm.support.utils.AESCipher;
 import com.enqualcomm.support.utils.CameraUtil;
 import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.utils.ICAudioManager;
@@ -63,11 +64,11 @@ import static java.lang.Math.abs;
 public class protocol_gator {
     private static final String TAG = "ICSrv." + protocol_gator.class.getSimpleName();
 
-    private static final String CMDHEADER = "IW";
-    private static final String CMDEND = "#";
+    private static final String CMDHEADER = "(";
+    private static final String CMDEND = ")";
     private static final String CMDSPLIT = ",";
-    public static final String defaultServerIP = "watch.jiai.pro";
-    public static final int defaultServerPort = 8090;
+    public static final String defaultServerIP = "13.59.36.164";
+    public static final int defaultServerPort = 7030;
 
     public enum CMD_TYPE {
         /*终端发起*/
@@ -356,10 +357,20 @@ public class protocol_gator {
 
     private Handler mHandler = null;
 
+    private static String encrepteMsg(String msg){
+        String encreptedStr="";
+        String encreptionMSGHeader="GT";
+        encreptedStr=AESCipher.aesEncryptStringFixedKey(msg);
+        String len= String.format("%04x",encreptedStr.length());
+        return encreptionMSGHeader+len+encreptedStr;
+    }
     /**/
     public static StringMessage genStringMessage(String cmdName, String msg) {
+        //设置cmdName，在这里配置进去的msg没有实际用到
         StringMessage sm = new StringMessage(new String[]{cmdName, msg});
+        //用此函数设置要发送的内容
         sm.refresh(msg);
+        //设置信息创建时间
         sm.setDate(TimeUtil.getSystemDateYYMMDD(), TimeUtil.getSystemTimeHHmmss());
         return sm;
     }
@@ -418,6 +429,7 @@ public class protocol_gator {
         return ret;
     }
 
+
     public int getBP28Amrlen(String cmd) {
 
         String Name;
@@ -458,7 +470,7 @@ public class protocol_gator {
     }
 
     /*登录*/
-    public static StringMessage AP00(Runtime ds) {
+    public static StringMessage BP00(Runtime ds) {
         //示例数据：IWAP00867155030001063#
         return genStringMessage(cmdMap.get(CMD_TYPE.AP00),
                 new StringBuffer(CMDHEADER).append(
@@ -499,7 +511,13 @@ public class protocol_gator {
         }
     }
 
-
+    public static StringMessage BP33(Runtime ds) {
+        return genStringMessage(cmdMap.get(CMD_TYPE.AP00),
+                new StringBuffer(CMDHEADER).append(
+                        cmdMap.get(CMD_TYPE.AP00)
+                ).append(ds.IMEI()).append(
+                        CMDEND).toString());
+    }
     public static StringMessage AP03(Runtime ds) {
         //示例数据：IWAP03,06000908000102,5555,30#  IWAP03,000000null00000,0,0#
         //IW: 标识符

diff --git a/app/src/main/java/com/ic/protocols/protocol_ic.java b/app/src/main/java/com/ic/protocols/protocol_ic.java
index 7e5900d..0508618 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -358,8 +358,11 @@ public class protocol_ic {
 
     /**/
     public static StringMessage genStringMessage(String cmdName, String msg) {
+        //设置cmdName，在这里配置进去的msg没有实际用到
         StringMessage sm = new StringMessage(new String[]{cmdName, msg});
+        //用此函数设置要发送的内容
         sm.refresh(msg);
+        //设置信息创建时间
         sm.setDate(TimeUtil.getSystemDateYYMMDD(), TimeUtil.getSystemTimeHHmmss());
         return sm;
     }

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 55ec080..477246a 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_jiai.java
+++ b/app/src/main/java/com/ic/protocols/protocol_jiai.java
@@ -250,8 +250,11 @@ public class protocol_jiai {
 
     /**/
     public static StringMessage genStringMessage(String cmdName, String msg) {
+        //设置cmdName，在这里配置进去的msg没有实际用到
         StringMessage sm = new StringMessage(new String[]{cmdName, msg});
+        //用此函数设置要发送的内容
         sm.refresh(msg);
+        //设置信息创建时间
         sm.setDate(TimeUtil.getSystemDateYYMMDD(), TimeUtil.getSystemTimeHHmmss());
         return sm;
     }

diff --git a/app/src/main/java/com/ic/protocols/protocol_mqtt.java b/app/src/main/java/com/ic/protocols/protocol_mqtt.java
index 97371de..6f7cb7e 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_mqtt.java
+++ b/app/src/main/java/com/ic/protocols/protocol_mqtt.java
@@ -122,8 +122,11 @@ public class protocol_mqtt {
 
     /**/
     public static StringMessage genStringMessage(String cmdName, String msg) {
+        //设置cmdName（即topic)，在这里配置进去的msg没有实际用到
         StringMessage sm = new StringMessage(new String[]{cmdName, msg});
+        //用此函数设置要发送的内容
         sm.refresh(msg);
+        //设置信息创建时间
         sm.setDate(TimeUtil.getSystemDateYYMMDD(), TimeUtil.getSystemTimeHHmmss());
         return sm;
     }

diff --git a/app/src/main/java/com/ic/protocols/protocol_s123.java b/app/src/main/java/com/ic/protocols/protocol_s123.java
index e3f5795..611a664 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_s123.java
+++ b/app/src/main/java/com/ic/protocols/protocol_s123.java
@@ -373,8 +373,11 @@ public class protocol_s123 {
 
     /**/
     public static StringMessage genStringMessage(String cmdName, String msg) {
+        //设置cmdName，在这里配置进去的msg没有实际用到
         StringMessage sm = new StringMessage(new String[]{cmdName, msg});
+        //用此函数设置要发送的内容
         sm.refresh(msg);
+        //设置信息创建时间
         sm.setDate(TimeUtil.getSystemDateYYMMDD(), TimeUtil.getSystemTimeHHmmss());
         return sm;
     }