diff --git a/app/src/main/java/com/gh/common/simulator/SimulatorGameManager.kt b/app/src/main/java/com/gh/common/simulator/SimulatorGameManager.kt index fdccf4757b..d32ebc25c2 100644 --- a/app/src/main/java/com/gh/common/simulator/SimulatorGameManager.kt +++ b/app/src/main/java/com/gh/common/simulator/SimulatorGameManager.kt @@ -33,7 +33,7 @@ object SimulatorGameManager { @JvmStatic fun deleteLocalGames(names: List) { - val downloadEntityList = DownloadDao.getInstance(HaloApp.getInstance().application).all + val downloadEntityList = DownloadManager.getInstance(HaloApp.getInstance().application).allDownloadEntity names.forEach { name -> val downloadEntity = downloadEntityList.find { it.name == name } if (downloadEntity != null) { @@ -48,7 +48,7 @@ object SimulatorGameManager { @JvmStatic fun deleteLocalGame(name: String) { - val downloadEntityList = DownloadDao.getInstance(HaloApp.getInstance().application).all + val downloadEntityList = DownloadManager.getInstance(HaloApp.getInstance().application).allDownloadEntity val downloadEntity = downloadEntityList.find { it.name == name } if (downloadEntity != null) { val file = File(downloadEntity.path) diff --git a/app/src/main/java/com/gh/common/util/DataUtils.java b/app/src/main/java/com/gh/common/util/DataUtils.java index 919c2d155a..25c3632b9b 100644 --- a/app/src/main/java/com/gh/common/util/DataUtils.java +++ b/app/src/main/java/com/gh/common/util/DataUtils.java @@ -57,10 +57,6 @@ public class DataUtils { }); Sentry.configureScope(scope -> { - User user = new User(); - user.setId(HaloApp.getInstance().getGid()); - scope.setUser(user); - if (BuildConfig.BUILD_TIME != 0L) { scope.setTag("alias", "内测版" + BuildConfig.VERSION_NAME + "_" + BuildConfig.BUILD_TIME); } else { diff --git a/app/src/main/java/com/gh/download/DownloadManager.java b/app/src/main/java/com/gh/download/DownloadManager.java index 9ed07f5a5a..ba7d0d624b 100644 --- a/app/src/main/java/com/gh/download/DownloadManager.java +++ b/app/src/main/java/com/gh/download/DownloadManager.java @@ -543,7 +543,7 @@ public class DownloadManager implements DownloadStatusListener { } public List getAllSimulatorDownloadEntity() { - List downloadEntityList = mDownloadDao.getAll(); + List downloadEntityList = getAllDownloadEntity(); ArrayList filteredDownloadEntityList = new ArrayList<>(); for (DownloadEntity downloadEntity : downloadEntityList) { if (ExtensionsKt.isSimulatorGame(downloadEntity) && downloadEntity.getStatus() == DownloadStatus.done) { @@ -560,7 +560,7 @@ public class DownloadManager implements DownloadStatusListener { if (CommonDebug.IS_DEBUG) { CommonDebug.logMethodName(this); } - List all = mDownloadDao.getAll(); + List all = getAllDownloadEntity(); return filterSilentDownloadTask(all); } diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameFragment.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameFragment.kt index 6498e74956..cf6fc07687 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameFragment.kt @@ -122,7 +122,7 @@ class SimulatorGameFragment : NormalFragment() { MtaHelper.onEvent("我的光环_新", "模拟器游戏", "点击${mTypeAliasList[it]}") if (mCurrentPage != it) { - (mFragmentsList[mCurrentPage] as SimulatorGameListFragment).resetPage() + (mFragmentsList.safelyGetInRelease(mCurrentPage) as? SimulatorGameListFragment)?.resetPage() mCurrentPage = it } } diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt index 02f3abd295..8a19973479 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt @@ -242,7 +242,7 @@ class VideoDetailContainerFragment : BaseLazyFragment(), OnBackPressedListener { } override fun onPageRelease(isNext: Boolean, position: Int) { - val video = mViewModel.videoList.value?.get(position) + val video = mViewModel.videoList.value?.safelyGetInRelease(position) video?.let { ExoCacheManager.cancel(video.url)