From 60b00b6170a3e0826f885b5b980a630b2baa5adb Mon Sep 17 00:00:00 2001
From: Blankj <625783482@qq.com>
Date: Fri, 27 Oct 2017 23:20:55 +0800
Subject: [PATCH] feat: see 10/27 log
---
README-CN.md | 4 +-
README.md | 4 +-
app/src/main/res/drawable/ic_menu_blog.xml | 6 +--
app/src/main/res/drawable/ic_menu_github.xml | 41 ++++++++++++-------
build.gradle | 16 ++++----
gradle/wrapper/gradle-wrapper.properties | 2 +-
update_log.md | 1 +
.../com/blankj/utilcode/util/BarUtils.java | 1 +
.../com/blankj/utilcode/util/LogUtils.java | 24 +++++------
9 files changed, 58 insertions(+), 41 deletions(-)
diff --git a/README-CN.md b/README-CN.md
index c8eed210..0a07cb30 100644
--- a/README-CN.md
+++ b/README-CN.md
@@ -612,7 +612,7 @@ getComments : 获取压缩文件中的注释链表
Gradle:
``` groovy
-compile 'com.blankj:utilcode:1.9.5'
+compile 'com.blankj:utilcode:1.9.6'
```
@@ -635,7 +635,7 @@ Utils.init(application);
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
-[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.5-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.6-brightgreen.svg
[auc]: https://github.com/Blankj/AndroidUtilCode
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg
diff --git a/README.md b/README.md
index 356e2073..683faef7 100644
--- a/README.md
+++ b/README.md
@@ -612,7 +612,7 @@ getComments
Gradle:
``` groovy
-compile 'com.blankj:utilcode:1.9.5'
+compile 'com.blankj:utilcode:1.9.6'
```
@@ -635,7 +635,7 @@ Utils.init(application);
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
-[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.5-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.6-brightgreen.svg
[auc]: https://github.com/Blankj/AndroidUtilCode
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg
diff --git a/app/src/main/res/drawable/ic_menu_blog.xml b/app/src/main/res/drawable/ic_menu_blog.xml
index dd3bdd4c..c55ddd27 100644
--- a/app/src/main/res/drawable/ic_menu_blog.xml
+++ b/app/src/main/res/drawable/ic_menu_blog.xml
@@ -6,7 +6,7 @@
android:viewportWidth="508.52">
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_menu_github.xml b/app/src/main/res/drawable/ic_menu_github.xml
index b9ec90d5..b97a0e51 100644
--- a/app/src/main/res/drawable/ic_menu_github.xml
+++ b/app/src/main/res/drawable/ic_menu_github.xml
@@ -2,18 +2,31 @@
+ android:viewportHeight="438.549"
+ android:viewportWidth="438.549">
-
-
\ No newline at end of file
+
+
+
+
diff --git a/build.gradle b/build.gradle
index bd6dbda7..844b998b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,11 +2,12 @@
buildscript {
repositories {
jcenter()
+ google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
+ classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
- classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
+ classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
@@ -15,6 +16,7 @@ buildscript {
allprojects {
repositories {
jcenter()
+ google()
}
}
@@ -24,16 +26,16 @@ task clean(type: Delete) {
ext {
// Sdk and tools
- compileSdkVersion = 25
- buildToolsVersion = '25.0.2'
+ compileSdkVersion = 26
+ buildToolsVersion = '26.0.2'
minSdkVersion = 14
targetSdkVersion = 22
- versionCode = 100900500
- versionName = '1.9.5'
+ versionCode = 100900600
+ versionName = '1.9.6'
// App dependencies
- supportVersion = '25.3.1'
+ supportVersion = '26.0.2'
junitVersion = '4.12'
robolectricVersion = '3.1.2'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 11c6623c..e8c84be0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/update_log.md b/update_log.md
index 84adab46..d9d448f2 100644
--- a/update_log.md
+++ b/update_log.md
@@ -1,3 +1,4 @@
+* 17/10/27 修复LogUtils在kotlin中使用的问题
* 17/10/25 修复LogUtils边框，修复getBitmap从流获取
* 17/09/30 完善FragmentUtils，发布1.9.2
* 17/09/29 完善FragmentUtils和isInstallApp
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java
index 76971a05..1217c6ad 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java
@@ -6,6 +6,7 @@ import android.content.res.Resources;
import android.graphics.Color;
import android.os.Build;
import android.support.annotation.ColorInt;
+import android.support.annotation.ColorRes;
import android.support.annotation.IntRange;
import android.support.annotation.NonNull;
import android.support.v4.widget.DrawerLayout;
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/LogUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/LogUtils.java
index a65e79f1..2b3dd394 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/util/LogUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/util/LogUtils.java
@@ -100,48 +100,48 @@ public final class LogUtils {
log(V, sGlobalTag, contents);
}
- public static void v(final String tag, final Object... contents) {
- log(V, tag, contents);
+ public static void v(final String tag, final Object content, final Object... contents) {
+ log(V, tag, content, contents);
}
public static void d(final Object contents) {
log(D, sGlobalTag, contents);
}
- public static void d(final String tag, final Object... contents) {
- log(D, tag, contents);
+ public static void d(final String tag, final Object content, final Object... contents) {
+ log(D, tag, content, contents);
}
public static void i(final Object contents) {
log(I, sGlobalTag, contents);
}
- public static void i(final String tag, final Object... contents) {
- log(I, tag, contents);
+ public static void i(final String tag, final Object content, final Object... contents) {
+ log(I, tag, content, contents);
}
public static void w(final Object contents) {
log(W, sGlobalTag, contents);
}
- public static void w(final String tag, final Object... contents) {
- log(W, tag, contents);
+ public static void w(final String tag, final Object content, final Object... contents) {
+ log(W, tag, content, contents);
}
public static void e(final Object contents) {
log(E, sGlobalTag, contents);
}
- public static void e(final String tag, final Object... contents) {
- log(E, tag, contents);
+ public static void e(final String tag, final Object content, final Object... contents) {
+ log(E, tag, content, contents);
}
public static void a(final Object contents) {
log(A, sGlobalTag, contents);
}
- public static void a(final String tag, final Object... contents) {
- log(A, tag, contents);
+ public static void a(final String tag, final Object content, final Object... contents) {
+ log(A, tag, content, contents);
}
public static void file(final Object contents) {
--
GitLab