Merge pull request #561 from easemob/4.13.0+1

dujiepeng · web-flow · commit dcf594fac2b9 · 2025-03-28T18:19:18.000+08:00
4.13.0+1
diff --git a/im_flutter_sdk/CHANGELOG.md b/im_flutter_sdk/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 4.13.0+1
+
+- 修复收到 `onAnnouncementChangedFromChatRoom` 回调时，`announcement` 为空导致的崩溃问题。
+- 修复收到 `onAnnouncementChangedFromGroup` 回调时，`announcement` 为空导致的崩溃问题。
+- 增加 `EMMultiDevicesEvent.UnKnow` 类型，防止新增多设备事件时无法解析；
+
 ## 4.13.0
 
 ### 新增特性
diff --git a/im_flutter_sdk/example/lib/main.dart b/im_flutter_sdk/example/lib/main.dart
@@ -133,11 +133,11 @@ class _MyHomePageState extends State<MyHomePage> {
             const SizedBox(height: 10),
             TextButton(
               onPressed: _sendMessage,
-              child: const Text("SEND TEXT"),
               style: ButtonStyle(
                 foregroundColor: WidgetStateProperty.all(Colors.white),
                 backgroundColor: WidgetStateProperty.all(Colors.lightBlue),
               ),
+              child: const Text("SEND TEXT"),
             ),
             Flexible(
               child: ListView.builder(
@@ -254,39 +254,6 @@ class _MyHomePageState extends State<MyHomePage> {
       ),
     );
     EMClient.getInstance.groupManager.removeEventHandler('identifier');
-    EMClient.getInstance.chatRoomManager
-        .addEventHandler('identifier', EMChatRoomEventHandler(onAnnouncementChangedFromChatRoom: (roomId, announcement) {
-          
-        },));
-    EMClient.getInstance.groupManager.addEventHandler(
-        'identifier',
-        EMGroupEventHandler(
-          onAnnouncementChangedFromGroup: (groupId, announcement) {
-            _addLogToConsole(
-              "onAnnouncementChangedFromGroup, groupId: $groupId, announcement: $announcement",
-            );
-          },
-          onAdminAddedFromGroup: (groupId, admin) {
-            _addLogToConsole(
-              "onAdminAddedFromGroup, groupId: $groupId, admin: $admin",
-            );
-          },
-          onUserRemovedFromGroup: (groupId, groupName) {
-            _addLogToConsole(
-              "onUserRemovedFromGroup, groupId: $groupId, groupName: $groupName",
-            );
-          },
-          onMemberJoinedFromGroup: (groupId, member) {
-            _addLogToConsole(
-              "onMemberJoinedFromGroup, groupId: $groupId, member: $member",
-            );
-          },
-          onMemberExitedFromGroup: (groupId, member) {
-            _addLogToConsole(
-              "onMemberExitedFromGroup, groupId: $groupId, member: $member",
-            );
-          },
-        ));
   }
 
   void _signIn() async {
diff --git a/im_flutter_sdk/example/pubspec.lock b/im_flutter_sdk/example/pubspec.lock
@@ -81,31 +81,28 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "4.13.0"
+    version: "4.13.0+1"
   im_flutter_sdk_android:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: im_flutter_sdk_android
-      sha256: "1e6374be259add7e8e9fdb0dbd284817767e66bb5ad0c4b90d0b1c605fd2c79f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.13.0"
+      path: "../../im_flutter_sdk_android"
+      relative: true
+    source: path
+    version: "4.13.0+1"
   im_flutter_sdk_interface:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: im_flutter_sdk_interface
-      sha256: fa78d0089dea15a0f08eda345ff9b88d2c32fa9c1233ab4652168ccd094879d6
-      url: "https://pub.dev"
-    source: hosted
+      path: "../../im_flutter_sdk_interface"
+      relative: true
+    source: path
     version: "4.13.0"
   im_flutter_sdk_ios:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: im_flutter_sdk_ios
-      sha256: "57e012a097b5e2e736227b7873108b945b3a7f2436f5ccd9054f1220694b9283"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.13.0"
+      path: "../../im_flutter_sdk_ios"
+      relative: true
+    source: path
+    version: "4.13.0+1"
   leak_tracker:
     dependency: transitive
     description:
diff --git a/im_flutter_sdk/example/pubspec.yaml b/im_flutter_sdk/example/pubspec.yaml
@@ -40,6 +40,17 @@ dependencies:
   im_flutter_sdk:
     path: ../
 
+dependency_overrides:
+
+  # im_flutter_sdk_interface:
+  #   path: ../../im_flutter_sdk_interface
+
+  # im_flutter_sdk_ios:
+  #   path: ../../im_flutter_sdk_ios
+
+  # im_flutter_sdk_android:
+  #   path: ../../im_flutter_sdk_android
+
 dev_dependencies:
   flutter_test:
     sdk: flutter
diff --git a/im_flutter_sdk/pubspec.yaml b/im_flutter_sdk/pubspec.yaml
@@ -1,6 +1,6 @@
 name: im_flutter_sdk
 description: Integrate the Chat SDK to enjoy the global IM services with high reliability, ultra-low latency, and high concurrency.
-version: 4.13.0
+version: 4.13.0+1
 homepage: https://www.easemob.com
 
 environment:
@@ -11,11 +11,11 @@ dependencies:
   flutter:
     sdk: flutter
 
-  im_flutter_sdk_interface: ^4.13.0
+  im_flutter_sdk_interface: ^4.13.0+1
 
-  im_flutter_sdk_ios: ^4.13.0
+  im_flutter_sdk_ios: ^4.13.0+1
 
-  im_flutter_sdk_android: ^4.13.0
+  im_flutter_sdk_android: ^4.13.0+1
 
 
 dev_dependencies:
diff --git a/im_flutter_sdk_android/CHANGELOG.md b/im_flutter_sdk_android/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 4.13.0+1
+
+- 修复收到 `onAnnouncementChangedFromChatRoom` 回调时，`announcement` 为空导致的崩溃问题。
+- 修复收到 `onAnnouncementChangedFromGroup` 回调时，`announcement` 为空导致的崩溃问题。
+
 ## 4.13.0
 
 * 更新原生sdk为 4.13.0
diff --git a/im_flutter_sdk_android/android/src/main/java/com/easemob/im_flutter_sdk/ChatRoomManagerWrapper.java b/im_flutter_sdk_android/android/src/main/java/com/easemob/im_flutter_sdk/ChatRoomManagerWrapper.java
@@ -846,10 +846,11 @@ public void onAnnouncementChanged(String chatRoomId, String announcement) {
                         ()-> {
                             Map<String, Object> data = new HashMap<>();
                             data.put("roomId", chatRoomId);
-                            if(announcement == nill) {
-                                announcement = "";
+                            if(announcement == null) {
+                                data.put("announcement", "");
+                            }else {
+                                data.put("announcement", announcement);
                             }
-                            data.put("announcement", announcement);
                             data.put("type", "onRoomAnnouncementChanged");
                             post(() -> channel.invokeMethod(MethodKey.chatRoomChange, data));
                         }
diff --git a/im_flutter_sdk_android/android/src/main/java/com/easemob/im_flutter_sdk/GroupManagerWrapper.java b/im_flutter_sdk_android/android/src/main/java/com/easemob/im_flutter_sdk/GroupManagerWrapper.java
@@ -1217,9 +1217,10 @@ public void onAnnouncementChanged(String groupId, String announcement) {
                             data.put("type", "onGroupAnnouncementChanged");
                             data.put("groupId", groupId);
                             if(announcement == null) {
-                                announcement = "";
+                                data.put("announcement", "");
+                            }else {
+                                data.put("announcement", announcement);
                             }
-                            data.put("announcement", announcement);
                             post(() -> channel.invokeMethod(MethodKey.onGroupChanged, data));
                         }
                 );
diff --git a/im_flutter_sdk_android/pubspec.yaml b/im_flutter_sdk_android/pubspec.yaml
@@ -1,6 +1,6 @@
 name: im_flutter_sdk_android
 description: Integrate the Chat SDK to enjoy the global IM services with high reliability, ultra-low latency, and high concurrency.
-version: 4.13.0
+version: 4.13.0+1
 homepage: https://www.easemob.com
 
 environment:
@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
 
-  im_flutter_sdk_interface: ^4.13.0
+  im_flutter_sdk_interface: ^4.13.0+1
 
 dev_dependencies:
   flutter_test:
diff --git a/im_flutter_sdk_interface/CHANGELOG.md b/im_flutter_sdk_interface/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.13.0+1
+
+- 增加 `EMMultiDevicesEvent.UnKnow` 类型，防止新增多设备事件时无法解析；
+
 ## 4.13.0
 
 * 首次修改为联合插件模式
diff --git a/im_flutter_sdk_interface/lib/src/internal/em_transform_tools.dart b/im_flutter_sdk_interface/lib/src/internal/em_transform_tools.dart
@@ -2,6 +2,8 @@ import 'inner_headers.dart';
 
 EMMultiDevicesEvent? convertIntToEMMultiDevicesEvent(int? i) {
   switch (i) {
+    case -1:
+      return EMMultiDevicesEvent.UnKnow;
     case 2:
       return EMMultiDevicesEvent.CONTACT_REMOVE;
     case 3:
diff --git a/im_flutter_sdk_interface/lib/src/models/em_chat_enums.dart b/im_flutter_sdk_interface/lib/src/models/em_chat_enums.dart
@@ -460,6 +460,8 @@ enum EMSearchDirection {
 /// ~end
 
 enum EMMultiDevicesEvent {
+  UnKnow,
+
   /// ~english
   /// If user A deletes a contact on Device A1, this event is triggered on Device A2.
   /// ~end
diff --git a/im_flutter_sdk_interface/pubspec.yaml b/im_flutter_sdk_interface/pubspec.yaml
@@ -1,6 +1,6 @@
 name: im_flutter_sdk_interface
 description: Integrate the Chat SDK to enjoy the global IM services with high reliability, ultra-low latency, and high concurrency.
-version: 4.13.0
+version: 4.13.0+1
 homepage: https://www.easemob.com
 
 environment:
diff --git a/im_flutter_sdk_ios/CHANGELOG.md b/im_flutter_sdk_ios/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 4.13.0+1
+
+- 修复收到 `onAnnouncementChangedFromChatRoom` 回调时，`announcement` 为空导致的崩溃问题。
+- 修复收到 `onAnnouncementChangedFromGroup` 回调时，`announcement` 为空导致的崩溃问题。
+
 ## 4.13.0
 
 * 更新原生sdk为 4.13.0
diff --git a/im_flutter_sdk_ios/ios/Classes/ChatroomManagerWrapper.m b/im_flutter_sdk_ios/ios/Classes/ChatroomManagerWrapper.m
@@ -910,6 +910,8 @@ - (void)chatroomAnnouncementDidUpdate:(EMChatroom *)aChatroom
         }.mutableCopy;
         if(aAnnouncement != nil) {
             map[@"announcement"] = aAnnouncement;
+        }else {
+            map[@"announcement"] = @"";
         }
         [weakSelf.channel invokeMethod:ChatChatroomChanged arguments:map];
     }];
diff --git a/im_flutter_sdk_ios/ios/Classes/GroupManagerWrapper.m b/im_flutter_sdk_ios/ios/Classes/GroupManagerWrapper.m
@@ -1367,6 +1367,8 @@ - (void)groupAnnouncementDidUpdate:(EMGroup *)aGroup
         }.mutableCopy;
         if(aAnnouncement != nil) {
             map[@"announcement"] = aAnnouncement;
+        }else {
+            map[@"announcement"] = @"";
         }
         [weakSelf.channel invokeMethod:ChatOnGroupChanged
                          arguments:map];
diff --git a/im_flutter_sdk_ios/pubspec.yaml b/im_flutter_sdk_ios/pubspec.yaml
@@ -1,6 +1,6 @@
 name: im_flutter_sdk_ios
 description: Integrate the Chat SDK to enjoy the global IM services with high reliability, ultra-low latency, and high concurrency.
-version: 4.13.0
+version: 4.13.0+1
 homepage: https://www.easemob.com
 
 environment:
@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
 
-  im_flutter_sdk_interface: ^4.13.0
+  im_flutter_sdk_interface: ^4.13.0+1
 
 dev_dependencies:
   flutter_lints: ^3.0.0

Original file line number	Diff line number	Diff line change
`@@ -1217,9 +1217,10 @@ public void onAnnouncementChanged(String groupId, String announcement) {`
`1217`	`1217`	`data.put("type", "onGroupAnnouncementChanged");`
`1218`	`1218`	`data.put("groupId", groupId);`
`1219`	`1219`	`if(announcement == null) {`
`1220`		`- announcement = "";`
	`1220`	`+ data.put("announcement", "");`
	`1221`	`+ }else {`
	`1222`	`+ data.put("announcement", announcement);`
`1221`	`1223`	`}`
`1222`		`- data.put("announcement", announcement);`
`1223`	`1224`	`post(() -> channel.invokeMethod(MethodKey.onGroupChanged, data));`
`1224`	`1225`	`}`
`1225`	`1226`	`);`