Merge pull request #536 from easemob/dev_3.9.9

Dev 3.9.9

Author: dujiepeng

CHANGELOG.md

@@ -1,5 +1,18 @@
 ## NEXT
 
+# 3.9.9
+修复：
+修复极端情况下 SDK 崩溃的问题。
+
+## 3.9.7+4
+修复：
+1. 安卓不执行onGroupDestroyed回调；
+2. 构造位置消息时无法设置buildingName；
+
+## 3.9.7+3
+修复：
+1. 安卓不会执行 onAutoAcceptInvitationFromGroup 回调；
+
 ## 3.9.7+2
 
 修复：

android/build.gradle

@@ -49,5 +49,5 @@ tasks.withType(JavaCompile){
 
 dependencies {
     api 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'io.hyphenate:hyphenate-chat:3.9.7'
+    implementation 'io.hyphenate:hyphenate-chat:3.9.9'
 }

android/src/main/java/com/easemob/im_flutter_sdk/EMChatManagerWrapper.java

@@ -279,7 +279,11 @@ private void getMessage(JSONObject param, String channelName, Result result) thr
 
         asyncRunnable(() -> {
             EMMessage msg = EMClient.getInstance().chatManager().getMessage(msgId);
-            onSuccess(result, channelName, EMMessageHelper.toJson(msg));
+            if(msg == null) {
+                onSuccess(result, channelName, null);
+            }else {
+                onSuccess(result, channelName, EMMessageHelper.toJson(msg));
+            }
         });
     }
 
@@ -775,8 +779,9 @@ public void onReactionChanged(List<EMMessageReactionChange> messageReactionChang
         };
 
         conversationListener = new EMConversationListener() {
+
             @Override
-            public void onCoversationUpdate() {
+            public void onConversationUpdate() {
                 Map<String, Object> data = new HashMap<>();
                 post(() -> channel.invokeMethod(EMSDKMethod.onConversationUpdate, data));
             }

android/src/main/java/com/easemob/im_flutter_sdk/EMConversationWrapper.java

@@ -210,7 +210,11 @@ private void loadMsgWithId(JSONObject params, String channelName, Result result)
         String msgId = params.getString("msg_id");
         asyncRunnable(()->{
             EMMessage msg = EMClient.getInstance().chatManager().getMessage(msgId);
-            onSuccess(result, channelName, EMMessageHelper.toJson(msg));
+            if(msg == null) {
+                onSuccess(result, channelName, null);
+            }else {
+                onSuccess(result, channelName, EMMessageHelper.toJson(msg));
+            }
         });
     }
 

android/src/main/java/com/easemob/im_flutter_sdk/EMGroupManagerWrapper.java

@@ -586,7 +586,7 @@ public void onSuccess(EMGroup object) {
             }
         };
 
-        EMClient.getInstance().groupManager().aysncMuteGroupMembers(groupId, members, duration, callBack);
+        EMClient.getInstance().groupManager().asyncMuteGroupMembers(groupId, members, duration, callBack);
     }
 
     private void unMuteMembers(JSONObject param, String channelName, Result result) throws JSONException {
@@ -965,7 +965,7 @@ public void onGroupDestroyed(String groupId, String groupName) {
                 EMListenerHandle.getInstance().addHandle(
                         ()-> {
                             Map<String, Object> data = new HashMap<>();
-                            data.put("type", "groupGroupDestroyed");
+                            data.put("type", "groupDestroyed");
                             data.put("groupId", groupId);
                             data.put("groupName", groupName);
                             post(() -> channel.invokeMethod(EMSDKMethod.onGroupChanged, data));
@@ -979,7 +979,7 @@ public void onAutoAcceptInvitationFromGroup(String groupId, String inviter, Stri
                 EMListenerHandle.getInstance().addHandle(
                         ()-> {
                             Map<String, Object> data = new HashMap<>();
-                            data.put("type", "groupAutoAcceptInvitationFromGroup");
+                            data.put("type", "groupAutoAcceptInvitation");
                             data.put("groupId", groupId);
                             data.put("inviter", inviter);
                             data.put("inviteMessage", inviteMessage);

example/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '10.0'
+platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/im_flutter_sdk.podspec

@@ -21,8 +21,8 @@ A new flutter plugin project.
   s.public_header_files = 'Classes/**/*.h'
 
   s.dependency 'Flutter'
-  s.dependency 'HyphenateChat','3.9.7.1'
-  s.ios.deployment_target = '10.0'
+  s.dependency 'HyphenateChat','3.9.9'
+  s.ios.deployment_target = '11.0'
 
 end
 

lib/src/internal/chat_method_keys.dart

@@ -1,3 +1,4 @@
+/// @nodoc
 class ChatMethodKeys {
   /// EMClient methods
   static const String init = "init";

lib/src/internal/em_channel_manager.dart

@@ -1,3 +1,4 @@
+/// @nodoc
 import 'package:flutter/services.dart';
 
 const channelPrefix = 'com.chat.im';

lib/src/internal/em_event_keys.dart

@@ -1,3 +1,4 @@
+/// @nodoc
 class EMContactChangeEvent {
   static const String CONTACT_ADD = 'onContactAdded';
   static const String CONTACT_DELETE = 'onContactDeleted';
@@ -6,6 +7,7 @@ class EMContactChangeEvent {
   static const String INVITATION_DECLINED = 'onFriendRequestDeclined';
 }
 
+/// @nodoc
 class EMChatRoomEvent {
   static const String ON_CHAT_ROOM_DESTROYED = "chatroomDestroyed";
   static const String ON_MEMBER_JOINED = "chatroomMemberJoined";
@@ -26,6 +28,7 @@ class EMChatRoomEvent {
   static const String ON_ATTRIBUTES_REMOVED = "chatroomAttributesDidRemoved";
 }
 
+/// @nodoc
 class EMGroupChangeEvent {
   static const String ON_INVITATION_RECEIVED = "groupInvitationReceived";
   static const String ON_INVITATION_ACCEPTED = "groupInvitationAccepted";