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/18 04:17:12 UTC
[34/50] [abbrv] incubator-weex git commit: * [android] modify log
print
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b5126471/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
index 782b16c..03f3057 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
@@ -335,9 +335,7 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject
int index = mDomChildren.indexOf(child);
if (index == -1) {
- if (WXEnvironment.isApkDebugable()) {
WXLogUtils.e("[WXDomObject] remove function error");
- }
return;
}
mDomChildren.remove(index).parent = null;
@@ -685,7 +683,7 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject
type = TextUtils.isEmpty(result.replacedComponent) ? WXBasicComponentType.DIV
: result.replacedComponent;
json.put(TYPE, type);
- if (WXEnvironment.isApkDebugable() && result.validateInfo != null) {
+ if (result.validateInfo != null) {
String tag = "[WXDomObject]onComponentValidate failure. >>> " + result.validateInfo.toJSONString();
WXLogUtils.e(tag);
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b5126471/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java b/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
index 9f35263..3fcedcb 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
@@ -96,9 +96,7 @@ public abstract class AbstractAddElementAction extends TraceableAction implement
Stopwatch.split("parseDomObject");
if (domObject == null || context.getDomByRef(domObject.getRef()) != null) {
- if (WXEnvironment.isApkDebugable()) {
- WXLogUtils.e("[DOMActionContextImpl] " + getStatementName() + " error,DOM object is null or already registered!!");
- }
+ WXLogUtils.e("[DOMActionContextImpl] " + getStatementName() + " error,DOM object is null or already registered!!");
instance.commitUTStab(IWXUserTrackAdapter.DOM_MODULE, errCode);
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b5126471/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponentFactory.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponentFactory.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponentFactory.java
index 4323821..4f9712f 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponentFactory.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponentFactory.java
@@ -59,11 +59,9 @@ public class WXComponentFactory {
IFComponentHolder holder = WXComponentRegistry.getComponent(node.getType());
if (holder == null) {
- if (WXEnvironment.isApkDebugable()) {
String tag = "WXComponentFactory error type:[" +
node.getType() + "]" + " class not found";
WXLogUtils.e(tag);
- }
//For compatible reason of JS framework, unregistered type will be treated as container.
holder = WXComponentRegistry.getComponent(WXBasicComponentType.CONTAINER);
if(holder == null){
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b5126471/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 1f2b4b1..ae6e623 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
@@ -71,13 +71,17 @@ public class WXLogUtils {
}
private static void log(String tag, String msg, LogLevel level){
- if (WXEnvironment.isApkDebugable() && msg != null && WXEnvironment.sLogLevel.compare(level) >= 0) {
- Log.println(level.getPriority(),tag, msg);
- writeConsoleLog(level.getName(), msg);
- sendLog(level, msg);
- }
- if (sLogWatcher != null) {
- sLogWatcher.onLog(level.getName(), tag, msg);
+ if (msg != null && WXEnvironment.sLogLevel.compare(level) >= 0) {
+ if (sLogWatcher != null ) {
+ sLogWatcher.onLog(level.getName(), tag, msg);
+ }else{
+ Log.println(level.getPriority(),tag, msg);
+ }
+
+ if(WXEnvironment.isApkDebugable()){
+ writeConsoleLog(level.getName(), msg);
+ sendLog(level, msg);
+ }
}
}
@@ -214,15 +218,13 @@ public class WXLogUtils {
}
public static void w(String prefix, Throwable e) {
- if (WXEnvironment.isApkDebugable()) {
w(prefix + getStackTrace(e));
- }
+
}
public static void e(String prefix, Throwable e) {
- if (WXEnvironment.isApkDebugable()) {
e(prefix + getStackTrace(e));
- }
+
}
public static void wtf(String prefix, Throwable e){