Merge remote-tracking branch 'github/main' into dev_gem_s1

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

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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)

android/build.gradle

@@ -15,6 +15,10 @@ 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()
     }
@@ -38,7 +42,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 21
@@ -53,5 +57,5 @@ android {
 }
 
 dependencies {
-    implementation 'com.openim:sdkcore:1.0.0'
+    implementation 'com.openim:sdkcore:1.0.8'
 }

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

@@ -29,6 +29,14 @@ public class OnAdvancedMsgListener implements open_im_sdk_callback.OnAdvancedMsg
         CommonUtil.emitEvent("advancedMsgListener", "onNewRecvMessageRevoked", values);
     }
 
+    @Override
+    public void onNewRecvMessageEdited(String s) {
+        final Map<String, String> values = new ArrayMap<>();
+        values.put("id", id);
+        values.put("messageEdited", s);
+        CommonUtil.emitEvent("advancedMsgListener", "onNewRecvMessageEdited", values);
+    }
+
     @Override
     public void onRecvC2CReadReceipt(String s) {
         final Map<String, String> values = new ArrayMap<>();

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

@@ -42,6 +42,16 @@ public class MessageManager extends BaseManager {
         );
     }
 
+    public void editMessage(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.editMessage(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                value(methodCall, "conversationID"),
+                value(methodCall, "clientMsgID"),
+                jsonValue(methodCall, "message")
+        );
+    }
+
     public void deleteMessageFromLocalStorage(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.deleteMessageFromLocalStorage(
                 new OnBaseListener(result, methodCall),
@@ -378,6 +388,16 @@ public class MessageManager extends BaseManager {
                         jsonValue(methodCall, "fileElem")));
     }
 
+    public void fetchSurroundingMessages(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.fetchSurroundingMessages(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                jsonValue(methodCall, "message"),
+                int2long(methodCall, "before"),
+                int2long(methodCall, "after"));
+    }
+
+
     public void setCustomBusinessListener(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.setCustomBusinessListener(new OnCustomBusinessListener());
 

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

@@ -53,7 +53,7 @@ public class CommonUtil {
                 @Override
                 public void success(Object result) {
                     // 处理成功返回值
-                    Log.i("F-OpenIMSDK(native call flutter)", "Method " + method + " returned: " + result.toString());
+                    Log.i("F-OpenIMSDK(native call flutter)", "Method " + method + " returned: ");
                 }
 
                 @Override

example/ios/Podfile.lock

@@ -0,0 +1,29 @@
+PODS:
+  - Flutter (1.0.0)
+  - flutter_openim_sdk (0.0.1):
+    - Flutter
+    - OpenIMSDKCore (= 3.8.2)
+  - OpenIMSDKCore (3.8.2)
+
+DEPENDENCIES:
+  - Flutter (from `Flutter`)
+  - flutter_openim_sdk (from `.symlinks/plugins/flutter_openim_sdk/ios`)
+
+SPEC REPOS:
+  trunk:
+    - OpenIMSDKCore
+
+EXTERNAL SOURCES:
+  Flutter:
+    :path: Flutter
+  flutter_openim_sdk:
+    :path: ".symlinks/plugins/flutter_openim_sdk/ios"
+
+SPEC CHECKSUMS:
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+  flutter_openim_sdk: 77bdd08fb8dda1644a0c150b8ba7324f11b32404
+  OpenIMSDKCore: aaffd63079a874d9272b8b962598723cb8128d32
+
+PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
+
+COCOAPODS: 1.15.2

example/ios/Runner.xcodeproj/project.pbxproj

@@ -10,10 +10,12 @@
 		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 */; };
 		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 */
@@ -40,14 +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>"; };
 		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>"; };
+		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>"; };
+		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>"; };
+		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; };
@@ -55,13 +62,25 @@
 		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 = (
+				3E0FE62DE2A4D4E61AC3FD02 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -76,6 +95,20 @@
 			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 */ = {
 			isa = PBXGroup;
 			children = (
@@ -94,6 +127,8 @@
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
 				331C8082294A63A400263BE5 /* RunnerTests */,
+				8575235C80CAB4F7FB7F5B46 /* Pods */,
+				B94289CF044A7671B3BECB8E /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -121,6 +156,15 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
+		B94289CF044A7671B3BECB8E /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				8BB3D975831D21A8FACEF96B /* Pods_Runner.framework */,
+				119B0071FAB85FAD36937602 /* Pods_RunnerTests.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -128,8 +172,10 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
 			buildPhases = (
+				70DBF52745AF25A4FC72D8C3 /* [CP] Check Pods Manifest.lock */,
 				331C807D294A63A400263BE5 /* Sources */,
 				331C807F294A63A400263BE5 /* Resources */,
+				1B803A0F046E9658A8FCEED0 /* Frameworks */,
 			);
 			buildRules = (
 			);
@@ -145,6 +191,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				3DCEC8459668E43AE9B4C8D5 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
@@ -238,6 +285,50 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		3DCEC8459668E43AE9B4C8D5 /* [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-Runner-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;
+		};
+		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;
@@ -379,6 +470,7 @@
 		};
 		331C8088294A63A400263BE5 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = F0FFA291A8BB24B66A6DCC8C /* Pods-RunnerTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -396,6 +488,7 @@
 		};
 		331C8089294A63A400263BE5 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 5C84146D7BEE11433AA4DE9E /* Pods-RunnerTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -411,6 +504,7 @@
 		};
 		331C808A294A63A400263BE5 /* Profile */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = BD60456F5D1660BF5A90F9A1 /* Pods-RunnerTests.profile.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;

example/ios/Runner.xcworkspace/contents.xcworkspacedata

@@ -4,4 +4,7 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>

example/ios/Runner/AppDelegate.swift

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

example/pubspec.lock

@@ -76,7 +76,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "3.8.1+1"
+    version: "3.8.3+2"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -86,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:
@@ -126,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:
@@ -195,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:
@@ -211,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.4.4 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"

ios/Classes/Module/MessageManager.swift

@@ -9,6 +9,7 @@ public class MessageManager: BaseServiceManager {
         self["setAdvancedMsgListener"] = setAdvancedMsgListener
         self["sendMessage"] = sendMessage
         self["revokeMessage"] = revokeMessage
+        self["editMessage"] = editMessage
         self["deleteMessageFromLocalStorage"] = deleteMessageFromLocalStorage
         self["deleteMessageFromLocalAndSvr"] = deleteMessageFromLocalAndSvr
         self["deleteAllMsgFromLocal"] = deleteAllMsgFromLocal
@@ -47,6 +48,10 @@ public class MessageManager: BaseServiceManager {
         self["setMessageLocalEx"] = setMessageLocalEx
         self["setAppBadge"] = setAppBadge
 
+        self["fetchSurroundingMessages"] = fetchSurroundingMessages
+
+
+
         self["sendMessageNotOss"] = sendMessageNotOss
         self["createImageMessageByURL"] = createImageMessageByURL
         self["createSoundMessageByURL"] = createSoundMessageByURL
@@ -71,7 +76,11 @@ public class MessageManager: BaseServiceManager {
     func revokeMessage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
         Open_im_sdkRevokeMessage(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"],methodCall[string: "clientMsgID"])
     }
-    
+
+    func editMessage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+        Open_im_sdkEditMessage(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"],methodCall[string: "clientMsgID"],methodCall[jsonString: "message"])
+    }
+
     func deleteMessageFromLocalStorage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
         Open_im_sdkDeleteMessageFromLocalStorage(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"],methodCall[string: "clientMsgID"])
     }
@@ -250,6 +259,13 @@ public class MessageManager: BaseServiceManager {
         Open_im_sdkSetCustomBusinessListener(CustomBusinessListener(channel: channel))
         callBack(result)
     }
+
+    func fetchSurroundingMessages(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
+        Open_im_sdkFetchSurroundingMessages(BaseCallback(result: result),methodCall[string: "operationID"], methodCall[jsonString: "message"], methodCall[int: "before"], methodCall[int: "after"])
+    }
+
+
+
 }
 
 public class SendMsgProgressListener: NSObject, Open_im_sdk_callbackSendMsgCallBackProtocol {
@@ -303,7 +319,14 @@ public class AdvancedMsgListener: NSObject, Open_im_sdk_callbackOnAdvancedMsgLis
         values["messageRevoked"] = messageRevoked
         CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onNewRecvMessageRevoked", errCode: nil, errMsg: nil, data: values)
     }
-    
+
+    public func onNewRecvMessageEdited(_ messageEdited: String?) {
+        var values: [String: Any] = [:]
+        values["id"] = id
+        values["messageEdited"] = messageEdited
+        CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onNewRecvMessageEdited", errCode: nil, errMsg: nil, data: values)
+    }
+
     public func onRecvC2CReadReceipt(_ msgReceiptList: String?) {
         var values: [String: Any] = [:]
         values["id"] = id

ios/flutter_openim_sdk.podspec

@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'flutter_openim_sdk'
-  s.version          = '0.0.1'
+  s.version          = '0.0.7'
   s.summary          = 'A new Flutter project.'
   s.description      = <<-DESC
 A new Flutter project.
@@ -15,11 +15,11 @@ A new Flutter project.
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
-  s.platform = :ios, '11.0'
+  s.platform = :ios, '13.0'
 
   #s.ios.vendored_frameworks = 'frameworks/*.xcframework'
   #s.vendored_frameworks = 'frameworks/*.xcframework'
-  s.dependency 'openim_sdk_core_ios','0.2.0'
+  s.dependency 'openim_sdk_core_ios','0.6.0'
   s.static_framework = true
   s.library = 'resolv'
 

lib/src/enum/message_status.dart

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

lib/src/enum/message_type.dart

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

lib/src/listener/advanced_msg_listener.dart

@@ -4,6 +4,7 @@ import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
 class OnAdvancedMsgListener {
   Function(Message msg)? onMsgDeleted;
   Function(RevokedInfo info)? onNewRecvMessageRevoked;
+  Function(EditedInfo info)? onNewRecvMessageEdited;
   Function(List<ReadReceiptInfo> list)? onRecvC2CReadReceipt;
   Function(Message msg)? onRecvNewMessage;
   Function(Message msg)? onRecvOfflineNewMessage;
@@ -15,6 +16,7 @@ class OnAdvancedMsgListener {
   OnAdvancedMsgListener({
     this.onMsgDeleted,
     this.onNewRecvMessageRevoked,
+    this.onNewRecvMessageEdited,
     this.onRecvC2CReadReceipt,
     this.onRecvNewMessage,
     this.onRecvOfflineNewMessage,
@@ -30,6 +32,12 @@ class OnAdvancedMsgListener {
     onNewRecvMessageRevoked?.call(info);
   }
 
+  /// Message has been edited
+  void newRecvMessageEdited(EditedInfo info) {
+    onNewRecvMessageEdited?.call(info);
+  }
+
+
   /// C2C Message Read Receipt
   void recvC2CReadReceipt(List<ReadReceiptInfo> list) {
     onRecvC2CReadReceipt?.call(list);

lib/src/manager/im_manager.dart

@@ -179,6 +179,11 @@ class IMManager {
               var info = Utils.toObj(value, (map) => RevokedInfo.fromJson(map));
               messageManager.msgListener.newRecvMessageRevoked(info);
               break;
+            case 'onNewRecvMessageEdited':
+              var value = call.arguments['data']['messageEdited'];
+              var info = Utils.toObj(value, (map) => EditedInfo.fromJson(map));
+              messageManager.msgListener.newRecvMessageEdited(info);
+              break;
             case 'onRecvC2CReadReceipt':
               var value = call.arguments['data']['msgReceiptList'];
               var list = Utils.toList(value, (map) => ReadReceiptInfo.fromJson(map));

lib/src/manager/im_message_manager.dart

@@ -151,7 +151,8 @@ class MessageManager {
 
   /// Typing status update
   /// [msgTip] Custom content
-  @Deprecated('Use [OpenIM.iMManager.conversationManager.changeInputStates(conversationID:focus:)] instead')
+  @Deprecated(
+      'Use [OpenIM.iMManager.conversationManager.changeInputStates(conversationID:focus:)] instead')
   Future typingStatusUpdate({
     required String userID,
     String? msgTip,
@@ -531,7 +532,8 @@ class MessageManager {
                 },
                 'operationID': Utils.checkOperationID(operationID),
               }))
-          .then((value) => Utils.toObj(value, (map) => SearchResult.fromJson(map)));
+          .then((value) =>
+              Utils.toObj(value, (map) => SearchResult.fromJson(map)));
 
   /// Revoke a message
   /// [message] The message to be revoked
@@ -548,6 +550,23 @@ class MessageManager {
             "operationID": Utils.checkOperationID(operationID),
           }));
 
+  /// Edit a message
+  /// [message] The message to be edited
+  Future editMessage({
+    required String conversationID,
+    required String clientMsgID,
+    String? operationID,
+    required Message message,
+  }) =>
+      _channel.invokeMethod(
+          'editMessage',
+          _buildParam({
+            'conversationID': conversationID,
+            'clientMsgID': clientMsgID,
+            "operationID": Utils.checkOperationID(operationID),
+            'message': message.toJson(),
+          }));
+
   /// Mark messages as read
   /// [conversationID] Conversation ID
   /// [messageIDList] List of clientMsgIDs of messages to be marked as read
@@ -573,7 +592,7 @@ class MessageManager {
   Future<AdvancedMessage> getAdvancedHistoryMessageList({
     String? conversationID,
     Message? startMsg,
-    int? lastMinSeq,
+    GetHistoryViewType viewType = GetHistoryViewType.history,
     int? count,
     String? operationID,
   }) =>
@@ -584,10 +603,11 @@ 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)));
+          .then((value) =>
+              Utils.toObj(value, (map) => AdvancedMessage.fromJson(map)));
 
   /// Get chat history (newly received chat history after startMsg). Used for locating a specific message in global search and then fetching messages received after that message.
   /// [conversationID] Conversation ID, can be used for querying notifications
@@ -596,7 +616,7 @@ class MessageManager {
   Future<AdvancedMessage> getAdvancedHistoryMessageListReverse({
     String? conversationID,
     Message? startMsg,
-    int? lastMinSeq,
+    GetHistoryViewType viewType = GetHistoryViewType.history,
     int? count,
     String? operationID,
   }) =>
@@ -607,10 +627,11 @@ 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)));
+          .then((value) =>
+              Utils.toObj(value, (map) => AdvancedMessage.fromJson(map)));
 
   /// Find message details
   /// [conversationID] Conversation ID
@@ -626,7 +647,8 @@ class MessageManager {
                 'searchParams': searchParams.map((e) => e.toJson()).toList(),
                 'operationID': Utils.checkOperationID(operationID),
               }))
-          .then((value) => Utils.toObj(value, (map) => SearchResult.fromJson(map)));
+          .then((value) =>
+              Utils.toObj(value, (map) => SearchResult.fromJson(map)));
 
   /// Rich text message
   /// [text] Input content
@@ -794,6 +816,28 @@ class MessageManager {
         }));
   }
 
+  /// Fetch Surrounding Messages
+  /// [message] Message content
+  /// [before] message index - before
+  /// [after] message index - after
+  /// [operationID] Operation ID
+  Future<List<Message>> FetchSurroundingMessages({
+    required Message message,
+    int? before,
+    int? after,
+    String? operationID,
+  }) =>
+      _channel
+          .invokeMethod(
+              'fetchSurroundingMessages',
+              _buildParam({
+                'message': message.toJson(),
+                'before': before ?? 0,
+                'after': after ?? 0,
+                'operationID': Utils.checkOperationID(operationID),
+              }))
+          .then((value) => Utils.toList(value, (map) => Message.fromJson(map)));
+
   static Map _buildParam(Map<String, dynamic> param) {
     param["ManagerName"] = "messageManager";
     param = Utils.cleanMap(param);

lib/src/models/message.dart

@@ -1123,6 +1123,82 @@ class RevokedInfo {
   }
 }
 
+
+
+/// Message revocation details
+class EditedInfo {
+  /// Editer's ID
+  String? editerID;
+
+
+  /// Message ID
+  String? clientMsgID;
+
+  /// Revocation time
+  int? editTime;
+
+  /// Message sending time
+  int? sourceMessageSendTime;
+
+  /// Message sender
+  String? sourceMessageSendID;
+
+  /// Message sender's nickname
+  String? sourceMessageSenderNickname;
+
+  /// Conversation type [ConversationType]
+  int? sessionType;
+
+  /// Message contentType
+  int? contentType;
+
+  /// Message content
+  String? content;
+
+
+
+  EditedInfo({
+    this.editerID,
+    this.clientMsgID,
+    this.editTime,
+    this.sourceMessageSendTime,
+    this.sourceMessageSendID,
+    this.sourceMessageSenderNickname,
+    this.sessionType,
+    this.contentType,
+    this.content,
+  });
+
+  EditedInfo.fromJson(Map<String, dynamic> json) {
+    editerID = json['editerID'];
+    clientMsgID = json['clientMsgID'];
+    editTime = json['editTime'];
+    sourceMessageSendTime = json['sourceMessageSendTime'];
+    sourceMessageSendID = json['sourceMessageSendID'];
+    sourceMessageSenderNickname = json['sourceMessageSenderNickname'];
+    sessionType = json['sessionType'];
+    contentType = json['contentType'];
+    content = json['content'];
+
+  }
+
+  Map<String, dynamic> toJson() {
+    final data = Map<String, dynamic>();
+    data['editerID'] = this.editerID;
+    data['clientMsgID'] = this.clientMsgID;
+    data['editTime'] = this.editTime;
+    data['sourceMessageSendTime'] = this.sourceMessageSendTime;
+    data['sourceMessageSendID'] = this.sourceMessageSendID;
+    data['sourceMessageSenderNickname'] = this.sourceMessageSenderNickname;
+    data['sessionType'] = this.sessionType;
+    data['contentType'] = this.contentType;
+    data['content'] = this.content;
+    return data;
+  }
+}
+
+
+
 class AdvancedMessage {
   List<Message>? messageList;
   bool? isEnd;

lib/src/openim.dart

@@ -2,7 +2,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
 
 class OpenIM {
-  static const version = '3.8.1+2';
+  static const version = '3.8.3+2';
 
   static const _channel = MethodChannel('flutter_openim_sdk');
 

pubspec.lock

@@ -63,18 +63,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:
@@ -95,18 +95,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:
@@ -164,10 +164,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:
@@ -180,10 +180,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"
   flutter: ">=3.18.0-18.0.pre.54"

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_openim_sdk
 description: An instant messaging plug-in that supports Android and IOS. And the server is also all open source.
-version: 3.8.1+2
+version: 3.8.3+2
 homepage: https://www.openim.io
 repository: https://github.com/openimsdk/open-im-sdk-flutter