You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/10/26 04:03:14 UTC
[1/2] incubator-weex git commit: * [android] create instance
exception when jsf not ready or jsc cannot start up will use h5 to render
page
Repository: incubator-weex
Updated Branches:
refs/heads/release-0.16 ee83fd3f9 -> 6e413271d
* [android] create instance exception when jsf not ready or jsc cannot start up will use h5 to render page
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0a28f271
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0a28f271
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0a28f271
Branch: refs/heads/release-0.16
Commit: 0a28f2712ad14b8da6231bc1c695ffde31e055a0
Parents: ee83fd3
Author: yuhun-alibaba <to...@gmail.com>
Authored: Wed Oct 25 15:39:05 2017 +0800
Committer: yuhun-alibaba <to...@gmail.com>
Committed: Wed Oct 25 15:42:27 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/bridge/WXBridgeManager.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0a28f271/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 0beb80d..82c526f 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
@@ -1478,7 +1478,9 @@ public class WXBridgeManager implements Callback, BactchExecutor {
WXJSObject instanceIdObj = new WXJSObject(WXJSObject.String,
instanceId);
WXJSObject[] args = {instanceIdObj};
- invokeExecJS(instanceId, null, METHOD_DESTROY_INSTANCE, args);
+ if (isJSFrameworkInit()) {
+ invokeExecJS(instanceId, null, METHOD_DESTROY_INSTANCE, args);
+ }
} catch (Throwable e) {
String err = "[WXBridgeManager] invokeDestroyInstance " + e.getCause();
commitJSBridgeAlarmMonitor(instanceId, WXErrorCode.WX_ERR_INVOKE_NATIVE, err);
@@ -1864,23 +1866,28 @@ public class WXBridgeManager implements Callback, BactchExecutor {
+ exception);
WXSDKInstance instance = null;
if (instanceId != null && (instance = WXSDKManager.getInstance().getSDKInstance(instanceId)) != null) {
- exception += instance.getTemplateInfo();
- instance.onJSException(WXErrorCode.WX_ERR_JS_EXECUTE.getErrorCode(), function, exception);
+
if (METHOD_CREATE_INSTANCE.equals(function)) {
try {
- if (reInitCount > 1 && !instance.isNeedReLoad()) {
+ if (mInit && reInitCount > 1 && !instance.isNeedReLoad()) {
// JSONObject domObject = JSON.parseObject(tasks);
WXDomModule domModule = getDomModule(instanceId);
Action action = Actions.getReloadPage(instanceId, true);
domModule.postAction((DOMAction) action, true);
instance.setNeedLoad(true);
return;
+ } else {
+ instance.onRenderError(WXRenderErrorCode.WX_CREATE_INSTANCE_ERROR, "createInstance fail!");
+ return;
}
} catch (Exception e) {
e.printStackTrace();
}
}
+ exception += instance.getTemplateInfo();
+ instance.onJSException(WXErrorCode.WX_ERR_JS_EXECUTE.getErrorCode(), function, exception);
+
String err = "function:" + function + "#exception:" + exception;
commitJSBridgeAlarmMonitor(instanceId, WXErrorCode.WX_ERR_JS_EXECUTE, err);
}
[2/2] incubator-weex git commit: * [android] exception opt,
on debug apk connecting debug server will hold on and wait
initframework, on release will return and use H5 render soon
Posted by gu...@apache.org.
* [android] exception opt, on debug apk connecting debug server will hold on and wait initframework, on release will return and use H5 render soon
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6e413271
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6e413271
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6e413271
Branch: refs/heads/release-0.16
Commit: 6e413271d3e07775c6a9dcc189ee6404327fefd0
Parents: 0a28f27
Author: yuhun-alibaba <to...@gmail.com>
Authored: Wed Oct 25 17:28:14 2017 +0800
Committer: yuhun-alibaba <to...@gmail.com>
Committed: Wed Oct 25 21:26:25 2017 +0800
----------------------------------------------------------------------
.../sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6e413271/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 82c526f..3db4972 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
@@ -1367,7 +1367,7 @@ public class WXBridgeManager implements Callback, BactchExecutor {
return;
}
- if (!isJSFrameworkInit() && reInitCount == 1) {
+ if (!isJSFrameworkInit() && reInitCount == 1 && !WXEnvironment.sDebugServerConnectable) {
instance.onRenderError(WXRenderErrorCode.WX_CREATE_INSTANCE_ERROR, "createInstance fail!");
post(new Runnable() {
@Override