perf: update text

lisonge · lisonge · commit e81f24afd34d · 2025-09-03T14:06:02.000+08:00
diff --git a/app/src/main/kotlin/li/songe/gkd/service/HttpService.kt b/app/src/main/kotlin/li/songe/gkd/service/HttpService.kt
@@ -79,7 +79,7 @@ class HttpService : Service(), OnSimpleLife {
 
     val scope = useScope()
 
-    private val httpServerPortFlow = storeFlow.mapState(scope) { s -> s.httpServerPort }
+    val httpServerPortFlow = storeFlow.mapState(scope) { s -> s.httpServerPort }
 
     init {
         useLogLifecycle()
@@ -88,7 +88,9 @@ class HttpService : Service(), OnSimpleLife {
         StopServiceReceiver.autoRegister()
         onCreated {
             scope.launchTry(Dispatchers.IO) {
-                localNetworkIpsFlow.value = getIpAddressInLocalNetwork()
+                httpServerPortFlow.collect {
+                    localNetworkIpsFlow.value = getIpAddressInLocalNetwork()
+                }
             }
         }
         onDestroyed {
@@ -98,13 +100,16 @@ class HttpService : Service(), OnSimpleLife {
             httpServerFlow.value = null
         }
         onCreated {
-            httpNotif.copy(text = "端口-${storeFlow.value.httpServerPort}").notifyService()
+            httpNotif.notifyService()
             scope.launchTry(Dispatchers.IO) {
                 httpServerPortFlow.collect { port ->
-                    httpServerFlow.value?.stop()
-                    httpServerFlow.value = null
+                    val isReboot = httpServerFlow.value != null
+                    httpServerFlow.apply {
+                        value?.stop()
+                        value = null
+                    }
                     if (!isPortAvailable(port)) {
-                        toast("端口 $port 被占用, 请更换后重试")
+                        toast("端口 $port 被占用，请更换后重试")
                         stopSelf()
                         return@collect
                     }
@@ -117,8 +122,8 @@ class HttpService : Service(), OnSimpleLife {
                     }
                     if (httpServerFlow.value == null) {
                         stopSelf()
-                    } else {
-                        httpNotif.copy(text = "端口-$port").notifyService()
+                    } else if (isReboot) {
+                        toast("HTTP服务重启成功")
                     }
                 }
             }
diff --git a/app/src/main/kotlin/li/songe/gkd/store/SettingsStore.kt b/app/src/main/kotlin/li/songe/gkd/store/SettingsStore.kt
@@ -18,7 +18,7 @@ data class SettingsStore(
     val updateSubsInterval: Long = UpdateTimeOption.Everyday.value,
     val captureVolumeChange: Boolean = false,
     val toastWhenClick: Boolean = true,
-    val clickToast: String = META.appName,
+    val actionToast: String = META.appName,
     val autoClearMemorySubs: Boolean = true,
     val hideSnapshotStatusBar: Boolean = false,
     val enableDarkTheme: Boolean? = null,
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/AdvancedPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/AdvancedPage.kt
@@ -102,6 +102,8 @@ fun AdvancedPage() {
         mutableStateOf(false)
     }
     if (showEditPortDlg) {
+        val portRange = remember { 1000 to 65535 }
+        val placeholderText = remember { "请输入 ${portRange.first}-${portRange.second} 的整数" }
         var value by remember {
             mutableStateOf(store.httpServerPort.toString())
         }
@@ -112,7 +114,7 @@ fun AdvancedPage() {
                 OutlinedTextField(
                     value = value,
                     placeholder = {
-                        Text(text = "请输入 5000-65535 的整数")
+                        Text(text = placeholderText)
                     },
                     onValueChange = {
                         value = it.filter { c -> c.isDigit() }.take(5)
@@ -139,18 +141,16 @@ fun AdvancedPage() {
                     enabled = value.isNotEmpty(),
                     onClick = {
                         val newPort = value.toIntOrNull()
-                        if (newPort == null || !(5000 <= newPort && newPort <= 65535)) {
-                            toast("请输入 5000-65535 的整数")
+                        if (newPort == null || !(portRange.first <= newPort && newPort <= portRange.second)) {
+                            toast(placeholderText)
                             return@TextButton
                         }
-                        storeFlow.value = store.copy(
-                            httpServerPort = newPort
-                        )
                         showEditPortDlg = false
-                        if (HttpService.httpServerFlow.value != null) {
-                            toast("已更新，重启服务")
-                        } else {
-                            toast("已更新")
+                        if (newPort != store.httpServerPort) {
+                            storeFlow.value = store.copy(
+                                httpServerPort = newPort
+                            )
+                            toast("更新成功")
                         }
                     }
                 ) {
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/home/SettingsPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/home/SettingsPage.kt
@@ -73,7 +73,7 @@ fun useSettingsPage(): ScaffoldExt {
 
     if (showToastInputDlg) {
         var value by remember {
-            mutableStateOf(store.clickToast)
+            mutableStateOf(store.actionToast)
         }
         val maxCharLen = 32
         AlertDialog(
@@ -104,7 +104,10 @@ fun useSettingsPage(): ScaffoldExt {
             onDismissRequest = { showToastInputDlg = false },
             confirmButton = {
                 TextButton(enabled = value.isNotEmpty(), onClick = {
-                    storeFlow.update { it.copy(clickToast = value) }
+                    if (value != storeFlow.value.actionToast) {
+                        storeFlow.update { it.copy(actionToast = value) }
+                        toast("更新成功")
+                    }
                     showToastInputDlg = false
                 }) {
                     Text(
@@ -208,14 +211,16 @@ fun useSettingsPage(): ScaffoldExt {
             confirmButton = {
                 TextButton(onClick = {
                     KeyboardUtils.hideSoftInput(activity)
-                    storeFlow.update {
-                        it.copy(
-                            customNotifTitle = titleValue,
-                            customNotifText = textValue
-                        )
+                    if (store.customNotifTitle != textValue || store.customNotifText != textValue) {
+                        storeFlow.update {
+                            it.copy(
+                                customNotifTitle = titleValue,
+                                customNotifText = textValue
+                            )
+                        }
+                        toast("更新成功")
                     }
                     showNotifTextInputDlg = false
-                    toast("更新成功")
                 }) {
                     Text(
                         text = "确认",
@@ -259,7 +264,7 @@ fun useSettingsPage(): ScaffoldExt {
 
             TextSwitch(
                 title = "触发提示",
-                subtitle = store.clickToast,
+                subtitle = store.actionToast,
                 checked = store.toastWhenClick,
                 modifier = Modifier.clickable {
                     showToastInputDlg = true
diff --git a/app/src/main/kotlin/li/songe/gkd/util/NetworkExt.kt b/app/src/main/kotlin/li/songe/gkd/util/NetworkExt.kt
@@ -8,7 +8,7 @@ fun getIpAddressInLocalNetwork(): List<String> {
         NetworkInterface.getNetworkInterfaces().asSequence()
     } catch (e: Exception) {
         // android.system.ErrnoException: getifaddrs failed: EACCES (Permission denied)
-        toast("获取host失败:" + e.message)
+        toast("获取HOST失败:" + e.message)
         return emptyList()
     }
     val localAddresses = networkInterfaces.flatMap {
@@ -27,8 +27,7 @@ fun isPortAvailable(port: Int): Boolean {
         serverSocket = ServerSocket(port)
         serverSocket.reuseAddress = true
         true
-    } catch (e: Exception) {
-        e.printStackTrace()
+    } catch (_: Exception) {
         false
     } finally {
         serverSocket?.close()
diff --git a/app/src/main/kotlin/li/songe/gkd/util/Toast.kt b/app/src/main/kotlin/li/songe/gkd/util/Toast.kt
@@ -109,10 +109,10 @@ fun showActionToast() {
         if (t - triggerTime > triggerInterval + 100) { // 100ms 保证二次显示的时候上一次已经完全消失
             triggerTime = t
             if (storeFlow.value.useSystemToast) {
-                showSystemToast(storeFlow.value.clickToast)
+                showSystemToast(storeFlow.value.actionToast)
             } else {
                 showA11yToast(
-                    storeFlow.value.clickToast
+                    storeFlow.value.actionToast
                 )
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -109,10 +109,10 @@ fun showActionToast() {`
`109`	`109`	`if (t - triggerTime > triggerInterval + 100) { // 100ms 保证二次显示的时候上一次已经完全消失`
`110`	`110`	`triggerTime = t`
`111`	`111`	`if (storeFlow.value.useSystemToast) {`
`112`		`- showSystemToast(storeFlow.value.clickToast)`
	`112`	`+ showSystemToast(storeFlow.value.actionToast)`
`113`	`113`	`} else {`
`114`	`114`	`showA11yToast(`
`115`		`- storeFlow.value.clickToast`
	`115`	`+ storeFlow.value.actionToast`
`116`	`116`	`)`
`117`	`117`	`}`
`118`	`118`	`}`