From 61fb9b7dd99befcfef746b03996afadd9501e771 Mon Sep 17 00:00:00 2001 From: hrxiang Date: Fri, 30 Jun 2023 17:03:31 +0800 Subject: [PATCH] open 3.0 --- .idea/libraries/Dart_SDK.xml | 38 ++++++++--------- android/build.gradle | 2 +- .../listener/OnAdvancedMsgListener.java | 6 +-- example/ios/Podfile.lock | 10 ++--- example/ios/Runner.xcodeproj/project.pbxproj | 41 +++++++++++++++++++ ios/Classes/Module/MessageManager.swift | 6 +-- lib/src/listener/advanced_msg_listener.dart | 8 ++-- lib/src/manager/im_conversation_manager.dart | 2 +- lib/src/manager/im_manager.dart | 8 ++-- 9 files changed, 81 insertions(+), 40 deletions(-) diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml index 21b2095..71fcae3 100644 --- a/.idea/libraries/Dart_SDK.xml +++ b/.idea/libraries/Dart_SDK.xml @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/android/build.gradle b/android/build.gradle index 35b16ab..464e278 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -53,5 +53,5 @@ 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' // api 'io.openim:core-sdk:2.3.5-t44@aar' - implementation 'io.openim:core-sdk:3.0.0-beta01@aar' + implementation 'io.openim:core-sdk:3.0.0-beta04@aar' } \ No newline at end of file diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnAdvancedMsgListener.java b/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnAdvancedMsgListener.java index fe0964e..0caf211 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnAdvancedMsgListener.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/listener/OnAdvancedMsgListener.java @@ -82,10 +82,10 @@ public class OnAdvancedMsgListener implements open_im_sdk_callback.OnAdvancedMsg } @Override - public void onRecvOfflineNewMessages(String s) { + public void onRecvOfflineNewMessage(String s) { final Map values = new ArrayMap<>(); values.put("id", id); - values.put("messageList", s); - CommonUtil.emitEvent("advancedMsgListener", "onRecvOfflineNewMessages", values); + values.put("message", s); + CommonUtil.emitEvent("advancedMsgListener", "onRecvOfflineNewMessage", values); } } diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index d66acb8..008ac40 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -2,8 +2,8 @@ PODS: - Flutter (1.0.0) - flutter_openim_sdk (0.0.1): - Flutter - - OpenIMSDKCore (= 3.0.0-beta) - - OpenIMSDKCore (3.0.0-beta) + - OpenIMSDKCore (= 3.0.0) + - OpenIMSDKCore (3.0.0) DEPENDENCIES: - Flutter (from `Flutter`) @@ -21,9 +21,9 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - flutter_openim_sdk: ed909a3ad758f605a188acd96d6f38f27953016f - OpenIMSDKCore: 4f3815fe8e0a6ef4130894afd2e8ad4d343df66e + flutter_openim_sdk: 12daf3769f8bf40001970304445b6155c146b7eb + OpenIMSDKCore: cf4fa9f9599cc6741f7acc5ef260647f34541e87 PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d -COCOAPODS: 1.11.3 +COCOAPODS: 1.11.2 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 868ae38..b25c9d9 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 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 */; }; @@ -31,10 +32,14 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 2F48A41A58786A29BEEBCFE3 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 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 = ""; }; + 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 = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 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 = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -49,12 +54,21 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 79CF11091A38454F94DA1EB4 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 0EDFEBEB76AE7FAFA44EF2AF /* Frameworks */ = { + isa = PBXGroup; + children = ( + 2F48A41A58786A29BEEBCFE3 /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -73,6 +87,7 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, E653626F5A38799455FF26C4 /* Pods */, + 0EDFEBEB76AE7FAFA44EF2AF /* Frameworks */, ); sourceTree = ""; }; @@ -102,6 +117,9 @@ E653626F5A38799455FF26C4 /* Pods */ = { isa = PBXGroup; children = ( + 85A1617DD2AFC45DFFDD8B11 /* Pods-Runner.debug.xcconfig */, + 3F8F3496860058CED33C418C /* Pods-Runner.release.xcconfig */, + 564E6205C72C7CB32AC49601 /* Pods-Runner.profile.xcconfig */, ); path = Pods; sourceTree = ""; @@ -113,6 +131,7 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( + DFE84742E2B41158E8703A14 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, @@ -207,6 +226,28 @@ 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 = ( + ); + 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; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/ios/Classes/Module/MessageManager.swift b/ios/Classes/Module/MessageManager.swift index 984e567..c281d15 100644 --- a/ios/Classes/Module/MessageManager.swift +++ b/ios/Classes/Module/MessageManager.swift @@ -349,11 +349,11 @@ public class AdvancedMsgListener: NSObject, Open_im_sdk_callbackOnAdvancedMsgLis } - public func onRecvOfflineNewMessages(_ messageList: String?) { + public func onRecvOfflineNewMessage(_ message: String?) { var values: [String: Any] = [:] values["id"] = id - values["messageList"] = messageList - CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onRecvOfflineNewMessages", errCode: nil, errMsg: nil, data: values); + values["message"] = message + CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onRecvOfflineNewMessage", errCode: nil, errMsg: nil, data: values); } } diff --git a/lib/src/listener/advanced_msg_listener.dart b/lib/src/listener/advanced_msg_listener.dart index c027994..47444c2 100644 --- a/lib/src/listener/advanced_msg_listener.dart +++ b/lib/src/listener/advanced_msg_listener.dart @@ -10,7 +10,7 @@ class OnAdvancedMsgListener { Function(String msgID, List list)? onRecvMessageExtensionsChanged; Function(String msgID, List list)? onRecvMessageExtensionsDeleted; Function(Message msg)? onRecvNewMessage; - Function(List list)? onRecvOfflineNewMessages; + Function(Message msg)? onRecvOfflineNewMessage; /// Uniquely identifies String id; @@ -24,7 +24,7 @@ class OnAdvancedMsgListener { this.onRecvMessageExtensionsChanged, this.onRecvMessageExtensionsDeleted, this.onRecvNewMessage, - this.onRecvOfflineNewMessages, + this.onRecvOfflineNewMessage, }) : id = "id_${DateTime.now().microsecondsSinceEpoch}"; void msgDeleted(Message msg) { @@ -67,7 +67,7 @@ class OnAdvancedMsgListener { onRecvNewMessage?.call(msg); } - void recvOfflineNewMessages(List list) { - onRecvOfflineNewMessages?.call(list); + void recvOfflineNewMessage(Message msg) { + onRecvOfflineNewMessage?.call(msg); } } diff --git a/lib/src/manager/im_conversation_manager.dart b/lib/src/manager/im_conversation_manager.dart index 40c1638..758562c 100644 --- a/lib/src/manager/im_conversation_manager.dart +++ b/lib/src/manager/im_conversation_manager.dart @@ -259,7 +259,7 @@ class ConversationManager { })); /// 查询@所有人标识 - String get atAllTag => 'atAllTag'; + String get atAllTag => 'AtAllTag'; /// 全局免打扰 /// [status] 0：正常；1：不接受消息；2：接受在线消息不接受离线消息； diff --git a/lib/src/manager/im_manager.dart b/lib/src/manager/im_manager.dart index c9b031d..61a7060 100644 --- a/lib/src/manager/im_manager.dart +++ b/lib/src/manager/im_manager.dart @@ -184,10 +184,10 @@ class IMManager { final msg = Utils.toObj(value, (map) => Message.fromJson(map)); messageManager.msgListener.recvNewMessage(msg); break; - case 'onRecvOfflineNewMessages': - var value = call.arguments['data']['messageList']; - final list = Utils.toList(value, (map) => Message.fromJson(map)); - messageManager.msgListener.recvOfflineNewMessages(list); + case 'onRecvOfflineNewMessage': + var value = call.arguments['data']['message']; + final msg = Utils.toObj(value, (map) => Message.fromJson(map)); + messageManager.msgListener.recvOfflineNewMessage(msg); break; } } else if (call.method == ListenerType.msgSendProgressListener) {