fix:修复delaysProcessLimitTimeMillis不生效问题

Author: buhuiming

.idea/sonarlint/issuestore/2/d/2d34a1dc03352dfbc252fdd675ac00e0254ae7ab

@@ -43,7 +43,7 @@ internal class JobManager private constructor() {
      * 取消一个请求
      */
     fun removeJob(key: String) { //中断监听 取消请求
-        if (jobMap.size > 0) {
+        if (jobMap.isNotEmpty()) {
             val job = jobMap[key]
             jobMap.remove(key)
             job?.cancel()

.idea/sonarlint/issuestore/6/5/65dbe50fb9abd4cf71b4f30ce47d4a3ab8c774cf

@@ -103,9 +103,7 @@ class RequestManager private constructor() {
         }
 
         private fun checkOptions() {
-            if (httpOptions == null) {
-                throw IllegalArgumentException("Please initialize HttpOptions")
-            }
+            requireNotNull(httpOptions) { "Please initialize HttpOptions" }
         }
 
         /**
@@ -114,6 +112,7 @@ class RequestManager private constructor() {
         private fun <T: Any, E: Any> enqueue(api: T, httpCall: suspend (T) -> E, callBack: CallBackImp<E>?): Job {
             httpOptions.callBack = callBack
             val job = CoroutineScope(Dispatchers.IO).launch {
+                httpOptions.currentRequestDateTamp = System.currentTimeMillis()
                 flow {
                     emit(httpCall(api))
                 }
@@ -149,7 +148,6 @@ class RequestManager private constructor() {
                         }
                         JobManager.get().removeJob(httpOptions.jobKey)
                     }
-                httpOptions.currentRequestDateTamp = System.currentTimeMillis()
             }
             JobManager.get().addJob(httpOptions.jobKey, job)
             return job
@@ -168,6 +166,7 @@ class RequestManager private constructor() {
         private fun <T: Any, E: Any> downloadEnqueue(api: T, httpCall: suspend (T) -> E, callBack: CallBackImp<E>?): Job {
             httpOptions.callBack = callBack
             val job = CoroutineScope(Dispatchers.IO).launch {
+                httpOptions.currentRequestDateTamp = System.currentTimeMillis()
                 flow {
                     emit(httpCall(api))
                 }
@@ -195,7 +194,6 @@ class RequestManager private constructor() {
                         }
                         JobManager.get().removeJob(httpOptions.jobKey)
                     }
-                httpOptions.currentRequestDateTamp = System.currentTimeMillis()
             }
             JobManager.get().addJob(httpOptions.jobKey, job)
             return job
@@ -242,25 +240,32 @@ class RequestManager private constructor() {
                 httpOptions.dialog?.dismissLoading(httpOptions.activity)
             }
             if (httpOptions.isDefaultToast) {
-                if (e is HttpException) {
-                    if (e.code() == 404) {
-                        Toast.makeText(httpOptions.activity, e.message, Toast.LENGTH_SHORT).show()
-                    } else if (e.code() == 504) {
-                        Toast.makeText(httpOptions.activity, "请检查网络连接！", Toast.LENGTH_SHORT).show()
-                    } else {
-                        Toast.makeText(httpOptions.activity, "请检查网络连接！", Toast.LENGTH_SHORT).show()
+                when (e) {
+                    is HttpException -> {
+                        when {
+                            e.code() == 404 -> {
+                                Toast.makeText(httpOptions.activity, e.message, Toast.LENGTH_SHORT).show()
+                            }
+                            e.code() == 504 -> {
+                                Toast.makeText(httpOptions.activity, "请检查网络连接！", Toast.LENGTH_SHORT).show()
+                            }
+                            else -> {
+                                Toast.makeText(httpOptions.activity, "请检查网络连接！", Toast.LENGTH_SHORT).show()
+                            }
+                        }
+                    }
+
+                    is IndexOutOfBoundsException, is NullPointerException, is JsonSyntaxException, is IllegalStateException, is ResultException -> {
+                        Toast.makeText(httpOptions.activity, "数据异常，解析失败！", Toast.LENGTH_SHORT).show()
+                    }
+
+                    is TimeoutException -> {
+                        Toast.makeText(httpOptions.activity, "连接超时，请重试！", Toast.LENGTH_SHORT).show()
+                    }
+
+                    else -> {
+                        Toast.makeText(httpOptions.activity, "请求失败，请稍后再试！", Toast.LENGTH_SHORT).show()
                     }
-                } else if (e is IndexOutOfBoundsException
-                    || e is NullPointerException
-                    || e is JsonSyntaxException
-                    || e is IllegalStateException
-                    || e is ResultException
-                ) {
-                    Toast.makeText(httpOptions.activity, "数据异常，解析失败！", Toast.LENGTH_SHORT).show()
-                } else if (e is TimeoutException) {
-                    Toast.makeText(httpOptions.activity, "连接超时，请重试！", Toast.LENGTH_SHORT).show()
-                } else {
-                    Toast.makeText(httpOptions.activity, "请求失败，请稍后再试！", Toast.LENGTH_SHORT).show()
                 }
             }
         }

.idea/sonarlint/issuestore/c/1/c1d965fc91199e038db1608072e69820db84b138

@@ -5,7 +5,6 @@ import com.bhm.network.adapter.LongDefaultAdapter
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
 
 /**
  * Created by bhm on 2023/5/6.

.idea/sonarlint/issuestore/f/1/f17ad8355da065c5629c7ad3940b349fb049b577

@@ -1,6 +1,5 @@
 package com.bhm.network.core.interceptor
 
-import android.util.Log
 import com.bhm.network.core.HttpOptions
 import com.bhm.network.define.CommonUtil.logger
 import okhttp3.logging.HttpLoggingInterceptor
@@ -31,24 +30,24 @@ class LoggingInterceptor {
                 if (message.startsWith("{") && message.endsWith("}")
                     || message.startsWith("[") && message.endsWith("]")
                 ) {
-                    Log.e(javaClass.name, replaceBlank(message).trimIndent())
+                    logger(builder, javaClass.name, replaceBlank(message).trimIndent())
                 }
                 mMessage.append(message.trimIndent())
                 // 响应结束，打印整条日志
                 if (message.startsWith("<-- END HTTP")) {
-                    Log.e(javaClass.name, mMessage.toString())
+                    logger(builder, javaClass.name, mMessage.toString())
                 }
             }
         }.setLevel(HttpLoggingInterceptor.Level.BODY)
     }
 
     /**
-     * 去除字符串中的空格、回车、换行符、制表符
+     * 去除字符串中的回车、换行符、制表符
      */
     private fun replaceBlank(str: String?): String {
         var dest = ""
         if (str != null) {
-            val p = Pattern.compile("\\s*|\t|\r|\n")
+            val p = Pattern.compile("\\s*|\r|\n")
             val m = p.matcher(str)
             dest = m.replaceAll("")
         }