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/f59069bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f59069bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f59069bd Branch: refs/heads/0.16-dev Commit: f59069bdbc5021cd757a4da432b257038350e33c Parents: a4ab661 Author: å¢¨ç¬ <sanjun....@alibaba-inc.com> Authored: Tue Aug 8 16:05:34 2017 +0800 Committer: å¢¨ç¬ <sanjun....@alibaba-inc.com> Committed: Tue Aug 8 16:05:34 2017 +0800 ---------------------------------------------------------------------- .../main/java/com/taobao/weex/bridge/WXBridgeManager.java | 5 ++--- .../sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java | 8 ++------ 2 files changed, 4 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f59069bd/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 b5c007d..5475e0d 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 @@ -229,7 +229,6 @@ public class WXBridgeManager implements Callback,BactchExecutor { if (wxsdkInstance == null) { return null; } - if (wxsdkInstance.isNeedValidate() && WXSDKManager.getInstance().getValidateProcessor() != null) { WXValidateProcessor.WXModuleValidateResult validateResult = WXSDKManager @@ -351,8 +350,8 @@ public class WXBridgeManager implements Callback,BactchExecutor { commitJSBridgeAlarmMonitor(instanceId, WXErrorCode.WX_ERR_INVOKE_NATIVE, "[WXBridgeManager] callNativeModule exception " + e.getCause()); } - return null; - } + return null; + } public Object callNativeModule(String instanceId, String module,String method, JSONArray arguments, JSONObject options) { if (WXEnvironment.isApkDebugable()) { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f59069bd/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java index 1deaae6..9643abd 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java +++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java @@ -630,12 +630,7 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject public static @Nullable WXDomObject parse(JSONObject json, WXSDKInstance wxsdkInstance) { return parse(json, wxsdkInstance, null); } - - /** - * Parse the jsonObject to {@link WXDomObject} recursively - * @param json the original JSONObject - * @return Dom Object corresponding to the JSONObject. - */ + public static @Nullable WXDomObject parse(JSONObject json, WXSDKInstance wxsdkInstance, WXDomObject parentDomObject){ if (json == null || json.size() <= 0) { return null; @@ -673,6 +668,7 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject domObject.parseFromJson(json); domObject.mDomContext = wxsdkInstance; domObject.parent = parentDomObject; + Object children = json.get(CHILDREN); if (children != null && children instanceof JSONArray) { JSONArray childrenArray = (JSONArray) children;
