You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/10/01 03:10:02 UTC
[4/6] incubator-weex git commit: open debug log for exception
open debug log for exception
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b3d96fe0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b3d96fe0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b3d96fe0
Branch: refs/heads/release-0.16
Commit: b3d96fe09d371af73939bd388cad266481616ef1
Parents: 3baa9e0
Author: 御魂 <we...@alibaba-inc.com>
Authored: Thu Sep 28 15:58:18 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Sun Oct 1 11:09:19 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/WXSDKInstance.java | 11 +++--
.../java/com/taobao/weex/bridge/WXBridge.java | 26 ++++++------
.../com/taobao/weex/bridge/WXBridgeManager.java | 42 ++++++++++----------
3 files changed, 40 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b3d96fe0/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 427c9af..9b9e165 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -1043,9 +1043,8 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
mWXPerformance.screenRenderTime = time;
}
mWXPerformance.componentCount = WXComponent.mComponentNum;
- if(WXEnvironment.isApkDebugable()) {
- WXLogUtils.d(WXLogUtils.WEEX_PERF_TAG, "mComponentNum:" + WXComponent.mComponentNum);
- }
+ WXLogUtils.d(WXLogUtils.WEEX_PERF_TAG, "mComponentNum:" + WXComponent.mComponentNum);
+
WXComponent.mComponentNum = 0;
if (mRenderListener != null && mContext != null) {
runOnUiThread(new Runnable() {
@@ -1060,9 +1059,9 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
performance.args=getBundleUrl();
mUserTrackAdapter.commit(mContext,null,IWXUserTrackAdapter.JS_BRIDGE,performance,getUserTrackParams());
}
- if (WXEnvironment.isApkDebugable()) {
- WXLogUtils.d(WXLogUtils.WEEX_PERF_TAG, mWXPerformance.toString());
- }
+
+ WXLogUtils.d(WXLogUtils.WEEX_PERF_TAG, mWXPerformance.toString());
+
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b3d96fe0/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
index 8d5bf6f..9d88fc2 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
@@ -91,9 +91,9 @@ class WXBridge implements IWXBridge {
errorCode = WXBridgeManager.getInstance().callNative(instanceId, tasks, callback);
}catch (Throwable e){
//catch everything during call native.
- if(WXEnvironment.isApkDebugable()){
+ // if(WXEnvironment.isApkDebugable()){
WXLogUtils.e(TAG,"callNative throw exception:"+e.getMessage());
- }
+ // }
}
if(instance != null) {
@@ -133,9 +133,9 @@ class WXBridge implements IWXBridge {
errorCode = WXBridgeManager.getInstance().callCreateBody(instanceId, tasks, callback);
}catch (Throwable e){
//catch everything during call native.
- if(WXEnvironment.isApkDebugable()){
+ // if(WXEnvironment.isApkDebugable()){
WXLogUtils.e(TAG,"callCreateBody throw exception:"+e.getMessage());
- }
+ // }
}
if(instance != null) {
instance.callNativeTime(System.currentTimeMillis() - start);
@@ -160,20 +160,20 @@ class WXBridge implements IWXBridge {
errorCode = WXBridgeManager.getInstance().callAddElement(instanceId, ref,dom,index, callback);
}catch (Throwable e){
//catch everything during call native.
- if(WXEnvironment.isApkDebugable()){
+ // if(WXEnvironment.isApkDebugable()){
e.printStackTrace();
WXLogUtils.e(TAG,"callNative throw error:"+e.getMessage());
- }
+ // }
}
if(instance != null) {
instance.callNativeTime(System.currentTimeMillis() - start);
}
- if(WXEnvironment.isApkDebugable()){
+ // if(WXEnvironment.isApkDebugable()){
if(errorCode == IWXBridge.DESTROY_INSTANCE){
WXLogUtils.w("destroyInstance :"+instanceId+" JSF must stop callNative");
}
- }
+ // }
return errorCode;
}
@@ -273,6 +273,7 @@ class WXBridge implements IWXBridge {
*/
public int callCreateFinish(String instanceId, byte [] tasks, String callback) {
+
long start = System.currentTimeMillis();
WXSDKInstance instance = WXSDKManager.getInstance().getSDKInstance(instanceId);
if(instance != null) {
@@ -283,9 +284,9 @@ class WXBridge implements IWXBridge {
errorCode = WXBridgeManager.getInstance().callCreateFinish(instanceId, callback);
} catch (Throwable e) {
//catch everything during call native.
- if(WXEnvironment.isApkDebugable()){
+ // if(WXEnvironment.isApkDebugable()){
WXLogUtils.e(TAG,"callCreateFinish throw exception:" + e.getMessage());
- }
+ // }
}
if(instance != null) {
instance.callNativeTime(System.currentTimeMillis() - start);
@@ -459,9 +460,9 @@ class WXBridge implements IWXBridge {
errorCode = WXBridgeManager.getInstance().callAddEvent(instanceId, ref, event, callback);
} catch (Throwable e) {
//catch everything during call native.
- if(WXEnvironment.isApkDebugable()){
+ // if(WXEnvironment.isApkDebugable()){
WXLogUtils.e(TAG,"callAddEvent throw exception:" + e.getMessage());
- }
+ // }
}
if(instance != null) {
instance.callNativeTime(System.currentTimeMillis() - start);
@@ -499,6 +500,7 @@ class WXBridge implements IWXBridge {
}
public void reportServerCrash(String instanceId, String crashFile) {
+ WXLogUtils.e(TAG,"reportServerCrash instanceId:" + instanceId);
int errorCode = IWXBridge.INSTANCE_RENDERING;
try {
errorCode = WXBridgeManager.getInstance().callReportCrashReloadPage(instanceId, crashFile);
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b3d96fe0/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 0d830b6..ba13bed 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -430,12 +430,12 @@ public class WXBridgeManager implements Callback,BactchExecutor {
return IWXBridge.INSTANCE_RENDERING_ERROR;
}
- if (WXEnvironment.isApkDebugable()) {
+ // if (WXEnvironment.isApkDebugable()) {
mLodBuilder.append("[WXBridgeManager] callNative >>>> instanceId:").append(instanceId)
.append(", tasks:").append(tasks).append(", callback:").append(callback);
- WXLogUtils.d(mLodBuilder.substring(0));
+ WXLogUtils.e(mLodBuilder.substring(0));
mLodBuilder.setLength(0);
- }
+ // }
if(mDestroyedInstanceId!=null &&mDestroyedInstanceId.contains(instanceId)){
return IWXBridge.DESTROY_INSTANCE;
@@ -494,19 +494,19 @@ public class WXBridgeManager implements Callback,BactchExecutor {
// callCreateBody
public int callCreateBody(String instanceId, String tasks, String callback) {
if (TextUtils.isEmpty(tasks)) {
- if (WXEnvironment.isApkDebugable()) {
+ // if (WXEnvironment.isApkDebugable()) {
WXLogUtils.e("[WXBridgeManager] callCreateBody: call CreateBody tasks is null");
- }
+ // }
commitJSBridgeAlarmMonitor(instanceId, WXErrorCode.WX_ERR_DOM_CREATEBODY,"[WXBridgeManager] callCreateBody: call CreateBody tasks is null");
return IWXBridge.INSTANCE_RENDERING_ERROR;
}
- if (WXEnvironment.isApkDebugable()) {
+ // if (WXEnvironment.isApkDebugable()) {
mLodBuilder.append("[WXBridgeManager] callCreateBody >>>> instanceId:").append(instanceId)
.append(", tasks:").append(tasks).append(", callback:").append(callback);
WXLogUtils.d(mLodBuilder.substring(0));
mLodBuilder.setLength(0);
- }
+ // }
if(mDestroyedInstanceId != null && mDestroyedInstanceId.contains(instanceId)){
@@ -578,12 +578,12 @@ public class WXBridgeManager implements Callback,BactchExecutor {
// callCreateFinish
public int callCreateFinish(String instanceId, String callback) {
- if (WXEnvironment.isApkDebugable()) {
+ // if (WXEnvironment.isApkDebugable()) {
mLodBuilder.append("[WXBridgeManager] callCreateFinish >>>> instanceId:").append(instanceId)
.append(", callback:").append(callback);
WXLogUtils.d(mLodBuilder.substring(0));
mLodBuilder.setLength(0);
- }
+ // }
if(mDestroyedInstanceId != null && mDestroyedInstanceId.contains(instanceId)) {
return IWXBridge.DESTROY_INSTANCE;
@@ -704,14 +704,14 @@ public class WXBridgeManager implements Callback,BactchExecutor {
commitJSBridgeAlarmMonitor(instanceId, WXErrorCode.WX_ERR_DOM_UPDATESTYLE,"[WXBridgeManager] callUpdateStyle: call UpdateStyle tasks is null");
return IWXBridge.INSTANCE_RENDERING_ERROR;
}
- if (WXEnvironment.isApkDebugable()) {
+// if (WXEnvironment.isApkDebugable()) {
mLodBuilder.append("[WXBridgeManager] callUpdateStyle >>>> instanceId:").append(instanceId)
.append(", ref:").append(ref)
.append(", task:").append(task)
.append(", callback:").append(callback);
WXLogUtils.d(mLodBuilder.substring(0));
mLodBuilder.setLength(0);
- }
+// }
if(mDestroyedInstanceId != null && mDestroyedInstanceId.contains(instanceId)) {
return IWXBridge.DESTROY_INSTANCE;
@@ -821,13 +821,13 @@ public class WXBridgeManager implements Callback,BactchExecutor {
public int callAddEvent(String instanceId, String ref, String event, String callback) {
- if (WXEnvironment.isApkDebugable()) {
+// if (WXEnvironment.isApkDebugable()) {
mLodBuilder.append("[WXBridgeManager] callAddEvent >>>> instanceId:").append(instanceId)
.append(", ref:").append(ref)
.append(", event:").append(event);
WXLogUtils.d(mLodBuilder.substring(0));
mLodBuilder.setLength(0);
- }
+// }
if(mDestroyedInstanceId != null && mDestroyedInstanceId.contains(instanceId)) {
return IWXBridge.DESTROY_INSTANCE;
@@ -895,12 +895,12 @@ public class WXBridgeManager implements Callback,BactchExecutor {
public int callAddElement(String instanceId, String ref,String dom,String index, String callback){
- if (WXEnvironment.isApkDebugable()) {
+ // if (WXEnvironment.isApkDebugable()) {
mLodBuilder.append("[WXBridgeManager] callNative::callAddElement >>>> instanceId:").append(instanceId)
.append(", ref:").append(ref).append(", dom:").append(dom).append(", callback:").append(callback);
WXLogUtils.d(mLodBuilder.substring(0));
mLodBuilder.setLength(0);
- }
+ // }
if(mDestroyedInstanceId!=null && mDestroyedInstanceId.contains(instanceId)){
return IWXBridge.DESTROY_INSTANCE;
@@ -1351,9 +1351,9 @@ public class WXBridgeManager implements Callback,BactchExecutor {
if (adapter != null) {
WXJSExceptionInfo jsException = new WXJSExceptionInfo(instanceId, url, errorCode.getErrorCode(), method, exception, extParams);
adapter.onJSException(jsException);
- if (WXEnvironment.isApkDebugable()) {
+ // if (WXEnvironment.isApkDebugable()) {
WXLogUtils.e(jsException.toString());
- }
+ // }
}
}
@@ -1519,14 +1519,14 @@ public class WXBridgeManager implements Callback,BactchExecutor {
public void invokeExecJS(String instanceId, String namespace, String function,
WXJSObject[] args,boolean logTaskDetail){
- if (WXEnvironment.isApkDebugable()) {
+ // if (WXEnvironment.isApkDebugable()) {
mLodBuilder.append("callJS >>>> instanceId:").append(instanceId)
.append("function:").append(function);
if(logTaskDetail)
mLodBuilder.append(" tasks:").append(WXJsonUtils.fromObjectToJSONString(args));
WXLogUtils.d(mLodBuilder.substring(0));
mLodBuilder.setLength(0);
- }
+ // }
mWXBridge.execJS(instanceId, namespace, function, args);
}
@@ -1544,9 +1544,9 @@ public class WXBridgeManager implements Callback,BactchExecutor {
private void initFramework(String framework){
if (!isJSFrameworkInit()) {
if (TextUtils.isEmpty(framework)) {
- if (WXEnvironment.isApkDebugable()) {
+ // if (WXEnvironment.isApkDebugable()) {
WXLogUtils.d("weex JS framework from assets");
- }
+ // }
framework = WXFileUtils.loadAsset("main.js", WXEnvironment.getApplication());
}
if (TextUtils.isEmpty(framework)) {