From 04c2d44bd5beaaaedfe8c299b2b123611f1fa2e3 Mon Sep 17 00:00:00 2001 From: JoshLi <542938192@qq.com> Date: Thu, 13 Dec 2018 16:29:31 +0800 Subject: [PATCH 1/2] Update group API --- src/android/JMessagePlugin.java | 111 +++++++++++++++----------------- 1 file changed, 53 insertions(+), 58 deletions(-) diff --git a/src/android/JMessagePlugin.java b/src/android/JMessagePlugin.java index 57a3ec7..ea5dc91 100644 --- a/src/android/JMessagePlugin.java +++ b/src/android/JMessagePlugin.java @@ -208,7 +208,6 @@ public void gotResult(int status, String desc) { public void userLogin(JSONArray data, final CallbackContext callback) { String username, password; - try { JSONObject params = data.getJSONObject(0); username = params.getString("username"); @@ -2758,7 +2757,6 @@ public void onEvent(MessageRetractEvent event) throws JSONException { public void onEvent(CommandNotificationEvent event) throws JSONException { final JSONObject result = new JSONObject(); result.put("content", event.getMsg()); - event.getSenderUserInfo(new GetUserInfoCallback() { @Override public void gotResult(int status, String desc, UserInfo userInfo) { @@ -2769,37 +2767,37 @@ public void gotResult(int status, String desc, UserInfo userInfo) { e.printStackTrace(); } } - } - }); + event.getTargetInfo(new CommandNotificationEvent.GetTargetInfoCallback() { + @Override + public void gotResult(int status, String desc, Object obj, CommandNotificationEvent.Type type) { + if (status == 0) { + if (type == CommandNotificationEvent.Type.single) { + try { + UserInfo receiver = (UserInfo) obj; + result.put("receiver", toJson(receiver)); + result.put("receiverType", "single"); + } catch (JSONException e) { + e.printStackTrace(); + } - event.getTargetInfo(new CommandNotificationEvent.GetTargetInfoCallback() { - @Override - public void gotResult(int status, String desc, Object obj, CommandNotificationEvent.Type type) { - if (status == 0) { - if (type == CommandNotificationEvent.Type.single) { - try { - UserInfo receiver = (UserInfo) obj; - result.put("receiver", toJson(receiver)); - result.put("receiverType", "single"); - } catch (JSONException e) { - e.printStackTrace(); + } else { + try { + GroupInfo receiver = (GroupInfo) obj; + result.put("receiver", toJson(receiver)); + result.put("receiverType", "group"); + } catch (JSONException e) { + e.printStackTrace(); + } + } } + JSONObject eventJson = toJson("receiveTransCommand", result); + eventSuccess(eventJson); - } else { - try { - GroupInfo receiver = (GroupInfo) obj; - result.put("receiver", toJson(receiver)); - result.put("receiverType", "group"); - } catch (JSONException e) { - e.printStackTrace(); - } } - - JSONObject eventJson = toJson("receiveTransCommand", result); - eventSuccess(eventJson); - } + }); } }); + } /** @@ -2845,24 +2843,23 @@ public void gotResult(int status, String desc, UserInfo userInfo) { e.printStackTrace(); } } - } - }); - event.getApprovalUserInfoList(new GetUserInfoListCallback() { - @Override - public void gotResult(int status, String s, List list) { - if (status == 0) { - try { - json.put("joinGroupUsers", toJson(list)); - } catch (JSONException e) { - e.printStackTrace(); + event.getApprovalUserInfoList(new GetUserInfoListCallback() { + @Override + public void gotResult(int status, String s, List list) { + if (status == 0) { + try { + json.put("joinGroupUsers", toJson(list)); + } catch (JSONException e) { + e.printStackTrace(); + } + } + JSONObject eventJson = toJson("receiveApplyJoinGroupApproval", json); + eventSuccess(eventJson); } - } + }); } }); - JSONObject eventJson = toJson("receiveApplyJoinGroupApproval", json); - eventSuccess(eventJson); - } /** @@ -2884,24 +2881,22 @@ public void gotResult(int status, String desc, UserInfo userInfo) { e.printStackTrace(); } } - } - }); - event.getApprovedUserInfoList(new GetUserInfoListCallback() { - @Override - public void gotResult(int status, String s, List list) { - if (status == 0) { - try { - json.put("users", toJson(list)); - } catch (JSONException e) { - e.printStackTrace(); + event.getApprovedUserInfoList(new GetUserInfoListCallback() { + @Override + public void gotResult(int status, String s, List list) { + if (status == 0) { + try { + json.put("users", toJson(list)); + } catch (JSONException e) { + e.printStackTrace(); + } + } + JSONObject eventJson = toJson("receiveGroupAdminApproval", json); + eventSuccess(eventJson); } - } + }); } }); - - JSONObject eventJson = toJson("receiveGroupAdminApproval", json); - eventSuccess(eventJson); - } /** @@ -2919,6 +2914,8 @@ public void gotResult(int status, String desc, UserInfo userInfo) { if (status == 0) { try { json.put("groupManager", toJson(userInfo)); + JSONObject eventJson = toJson("receiveGroupAdminReject", json); + eventSuccess(eventJson); } catch (JSONException e) { e.printStackTrace(); } @@ -2926,8 +2923,6 @@ public void gotResult(int status, String desc, UserInfo userInfo) { } }); - JSONObject eventJson = toJson("receiveGroupAdminReject", json); - eventSuccess(eventJson); } private void eventSuccess(JSONObject value) { From ad4b09495845814c4fff79b45977dc0ea2fd5755 Mon Sep 17 00:00:00 2001 From: JoshLi <542938192@qq.com> Date: Thu, 13 Dec 2018 16:35:23 +0800 Subject: [PATCH 2/2] Release v4.0.1 --- package.json | 2 +- plugin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e806d5b..20ef6d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jmessage-phonegap-plugin", - "version": "4.0.0", + "version": "4.0.1", "description": "JMessage Cordova Plugin.", "cordova": { "id": "jmessage-phonegap-plugin", diff --git a/plugin.xml b/plugin.xml index d1d9202..55a51ea 100644 --- a/plugin.xml +++ b/plugin.xml @@ -2,7 +2,7 @@ + version="4.0.1"> JMessage 集成极光 IM 和推送功能