From 86ab2e9aee1b312ccc67cb80c500d6bc40795842 Mon Sep 17 00:00:00 2001 From: "k.liang" Date: Tue, 27 Jul 2021 14:31:40 +0800 Subject: [PATCH] =?utf8?q?=E6=9B=B4=E6=96=B0=E6=94=BE=E8=B5=B0=E4=B8=A2?= =?utf8?q?=E9=80=82=E9=85=8D=E5=A3=B0=E7=BD=91=E7=9A=84=E5=8D=8F=E8=AE=AE?= =?utf8?q?=5F=E5=A2=9E=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=87=86?= =?utf8?q?=E5=A4=87=E5=A5=BD=E7=9A=84=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app/release/output.json | 2 +- .../main/aidl/com/enqualcomm/support/IFZDService.aidl | 1 + .../main/java/com/enqualcomm/support/CoreService.java | 5 +++++ .../main/java/com/ic/protocols/protocolAPIHelper.java | 9 +++++++++ app/src/main/java/com/ic/protocols/protocol_fzd.java | 11 ++++++++++- app/version_code.properties | 4 ++-- local.properties | 2 +- 7 files changed, 29 insertions(+), 5 deletions(-) diff --git a/app/release/output.json b/app/release/output.json index a2c88e80..ec39c4c9 100644 --- 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 3e69b4ed..caebea26 100644 --- 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 ca049965..0e326dd1 100644 --- 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 fb0d833f..3168efee 100644 --- 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 c582e660..2c422a15 100644 --- 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 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 b763d0dc..7deee074 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Fri Jul 23 10:00:50 CST 2021 -VERSION_CODE=899 +#Tue Jul 27 10:31:45 CST 2021 +VERSION_CODE=900 diff --git a/local.properties b/local.properties index 8bb06342..6594581d 100644 --- a/local.properties +++ b/local.properties @@ -5,4 +5,4 @@ # For customization when using a Version Control System, please read the # header note. #Fri Jul 02 14:52:39 CST 2021 -sdk.dir=E\:\\Android\\Sdk +sdk.dir=D\:\\android\\Android\\sdk -- 2.17.1