Skip to content

Commit 32012cd

Browse files
BlankjBlankj
committed
see 11/06 log
1 parent 359f376 commit 32012cd

File tree

11 files changed

+71
-72
lines changed

11 files changed

+71
-72
lines changed

‎README-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.6-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.7-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ If this ptoject helps you a lot, and you would like to support this ptoject's fu
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.6-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.7-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

‎app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ dependencies {
7070
releaseImplementation leakCanary
7171
testImplementation leakCanary
7272

73-
// compile 'com.blankj:utilcode:1.9.3'
73+
// compile 'com.blankj:utilcode:1.9.7'
7474
}
7575

7676

‎app/src/main/java/com/blankj/androidutilcode/core/log/LogActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void run() {
5656
LogUtils.d("debug");
5757
LogUtils.i("info");
5858
LogUtils.w("warn");
59-
LogUtils.e("初始化成功");
59+
LogUtils.e("error");
6060
LogUtils.a("assert");
6161
}
6262
};

‎build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ ext {
3030
minSdkVersion = 14
3131
targetSdkVersion = 22
3232

33-
versionCode = 100900600
34-
versionName = '1.9.6'
33+
versionCode = 100900700
34+
versionName = '1.9.7'
3535

3636
// App dependencies
3737
supportVersion = '26.1.0'

‎update_log.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* 17/11/06 修复LogUtils多参数打印失败的问题
12
* 17/11/01 完善ShellUtil的Msg换行，感谢香脆的大鸡排
23
* 17/10/30 升级README
34
* 17/10/29 修复6.0内部存储安装失败问题

‎utilcode/README-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gradle:
44
``` groovy
5-
compile 'com.blankj:utilcode:1.9.6'
5+
compile 'com.blankj:utilcode:1.9.7'
66
```
77

88

‎utilcode/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gradle:
44
``` groovy
5-
compile 'com.blankj:utilcode:1.9.6'
5+
compile 'com.blankj:utilcode:1.9.7'
66
```
77

88

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

Lines changed: 58 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ public final class LogUtils {
8383
private static final String BOTTOM_BORDER = "╚═══════════════════════════════════════════════════════════════════════════════════════════════════";
8484
private static final int MAX_LEN = 4000;
8585
private static final Format FORMAT = new SimpleDateFormat("MM-dd HH:mm:ss.SSS ", Locale.getDefault());
86-
private static final String NULL_TIPS = "Log with null object.";
8786
private static final String NULL = "null";
8887
private static final String ARGS = "args";
8988
private static final Config CONFIG = new Config();
@@ -96,100 +95,100 @@ public static Config getConfig() {
9695
return CONFIG;
9796
}
9897

99-
public static void v(final Object contents) {
100-
log(V, sGlobalTag, contents);
98+
public static void v(final Object content) {
99+
log(V, sGlobalTag, content);
101100
}
102101

103102
public static void v(final String tag, final Object content, final Object... contents) {
104103
log(V, tag, content, contents);
105104
}
106105

107-
public static void d(final Object contents) {
108-
log(D, sGlobalTag, contents);
106+
public static void d(final Object content) {
107+
log(D, sGlobalTag, content);
109108
}
110109

111110
public static void d(final String tag, final Object content, final Object... contents) {
112111
log(D, tag, content, contents);
113112
}
114113

115-
public static void i(final Object contents) {
116-
log(I, sGlobalTag, contents);
114+
public static void i(final Object content) {
115+
log(I, sGlobalTag, content);
117116
}
118117

119118
public static void i(final String tag, final Object content, final Object... contents) {
120119
log(I, tag, content, contents);
121120
}
122121

123-
public static void w(final Object contents) {
124-
log(W, sGlobalTag, contents);
122+
public static void w(final Object content) {
123+
log(W, sGlobalTag, content);
125124
}
126125

127126
public static void w(final String tag, final Object content, final Object... contents) {
128127
log(W, tag, content, contents);
129128
}
130129

131-
public static void e(final Object contents) {
132-
log(E, sGlobalTag, contents);
130+
public static void e(final Object content) {
131+
log(E, sGlobalTag, content);
133132
}
134133

135134
public static void e(final String tag, final Object content, final Object... contents) {
136135
log(E, tag, content, contents);
137136
}
138137

139-
public static void a(final Object contents) {
140-
log(A, sGlobalTag, contents);
138+
public static void a(final Object content) {
139+
log(A, sGlobalTag, content);
141140
}
142141

143142
public static void a(final String tag, final Object content, final Object... contents) {
144143
log(A, tag, content, contents);
145144
}
146145

147-
public static void file(final Object contents) {
148-
log(FILE | D, sGlobalTag, contents);
146+
public static void file(final Object content) {
147+
log(FILE | D, sGlobalTag, content);
149148
}
150149

151-
public static void file(@TYPE final int type, final Object contents) {
152-
log(FILE | type, sGlobalTag, contents);
150+
public static void file(@TYPE final int type, final Object content) {
151+
log(FILE | type, sGlobalTag, content);
153152
}
154153

155-
public static void file(final String tag, final Object contents) {
156-
log(FILE | D, tag, contents);
154+
public static void file(final String tag, final Object content) {
155+
log(FILE | D, tag, content);
157156
}
158157

159-
public static void file(@TYPE final int type, final String tag, final Object contents) {
160-
log(FILE | type, tag, contents);
158+
public static void file(@TYPE final int type, final String tag, final Object content) {
159+
log(FILE | type, tag, content);
161160
}
162161

163-
public static void json(final String contents) {
164-
log(JSON | D, sGlobalTag, contents);
162+
public static void json(final String content) {
163+
log(JSON | D, sGlobalTag, content);
165164
}
166165

167-
public static void json(@TYPE final int type, final String contents) {
168-
log(JSON | type, sGlobalTag, contents);
166+
public static void json(@TYPE final int type, final String content) {
167+
log(JSON | type, sGlobalTag, content);
169168
}
170169

171-
public static void json(final String tag, final String contents) {
172-
log(JSON | D, tag, contents);
170+
public static void json(final String tag, final String content) {
171+
log(JSON | D, tag, content);
173172
}
174173

175-
public static void json(@TYPE final int type, final String tag, final String contents) {
176-
log(JSON | type, tag, contents);
174+
public static void json(@TYPE final int type, final String tag, final String content) {
175+
log(JSON | type, tag, content);
177176
}
178177

179-
public static void xml(final String contents) {
180-
log(XML | D, sGlobalTag, contents);
178+
public static void xml(final String content) {
179+
log(XML | D, sGlobalTag, content);
181180
}
182181

183-
public static void xml(@TYPE final int type, final String contents) {
184-
log(XML | type, sGlobalTag, contents);
182+
public static void xml(@TYPE final int type, final String content) {
183+
log(XML | type, sGlobalTag, content);
185184
}
186185

187-
public static void xml(final String tag, final String contents) {
188-
log(XML | D, tag, contents);
186+
public static void xml(final String tag, final String content) {
187+
log(XML | D, tag, content);
189188
}
190189

191-
public static void xml(@TYPE final int type, final String tag, final String contents) {
192-
log(XML | type, tag, contents);
190+
public static void xml(@TYPE final int type, final String tag, final String content) {
191+
log(XML | type, tag, content);
193192
}
194193

195194
private static void log(final int type, final String tag, final Object... contents) {
@@ -265,30 +264,26 @@ private static TagHead processTagAndHead(String tag) {
265264
}
266265

267266
private static String processBody(final int type, final Object... contents) {
268-
String body = NULL_TIPS;
269-
if (contents != null) {
270-
if (contents.length == 1) {
271-
Object object = contents[0];
272-
body = object == null ? NULL : object.toString();
273-
if (type == JSON) {
274-
body = formatJson(body);
275-
} else if (type == XML) {
276-
body = formatXml(body);
277-
}
267+
String body;
268+
if (contents.length == 1) {
269+
body = contents[0] == null ? NULL : contents[0].toString();
270+
if (type == JSON) {
271+
body = formatJson(body);
272+
} else if (type == XML) {
273+
body = formatXml(body);
274+
}
275+
} else {
276+
StringBuilder sb = new StringBuilder();
277+
int i = 0;
278+
sb.append(generateArgLine(i++, contents[0] == null ? NULL : contents[0].toString()));
279+
if (contents[1] == null) {
280+
sb.append(generateArgLine(i, NULL));
278281
} else {
279-
StringBuilder sb = new StringBuilder();
280-
for (int i = 0, len = contents.length; i < len; ++i) {
281-
Object content = contents[i];
282-
sb.append(ARGS)
283-
.append("[")
284-
.append(i)
285-
.append("]")
286-
.append(" = ")
287-
.append(content == null ? NULL : content.toString())
288-
.append(LINE_SEP);
282+
for (Object content : (Object[]) contents[1]) {
283+
sb.append(generateArgLine(i++, content == null ? NULL : content.toString()));
289284
}
290-
body = sb.toString();
291285
}
286+
body = sb.toString();
292287
}
293288
return body;
294289
}
@@ -321,7 +316,11 @@ private static String formatXml(String xml) {
321316
return xml;
322317
}
323318

324-
private static void print2Console(final int type, final String tag, final String[] head, String msg) {
319+
private static String generateArgLine(int index, String content) {
320+
return ARGS + "[" + index + "]" + " = " + content + LINE_SEP;
321+
}
322+
323+
private static void print2Console(final int type, final String tag, final String[] head, final String msg) {
325324
printBorder(type, tag, true);
326325
printHead(type, tag, head);
327326
printMsg(type, tag, msg);

‎utilcode/src/test/java/com/blankj/utilcode/util/TestUtils.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,5 +123,4 @@ public void formatCN(File file) throws Exception {
123123
public void test() throws Exception {
124124

125125
}
126-
127126
}

‎utilcode/src/test/java/com/blankj/utilcode/util/TimeUtilsTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ public void getTimeSpanByNow() throws Exception {
122122
@Test
123123
public void getFitTimeSpanByNow() throws Exception {
124124
long spanMillis = 6 * TimeConstants.DAY + 6 * TimeConstants.HOUR + 6 * TimeConstants.MIN + 6 * TimeConstants.SEC;
125-
assertEquals("6天6小时6分钟6秒", TimeUtils.getFitTimeSpanByNow(TimeUtils.millis2String(System.currentTimeMillis() + spanMillis), 5));
126-
assertEquals("6天6小时6分钟6秒", TimeUtils.getFitTimeSpanByNow(TimeUtils.millis2String(System.currentTimeMillis() + spanMillis, mFormat), mFormat, 5));
127-
assertEquals("6天6小时6分钟6秒", TimeUtils.getFitTimeSpanByNow(TimeUtils.millis2Date(System.currentTimeMillis() + spanMillis), 5));
128-
assertEquals("6天6小时6分钟6秒", TimeUtils.getFitTimeSpanByNow(System.currentTimeMillis() + spanMillis, 5));
125+
assertEquals("6天6小时6分钟6秒", TimeUtils.getFitTimeSpanByNow(TimeUtils.millis2String(System.currentTimeMillis() + spanMillis), 4));
126+
assertEquals("6天6小时6分钟6秒", TimeUtils.getFitTimeSpanByNow(TimeUtils.millis2String(System.currentTimeMillis() + spanMillis, mFormat), mFormat, 4));
127+
assertEquals("6天6小时6分钟6秒", TimeUtils.getFitTimeSpanByNow(TimeUtils.millis2Date(System.currentTimeMillis() + spanMillis), 4));
128+
assertEquals("6天6小时6分钟6秒", TimeUtils.getFitTimeSpanByNow(System.currentTimeMillis() + spanMillis, 4));
129129
}
130130

131131
@Test

0 commit comments

Comments
 (0)