From cc75cb497dbd3774e0c5b87eeda70ba9682ffe29 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Sun, 19 Jan 2020 11:13:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E4=B8=8B=E8=BD=BD=E9=99=90?= =?UTF-8?q?=E9=80=9F=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=B8=93=E9=A2=98=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/download/DownloadManager.java | 5 ++--- .../java/com/gh/gamecenter/subject/SubjectListFragment.kt | 6 +++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/gh/download/DownloadManager.java b/app/src/main/java/com/gh/download/DownloadManager.java index eec6e07b14..e2f3d61b2d 100644 --- a/app/src/main/java/com/gh/download/DownloadManager.java +++ b/app/src/main/java/com/gh/download/DownloadManager.java @@ -39,7 +39,6 @@ import com.lightgame.download.DownloadConfig; import com.lightgame.download.DownloadDao; import com.lightgame.download.DownloadEntity; import com.lightgame.download.DownloadService; -import com.lightgame.download.DownloadSpeedController; import com.lightgame.download.DownloadStatus; import com.lightgame.download.DownloadStatusListener; import com.lightgame.download.DownloadStatusManager; @@ -664,11 +663,11 @@ public class DownloadManager implements DownloadStatusListener { } public void disableDownloadSpeedLimit() { - DownloadSpeedController.disableSpeedLimit(); +// DownloadSpeedController.disableSpeedLimit(); } public void updateSpeedLimitationReleaseDelay(int delay) { - DownloadSpeedController.updateLimitationReleaseDelay(delay); +// DownloadSpeedController.updateLimitationReleaseDelay(delay); } public void checkRetryDownload() { diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt index 391440e3d1..29dbf69199 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt @@ -13,6 +13,7 @@ import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.entity.GameEntity +import com.gh.gamecenter.entity.SubjectData import com.gh.gamecenter.eventbus.EBDownloadStatus import com.gh.gamecenter.eventbus.EBPackage import com.gh.gamecenter.game.columncollection.detail.ColumnCollectionDetailActivity @@ -66,7 +67,10 @@ class SubjectListFragment : ListFragment(), On val factory = SubjectListViewModel.Factory(HaloApp.getInstance().application , arguments?.getParcelable(EntranceUtils.KEY_SUBJECT_DATA)!!) if (requireContext() is SubjectActivity) { - mSubjectViewModel = viewModelProviderFromParent() + requireActivity().intent.getParcelableExtra(EntranceUtils.KEY_SUBJECT_DATA)?.let { + val f = SubjectViewModel.Factory(HaloApp.getInstance().application, it) + mSubjectViewModel = viewModelProviderFromParent(f) + } } return ViewModelProviders.of(this, factory).get(SubjectListViewModel::class.java) }