Move code into a module

wanghai · wanghai · commit 0e396b67eff7 · 2025-03-04T17:22:53.000+08:00
diff --git a/log/build.gradle b/log/build.gradle
@@ -41,6 +41,7 @@ dependencies {
     implementation("androidx.activity:activity-ktx:1.7.2")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
     implementation "androidx.recyclerview:recyclerview:1.3.0"
-    implementation project(":logger")
+
+    testImplementation "org.json:json:20230227"
 
 }
diff --git a/log/src/main/java/com/kit/log/LogKit.kt b/log/src/main/java/com/kit/log/LogKit.kt
@@ -4,11 +4,10 @@ import android.app.Activity
 import android.content.Context
 import com.kit.log.ui.LogActivity.Companion.startActivity
 import com.orhanobut.logger.AndroidLogAdapter
-import com.orhanobut.logger.CsvFormatStrategy
 import com.orhanobut.logger.DiskLogAdapter
 import com.orhanobut.logger.DiskLogWriteReadStrategy
+import com.orhanobut.logger.CsvFormatStrategy
 import com.orhanobut.logger.Logger
-import com.orhanobut.logger.Printer
 
 object LogKit {
 
@@ -33,7 +32,11 @@ object LogKit {
         val csvFormatStrategy = CsvFormatStrategy.newBuilder()
             .logStrategy(diskLogWriteReadStrategy)
             .build()
-        Logger.addLogAdapter(DiskLogAdapter(csvFormatStrategy))
+        Logger.addLogAdapter(
+            DiskLogAdapter(
+                csvFormatStrategy
+            )
+        )
     }
 
     fun showLogUi(activity: Activity) {
diff --git a/log/src/main/java/com/orhanobut/logger/AndroidLogAdapter.java b/log/src/main/java/com/orhanobut/logger/AndroidLogAdapter.java
@@ -1,9 +1,10 @@
 package com.orhanobut.logger;
 
+import static com.orhanobut.logger.Utils.checkNotNull;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import static com.orhanobut.logger.Utils.checkNotNull;
 
 /**
  * 针对 {@link LogAdapter} 的 Android 终端日志输出实现。
diff --git a/log/src/main/java/com/orhanobut/logger/CsvFormatStrategy.java b/log/src/main/java/com/orhanobut/logger/CsvFormatStrategy.java
@@ -1,5 +1,7 @@
 package com.orhanobut.logger;
 
+import static com.orhanobut.logger.Utils.checkNotNull;
+
 import android.os.Environment;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -12,7 +14,6 @@
 import java.util.Date;
 import java.util.Locale;
 
-import static com.orhanobut.logger.Utils.checkNotNull;
 
 /**
  * 用于 Android 的 CSV 格式日志记录。
diff --git a/log/src/main/java/com/orhanobut/logger/DiskLogAdapter.java b/log/src/main/java/com/orhanobut/logger/DiskLogAdapter.java
@@ -1,9 +1,10 @@
 package com.orhanobut.logger;
 
+import static com.orhanobut.logger.Utils.checkNotNull;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import static com.orhanobut.logger.Utils.checkNotNull;
 
 /**
  * 用于将日志消息保存到磁盘。
diff --git a/log/src/main/java/com/orhanobut/logger/DiskLogStrategy.java b/log/src/main/java/com/orhanobut/logger/DiskLogStrategy.java
@@ -1,5 +1,7 @@
 package com.orhanobut.logger;
 
+import static com.orhanobut.logger.Utils.checkNotNull;
+
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -10,7 +12,6 @@
 import java.io.FileWriter;
 import java.io.IOException;
 
-import static com.orhanobut.logger.Utils.checkNotNull;
 
 /**
  * 负责在 Android 中处理文件日志操作的后台线程。
diff --git a/log/src/main/java/com/orhanobut/logger/DiskLogWriteReadStrategy.java b/log/src/main/java/com/orhanobut/logger/DiskLogWriteReadStrategy.java
@@ -1,5 +1,6 @@
 package com.orhanobut.logger;
 
+
 import static com.orhanobut.logger.Utils.checkNotNull;
 
 import android.content.Context;
@@ -13,15 +14,12 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.function.Consumer;
 
 public class DiskLogWriteReadStrategy implements LogStrategy {
 
diff --git a/log/src/main/java/com/orhanobut/logger/FormatStrategy.java b/log/src/main/java/com/orhanobut/logger/FormatStrategy.java
diff --git a/log/src/main/java/com/orhanobut/logger/LogAdapter.java b/log/src/main/java/com/orhanobut/logger/LogAdapter.java
diff --git a/log/src/main/java/com/orhanobut/logger/LogStrategy.java b/log/src/main/java/com/orhanobut/logger/LogStrategy.java
diff --git a/log/src/main/java/com/orhanobut/logger/LogcatLogStrategy.java b/log/src/main/java/com/orhanobut/logger/LogcatLogStrategy.java
@@ -1,10 +1,11 @@
 package com.orhanobut.logger;
 
+import static com.orhanobut.logger.Utils.checkNotNull;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import android.util.Log;
 
-import static com.orhanobut.logger.Utils.checkNotNull;
 
 /**
  * LogCat 实现类，符合 {@link LogStrategy} 接口。
diff --git a/log/src/main/java/com/orhanobut/logger/Logger.java b/log/src/main/java/com/orhanobut/logger/Logger.java
@@ -1,9 +1,10 @@
 package com.orhanobut.logger;
 
+import static com.orhanobut.logger.Utils.checkNotNull;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import static com.orhanobut.logger.Utils.checkNotNull;
 
 
 /**
diff --git a/log/src/main/java/com/orhanobut/logger/LoggerPrinter.java b/log/src/main/java/com/orhanobut/logger/LoggerPrinter.java
@@ -1,5 +1,13 @@
 package com.orhanobut.logger;
 
+import static com.orhanobut.logger.Logger.ASSERT;
+import static com.orhanobut.logger.Logger.DEBUG;
+import static com.orhanobut.logger.Logger.ERROR;
+import static com.orhanobut.logger.Logger.INFO;
+import static com.orhanobut.logger.Logger.VERBOSE;
+import static com.orhanobut.logger.Logger.WARN;
+import static com.orhanobut.logger.Utils.checkNotNull;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -20,13 +28,7 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import static com.orhanobut.logger.Logger.ASSERT;
-import static com.orhanobut.logger.Logger.DEBUG;
-import static com.orhanobut.logger.Logger.ERROR;
-import static com.orhanobut.logger.Logger.INFO;
-import static com.orhanobut.logger.Logger.VERBOSE;
-import static com.orhanobut.logger.Logger.WARN;
-import static com.orhanobut.logger.Utils.checkNotNull;
+
 
 /**
  * `LoggerPrinter` 是 `Printer` 接口的具体实现，提供了一系列用于日志打印的功能，
diff --git a/log/src/main/java/com/orhanobut/logger/PrettyFormatStrategy.java b/log/src/main/java/com/orhanobut/logger/PrettyFormatStrategy.java
@@ -1,9 +1,10 @@
 package com.orhanobut.logger;
 
+import static com.orhanobut.logger.Utils.checkNotNull;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import static com.orhanobut.logger.Utils.checkNotNull;
 
 /**
  * Draws borders around the given log message along with additional information such as :
diff --git a/log/src/main/java/com/orhanobut/logger/Printer.java b/log/src/main/java/com/orhanobut/logger/Printer.java
diff --git a/log/src/main/java/com/orhanobut/logger/Utils.java b/log/src/main/java/com/orhanobut/logger/Utils.java
@@ -1,5 +1,6 @@
 package com.orhanobut.logger;
 
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
diff --git a/logger/build.gradle b/logger/build.gradle
diff --git a/logger/gradle.properties b/logger/gradle.properties
diff --git a/logger/src/main/AndroidManifest.xml b/logger/src/main/AndroidManifest.xml
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -26,4 +26,7 @@ android {
 
 dependencies {
     implementation project(":log")
+
+//    implementation 'com.github.e-hai.LogKit:log:v1.0.0'
+
 }
diff --git a/settings.gradle b/settings.gradle
@@ -15,5 +15,5 @@ dependencyResolutionManagement {
   }
 }
 rootProject.name = "LogKit"
-include ':logger', ':sample'
+include ':sample'
 include ':log'

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ dependencies {`
`41`	`41`	`implementation("androidx.activity:activity-ktx:1.7.2")`
`42`	`42`	`implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")`
`43`	`43`	`implementation "androidx.recyclerview:recyclerview:1.3.0"`
`44`		`- implementation project(":logger")`
	`44`	`+`
	`45`	`+ testImplementation "org.json:json:20230227"`
`45`	`46`
`46`	`47`	`}`