release-3.0.0

2.Delete WorkMoments
3.Delete Signaling

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@aar'
 }

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();
     }
 
 

android/src/main/java/io/openim/flutter_openim_sdk/listener/OnOrganizationListener.java

@@ -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);
-//    }
-}

android/src/main/java/io/openim/flutter_openim_sdk/listener/OnPutFileListener.java

@@ -1,86 +0,0 @@
-package io.openim.flutter_openim_sdk.listener;
-
-import android.util.ArrayMap;
-
-import java.util.Map;
-
-import io.flutter.plugin.common.MethodCall;
-import io.flutter.plugin.common.MethodChannel;
-import io.openim.flutter_openim_sdk.util.CommonUtil;
-import open_im_sdk_callback.PutFileCallback;
-
-public class OnPutFileListener implements PutFileCallback {
-    final private MethodChannel.Result result;
-    final private Object putID;
-
-    public OnPutFileListener(MethodChannel.Result result, MethodCall call) {
-        this.result = result;
-        this.putID = call.argument("putID");
-    }
-
-    @Override
-    public void hashComplete(String hash, long total) {
-        if (null != putID) {
-            final Map<String, Object> values = new ArrayMap<>();
-            values.put("putID", putID);
-            values.put("hash", hash);
-            values.put("total", total);
-            CommonUtil.emitEvent("putFileListener", "hashComplete", values);
-        }
-    }
-
-    @Override
-    public void hashProgress(long current, long total) {
-        if (null != putID) {
-            final Map<String, Object> values = new ArrayMap<>();
-            values.put("putID", putID);
-            values.put("current", current);
-            values.put("total", total);
-            CommonUtil.emitEvent("putFileListener", "hashProgress", values);
-        }
-    }
-
-    @Override
-    public void open(long size) {
-        if (null != putID) {
-            final Map<String, Object> values = new ArrayMap<>();
-            values.put("putID", putID);
-            values.put("size", size);
-            CommonUtil.emitEvent("putFileListener", "open", values);
-        }
-    }
-
-    @Override
-    public void putComplete(long total, long putType) {
-        if (null != putID) {
-            final Map<String, Object> values = new ArrayMap<>();
-            values.put("putID", putID);
-            values.put("putType", putType);
-            values.put("total", total);
-            CommonUtil.emitEvent("putFileListener", "putComplete", values);
-        }
-    }
-
-    @Override
-    public void putProgress(long save, long current, long total) {
-        if (null != putID) {
-            final Map<String, Object> values = new ArrayMap<>();
-            values.put("putID", putID);
-            values.put("save", save);
-            values.put("current", current);
-            values.put("total", total);
-            CommonUtil.emitEvent("putFileListener", "putProgress", values);
-        }
-    }
-
-    @Override
-    public void putStart(long current, long total) {
-        if (null != putID) {
-            final Map<String, Object> values = new ArrayMap<>();
-            values.put("putID", putID);
-            values.put("current", current);
-            values.put("total", total);
-            CommonUtil.emitEvent("putFileListener", "putStart", values);
-        }
-    }
-}

android/src/main/java/io/openim/flutter_openim_sdk/listener/OnSignalingListener.java

@@ -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);
-    }
-}

android/src/main/java/io/openim/flutter_openim_sdk/listener/OnUploadFileListener.java

@@ -0,0 +1,110 @@
+package io.openim.flutter_openim_sdk.listener;
+
+import android.util.ArrayMap;
+
+import java.util.Map;
+
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import io.openim.flutter_openim_sdk.util.CommonUtil;
+import open_im_sdk_callback.UploadFileCallback;
+
+public class OnUploadFileListener implements UploadFileCallback {
+    final private MethodChannel.Result result;
+    final private Object id;
+
+    public OnUploadFileListener(MethodChannel.Result result, MethodCall call) {
+        this.result = result;
+        this.id = call.argument("id");
+    }
+
+    @Override
+    public void complete(long size, String url, int type) {
+        if (null != id) {
+            final Map<String, Object> values = new ArrayMap<>();
+            values.put("id", id);
+            values.put("size", size);
+            values.put("url", url);
+            values.put("type", type);
+            CommonUtil.emitEvent("uploadFileListener", "complete", values);
+        }
+    }
+
+    @Override
+    public void hashPartComplete(String partHash, String fileHash) {
+        if (null != id) {
+            final Map<String, Object> values = new ArrayMap<>();
+            values.put("id", id);
+            values.put("partHash", partHash);
+            values.put("fileHash", fileHash);
+            CommonUtil.emitEvent("uploadFileListener", "hashPartComplete", values);
+        }
+    }
+
+    @Override
+    public void hashPartProgress(int index, long size, String partHash) {
+        if (null != id) {
+            final Map<String, Object> values = new ArrayMap<>();
+            values.put("id", id);
+            values.put("index", index);
+            values.put("size", size);
+            values.put("partHash", partHash);
+            CommonUtil.emitEvent("uploadFileListener", "hashPartProgress", values);
+        }
+    }
+
+    @Override
+    public void open(long size) {
+        if (null != id) {
+            final Map<String, Object> values = new ArrayMap<>();
+            values.put("id", id);
+            values.put("size", size);
+            CommonUtil.emitEvent("uploadFileListener", "open", values);
+        }
+    }
+
+    @Override
+    public void partSize(long partSize, int num) {
+        if (null != id) {
+            final Map<String, Object> values = new ArrayMap<>();
+            values.put("id", id);
+            values.put("partSize", partSize);
+            values.put("num", num);
+            CommonUtil.emitEvent("uploadFileListener", "partSize", values);
+        }
+    }
+
+    @Override
+    public void uploadComplete(long fileSize, long streamSize, long storageSize) {
+        if (null != id) {
+            final Map<String, Object> values = new ArrayMap<>();
+            values.put("id", id);
+            values.put("fileSize", fileSize);
+            values.put("streamSize", streamSize);
+            values.put("storageSize", storageSize);
+            CommonUtil.emitEvent("uploadFileListener", "uploadProgress", values);
+        }
+    }
+
+    @Override
+    public void uploadID(String uploadID) {
+        if (null != id) {
+            final Map<String, Object> values = new ArrayMap<>();
+            values.put("id", id);
+            values.put("uploadID", uploadID);
+            CommonUtil.emitEvent("uploadFileListener", "uploadID", values);
+        }
+    }
+
+    @Override
+    public void uploadPartComplete(int index, long partSize, String partHash) {
+        if (null != id) {
+            final Map<String, Object> values = new ArrayMap<>();
+            values.put("id", id);
+            values.put("index", index);
+            values.put("partSize", partSize);
+            values.put("partHash", partHash);
+            CommonUtil.emitEvent("uploadFileListener", "uploadPartComplete", values);
+        }
+    }
+}

android/src/main/java/io/openim/flutter_openim_sdk/listener/OnWorkMomentsListener.java

@@ -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);
-//    }
-}

android/src/main/java/io/openim/flutter_openim_sdk/manager/ConversationManager.java

@@ -175,4 +175,22 @@ public class ConversationManager extends BaseManager {
                 value(methodCall, "burnDuration")
         );
     }
+
+    public void setConversationIsMsgDestruct(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.setConversationIsMsgDestruct(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                value(methodCall, "conversationID"),
+                value(methodCall, "isMsgDestruct")
+        );
+    }
+
+    public void setConversationMsgDestructTime(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.setConversationMsgDestructTime(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                value(methodCall, "conversationID"),
+                int2long(methodCall, "duration")
+        );
+    }
 }

android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java

@@ -5,8 +5,7 @@ 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.OnUploadFileListener;
-import io.openim.flutter_openim_sdk.listener.OnPutFileListener;
 import io.openim.flutter_openim_sdk.util.CommonUtil;
 import open_im_sdk.Open_im_sdk;
 
@@ -38,15 +37,15 @@ 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) {
+    public void uploadFile(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.putFile(
+        Open_im_sdk.uploadFile(
                 new OnBaseListener(result, methodCall),
                 value(methodCall, "operationID"),
                 jsonValue(methodCall),
-                new OnPutFileListener(result, methodCall)
+                new OnUploadFileListener(result, methodCall)
         );
     }
 

android/src/main/java/io/openim/flutter_openim_sdk/manager/OrganizationManager.java

@@ -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")
-//        );
-//    }
-//}

android/src/main/java/io/openim/flutter_openim_sdk/manager/SignalingManager.java

@@ -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"));
-//    }
-//}

android/src/main/java/io/openim/flutter_openim_sdk/manager/WorkMomentsManager.java

@@ -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"));
-//    }
-//}

example/ios/Podfile.lock

@@ -3,7 +3,7 @@ PODS:
   - flutter_openim_sdk (0.0.1):
     - Flutter
     - OpenIMSDKCore (= 3.0.0)
-  - OpenIMSDKCore (3.0.0)
+  - "OpenIMSDKCore (3.0.0+1)"
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
@@ -22,7 +22,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_openim_sdk: 12daf3769f8bf40001970304445b6155c146b7eb
-  OpenIMSDKCore: cf4fa9f9599cc6741f7acc5ef260647f34541e87
+  OpenIMSDKCore: 2e38a5b9be23e588b5049ebd378161cf277e41a0
 
 PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d
 

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:

ios/Classes/Module/ConversationManager.swift

@@ -111,7 +111,7 @@ public class ConversationManager: BaseServiceManager {
     }
     
     func setConversationBurnDuration(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkSetConversationBurnDuration(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"], methodCall[int: "burnDuration"])
+        Open_im_sdkSetConversationBurnDuration(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"], methodCall[int32: "burnDuration"])
     }
 }
 

ios/Classes/Module/IMManager.swift

@@ -11,7 +11,7 @@ public class IMMananger: BaseServiceManager {
         self["login"] = login
         self["logout"] = logout
         self["getLoginStatus"] = getLoginStatus
-        self["putFile"] = putFile
+        self["uploadFile"] = uploadFile
         self["updateFcmToken"] = updateFcmToken
         self["setAppBackgroundStatus"] = setAppBackgroundStatus
         self["networkStatusChanged"] = networkStatusChanged
@@ -22,7 +22,7 @@ public class IMMananger: BaseServiceManager {
                                                selector: #selector(applicationWillEnterForeground),
                                                name: UIApplication.willEnterForegroundNotification,
                                                object: nil)
-                
+        
         NotificationCenter.default.addObserver(self,
                                                selector: #selector(applicationDidEnterBackground),
                                                name: UIApplication.didEnterBackgroundNotification,
@@ -51,7 +51,7 @@ public class IMMananger: BaseServiceManager {
         Open_im_sdkSetAppBackgroundStatus(BaseCallback(result: { _ in
         }), UUID().uuidString, true)
     }
-
+    
     @objc
     fileprivate func applicationWillEnterForeground() {
         Open_im_sdkSetAppBackgroundStatus(BaseCallback(result: { _ in
@@ -72,11 +72,11 @@ public class IMMananger: BaseServiceManager {
     }
     
     func getLoginStatus(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        callBack(result, Open_im_sdkGetLoginStatus())
+        callBack(result, Open_im_sdkGetLoginStatus(methodCall[string: "operationID"]))
     }
     
-    func putFile(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+    func uploadFile(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkPutFile(BaseCallback(result: result), methodCall[string: "operationID"], methodCall.toJsonString(),PutFileListener(channel: self.channel,putID: methodCall[string: "putID"]))
+        Open_im_sdkUploadFile(BaseCallback(result: result), methodCall[string: "operationID"], methodCall.toJsonString(), UploadFileListener(channel: self.channel,id: methodCall[string: "id"]))
     }
     
     func updateFcmToken(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
@@ -102,7 +102,7 @@ public class ConnListener: NSObject, Open_im_sdk_callbackOnConnListenerProtocol
     public func onConnectFailed(_ errCode: Int32, errMsg: String?) {
         CommonUtil.emitEvent(channel: self.channel, method: "connectListener", type: "onConnectFailed", errCode: errCode, errMsg: errMsg, data: nil)
     }
-
+    
     public func onConnectSuccess() {
         CommonUtil.emitEvent(channel: self.channel, method: "connectListener", type: "onConnectSuccess", errCode: nil, errMsg: nil, data: nil)
     }
@@ -120,60 +120,79 @@ public class ConnListener: NSObject, Open_im_sdk_callbackOnConnListenerProtocol
     }
 }
 
-public class PutFileListener: NSObject, Open_im_sdk_callbackPutFileCallbackProtocol {
+public class UploadFileListener: NSObject, Open_im_sdk_callbackUploadFileCallbackProtocol {
+    
     private let channel:FlutterMethodChannel
-    private let putID: String
+    private let id: String
     
-    init(channel:FlutterMethodChannel, putID: String) {
+    init(channel:FlutterMethodChannel, id: String) {
         self.channel = channel
-        self.putID = putID
+        self.id = id
     }
     
-    public func hashComplete(_ hash: String?, total: Int64) {
+    public func complete(_ size: Int64, url: String?, typ: Int32) {
         var values: [String: Any] = [:]
-        values["putID"] = putID
+        values["id"] = id
-        values["hash"] = hash
+        values["size"] = size
-        values["total"] = total
+        values["url"] = url
-        CommonUtil.emitEvent(channel: channel, method: "putFileListener", type: "hashComplete", errCode: nil, errMsg: nil, data: values)
+        values["type"] = typ
+        CommonUtil.emitEvent(channel: channel, method: "uploadFileListener", type: "complete", errCode: nil, errMsg: nil, data: values)
     }
     
-    public func hashProgress(_ current: Int64, total: Int64) {
+    public func hashPartComplete(_ partsHash: String?, fileHash: String?) {
         var values: [String: Any] = [:]
-        values["putID"] = putID
+        values["id"] = id
-        values["current"] = current
+        values["partHash"] = partsHash
-        values["total"] = total
+        values["fileHash"] = fileHash
-        CommonUtil.emitEvent(channel: channel, method: "putFileListener", type: "hashProgress", errCode: nil, errMsg: nil, data: values)
+        CommonUtil.emitEvent(channel: channel, method: "uploadFileListener", type: "hashPartComplete", errCode: nil, errMsg: nil, data: values)
+    }
+    
+    public func hashPartProgress(_ index: Int32, size: Int64, partHash: String?) {
+        var values: [String: Any] = [:]
+        values["id"] = id
+        values["index"] = index
+        values["size"] = size
+        values["partHash"] = partHash
+        CommonUtil.emitEvent(channel: channel, method: "uploadFileListener", type: "hashPartProgress", errCode: nil, errMsg: nil, data: values)
     }
     
     public func open(_ size: Int64) {
         var values: [String: Any] = [:]
-        values["putID"] = putID
+        values["id"] = id
         values["size"] = size
-        CommonUtil.emitEvent(channel: channel, method: "putFileListener", type: "open", errCode: nil, errMsg: nil, data: values)
+        CommonUtil.emitEvent(channel: channel, method: "uploadFileListener", type: "open", errCode: nil, errMsg: nil, data: values)
     }
     
-    public func putComplete(_ total: Int64, putType: Int) {
+    public func partSize(_ partSize: Int64, num: Int32) {
         var values: [String: Any] = [:]
-        values["putID"] = putID
+        values["id"] = id
-        values["putType"] = putType
+        values["partSize"] = partSize
-        values["total"] = total
+        values["num"] = num
-        CommonUtil.emitEvent(channel: channel, method: "putFileListener", type: "putComplete", errCode: nil, errMsg: nil, data: values)
+        CommonUtil.emitEvent(channel: channel, method: "uploadFileListener", type: "partSize", errCode: nil, errMsg: nil, data: values)
     }
     
-    public func putProgress(_ save: Int64, current: Int64, total: Int64) {
+    public func uploadComplete(_ fileSize: Int64, streamSize: Int64, storageSize: Int64) {
         var values: [String: Any] = [:]
-        values["putID"] = putID
+        values["id"] = id
-        values["save"] = save
+        values["fileSize"] = fileSize
-        values["current"] = current
+        values["streamSize"] = streamSize
-        values["total"] = total
+        values["storageSize"] = storageSize
-        CommonUtil.emitEvent(channel: channel, method: "putFileListener", type: "putProgress", errCode: nil, errMsg: nil, data: values)
+        CommonUtil.emitEvent(channel: channel, method: "uploadFileListener", type: "uploadProgress", errCode: nil, errMsg: nil, data: values)
     }
     
-    public func putStart(_ current: Int64, total: Int64) {
+    public func uploadID(_ uploadID: String?) {
         var values: [String: Any] = [:]
-        values["putID"] = putID
+        values["id"] = id
-        values["current"] = current
+        values["uploadID"] = uploadID
-        values["total"] = total
+        CommonUtil.emitEvent(channel: channel, method: "uploadFileListener", type: "uploadID", errCode: nil, errMsg: nil, data: values)
-        CommonUtil.emitEvent(channel: channel, method: "putFileListener", type: "putStart", errCode: nil, errMsg: nil, data: values)
+    }
+    
+    public func uploadPartComplete(_ index: Int32, partSize: Int64, partHash: String?) {
+        var values: [String: Any] = [:]
+        values["id"] = id
+        values["index"] = index
+        values["partSize"] = partSize
+        values["partHash"] = partHash
+        CommonUtil.emitEvent(channel: channel, method: "uploadFileListener", type: "uploadPartComplete", errCode: nil, errMsg: nil, data: values)
     }
 }

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/upload_file_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';
@@ -44,6 +37,5 @@ export 'src/models/organization_info.dart';
 export 'src/models/search_info.dart';
 export 'src/models/signaling_info.dart';
 export 'src/models/user_info.dart';
-export 'src/models/workmoments_info.dart';
 export 'src/openim.dart';
 export 'src/utils.dart';

lib/src/enum/listener_type.dart

@@ -14,5 +14,5 @@ class ListenerType {
   static const customBusinessListener = "customBusinessListener";
   static const messageKvInfoListener = "messageKvInfoListener";
   static const listenerForService = "listenerForService";
-  static const putFileListener = "putFileListener";
+  static const uploadFileListener = "uploadFileListener";
 }

lib/src/enum/sdk_error_code.dart

@@ -1,17 +1,172 @@
-/// 消息发送失败
+// /// 消息发送失败
-class MessageFailedCode {
+// class MessageFailedCode {
-  /// 被对方拉黑
+//   /// 被对方拉黑
-  static const int blockedByFriend = 1302;
+//   static const int blockedByFriend = 1302;
+//
+//   /// 被对方删除
+//   static const int deletedByFriend = 1303;
+//
+//   /// 已被移除群聊/群已解散
+//   static const int notInGroup = 1204;
+// }
+//
+// /// 添加好友失败
+// class AddFriendFailedCode {
+//   /// 该用户已设置不可添加
+//   static const int refuseToAddFriends = 10013;
+// }
 
-  /// 被对方删除
+class SDKErrorCode {
-  static const int deletedByFriend = 601;
+  /// 网络请求错误
+  static const int networkRequestError = 10000;
 
-  /// 已被移除群聊/群已解散
+  /// 网络等待超时错误
-  static const int notInGroup = 1205;
+  static const int networkWaitTimeoutError = 10001;
-}
+
+  /// 参数错误
+  static const int parameterError = 10002;
+
+  /// 上下文超时错误，通常为用户已经退出
+  static const int contextTimeoutError = 10003;
+
+  /// 资源未加载完毕，通常为未初始化，或者登录接口还未成功返回
+  static const int resourceNotLoaded = 10004;
+
+  /// 未知错误，需要根据 errmsg 确认原因
+  static const int unknownError = 10005;
+
+  /// sdk 内部错误，需要根据 errmsg 确认原因
+  static const int sdkInternalError = 10006;
 
-/// 添加好友失败
-class AddFriendFailedCode {
   /// 该用户已设置不可添加
   static const int refuseToAddFriends = 10013;
+
+  /// 用户不存在或未注册
+  static const int userNotExistOrNotRegistered = 10100;
+
+  /// 用户已经退出登录
+  static const int userHasLoggedOut = 10101;
+
+  /// 用户重复登录，可以通过 getloginstatus 确认登录状态，避免重复登录
+  static const int repeatLogin = 10102;
+
+  /// 需要上传的文件不存在
+  static const int uploadFileNotExist = 10200;
+
+  /// 消息解压失败
+  static const int messageDecompressionFailed = 10201;
+
+  /// 消息解码失败
+  static const int messageDecodingFailed = 10202;
+
+  /// 不支持的长连接二进制协议
+  static const int unsupportedLongConnection = 10203;
+
+  /// 消息重复发送
+  static const int messageRepeated = 10204;
+
+  /// 消息内容类型不支持
+  static const int messageContentTypeNotSupported = 10205;
+
+  /// 不支持的会话操作
+  static const int unsupportedSessionOperation = 10301;
+
+  /// 群 ID 不存在
+  static const int groupIDNotExist = 10400;
+
+  /// 群组类型错误
+  static const int wrongGroupType = 10401;
+
+  /// 服务器内部错误，通常为内部网络错误，需要检查服务器各节点运行是否正常
+  static const int serverInternalError = 500;
+
+  /// 	参数错误，需要检查 body 参数以及 header 参数是否正确
+  static const int serverParameterError = 1001;
+
+  /// 权限不足，一般为 header 参数中携带 token 不正确，或者权限越级操作
+  static const int insufficientPermissions = 1002;
+
+  /// 数据库主键重复
+  static const int duplicateDatabasePrimaryKey = 1003;
+
+  /// 数据库记录未找到
+  static const int databaseRecordNotFound = 1004;
+
+  /// 	用户 ID 不存在
+  static const int userIDNotExist = 1101;
+
+  /// 用户已经注册
+  static const int userAlreadyRegistered = 1102;
+
+  /// 群不存在
+  static const int groupNotExis = 1201;
+
+  /// 群已存在
+  static const int groupAlreadyExists = 1202;
+
+  /// 用户不在群组中
+  static const int userIsNotInGroup = 1203;
+
+  /// 群组已解散
+  static const int groupDisbanded = 1204;
+
+  /// 群申请已经被处理，不需要重复处理
+  static const int groupApplicationHasBeenProcessed = 1206;
+
+  /// 不能添加自己为好友
+  static const int notAddMyselfAsAFriend = 1301;
+
+  /// 已被对方拉黑
+  static const int hasBeenBlocked = 1302;
+
+  /// 对方不是自己的好友
+  static const int notFriend = 1303;
+
+  /// 已经是好友关系，不需要重复申请
+  static const int alreadyAFriendRelationship = 1304;
+
+  /// 消息已读功能被关闭
+  static const int messageReadFunctionIsTurnedOff = 1401;
+
+  /// 你已被禁言，不能在群里发言
+  static const int youHaveBeenBanned = 1402;
+
+  /// 群已被禁言，不能发言
+  static const int groupHasBeenBanned = 1403;
+
+  /// 该消息已被撤回
+  static const int messageHasBeenRetracted = 1404;
+
+  /// 授权过期
+  static const int licenseExpired = 1405;
+
+  /// token 已经过期
+  static const int tokenHasExpired = 1501;
+
+  /// token 无效
+  static const int tokenInvalid = 1502;
+
+  /// token 格式错误
+  static const int tokenFormatError = 1503;
+
+  /// token 还未生效
+  static const int tokenHasNotYetTakenEffect = 1504;
+
+  /// 未知 token 错误
+  static const int unknownTokenError = 1505;
+
+  /// 被踢出的 token，无效
+  static const int thekickedOutTokenIsInvalid = 1506;
+
+  /// token 不存在
+  static const int tokenNotExist = 1507;
+
+  /// 连接数超过网关最大限制
+  static const int connectionsExceedsMaximumLimit = 1601;
+
+  /// 连接握手参数错误
+  static const int handshakeParameterError = 1602;
+
+  /// 文件上传过期
+  static const int fileUploadExpired = 1701;
 }

lib/src/listener/organization_listener.dart

@@ -1,11 +0,0 @@
-// /// 组织架构监听
-// class OnOrganizationListener {
-//   Function()? onOrganizationUpdated;
-//
-//   OnOrganizationListener({this.onOrganizationUpdated});
-//
-//   /// 组织架构有更新
-//   void organizationUpdated() {
-//     onOrganizationUpdated?.call();
-//   }
-// }

lib/src/listener/put_file_listener.dart

@@ -1,32 +0,0 @@
-class OnPutFileListener {
-  Function(String putID, String hash, int total)? onHashComplete;
-  Function(String putID, int current, int total)? onHashProgress;
-  Function(String putID, int size)? onOpen;
-  Function(String putID, int total, int putType)? onPutComplete;
-  Function(String putID, int save, int current, int total)? onPutProgress;
-  Function(String putID, int current, int total)? onPutStart;
-
-  void hashComplete(String putID, String hash, int total) {
-    onHashComplete?.call(putID, hash, total);
-  }
-
-  void hashProgress(String putID, int current, int total) {
-    onHashProgress?.call(putID, current, total);
-  }
-
-  void open(String putID, int size) {
-    onOpen?.call(putID, size);
-  }
-
-  void putComplete(String putID, int total, int putType) {
-    onPutComplete?.call(putID, total, putType);
-  }
-
-  void putProgress(String putID, int save, int current, int total) {
-    onPutProgress?.call(putID, save, current, total);
-  }
-
-  void putStart(String putID, int current, int total) {
-    onPutStart?.call(putID, current, total);
-  }
-}

lib/src/listener/signaling_listener.dart

@@ -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);
-  }
-}

lib/src/listener/upload_file_listener.dart

@@ -0,0 +1,45 @@
+class OnUploadFileListener {
+  Function(String id, int size, String url, int type)? onComplete;
+  Function(String id, String partHash, String fileHash)? onHashPartComplete;
+  Function(String id, int index, int size, String partHash)? onHashPartProgress;
+  Function(String id, int size)? onOpen;
+  Function(String id, int partSize, int num)? onPartSize;
+  Function(String id, int fileSize, int streamSize, int storageSize)?
+      onUploadProgress;
+  Function(String id, String uploadID)? onUploadID;
+  Function(String id, int index, int partSize, String partHash)?
+      onUploadPartComplete;
+
+  void complete(String id, int size, String url, int type) {
+    onComplete?.call(id, size, url, type);
+  }
+
+  void hashPartComplete(String id, String partHash, String fileHash) {
+    onHashPartComplete?.call(id, partHash, fileHash);
+  }
+
+  void hashPartProgress(String id, int index, int size, String partHash) {
+    onHashPartProgress?.call(id, index, size, partHash);
+  }
+
+  void open(String id, int size) {
+    onOpen?.call(id, size);
+  }
+
+  void partSize(String id, int partSize, int num) {
+    onPartSize?.call(id, partSize, num);
+  }
+
+  void uploadProgress(
+      String id, int fileSize, int streamSize, int storageSize) {
+    onUploadProgress?.call(id, fileSize, streamSize, storageSize);
+  }
+
+  void uploadID(String id, String uploadID) {
+    onUploadID?.call(id, uploadID);
+  }
+
+  void uploadPartComplete(String id, int index, int partSize, String partHash) {
+    onUploadPartComplete?.call(id, index, partSize, partHash);
+  }
+}

lib/src/listener/workmoments_listener.dart

@@ -1,11 +0,0 @@
-// /// 朋友圈监听
-// class OnWorkMomentsListener {
-//   Function()? onRecvNewNotification;
-//
-//   OnWorkMomentsListener({this.onRecvNewNotification});
-//
-//   /// 朋友圈信息发送改变
-//   void recvNewNotification() {
-//     onRecvNewNotification?.call();
-//   }
-// }

lib/src/manager/im_conversation_manager.dart

@@ -304,6 +304,36 @@ class ConversationManager {
             "operationID": Utils.checkOperationID(operationID),
           }));
 
+  /// 开启定期删除
+  /// [isMsgDestruct] true 开启
+  Future<dynamic> setConversationIsMsgDestruct({
+    required String conversationID,
+    bool isMsgDestruct = true,
+    String? operationID,
+  }) =>
+      _channel.invokeMethod(
+          'setConversationIsMsgDestruct',
+          _buildParam({
+            "conversationID": conversationID,
+            "isMsgDestruct": isMsgDestruct,
+            "operationID": Utils.checkOperationID(operationID),
+          }));
+
+  /// 定期删除聊天记录
+  /// [duration] 秒
+  Future<dynamic> setConversationMsgDestructTime({
+    required String conversationID,
+    int duration = 1 * 24 * 60 * 60,
+    String? operationID,
+  }) =>
+      _channel.invokeMethod(
+          'setConversationMsgDestructTime',
+          _buildParam({
+            "conversationID": conversationID,
+            "duration": duration,
+            "operationID": Utils.checkOperationID(operationID),
+          }));
+
   /// 会话列表自定义排序规则。
   List<ConversationInfo> simpleSort(List<ConversationInfo> list) => list
     ..sort((a, b) {

lib/src/manager/im_manager.dart

@@ -13,20 +13,13 @@ 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;
+  OnUploadFileListener? _uploadFileListener;
   late String userID;
   late UserInfo userInfo;
   bool isLogined = false;
   String? token;
-  String? _objectStorage;
 
   IMManager(this._channel) {
     conversationManager = ConversationManager(_channel);
@@ -34,10 +27,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,81 +267,7 @@ class IMManager {
               friendshipManager.listener.friendInfoChanged(u);
               break;
           }
-        } else if (call.method == ListenerType.signalingListener) {
+        } else if (call.method == ListenerType.customBusinessListener) {
-          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) {
           String type = call.arguments['type'];
           String data = call.arguments['data'];
           switch (type) {
@@ -400,45 +315,61 @@ class IMManager {
               _listenerForService?.recvNewMessage(msg);
               break;
           }
-        } else if (call.method == ListenerType.putFileListener) {
+        } else if (call.method == ListenerType.uploadFileListener) {
           String type = call.arguments['type'];
           dynamic data = call.arguments['data'];
           switch (type) {
-            case 'hashComplete':
+            case 'complete':
-              String putID = data['putID'];
+              String id = data['id'];
-              String hash = data['hash'];
+              int size = data['size'];
-              int total = data['total'];
+              String url = data['url'];
-              _putFileListener?.hashComplete(putID, hash, total);
+              int type = data['type'];
+              _uploadFileListener?.complete(id, size, url, type);
               break;
-            case 'hashProgress':
+            case 'hashPartComplete':
-              String putID = data['putID'];
+              String id = data['id'];
-              int current = data['current'];
+              String partHash = data['partHash'];
-              int total = data['total'];
+              String fileHash = data['fileHash'];
-              _putFileListener?.hashProgress(putID, current, total);
+              _uploadFileListener?.hashPartComplete(id, partHash, fileHash);
+              break;
+            case 'hashPartProgress':
+              String id = data['id'];
+              int index = data['index'];
+              int size = data['size'];
+              String partHash = data['partHash'];
+              _uploadFileListener?.hashPartProgress(id, index, size, partHash);
               break;
             case 'open':
-              String putID = data['putID'];
+              String id = data['id'];
               int size = data['size'];
-              _putFileListener?.open(putID, size);
+              _uploadFileListener?.open(id, size);
               break;
-            case 'putComplete':
+            case 'partSize':
-              String putID = data['putID'];
+              String id = data['id'];
-              int putType = data['putType'];
+              int partSize = data['partSize'];
-              int total = data['total'];
+              int num = data['num'];
-              _putFileListener?.putComplete(putID, putType, total);
+              _uploadFileListener?.partSize(id, partSize, num);
               break;
-            case 'putProgress':
+            case 'uploadProgress':
-              String putID = data['putID'];
+              String id = data['id'];
-              int save = data['save'];
+              int fileSize = data['fileSize'];
-              int current = data['current'];
+              int streamSize = data['streamSize'];
-              int total = data['total'];
+              int storageSize = data['storageSize'];
-              _putFileListener?.putProgress(putID, save, current, total);
+              _uploadFileListener?.uploadProgress(
+                  id, fileSize, streamSize, storageSize);
               break;
-            case 'putStart':
+            case 'uploadID':
-              String putID = data['putID'];
+              String id = data['id'];
-              int current = data['current'];
+              String uploadID = data['uploadID'];
-              int total = data['total'];
+              _uploadFileListener?.uploadID(id, uploadID);
-              _putFileListener?.putStart(putID, current, total);
+              break;
+            case 'uploadPartComplete':
+              String id = data['id'];
+              int index = data['index'];
+              int partSize = data['partSize'];
+              String partHash = data['partHash'];
+              _uploadFileListener?.uploadPartComplete(
+                  id, index, partSize, partHash);
               break;
           }
         }
@@ -476,7 +407,6 @@ class IMManager {
     String? operationID,
   }) {
     this._connectListener = listener;
-    this._objectStorage = objectStorage;
     return _channel.invokeMethod(
         'initSDK',
         _buildParam(
@@ -553,8 +483,14 @@ class IMManager {
 
   /// 获取登录状态
   /// 1: logout 2: logging  3:logged
-  Future<int?> getLoginStatus() =>
+  Future<int?> getLoginStatus({
-      _channel.invokeMethod<int>('getLoginStatus', _buildParam({}));
+    String? operationID,
+  }) =>
+      _channel.invokeMethod<int>(
+          'getLoginStatus',
+          _buildParam({
+            'operationID': Utils.checkOperationID(operationID),
+          }));
 
   /// 获取当前登录用户id
   Future<String> getLoginUserID() async => userID;
@@ -562,19 +498,23 @@ class IMManager {
   /// 获取当前登录用户信息
   Future<UserInfo> getLoginUserInfo() async => userInfo;
 
-  ///
+  ///[id] 跟 [OnUploadFileListener] id一致，区分是哪个文件的回调
-  Future putFile({
+  Future uploadFile({
-    required String putID,
+    required String id,
     required String filePath,
     required String fileName,
+    String? contentType,
+    String? cause,
     String? operationID,
   }) =>
       _channel.invokeMethod(
-          'putFile',
+          'uploadFile',
           _buildParam({
-            'putID': putID,
+            'id': id,
             'filePath': filePath,
             'name': fileName,
+            'contentType': contentType,
+            'cause': cause,
             'operationID': Utils.checkOperationID(operationID),
           }));
 
@@ -613,8 +553,8 @@ class IMManager {
   //           'operationID': Utils.checkOperationID(operationID),
   //         }));
 
-  void setPutFileListener(OnPutFileListener listener) {
+  void setUploadFileListener(OnUploadFileListener listener) {
-    _putFileListener = listener;
+    _uploadFileListener = listener;
   }
 
   ///

lib/src/manager/im_offline_push_manager.dart

@@ -1,7 +0,0 @@
-// import 'package:flutter/services.dart';
-//
-// class OfflinePushManager{
-//   MethodChannel _channel;
-//
-//   OfflinePushManager(this._channel);
-// }

lib/src/manager/im_organization_manager.dart

@@ -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<List<DeptInfo>> 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<List<DeptMemberInfo>> 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<List<UserInDept>> 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<DeptMemberAndSubDept> 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<DeptInfo> 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<OrganizationSearchResult> 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;
-//   }
-// }

lib/src/manager/im_signaling_manager.dart

@@ -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<SignalingCertificate> 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<SignalingCertificate> 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<SignalingCertificate> 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<dynamic> signalingReject({
-    required SignalingInfo info,
-    String? operationID,
-  }) =>
-      _channel.invokeMethod(
-          'signalingReject',
-          _buildParam({
-            'signalingInfo': info.toJson(),
-            'operationID': Utils.checkOperationID(operationID),
-          }));
-
-  /// 邀请者取消音视频通话
-  /// [info] 信令对象[SignalingInfo]
-  Future<dynamic> signalingCancel({
-    required SignalingInfo info,
-    String? operationID,
-  }) =>
-      _channel.invokeMethod(
-          'signalingCancel',
-          _buildParam({
-            'signalingInfo': info.toJson(),
-            'operationID': Utils.checkOperationID(operationID),
-          }));
-
-  /// 挂断
-  /// [info] 信令对象[SignalingInfo]
-  Future<dynamic> signalingHungUp({
-    required SignalingInfo info,
-    String? operationID,
-  }) =>
-      _channel.invokeMethod(
-          'signalingHungUp',
-          _buildParam({
-            'signalingInfo': info.toJson(),
-            'operationID': Utils.checkOperationID(operationID),
-          }));
-
-  /// 获取当前群通话信息
-  /// [groupID] 当前群ID
-  Future<RoomCallingInfo> 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<SignalingCertificate> 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<String> addCanScreenUserIDList = const [],
-  ///  List<String> reduceCanScreenUserIDList = const [],
-  ///  List<String> addDisableMicrophoneUserIDList = const [],
-  ///  List<String> reduceDisableMicrophoneUserIDList = const [],
-  ///  List<String> addDisableVideoUserIDList = const [],
-  ///  List<String> reduceDisableVideoUserIDList = const [],
-  ///  List<String> addPinedUserIDList = const [],
-  ///  List<String> reducePinedUserIDList = const [],
-  ///  List<String> addBeWatchedUserIDList = const [],
-  ///  List<String> reduceBeWatchedUserIDList = const [],
-  Future<dynamic> 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<SignalingCertificate> signalingCreateMeeting({
-    required String meetingName,
-    String? meetingHostUserID,
-    int? startTime,
-    int? meetingDuration,
-    List<String> 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<SignalingCertificate> 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<dynamic> 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<MeetingInfoList> signalingGetMeetings({
-    String? operationID,
-  }) =>
-      _channel
-          .invokeMethod(
-              'signalingGetMeetings',
-              _buildParam({
-                'operationID': Utils.checkOperationID(operationID),
-              }))
-          .then((value) =>
-              Utils.toObj(value, (map) => MeetingInfoList.fromJson(map)));
-
-  /// 结束会议
-  /// [roomID] 会议ID
-  Future<dynamic> signalingCloseRoom({
-    required String roomID,
-    String? operationID,
-  }) =>
-      _channel.invokeMethod(
-          'signalingCloseRoom',
-          _buildParam({
-            'roomID': roomID,
-            'operationID': Utils.checkOperationID(operationID),
-          }));
-
-  /// 自定义信令
-  /// [roomID] 会议ID
-  /// [customInfo] 自定义信令
-  Future<dynamic> 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;
-  }
-}

lib/src/manager/im_workmoments_manager.dart

@@ -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<int> getWorkMomentsUnReadCount({
-//     String? operationID,
-//   }) =>
-//       _channel
-//           .invokeMethod(
-//               'getWorkMomentsUnReadCount',
-//               _buildParam({
-//                 'operationID': Utils.checkOperationID(operationID),
-//               }))
-//           .then((value) => Utils.toObj(value, (map) => map['unreadCount']));
-//
-//   /// 获取通知列表
-//   /// [offset] 开始下标
-//   /// [count] 每页大小
-//   Future<List<WorkMomentsInfo>> 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;
-//   }
-// }

lib/src/models/conversation_info.dart

@@ -51,8 +51,11 @@ class ConversationInfo {
   /// 可阅读期限 s
   int? burnDuration;
 
-  /// 附加内容
+  /// 是否开启定期销毁
-  String? ext;
+  bool? isMsgDestruct;
+
+  /// 定期销毁时间 s
+  int? msgDestructTime;
 
   /// 附加内容
   String? ex;
@@ -78,7 +81,9 @@ class ConversationInfo {
     this.isPinned,
     this.isNotInGroup,
     this.ex,
-    this.ext,
+    this.groupAtType,
+    this.isMsgDestruct,
+    this.msgDestructTime,
   });
 
   ConversationInfo.fromJson(Map<String, dynamic> json)
@@ -106,7 +111,8 @@ class ConversationInfo {
     isNotInGroup = json['isNotInGroup'];
     groupAtType = json['groupAtType'];
     ex = json['ex'];
-    ext = json['ext'];
+    isMsgDestruct = json['isMsgDestruct'];
+    msgDestructTime = json['msgDestructTime'];
   }
 
   Map<String, dynamic> toJson() {
@@ -129,7 +135,8 @@ class ConversationInfo {
     data['isNotInGroup'] = this.isNotInGroup;
     data['groupAtType'] = this.groupAtType;
     data['ex'] = this.ex;
-    data['ext'] = this.ext;
+    data['isMsgDestruct'] = this.isMsgDestruct;
+    data['msgDestructTime'] = this.msgDestructTime;
     return data;
   }
 

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<String>? beWatchedUserIDList; // 正在被观看用户列表
 
   MeetingInfo({
-    this.meetingID,
+    this.roomID,
     this.meetingName,
     this.ex,
     this.hostUserID,
@@ -70,7 +70,7 @@ class MeetingInfo {
   });
 
   MeetingInfo.fromJson(Map<String, dynamic> json) {
-    meetingID = json['meetingID'];
+    roomID = json['roomID'];
     meetingName = json['meetingName'];
     ex = json['ex'];
     hostUserID = json['hostUserID'];
@@ -107,7 +107,7 @@ class MeetingInfo {
 
   Map<String, dynamic> toJson() {
     final data = <String, dynamic>{};
-    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<String, dynamic> json) {
-    meetingID = json['meetingID'];
+    roomID = json['roomID'];
     streamType = json['streamType'];
     mute = json['mute'];
   }
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
-    data['meetingID'] = this.meetingID;
+    data['roomID'] = this.roomID;
     data['streamType'] = this.streamType;
     data['mute'] = this.mute;
     return data;

lib/src/models/signaling_info.dart

@@ -4,7 +4,7 @@ import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
 
 class SignalingInfo {
   /// 操作者
-  String? opUserID;
+  String? userID;
 
   /// 邀请信息
   InvitationInfo? invitation;
@@ -13,24 +13,24 @@ class SignalingInfo {
   OfflinePushInfo? offlinePushInfo;
 
   SignalingInfo({
-    this.opUserID,
+    this.userID,
     this.invitation,
     this.offlinePushInfo,
   });
 
   SignalingInfo.fromJson(Map<String, dynamic> json) {
-    opUserID = json['opUserID'];
     invitation = json['invitation'] == null
         ? null
         : InvitationInfo.fromJson(json['invitation']);
     offlinePushInfo = json['offlinePushInfo'] == null
         ? null
         : OfflinePushInfo.fromJson(json['offlinePushInfo']);
+    userID = json['userID'] ?? invitation?.inviterUserID;
   }
 
   Map<String, dynamic> toJson() {
     final data = Map<String, dynamic>();
-    data['opUserID'] = this.opUserID;
+    data['userID'] = this.userID;
     data['invitation'] = this.invitation?.toJson();
     data['offlinePushInfo'] = this.offlinePushInfo?.toJson();
     return data;
@@ -78,7 +78,7 @@ class InvitationInfo {
 
   InvitationInfo.fromJson(Map<String, dynamic> json) {
     inviterUserID = json['inviterUserID'];
-    inviteeUserIDList = json['inviteeUserIDList'].cast<String>();
+    inviteeUserIDList = json['inviteeUserIDList']?.cast<String>();
     groupID = json['groupID'];
     roomID = json['roomID'];
     timeout = json['timeout'];

lib/src/models/user_info.dart

@@ -188,8 +188,6 @@ class UserInfo {
 
   int? get _birth => friendInfo?.birth;
 
-  String? get _birthTime => friendInfo?.birthTime;
-
   String? get _email => friendInfo?.email;
 
   String? get _remark => friendInfo?.remark;
@@ -280,9 +278,6 @@ class FriendInfo {
   String? phoneNumber;
 
   /// 出生日期
-  String? birthTime;
-
-  /// 使用[birthTime]
   int? birth;
 
   /// 邮箱
@@ -310,7 +305,6 @@ class FriendInfo {
     this.gender,
     this.phoneNumber,
     this.birth,
-    this.birthTime,
     this.email,
     this.remark,
     this.ex,
@@ -331,7 +325,6 @@ class FriendInfo {
     gender = json['gender'];
     phoneNumber = json['phoneNumber'];
     birth = json['birth'];
-    birthTime = json['birthTime'];
     email = json['email'];
     ex = json['ex'];
   }
@@ -349,7 +342,6 @@ class FriendInfo {
     data['gender'] = this.gender;
     data['phoneNumber'] = this.phoneNumber;
     data['birth'] = this.birth;
-    data['birthTime'] = this.birthTime;
     data['email'] = this.email;
     data['ex'] = this.ex;
     return data;

lib/src/models/workmoments_info.dart

@@ -1,56 +0,0 @@
-// class WorkMomentsInfo {
-//   int? notificationMsgType;
-//   String? replyUserName;
-//   String? replyUserID;
-//   String? content;
-//   String? contentID;
-//   String? workMomentID;
-//   String? userID;
-//   String? userName;
-//   String? faceURL;
-//   String? workMomentContent;
-//   int? createTime;
-//
-//   WorkMomentsInfo(
-//       {this.notificationMsgType,
-//       this.replyUserName,
-//       this.replyUserID,
-//       this.content,
-//       this.contentID,
-//       this.workMomentID,
-//       this.userID,
-//       this.userName,
-//       this.faceURL,
-//       this.workMomentContent,
-//       this.createTime});
-//
-//   WorkMomentsInfo.fromJson(Map<String, dynamic> json) {
-//     notificationMsgType = json['notificationMsgType'];
-//     replyUserName = json['replyUserName'];
-//     replyUserID = json['replyUserID'];
-//     content = json['content'];
-//     contentID = json['contentID'];
-//     workMomentID = json['workMomentID'];
-//     userID = json['userID'];
-//     userName = json['userName'];
-//     faceURL = json['faceURL'];
-//     workMomentContent = json['workMomentContent'];
-//     createTime = json['createTime'];
-//   }
-//
-//   Map<String, dynamic> toJson() {
-//     final Map<String, dynamic> data = new Map<String, dynamic>();
-//     data['notificationMsgType'] = this.notificationMsgType;
-//     data['replyUserName'] = this.replyUserName;
-//     data['replyUserID'] = this.replyUserID;
-//     data['content'] = this.content;
-//     data['contentID'] = this.contentID;
-//     data['workMomentID'] = this.workMomentID;
-//     data['userID'] = this.userID;
-//     data['userName'] = this.userName;
-//     data['faceURL'] = this.faceURL;
-//     data['workMomentContent'] = this.workMomentContent;
-//     data['createTime'] = this.createTime;
-//     return data;
-//   }
-// }

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: