diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 44777c3..8fba438 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,9 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.zj365.dc">
+
+
+
diff --git a/common/src/main/java/com/xty/common/LogUtils.kt b/common/src/main/java/com/xty/common/LogUtils.kt
index 7fe42cb..33af27a 100644
--- a/common/src/main/java/com/xty/common/LogUtils.kt
+++ b/common/src/main/java/com/xty/common/LogUtils.kt
@@ -9,7 +9,7 @@ import com.tencent.mm.opensdk.utils.Log
*/
object LogUtils {
- private const val TAG = "HealthUser"
+ private const val TAG = "ZJ365"
/**
* 得到tag
@@ -26,7 +26,7 @@ object LogUtils {
}
private fun isDebug(): Boolean {
- return BuildConfig.isDebug || MMkvHelper.getBoolean("openLog", false)
+ return BuildConfig.isDebug// || MMkvHelper.getBoolean("openLog", false)
// return true
}
diff --git a/network/src/main/java/com/xty/network/TokenIntercept.kt b/network/src/main/java/com/xty/network/TokenIntercept.kt
index 91220e4..953834d 100644
--- a/network/src/main/java/com/xty/network/TokenIntercept.kt
+++ b/network/src/main/java/com/xty/network/TokenIntercept.kt
@@ -2,6 +2,8 @@ package com.xty.network
import android.util.Log
import com.tencent.mmkv.MMKV
+import com.xty.network.utils.NetWorkLogUtils
+import com.youth.banner.util.LogUtils
import okhttp3.Interceptor
import okhttp3.Response
@@ -14,9 +16,9 @@ class TokenIntercept:Interceptor {
var request=chain.request()
val newBuilder = request.newBuilder()
mmkv!!.decodeString("Auth-Token")?.let {
- Log.e("token", "${mmkv!!.decodeString("Auth-Token")!!} " )
- Log.e("token_id", "${mmkv!!.decodeString("Auth-Id")!!} " )
- Log.e("mac_address", MyRetrofit.get().BLUETOOTH_MAC )
+ NetWorkLogUtils.e("token", "${mmkv!!.decodeString("Auth-Token")!!} " )
+ NetWorkLogUtils.e("token_id", "${mmkv!!.decodeString("Auth-Id")!!} " )
+ NetWorkLogUtils.e("mac_address", MyRetrofit.get().BLUETOOTH_MAC )
newBuilder.header("auth-token",mmkv!!.decodeString("Auth-Token")!!)
newBuilder.header("auth-id",mmkv!!.decodeString("Auth-Id")!!)
newBuilder.header("mark",MyRetrofit.get().BLUETOOTH_MAC)
diff --git a/network/src/main/java/com/xty/network/utils/NetWorkLogUtils.kt b/network/src/main/java/com/xty/network/utils/NetWorkLogUtils.kt
new file mode 100644
index 0000000..2562c97
--- /dev/null
+++ b/network/src/main/java/com/xty/network/utils/NetWorkLogUtils.kt
@@ -0,0 +1,82 @@
+package com.xty.network.utils
+
+import android.text.TextUtils
+import com.tencent.mm.opensdk.utils.Log
+import com.youth.banner.BuildConfig
+
+object NetWorkLogUtils {
+
+ private const val TAG = "ZJ365"
+
+ private const val DEBUG = BuildConfig.DEBUG
+
+ /**
+ * 得到tag
+ * @return 所在类->方法:行
+ */
+ private fun generateTag(): String {
+ val stackTraceElement = Thread.currentThread().stackTrace[6]
+// val callerClazzName =
+// stackTraceElement.className.substring(stackTraceElement.className.lastIndexOf(".") + 1)
+ val fileName = stackTraceElement.fileName
+// val methodName = stackTraceElement.methodName
+ val lineNumber = stackTraceElement.lineNumber
+ return "($fileName:$lineNumber)"
+ }
+
+
+ fun d(msg: String) {
+ d(null, msg)
+ }
+
+ fun i(msg: String) {
+ i(null, msg)
+ }
+
+ fun e(msg: String) {
+ e(null, msg)
+ }
+
+ fun w(msg: String) {
+ w(null, msg)
+ }
+
+ fun v(msg: String) {
+ v(null, msg)
+ }
+
+ fun d(tag: String?, msg: String) {//测试环境输出日志
+ if (DEBUG) {
+ Log.d(TAG, getMsg(tag, msg))
+ }
+ }
+
+ fun i(tag: String?, msg: String) {//测试环境输出日志
+ if (DEBUG) {
+ Log.i(TAG, getMsg(tag, msg))
+ }
+ }
+
+ fun e(tag: String?, msg: String) {
+ if (DEBUG) {
+ Log.e(TAG, getMsg(tag, msg))
+ }
+ }
+
+ fun w(tag: String?, msg: String) {//测试环境输出日志
+ if (DEBUG) {
+ Log.w(TAG, getMsg(tag, msg))
+ }
+ }
+
+ fun v(tag: String?, msg: String) {//测试环境输出日志
+ if (DEBUG) {
+ Log.v(TAG, getMsg(tag, msg))
+ }
+ }
+
+ private fun getMsg(tag: String?, msg: String): String{
+ val tagStr = if (TextUtils.isEmpty(tag)) generateTag() else generateTag() + ":$tag"
+ return "$msg:$tagStr"
+ }
+}
\ No newline at end of file