添加 mqtt 报警模式 ，修正AL命令

已经更新账号密码，但是不知为什么登陆不了mqtt服务器

diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index 1ee6550..1f7f2ce 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -792,7 +792,6 @@ public class ICSmsManager  extends BroadcastReceiver {
                         sendSMS(phonenumber, "Set USB config to "+tmp[1]+"!");\r
                         Util.setSystemProperties("persist.sys.usb.config", "none");\r
                         Util.setSystemProperties("persist.sys.usb.config", tmp[1]);\r
-\r
                     }else{\r
                         sendSMS(phonenumber, "USB cmd format error only support current|adb|mtp|adb,mtp|mtp,adb|none !");\r
                     }\r

diff --git a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
index c5fd8cb..20b7ac6 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
@@ -180,8 +180,11 @@ public class Runtime {
       ALARM_LOCK_WATCH,\r
       ALARM_TEMP_HIGH,\r
       ALARM_TEMP_LOW,\r
+      ALARM_POWER_OFF,\r
       ALARM_NONE,\r
     };\r
+\r
+  private AlarmType g_alarm=AlarmType.ALARM_NONE;\r
 /***\r
  *    00为报警状态,00为无任何报警(01：SOS,02：低电,03：脱落报警,04:佩戴提醒，05：剪断报警,06:跌倒报警,\r
  *    07:心率异常, 08:心率过高, 09:心率过低,10:收缩压过高,11:收缩压过低,12:舒张压过高,13:舒张压过低,\r
@@ -189,7 +192,7 @@ public class Runtime {
   */\r
    public void setAlarmType(AlarmType alarm){\r
 //    if ( !fall && !lowbattery && !sos && antioff)\r
-\r
+       g_alarm=alarm;\r
       switch (alarm){\r
           case ALARM_SOS:\r
               alarmType="01";\r
@@ -257,6 +260,7 @@ public class Runtime {
           case ALARM_TEMP_LOW:\r
               alarmType="18";\r
               break;\r
+          case ALARM_POWER_OFF:\r
           case ALARM_NONE:\r
           default:\r
               alarmType="00";\r
@@ -630,7 +634,115 @@ public class Runtime {
     }\r
 \r
     public String fzdAlarmStatus="00000000";\r
-    public String getFZDDevStatus(){\r
+\r
+\r
+    /***\r
+     * 终端状态    00000000 （ 16 进\r
+     * 制）  用二进制字符串表示为\r
+     * 0000 0000 0000 0010 0000 0000 0000 0000 含义如下:\r
+     * 左边高 16bit 表示报警,右边低 16bit 表示状态. Bit 位(0 开始)    含义(1 有效)\r
+     * 0低电状态\r
+     * 1出围栏状态（目前没用到）\r
+     * 2进围栏状态（目前没用到）\r
+     * 3手环戴上取下状态\r
+     * 4手表运行静止状态\r
+     * 16SOS 报警\r
+     * 17低电报警\r
+     * 18出围栏报警（目前没用到）\r
+     * 19进围栏报警（目前没用到）\r
+     * 20手环拆除报警\r
+     * 21跌倒报警\r
+     * 22震动报警\r
+     * 23断电报警\r
+     * 24心率骤降报警\r
+     * 25车辆启动\r
+     *                 比如 00200010，即表示00000000001000000000000000010000\r
+     * 这个项目需要支持防拆 20、00000000000100000000000000000000   0x 00100000 1048576\r
+     * 低电 17、00000000000000100000000000000000    0x 00020000 131072\r
+     * 离线 23、00000000100000000000000000000000    0x 00800000 8388608\r
+     * 逃逸报警 18\  00000000000001000000000000000000   0x 00040000  262144\r
+     * 分别是第四位为 1，第 21 位为 1，对应 21 位是跌倒报警\r
+     * @param runtime\r
+     * @return\r
+     */\r
+    public String getFZDDevStatus(Runtime runtime){\r
+        String alarmType1="00000000";\r
+        switch (runtime.g_alarm){\r
+            case ALARM_SOS:\r
+            //    alarmType1="01";\r
+                break;\r
+            case ALARM_LOWBATTERY:\r
+                alarmType1="00020000";\r
+                break;\r
+            case ALARM_ANTIOFF:\r
+                alarmType1="00100000";\r
+                break;\r
+            case ALARM_WEARED:\r
+//                alarmType1="04";\r
+                break;\r
+            case ALARM_CUTOFF:\r
+//                alarmType1="05";\r
+                break;\r
+            case ALARM_FALL:\r
+//                alarmType1="06";\r
+                break;\r
+\r
+            case ALARM_ABNORMAL_HEART_RATE:\r
+//                alarmType1="07";\r
+                break;\r
+\r
+            case ALARM_HEART_RATE_HIGH:\r
+//                alarmType1="08";\r
+                break;\r
+\r
+            case ALARM_HEART_RATE_LOW:\r
+//                alarmType1="09";\r
+                break;\r
+\r
+            case ALARM_BPH_HIGH:\r
+//                alarmType1="10";\r
+                break;\r
+\r
+            case ALARM_BPH_LOW:\r
+//                alarmType1="11";\r
+                break;\r
+\r
+            case ALARM_BPL_HIGH:\r
+//                alarmType1="12";\r
+                break;\r
+\r
+            case ALARM_BPL_LOW:\r
+//                alarmType1="13";\r
+                break;\r
+\r
+            case ALARM_SEDENTARY:\r
+//                alarmType1="14";\r
+                break;\r
+\r
+            case ALARM_ILLEGAL_CUTOFF:\r
+//                alarmType1="15";\r
+                break;\r
+\r
+            case ALARM_LOCK_WATCH:\r
+//                alarmType1="16";\r
+                break;\r
+\r
+            case ALARM_TEMP_HIGH:\r
+//                alarmType1="17";\r
+                break;\r
+\r
+            case ALARM_TEMP_LOW:\r
+//                alarmType1="18";\r
+                break;\r
+            case ALARM_POWER_OFF:\r
+                alarmType1="00800000";\r
+                break;\r
+            case ALARM_NONE:\r
+            default:\r
+//                alarmType1="00000000";\r
+                break;\r
+        }\r
+        fzdAlarmStatus=alarmType1;\r
       return fzdAlarmStatus;\r
     }\r
   public String getGPSHeading(){\r

diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index 7fb6741..d4ac633 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
@@ -182,7 +182,7 @@ public class protocolAPIHelper {
                 ret=null;\r
                 break;\r
             case Config.PROTOCOL_MQTT:\r
-                ret=null;\r
+                ret=protocol_mqtt.AL(runtime);\r
                 break;\r
         }\r
         return ret;\r

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 fd3b1cd..936901d 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_fzd.java
+++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java
@@ -411,7 +411,7 @@ public class protocol_fzd {
                 .append(runtime.getBattery()).append(CMDSPLIT)\r
                 .append(runtime.getTotalStepCount()).append(CMDSPLIT)\r
                 .append(runtime.getRolltimes()).append(CMDSPLIT)\r
-                .append(runtime.getFZDDevStatus()).append(CMDSPLIT)\r
+                .append(runtime.getFZDDevStatus(runtime)).append(CMDSPLIT)\r
                 .append(runtime.getFZDLBSMultiStationData()).append(CMDSPLIT)\r
                 .append(runtime.getFZDWifiData());\r
 \r

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 9362dbb..4197bbe 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_mqtt.java
+++ b/app/src/main/java/com/ic/protocols/protocol_mqtt.java
@@ -79,7 +79,7 @@ public class protocol_mqtt {
         cmdMap.put(CMD_TYPE.LGZONE, "LGZONE");\r
         cmdMap.put(CMD_TYPE.UD, "UD");\r
         cmdMap.put(CMD_TYPE.AL, "AL");\r
-        cmdMap.put(CMD_TYPE.AL, "ALARM");\r
+        cmdMap.put(CMD_TYPE.ALARM, "ALARM");\r
         cmdMap.put(CMD_TYPE.temp, "temp");\r
         cmdMap.put(CMD_TYPE.heart, "heart");\r
         cmdMap.put(CMD_TYPE.blood, "blood");\r
@@ -311,7 +311,7 @@ public class protocol_mqtt {
                 .append(runtime.getBattery()).append(CMDSPLIT)\r
                 .append(runtime.getTotalStepCount()).append(CMDSPLIT)\r
                 .append(runtime.getRolltimes()).append(CMDSPLIT)\r
-                .append(runtime.getFZDDevStatus()).append(CMDSPLIT)\r
+                .append(runtime.getFZDDevStatus(runtime)).append(CMDSPLIT)\r
                 .append(runtime.getFZDLBSMultiStationData()).append(CMDSPLIT)\r
                 .append(runtime.getFZDWifiData()).append(CMDSPLIT)\r
                 .append(runtime.bleInfo.is_in_area ? "1" : "0").append(CMDSPLIT)\r
@@ -438,7 +438,7 @@ public class protocol_mqtt {
                 .append(CMDSPLIT).append(runtime.getBattery())\r
                 .append(CMDSPLIT).append(runtime.getTotalStepCount())\r
                 .append(CMDSPLIT).append(runtime.getRolltimes())\r
-                .append(CMDSPLIT).append(runtime.getFZDDevStatus())\r
+                .append(CMDSPLIT).append(runtime.getFZDDevStatus(runtime))\r
                 .append(CMDSPLIT).append(runtime.getFZDLBSMultiStationData())\r
                 .append(CMDSPLIT).append(runtime.getFZDWifiData())\r
                 .append(CMDSPLIT).append(runtime.bleInfo.is_in_area ? "1" : "0")\r

diff --git a/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java b/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java
index 85a1d75..c4d27f9 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java
+++ b/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java
@@ -12,10 +12,7 @@ import android.util.Log;
 import com.enqualcomm.support.Config;\r
 import com.enqualcomm.support.utils.ICLogger;\r
 \r
-import java.io.IOException;\r
-\r
 import se.wetcat.qatja.MQTTConstants;\r
-import se.wetcat.qatja.MQTTException;\r
 import se.wetcat.qatja.android.MQTTConnectionConstants;\r
 import se.wetcat.qatja.android.QatjaService;\r
 import se.wetcat.qatja.messages.MQTTMessage;\r

diff --git a/app/src/main/java/se/wetcat/qatja/android/QatjaService.java b/app/src/main/java/se/wetcat/qatja/android/QatjaService.java
index ce62d65..deedd0a 100644 (file)
--- a/app/src/main/java/se/wetcat/qatja/android/QatjaService.java
+++ b/app/src/main/java/se/wetcat/qatja/android/QatjaService.java
@@ -23,7 +23,6 @@ import android.os.Binder;
 import android.os.Handler;
 import android.os.IBinder;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.enqualcomm.support.utils.ICLogger;
 
@@ -281,6 +280,7 @@ public class QatjaService extends Service {
 
     MQTTConnect connect;
     if (!TextUtils.isEmpty(mUsername) && !TextUtils.isEmpty(mPassword)) {
+      ICLogger.i("mqtt connect "+clientIdentifier+" username "+mUsername+" password "+mPassword);
       connect = MQTTConnect.newInstance(clientIdentifier, mUsername, mPassword);
     } else {
       connect = MQTTConnect.newInstance(clientIdentifier);

diff --git a/icsupport.iml b/icsupport.iml
index 9c9054b..b525d96 100644 (file)
--- a/icsupport.iml
+++ b/icsupport.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<module external.linked.project.id="icsupport" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">\r
+<module external.linked.project.id="icsupport" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">\r
   <component name="FacetManager">\r
     <facet type="java-gradle" name="Java-Gradle">\r
       <configuration>\r

diff --git a/settings.gradle b/settings.gradle
index c3ef022..6b0a1a1 100644 (file)
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,2 @@
-include ':app', ':okio'
-\r
+include ':app'\r
 include ':dNSCache'\r