format code
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/50fa5ca9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/50fa5ca9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/50fa5ca9 Branch: refs/heads/0.16-dev Commit: 50fa5ca956c47c56f0991faf36b3629bcca3bacd Parents: 1fe7ab7 Author: å¢¨ç¬ <sanjun....@alibaba-inc.com> Authored: Fri Aug 4 10:37:36 2017 +0800 Committer: å¢¨ç¬ <sanjun....@alibaba-inc.com> Committed: Fri Aug 4 10:37:36 2017 +0800 ---------------------------------------------------------------------- .../com/taobao/weex/bridge/WXBridgeManager.java | 95 ++++++++++---------- 1 file changed, 49 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/50fa5ca9/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java index cb4db93..a88fb30 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java +++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java @@ -219,37 +219,37 @@ public class WXBridgeManager implements Callback,BactchExecutor { } } - public Object callModuleMethod(String instanceId, String moduleStr, String methodStr, JSONArray args) { - return callModuleMethod(instanceId, moduleStr, methodStr, args, null); + public Object callModuleMethod(String instanceId, String moduleStr, String methodStr, JSONArray args) { + return callModuleMethod(instanceId, moduleStr, methodStr, args, null); } - public Object callModuleMethod(String instanceId, String moduleStr, String methodStr, JSONArray args, JSONObject options) { - WXSDKInstance wxsdkInstance = WXSDKManager.getInstance() - .getSDKInstance(instanceId); - if (wxsdkInstance == null) { - return null; - } - - if (wxsdkInstance.isNeedValidate() - && WXSDKManager.getInstance().getValidateProcessor() != null) { - WXValidateProcessor.WXModuleValidateResult validateResult = WXSDKManager - .getInstance().getValidateProcessor() - .onModuleValidate(wxsdkInstance, moduleStr, methodStr, args, options); - if (validateResult == null) { + public Object callModuleMethod(String instanceId, String moduleStr, String methodStr, JSONArray args, JSONObject options) { + WXSDKInstance wxsdkInstance = WXSDKManager.getInstance() + .getSDKInstance(instanceId); + if (wxsdkInstance == null) { return null; } - if (validateResult.isSuccess) { - return WXModuleManager.callModuleMethod(instanceId, moduleStr, methodStr, - args); - } else { - JSONObject validateInfo = validateResult.validateInfo; - if (validateInfo != null) { - WXLogUtils.e("[WXBridgeManager] module validate fail. >>> " + validateInfo.toJSONString()); - } - return validateInfo; + + if (wxsdkInstance.isNeedValidate() + && WXSDKManager.getInstance().getValidateProcessor() != null) { + WXValidateProcessor.WXModuleValidateResult validateResult = WXSDKManager + .getInstance().getValidateProcessor() + .onModuleValidate(wxsdkInstance, moduleStr, methodStr, args, options); + if (validateResult == null) { + return null; + } + if (validateResult.isSuccess) { + return WXModuleManager.callModuleMethod(instanceId, moduleStr, methodStr, + args); + } else { + JSONObject validateInfo = validateResult.validateInfo; + if (validateInfo != null) { + WXLogUtils.e("[WXBridgeManager] module validate fail. >>> " + validateInfo.toJSONString()); + } + return validateInfo; + } } - } - return WXModuleManager.callModuleMethod(instanceId, moduleStr, methodStr, args); + return WXModuleManager.callModuleMethod(instanceId, moduleStr, methodStr, args); } /** @@ -329,27 +329,30 @@ public class WXBridgeManager implements Callback,BactchExecutor { mJSHandler.removeMessages(what, obj); } - public Object callNativeModule(String instanceId, String module,String method, JSONArray arguments, JSONObject options) { - if (WXEnvironment.isApkDebugable()) { - mLodBuilder.append("[WXBridgeManager] callNativeModule >>>> instanceId:").append(instanceId) - .append(", module:").append(module).append(", method:").append(method).append(", arguments:").append(arguments); - WXLogUtils.d(mLodBuilder.substring(0)); - mLodBuilder.setLength(0); - } - try { - if(WXDomModule.WXDOM.equals(module)){ - WXDomModule dom = getDomModule(instanceId); - return dom.callDomMethod(method,arguments); - }else { - return callModuleMethod(instanceId, module, - method, arguments, options); - } - } catch (Exception e) { - WXLogUtils.e("[WXBridgeManager] callNative exception: ", e); - commitJSBridgeAlarmMonitor(instanceId, WXErrorCode.WX_ERR_INVOKE_NATIVE, "[WXBridgeManager] callNativeModule exception " + e.getCause()); + public Object callNativeModule(String instanceId, String module,String method, JSONArray arguments, JSONObject options) { + + if (WXEnvironment.isApkDebugable()) { + mLodBuilder.append("[WXBridgeManager] callNativeModule >>>> instanceId:").append(instanceId) + .append(", module:").append(module).append(", method:").append(method).append(", arguments:").append(arguments); + WXLogUtils.d(mLodBuilder.substring(0)); + mLodBuilder.setLength(0); + } + + try { + if(WXDomModule.WXDOM.equals(module)){ + WXDomModule dom = getDomModule(instanceId); + return dom.callDomMethod(method,arguments); + }else { + return callModuleMethod(instanceId, module, + method, arguments, options); + } + } catch (Exception e) { + WXLogUtils.e("[WXBridgeManager] callNative exception: ", e); + commitJSBridgeAlarmMonitor(instanceId, WXErrorCode.WX_ERR_INVOKE_NATIVE, "[WXBridgeManager] callNativeModule exception " + e.getCause()); + } + + return null; } - return null; - } public Object callNativeComponent(String instanceId, String componentRef, String method, JSONArray arguments, Object options) { if (WXEnvironment.isApkDebugable()) {
