From 5cd2c2765d3916b69ff25db1c702f04f9eeb58c7 Mon Sep 17 00:00:00 2001
From: "k.liang" <liangkang648253071@126.com>
Date: Mon, 5 Jul 2021 21:00:41 +0800
Subject: [PATCH] =?utf8?q?=E6=9B=B4=E6=96=B0=E6=94=BE=E8=B5=B0=E4=B8=A2?=
 =?utf8?q?=E5=A3=B0=E7=BD=91=E7=9A=84=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 app/debug/output.json                         |  1 -
 .../com/enqualcomm/support/IFZDCallback.aidl  |  1 +
 .../java/com/ic/protocols/protocol_fzd.java   | 22 ++++++++++++++++++-
 app/version_code.properties                   |  3 ++-
 local.properties                              |  4 ++--
 5 files changed, 26 insertions(+), 5 deletions(-)
 delete mode 100644 app/debug/output.json

diff --git a/app/debug/output.json b/app/debug/output.json
deleted file mode 100644
index d2561fa0..00000000
--- a/app/debug/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":392,"versionName":"2004071059","enabled":true,"outputFile":"ICSer_V392_2004071059_debug.apk","fullName":"debug","baseName":"debug"},"path":"ICSer_V392_2004071059_debug.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/aidl/com/enqualcomm/support/IFZDCallback.aidl b/app/src/main/aidl/com/enqualcomm/support/IFZDCallback.aidl
index 4d3e7f68..8d849ca1 100644
--- a/app/src/main/aidl/com/enqualcomm/support/IFZDCallback.aidl
+++ b/app/src/main/aidl/com/enqualcomm/support/IFZDCallback.aidl
@@ -11,4 +11,5 @@ interface IFZDCallback {
     void onFriendsMakeResult(in int result,String friendName,String id,String phoneNum);
     void onFriendsUnbindResult();
     void onFriendsListLoaded();
+    void onCalling(in String callerID,in String roomName,in String type,in String token);
 }
\ No newline at end of file
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 895ace5a..f9dd55ac 100644
--- a/app/src/main/java/com/ic/protocols/protocol_fzd.java
+++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java
@@ -2604,16 +2604,23 @@ public class protocol_fzd {
      * @param data
      */
     private void handleCallRequest(Connection mConnection, Runtime mRuntime, String data) {
+        RemoteCallbackList<IFZDCallback> fzdCallback = mRuntime.getFZDCallback();
         String[] split = data.split(CMD_SPLIT);
-        if (split.length == 3) {
+        ICLogger.i("split.length = "+split.length);
+        if (split.length == 3 || split.length == 4) {
             needResponseCalling = true;
             //1、准备数据：对方的id，来电类型
             String remoteId = split[0];
             String sessionId = split[1];
             String type = split[2];
+            String token = "";
+            if(split.length == 4){
+                token = split[3];
+            }
             ICLogger.d("remote id is == > " + remoteId);
             ICLogger.d("type is == > " + type);
             ICLogger.d("sessionId is == > " + sessionId);
+            ICLogger.d("token is == > " + token);
 
             //4、环境是否有准备好
             int envState = sharedPreferences.getInt(STATE_ENV, -1);
@@ -2626,6 +2633,19 @@ public class protocol_fzd {
             }
             //否则由设置的地方去通知后台
             //needResponseCalling来判断
+
+            int i = fzdCallback.beginBroadcast();
+            try {
+                while (i > 0) {
+                    i--;
+                    IFZDCallback broadcastItem = fzdCallback.getBroadcastItem(i);
+                    broadcastItem.onCalling(remoteId,sessionId,type,token);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                fzdCallback.finishBroadcast();
+            }
         }
     }
 
diff --git a/app/version_code.properties b/app/version_code.properties
index 1b0c5080..7d87ea71 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1 +1,2 @@
-VERSION_CODE=881
\ No newline at end of file
+#Mon Jul 05 15:49:58 CST 2021
+VERSION_CODE=884
diff --git a/local.properties b/local.properties
index 3ff6dd52..f210a2f8 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Jun 29 20:13:18 CST 2021
-sdk.dir=E\:\\Android\\Sdk
\ No newline at end of file
+#Sun Jun 27 19:54:51 CST 2021
+sdk.dir=D\:\\android\\Android\\sdk
-- 
2.17.1