Repository: incubator-weex Updated Branches: refs/heads/master 56e23de83 -> 595c29e9c
+ [android] add instanceId declaring the caller instance Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5f3f9c37 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5f3f9c37 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5f3f9c37 Branch: refs/heads/master Commit: 5f3f9c37c6846c259236f4b359b13c7595fe9d63 Parents: 5bfcb7b Author: jiangxiang.jx <[email protected]> Authored: Tue Mar 13 12:51:47 2018 +0800 Committer: jiangxiang.jx <[email protected]> Committed: Tue Mar 13 12:51:47 2018 +0800 ---------------------------------------------------------------------- android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java | 1 + .../main/java/com/taobao/weex/common/WXImageStrategy.java | 8 ++++++++ .../sdk/src/main/java/com/taobao/weex/common/WXRequest.java | 8 ++++++++ .../src/main/java/com/taobao/weex/http/WXStreamModule.java | 1 + .../src/main/java/com/taobao/weex/ui/component/WXImage.java | 1 + 5 files changed, 19 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5f3f9c37/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 475991e..dbbbfe1 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java +++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java @@ -578,6 +578,7 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View. if (wxRequest.paramMap == null) { wxRequest.paramMap = new HashMap<String, String>(); } + wxRequest.instanceId = getInstanceId(); wxRequest.paramMap.put(KEY_USER_AGENT, WXHttpUtil.assembleUserAgent(mContext,WXEnvironment.getConfig())); WXHttpListener httpListener = new WXHttpListener(pageName, renderOptions, jsonInitData, flag, System.currentTimeMillis()); http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5f3f9c37/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java b/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java index 994c99b..6b9b51d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java +++ b/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java @@ -20,6 +20,8 @@ package com.taobao.weex.common; import android.widget.ImageView; +import com.taobao.weex.WXSDKInstance; + import java.util.Map; public class WXImageStrategy { @@ -48,6 +50,12 @@ public class WXImageStrategy { public String placeHolder; + /** + * running weex instanceId + * @see WXSDKInstance#mInstanceId + */ + public String instanceId;; + public ImageListener getImageListener() { return imageListener; } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5f3f9c37/android/sdk/src/main/java/com/taobao/weex/common/WXRequest.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXRequest.java b/android/sdk/src/main/java/com/taobao/weex/common/WXRequest.java index 462e48b..e266a96 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXRequest.java +++ b/android/sdk/src/main/java/com/taobao/weex/common/WXRequest.java @@ -18,6 +18,8 @@ */ package com.taobao.weex.common; +import com.taobao.weex.WXSDKInstance; + import java.util.Map; public class WXRequest { @@ -49,4 +51,10 @@ public class WXRequest { * The default timeout */ public static final int DEFAULT_TIMEOUT_MS = 3000; + + /** + * running weex instanceId + * @see WXSDKInstance#mInstanceId + */ + public String instanceId;; } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5f3f9c37/android/sdk/src/main/java/com/taobao/weex/http/WXStreamModule.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/http/WXStreamModule.java b/android/sdk/src/main/java/com/taobao/weex/http/WXStreamModule.java index 005e676..e3ac2f0 100644 --- a/android/sdk/src/main/java/com/taobao/weex/http/WXStreamModule.java +++ b/android/sdk/src/main/java/com/taobao/weex/http/WXStreamModule.java @@ -266,6 +266,7 @@ public class WXStreamModule extends WXModule { wxRequest.url = mWXSDKInstance.rewriteUri(Uri.parse(options.getUrl()), URIAdapter.REQUEST).toString(); wxRequest.body = options.getBody(); wxRequest.timeoutMs = options.getTimeout(); + wxRequest.instanceId = mWXSDKInstance.getInstanceId(); if(options.getHeaders()!=null) if (wxRequest.paramMap == null) { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5f3f9c37/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java index f307d8a..a63d14c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java @@ -336,6 +336,7 @@ public class WXImage extends WXComponent<ImageView> { imageStrategy.placeHolder = getInstance().rewriteUri(Uri.parse(placeholder),URIAdapter.IMAGE).toString(); } + imageStrategy.instanceId = getInstanceId(); IWXImgLoaderAdapter imgLoaderAdapter = getInstance().getImgLoaderAdapter(); if (imgLoaderAdapter != null) { imgLoaderAdapter.setImage(rewrited.toString(), getHostView(),
