Skip to content

Commit c8be313

Browse files
committed
see 08/11 log
1 parent 5f43df5 commit c8be313

File tree

8 files changed

+146
-132
lines changed

8 files changed

+146
-132
lines changed

README-CN.md

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -314,24 +314,25 @@ clickBlankArea2HideSoftInput: 点击屏幕空白区域隐藏软键盘
314314

315315
* ### 日志相关→[LogUtils.java][log.java][Demo][log.demo]
316316
```
317-
Builder.setLogSwitch : 设置log总开关
318-
Builder.setConsoleSwitch : 设置log控制台开关
319-
Builder.setGlobalTag : 设置log全局tag
320-
Builder.setLogHeadSwitch : 设置log头部信息开关
321-
Builder.setLog2FileSwitch: 设置log文件开关
322-
Builder.setDir : 设置log文件存储目录
323-
Builder.setBorderSwitch : 设置log边框开关
324-
Builder.setConsoleFilter : 设置log控制台过滤器
325-
Builder.setFileFilter : 设置log文件过滤器
326-
v : Verbose日志
327-
d : Debug日志
328-
i : Info日志
329-
w : Warn日志
330-
e : Error日志
331-
a : Assert日志
332-
file : log到文件
333-
json : log字符串之json
334-
xml : log字符串之xml
317+
getConfig : 获取log配置
318+
Config.setLogSwitch : 设置log总开关
319+
Config.setConsoleSwitch : 设置log控制台开关
320+
Config.setGlobalTag : 设置log全局tag
321+
Config.setLogHeadSwitch : 设置log头部信息开关
322+
Config.setLog2FileSwitch: 设置log文件开关
323+
Config.setDir : 设置log文件存储目录
324+
Config.setBorderSwitch : 设置log边框开关
325+
Config.setConsoleFilter : 设置log控制台过滤器
326+
Config.setFileFilter : 设置log文件过滤器
327+
v : Verbose日志
328+
d : Debug日志
329+
i : Info日志
330+
w : Warn日志
331+
e : Error日志
332+
a : Assert日志
333+
file : log到文件
334+
json : log字符串之json
335+
xml : log字符串之xml
335336
```
336337

337338
* ### 网络相关→[NetworkUtils.java][network.java][Demo][network.demo]
@@ -615,7 +616,7 @@ getEntries : 获取压缩文件中的文件对象
615616

616617
Gradle:
617618
``` groovy
618-
compile 'com.blankj:utilcode:1.8.1'
619+
compile 'com.blankj:utilcode:1.8.2'
619620
```
620621

621622

@@ -638,7 +639,7 @@ Utils.init(context);
638639

639640
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
640641

641-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.8.1-brightgreen.svg
642+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.8.2-brightgreen.svg
642643
[auc]: https://github.com/Blankj/AndroidUtilCode
643644

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

README.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -314,15 +314,16 @@ clickBlankArea2HideSoftInput
314314

315315
* ### About Log→[LogUtils.java][log.java][Demo][log.demo]
316316
```
317-
Builder.setLogSwitch
318-
Builder.setConsoleSwitch
319-
Builder.setGlobalTag
320-
Builder.setLogHeadSwitch
321-
Builder.setLog2FileSwitch
322-
Builder.setDir
323-
Builder.setBorderSwitch
324-
Builder.setConsoleFilter
325-
Builder.setFileFilter
317+
getConfig
318+
Config.setLogSwitch
319+
Config.setConsoleSwitch
320+
Config.setGlobalTag
321+
Config.setLogHeadSwitch
322+
Config.setLog2FileSwitch
323+
Config.setDir
324+
Config.setBorderSwitch
325+
Config.setConsoleFilter
326+
Config.setFileFilter
326327
v
327328
d
328329
i
@@ -615,7 +616,7 @@ getEntries
615616

616617
Gradle:
617618
``` groovy
618-
compile 'com.blankj:utilcode:1.8.1'
619+
compile 'com.blankj:utilcode:1.8.2'
619620
```
620621

621622

@@ -638,7 +639,7 @@ Utils.init(context);
638639

639640
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
640641

641-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.8.1-brightgreen.svg
642+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.8.2-brightgreen.svg
642643
[auc]: https://github.com/Blankj/AndroidUtilCode
643644

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

app/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ android {
1010
applicationId "com.blankj.androidutilcode"
1111
minSdkVersion 14
1212
targetSdkVersion 25
13-
versionCode 100800100
14-
versionName "1.8.1"
13+
versionCode 100800200
14+
versionName "1.8.2"
1515
}
1616

1717
if (signPropertiesFile.exists()) {
@@ -64,7 +64,7 @@ dependencies {
6464

6565
def leakCanary = "com.squareup.leakcanary:leakcanary-android-no-op:$LEAKCANARY_VERSION"
6666

67-
compile project(':utilcode')
67+
// compile project(':utilcode')
6868
compile project(':subutil')
6969
compile "com.android.support:appcompat-v7:$SUPPORT_VERSION"
7070
compile "com.android.support:support-v4:$SUPPORT_VERSION"
@@ -76,6 +76,8 @@ dependencies {
7676
debugCompile "com.squareup.leakcanary:leakcanary-android:$LEAKCANARY_VERSION"
7777
releaseCompile leakCanary
7878
testCompile leakCanary
79+
80+
compile 'com.blankj:utilcode:1.8.2'
7981
}
8082

8183

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,26 @@ public class UtilsApp extends BaseApplication {
2222
@Override
2323
public void onCreate() {
2424
super.onCreate();
25+
com.blankj.utilcode.util.Utils.init(this);
26+
com.blankj.subutil.util.Utils.init(this);
27+
initLeakCanary();
28+
initLog();
29+
initCrash();
30+
initAssets();
31+
}
32+
33+
private void initLeakCanary() {
2534
// 内存泄露检查工具
2635
if (LeakCanary.isInAnalyzerProcess(this)) {
2736
// This process is dedicated to LeakCanary for heap analysis.
2837
// You should not init your app in this process.
2938
return;
3039
}
3140
LeakCanary.install(this);
32-
com.blankj.utilcode.util.Utils.init(this);
33-
com.blankj.subutil.util.Utils.init(this);
34-
initLog();
35-
initCrash();
36-
initAssets();
3741
}
3842

3943
public static void initLog() {
40-
LogUtils.Builder builder = new LogUtils.Builder()
44+
LogUtils.Config config = LogUtils.getConfig()
4145
.setLogSwitch(BuildConfig.DEBUG)// 设置log总开关,包括输出到控制台和文件,默认开
4246
.setConsoleSwitch(BuildConfig.DEBUG)// 设置是否输出到控制台开关,默认开
4347
.setGlobalTag(null)// 设置log全局标签,默认为空
@@ -49,17 +53,17 @@ public static void initLog() {
4953
.setBorderSwitch(true)// 输出日志是否带边框开关,默认开
5054
.setConsoleFilter(LogUtils.V)// log的控制台过滤器,和logcat过滤器同理,默认Verbose
5155
.setFileFilter(LogUtils.V);// log文件过滤器,和logcat过滤器同理,默认Verbose
52-
LogUtils.d(builder.toString());
56+
LogUtils.d(config.toString());
5357
}
5458

5559
private void initCrash() {
5660
CrashUtils.init();
5761
}
5862

5963
private void initAssets() {
60-
if (!FileUtils.isFileExists(Config.getTestApkPath())) {
64+
if (!FileUtils.isFileExists(com.blankj.androidutilcode.Config.getTestApkPath())) {
6165
try {
62-
FileIOUtils.writeFileFromIS(Config.getTestApkPath(), getAssets().open("test_install"), false);
66+
FileIOUtils.writeFileFromIS(com.blankj.androidutilcode.Config.getTestApkPath(), getAssets().open("test_install"), false);
6367
} catch (IOException e) {
6468
e.printStackTrace();
6569
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class LogActivity extends BaseBackActivity {
2828

2929
private TextView tvAboutLog;
3030

31-
private LogUtils.Builder mBuilder = new LogUtils.Builder();
31+
private LogUtils.Config mConfig = LogUtils.getConfig();
3232

3333
private String dir = "";
3434
private String globalTag = "";
@@ -244,7 +244,7 @@ private void updateAbout(int args) {
244244
fileFilter = fileFilter == LogUtils.V ? LogUtils.I : LogUtils.V;
245245
break;
246246
}
247-
mBuilder.setLogSwitch(log)
247+
mConfig.setLogSwitch(log)
248248
.setConsoleSwitch(console)
249249
.setGlobalTag(globalTag)
250250
.setLogHeadSwitch(head)
@@ -253,11 +253,11 @@ private void updateAbout(int args) {
253253
.setBorderSwitch(border)
254254
.setConsoleFilter(consoleFilter)
255255
.setFileFilter(fileFilter);
256-
tvAboutLog.setText(mBuilder.toString());
256+
tvAboutLog.setText(mConfig.toString());
257257
}
258258

259259
private String getDir() {
260-
return mBuilder.toString().split(System.getProperty("line.separator"))[5].substring(5);
260+
return mConfig.toString().split(System.getProperty("line.separator"))[5].substring(5);
261261
}
262262

263263
@Override

subutil/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ android {
2626

2727
defaultConfig {
2828
minSdkVersion 14
29-
versionCode 100800100
30-
versionName "1.8.1"
29+
versionCode 100800200
30+
versionName "1.8.2"
3131
}
3232

3333
buildTypes {

update_log.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* 17/08/11 LogUtils的Builder改为Config,发布版本1.8.2
12
* 17/08/10 优化FileUtils的deleteFilesInDir和listFilesInDir
23
* 17/08/08 新增反射工具类ReflectUtils
34
* 17/08/06 更改为按功能分包,增加subutil的Demo

0 commit comments

Comments
 (0)