protocol Jiai，阅读完PushTxt消息后，返回AP94给服务器

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 f290046..945a99f 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
@@ -22,6 +22,8 @@ public class Runtime {
     public int temp_test_Cycle=60*60;\r
     public int anti_test_cycle=30;\r
 \r
+    public static String PushtxtMsg_srv_index="";\r
+\r
     public int SignalStrength;\r
     //上一次成功心跳时间，供系统重连机制使用。\r
     public long lastLoginSuccessTime=0;\r

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 6112944..39db0d3 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -198,6 +198,9 @@ public class ProcessReceiver extends BroadcastReceiver {
         public void onClick(DialogInterface var1, int var2) {\r
           var1.dismiss();\r
           VibrateUtil.getInstance(context).VibrateOn(false);\r
+          if(CoreService.getInstance()!=null) {\r
+            CoreService.getInstance().getConnection().send(protocolAPIHelper.getPushTxtReadFlagToSrvMSG());\r
+          }\r
         }\r
       }).create();\r
       mCustomDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_TOAST);\r

diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index 15685b2..95a4045 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
@@ -504,4 +504,28 @@ public class protocolAPIHelper {
         }\r
         return ret;\r
     }\r
+\r
+    public static StringMessage getPushTxtReadFlagToSrvMSG( ){\r
+        if (is_protocol_not_Initialled()) return null;\r
+        StringMessage ret=null;\r
+        switch(Config.protocol_no)\r
+        {\r
+            case Config.PROTOCOL_JIAI:\r
+                ret=protocoljiai_handler.AP94();\r
+                break;\r
+            case Config.PROTOCOL_BEEHOME:\r
+                ret=null;\r
+                break;\r
+            case Config.PROTOCOL_IC:\r
+                ret=null;\r
+                break;\r
+            case Config.PROTOCOL_FZD:\r
+                ret=null;\r
+                break;\r
+            case Config.PROTOCOL_MQTT:\r
+                ret=null;\r
+                break;\r
+        }\r
+        return ret;\r
+    }\r
 }\r

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 57a1953..2914c90 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_jiai.java
+++ b/app/src/main/java/com/ic/protocols/protocol_jiai.java
@@ -1521,16 +1521,18 @@ public class protocol_jiai {
             StringMessage msg=AP93(cmdindex);\r
             //设定当前工作模式及循环频率\r
             connection.send(msg);\r
+            runtime.PushtxtMsg_srv_index=msg_index_no;//给回复AP94用\r
             ICLogger.i("received Txt Msg "+txtmsg);\r
             runtime.getContextProxy().sendMsgBroadcast(txtmsg,0);\r
             runtime.getContextProxy().saveMstToSMSDB(txtmsg);\r
+\r
         }else{\r
             ICLogger.i("BP40 format error!");\r
         }\r
 \r
     }\r
 \r
-    public static StringMessage AP94(Runtime runtime , String index_of_msg ){\r
+    public static StringMessage AP94( ){\r
         /***\r
          * 15确认已读文字（上行协议号：AP94，响应：BP94）\r
          * 示例：\r
@@ -1547,7 +1549,7 @@ public class protocol_jiai {
 \r
         //在UI逻辑中，只要有处理就都是已经阅读。所以不存在取消阅读的说法。\r
         return genStringMessage(cmdMap.get(CMD_TYPE.AP94),new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP94))\r
-                .append(CMDSPLIT).append(index_of_msg)\r
+                .append(CMDSPLIT).append(Runtime.PushtxtMsg_srv_index)\r
                 .append(CMDSPLIT).append("1")\r
                 .append(CMDEND).toString());\r
 \r