diff --git a/android/build.gradle b/android/build.gradle index 355ef99..631b101 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-beta09@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..10b60e9 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 @@ -42,9 +42,6 @@ public class FlutterOpenimSdkPlugin implements FlutterPlugin, MethodCallHandler, private static MessageManager messageManager; private static ConversationManager conversationManager; private static GroupManager groupManager; -// private static SignalingManager signalingManager; -// private static WorkMomentsManager workMomentsManager; -// private static OrganizationManager organizationManager; private static Activity activity; private static Context context; private ConnectivityListener connectivityListener; @@ -58,9 +55,6 @@ public class FlutterOpenimSdkPlugin implements FlutterPlugin, MethodCallHandler, FlutterOpenimSdkPlugin.messageManager = new MessageManager(); FlutterOpenimSdkPlugin.conversationManager = new ConversationManager(); FlutterOpenimSdkPlugin.groupManager = new GroupManager(); -// 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 deleted file mode 100644 index d7e3ca3..0000000 --- a/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnOrganizationListener.java +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 6f32b81..0000000 --- a/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnSignalingListener.java +++ /dev/null @@ -1,66 +0,0 @@ -package io.openim.flutter_openim_sdk.listener; - -import io.openim.flutter_openim_sdk.util.CommonUtil; - -public class OnSignalingListener implements open_im_sdk_callback.OnSignalingListener { - - @Override - public void onInvitationCancelled(String s) { - CommonUtil.emitEvent("signalingListener", "onInvitationCancelled", s); - } - - @Override - public void onInvitationTimeout(String s) { - CommonUtil.emitEvent("signalingListener", "onInvitationTimeout", s); - } - - @Override - public void onInviteeAccepted(String s) { - CommonUtil.emitEvent("signalingListener", "onInviteeAccepted", s); - } - - @Override - public void onInviteeAcceptedByOtherDevice(String s) { - CommonUtil.emitEvent("signalingListener", "onInviteeAcceptedByOtherDevice", s); - } - - @Override - public void onInviteeRejected(String s) { - CommonUtil.emitEvent("signalingListener", "onInviteeRejected", s); - } - - @Override - public void onInviteeRejectedByOtherDevice(String s) { - CommonUtil.emitEvent("signalingListener", "onInviteeRejectedByOtherDevice", s); - } - -// @Override -// public void onReceiveCustomSignal(String s) { -// CommonUtil.emitEvent("signalingListener", "onReceiveCustomSignal", s); -// } - - @Override - public void onReceiveNewInvitation(String s) { - CommonUtil.emitEvent("signalingListener", "onReceiveNewInvitation", s); - } - - @Override - public void onRoomParticipantConnected(String s) { - CommonUtil.emitEvent("signalingListener", "onRoomParticipantConnected", s); - } - - @Override - public void onRoomParticipantDisconnected(String s) { - CommonUtil.emitEvent("signalingListener", "onRoomParticipantDisconnected", s); - } - -// @Override -// public void onStreamChange(String s) { -// CommonUtil.emitEvent("signalingListener", "onStreamChange", s); -// } - - @Override - public void onHangUp(String s) { - CommonUtil.emitEvent("signalingListener", "onHangUp", 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 deleted file mode 100644 index 18b235e..0000000 --- a/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnWorkMomentsListener.java +++ /dev/null @@ -1,12 +0,0 @@ -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/OrganizationManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/OrganizationManager.java deleted file mode 100644 index 86623dd..0000000 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/OrganizationManager.java +++ /dev/null @@ -1,70 +0,0 @@ -//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.OnOrganizationListener; -//import open_im_sdk.Open_im_sdk; -// -//public class OrganizationManager extends BaseManager { -// -// public void setOrganizationListener(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.setOrganizationListener(new OnOrganizationListener()); -// -// result.success(null); -// } -// -// public void getSubDepartment(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.getSubDepartment( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// value(methodCall, "departmentID"), -// int2long(methodCall, "offset"), -// int2long(methodCall, "count") -// ); -// } -// -// public void getDepartmentMember(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.getDepartmentMember( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// value(methodCall, "departmentID"), -// int2long(methodCall, "offset"), -// int2long(methodCall, "count") -// ); -// } -// -// public void getUserInDepartment(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.getUserInDepartment( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// value(methodCall, "userID") -// ); -// } -// -// public void getDepartmentMemberAndSubDepartment(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.getDepartmentMemberAndSubDepartment( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// value(methodCall, "departmentID") -// ); -// } -// -// public void getDepartmentInfo(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.getDepartmentInfo( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// value(methodCall, "departmentID") -// ); -// } -// -// public void searchOrganization(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.searchOrganization( -// new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// jsonValue(methodCall, "searchParam"), -// int2long(methodCall, "offset"), -// int2long(methodCall, "count") -// ); -// } -//} 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 deleted file mode 100644 index 1ba1473..0000000 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/SignalingManager.java +++ /dev/null @@ -1,125 +0,0 @@ -//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")); -// } -//} diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/WorkMomentsManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/WorkMomentsManager.java deleted file mode 100644 index 90fc192..0000000 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/WorkMomentsManager.java +++ /dev/null @@ -1,33 +0,0 @@ -//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.OnWorkMomentsListener; -//import open_im_sdk.Open_im_sdk; -// -//public class WorkMomentsManager extends BaseManager { -// -// public void setWorkMomentsListener(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.setWorkMomentsListener(new OnWorkMomentsListener()); -// -// result.success(null); -// } -// -// public void getWorkMomentsUnReadCount(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.getWorkMomentsUnReadCount(new OnBaseListener(result, methodCall), -// value(methodCall, "operationID")); -// } -// -// public void getWorkMomentsNotification(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.getWorkMomentsNotification(new OnBaseListener(result, methodCall), -// value(methodCall, "operationID"), -// int2long(methodCall, "offset"), -// int2long(methodCall, "count")); -// } -// -// public void clearWorkMomentsNotification(MethodCall methodCall, MethodChannel.Result result) { -// Open_im_sdk.clearWorkMomentsNotification(new OnBaseListener(result, methodCall), -// value(methodCall, "operationID")); -// } -//} diff --git a/lib/flutter_openim_sdk.dart b/lib/flutter_openim_sdk.dart index b3545cd..23d5929 100644 --- a/lib/flutter_openim_sdk.dart +++ b/lib/flutter_openim_sdk.dart @@ -20,21 +20,14 @@ export 'src/listener/group_listener.dart'; export 'src/listener/listener_for_service.dart'; export 'src/listener/message_kv_info_listener.dart'; export 'src/listener/msg_send_progress_listener.dart'; -export 'src/listener/organization_listener.dart'; export 'src/listener/put_file_listener.dart'; -export 'src/listener/signaling_listener.dart'; export 'src/listener/user_listener.dart'; -export 'src/listener/workmoments_listener.dart'; export 'src/manager/im_conversation_manager.dart'; export 'src/manager/im_friendship_manager.dart'; export 'src/manager/im_group_manager.dart'; export 'src/manager/im_manager.dart'; export 'src/manager/im_message_manager.dart'; -export 'src/manager/im_offline_push_manager.dart'; -export 'src/manager/im_organization_manager.dart'; -export 'src/manager/im_signaling_manager.dart'; export 'src/manager/im_user_manager.dart'; -export 'src/manager/im_workmoments_manager.dart'; export 'src/models/conversation_info.dart'; export 'src/models/group_info.dart'; export 'src/models/meeting_info.dart'; diff --git a/lib/src/listener/organization_listener.dart b/lib/src/listener/organization_listener.dart deleted file mode 100644 index 1a055ea..0000000 --- a/lib/src/listener/organization_listener.dart +++ /dev/null @@ -1,11 +0,0 @@ -// /// 组织架构监听 -// class OnOrganizationListener { -// Function()? onOrganizationUpdated; -// -// OnOrganizationListener({this.onOrganizationUpdated}); -// -// /// 组织架构有更新 -// void organizationUpdated() { -// onOrganizationUpdated?.call(); -// } -// } diff --git a/lib/src/listener/signaling_listener.dart b/lib/src/listener/signaling_listener.dart deleted file mode 100644 index 944dccb..0000000 --- a/lib/src/listener/signaling_listener.dart +++ /dev/null @@ -1,88 +0,0 @@ -// import 'package:flutter_openim_sdk/flutter_openim_sdk.dart'; -// -// /// 信令监听 -// class OnSignalingListener { -// final Function(SignalingInfo info)? onInvitationCancelled; -// final Function(SignalingInfo info)? onInvitationTimeout; -// final Function(SignalingInfo info)? onInviteeAccepted; -// final Function(SignalingInfo info)? onInviteeRejected; -// final Function(SignalingInfo info)? onReceiveNewInvitation; -// final Function(SignalingInfo info)? onInviteeRejectedByOtherDevice; -// final Function(SignalingInfo info)? onInviteeAcceptedByOtherDevice; -// final Function(SignalingInfo info)? onHangup; -// final Function(RoomCallingInfo info)? onRoomParticipantConnected; -// final Function(RoomCallingInfo info)? onRoomParticipantDisconnected; -// final Function(MeetingStreamEvent event)? onMeetingStreamChanged; -// final Function(CustomSignaling info)? onReceiveCustomSignal; -// -// OnSignalingListener({ -// this.onInvitationCancelled, -// this.onInvitationTimeout, -// this.onInviteeAccepted, -// this.onInviteeRejected, -// this.onReceiveNewInvitation, -// this.onInviteeAcceptedByOtherDevice, -// this.onInviteeRejectedByOtherDevice, -// this.onHangup, -// this.onRoomParticipantConnected, -// this.onRoomParticipantDisconnected, -// this.onMeetingStreamChanged, -// this.onReceiveCustomSignal, -// }); -// -// /// 被邀请者收到：邀请者取消音视频通话 -// void invitationCancelled(SignalingInfo info) { -// onInvitationCancelled?.call(info); -// } -// -// /// 邀请者收到：被邀请者超时未接通 -// void invitationTimeout(SignalingInfo info) { -// onInvitationTimeout?.call(info); -// } -// -// /// 邀请者收到：被邀请者同意音视频通话 -// void inviteeAccepted(SignalingInfo info) { -// onInviteeAccepted?.call(info); -// } -// -// /// 邀请者收到：被邀请者拒绝音视频通话 -// void inviteeRejected(SignalingInfo info) { -// onInviteeRejected?.call(info); -// } -// -// /// 被邀请者收到：音视频通话邀请 -// void receiveNewInvitation(SignalingInfo info) { -// onReceiveNewInvitation?.call(info); -// } -// -// /// 被邀请者（其他端）收到：比如被邀请者在手机拒接，在pc上会收到此回调 -// void inviteeAcceptedByOtherDevice(SignalingInfo info) { -// onInviteeAcceptedByOtherDevice?.call(info); -// } -// -// /// 被邀请者（其他端）收到：比如被邀请者在手机拒接，在pc上会收到此回调 -// void inviteeRejectedByOtherDevice(SignalingInfo info) { -// onInviteeRejectedByOtherDevice?.call(info); -// } -// -// /// 被挂断 -// void hangup(SignalingInfo info) { -// onHangup?.call(info); -// } -// -// void roomParticipantConnected(RoomCallingInfo info) { -// onRoomParticipantConnected?.call(info); -// } -// -// void roomParticipantDisconnected(RoomCallingInfo info) { -// onRoomParticipantDisconnected?.call(info); -// } -// -// void streamChangedEvent(MeetingStreamEvent event) { -// onMeetingStreamChanged?.call(event); -// } -// -// void receiveCustomSignal(CustomSignaling info) { -// onReceiveCustomSignal?.call(info); -// } -// } diff --git a/lib/src/listener/workmoments_listener.dart b/lib/src/listener/workmoments_listener.dart deleted file mode 100644 index eccb703..0000000 --- a/lib/src/listener/workmoments_listener.dart +++ /dev/null @@ -1,11 +0,0 @@ -// /// 朋友圈监听 -// class OnWorkMomentsListener { -// Function()? onRecvNewNotification; -// -// OnWorkMomentsListener({this.onRecvNewNotification}); -// -// /// 朋友圈信息发送改变 -// void recvNewNotification() { -// onRecvNewNotification?.call(); -// } -// } diff --git a/lib/src/manager/im_manager.dart b/lib/src/manager/im_manager.dart index 3a7f09a..d5b299a 100644 --- a/lib/src/manager/im_manager.dart +++ b/lib/src/manager/im_manager.dart @@ -13,12 +13,6 @@ class IMManager { late GroupManager groupManager; late UserManager userManager; - // late OfflinePushManager offlinePushManager; - // late SignalingManager signalingManager; - - // late WorkMomentsManager workMomentsManager; - // late OrganizationManager organizationManager; - late OnConnectListener _connectListener; OnListenerForService? _listenerForService; OnPutFileListener? _putFileListener; @@ -34,10 +28,6 @@ class IMManager { messageManager = MessageManager(_channel); groupManager = GroupManager(_channel); userManager = UserManager(_channel); - // offlinePushManager = OfflinePushManager(_channel); - // signalingManager = SignalingManager(_channel); - // workMomentsManager = WorkMomentsManager(_channel); - // organizationManager = OrganizationManager(_channel); _addNativeCallback(_channel); } @@ -278,82 +268,7 @@ class IMManager { friendshipManager.listener.friendInfoChanged(u); break; } - } - /*else if (call.method == ListenerType.signalingListener) { - String type = call.arguments['type']; - dynamic data = call.arguments['data']; - dynamic info; - switch (type) { - case 'onRoomParticipantConnected': - case 'onRoomParticipantDisconnected': - info = Utils.toObj(data, (map) => RoomCallingInfo.fromJson(map)); - break; - case 'onStreamChange': - info = - Utils.toObj(data, (map) => MeetingStreamEvent.fromJson(map)); - break; - case 'onReceiveCustomSignal': - info = Utils.toObj(data, (map) => CustomSignaling.fromJson(map)); - break; - default: - info = Utils.toObj(data, (map) => SignalingInfo.fromJson(map)); - break; - } - switch (type) { - case 'onInvitationCancelled': - signalingManager.listener.invitationCancelled(info); - break; - case 'onInvitationTimeout': - signalingManager.listener.invitationTimeout(info); - break; - case 'onInviteeAccepted': - signalingManager.listener.inviteeAccepted(info); - break; - case 'onInviteeRejected': - signalingManager.listener.inviteeRejected(info); - break; - case 'onReceiveNewInvitation': - signalingManager.listener.receiveNewInvitation(info); - break; - case 'onInviteeAcceptedByOtherDevice': - signalingManager.listener.inviteeAcceptedByOtherDevice(info); - break; - case 'onInviteeRejectedByOtherDevice': - signalingManager.listener.inviteeRejectedByOtherDevice(info); - break; - case 'onHangUp': - signalingManager.listener.hangup(info); - break; - case 'onRoomParticipantConnected': - signalingManager.listener.roomParticipantConnected(info); - break; - case 'onRoomParticipantDisconnected': - signalingManager.listener.roomParticipantDisconnected(info); - break; - case 'onStreamChange': - signalingManager.listener.streamChangedEvent(info); - break; - case 'onReceiveCustomSignal': - signalingManager.listener.receiveCustomSignal(info); - break; - } - } - else if (call.method == ListenerType.workMomentsListener) { - String type = call.arguments['type']; - switch (type) { - case 'OnRecvNewNotification': - workMomentsManager.listener.recvNewNotification(); - break; - } - } else if (call.method == ListenerType.organizationListener) { - String type = call.arguments['type']; - switch (type) { - case 'onOrganizationUpdated': - organizationManager.listener.organizationUpdated(); - break; - } - }*/ - else if (call.method == ListenerType.customBusinessListener) { + } else if (call.method == ListenerType.customBusinessListener) { String type = call.arguments['type']; String data = call.arguments['data']; switch (type) { @@ -554,8 +469,14 @@ 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_offline_push_manager.dart b/lib/src/manager/im_offline_push_manager.dart deleted file mode 100644 index 810c424..0000000 --- a/lib/src/manager/im_offline_push_manager.dart +++ /dev/null @@ -1,7 +0,0 @@ -// import 'package:flutter/services.dart'; -// -// class OfflinePushManager{ -// MethodChannel _channel; -// -// OfflinePushManager(this._channel); -// } diff --git a/lib/src/manager/im_organization_manager.dart b/lib/src/manager/im_organization_manager.dart deleted file mode 100644 index 7e91297..0000000 --- a/lib/src/manager/im_organization_manager.dart +++ /dev/null @@ -1,162 +0,0 @@ -// import 'package:flutter/services.dart'; -// import 'package:flutter_openim_sdk/flutter_openim_sdk.dart'; -// -// class OrganizationManager { -// MethodChannel _channel; -// late OnOrganizationListener listener; -// -// OrganizationManager(this._channel); -// -// /// 组织架构发生变化回调 -// Future setOrganizationListener(OnOrganizationListener listener) { -// this.listener = listener; -// return _channel.invokeMethod('setOrganizationListener', _buildParam({})); -// } -// -// /// 获取子部门列表，返回当前部门下的一级子部门 -// /// [departmentID] 当前部门id -// /// [offset] 开始下标 -// /// [count] 每页大小 -// Future> getSubDept({ -// required String departmentID, -// int offset = 0, -// int count = 40, -// String? operationID, -// }) => -// _channel -// .invokeMethod( -// 'getSubDepartment', -// _buildParam({ -// 'departmentID': departmentID, -// 'offset': offset, -// 'count': count, -// 'operationID': Utils.checkOperationID(operationID), -// })) -// .then((value) => Utils.toList(value, (v) => DeptInfo.fromJson(v))); -// -// /// 获取部门下的成员列表，返回当前部门下的一级成员 -// /// [departmentID] 当前部门id -// /// [offset] 开始下标 -// /// [count] 每页大小 -// Future> getDeptMember({ -// required String departmentID, -// int offset = 0, -// int count = 40, -// String? operationID, -// }) => -// _channel -// .invokeMethod( -// 'getDepartmentMember', -// _buildParam({ -// 'departmentID': departmentID, -// 'offset': offset, -// 'count': count, -// 'operationID': Utils.checkOperationID(operationID), -// })) -// .then((value) => -// Utils.toList(value, (v) => DeptMemberInfo.fromJson(v))); -// -// /// 获取成员所在的部门 -// /// [userID] 成员ID -// Future> getUserInDept({ -// required String userID, -// String? operationID, -// }) => -// _channel -// .invokeMethod( -// 'getUserInDepartment', -// _buildParam({ -// 'userID': userID, -// 'operationID': Utils.checkOperationID(operationID), -// })) -// .then((value) => Utils.toList(value, (v) => UserInDept.fromJson(v))); -// -// /// 获取部门下的子部门跟员工 -// /// [departmentID] 当前部门id -// Future getDeptMemberAndSubDept({ -// required String departmentID, -// // int departmentOffset = 0, -// // int departmentCount = 40, -// // int memberOffset = 0, -// // int memberCount = 40, -// String? operationID, -// }) => -// _channel -// .invokeMethod( -// 'getDepartmentMemberAndSubDepartment', -// _buildParam({ -// 'departmentID': departmentID, -// // 'departmentOffset': departmentOffset, -// // 'departmentCount': departmentCount, -// // 'memberOffset': memberOffset, -// // 'memberCount': memberCount, -// 'operationID': Utils.checkOperationID(operationID), -// })) -// .then((value) => -// Utils.toObj(value, (v) => DeptMemberAndSubDept.fromJson(v))); -// -// /// 查询部门信息 -// /// [departmentID] 部门ID -// Future getDeptInfo({ -// required String departmentID, -// String? operationID, -// }) => -// _channel -// .invokeMethod( -// 'getDepartmentInfo', -// _buildParam({ -// 'departmentID': departmentID, -// 'operationID': Utils.checkOperationID(operationID), -// })) -// .then((value) => Utils.toObj(value, (v) => DeptInfo.fromJson(v))); -// -// /// 搜索组织人员 -// /// [keyWord] 关键字 -// /// [isSearchUserName] 是否匹配用户名 -// /// [isSearchEnglishName] 是否匹配英文名 -// /// [isSearchPosition] 是否匹配职位 -// /// [isSearchUserID] 是否匹配用户ID -// /// [isSearchMobile] 是否匹配手机号 -// /// [isSearchEmail] 是否匹配邮箱号 -// /// [isSearchTelephone] 是否匹配电话号码 -// /// [offset] 开始下标 -// /// [count] 分页大小 -// Future searchOrganization({ -// required String keyWord, -// bool isSearchUserName = false, -// bool isSearchEnglishName = false, -// bool isSearchPosition = false, -// bool isSearchUserID = false, -// bool isSearchMobile = false, -// bool isSearchEmail = false, -// bool isSearchTelephone = false, -// int offset = 0, -// int count = 40, -// String? operationID, -// }) => -// _channel -// .invokeMethod( -// 'searchOrganization', -// _buildParam({ -// 'searchParam': { -// 'keyWord': keyWord, -// 'isSearchUserName': isSearchUserName, -// 'isSearchEnglishName': isSearchEnglishName, -// 'isSearchPosition': isSearchPosition, -// 'isSearchUserID': isSearchUserID, -// 'isSearchMobile': isSearchMobile, -// 'isSearchEmail': isSearchEmail, -// 'isSearchTelephone': isSearchTelephone, -// }, -// 'offset': offset, -// 'count': count, -// 'operationID': Utils.checkOperationID(operationID), -// })) -// .then((value) => -// Utils.toObj(value, (v) => OrganizationSearchResult.fromJson(v))); -// -// static Map _buildParam(Map param) { -// param["ManagerName"] = "organizationManager"; -// return param; -// } -// } diff --git a/lib/src/manager/im_signaling_manager.dart b/lib/src/manager/im_signaling_manager.dart deleted file mode 100644 index 892296e..0000000 --- a/lib/src/manager/im_signaling_manager.dart +++ /dev/null @@ -1,307 +0,0 @@ -// import 'package:flutter/services.dart'; -// -// import '../../flutter_openim_sdk.dart'; -// -// class SignalingManager { -// MethodChannel _channel; -// late OnSignalingListener listener; -// -// SignalingManager(this._channel); -// -// /// 信令监听 -// Future setSignalingListener(OnSignalingListener listener) { -// this.listener = listener; -// return _channel.invokeMethod('setSignalingListener', _buildParam({})); -// } -// -// /// 邀请个人加入音视频 -// /// [info] 信令对象[SignalingInfo] -// Future signalingInvite({ -// required SignalingInfo info, -// String? operationID, -// }) => -// _channel -// .invokeMethod( -// 'signalingInvite', -// _buildParam({ -// 'signalingInfo': info.toJson(), -// 'operationID': Utils.checkOperationID(operationID), -// })) -// .then((value) => -// Utils.toObj(value, (map) => SignalingCertificate.fromJson(map))); -// -// /// 邀请群里某些人加入音视频 -// /// [info] 信令对象[SignalingInfo] -// Future signalingInviteInGroup({ -// required SignalingInfo info, -// String? operationID, -// }) => -// _channel -// .invokeMethod( -// 'signalingInviteInGroup', -// _buildParam({ -// 'signalingInfo': info.toJson(), -// 'operationID': Utils.checkOperationID(operationID), -// })) -// .then((value) => -// Utils.toObj(value, (map) => SignalingCertificate.fromJson(map))); -// -// /// 同意某人音视频邀请 -// /// [info] 信令对象[SignalingInfo] -// Future signalingAccept({ -// required SignalingInfo info, -// String? operationID, -// }) => -// _channel -// .invokeMethod( -// 'signalingAccept', -// _buildParam({ -// 'signalingInfo': info.toJson(), -// 'operationID': Utils.checkOperationID(operationID), -// })) -// .then((value) => -// Utils.toObj(value, (map) => SignalingCertificate.fromJson(map))); -// -// /// 拒绝某人音视频邀请 -// /// [info] 信令对象[SignalingInfo] -// Future signalingReject({ -// required SignalingInfo info, -// String? operationID, -// }) => -// _channel.invokeMethod( -// 'signalingReject', -// _buildParam({ -// 'signalingInfo': info.toJson(), -// 'operationID': Utils.checkOperationID(operationID), -// })); -// -// /// 邀请者取消音视频通话 -// /// [info] 信令对象[SignalingInfo] -// Future signalingCancel({ -// required SignalingInfo info, -// String? operationID, -// }) => -// _channel.invokeMethod( -// 'signalingCancel', -// _buildParam({ -// 'signalingInfo': info.toJson(), -// 'operationID': Utils.checkOperationID(operationID), -// })); -// -// /// 挂断 -// /// [info] 信令对象[SignalingInfo] -// Future signalingHungUp({ -// required SignalingInfo info, -// String? operationID, -// }) => -// _channel.invokeMethod( -// 'signalingHungUp', -// _buildParam({ -// 'signalingInfo': info.toJson(), -// 'operationID': Utils.checkOperationID(operationID), -// })); -// -// /// 获取当前群通话信息 -// /// [groupID] 当前群ID -// Future signalingGetRoomByGroupID({ -// required String groupID, -// String? operationID, -// }) => -// _channel -// .invokeMethod( -// 'signalingGetRoomByGroupID', -// _buildParam({ -// 'groupID': groupID, -// 'operationID': Utils.checkOperationID(operationID), -// })) -// .then((value) => -// Utils.toObj(value, (map) => RoomCallingInfo.fromJson(map))); -// -// /// 获取进入房间的信息 -// /// [roomID] 当前房间ID -// Future signalingGetTokenByRoomID({ -// required String roomID, -// String? operationID, -// }) => -// _channel -// .invokeMethod( -// 'signalingGetTokenByRoomID', -// _buildParam({ -// 'roomID': roomID, -// 'operationID': Utils.checkOperationID(operationID), -// })) -// .then((value) => Utils.toObj( -// value, -// (map) => SignalingCertificate.fromJson( -// map..addAll({'roomID': roomID})))); -// -// /// 会议设置 -// /// required String roomID, -// /// String? meetingName, -// /// String? ex, -// /// int startTime = 0, -// /// int endTime = 0, -// /// bool participantCanUnmuteSelf = true, -// /// bool participantCanEnableVideo = true, -// /// bool onlyHostInviteUser = true, -// /// bool onlyHostShareScreen = true, -// /// bool joinDisableMicrophone = true, -// /// bool joinDisableVideo = true, -// /// bool isMuteAllVideo = true, -// /// bool isMuteAllMicrophone = true, -// /// List addCanScreenUserIDList = const [], -// /// List reduceCanScreenUserIDList = const [], -// /// List addDisableMicrophoneUserIDList = const [], -// /// List reduceDisableMicrophoneUserIDList = const [], -// /// List addDisableVideoUserIDList = const [], -// /// List reduceDisableVideoUserIDList = const [], -// /// List addPinedUserIDList = const [], -// /// List reducePinedUserIDList = const [], -// /// List addBeWatchedUserIDList = const [], -// /// List reduceBeWatchedUserIDList = const [], -// Future signalingUpdateMeetingInfo({ -// required Map info, -// String? operationID, -// }) { -// if (info['meetingID'] != null) { -// info['roomID'] = info['meetingID']; -// } -// assert(info['roomID'] != null); -// return _channel.invokeMethod( -// 'signalingUpdateMeetingInfo', -// _buildParam({ -// 'info': info, -// 'operationID': Utils.checkOperationID(operationID), -// })); -// } -// -// /// 创建会议室 -// /// [meetingName] 会议主题 -// /// [meetingHostUserID] 会议主持人ID -// /// [startTime] 开始时间s -// /// [meetingDuration] 会议时长s -// /// [inviteeUserIDList] 被邀请人ID列表 -// /// [ex] 其他 -// Future signalingCreateMeeting({ -// required String meetingName, -// String? meetingHostUserID, -// int? startTime, -// int? meetingDuration, -// List inviteeUserIDList = const [], -// String? ex, -// String? operationID, -// }) => -// _channel -// .invokeMethod( -// 'signalingCreateMeeting', -// _buildParam({ -// 'info': { -// 'meetingName': meetingName, -// 'meetingHostUserID': meetingHostUserID, -// 'startTime': startTime, -// 'meetingDuration': meetingDuration, -// 'inviteeUserIDList': inviteeUserIDList, -// 'ex': ex, -// }, -// 'operationID': Utils.checkOperationID(operationID), -// })) -// .then((value) => -// Utils.toObj(value, (map) => SignalingCertificate.fromJson(map))); -// -// /// 加入会议室 -// /// [meetingID] 会议ID -// /// [meetingName] 会议主题 -// /// [participantNickname] 加入房间显示的名称 -// Future signalingJoinMeeting({ -// required String meetingID, -// String? meetingName, -// String? participantNickname, -// String? operationID, -// }) => -// _channel -// .invokeMethod( -// 'signalingJoinMeeting', -// _buildParam({ -// 'info': { -// 'meetingID': meetingID, -// 'meetingName': meetingName, -// 'participantNickname': participantNickname, -// }, -// 'operationID': Utils.checkOperationID(operationID), -// })) -// .then((value) => -// Utils.toObj(value, (map) => SignalingCertificate.fromJson(map))); -// -// /// 会议室 管理员对指定的某一个入会人员设置禁言 -// /// [roomID] 会议ID -// /// [streamType] video/audio -// /// [userID] 被禁言的用户ID -// /// [mute] true：禁言 -// /// [muteAll] true：video/audio 一起设置 -// Future signalingOperateStream({ -// required String roomID, -// String? streamType, -// required String userID, -// bool mute = false, -// bool muteAll = false, -// String? operationID, -// }) => -// _channel.invokeMethod( -// 'signalingOperateStream', -// _buildParam({ -// 'roomID': roomID, -// 'streamType': streamType, -// 'userID': userID, -// 'mute': mute, -// 'muteAll': muteAll, -// 'operationID': Utils.checkOperationID(operationID), -// })); -// -// /// 获取所有的未完成会议 -// /// [roomID] 会议ID -// Future signalingGetMeetings({ -// String? operationID, -// }) => -// _channel -// .invokeMethod( -// 'signalingGetMeetings', -// _buildParam({ -// 'operationID': Utils.checkOperationID(operationID), -// })) -// .then((value) => -// Utils.toObj(value, (map) => MeetingInfoList.fromJson(map))); -// -// /// 结束会议 -// /// [roomID] 会议ID -// Future signalingCloseRoom({ -// required String roomID, -// String? operationID, -// }) => -// _channel.invokeMethod( -// 'signalingCloseRoom', -// _buildParam({ -// 'roomID': roomID, -// 'operationID': Utils.checkOperationID(operationID), -// })); -// -// /// 自定义信令 -// /// [roomID] 会议ID -// /// [customInfo] 自定义信令 -// Future signalingSendCustomSignal({ -// required String roomID, -// required String customInfo, -// String? operationID, -// }) => -// _channel.invokeMethod( -// 'signalingSendCustomSignal', -// _buildParam({ -// 'roomID': roomID, -// 'customInfo': customInfo, -// 'operationID': Utils.checkOperationID(operationID), -// })); -// -// static Map _buildParam(Map param) { -// param["ManagerName"] = "signalingManager"; -// return param; -// } -// } diff --git a/lib/src/manager/im_workmoments_manager.dart b/lib/src/manager/im_workmoments_manager.dart deleted file mode 100644 index 699f8aa..0000000 --- a/lib/src/manager/im_workmoments_manager.dart +++ /dev/null @@ -1,61 +0,0 @@ -// import 'package:flutter/services.dart'; -// import 'package:flutter_openim_sdk/flutter_openim_sdk.dart'; -// -// class WorkMomentsManager { -// MethodChannel _channel; -// late OnWorkMomentsListener listener; -// -// WorkMomentsManager(this._channel); -// -// /// 朋友圈信息发送变化通知 -// Future setWorkMomentsListener(OnWorkMomentsListener listener) { -// this.listener = listener; -// return _channel.invokeMethod('setWorkMomentsListener', _buildParam({})); -// } -// -// /// 获取朋友圈未读消息总数 -// Future getWorkMomentsUnReadCount({ -// String? operationID, -// }) => -// _channel -// .invokeMethod( -// 'getWorkMomentsUnReadCount', -// _buildParam({ -// 'operationID': Utils.checkOperationID(operationID), -// })) -// .then((value) => Utils.toObj(value, (map) => map['unreadCount'])); -// -// /// 获取通知列表 -// /// [offset] 开始下标 -// /// [count] 每页大小 -// Future> getWorkMomentsNotification({ -// required int offset, -// required int count, -// String? operationID, -// }) => -// _channel -// .invokeMethod( -// 'getWorkMomentsNotification', -// _buildParam({ -// 'offset': offset, -// 'count': count, -// 'operationID': Utils.checkOperationID(operationID), -// })) -// .then((value) => -// Utils.toList(value, (map) => WorkMomentsInfo.fromJson(map))); -// -// /// 清除通知列表 -// Future clearWorkMomentsNotification({ -// String? operationID, -// }) => -// _channel.invokeMethod( -// 'clearWorkMomentsNotification', -// _buildParam({ -// 'operationID': Utils.checkOperationID(operationID), -// })); -// -// static Map _buildParam(Map param) { -// param["ManagerName"] = "workMomentsManager"; -// return param; -// } -// }