add getChatRoomOwner

Author: KenChoi

android/src/io/jchat/android/Constant.java

@@ -99,5 +99,5 @@ public class Constant {
     public static final String ROOM_ID = "roomId";
     public static final String ROOM_IDS = "roomIds";
     public static final String ROOM_NAME = "roomName";
-    public static final String TOTAL_MEMBER_COUNT = "totalMemberCount";
+    public static final String MEMBER_COUNT = "memberCount";
 }

android/src/io/jchat/android/JMessageModule.java

@@ -308,7 +308,7 @@ public void createSendMessage(ReadableMap map, Callback callback) {
                 content = new ImageContent(new File(path));
             } else if (type.equals(Constant.VOICE)) {
                 String path = map.getString(Constant.PATH);
-                File file = new File(map.getString(path));
+                File file = new File(path);
                 MediaPlayer mediaPlayer = MediaPlayer.create(mContext, Uri.parse(path));
                 int duration = mediaPlayer.getDuration() / 1000;    // Millisecond to second.
                 content = new VoiceContent(file, duration);
@@ -1473,7 +1473,7 @@ public void getChatRoomListByApp(ReadableMap param, final Callback success, fina
                 @Override
                 public void gotResult(int status, String desc, List<ChatRoomInfo> chatRoomInfos) {
                     mJMessageUtils.handleCallbackWithArray(status, desc, success, fail,
-                            ResultUtils.toJSArray(chatRoomInfos, fail));
+                            ResultUtils.toJSArray(chatRoomInfos));
                 }
             });
         } catch (Exception e) {
@@ -1493,7 +1493,7 @@ public void getChatRoomListByUser(final Callback success, final Callback fail) {
         ChatRoomManager.getChatRoomListByUser(new RequestCallback<List<ChatRoomInfo>>() {
             @Override
             public void gotResult(int status, String desc, List<ChatRoomInfo> list) {
-                mJMessageUtils.handleCallbackWithArray(status, desc, success, fail, ResultUtils.toJSArray(list, fail));
+                mJMessageUtils.handleCallbackWithArray(status, desc, success, fail, ResultUtils.toJSArray(list));
             }
         });
     }
@@ -1516,7 +1516,36 @@ public void getChatRoomInfos(ReadableMap map, final Callback success, final Call
             ChatRoomManager.getChatRoomInfos(idSet, new RequestCallback<List<ChatRoomInfo>>() {
                 @Override
                 public void gotResult(int status, String desc, List<ChatRoomInfo> list) {
-                    mJMessageUtils.handleCallbackWithArray(status, desc, success, fail, ResultUtils.toJSArray(list, fail));
+                    mJMessageUtils.handleCallbackWithArray(status, desc, success, fail, ResultUtils.toJSArray(list));
+                }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            mJMessageUtils.handleError(fail, ERR_CODE_PARAMETER, ERR_MSG_PARAMETER);
+        }
+    }
+
+    /**
+     * 获取聊天室拥有者 UserInfo
+     * @param roomId 聊天室 id
+     * @param success 成功回调
+     * @param fail 失败回调
+     */
+    @ReactMethod
+    public void getChatRoomOwner(String roomId, final Callback success, final Callback fail) {
+        try {
+            long id = Long.parseLong(roomId);
+            Set<Long> set = new HashSet<>();
+            set.add(id);
+            ChatRoomManager.getChatRoomInfos(set, new RequestCallback<List<ChatRoomInfo>>() {
+                @Override
+                public void gotResult(int status, String desc, List<ChatRoomInfo> list) {
+                    list.get(0).getOwnerInfo(new GetUserInfoCallback() {
+                        @Override
+                        public void gotResult(int status, String desc, UserInfo userInfo) {
+                            mJMessageUtils.handleCallbackWithObject(status, desc, success, fail, ResultUtils.toJSObject(userInfo));
+                        }
+                    });
                 }
             });
         } catch (Exception e) {

android/src/io/jchat/android/utils/ResultUtils.java

@@ -257,7 +257,7 @@ public static WritableMap toJSObject(Conversation conversation) {
                 map.putMap(Constant.TARGET, toJSObject(targetInfo));
             } else {
                 ChatRoomInfo chatRoomInfo = (ChatRoomInfo) conversation.getTargetInfo();
-                map.putMap(Constant.TARGET, toJSObject(chatRoomInfo, null));
+                map.putMap(Constant.TARGET, toJSObject(chatRoomInfo));
             }
 
         } catch (Exception e) {
@@ -267,29 +267,16 @@ public static WritableMap toJSObject(Conversation conversation) {
         return map;
     }
 
-    public static WritableMap toJSObject(ChatRoomInfo chatRoomInfo, final Callback fail) {
+    public static WritableMap toJSObject(ChatRoomInfo chatRoomInfo) {
         final WritableMap map = Arguments.createMap();
         try {
             map.putString(Constant.ROOM_ID, String.valueOf(chatRoomInfo.getRoomID()));
             map.putString(Constant.TYPE, Constant.TYPE_CHAT_ROOM);
             map.putString(Constant.ROOM_NAME, chatRoomInfo.getName());
             map.putString(Constant.APP_KEY, chatRoomInfo.getAppkey());
-            chatRoomInfo.getOwnerInfo(new GetUserInfoCallback() {
-                @Override
-                public void gotResult(int status, String desc, UserInfo userInfo) {
-                    if (status == 0) {
-                        map.putMap(Constant.OWNER, toJSObject(userInfo));
-                    } else if (fail != null) {
-                        WritableMap result = Arguments.createMap();
-                        result.putInt(Constant.CODE, status);
-                        result.putString(Constant.DESCRIPTION, desc);
-                        fail.invoke(result);
-                    }
-                }
-            });
             map.putInt(Constant.MAX_MEMBER_COUNT, chatRoomInfo.getMaxMemberCount());
             map.putString(Constant.DESCRIPTION, chatRoomInfo.getDescription());
-            map.putInt(Constant.TOTAL_MEMBER_COUNT, chatRoomInfo.getTotalMemberCount());
+            map.putInt(Constant.MEMBER_COUNT, chatRoomInfo.getTotalMemberCount());
             map.putInt(Constant.CREATE_TIME, chatRoomInfo.getCreateTime());
         } catch (Exception e) {
             e.printStackTrace();
@@ -309,6 +296,8 @@ public static WritableArray toJSArray(List list) {
                     array.pushMap(toJSObject((Message) object));
                 } else if (object instanceof Conversation) {
                     array.pushMap(toJSObject((Conversation) object));
+                } else if (object instanceof ChatRoomInfo) {
+                    array.pushMap(toJSObject((ChatRoomInfo) object));
                 } else {
                     array.pushString(object.toString());
                 }
@@ -318,16 +307,6 @@ public static WritableArray toJSArray(List list) {
         return array;
     }
 
-    public static WritableArray toJSArray(List<ChatRoomInfo> list, Callback fail) {
-        WritableArray array = Arguments.createArray();
-        if (null != list) {
-            for (ChatRoomInfo chatRoomInfo : list) {
-                array.pushMap(toJSObject(chatRoomInfo, fail));
-            }
-        }
-        return array;
-    }
-
     public static JSONObject toJSObject(String eventName, JSONObject value) {
         JSONObject result = new JSONObject();
         try {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmessage-react-plugin",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "a jmessage plugin for react native application",
   "main": "index.js",
   "repository": {