You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/03/30 11:39:03 UTC
[29/30] incubator-weex git commit: * [android] fix merge error
* [android] fix merge error
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e00277ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e00277ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e00277ac
Branch: refs/heads/0.12-dev
Commit: e00277acf77e061d8af769051e87a295a56518ef
Parents: 6bc2a18
Author: zshshr <zh...@gmail.com>
Authored: Thu Mar 30 13:43:04 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Thu Mar 30 13:43:04 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/WXSDKManager.java | 72 +++++++++++++++++---
1 file changed, 64 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e00277ac/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
index 461faf0..fc182b4 100755
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
@@ -139,6 +139,7 @@ import com.taobao.weex.adapter.IWXDebugAdapter;
import com.taobao.weex.adapter.IWXHttpAdapter;
import com.taobao.weex.adapter.IWXImgLoaderAdapter;
import com.taobao.weex.adapter.IWXJSExceptionAdapter;
+import com.taobao.weex.adapter.IWXSoLoaderAdapter;
import com.taobao.weex.adapter.IWXUserTrackAdapter;
import com.taobao.weex.adapter.URIAdapter;
import com.taobao.weex.appfram.navigator.IActivityNavBarSetter;
@@ -157,6 +158,7 @@ import com.taobao.weex.ui.WXRenderManager;
import com.taobao.weex.utils.WXLogUtils;
import com.taobao.weex.utils.WXUtils;
+import java.io.File;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -175,6 +177,7 @@ public class WXSDKManager {
private IWXUserTrackAdapter mIWXUserTrackAdapter;
private IWXImgLoaderAdapter mIWXImgLoaderAdapter;
+ private IWXSoLoaderAdapter mIWXSoLoaderAdapter;
private IDrawableLoader mDrawableLoader;
private IWXHttpAdapter mIWXHttpAdapter;
private IWXDebugAdapter mIWXDebugAdapter;
@@ -185,10 +188,12 @@ 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 WXSDKManager() {
mWXRenderManager = new WXRenderManager();
@@ -196,14 +201,46 @@ public class WXSDKManager {
mBridgeManager = WXBridgeManager.getInstance();
}
- private WXSDKManager(WXRenderManager renderManager) {
- mWXRenderManager = renderManager;
- mWXDomManager = new WXDomManager(renderManager);
- mBridgeManager = WXBridgeManager.getInstance();
+ public void registerStatisticsListener(IWXStatisticsListener listener) {
+ mStatisticsListener = listener;
+ }
+
+ public IWXStatisticsListener getWXStatisticsListener() {
+ return mStatisticsListener;
+ }
+
+ public void onSDKEngineInitialize() {
+ if (mStatisticsListener != null) {
+ mStatisticsListener.onSDKEngineInitialize();
+ }
}
- static void initInstance(WXRenderManager renderManager){
- sManager = new WXSDKManager(renderManager);
+ public void setNeedInitV8(boolean need) {
+ mNeedInitV8 = need;
+ }
+
+ public boolean needInitV8() {
+ return mNeedInitV8;
+ }
+
+ public void takeJSHeapSnapshot(String path) {
+ File file = new File(path);
+ if (!file.exists()) {
+ if (!file.mkdir()) {
+ return;
+ }
+ }
+
+ String name = String.valueOf(sInstanceId.get());
+ String filename = path;
+
+ if (!path.endsWith(File.separator)) {
+ filename += File.separator;
+ }
+ filename += name;
+ filename += ".heapsnapshot";
+
+ mBridgeManager.takeJSHeapSnapshot(filename);
}
public static WXSDKManager getInstance() {
@@ -355,7 +392,7 @@ public class WXSDKManager {
return mIWXJSExceptionAdapter;
}
- void setIWXJSExceptionAdapter(IWXJSExceptionAdapter IWXJSExceptionAdapter) {
+ void setIWXJSExceptionAdapter(IWXJSExceptionAdapter IWXJSExceptionAdapter) {
mIWXJSExceptionAdapter = IWXJSExceptionAdapter;
}
@@ -373,6 +410,10 @@ public class WXSDKManager {
return mURIAdapter;
}
+ public IWXSoLoaderAdapter getIWXSoLoaderAdapter() {
+ return mIWXSoLoaderAdapter;
+ }
+
void setInitConfig(InitConfig config){
this.mIWXDebugAdapter = config.getDebugAdapter();
this.mIWXHttpAdapter = config.getHttpAdapter();
@@ -383,6 +424,7 @@ public class WXSDKManager {
this.mURIAdapter = config.getURIAdapter();
this.mIWebSocketAdapterFactory = config.getWebSocketAdapterFactory();
this.mIWXJSExceptionAdapter = config.getJSExceptionAdapter();
+ this.mIWXSoLoaderAdapter = config.getIWXSoLoaderAdapter();
}
public IWXDebugAdapter getIWXDebugAdapter() {
@@ -417,6 +459,20 @@ public class WXSDKManager {
public void notifyTrimMemory() {
mBridgeManager.notifyTrimMemory();
}
+
+ /**
+ * Weex embedders can use <code>notifySerializeCodeCache</code> to
+ * serialize code caches if the jsfm has the alility to compile 'new Function'
+ * against js bundles on the weex native side.
+ *
+ * It's a good time to serialize a code cache after exiting a weex page.
+ * Then, the next time of entering the same weex page, V8 would compile
+ * 'new Function' against the code cache deseriazed from the js bundle.
+ */
+ public void notifySerializeCodeCache() {
+ mBridgeManager.notifySerializeCodeCache();
+ }
+
public @Nullable
IWebSocketAdapter getIWXWebSocketAdapter() {
if (mIWebSocketAdapterFactory != null) {