recover some deleted functions to ensure the backward compatibility
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a4ab6613 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a4ab6613 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a4ab6613 Branch: refs/heads/0.16-dev Commit: a4ab66132684d09ee1b3979dd8cbd0003fa2943e Parents: 50fa5ca Author: å¢¨ç¬ <sanjun....@alibaba-inc.com> Authored: Fri Aug 4 12:31:39 2017 +0800 Committer: å¢¨ç¬ <sanjun....@alibaba-inc.com> Committed: Fri Aug 4 12:31:39 2017 +0800 ---------------------------------------------------------------------- .../com/taobao/weex/bridge/WXBridgeManager.java | 24 ++++++++++++++++++++ .../java/com/taobao/weex/dom/WXDomObject.java | 9 ++++++++ 2 files changed, 33 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a4ab6613/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 a88fb30..b5c007d 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 @@ -329,6 +329,30 @@ public class WXBridgeManager implements Callback,BactchExecutor { mJSHandler.removeMessages(what, obj); } + public Object callNativeModule(String instanceId, String module, String method, JSONArray arguments, Object 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); + } + } catch (Exception e) { + WXLogUtils.e("[WXBridgeManager] callNative exception: ", e); + commitJSBridgeAlarmMonitor(instanceId, WXErrorCode.WX_ERR_INVOKE_NATIVE, "[WXBridgeManager] callNativeModule exception " + e.getCause()); + } + + 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/a4ab6613/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 dab3d2e..1deaae6 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 @@ -627,6 +627,15 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject * @param json the original JSONObject * @return Dom Object corresponding to the JSONObject. */ + 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;
