From ccd70b6087f658317db47f540226c75e328fe8fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E6=B6=9B?= Date: Fri, 28 Oct 2022 15:43:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=A8=A1=E6=8B=9F?= =?UTF-8?q?=E5=99=A8=E4=B8=8B=E8=BD=BD=E6=B5=81=E7=A8=8B20221027=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E5=8F=8D=E9=A6=88=20=20https://git.shanqu.cc/pm/halo/?= =?UTF-8?q?halo-app-issues/-/issues/2125?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/simulator/NewSimulatorGameManager.kt | 2 +- .../common/simulator/SimulatorDownloadManager.kt | 6 +++--- .../simulatorgame/SimulatorGameListFragment.kt | 2 +- .../res/drawable-xxxhdpi/ic_go_simulator.webp | Bin 0 -> 192 bytes .../main/res/drawable/button_round_1affa142.xml | 2 +- .../res/layout/fragment_simulator_game_list.xml | 2 +- app/src/main/res/layout/game_item.xml | 7 +++---- app/src/main/res/layout/simulator_header_view.xml | 2 +- 8 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_go_simulator.webp 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 0000000000000000000000000000000000000000..4658b27f8f81cd32250382a7a7998810002e1e43 GIT binary patch literal 192 zcmWIYbaUImz`zjh>J$(bU=hIuWD5YXFav`;1B0VafJY>d$LQ`L;4sU&$xQlXM~BQr zQJ?JW{7dT*&)x r6$1}rQj`OOol}|v!@mzk(>MMrQ~&?}VzA1h|GzKC|NrkagMk46a4tl1 literal 0 HcmV?d00001 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">