From: k.liang <liangkang648253071@126.com>
Date: Thu, 8 Jul 2021 12:25:41 +0000 (+0800)
Subject: 更新放走丢适配声网的aidl,增加FZD协议已经准备好接口
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=9b84221683b69cd56667d48be4f413af2cd7b48e;p=protocol_srv.git

更新放走丢适配声网的aidl,增加FZD协议已经准备好接口
---

diff --git a/app/src/main/aidl/com/enqualcomm/support/IFZDCallback.aidl b/app/src/main/aidl/com/enqualcomm/support/IFZDCallback.aidl
index 8d849ca1..35356637 100644
--- a/app/src/main/aidl/com/enqualcomm/support/IFZDCallback.aidl
+++ b/app/src/main/aidl/com/enqualcomm/support/IFZDCallback.aidl
@@ -12,4 +12,5 @@ interface IFZDCallback {
     void onFriendsUnbindResult();
     void onFriendsListLoaded();
     void onCalling(in String callerID,in String roomName,in String type,in String token);
+    void onServerReady();
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index ac21cc94..0abf2d67 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -1623,12 +1623,6 @@ public class CoreService extends Service {
         //判断来源，如果是ICVideoCall的则返回对应的
         String action = intent.getAction();
         if ("com.ic.action.VIDEO_CALL".equals(action)) {
-            try {
-                mFZDService.getBRId();
-                mFZDService.getContacts();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
             return mFZDService;
         } else if ("com.ic.fzd.action.WEATHER".equals(action)) {
             return mFZDWeatherService;
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 f9dd55ac..ce374a29 100644
--- a/app/src/main/java/com/ic/protocols/protocol_fzd.java
+++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java
@@ -1151,7 +1151,21 @@ public class protocol_fzd {
             ICLogger.i("LGZONE Format Error!");
         }
 
-
+        //收到服务器时间消息的时候认为服务器已经准备好了
+        RemoteCallbackList<IFZDCallback> fzdCallback = mRuntime.getFZDCallback();
+        int i = fzdCallback.beginBroadcast();
+        try {
+            while (i > 0) {
+                i--;
+                if (fzdCallback != null) {
+                    fzdCallback.getBroadcastItem(i).onServerReady();
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            fzdCallback.finishBroadcast();
+        }
     }
 
 
diff --git a/app/version_code.properties b/app/version_code.properties
index 438d9499..00df5721 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Jul 08 14:44:19 CST 2021
-VERSION_CODE=889
+#Thu Jul 08 17:02:52 CST 2021
+VERSION_CODE=890