Merge pull request #551 from easemob/dev_4.1.3

Dev 4.1.3

Author: dujiepeng

CHANGELOG.md

@@ -1,3 +1,19 @@
+## 4.1.3
+
+#### 新增
+
+- 支持 安卓 14;
+- 新增 开启 荣耀推送开关 `EMOptions#enableHonorPush` 方法；
+
+#### 修复
+
+- 修复调用 `EMChatManager#getThreadConversation` 报错；
+- 修复 `EMMessage#chatThread` 方法报错;
+- 修复 `EMChatRoomEventHandler#onSpecificationChanged` 回调不执行。
+- 修复 `EMChatThreadManager#fetchChatThreadMembers` 崩溃。
+- 修复特殊场景下，安卓平台退出后再登录会丢失聊天室监听事件问题。
+- 修复修改消息后，离线用户上线后拉取历史消息，消息体中缺乏 from 属性的问题。
+
 ## 4.1.0
 
 #### 新增：

android/build.gradle

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

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

@@ -850,7 +850,7 @@ public void onSpecificationChanged(EMChatRoom room) {
                         ()-> {
                             Map<String, Object> data = new HashMap<>();
                             data.put("room", EMChatRoomHelper.toJson(room));
-                            data.put("type", "onSpecificationChanged");
+                            data.put("type", "onRoomSpecificationChanged");
                             post(() -> channel.invokeMethod(EMSDKMethod.chatRoomChange, data));
                         }
                 );

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

@@ -119,6 +119,9 @@ static EMOptions fromJson(JSONObject json, Context context) throws JSONException
             if (pushConfig.getBoolean("enableVivoPush")) {
                 builder.enableVivoPush();
             }
+            if(pushConfig.getBoolean("enableHonorPush")) {
+                builder.enableHonorPush();
+            }
             options.setPushConfig(builder.build());
         }
         return options;
@@ -456,7 +459,7 @@ static EMMessage fromJson(JSONObject json) throws JSONException {
         if (statusFromInt(json.getInt("status")) == EMMessage.Status.SUCCESS) {
             message.setUnread(!json.getBoolean("hasRead"));
         }
-        message.setDeliverAcked(json.getBoolean("hasDeliverAck"));
+        // message.setDeliverAcked(json.getBoolean("hasDeliverAck"));
         message.setIsNeedGroupAck(json.getBoolean("needGroupAck"));
         if (json.has("groupAckCount")) {
             message.setGroupAckCount(json.getInt("groupAckCount"));
@@ -916,7 +919,7 @@ static EMVideoMessageBody videoBodyFromJson(JSONObject json) throws JSONExceptio
     static Map<String, Object> videoBodyToJson(EMVideoMessageBody body) {
         Map<String, Object> data = getParentMap(body);
         data.put("localPath", body.getLocalUrl());
-        data.put("thumbnailLocalPath", body.getLocalThumbUri());
+        data.put("thumbnailLocalPath", body.getLocalThumb());
         data.put("duration", body.getDuration());
         data.put("thumbnailRemotePath", body.getThumbnailUrl());
         data.put("thumbnailSecret", body.getThumbnailSecret());
@@ -1405,23 +1408,28 @@ static Map<String, Object> toJson(EMChatThread thread) {
 class EMChatThreadEventHelper {
     static Map<String, Object> toJson(EMChatThreadEvent event) {
         Map<String, Object> data = new HashMap<>();
-        switch (event.getType()) {
-            case UNKNOWN:
-                data.put("type", 0);
-                break;
-            case CREATE:
-                data.put("type", 1);
-                break;
-            case UPDATE:
-                data.put("type", 2);
-                break;
-            case DELETE:
-                data.put("type", 3);
-                break;
-            case UPDATE_MSG:
-                data.put("type", 4);
-                break;
+        if(event.getType() != null) {
+            switch (event.getType()) {
+                case UNKNOWN:
+                    data.put("type", 0);
+                    break;
+                case CREATE:
+                    data.put("type", 1);
+                    break;
+                case UPDATE:
+                    data.put("type", 2);
+                    break;
+                case DELETE:
+                    data.put("type", 3);
+                    break;
+                case UPDATE_MSG:
+                    data.put("type", 4);
+                    break;
+            }
+        }else {
+            data.put("type", 0);
         }
+
         data.put("from", event.getFrom());
         if (event.getChatThread() != null) {
             data.put("thread", EMChatThreadHelper.toJson(event.getChatThread()));

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

@@ -73,10 +73,11 @@ private void getChatThread(JSONObject params, String channelName, MethodChannel.
         String msgId = params.getString("msgId");
         EMMessage msg = getMessageWithId(msgId);
         asyncRunnable(()->{
-            if (msg == null) {
+            if (msg != null) {
                 onSuccess(result, channelName,  msg.getChatThread() != null ? EMChatThreadHelper.toJson(msg.getChatThread()) : null);
+            }else {
+                onSuccess(result, channelName,  null);
             }
-            onSuccess(result, channelName,  null);
         });
     }
 

example/ios/Podfile.lock

@@ -1,9 +1,9 @@
 PODS:
   - Flutter (1.0.0)
-  - HyphenateChat (4.0.3)
+  - HyphenateChat (4.1.1)
   - im_flutter_sdk (0.0.1):
     - Flutter
-    - HyphenateChat (= 4.0.3)
+    - HyphenateChat (= 4.1.1)
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
@@ -21,8 +21,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  HyphenateChat: 35826ebaa42ebac897b39e29a06f2215a060011a
-  im_flutter_sdk: bbcfbe596ef4682c9518604e1cb319e967f6b163
+  HyphenateChat: 95aa4abbad0e763f513acbe21ff9543f50b886cd
+  im_flutter_sdk: 9242a0d080c2f4ade4a0247a21b034036320233e
 
 PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d
 

example/lib/main.dart

@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:im_flutter_sdk/im_flutter_sdk.dart';
 
-var appKey = "easemob-demo#flutter";
+var appKey = "";
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  assert(appKey.isNotEmpty, "appKey is empty");
   EMOptions options =
       EMOptions(appKey: appKey, autoLogin: false, debugModel: true);
   await EMClient.getInstance.init(options);
@@ -297,7 +298,7 @@ class _MyHomePageState extends State<MyHomePage> {
       content: _messageContent,
     );
 
-    EMClient.getInstance.chatManager.sendMessage(msg);
+    await EMClient.getInstance.chatManager.sendMessage(msg);
   }
 
   void _addLogToConsole(String log) {

example/pubspec.lock

@@ -97,7 +97,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "4.0.3"
+    version: "4.1.3"
   js:
     dependency: transitive
     description:

ios/Classes/EMChatManagerWrapper.m

@@ -1247,4 +1247,8 @@ - (void)onMessageContentChanged:(EMChatMessage *)message operatorId:(NSString *)
                      arguments:dict];
 }
 
+- (void)messageAttachmentStatusDidChange:(EMChatMessage *)aMessage error:(EMError *)aError {
+    
+}
+
 @end

ios/Classes/EMChatMessageWrapper.m

@@ -33,7 +33,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     } else if([ChatGroupAckCount isEqualToString:call.method]) {
         [self getGroupAckCount:call.arguments channelName:call.method result:result];
     } else if([ChatThread isEqualToString:call.method]) {
-        
+        [self getChatThread:call.arguments channelName:call.method result:result];
     }
     else {
         [super handleMethodCall:call result:result];