feature: 增加网络连接可控制允许重定向的功能

Author: kylelyk12

android/JDCache/gradle.properties

@@ -16,5 +16,5 @@
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 groupId=com.jingdong.wireless.jdsdk
 artifactId=jdhybrid-cache
-version=1.0.0-beta-1
+version=1.0.0-beta-2
 

android/JDCache/src/main/java/com/jd/jdcache/service/base/JDCacheFileRepoDelegate.kt

@@ -118,7 +118,8 @@ open class FileRequestOption(
     var method: String = METHOD_GET,
     val header: MutableMap<String?, String>? = null,
     val userAgent: String? = null,
-    val cookie: String? = null
+    val cookie: String? = null,
+    val allowRedirect: Boolean = true
 )
 
 @Keep
@@ -127,11 +128,12 @@ open class FileSaveOption(
     header: MutableMap<String?, String>? = null,
     userAgent: String? = null,
     cookie: String? = null,
+    allowRedirect: Boolean = true,
     val needUnzip: Boolean = false,
     val unzipDir: String? = null,
     val split: Boolean = false,
     val mergeWithFile: String? = null
-) : FileRequestOption(method, header, userAgent, cookie)
+) : FileRequestOption(method, header, userAgent, cookie, allowRedirect)
 
 @Keep
 sealed class FileState {

android/JDCache/src/main/java/com/jd/jdcache/service/base/JDCacheNetDelegate.kt

@@ -88,7 +88,8 @@ abstract class JDCacheNetDelegate : AbstractDelegate() {
         method: String = METHOD_GET,
         header: MutableMap<String?, String>? = null,
         userAgent: String? = null,
-        cookie: String? = null
+        cookie: String? = null,
+        followRedirect: Boolean = true
     ): Flow<NetState<File>>?
 
     /**
@@ -100,10 +101,11 @@ abstract class JDCacheNetDelegate : AbstractDelegate() {
         method: String = METHOD_GET,
         header: MutableMap<String?, String>? = null,
         userAgent: String? = null,
-        cookie: String? = null
+        cookie: String? = null,
+        followRedirect: Boolean = true
     ): NetState<File>? {
         return try {
-            downloadFlow(url, savePath, method, header, userAgent, cookie)?.toList()?.last()
+            downloadFlow(url, savePath, method, header, userAgent, cookie, followRedirect)?.toList()?.last()
         } catch (e: Exception) {
             log { e(name, e) }
             null

android/JDCache/src/main/java/com/jd/jdcache/service/impl/FileRepo.kt

@@ -34,7 +34,8 @@ open class FileRepo : JDCacheFileRepoDelegate() {
             option?.method ?: METHOD_GET,
             option?.header,
             option?.userAgent,
-            option?.cookie
+            option?.cookie,
+            followRedirect = option?.allowRedirect?:true
         )?.map { netState ->
             when(netState) {
                 is NetState.Complete -> {
@@ -71,7 +72,8 @@ open class FileRepo : JDCacheFileRepoDelegate() {
             option?.method ?: METHOD_GET,
             option?.header,
             option?.userAgent,
-            option?.cookie
+            option?.cookie,
+            followRedirect = option?.allowRedirect?:true
         )?.map { netState ->
             when (netState) {
                 is NetState.OnStart -> {

android/JDCache/src/main/java/com/jd/jdcache/service/impl/net/NetConnection.kt

@@ -107,7 +107,8 @@ open class NetConnection : JDCacheNetDelegate() {
         method: String,
         header: MutableMap<String?, String>?,
         userAgent: String?,
-        cookie: String?
+        cookie: String?,
+        followRedirect: Boolean
     ): Flow<NetState<File>>? {
         if (url.isEmpty()) {
             log { e(name, "Cannot download file, because url is empty.") }
@@ -119,6 +120,10 @@ open class NetConnection : JDCacheNetDelegate() {
         }
         val request = FileRequest(url, savePath)
         request.method = method
+        request.header = header
+        request.userAgent = userAgent
+        request.cookies = cookie
+        request.allowRedirect = followRedirect
         return request.connectFlow()
     }