Skip to content

Commit e0a80dd

Browse files
author
Blankj
committed
see 01/17 log
1 parent ff3d17a commit e0a80dd

3 files changed

Lines changed: 33 additions & 18 deletions

File tree

‎update_log.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* 16/01/16 LogUtils新增打印类名函数名及所在行
12
* 16/12/26 新增阴历相关工具类
23
* 16/12/21 SpannableStringUtils撒花完结
34
* 16/12/19 SpannableStringUtils完善中

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

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void create() {
108108
* @param msg 消息
109109
*/
110110
public static void v(Object msg) {
111-
v(tag, msg);
111+
log(tag, msg.toString(), null, 'i');
112112
}
113113

114114
/**
@@ -118,7 +118,7 @@ public static void v(Object msg) {
118118
* @param msg 消息
119119
*/
120120
public static void v(String tag, Object msg) {
121-
v(tag, msg, null);
121+
log(tag, msg.toString(), null, 'i');
122122
}
123123

124124
/**
@@ -138,7 +138,7 @@ public static void v(String tag, Object msg, Throwable tr) {
138138
* @param msg 消息
139139
*/
140140
public static void d(Object msg) {
141-
d(tag, msg);
141+
log(tag, msg.toString(), null, 'd');
142142
}
143143

144144
/**
@@ -148,7 +148,7 @@ public static void d(Object msg) {
148148
* @param msg 消息
149149
*/
150150
public static void d(String tag, Object msg) {// 调试信息
151-
d(tag, msg, null);
151+
log(tag, msg.toString(), null, 'd');
152152
}
153153

154154
/**
@@ -168,7 +168,7 @@ public static void d(String tag, Object msg, Throwable tr) {
168168
* @param msg 消息
169169
*/
170170
public static void i(Object msg) {
171-
i(tag, msg);
171+
log(tag, msg.toString(), null, 'i');
172172
}
173173

174174
/**
@@ -178,7 +178,7 @@ public static void i(Object msg) {
178178
* @param msg 消息
179179
*/
180180
public static void i(String tag, Object msg) {
181-
i(tag, msg, null);
181+
log(tag, msg.toString(), null, 'i');
182182
}
183183

184184
/**
@@ -198,7 +198,7 @@ public static void i(String tag, Object msg, Throwable tr) {
198198
* @param msg 消息
199199
*/
200200
public static void w(Object msg) {
201-
w(tag, msg);
201+
log(tag, msg.toString(), null, 'w');
202202
}
203203

204204
/**
@@ -208,7 +208,7 @@ public static void w(Object msg) {
208208
* @param msg 消息
209209
*/
210210
public static void w(String tag, Object msg) {
211-
w(tag, msg, null);
211+
log(tag, msg.toString(), null, 'w');
212212
}
213213

214214
/**
@@ -228,7 +228,7 @@ public static void w(String tag, Object msg, Throwable tr) {
228228
* @param msg 消息
229229
*/
230230
public static void e(Object msg) {
231-
e(tag, msg);
231+
log(tag, msg.toString(), null, 'e');
232232
}
233233

234234
/**
@@ -238,7 +238,7 @@ public static void e(Object msg) {
238238
* @param msg 消息
239239
*/
240240
public static void e(String tag, Object msg) {
241-
e(tag, msg, null);
241+
log(tag, msg.toString(), null, 'e');
242242
}
243243

244244
/**
@@ -263,16 +263,16 @@ public static void e(String tag, Object msg, Throwable tr) {
263263
private static void log(String tag, String msg, Throwable tr, char type) {
264264
if (logSwitch) {
265265
if ('e' == type && ('e' == logFilter || 'v' == logFilter)) {
266-
Log.e(tag, msg, tr);
266+
Log.e(generateTag(tag), msg, tr);
267267
} else if ('w' == type && ('w' == logFilter || 'v' == logFilter)) {
268-
Log.w(tag, msg, tr);
268+
Log.w(generateTag(tag), msg, tr);
269269
} else if ('d' == type && ('d' == logFilter || 'v' == logFilter)) {
270-
Log.d(tag, msg, tr);
270+
Log.d(generateTag(tag), msg, tr);
271271
} else if ('i' == type && ('d' == logFilter || 'v' == logFilter)) {
272-
Log.i(tag, msg, tr);
272+
Log.i(generateTag(tag), msg, tr);
273273
}
274274
if (log2FileSwitch) {
275-
log2File(type, tag, msg + '\n' + Log.getStackTraceString(tr));
275+
log2File(type, generateTag(tag), msg + '\n' + Log.getStackTraceString(tr));
276276
}
277277
}
278278
}
@@ -307,4 +307,18 @@ public void run() {
307307
}
308308
}).start();
309309
}
310+
311+
/**
312+
* 产生tag
313+
*
314+
* @return tag
315+
*/
316+
private static String generateTag(String tag) {
317+
StackTraceElement[] stacks = Thread.currentThread().getStackTrace();
318+
StackTraceElement caller = stacks[4];
319+
String format = "Tag[" + tag + "] %s[%s, %d]";
320+
String callerClazzName = caller.getClassName();
321+
callerClazzName = callerClazzName.substring(callerClazzName.lastIndexOf(".") + 1);
322+
return String.format(format, callerClazzName, caller.getMethodName(), caller.getLineNumber());
323+
}
310324
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ public class LogUtilsTest {
2121

2222
@Before
2323
public void setUp() throws Exception {
24-
if (Utils.getContext() == null) TestUtils.init();
24+
TestUtils.init();
2525
ShadowLog.stream = System.out;
2626
LogUtils.getBuilder().
2727
setLogSwitch(true).
2828
setLog2FileSwitch(false).
2929
setTag("Blankj").
30-
setLogFilter('e').
30+
setLogFilter('v').
3131
create();
3232
}
3333

3434
@Test
3535
public void v() throws Exception {
36-
LogUtils.v("Verbose");
36+
LogUtils.v("My Tag","Verbose");
3737
}
3838

3939
@Test

0 commit comments

Comments
 (0)