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:38:47 UTC
[13/30] incubator-weex git commit: * [android] add an interface for
statistics.
* [android] add an interface for statistics.
Embedders can adapte their own classes for performance statistics or
uploading exception logs to their own log servers.
We should move WXPerformances, UserTracker, commitXXX functions
into a adapter level, this will be done in future.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b807772d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b807772d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b807772d
Branch: refs/heads/0.12-dev
Commit: b807772d1f41556596529771b0e69209b1b0ee1f
Parents: ab76ce7
Author: butuo.dbt <bu...@alibaba-inc.com>
Authored: Fri Mar 3 15:23:11 2017 +0800
Committer: bruno.duan <br...@gmail.com>
Committed: Tue Mar 7 15:27:50 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/IWXStatisticsListener.java | 252 +++++++++++++++++++
.../main/java/com/taobao/weex/WXSDKEngine.java | 5 +-
.../java/com/taobao/weex/WXSDKInstance.java | 62 ++++-
.../main/java/com/taobao/weex/WXSDKManager.java | 16 ++
.../com/taobao/weex/bridge/WXBridgeManager.java | 30 ++-
.../taobao/weex/utils/WXSoInstallMgrSdk.java | 11 +-
6 files changed, 366 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b807772d/android/sdk/src/main/java/com/taobao/weex/IWXStatisticsListener.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/IWXStatisticsListener.java b/android/sdk/src/main/java/com/taobao/weex/IWXStatisticsListener.java
new file mode 100755
index 0000000..72e0d49
--- /dev/null
+++ b/android/sdk/src/main/java/com/taobao/weex/IWXStatisticsListener.java
@@ -0,0 +1,252 @@
+/**
+ *
+ * Apache License
+ * Version 2.0, January 2004
+ * http://www.apache.org/licenses/
+ *
+ * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ *
+ * 1. Definitions.
+ *
+ * "License" shall mean the terms and conditions for use, reproduction,
+ * and distribution as defined by Sections 1 through 9 of this document.
+ *
+ * "Licensor" shall mean the copyright owner or entity authorized by
+ * the copyright owner that is granting the License.
+ *
+ * "Legal Entity" shall mean the union of the acting entity and all
+ * other entities that control, are controlled by, or are under common
+ * control with that entity. For the purposes of this definition,
+ * "control" means (i) the power, direct or indirect, to cause the
+ * direction or management of such entity, whether by contract or
+ * otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ * outstanding shares, or (iii) beneficial ownership of such entity.
+ *
+ * "You" (or "Your") shall mean an individual or Legal Entity
+ * exercising permissions granted by this License.
+ *
+ * "Source" form shall mean the preferred form for making modifications,
+ * including but not limited to software source code, documentation
+ * source, and configuration files.
+ *
+ * "Object" form shall mean any form resulting from mechanical
+ * transformation or translation of a Source form, including but
+ * not limited to compiled object code, generated documentation,
+ * and conversions to other media types.
+ *
+ * "Work" shall mean the work of authorship, whether in Source or
+ * Object form, made available under the License, as indicated by a
+ * copyright notice that is included in or attached to the work
+ * (an example is provided in the Appendix below).
+ *
+ * "Derivative Works" shall mean any work, whether in Source or Object
+ * form, that is based on (or derived from) the Work and for which the
+ * editorial revisions, annotations, elaborations, or other modifications
+ * represent, as a whole, an original work of authorship. For the purposes
+ * of this License, Derivative Works shall not include works that remain
+ * separable from, or merely link (or bind by name) to the interfaces of,
+ * the Work and Derivative Works thereof.
+ *
+ * "Contribution" shall mean any work of authorship, including
+ * the original version of the Work and any modifications or additions
+ * to that Work or Derivative Works thereof, that is intentionally
+ * submitted to Licensor for inclusion in the Work by the copyright owner
+ * or by an individual or Legal Entity authorized to submit on behalf of
+ * the copyright owner. For the purposes of this definition, "submitted"
+ * means any form of electronic, verbal, or written communication sent
+ * to the Licensor or its representatives, including but not limited to
+ * communication on electronic mailing lists, source code control systems,
+ * and issue tracking systems that are managed by, or on behalf of, the
+ * Licensor for the purpose of discussing and improving the Work, but
+ * excluding communication that is conspicuously marked or otherwise
+ * designated in writing by the copyright owner as "Not a Contribution."
+ *
+ * "Contributor" shall mean Licensor and any individual or Legal Entity
+ * on behalf of whom a Contribution has been received by Licensor and
+ * subsequently incorporated within the Work.
+ *
+ * 2. Grant of Copyright License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * copyright license to reproduce, prepare Derivative Works of,
+ * publicly display, publicly perform, sublicense, and distribute the
+ * Work and such Derivative Works in Source or Object form.
+ *
+ * 3. Grant of Patent License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * (except as stated in this section) patent license to make, have made,
+ * use, offer to sell, sell, import, and otherwise transfer the Work,
+ * where such license applies only to those patent claims licensable
+ * by such Contributor that are necessarily infringed by their
+ * Contribution(s) alone or by combination of their Contribution(s)
+ * with the Work to which such Contribution(s) was submitted. If You
+ * institute patent litigation against any entity (including a
+ * cross-claim or counterclaim in a lawsuit) alleging that the Work
+ * or a Contribution incorporated within the Work constitutes direct
+ * or contributory patent infringement, then any patent licenses
+ * granted to You under this License for that Work shall terminate
+ * as of the date such litigation is filed.
+ *
+ * 4. Redistribution. You may reproduce and distribute copies of the
+ * Work or Derivative Works thereof in any medium, with or without
+ * modifications, and in Source or Object form, provided that You
+ * meet the following conditions:
+ *
+ * (a) You must give any other recipients of the Work or
+ * Derivative Works a copy of this License; and
+ *
+ * (b) You must cause any modified files to carry prominent notices
+ * stating that You changed the files; and
+ *
+ * (c) You must retain, in the Source form of any Derivative Works
+ * that You distribute, all copyright, patent, trademark, and
+ * attribution notices from the Source form of the Work,
+ * excluding those notices that do not pertain to any part of
+ * the Derivative Works; and
+ *
+ * (d) If the Work includes a "NOTICE" text file as part of its
+ * distribution, then any Derivative Works that You distribute must
+ * include a readable copy of the attribution notices contained
+ * within such NOTICE file, excluding those notices that do not
+ * pertain to any part of the Derivative Works, in at least one
+ * of the following places: within a NOTICE text file distributed
+ * as part of the Derivative Works; within the Source form or
+ * documentation, if provided along with the Derivative Works; or,
+ * within a display generated by the Derivative Works, if and
+ * wherever such third-party notices normally appear. The contents
+ * of the NOTICE file are for informational purposes only and
+ * do not modify the License. You may add Your own attribution
+ * notices within Derivative Works that You distribute, alongside
+ * or as an addendum to the NOTICE text from the Work, provided
+ * that such additional attribution notices cannot be construed
+ * as modifying the License.
+ *
+ * You may add Your own copyright statement to Your modifications and
+ * may provide additional or different license terms and conditions
+ * for use, reproduction, or distribution of Your modifications, or
+ * for any such Derivative Works as a whole, provided Your use,
+ * reproduction, and distribution of the Work otherwise complies with
+ * the conditions stated in this License.
+ *
+ * 5. Submission of Contributions. Unless You explicitly state otherwise,
+ * any Contribution intentionally submitted for inclusion in the Work
+ * by You to the Licensor shall be under the terms and conditions of
+ * this License, without any additional terms or conditions.
+ * Notwithstanding the above, nothing herein shall supersede or modify
+ * the terms of any separate license agreement you may have executed
+ * with Licensor regarding such Contributions.
+ *
+ * 6. Trademarks. This License does not grant permission to use the trade
+ * names, trademarks, service marks, or product names of the Licensor,
+ * except as required for reasonable and customary use in describing the
+ * origin of the Work and reproducing the content of the NOTICE file.
+ *
+ * 7. Disclaimer of Warranty. Unless required by applicable law or
+ * agreed to in writing, Licensor provides the Work (and each
+ * Contributor provides its Contributions) on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied, including, without limitation, any warranties or conditions
+ * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ * PARTICULAR PURPOSE. You are solely responsible for determining the
+ * appropriateness of using or redistributing the Work and assume any
+ * risks associated with Your exercise of permissions under this License.
+ *
+ * 8. Limitation of Liability. In no event and under no legal theory,
+ * whether in tort (including negligence), contract, or otherwise,
+ * unless required by applicable law (such as deliberate and grossly
+ * negligent acts) or agreed to in writing, shall any Contributor be
+ * liable to You for damages, including any direct, indirect, special,
+ * incidental, or consequential damages of any character arising as a
+ * result of this License or out of the use or inability to use the
+ * Work (including but not limited to damages for loss of goodwill,
+ * work stoppage, computer failure or malfunction, or any and all
+ * other commercial damages or losses), even if such Contributor
+ * has been advised of the possibility of such damages.
+ *
+ * 9. Accepting Warranty or Additional Liability. While redistributing
+ * the Work or Derivative Works thereof, You may choose to offer,
+ * and charge a fee for, acceptance of support, warranty, indemnity,
+ * or other liability obligations and/or rights consistent with this
+ * License. However, in accepting such obligations, You may act only
+ * on Your own behalf and on Your sole responsibility, not on behalf
+ * of any other Contributor, and only if You agree to indemnify,
+ * defend, and hold each Contributor harmless for any liability
+ * incurred by, or claims asserted against, such Contributor by reason
+ * of your accepting any such warranty or additional liability.
+ *
+ * END OF TERMS AND CONDITIONS
+ *
+ * APPENDIX: How to apply the Apache License to your work.
+ *
+ * To apply the Apache License to your work, attach the following
+ * boilerplate notice, with the fields enclosed by brackets "[]"
+ * replaced with your own identifying information. (Don't include
+ * the brackets!) The text should be enclosed in the appropriate
+ * comment syntax for the file format. We also recommend that a
+ * file or class name and description of purpose be included on the
+ * same "printed page" as the copyright notice for easier
+ * identification within third-party archives.
+ *
+ * Copyright 2016 Alibaba Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.taobao.weex;
+
+public interface IWXStatisticsListener {
+ /**
+ * Called when weex sdk engine begin to initialize.
+ */
+ void onSDKEngineInitialize();
+
+ /**
+ * Called when begin to load js framework.
+ */
+ void onJsFrameworkStart();
+
+ /**
+ * Called when finish loading js framework.
+ */
+ void onJsFrameworkReady();
+
+ /**
+ * Called when the render view phase of first view reached.
+ */
+ void onFirstView();
+
+ /**
+ * Called when the render view phase of first screen reached.
+ */
+ void onFirstScreen();
+
+ /**
+ * Called when to start a http request.
+ */
+ void onHttpStart();
+
+ /**
+ * Called when received a http response header data.
+ */
+ void onHeadersReceived();
+
+ /**
+ * Called when to finish a http request.
+ */
+ void onHttpFinish();
+
+ /**
+ * Called when an exception occured.
+ */
+ void onException(String instanceid, String errCode, String msg);
+}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b807772d/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
index 526c989..fc94ce0 100755
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
@@ -263,13 +263,16 @@ public class WXSDKEngine {
public void run() {
long start = System.currentTimeMillis();
WXSDKManager sm = WXSDKManager.getInstance();
+ sm.onSDKEngineInitialize();
if(config != null ) {
sm.setInitConfig(config);
if(config.getDebugAdapter()!=null){
config.getDebugAdapter().initDebug(application);
}
}
- WXSoInstallMgrSdk.init(application, sm.getIWXSoLoaderAdapter());
+ WXSoInstallMgrSdk.init(application,
+ sm.getIWXSoLoaderAdapter(),
+ sm.getWXStatisticsListener());
boolean isSoInitSuccess = WXSoInstallMgrSdk.initSo(V8_SO_NAME, 1, config!=null?config.getUtAdapter():null);
if (!isSoInitSuccess) {
return;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b807772d/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 29eec05..151ad1e 100755
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -280,6 +280,7 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
public static final String BUNDLE_URL = "bundleUrl";
private IWXUserTrackAdapter mUserTrackAdapter;
private IWXRenderListener mRenderListener;
+ private IWXStatisticsListener mStatisticsListener;
/** package **/ Context mContext;
private final String mInstanceId;
private RenderContainer mRenderContainer;
@@ -590,7 +591,10 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
wxRequest.paramMap = new HashMap<String, String>();
}
wxRequest.paramMap.put(KEY_USER_AGENT, WXHttpUtil.assembleUserAgent(mContext,WXEnvironment.getConfig()));
- adapter.sendRequest(wxRequest, new WXHttpListener(pageName, renderOptions, jsonInitData, flag, System.currentTimeMillis()));
+ WXHttpListener httpListener =
+ new WXHttpListener(pageName, renderOptions, jsonInitData, flag, System.currentTimeMillis());
+ httpListener.setSDKInstance(this);
+ adapter.sendRequest(wxRequest, (IWXHttpAdapter.OnHttpListener) httpListener);
}
/**
@@ -750,6 +754,10 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
return WXSDKManager.getInstance().getIWXHttpAdapter();
}
+ public IWXStatisticsListener getWXStatisticsListener() {
+ return mStatisticsListener;
+ }
+
public @Nullable
IWebSocketAdapter getWXWebSocketAdapter() {
return WXSDKManager.getInstance().getIWXWebSocketAdapter();
@@ -774,6 +782,10 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
}
+ public void registerStatisticsListener(IWXStatisticsListener listener) {
+ mStatisticsListener = listener;
+ }
+
/********************************
* end register listener
********************************************************/
@@ -990,6 +1002,9 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
if(mRenderListener != null) {
mRenderListener.onViewCreated(WXSDKInstance.this, wxView);
}
+ if (mStatisticsListener != null) {
+ mStatisticsListener.onFirstView();
+ }
}
}
});
@@ -1140,6 +1155,18 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
return;
mEnd = true;
+
+ if (mStatisticsListener != null && mContext != null) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ if (mStatisticsListener != null && mContext != null) {
+ mStatisticsListener.onFirstScreen();
+ }
+ }
+ });
+ }
+
mWXPerformance.screenRenderTime = System.currentTimeMillis() - mRenderStartTime;
WXLogUtils.renderPerformanceLog("firstScreenRenderFinished", mWXPerformance.screenRenderTime);
WXLogUtils.renderPerformanceLog(" firstScreenJSFExecuteTime", mWXPerformance.firstScreenJSFExecuteTime);
@@ -1177,12 +1204,20 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
* UserTrack Log
*/
public void commitUTStab(final String type, final WXErrorCode errorCode) {
- if (mUserTrackAdapter == null || TextUtils.isEmpty(type) || errorCode==null) {
+ if (TextUtils.isEmpty(type) || errorCode == null) {
return;
}
+
runOnUiThread(new Runnable() {
@Override
public void run() {
+ // Record exception if a render error happened.
+ if (mStatisticsListener != null && errorCode != WXErrorCode.WX_SUCCESS) {
+ mStatisticsListener.onException(mInstanceId,
+ errorCode.getErrorCode(),
+ errorCode.getErrorMsg());
+ }
+
WXPerformance performance = new WXPerformance();
performance.errCode = errorCode.getErrorCode();
performance.args = errorCode.getArgs();
@@ -1245,7 +1280,8 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
mScrollView = null;
mContext = null;
mRenderListener = null;
- isDestroy=true;
+ isDestroy = true;
+ mStatisticsListener = null;
}
public boolean isDestroy(){
@@ -1491,6 +1527,7 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
private Map<String, Object> options;
private String jsonInitData;
private WXRenderStrategy flag;
+ private WXSDKInstance instance;
private long startRequestTime;
private WXHttpListener(String pageName, Map<String, Object> options, String jsonInitData, WXRenderStrategy flag, long startRequestTime) {
@@ -1500,16 +1537,25 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
this.flag = flag;
this.startRequestTime = startRequestTime;
}
-
+
+ public void setSDKInstance(WXSDKInstance instance) {
+ this.instance = instance;
+ }
@Override
public void onHttpStart() {
-
+ if (this.instance != null
+ && this.instance.getWXStatisticsListener() != null) {
+ this.instance.getWXStatisticsListener().onHttpStart();
+ }
}
@Override
public void onHeadersReceived(int statusCode,Map<String,List<String>> headers) {
-
+ if (this.instance != null
+ && this.instance.getWXStatisticsListener() != null) {
+ this.instance.getWXStatisticsListener().onHeadersReceived();
+ }
}
@Override
@@ -1524,6 +1570,10 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
@Override
public void onHttpFinish(WXResponse response) {
+ if (this.instance != null
+ && this.instance.getWXStatisticsListener() != null) {
+ this.instance.getWXStatisticsListener().onHttpFinish();
+ }
mWXPerformance.networkTime = System.currentTimeMillis() - startRequestTime;
if(response.extendParams!=null){
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b807772d/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 821ab30..f7a15c1 100755
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
@@ -132,6 +132,7 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
+import com.taobao.weex.IWXStatisticsListener;
import com.taobao.weex.adapter.DefaultUriAdapter;
import com.taobao.weex.adapter.DefaultWXHttpAdapter;
import com.taobao.weex.adapter.IDrawableLoader;
@@ -189,6 +190,7 @@ public class WXSDKManager {
private IWXJSExceptionAdapter mIWXJSExceptionAdapter;
private IWXStorageAdapter mIWXStorageAdapter;
+ private IWXStatisticsListener mStatisticsListener;
private URIAdapter mURIAdapter;
private IWebSocketAdapterFactory mIWebSocketAdapterFactory;
private WXValidateProcessor mWXValidateProcessor;
@@ -201,6 +203,20 @@ public class WXSDKManager {
mBridgeManager = WXBridgeManager.getInstance();
}
+ public void registerStatisticsListener(IWXStatisticsListener listener) {
+ mStatisticsListener = listener;
+ }
+
+ public IWXStatisticsListener getWXStatisticsListener() {
+ return mStatisticsListener;
+ }
+
+ public void onSDKEngineInitialize() {
+ if (mStatisticsListener != null) {
+ mStatisticsListener.onSDKEngineInitialize();
+ }
+ }
+
public void setNeedInitV8(boolean need) {
mNeedInitV8 = need;
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b807772d/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index 2792f8d..2e8e322 100755
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -849,8 +849,16 @@ public class WXBridgeManager implements Callback,BactchExecutor {
public void commitJSBridgeAlarmMonitor(String instanceId, WXErrorCode errCode, String errMsg) {
WXSDKInstance instance = WXSDKManager.getInstance().getSDKInstance(instanceId);
+ if (instance == null || errCode == null) {
+ return;
+ }
+ // TODO: We should move WXPerformance and IWXUserTrackAdapter
+ // into a adapter level.
+ // comment out the line below to prevent commiting twice.
+ //instance.commitUTStab(WXConst.JS_BRIDGE, errCode, errMsg);
+
IWXUserTrackAdapter adapter = WXSDKManager.getInstance().getIWXUserTrackAdapter();
- if (instance == null || adapter == null || errCode == null) {
+ if (adapter == null) {
return;
}
WXPerformance performance = new WXPerformance();
@@ -864,8 +872,17 @@ public class WXBridgeManager implements Callback,BactchExecutor {
}
public void commitJSFrameworkAlarmMonitor(final String type, final WXErrorCode errorCode, String errMsg) {
+ if (TextUtils.isEmpty(type) || errorCode == null) {
+ return;
+ }
+ if (WXSDKManager.getInstance().getWXStatisticsListener() != null) {
+ WXSDKManager.getInstance().getWXStatisticsListener().onException("0",
+ errorCode.getErrorCode(),
+ TextUtils.isEmpty(errMsg) ? errorCode.getErrorMsg() : errMsg);
+ }
+
final IWXUserTrackAdapter userTrackAdapter = WXSDKManager.getInstance().getIWXUserTrackAdapter();
- if (userTrackAdapter == null || TextUtils.isEmpty(type) || errorCode == null) {
+ if (userTrackAdapter == null) {
return;
}
WXPerformance performance = new WXPerformance();
@@ -1076,6 +1093,10 @@ public class WXBridgeManager implements Callback,BactchExecutor {
return;
}
try {
+ if (WXSDKManager.getInstance().getWXStatisticsListener() != null) {
+ WXSDKManager.getInstance().getWXStatisticsListener().onJsFrameworkStart();
+ }
+
long start = System.currentTimeMillis();
if(mWXBridge.initFramework(framework, assembleDefaultOptions())==INIT_FRAMEWORK_OK){
WXEnvironment.sJSLibInitTime = System.currentTimeMillis() - start;
@@ -1083,6 +1104,11 @@ public class WXBridgeManager implements Callback,BactchExecutor {
WXEnvironment.sSDKInitTime = System.currentTimeMillis() - WXEnvironment.sSDKInitStart;
WXLogUtils.renderPerformanceLog("SDKInitTime", WXEnvironment.sSDKInitTime);
mInit = true;
+
+ if (WXSDKManager.getInstance().getWXStatisticsListener() != null) {
+ WXSDKManager.getInstance().getWXStatisticsListener().onJsFrameworkReady();
+ }
+
execRegisterFailTask();
WXEnvironment.JsFrameworkInit = true;
registerDomModule();
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b807772d/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
index f1a43d1..d72fe1d 100755
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
@@ -208,6 +208,7 @@ import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.os.Build;
+import com.taobao.weex.IWXStatisticsListener;
import com.taobao.weex.WXEnvironment;
import com.taobao.weex.adapter.IWXSoLoaderAdapter;
import com.taobao.weex.adapter.IWXUserTrackAdapter;
@@ -257,10 +258,14 @@ public class WXSoInstallMgrSdk {
static Context mContext = null;
private static IWXSoLoaderAdapter mSoLoader = null;
+ private static IWXStatisticsListener mStatisticsListener = null;
- public static void init(Context c, IWXSoLoaderAdapter loader) {
+ public static void init(Context c,
+ IWXSoLoaderAdapter loader,
+ IWXStatisticsListener listener) {
mContext = c;
mSoLoader = loader;
+ mStatisticsListener = listener;
}
public static boolean isX86(){
@@ -576,6 +581,10 @@ public class WXSoInstallMgrSdk {
}
static void commit(IWXUserTrackAdapter utAdapter, String errCode, String errMsg) {
+ if (mStatisticsListener != null) {
+ mStatisticsListener.onException("0", errCode, errMsg);
+ }
+
if (utAdapter == null) {
return;
}