fix: make recent tasks usable while streaming
This commit is contained in:
@@ -54,8 +54,8 @@ android {
|
|||||||
applicationId = "io.github.miuzarte.scrcpyforandroid"
|
applicationId = "io.github.miuzarte.scrcpyforandroid"
|
||||||
minSdk = 26
|
minSdk = 26
|
||||||
targetSdk = 37
|
targetSdk = 37
|
||||||
versionCode = 13
|
versionCode = 14
|
||||||
versionName = "0.1.7"
|
versionName = "0.1.8"
|
||||||
|
|
||||||
externalNativeBuild {
|
externalNativeBuild {
|
||||||
cmake {
|
cmake {
|
||||||
|
|||||||
@@ -680,9 +680,8 @@ fun DeviceTabPage(
|
|||||||
resolveStartAppRequest(scrcpy, resolvedOptions)
|
resolveStartAppRequest(scrcpy, resolvedOptions)
|
||||||
}.getOrElse { error ->
|
}.getOrElse { error ->
|
||||||
logEvent(
|
logEvent(
|
||||||
"启动应用请求无效: ${
|
"启动应用请求无效: " +
|
||||||
error.message?.takeIf { it.isNotBlank() } ?: error.javaClass.simpleName
|
"${error.message?.takeIf { it.isNotBlank() } ?: error.javaClass.simpleName}",
|
||||||
}",
|
|
||||||
Log.WARN,
|
Log.WARN,
|
||||||
error,
|
error,
|
||||||
)
|
)
|
||||||
@@ -704,14 +703,15 @@ fun DeviceTabPage(
|
|||||||
}.onSuccess {
|
}.onSuccess {
|
||||||
val appLabelPart = request.matchedAppLabel?.let { " ($it)" }.orEmpty()
|
val appLabelPart = request.matchedAppLabel?.let { " ($it)" }.orEmpty()
|
||||||
logEvent(
|
logEvent(
|
||||||
"已启动应用: ${request.packageName}$appLabelPart" +
|
"已启动应用: " +
|
||||||
request.displayId?.let { " @display=$it" }.orEmpty()
|
"${request.packageName}$appLabelPart"
|
||||||
|
+ request.displayId?.let { " @display=$it" }.orEmpty()
|
||||||
)
|
)
|
||||||
}.onFailure { error ->
|
}.onFailure { error ->
|
||||||
logEvent(
|
logEvent(
|
||||||
"启动应用失败: ${request.packageName} (${
|
"启动应用失败: " +
|
||||||
error.message?.takeIf { it.isNotBlank() } ?: error.javaClass.simpleName
|
"${request.packageName} " +
|
||||||
})",
|
"(${error.message?.takeIf { it.isNotBlank() } ?: error.javaClass.simpleName})",
|
||||||
Log.WARN,
|
Log.WARN,
|
||||||
error,
|
error,
|
||||||
)
|
)
|
||||||
@@ -1222,9 +1222,13 @@ fun DeviceTabPage(
|
|||||||
},
|
},
|
||||||
onLaunchTask = { task ->
|
onLaunchTask = { task ->
|
||||||
showRecentTasksSheet = false
|
showRecentTasksSheet = false
|
||||||
runBusy("启动 scrcpy") {
|
if (sessionInfo == null) runBusy("启动 scrcpy") {
|
||||||
startScrcpySession(startAppOverride = task.packageName)
|
startScrcpySession(startAppOverride = task.packageName)
|
||||||
}
|
}
|
||||||
|
else runBusy("启动应用") {
|
||||||
|
adbCoordinator.startApp(packageName = task.packageName)
|
||||||
|
logEvent("已启动应用: ${task.packageName}")
|
||||||
|
}
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user