3.0 enterprise

2023-07-04 15:06:22 +08:00
parent 5bdb9879a7
commit c1f62d0661
12 changed files with 227 additions and 208 deletions
--- 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'
 }
--- 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();
    }
--- 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);
 //    }
-}
+//}
--- 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) {
--- 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);
 //    }
-}
+//}
--- 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) {
--- 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"));
+    }
+}