diff --git a/android/build.gradle b/android/build.gradle index 355ef99..8a936a4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -53,5 +53,5 @@ dependencies { // 本地依赖,现将aar复制到libs/io/openim/core-sdk/0.0.1/ 下,命名core-sdk-0.0.1.aar // implementation 'io.openim:core-sdk:0.0.1@aar' // api 'io.openim:core-sdk:2.3.5-t44@aar' - implementation 'io.openim:core-sdk:3.0.0-beta08@aar' + implementation 'io.openim:core-sdk:3.0.0-enterprise-beta01@aar' } \ No newline at end of file diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/FlutterOpenimSdkPlugin.java b/android/src/main/java/io/openim/flutter_openim_sdk/FlutterOpenimSdkPlugin.java index 85b8e8f..19a4140 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/FlutterOpenimSdkPlugin.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/FlutterOpenimSdkPlugin.java @@ -23,6 +23,7 @@ import io.openim.flutter_openim_sdk.manager.FriendshipManager; import io.openim.flutter_openim_sdk.manager.GroupManager; import io.openim.flutter_openim_sdk.manager.IMManager; import io.openim.flutter_openim_sdk.manager.MessageManager; +import io.openim.flutter_openim_sdk.manager.SignalingManager; import io.openim.flutter_openim_sdk.manager.UserManager; @@ -42,7 +43,7 @@ public class FlutterOpenimSdkPlugin implements FlutterPlugin, MethodCallHandler, private static MessageManager messageManager; private static ConversationManager conversationManager; private static GroupManager groupManager; -// private static SignalingManager signalingManager; + private static SignalingManager signalingManager; // private static WorkMomentsManager workMomentsManager; // private static OrganizationManager organizationManager; private static Activity activity; @@ -58,7 +59,7 @@ public class FlutterOpenimSdkPlugin implements FlutterPlugin, MethodCallHandler, FlutterOpenimSdkPlugin.messageManager = new MessageManager(); FlutterOpenimSdkPlugin.conversationManager = new ConversationManager(); FlutterOpenimSdkPlugin.groupManager = new GroupManager(); -// FlutterOpenimSdkPlugin.signalingManager = new SignalingManager(); + FlutterOpenimSdkPlugin.signalingManager = new SignalingManager(); // FlutterOpenimSdkPlugin.workMomentsManager = new WorkMomentsManager(); // FlutterOpenimSdkPlugin.organizationManager = new OrganizationManager(); } diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnOrganizationListener.java b/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnOrganizationListener.java index d7e3ca3..6997d95 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnOrganizationListener.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnOrganizationListener.java @@ -1,10 +1,10 @@ -package io.openim.flutter_openim_sdk.listener; - -import io.openim.flutter_openim_sdk.util.CommonUtil; - -public class OnOrganizationListener /*implements open_im_sdk_callback.OnOrganizationListener*/ { +//package io.openim.flutter_openim_sdk.listener; +// +//import io.openim.flutter_openim_sdk.util.CommonUtil; +// +//public class OnOrganizationListener /*implements open_im_sdk_callback.OnOrganizationListener*/ { // @Override // public void onOrganizationUpdated() { // CommonUtil.emitEvent("organizationListener", "onOrganizationUpdated", null); // } -} +//} diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnSignalingListener.java b/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnSignalingListener.java index 6f32b81..b70384b 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnSignalingListener.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnSignalingListener.java @@ -34,10 +34,10 @@ public class OnSignalingListener implements open_im_sdk_callback.OnSignalingList CommonUtil.emitEvent("signalingListener", "onInviteeRejectedByOtherDevice", s); } -// @Override -// public void onReceiveCustomSignal(String s) { -// CommonUtil.emitEvent("signalingListener", "onReceiveCustomSignal", s); -// } + @Override + public void onReceiveCustomSignal(String s) { + CommonUtil.emitEvent("signalingListener", "onReceiveCustomSignal", s); + } @Override public void onReceiveNewInvitation(String s) { @@ -54,10 +54,10 @@ public class OnSignalingListener implements open_im_sdk_callback.OnSignalingList CommonUtil.emitEvent("signalingListener", "onRoomParticipantDisconnected", s); } -// @Override -// public void onStreamChange(String s) { -// CommonUtil.emitEvent("signalingListener", "onStreamChange", s); -// } + @Override + public void onStreamChange(String s) { + CommonUtil.emitEvent("signalingListener", "onStreamChange", s); + } @Override public void onHangUp(String s) { diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnWorkMomentsListener.java b/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnWorkMomentsListener.java index 18b235e..5b81b34 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnWorkMomentsListener.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnWorkMomentsListener.java @@ -1,12 +1,12 @@ -package io.openim.flutter_openim_sdk.listener; - -import io.openim.flutter_openim_sdk.util.CommonUtil; - -public class OnWorkMomentsListener /*implements open_im_sdk_callback.OnWorkMomentsListener*/ { - - +//package io.openim.flutter_openim_sdk.listener; +// +//import io.openim.flutter_openim_sdk.util.CommonUtil; +// +//public class OnWorkMomentsListener /*implements open_im_sdk_callback.OnWorkMomentsListener*/ { +// +// // @Override // public void onRecvNewNotification() { // CommonUtil.emitEvent("workMomentsListener", "OnRecvNewNotification", null); // } -} +//} diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java index fb3ac07..03a676d 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java @@ -5,7 +5,6 @@ import io.flutter.plugin.common.MethodChannel; import io.openim.flutter_openim_sdk.FlutterOpenimSdkPlugin; import io.openim.flutter_openim_sdk.listener.OnBaseListener; import io.openim.flutter_openim_sdk.listener.OnConnListener; -import io.openim.flutter_openim_sdk.listener.OnListenerForService; import io.openim.flutter_openim_sdk.listener.OnPutFileListener; import io.openim.flutter_openim_sdk.util.CommonUtil; import open_im_sdk.Open_im_sdk; @@ -38,7 +37,7 @@ public class IMManager extends BaseManager { } public void getLoginStatus(MethodCall methodCall, MethodChannel.Result result) { - CommonUtil.runMainThreadReturn(result, Open_im_sdk.getLoginStatus()); + CommonUtil.runMainThreadReturn(result, Open_im_sdk.getLoginStatus(value(methodCall, "operationID"))); } public void putFile(MethodCall methodCall, MethodChannel.Result result) { diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/SignalingManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/SignalingManager.java index 1ba1473..76f2343 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/SignalingManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/SignalingManager.java @@ -1,125 +1,131 @@ -//package io.openim.flutter_openim_sdk.manager; -// -//import io.flutter.plugin.common.MethodCall; -//import io.flutter.plugin.common.MethodChannel; -//import io.openim.flutter_openim_sdk.listener.OnBaseListener; -//import io.openim.flutter_openim_sdk.listener.OnSignalingListener; -//import open_im_sdk.Open_im_sdk; -// -//public class SignalingManager extends BaseManager { -// -// public void setSignalingListener(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.setSignalingListener(new OnSignalingListener()); -// -// result.success(null); -// } -// -// public void signalingInvite(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.signalingInvite( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// jsonValue(methodCall, "signalingInfo")); -// } -// -// public void signalingInviteInGroup(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.signalingInviteInGroup( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// jsonValue(methodCall, "signalingInfo")); -// } -// -// public void signalingAccept(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.signalingAccept( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// jsonValue(methodCall, "signalingInfo")); -// } -// -// public void signalingReject(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.signalingReject( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// jsonValue(methodCall, "signalingInfo")); -// } -// -// public void signalingCancel(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.signalingCancel( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// jsonValue(methodCall, "signalingInfo")); -// } -// -// public void signalingHungUp(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.signalingHungUp( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// jsonValue(methodCall, "signalingInfo")); -// } -// -// public void signalingGetRoomByGroupID(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.signalingGetRoomByGroupID( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// value(methodCall, "groupID")); -// } -// -// public void signalingGetTokenByRoomID(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.signalingGetTokenByRoomID( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// value(methodCall, "roomID")); -// } -// -// public void signalingUpdateMeetingInfo(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.signalingUpdateMeetingInfo( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// jsonValue(methodCall, "info")); -// } -// -// public void signalingCreateMeeting(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.signalingCreateMeeting( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// jsonValue(methodCall, "info")); -// } -// -// public void signalingJoinMeeting(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.signalingJoinMeeting( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// jsonValue(methodCall, "info")); -// } -// -// public void signalingOperateStream(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.signalingOperateStream( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// value(methodCall, "streamType"), -// value(methodCall, "roomID"), -// value(methodCall, "userID"), -// value(methodCall, "mute"), -// value(methodCall, "muteAll")); -// } -// -// public void signalingGetMeetings(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.signalingGetMeetings( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID")); -// } -// -// public void signalingCloseRoom(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.signalingCloseRoom( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// value(methodCall, "roomID")); -// } -// -// public void signalingSendCustomSignal(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.signalingSendCustomSignal( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// value(methodCall, "customInfo"), -// value(methodCall, "roomID")); -// } -//} +package io.openim.flutter_openim_sdk.manager; + +import io.flutter.plugin.common.MethodCall; +import io.flutter.plugin.common.MethodChannel; +import io.openim.flutter_openim_sdk.listener.OnBaseListener; +import io.openim.flutter_openim_sdk.listener.OnSignalingListener; +import open_im_sdk.Open_im_sdk; + +public class SignalingManager extends BaseManager { + + public void setSignalingListener(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.setSignalingListener(new OnSignalingListener()); + + result.success(null); + } + + public void signalingInvite(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.signalingInvite( + new OnBaseListener(result, methodCall), + value(methodCall, "operationID"), + jsonValue(methodCall, "signalingInfo")); + } + + public void signalingInviteInGroup(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.signalingInviteInGroup( + new OnBaseListener(result, methodCall), + value(methodCall, "operationID"), + jsonValue(methodCall, "signalingInfo")); + } + + public void signalingAccept(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.signalingAccept( + new OnBaseListener(result, methodCall), + value(methodCall, "operationID"), + jsonValue(methodCall, "signalingInfo")); + } + + public void signalingReject(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.signalingReject( + new OnBaseListener(result, methodCall), + value(methodCall, "operationID"), + jsonValue(methodCall, "signalingInfo")); + } + + public void signalingCancel(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.signalingCancel( + new OnBaseListener(result, methodCall), + value(methodCall, "operationID"), + jsonValue(methodCall, "signalingInfo")); + } + + public void signalingHungUp(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.signalingHungUp( + new OnBaseListener(result, methodCall), + value(methodCall, "operationID"), + jsonValue(methodCall, "signalingInfo")); + } + + public void signalingGetRoomByGroupID(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.signalingGetRoomByGroupID( + new OnBaseListener(result, methodCall), + value(methodCall, "operationID"), + value(methodCall, "groupID")); + } + + public void signalingGetTokenByRoomID(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.signalingGetTokenByRoomID( + new OnBaseListener(result, methodCall), + value(methodCall, "operationID"), + value(methodCall, "roomID")); + } + + public void signalingUpdateMeetingInfo(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.signalingUpdateMeetingInfo( + new OnBaseListener(result, methodCall), + value(methodCall, "operationID"), + jsonValue(methodCall, "info")); + } + + public void signalingCreateMeeting(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.signalingCreateMeeting( + new OnBaseListener(result, methodCall), + value(methodCall, "operationID"), + jsonValue(methodCall, "info")); + } + + public void signalingJoinMeeting(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.signalingJoinMeeting( + new OnBaseListener(result, methodCall), + value(methodCall, "operationID"), + jsonValue(methodCall, "info")); + } + + public void signalingOperateStream(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.signalingOperateStream( + new OnBaseListener(result, methodCall), + value(methodCall, "operationID"), + value(methodCall, "streamType"), + value(methodCall, "roomID"), + value(methodCall, "userID"), + value(methodCall, "mute"), + value(methodCall, "muteAll")); + } + + public void signalingGetMeetings(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.signalingGetMeetings( + new OnBaseListener(result, methodCall), + value(methodCall, "operationID")); + } + + public void signalingCloseRoom(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.signalingCloseRoom( + new OnBaseListener(result, methodCall), + value(methodCall, "operationID"), + value(methodCall, "roomID")); + } + + public void signalingSendCustomSignal(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.signalingSendCustomSignal( + new OnBaseListener(result, methodCall), + value(methodCall, "operationID"), + value(methodCall, "customInfo"), + value(methodCall, "roomID")); + } + + public void getSignalingInvitationInfoStartApp(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.getSignalingInvitationInfoStartApp( + new OnBaseListener(result, methodCall), + value(methodCall, "operationID")); + } +} diff --git a/example/pubspec.lock b/example/pubspec.lock index 1b0c595..35a8c75 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -6,7 +6,7 @@ packages: description: name: async sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.10.0" boolean_selector: @@ -14,7 +14,7 @@ packages: description: name: boolean_selector sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.1" characters: @@ -22,7 +22,7 @@ packages: description: name: characters sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.1" clock: @@ -30,7 +30,7 @@ packages: description: name: clock sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.1" collection: @@ -38,7 +38,7 @@ packages: description: name: collection sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.17.0" cupertino_icons: @@ -46,7 +46,7 @@ packages: description: name: cupertino_icons sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.5" fake_async: @@ -54,7 +54,7 @@ packages: description: name: fake_async sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.1" flutter: @@ -68,7 +68,7 @@ packages: path: ".." relative: true source: path - version: "2.3.5+4" + version: "3.0.0" flutter_test: dependency: "direct dev" description: flutter @@ -79,7 +79,7 @@ packages: description: name: js sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.6.5" matcher: @@ -87,7 +87,7 @@ packages: description: name: matcher sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.12.13" material_color_utilities: @@ -95,7 +95,7 @@ packages: description: name: material_color_utilities sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.0" meta: @@ -103,7 +103,7 @@ packages: description: name: meta sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.8.0" path: @@ -111,7 +111,7 @@ packages: description: name: path sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.8.2" sky_engine: @@ -124,7 +124,7 @@ packages: description: name: source_span sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.9.1" stack_trace: @@ -132,7 +132,7 @@ packages: description: name: stack_trace sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.11.0" stream_channel: @@ -140,7 +140,7 @@ packages: description: name: stream_channel sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.1" string_scanner: @@ -148,7 +148,7 @@ packages: description: name: string_scanner sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.0" term_glyph: @@ -156,7 +156,7 @@ packages: description: name: term_glyph sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.1" test_api: @@ -164,7 +164,7 @@ packages: description: name: test_api sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.4.16" vector_math: @@ -172,7 +172,7 @@ packages: description: name: vector_math sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.4" sdks: diff --git a/lib/src/manager/im_manager.dart b/lib/src/manager/im_manager.dart index 3330dd1..1dc11c7 100644 --- a/lib/src/manager/im_manager.dart +++ b/lib/src/manager/im_manager.dart @@ -467,10 +467,10 @@ class IMManager { required OnConnectListener listener, int logLevel = 6, String objectStorage = 'cos', - // String? encryptionKey, - // bool isNeedEncryption = false, - // bool isCompression = false, - // bool isExternalExtensions = false, + String? encryptionKey, + bool isNeedEncryption = false, + bool isCompression = false, + bool isExternalExtensions = false, bool isLogStandardOutput = true, String? logFilePath, String? operationID, @@ -487,10 +487,10 @@ class IMManager { "dataDir": dataDir, "logLevel": logLevel, "objectStorage": objectStorage, - // "encryptionKey": encryptionKey, - // "isNeedEncryption": isNeedEncryption, - // "isCompression": isCompression, - // "isExternalExtensions": isExternalExtensions, + "encryptionKey": encryptionKey, + "isNeedEncryption": isNeedEncryption, + "isCompression": isCompression, + "isExternalExtensions": isExternalExtensions, "isLogStandardOutput": isLogStandardOutput, "logFilePath": logFilePath, "operationID": Utils.checkOperationID(operationID), @@ -553,8 +553,12 @@ class IMManager { /// 获取登录状态 /// 1: logout 2: logging 3:logged - Future getLoginStatus() => - _channel.invokeMethod('getLoginStatus', _buildParam({})); + Future getLoginStatus({String? operationID}) => + _channel.invokeMethod( + 'getLoginStatus', + _buildParam({ + 'operationID': Utils.checkOperationID(operationID), + })); /// 获取当前登录用户id Future getLoginUserID() async => userID; diff --git a/lib/src/manager/im_signaling_manager.dart b/lib/src/manager/im_signaling_manager.dart index f01765b..d3d5d7e 100644 --- a/lib/src/manager/im_signaling_manager.dart +++ b/lib/src/manager/im_signaling_manager.dart @@ -300,6 +300,15 @@ class SignalingManager { 'operationID': Utils.checkOperationID(operationID), })); + Future getSignalingInvitationInfoStartApp({ + String? operationID, + }) => + _channel.invokeMethod( + 'getSignalingInvitationInfoStartApp', + _buildParam({ + 'operationID': Utils.checkOperationID(operationID), + })); + static Map _buildParam(Map param) { param["ManagerName"] = "signalingManager"; return param; diff --git a/lib/src/models/meeting_info.dart b/lib/src/models/meeting_info.dart index 360da3c..b1a565d 100644 --- a/lib/src/models/meeting_info.dart +++ b/lib/src/models/meeting_info.dart @@ -23,7 +23,7 @@ class MeetingInfoList { } class MeetingInfo { - String? meetingID; + String? roomID; String? meetingName; String? ex; String? hostUserID; @@ -46,7 +46,7 @@ class MeetingInfo { List? beWatchedUserIDList; // 正在被观看用户列表 MeetingInfo({ - this.meetingID, + this.roomID, this.meetingName, this.ex, this.hostUserID, @@ -70,7 +70,7 @@ class MeetingInfo { }); MeetingInfo.fromJson(Map json) { - meetingID = json['meetingID']; + roomID = json['roomID']; meetingName = json['meetingName']; ex = json['ex']; hostUserID = json['hostUserID']; @@ -107,7 +107,7 @@ class MeetingInfo { Map toJson() { final data = {}; - data['meetingID'] = meetingID; + data['roomID'] = roomID; data['meetingName'] = meetingName; data['ex'] = ex; data['hostUserID'] = hostUserID; @@ -133,21 +133,21 @@ class MeetingInfo { } class MeetingStreamEvent { - String? meetingID; + String? roomID; String? streamType; bool? mute; - MeetingStreamEvent({this.meetingID, this.streamType, this.mute}); + MeetingStreamEvent({this.roomID, this.streamType, this.mute}); MeetingStreamEvent.fromJson(Map json) { - meetingID = json['meetingID']; + roomID = json['roomID']; streamType = json['streamType']; mute = json['mute']; } Map toJson() { final Map data = new Map(); - data['meetingID'] = this.meetingID; + data['roomID'] = this.roomID; data['streamType'] = this.streamType; data['mute'] = this.mute; return data; diff --git a/pubspec.lock b/pubspec.lock index 4ac96db..dd4cb56 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -6,7 +6,7 @@ packages: description: name: async sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.10.0" boolean_selector: @@ -14,7 +14,7 @@ packages: description: name: boolean_selector sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.1" characters: @@ -22,7 +22,7 @@ packages: description: name: characters sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.1" clock: @@ -30,7 +30,7 @@ packages: description: name: clock sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.1" collection: @@ -38,7 +38,7 @@ packages: description: name: collection sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.17.0" fake_async: @@ -46,7 +46,7 @@ packages: description: name: fake_async sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.1" flutter: @@ -64,7 +64,7 @@ packages: description: name: js sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.6.5" matcher: @@ -72,7 +72,7 @@ packages: description: name: matcher sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.12.13" material_color_utilities: @@ -80,7 +80,7 @@ packages: description: name: material_color_utilities sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.0" meta: @@ -88,7 +88,7 @@ packages: description: name: meta sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.8.0" path: @@ -96,7 +96,7 @@ packages: description: name: path sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.8.2" sky_engine: @@ -109,7 +109,7 @@ packages: description: name: source_span sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.9.1" stack_trace: @@ -117,7 +117,7 @@ packages: description: name: stack_trace sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.11.0" stream_channel: @@ -125,7 +125,7 @@ packages: description: name: stream_channel sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.1" string_scanner: @@ -133,7 +133,7 @@ packages: description: name: string_scanner sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.0" term_glyph: @@ -141,7 +141,7 @@ packages: description: name: term_glyph sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.1" test_api: @@ -149,7 +149,7 @@ packages: description: name: test_api sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.4.16" vector_math: @@ -157,7 +157,7 @@ packages: description: name: vector_math sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.4" sdks: