see 04/02 log

Author: Blankj

app/build.gradle

@@ -48,15 +48,15 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-//    implementation project(':utilcode')
+    implementation project(':utilcode')
     implementation project(':subutil')
     implementation "com.android.support:appcompat-v7:$support_version"
     implementation "com.android.support:design:$support_version"
     implementation 'com.r0adkll:slidableactivity:2.0.5'
     // LeakCanary
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"
-    implementation 'com.blankj:utilcode:1.13.6'
+//    implementation 'com.blankj:utilcode:1.13.6'
 }
 
 

app/src/main/java/com/blankj/androidutilcode/UtilsApp.java

@@ -64,7 +64,7 @@ public void initLog() {
                 .setBorderSwitch(true)// 输出日志是否带边框开关，默认开
                 .setConsoleFilter(LogUtils.V)// log 的控制台过滤器，和 logcat 过滤器同理，默认 Verbose
                 .setFileFilter(LogUtils.V)// log 文件过滤器，和 logcat 过滤器同理，默认 Verbose
-                .setStackDeep(1);// log 栈深度，默认为 1
+                .setStackDeep(10);// log 栈深度，默认为 1
         new Thread(new Runnable() {
             @Override
             public void run() {

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Feb 27 13:02:08 CST 2017
+#Sat Mar 31 15:05:28 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

utilcode/src/main/java/com/blankj/utilcode/util/LogUtils.java

@@ -224,31 +224,17 @@ private static TagHead processTagAndHead(String tag) {
         } else {
             final StackTraceElement[] stackTrace = new Throwable().getStackTrace();
             StackTraceElement targetElement = stackTrace[3];
-            String fileName = targetElement.getFileName();
-            String className;
-            // If name of file is null, should add
-            // "-keepattributes SourceFile,LineNumberTable" in proguard file.
-            if (fileName == null) {
-                className = targetElement.getClassName();
-                String[] classNameInfo = className.split("\\.");
-                if (classNameInfo.length > 0) {
-                    className = classNameInfo[classNameInfo.length - 1];
-                }
-                int index = className.indexOf('$');
-                if (index != -1) {
-                    className = className.substring(0, index);
-                }
-                fileName = className + ".java";
-            } else {
+            final String fileName = getFileName(targetElement);
+            if (sTagIsSpace && isSpace(tag)) {
                 int index = fileName.indexOf('.');// Use proguard may not find '.'.
-                className = index == -1 ? fileName : fileName.substring(0, index);
+                tag = index == -1 ? fileName : fileName.substring(0, index);
             }
-            if (sTagIsSpace) tag = isSpace(tag) ? className : tag;
             if (sLogHeadSwitch) {
                 String tName = Thread.currentThread().getName();
                 final String head = new Formatter()
-                        .format("%s, %s(%s:%d)",
+                        .format("%s, %s.%s(%s:%d)",
                                 tName,
+                                targetElement.getClassName(),
                                 targetElement.getMethodName(),
                                 fileName,
                                 targetElement.getLineNumber())
@@ -265,10 +251,11 @@ private static TagHead processTagAndHead(String tag) {
                     for (int i = 1, len = consoleHead.length; i < len; ++i) {
                         targetElement = stackTrace[i + 3];
                         consoleHead[i] = new Formatter()
-                                .format("%s%s(%s:%d)",
+                                .format("%s%s.%s(%s:%d)",
                                         space,
+                                        targetElement.getClassName(),
                                         targetElement.getMethodName(),
-                                        targetElement.getFileName(),
+                                        getFileName(targetElement),
                                         targetElement.getLineNumber())
                                 .toString();
                     }
@@ -279,6 +266,23 @@ private static TagHead processTagAndHead(String tag) {
         return new TagHead(tag, null, ": ");
     }
 
+    private static String getFileName(final StackTraceElement targetElement) {
+        String fileName = targetElement.getFileName();
+        if (fileName != null) return fileName;
+        // If name of file is null, should add
+        // "-keepattributes SourceFile,LineNumberTable" in proguard file.
+        String className = targetElement.getClassName();
+        String[] classNameInfo = className.split("\\.");
+        if (classNameInfo.length > 0) {
+            className = classNameInfo[classNameInfo.length - 1];
+        }
+        int index = className.indexOf('$');
+        if (index != -1) {
+            className = className.substring(0, index);
+        }
+        return className + ".java";
+    }
+
     private static String processBody(final int type, final Object... contents) {
         String body = NULL;
         if (contents != null) {