Merge pull request #482 from easemob/dev_3.8.3+4

Dev 3.8.3+4

Author: dujiepeng

CHANGELOG.md

@@ -1,9 +1,17 @@
 ## NEXT
 
-* 支持gcm推送点击
+## 3.8.3+4
+* 修复消息attribute类型变为bool类型；
+* 修复群组免打扰属性不准；
+* 修复ios importMessages方法bug；
+* 修复群、聊天室禁言时不执行回调的bug；
+* 修复下载方法不执行callback；
+* 构造文件消息提供设置文件大小属性；
+* 修改`EMGroupChangeListener` 为 `EMGroupEventListener`
 
 ## 3.8.3+3
-* 修复安卓下resendMessage方法发送失败时不回调onError。
+* 修复安卓下resendMessage方法发送失败时不回调onError；
+* 修复fetchChatRoomMembers返回类型错误；
 
 ## 3.8.3+2
 * 增加群组已读回执；

README.md

@@ -28,7 +28,7 @@ Demo中使用的音视频是针对声网音视频封装的[EaseCallKit](https://
 1. 修改 `pubspec.yaml`;
 ```dart
 dependencies:
-  im_flutter_sdk: ^3.8.3+3
+  im_flutter_sdk: ^3.8.3+4
 ```
 
 2. 执行`flutter pub get`;
@@ -1656,25 +1656,18 @@ try{
 #### 更新自己的用户属性
 ```dart
  try {
-     
-      Map aMap = {'nickName': 'gagaga', 'mail': '[email protected]'};
-      EMUserInfo updateUserInfo =
-          await EMClient.getInstance.userInfoManager.updateOwnUserInfo(aMap);
-    } on EMError catch (e) {
-      print('操作失败，原因是: $e');
-    }
-```
-#### 更新自己的某一个用户属性
-```dart
-   try {
-      EMUserInfoType infoType = EMUserInfoType.EMUserInfoTypeBirth;
-      String updateValue = '2021.01.01';
-      EMUserInfo updateUserInfo = await EMClient.getInstance.userInfoManager
-          .updateOwnUserInfoWithType(infoType, updateValue);
+    EMUserInfo info = EMUserInfo(EMClient.getInstance.currentUsername);
+    info.copyWith(
+      sign: "修改签名",
+      nickName: "用户属性昵称",
+      mail: "[email protected]",
+    );
+    await EMClient.getInstance.userInfoManager.updateOwnUserInfo(info);
     } on EMError catch (e) {
       print('操作失败，原因是: $e');
     }
 ```
+
 #### 获取多用户的用户属性
 ```dart
   try {

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

@@ -526,44 +526,7 @@ static Map<String, Object> toJson(EMMessage message) {
         }
 
         if (message.ext().size() > 0 && null != message.ext()) {
-            HashMap<String, Object> map = new HashMap<>();
-            for (Map.Entry entry:message.ext().entrySet()) {
-                String key = entry.getKey().toString();
-                try {
-                    JSONObject value = message.getJSONObjectAttribute(key);
-                    map.put(key, value);
-                    continue;
-                }
-                catch (HyphenateException e) {
-                }
-                try {
-                    boolean value =  message.getBooleanAttribute(key);
-                    map.put(key, value);
-                    continue;
-                } catch (HyphenateException e) {
-                }
-
-                try {
-                    JSONArray value = message.getJSONArrayAttribute(key);
-                    map.put(key, value);
-                    continue;
-                } catch (HyphenateException e) {
-                }
-                try {
-                    int value = message.getIntAttribute(key);
-                    map.put(key, value);
-                    continue;
-                } catch (HyphenateException e){
-                }
-
-                try {
-                    String value = message.getStringAttribute(key);
-                    map.put(key, value);
-                    continue;
-                } catch (HyphenateException e) {
-                }
-            }
-            data.put("attributes", map);
+            data.put("attributes", message.ext());
         }
         data.put("from", message.getFrom());
         data.put("to", message.getTo());

example/ios/Runner.xcodeproj/project.pbxproj

@@ -161,7 +161,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

example/lib/pages/account/login_page.dart

@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:easeim_flutter_demo/widgets/common_widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';

example/lib/pages/chat/chat_page.dart

@@ -372,13 +372,6 @@ class _ChatPageState extends State<ChatPage>
   /// 消息长按
   _messageOnLongPress(EMMessage msg) async {
     print('长按消息 $msg');
-    String toAddUsername;
-    String reason;
-    try {
-      EMClient.getInstance.contactManager.addContact(toAddUsername, reason);
-    } on EMError catch (e) {
-      debugPrint(e.toString());
-    }
   }
 
   /// 发送文字消息

example/lib/widgets/wx_expression.dart

@@ -1,6 +1,3 @@
-import 'dart:ui';
-
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 ///表情组件

ios/Classes/EMChatManagerWrapper.m

@@ -375,7 +375,7 @@ - (void)importMessages:(NSDictionary *)param
                 result:(FlutterResult)result {
     __weak typeof(self) weakSelf = self;
     NSArray *dictAry = param[@"messages"];
-    NSMutableArray *messages;
+    NSMutableArray *messages = [NSMutableArray array];
     for (NSDictionary *dict in dictAry) {
         [messages addObject:[EMMessage fromJson:dict]];
     }
@@ -395,7 +395,8 @@ - (void)downloadAttachment:(NSDictionary *)param
                     result:(FlutterResult)result {
     __weak typeof(self) weakSelf = self;
     __block EMMessage *msg = [EMMessage fromJson:param[@"message"]];
-    [EMClient.sharedClient.chatManager downloadMessageAttachment:msg
+    EMMessage *needDownMSg = [EMClient.sharedClient.chatManager getMessageWithMessageId:msg.messageId];
+    [EMClient.sharedClient.chatManager downloadMessageAttachment:needDownMSg
                                                         progress:^(int progress)
      {
         [weakSelf.messageChannel invokeMethod:EMMethodKeyOnMessageProgressUpdate
@@ -432,7 +433,8 @@ - (void)downloadThumbnail:(NSDictionary *)param
                    result:(FlutterResult)result {
     __weak typeof(self) weakSelf = self;
     __block EMMessage *msg = [EMMessage fromJson:param[@"message"]];
-    [EMClient.sharedClient.chatManager downloadMessageThumbnail:msg
+    EMMessage *needDownMSg = [EMClient.sharedClient.chatManager getMessageWithMessageId:msg.messageId];
+    [EMClient.sharedClient.chatManager downloadMessageThumbnail:needDownMSg
                                                        progress:^(int progress)
      {
         [weakSelf.messageChannel invokeMethod:EMMethodKeyOnMessageProgressUpdate
@@ -638,6 +640,7 @@ - (void)onConversationRead:(NSString *)from
 - (void)messagesDidReceive:(NSArray *)aMessages {
     NSMutableArray *msgList = [NSMutableArray array];
     for (EMMessage *msg in aMessages) {
+        
         [msgList addObject:[msg toJson]];
     }
     [self.channel invokeMethod:EMMethodKeyOnMessagesReceived

lib/src/em_chat_manager.dart

@@ -2,8 +2,6 @@ import "dart:async";
 
 import 'package:flutter/services.dart';
 import 'package:im_flutter_sdk/im_flutter_sdk.dart';
-import 'models/em_domain_terms.dart';
-import 'em_sdk_method.dart';
 
 class EMChatManager implements EMMessageStatusListener {
   static const _channelPrefix = 'com.easemob.im';