You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/04/10 06:29:40 UTC
[09/10] incubator-weex git commit: Merge branch
'android-bugfix-instance-npe' of github.com:misakuo/incubator-weex into
0.12-dev This closes #191
Merge branch 'android-bugfix-instance-npe' of github.com:misakuo/incubator-weex into 0.12-dev
This closes #191
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/75589535
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/75589535
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/75589535
Branch: refs/heads/0.12-dev
Commit: 75589535fb8a52b9d51eddf6340b50d28ada8c14
Parents: d882c8b 8526474
Author: sospartan <so...@apache.org>
Authored: Mon Apr 10 14:22:19 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Mon Apr 10 14:22:19 2017 +0800
----------------------------------------------------------------------
.../sdk/src/main/java/com/taobao/weex/WXSDKManager.java | 10 ++++++++--
.../main/java/com/taobao/weex/bridge/WXBridgeManager.java | 3 +++
.../java/com/taobao/weex/dom/DOMActionContextImpl.java | 2 +-
.../sdk/src/main/java/com/taobao/weex/utils/ATagUtil.java | 8 ++++++--
4 files changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/75589535/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
----------------------------------------------------------------------
diff --cc android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
index 6e5648c,7cbbef1..83c0288
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
@@@ -188,15 -185,17 +188,17 @@@ public class WXSDKManager
private IWXJSExceptionAdapter mIWXJSExceptionAdapter;
private IWXStorageAdapter mIWXStorageAdapter;
+ private IWXStatisticsListener mStatisticsListener;
private URIAdapter mURIAdapter;
private IWebSocketAdapterFactory mIWebSocketAdapterFactory;
-
private WXValidateProcessor mWXValidateProcessor;
+ // Tell weexv8 to initialize v8, default is true.
+ private boolean mNeedInitV8 = true;
+ private static final int DEFAULT_VIEWPORT_WIDTH = 750;
+
private WXSDKManager() {
- mWXRenderManager = new WXRenderManager();
- mWXDomManager = new WXDomManager(mWXRenderManager);
- mBridgeManager = WXBridgeManager.getInstance();
+ this(new WXRenderManager());
}
private WXSDKManager(WXRenderManager renderManager) {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/75589535/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
----------------------------------------------------------------------