优化LOG

alibaba · Sep 24, 2024 · 3e83fac · 3e83fac
1 parent f5cffec
commit 3e83fac
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 88 deletions.
diff --git a/GaiaXAndroid/src/main/kotlin/com/alibaba/gaiax/utils/Log.kt b/GaiaXAndroid/src/main/kotlin/com/alibaba/gaiax/utils/Log.kt
@@ -60,28 +60,10 @@ fun SystemProp.defaultLog(): Boolean {
     return this["debug.com.alibaba.gaiax.sdk.log", "0"] == "1" || this["debug.com.alibaba.gaiax.all.log", "0"] == "1"
 }
 
-fun SystemProp.defaultLogFlag(): Int {
-    return if (defaultLog()) Log.FLAG_OPEN else 0
-}
-
-inline fun Log.runE(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(ERROR, flags or SystemProp.defaultLogFlag(), tag, block)
-}
-
-inline fun Log.runD(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(DEBUG, flags or SystemProp.defaultLogFlag(), tag, block)
-}
-
-inline fun Log.runV(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(VERBOSE, flags or SystemProp.defaultLogFlag(), tag, block)
-}
-
-inline fun Log.runI(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(INFO, flags or SystemProp.defaultLogFlag(), tag, block)
-}
-
-inline fun Log.runW(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(WARN, flags or SystemProp.defaultLogFlag(), tag, block)
+inline fun Log.runE(tag: String = "", block: () -> String) {
+    if (SystemProp.defaultLog()) {
+        runIf(ERROR, FLAG_OPEN, tag, block)
+    }
 }
 
 object SystemProp {

diff --git a/GaiaXAndroidAdapter/src/main/java/com/alibaba/gaiax/adapter/Log.kt b/GaiaXAndroidAdapter/src/main/java/com/alibaba/gaiax/adapter/Log.kt
@@ -57,28 +57,10 @@ fun SystemProp.defaultLog(): Boolean {
     return this["debug.com.alibaba.gaiax.adapter.log", "0"] == "1" || this["debug.com.alibaba.gaiax.all.log", "0"] == "1"
 }
 
-fun SystemProp.defaultLogFlag(): Int {
-    return if (defaultLog()) Log.FLAG_OPEN else 0
-}
-
-inline fun Log.runE(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(ERROR, flags or SystemProp.defaultLogFlag(), tag, block)
-}
-
-inline fun Log.runD(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(DEBUG, flags or SystemProp.defaultLogFlag(), tag, block)
-}
-
-inline fun Log.runV(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(VERBOSE, flags or SystemProp.defaultLogFlag(), tag, block)
-}
-
-inline fun Log.runI(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(INFO, flags or SystemProp.defaultLogFlag(), tag, block)
-}
-
-inline fun Log.runW(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(WARN, flags or SystemProp.defaultLogFlag(), tag, block)
+inline fun Log.runE(tag: String = "", block: () -> String) {
+    if (SystemProp.defaultLog()) {
+        runIf(ERROR, FLAG_OPEN, tag, block)
+    }
 }
 
 object SystemProp {

diff --git a/GaiaXAndroidJS/src/main/kotlin/com/alibaba/gaiax/js/utils/Log.kt b/GaiaXAndroidJS/src/main/kotlin/com/alibaba/gaiax/js/utils/Log.kt
@@ -57,28 +57,10 @@ fun SystemProp.defaultLog(): Boolean {
     return this["debug.com.alibaba.gaiax.js.log", "0"] == "1" || this["debug.com.alibaba.gaiax.all.log", "0"] == "1"
 }
 
-fun SystemProp.defaultLogFlag(): Int {
-    return if (defaultLog()) Log.FLAG_OPEN else 0
-}
-
-inline fun Log.runE(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(ERROR, flags or SystemProp.defaultLogFlag(), tag, block)
-}
-
-inline fun Log.runD(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(DEBUG, flags or SystemProp.defaultLogFlag(), tag, block)
-}
-
-inline fun Log.runV(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(VERBOSE, flags or SystemProp.defaultLogFlag(), tag, block)
-}
-
-inline fun Log.runI(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(INFO, flags or SystemProp.defaultLogFlag(), tag, block)
-}
-
-inline fun Log.runW(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(WARN, flags or SystemProp.defaultLogFlag(), tag, block)
+inline fun Log.runE(tag: String = "", block: () -> String) {
+    if (SystemProp.defaultLog()) {
+        runIf(ERROR, FLAG_OPEN, tag, block)
+    }
 }
 
 object SystemProp {

diff --git a/GaiaXAndroidJSProxy/src/main/java/com/alibaba/gaiax/js/proxy/Log.kt b/GaiaXAndroidJSProxy/src/main/java/com/alibaba/gaiax/js/proxy/Log.kt
@@ -1,5 +1,7 @@
 package com.alibaba.gaiax.js.proxy
 
+import com.alibaba.gaiax.js.utils.Log
+import com.alibaba.gaiax.js.utils.defaultLog
 import java.lang.reflect.Method
 
 
@@ -57,28 +59,10 @@ fun SystemProp.defaultLog(): Boolean {
     return this["debug.com.alibaba.gaiax.js.proxy.log", "0"] == "1" || this["debug.com.alibaba.gaiax.all.log", "0"] == "1"
 }
 
-fun SystemProp.defaultLogFlag(): Int {
-    return if (defaultLog()) Log.FLAG_OPEN else 0
-}
-
-inline fun Log.runE(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(ERROR, flags or SystemProp.defaultLogFlag(), tag, block)
-}
-
-inline fun Log.runD(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(DEBUG, flags or SystemProp.defaultLogFlag(), tag, block)
-}
-
-inline fun Log.runV(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(VERBOSE, flags or SystemProp.defaultLogFlag(), tag, block)
-}
-
-inline fun Log.runI(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(INFO, flags or SystemProp.defaultLogFlag(), tag, block)
-}
-
-inline fun Log.runW(tag: String = "", flags: Int = 0, block: () -> String) {
-    runIf(WARN, flags or SystemProp.defaultLogFlag(), tag, block)
+inline fun Log.runE(tag: String = "", block: () -> String) {
+    if (SystemProp.defaultLog()) {
+        runIf(ERROR, FLAG_OPEN, tag, block)
+    }
 }
 
 object SystemProp {