Merge commit '0a175bb8b1eb8d4a40c66107ca77a2ff33212bf9' into pre_merge

# Conflicts:
#	.idea/libraries/Dart_SDK.xml
#	android/build.gradle
#	android/gradle/wrapper/gradle-wrapper.properties
#	android/src/main/AndroidManifest.xml
#	example/android/app/build.gradle
#	example/android/build.gradle
#	example/android/settings.gradle
#	example/lib/main.dart
#	example/pubspec.lock
#	ios/flutter_openim_sdk.podspec
#	lib/src/manager/im_conversation_manager.dart
#	lib/src/manager/im_friendship_manager.dart
#	lib/src/models/notification_info.dart
This commit is contained in:
gem
2025-12-10 18:13:02 +08:00
41 changed files with 2049 additions and 342 deletions

View File

@@ -21,6 +21,7 @@ public class FriendshipManager: BaseServiceManager {
self["searchFriends"] = searchFriends
self["setFriendListener"] = setFriendListener
self["updateFriends"] = updateFriends
self["getFriendApplicationUnhandledCount"] = getFriendApplicationUnhandledCount
}
func acceptFriendApplication(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
@@ -48,11 +49,11 @@ public class FriendshipManager: BaseServiceManager {
}
func getFriendApplicationListAsApplicant(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
Open_im_sdkGetFriendApplicationListAsApplicant(BaseCallback(result: result), methodCall[string: "operationID"])
Open_im_sdkGetFriendApplicationListAsApplicant(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "req"])
}
func getFriendApplicationListAsRecipient(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
Open_im_sdkGetFriendApplicationListAsRecipient(BaseCallback(result: result), methodCall[string: "operationID"])
Open_im_sdkGetFriendApplicationListAsRecipient(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "req"])
}
func getFriendList(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
@@ -87,6 +88,10 @@ public class FriendshipManager: BaseServiceManager {
func updateFriends(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
Open_im_sdkUpdateFriends(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "req"])
}
func getFriendApplicationUnhandledCount(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
Open_im_sdkGetFriendApplicationUnhandledCount(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "req"])
}
}
public class FriendshipListener: NSObject, Open_im_sdk_callbackOnFriendshipListenerProtocol {

View File

@@ -32,6 +32,7 @@ public class GroupManager: BaseServiceManager {
self["setGroupListener"] = setGroupListener
self["setGroupMemberInfo"] = setGroupMemberInfo
self["transferGroupOwner"] = transferGroupOwner
self["getGroupApplicationUnhandledCount"] = getGroupApplicationUnhandledCount
}
func acceptGroupApplication(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
@@ -55,11 +56,11 @@ public class GroupManager: BaseServiceManager {
}
func getGroupApplicationListAsApplicant(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
Open_im_sdkGetGroupApplicationListAsApplicant(BaseCallback(result: result), methodCall[string: "operationID"])
Open_im_sdkGetGroupApplicationListAsApplicant(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "req"])
}
func getGroupApplicationListAsRecipient(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
Open_im_sdkGetGroupApplicationListAsRecipient(BaseCallback(result: result), methodCall[string: "operationID"])
Open_im_sdkGetGroupApplicationListAsRecipient(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "req"])
}
func getGroupMemberList(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
@@ -147,6 +148,10 @@ public class GroupManager: BaseServiceManager {
func transferGroupOwner(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
Open_im_sdkTransferGroupOwner(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"], methodCall[string: "userID"])
}
func getGroupApplicationUnhandledCount(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
Open_im_sdkGetGroupApplicationUnhandledCount(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "req"])
}
}
public class GroupListener: NSObject, Open_im_sdk_callbackOnGroupListenerProtocol {