diff --git a/app/src/main/java/com/gh/common/simulator/NewSimulatorGameManager.kt b/app/src/main/java/com/gh/common/simulator/NewSimulatorGameManager.kt index badd4f1ad9..91fd7dbb0d 100644 --- a/app/src/main/java/com/gh/common/simulator/NewSimulatorGameManager.kt +++ b/app/src/main/java/com/gh/common/simulator/NewSimulatorGameManager.kt @@ -79,7 +79,7 @@ object NewSimulatorGameManager { NewFlatLogUtils.logSimulatorUpdateAlertClick("更新") val simulator = Config.getNewSimulatorEntitySetting() if (simulator != null) { - SimulatorDownloadManager.getInstance().showDownloadDialog(context, simulator, SimulatorDownloadManager.SimulatorLocation.SIMULATOR_MANAGE) + SimulatorDownloadManager.getInstance().showDownloadingDialog(context, simulator) } }, cancelClickCallback = { diff --git a/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt b/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt index 6b8cf1e0e4..d0d7465d89 100644 --- a/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt +++ b/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt @@ -139,7 +139,6 @@ class SimulatorDownloadManager private constructor() { ) { if (context == null) return - mContextRef = WeakReference(context) this.simulatorLocation = location this.simulator = simulator this.gameId = gameId @@ -203,14 +202,15 @@ class SimulatorDownloadManager private constructor() { mtaEvent = trackableEntity.event, mtaKey = trackableEntity.key, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) ) - if (downloadType == "update" && location != SimulatorLocation.SIMULATOR_MANAGE){ + if (downloadType == "update" && location != SimulatorLocation.SIMULATOR_MANAGE) { SPUtils.setString(SimulatorGameManager.SIMULATOR_UPDATE_SHOW_ALERT_TAG, TimeUtils.getToday()) } } }) } - private fun showDownloadingDialog(context: Context, simulator: SimulatorEntity?) { + fun showDownloadingDialog(context: Context, simulator: SimulatorEntity?) { + mContextRef = WeakReference(context) val msg = FileUtils.isCanDownload(context, simulator?.apk?.size) if (!msg.isNullOrEmpty()) { Utils.toast(context, msg) diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListFragment.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListFragment.kt index 1354ae044c..ded4ac6b41 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListFragment.kt @@ -91,7 +91,7 @@ class SimulatorGameListFragment : ListFragment - simulatorGameSubLayout.run { + simulatorGameLayout.run { setOnClickListener { MtaHelper.onEvent("广告位统计", "模拟器游戏", ad.title) NewFlatLogUtils.logSimulatorGameCollectionClick() diff --git a/app/src/main/res/drawable-xxxhdpi/ic_go_simulator.webp b/app/src/main/res/drawable-xxxhdpi/ic_go_simulator.webp new file mode 100644 index 0000000000..4658b27f8f Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_go_simulator.webp differ diff --git a/app/src/main/res/drawable/button_round_1affa142.xml b/app/src/main/res/drawable/button_round_1affa142.xml index d739378a87..54036b779b 100644 --- a/app/src/main/res/drawable/button_round_1affa142.xml +++ b/app/src/main/res/drawable/button_round_1affa142.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/layout/fragment_simulator_game_list.xml b/app/src/main/res/layout/fragment_simulator_game_list.xml index 0c64826a66..ec84d71f7a 100644 --- a/app/src/main/res/layout/fragment_simulator_game_list.xml +++ b/app/src/main/res/layout/fragment_simulator_game_list.xml @@ -35,7 +35,7 @@ + android:background="@drawable/ic_go_simulator" /> diff --git a/app/src/main/res/layout/game_item.xml b/app/src/main/res/layout/game_item.xml index 8e62eb655d..4347a20ed4 100644 --- a/app/src/main/res/layout/game_item.xml +++ b/app/src/main/res/layout/game_item.xml @@ -90,18 +90,17 @@ + android:background="@color/background_space">