diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml index b0f6971..53449da 100644 --- a/.idea/libraries/Flutter_Plugins.xml +++ b/.idea/libraries/Flutter_Plugins.xml @@ -1,6 +1,8 @@ - + + + diff --git a/android/build.gradle b/android/build.gradle index 9c6cfad..58d9765 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -52,5 +52,5 @@ android { dependencies { // 本地依赖，现将aar复制到libs/io/openim/core-sdk/0.0.1/ 下，命名core-sdk-0.0.1.aar // implementation 'io.openim:core-sdk:0.0.1@aar' - implementation 'io.openim:core-sdk:3.3.0@aar' + implementation 'io.openim:core-sdk:3.4.0@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 9a186e9..631746a 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 @@ -141,10 +141,6 @@ public class ConversationManager extends BaseManager { } public void deleteAllConversationFromLocal(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.deleteAllConversationFromLocal( - new OnBaseListener(result, methodCall), - value(methodCall, "operationID") - ); } public void resetConversationGroupAtType(MethodCall methodCall, MethodChannel.Result result) { diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java index 38c6f17..b945ec8 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java @@ -58,7 +58,7 @@ public class IMManager extends BaseManager { new OnBaseListener(result, methodCall), value(methodCall, "operationID"), value(methodCall, "fcmToken"), - value(methodCall, "expireTime") + int2long(methodCall, "expireTime") ); } 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 90645b7..6240a60 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 @@ -346,6 +346,7 @@ public class MessageManager extends BaseManager { CommonUtil.runMainThreadReturn(result, Open_im_sdk.createImageMessageByURL( value(methodCall, "operationID"), + value(methodCall, "sourcePath"), jsonValue(methodCall, "sourcePicture"), jsonValue(methodCall, "bigPicture"), jsonValue(methodCall, "snapshotPicture"))); diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/UserManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/UserManager.java index 4d8fe67..4775dc4 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/UserManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/UserManager.java @@ -62,8 +62,8 @@ public class UserManager extends BaseManager { jsonValue(methodCall, "userIDs")); } - public void getUsersInfoStranger(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.getUsersInfoStranger( + public void getUsersInfoWithCache(MethodCall methodCall, MethodChannel.Result result) { + Open_im_sdk.getUsersInfoWithCache( new OnBaseListener(result, methodCall), value(methodCall, "operationID"), jsonValue(methodCall, "userIDs"), diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock deleted file mode 100644 index 73b1388..0000000 --- a/example/ios/Podfile.lock +++ /dev/null @@ -1,29 +0,0 @@ -PODS: - - Flutter (1.0.0) - - flutter_openim_sdk (0.0.1): - - Flutter - - OpenIMSDKCore (= 3.0.0) - - "OpenIMSDKCore (3.0.0+1)" - -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: f04841e97a9d0b0a8025694d0796dd46242b2854 - flutter_openim_sdk: 12daf3769f8bf40001970304445b6155c146b7eb - OpenIMSDKCore: 2e38a5b9be23e588b5049ebd378161cf277e41a0 - -PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d - -COCOAPODS: 1.11.2 diff --git a/example/pubspec.lock b/example/pubspec.lock index 35a8c75..d233bc1 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -68,7 +68,7 @@ packages: path: ".." relative: true source: path - version: "3.0.0" + version: "3.4.0" flutter_test: dependency: "direct dev" description: flutter diff --git a/ios/Classes/Module/ConversationManager.swift b/ios/Classes/Module/ConversationManager.swift index fe7c230..37f9512 100644 --- a/ios/Classes/Module/ConversationManager.swift +++ b/ios/Classes/Module/ConversationManager.swift @@ -96,7 +96,6 @@ public class ConversationManager: BaseServiceManager { } func deleteAllConversationFromLocal(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ - Open_im_sdkDeleteAllConversationFromLocal(BaseCallback(result: result), methodCall[string: "operationID"]) } func resetConversationGroupAtType(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ diff --git a/ios/Classes/Module/MessageManager.swift b/ios/Classes/Module/MessageManager.swift index 3b493c9..0a5c954 100644 --- a/ios/Classes/Module/MessageManager.swift +++ b/ios/Classes/Module/MessageManager.swift @@ -222,7 +222,7 @@ public class MessageManager: BaseServiceManager { } func setAppBadge(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ - Open_im_sdkSetAppBadge(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[int64: "count"]) + Open_im_sdkSetAppBadge(BaseCallback(result: result), methodCall[string: "operationID"], Int32(methodCall[int64: "count"])) } func sendMessageNotOss(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ @@ -232,7 +232,7 @@ public class MessageManager: BaseServiceManager { } func createImageMessageByURL(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ - callBack(result, Open_im_sdkCreateImageMessageByURL(methodCall[string: "operationID"], methodCall[jsonString: "sourcePicture"], methodCall[jsonString: "bigPicture"], methodCall[jsonString: "snapshotPicture"])) + callBack(result, Open_im_sdkCreateImageMessageByURL(methodCall[string: "operationID"], methodCall[string: "sourcePath"], methodCall[jsonString: "sourcePicture"], methodCall[jsonString: "bigPicture"], methodCall[jsonString: "snapshotPicture"])) } func createSoundMessageByURL(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ diff --git a/ios/Classes/Module/UserManager.swift b/ios/Classes/Module/UserManager.swift index 269ace6..194f6ac 100644 --- a/ios/Classes/Module/UserManager.swift +++ b/ios/Classes/Module/UserManager.swift @@ -13,7 +13,7 @@ public class UserManager: BaseServiceManager { self["unsubscribeUsersStatus"] = unsubscribeUsersStatus self["getSubscribeUsersStatus"] = getSubscribeUsersStatus self["getUserStatus"] = getUserStatus - self["getUsersInfoStranger"] = getUsersInfoStranger + self["getUsersInfoWithCache"] = getUsersInfoWithCache } func setUserListener(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ @@ -49,8 +49,9 @@ public class UserManager: BaseServiceManager { Open_im_sdkGetUserStatus(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "userIDs"]) } - func getUsersInfoStranger(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ - Open_im_sdkGetUsersInfoStranger(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "userIDs"], methodCall[string: "groupID"]) + func getUsersInfoWithCache(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ + Open_im_sdkGetUsersInfoWithCache(BaseCallback(result: result), methodCall[string: "operationID"], methodCall[jsonString: "userIDs"], + methodCall[string: "groupID"]) } } diff --git a/ios/flutter_openim_sdk.podspec b/ios/flutter_openim_sdk.podspec index 282ce0a..dcd25fa 100644 --- a/ios/flutter_openim_sdk.podspec +++ b/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.3.0' + s.dependency 'OpenIMSDKCore','3.4.0' s.static_framework = true # s.vendored_frameworks = 'Framework/*.framework' # Flutter.framework does not contain a i386 slice. diff --git a/lib/src/manager/im_conversation_manager.dart b/lib/src/manager/im_conversation_manager.dart index 188413a..de3cd6a 100644 --- a/lib/src/manager/im_conversation_manager.dart +++ b/lib/src/manager/im_conversation_manager.dart @@ -233,6 +233,7 @@ class ConversationManager { })); /// Delete All Local Conversations + @Deprecated('use hideAllConversations instead') Future deleteAllConversationFromLocal({ String? operationID, }) => diff --git a/lib/src/manager/im_user_manager.dart b/lib/src/manager/im_user_manager.dart index 6b18fc6..cb2f9da 100644 --- a/lib/src/manager/im_user_manager.dart +++ b/lib/src/manager/im_user_manager.dart @@ -115,14 +115,14 @@ class UserManager { .then((value) => Utils.toList(value, (map) => UserStatusInfo.fromJson(map))); } - Future> getUsersInfoStranger( + Future> getUsersInfoWithCache( List userIDs, { String? groupID, String? operationID, }) { return _channel .invokeMethod( - 'getUsersInfoStranger', + 'getUsersInfoWithCache', _buildParam({ 'userIDs': userIDs, 'groupID': groupID, diff --git a/lib/src/openim.dart b/lib/src/openim.dart index a81fa56..636db89 100644 --- a/lib/src/openim.dart +++ b/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.3.0'; + static const version = '3.4.0'; static const _channel = const MethodChannel('flutter_openim_sdk'); diff --git a/pubspec.yaml b/pubspec.yaml index 7148d48..f958d83 100644 --- a/pubspec.yaml +++ b/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.3.0 +version: 3.4.0 homepage: https://www.rentsoft.cn repository: https://github.com/OpenIMSDK/Open-IM-SDK-Flutter