From: snickersun <snickersun@qq.com>
Date: Sun, 30 Aug 2020 16:05:39 +0000 (+0800)
Subject: protocol Jiai，阅读完PushTxt消息后，返回AP94给服务器
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=6f5ec65672a98a5b8e31b94057e121bce4311528;p=protocol_srv.git

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 f2900464..945a99f8 100644
--- 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;
     public int anti_test_cycle=30;
 
+    public static String PushtxtMsg_srv_index="";
+
     public int SignalStrength;
     //上一次成功心跳时间，供系统重连机制使用。
     public long lastLoginSuccessTime=0;
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 61129447..39db0d3c 100644
--- 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) {
           var1.dismiss();
           VibrateUtil.getInstance(context).VibrateOn(false);
+          if(CoreService.getInstance()!=null) {
+            CoreService.getInstance().getConnection().send(protocolAPIHelper.getPushTxtReadFlagToSrvMSG());
+          }
         }
       }).create();
       mCustomDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_TOAST);
diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index 15685b26..95a4045e 100644
--- 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 {
         }
         return ret;
     }
+
+    public static StringMessage getPushTxtReadFlagToSrvMSG( ){
+        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:
+                ret=null;
+                break;
+            case Config.PROTOCOL_FZD:
+                ret=null;
+                break;
+            case Config.PROTOCOL_MQTT:
+                ret=null;
+                break;
+        }
+        return ret;
+    }
 }
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 57a1953f..2914c90f 100644
--- 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);
             //设定当前工作模式及循环频率
             connection.send(msg);
+            runtime.PushtxtMsg_srv_index=msg_index_no;//给回复AP94用
             ICLogger.i("received Txt Msg "+txtmsg);
             runtime.getContextProxy().sendMsgBroadcast(txtmsg,0);
             runtime.getContextProxy().saveMstToSMSDB(txtmsg);
+
         }else{
             ICLogger.i("BP40 format error!");
         }
 
     }
 
-    public static StringMessage AP94(Runtime runtime , String index_of_msg ){
+    public static StringMessage AP94( ){
         /***
          * 15确认已读文字（上行协议号：AP94，响应：BP94）
          * 示例：
@@ -1547,7 +1549,7 @@ public class protocol_jiai {
 
         //在UI逻辑中，只要有处理就都是已经阅读。所以不存在取消阅读的说法。
         return genStringMessage(cmdMap.get(CMD_TYPE.AP94),new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP94))
-                .append(CMDSPLIT).append(index_of_msg)
+                .append(CMDSPLIT).append(Runtime.PushtxtMsg_srv_index)
                 .append(CMDSPLIT).append("1")
                 .append(CMDEND).toString());