Merge pull request #388 from misaka10032w/baseline/compose-without-player

[Added] 支持自定义 CloudFlare 边缘节点 HOSTS 、优化 SAF 下载续传与错误处理

Author: misaka10032w

app/src/main/java/com/yenaly/han1meviewer/Preferences.kt

@@ -189,6 +189,9 @@ object Preferences {
     val useBuiltInHosts: Boolean
         get() = preferenceSp.getBoolean(SettingsPreferenceKeys.USE_BUILT_IN_HOSTS, false)
 
+    val customHostsData: String
+        get() = preferenceSp.getString(SettingsPreferenceKeys.CUSTOM_HOSTS_DATA, EMPTY_STRING).orEmpty()
+
     val useDoH: Boolean
         get() = preferenceSp.getBoolean(SettingsPreferenceKeys.USE_DOH, false)
 

app/src/main/java/com/yenaly/han1meviewer/logic/network/HDns.kt

@@ -32,8 +32,8 @@ class HDns : Dns {
     companion object {
 
         private val cloudFlareIps = listOf(
-            "172.64.229.154", "104.25.254.167", "172.67.75.184", "104.21.7.20", "172.67.187.141",
-            "2606:4700:8dd1::2a46:47f8", "2606:4700:3031::ac43:bb8d", "2606:4700:3030::6815:746"
+            "172.64.229.154", "162.159.0.1", "108.162.192.1", "172.64.33.1", "104.19.0.1",
+            "2606:4700:3035::ac43:bb8d", "2606:4700:3030::6815:746", "2606:4700:3030::6815:714"
         )
 
         /**
@@ -46,10 +46,53 @@ class HDns : Dns {
                 InetAddress.getByAddress(host, InetAddress.getByName(it).address)
             }
         }
+
+        /**
+         * 解析自定义 IP 列表，逗号分隔
+         */
+        fun parseCustomIps(raw: String): List<String> {
+            return raw.split(",")
+                .map { it.trim() }
+                .filter { it.isNotEmpty() }
+        }
+
+        /**
+         * 验证自定义 IP 列表格式是否有效
+         * @return 无效 IP 的错误信息列表，为空表示全部有效
+         */
+        fun validateCustomHosts(raw: String): List<String> {
+            val errors = mutableListOf<String>()
+            if (raw.isBlank()) return errors
+            val ips = parseCustomIps(raw)
+            if (ips.isEmpty()) {
+                errors.add("No IP addresses entered")
+                return errors
+            }
+            ips.forEach { ip ->
+                if (!isValidIpAddress(ip)) {
+                    errors.add("Invalid IP address: \"$ip\"")
+                }
+            }
+            return errors
+        }
+
+        private fun isValidIpAddress(ip: String): Boolean {
+            return runCatching {
+                val addr = InetAddress.getByName(ip)
+                addr.hostAddress == ip || addr.hostAddress == ip.removePrefix("[")
+                    .removeSuffix("]")
+            }.getOrDefault(false)
+        }
     }
 
     override fun lookup(hostname: String): List<InetAddress> {
         if (Preferences.useBuiltInHosts && HANIME_HOSTNAME.contains(hostname)) {
+            val customIps = resolveCustomIps()
+            if (!customIps.isNullOrEmpty()) {
+                return customIps.map {
+                    InetAddress.getByAddress(hostname, InetAddress.getByName(it).address)
+                }
+            }
             return cloudFlareIps.map {
                 InetAddress.getByAddress(hostname, InetAddress.getByName(it).address)
             }
@@ -119,6 +162,10 @@ class HDns : Dns {
 
     fun getCDNList(host: String): List<String> {
         if (Preferences.useBuiltInHosts && HANIME_HOSTNAME.contains(host)) {
+            val customIps = resolveCustomIps()
+            if (!customIps.isNullOrEmpty()) {
+                return customIps.distinct()
+            }
             return cloudFlareIps.distinct()
         }
 
@@ -130,4 +177,22 @@ class HDns : Dns {
         }
     }
 
+    @Volatile
+    private var cachedCustomIps: List<String>? = null
+
+    @Volatile
+    private var cachedCustomIpsRaw: String? = null
+
+    private fun resolveCustomIps(): List<String>? {
+        val raw = Preferences.customHostsData
+        if (raw.isBlank()) return null
+        if (raw == cachedCustomIpsRaw && cachedCustomIps != null) {
+            return cachedCustomIps
+        }
+        val result = parseCustomIps(raw)
+        cachedCustomIpsRaw = raw
+        cachedCustomIps = result
+        return result
+    }
+
 }

app/src/main/java/com/yenaly/han1meviewer/logic/network/ServiceCreator.kt

@@ -14,6 +14,7 @@ import com.yenaly.yenaly_libs.utils.unsafeLazy
 import okhttp3.Cache
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
+import okhttp3.Protocol
 import retrofit2.Retrofit
 import java.io.File
 import java.util.concurrent.TimeUnit
@@ -71,6 +72,7 @@ object ServiceCreator {
     private fun buildDownloadClient(): OkHttpClient {
         return OkHttpClient.Builder()
             .connectTimeout(5, TimeUnit.SECONDS)
+            .protocols(listOf(Protocol.HTTP_1_1))
             .addInterceptor(UserAgentInterceptor)
             .addInterceptor(downloadSpeedLimitInterceptor)
             .dns(dns)

app/src/main/java/com/yenaly/han1meviewer/logic/network/interceptor/SpeedLimitResponseBody.kt

@@ -21,5 +21,9 @@ class SpeedLimitResponseBody(
 
     override fun contentType() = responseBody.contentType()
 
-    override fun source() = throttler.source(responseBody.source()).buffer()
-}
+    override fun source() = if (maxSpeed > 0) {
+        throttler.source(responseBody.source()).buffer()
+    } else {
+        responseBody.source()
+    }
+}

app/src/main/java/com/yenaly/han1meviewer/ui/component/TripleButtonDialog.kt

@@ -1,16 +1,14 @@
 package com.yenaly.han1meviewer.ui.component
 
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.width
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.yenaly.han1meviewer.ui.preview.ComponentPreview
@@ -35,21 +33,28 @@ fun TripleButtonDialog(
         title = { Text(title) },
         text = message?.let { { Text(it) } },
         confirmButton = {
-            Row(
+            FlowRow(
                 modifier = Modifier.fillMaxWidth(),
                 horizontalArrangement = Arrangement.End,
-                verticalAlignment = Alignment.CenterVertically,
+                verticalArrangement = Arrangement.spacedBy(4.dp),
             ) {
-                TextButton(onClick = onNegative) { Text(negativeText) }
-                Spacer(Modifier.width(4.dp))
-                TextButton(onClick = onNeutral) { Text(neutralText) }
-                Spacer(Modifier.width(4.dp))
-                TextButton(onClick = onPositive) { Text(positiveText) }
+                TextButton(onClick = onNegative) { DialogButtonText(negativeText) }
+                TextButton(onClick = onNeutral) { DialogButtonText(neutralText) }
+                TextButton(onClick = onPositive) { DialogButtonText(positiveText) }
             }
         },
     )
 }
 
+@Composable
+private fun DialogButtonText(text: String) {
+    Text(
+        text = text,
+        maxLines = 2,
+        overflow = TextOverflow.Ellipsis,
+    )
+}
+
 @Preview(showBackground = true, showSystemUi = true)
 @Composable
 private fun TripleButtonDialogPreview(){
@@ -58,12 +63,12 @@ private fun TripleButtonDialogPreview(){
             visible = true,
             title = "这是标题",
             message = "这是信息",
-            negativeText = "反向按钮",
-            neutralText = "中性按钮",
-            positiveText = "正向按钮",
+            negativeText = "取消并关闭",
+            neutralText = "恢复默认下载目录",
+            positiveText = "选择自定义下载文件夹",
             onNegative = { },
             onNeutral = { },
             onPositive = { },
         ) { }
     }
-}
+}

app/src/main/java/com/yenaly/han1meviewer/ui/navigation/settings/NetworkSettingsRoute.kt

@@ -4,6 +4,9 @@ import android.content.Context
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
@@ -42,6 +45,7 @@ private const val NETWORK_PROXY_PORT = "proxy_port"
 private const val NETWORK_DOMAIN_NAME = "domain_name"
 private const val NETWORK_SELECTED_BASE_URL = "selectedBaseUrl"
 private const val NETWORK_USE_BUILT_IN_HOSTS = "use_built_in_hosts"
+private const val NETWORK_CUSTOM_HOSTS_DATA = "custom_hosts_data"
 private const val NETWORK_USE_DOH = "use_doh"
 private const val NETWORK_DOH_PRESET = "doh_preset"
 private const val NETWORK_DOH_CUSTOM_URL = "doh_custom_url"
@@ -62,6 +66,7 @@ fun NetworkSettingsRouteScreen() {
     var isDohTesting by remember { mutableStateOf(false) }
     var showDomainRestartConfirm by remember { mutableStateOf(false) }
     var showHostsRestartConfirm by remember { mutableStateOf(false) }
+    var showCustomHostsValidationError by remember { mutableStateOf<List<String>?>(null) }
     var showDohConflictConfirm by remember { mutableStateOf(false) }
     var pendingDomainValue by remember { mutableStateOf("") }
     var pendingDohConflictTarget by remember { mutableStateOf(DohConflictTarget.EnableDoH) }
@@ -195,6 +200,21 @@ fun NetworkSettingsRouteScreen() {
             refreshKey++
             showHostsRestartConfirm = true
         },
+        onSaveCustomHosts = { data ->
+            val errors = HDns.validateCustomHosts(data)
+            if (errors.isNotEmpty()) {
+                showCustomHostsValidationError = errors
+                return@NetworkSettingsScreen
+            }
+            Preferences.preferenceSp.edit(commit = true) {
+                putString(NETWORK_CUSTOM_HOSTS_DATA, data)
+            }
+            refreshKey++
+            if (Preferences.useBuiltInHosts) {
+                HanimeNetwork.rebuildNetwork()
+            }
+        },
+        customHostsData = Preferences.customHostsData,
         onSaveDohSettings = { enabled, preset, url, bootstrapIps, timeoutSeconds ->
             pendingDohEnabled = enabled
             pendingDohPreset = preset
@@ -296,6 +316,20 @@ fun NetworkSettingsRouteScreen() {
         onDismiss = { showHostsRestartConfirm = false },
     )
 
+    val validationErrors = showCustomHostsValidationError
+    if (validationErrors != null) {
+        AlertDialog(
+            onDismissRequest = { showCustomHostsValidationError = null },
+            title = { Text(stringResource(R.string.attention)) },
+            text = { Text(validationErrors.joinToString("\n")) },
+            confirmButton = {
+                TextButton(onClick = { showCustomHostsValidationError = null }) {
+                    Text(stringResource(R.string.confirm))
+                }
+            },
+        )
+    }
+
     ConfirmDialog(
         visible = showDohConflictConfirm,
         title = stringResource(R.string.attention),

app/src/main/java/com/yenaly/han1meviewer/ui/navigation/settings/SettingsPreferenceKeys.kt

@@ -33,6 +33,7 @@ object SettingsPreferenceKeys {
     const val DOMAIN_NAME = "domain_name"
     const val SELECTED_BASE_URL = "selectedBaseUrl"
     const val USE_BUILT_IN_HOSTS = "use_built_in_hosts"
+    const val CUSTOM_HOSTS_DATA = "custom_hosts_data"
     const val USE_DOH = "use_doh"
     const val DOH_PRESET = "doh_preset"
     const val DOH_CUSTOM_URL = "doh_custom_url"

app/src/main/java/com/yenaly/han1meviewer/ui/screen/home/download/DownloadUtils.kt

@@ -80,7 +80,7 @@ fun downloadStateText(state: DownloadState, progress: Int): String = when (state
     DownloadState.Queued -> stringResource(R.string.already_in_queue)
     DownloadState.Downloading -> stringResource(R.string.download_progress_percent, progress)
     DownloadState.Paused -> stringResource(R.string.paused)
-    DownloadState.Failed -> stringResource(R.string.retry)
+    DownloadState.Failed -> stringResource(R.string.download_failed_tap_retry)
     DownloadState.Finished -> stringResource(R.string.download_complete)
     DownloadState.Unknown -> stringResource(R.string.loading)
 }