简化日志记录器函数

kalle/src/main/java/com/yanzhenjie/kalle/KalleConfig.java

@@ -221,7 +221,7 @@ public final class KalleConfig {
          * 是否开启日志记录器
          */
         public Builder setLogRecord(boolean enabled) {
-            LogRecorder.INSTANCE.setEnabled(enabled);
+            LogRecorder.setEnabled(enabled);
             return this;
         }
 

kalle/src/main/java/com/yanzhenjie/kalle/Request.java

@@ -39,7 +39,7 @@ public abstract class Request {
     private final Object mTag;
     private final Object uid;
     private String location;
-    private String logId = LogRecorder.INSTANCE.generateId();
+    private String logId = LogRecorder.generateId();
     private String log;
     private long timeMillis = System.currentTimeMillis();
 

kalle/src/main/java/com/yanzhenjie/kalle/recorder/LogRecorder.kt

@@ -16,6 +16,7 @@ import java.util.concurrent.atomic.AtomicLong
  */
 object LogRecorder {
 
+    @JvmStatic
     var enabled = false
 
     private val handler by lazy {
@@ -39,6 +40,7 @@ object LogRecorder {
     /**
      * 产生一个唯一的基于时间戳Id
      */
+    @JvmStatic
     @Synchronized
     fun generateId(): String {
         if (!enabled) return ""
@@ -60,6 +62,7 @@ object LogRecorder {
      * @param headers 请求头
      * @param body 请求体
      */
+    @JvmStatic
     fun recordRequest(
         id: String,
         url: String,
@@ -93,6 +96,7 @@ object LogRecorder {
      * @param headers 响应头
      * @param body 响应体
      */
+    @JvmStatic
     fun recordResponse(
         id: String,
         requestMillis: Long,
@@ -124,6 +128,7 @@ object LogRecorder {
      * @param requestMillis 请求时间毫秒值
      * @param errorMessage 错误信息, 如果存在\n换行符, 仅接受最后一行
      */
+    @JvmStatic
     fun recordException(
         id: String,
         requestMillis: Long,

kalle/src/main/java/com/yanzhenjie/kalle/simple/BasicWorker.java

@@ -60,7 +60,7 @@ abstract class BasicWorker<T extends SimpleRequest, S> implements Callable<S>, C
         tryAttachCache();
         try {
             Request request = mRequest.request();
-            LogRecorder.INSTANCE.recordRequest(request.logId(), request.location(), request.method().toString(), request.headers().toMap(), request.getLog());
+            LogRecorder.recordRequest(request.logId(), request.location(), request.method().toString(), request.headers().toMap(), request.getLog());
 
             response = requestNetwork(mRequest);
 
@@ -96,7 +96,7 @@ abstract class BasicWorker<T extends SimpleRequest, S> implements Callable<S>, C
                 errorMsg = response.getLog();
                 code = response.code();
             }
-            LogRecorder.INSTANCE.recordException(request.logId(), request.getTimeMillis(), code, e.getLocalizedMessage(), errorMsg);
+            LogRecorder.recordException(request.logId(), request.getTimeMillis(), code, e.getLocalizedMessage(), errorMsg);
             throw e;
         } finally {
             IOUtils.closeQuietly(response);
@@ -319,7 +319,7 @@ abstract class BasicWorker<T extends SimpleRequest, S> implements Callable<S>, C
         Request request = mRequest.request();
         try {
             S result = mConverter.convert(mSucceed, request, response, cache);
-            LogRecorder.INSTANCE.recordResponse(request.logId(), request.getTimeMillis(), response.code(), response.headers().toMap(), response.getLog());
+            LogRecorder.recordResponse(request.logId(), request.getTimeMillis(), response.code(), response.headers().toMap(), response.getLog());
             return result;
         } catch (NetException e) {
             throw e;