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 2018/07/09 09:19:46 UTC
incubator-weex git commit: [WEEX-498][Android] fix report url is
bundleUrlDefault
Repository: incubator-weex
Updated Branches:
refs/heads/master 402feabd7 -> 987792330
[WEEX-498][Android] fix report url is bundleUrlDefault
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/98779233
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/98779233
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/98779233
Branch: refs/heads/master
Commit: 987792330361755dbeeba165abb18407006f6603
Parents: 402feab
Author: zhongcang <qh...@gmail.com>
Authored: Mon Jul 9 14:27:46 2018 +0800
Committer: zhongcang <qh...@gmail.com>
Committed: Mon Jul 9 15:53:47 2018 +0800
----------------------------------------------------------------------
.../sdk/src/main/java/com/taobao/weex/WXSDKInstance.java | 8 +++++---
android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java | 9 +++++++++
.../main/java/com/taobao/weex/utils/WXExceptionUtils.java | 2 +-
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/98779233/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 54b8583..0b3c9d9 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -391,6 +391,8 @@ public class WXSDKInstance implements IWXActivityStateListener,View.OnLayoutChan
mWXPerformance.JSLibInitTime = WXEnvironment.sJSLibInitTime;
mUserTrackAdapter=WXSDKManager.getInstance().getIWXUserTrackAdapter();
+
+ WXSDKManager.getInstance().getAllInstanceMap().put(mInstanceId,this);
}
/**
@@ -1340,6 +1342,7 @@ public class WXSDKInstance implements IWXActivityStateListener,View.OnLayoutChan
public synchronized void destroy() {
if(!isDestroy()) {
+ WXSDKManager.getInstance().getAllInstanceMap().remove(mInstanceId);
if(mRendered) {
WXSDKManager.getInstance().destroyInstance(mInstanceId);
}
@@ -1839,7 +1842,6 @@ public class WXSDKInstance implements IWXActivityStateListener,View.OnLayoutChan
WXLogUtils.e("user intercept: WX_DEGRAD_ERR_BUNDLE_CONTENTTYPE_ERROR");
onRenderError(WXErrorCode.WX_DEGRAD_ERR_BUNDLE_CONTENTTYPE_ERROR.getErrorCode(),
"|response.errorMsg==" + response.errorMsg +
- "|instance.getTemplateInfo == \n" + instance.getTemplateInfo() +
"|instance bundleUrl = \n" + instance.getBundleUrl() +
"|instance requestUrl = \n" + Uri.decode(WXSDKInstance.requestUrl)
);
@@ -1850,8 +1852,8 @@ public class WXSDKInstance implements IWXActivityStateListener,View.OnLayoutChan
onRenderError(
WXErrorCode.WX_DEGRAD_ERR_NETWORK_CHECK_CONTENT_LENGTH_FAILED.getErrorCode(),
WXErrorCode.WX_DEGRAD_ERR_NETWORK_CHECK_CONTENT_LENGTH_FAILED.getErrorCode() +
- "|response.errorMsg==" + response.errorMsg +
- "|instance.getTemplateInfo == \n" + instance.getTemplateInfo());
+ "|response.errorMsg==" + response.errorMsg
+ );
}
else {
onRenderError(WXErrorCode.WX_DEGRAD_ERR_NETWORK_BUNDLE_DOWNLOAD_FAILED.getErrorCode(),
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/98779233/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 1823ef2..c5b579e 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
@@ -94,6 +94,9 @@ public class WXSDKManager {
// Tell weexv8 to initialize v8, default is true.
private boolean mNeedInitV8 = true;
+ //add when instance create,rm when instance destroy, not like WXRenderManager
+ private Map<String,WXSDKInstance> mAllInstanceMap;
+
private List<InstanceLifeCycleCallbacks> mLifeCycleCallbacks;
private static final int DEFAULT_VIEWPORT_WIDTH = 750;
@@ -107,6 +110,7 @@ public class WXSDKManager {
mBridgeManager = WXBridgeManager.getInstance();
mWXWorkThreadManager = new WXWorkThreadManager();
mWXAnalyzerList = new ArrayList<>();
+ mAllInstanceMap = new HashMap<>();
}
/**
@@ -213,10 +217,15 @@ public class WXSDKManager {
mWXRenderManager.postOnUiThread(WXThread.secure(runnable), delayMillis);
}
+ public Map<String, WXSDKInstance> getAllInstanceMap() {
+ return mAllInstanceMap;
+ }
+
public void destroy() {
if (mWXWorkThreadManager != null) {
mWXWorkThreadManager.destroy();
}
+ mAllInstanceMap.clear();
}
@Deprecated
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/98779233/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java
index 0e6069c..c0eccb6 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java
@@ -75,7 +75,7 @@ public class WXExceptionUtils {
if (!TextUtils.isEmpty(instanceId)) {
instanceIdCommit = instanceId;
- instance = WXSDKManager.getInstance().getSDKInstance(instanceId);
+ instance = WXSDKManager.getInstance().getAllInstanceMap().get(instanceId);
if (null != instance && instance.getContainerView() != null){
Context c = instance.getContainerView().getContext();