android: 调整eventCallback()

src/android/ShutoApi.java

@@ -165,18 +165,23 @@ public class ShutoApi extends CordovaPlugin {
 
     // 处理前端回调
     private void eventCallback(JSONArray args) {
+        LOG.d(TAG, "eventCallback: " + args);
         try {
             String callbackId = args.getString(0);
-            JSONObject result = args.optJSONObject(1);
+            String result = args.getString(1);
-            String errorMessage = args.optString(2);
+            String errorMessage = args.getString(2);
+            LOG.d(TAG, "result: " + result + ", errorMessage: " + errorMessage + ", isEmpty: " + errorMessage.isEmpty());
 
             EventCallback callback = eventCallbacks.get(callbackId);
 
             if (callback != null) {
-                if (errorMessage != null && !errorMessage.isEmpty()) {
+                if (errorMessage != null && !errorMessage.isEmpty() && !errorMessage.equals("null")) {
                     callback.onError(errorMessage);
                 } else {
-                    callback.onResult(result);
+                    JSONObject _result = new JSONObject();
+                    _result.put("success", true);
+                    _result.put("message", result);
+                    callback.onResult(_result);
                 }
                 eventCallbacks.remove(callbackId);
             }
@@ -195,15 +200,15 @@ public class ShutoApi extends CordovaPlugin {
         callbackContext.success();
     }
 
-    @Override
+  @Override
-    public void onDestroy() {
+  public void onDestroy() {
-        super.onDestroy();
+    super.onDestroy();
-        if (eventCallbacks != null) {
+    if (eventCallbacks != null) {
-            eventCallbacks.clear();
+      eventCallbacks.clear();
-        }
     }
+  }
 
-    // 提供给原生代码查询就绪状态的接口
+  // 提供给原生代码查询就绪状态的接口
     public boolean isIonicReady() {
         return isIonicReady;
     }