fix：添加可以设置网络缓存的时间

Author: buhuiming

.idea/sonarlint/issuestore/0/9/09fc55d7b0e62b7c5cfc119d00304e17034b5a62

@@ -6,7 +6,7 @@ plugins {
 
 //ext.GROUP = "com.lute.network"
 //ext.POM_ARTIFACT_ID = "NetCore-Flow"
-//ext.VERSION_NAME = "1.6.4"
+//ext.VERSION_NAME = "1.6.5"
 ////引用gradle_upload.gradle
 //apply from: "${project.rootDir}/maven_upload.gradle"
 
@@ -19,7 +19,7 @@ afterEvaluate {
                 // 这里头是artifacts的配置信息，不填会采用默认的
                 groupId = 'com.github.buhuiming'
                 artifactId = 'NetCore-Flow'
-                version = '1.6.4'
+                version = '1.6.5'
 
                 from components.release
                 artifact androidSourcesJar //打包源码，去除这行打的包将看不到源码

.idea/sonarlint/issuestore/5/9/59ca5d84a1197004f62a9cb9f53a7df61157ac7a

@@ -38,6 +38,8 @@ class HttpConfig(builder: Builder) {
         internal var successCode: Int = OK_CODE
         internal var parseDataKey: Boolean = false
         internal var httpLogEvent: HttpLogEvent? = null
+        internal var cacheDuration: Long = 5L
+        internal var cacheDurationNoNet: Long = 60 * 60 * 24 * 3L
 
         /**
          * 设置请求loading页面
@@ -170,6 +172,16 @@ class HttpConfig(builder: Builder) {
             this.httpLogEvent = httpLogEvent
         }
 
+        /**
+         * 设置缓存时间
+         * @param cacheDuration 有网络时缓存时间，单位秒
+         * @param cacheDurationNoNet 没有网络时缓存时间，单位秒
+         */
+        fun setCacheDuration(cacheDuration: Long, cacheDurationNoNet: Long) = apply {
+            this.cacheDuration = cacheDuration
+            this.cacheDurationNoNet = cacheDurationNoNet
+        }
+
         fun build(): HttpConfig {
             return HttpConfig(this)
         }
@@ -250,6 +262,14 @@ class HttpConfig(builder: Builder) {
         var httpLogEvent: HttpLogEvent? = null
             private set
 
+        @JvmStatic
+        var cacheDuration: Long = 5L //缓存时间，单位秒，有网络时缓存时间，默认5秒
+            private set
+
+        @JvmStatic
+        var cacheDurationNoNet: Long = 60 * 60 * 24 * 3L //缓存时间，单位秒，没有网络时缓存时间，默认3天
+            private set
+
         @JvmStatic
         fun create() = Builder()
 
@@ -288,5 +308,7 @@ class HttpConfig(builder: Builder) {
         successCode = builder.successCode
         parseDataKey = builder.parseDataKey
         httpLogEvent = builder.httpLogEvent
+        cacheDuration = builder.cacheDuration
+        cacheDurationNoNet = builder.cacheDurationNoNet
     }
 }

.idea/sonarlint/issuestore/e/f/ef64fd164d2083a14e4ffe5a00abb31194c0a8ef

@@ -78,6 +78,10 @@ class HttpOptions(private val builder: Builder) {
         get() = builder.noProxy
     val httpLogEvent: HttpLogEvent?
         get() = builder.httpLogEvent
+    val cacheDuration: Long
+        get() = builder.cacheDuration
+    val cacheDurationNoNet: Long
+        get() = builder.cacheDurationNoNet
 
     class Builder(val activity: FragmentActivity) {
         internal var isShowDialog = HttpConfig.isShowDialog
@@ -105,6 +109,8 @@ class HttpOptions(private val builder: Builder) {
         internal var jobKey = System.currentTimeMillis().toString()
         internal var noProxy = true
         internal var httpLogEvent = HttpConfig.httpLogEvent
+        internal var cacheDuration: Long = HttpConfig.cacheDuration
+        internal var cacheDurationNoNet: Long = HttpConfig.cacheDurationNoNet
 
         init {
             activity.lifecycle.addObserver(object : DefaultLifecycleObserver {
@@ -261,6 +267,16 @@ class HttpOptions(private val builder: Builder) {
             this.httpLogEvent = httpLogEvent
         }
 
+        /**
+         * 设置缓存时间
+         * @param cacheDuration 有网络时缓存时间，单位秒
+         * @param cacheDurationNoNet 没有网络时缓存时间，单位秒
+         */
+        fun setCacheDuration(cacheDuration: Long, cacheDurationNoNet: Long) = apply {
+            this.cacheDuration = cacheDuration
+            this.cacheDurationNoNet = cacheDurationNoNet
+        }
+
         fun build(): HttpOptions {
             val options = HttpOptions(this)
             JobManager.get().setHttpOptions(options)

FlowHttp/build.gradle

@@ -24,7 +24,7 @@ class CacheInterceptor {
             var request = chain.request()
             if (isNetworkConnected(builder.activity)) {
                 // 有网络时, 缓存5s，根据实际情况设置
-                val maxAge = 5
+                val maxAge = builder.cacheDuration
                 request = request.newBuilder()
                     .removeHeader(USER_AGENT)
                     .removeHeader(ACCEPT_ENCODING)
@@ -40,7 +40,7 @@ class CacheInterceptor {
                     .build()
             } else {
                 // 无网络时，缓存为3天
-                val maxStale = 60 * 60 * 24 * 3
+                val maxStale = builder.cacheDurationNoNet
                 request = request.newBuilder()
                     .cacheControl(CacheControl.FORCE_CACHE)
                     .removeHeader(USER_AGENT)

FlowHttp/src/main/java/com/bhm/network/core/HttpConfig.kt

@@ -10,7 +10,7 @@
         }
 
         dependencies {
-            implementation 'com.github.buhuiming:NetCore-Flow:1.6.4'
+            implementation 'com.github.buhuiming:NetCore-Flow:1.6.5'
         }
 
 #### 1、Application配置默认的全局配置项（可选）