see 04/03 log

Blankj · Blankj · commit 87a39a645683 · 2018-04-03T18:13:37.000+08:00
diff --git a/README-CN.md b/README-CN.md
@@ -41,7 +41,7 @@
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.13.6-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.13.7-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
@@ -41,7 +41,7 @@ If this ptoject helps you a lot, and you would like to support this ptoject's fu
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.13.6-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.13.7-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg
diff --git a/app/build.gradle b/app/build.gradle
@@ -56,7 +56,7 @@ dependencies {
     // LeakCanary
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"
-//    implementation 'com.blankj:utilcode:1.13.6'
+//    implementation 'com.blankj:utilcode:1.13.7'
 }
 
 
diff --git a/app/src/main/java/com/blankj/androidutilcode/UtilsApp.java b/app/src/main/java/com/blankj/androidutilcode/UtilsApp.java
@@ -62,9 +62,10 @@ public void initLog() {
                 .setDir("")// 当自定义路径为空时，写入应用的/cache/log/目录中
                 .setFilePrefix("")// 当文件前缀为空时，默认为"util"，即写入文件为"util-MM-dd.txt"
                 .setBorderSwitch(true)// 输出日志是否带边框开关，默认开
+                .setSingleTagSwitch(true)// 一条日志仅输出一条，默认开，为美化 AS 3.1 的 Logcat
                 .setConsoleFilter(LogUtils.V)// log 的控制台过滤器，和 logcat 过滤器同理，默认 Verbose
                 .setFileFilter(LogUtils.V)// log 文件过滤器，和 logcat 过滤器同理，默认 Verbose
-                .setStackDeep(10);// log 栈深度，默认为 1
+                .setStackDeep(1);// log 栈深度，默认为 1
         new Thread(new Runnable() {
             @Override
             public void run() {
diff --git a/app/src/main/java/com/blankj/androidutilcode/feature/core/log/LogActivity.java b/app/src/main/java/com/blankj/androidutilcode/feature/core/log/LogActivity.java
@@ -36,6 +36,7 @@ public class LogActivity extends BaseBackActivity {
     private boolean head          = true;
     private boolean file          = false;
     private boolean border        = true;
+    private boolean single        = true;
     private int     consoleFilter = LogUtils.V;
     private int     fileFilter    = LogUtils.V;
 
@@ -46,8 +47,9 @@ public class LogActivity extends BaseBackActivity {
     private static final int UPDATE_FILE           = 0x01 << 4;
     private static final int UPDATE_DIR            = 0x01 << 5;
     private static final int UPDATE_BORDER         = 0x01 << 6;
-    private static final int UPDATE_CONSOLE_FILTER = 0x01 << 7;
-    private static final int UPDATE_FILE_FILTER    = 0x01 << 8;
+    private static final int UPDATE_SINGLE         = 0x01 << 7;
+    private static final int UPDATE_CONSOLE_FILTER = 0x01 << 8;
+    private static final int UPDATE_FILE_FILTER    = 0x01 << 9;
 
     private Runnable mRunnable = new Runnable() {
         @Override
@@ -98,6 +100,7 @@ public void initView(Bundle savedInstanceState, View view) {
         findViewById(R.id.btn_toggle_tag).setOnClickListener(this);
         findViewById(R.id.btn_toggle_head).setOnClickListener(this);
         findViewById(R.id.btn_toggle_border).setOnClickListener(this);
+        findViewById(R.id.btn_toggle_single).setOnClickListener(this);
         findViewById(R.id.btn_toggle_file).setOnClickListener(this);
         findViewById(R.id.btn_toggle_dir).setOnClickListener(this);
         findViewById(R.id.btn_toggle_conole_filter).setOnClickListener(this);
@@ -143,6 +146,9 @@ public void onWidgetClick(View view) {
             case R.id.btn_toggle_border:
                 updateConfig(UPDATE_BORDER);
                 break;
+            case R.id.btn_toggle_single:
+                updateConfig(UPDATE_SINGLE);
+                break;
             case R.id.btn_toggle_conole_filter:
                 updateConfig(UPDATE_CONSOLE_FILTER);
                 break;
@@ -242,6 +248,9 @@ private void updateConfig(int args) {
             case UPDATE_BORDER:
                 border = !border;
                 break;
+            case UPDATE_SINGLE:
+                single = !single;
+                break;
             case UPDATE_CONSOLE_FILTER:
                 consoleFilter = consoleFilter == LogUtils.V ? LogUtils.W : LogUtils.V;
                 break;
@@ -256,6 +265,7 @@ private void updateConfig(int args) {
                 .setLog2FileSwitch(file)
                 .setDir(dir)
                 .setBorderSwitch(border)
+                .setSingleTagSwitch(single)
                 .setConsoleFilter(consoleFilter)
                 .setFileFilter(fileFilter);
         tvAboutLog.setText(mConfig.toString());
diff --git a/app/src/main/res_core/layout/activity_log.xml b/app/src/main/res_core/layout/activity_log.xml
@@ -62,6 +62,13 @@
         android:layout_height="wrap_content"
         android:text="@string/log_toggle_border" />
 
+    <Button
+        android:id="@+id/btn_toggle_single"
+        style="@style/WideBtnStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/log_toggle_single" />
+
     <Button
         android:id="@+id/btn_toggle_conole_filter"
         style="@style/WideBtnStyle"
diff --git a/app/src/main/res_core/values/strings.xml b/app/src/main/res_core/values/strings.xml
@@ -176,6 +176,7 @@
     <string name="log_toggle_tag">Toggle Tag</string>
     <string name="log_toggle_head">Toggle Head</string>
     <string name="log_toggle_border">Toggle Border</string>
+    <string name="log_toggle_single">Toggle Single</string>
     <string name="log_toggle_console_filter">Toggle Console Filter</string>
     <string name="log_toggle_file_filter">Toggle File Filter</string>
     <string name="log_toggle_file">Toggle File</string>
diff --git a/build.gradle b/build.gradle
@@ -33,8 +33,8 @@ ext {
     min_sdk_version = 14
     target_sdk_version = 27
 
-    version_code = 1_013_006
-    version_name = '1.13.6'// E.g 1.9.72 => 1,009,072
+    version_code = 1_013_007
+    version_name = '1.13.7'// E.g 1.9.72 => 1,009,072
 
     // App dependencies
     support_version = '27.0.2'
diff --git a/update_log.md b/update_log.md
@@ -1,3 +1,4 @@
+* 18/04/03 修复 LogUtils 在 Android Studio 3.1 版本日志丑陋的问题，发布 1.13.7 版本
 * 18/03/29 兼容 Utils 的初始化传入 application，发布 1.13.6 版本
 * 18/03/20 修复 PermissionUtils 子进程的问题，发布 1.13.5 版本
 * 18/03/16 新增 gradle 插件来格式化 README
diff --git a/utilcode/README-CN.md b/utilcode/README-CN.md
@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-compile 'com.blankj:utilcode:1.13.6'
+compile 'com.blankj:utilcode:1.13.7'
 ```
 
 
diff --git a/utilcode/README.md b/utilcode/README.md
@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-compile 'com.blankj:utilcode:1.13.6'
+compile 'com.blankj:utilcode:1.13.7'
 ```
 
 
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/LogUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/LogUtils.java
@@ -77,12 +77,13 @@ public final class LogUtils {
     private static final String TOP_BORDER     = TOP_CORNER + SIDE_DIVIDER + SIDE_DIVIDER;
     private static final String MIDDLE_BORDER  = MIDDLE_CORNER + MIDDLE_DIVIDER + MIDDLE_DIVIDER;
     private static final String BOTTOM_BORDER  = BOTTOM_CORNER + SIDE_DIVIDER + SIDE_DIVIDER;
-    private static final int    MAX_LEN        = 4000;
+    private static final int    MAX_LEN        = 3000;
     @SuppressLint("SimpleDateFormat")
     private static final Format FORMAT         = new SimpleDateFormat("MM-dd HH:mm:ss.SSS ");
     private static final String NOTHING        = "log nothing";
     private static final String NULL           = "null";
     private static final String ARGS           = "args";
+    private static final String PLACEHOLDER    = " ";
     private static final Config CONFIG         = new Config();
 
     private static ExecutorService sExecutor;
@@ -96,10 +97,12 @@ public final class LogUtils {
     private static boolean sLogHeadSwitch     = true;  // The head's switch of log.
     private static boolean sLog2FileSwitch    = false; // The file's switch of log.
     private static boolean sLogBorderSwitch   = true;  // The border's switch of log.
+    private static boolean sSingleTagSwitch   = true;  // The single tag of log.
     private static int     sConsoleFilter     = V;     // The console's filter of log.
     private static int     sFileFilter        = V;     // The file's filter of log.
     private static int     sStackDeep         = 1;     // The stack's deep of log.
 
+
     private LogUtils() {
         throw new UnsupportedOperationException("u can't instantiate me...");
     }
@@ -344,31 +347,32 @@ private static void print2Console(final int type,
                                       final String tag,
                                       final String[] head,
                                       final String msg) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(" ").append(LINE_SEP);
-        if (sLogBorderSwitch) {
-            sb.append(TOP_BORDER).append(LINE_SEP);
-            for (String aHead : head) {
-                sb.append(LEFT_BORDER).append(aHead).append(LINE_SEP);
-            }
-            sb.append(MIDDLE_BORDER).append(LINE_SEP);
-            for (String line : msg.split(LINE_SEP)) {
-                sb.append(LEFT_BORDER).append(line).append(LINE_SEP);
+        if (sSingleTagSwitch) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(PLACEHOLDER).append(LINE_SEP);
+            if (sLogBorderSwitch) {
+                sb.append(TOP_BORDER).append(LINE_SEP);
+                for (String aHead : head) {
+                    sb.append(LEFT_BORDER).append(aHead).append(LINE_SEP);
+                }
+                sb.append(MIDDLE_BORDER).append(LINE_SEP);
+                for (String line : msg.split(LINE_SEP)) {
+                    sb.append(LEFT_BORDER).append(line).append(LINE_SEP);
+                }
+                sb.append(BOTTOM_BORDER);
+            } else {
+                for (String aHead : head) {
+                    sb.append(aHead).append(LINE_SEP);
+                }
+                sb.append(msg);
             }
-            sb.append(BOTTOM_BORDER);
+            printMsgSingleTag(type, tag, sb.toString());
         } else {
-            for (String aHead : head) {
-                sb.append(aHead).append(LINE_SEP);
-            }
-            sb.append(msg);
+            printBorder(type, tag, true);
+            printHead(type, tag, head);
+            printMsg(type, tag, msg);
+            printBorder(type, tag, false);
         }
-
-        printMsg1(type, tag, sb.toString());
-//
-//        printBorder(type, tag, true);
-//        printHead(type, tag, head);
-//        printMsg(type, tag, msg);
-//        printBorder(type, tag, false);
     }
 
     private static void printBorder(final int type, final String tag, boolean isTop) {
@@ -403,17 +407,32 @@ private static void printMsg(final int type, final String tag, final String msg)
         }
     }
 
-    private static void printMsg1(final int type, final String tag, final String msg) {
+    private static void printMsgSingleTag(final int type, final String tag, final String msg) {
         int len = msg.length();
         int countOfSub = len / MAX_LEN;
         if (countOfSub > 0) {
-            int index = 0;
-            for (int i = 0; i < countOfSub; i++) {
-                Log.println(type, tag, msg.substring(index, index + MAX_LEN));
-                index += MAX_LEN;
-            }
-            if (index != len) {
-                Log.println(type, tag, msg.substring(index, len));
+            if (sLogBorderSwitch) {
+                Log.println(type, tag, msg.substring(0, MAX_LEN) + LINE_SEP + BOTTOM_BORDER);
+                int index = MAX_LEN;
+                for (int i = 1; i < countOfSub; i++) {
+                    Log.println(type, tag, PLACEHOLDER + LINE_SEP + TOP_BORDER + LINE_SEP
+                            + LEFT_BORDER + msg.substring(index, index + MAX_LEN)
+                            + LINE_SEP + BOTTOM_BORDER);
+                    index += MAX_LEN;
+                }
+                if (index != len) {
+                    Log.println(type, tag, PLACEHOLDER + LINE_SEP + TOP_BORDER + LINE_SEP
+                            + LEFT_BORDER + msg.substring(index, len));
+                }
+            } else {
+                int index = 0;
+                for (int i = 0; i < countOfSub; i++) {
+                    Log.println(type, tag, msg.substring(index, index + MAX_LEN));
+                    index += MAX_LEN;
+                }
+                if (index != len) {
+                    Log.println(type, tag, msg.substring(index, len));
+                }
             }
         } else {
             Log.println(type, tag, msg);
@@ -629,6 +648,11 @@ public Config setBorderSwitch(final boolean borderSwitch) {
             return this;
         }
 
+        public Config setSingleTagSwitch(final boolean singleTagSwitch) {
+            sSingleTagSwitch = singleTagSwitch;
+            return this;
+        }
+
         public Config setConsoleFilter(@TYPE final int consoleFilter) {
             sConsoleFilter = consoleFilter;
             return this;
@@ -654,6 +678,7 @@ public String toString() {
                     + LINE_SEP + "dir: " + (sDir == null ? sDefaultDir : sDir)
                     + LINE_SEP + "filePrefix: " + sFilePrefix
                     + LINE_SEP + "border: " + sLogBorderSwitch
+                    + LINE_SEP + "singleTag: " + sSingleTagSwitch
                     + LINE_SEP + "consoleFilter: " + T[sConsoleFilter - V]
                     + LINE_SEP + "fileFilter: " + T[sFileFilter - V]
                     + LINE_SEP + "stackDeep: " + sStackDeep;

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ dependencies {`
`56`	`56`	`// LeakCanary`
`57`	`57`	`debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"`
`58`	`58`	`releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"`
`59`		`-// implementation 'com.blankj:utilcode:1.13.6'`
	`59`	`+// implementation 'com.blankj:utilcode:1.13.7'`
`60`	`60`	`}`
`61`	`61`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+* 18/04/03 修复 LogUtils 在 Android Studio 3.1 版本日志丑陋的问题，发布 1.13.7 版本`
`1`	`2`	`* 18/03/29 兼容 Utils 的初始化传入 application，发布 1.13.6 版本`
`2`	`3`	`* 18/03/20 修复 PermissionUtils 子进程的问题，发布 1.13.5 版本`
`3`	`4`	`* 18/03/16 新增 gradle 插件来格式化 README`