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 2017/05/18 03:38:37 UTC
[1/2] incubator-weex git commit: Module monitor info
Repository: incubator-weex
Updated Branches:
refs/heads/0.13-dev 62d1d3f83 -> 54d077d41
Module monitor info
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1581e3c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1581e3c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1581e3c3
Branch: refs/heads/0.13-dev
Commit: 1581e3c35a48096973bcd2d2aef9a2e048b054b5
Parents: 834191e
Author: yilingwj <yi...@alibaba-inc.com>
Authored: Wed May 17 11:36:55 2017 +0800
Committer: yilingwj <yi...@alibaba-inc.com>
Committed: Wed May 17 11:36:55 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/adapter/IWXUserTrackAdapter.java | 2 +-
.../com/taobao/weex/bridge/WXModuleManager.java | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1581e3c3/android/sdk/src/main/java/com/taobao/weex/adapter/IWXUserTrackAdapter.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXUserTrackAdapter.java b/android/sdk/src/main/java/com/taobao/weex/adapter/IWXUserTrackAdapter.java
index a5201c2..604b461 100644
--- a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXUserTrackAdapter.java
+++ b/android/sdk/src/main/java/com/taobao/weex/adapter/IWXUserTrackAdapter.java
@@ -41,7 +41,7 @@ public interface IWXUserTrackAdapter {
String DOM_MODULE = "domModule";
String JS_BRIDGE = "jsBridge";
String STREAM_MODULE = "streamModule";
-
+ String INVOKE_MODULE = "invokeModule";
void commit(Context context, String eventId, String type, WXPerformance perf, Map<String, Serializable> params);
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1581e3c3/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java
index 2b5ee4a..9ec961b 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java
@@ -26,6 +26,7 @@ import android.view.Menu;
import com.alibaba.fastjson.JSONArray;
import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.WXSDKManager;
+import com.taobao.weex.adapter.IWXUserTrackAdapter;
import com.taobao.weex.common.Destroyable;
import com.taobao.weex.common.WXException;
import com.taobao.weex.common.WXModule;
@@ -35,6 +36,7 @@ import com.taobao.weex.dom.action.Actions;
import com.taobao.weex.ui.module.WXTimerModule;
import com.taobao.weex.utils.WXLogUtils;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -56,6 +58,13 @@ public class WXModuleManager {
private static Map<String, WXDomModule> sDomModuleMap = new HashMap<>();
/**
+ * monitor keys
+ */
+ private static String MONITOR_ERROR_CODE = "errCode";
+ private static String MONITOR_ARG = "arg";
+ private static String MONITOR_ERROR_MSG = "errMsg";
+
+ /**
* module object dictionary
* K : instanceId, V : Modules
*/
@@ -144,6 +153,14 @@ public class WXModuleManager {
final Invoker invoker = factory.getMethodInvoker(methodStr);
try {
if(instance != null) {
+ IWXUserTrackAdapter userTrackAdapter = WXSDKManager.getInstance().getIWXUserTrackAdapter();
+ if(userTrackAdapter != null) {
+ HashMap<String, Serializable> data = new HashMap<String, Serializable>();
+ data.put(MONITOR_ERROR_CODE, "101");
+ data.put(MONITOR_ARG, moduleStr + "." + methodStr);
+ data.put(MONITOR_ERROR_MSG, instance.getBundleUrl());
+ userTrackAdapter.commit(instance.getContext(), null, IWXUserTrackAdapter.INVOKE_MODULE, null, data);
+ }
return dispatchCallModuleMethod(instance,wxModule,args,invoker);
} else {
WXLogUtils.e("callModuleMethod >>> instance is null");
[2/2] incubator-weex git commit: Merge branch '0.13-dev' into
0.13-yiling
Posted by ky...@apache.org.
Merge branch '0.13-dev' into 0.13-yiling
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/54d077d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/54d077d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/54d077d4
Branch: refs/heads/0.13-dev
Commit: 54d077d41f578451e8306ec23dd97acbfb4893e2
Parents: 1581e3c 62d1d3f
Author: yilingwj <yi...@alibaba-inc.com>
Authored: Wed May 17 17:43:16 2017 +0800
Committer: yilingwj <yi...@alibaba-inc.com>
Committed: Wed May 17 17:43:16 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 9 ++++++---
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 1 +
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 ++
3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------