Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修复一体化，畅玩游戏启动判断

Browse Source
This commit is contained in:
yangfei
2024-02-27 11:35:31 +08:00
parent fe6405fac3
commit 6cc73d4b05
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/gh/common/DefaultJsApi.kt
View File

@ -220,7 +220,7 @@ class DefaultJsApi(
runOnUiThread {
// 若畅玩列表中安装了，优先启动畅玩游戏
if (VHelper.isInstalled(packageName)) {
if (!VHelper.showDialogIfVSpaceIsNeeded(context, "", "", "", "")) {
VHelper.validateVSpaceBeforeAction(context, packageName, null) {
VHelper.launch(context, packageName)
}
} else {

2
app/src/main/java/com/gh/common/chain/ValidateVSpaceHandler.kt
View File

@ -16,7 +16,7 @@ class ValidateVSpaceHandler : DownloadChainHandler() {
}
if (asVGame) {
VHelper.validateVSpaceBeforeAction(context, gameEntity) {
VHelper.validateVSpaceBeforeAction(context,gameEntity.getUniquePackageName(), gameEntity) {
closure.invoke()
}
} else {

2
app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt
View File

@ -282,7 +282,7 @@ object GameActivityDownloadHelper {
location: String,
traceEvent: ExposureEvent
) {
VHelper.validateVSpaceBeforeAction(context, gameEntity) {
VHelper.validateVSpaceBeforeAction(context,gameEntity.getUniquePackageName(), gameEntity) {
GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
CertificationDialog.showCertificationDialog(context, gameEntity) {
DialogUtils.checkDownload(

9
app/src/main/java/com/gh/vspace/VHelper.kt
View File

@ -559,8 +559,8 @@ object VHelper {
/**
* 在执行 callback 前先检查组件是否已安装，是否可下载
*/
fun validateVSpaceBeforeAction(context: Context, gameEntity: GameEntity?, callback: () -> Unit) {
if (isLegacyInstalled(gameEntity?.getUniquePackageName())) {
fun validateVSpaceBeforeAction(context: Context, packageName: String?, gameEntity: GameEntity?, callback: () -> Unit) {
if (isLegacyInstalled(packageName)) {
oldCwValidateVSpaceBeforeAction(context, gameEntity, callback)
} else {
newCwValidateVspaceBeforeAction(context, gameEntity, callback)
@ -680,6 +680,9 @@ object VHelper {
callback.invoke()
}
/**
* 判断是否需要安装32位组件，64位直接callback
*/
private fun newCwValidateVspaceBeforeAction(context: Context, gameEntity: GameEntity?, callback: () -> Unit) {
val bit = gameEntity?.gameBit ?: ""
if (bit == "32") {
@ -1191,7 +1194,7 @@ object VHelper {
logLaunchButtonClicked(packageName, gameId, gameName, gameType, location)
}
validateVSpaceBeforeAction(context, GameEntity().apply {
validateVSpaceBeforeAction(context,packageName, GameEntity().apply {
id = gameId
name = gameName
downloadStatus = Constants.V_GAME