From: TrillGates <williamtrillgates@gmail.com>
Date: Thu, 6 May 2021 13:28:10 +0000 (+0800)
Subject: adjust aidl interface name.
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=855ab63def4e44d1905a8662527843ca62778f54;p=protocol_srv.git

adjust aidl interface name.
---

diff --git a/app/src/main/aidl/com/enqualcomm/support/IFZDService.aidl b/app/src/main/aidl/com/enqualcomm/support/IFZDService.aidl
index 3b5c2d46..3e69b4ed 100644
--- a/app/src/main/aidl/com/enqualcomm/support/IFZDService.aidl
+++ b/app/src/main/aidl/com/enqualcomm/support/IFZDService.aidl
@@ -7,7 +7,7 @@ import com.enqualcomm.support.IFZDCallback;
 interface IFZDService {
     void registerCallback(in IFZDCallback callback);
     void unregisterCallback(in IFZDCallback callback);
-    void getContracts();
+    void getContacts();
     void getBRId();
     void rejectCallInCome(in String remoteId,in int type);
     void requireCall(in int type,in int remoteUserId);
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 14dd796a..c7407a37 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -1583,7 +1583,7 @@ public class CoreService extends Service {
         if ("com.ic.action.VIDEO_CALL".equals(action)) {
             try {
                 mFZDService.getBRId();
-                mFZDService.getContracts();
+                mFZDService.getContacts();
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -1638,7 +1638,7 @@ public class CoreService extends Service {
         }
 
         @Override
-        public void getContracts() {
+        public void getContacts() {
             //获取联系人
             StringMessage cmdmMembers = protocol_fzd.MEMBERS();
             //获取佰锐ID
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 9f85e6fe..a897aeb9 100644
--- a/app/src/main/java/com/ic/protocols/protocol_anan.java
+++ b/app/src/main/java/com/ic/protocols/protocol_anan.java
@@ -450,6 +450,11 @@ public class protocol_anan {
          * zh-cn:设备语言
          * 00:第一个0:是否需要回复地址信息,0:不回复,1回复.
          */
+        String alarmType = ds.getAlarmType();
+        if ("03".equals(alarmType) || "04".equals(alarmType)) {
+            //不支持这些指令了
+            return null;
+        }
         String wifiInfo = ds.getWifiInfo();
         return genStringMessage(cmdMap.get(CMD_TYPE.AP10),
                 new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP10))
diff --git a/app/src/main/java/com/ic/view/msg/MsgMustReadDialog.java b/app/src/main/java/com/ic/view/msg/MsgMustReadDialog.java
index 7b7ea828..44065ee3 100644
--- a/app/src/main/java/com/ic/view/msg/MsgMustReadDialog.java
+++ b/app/src/main/java/com/ic/view/msg/MsgMustReadDialog.java
@@ -89,7 +89,6 @@ public class MsgMustReadDialog {
                 currentItem++;
                 msgPage.setCurrentItem(currentItem, false);
             }
-
             @Override
             public void onEndClick() {
                 windowManager.removeView(view);