no message

# Conflicts:
#	android/build.gradle
#	ios/flutter_openim_sdk.podspec

CHANGELOG.md

@@ -1,3 +1,23 @@
+## 3.8.2
+
+- [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.8.2)
+  
+## 3.8.1+2
+
+- [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.8.1)
+
+## 3.8.1+1
+
+- [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.8.1)
+
+## 3.8.1
+
+- [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.8.1)
+
+## 3.8.1-rc.0
+
+- [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.8.1-rc.0)
+
 ## 3.8.0
 
 - [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.8.0)
@@ -5,7 +25,7 @@
 ## 3.8.0-rc.16
 
 - [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.8.0-rc.16)
-- 
+
 ## 3.5.1
 
 - [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.5.1)

android/build.gradle

@@ -3,7 +3,6 @@ version '1.0'
 
 def dir = getCurrentProjectDir()
 
-// 将aar放到libs，本地仓库替换远程仓库
 def getCurrentProjectDir() {
     String result = ""
     rootProject.allprojects { project ->
@@ -16,20 +15,25 @@ def getCurrentProjectDir() {
 
 buildscript {
     repositories {
+        maven { url 'https://maven.aliyun.com/repository/public' }
+        maven { url 'https://maven.aliyun.com/repository/central' }
+        maven { url 'https://maven.aliyun.com/nexus/content/repositories/google' }
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.4'
+        classpath 'com.android.tools.build:gradle:7.3.1'
     }
 }
 
 rootProject.allprojects {
     repositories {
-        // 将aar放到libs，本地仓库替换远程仓库
+        maven {
-//        maven { url "$dir/libs" }
+            url 'http://192.168.77.132:8081/repository/mvn2-group'
-        maven { url 'https://open-im-online.rentsoft.cn:51000/repository/maven2/' }
+            allowInsecureProtocol true
+        }
         google()
         mavenCentral()
     }
@@ -38,10 +42,13 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 21
+        ndk {
+            abiFilters "arm64-v8a","x86" // 根据需要添加其他 ABI
+        }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -50,7 +57,5 @@ android {
 }
 
 dependencies {
-    // 本地依赖，现将aar复制到libs/io/openim/core-sdk/0.0.1/ 下，命名core-sdk-0.0.1.aar
+    implementation 'com.openim:sdkcore:1.0.14'
-//    implementation 'io.openim:core-sdk:0.0.1@aar'
-    implementation 'io.openim:core-sdk:3.8.0@aar'
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Tue Nov 12 14:22:37 CST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

android/src/main/java/io/openim/flutter_openim_sdk/FlutterOpenimSdkPlugin.java

@@ -24,7 +24,7 @@ import io.openim.flutter_openim_sdk.manager.GroupManager;
 import io.openim.flutter_openim_sdk.manager.IMManager;
 import io.openim.flutter_openim_sdk.manager.MessageManager;
 import io.openim.flutter_openim_sdk.manager.UserManager;
-
+import io.openim.flutter_openim_sdk.manager.ChannelManager;
 
 /**
  * FlutterOpenimSdkPlugin
@@ -42,6 +42,7 @@ public class FlutterOpenimSdkPlugin implements FlutterPlugin, MethodCallHandler,
     private static MessageManager messageManager;
     private static ConversationManager conversationManager;
     private static GroupManager groupManager;
+    private static ChannelManager channelManager;
     private static Activity activity;
     private static Context context;
     private ConnectivityListener connectivityListener;
@@ -55,6 +56,8 @@ public class FlutterOpenimSdkPlugin implements FlutterPlugin, MethodCallHandler,
         FlutterOpenimSdkPlugin.messageManager = new MessageManager();
         FlutterOpenimSdkPlugin.conversationManager = new ConversationManager();
         FlutterOpenimSdkPlugin.groupManager = new GroupManager();
+        FlutterOpenimSdkPlugin.channelManager = new ChannelManager();
+
     }
 
 

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

@@ -29,6 +29,14 @@ public class OnAdvancedMsgListener implements open_im_sdk_callback.OnAdvancedMsg
         CommonUtil.emitEvent("advancedMsgListener", "onNewRecvMessageRevoked", values);
     }
 
+    @Override
+    public void onNewRecvMessageEdited(String s) {
+        final Map<String, String> values = new ArrayMap<>();
+        values.put("id", id);
+        values.put("messageEdited", s);
+        CommonUtil.emitEvent("advancedMsgListener", "onNewRecvMessageEdited", values);
+    }
+
     @Override
     public void onRecvC2CReadReceipt(String s) {
         final Map<String, String> values = new ArrayMap<>();
@@ -37,42 +45,6 @@ public class OnAdvancedMsgListener implements open_im_sdk_callback.OnAdvancedMsg
         CommonUtil.emitEvent("advancedMsgListener", "onRecvC2CReadReceipt", values);
     }
 
-    @Override
-    public void onRecvGroupReadReceipt(String s) {
-        final Map<String, String> values = new ArrayMap<>();
-        values.put("id", id);
-        values.put("groupMsgReceiptList", s);
-        CommonUtil.emitEvent("advancedMsgListener", "onRecvGroupReadReceipt", values);
-    }
-
-
-    @Override
-    public void onRecvMessageExtensionsAdded(String s, String s1) {
-        final Map<String, String> values = new ArrayMap<>();
-        values.put("id", id);
-        values.put("msgID", s);
-        values.put("reactionExtensionList", s1);
-        CommonUtil.emitEvent("advancedMsgListener", "onRecvMessageExtensionsAdded", values);
-    }
-
-    @Override
-    public void onRecvMessageExtensionsChanged(String s, String s1) {
-        final Map<String, String> values = new ArrayMap<>();
-        values.put("id", id);
-        values.put("msgID", s);
-        values.put("reactionExtensionList", s1);
-        CommonUtil.emitEvent("advancedMsgListener", "onRecvMessageExtensionsChanged", values);
-    }
-
-    @Override
-    public void onRecvMessageExtensionsDeleted(String s, String s1) {
-        final Map<String, String> values = new ArrayMap<>();
-        values.put("id", id);
-        values.put("msgID", s);
-        values.put("reactionExtensionKeyList", s1);
-        CommonUtil.emitEvent("advancedMsgListener", "onRecvMessageExtensionsDeleted", values);
-    }
-
     @Override
     public void onRecvNewMessage(String s) {
         final Map<String, String> values = new ArrayMap<>();

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

@@ -19,13 +19,15 @@ public class OnBaseListener implements Base {
 
     @Override
     public void onError(int l, String s) {
-        Log.i("F-OpenIMSDK(native call flutter)", "method: 【 " + call.method + " 】, onError: { code:" + l + ", message:" + s + "}");
+        String threadName = Thread.currentThread().getName();
+        Log.i("F-OpenIMSDK(native call flutter)", "thread: " + threadName + " method: 【 " + call.method + " 】, onError: { code:" + l + ", message:" + s + "}");
         CommonUtil.runMainThreadReturnError(result, l, s, null);
     }
 
     @Override
     public void onSuccess(String s) {
-        Log.i("F-OpenIMSDK(native call flutter)", "method: 【 " + call.method + " 】, onSuccess: " + s);
+        String threadName = Thread.currentThread().getName();
+        Log.i("F-OpenIMSDK(native call flutter)", "thread: " + threadName + " method: 【 " + call.method + " 】, onSuccess: " + s);
         CommonUtil.runMainThreadReturn(result, s);
     }
 }

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

@@ -0,0 +1,32 @@
+package io.openim.flutter_openim_sdk.listener;
+
+import io.openim.flutter_openim_sdk.util.CommonUtil;
+
+public class OnChannelListener implements open_im_sdk_callback.OnChannelListener {
+
+    @Override
+    public void onChannelDismissed(String s) {
+        CommonUtil.emitEvent("channelListener", "onChannelDismissed", s);
+    }
+
+    @Override
+    public void onChannelInfoChanged(String s) {
+        CommonUtil.emitEvent("channelListener", "onChannelInfoChanged", s);
+    }
+
+    @Override
+    public void onChannelMemberAdded(String s) {
+        CommonUtil.emitEvent("channelListener", "onChannelMemberAdded", s);
+    }
+
+    @Override
+    public void onChannelMemberDeleted(String s) {
+        CommonUtil.emitEvent("channelListener", "onChannelMemberDeleted", s);
+    }
+
+    @Override
+    public void onChannelMemberInfoChanged(String s) {
+        CommonUtil.emitEvent("channelListener", "onChannelMemberInfoChanged", s);
+    }
+
+}

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

@@ -2,6 +2,7 @@ package io.openim.flutter_openim_sdk.listener;
 
 import io.openim.flutter_openim_sdk.util.CommonUtil;
 
+
 public class OnConversationListener implements open_im_sdk_callback.OnConversationListener {
 
     @Override

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

@@ -24,66 +24,6 @@
 //    }
 //
 //    @Override
-//    public void onHangUp(String s) {
-//
-//    }
-//
-//    @Override
-//    public void onInvitationCancelled(String s) {
-//
-//    }
-//
-//    @Override
-//    public void onInvitationTimeout(String s) {
-//
-//    }
-//
-//    @Override
-//    public void onInviteeAccepted(String s) {
-//
-//    }
-//
-//    @Override
-//    public void onInviteeAcceptedByOtherDevice(String s) {
-//
-//    }
-//
-//    @Override
-//    public void onInviteeRejected(String s) {
-//
-//    }
-//
-//    @Override
-//    public void onInviteeRejectedByOtherDevice(String s) {
-//
-//    }
-//
-//    @Override
-//    public void onReceiveCustomSignal(String s) {
-//
-//    }
-//
-//    @Override
-//    public void onReceiveNewInvitation(String s) {
-//
-//    }
-//
-//    @Override
-//    public void onRoomParticipantConnected(String s) {
-//
-//    }
-//
-//    @Override
-//    public void onRoomParticipantDisconnected(String s) {
-//
-//    }
-//
-//    @Override
-//    public void onStreamChange(String s) {
-//
-//    }
-//
-//    @Override
 //    public void onRecvNewMessage(String s) {
 //        CommonUtil.emitEvent("listenerForService", "onRecvNewMessage", s);
 //    }

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

@@ -0,0 +1,103 @@
+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.OnChannelListener;
+import open_im_sdk.Open_im_sdk;
+
+public class ChannelManager extends BaseManager {
+
+    public void setChannelListener(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.setChannelListener(new OnChannelListener());
+
+        result.success(null);
+    }
+
+
+    public void getChannelMembersInfo(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.getSpecifiedChannelMembersInfo(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                value(methodCall, "channelID"),
+                jsonValue(methodCall, "userIDList")
+        );
+    }
+
+    public void getChannelMemberList(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.getChannelMemberList(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                value(methodCall, "channelID"),
+                value(methodCall, "filter"),
+                value(methodCall, "offset"),
+                value(methodCall, "count")
+        );
+    }
+
+
+    public void getChannelsInfo(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.getSpecifiedChannelsInfo(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                jsonValue(methodCall, "channelIDList")
+        );
+    }
+
+    public void joinChannel(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.joinChannel(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                value(methodCall, "channelID"),
+                value(methodCall, "reason"),
+                value(methodCall, "joinSource"),
+                value(methodCall, "ex")
+        );
+    }
+
+    public void quitChannel(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.quitChannel(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                value(methodCall, "channelID")
+        );
+    }
+
+
+
+    public void changeChannelMute(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.changeChannelMute(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                value(methodCall, "channelID"),
+                value(methodCall, "mute")
+        );
+    }
+
+    public void changeChannelMemberMute(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.changeChannelMemberMute(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                value(methodCall, "channelID"),
+                value(methodCall, "userID"),
+                int2long(methodCall, "seconds")
+        );
+    }
+
+
+
+    public void isJoinChannel(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.isJoinChannel(new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                value(methodCall, "channelID")
+        );
+    }
+
+    public  void getUsersInChannel(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.getUsersInChannel(new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                value(methodCall, "channelID"),
+                jsonValue(methodCall, "userIDs")
+        );
+    }
+}

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

@@ -59,15 +59,6 @@ public class ConversationManager extends BaseManager {
         );
     }
 
-    public void pinConversation(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.pinConversation(
-                new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID"),
-                value(methodCall, "conversationID"),
-                value(methodCall, "isPinned")
-        );
-    }
-
     public void hideConversation(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.hideConversation(
                 new OnBaseListener(result, methodCall),
@@ -98,32 +89,6 @@ public class ConversationManager extends BaseManager {
                 int2long(methodCall, "sessionType")));
     }
 
-    public void setConversationRecvMessageOpt(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.setConversationRecvMessageOpt(
-                new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID"),
-                value(methodCall, "conversationID"),
-                int2long(methodCall, "status")
-        );
-    }
-
-    public void getConversationRecvMessageOpt(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.getConversationRecvMessageOpt(
-                new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID"),
-                jsonValue(methodCall, "conversationIDList")
-        );
-    }
-
-    public void setConversationPrivateChat(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.setConversationPrivateChat(
-                new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID"),
-                value(methodCall, "conversationID"),
-                value(methodCall, "isPrivate")
-        );
-    }
-
     public void clearConversationAndDeleteAllMsg(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.clearConversationAndDeleteAllMsg(
                 new OnBaseListener(result, methodCall),
@@ -140,56 +105,10 @@ public class ConversationManager extends BaseManager {
         );
     }
 
-    public void deleteAllConversationFromLocal(MethodCall methodCall, MethodChannel.Result result) {
-    }
-
-    public void resetConversationGroupAtType(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.resetConversationGroupAtType(
-                new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID"),
-                value(methodCall, "conversationID")
-        );
-    }
-
     public void getAtAllTag(MethodCall methodCall, MethodChannel.Result result) {
         CommonUtil.runMainThreadReturn(result, Open_im_sdk.getAtAllTag(value(methodCall, "operationID")));
     }
 
-    public void setGlobalRecvMessageOpt(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.setGlobalRecvMessageOpt(
-                new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID"),
-                int2long(methodCall, "status")
-        );
-    }
-
-    public void setConversationBurnDuration(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.setConversationBurnDuration(
-                new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID"),
-                value(methodCall, "conversationID"),
-                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")
-        );
-    }
-
     public void hideAllConversations(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.hideAllConversations(
                 new OnBaseListener(result, methodCall),
@@ -205,12 +124,39 @@ public class ConversationManager extends BaseManager {
         );
     }
 
-    public void setConversationEx(MethodCall methodCall, MethodChannel.Result result) {
+    public void changeInputStates(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.setConversationEx(
+        Open_im_sdk.changeInputStates(
                 new OnBaseListener(result, methodCall),
                 value(methodCall, "operationID"),
                 value(methodCall, "conversationID"),
-                value(methodCall, "ex")
+                value(methodCall, "focus")
+        );
+    }
+
+    public void getInputStates(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.getInputStates(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                value(methodCall, "conversationID"),
+                value(methodCall, "userID")
+        );
+    }
+
+    public void setConversation(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.setConversation(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                value(methodCall, "conversationID"),
+                jsonValue(methodCall, "req")
+        );
+    }
+
+
+    public void searchConversations(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.searchConversation(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                value(methodCall, "name")
         );
     }
 }

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

@@ -19,7 +19,8 @@ public class FriendshipManager extends BaseManager {
         Open_im_sdk.getSpecifiedFriendsInfo(
                 new OnBaseListener(result, methodCall),
                 value(methodCall, "operationID"),
-                jsonValue(methodCall, "userIDList")
+                jsonValue(methodCall, "userIDList"),
+                value(methodCall, "filterBlack")
         );
     }
 
@@ -48,7 +49,8 @@ public class FriendshipManager extends BaseManager {
     public void getFriendList(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.getFriendList(
                 new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID")
+                value(methodCall, "operationID"),
+                value(methodCall, "filterBlack")
         );
     }
 
@@ -57,15 +59,8 @@ public class FriendshipManager extends BaseManager {
                 new OnBaseListener(result, methodCall),
                 value(methodCall, "operationID"),
                 value(methodCall, "offset"),
-                value(methodCall, "count")
+                value(methodCall, "count"),
-        );
+                value(methodCall, "filterBlack")
-    }
-
-    public void setFriendRemark(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.setFriendRemark(
-                new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID"),
-                jsonValue(methodCall)
         );
     }
 
@@ -133,12 +128,11 @@ public class FriendshipManager extends BaseManager {
         );
     }
 
-    public void setFriendsEx(MethodCall methodCall, MethodChannel.Result result) {
+    public void updateFriends(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.setFriendsEx(
+        Open_im_sdk.updateFriends(
                 new OnBaseListener(result, methodCall),
                 value(methodCall, "operationID"),
-                jsonValue(methodCall, "friendIDs"),
+                jsonValue(methodCall, "req")
-                value(methodCall, "ex")
         );
     }
 }

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

@@ -186,15 +186,6 @@ public class GroupManager extends BaseManager {
         );
     }
 
-    public void setGroupMemberNickname(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.setGroupMemberNickname(new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID"),
-                value(methodCall, "groupID"),
-                value(methodCall, "userID"),
-                value(methodCall, "groupNickname")
-        );
-    }
-
     public void searchGroups(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.searchGroups(new OnBaseListener(result, methodCall),
                 value(methodCall, "operationID"),
@@ -202,15 +193,6 @@ public class GroupManager extends BaseManager {
         );
     }
 
-    public void setGroupMemberRoleLevel(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.setGroupMemberRoleLevel(new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID"),
-                value(methodCall, "groupID"),
-                value(methodCall, "userID"),
-                int2long(methodCall, "roleLevel")
-        );
-    }
-
     public void getGroupMemberListByJoinTimeFilter(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.getGroupMemberListByJoinTimeFilter(new OnBaseListener(result, methodCall),
                 value(methodCall, "operationID"),
@@ -223,30 +205,6 @@ public class GroupManager extends BaseManager {
         );
     }
 
-    public void setGroupVerification(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.setGroupVerification(new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID"),
-                value(methodCall, "groupID"),
-                value(methodCall, "needVerification")
-        );
-    }
-
-    public void setGroupLookMemberInfo(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.setGroupLookMemberInfo(new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID"),
-                value(methodCall, "groupID"),
-                value(methodCall, "status")
-        );
-    }
-
-    public void setGroupApplyMemberFriend(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.setGroupApplyMemberFriend(new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID"),
-                value(methodCall, "groupID"),
-                value(methodCall, "status")
-        );
-    }
-
     public void getGroupMemberOwnerAndAdmin(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.getGroupMemberOwnerAndAdmin(new OnBaseListener(result, methodCall),
                 value(methodCall, "operationID"),

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

@@ -73,6 +73,19 @@ public class IMManager extends BaseManager {
         );
     }
 
+    public void logs(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.logs(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                int2long(methodCall, "logLevel"),
+                value(methodCall, "file"),
+                int2long(methodCall, "line"),
+                value(methodCall, "msgs"),
+                value(methodCall, "err"),
+                value(methodCall, "keyAndValue")
+        );
+    }
+
     public void setAppBackgroundStatus(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.setAppBackgroundStatus(
                 new OnBaseListener(result, methodCall),

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

@@ -27,6 +27,7 @@ public class MessageManager extends BaseManager {
                 jsonValue(methodCall, "message"),
                 value(methodCall, "userID"),
                 value(methodCall, "groupID"),
+                value(methodCall, "channelID"),
                 jsonValue(methodCall, "offlinePushInfo"),
                 value(methodCall, "isOnlineOnly")
         );
@@ -41,6 +42,16 @@ public class MessageManager extends BaseManager {
         );
     }
 
+    public void editMessage(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.editMessage(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                value(methodCall, "conversationID"),
+                value(methodCall, "clientMsgID"),
+                jsonValue(methodCall, "message")
+        );
+    }
+
     public void deleteMessageFromLocalStorage(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.deleteMessageFromLocalStorage(
                 new OnBaseListener(result, methodCall),
@@ -89,6 +100,7 @@ public class MessageManager extends BaseManager {
                 value(methodCall, "operationID"),
                 jsonValue(methodCall, "message"),
                 value(methodCall, "groupID"),
+                value(methodCall, "channelID"),
                 value(methodCall, "senderID")
         );
     }
@@ -339,6 +351,7 @@ public class MessageManager extends BaseManager {
                 jsonValue(methodCall, "message"),
                 value(methodCall, "userID"),
                 value(methodCall, "groupID"),
+                value(methodCall, "channelId"),
                 jsonValue(methodCall, "offlinePushInfo"),
                 value(methodCall, "isOnlineOnly")
         );
@@ -375,6 +388,16 @@ public class MessageManager extends BaseManager {
                         jsonValue(methodCall, "fileElem")));
     }
 
+    public void fetchSurroundingMessages(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.fetchSurroundingMessages(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                jsonValue(methodCall, "message"),
+                int2long(methodCall, "before"),
+                int2long(methodCall, "after"));
+    }
+
+
     public void setCustomBusinessListener(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.setCustomBusinessListener(new OnCustomBusinessListener());
 

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

@@ -61,20 +61,4 @@ public class UserManager extends BaseManager {
                 value(methodCall, "operationID"),
                 jsonValue(methodCall, "userIDs"));
     }
-
-    public void getUsersInfoWithCache(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.getUsersInfoWithCache(
-                new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID"),
-                jsonValue(methodCall, "userIDs"),
-                value(methodCall, "groupID"));
-    }
-    /*
-    public void setSelfInfoEx(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.setSelfInfoEx(
-                new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID"),
-                jsonValue(methodCall));
-    }
-     */
 }

android/src/main/java/io/openim/flutter_openim_sdk/util/CommonUtil.java

@@ -33,6 +33,7 @@ public class CommonUtil {
     }
 
     public synchronized static <T> void emitEvent(String method, String type, Object errCode, String errMsg, T data) {
+        String threadName = Thread.currentThread().getName();
         runMainThread(() -> {
             Map<String, Object> res = new ArrayMap<>();
             if (null != type) {
@@ -47,8 +48,26 @@ public class CommonUtil {
             if (null != errMsg) {
                 res.put("errMsg", errMsg);
             }
-            Log.i("F-OpenIMSDK(native call flutter)", "{ method:" + method + ",  type:" + type + " }");
+            Log.i("F-OpenIMSDK(native call flutter)", "thread: " + threadName + " { method:" + method + ",  type:" + type + " }");
-            FlutterOpenimSdkPlugin.channel.invokeMethod(method, res);
+            FlutterOpenimSdkPlugin.channel.invokeMethod(method, res, new MethodChannel.Result() {
+                @Override
+                public void success(Object result) {
+                    // 处理成功返回值
+                    Log.i("F-OpenIMSDK(native call flutter)", "Method " + method + " returned: ");
+                }
+
+                @Override
+                public void error(String errorCode, String errorMessage, Object errorDetails) {
+                    // 处理错误
+                    Log.e("F-OpenIMSDK(native call flutter)", "Method " + method + " error: " + errorCode + ", " + errorMessage);
+                }
+
+                @Override
+                public void notImplemented() {
+                    // 处理未实现的方法
+                    Log.w("F-OpenIMSDK(native call flutter)", "Method " + method + " not implemented");
+                }
+            });
         });
     }
 

example/.gitignore

@@ -8,6 +8,7 @@
 .buildlog/
 .history
 .svn/
+migrate_working_dir/
 
 # IntelliJ related
 *.iml
@@ -26,14 +27,10 @@
 .dart_tool/
 .flutter-plugins
 .flutter-plugins-dependencies
-.packages
 .pub-cache/
 .pub/
 /build/
 
-# Web related
-lib/generated_plugin_registrant.dart
-
 # Symbolication related
 app.*.symbols
 

example/.metadata

@@ -4,7 +4,42 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: b22742018b3edf16c6cadd7b76d9db5e7f9064b5
+  revision: "b0850beeb25f6d5b10426284f506557f66181b36"
-  channel: stable
+  channel: "stable"
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: b0850beeb25f6d5b10426284f506557f66181b36
+      base_revision: b0850beeb25f6d5b10426284f506557f66181b36
+    - platform: android
+      create_revision: b0850beeb25f6d5b10426284f506557f66181b36
+      base_revision: b0850beeb25f6d5b10426284f506557f66181b36
+    - platform: ios
+      create_revision: b0850beeb25f6d5b10426284f506557f66181b36
+      base_revision: b0850beeb25f6d5b10426284f506557f66181b36
+    - platform: linux
+      create_revision: b0850beeb25f6d5b10426284f506557f66181b36
+      base_revision: b0850beeb25f6d5b10426284f506557f66181b36
+    - platform: macos
+      create_revision: b0850beeb25f6d5b10426284f506557f66181b36
+      base_revision: b0850beeb25f6d5b10426284f506557f66181b36
+    - platform: web
+      create_revision: b0850beeb25f6d5b10426284f506557f66181b36
+      base_revision: b0850beeb25f6d5b10426284f506557f66181b36
+    - platform: windows
+      create_revision: b0850beeb25f6d5b10426284f506557f66181b36
+      base_revision: b0850beeb25f6d5b10426284f506557f66181b36
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

example/README.md

@@ -1,6 +1,6 @@
-# flutter_openim_sdk_example
+# example
 
-Demonstrates how to use the flutter_openim_sdk plugin.
+A new Flutter project.
 
 ## Getting Started
 
@@ -8,9 +8,9 @@ This project is a starting point for a Flutter application.
 
 A few resources to get you started if this is your first Flutter project:
 
-- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab)
+- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook)
+- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
 
-For help getting started with Flutter, view our
+For help getting started with Flutter development, view the
-[online documentation](https://flutter.dev/docs), which offers tutorials,
+[online documentation](https://docs.flutter.dev/), which offers tutorials,
 samples, guidance on mobile development, and a full API reference.

example/analysis_options.yaml

@@ -0,0 +1,28 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at https://dart.dev/lints.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

example/android/.gitignore

@@ -9,3 +9,5 @@ GeneratedPluginRegistrant.java
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
 key.properties
+**/*.keystore
+**/*.jks

example/android/app/build.gradle

@@ -1,69 +1,58 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
+def localPropertiesFile = rootProject.file("local.properties")
 if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
+    localPropertiesFile.withReader("UTF-8") { reader ->
         localProperties.load(reader)
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
+def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
+    flutterVersionCode = "1"
 }
 
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
+def flutterVersionName = localProperties.getProperty("flutter.versionName")
 if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
+    flutterVersionName = "1.0"
 }
 
-apply plugin: 'com.android.application'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    compileSdkVersion 30
+    namespace = "com.example.example"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "io.openim.flutter_openim_sdk_example"
+        applicationId = "com.example.example"
-        minSdkVersion 21
+        // You can update the following values to match your application needs.
-        targetSdkVersion 30
+        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        versionCode flutterVersionCode.toInteger()
+        minSdk = flutter.minSdkVersion
-        versionName flutterVersionName
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutterVersionCode.toInteger()
+        versionName = flutterVersionName
     }
 
     buildTypes {
-        debug {
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
-            // signingConfig signingConfigs.debug
+            signingConfig = signingConfigs.debug
-
-            signingConfig signingConfigs.debug
-
-            minifyEnabled false
-            shrinkResources false
-
-            useProguard true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    repositories{
-        flatDir {
-            dirs 'libs'
         }
     }
 }
-dependencies {
 
-}
 flutter {
-    source '../..'
+    source = "../.."
 }

example/android/app/src/debug/AndroidManifest.xml

@@ -1,6 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="io.openim.flutter_openim_sdk_example">
+    <!-- The INTERNET permission is required for development. Specifically,
-    <!-- Flutter needs it to communicate with the running application
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

example/android/app/src/main/AndroidManifest.xml

@@ -1,11 +1,13 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="io.openim.flutter_openim_sdk_example">
+    <application
-   <application
+        android:label="example"
-        android:label="flutter_openim_sdk_example"
+        android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
+            android:taskAffinity=""
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
@@ -18,15 +20,6 @@
               android:name="io.flutter.embedding.android.NormalTheme"
               android:resource="@style/NormalTheme"
               />
-            <!-- Displays an Android View that continues showing the launch screen
-                 Drawable until Flutter paints its first frame, then this splash
-                 screen fades out. A splash screen is useful to avoid any visual
-                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -38,4 +31,15 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
+    <!-- Required to query activities that can process text, see:
+         https://developer.android.com/training/package-visibility and
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
+        </intent>
+    </queries>
 </manifest>

example/android/app/src/main/java/io/openim/flutter_openim_sdk_example/MainActivity.java

@@ -1,6 +0,0 @@
-package io.openim.flutter_openim_sdk_example;
-
-import io.flutter.embedding.android.FlutterActivity;
-
-public class MainActivity extends FlutterActivity {
-}

example/android/app/src/main/kotlin/com/example/example/MainActivity.kt

@@ -0,0 +1,5 @@
+package com.example.example
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity()

example/android/app/src/main/res/values-night/styles.xml

@@ -3,7 +3,7 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.

example/android/app/src/main/res/values/styles.xml

@@ -3,7 +3,7 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.

example/android/app/src/profile/AndroidManifest.xml

@@ -1,6 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="io.openim.flutter_openim_sdk_example">
+    <!-- The INTERNET permission is required for development. Specifically,
-    <!-- Flutter needs it to communicate with the running application
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

example/android/build.gradle

@@ -1,33 +1,16 @@
-buildscript {
-    repositories {
-        maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
-        maven { url 'https://maven.aliyun.com/nexus/content/repositories/jcenter' }
-        maven { url 'https://maven.aliyun.com/nexus/content/repositories/google' }
-        maven { url 'https://maven.aliyun.com/nexus/content/repositories/gradle-plugin' }
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
-    }
-}
-
 allprojects {
     repositories {
-        maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
-        maven { url 'https://maven.aliyun.com/nexus/content/repositories/jcenter' }
-        maven { url 'https://maven.aliyun.com/nexus/content/repositories/google' }
-        maven { url 'https://maven.aliyun.com/nexus/content/repositories/gradle-plugin' }
         google()
         mavenCentral()
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
-    project.evaluationDependsOn(':app')
+}
+subprojects {
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {

example/android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip

example/android/proguard-rules.pro

@@ -1,107 +0,0 @@
-#默认的proguard-android.txt已经增加了Annotation、native、view的setget方法、Activity参数为view的  方法、Enum枚举、Parcelable、R，此处不再写
-#------------------------------------------通用区域----------------------------------------------------
-#----------------------基本指令------------------------
--optimizationpasses 5
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--dontskipnonpubliclibraryclassmembers
--dontpreverify
--verbose
--printmapping proguardMapping.txt
--optimizations !code/simplification/cast,!field/*,!class/merging/*
--keepattributes *Annotation*,InnerClasses
--keepattributes Signature
--keepattributes SourceFile,LineNumberTable
-
-#如果引用了v4或者v7包
--dontwarn android.support.**
--keep class android.support.** { *; }
--keep interface android.support.** { *; }
--keep public class * extends android.support.**
--dontwarn android.support.**
-
-#如果引用了androidx包
--keep class com.google.android.material.** {*;}
--keep class androidx.** {*;}
--keep public class * extends androidx.**
--keep interface androidx.** {*;}
--dontwarn com.google.android.material.**
--dontnote com.google.android.material.**
--dontwarn androidx.**
-
-#---------------------默认保留-------------------------
-## 基础保留 ##
--keep public class * extends android.app.Fragment
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
-
--keep public class * extends android.view.View {
-    public <init>(android.content.Context);
-    public <init>(android.content.Context, android.util.AttributeSet);
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-    public void set*(...);
-}
-# 保持自定义控件类不被混淆
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet);
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-#保持自定义控件类不被混淆
--keepclassmembers class * extends android.app.Activity {
-    public void *(android.view.View);
-}
--keepclassmembers enum * {     # 保持枚举 enum 类不被混淆
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
--keep class * implements android.os.Parcelable { # 保持 Parcelable 不被混淆
-    public static final android.os.Parcelable$Creator *;
-}
--keep class * implements java.io.Serializable # 保持 Serializable 不被混淆
-#保持 Serializable 不被混淆并且enum 类也不被混淆
--keepclassmembers class * implements java.io.Serializable {
-    static final long serialVersionUID;
-    private static final java.io.ObjectStreamField[] serialPersistentFields;
-    !static !transient <fields>;
-    !private <fields>;
-    !private <methods>;
-    private void writeObject(java.io.ObjectOutputStream);
-    private void readObject(java.io.ObjectInputStream);
-    java.lang.Object writeReplace();
-    java.lang.Object readResolve();
-}
-#不混淆资源类
--keepclassmembers class **.R$* {
-    public static <fields>;
-}
-# 保持 native 方法不被混淆
--keepclasseswithmembernames class * {
-    native <methods>;
-}
-
-#WebView
--keepclassmembers class * extends android.webkit.WebView {*;}
--keepclassmembers class * extends android.webkit.WebViewClient {*;}
--keepclassmembers class * extends android.webkit.WebChromeClient {*;}
--keepclassmembers class * {
-    @android.webkit.JavascriptInterface <methods>;
-}
-
--keep class androidx.lifecycle.DefaultLifecycleObserver
-#-------------------------------------------项目定义区-------------------------------------------------
-#im
--keep class io.openim.flutter_openim_sdk.** { *; }
-#Flutter Wrapper
-#-dontwarn io.flutter.**
-#-keep class io.flutter.app.** { *; }
-#-keep class io.flutter.plugin.**  { *; }
-#-keep class io.flutter.util.**  { *; }
-#-keep class io.flutter.view.**  { *; }
-#-keep class io.flutter.**  { *; }
-#-keep class io.flutter.plugins.**  { *; }

example/android/settings.gradle

@@ -1,11 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
-def properties = new Properties()
 
-assert localPropertiesFile.exists()
+    repositories {
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
+plugins {
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+    id "com.android.application" version "7.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+}
+
+include ":app"

example/ios/.gitignore

@@ -1,3 +1,4 @@
+**/dgph
 *.mode1v3
 *.mode2v3
 *.moved-aside

example/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>

example/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '11.0'
+# platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -32,6 +32,9 @@ target 'Runner' do
   use_modular_headers!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
 end
 
 post_install do |installer|

example/ios/Podfile.lock

@@ -2,8 +2,8 @@ PODS:
   - Flutter (1.0.0)
   - flutter_openim_sdk (0.0.1):
     - Flutter
-    - OpenIMSDKCore (= 3.4.0)
+    - OpenIMSDKCore (= 3.8.2)
-  - OpenIMSDKCore (3.4.0)
+  - OpenIMSDKCore (3.8.2)
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
@@ -20,10 +20,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_openim_sdk/ios"
 
 SPEC CHECKSUMS:
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_openim_sdk: 54d1c836ff60ebb5b99d246521ef0cb1d834fb13
+  flutter_openim_sdk: 77bdd08fb8dda1644a0c150b8ba7324f11b32404
-  OpenIMSDKCore: 47e0e830afe0d2dd905ad3dda255e6a6d26a555c
+  OpenIMSDKCore: aaffd63079a874d9272b8b962598723cb8128d32
 
-PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d
+PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
 
-COCOAPODS: 1.13.0
+COCOAPODS: 1.15.2

example/ios/Runner.xcodeproj/project.pbxproj

@@ -8,14 +8,26 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		3E0FE62DE2A4D4E61AC3FD02 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BB3D975831D21A8FACEF96B /* Pods_Runner.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
-		79CF11091A38454F94DA1EB4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F48A41A58786A29BEEBCFE3 /* Pods_Runner.framework */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		F32475A5B591900F07118022 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 119B0071FAB85FAD36937602 /* Pods_RunnerTests.framework */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 97C146E61CF9000F007C117D /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 97C146ED1CF9000F007C117D;
+			remoteInfo = Runner;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXCopyFilesBuildPhase section */
 		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -30,16 +42,19 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		119B0071FAB85FAD36937602 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		2F48A41A58786A29BEEBCFE3 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
+		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		3F8F3496860058CED33C418C /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		4D6806EF7C87F4A8E899A73E /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
-		564E6205C72C7CB32AC49601 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		5C84146D7BEE11433AA4DE9E /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		85A1617DD2AFC45DFFDD8B11 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		7D277EA428A8FDCA196F3196 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		8BB3D975831D21A8FACEF96B /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -47,26 +62,51 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		BD60456F5D1660BF5A90F9A1 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
+		F0FFA291A8BB24B66A6DCC8C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
+		FA507785CCEA4423C40C3CCD /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		1B803A0F046E9658A8FCEED0 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				F32475A5B591900F07118022 /* Pods_RunnerTests.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		97C146EB1CF9000F007C117D /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				79CF11091A38454F94DA1EB4 /* Pods_Runner.framework in Frameworks */,
+				3E0FE62DE2A4D4E61AC3FD02 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		0EDFEBEB76AE7FAFA44EF2AF /* Frameworks */ = {
+		331C8082294A63A400263BE5 /* RunnerTests */ = {
 			isa = PBXGroup;
 			children = (
-				2F48A41A58786A29BEEBCFE3 /* Pods_Runner.framework */,
+				331C807B294A618700263BE5 /* RunnerTests.swift */,
 			);
-			name = Frameworks;
+			path = RunnerTests;
+			sourceTree = "<group>";
+		};
+		8575235C80CAB4F7FB7F5B46 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				FA507785CCEA4423C40C3CCD /* Pods-Runner.debug.xcconfig */,
+				4D6806EF7C87F4A8E899A73E /* Pods-Runner.release.xcconfig */,
+				7D277EA428A8FDCA196F3196 /* Pods-Runner.profile.xcconfig */,
+				F0FFA291A8BB24B66A6DCC8C /* Pods-RunnerTests.debug.xcconfig */,
+				5C84146D7BEE11433AA4DE9E /* Pods-RunnerTests.release.xcconfig */,
+				BD60456F5D1660BF5A90F9A1 /* Pods-RunnerTests.profile.xcconfig */,
+			);
+			name = Pods;
+			path = Pods;
 			sourceTree = "<group>";
 		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
@@ -86,8 +126,9 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
-				E653626F5A38799455FF26C4 /* Pods */,
+				331C8082294A63A400263BE5 /* RunnerTests */,
-				0EDFEBEB76AE7FAFA44EF2AF /* Frameworks */,
+				8575235C80CAB4F7FB7F5B46 /* Pods */,
+				B94289CF044A7671B3BECB8E /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -95,6 +136,7 @@
 			isa = PBXGroup;
 			children = (
 				97C146EE1CF9000F007C117D /* Runner.app */,
+				331C8081294A63A400263BE5 /* RunnerTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -114,24 +156,42 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		E653626F5A38799455FF26C4 /* Pods */ = {
+		B94289CF044A7671B3BECB8E /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				85A1617DD2AFC45DFFDD8B11 /* Pods-Runner.debug.xcconfig */,
+				8BB3D975831D21A8FACEF96B /* Pods_Runner.framework */,
-				3F8F3496860058CED33C418C /* Pods-Runner.release.xcconfig */,
+				119B0071FAB85FAD36937602 /* Pods_RunnerTests.framework */,
-				564E6205C72C7CB32AC49601 /* Pods-Runner.profile.xcconfig */,
 			);
-			path = Pods;
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
+		331C8080294A63A400263BE5 /* RunnerTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
+			buildPhases = (
+				70DBF52745AF25A4FC72D8C3 /* [CP] Check Pods Manifest.lock */,
+				331C807D294A63A400263BE5 /* Sources */,
+				331C807F294A63A400263BE5 /* Resources */,
+				1B803A0F046E9658A8FCEED0 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				331C8086294A63A400263BE5 /* PBXTargetDependency */,
+			);
+			name = RunnerTests;
+			productName = RunnerTests;
+			productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 		97C146ED1CF9000F007C117D /* Runner */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				DFE84742E2B41158E8703A14 /* [CP] Check Pods Manifest.lock */,
+				3DCEC8459668E43AE9B4C8D5 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
@@ -154,9 +214,14 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
+					331C8080294A63A400263BE5 = {
+						CreatedOnToolsVersion = 14.0;
+						TestTargetID = 97C146ED1CF9000F007C117D;
+					};
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
 						LastSwiftMigration = 1100;
@@ -177,11 +242,19 @@
 			projectRoot = "";
 			targets = (
 				97C146ED1CF9000F007C117D /* Runner */,
+				331C8080294A63A400263BE5 /* RunnerTests */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
+		331C807F294A63A400263BE5 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		97C146EC1CF9000F007C117D /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -203,6 +276,7 @@
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -211,22 +285,7 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
+		3DCEC8459668E43AE9B4C8D5 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
-		};
-		DFE84742E2B41158E8703A14 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -248,9 +307,54 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		70DBF52745AF25A4FC72D8C3 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		9740EEB61CF901F6004384FC /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
+		331C807D294A63A400263BE5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		97C146EA1CF9000F007C117D /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -262,6 +366,14 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		331C8086294A63A400263BE5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 97C146ED1CF9000F007C117D /* Runner */;
+			targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin PBXVariantGroup section */
 		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -286,7 +398,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = arm64;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -316,6 +428,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -324,7 +437,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -337,18 +450,17 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = BDLHL8GNFV;
+				DEVELOPMENT_TEAM = V57RT7LMFH;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = cn.rentsoft.uni;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -356,11 +468,61 @@
 			};
 			name = Profile;
 		};
+		331C8088294A63A400263BE5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F0FFA291A8BB24B66A6DCC8C /* Pods-RunnerTests.debug.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.example.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Debug;
+		};
+		331C8089294A63A400263BE5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 5C84146D7BEE11433AA4DE9E /* Pods-RunnerTests.release.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.example.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Release;
+		};
+		331C808A294A63A400263BE5 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = BD60456F5D1660BF5A90F9A1 /* Pods-RunnerTests.profile.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.example.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Profile;
+		};
 		97C147031CF9000F007C117D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = arm64;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -390,6 +552,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -404,7 +567,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -416,7 +579,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = arm64;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -446,6 +609,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -454,7 +618,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -469,18 +633,17 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = BDLHL8GNFV;
+				DEVELOPMENT_TEAM = V57RT7LMFH;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = cn.rentsoft.uni;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -493,18 +656,17 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = BDLHL8GNFV;
+				DEVELOPMENT_TEAM = V57RT7LMFH;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = cn.rentsoft.uni;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -515,6 +677,16 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				331C8088294A63A400263BE5 /* Debug */,
+				331C8089294A63A400263BE5 /* Release */,
+				331C808A294A63A400263BE5 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,19 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
+      <Testables>
-      </AdditionalOptions>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "331C8080294A63A400263BE5"
+               BuildableName = "RunnerTests.xctest"
+               BlueprintName = "RunnerTests"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +70,6 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"

example/ios/Runner/AppDelegate.swift

@@ -1,7 +1,7 @@
-import UIKit
 import Flutter
+import UIKit
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,103 +1,122 @@
 {
   "images" : [
     {
+      "size" : "20x20",
       "idiom" : "iphone",
-      "scale" : "2x",
+      "filename" : "Icon-App-20x20@2x.png",
-      "size" : "20x20"
+      "scale" : "2x"
     },
     {
+      "size" : "20x20",
       "idiom" : "iphone",
-      "scale" : "3x",
+      "filename" : "Icon-App-20x20@3x.png",
-      "size" : "20x20"
+      "scale" : "3x"
     },
     {
+      "size" : "29x29",
       "idiom" : "iphone",
-      "scale" : "1x",
+      "filename" : "Icon-App-29x29@1x.png",
-      "size" : "29x29"
+      "scale" : "1x"
     },
     {
+      "size" : "29x29",
       "idiom" : "iphone",
-      "scale" : "2x",
+      "filename" : "Icon-App-29x29@2x.png",
-      "size" : "29x29"
+      "scale" : "2x"
     },
     {
+      "size" : "29x29",
       "idiom" : "iphone",
-      "scale" : "3x",
+      "filename" : "Icon-App-29x29@3x.png",
-      "size" : "29x29"
+      "scale" : "3x"
     },
     {
+      "size" : "40x40",
       "idiom" : "iphone",
-      "scale" : "2x",
+      "filename" : "Icon-App-40x40@2x.png",
-      "size" : "40x40"
+      "scale" : "2x"
     },
     {
+      "size" : "40x40",
       "idiom" : "iphone",
-      "scale" : "3x",
+      "filename" : "Icon-App-40x40@3x.png",
-      "size" : "40x40"
+      "scale" : "3x"
     },
     {
+      "size" : "60x60",
       "idiom" : "iphone",
-      "scale" : "2x",
+      "filename" : "Icon-App-60x60@2x.png",
-      "size" : "60x60"
+      "scale" : "2x"
     },
     {
+      "size" : "60x60",
       "idiom" : "iphone",
-      "scale" : "3x",
+      "filename" : "Icon-App-60x60@3x.png",
-      "size" : "60x60"
+      "scale" : "3x"
     },
     {
+      "size" : "20x20",
       "idiom" : "ipad",
-      "scale" : "1x",
+      "filename" : "Icon-App-20x20@1x.png",
-      "size" : "20x20"
+      "scale" : "1x"
     },
     {
+      "size" : "20x20",
       "idiom" : "ipad",
-      "scale" : "2x",
+      "filename" : "Icon-App-20x20@2x.png",
-      "size" : "20x20"
+      "scale" : "2x"
     },
     {
+      "size" : "29x29",
       "idiom" : "ipad",
-      "scale" : "1x",
+      "filename" : "Icon-App-29x29@1x.png",
-      "size" : "29x29"
+      "scale" : "1x"
     },
     {
+      "size" : "29x29",
       "idiom" : "ipad",
-      "scale" : "2x",
+      "filename" : "Icon-App-29x29@2x.png",
-      "size" : "29x29"
+      "scale" : "2x"
     },
     {
+      "size" : "40x40",
       "idiom" : "ipad",
-      "scale" : "1x",
+      "filename" : "Icon-App-40x40@1x.png",
-      "size" : "40x40"
+      "scale" : "1x"
     },
     {
+      "size" : "40x40",
       "idiom" : "ipad",
-      "scale" : "2x",
+      "filename" : "Icon-App-40x40@2x.png",
-      "size" : "40x40"
+      "scale" : "2x"
     },
     {
+      "size" : "76x76",
       "idiom" : "ipad",
-      "scale" : "1x",
+      "filename" : "Icon-App-76x76@1x.png",
-      "size" : "76x76"
+      "scale" : "1x"
     },
     {
+      "size" : "76x76",
       "idiom" : "ipad",
-      "scale" : "2x",
+      "filename" : "Icon-App-76x76@2x.png",
-      "size" : "76x76"
+      "scale" : "2x"
     },
     {
+      "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "scale" : "2x",
+      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "size" : "83.5x83.5"
+      "scale" : "2x"
     },
     {
+      "size" : "1024x1024",
       "idiom" : "ios-marketing",
-      "scale" : "1x",
+      "filename" : "Icon-App-1024x1024@1x.png",
-      "size" : "1024x1024"
+      "scale" : "1x"
     }
   ],
   "info" : {
-    "author" : "xcode",
+    "version" : 1,
-    "version" : 1
+    "author" : "xcode"
   }
 }

example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json

@@ -2,19 +2,22 @@
   "images" : [
     {
       "idiom" : "universal",
+      "filename" : "LaunchImage.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
+      "filename" : "LaunchImage@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
+      "filename" : "LaunchImage@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "author" : "xcode",
+    "version" : 1,
-    "version" : 1
+    "author" : "xcode"
   }
 }

example/ios/Runner/Base.lproj/Main.storyboard

@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Flutter View Controller-->
@@ -16,14 +14,13 @@
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-26" y="-44"/>
         </scene>
     </scenes>
 </document>

example/ios/Runner/Info.plist

@@ -2,10 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>Example</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>flutter_openim_sdk_example</string>
+	<string>example</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -24,8 +24,6 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -43,7 +41,9 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<false/>
+	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>

example/ios/RunnerTests/RunnerTests.swift

@@ -0,0 +1,12 @@
+import Flutter
+import UIKit
+import XCTest
+
+class RunnerTests: XCTestCase {
+
+  func testExample() {
+    // If you add code to the Runner application, consider adding tests here.
+    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
+  }
+
+}

example/lib/main.dart

@@ -14,7 +14,12 @@ class _MyAppState extends State<MyApp> {
   @override
   void initState() {
     super.initState();
-    OpenIM.iMManager.initSDK(platformID: 1, apiAddr: '', wsAddr: '', dataDir: '/', listener: OnConnectListener());
+    OpenIM.iMManager.initSDK(
+        platformID: 1,
+        apiAddr: '',
+        wsAddr: '',
+        dataDir: '/',
+        listener: OnConnectListener());
   }
 
   @override

example/pubspec.lock

@@ -45,10 +45,10 @@ packages:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.6"
+    version: "1.0.8"
   fake_async:
     dependency: transitive
     description:
@@ -62,13 +62,21 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_lints:
+    dependency: "direct dev"
+    description:
+      name: flutter_lints
+      sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
   flutter_openim_sdk:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "3.8.0-rc.15"
+    version: "3.8.3+2"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -78,18 +86,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.4"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.5"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -98,6 +106,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.1"
+  lints:
+    dependency: transitive
+    description:
+      name: lints
+      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
   matcher:
     dependency: transitive
     description:
@@ -110,18 +126,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.15.0"
   path:
     dependency: transitive
     description:
@@ -179,10 +195,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0"
+    version: "0.7.2"
   vector_math:
     dependency: transitive
     description:
@@ -195,10 +211,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.1"
+    version: "14.2.5"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
+  dart: ">=3.4.4 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"

example/pubspec.yaml

@@ -2,13 +2,32 @@ name: flutter_openim_sdk_example
 description: Demonstrates how to use the flutter_openim_sdk plugin.
 
 # The following line prevents the package from being accidentally published to
-# pub.dev using `pub publish`. This is preferred for private packages.
+# pub.dev using `flutter pub publish`. This is preferred for private packages.
-#publish_to: 'none' # Remove this line if you wish to publish to pub.dev
+publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-version: 1.0.0
+
+# The following defines the version and build number for your application.
+# A version number is three numbers separated by dots, like 1.2.43
+# followed by an optional build number separated by a +.
+# Both the version and the builder number may be overridden in flutter
+# build by specifying --build-name and --build-number, respectively.
+# In Android, build-name is used as versionName while build-number used as versionCode.
+# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
+# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion.
+# Read more about iOS versioning at
+# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
+# In Windows, build-name is used as the major, minor, and patch parts
+# of the product and file versions while build-number is used as the build suffix.
+version: 1.0.0+1
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: '>=3.4.4 <4.0.0'
 
+# Dependencies specify other packages that your package needs in order to work.
+# To automatically upgrade your package dependencies to the latest versions
+# consider running `flutter pub upgrade --major-versions`. Alternatively,
+# dependencies can be manually updated by changing the version numbers below to
+# the latest version available on pub.dev. To see which dependencies have newer
+# versions available, run `flutter pub outdated`.
 dependencies:
   flutter:
     sdk: flutter
@@ -23,16 +42,23 @@ dependencies:
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.2
+  cupertino_icons: ^1.0.6
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
 
+  # The "flutter_lints" package below contains a set of recommended lints to
+  # encourage good coding practices. The lint set provided by the package is
+  # activated in the `analysis_options.yaml` file located at the root of your
+  # package. See that file for information about deactivating specific lint
+  # rules and activating additional ones.
+  flutter_lints: ^3.0.0
+
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 
-# The following section is specific to Flutter.
+# The following section is specific to Flutter packages.
 flutter:
 
   # The following line ensures that the Material Icons font is
@@ -46,7 +72,7 @@ flutter:
   #   - images/a_dot_ham.jpeg
 
   # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware.
+  # https://flutter.dev/assets-and-images/#resolution-aware
 
   # For details regarding adding assets from package dependencies, see
   # https://flutter.dev/assets-and-images/#from-packages

example/test/widget_test.dart

@@ -1,7 +1,7 @@
 // This is a basic Flutter widget test.
 //
 // To perform an interaction with a widget in your test, use the WidgetTester
-// utility that Flutter provides. For example, you can send tap and scroll
+// utility in the flutter_test package. For example, you can send tap and scroll
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
@@ -11,17 +11,20 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_openim_sdk_example/main.dart';
 
 void main() {
-  testWidgets('Verify Platform version', (WidgetTester tester) async {
+  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
     await tester.pumpWidget(MyApp());
 
-    // Verify that platform version is retrieved.
+    // Verify that our counter starts at 0.
-    expect(
+    expect(find.text('0'), findsOneWidget);
-      find.byWidgetPredicate(
+    expect(find.text('1'), findsNothing);
-        (Widget widget) => widget is Text &&
+
-                           widget.data!.startsWith('Running on:'),
+    // Tap the '+' icon and trigger a frame.
-      ),
+    await tester.tap(find.byIcon(Icons.add));
-      findsOneWidget,
+    await tester.pump();
-    );
+
+    // Verify that our counter has incremented.
+    expect(find.text('0'), findsNothing);
+    expect(find.text('1'), findsOneWidget);
   });
 }

ios/Classes/Module/ChannelManager.swift

@@ -0,0 +1,101 @@
+import Foundation
+import OpenIMCore
+
+public class ChannelManager: BaseServiceManager {
+
+    public override func registerHandlers() {
+        super.registerHandlers()
+
+    //    self["changeChannelMemberMute"] = changeChannelMemberMute
+    //    self["changeChannelMute"] = changeChannelMute
+
+    //    self["getChannelMemberList"] = getChannelMemberList
+
+
+        self["getChannelMembersInfo"] = getChannelMembersInfo
+        self["getChannelsInfo"] = getChannelsInfo
+
+
+        self["getUsersInChannel"] = getUsersInChannel
+        self["isJoinChannel"] = isJoinChannel
+        self["joinChannel"] = joinChannel
+        self["quitChannel"] = quitChannel
+        self["setChannelListener"] = setChannelListener
+
+    }
+
+//     func changeChannelMemberMute(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+//         Open_im_sdkChangeChannelMemberMute(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "channelID"], methodCall[string:"userID"], methodCall[int:"seconds"])
+//     }
+//
+//     func changeChannelMute(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+//         Open_im_sdkChangeChannelMute(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "channelID"], methodCall[bool: "mute"])
+//     }
+//
+//     func getChannelMemberList(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+//         Open_im_sdkGetChannelMemberList(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "channelID"], methodCall[int32: "filter"],
+//                                       methodCall[int32: "offset"], methodCall[int32: "count"])
+//     }
+
+    func getChannelMembersInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkGetSpecifiedChannelMembersInfo(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "channelID"], methodCall[jsonString: "userIDList"])
+    }
+
+    func getChannelsInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkGetSpecifiedChannelsInfo(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "channelIDList"])
+    }
+
+    func getUsersInChannel(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+         Open_im_sdkGetUsersInChannel(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "channelID"],
+         methodCall[jsonString: "userIDs"])
+    }
+
+    func isJoinChannel(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkIsJoinChannel(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "channelID"])
+    }
+
+    func joinChannel(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkJoinChannel(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "channelID"], methodCall[string:
+        "reason"], methodCall[int32: "joinSource"], methodCall[jsonString: "ex"])
+    }
+
+
+    func quitChannel(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkQuitChannel(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "channelID"])
+    }
+
+    func setChannelListener(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkSetChannelListener(ChannelListener(channel: channel))
+        callBack(result)
+    }
+}
+
+public class ChannelListener: NSObject, Open_im_sdk_callbackOnChannelListenerProtocol {
+
+    private let channel: FlutterMethodChannel
+
+    init(channel: FlutterMethodChannel) {
+        self.channel = channel
+    }
+
+    public func onChannelDismissed(_ s: String?) {
+        CommonUtil.emitEvent(channel: channel, method: "channelListener", type: "onChannelDismissed", errCode: nil, errMsg: nil, data: s)
+    }
+
+    public func onChannelInfoChanged(_ s: String?) {
+        CommonUtil.emitEvent(channel: channel, method: "channelListener", type: "onChannelInfoChanged", errCode: nil, errMsg: nil, data: s)
+    }
+
+    public func onChannelMemberAdded(_ s: String?) {
+        CommonUtil.emitEvent(channel: channel, method: "channelListener", type: "onChannelMemberAdded", errCode: nil, errMsg: nil, data: s)
+    }
+
+    public func onChannelMemberDeleted(_ s: String?) {
+        CommonUtil.emitEvent(channel: channel, method: "channelListener", type: "onChannelMemberDeleted", errCode: nil, errMsg: nil, data: s)
+    }
+
+    public func onChannelMemberInfoChanged(_ s: String?) {
+        CommonUtil.emitEvent(channel: channel, method: "channelListener", type: "onChannelMemberInfoChanged", errCode: nil, errMsg: nil, data: s)
+    }
+
+}

ios/Classes/Module/ConversationManager.swift

@@ -5,141 +5,111 @@ public class ConversationManager: BaseServiceManager {
 
     public override func registerHandlers() {
         super.registerHandlers()
-        self["setConversationListener"] = setConversationListener
+        self["changeInputStates"] = changeInputStates
-        self["getAllConversationList"] = getAllConversationList
-        self["getConversationListSplit"] = getConversationListSplit
-        self["getOneConversation"] = getOneConversation
-        self["getMultipleConversation"] = getMultipleConversation
-        self["setConversationDraft"] = setConversationDraft
-        self["pinConversation"] = pinConversation
-        self["hideConversation"] = hideConversation
-        self["markConversationMessageAsRead"] = markConversationMessageAsRead
-        self["getTotalUnreadMsgCount"] = getTotalUnreadMsgCount
-        self["getConversationIDBySessionType"] = getConversationIDBySessionType
-        self["setConversationRecvMessageOpt"] = setConversationRecvMessageOpt
-        self["getConversationRecvMessageOpt"] = getConversationRecvMessageOpt
-        self["setConversationPrivateChat"] = setConversationPrivateChat
         self["clearConversationAndDeleteAllMsg"] = clearConversationAndDeleteAllMsg
         self["deleteConversationAndDeleteAllMsg"] = deleteConversationAndDeleteAllMsg
-        self["deleteAllConversationFromLocal"] = deleteAllConversationFromLocal
+        self["getAllConversationList"] = getAllConversationList
-        self["resetConversationGroupAtType"] = resetConversationGroupAtType
         self["getAtAllTag"] = getAtAllTag
-        self["setGlobalRecvMessageOpt"] = setGlobalRecvMessageOpt
+        self["getConversationIDBySessionType"] = getConversationIDBySessionType
-        self["setConversationBurnDuration"] = setConversationBurnDuration
+        self["getConversationListSplit"] = getConversationListSplit
+        self["getInputStates"] = getInputStates
+        self["getMultipleConversation"] = getMultipleConversation
+        self["getOneConversation"] = getOneConversation
+        self["getTotalUnreadMsgCount"] = getTotalUnreadMsgCount
         self["hideAllConversations"] = hideAllConversations
+        self["hideConversation"] = hideConversation
+        self["markConversationMessageAsRead"] = markConversationMessageAsRead
         self["searchConversation"] = searchConversation
-        self["setConversationEx"] = setConversationEx
+        self["setConversationDraft"] = setConversationDraft
+        self["setConversationListener"] = setConversationListener
+        self["setConversation"] = setConversation
+        self["searchConversations"] = searchConversations
     }
 
-    func setConversationListener(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func changeInputStates(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkChangeInputStates(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"], methodCall[bool: "focus"])
+    }
+
+    func clearConversationAndDeleteAllMsg(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkClearConversationAndDeleteAllMsg(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"])
+    }
+
+    func deleteConversationAndDeleteAllMsg(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkDeleteConversationAndDeleteAllMsg(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"])
+    }
+
+    func getAllConversationList(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkGetAllConversationList(BaseCallback(result: result), methodCall[string: "operationID"])
+    }
+
+    func getAtAllTag(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        callBack(result, Open_im_sdkGetAtAllTag(methodCall[string: "operationID"]))
+    }
+
+    func getConversationIDBySessionType(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        let conversationID = Open_im_sdkGetConversationIDBySessionType(methodCall[string: "operationID"], methodCall[string: "sourceID"], methodCall[int: "sessionType"])
+        callBack(result, conversationID)
+    }
+
+    func getConversationListSplit(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkGetConversationListSplit(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[int: "offset"], methodCall[int: "count"])
+    }
+
+    func getInputStates(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkGetInputStates(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"], methodCall[string: "userID"])
+    }
+
+    func getMultipleConversation(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkGetMultipleConversation(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "conversationIDList"])
+    }
+
+    func getOneConversation(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkGetOneConversation(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[int32: "sessionType"], methodCall[string: "sourceID"])
+    }
+
+    func getTotalUnreadMsgCount(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkGetTotalUnreadMsgCount(BaseCallback(result: result), methodCall[string: "operationID"])
+    }
+
+    func hideAllConversations(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkHideAllConversations(BaseCallback(result: result), methodCall[string: "operationID"])
+    }
+
+    func hideConversation(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkHideConversation(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"])
+    }
+
+    func markConversationMessageAsRead(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkMarkConversationMessageAsRead(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"])
+    }
+
+    func searchConversation(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkSearchConversation(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "name"])
+    }
+
+    func setConversationDraft(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkSetConversationDraft(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"], methodCall[string: "draftText"])
+    }
+
+    func setConversationListener(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
         Open_im_sdkSetConversationListener(ConversationListener(channel: channel))
         callBack(result)
     }
 
-    func getAllConversationList(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func setConversation(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkGetAllConversationList(BaseCallback(result: result), methodCall[string: "operationID"])
+        Open_im_sdkSetConversation(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"], methodCall[jsonString: "req"])
     }
 
-    func getConversationListSplit(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func searchConversations(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkGetConversationListSplit(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[int: "offset"], methodCall[int: "count"])
-    }
-
-    func getOneConversation(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkGetOneConversation(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[int32: "sessionType"], methodCall[string: "sourceID"])
-    }
-    
-    func getMultipleConversation(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkGetMultipleConversation(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "conversationIDList"])
-    }
-    
-    func setConversationDraft(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkSetConversationDraft(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"], methodCall[string: "draftText"])
-    }
-    
-    func pinConversation(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkPinConversation(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"], methodCall[bool: "isPinned"])
-    }
-    
-    func hideConversation(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkHideConversation(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"])
-    }
-    
-    func markConversationMessageAsRead(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkMarkConversationMessageAsRead(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"])
-    }
-    
-    func getTotalUnreadMsgCount(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkGetTotalUnreadMsgCount(BaseCallback(result: result), methodCall[string: "operationID"])
-    }
-    
-    func getConversationIDBySessionType(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        let conversationID = Open_im_sdkGetConversationIDBySessionType( methodCall[string: "operationID"],methodCall[string: "sourceID"], methodCall[int: "sessionType"])
-        callBack(result, conversationID)
-    }
-
-    func setConversationRecvMessageOpt(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkSetConversationRecvMessageOpt(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"], methodCall[int: "status"])
-    }
-
-    func getConversationRecvMessageOpt(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkGetConversationRecvMessageOpt(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "conversationIDList"])
-    }
-    
-    func setConversationPrivateChat(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkSetConversationPrivateChat(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"],methodCall[bool: "isPrivate"])
-    }
-    
-    func clearConversationAndDeleteAllMsg(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkClearConversationAndDeleteAllMsg(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"])
-    }
-    
-    func deleteConversationAndDeleteAllMsg(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkDeleteConversationAndDeleteAllMsg(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"])
-    }
-    
-    func deleteAllConversationFromLocal(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-    }
-    
-    func resetConversationGroupAtType(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkResetConversationGroupAtType(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"])
-    }
-    
-    func getAtAllTag(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        callBack(result, Open_im_sdkGetAtAllTag(methodCall[string: "operationID"]))
-    }
-    
-    func setGlobalRecvMessageOpt(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkSetGlobalRecvMessageOpt(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[int: "status"])
-    }
-    
-    func setConversationBurnDuration(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkSetConversationBurnDuration(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"], methodCall[int32: "burnDuration"])
-    }
-
-    func hideAllConversations(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-            Open_im_sdkHideAllConversations(BaseCallback(result: result), methodCall[string: "operationID"])
-    }
-
-    func searchConversation(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
         Open_im_sdkSearchConversation(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "name"])
     }
-
-    func setConversationEx(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkSetConversationEx(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"], methodCall[jsonString: "ex"])
-    }
 }
 
-
 public class ConversationListener: NSObject, Open_im_sdk_callbackOnConversationListenerProtocol {
 
-    public func onSyncServerProgress(_ progress: Int) {
+    private let channel: FlutterMethodChannel
-        CommonUtil.emitEvent(channel: channel, method: "conversationListener", type: "onSyncServerProgress", errCode: nil, errMsg: nil, data: progress)
-    }
 
-
+    init(channel: FlutterMethodChannel) {
-    private let channel:FlutterMethodChannel
-
-    init(channel:FlutterMethodChannel) {
         self.channel = channel
     }
 
@@ -147,6 +117,10 @@ public class ConversationListener: NSObject, Open_im_sdk_callbackOnConversationL
         CommonUtil.emitEvent(channel: channel, method: "conversationListener", type: "onConversationChanged", errCode: nil, errMsg: nil, data: conversationList)
     }
 
+    public func onConversationUserInputStatusChanged(_ change: String?) {
+        CommonUtil.emitEvent(channel: channel, method: "conversationListener", type: "onConversationUserInputStatusChanged", errCode: nil, errMsg: nil, data: change)
+    }
+
     public func onNewConversation(_ conversationList: String?) {
         CommonUtil.emitEvent(channel: channel, method: "conversationListener", type: "onNewConversation", errCode: nil, errMsg: nil, data: conversationList)
     }
@@ -159,6 +133,10 @@ public class ConversationListener: NSObject, Open_im_sdk_callbackOnConversationL
         CommonUtil.emitEvent(channel: channel, method: "conversationListener", type: "onSyncServerFinish", errCode: nil, errMsg: nil, data: reinstalled)
     }
 
+    public func onSyncServerProgress(_ progress: Int) {
+        CommonUtil.emitEvent(channel: channel, method: "conversationListener", type: "onSyncServerProgress", errCode: nil, errMsg: nil, data: progress)
+    }
+
     public func onSyncServerStart(_ reinstalled: Bool) {
         CommonUtil.emitEvent(channel: channel, method: "conversationListener", type: "onSyncServerStart", errCode: nil, errMsg: nil, data: reinstalled)
     }
@@ -166,10 +144,4 @@ public class ConversationListener: NSObject, Open_im_sdk_callbackOnConversationL
     public func onTotalUnreadMessageCountChanged(_ totalUnreadCount: Int32) {
         CommonUtil.emitEvent(channel: channel, method: "conversationListener", type: "onTotalUnreadMessageCountChanged", errCode: nil, errMsg: nil, data: totalUnreadCount)
     }
-
-    public func onConversationUserInputStatusChanged(_ change: String?) {
-        CommonUtil.emitEvent(channel: channel, method: "conversationListener", type: "onConversationUserInputStatusChanged", errCode: nil, errMsg: nil, data: change)
-    }
 }
-
-

ios/Classes/Module/FriendshipManager.swift

@@ -5,68 +5,34 @@ public class FriendshipManager: BaseServiceManager {
     
     public override func registerHandlers() {
         super.registerHandlers()
-        self["setFriendListener"] = setFriendListener
+        self["acceptFriendApplication"] = acceptFriendApplication
-        self["getFriendsInfo"] = getFriendsInfo
-        self["addFriend"] = addFriend
-        self["getFriendApplicationListAsRecipient"] = getFriendApplicationListAsRecipient
-        self["getFriendApplicationListAsApplicant"] = getFriendApplicationListAsApplicant
-        self["getFriendList"] = getFriendList
-        self["getFriendListPage"] = getFriendListPage
-        self["setFriendRemark"] = setFriendRemark
         self["addBlacklist"] = addBlacklist
-        self["getBlacklist"] = getBlacklist
+        self["addFriend"] = addFriend
-        self["removeBlacklist"] = removeBlacklist
         self["checkFriend"] = checkFriend
         self["deleteFriend"] = deleteFriend
-        self["acceptFriendApplication"] = acceptFriendApplication
+        self["getBlacklist"] = getBlacklist
+        self["getFriendApplicationListAsApplicant"] = getFriendApplicationListAsApplicant
+        self["getFriendApplicationListAsRecipient"] = getFriendApplicationListAsRecipient
+        self["getFriendList"] = getFriendList
+        self["getFriendListPage"] = getFriendListPage
+        self["getFriendsInfo"] = getFriendsInfo
         self["refuseFriendApplication"] = refuseFriendApplication
+        self["removeBlacklist"] = removeBlacklist
         self["searchFriends"] = searchFriends
-        self["setFriendsEx"] = setFriendsEx
+        self["setFriendListener"] = setFriendListener
+        self["updateFriends"] = updateFriends
     }
     
-    func setFriendListener(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func acceptFriendApplication(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkSetFriendListener(FriendshipListener(channel: channel))
+        Open_im_sdkAcceptFriendApplication(BaseCallback(result: result), methodCall[string: "operationID"], methodCall.toJsonString())
-        callBack(result)
-    }
-    
-    func getFriendsInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkGetSpecifiedFriendsInfo(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "userIDList"])
-    }
-    
-    func addFriend(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkAddFriend(BaseCallback(result: result), methodCall[string: "operationID"], methodCall.toJsonString())
-    }
-    
-    func getFriendApplicationListAsRecipient(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkGetFriendApplicationListAsRecipient(BaseCallback(result: result), methodCall[string: "operationID"])
-    }
-
-    func getFriendApplicationListAsApplicant(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkGetFriendApplicationListAsApplicant(BaseCallback(result: result), methodCall[string: "operationID"])
-    }
-
-    func getFriendList(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkGetFriendList(BaseCallback(result: result), methodCall[string: "operationID"])
-    }
-
-    func getFriendListPage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-            Open_im_sdkGetFriendListPage(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[int32: "offset"], methodCall[int32: "count"])
-    }
-    
-    func setFriendRemark(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkSetFriendRemark(BaseCallback(result: result), methodCall[string: "operationID"], methodCall.toJsonString())
     }
 
     func addBlacklist(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
         Open_im_sdkAddBlack(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "userID"], methodCall[string: "ex"])
     }
     
-    func getBlacklist(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func addFriend(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkGetBlackList(BaseCallback(result: result), methodCall[string: "operationID"])
+        Open_im_sdkAddFriend(BaseCallback(result: result), methodCall[string: "operationID"], methodCall.toJsonString())
-    }
-    
-    func removeBlacklist(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkRemoveBlack(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "userID"])
     }
     
     func checkFriend(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
@@ -77,20 +43,49 @@ public class FriendshipManager: BaseServiceManager {
         Open_im_sdkDeleteFriend(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "userID"])
     }
     
-    func acceptFriendApplication(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func getBlacklist(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkAcceptFriendApplication(BaseCallback(result: result), methodCall[string: "operationID"], methodCall.toJsonString())
+        Open_im_sdkGetBlackList(BaseCallback(result: result), methodCall[string: "operationID"])
+    }
+    
+    func getFriendApplicationListAsApplicant(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+        Open_im_sdkGetFriendApplicationListAsApplicant(BaseCallback(result: result), methodCall[string: "operationID"])
+    }
+
+    func getFriendApplicationListAsRecipient(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+        Open_im_sdkGetFriendApplicationListAsRecipient(BaseCallback(result: result), methodCall[string: "operationID"])
+    }
+
+    func getFriendList(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+        Open_im_sdkGetFriendList(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[bool: "filterBlack"])
+    }
+    
+    func getFriendListPage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+        Open_im_sdkGetFriendListPage(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[int32: "offset"], methodCall[int32: "count"], methodCall[bool: "filterBlack"])
+    }
+
+    func getFriendsInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+        Open_im_sdkGetSpecifiedFriendsInfo(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "userIDList"], methodCall[bool: "filterBlack"])
     }
     
     func refuseFriendApplication(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
         Open_im_sdkRefuseFriendApplication(BaseCallback(result: result), methodCall[string: "operationID"], methodCall.toJsonString())
     }
     
+    func removeBlacklist(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+        Open_im_sdkRemoveBlack(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "userID"])
+    }
+    
     func searchFriends(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
         Open_im_sdkSearchFriends(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "searchParam"])
     }
     
-    func setFriendsEx(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func setFriendListener(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkSetFriendsEx(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "friendIDs"], methodCall[string: "ex"])
+        Open_im_sdkSetFriendListener(FriendshipListener(channel: channel))
+        callBack(result)
+    }
+    
+    func updateFriends(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+        Open_im_sdkUpdateFriends(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "req"])
     }
 }
 
@@ -137,4 +132,3 @@ public class FriendshipListener: NSObject, Open_im_sdk_callbackOnFriendshipListe
         CommonUtil.emitEvent(channel: channel, method: "friendListener", type: "onFriendInfoChanged", errCode: nil, errMsg: nil, data: friendInfo)
     }
 }
-

ios/Classes/Module/GroupManager.swift

@@ -5,180 +5,155 @@ public class GroupManager: BaseServiceManager {
     
     public override func registerHandlers() {
         super.registerHandlers()
-        self["setGroupListener"] = setGroupListener
+        self["acceptGroupApplication"] = acceptGroupApplication
-        self["inviteUserToGroup"] = inviteUserToGroup
+        self["changeGroupMemberMute"] = changeGroupMemberMute
-        self["kickGroupMember"] = kickGroupMember
+        self["changeGroupMute"] = changeGroupMute
-        self["getGroupMembersInfo"] = getGroupMembersInfo
+        self["createGroup"] = createGroup
+        self["dismissGroup"] = dismissGroup
+        self["getGroupApplicationListAsApplicant"] = getGroupApplicationListAsApplicant
+        self["getGroupApplicationListAsRecipient"] = getGroupApplicationListAsRecipient
         self["getGroupMemberList"] = getGroupMemberList
+        self["getGroupMemberListByJoinTimeFilter"] = getGroupMemberListByJoinTimeFilter
+        self["getGroupMemberOwnerAndAdmin"] = getGroupMemberOwnerAndAdmin
+        self["getGroupMembersInfo"] = getGroupMembersInfo
+        self["getGroupsInfo"] = getGroupsInfo
         self["getJoinedGroupList"] = getJoinedGroupList
         self["getJoinedGroupListPage"] = getJoinedGroupListPage
-        self["createGroup"] = createGroup
-        self["setGroupInfo"] = setGroupInfo
-        self["getGroupsInfo"] = getGroupsInfo
-        self["joinGroup"] = joinGroup
-        self["quitGroup"] = quitGroup
-        self["transferGroupOwner"] = transferGroupOwner
-        self["getGroupApplicationListAsRecipient"] = getGroupApplicationListAsRecipient
-        self["getGroupApplicationListAsApplicant"] = getGroupApplicationListAsApplicant
-        self["acceptGroupApplication"] = acceptGroupApplication
-        self["refuseGroupApplication"] = refuseGroupApplication
-        self["dismissGroup"] = dismissGroup
-        self["changeGroupMute"] = changeGroupMute
-        self["changeGroupMemberMute"] = changeGroupMemberMute
-        self["setGroupMemberNickname"] = setGroupMemberNickname
-        self["searchGroups"] = searchGroups
-        self["setGroupMemberRoleLevel"] = setGroupMemberRoleLevel
-        self["getGroupMemberListByJoinTimeFilter"] = getGroupMemberListByJoinTimeFilter
-        self["setGroupVerification"] = setGroupVerification
-        self["setGroupLookMemberInfo"] = setGroupLookMemberInfo
-        self["setGroupApplyMemberFriend"] = setGroupApplyMemberFriend
-        self["getGroupMemberOwnerAndAdmin"] = getGroupMemberOwnerAndAdmin
-        self["searchGroupMembers"] = searchGroupMembers
-        self["setGroupMemberInfo"] = setGroupMemberInfo
-        self["isJoinGroup"] = isJoinGroup
         self["getUsersInGroup"] = getUsersInGroup
+        self["inviteUserToGroup"] = inviteUserToGroup
+        self["isJoinGroup"] = isJoinGroup
+        self["joinGroup"] = joinGroup
+        self["kickGroupMember"] = kickGroupMember
+        self["quitGroup"] = quitGroup
+        self["refuseGroupApplication"] = refuseGroupApplication
+        self["searchGroupMembers"] = searchGroupMembers
+        self["searchGroups"] = searchGroups
+        self["setGroupInfo"] = setGroupInfo
+        self["setGroupListener"] = setGroupListener
+        self["setGroupMemberInfo"] = setGroupMemberInfo
+        self["transferGroupOwner"] = transferGroupOwner
     }
 
-    func setGroupListener(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func acceptGroupApplication(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkSetGroupListener(GroupListener(channel: channel))
+        Open_im_sdkAcceptGroupApplication(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string: "userID"], methodCall[string: "handleMsg"])
-        callBack(result)
     }
 
-    func inviteUserToGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func changeGroupMemberMute(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkInviteUserToGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string: "reason"],
+        Open_im_sdkChangeGroupMemberMute(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string:"userID"], methodCall[int:"seconds"])
-                                     methodCall[jsonString: "userIDList"])
     }
 
-    func kickGroupMember(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func changeGroupMute(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkKickGroupMember(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string: "reason"],
+        Open_im_sdkChangeGroupMute(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[bool: "mute"])
-                                   methodCall[jsonString: "userIDList"])
     }
 
-    func getGroupMembersInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func createGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkGetSpecifiedGroupMembersInfo(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[jsonString: "userIDList"])
+        Open_im_sdkCreateGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall.toJsonString())
     }
 
-    func getGroupMemberList(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func dismissGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkDismissGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"])
+    }
+
+    func getGroupApplicationListAsApplicant(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkGetGroupApplicationListAsApplicant(BaseCallback(result: result), methodCall[string: "operationID"])
+    }
+
+    func getGroupApplicationListAsRecipient(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkGetGroupApplicationListAsRecipient(BaseCallback(result: result), methodCall[string: "operationID"])
+    }
+
+    func getGroupMemberList(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
         Open_im_sdkGetGroupMemberList(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[int32: "filter"],
                                       methodCall[int32: "offset"], methodCall[int32: "count"])
     }
 
-    func getJoinedGroupList(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func getGroupMemberListByJoinTimeFilter(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkGetJoinedGroupList(BaseCallback(result: result), methodCall[string: "operationID"])
+        Open_im_sdkGetGroupMemberListByJoinTimeFilter(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[int32: "offset"], methodCall[int32: "count"], methodCall[int64: "joinTimeBegin"], methodCall[int64: "joinTimeEnd"], methodCall[jsonString: "excludeUserIDList"])
     }
 
-    func getJoinedGroupListPage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func getGroupMemberOwnerAndAdmin(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-            Open_im_sdkGetJoinedGroupListPage(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[int32: "offset"], methodCall[int32: "count"])
+        Open_im_sdkGetGroupMemberOwnerAndAdmin(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"])
     }
 
-    func createGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func getGroupMembersInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkCreateGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall.toJsonString())
+        Open_im_sdkGetSpecifiedGroupMembersInfo(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[jsonString: "userIDList"])
     }
 
-    func setGroupInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func getGroupsInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkSetGroupInfo(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "groupInfo"])
-    }
-    
-    func getGroupsInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
         Open_im_sdkGetSpecifiedGroupsInfo(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "groupIDList"])
     }
 
-    func joinGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func getJoinedGroupList(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkGetJoinedGroupList(BaseCallback(result: result), methodCall[string: "operationID"])
+    }
+
+    func getJoinedGroupListPage(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkGetJoinedGroupListPage(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[int32: "offset"], methodCall[int32: "count"])
+    }
+
+    func getUsersInGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+         Open_im_sdkGetUsersInGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"],
+         methodCall[jsonString: "userIDs"])
+    }
+
+    func inviteUserToGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkInviteUserToGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string: "reason"],
+                                     methodCall[jsonString: "userIDList"])
+    }
+
+    func isJoinGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkIsJoinGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"])
+    }
+
+    func joinGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
         Open_im_sdkJoinGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string:
         "reason"], methodCall[int32: "joinSource"], methodCall[jsonString: "ex"])
     }
 
-    func quitGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func kickGroupMember(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkKickGroupMember(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string: "reason"],
+                                   methodCall[jsonString: "userIDList"])
+    }
+
+    func quitGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
         Open_im_sdkQuitGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"])
     }
 
-    func transferGroupOwner(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func refuseGroupApplication(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkTransferGroupOwner(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string: "userID"])
-    }
-    
-    func getGroupApplicationListAsRecipient(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkGetGroupApplicationListAsRecipient(BaseCallback(result: result), methodCall[string: "operationID"])
-    }
-    
-    func getGroupApplicationListAsApplicant(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkGetGroupApplicationListAsApplicant(BaseCallback(result: result), methodCall[string: "operationID"])
-    }
-
-    func acceptGroupApplication(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkAcceptGroupApplication(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string: "userID"], methodCall[string: "handleMsg"])
-    }
-    
-    func refuseGroupApplication(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
         Open_im_sdkRefuseGroupApplication(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string: "userID"], methodCall[string: "handleMsg"])
     }
 
-    func dismissGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func searchGroupMembers(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkDismissGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"])
-    }
-    
-    func changeGroupMute(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkChangeGroupMute(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[bool: "mute"])
-    }
-    
-    func changeGroupMemberMute(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkChangeGroupMemberMute(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string:"userID"],methodCall[int:"seconds"])
-    }
-    
-    func setGroupMemberNickname(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkSetGroupMemberNickname(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string:"userID"],methodCall[string:"groupNickname"])
-    }
-    
-    func searchGroups(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkSearchGroups(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "searchParam"])
-    }
-    
-    func setGroupMemberRoleLevel(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkSetGroupMemberRoleLevel(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string:"userID"],methodCall[int:"roleLevel"])
-    }
-    
-    func getGroupMemberListByJoinTimeFilter(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkGetGroupMemberListByJoinTimeFilter(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[int32: "offset"], methodCall[int32: "count"], methodCall[int64: "joinTimeBegin"], methodCall[int64: "joinTimeEnd"], methodCall[jsonString: "excludeUserIDList"])
-    }
-    
-    func setGroupVerification(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkSetGroupVerification(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[int32:"needVerification"])
-    }
-    
-    func setGroupLookMemberInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkSetGroupLookMemberInfo(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[int32:"status"])
-    }
-    
-    func setGroupApplyMemberFriend(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkSetGroupApplyMemberFriend(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[int32:"status"])
-    }
-    
-    func getGroupMemberOwnerAndAdmin(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkGetGroupMemberOwnerAndAdmin(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"])
-    }
-    
-    func searchGroupMembers(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
         Open_im_sdkSearchGroupMembers(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "searchParam"])
     }
 
-    func setGroupMemberInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func searchGroups(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkSearchGroups(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "searchParam"])
+    }
+
+    func setGroupInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkSetGroupInfo(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "groupInfo"])
+    }
+
+    func setGroupListener(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkSetGroupListener(GroupListener(channel: channel))
+        callBack(result)
+    }
+
+    func setGroupMemberInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
         Open_im_sdkSetGroupMemberInfo(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "info"])
     }
 
-    func isJoinGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func transferGroupOwner(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkIsJoinGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"])
+        Open_im_sdkTransferGroupOwner(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string: "userID"])
-    }
-
-    func getUsersInGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkGetUsersInGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"],
-        methodCall[jsonString: "userIDs"])
     }
 }
 
 public class GroupListener: NSObject, Open_im_sdk_callbackOnGroupListenerProtocol {
   
-    private let channel:FlutterMethodChannel
+    private let channel: FlutterMethodChannel
     
-    init(channel:FlutterMethodChannel) {
+    init(channel: FlutterMethodChannel) {
         self.channel = channel
     }
   

ios/Classes/Module/IMManager.swift

@@ -14,6 +14,7 @@ public class IMMananger: BaseServiceManager {
         self["getLoginStatus"] = getLoginStatus
         self["uploadFile"] = uploadFile
         self["uploadLogs"] = uploadLogs
+        self["logs"] = logs
         self["updateFcmToken"] = updateFcmToken
         self["setAppBackgroundStatus"] = setAppBackgroundStatus
         self["networkStatusChanged"] = networkStatusChanged
@@ -90,6 +91,10 @@ public class IMMananger: BaseServiceManager {
         UploadLogsListener(channel: self.channel))
     }
 
+    func logs(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkLogs(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[int: "logLevel"], methodCall[string: "file"], methodCall[int: "line"], methodCall[string: "msgs"], methodCall[string: "err"], methodCall[string: "keyAndValue"])
+    }
+    
     func updateFcmToken(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
             Open_im_sdkUpdateFcmToken(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "fcmToken"], methodCall[int64:
             "expireTime"])

ios/Classes/Module/MessageManager.swift

@@ -9,6 +9,7 @@ public class MessageManager: BaseServiceManager {
         self["setAdvancedMsgListener"] = setAdvancedMsgListener
         self["sendMessage"] = sendMessage
         self["revokeMessage"] = revokeMessage
+        self["editMessage"] = editMessage
         self["deleteMessageFromLocalStorage"] = deleteMessageFromLocalStorage
         self["deleteMessageFromLocalAndSvr"] = deleteMessageFromLocalAndSvr
         self["deleteAllMsgFromLocal"] = deleteAllMsgFromLocal
@@ -47,6 +48,10 @@ public class MessageManager: BaseServiceManager {
         self["setMessageLocalEx"] = setMessageLocalEx
         self["setAppBadge"] = setAppBadge
 
+        self["fetchSurroundingMessages"] = fetchSurroundingMessages
+
+
+
         self["sendMessageNotOss"] = sendMessageNotOss
         self["createImageMessageByURL"] = createImageMessageByURL
         self["createSoundMessageByURL"] = createSoundMessageByURL
@@ -65,13 +70,17 @@ public class MessageManager: BaseServiceManager {
     func sendMessage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
         let sendMsgProgressListener: SendMsgProgressListener = SendMsgProgressListener(channel: channel,result: result,methodCall: methodCall)
         Open_im_sdkSendMessage(sendMsgProgressListener, methodCall[string: "operationID"], methodCall[jsonString: "message"], methodCall[string: "userID"],
-                               methodCall[string: "groupID"], methodCall[jsonString: "offlinePushInfo"], methodCall[bool: "isOnlineOnly"])
+                               methodCall[string: "groupID"], methodCall[string: "channelID"],methodCall[jsonString: "offlinePushInfo"], methodCall[bool: "isOnlineOnly"])
     }
     
     func revokeMessage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
         Open_im_sdkRevokeMessage(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"],methodCall[string: "clientMsgID"])
     }
 
+    func editMessage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+        Open_im_sdkEditMessage(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"],methodCall[string: "clientMsgID"],methodCall[jsonString: "message"])
+    }
+
     func deleteMessageFromLocalStorage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
         Open_im_sdkDeleteMessageFromLocalStorage(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"],methodCall[string: "clientMsgID"])
     }
@@ -95,7 +104,7 @@ public class MessageManager: BaseServiceManager {
     
     func insertGroupMessageToLocalStorage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
         Open_im_sdkInsertGroupMessageToLocalStorage(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "message"],
-                                                     methodCall[string: "groupID"], methodCall[string: "senderID"])
+                                                     methodCall[string: "groupID"], methodCall[string: "channelID"],methodCall[string: "senderID"])
     }
     
     func markMessagesAsReadByMsgID(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
@@ -227,8 +236,7 @@ public class MessageManager: BaseServiceManager {
     
     func sendMessageNotOss(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
         let sendMsgProgressListener: SendMsgProgressListener = SendMsgProgressListener(channel: channel,result: result,methodCall: methodCall)
-        Open_im_sdkSendMessageNotOss(sendMsgProgressListener, methodCall[string: "operationID"], methodCall[jsonString: "message"], methodCall[string: "userID"],
+        Open_im_sdkSendMessageNotOss(sendMsgProgressListener, methodCall[string: "operationID"], methodCall[jsonString: "message"], methodCall[string: "userID"], methodCall[string: "groupID"], methodCall[string: "channelID"],methodCall[jsonString: "offlinePushInfo"], methodCall[bool: "isOnlineOnly"])
-                               methodCall[string: "groupID"], methodCall[jsonString: "offlinePushInfo"], methodCall[bool: "isOnlineOnly"])
     }
     
     func createImageMessageByURL(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
@@ -251,6 +259,13 @@ public class MessageManager: BaseServiceManager {
         Open_im_sdkSetCustomBusinessListener(CustomBusinessListener(channel: channel))
         callBack(result)
     }
+
+    func fetchSurroundingMessages(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+        Open_im_sdkFetchSurroundingMessages(BaseCallback(result: result),methodCall[string: "operationID"], methodCall[jsonString: "message"], methodCall[int: "before"], methodCall[int: "after"])
+    }
+
+
+
 }
 
 public class SendMsgProgressListener: NSObject, Open_im_sdk_callbackSendMsgCallBackProtocol {
@@ -305,6 +320,13 @@ public class AdvancedMsgListener: NSObject, Open_im_sdk_callbackOnAdvancedMsgLis
         CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onNewRecvMessageRevoked", errCode: nil, errMsg: nil, data: values)
     }
 
+    public func onNewRecvMessageEdited(_ messageEdited: String?) {
+        var values: [String: Any] = [:]
+        values["id"] = id
+        values["messageEdited"] = messageEdited
+        CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onNewRecvMessageEdited", errCode: nil, errMsg: nil, data: values)
+    }
+
     public func onRecvC2CReadReceipt(_ msgReceiptList: String?) {
         var values: [String: Any] = [:]
         values["id"] = id
@@ -312,37 +334,6 @@ public class AdvancedMsgListener: NSObject, Open_im_sdk_callbackOnAdvancedMsgLis
         CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onRecvC2CReadReceipt", errCode: nil, errMsg: nil, data: values)
     }
     
-    public func onRecvGroupReadReceipt(_ groupMsgReceiptList: String?) {
-        var values: [String: Any] = [:]
-        values["id"] = id
-        values["groupMsgReceiptList"] = groupMsgReceiptList
-        CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onRecvGroupReadReceipt", errCode: nil, errMsg: nil, data: values)
-    }
-    
-    public func onRecvMessageExtensionsAdded(_ msgID: String?, reactionExtensionList: String?) {
-        var values: [String: Any] = [:]
-        values["id"] = id
-        values["msgID"] = msgID
-        values["reactionExtensionList"] = reactionExtensionList
-        CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onRecvMessageExtensionsAdded", errCode: nil, errMsg: nil, data: values)
-    }
-    
-    public func onRecvMessageExtensionsChanged(_ msgID: String?, reactionExtensionList: String?) {
-        var values: [String: Any] = [:]
-        values["id"] = id
-        values["msgID"] = msgID
-        values["reactionExtensionList"] = reactionExtensionList
-        CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onRecvMessageExtensionsChanged", errCode: nil, errMsg: nil, data: values)
-    }
-    
-    public func onRecvMessageExtensionsDeleted(_ msgID: String?, reactionExtensionKeyList: String?) {
-        var values: [String: Any] = [:]
-        values["id"] = id
-        values["msgID"] = msgID
-        values["reactionExtensionKeyList"] = reactionExtensionKeyList
-        CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onRecvMessageExtensionsDeleted", errCode: nil, errMsg: nil, data: values)
-    }
-    
     public func onRecvNewMessage(_ message: String?) {
         var values: [String: Any] = [:]
         values["id"] = id
@@ -350,20 +341,19 @@ public class AdvancedMsgListener: NSObject, Open_im_sdk_callbackOnAdvancedMsgLis
         CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onRecvNewMessage", errCode: nil, errMsg: nil, data: values)
     }
 
+    public func onRecvOfflineNewMessage(_ message: String?) {
+        var values: [String: Any] = [:]
+        values["id"] = id
+        values["message"] = message
+        CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onRecvOfflineNewMessage", errCode: nil, errMsg: nil, data: values);
+    }
 
-      public func onRecvOfflineNewMessage(_ message: String?) {
+    public func onRecvOnlineOnlyMessage(_ message: String?) {
-          var values: [String: Any] = [:]
+        var values: [String: Any] = [:]
-          values["id"] = id
+        values["id"] = id
-          values["message"] = message
+        values["message"] = message
-          CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onRecvOfflineNewMessage", errCode: nil, errMsg: nil, data: values);
+        CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onRecvOnlineOnlyMessage", errCode: nil, errMsg: nil, data: values);
-      }
+    }
-
-      public func onRecvOnlineOnlyMessage(_ message: String?) {
-           var values: [String: Any] = [:]
-           values["id"] = id
-           values["message"] = message
-           CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onRecvOnlineOnlyMessage", errCode: nil, errMsg: nil, data: values);
-      }
 }
 
 public class CustomBusinessListener: NSObject, Open_im_sdk_callbackOnCustomBusinessListenerProtocol {
@@ -377,4 +367,3 @@ public class CustomBusinessListener: NSObject, Open_im_sdk_callbackOnCustomBusin
         CommonUtil.emitEvent(channel: channel, method: "customBusinessListener", type: "onRecvCustomBusinessMessage", errCode: nil, errMsg: nil, data: s)
     }
 }
-

ios/Classes/Module/UserManager.swift

@@ -13,10 +13,6 @@ public class UserManager: BaseServiceManager {
         self["unsubscribeUsersStatus"] = unsubscribeUsersStatus
         self["getSubscribeUsersStatus"] = getSubscribeUsersStatus
         self["getUserStatus"] = getUserStatus
-        self["getUsersInfoWithCache"] = getUsersInfoWithCache
-        /*
-        self["setSelfInfoEx"] = setSelfInfoEx
-        */
     }
 
     func setUserListener(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
@@ -51,16 +47,6 @@ public class UserManager: BaseServiceManager {
     func getUserStatus(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
         Open_im_sdkGetUserStatus(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "userIDs"])
     }
-    
-    func getUsersInfoWithCache(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkGetUsersInfoWithCache(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "userIDs"],
-        methodCall[string: "groupID"])
-    }
-/*
-    func setSelfInfoEx(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkSetSelfInfoEx(BaseCallback(result: result), methodCall[string: "operationID"], methodCall.toJsonString())
-    }
-    */
 }
 
 public class UserListener: NSObject, Open_im_sdk_callbackOnUserListenerProtocol {

ios/Classes/SwiftFlutterOpenimSdkPlugin.swift

@@ -8,6 +8,7 @@ public class SwiftFlutterOpenimSdkPlugin: NSObject, FlutterPlugin {
     let messageManager: MessageManager
     let groupManager: GroupManager
     let userManger: UserManager
+    let channelManager: ChannelManager
 
     init(channel: FlutterMethodChannel) {
         self.imManager = IMMananger(channel: channel)
@@ -15,6 +16,7 @@ public class SwiftFlutterOpenimSdkPlugin: NSObject, FlutterPlugin {
         self.friendshipManager = FriendshipManager(channel: channel)
         self.messageManager = MessageManager(channel: channel)
         self.groupManager = GroupManager(channel: channel)
+        self.channelManager = ChannelManager(channel: channel)
         self.userManger = UserManager(channel: channel)
     }
     
@@ -37,6 +39,8 @@ public class SwiftFlutterOpenimSdkPlugin: NSObject, FlutterPlugin {
             friendshipManager.handleMethod(call: call, result: result)
         case "groupManager":
             groupManager.handleMethod(call: call, result: result)
+        case "channelManager":
+            channelManager.handleMethod(call: call, result: result)
         case "userManager":
             userManger.handleMethod(call: call, result: result)
         default:

ios/flutter_openim_sdk.podspec

@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'flutter_openim_sdk'
-  s.version          = '0.0.1'
+  s.version          = '0.0.11'
   s.summary          = 'A new Flutter project.'
   s.description      = <<-DESC
 A new Flutter project.
@@ -15,12 +15,17 @@ A new Flutter project.
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
-  s.platform = :ios, '11.0'
+  s.platform = :ios, '13.0'
 
-  s.dependency 'OpenIMSDKCore','3.8.0'
+  #s.ios.vendored_frameworks = 'frameworks/*.xcframework'
+  #s.vendored_frameworks = 'frameworks/*.xcframework'
+  s.dependency 'openim_sdk_core_ios','0.11.0'
   s.static_framework = true
   s.library = 'resolv'
 
+
+
+
   # s.vendored_frameworks = 'Framework/*.xcframework'
   # Flutter.framework does not contain a i386 slice.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386 arm64' }

lib/flutter_openim_sdk.dart

@@ -17,6 +17,7 @@ export 'src/listener/conversation_listener.dart';
 export 'src/listener/custom_business_listener.dart';
 export 'src/listener/friendship_listener.dart';
 export 'src/listener/group_listener.dart';
+export 'src/listener/channel_listener.dart';
 export 'src/listener/listener_for_service.dart';
 export 'src/listener/msg_send_progress_listener.dart';
 export 'src/listener/upload_file_listener.dart';
@@ -24,15 +25,20 @@ export 'src/listener/user_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_channel_manager.dart';
 export 'src/manager/im_manager.dart';
 export 'src/manager/im_message_manager.dart';
 export 'src/manager/im_user_manager.dart';
 export 'src/models/conversation_info.dart';
 export 'src/models/group_info.dart';
+export 'src/models/channel_info.dart';
 export 'src/models/init_config.dart';
 export 'src/models/message.dart';
 export 'src/models/notification_info.dart';
 export 'src/models/search_info.dart';
 export 'src/models/user_info.dart';
+export 'src/models/input_status_changed_data.dart';
+export 'src/models/set_group_member_info.dart';
+export 'src/models/update_req.dart';
 export 'src/openim.dart';
 export 'src/utils.dart';

lib/src/enum/conversation_type.dart

@@ -12,4 +12,8 @@ class ConversationType {
 
   /// Notification
   static const notification = 4;
+
+  /// Super channel chat
+  static const superChannel = 11;
+
 }

lib/src/enum/listener_type.dart

@@ -4,6 +4,7 @@ class ListenerType {
   static const connectListener = 'connectListener';
   static const userListener = 'userListener';
   static const groupListener = 'groupListener';
+  static const channelListener = 'channelListener';
   static const advancedMsgListener = 'advancedMsgListener';
   static const conversationListener = 'conversationListener';
   static const friendListener = 'friendListener';

lib/src/enum/message_status.dart

@@ -12,3 +12,12 @@ class MessageStatus {
   /// Already deleted
   static const deleted = 4;
 }
+
+enum GetHistoryViewType {
+  history(0),
+  search(1);
+
+  final int rawValue;
+
+  const GetHistoryViewType(this.rawValue);
+}

lib/src/enum/message_type.dart

@@ -168,6 +168,9 @@ class MessageType {
   /// Recall Message
   static const revokeMessageNotification = 2101;
 
+  /// Edit Message
+  static const editMessageNotification = 2108;
+
   /// Single Chat Has Read Receipt
   static const signalHasReadReceiptNotification = 2150;
 

lib/src/listener/advanced_msg_listener.dart

@@ -4,9 +4,8 @@ import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
 class OnAdvancedMsgListener {
   Function(Message msg)? onMsgDeleted;
   Function(RevokedInfo info)? onNewRecvMessageRevoked;
+  Function(EditedInfo info)? onNewRecvMessageEdited;
   Function(List<ReadReceiptInfo> list)? onRecvC2CReadReceipt;
-  Function(List<ReadReceiptInfo> list)? onRecvGroupReadReceipt;
-  Function(String msgID, List<String> list)? onRecvMessageExtensionsDeleted;
   Function(Message msg)? onRecvNewMessage;
   Function(Message msg)? onRecvOfflineNewMessage;
   Function(Message msg)? onRecvOnlineOnlyMessage;
@@ -17,9 +16,8 @@ class OnAdvancedMsgListener {
   OnAdvancedMsgListener({
     this.onMsgDeleted,
     this.onNewRecvMessageRevoked,
+    this.onNewRecvMessageEdited,
     this.onRecvC2CReadReceipt,
-    this.onRecvGroupReadReceipt,
-    this.onRecvMessageExtensionsDeleted,
     this.onRecvNewMessage,
     this.onRecvOfflineNewMessage,
     this.onRecvOnlineOnlyMessage,
@@ -34,22 +32,17 @@ class OnAdvancedMsgListener {
     onNewRecvMessageRevoked?.call(info);
   }
 
+  /// Message has been edited
+  void newRecvMessageEdited(EditedInfo info) {
+    onNewRecvMessageEdited?.call(info);
+  }
+
+
   /// C2C Message Read Receipt
   void recvC2CReadReceipt(List<ReadReceiptInfo> list) {
     onRecvC2CReadReceipt?.call(list);
   }
 
-  /// Group Message Read Receipt
-  void recvGroupReadReceipt(List<ReadReceiptInfo> list) {
-    onRecvGroupReadReceipt?.call(list);
-  }
-
-  /// Received Extended Message Deleted
-  /// [list] TypeKey that was deleted
-  void recvMessageExtensionsDeleted(String msgID, List<String> list) {
-    onRecvMessageExtensionsDeleted?.call(msgID, list);
-  }
-
   /// Received a new message
   void recvNewMessage(Message msg) {
     onRecvNewMessage?.call(msg);

lib/src/listener/channel_listener.dart

@@ -0,0 +1,60 @@
+import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
+
+import '../models/channel_info.dart';
+
+/// Channel Listener
+class OnChannelListener {
+
+  Function(ChannelInfo info)? onChannelDismissed;
+  Function(ChannelInfo info)? onChannelInfoChanged;
+  Function(ChannelMembersInfo info)? onChannelMemberAdded;
+  Function(ChannelMembersInfo info)? onChannelMemberDeleted;
+  Function(ChannelMembersInfo info)? onChannelMemberInfoChanged;
+  Function(ChannelInfo info)? onJoinedChannelAdded;
+  Function(ChannelInfo info)? onJoinedChannelDeleted;
+
+  OnChannelListener({
+    this.onChannelDismissed,
+    this.onChannelInfoChanged,
+    this.onChannelMemberAdded,
+    this.onChannelMemberDeleted,
+    this.onChannelMemberInfoChanged,
+    this.onJoinedChannelAdded,
+    this.onJoinedChannelDeleted,
+  });
+
+
+  void channelDismissed(ChannelInfo info) {
+    onChannelDismissed?.call(info);
+  }
+
+  /// Channel information changed
+  void channelInfoChanged(ChannelInfo info) {
+    onChannelInfoChanged?.call(info);
+  }
+
+  /// Channel member added
+  void channelMemberAdded(ChannelMembersInfo info) {
+    onChannelMemberAdded?.call(info);
+  }
+
+  /// Channel member deleted
+  void channelMemberDeleted(ChannelMembersInfo info) {
+    onChannelMemberDeleted?.call(info);
+  }
+
+  /// Channel member information changed
+  void channelMemberInfoChanged(ChannelMembersInfo info) {
+    onChannelMemberInfoChanged?.call(info);
+  }
+
+  /// Joined channel added
+  void joinedChannelAdded(ChannelInfo info) {
+    onJoinedChannelAdded?.call(info);
+  }
+
+  /// Joined channel deleted
+  void joinedChannelDeleted(ChannelInfo info) {
+    onJoinedChannelDeleted?.call(info);
+  }
+}

lib/src/listener/connect_listener.dart

@@ -5,6 +5,7 @@ class OnConnectListener {
   Function()? onConnecting;
   Function()? onKickedOffline;
   Function()? onUserTokenExpired;
+  Function()? onUserTokenInvalid;
 
   OnConnectListener({
     this.onConnectFailed,
@@ -12,6 +13,7 @@ class OnConnectListener {
     this.onConnecting,
     this.onKickedOffline,
     this.onUserTokenExpired,
+    this.onUserTokenInvalid,
   });
 
   /// SDK failed to connect to the server
@@ -38,4 +40,8 @@ class OnConnectListener {
   void userTokenExpired() {
     onUserTokenExpired?.call();
   }
+
+  void userTokenInvalid() {
+    onUserTokenInvalid?.call();
+  }
 }

lib/src/listener/conversation_listener.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
 
 /// Conversation Listener
@@ -5,17 +6,21 @@ class OnConversationListener {
   Function(List<ConversationInfo> list)? onConversationChanged;
   Function(List<ConversationInfo> list)? onNewConversation;
   Function(int count)? onTotalUnreadMessageCountChanged;
-  Function()? onSyncServerFailed;
+  Function(bool? reinstalled)? onSyncServerStart;
-  Function()? onSyncServerFinish;
+  Function(int? progress)? onSyncServerProgress;
-  Function()? onSyncServerStart;
+  Function(bool? reinstalled)? onSyncServerFinish;
+  Function(bool? reinstalled)? onSyncServerFailed;
+  ValueChanged<InputStatusChangedData>? onInputStatusChanged;
 
   OnConversationListener({
     this.onConversationChanged,
     this.onNewConversation,
     this.onTotalUnreadMessageCountChanged,
-    this.onSyncServerFailed,
-    this.onSyncServerFinish,
     this.onSyncServerStart,
+    this.onSyncServerProgress,
+    this.onSyncServerFinish,
+    this.onSyncServerFailed,
+    this.onInputStatusChanged,
   });
 
   /// Conversations have changed
@@ -33,15 +38,23 @@ class OnConversationListener {
     onTotalUnreadMessageCountChanged?.call(count);
   }
 
-  void syncServerFailed() {
+  void syncServerStart(bool? reinstalled) {
-    onSyncServerFailed?.call();
+    onSyncServerStart?.call(reinstalled);
   }
 
-  void syncServerFinish() {
+  void syncServerProgress(int? progress) {
-    onSyncServerFinish?.call();
+    onSyncServerProgress?.call(progress);
   }
 
-  void syncServerStart() {
+  void syncServerFailed(bool? reinstalled) {
-    onSyncServerStart?.call();
+    onSyncServerFailed?.call(reinstalled);
+  }
+
+  void syncServerFinish(bool? reinstalled) {
+    onSyncServerFinish?.call(reinstalled);
+  }
+
+  void conversationUserInputStatusChanged(InputStatusChangedData data) {
+    onInputStatusChanged?.call(data);
   }
 }

lib/src/listener/upload_file_listener.dart

@@ -8,16 +8,25 @@ class OnUploadLogsListener {
 }
 
 class OnUploadFileListener {
+  OnUploadFileListener({
+    this.onComplete,
+    this.onHashPartComplete,
+    this.onHashPartProgress,
+    this.onOpen,
+    this.onPartSize,
+    this.onUploadID,
+    this.onUploadPartComplete,
+    this.onUploadProgress,
+  });
+
   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)?
+  Function(String id, int fileSize, int streamSize, int storageSize)? onUploadProgress;
-      onUploadProgress;
   Function(String id, String uploadID)? onUploadID;
-  Function(String id, int index, int partSize, String partHash)?
+  Function(String id, int index, int partSize, String partHash)? onUploadPartComplete;
-      onUploadPartComplete;
 
   void complete(String id, int size, String url, int type) {
     onComplete?.call(id, size, url, type);
@@ -39,8 +48,7 @@ class OnUploadFileListener {
     onPartSize?.call(id, partSize, num);
   }
 
-  void uploadProgress(
+  void uploadProgress(String id, int fileSize, int streamSize, int storageSize) {
-      String id, int fileSize, int streamSize, int storageSize) {
     onUploadProgress?.call(id, fileSize, streamSize, storageSize);
   }