see 01/17 log

Author: Blankj

update_log.md

@@ -1,3 +1,4 @@
+* 16/01/16 LogUtils新增打印类名函数名及所在行
 * 16/12/26 新增阴历相关工具类
 * 16/12/21 SpannableStringUtils撒花完结
 * 16/12/19 SpannableStringUtils完善中

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

@@ -108,7 +108,7 @@ public void create() {
      * @param msg 消息
      */
     public static void v(Object msg) {
-        v(tag, msg);
+        log(tag, msg.toString(), null, 'i');
     }
 
     /**
@@ -118,7 +118,7 @@ public static void v(Object msg) {
      * @param msg 消息
      */
     public static void v(String tag, Object msg) {
-        v(tag, msg, null);
+        log(tag, msg.toString(), null, 'i');
     }
 
     /**
@@ -138,7 +138,7 @@ public static void v(String tag, Object msg, Throwable tr) {
      * @param msg 消息
      */
     public static void d(Object msg) {
-        d(tag, msg);
+        log(tag, msg.toString(), null, 'd');
     }
 
     /**
@@ -148,7 +148,7 @@ public static void d(Object msg) {
      * @param msg 消息
      */
     public static void d(String tag, Object msg) {// 调试信息
-        d(tag, msg, null);
+        log(tag, msg.toString(), null, 'd');
     }
 
     /**
@@ -168,7 +168,7 @@ public static void d(String tag, Object msg, Throwable tr) {
      * @param msg 消息
      */
     public static void i(Object msg) {
-        i(tag, msg);
+        log(tag, msg.toString(), null, 'i');
     }
 
     /**
@@ -178,7 +178,7 @@ public static void i(Object msg) {
      * @param msg 消息
      */
     public static void i(String tag, Object msg) {
-        i(tag, msg, null);
+        log(tag, msg.toString(), null, 'i');
     }
 
     /**
@@ -198,7 +198,7 @@ public static void i(String tag, Object msg, Throwable tr) {
      * @param msg 消息
      */
     public static void w(Object msg) {
-        w(tag, msg);
+        log(tag, msg.toString(), null, 'w');
     }
 
     /**
@@ -208,7 +208,7 @@ public static void w(Object msg) {
      * @param msg 消息
      */
     public static void w(String tag, Object msg) {
-        w(tag, msg, null);
+        log(tag, msg.toString(), null, 'w');
     }
 
     /**
@@ -228,7 +228,7 @@ public static void w(String tag, Object msg, Throwable tr) {
      * @param msg 消息
      */
     public static void e(Object msg) {
-        e(tag, msg);
+        log(tag, msg.toString(), null, 'e');
     }
 
     /**
@@ -238,7 +238,7 @@ public static void e(Object msg) {
      * @param msg 消息
      */
     public static void e(String tag, Object msg) {
-        e(tag, msg, null);
+        log(tag, msg.toString(), null, 'e');
     }
 
     /**
@@ -263,16 +263,16 @@ public static void e(String tag, Object msg, Throwable tr) {
     private static void log(String tag, String msg, Throwable tr, char type) {
         if (logSwitch) {
             if ('e' == type && ('e' == logFilter || 'v' == logFilter)) {
-                Log.e(tag, msg, tr);
+                Log.e(generateTag(tag), msg, tr);
             } else if ('w' == type && ('w' == logFilter || 'v' == logFilter)) {
-                Log.w(tag, msg, tr);
+                Log.w(generateTag(tag), msg, tr);
             } else if ('d' == type && ('d' == logFilter || 'v' == logFilter)) {
-                Log.d(tag, msg, tr);
+                Log.d(generateTag(tag), msg, tr);
             } else if ('i' == type && ('d' == logFilter || 'v' == logFilter)) {
-                Log.i(tag, msg, tr);
+                Log.i(generateTag(tag), msg, tr);
             }
             if (log2FileSwitch) {
-                log2File(type, tag, msg + '\n' + Log.getStackTraceString(tr));
+                log2File(type, generateTag(tag), msg + '\n' + Log.getStackTraceString(tr));
             }
         }
     }
@@ -307,4 +307,18 @@ public void run() {
             }
         }).start();
     }
+
+    /**
+     * 产生tag
+     *
+     * @return tag
+     */
+    private static String generateTag(String tag) {
+        StackTraceElement[] stacks = Thread.currentThread().getStackTrace();
+        StackTraceElement caller = stacks[4];
+        String format = "Tag[" + tag + "] %s[%s, %d]";
+        String callerClazzName = caller.getClassName();
+        callerClazzName = callerClazzName.substring(callerClazzName.lastIndexOf(".") + 1);
+        return String.format(format, callerClazzName, caller.getMethodName(), caller.getLineNumber());
+    }
 }

utilcode/src/test/java/com/blankj/utilcode/utils/LogUtilsTest.java

@@ -21,19 +21,19 @@ public class LogUtilsTest {
 
     @Before
     public void setUp() throws Exception {
-        if (Utils.getContext() == null) TestUtils.init();
+        TestUtils.init();
         ShadowLog.stream = System.out;
         LogUtils.getBuilder().
                 setLogSwitch(true).
                 setLog2FileSwitch(false).
                 setTag("Blankj").
-                setLogFilter('e').
+                setLogFilter('v').
                 create();
     }
 
     @Test
     public void v() throws Exception {
-        LogUtils.v("Verbose");
+        LogUtils.v("My Tag","Verbose");
     }
 
     @Test