更新放走丢适配声网的协议_增加服务器准备好的常量

diff --git a/app/release/output.json b/app/release/output.json
index a2c88e8..ec39c4c 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":899,"versionName":"2107231000","enabled":true,"outputFile":"ICSer_V899_2107231000_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V899_2107231000_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":900,"versionName":"2107271031","enabled":true,"outputFile":"ICSer_V900_2107271031_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V900_2107271031_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/aidl/com/enqualcomm/support/IFZDService.aidl b/app/src/main/aidl/com/enqualcomm/support/IFZDService.aidl
index 3e69b4e..caebea2 100644 (file)
--- a/app/src/main/aidl/com/enqualcomm/support/IFZDService.aidl
+++ b/app/src/main/aidl/com/enqualcomm/support/IFZDService.aidl
@@ -9,6 +9,7 @@ interface IFZDService {
     void unregisterCallback(in IFZDCallback callback);
     void getContacts();
     void getBRId();
+    void getServerReady();
     void rejectCallInCome(in String remoteId,in int type);
     void requireCall(in int type,in int remoteUserId);
     void test();

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index ca04996..0e326dd 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -20,6 +20,7 @@ import android.os.IBinder;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.PowerManager;
+import android.os.RemoteException;
 import android.os.SystemClock;
 import android.support.annotation.Nullable;
 import android.telephony.TelephonyManager;
@@ -1905,6 +1906,10 @@ public class CoreService extends Service {
             ICLogger.d("get AGORA id..");
         }
 
+        @Override
+        public void getServerReady() throws RemoteException {
+            protocolAPIHelper.requestServerReady();
+        }
 
         @Override
         public void rejectCallInCome(String remoteId, int type) {

diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index fb0d833..3168efe 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
@@ -1181,6 +1181,15 @@ public class protocolAPIHelper {
         return ret;
     }
 
+    public static void requestServerReady(){
+        if (is_protocol_not_Initialled()) return;
+        switch (Config.protocol_no){
+            case Config.PROTOCOL_FZD:
+                protocolfzd_handler.getServerReady();
+                return;
+        }
+    }
+
     /**
      * 获取VideoCall ID
      * @param runtime

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 c582e66..2c422a1 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_fzd.java
+++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java
@@ -97,6 +97,7 @@ public class protocol_fzd {
     public static final int defaultServerPort = 9000;
     private final SharedPreferences sharedPreferences;
     private final Handler mHandler;
+    private static boolean isServerReady = false;  //跟声网视频说服务器已经准备好了
 
 
     /**
@@ -1150,7 +1151,12 @@ public class protocol_fzd {
         } else {
             ICLogger.i("LGZONE Format Error!");
         }
+        isServerReady = true;
+        ICLogger.i("isServerReady = "+isServerReady);
+        serverReady();
+    }
 
+    private void serverReady(){
         //收到服务器时间消息的时候认为服务器已经准备好了
         RemoteCallbackList<IFZDCallback> fzdCallback = mRuntime.getFZDCallback();
         int i = fzdCallback.beginBroadcast();
@@ -1168,7 +1174,6 @@ public class protocol_fzd {
         }
     }
 
-
     /*LBS+GPS混合定位*/
 
     /***
@@ -1429,6 +1434,10 @@ public class protocol_fzd {
         return genFZDCMD(cmdMap.get(CMD_TYPE.AGREG));
     }
 
+    public void getServerReady(){
+        serverReady();
+    }
+
     public static StringMessage PHL() {
         return genFZDCMD(cmdMap.get(CMD_TYPE.PHL));
     }

diff --git a/app/version_code.properties b/app/version_code.properties
index b763d0d..7deee07 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Jul 23 10:00:50 CST 2021\r
-VERSION_CODE=899\r
+#Tue Jul 27 10:31:45 CST 2021\r
+VERSION_CODE=900\r

diff --git a/local.properties b/local.properties
index 8bb0634..6594581 100644 (file)
--- a/local.properties
+++ b/local.properties
@@ -5,4 +5,4 @@
 # For customization when using a Version Control System, please read the\r
 # header note.\r
 #Fri Jul 02 14:52:39 CST 2021\r
-sdk.dir=E\:\\Android\\Sdk\r
+sdk.dir=D\:\\android\\Android\\sdk\r