[android] remove debug log into debug mode
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/265d4272 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/265d4272 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/265d4272 Branch: refs/heads/master Commit: 265d4272e3af8fc1ecaff2b58d33a0d47f41433e Parents: 71d92a2 Author: atomtong <tong_huab...@qq.com> Authored: Mon Nov 13 15:24:44 2017 +0800 Committer: atomtong <tong_huab...@qq.com> Committed: Mon Nov 13 15:24:44 2017 +0800 ---------------------------------------------------------------------- .../main/java/com/taobao/weex/WXSDKInstance.java | 3 +-- .../com/taobao/weex/bridge/WXBridgeManager.java | 4 ++-- .../main/java/com/taobao/weex/utils/WXLogUtils.java | 16 +++++++++------- 3 files changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/265d4272/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 8aa9809..11e7ce1 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java +++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java @@ -1074,13 +1074,12 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View. } WXLogUtils.d(WXLogUtils.WEEX_PERF_TAG, mWXPerformance.toString()); - } } }); } if(!WXEnvironment.isApkDebugable()){ - Log.e("weex_perf",mWXPerformance.getPerfData()); + WXLogUtils.e("weex_perf",mWXPerformance.getPerfData()); } } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/265d4272/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 b6db683..97fb867 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 @@ -1529,14 +1529,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); } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/265d4272/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java index 10f1597..70ca32b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java +++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java @@ -75,14 +75,18 @@ public class WXLogUtils { sLogWatcher.onLog(level.getName(), tag, msg); } - if (msg != null && WXEnvironment.sLogLevel.compare(level) >= 0) { + if (WXEnvironment.isApkDebugable()) { Log.println(level.getPriority(),tag, msg); // if not debug level then print log - if(WXEnvironment.isApkDebugable() && !level.getName().equals("debug")){ + if(!level.getName().equals("debug")){ writeConsoleLog(level.getName(), msg); sendLog(level, msg); } - } + }else { + if(level.getPriority() - LogLevel.WARN.getPriority() >=0){ + Log.println(level.getPriority(),tag, msg); + } + } } public static void d(String msg) { @@ -120,10 +124,8 @@ public class WXLogUtils { public static void d(String tag, String msg) { log(tag, msg, LogLevel.DEBUG); - sendLog(LogLevel.DEBUG, tag + ":" + msg);// WXDebugTool sendLog - if(WXEnvironment.sLogLevel.compare(LogLevel.DEBUG) >= 0){//sLogLevel in debug mode is "LogLevel.DEBUG" - if (WXEnvironment.isApkDebugable() && !TextUtils.isEmpty(msg)) { + if(WXEnvironment.isApkDebugable()){//sLogLevel in debug mode is "LogLevel.DEBUG" if ("jsLog".equals(tag) && jsLogWatcher != null) { if (msg.endsWith("__DEBUG")) { jsLogWatcher.onJsLog(Log.DEBUG, msg.replace("__DEBUG", "")); @@ -149,7 +151,7 @@ public class WXLogUtils { return; } } - } + sendLog(LogLevel.DEBUG, tag + ":" + msg);// WXDebugTool sendLog } }
