Merge pull request #148 from weiruiyang/master

nicknames 补充

Author: weiruiyang

CHANGELOG.md

@@ -1,3 +1,5 @@
+## 2.1.9
++补充  nicknames 字段
 ## 2.1.8
 +新增  nicknames 字段
 ## 2.1.7

README.md

@@ -17,7 +17,7 @@ dependencies:
 
 //pub.dev 集成
 dependencies:
-  jmessage_flutter: 2.1.8
+  jmessage_flutter: 2.1.9
 ```
 
 

android/src/main/java/com/jiguang/jmessageflutter/JsonUtils.java

@@ -315,11 +315,14 @@ static HashMap toJson(Message msg) {
                 if (usernameList != null) {
                     result.put("usernames", toJson(usernameList));
                 }
+                Log.d("flutter plugin", "usernameList:" + usernameList);
 
                 List displayNameList = ((EventNotificationContent) content).getUserDisplayNames();
-                if (usernameList != null) {
+                if (displayNameList != null) {
                     result.put("nicknames", toJson(displayNameList));
                 }
+                Log.d("flutter plugin", "displayNameList:" + displayNameList);
+
                 switch (((EventNotificationContent) content).getEventNotificationType()) {
                     case group_member_added:
                         // 群成员加群事件

lib/jmessage_flutter.dart

@@ -2218,17 +2218,20 @@ enum JMEventType { group_member_added, group_member_removed, group_member_exit }
 class JMEventMessage extends JMNormalMessage {
   JMEventType eventType; // 事件类型
   List<dynamic> usernames; // List<String>
+  List<dynamic> nicknames; // List<String>
 
   Map toJson() {
     var json = super.toJson();
     json['eventType'] = getStringFromEnum(eventType);
     json['usernames'] = usernames;
+    json['nicknames'] = nicknames;
     return json;
   }
 
   JMEventMessage.fromJson(Map<dynamic, dynamic> json)
       : eventType = getEnumFromString(JMEventType.values, json['eventType']),
         usernames = json['usernames'],
+        nicknames = json['nicknames'],
         super.fromJson(json);
 }
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: jmessage_flutter
 description: JIGUANG officially supported JMessage Flutter plugin (Android & iOS). 极光推送官方支持的 Flutter 插件（Android & iOS）(https://www.jiguang.cn).
-version: 2.1.8
+version: 2.1.9
 homepage: https://www.jiguang.cn
 
 environment: