diff --git a/CHANGELOG.md b/CHANGELOG.md index a7457ea..cb0f648 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,14 @@ ## 2.0.0+5 -1.New notification
-2.New deleteConversationMsgFromLocalAndSvr
-3.New deleteMessageFromLocalAndSvr
-4.New deleteAllMsgFromLocal
-5.New deleteAllMsgFromLocalAndSvr
-6.New markMessageAsReadByConID
-7.New wakeUp
-8.New group notification class
+1.New notification parse
+2.New deleteConversationFromLocalAndSvr method
+3.New deleteMessageFromLocalAndSvr method
+4.New deleteAllMsgFromLocal method
+5.New deleteAllMsgFromLocalAndSvr method
+6.New clearC2CHistoryMessageFromLocalAndSvr method
+7.New clearGroupHistoryMessageFromLocalAndSvr method
+8.New markMessageAsReadByConID method
+9.New wakeUp method
## 2.0.0+4 diff --git a/android/build.gradle b/android/build.gradle index 0da6537..ce8e6e6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -41,5 +41,5 @@ android { } } dependencies { - implementation 'io.openim:client-sdk:2.0.27@aar' + implementation 'io.openim:client-sdk:2.0.29@aar' } \ No newline at end of file diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/ConversationManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/ConversationManager.java index edac438..993321d 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/ConversationManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/ConversationManager.java @@ -128,8 +128,8 @@ public class ConversationManager extends BaseManager { ); } - public void deleteConversationMsgFromLocalAndSvr(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.deleteConversationMsgFromLocalAndSvr( + public void deleteConversationFromLocalAndSvr(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.deleteConversationFromLocalAndSvr( new OnBaseListener(result), value(methodCall, "operationID"), value(methodCall, "conversationID") diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/MessageManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/MessageManager.java index 1366a44..d376581 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/MessageManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/MessageManager.java @@ -362,4 +362,20 @@ public class MessageManager extends BaseManager { jsonValue(methodCall, "messageIDList") ); } + + public void clearC2CHistoryMessageFromLocalAndSvr(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.clearC2CHistoryMessageFromLocalAndSvr( + new OnBaseListener(result), + value(methodCall, "operationID"), + value(methodCall, "userID") + ); + } + + public void clearGroupHistoryMessageFromLocalAndSvr(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.clearGroupHistoryMessageFromLocalAndSvr( + new OnBaseListener(result), + value(methodCall, "operationID"), + value(methodCall, "groupID") + ); + } } diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index e5d0593..0900ed5 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -353,7 +353,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { - ARCHS = arm64; + ARCHS = "$(ARCHS_STANDARD)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; @@ -485,7 +485,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { - ARCHS = arm64; + ARCHS = "$(ARCHS_STANDARD)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; @@ -509,7 +509,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { - ARCHS = arm64; + ARCHS = "$(ARCHS_STANDARD)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; diff --git a/ios/Classes/Module/ConversationManager.swift b/ios/Classes/Module/ConversationManager.swift index 21d2b5c..35a7041 100644 --- a/ios/Classes/Module/ConversationManager.swift +++ b/ios/Classes/Module/ConversationManager.swift @@ -20,7 +20,7 @@ public class ConversationManager: BaseServiceManager { self["setConversationRecvMessageOpt"] = setConversationRecvMessageOpt self["getConversationRecvMessageOpt"] = getConversationRecvMessageOpt self["setOneConversationPrivateChat"] = setOneConversationPrivateChat - self["deleteConversationMsgFromLocalAndSvr"] = deleteConversationMsgFromLocalAndSvr + self["deleteConversationFromLocalAndSvr"] = deleteConversationFromLocalAndSvr } func setConversationListener(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ @@ -85,8 +85,8 @@ public class ConversationManager: BaseServiceManager { Open_im_sdkSetOneConversationPrivateChat(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"],methodCall[bool: "isPrivate"]) } - func deleteConversationMsgFromLocalAndSvr(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ - Open_im_sdkDeleteConversationMsgFromLocalAndSvr(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"]) + func deleteConversationFromLocalAndSvr(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ + Open_im_sdkDeleteConversationFromLocalAndSvr(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"]) } } diff --git a/ios/Classes/Module/MessageManager.swift b/ios/Classes/Module/MessageManager.swift index b06d77a..85d5318 100644 --- a/ios/Classes/Module/MessageManager.swift +++ b/ios/Classes/Module/MessageManager.swift @@ -41,6 +41,8 @@ public class MessageManager: BaseServiceManager { self["deleteAllMsgFromLocal"] = deleteAllMsgFromLocal self["deleteAllMsgFromLocalAndSvr"] = deleteAllMsgFromLocalAndSvr self["markMessageAsReadByConID"] = markMessageAsReadByConID + self["clearC2CHistoryMessageFromLocalAndSvr"] = clearC2CHistoryMessageFromLocalAndSvr + self["clearGroupHistoryMessageFromLocalAndSvr"] = clearGroupHistoryMessageFromLocalAndSvr } func setAdvancedMsgListener(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ @@ -198,6 +200,14 @@ public class MessageManager: BaseServiceManager { Open_im_sdkMarkMessageAsReadByConID(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "conversationID"], methodCall[jsonString: "messageIDList"]) } + func clearC2CHistoryMessageFromLocalAndSvr(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ + Open_im_sdkClearC2CHistoryMessageFromLocalAndSvr(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "userID"]) + } + + func clearGroupHistoryMessageFromLocalAndSvr(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ + Open_im_sdkClearGroupHistoryMessageFromLocalAndSvr(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[string: "groupID"]) + } + public class SendMsgProgressListener: NSObject, Open_im_sdk_callbackSendMsgCallBackProtocol { private let channel: FlutterMethodChannel private let result: FlutterResult diff --git a/ios/Framework/OpenIMCore.framework/Headers/Open_im_sdk.objc.h b/ios/Framework/OpenIMCore.framework/Headers/Open_im_sdk.objc.h index 60c7ee0..888eb37 100644 --- a/ios/Framework/OpenIMCore.framework/Headers/Open_im_sdk.objc.h +++ b/ios/Framework/OpenIMCore.framework/Headers/Open_im_sdk.objc.h @@ -40,8 +40,12 @@ FOUNDATION_EXPORT BOOL Open_im_sdkCheckToken(NSString* _Nullable userID, NSStrin FOUNDATION_EXPORT void Open_im_sdkClearC2CHistoryMessage(id _Nullable callback, NSString* _Nullable operationID, NSString* _Nullable userID); +FOUNDATION_EXPORT void Open_im_sdkClearC2CHistoryMessageFromLocalAndSvr(id _Nullable callback, NSString* _Nullable operationID, NSString* _Nullable userID); + FOUNDATION_EXPORT void Open_im_sdkClearGroupHistoryMessage(id _Nullable callback, NSString* _Nullable operationID, NSString* _Nullable groupID); +FOUNDATION_EXPORT void Open_im_sdkClearGroupHistoryMessageFromLocalAndSvr(id _Nullable callback, NSString* _Nullable operationID, NSString* _Nullable groupID); + FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateCardMessage(NSString* _Nullable operationID, NSString* _Nullable cardInfo); FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateCustomMessage(NSString* _Nullable operationID, NSString* _Nullable data, NSString* _Nullable extension, NSString* _Nullable description); @@ -92,7 +96,7 @@ FOUNDATION_EXPORT void Open_im_sdkDeleteAllMsgFromLocalAndSvr(id _Nullable callback, NSString* _Nullable operationID, NSString* _Nullable conversationID); -FOUNDATION_EXPORT void Open_im_sdkDeleteConversationMsgFromLocalAndSvr(id _Nullable callback, NSString* _Nullable operationID, NSString* _Nullable conversationID); +FOUNDATION_EXPORT void Open_im_sdkDeleteConversationFromLocalAndSvr(id _Nullable callback, NSString* _Nullable operationID, NSString* _Nullable conversationID); FOUNDATION_EXPORT void Open_im_sdkDeleteFriend(id _Nullable callback, NSString* _Nullable operationID, NSString* _Nullable friendUserID); diff --git a/ios/Framework/OpenIMCore.framework/OpenIMCore b/ios/Framework/OpenIMCore.framework/OpenIMCore index d38611e..4888c9d 100644 Binary files a/ios/Framework/OpenIMCore.framework/OpenIMCore and b/ios/Framework/OpenIMCore.framework/OpenIMCore differ diff --git a/lib/src/manager/im_conversation_manager.dart b/lib/src/manager/im_conversation_manager.dart index 92e9c24..9d364fe 100644 --- a/lib/src/manager/im_conversation_manager.dart +++ b/lib/src/manager/im_conversation_manager.dart @@ -221,12 +221,12 @@ class ConversationManager { /// Delete conversation from local and service /// 删除会话 - Future deleteConversationMsgFromLocalAndSvr({ + Future deleteConversationFromLocalAndSvr({ required String conversationID, String? operationID, }) => _channel.invokeMethod( - 'deleteConversationMsgFromLocalAndSvr', + 'deleteConversationFromLocalAndSvr', _buildParam({ "conversationID": conversationID, "operationID": Utils.checkOperationID(operationID), diff --git a/lib/src/manager/im_message_manager.dart b/lib/src/manager/im_message_manager.dart index 7afe173..0a1c22a 100644 --- a/lib/src/manager/im_message_manager.dart +++ b/lib/src/manager/im_message_manager.dart @@ -619,6 +619,32 @@ class MessageManager { "operationID": Utils.checkOperationID(operationID), })); + /// Clear all c2c history message + /// 清空单聊消息记录 + Future clearC2CHistoryMessageFromLocalAndSvr({ + required String uid, + String? operationID, + }) => + _channel.invokeMethod( + 'clearC2CHistoryMessageFromLocalAndSvr', + _buildParam({ + "userID": uid, + "operationID": Utils.checkOperationID(operationID), + })); + + /// Clear all group history + /// 清空组消息记录 + Future clearGroupHistoryMessageFromLocalAndSvr({ + required String gid, + String? operationID, + }) => + _channel.invokeMethod( + 'clearGroupHistoryMessageFromLocalAndSvr', + _buildParam({ + "groupID": gid, + "operationID": Utils.checkOperationID(operationID), + })); + static Map _buildParam(Map param) { param["ManagerName"] = "messageManager"; return param;