fix: InvitedJoinGroupNotification

缺失的部分导出，会导致需要额外引用 `import "package:flutter_openim_sdk/src/models/update_req.dart";`，最终导致:

```
Import of a library in the 'lib/src' directory of another package.
Try importing a public library that exports this library, or removing the import.dartimplementation_imports
```

CHANGELOG.md

@@ -1,3 +1,27 @@
+## 3.8.3+3
+
+- [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.8.3-patch.3)
+  
+## 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 +29,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)

LICENSE

@@ -1,21 +1,201 @@
-MIT License
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Copyright (c) 2018 OpenIM Corporation
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+   1. Definitions.
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
+      "License" shall mean the terms and conditions for use, reproduction,
-copies or substantial portions of the Software.
+      and distribution as defined by Sections 1 through 9 of this document.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+      "Licensor" shall mean the copyright owner or entity authorized by
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+      the copyright owner that is granting the License.
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+      "Legal Entity" shall mean the union of the acting entity and all
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+      other entities that control, are controlled by, or are under common
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+      control with that entity. For the purposes of this definition,
-SOFTWARE.
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

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,21 @@ 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 { url "$dir/libs" }
-        maven { url 'https://open-im-online.rentsoft.cn:51000/repository/maven2/' }
         google()
         mavenCentral()
     }
@@ -38,7 +38,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 21
@@ -50,7 +50,5 @@ android {
 }
 
 dependencies {
-    // 本地依赖，现将aar复制到libs/io/openim/core-sdk/0.0.1/ 下，命名core-sdk-0.0.1.aar
+    implementation 'io.openim:core-sdk:3.8.3-patch3@aar'
-//    implementation 'io.openim:core-sdk:0.0.1@aar'
-    implementation 'io.openim:core-sdk:3.8.0@aar'
 }

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

@@ -37,42 +37,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/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
@@ -43,4 +44,4 @@ public class OnConversationListener implements open_im_sdk_callback.OnConversati
     public void onTotalUnreadMessageCountChanged(int i) {
         CommonUtil.emitEvent("conversationListener", "onTotalUnreadMessageCountChanged", i);
     }
-}
+}

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

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,14 +3,14 @@
     <!-- 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.
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>

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

@@ -3,14 +3,14 @@
     <!-- 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.
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>

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/ConversationManager.swift

@@ -2,144 +2,114 @@ import Foundation
 import OpenIMCore
 
 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_sdkSetConversationListener(ConversationListener(channel: channel))
+        Open_im_sdkChangeInputStates(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"], methodCall[bool: "focus"])
-        callBack(result)
     }
-    
+
-    func getAllConversationList(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    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 getConversationListSplit(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func getAtAllTag(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkGetConversationListSplit(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[int: "offset"], methodCall[int: "count"])
+        callBack(result, Open_im_sdkGetAtAllTag(methodCall[string: "operationID"]))
     }
 
-    func getOneConversation(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func getConversationIDBySessionType(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkGetOneConversation(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[int32: "sessionType"], methodCall[string: "sourceID"])
+        let conversationID = Open_im_sdkGetConversationIDBySessionType(methodCall[string: "operationID"], methodCall[string: "sourceID"], methodCall[int: "sessionType"])
-    }
-    
-    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){
+    func getConversationListSplit(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkSetConversationRecvMessageOpt(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"], methodCall[int: "status"])
+        Open_im_sdkGetConversationListSplit(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[int: "offset"], methodCall[int: "count"])
     }
 
-    func getConversationRecvMessageOpt(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func getInputStates(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkGetConversationRecvMessageOpt(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "conversationIDList"])
+        Open_im_sdkGetInputStates(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"], methodCall[string: "userID"])
-    }
-    
-    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){
+    func getMultipleConversation(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-            Open_im_sdkHideAllConversations(BaseCallback(result: result), methodCall[string: "operationID"])
+        Open_im_sdkGetMultipleConversation(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "conversationIDList"])
     }
 
-    func searchConversation(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    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 setConversationEx(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func setConversationDraft(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkSetConversationEx(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"], methodCall[jsonString: "ex"])
+        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 setConversation(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkSetConversation(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"], methodCall[jsonString: "req"])
+    }
+
+    func searchConversations(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkSearchConversation(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "name"])
     }
 }
 
-
 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,17 +133,15 @@ 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)
     }
-    
+
     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,219 +5,194 @@ 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_sdkAcceptGroupApplication(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string: "userID"], methodCall[string: "handleMsg"])
+    }
+
+    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 changeGroupMute(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkChangeGroupMute(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[bool: "mute"])
+    }
+
+    func createGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkCreateGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall.toJsonString())
+    }
+
+    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 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 getGroupMemberOwnerAndAdmin(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkGetGroupMemberOwnerAndAdmin(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"])
+    }
+
+    func getGroupMembersInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkGetSpecifiedGroupMembersInfo(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[jsonString: "userIDList"])
+    }
+
+    func getGroupsInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkGetSpecifiedGroupsInfo(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "groupIDList"])
+    }
+
+    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 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 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 searchGroupMembers(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
+        Open_im_sdkSearchGroupMembers(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "searchParam"])
+    }
+
+    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 inviteUserToGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func setGroupMemberInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkInviteUserToGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string: "reason"],
-                                     methodCall[jsonString: "userIDList"])
-    }
-    
-    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 getGroupMembersInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkGetSpecifiedGroupMembersInfo(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[jsonString: "userIDList"])
-    }
-    
-    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){
-        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 createGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkCreateGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall.toJsonString())
-    }
-    
-    func setGroupInfo(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){
-        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){
-        Open_im_sdkQuitGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"])
-    }
-    
-    func transferGroupOwner(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){
-        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){
         Open_im_sdkSetGroupMemberInfo(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "info"])
     }
-    
-    func isJoinGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
-        Open_im_sdkIsJoinGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"])
-    }
 
-    func getUsersInGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+    func transferGroupOwner(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
-        Open_im_sdkGetUsersInGroup(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"],
+        Open_im_sdkTransferGroupOwner(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string: "userID"])
-        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
     }
   
     public func onGroupApplicationAccepted(_ s: String?) {
         CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onGroupApplicationAccepted", errCode: nil, errMsg: nil, data: s)
     }
-    
+
     public func onGroupApplicationAdded(_ s: String?) {
         CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onGroupApplicationAdded", errCode: nil, errMsg: nil, data: s)
     }
-    
+
     public func onGroupApplicationDeleted(_ s: String?) {
         CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onGroupApplicationDeleted", errCode: nil, errMsg: nil, data: s)
     }
-    
+
     public func onGroupApplicationRejected(_ s: String?) {
         CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onGroupApplicationRejected", errCode: nil, errMsg: nil, data: s)
     }
-    
+
     public func onGroupDismissed(_ s: String?) {
         CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onGroupDismissed", errCode: nil, errMsg: nil, data: s)
     }
-    
+
     public func onGroupInfoChanged(_ s: String?) {
         CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onGroupInfoChanged", errCode: nil, errMsg: nil, data: s)
     }
-    
+
     public func onGroupMemberAdded(_ s: String?) {
         CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onGroupMemberAdded", errCode: nil, errMsg: nil, data: s)
     }
-    
+
     public func onGroupMemberDeleted(_ s: String?) {
         CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onGroupMemberDeleted", errCode: nil, errMsg: nil, data: s)
     }
-    
+
     public func onGroupMemberInfoChanged(_ s: String?) {
         CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onGroupMemberInfoChanged", errCode: nil, errMsg: nil, data: s)
     }
-    
+
     public func onJoinedGroupAdded(_ s: String?) {
         CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onJoinedGroupAdded", errCode: nil, errMsg: nil, data: s)
     }

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
@@ -89,6 +90,10 @@ public class IMMananger: BaseServiceManager {
         Open_im_sdkUploadLogs(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[int: "line"], methodCall[string: "ex"],
         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:
@@ -108,7 +113,7 @@ public class ConnListener: NSObject, Open_im_sdk_callbackOnConnListenerProtocol
     public func onUserTokenInvalid(_ errMsg: String?) {
         CommonUtil.emitEvent(channel: self.channel, method: "connectListener", type: "onUserTokenInvalid", errCode: nil, errMsg: errMsg, data: nil)
     }
-
+    
     private let channel:FlutterMethodChannel
     
     init(channel:FlutterMethodChannel) {

ios/Classes/Module/MessageManager.swift

@@ -227,8 +227,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[jsonString: "offlinePushInfo"], methodCall[bool: "isOnlineOnly"])
-                               methodCall[string: "groupID"], methodCall[jsonString: "offlinePushInfo"], methodCall[bool: "isOnlineOnly"])
     }
     
     func createImageMessageByURL(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
@@ -312,37 +311,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 +318,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?) {
-      public func onRecvOfflineNewMessage(_ 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: "onRecvOfflineNewMessage", errCode: nil, errMsg: nil, data: values);
+    }
-      }
 
-      public func onRecvOnlineOnlyMessage(_ 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: "onRecvOnlineOnlyMessage", errCode: nil, errMsg: nil, data: values);
+        CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onRecvOnlineOnlyMessage", errCode: nil, errMsg: nil, data: values);
-      }
+    }
 }
 
 public class CustomBusinessListener: NSObject, Open_im_sdk_callbackOnCustomBusinessListenerProtocol {
@@ -377,4 +344,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,44 +47,34 @@ 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 {
     public func onUserCommandAdd(_ userCommand: String?) {
         CommonUtil.emitEvent(channel: self.channel, method: "userListener", type: "onUserCommandAdd", errCode: nil, errMsg: nil, data: userCommand)
     }
-
+    
     public func onUserCommandDelete(_ userCommand: String?) {
         CommonUtil.emitEvent(channel: self.channel, method: "userListener", type: "onUserCommandDelete", errCode: nil, errMsg: nil, data: userCommand)
     }
-
+    
     public func onUserCommandUpdate(_ userCommand: String?) {
         CommonUtil.emitEvent(channel: self.channel, method: "userListener", type: "onUserCommandUpdate", errCode: nil, errMsg: nil, data: userCommand)
     }
-
+    
-
+    
     private let channel:FlutterMethodChannel
 
     init(channel:FlutterMethodChannel) {
         self.channel = channel
     }
-
+    
     public func onSelfInfoUpdated(_ userInfo: String?) {
         CommonUtil.emitEvent(channel: self.channel, method: "userListener", type: "onSelfInfoUpdated", errCode: nil, errMsg: nil, data: userInfo)
     }
-
+    
     public func onUserStatusChanged(_ statusInfo: String?) {
         CommonUtil.emitEvent(channel: self.channel, method: "userListener", type: "onUserStatusChanged", errCode: nil, errMsg: nil, data: statusInfo)
     }
 
-}
+}

ios/flutter_openim_sdk.podspec

@@ -17,7 +17,7 @@ A new Flutter project.
   s.dependency 'Flutter'
   s.platform = :ios, '11.0'
 
-  s.dependency 'OpenIMSDKCore','3.8.0'
+  s.dependency 'OpenIMSDKCore','3.8.3+3'
   s.static_framework = true
   s.library = 'resolv'
 

lib/flutter_openim_sdk.dart

@@ -34,5 +34,8 @@ 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/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/listener/advanced_msg_listener.dart

@@ -5,8 +5,6 @@ class OnAdvancedMsgListener {
   Function(Message msg)? onMsgDeleted;
   Function(RevokedInfo info)? onNewRecvMessageRevoked;
   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;
@@ -18,8 +16,6 @@ class OnAdvancedMsgListener {
     this.onMsgDeleted,
     this.onNewRecvMessageRevoked,
     this.onRecvC2CReadReceipt,
-    this.onRecvGroupReadReceipt,
-    this.onRecvMessageExtensionsDeleted,
     this.onRecvNewMessage,
     this.onRecvOfflineNewMessage,
     this.onRecvOnlineOnlyMessage,
@@ -39,17 +35,6 @@ class OnAdvancedMsgListener {
     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/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);
   }
 

lib/src/manager/im_conversation_manager.dart

@@ -1,8 +1,11 @@
+import 'dart:async';
 import 'dart:developer';
 
 import 'package:flutter/services.dart';
 import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
 
+import '../models/update_req.dart';
+
 class ConversationManager {
   MethodChannel _channel;
   late OnConversationListener listener;
@@ -98,14 +101,11 @@ class ConversationManager {
     required String conversationID,
     required bool isPinned,
     String? operationID,
-  }) =>
+  }) {
-      _channel.invokeMethod(
+    final req = ConversationReq(isPinned: isPinned);
-          'pinConversation',
+
-          _buildParam({
+    return setConversation(conversationID, req, operationID: operationID);
-            "conversationID": conversationID,
+  }
-            "isPinned": isPinned,
-            "operationID": Utils.checkOperationID(operationID),
-          }));
 
   /// Hide a Conversation
   /// [conversationID] Conversation ID
@@ -161,22 +161,20 @@ class ConversationManager {
   /// Message Do-Not-Disturb Setting
   /// [conversationID] Conversation ID
   /// [status] 0: normal; 1: not receiving messages; 2: receive online messages but not offline messages
+  @Deprecated('use [setConversation] instead')
   Future<dynamic> setConversationRecvMessageOpt({
     required String conversationID,
     required int status,
     String? operationID,
-  }) =>
+  }) {
-      _channel.invokeMethod(
+    final req = ConversationReq(recvMsgOpt: status);
-          'setConversationRecvMessageOpt',
-          _buildParam({
-            "conversationID": conversationID,
-            "status": status,
-            "operationID": Utils.checkOperationID(operationID),
-          }));
 
-  /// Query Do-Not-Disturb Status
+    return setConversation(conversationID, req, operationID: operationID);
-  /// [conversationIDList] List of conversation IDs
+  }
-  /// Returns: [{"conversationId":"single_13922222222","result":0}], result values: 0: normal; 1: not receiving messages; 2: receive online messages but not offline messages
+
+  /// Message Do-Not-Disturb Setting
+  /// [conversationID] Conversation ID
+  /// [status] 0: normal; 1: not receiving messages; 2: receive online messages but not offline messages
   Future<List<dynamic>> getConversationRecvMessageOpt({
     required List<String> conversationIDList,
     String? operationID,
@@ -193,18 +191,16 @@ class ConversationManager {
   /// Self-Destruct Messages
   /// [conversationID] Conversation ID
   /// [isPrivate] true: enable, false: disable
+  @Deprecated('use [setConversation] instead')
   Future<dynamic> setConversationPrivateChat({
     required String conversationID,
     required bool isPrivate,
     String? operationID,
-  }) =>
+  }) {
-      _channel.invokeMethod(
+    final req = ConversationReq(isPrivateChat: isPrivate);
-          'setConversationPrivateChat',
+
-          _buildParam({
+    return setConversation(conversationID, req, operationID: operationID);
-            "conversationID": conversationID,
+  }
-            "isPrivate": isPrivate,
-            "operationID": Utils.checkOperationID(operationID),
-          }));
 
   /// Delete a Conversation Locally and from the Server
   /// [conversationID] Conversation ID
@@ -245,16 +241,15 @@ class ConversationManager {
 
   /// Reset Mentioned (Group At) Flags [GroupAtType]
   /// [conversationID] Conversation ID
+  @Deprecated('use [setConversation] instead')
   Future<dynamic> resetConversationGroupAtType({
     required String conversationID,
     String? operationID,
-  }) =>
+  }) {
-      _channel.invokeMethod(
+    final req = ConversationReq(groupAtType: 0);
-          'resetConversationGroupAtType',
+
-          _buildParam({
+    return setConversation(conversationID, req, operationID: operationID);
-            "conversationID": conversationID,
+  }
-            "operationID": Utils.checkOperationID(operationID),
-          }));
 
   /// Query @ All Flag
   Future<dynamic> getAtAllTag({
@@ -271,32 +266,27 @@ class ConversationManager {
 
   /// Global Do-Not-Disturb
   /// [status] 0: normal; 1: not receiving messages; 2: receive online messages but not offline messages
+  @Deprecated('use [OpenIM.iMManager.userManager.setSelfInfo()] instead')
   Future<dynamic> setGlobalRecvMessageOpt({
     required int status,
     String? operationID,
-  }) =>
+  }) {
-      _channel.invokeMethod(
+    throw UnimplementedError('setGlobalRecvMessageOpt');
-          'setGlobalRecvMessageOpt',
+  }
-          _buildParam({
-            "status": status,
-            "operationID": Utils.checkOperationID(operationID),
-          }));
 
   /// Set Self-Destruct Message Duration
   /// [conversationID] Conversation ID
   /// [burnDuration] Duration in seconds, default: 30s
+  @Deprecated('use [setConversation] instead')
   Future<dynamic> setConversationBurnDuration({
     required String conversationID,
     int burnDuration = 30,
     String? operationID,
-  }) =>
+  }) {
-      _channel.invokeMethod(
+    final req = ConversationReq(burnDuration: burnDuration);
-          'setConversationBurnDuration',
+
-          _buildParam({
+    return setConversation(conversationID, req, operationID: operationID);
-            "conversationID": conversationID,
+  }
-            "burnDuration": burnDuration,
-            "operationID": Utils.checkOperationID(operationID),
-          }));
 
   /// Mark Messages as Read
   /// [conversationID] Conversation ID
@@ -311,36 +301,6 @@ class ConversationManager {
             "operationID": Utils.checkOperationID(operationID),
           }));
 
-  /// Enable Regular Deletion
-  /// [isMsgDestruct] true: enable
-  Future<dynamic> setConversationIsMsgDestruct({
-    required String conversationID,
-    bool isMsgDestruct = true,
-    String? operationID,
-  }) =>
-      _channel.invokeMethod(
-          'setConversationIsMsgDestruct',
-          _buildParam({
-            "conversationID": conversationID,
-            "isMsgDestruct": isMsgDestruct,
-            "operationID": Utils.checkOperationID(operationID),
-          }));
-
-  /// Regularly Delete Chat Records
-  /// [duration] Seconds
-  Future<dynamic> setConversationMsgDestructTime({
-    required String conversationID,
-    int duration = 1 * 24 * 60 * 60,
-    String? operationID,
-  }) =>
-      _channel.invokeMethod(
-          'setConversationMsgDestructTime',
-          _buildParam({
-            "conversationID": conversationID,
-            "duration": duration,
-            "operationID": Utils.checkOperationID(operationID),
-          }));
-
   /// search Conversations
   Future<List<ConversationInfo>> searchConversations(
     String name, {
@@ -356,20 +316,15 @@ class ConversationManager {
         .then((value) => Utils.toList(value, (map) => ConversationInfo.fromJson(map)));
   }
 
-  Future<List<ConversationInfo>> setConversationEx(
+  @Deprecated('use [setConversation] instead')
+  Future setConversationEx(
     String conversationID, {
     String? ex,
     String? operationID,
   }) {
-    return _channel
+    final req = ConversationReq(ex: ex);
-        .invokeMethod(
+
-            'setConversationEx',
+    return setConversation(conversationID, req, operationID: operationID);
-            _buildParam({
-              'conversationID': conversationID,
-              'ex': ex,
-              "operationID": Utils.checkOperationID(operationID),
-            }))
-        .then((value) => Utils.toList(value, (map) => ConversationInfo.fromJson(map)));
   }
 
   /// Custom Sort for Conversation List
@@ -392,9 +347,68 @@ class ConversationManager {
       }
     });
 
-  static Map _buildParam(Map param) {
+  Future changeInputStates({
+    required String conversationID,
+    required bool focus,
+    String? operationID,
+  }) {
+    return _channel.invokeMethod(
+      'changeInputStates',
+      _buildParam(
+        {
+          'focus': focus,
+          'conversationID': conversationID,
+          'operationID': Utils.checkOperationID(operationID),
+        },
+      ),
+    );
+  }
+
+  Future<List<int>?> getInputStates(
+    String conversationID,
+    String userID, {
+    String? operationID,
+  }) {
+    return _channel
+        .invokeMethod(
+      'getInputStates',
+      _buildParam(
+        {
+          'conversationID': conversationID,
+          'userID': userID,
+          'operationID': Utils.checkOperationID(operationID),
+        },
+      ),
+    )
+        .then((value) {
+      print('getInputStates: $value');
+      final result = Utils.toListMap(value);
+      return List<int>.from(result);
+    });
+  }
+
+  Future setConversation(
+    String conversationID,
+    ConversationReq req, {
+    String? operationID,
+  }) {
+    return _channel.invokeMethod(
+      'setConversation',
+      _buildParam(
+        {
+          'conversationID': conversationID,
+          'req': req.toJson(),
+          'operationID': Utils.checkOperationID(operationID),
+        },
+      ),
+    );
+  }
+
+  static Map _buildParam(Map<String, dynamic> param) {
     param["ManagerName"] = "conversationManager";
+    param = Utils.cleanMap(param);
     log('param: $param');
+
     return param;
   }
 }

lib/src/manager/im_friendship_manager.dart

@@ -1,6 +1,10 @@
+import 'dart:async';
+
 import 'package:flutter/services.dart';
 import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
 
+import '../models/update_req.dart';
+
 class FriendshipManager {
   MethodChannel _channel;
   late OnFriendshipListener listener;
@@ -15,8 +19,9 @@ class FriendshipManager {
 
   /// Query Friend Information
   /// [userIDList] List of user IDs
-  Future<List<FullUserInfo>> getFriendsInfo({
+  Future<List<FriendInfo>> getFriendsInfo({
     required List<String> userIDList,
+    bool filterBlack = false,
     String? operationID,
   }) =>
       _channel
@@ -24,9 +29,10 @@ class FriendshipManager {
               'getFriendsInfo',
               _buildParam({
                 "userIDList": userIDList,
+                'filterBlack': filterBlack,
                 "operationID": Utils.checkOperationID(operationID),
               }))
-          .then((value) => Utils.toList(value, (v) => FullUserInfo.fromJson(v)));
+          .then((value) => Utils.toList(value, (v) => FriendInfo.fromJson(v)));
 
   /// Send a Friend Request, the other party needs to accept the request to become friends.
   /// [userID] User ID to be invited
@@ -63,23 +69,35 @@ class FriendshipManager {
       .then((value) => Utils.toList(value, (v) => FriendApplicationInfo.fromJson(v)));
 
   /// Get Friend List, including friends who have been put into the blacklist
-  Future<List<FullUserInfo>> getFriendList({String? operationID}) => _channel
+  Future<List<FriendInfo>> getFriendList({
-      .invokeMethod(
+    String? operationID,
-          'getFriendList',
+    bool filterBlack = false,
-          _buildParam({
+  }) =>
-            "operationID": Utils.checkOperationID(operationID),
+      _channel
-          }))
+          .invokeMethod(
-      .then((value) => Utils.toList(value, (v) => FullUserInfo.fromJson(v)));
+              'getFriendList',
+              _buildParam({
+                'filterBlack': filterBlack,
+                "operationID": Utils.checkOperationID(operationID),
+              }))
+          .then((value) => Utils.toList(value, (v) => FriendInfo.fromJson(v)));
 
-  Future<List<FullUserInfo>> getFriendListPage({String? operationID, int offset = 0, int count = 40}) => _channel
+  Future<List<FriendInfo>> getFriendListPage({
-      .invokeMethod(
+    bool filterBlack = false,
-          'getFriendListPage',
+    int offset = 0,
-          _buildParam({
+    int count = 40,
-            'offset': offset,
+    String? operationID,
-            'count': count,
+  }) =>
-            "operationID": Utils.checkOperationID(operationID),
+      _channel
-          }))
+          .invokeMethod(
-      .then((value) => Utils.toList(value, (v) => FullUserInfo.fromJson(v)));
+              'getFriendListPage',
+              _buildParam({
+                'offset': offset,
+                'count': count,
+                'filterBlack': filterBlack,
+                "operationID": Utils.checkOperationID(operationID),
+              }))
+          .then((value) => Utils.toList(value, (v) => FriendInfo.fromJson(v)));
 
   /// Get Friend List, including friends who have been put into the blacklist (returns a map)
   Future<List<dynamic>> getFriendListMap({String? operationID}) => _channel
@@ -90,21 +108,36 @@ class FriendshipManager {
           }))
       .then((value) => Utils.toListMap(value));
 
+  Future<List<dynamic>> getFriendListPageMap({
+    bool filterBlack = false,
+    String? operationID,
+    int offset = 0,
+    int count = 40,
+  }) =>
+      _channel
+          .invokeMethod(
+              'getFriendListPage',
+              _buildParam({
+                'offset': offset,
+                'count': count,
+                'filterBlack': filterBlack,
+                "operationID": Utils.checkOperationID(operationID),
+              }))
+          .then((value) => Utils.toListMap(value));
+
   /// Set Friend's Remark
   /// [userID] Friend's userID
   /// [remark] Friend's remark
+  @Deprecated('Use [updateFriends] instead')
   Future<dynamic> setFriendRemark({
     required String userID,
     required String remark,
     String? operationID,
-  }) =>
+  }) {
-      _channel.invokeMethod(
+    final req = UpdateFriendsReq(friendUserIDs: [userID], remark: remark);
-          'setFriendRemark',
+
-          _buildParam({
+    return updateFriends(req, operationID: operationID);
-            'toUserID': userID,
+  }
-            'remark': remark,
-            "operationID": Utils.checkOperationID(operationID),
-          }));
 
   /// Add to Blacklist
   /// [userID] Friend's ID to be added to the blacklist
@@ -229,22 +262,35 @@ class FriendshipManager {
               }))
           .then((value) => Utils.toList(value, (map) => SearchFriendsInfo.fromJson(map)));
 
-  Future<String?> setFriendsEx(
+  @Deprecated('Use [updateFriends] instead')
+  Future setFriendsEx(
     List<String> friendIDs, {
     String? ex,
     String? operationID,
   }) {
-    return _channel.invokeMethod(
+    final req = UpdateFriendsReq(friendUserIDs: friendIDs, ex: ex);
-        'setFriendsEx',
+
-        _buildParam({
+    return updateFriends(req, operationID: operationID);
-          "friendIDs": friendIDs,
-          "ex": ex,
-          "operationID": Utils.checkOperationID(operationID),
-        }));
   }
 
-  static Map _buildParam(Map param) {
+  Future<dynamic> updateFriends(
+    UpdateFriendsReq updateFriendsReq, {
+    String? operationID,
+  }) {
+    return _channel
+        .invokeMethod(
+            'updateFriends',
+            _buildParam({
+              'req': updateFriendsReq.toJson(),
+              'operationID': Utils.checkOperationID(operationID),
+            }))
+        .then((value) => value);
+  }
+
+  static Map _buildParam(Map<String, dynamic> param) {
     param["ManagerName"] = "friendshipManager";
+    param = Utils.cleanMap(param);
+
     return param;
   }
 }

lib/src/manager/im_group_manager.dart

@@ -2,6 +2,7 @@ import 'dart:developer';
 
 import 'package:flutter/services.dart';
 import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
+import 'package:flutter_openim_sdk/src/models/set_group_member_info.dart';
 
 class GroupManager {
   MethodChannel _channel;
@@ -18,39 +19,43 @@ class GroupManager {
   /// Invite users to a group, allowing them to join without approval.
   /// [groupID] Group ID
   /// [userIDList] List of user IDs
-  Future inviteUserToGroup({
+  Future<List<GroupInviteResult>> inviteUserToGroup({
     required String groupID,
     required List<String> userIDList,
     String? reason,
     String? operationID,
   }) =>
-      _channel.invokeMethod(
+      _channel
-          'inviteUserToGroup',
+          .invokeMethod(
-          _buildParam({
+              'inviteUserToGroup',
-            'groupID': groupID,
+              _buildParam({
-            'userIDList': userIDList,
+                'groupID': groupID,
-            'reason': reason,
+                'userIDList': userIDList,
-            "operationID": Utils.checkOperationID(operationID),
+                'reason': reason,
-          }));
+                "operationID": Utils.checkOperationID(operationID),
+              }))
+          .then((value) => Utils.toList(value, (map) => GroupInviteResult.fromJson(map)));
 
   /// Remove group members
   /// [groupID] Group ID
   /// [userIDList] List of user IDs
   /// [reason] Reason for removal
-  Future kickGroupMember({
+  Future<List<GroupInviteResult>> kickGroupMember({
     required String groupID,
     required List<String> userIDList,
     String? reason,
     String? operationID,
   }) =>
-      _channel.invokeMethod(
+      _channel
-          'kickGroupMember',
+          .invokeMethod(
-          _buildParam({
+              'kickGroupMember',
-            'groupID': groupID,
+              _buildParam({
-            'userIDList': userIDList,
+                'groupID': groupID,
-            'reason': reason,
+                'userIDList': userIDList,
-            "operationID": Utils.checkOperationID(operationID),
+                'reason': reason,
-          }));
+                "operationID": Utils.checkOperationID(operationID),
+              }))
+          .then((value) => Utils.toList(value, (map) => GroupInviteResult.fromJson(map)));
 
   /// Query group member information
   /// [groupID] Group ID
@@ -213,15 +218,17 @@ class GroupManager {
 
   /// Apply to join a group, requiring approval from an administrator or the group.
   /// [joinSource] 2: Invited, 3: Searched, 4: Using a QR code
-  Future<dynamic> joinGroup({required String groupID, String? reason, String? operationID, int joinSource = 3, String? ex}) => _channel.invokeMethod(
+  Future<dynamic> joinGroup(
-      'joinGroup',
+          {required String groupID, String? reason, String? operationID, int joinSource = 3, String? ex}) =>
-      _buildParam({
+      _channel.invokeMethod(
-        'groupID': groupID,
+          'joinGroup',
-        'reason': reason,
+          _buildParam({
-        'joinSource': joinSource,
+            'groupID': groupID,
-        'ex': ex,
+            'reason': reason,
-        'operationID': Utils.checkOperationID(operationID),
+            'joinSource': joinSource,
-      }));
+            'ex': ex,
+            'operationID': Utils.checkOperationID(operationID),
+          }));
 
   /// Exit a group
   Future<dynamic> quitGroup({
@@ -357,20 +364,17 @@ class GroupManager {
   /// [groupID] Group ID
   /// [userID] User ID of the group member
   /// [groupNickname] Group nickname
+  @Deprecated('Use [setGroupMemberInfo] instead')
   Future<dynamic> setGroupMemberNickname({
     required String groupID,
     required String userID,
     String? groupNickname,
     String? operationID,
-  }) =>
+  }) {
-      _channel.invokeMethod(
+    final req = SetGroupMemberInfo(groupID: groupID, userID: userID, nickname: groupNickname);
-          'setGroupMemberNickname',
+
-          _buildParam({
+    return setGroupMemberInfo(groupMembersInfo: req, operationID: operationID);
-            'groupID': groupID,
+  }
-            'userID': userID,
-            'groupNickname': groupNickname ?? '',
-            'operationID': Utils.checkOperationID(operationID),
-          }));
 
   /// Query a group
   /// [keywordList] Search keywords; currently, only one keyword is supported, and it cannot be empty.
@@ -399,20 +403,17 @@ class GroupManager {
   /// [groupID] Group ID
   /// [userID] User ID of the group member
   /// [roleLevel] Role level; see [GroupRoleLevel]
+  @Deprecated('Use [setGroupMemberInfo] instead')
   Future<dynamic> setGroupMemberRoleLevel({
     required String groupID,
     required String userID,
     required int roleLevel,
     String? operationID,
-  }) =>
+  }) {
-      _channel.invokeMethod(
+    final req = SetGroupMemberInfo(groupID: groupID, userID: userID, roleLevel: roleLevel);
-          'setGroupMemberRoleLevel',
+
-          _buildParam({
+    return setGroupMemberInfo(groupMembersInfo: req, operationID: operationID);
-            'groupID': groupID,
+  }
-            'userID': userID,
-            'roleLevel': roleLevel,
-            'operationID': Utils.checkOperationID(operationID),
-          }));
 
   /// Get a group member list based on join time
   Future<List<GroupMembersInfo>> getGroupMemberListByJoinTime({
@@ -441,50 +442,44 @@ class GroupManager {
   /// Set group verification for joining
   /// [groupID] Group ID
   /// [needVerification] Verification setting; see [GroupVerification] class
+  @Deprecated('Use [setGroupInfo] instead')
   Future<dynamic> setGroupVerification({
     required String groupID,
     required int needVerification,
     String? operationID,
-  }) =>
+  }) {
-      _channel.invokeMethod(
+    final req = GroupInfo(groupID: groupID, needVerification: needVerification);
-          'setGroupVerification',
-          _buildParam({
-            'groupID': groupID,
-            'needVerification': needVerification,
-            'operationID': Utils.checkOperationID(operationID),
-          }));
 
-  /// Allow/disallow members to view each other's information through the group
+    return setGroupInfo(req, operationID: operationID);
-  /// [groupID] Group ID
+  }
-  /// [status] 0: Disable, 1: Enable
-  Future<dynamic> setGroupLookMemberInfo({
-    required String groupID,
-    required int status,
-    String? operationID,
-  }) =>
-      _channel.invokeMethod(
-          'setGroupLookMemberInfo',
-          _buildParam({
-            'groupID': groupID,
-            'status': status,
-            'operationID': Utils.checkOperationID(operationID),
-          }));
 
   /// Allow/disallow members to add friends through the group
   /// [groupID] Group ID
   /// [status] 0: Disable, 1: Enable
+  @Deprecated('Use [setGroupInfo] instead')
+  Future<dynamic> setGroupLookMemberInfo({
+    required String groupID,
+    required int status,
+    String? operationID,
+  }) {
+    final req = GroupInfo(groupID: groupID, lookMemberInfo: status);
+
+    return setGroupInfo(req, operationID: operationID);
+  }
+
+  /// Allow/disallow members to add friends through the group
+  /// [groupID] Group ID
+  /// [status] 0: Disable, 1: Enable
+  @Deprecated('Use [setGroupInfo] instead')
   Future<dynamic> setGroupApplyMemberFriend({
     required String groupID,
     required int status,
     String? operationID,
-  }) =>
+  }) {
-      _channel.invokeMethod(
+    final req = GroupInfo(groupID: groupID, applyMemberFriend: status);
-          'setGroupApplyMemberFriend',
+
-          _buildParam({
+    return setGroupInfo(req, operationID: operationID);
-            'groupID': groupID,
+  }
-            'status': status,
-            'operationID': Utils.checkOperationID(operationID),
-          }));
 
   /// Get group owners and administrators
   /// [groupId] Group ID
@@ -567,7 +562,7 @@ class GroupManager {
 
   /// Modify the GroupMemberInfo ex field
   Future<dynamic> setGroupMemberInfo({
-    required GroupMembersInfo groupMembersInfo,
+    required SetGroupMemberInfo groupMembersInfo,
     String? operationID,
   }) =>
       _channel.invokeMethod(
@@ -590,9 +585,13 @@ class GroupManager {
             'operationID': Utils.checkOperationID(operationID),
           }));
 
-  static Map _buildParam(Map param) {
+  static Map _buildParam(Map<String, dynamic> param) {
     param["ManagerName"] = "groupManager";
+    param = Utils.cleanMap(param);
     log('param: $param');
+    
     return param;
   }
+
+
 }

lib/src/manager/im_manager.dart

@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'dart:developer';
 import 'dart:io';
 
@@ -56,6 +57,9 @@ class IMManager {
             case 'onUserTokenExpired':
               _connectListener.userTokenExpired();
               break;
+            case 'onUserTokenInvalid':
+              _connectListener.userTokenInvalid();
+              break;
           }
         } else if (call.method == ListenerType.userListener) {
           String type = call.arguments['type'];
@@ -138,18 +142,6 @@ class IMManager {
               var list = Utils.toList(value, (map) => ReadReceiptInfo.fromJson(map));
               messageManager.msgListener.recvC2CReadReceipt(list);
               break;
-            case 'onRecvGroupReadReceipt':
-              var value = call.arguments['data']['groupMsgReceiptList'];
-              var list = Utils.toList(value, (map) => ReadReceiptInfo.fromJson(map));
-              messageManager.msgListener.recvGroupReadReceipt(list);
-              break;
-            case 'onRecvMessageExtensionsDeleted':
-              var msgID = call.arguments['data']['msgID'];
-              var value = call.arguments['data']['reactionExtensionKeyList'];
-              var list = Utils.toList(value, (map) => '$map');
-              messageManager.msgListener.recvMessageExtensionsDeleted(msgID, list);
-              break;
-
             case 'onRecvNewMessage':
               var value = call.arguments['data']['message'];
               final msg = Utils.toObj(value, (map) => Message.fromJson(map));
@@ -184,14 +176,17 @@ class IMManager {
           dynamic data = call.arguments['data'];
           switch (type) {
             case 'onSyncServerStart':
-              conversationManager.listener.syncServerStart();
+              print('dart onSyncServerStart: $data');
+              conversationManager.listener.syncServerStart(data);
+              break;
+            case 'onSyncServerProgress':
+              conversationManager.listener.syncServerProgress(data);
               break;
             case 'onSyncServerFinish':
-              conversationManager.listener.syncServerFinish();
+              conversationManager.listener.syncServerFinish(data);
               break;
-
             case 'onSyncServerFailed':
-              conversationManager.listener.syncServerFailed();
+              conversationManager.listener.syncServerFailed(data);
               break;
             case 'onNewConversation':
               var list = Utils.toList(data, (map) => ConversationInfo.fromJson(map));
@@ -204,6 +199,10 @@ class IMManager {
             case 'onTotalUnreadMessageCountChanged':
               conversationManager.listener.totalUnreadMessageCountChanged(data ?? 0);
               break;
+            case 'onConversationUserInputStatusChanged':
+              final i = Utils.toObj(data, (map) => InputStatusChangedData.fromJson(map));
+              conversationManager.listener.conversationUserInputStatusChanged(i);
+              break;
           }
         } else if (call.method == ListenerType.friendListener) {
           String type = call.arguments['type'];
@@ -357,10 +356,8 @@ class IMManager {
     OnConnectListener listener, {
     String? operationID,
   }) {
-    this._connectListener = listener;
+    _connectListener = listener;
-    if (config.logFilePath == null) {
+    config.logFilePath ??= config.dataDir;
-      config.logFilePath = config.dataDir;
-    }
     return _channel.invokeMethod(
       'initSDK',
       _buildParam(
@@ -377,7 +374,6 @@ class IMManager {
   /// [apiAddr] SDK API address
   /// [wsAddr] SDK WebSocket address
   /// [dataDir] SDK database storage directory
-  /// [objectStorage] Object storage minio
   /// [logLevel] Log level, 1: no printing
   /// [enabledEncryption] true: encryption
   /// [enabledCompression] true: compression
@@ -388,12 +384,13 @@ class IMManager {
     required String dataDir,
     required OnConnectListener listener,
     int logLevel = 6,
+    bool isNeedEncryption = false,
     bool isCompression = false,
     bool isLogStandardOutput = true,
     String? logFilePath,
     String? operationID,
   }) {
-    this._connectListener = listener;
+    _connectListener = listener;
     return _channel.invokeMethod(
       'initSDK',
       _buildParam(
@@ -404,8 +401,10 @@ class IMManager {
           "dataDir": dataDir,
           "logLevel": logLevel,
           "isCompression": isCompression,
+          'isNeedEncryption': isNeedEncryption,
           "isLogStandardOutput": isLogStandardOutput,
           "logFilePath": logFilePath,
+          'systemType': 'flutter',
           "operationID": Utils.checkOperationID(operationID),
         },
       ),
@@ -413,8 +412,8 @@ class IMManager {
   }
 
   /// Deinitialize the SDK
-  Future<dynamic> unInitSDK() {
+  void unInitSDK() {
-    return _channel.invokeMethod('unInitSDK', _buildParam({}));
+    _channel.invokeMethod('unInitSDK', _buildParam({}));
   }
 
   /// Login
@@ -525,7 +524,7 @@ class IMManager {
             'operationID': Utils.checkOperationID(operationID),
           }));
 
-  /// 上传日志
+  /// Upload logs
   Future uploadLogs({
     String? ex,
     int line = 0,
@@ -539,6 +538,27 @@ class IMManager {
             'operationID': Utils.checkOperationID(operationID),
           }));
 
+  Future logs({
+    int logLevel = 5,
+    String? file,
+    int line = 0,
+    String? msgs,
+    String? err,
+    List<dynamic>? keyAndValues,
+    String? operationID,
+  }) =>
+      _channel.invokeMethod(
+          'logs',
+          _buildParam({
+            'line': line,
+            'logLevel': logLevel,
+            'file': file,
+            'msgs': msgs,
+            'err': err,
+            if (keyAndValues != null) 'keyAndValue': jsonEncode(keyAndValues),
+            'operationID': Utils.checkOperationID(operationID),
+          }));
+
   void setUploadLogsListener(OnUploadLogsListener listener) {
     _uploadLogsListener = listener;
   }
@@ -559,8 +579,10 @@ class IMManager {
 
   MethodChannel get channel => _channel;
 
-  static Map _buildParam(Map param) {
+  static Map _buildParam(Map<String, dynamic> param) {
     param["ManagerName"] = "imManager";
+    param = Utils.cleanMap(param);
+
     return param;
   }
 }

lib/src/manager/im_message_manager.dart

@@ -147,18 +147,14 @@ class MessageManager {
 
   /// Typing status update
   /// [msgTip] Custom content
+  @Deprecated('Use [OpenIM.iMManager.conversationManager.changeInputStates(conversationID:focus:)] instead')
   Future typingStatusUpdate({
     required String userID,
     String? msgTip,
     String? operationID,
-  }) =>
+  }) {
-      _channel.invokeMethod(
+    throw UnimplementedError('typingStatusUpdate');
-          'typingStatusUpdate',
+  }
-          _buildParam({
-            "msgTip": msgTip,
-            "userID": userID,
-            "operationID": Utils.checkOperationID(operationID),
-          }));
 
   /// Create a text message
   Future<Message> createTextMessage({
@@ -551,6 +547,7 @@ class MessageManager {
   /// Mark messages as read
   /// [conversationID] Conversation ID
   /// [messageIDList] List of clientMsgIDs of messages to be marked as read
+  @Deprecated('Use markConversationMessageAsRead instead')
   Future markMessagesAsReadByMsgID({
     required String conversationID,
     required List<String> messageIDList,
@@ -572,7 +569,7 @@ class MessageManager {
   Future<AdvancedMessage> getAdvancedHistoryMessageList({
     String? conversationID,
     Message? startMsg,
-    int? lastMinSeq,
+    GetHistoryViewType viewType = GetHistoryViewType.history,
     int? count,
     String? operationID,
   }) =>
@@ -583,7 +580,7 @@ class MessageManager {
                 'conversationID': conversationID ?? '',
                 'startClientMsgID': startMsg?.clientMsgID ?? '',
                 'count': count ?? 40,
-                'lastMinSeq': lastMinSeq ?? 0,
+                'viewType': viewType.rawValue,
                 'operationID': Utils.checkOperationID(operationID),
               }))
           .then((value) => Utils.toObj(value, (map) => AdvancedMessage.fromJson(map)));
@@ -595,7 +592,7 @@ class MessageManager {
   Future<AdvancedMessage> getAdvancedHistoryMessageListReverse({
     String? conversationID,
     Message? startMsg,
-    int? lastMinSeq,
+    GetHistoryViewType viewType = GetHistoryViewType.history,
     int? count,
     String? operationID,
   }) =>
@@ -606,7 +603,7 @@ class MessageManager {
                 'conversationID': conversationID ?? '',
                 'startClientMsgID': startMsg?.clientMsgID ?? '',
                 'count': count ?? 40,
-                'lastMinSeq': lastMinSeq ?? 0,
+                'viewType': viewType.rawValue,
                 'operationID': Utils.checkOperationID(operationID),
               }))
           .then((value) => Utils.toObj(value, (map) => AdvancedMessage.fromJson(map)));
@@ -791,8 +788,10 @@ class MessageManager {
         }));
   }
 
-  static Map _buildParam(Map param) {
+  static Map _buildParam(Map<String, dynamic> param) {
     param["ManagerName"] = "messageManager";
+    param = Utils.cleanMap(param);
+
     return param;
   }
 }

lib/src/manager/im_user_manager.dart

@@ -15,7 +15,7 @@ class UserManager {
 
   /// Get user information
   /// [userIDList] List of user IDs
-  Future<List<FullUserInfo>> getUsersInfo({
+  Future<List<PublicUserInfo>> getUsersInfo({
     required List<String> userIDList,
     String? operationID,
   }) =>
@@ -26,7 +26,7 @@ class UserManager {
                 'userIDList': userIDList,
                 'operationID': Utils.checkOperationID(operationID),
               }))
-          .then((value) => Utils.toList(value, (v) => FullUserInfo.fromJson(v)));
+          .then((value) => Utils.toList(value, (v) => PublicUserInfo.fromJson(v)));
 
   /// Get information of the currently logged-in user
   Future<UserInfo> getSelfUserInfo({
@@ -48,17 +48,16 @@ class UserManager {
   Future<String?> setSelfInfo({
     String? nickname,
     String? faceURL,
-    int? appManagerLevel,
+    int? globalRecvMsgOpt,
     String? ex,
     String? operationID,
   }) =>
       _channel.invokeMethod(
           'setSelfInfo',
           _buildParam({
-            // 'userID': userID,
             'nickname': nickname,
             'faceURL': faceURL,
-            'appManagerLevel': appManagerLevel,
+            'globalRecvMsgOpt': globalRecvMsgOpt,
             'ex': ex,
             'operationID': Utils.checkOperationID(operationID),
           }));
@@ -115,37 +114,28 @@ class UserManager {
         .then((value) => Utils.toList(value, (map) => UserStatusInfo.fromJson(map)));
   }
 
-  Future<List<FullUserInfo>> getUsersInfoWithCache(
+  @Deprecated('Use [getUsersInfo] instead')
+  Future<List<PublicUserInfo>> getUsersInfoWithCache(
     List<String> userIDs, {
-    String? groupID,
     String? operationID,
   }) {
-    return _channel
+    return getUsersInfo(userIDList: userIDs, operationID: operationID);
-        .invokeMethod(
-            'getUsersInfoWithCache',
-            _buildParam({
-              'userIDs': userIDs,
-              'groupID': groupID,
-              'operationID': Utils.checkOperationID(operationID),
-            }))
-        .then((value) => Utils.toList(value, (map) => FullUserInfo.fromJson(map)));
   }
 
-/*
+/// Global Do Not Disturb
-  Future<String?> setSelfUserInfoEx(
+/// [status] 0: Normal; 1: Do not accept messages; 2: Accept online messages but not offline messages;
-    UserInfo userInfo, {
+  @Deprecated('use [setSelfInfo] instead')
+  Future<dynamic> setGlobalRecvMessageOpt({
+    required int status,
     String? operationID,
   }) {
-    return _channel.invokeMethod(
+    return setSelfInfo(globalRecvMsgOpt: status);
-        'setSelfUserInfoEx',
-        _buildParam({
-          ...userInfo.toJson(),
-          'operationID': Utils.checkOperationID(operationID),
-        }));
   }
-*/
+
-  static Map _buildParam(Map param) {
+  static Map _buildParam(Map<String, dynamic> param) {
     param["ManagerName"] = "userManager";
+    param = Utils.cleanMap(param);
+
     return param;
   }
 }

lib/src/models/group_info.dart

@@ -115,16 +115,11 @@ class GroupInfo {
   }
 
   /// Corresponding Conversation Type for Group Type
-  int get sessionType => groupType == GroupType.general
+  int get sessionType => groupType == GroupType.general ? ConversationType.group : ConversationType.superGroup;
-      ? ConversationType.group
-      : ConversationType.superGroup;
 
   @override
   bool operator ==(Object other) =>
-      identical(this, other) ||
+      identical(this, other) || other is GroupInfo && runtimeType == other.runtimeType && groupID == other.groupID;
-      other is GroupInfo &&
-          runtimeType == other.runtimeType &&
-          groupID == other.groupID;
 
   @override
   int get hashCode => groupID.hashCode;

lib/src/models/init_config.dart

@@ -1,4 +1,5 @@
 class InitConfig {
+  String systemType;
   int platformID;
   String apiAddr;
   String wsAddr;
@@ -6,6 +7,7 @@ class InitConfig {
   int logLevel;
   bool isLogStandardOutput;
   String? logFilePath;
+  bool enabledCompression;
 
   InitConfig({
     required this.platformID,
@@ -15,18 +17,21 @@ class InitConfig {
     this.logLevel = 6,
     this.isLogStandardOutput = true,
     this.logFilePath,
+    this.enabledCompression = false,
+    this.systemType = 'flutter',
   });
 
   factory InitConfig.fromJson(Map<String, dynamic> json) {
     return InitConfig(
-      platformID: json['platformID'],
+        platformID: json['platformID'],
-      apiAddr: json['apiAddr'],
+        apiAddr: json['apiAddr'],
-      wsAddr: json['wsAddr'],
+        wsAddr: json['wsAddr'],
-      dataDir: json['dataDir'],
+        dataDir: json['dataDir'],
-      logLevel: json['logLevel'],
+        logLevel: json['logLevel'],
-      isLogStandardOutput: json['isLogStandardOutput'],
+        isLogStandardOutput: json['isLogStandardOutput'],
-      logFilePath: json['logFilePath'],
+        logFilePath: json['logFilePath'],
-    );
+        enabledCompression: json['isCompression'],
+        systemType: json['systemType']);
   }
 
   Map<String, dynamic> toMap() {
@@ -38,6 +43,8 @@ class InitConfig {
       'logLevel': logLevel,
       'isLogStandardOutput': isLogStandardOutput,
       'logFilePath': logFilePath,
+      'isCompression': enabledCompression,
+      'systemType': systemType,
     };
   }
 }

lib/src/models/input_status_changed_data.dart

@@ -0,0 +1,24 @@
+class InputStatusChangedData {
+  final String userID;
+  final String conversationID;
+  final List<int>? platformIDs;
+
+  InputStatusChangedData({
+    required this.userID,
+    required this.conversationID,
+    this.platformIDs,
+  });
+
+  InputStatusChangedData.fromJson(Map<String, dynamic> json)
+      : userID = json['userID'],
+        conversationID = json['conversationID'],
+        platformIDs = List<int>.from(json['platformIDs'] ?? []);
+
+  Map<String, dynamic> toJson() {
+    final data = <String, dynamic>{};
+    data['userID'] = userID;
+    data['conversationID'] = conversationID;
+    data['platformIDs'] = platformIDs;
+    return data;
+  }
+}

lib/src/models/notification_info.dart

@@ -1,6 +1,6 @@
 import '../../flutter_openim_sdk.dart';
 
-/// OA notification
+/// OA Notification
 class OANotification {
   /// Title
   String? notificationName;
@@ -58,57 +58,50 @@ class OANotification {
     text = json['text'];
     externalUrl = json['externalUrl'];
     mixType = json['mixType'];
-    pictureElem = json['pictureElem'] != null
+    pictureElem = json['pictureElem'] != null ? PictureElem.fromJson(json['pictureElem']) : null;
-        ? PictureElem.fromJson(json['pictureElem'])
+    soundElem = json['soundElem'] != null ? SoundElem.fromJson(json['soundElem']) : null;
-        : null;
+    videoElem = json['videoElem'] != null ? VideoElem.fromJson(json['videoElem']) : null;
-    soundElem = json['soundElem'] != null
+    fileElem = json['fileElem'] != null ? FileElem.fromJson(json['fileElem']) : null;
-        ? SoundElem.fromJson(json['soundElem'])
-        : null;
-    videoElem = json['videoElem'] != null
-        ? VideoElem.fromJson(json['videoElem'])
-        : null;
-    fileElem =
-        json['fileElem'] != null ? FileElem.fromJson(json['fileElem']) : null;
     ex = json['ex'];
   }
 
   Map<String, dynamic> toJson() {
     final data = Map<String, dynamic>();
-    data['notificationName'] = this.notificationName;
+    data['notificationName'] = notificationName;
-    data['notificationFaceURL'] = this.notificationFaceURL;
+    data['notificationFaceURL'] = notificationFaceURL;
-    data['notificationType'] = this.notificationType;
+    data['notificationType'] = notificationType;
-    data['text'] = this.text;
+    data['text'] = text;
-    data['externalUrl'] = this.externalUrl;
+    data['externalUrl'] = externalUrl;
-    data['mixType'] = this.mixType;
+    data['mixType'] = mixType;
-    if (this.pictureElem != null) {
+    if (pictureElem != null) {
-      data['pictureElem'] = this.pictureElem!.toJson();
+      data['pictureElem'] = pictureElem!.toJson();
     }
-    if (this.soundElem != null) {
+    if (soundElem != null) {
-      data['soundElem'] = this.soundElem!.toJson();
+      data['soundElem'] = soundElem!.toJson();
     }
-    if (this.videoElem != null) {
+    if (videoElem != null) {
-      data['videoElem'] = this.videoElem!.toJson();
+      data['videoElem'] = videoElem!.toJson();
     }
-    if (this.fileElem != null) {
+    if (fileElem != null) {
-      data['fileElem'] = this.fileElem!.toJson();
+      data['fileElem'] = fileElem!.toJson();
     }
-    data['ex'] = this.ex;
+    data['ex'] = ex;
     return data;
   }
 }
 
-/// 群事件通知
+/// Group Event Notification
 class GroupNotification {
-  /// 群信息
+  /// Group information
   GroupInfo? group;
 
-  /// 当前事件操作者信息
+  /// Current event operator information
   GroupMembersInfo? opUser;
 
-  /// 群拥有者信息
+  /// Group owner information
   GroupMembersInfo? groupOwnerUser;
 
-  /// 产生影响的群成员列表
+  /// List of affected group members
   List<GroupMembersInfo>? memberList;
 
   GroupNotification({
@@ -120,12 +113,8 @@ class GroupNotification {
 
   GroupNotification.fromJson(Map<String, dynamic> json) {
     group = json['group'] != null ? GroupInfo.fromJson(json['group']) : null;
-    opUser = json['opUser'] != null
+    opUser = json['opUser'] != null ? GroupMembersInfo.fromJson(json['opUser']) : null;
-        ? GroupMembersInfo.fromJson(json['opUser'])
+    groupOwnerUser = json['groupOwnerUser'] != null ? GroupMembersInfo.fromJson(json['groupOwnerUser']) : null;
-        : null;
-    groupOwnerUser = json['groupOwnerUser'] != null
-        ? GroupMembersInfo.fromJson(json['groupOwnerUser'])
-        : null;
     if (json['memberList'] != null) {
       memberList = <GroupMembersInfo>[];
       json['memberList'].forEach((v) {
@@ -136,40 +125,42 @@ class GroupNotification {
 
   Map<String, dynamic> toJson() {
     final data = Map<String, dynamic>();
-    if (this.group != null) {
+    if (group != null) {
-      data['group'] = this.group!.toJson();
+      data['group'] = group!.toJson();
     }
-    if (this.opUser != null) {
+    if (opUser != null) {
-      data['opUser'] = this.opUser!.toJson();
+      data['opUser'] = opUser!.toJson();
     }
-    if (this.groupOwnerUser != null) {
+    if (groupOwnerUser != null) {
-      data['groupOwnerUser'] = this.groupOwnerUser!.toJson();
+      data['groupOwnerUser'] = groupOwnerUser!.toJson();
     }
-    if (this.memberList != null) {
+    if (memberList != null) {
-      data['memberList'] = this.memberList!.map((v) => v.toJson()).toList();
+      data['memberList'] = memberList!.map((v) => v.toJson()).toList();
     }
     return data;
   }
 }
 
-/// 用户被邀请进群通知
+/// User Invited to Join Group Notification
 class InvitedJoinGroupNotification {
-  /// 群信息
+  /// Group information
   GroupInfo? group;
 
-  /// 操作者信息
+  /// Operator information
   GroupMembersInfo? opUser;
 
-  /// 被邀请进群的成员信息
+  /// Inviter information
+  GroupMembersInfo? inviterUser;
+
+  /// List of members invited to join the group
   List<GroupMembersInfo>? invitedUserList;
 
   InvitedJoinGroupNotification({this.group, this.opUser, this.invitedUserList});
 
   InvitedJoinGroupNotification.fromJson(Map<String, dynamic> json) {
     group = json['group'] != null ? GroupInfo.fromJson(json['group']) : null;
-    opUser = json['opUser'] != null
+    opUser = json['opUser'] != null ? GroupMembersInfo.fromJson(json['opUser']) : null;
-        ? GroupMembersInfo.fromJson(json['opUser'])
+    inviterUser = json['inviterUser'] != null ? GroupMembersInfo.fromJson(json['inviterUser']) : null;
-        : null;
     if (json['invitedUserList'] != null) {
       invitedUserList = <GroupMembersInfo>[];
       json['invitedUserList'].forEach((v) {
@@ -179,40 +170,39 @@ class InvitedJoinGroupNotification {
   }
 
   Map<String, dynamic> toJson() {
-    final Map<String, dynamic> data = new Map<String, dynamic>();
+    final Map<String, dynamic> data = <String, dynamic>{};
-    if (this.group != null) {
+    if (group != null) {
-      data['group'] = this.group!.toJson();
+      data['group'] = group!.toJson();
     }
-    if (this.opUser != null) {
+    if (opUser != null) {
-      data['opUser'] = this.opUser!.toJson();
+      data['opUser'] = opUser!.toJson();
     }
-    if (this.invitedUserList != null) {
+    if (inviterUser != null) {
-      data['invitedUserList'] =
+      data['inviterUser'] = inviterUser!.toJson();
-          this.invitedUserList!.map((v) => v.toJson()).toList();
+    }
+    if (invitedUserList != null) {
+      data['invitedUserList'] = invitedUserList!.map((v) => v.toJson()).toList();
     }
     return data;
   }
 }
 
-/// 组踢出成员通知
+/// Group Member Kicked Notification
 class KickedGroupMemeberNotification {
-  /// 群信息
+  /// Group information
   GroupInfo? group;
 
-  /// 操作者信息
+  /// Operator information
   GroupMembersInfo? opUser;
 
-  /// 被踢出群的成员信息列表
+  /// List of members kicked from the group
   List<GroupMembersInfo>? kickedUserList;
 
-  KickedGroupMemeberNotification(
+  KickedGroupMemeberNotification({this.group, this.opUser, this.kickedUserList});
-      {this.group, this.opUser, this.kickedUserList});
 
   KickedGroupMemeberNotification.fromJson(Map<String, dynamic> json) {
     group = json['group'] != null ? GroupInfo.fromJson(json['group']) : null;
-    opUser = json['opUser'] != null
+    opUser = json['opUser'] != null ? GroupMembersInfo.fromJson(json['opUser']) : null;
-        ? GroupMembersInfo.fromJson(json['opUser'])
-        : null;
     if (json['kickedUserList'] != null) {
       kickedUserList = <GroupMembersInfo>[];
       json['kickedUserList'].forEach((v) {
@@ -223,87 +213,82 @@ class KickedGroupMemeberNotification {
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
-    if (this.group != null) {
+    if (group != null) {
-      data['group'] = this.group!.toJson();
+      data['group'] = group!.toJson();
     }
-    if (this.opUser != null) {
+    if (opUser != null) {
-      data['opUser'] = this.opUser!.toJson();
+      data['opUser'] = opUser!.toJson();
     }
-    if (this.kickedUserList != null) {
+    if (kickedUserList != null) {
-      data['kickedUserList'] =
+      data['kickedUserList'] = kickedUserList!.map((v) => v.toJson()).toList();
-          this.kickedUserList!.map((v) => v.toJson()).toList();
     }
     return data;
   }
 }
 
-/// 退出群通知
+/// Quit Group Notification
 class QuitGroupNotification {
-  /// 群信息
+  /// Group information
   GroupInfo? group;
 
-  /// 退群的成员信息
+  /// Information of the member who quit the group
   GroupMembersInfo? quitUser;
 
   QuitGroupNotification({this.group, this.quitUser});
 
   QuitGroupNotification.fromJson(Map<String, dynamic> json) {
     group = json['group'] != null ? GroupInfo.fromJson(json['group']) : null;
-    quitUser = json['quitUser'] != null
+    quitUser = json['quitUser'] != null ? GroupMembersInfo.fromJson(json['quitUser']) : null;
-        ? GroupMembersInfo.fromJson(json['quitUser'])
-        : null;
   }
 
   Map<String, dynamic> toJson() {
     final data = Map<String, dynamic>();
-    if (this.group != null) {
+    if (group != null) {
-      data['group'] = this.group!.toJson();
+      data['group'] = group!.toJson();
     }
-    if (this.quitUser != null) {
+    if (quitUser != null) {
-      data['quitUser'] = this.quitUser!.toJson();
+      data['quitUser'] = quitUser!.toJson();
     }
     return data;
   }
 }
 
-/// 进群通知
+/// Enter Group Notification
 class EnterGroupNotification {
-  /// 群信息
+  /// Group information
   GroupInfo? group;
 
-  /// 进入群的成员信息
+  /// Information of the member who entered the group
   GroupMembersInfo? entrantUser;
 
   EnterGroupNotification({this.group, this.entrantUser});
 
   EnterGroupNotification.fromJson(Map<String, dynamic> json) {
     group = json['group'] != null ? GroupInfo.fromJson(json['group']) : null;
-    entrantUser = json['entrantUser'] != null
+    entrantUser = json['entrantUser'] != null ? GroupMembersInfo.fromJson(json['entrantUser']) : null;
-        ? GroupMembersInfo.fromJson(json['entrantUser'])
-        : null;
   }
 
   Map<String, dynamic> toJson() {
     final data = Map<String, dynamic>();
-    if (this.group != null) {
+    if (group != null) {
-      data['group'] = this.group!.toJson();
+      data['group'] = group!.toJson();
     }
-    if (this.entrantUser != null) {
+    if (entrantUser != null) {
-      data['quitUser'] = this.entrantUser!.toJson();
+      data['entrantUser'] = entrantUser!.toJson();
     }
     return data;
   }
 }
 
-/// 群权转让通知
+/// Group Rights Transfer Notification
 class GroupRightsTransferNoticication {
-  /// 群信息
+  /// Group information
   GroupInfo? group;
 
-  /// 操作者信息
+  /// Operator information
   GroupMembersInfo? opUser;
 
-  /// 群新的拥有者信息
+  /// New group owner information
   GroupMembersInfo? newGroupOwner;
 
   GroupRightsTransferNoticication({
@@ -314,41 +299,37 @@ class GroupRightsTransferNoticication {
 
   GroupRightsTransferNoticication.fromJson(Map<String, dynamic> json) {
     group = json['group'] != null ? GroupInfo.fromJson(json['group']) : null;
-    opUser = json['opUser'] != null
+    opUser = json['opUser'] != null ? GroupMembersInfo.fromJson(json['opUser']) : null;
-        ? GroupMembersInfo.fromJson(json['opUser'])
+    newGroupOwner = json['newGroupOwner'] != null ? GroupMembersInfo.fromJson(json['newGroupOwner']) : null;
-        : null;
-    newGroupOwner = json['newGroupOwner'] != null
-        ? GroupMembersInfo.fromJson(json['newGroupOwner'])
-        : null;
   }
 
   Map<String, dynamic> toJson() {
     final data = Map<String, dynamic>();
-    if (this.group != null) {
+    if (group != null) {
-      data['group'] = this.group!.toJson();
+      data['group'] = group!.toJson();
     }
-    if (this.opUser != null) {
+    if (opUser != null) {
-      data['opUser'] = this.opUser!.toJson();
+      data['opUser'] = opUser!.toJson();
     }
-    if (this.newGroupOwner != null) {
+    if (newGroupOwner != null) {
-      data['newGroupOwner'] = this.newGroupOwner!.toJson();
+      data['newGroupOwner'] = newGroupOwner!.toJson();
     }
     return data;
   }
 }
 
-/// 禁言成员通知
+/// Mute Member Notification
 class MuteMemberNotification {
-  /// 群信息
+  /// Group information
   GroupInfo? group;
 
-  /// 操作者信息
+  /// Operator information
   GroupMembersInfo? opUser;
 
-  /// 被禁言的成员信息
+  /// Muted member information
   GroupMembersInfo? mutedUser;
 
-  /// 禁言时间s
+  /// Mute duration in seconds
   int? mutedSeconds;
 
   MuteMemberNotification({
@@ -360,40 +341,36 @@ class MuteMemberNotification {
 
   MuteMemberNotification.fromJson(Map<String, dynamic> json) {
     group = json['group'] != null ? GroupInfo.fromJson(json['group']) : null;
-    opUser = json['opUser'] != null
+    opUser = json['opUser'] != null ? GroupMembersInfo.fromJson(json['opUser']) : null;
-        ? GroupMembersInfo.fromJson(json['opUser'])
+    mutedUser = json['mutedUser'] != null ? GroupMembersInfo.fromJson(json['mutedUser']) : null;
-        : null;
-    mutedUser = json['mutedUser'] != null
-        ? GroupMembersInfo.fromJson(json['mutedUser'])
-        : null;
     mutedSeconds = json['mutedSeconds'];
   }
 
   Map<String, dynamic> toJson() {
     final data = Map<String, dynamic>();
-    if (this.group != null) {
+    if (group != null) {
-      data['group'] = this.group!.toJson();
+      data['group'] = group!.toJson();
     }
-    if (this.opUser != null) {
+    if (opUser != null) {
-      data['opUser'] = this.opUser!.toJson();
+      data['opUser'] = opUser!.toJson();
     }
-    if (this.mutedUser != null) {
+    if (mutedUser != null) {
-      data['mutedUser'] = this.mutedUser!.toJson();
+      data['mutedUser'] = mutedUser!.toJson();
     }
-    data['mutedSeconds'] = this.mutedSeconds;
+    data['mutedSeconds'] = mutedSeconds;
     return data;
   }
 }
 
-/// 阅后即焚通知
+/// Burn After Reading Notification
 class BurnAfterReadingNotification {
-  /// 接收者
+  /// Receiver
   String? recvID;
 
-  /// 发送者
+  /// Sender
   String? sendID;
 
-  /// 是否开启
+  /// Whether enabled
   bool? isPrivate;
 
   BurnAfterReadingNotification({this.recvID, this.sendID, this.isPrivate});
@@ -406,22 +383,22 @@ class BurnAfterReadingNotification {
 
   Map<String, dynamic> toJson() {
     final data = Map<String, dynamic>();
-    data['recvID'] = this.recvID;
+    data['recvID'] = recvID;
-    data['sendID'] = this.sendID;
+    data['sendID'] = sendID;
-    data['isPrivate'] = this.isPrivate;
+    data['isPrivate'] = isPrivate;
     return data;
   }
 }
 
-/// 群成员信息发送变化通知
+/// Group Member Information Changed Notification
 class GroupMemberInfoChangedNotification {
-  /// 群信息
+  /// Group information
   GroupInfo? group;
 
-  /// 操作者信息
+  /// Operator information
   GroupMembersInfo? opUser;
 
-  /// 资料发生改变的成员
+  /// Member with changed information
   GroupMembersInfo? changedUser;
 
   GroupMemberInfoChangedNotification({
@@ -432,25 +409,21 @@ class GroupMemberInfoChangedNotification {
 
   GroupMemberInfoChangedNotification.fromJson(Map<String, dynamic> json) {
     group = json['group'] != null ? GroupInfo.fromJson(json['group']) : null;
-    opUser = json['opUser'] != null
+    opUser = json['opUser'] != null ? GroupMembersInfo.fromJson(json['opUser']) : null;
-        ? GroupMembersInfo.fromJson(json['opUser'])
+    changedUser = json['changedUser'] != null ? GroupMembersInfo.fromJson(json['changedUser']) : null;
-        : null;
-    changedUser = json['changedUser'] != null
-        ? GroupMembersInfo.fromJson(json['changedUser'])
-        : null;
   }
 
   Map<String, dynamic> toJson() {
     final data = Map<String, dynamic>();
-    if (this.group != null) {
+    if (group != null) {
-      data['group'] = this.group!.toJson();
+      data['group'] = group!.toJson();
     }
-    if (this.opUser != null) {
+    if (opUser != null) {
-      data['opUser'] = this.opUser!.toJson();
+      data['opUser'] = opUser!.toJson();
     }
-    if (this.changedUser != null) {
+    if (changedUser != null) {
-      data['changedUser'] = this.changedUser!.toJson();
+      data['changedUser'] = changedUser!.toJson();
     }
     return data;
   }
-}
+}