Merge pull request #149 from weiruiyang/master

getChatRoomConversation  调用无数据时错误问题

Author: weiruiyang

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

@@ -414,6 +414,10 @@ static Message JsonToMessage(JSONObject json) {
     static HashMap toJson(Conversation conversation) {
 
         final HashMap json = new HashMap<String, Object>();
+        if (null == conversation){
+            return json;
+        }
+
         json.put("title", conversation.getTitle() != null ? conversation.getTitle() : "");
         json.put("unreadCount", conversation.getUnReadMsgCnt());
 

example/lib/main.dart

@@ -1003,7 +1003,7 @@ class _MyHomePageState extends State<MyHomePage> {
       });
 
       test('getChatRoomConversation', () async {
-        JMConversationInfo conv =
+        JMConversationInfo? conv =
             await jmessage.getChatRoomConversation(roomId: kMockChatRoomid);
         verifyConversation(conv);
       });
@@ -1267,8 +1267,11 @@ void verifyGroupMember(JMGroupMemberInfo groupMember) {
   verifyUser(groupMember.user);
 }
 
-void verifyConversation(JMConversationInfo conversation) {
+void verifyConversation(JMConversationInfo? conversation) {
   expect(conversation, isNotNull, reason: 'conversation is null');
+  if(null == conversation){
+    return;
+  }
   expect(conversation.conversationType, isNotNull,
       reason: 'conversation conversationType is null');
   expect(conversation.title, isNotNull, reason: 'conversation title is null');

lib/jmessage_flutter.dart

@@ -1508,12 +1508,14 @@ class JmessageFlutter {
     return;
   }
 
-  Future<JMConversationInfo> getChatRoomConversation({
+  Future<JMConversationInfo?> getChatRoomConversation({
     required String? roomId,
   }) async {
     Map resJson = await _channel.invokeMethod('getChatRoomConversation',
         {'roomId': roomId}..removeWhere((key, value) => value == null));
-
+    if(resJson == null || resJson.isEmpty){
+      return null;
+    }
     return JMConversationInfo.fromJson(resJson);
   }