Merge pull request #94 from JoshLipan/dev

Dev
jpush · Dec 13, 2018 · 5ab8bac · 5ab8bac
2 parents 941807e + ad4b094
commit 5ab8bac
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 60 deletions.
diff --git 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
@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
  xmlns:android="http://schemas.android.com/apk/res/android"
  id="jmessage-phonegap-plugin"
- version="4.0.0">
+ version="4.0.1">
 
  <name>JMessage</name>
  <description>集成极光 IM 和推送功能</description>

diff --git 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<UserInfo> 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<UserInfo> 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<UserInfo> 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<UserInfo> 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,15 +2914,15 @@ 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();
  }
  }
  }
  });
 
- JSONObject eventJson = toJson("receiveGroupAdminReject", json);
- eventSuccess(eventJson);
  }
 
  private void eventSuccess(JSONObject value) {