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/16 06:08:51 UTC

[1/2] incubator-weex git commit: * [android] first startup, if jsf work not ready, report exception and use h5 render

Repository: incubator-weex
Updated Branches:
  refs/heads/release-0.16 e80309921 -> 4330ad658


 * [android] first startup, if jsf work not ready, report exception and use h5 render


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4330ad65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4330ad65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4330ad65

Branch: refs/heads/release-0.16
Commit: 4330ad658da8c55a7659592f9d664ebb818d1f99
Parents: e560483
Author: yuhun-alibaba <to...@gmail.com>
Authored: Sat Oct 14 20:03:26 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Mon Oct 16 14:08:05 2017 +0800

----------------------------------------------------------------------
 .../src/main/java/com/taobao/weex/bridge/WXBridgeManager.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4330ad65/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 70dfc90..713c4c2 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
@@ -1378,8 +1378,8 @@ public class WXBridgeManager implements Callback,BactchExecutor {
       return;
     }
 
-    // 如果没有初始化尽快返回Exception,并且异步初始化
-    if (!isJSFrameworkInit()) {
+    // 如果首次启动没初始化尽快返回Exception,并且异步初始化
+    if (!isJSFrameworkInit() && reInitCount == 1) {
       instance.onRenderError(WXRenderErrorCode.WX_CREATE_INSTANCE_ERROR, "createInstance fail!");
       post(new Runnable() {
         @Override


[2/2] incubator-weex git commit: * [android] format debug log

Posted by gu...@apache.org.
 * [android] format debug log


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e5604834
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e5604834
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e5604834

Branch: refs/heads/release-0.16
Commit: e5604834adc1538a6a272f5d36d2db86bb323066
Parents: e803099
Author: yuhun-alibaba <to...@gmail.com>
Authored: Fri Oct 13 14:44:49 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Mon Oct 16 14:08:05 2017 +0800

----------------------------------------------------------------------
 android/sdk/libs/armeabi/libweexjsb.so | Bin 22616 -> 22556 bytes
 android/sdk/libs/armeabi/libweexjsc.so | Bin 341824 -> 335100 bytes
 android/sdk/libs/armeabi/libweexjss.so | Bin 6754016 -> 6754016 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e5604834/android/sdk/libs/armeabi/libweexjsb.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjsb.so b/android/sdk/libs/armeabi/libweexjsb.so
index 1330933..c46e857 100755
Binary files a/android/sdk/libs/armeabi/libweexjsb.so and b/android/sdk/libs/armeabi/libweexjsb.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e5604834/android/sdk/libs/armeabi/libweexjsc.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjsc.so b/android/sdk/libs/armeabi/libweexjsc.so
index 4e76388..ec98d07 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/e5604834/android/sdk/libs/armeabi/libweexjss.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjss.so b/android/sdk/libs/armeabi/libweexjss.so
index 544d41d..5a8809c 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and b/android/sdk/libs/armeabi/libweexjss.so differ