Skip to content

改善扫码登录界面可能会产生ANR的问题 #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liyk123 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

改善扫码登录界面可能会产生ANR的问题 #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/shared/src/main/kotlin/dev/aaa1115910/bv/viewmodel/login/AppQrLoginViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class AppQrLoginViewModel(
logger.info { qrLoginData.url }
runCatching { timer.cancel() }
timer = timeTask(1000, 1000, "check qr login result") {
viewModelScope.launch {
viewModelScope.launch(Dispatchers.IO) {
checkLoginResult()
}
}
Expand Down
9 changes: 7 additions & 2 deletions app/shared/src/main/kotlin/dev/aaa1115910/m3qrcode/MaterialShapeQr.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.runtime.withFrameMillis
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.scale
Expand Down Expand Up @@ -69,8 +70,12 @@ fun MaterialShapeQr(
delay(50)
continue
}
state.frameElapsed = System.currentTimeMillis() - state.qrStartTime
delay(16)
withFrameMillis {
state.frameElapsed = System.currentTimeMillis() - state.qrStartTime
}
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S && state.hasFinalDataImage) {
break
}
}
}

Expand Down