Skip to content

Commit 60b00b6

Browse files
BlankjBlankj
committed
feat: see 10/27 log
1 parent cb23f4e commit 60b00b6

File tree

9 files changed

+58
-41
lines changed

9 files changed

+58
-41
lines changed

‎README-CN.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ getComments : 获取压缩文件中的注释链表
612612

613613
Gradle:
614614
``` groovy
615-
compile 'com.blankj:utilcode:1.9.5'
615+
compile 'com.blankj:utilcode:1.9.6'
616616
```
617617

618618

@@ -635,7 +635,7 @@ Utils.init(application);
635635

636636
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
637637

638-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.5-brightgreen.svg
638+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.6-brightgreen.svg
639639
[auc]: https://github.com/Blankj/AndroidUtilCode
640640

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

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ getComments
612612

613613
Gradle:
614614
``` groovy
615-
compile 'com.blankj:utilcode:1.9.5'
615+
compile 'com.blankj:utilcode:1.9.6'
616616
```
617617

618618

@@ -635,7 +635,7 @@ Utils.init(application);
635635

636636
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
637637

638-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.5-brightgreen.svg
638+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.6-brightgreen.svg
639639
[auc]: https://github.com/Blankj/AndroidUtilCode
640640

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

‎app/src/main/res/drawable/ic_menu_blog.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
android:viewportWidth="508.52">
77

88
<path
9-
android:fillColor="@color/light_black"
9+
android:fillColor="#191919"
1010
android:pathData="M254.26,0C113.845,0,0,113.845,0,254.26s113.845,254.26,254.26,254.26
1111
s254.26-113.845,254.26-254.26C508.52,113.813,394.675,0,254.26,0z
1212
M412.727,310.451c0,56.509-45.989,102.308-102.943,102.308
1313
H198.831c-56.891,0-103.102-45.735-103.102-102.308V198.132c0.032-56.541,46.18-102.371,103.102-102.371h51.964
1414
c56.954,0,102.53,42.525,102.53,99.066c0.731,10.584,10.298,19.8,21.167,19.8h17.766c11.378,0,20.5,11.95,20.5,23.233
1515
L412.727,310.451L412.727,310.451z" />
1616
<path
17-
android:fillColor="@color/light_black"
17+
android:fillColor="#191919"
1818
android:pathData="M313.693,293.893H194.827c-10.901,0-19.8,8.899-19.8,19.801c0,10.87,8.931,19.8,19.8,19.8
1919
h118.866c10.901,0,19.8-8.931,19.8-19.8C333.494,302.792,324.594,293.893,313.693,293.893z" />
2020
<path
21-
android:fillColor="@color/light_black"
21+
android:fillColor="#191919"
2222
android:pathData="M194.827,214.627h59.433c10.901,0,19.8-8.931,19.8-19.8c0-10.901-8.931-19.8-19.8-19.8h-59.433
2323
c-10.901,0-19.8,8.931-19.8,19.8C174.994,205.728,183.925,214.627,194.827,214.627z" />
2424
</vector>

‎app/src/main/res/drawable/ic_menu_github.xml‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,31 @@
22
<vector xmlns:android="http://schemas.android.com/apk/res/android"
33
android:width="24dp"
44
android:height="24dp"
5-
android:viewportHeight="16"
6-
android:viewportWidth="16">
5+
android:viewportHeight="438.549"
6+
android:viewportWidth="438.549">
77

8-
<path
9-
android:fillColor="@color/light_black"
10-
android:pathData="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59 .4 .07 .55 -.17 .55 -.38
11-
0-.19-.01-.82-.01-1.49-2.01 .37
12-
-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53 .63 -.01
13-
1.08 .58 1.23 .82 .72 1.21 1.87 .87 2.33 .66 .07-.52 .28 -.87 .51
14-
-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87 .31 -1.59 .82 -2.15-.08-.2-.36-1.02 .08
15-
-2.12 0 0 .67-.21 2.2 .82 .64-.18 1.32-.27 2-.27 .68 0 1.36 .09 2 .27 1.53-1.04
16-
2.2-.82 2.2-.82 .44 1.1 .16 1.92 .08 2.12 .51 .56 .82 1.27 .82 2.15 0 3.07-1.87
17-
3.75-3.65 3.95 .29 .25 .54 .73 .54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21 .15 .46
18-
.55 .38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z" />
19-
</vector>
8+
<group>
9+
<path
10+
android:fillColor="#191919"
11+
android:pathData="M409.132,114.573c-19.608-33.596-46.205-60.194-79.798-79.8C295.736,15.166,259.057,5.365,219.271,5.365
12+
c-39.781,0-76.472,9.804-110.063,29.408c-33.596,19.605-60.192,46.204-79.8,79.8C9.803,148.168,0,184.854,0,224.63
13+
c0,47.78,13.94,90.745,41.827,128.906c27.884,38.164,63.906,64.572,108.063,79.227c5.14,0.954,8.945,0.283,11.419-1.996
14+
c2.475-2.282,3.711-5.14,3.711-8.562c0-0.571-0.049-5.708-0.144-15.417c-0.098-9.709-0.144-18.179-0.144-25.406l-6.567,1.136
15+
c-4.187,0.767-9.469,1.092-15.846,1c-6.374-0.089-12.991-0.757-19.842-1.999c-6.854-1.231-13.229-4.086-19.13-8.559
16+
c-5.898-4.473-10.085-10.328-12.56-17.556l-2.855-6.57c-1.903-4.374-4.899-9.233-8.992-14.559
17+
c-4.093-5.331-8.232-8.945-12.419-10.848l-1.999-1.431c-1.332-0.951-2.568-2.098-3.711-3.429c-1.142-1.331-1.997-2.663-2.568-3.997
18+
c-0.572-1.335-0.098-2.43,1.427-3.289c1.525-0.859,4.281-1.276,8.28-1.276l5.708,0.853c3.807,0.763,8.516,3.042,14.133,6.851
19+
c5.614,3.806,10.229,8.754,13.846,14.842c4.38,7.806,9.657,13.754,15.846,17.847c6.184,4.093,12.419,6.136,18.699,6.136
20+
c6.28,0,11.704-0.476,16.274-1.423c4.565-0.952,8.848-2.383,12.847-4.285c1.713-12.758,6.377-22.559,13.988-29.41
21+
c-10.848-1.14-20.601-2.857-29.264-5.14c-8.658-2.286-17.605-5.996-26.835-11.14c-9.235-5.137-16.896-11.516-22.985-19.126
22+
c-6.09-7.614-11.088-17.61-14.987-29.979c-3.901-12.374-5.852-26.648-5.852-42.826c0-23.035,7.52-42.637,22.557-58.817
23+
c-7.044-17.318-6.379-36.732,1.997-58.24c5.52-1.715,13.706-0.428,24.554,3.853c10.85,4.283,18.794,7.952,23.84,10.994
24+
c5.046,3.041,9.089,5.618,12.135,7.708c17.705-4.947,35.976-7.421,54.818-7.421s37.117,2.474,54.823,7.421l10.849-6.849
25+
c7.419-4.57,16.18-8.758,26.262-12.565c10.088-3.805,17.802-4.853,23.134-3.138c8.562,21.509,9.325,40.922,2.279,58.24
26+
c15.036,16.18,22.559,35.787,22.559,58.817c0,16.178-1.958,30.497-5.853,42.966c-3.9,12.471-8.941,22.457-15.125,29.979
27+
c-6.191,7.521-13.901,13.85-23.131,18.986c-9.232,5.14-18.182,8.85-26.84,11.136c-8.662,2.286-18.415,4.004-29.263,5.146
28+
c9.894,8.562,14.842,22.077,14.842,40.539v60.237c0,3.422,1.19,6.279,3.572,8.562c2.379,2.279,6.136,2.95,11.276,1.995
29+
c44.163-14.653,80.185-41.062,108.068-79.226c27.88-38.161,41.825-81.126,41.825-128.906
30+
C438.536,184.851,428.728,148.168,409.132,114.573z" />
31+
</group>
32+
</vector>

‎build.gradle‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
buildscript {
33
repositories {
44
jcenter()
5+
google()
56
}
67
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.3.3'
8+
classpath 'com.android.tools.build:gradle:3.0.0'
89
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
9-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
10+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
1011
// NOTE: Do not place your application dependencies here; they belong
1112
// in the individual module build.gradle files
1213
}
@@ -15,6 +16,7 @@ buildscript {
1516
allprojects {
1617
repositories {
1718
jcenter()
19+
google()
1820
}
1921
}
2022

@@ -24,16 +26,16 @@ task clean(type: Delete) {
2426

2527
ext {
2628
// Sdk and tools
27-
compileSdkVersion = 25
28-
buildToolsVersion = '25.0.2'
29+
compileSdkVersion = 26
30+
buildToolsVersion = '26.0.2'
2931
minSdkVersion = 14
3032
targetSdkVersion = 22
3133

32-
versionCode = 100900500
33-
versionName = '1.9.5'
34+
versionCode = 100900600
35+
versionName = '1.9.6'
3436

3537
// App dependencies
36-
supportVersion = '25.3.1'
38+
supportVersion = '26.0.2'
3739

3840
junitVersion = '4.12'
3941
robolectricVersion = '3.1.2'

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

‎update_log.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* 17/10/27 修复LogUtils在kotlin中使用的问题
12
* 17/10/25 修复LogUtils边框，修复getBitmap从流获取
23
* 17/09/30 完善FragmentUtils，发布1.9.2
34
* 17/09/29 完善FragmentUtils和isInstallApp

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.graphics.Color;
77
import android.os.Build;
88
import android.support.annotation.ColorInt;
9+
import android.support.annotation.ColorRes;
910
import android.support.annotation.IntRange;
1011
import android.support.annotation.NonNull;
1112
import android.support.v4.widget.DrawerLayout;

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,48 +100,48 @@ public static void v(final Object contents) {
100100
log(V, sGlobalTag, contents);
101101
}
102102

103-
public static void v(final String tag, final Object... contents) {
104-
log(V, tag, contents);
103+
public static void v(final String tag, final Object content, final Object... contents) {
104+
log(V, tag, content, contents);
105105
}
106106

107107
public static void d(final Object contents) {
108108
log(D, sGlobalTag, contents);
109109
}
110110

111-
public static void d(final String tag, final Object... contents) {
112-
log(D, tag, contents);
111+
public static void d(final String tag, final Object content, final Object... contents) {
112+
log(D, tag, content, contents);
113113
}
114114

115115
public static void i(final Object contents) {
116116
log(I, sGlobalTag, contents);
117117
}
118118

119-
public static void i(final String tag, final Object... contents) {
120-
log(I, tag, contents);
119+
public static void i(final String tag, final Object content, final Object... contents) {
120+
log(I, tag, content, contents);
121121
}
122122

123123
public static void w(final Object contents) {
124124
log(W, sGlobalTag, contents);
125125
}
126126

127-
public static void w(final String tag, final Object... contents) {
128-
log(W, tag, contents);
127+
public static void w(final String tag, final Object content, final Object... contents) {
128+
log(W, tag, content, contents);
129129
}
130130

131131
public static void e(final Object contents) {
132132
log(E, sGlobalTag, contents);
133133
}
134134

135-
public static void e(final String tag, final Object... contents) {
136-
log(E, tag, contents);
135+
public static void e(final String tag, final Object content, final Object... contents) {
136+
log(E, tag, content, contents);
137137
}
138138

139139
public static void a(final Object contents) {
140140
log(A, sGlobalTag, contents);
141141
}
142142

143-
public static void a(final String tag, final Object... contents) {
144-
log(A, tag, contents);
143+
public static void a(final String tag, final Object content, final Object... contents) {
144+
log(A, tag, content, contents);
145145
}
146146

147147
public static void file(final Object contents) {

0 commit comments

Comments
 (0)