Merge pull request jpush#19 from jpush/dev

Dev

Author: huangminlinux

README.md

@@ -8,7 +8,7 @@
 
 ```
 dependencies:
-  jmessage_flutter: 0.0.8
+  jmessage_flutter: 0.0.9
 ```
 
 

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

@@ -678,8 +678,8 @@ private void setConversationExtras(MethodCall call, Result result) {
         return;
       }
 
-      if (params.has("extra")) {
-        extra = params.getJSONObject("extra");
+      if (params.has("extras")) {
+        extra = params.getJSONObject("extras");
       }
     } catch (JSONException e) {
       e.printStackTrace();

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

@@ -430,9 +430,9 @@ static HashMap toJson(Conversation conversation) {
             for (Map.Entry<String, JsonElement> entry : jsonObject.entrySet()) {
                 extrasMap.put(entry.getKey(), entry.getValue().toString());
             }
-            json.put("extra", extrasMap);
+            json.put("extras", extrasMap);
         } else {
-            json.put("extra", new HashMap());
+            json.put("extras", new HashMap());
         }
 
         Log.d("flutter plugin","native the conversation:" + json.toString());

ios/Classes/JmessageFlutterPlugin.m

@@ -822,7 +822,7 @@ - (void)setConversationExtras:(FlutterMethodCall*)call result:(FlutterResult)res
   }
 
   [self getConversationWithDictionary:param callback:^(JMSGConversation *conversation, NSError *error) {
-    if (error) {
+    
       if (error) {
         result([error flutterError]);
         return ;
@@ -834,7 +834,7 @@ - (void)setConversationExtras:(FlutterMethodCall*)call result:(FlutterResult)res
       }
       result([conversation conversationToDictionary]);
       return;
-    }
+    
   }];
 }
 
@@ -1423,7 +1423,7 @@ - (void)updateGroupInfo:(FlutterMethodCall*)call result:(FlutterResult)result {
 
     JMSGGroup *group = resultObject;
     NSString *newName = group.displayName;
-    NSString *newDesc = group.description;
+    NSString *newDesc = group.desc;
 
     if (param[@"newName"]) {
       newName = param[@"newName"];

lib/jmessage_flutter.dart

@@ -1988,11 +1988,13 @@ class JMConversationInfo {
   int unreadCount; // 未读消息数
   dynamic target; // JMUserInfo or JMGroupInfo or JMChatRoom
   dynamic latestMessage; // 最近的一条消息对象。如果不存在消息，则 conversation 对象中没有该属性。
-  
+  Map<dynamic, dynamic> extras;
+
   JMConversationInfo.fromJson(Map<dynamic, dynamic> json)
     : conversationType = getEnumFromString(JMConversationType.values, json['conversationType']),
       title = json['title'],
-      unreadCount = json['unreadCount'] {
+      unreadCount = json['unreadCount'],
+      extras = json['extras'] {
         switch (conversationType) {
           case JMConversationType.single:
             target = JMUserInfo.fromJson(json['target']);
@@ -2015,6 +2017,7 @@ class JMConversationInfo {
 
   // extras use Map<String, String>
   Future<void> setExtras(Map<dynamic, dynamic> extras) async {
+    this.extras = extras;
     await JmessageFlutter().setConversationExtras(
       type: target.targetType,
       extras: extras,