Merge pull request jpush#14 from jpush/dev

Dev

Author: huangminlinux

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.8
+ 
+ fix: group.maxMemberCount type
+
 ## 0.0.7
 
  new feature: add message.state property

README.md

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

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

@@ -161,7 +161,7 @@ static HashMap toJson(GroupInfo groupInfo) {
 
 //        result.put("ownerAppKey", groupInfo.getOwnerMemberInfo().getUserInfo().getAppKey());
         result.put("ownerAppKey", groupInfo.getOwnerAppkey() != null ? groupInfo.getOwnerAppkey() : "");
-        result.put("maxMemberCount", "" + groupInfo.getMaxMemberCount());
+        result.put("maxMemberCount", groupInfo.getMaxMemberCount());
         result.put("isNoDisturb", groupInfo.getNoDisturb() == 1);
         result.put("isBlocked", groupInfo.isGroupBlocked() == 1);
 

ios/Classes/JMessageHelper.m

@@ -152,9 +152,9 @@ -(NSMutableDictionary*)groupToDictionary {
   dict[@"flag"] = self.flag;
   dict[@"owner"] = self.owner;
   dict[@"ownerAppKey"] = self.ownerAppKey;
-  dict[@"maxMemberCount"] = self.maxMemberCount;
+  dict[@"maxMemberCount"] = @([self.maxMemberCount integerValue]);
   dict[@"isNoDisturb"] = @(self.isNoDisturb);
-  dict[@"isShieldMessage"] = @(self.isShieldMessage);
+  dict[@"isBlocked"] = @(self.isShieldMessage);
   dict[@"displayName"] = self.displayName;
 
   switch (self.groupType) {

lib/jmessage_flutter.dart

@@ -264,6 +264,10 @@ class JmessageFlutter {
     @required String username,
     @required String password,
   }) async {
+    if (username == null ||
+        password == null) {
+      throw("username or password was passed null");
+    }
     await _channel.invokeMethod('login', {
       'username': username,
       'password': password
@@ -1853,7 +1857,7 @@ class JMGroupInfo {
   int level;  // 群组等级，默认等级 4
   String owner; // 群主的 username
   String ownerAppKey; // 群主的 appKey
-  String maxMemberCount; // 最大成员数
+  int maxMemberCount; // 最大成员数
   bool isNoDisturb; // 是否免打扰
   bool isBlocked; // 是否屏蔽群消息
   JMGroupType groupType; // 群类型

pubspec.yaml

@@ -1,6 +1,6 @@
 name: jmessage_flutter
 description: Offically supported JMessage Flutter plugin.
-version: 0.0.7
+version: 0.0.8
 author: huminios <h380108184@gmail.com>
 homepage: https://www.jiguang.cn