You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2017/09/15 02:50:02 UTC
[1/3] incubator-weex git commit: fix exec js exception on
android7.1.1 platform
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev f95d20db1 -> 84b000d31
fix exec js exception on android7.1.1 platform
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/595ded47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/595ded47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/595ded47
Branch: refs/heads/0.16-dev
Commit: 595ded47e5ffba84d0f9f3e74bd021d4859da758
Parents: 701c4b9
Author: yuhun-alibaba <to...@gmail.com>
Authored: Wed Sep 13 17:13:07 2017 +0800
Committer: yuhun-alibaba <to...@gmail.com>
Committed: Wed Sep 13 17:53:21 2017 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi/libweexjsc.so | Bin 325660 -> 325660 bytes
android/sdk/libs/armeabi/libweexjss.so | Bin 6754012 -> 6754016 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/595ded47/android/sdk/libs/armeabi/libweexjsc.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjsc.so b/android/sdk/libs/armeabi/libweexjsc.so
index d3fb7e7..b08a455 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and b/android/sdk/libs/armeabi/libweexjsc.so differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/595ded47/android/sdk/libs/armeabi/libweexjss.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjss.so b/android/sdk/libs/armeabi/libweexjss.so
index c0236b6..13e5bc6 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and b/android/sdk/libs/armeabi/libweexjss.so differ
[2/3] incubator-weex git commit: do not let same crash page reload
again on short time
Posted by ky...@apache.org.
do not let same crash page reload again on short time
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/de67bd86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/de67bd86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/de67bd86
Branch: refs/heads/0.16-dev
Commit: de67bd868673e52342a33605006a6a131d516edd
Parents: 595ded4
Author: 御魂 <we...@alibaba-inc.com>
Authored: Thu Sep 14 00:53:01 2017 +0800
Committer: yuhun-alibaba <to...@gmail.com>
Committed: Thu Sep 14 12:19:03 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/WXSDKInstance.java | 26 ++++++++++---------
.../com/taobao/weex/bridge/WXBridgeManager.java | 27 +++++++++++++++++---
.../com/taobao/weex/dom/action/Actions.java | 4 +--
.../weex/dom/action/ReloadPageAction.java | 6 +++--
4 files changed, 43 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/de67bd86/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index d1bbd52..f354a25 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -606,21 +606,23 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
return "";
}
- public void reloadPage() {
+ public void reloadPage(boolean reloadThis) {
+
WXSDKEngine.reload();
- // 可以发送广播吗？
- if (mContext != null) {
- Intent intent = new Intent();
- intent.setAction(IWXDebugProxy.ACTION_INSTANCE_RELOAD);
- intent.putExtra("url", mBundleUrl);
- mContext.sendBroadcast(intent);
+ if (reloadThis) {
+ // 可以发送广播吗？
+ if (mContext != null) {
+ Intent intent = new Intent();
+ intent.setAction(IWXDebugProxy.ACTION_INSTANCE_RELOAD);
+ intent.putExtra("url", mBundleUrl);
+ mContext.sendBroadcast(intent);
+ }
+ // mRendered = false;
+ // destroy();
+ // renderInternal(mPackage, mTemplate, mOptions, mJsonInitData, mFlag);
+ // refreshInstance("{}");
}
- // mRendered = false;
- // destroy();
- // renderInternal(mPackage, mTemplate, mOptions, mJsonInitData, mFlag);
- // refreshInstance("{}");
-
}
/**
* Refresh instance asynchronously.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/de67bd86/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 89b2d3b..3b11387 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
@@ -135,6 +135,9 @@ public class WXBridgeManager implements Callback,BactchExecutor {
private static final int CRASHREINIT = 50;
private static int reInitCount = 1;
+ private static String crashUrl = null;
+ private static long lastCrashTime = 0;
+
/**
* next tick tasks, can set priority
@@ -962,12 +965,15 @@ public class WXBridgeManager implements Callback,BactchExecutor {
WXLogUtils.e("[WXBridgeManager] callReportCrashReloadPage exception: ", e);
}
try {
+
if (WXSDKManager.getInstance().getSDKInstance(instanceId) != null) {
- // JSONObject domObject = JSON.parseObject(tasks);
+ boolean reloadThisInstance = shouReloadCurrentInstance(
+ WXSDKManager.getInstance().getSDKInstance(instanceId).getBundleUrl());
WXDomModule domModule = getDomModule(instanceId);
- Action action = Actions.getReloadPage(instanceId);
- domModule.postAction((DOMAction)action, true);
+ Action action = Actions.getReloadPage(instanceId, reloadThisInstance);
+ domModule.postAction((DOMAction) action, true);
}
+
} catch (Exception e) {
WXLogUtils.e("[WXBridgeManager] callReloadPage exception: ", e);
commitJSBridgeAlarmMonitor(instanceId, WXErrorCode.WX_ERR_RELOAD_PAGE,"[WXBridgeManager] callReloadPage exception "+e.getCause());
@@ -975,6 +981,19 @@ public class WXBridgeManager implements Callback,BactchExecutor {
return IWXBridge.INSTANCE_RENDERING_ERROR;
}
+ public boolean shouReloadCurrentInstance(String aUrl) {
+ long time = System.currentTimeMillis();
+ if (crashUrl == null ||
+ (crashUrl != null && !crashUrl.equals(aUrl)) ||
+ ((time - lastCrashTime) > 10000)) {
+ crashUrl = aUrl;
+ lastCrashTime = time;
+ return true;
+ }
+ lastCrashTime = time;
+ return false;
+ }
+
public void callReportCrash(String crashFile, final String instanceId, final String url) {
// statistic weexjsc process crash
Date date = new Date();
@@ -1809,7 +1828,7 @@ public class WXBridgeManager implements Callback,BactchExecutor {
if (reInitCount > 1 && !instance.isNeedReLoad()) {
// JSONObject domObject = JSON.parseObject(tasks);
WXDomModule domModule = getDomModule(instanceId);
- Action action = Actions.getReloadPage(instanceId);
+ Action action = Actions.getReloadPage(instanceId, true);
domModule.postAction((DOMAction)action, true);
instance.setNeedLoad(true);
return;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/de67bd86/android/sdk/src/main/java/com/taobao/weex/dom/action/Actions.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/action/Actions.java b/android/sdk/src/main/java/com/taobao/weex/dom/action/Actions.java
index 6e87c68..779b4d6 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/action/Actions.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/action/Actions.java
@@ -225,7 +225,7 @@ public class Actions {
return new ExecutableRenderAction(runnable);
}
- public static DOMAction getReloadPage(String instanceId) {
- return new ReloadPageAction(instanceId);
+ public static DOMAction getReloadPage(String instanceId, boolean relaod) {
+ return new ReloadPageAction(instanceId, relaod);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/de67bd86/android/sdk/src/main/java/com/taobao/weex/dom/action/ReloadPageAction.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/action/ReloadPageAction.java b/android/sdk/src/main/java/com/taobao/weex/dom/action/ReloadPageAction.java
index aaf67e7..791a5f2 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/action/ReloadPageAction.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/action/ReloadPageAction.java
@@ -36,9 +36,11 @@ import com.taobao.weex.dom.RenderActionContext;
final class ReloadPageAction implements DOMAction, RenderAction {
private final String TAG = "ReloadPageAction";
private String mInstanceId;
+ private boolean mReloadThis;
- ReloadPageAction(String instanceId) {
+ ReloadPageAction(String instanceId, boolean reloadThis) {
mInstanceId = instanceId;
+ mReloadThis = reloadThis;
}
@Override
@@ -51,7 +53,7 @@ final class ReloadPageAction implements DOMAction, RenderAction {
WXSDKInstance instance = context.getInstance();
if (instance != null) {
// instance.commitUTStab(IWXUserTrackAdapter.DOM_MODULE, WXErrorCode.WX_SUCCESS);
- instance.reloadPage();
+ instance.reloadPage(mReloadThis);
} else {
Log.e(TAG, "ReloadPageAction executeDom reloadPage instance is null");
}
[3/3] incubator-weex git commit: Merge branch '0.16-dev-debug' of
https://github.com/yuhun-alibaba/incubator-weex into 0.16-dev
Posted by ky...@apache.org.
Merge branch '0.16-dev-debug' of https://github.com/yuhun-alibaba/incubator-weex into 0.16-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/84b000d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/84b000d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/84b000d3
Branch: refs/heads/0.16-dev
Commit: 84b000d31750d5d86e95b0482ca717aa245e7aac
Parents: f95d20d de67bd8
Author: YorkShen <sh...@gmail.com>
Authored: Fri Sep 15 10:49:51 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Fri Sep 15 10:49:51 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/WXSDKInstance.java | 26 ++++++++++---------
.../com/taobao/weex/bridge/WXBridgeManager.java | 27 +++++++++++++++++---
.../com/taobao/weex/dom/action/Actions.java | 4 +--
.../weex/dom/action/ReloadPageAction.java | 6 +++--
4 files changed, 43 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/84b000d3/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------