From 0a187b22429e0bc390fbbc9f029ab6f4ef0d8fde Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Mon, 26 Aug 2024 14:16:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8B=E8=BD=BD=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=94=B1=E5=8F=8C=E4=B8=8B=E8=BD=BD=E5=88=87=E6=8D=A2=E5=9B=9E?= =?UTF-8?q?=E5=8D=95=E4=B8=8B=E8=BD=BD=E6=97=B6=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20https://jira.shanqu.cc/browse/GHZSCY-6575?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenjuntao --- .../main/java/com/gh/common/util/GameUtils.kt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/GameUtils.kt b/app/src/main/java/com/gh/common/util/GameUtils.kt index 31dd37f372..e409219e25 100644 --- a/app/src/main/java/com/gh/common/util/GameUtils.kt +++ b/app/src/main/java/com/gh/common/util/GameUtils.kt @@ -136,12 +136,16 @@ object GameUtils { // 畅玩状态优先,且畅玩实体不为空时将 downloadEntity 置为畅玩实体 if (performAsVGame && vGameDownloadEntity != null) { downloadEntity = vGameDownloadEntity - } else if (!performAsVGame && !isFromList && downloadEntity?.isVGameDownloadInDualDownloadMode() == true) { - // 下载的任务是由畅玩触发的,游戏详情页不需判定为需要安装 - downloadEntity = null - } else if (performAsVGame && !isFromList && downloadEntity?.isLocalDownloadInDualDownloadMode() == true) { - // 下载的任务是由下载安装触发的,游戏详情页不需判定为需要安装 - downloadEntity = null + } else if (!isFromList) { + if (!performAsVGame + && gameEntity.isDualBtnModeEnabled() + && downloadEntity?.isVGameDownloadInDualDownloadMode() == true) { + // 下载的任务是由畅玩触发的,并且双下载按钮启用,游戏详情页不需判定为需要安装 + downloadEntity = null + } else if (performAsVGame && downloadEntity?.isLocalDownloadInDualDownloadMode() == true) { + // 下载的任务是由下载安装触发的,游戏详情页不需判定为需要安装 + downloadEntity = null + } } if (downloadEntity != null) {