diff --git a/README.md b/README.md index ed179fb..490b3a6 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,6 @@ ## 已知问题 -- 在息屏状态下 `--list-apps` 会阻塞较长时间，可能会暂时导致设备无法断开连接，之后加开关禁用连接时拉取应用列表 (同时最近任务中会只显示包名) - 因为没有设备用于（也懒得）测试，应用可能无法正常运行在安卓版本较低的设备上，特别是画中画功能，非常取决于国产 ROM 的实现 - 关闭画中画后不会停止 scrcpy 串流，仍然需要回到应用中点击停止 - 虚拟按键的截图实现方式为发送 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f615c5d..7a90c66 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -40,8 +40,8 @@ android { applicationId = "io.github.miuzarte.scrcpyforandroid" minSdk = 26 targetSdk = 36 - versionCode = 9 - versionName = "0.1.3" + versionCode = 10 + versionName = "0.1.4" externalNativeBuild { cmake { diff --git a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/DeviceTabScreen.kt b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/DeviceTabScreen.kt index dba063f..2cdf3a0 100644 --- a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/DeviceTabScreen.kt +++ b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/DeviceTabScreen.kt @@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.sizeIn import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Android import androidx.compose.material.icons.rounded.MoreVert import androidx.compose.material.icons.rounded.Refresh import androidx.compose.runtime.Composable @@ -100,11 +101,9 @@ import top.yukonga.miuix.kmp.basic.TopAppBar import top.yukonga.miuix.kmp.icon.MiuixIcons import top.yukonga.miuix.kmp.icon.basic.Check import top.yukonga.miuix.kmp.icon.extended.Store -import top.yukonga.miuix.kmp.icon.extended.Tune import top.yukonga.miuix.kmp.overlay.OverlayBottomSheet import top.yukonga.miuix.kmp.overlay.OverlayListPopup import top.yukonga.miuix.kmp.theme.MiuixTheme -import androidx.compose.foundation.lazy.LazyColumn as FoundationLazyColumn private const val ADB_CONNECT_TIMEOUT_MS = 12_000L private const val ADB_KEEPALIVE_INTERVAL_MS = 3_000L @@ -616,7 +615,7 @@ fun DeviceTabPage( val apps = scrcpy.listings.getApps(forceRefresh = false) val matches = apps.filter { - it.label.startsWith(searchName, ignoreCase = true) + it.label?.startsWith(searchName, ignoreCase = true) == true } require(matches.isNotEmpty()) { @@ -624,7 +623,9 @@ fun DeviceTabPage( } require(matches.size == 1) { "按应用名匹配到多个应用: " + - matches.take(5).joinToString { "${it.label} (${it.packageName})" } + matches.take(5).joinToString { + "${it.label ?: it.packageName} (${it.packageName})" + } } return StartAppRequest( @@ -773,11 +774,13 @@ fun DeviceTabPage( "sdk=${info.sdkInt}" ) snackbar.show("ADB 已连接") - scope.launch(Dispatchers.IO) { - runCatching { - scrcpy.listings.getApps(forceRefresh = true) - }.onFailure { error -> - logEvent("获取应用列表失败: ${error.message}", Log.WARN, error) + if (asBundle.adbAutoLoadAppListOnConnect) { + scope.launch(Dispatchers.IO) { + runCatching { + scrcpy.listings.getApps(forceRefresh = true) + }.onFailure { error -> + logEvent("获取应用列表失败: ${error.message}", Log.WARN, error) + } } } @@ -1265,7 +1268,7 @@ private fun RecentTasksBottomSheet( } else -> { - FoundationLazyColumn( + LazyColumn( modifier = Modifier .fillMaxWidth() .heightIn(max = 420.dp), @@ -1274,15 +1277,19 @@ private fun RecentTasksBottomSheet( val task = tasks[index] val app = scrcpy.listings.findCachedApp(task.packageName) val entry = SpinnerEntry( - icon = { modifier -> - Icon( - imageVector = if (app?.system == true) MiuixIcons.Tune else MiuixIcons.Store, - contentDescription = task.packageName, - modifier = modifier, - ) + icon = app?.system?.let { system -> + { modifier -> + Icon( + imageVector = + if (system) Icons.Rounded.Android // MiuixIcons.Tune + else MiuixIcons.Store, + contentDescription = task.packageName, + modifier = modifier, + ) + } }, title = app?.label?.takeIf { it.isNotBlank() } ?: task.packageName, - summary = task.packageName, + summary = app?.let { task.packageName }, ) RecentTaskSheetItem( entry = entry, diff --git a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/ScrcpyAllOptionsScreen.kt b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/ScrcpyAllOptionsScreen.kt index 2a93e6a..f699112 100644 --- a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/ScrcpyAllOptionsScreen.kt +++ b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/ScrcpyAllOptionsScreen.kt @@ -15,6 +15,7 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.rounded.ArrowBack import androidx.compose.material.icons.rounded.Add +import androidx.compose.material.icons.rounded.Android import androidx.compose.material.icons.rounded.DeleteOutline import androidx.compose.material.icons.rounded.Edit import androidx.compose.material.icons.rounded.MoreVert @@ -648,16 +649,18 @@ internal fun ScrcpyAllOptionsPage( apps.forEach { app -> add( SpinnerEntry( - icon = { - Icon( - imageVector = - if (app.system) MiuixIcons.Tune - else MiuixIcons.Store, - contentDescription = app.label, - modifier = Modifier.padding(end = UiSpacing.ContentVertical), - ) + icon = app.system?.let { system -> + { + Icon( + imageVector = + if (system) Icons.Rounded.Android // MiuixIcons.Tune + else MiuixIcons.Store, + contentDescription = app.label ?: app.packageName, + modifier = Modifier.padding(end = UiSpacing.ContentVertical), + ) + } }, - title = app.label, + title = app.label?.takeIf { it.isNotBlank() } ?: app.packageName, summary = app.packageName, ) ) diff --git a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/SettingsScreen.kt b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/SettingsScreen.kt index 59a8a28..ac4af92 100644 --- a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/SettingsScreen.kt +++ b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/SettingsScreen.kt @@ -430,6 +430,19 @@ fun SettingsPage( ) }, ) + SwitchPreference( + title = "连接后自动获取应用列表", + summary = "ADB 连接成功后立刻执行 --list-apps，用于补全最近任务列表应用名", + checked = asBundle.adbAutoLoadAppListOnConnect, + onCheckedChange = { + asBundle = asBundle.copy( + adbAutoLoadAppListOnConnect = it + ) + if (it) snackbar.show( + "--list-apps 操作可能非常耗时（特别是在息屏状态下），启用后可能导致连接设备后阻塞过久！" + ) + }, + ) } } diff --git a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/scaffolds/LazyColumn.kt b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/scaffolds/LazyColumn.kt index 23b3e22..5a9f436 100644 --- a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/scaffolds/LazyColumn.kt +++ b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/scaffolds/LazyColumn.kt @@ -15,15 +15,16 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp import io.github.miuzarte.scrcpyforandroid.constants.UiSpacing import top.yukonga.miuix.kmp.basic.ScrollBehavior import top.yukonga.miuix.kmp.utils.overScrollVertical @Composable fun LazyColumn( - contentPadding: PaddingValues, - scrollBehavior: ScrollBehavior, modifier: Modifier = Modifier, + contentPadding: PaddingValues = PaddingValues(0.dp), + scrollBehavior: ScrollBehavior? = null, state: LazyListState = rememberLazyListState(), itemSpacing: Dp = UiSpacing.PageItem, horizontalPadding: Dp = UiSpacing.PageHorizontal, @@ -43,7 +44,11 @@ fun LazyColumn( } else Modifier ) .overScrollVertical() - .nestedScroll(scrollBehavior.nestedScrollConnection) + .then( + if (scrollBehavior != null) + Modifier.nestedScroll(scrollBehavior.nestedScrollConnection) + else Modifier + ) .padding(contentPadding), state = state, contentPadding = PaddingValues(horizontal = horizontalPadding, vertical = verticalPadding), diff --git a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/scrcpy/Scrcpy.kt b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/scrcpy/Scrcpy.kt index a39d170..adbd3e5 100644 --- a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/scrcpy/Scrcpy.kt +++ b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/scrcpy/Scrcpy.kt @@ -670,8 +670,8 @@ class Scrcpy( ) data class AppInfo( - val system: Boolean, - val label: String, + val system: Boolean?, + val label: String?, val packageName: String, ) diff --git a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/storage/AppSettings.kt b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/storage/AppSettings.kt index 79f2324..5985242 100644 --- a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/storage/AppSettings.kt +++ b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/storage/AppSettings.kt @@ -78,10 +78,15 @@ class AppSettings(context: Context) : Settings(context, "AppSettings") { booleanPreferencesKey("adb_auto_reconnect_paired_device"), true ) + // 没必要加开关, 保持启用 val ADB_MDNS_LAN_DISCOVERY = Pair( booleanPreferencesKey("adb_mdns_lan_discovery"), true ) + val ADB_AUTO_LOAD_APP_LIST_ON_CONNECT = Pair( + booleanPreferencesKey("adb_auto_load_app_list_on_connect"), + false + ) val LAST_UPDATE_CHECK_AT = Pair( longPreferencesKey("last_update_check_at"), 0L @@ -112,6 +117,7 @@ class AppSettings(context: Context) : Settings(context, "AppSettings") { val adbPairingAutoDiscoverOnDialogOpen by setting(ADB_PAIRING_AUTO_DISCOVER_ON_DIALOG_OPEN) val adbAutoReconnectPairedDevice by setting(ADB_AUTO_RECONNECT_PAIRED_DEVICE) val adbMdnsLanDiscovery by setting(ADB_MDNS_LAN_DISCOVERY) + val adbAutoLoadAppListOnConnect by setting(ADB_AUTO_LOAD_APP_LIST_ON_CONNECT) val lastUpdateCheckAt by setting(LAST_UPDATE_CHECK_AT) @Parcelize @@ -133,6 +139,7 @@ class AppSettings(context: Context) : Settings(context, "AppSettings") { val adbPairingAutoDiscoverOnDialogOpen: Boolean, val adbAutoReconnectPairedDevice: Boolean, val adbMdnsLanDiscovery: Boolean, + val adbAutoLoadAppListOnConnect: Boolean, val lastUpdateCheckAt: Long, ) : Parcelable { } @@ -155,6 +162,7 @@ class AppSettings(context: Context) : Settings(context, "AppSettings") { bundleField(ADB_PAIRING_AUTO_DISCOVER_ON_DIALOG_OPEN) { bundle: Bundle -> bundle.adbPairingAutoDiscoverOnDialogOpen }, bundleField(ADB_AUTO_RECONNECT_PAIRED_DEVICE) { bundle: Bundle -> bundle.adbAutoReconnectPairedDevice }, bundleField(ADB_MDNS_LAN_DISCOVERY) { bundle: Bundle -> bundle.adbMdnsLanDiscovery }, + bundleField(ADB_AUTO_LOAD_APP_LIST_ON_CONNECT) { bundle: Bundle -> bundle.adbAutoLoadAppListOnConnect }, bundleField(LAST_UPDATE_CHECK_AT) { bundle: Bundle -> bundle.lastUpdateCheckAt }, ) @@ -180,6 +188,7 @@ class AppSettings(context: Context) : Settings(context, "AppSettings") { ), adbAutoReconnectPairedDevice = preferences.read(ADB_AUTO_RECONNECT_PAIRED_DEVICE), adbMdnsLanDiscovery = preferences.read(ADB_MDNS_LAN_DISCOVERY), + adbAutoLoadAppListOnConnect = preferences.read(ADB_AUTO_LOAD_APP_LIST_ON_CONNECT), lastUpdateCheckAt = preferences.read(LAST_UPDATE_CHECK_AT), )