From 9feb4e774aa5680087b6fd90614da02c05fae287 Mon Sep 17 00:00:00 2001 From: lyr <15622190878@163.com> Date: Tue, 21 Dec 2021 16:51:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=20SonarQube=20=E9=97=AE?= =?UTF-8?q?=E9=A2=98:=20=E5=8F=8C=E9=87=8D=E6=A3=80=E6=9F=A5=E9=94=81?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=AE=9E=E7=8E=B0=E7=9A=84=E5=8D=95=E4=BE=8B?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E4=BD=BF=E7=94=A8=E9=9D=99=E6=80=81?= =?UTF-8?q?=E5=86=85=E9=83=A8=E7=B1=BB=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/base/BaseActivity.java | 2 +- .../com/gh/base/BaseRichEditorViewModel.kt | 2 +- .../com/gh/base/GHUmengNotificationService.kt | 2 +- .../base/GlobalActivityLifecycleObserver.kt | 2 +- .../java/com/gh/base/ToolBarActivity.java | 2 +- .../main/java/com/gh/common/DefaultJsApi.kt | 4 +- .../java/com/gh/common/FixedRateJobHelper.kt | 2 +- .../com/gh/common/LocalBroadcastReceiver.kt | 2 +- .../main/java/com/gh/common/PushManager.kt | 2 +- .../java/com/gh/common/constant/Config.java | 6 +-- .../gh/common/databind/BindingAdapters.java | 4 +- .../gh/common/dialog/DeviceRemindDialog.kt | 4 +- .../dialog/PackageCheckDialogFragment.kt | 4 +- .../gh/common/dialog/ReserveDialogFragment.kt | 4 +- .../gh/common/filter/RegionSettingHelper.kt | 2 +- .../common/repository/RemenkapaiRepository.kt | 2 +- .../repository/ReservationRepository.kt | 2 +- .../simulator/SimulatorDownloadManager.kt | 16 ++++---- .../common/simulator/SimulatorGameManager.kt | 28 +++++++------- .../syncpage/example/ExampleFragment.kt | 2 +- .../com/gh/common/util/ActivationHelper.kt | 2 +- .../main/java/com/gh/common/util/AdHelper.kt | 2 +- .../com/gh/common/util/BbsReportHelper.kt | 2 +- .../com/gh/common/util/BbsStayTimeHelper.kt | 2 +- .../com/gh/common/util/CollectionUtils.kt | 12 +++--- .../gh/common/util/CommentDraftContainer.kt | 2 +- .../java/com/gh/common/util/CommentHelper.kt | 8 ++-- .../java/com/gh/common/util/CommentUtils.java | 4 +- .../java/com/gh/common/util/ConcernUtils.kt | 10 ++--- .../java/com/gh/common/util/DataUtils.java | 2 +- .../gh/common/util/DetailDownloadUtils.java | 2 +- .../com/gh/common/util/DeviceTokenUtils.kt | 2 +- .../java/com/gh/common/util/DirectUtils.kt | 2 +- .../java/com/gh/common/util/DownloadHelper.kt | 2 +- .../com/gh/common/util/DownloadItemUtils.kt | 18 ++++----- .../com/gh/common/util/DownloadObserver.kt | 10 ++--- .../com/gh/common/util/EnergyTaskHelper.kt | 4 +- .../util/GameSubstituteRepositoryHelper.kt | 2 +- .../java/com/gh/common/util/GameUtils.java | 4 +- .../com/gh/common/util/HomePluggableHelper.kt | 2 +- .../java/com/gh/common/util/InstallUtils.java | 22 +++++------ .../java/com/gh/common/util/LibaoUtils.java | 10 ++--- .../java/com/gh/common/util/LogUtils.java | 2 +- .../java/com/gh/common/util/LoginUtils.java | 4 +- .../java/com/gh/common/util/NewLogUtils.kt | 2 +- .../java/com/gh/common/util/NewsUtils.java | 2 +- .../java/com/gh/common/util/OssUploadUtils.kt | 2 +- .../com/gh/common/util/PackageInstaller.kt | 8 ++-- .../java/com/gh/common/util/PackageUtils.java | 2 +- .../com/gh/common/util/PlatformUtils.java | 2 +- .../com/gh/common/util/PostCommentUtils.java | 34 ++++++++--------- .../java/com/gh/common/util/PushHelper.kt | 4 +- .../com/gh/common/util/QuickLoginHelper.kt | 2 +- .../java/com/gh/common/util/RealNameHelper.kt | 8 ++-- .../com/gh/common/util/ReservationHelper.kt | 2 +- .../com/gh/common/util/SimpleRequestHelper.kt | 2 +- .../java/com/gh/common/util/TagUtils.java | 2 +- .../com/gh/common/util/UploadImageUtils.kt | 8 ++-- .../com/gh/common/util/UsageStatsHelper.kt | 2 +- .../gh/common/videolog/VideoRecordUtils.kt | 4 +- .../java/com/gh/common/xapk/XapkInstaller.kt | 8 ++-- .../com/gh/download/DownloadDataHelper.kt | 10 ++--- .../java/com/gh/download/DownloadManager.java | 38 +++++++++---------- .../java/com/gh/download/DownloadWorker.kt | 2 +- .../java/com/gh/download/PackageObserver.kt | 8 ++-- .../com/gh/download/dialog/DownloadDialog.kt | 6 +-- .../DownloadDialogInstalledItemViewHolder.kt | 2 +- .../dialog/DownloadDialogItemViewHolder.kt | 8 ++-- .../gh/download/dialog/DownloadViewModel.kt | 2 +- .../com/gh/download/server/DownloadServer.kt | 2 +- .../com/gh/gamecenter/ImageViewerActivity.kt | 2 +- .../gh/gamecenter/LibaoDetailActivity.java | 10 ++--- .../java/com/gh/gamecenter/MainActivity.java | 18 ++++----- .../com/gh/gamecenter/NewsDetailActivity.java | 10 ++--- .../gh/gamecenter/SplashScreenActivity.java | 16 ++++---- .../com/gh/gamecenter/SuggestionActivity.java | 4 +- .../com/gh/gamecenter/ToolBoxActivity.java | 2 +- .../adapter/CommentDetailAdapter.java | 2 +- .../gamecenter/adapter/GameNewsAdapter.java | 4 +- .../adapter/LibaoDetailAdapter.java | 2 +- .../adapter/MessageDetailAdapter.java | 6 +-- .../gamecenter/adapter/ToolBoxRvAdapter.java | 2 +- .../adapter/viewholder/DetailViewHolder.java | 4 +- .../com/gh/gamecenter/amway/AmwayFragment.kt | 4 +- .../com/gh/gamecenter/amway/AmwayViewModel.kt | 14 +++---- .../amway/search/AmwaySearchViewModel.kt | 4 +- .../baselist/ListHeadViewModel.java | 2 +- .../gh/gamecenter/baselist/ListViewModel.java | 3 +- .../gh/gamecenter/catalog/CatalogViewModel.kt | 2 +- .../catalog/NewCatalogListFragment.kt | 4 +- .../catalog/NewCatalogListViewModel.kt | 2 +- .../catalog/SpecialCatalogViewModel.kt | 2 +- .../gamecenter/catalog/SubCatalogViewModel.kt | 2 +- .../CategoryDirectoryListViewModel.kt | 2 +- .../category/NewCategoryListFragment.kt | 4 +- .../category/NewCategoryListViewModel.kt | 2 +- .../category2/CategoryV2ListFragment.kt | 4 +- .../category2/CategoryV2ListViewModel.kt | 2 +- .../category2/CategoryV2ViewModel.kt | 2 +- .../gamecenter/collection/AnswerViewModel.kt | 2 +- .../gamecenter/collection/ArticleAdapter.java | 2 +- .../collection/ArticleViewModel.java | 4 +- .../collection/CommunityArticleViewModel.kt | 6 +-- .../collection/GamesCollectionViewModel.kt | 2 +- .../gamecenter/collection/ToolsFragment.java | 2 +- .../gamecenter/collection/VideoViewModel.kt | 2 +- .../gamecenter/download/DownloadFragment.kt | 6 +-- .../download/GameDownloadFragment.java | 16 ++++---- .../download/GameDownloadFragmentAdapter.java | 34 ++++++++--------- .../download/GameUpdateFragmentAdapter.java | 24 ++++++------ .../download/InstalledGameFragment.kt | 10 ++--- .../InstalledGameFragmentAdapter.java | 6 +-- .../download/InstalledGameViewModel.kt | 6 +-- .../download/NewInstalledGameFragment.kt | 10 ++--- .../download/UpdatableGameAdapter.kt | 4 +- .../download/UpdatableGameViewModel.kt | 12 +++--- .../gamecenter/energy/CommodityViewModel.kt | 2 +- .../energy/EnergyCenterViewModel.kt | 2 +- .../gamecenter/energy/EnergyHouseViewModel.kt | 2 +- .../com/gh/gamecenter/energy/TaskViewModel.kt | 2 +- .../detail/ForumArticleAskListViewModel.kt | 8 ++-- .../forum/detail/ForumDetailViewModel.kt | 8 ++-- .../forum/home/CommunityHomeViewModel.kt | 2 +- .../forum/home/ForumActivityViewModel.kt | 4 +- .../forum/home/ForumArticleListViewModel.kt | 6 +-- .../forum/home/ForumHomeViewModel.kt | 8 ++-- .../gamecenter/forum/home/ForumViewModel.kt | 8 ++-- .../forum/list/ForumListVIewModel.kt | 2 +- .../moderator/ApplyModeratorViewModel.kt | 4 +- .../forum/moderator/ModeratorListViewModel.kt | 10 ++--- .../search/ForumContentSearchListViewModel.kt | 2 +- .../ForumOrUserSearchDefaultViewModel.kt | 2 +- .../forum/search/UserSearchListViewModel.kt | 6 +-- .../forum/select/ForumSelectViewModel.kt | 10 ++--- .../HomeSearchToolWrapperViewModel.kt | 2 +- .../fragment/MainWrapperViewModel.kt | 4 +- .../fragment/SearchToolbarFragment.java | 2 +- .../com/gh/gamecenter/game/GameFragment.kt | 4 +- .../com/gh/gamecenter/game/GameViewModel.kt | 4 +- .../detail/ColumnCollectionDetailViewModel.kt | 2 +- .../detail/CommonCollectionDetailViewModel.kt | 2 +- .../game/upload/GameUploadViewModel.kt | 4 +- .../choose/AddSearchGameFragment.kt | 2 +- .../detail/GameCollectionDetailFragment.kt | 4 +- .../detail/GameCollectionDetailViewModel.kt | 4 +- .../detail/GameCollectionPosterViewModel.kt | 4 +- .../mine/MyGameCollectionViewModel.kt | 2 +- .../publish/GameCollectionEditViewModel.kt | 4 +- .../square/GameCollectionSquareViewModel.kt | 6 +-- .../tag/GameCollectionTagViewModel.kt | 2 +- .../gamedetail/GameDetailFragment.kt | 8 ++-- .../gamedetail/GameDetailViewModel.kt | 4 +- .../gamedetail/desc/DescViewModel.kt | 8 ++-- .../gamedetail/dialog/InviteCodeDialog.kt | 2 +- .../fuli/kaifu/ServersCalendarViewModel.kt | 2 +- .../history/HistoryApkListAdapter.kt | 2 +- .../history/HistoryApkListFragment.kt | 4 +- .../history/HistoryApkListViewModel.kt | 4 +- .../gamedetail/myrating/MyRatingViewModel.kt | 2 +- .../gamedetail/rating/RatingReplyActivity.kt | 4 +- .../gamedetail/rating/RatingReplyViewModel.kt | 4 +- .../gamedetail/rating/RatingViewModel.kt | 2 +- .../rating/edit/RatingEditViewModel.kt | 2 +- .../rating/logs/CommentLogsActivity.kt | 2 +- .../gh/gamecenter/geetest/GeetestUtils.java | 16 +++----- .../gamecenter/help/HelpContainerViewModel.kt | 2 +- .../gh/gamecenter/help/HelpContentFragment.kt | 4 +- .../help/HelpQaCategoryViewModel.kt | 2 +- .../gh/gamecenter/help/QaFeedbackViewModel.kt | 2 +- .../com/gh/gamecenter/home/HomeFragment.kt | 4 +- .../com/gh/gamecenter/home/HomeViewModel.kt | 6 +-- .../home/skip/PackageSkipFragment.kt | 6 +-- .../gh/gamecenter/info/ConcernAdapter.java | 8 ++-- .../gh/gamecenter/info/ConcernFragment.java | 2 +- .../com/gh/gamecenter/info/InfoAdapter.java | 2 +- .../com/gh/gamecenter/info/InfoViewModel.java | 4 +- .../gh/gamecenter/info/OriginalAdapter.java | 2 +- .../gh/gamecenter/info/OriginalViewModel.java | 4 +- .../gh/gamecenter/info/StrategyAdapter.java | 2 +- .../gh/gamecenter/info/StrategyFragment.java | 2 +- .../libao/Libao2FragmentAdapter.java | 2 +- .../libao/Libao3FragmentAdapter.java | 2 +- .../gamecenter/libao/LibaoHistoryAdapter.java | 2 +- .../gh/gamecenter/libao/LibaoNewAdapter.kt | 2 +- .../gh/gamecenter/libao/LibaoSearchAdapter.kt | 2 +- .../gh/gamecenter/manager/CommentManager.java | 13 ++----- .../manager/DataCollectionManager.java | 29 ++++++-------- .../gh/gamecenter/manager/FilterManager.java | 2 +- .../gh/gamecenter/manager/UpdateManager.java | 22 +++++------ .../gh/gamecenter/manager/UserManager.java | 22 ++++------- .../gh/gamecenter/manager/VisitManager.java | 13 ++----- .../gh/gamecenter/message/KeFuViewModel.kt | 6 +-- .../message/MessageDetailFragment.java | 6 +-- .../message/MessageItemViewHolder.java | 2 +- .../message/MessageNormalViewModel.kt | 6 +-- .../message/MessageUnreadRepository.kt | 2 +- .../gh/gamecenter/message/MessageViewModel.kt | 6 +-- .../mygame/MyFollowedGameViewModel.kt | 2 +- .../gamecenter/mygame/MyPlayedGameFragment.kt | 2 +- .../mygame/MyReservationFragment.kt | 4 +- .../mygame/MyReservationViewModel.kt | 8 ++-- .../gamecenter/mygame/PlayedGameFragment.kt | 4 +- .../gamecenter/mygame/PlayedGameViewModel.kt | 4 +- .../newsdetail/NewsDetailAdapter.java | 10 ++--- .../packagehelper/PackageRepository.kt | 4 +- .../personal/NewPersonalFragment.kt | 2 +- .../gamecenter/personal/PersonalFragment.kt | 2 +- .../gamecenter/personal/PersonalViewModel.kt | 10 ++--- .../personalhome/FollowersOrFansViewModel.kt | 8 ++-- .../personalhome/InstalledGameDialog.kt | 2 +- .../personalhome/UserHomeViewModel.kt | 22 +++++------ .../PersonalityBackgroundViewModel.kt | 2 +- .../border/AvatarBorderViewModel.kt | 2 +- .../border/ChooseAvatarBorderViewModel.kt | 2 +- .../personalhome/home/UserHistoryViewModel.kt | 2 +- .../home/UserVideoHistoryViewModel.kt | 2 +- .../home/game/UserCommentHistoryViewModel.kt | 2 +- .../home/game/UserGameViewModel.kt | 2 +- .../home/game/UserPlayedGameFragment.kt | 6 +-- .../personalhome/rating/RatingActivity.kt | 2 +- .../gh/gamecenter/qa/CommunityViewModel.kt | 6 +-- .../BaseAnswerOrArticleItemViewHolder.kt | 18 ++++----- .../qa/answer/detail/AnswerDetailViewModel.kt | 22 +++++------ .../qa/answer/draft/AnswerDraftAdapter.java | 2 +- .../qa/answer/draft/AnswerDraftFragment.java | 2 +- .../qa/answer/fold/AnswerFoldFragment.java | 2 +- .../qa/article/MyArticleFragment.kt | 2 +- .../qa/article/SimpleArticleListViewModel.kt | 2 +- .../article/detail/ArticleDetailViewModel.kt | 2 +- .../comment/ArticleDetailCommentViewModel.kt | 4 +- .../qa/article/draft/ArticleDraftFragment.kt | 2 +- .../article/edit/ArticleSelectGameAdapter.kt | 2 +- .../qa/column/AskColumnRepository.java | 30 +++++++-------- .../qa/column/AskColumnViewModel.kt | 2 +- .../column/detail/AskColumnDetailActivity.kt | 2 +- .../qa/column/detail/hot/HotViewModel.kt | 4 +- .../detail/recommends/RecommendsViewModel.kt | 4 +- .../detail/unanswered/UnansweredViewModel.kt | 4 +- .../qa/comment/NewCommentViewModel.kt | 8 ++-- .../qa/comment/base/BaseCommentViewModel.kt | 2 +- .../dialog/ChooseForumContainerViewModel.kt | 2 +- .../gamecenter/qa/editor/AnswerViewModel.kt | 4 +- .../gamecenter/qa/editor/ArticleViewModel.kt | 4 +- .../gh/gamecenter/qa/editor/GameFragment.kt | 4 +- .../gh/gamecenter/qa/editor/LinkViewModel.kt | 2 +- .../qa/editor/OnlineVideoViewModel.kt | 2 +- .../qa/follow/AskFollowViewModel.kt | 6 +-- .../qa/myqa/ConcernQuestionsFragment.java | 2 +- .../gamecenter/qa/myqa/MyAnswerFragment.java | 2 +- .../qa/myqa/MyQuestionsFragment.java | 2 +- .../newest/AskQuestionsNewBodyFragment.java | 2 +- .../detail/QuestionsDetailFragment.kt | 2 +- .../detail/QuestionsDetailViewModel.kt | 2 +- .../questions/draft/QuestionDraftViewModel.kt | 2 +- .../questions/edit/manager/HistoryActivity.kt | 2 +- .../edit/manager/HistoryDetailViewModel.kt | 2 +- .../edit/tip/QuestionTitleTipAdapter.kt | 2 +- .../invite/QuestionsInviteViewModel.kt | 6 +-- .../AskQuestionsRecommendsViewModel.java | 8 ++-- .../AskRecommendSubjectViewModel.kt | 4 +- .../newest/RecommendNewestFragment.kt | 2 +- .../qa/search/AskSearchActivity.java | 2 +- .../qa/search/artilce/ArticleFragment.kt | 2 +- .../qa/search/history/HistoryViewModel.kt | 2 +- .../qa/search/hottest/HottestFragment.kt | 2 +- .../qa/search/newest/NewestFragment.kt | 2 +- .../qa/search/question/QuestionFragment.kt | 2 +- .../gamecenter/qa/search/user/UserFragment.kt | 2 +- .../qa/search/user/UserViewModel.kt | 4 +- .../gamecenter/qa/select/OpenedViewModel.kt | 2 +- .../qa/select/SelectGameDialogAdapter.java | 2 +- .../gamecenter/qa/select/VotingViewModel.java | 6 +-- .../qa/subject/AskSubjectViewModel.java | 2 +- .../qa/tags/AskQuestionsNewRepository.java | 30 +++++++-------- .../qa/tags/AskQuestionsNewViewModel.java | 2 +- .../video/detail/ForumVideoDetailFragment.kt | 4 +- .../video/detail/ForumVideoDetailViewModel.kt | 2 +- .../video/detail/desc/VideoDescViewModel.kt | 14 +++---- .../qa/video/publish/VideoPublishViewModel.kt | 2 +- .../receiver/InstallAndUninstallReceiver.java | 4 +- .../receiver/NetworkStateReceiver.java | 2 +- .../gamecenter/retrofit/RetrofitManager.java | 20 +++++----- .../com/gh/gamecenter/room/AppDatabase.java | 23 ++++------- .../search/SearchGameIndexFragment.kt | 4 +- .../search/SearchGameResultFragment.kt | 4 +- .../search/SearchGameResultViewModel.kt | 2 +- .../gamecenter/security/BindPhoneViewModel.kt | 2 +- .../servers/GameServersContentFragment.kt | 6 +-- .../servers/GameServersContentViewModel.kt | 6 +-- .../servers/GameServersPublishFragment.kt | 2 +- .../servers/GameServersTestFragment.kt | 6 +-- .../servers/GameServersTestViewModel.kt | 2 +- .../servers/add/AddKaiFuViewModel.kt | 2 +- .../servers/patch/PatchKaifuViewModel.kt | 2 +- .../simulatorgame/SimulatorGameListAdapter.kt | 2 +- .../SimulatorGameListFragment.kt | 4 +- .../SimulatorGameListViewModel.kt | 6 +-- .../simulatorgame/SimulatorGameViewModel.kt | 6 +-- .../SimulatorManagementViewModel.kt | 2 +- .../gamecenter/subject/SubjectListFragment.kt | 4 +- .../subject/SubjectListViewModel.kt | 4 +- .../gh/gamecenter/subject/SubjectViewModel.kt | 4 +- .../com/gh/gamecenter/tag/TagsListFragment.kt | 4 +- .../gh/gamecenter/tag/TagsListViewModel.kt | 4 +- .../teenagermode/TeenagerModeViewModel.kt | 8 ++-- .../gh/gamecenter/user/UserRepository.java | 28 ++++++-------- .../com/gh/gamecenter/user/UserViewModel.java | 2 +- .../video/data/VideoDataViewModel.kt | 2 +- .../detail/VideoDetailContainerFragment.kt | 4 +- .../detail/VideoDetailContainerViewModel.kt | 32 ++++++++-------- .../video/game/GameVideoFragment.kt | 2 +- .../video/game/GameVideoViewModel.kt | 2 +- .../video/label/VideoLabelViewModel.kt | 2 +- .../gamecenter/video/upload/UploadManager.kt | 4 +- .../video/upload/view/UploadVideoViewModel.kt | 2 +- .../video/videomanager/VideoDraftViewModel.kt | 2 +- .../videomanager/VideoVerifyViewModel.kt | 2 +- .../main/java/com/halo/assistant/HaloApp.java | 2 +- .../fragment/ApkCleanerFragment.java | 2 +- .../assistant/fragment/SettingsFragment.java | 2 +- .../halo/assistant/fragment/VoteFragment.java | 6 +-- .../halo/assistant/fragment/WebFragment.kt | 2 +- .../fragment/game/GameNewsSearchFragment.java | 2 +- .../game/GameNewsSearchResultFragment.java | 2 +- .../fragment/myconcern/MyConcernAdapter.java | 2 +- .../myconcern/MyConcernRecommendAdapter.java | 2 +- .../user/ManuallyRealNameViewModel.kt | 2 +- .../fragment/user/RealNameInfoFragment.kt | 2 +- .../fragment/user/RealNameInfoViewModel.kt | 10 ++--- .../fragment/user/UserInfoEditFragment.java | 2 +- 330 files changed, 828 insertions(+), 885 deletions(-) diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index 6360c79126..84b2d6504a 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -152,7 +152,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy return; } if (this.getClass().getName().equals(xapkUnzipActivity) && !TextUtils.isEmpty(xapkUrl)) { - DownloadEntity downloadEntity = DownloadManager.getInstance(this).getDownloadEntityByUrl(xapkUrl); + DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntityByUrl(xapkUrl); if (downloadEntity != null) { PackageInstaller.install(this, downloadEntity, false); SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, ""); diff --git a/app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt b/app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt index 0ef8364fd5..86169f0a01 100644 --- a/app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt +++ b/app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt @@ -41,7 +41,7 @@ import kotlin.collections.forEach import kotlin.collections.set abstract class BaseRichEditorViewModel(application: Application) : AndroidViewModel(application) { - val mApi: ApiService = RetrofitManager.getInstance(application).api + val mApi: ApiService = RetrofitManager.getInstance().api val processDialog = MediatorLiveData() val uploadingImage = ArrayList>() val chooseImagesUpload = MutableLiveData>() diff --git a/app/src/main/java/com/gh/base/GHUmengNotificationService.kt b/app/src/main/java/com/gh/base/GHUmengNotificationService.kt index 81c1f63275..a7a1e0ccd7 100644 --- a/app/src/main/java/com/gh/base/GHUmengNotificationService.kt +++ b/app/src/main/java/com/gh/base/GHUmengNotificationService.kt @@ -174,7 +174,7 @@ // jsonObject.put("type", type) // val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()) // -// RetrofitManager.getInstance(application).api.postMessageRead(UserManager.getInstance().userId, data?.id, body) +// RetrofitManager.getInstance().api.postMessageRead(UserManager.getInstance().userId, data?.id, body) // .subscribeOn(Schedulers.io()) // .observeOn(AndroidSchedulers.mainThread()) // .subscribe(object : Response() { diff --git a/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt b/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt index e8b64d845f..c13b15dea8 100644 --- a/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt +++ b/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt @@ -52,7 +52,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks { try { // 初始化gameMap if (activity !is SplashScreenActivity) { - DownloadManager.getInstance(activity).initGameMap() + DownloadManager.getInstance().initGameMap() } } catch (e: Exception) { e.printStackTrace() diff --git a/app/src/main/java/com/gh/base/ToolBarActivity.java b/app/src/main/java/com/gh/base/ToolBarActivity.java index ee667c3283..5fbdc3add7 100644 --- a/app/src/main/java/com/gh/base/ToolBarActivity.java +++ b/app/src/main/java/com/gh/base/ToolBarActivity.java @@ -242,7 +242,7 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon private void updateDownloadCountHint(List updateList) { if (mDownloadCountHint == null) return; - String count = DownloadManager.getInstance(getApplicationContext()).getDownloadOrUpdateCount(updateList); + String count = DownloadManager.getInstance().getDownloadOrUpdateCount(updateList); if (count != null) { mDownloadCountHint.setVisibility(View.VISIBLE); mDownloadCountHint.setText(count); diff --git a/app/src/main/java/com/gh/common/DefaultJsApi.kt b/app/src/main/java/com/gh/common/DefaultJsApi.kt index 3d766a8d23..7a0907f696 100644 --- a/app/src/main/java/com/gh/common/DefaultJsApi.kt +++ b/app/src/main/java/com/gh/common/DefaultJsApi.kt @@ -125,7 +125,7 @@ class DefaultJsApi(var context: Context) { wechatLoginInfoMap["access_token"] = jsonContent.getString("access_token") wechatLoginInfoMap["refresh_token"] = jsonContent.getString("refresh_token") - RetrofitManager.getInstance(HaloApp.getInstance().application) + RetrofitManager.getInstance() .api .postBindWechat(wechatLoginInfoMap.createRequestBody()) .subscribeOn(Schedulers.io()) @@ -276,7 +276,7 @@ class DefaultJsApi(var context: Context) { @JavascriptInterface fun logoutExitWebViewAndRedirectToLogin() { - UserRepository.getInstance(context).logout() + UserRepository.getInstance().logout() if (context is Activity) { AppExecutor.uiExecutor.executeWithDelay(Runnable { context.ifLogin("内部网页") diff --git a/app/src/main/java/com/gh/common/FixedRateJobHelper.kt b/app/src/main/java/com/gh/common/FixedRateJobHelper.kt index f111e144a0..8581083b04 100644 --- a/app/src/main/java/com/gh/common/FixedRateJobHelper.kt +++ b/app/src/main/java/com/gh/common/FixedRateJobHelper.kt @@ -35,7 +35,7 @@ object FixedRateJobHelper { fixedRateTimer("Global-Fixed-Rate-Timer", initialDelay = 100, period = CHECKER_PERIOD) { // 时间校对，10分钟一次 if ((mExecuteCount * CHECKER_PERIOD) % TIME_PERIOD == 0L) { - RetrofitManager.getInstance(HaloApp.getInstance().application).api.time + RetrofitManager.getInstance().api.time .subscribeOn(Schedulers.io()) .subscribe(object : Response() { override fun onResponse(response: TimeEntity?) { diff --git a/app/src/main/java/com/gh/common/LocalBroadcastReceiver.kt b/app/src/main/java/com/gh/common/LocalBroadcastReceiver.kt index 726ff4389f..b580dff689 100644 --- a/app/src/main/java/com/gh/common/LocalBroadcastReceiver.kt +++ b/app/src/main/java/com/gh/common/LocalBroadcastReceiver.kt @@ -22,7 +22,7 @@ // ChatActivity.ACTION_DISMISS_FLOATING_WINDOW -> { // ImManager.dismissFloatingWindow() // -// RetrofitManager.getInstance(HaloApp.getInstance().application).api.postImEnding(UserManager.getInstance().userId) +// RetrofitManager.getInstance().api.postImEnding(UserManager.getInstance().userId) // .subscribeOn(Schedulers.io()) // .subscribe() // } diff --git a/app/src/main/java/com/gh/common/PushManager.kt b/app/src/main/java/com/gh/common/PushManager.kt index 9150a877fc..1d62cff140 100644 --- a/app/src/main/java/com/gh/common/PushManager.kt +++ b/app/src/main/java/com/gh/common/PushManager.kt @@ -78,7 +78,7 @@ object PushManager { // // val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()) // -// RetrofitManager.getInstance(mApplication).api.getAlias(body) +// RetrofitManager.getInstance().api.getAlias(body) // .subscribeOn(Schedulers.io()) // .subscribe( // { setAlias(it) }, diff --git a/app/src/main/java/com/gh/common/constant/Config.java b/app/src/main/java/com/gh/common/constant/Config.java index 67c0a529e6..5222949544 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -290,7 +290,7 @@ public class Config { @SuppressLint("CheckResult") public static void getGhzsSettings() { String channel = HaloApp.getInstance().getChannel(); - RetrofitManager.getInstance(HaloApp.getInstance().getApplication()) + RetrofitManager.getInstance() .getApi().getSettings(PackageUtils.getGhVersionName(), channel) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -314,7 +314,7 @@ public class Config { } }); - RetrofitManager.getInstance(HaloApp.getInstance().getApplication()) + RetrofitManager.getInstance() .getApi().getNewSettings(Build.MANUFACTURER, Build.MODEL, channel, Build.VERSION.SDK_INT, BuildConfig.VERSION_NAME) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -326,7 +326,7 @@ public class Config { } }); - RetrofitManager.getInstance(HaloApp.getInstance().getApplication()) + RetrofitManager.getInstance() .getApi().getGameGuidePopup(Build.MANUFACTURER, Build.VERSION.RELEASE, Build.MODEL, channel, BuildConfig.VERSION_NAME) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/common/databind/BindingAdapters.java b/app/src/main/java/com/gh/common/databind/BindingAdapters.java index a1f7e80942..18ad963217 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -465,7 +465,7 @@ public class BindingAdapters { case INSTALL_PLUGIN: case INSTALL_NORMAL: if (gameEntity.getApk().size() == 1) { - DownloadEntity downloadEntity = DownloadManager.getInstance(progressBar.getContext()).getDownloadEntitySnapshotByUrl(gameEntity.getApk().get(0).getUrl()); + DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByUrl(gameEntity.getApk().get(0).getUrl()); if (downloadEntity != null) { PackageInstaller.install(v.getContext(), downloadEntity); } @@ -574,7 +574,7 @@ public class BindingAdapters { // 显示下载过程状态 if (gameEntity.getApk().size() == 1) { - DownloadEntity downloadEntity = DownloadManager.getInstance(progressBar.getContext()).getDownloadEntitySnapshotByUrl(gameEntity.getApk().get(0).getUrl()); + DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByUrl(gameEntity.getApk().get(0).getUrl()); if (downloadEntity != null) { progressBar.setProgress((int) (downloadEntity.getPercent() * 10)); switch (downloadEntity.getStatus()) { diff --git a/app/src/main/java/com/gh/common/dialog/DeviceRemindDialog.kt b/app/src/main/java/com/gh/common/dialog/DeviceRemindDialog.kt index eb5d626660..f68a50d427 100644 --- a/app/src/main/java/com/gh/common/dialog/DeviceRemindDialog.kt +++ b/app/src/main/java/com/gh/common/dialog/DeviceRemindDialog.kt @@ -158,7 +158,7 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g SPUtils.setBoolean(Constants.SP_NO_REMIND_AGAIN, view.noRemindAgainCb.isChecked) dismiss() } - DownloadManager.getInstance(context).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) } private fun addIndicator() { @@ -238,6 +238,6 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g disposable!!.dispose() disposable = null } - DownloadManager.getInstance(context).removeObserver(dataWatcher) + DownloadManager.getInstance().removeObserver(dataWatcher) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt index c7fe37004a..590a036af1 100644 --- a/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt @@ -240,7 +240,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() { val height = ViewGroup.LayoutParams.WRAP_CONTENT requireDialog().window?.setLayout(width, height) requireDialog().setCanceledOnTouchOutside(true) - DownloadManager.getInstance(context).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) } override fun onResume() { @@ -261,7 +261,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() { mDisposable?.dispose() } LogUtils.uploadPackageCheck("pkg_check_pop_click", "关闭弹窗", gameEntity, "", "", "", "") - DownloadManager.getInstance(context).removeObserver(dataWatcher) + DownloadManager.getInstance().removeObserver(dataWatcher) } //安装、卸载事件 diff --git a/app/src/main/java/com/gh/common/dialog/ReserveDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/ReserveDialogFragment.kt index edea273ec7..24b8b92644 100644 --- a/app/src/main/java/com/gh/common/dialog/ReserveDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/ReserveDialogFragment.kt @@ -332,7 +332,7 @@ class ReserveViewModel(application: Application) : AndroidViewModel(application) requestMap["mobile"] = mobile } - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .createNewGameReservation(requestMap.createRequestBody()) .subscribeOn(Schedulers.io()) .subscribe(object : BiResponse() { @@ -356,7 +356,7 @@ class ReserveViewModel(application: Application) : AndroidViewModel(application) @SuppressLint("CheckResult") private fun getAppointmentMobile() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getAppointmentMobile(UserManager.getInstance().userId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/common/filter/RegionSettingHelper.kt b/app/src/main/java/com/gh/common/filter/RegionSettingHelper.kt index 06b467945a..a18d7d3fda 100644 --- a/app/src/main/java/com/gh/common/filter/RegionSettingHelper.kt +++ b/app/src/main/java/com/gh/common/filter/RegionSettingHelper.kt @@ -63,7 +63,7 @@ object RegionSettingHelper { fun getRegionSetting() { debounceActionWithInterval(R.string.app_name, 5000) { // 使用默认的 Schdulers.io() 可能会触发 OOM - RetrofitManager.getInstance(HaloApp.getInstance().application) + RetrofitManager.getInstance() .api .getRegionSetting(HaloApp.getInstance().channel) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/common/repository/RemenkapaiRepository.kt b/app/src/main/java/com/gh/common/repository/RemenkapaiRepository.kt index ee5c692e42..81bc2ea2a0 100644 --- a/app/src/main/java/com/gh/common/repository/RemenkapaiRepository.kt +++ b/app/src/main/java/com/gh/common/repository/RemenkapaiRepository.kt @@ -16,7 +16,7 @@ object RemenkapaiRepository { @JvmStatic fun getRemenkapai(size: Int): Observable> { return if (remenkapaiList.isEmpty()) { - RetrofitManager.getInstance(HaloApp.getInstance().application).api.remenkapai + RetrofitManager.getInstance().api.remenkapai .map(RegionSettingHelper.filterGame) .map { gameList -> filterEntityWithoutApk(gameList) } .map { pickRandomSizeEntity(size) } diff --git a/app/src/main/java/com/gh/common/repository/ReservationRepository.kt b/app/src/main/java/com/gh/common/repository/ReservationRepository.kt index bbbbf8c4e2..4f7d952763 100644 --- a/app/src/main/java/com/gh/common/repository/ReservationRepository.kt +++ b/app/src/main/java/com/gh/common/repository/ReservationRepository.kt @@ -39,7 +39,7 @@ object ReservationRepository { @JvmStatic fun refreshReservations() { if (CheckLoginUtils.isLogin()) { - RetrofitManager.getInstance(HaloApp.getInstance().application).api + RetrofitManager.getInstance().api .getAllTheGameReservations(UserManager.getInstance().userId, Utils.getTime(HaloApp.getInstance().application)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) 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 78a7fba421..960e7e3760 100644 --- a/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt +++ b/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt @@ -70,7 +70,7 @@ class SimulatorDownloadManager private constructor() { val fileName = downloadEntity.path.substring(downloadEntity.path.lastIndexOf('/') + 1).removeSuffix(".apk") val startTime = downloadEntity.getMetaExtra(Constants.SIMULATOR_DOWNLOAD_START_TIME) LogUtils.uploadSimulatorDownload("simulator_download_complete", fileName, simulator?.id, downloadEntity.name, gameId, locationStr, downloadType, startTime) - DownloadManager.getInstance(HaloApp.getInstance().application).cancel(downloadEntity.url, false, true) + DownloadManager.getInstance().cancel(downloadEntity.url, false, true) val activity = mContextRef?.get() as? AppCompatActivity if (activity?.isFinishing == false) { downloadDialog?.dismiss() @@ -177,7 +177,7 @@ class SimulatorDownloadManager private constructor() { appProgressFilling = view.findViewById(R.id.progress_filling) view.findViewById(R.id.app_tv_cancel).setOnClickListener { - DownloadManager.getInstance(context).pause(simulator?.apk?.url) + DownloadManager.getInstance().pause(simulator?.apk?.url) MtaHelper.onEvent("模拟器下载", "下载中弹窗", "点击关闭") val activity = mContextRef?.get() as? AppCompatActivity if (activity?.isFinishing == false) { @@ -186,7 +186,7 @@ class SimulatorDownloadManager private constructor() { } downloadDialog?.setOnDismissListener { - DownloadManager.getInstance(context).removeObserver(dataWatcher) + DownloadManager.getInstance().removeObserver(dataWatcher) } downloadDialog?.setCanceledOnTouchOutside(false) @@ -220,14 +220,14 @@ class SimulatorDownloadManager private constructor() { private fun download(context: Context, simulator: SimulatorEntity?) { val apkEntity = simulator?.apk ?: return - val entity = DownloadManager.getInstance(context).getDownloadEntityByUrl(apkEntity.url) + val entity = DownloadManager.getInstance().getDownloadEntityByUrl(apkEntity.url) HaloApp.put(simulator.name, simulator) if (entity != null) { when (entity.status) { DownloadStatus.pause, DownloadStatus.subscribe, DownloadStatus.neterror, DownloadStatus.timeout -> { - DownloadManager.getInstance(context).addObserver(dataWatcher) - uiExecutor.executeWithDelay(Runnable { DownloadManager.getInstance(context).resume(entity, true) }, 200) + DownloadManager.getInstance().addObserver(dataWatcher) + uiExecutor.executeWithDelay(Runnable { DownloadManager.getInstance().resume(entity, true) }, 200) downloadDialog?.show() } DownloadStatus.done -> DataChanger.notifyDataChanged(entity) @@ -240,7 +240,7 @@ class SimulatorDownloadManager private constructor() { } private fun createDownload(context: Context, apkEntity: ApkEntity, simulator: SimulatorEntity) { - DownloadManager.getInstance(context).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) val downloadId = PackageInstaller.createDownloadId(simulator.name) val downloadEntity = DownloadEntity() downloadEntity.url = apkEntity.url @@ -253,7 +253,7 @@ class SimulatorDownloadManager private constructor() { downloadEntity.addMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE, Constants.SIMULATOR_DOWNLOAD) downloadEntity.addMetaExtra(Constants.SIMULATOR_DOWNLOAD_START_TIME, (System.currentTimeMillis() / 1000).toString()) downloadEntity.addMetaExtra(Constants.DOWNLOAD_ID, downloadId) - uiExecutor.executeWithDelay(Runnable { DownloadManager.getInstance(context).add(downloadEntity) }, 200) + uiExecutor.executeWithDelay(Runnable { DownloadManager.getInstance().add(downloadEntity) }, 200) val locationStr = if (simulatorLocation == SimulatorLocation.LAUNCH) "${simulatorLocation?.value}《${gameName}》" else simulatorLocation?.value val fileName = downloadEntity.path.substring(downloadEntity.path.lastIndexOf('/') + 1).removeSuffix(".apk") 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 c1f4616466..850fb33059 100644 --- a/app/src/main/java/com/gh/common/simulator/SimulatorGameManager.kt +++ b/app/src/main/java/com/gh/common/simulator/SimulatorGameManager.kt @@ -40,7 +40,7 @@ object SimulatorGameManager { @JvmStatic fun deleteLocalGames(names: List) { - val downloadEntityList = DownloadManager.getInstance(HaloApp.getInstance().application).allDownloadEntity + val downloadEntityList = DownloadManager.getInstance().allDownloadEntity names.forEach { name -> val downloadEntity = downloadEntityList.find { it.name == name } if (downloadEntity != null) { @@ -55,7 +55,7 @@ object SimulatorGameManager { @JvmStatic fun deleteLocalGame(name: String) { - val downloadEntityList = DownloadManager.getInstance(HaloApp.getInstance().application).allDownloadEntity + val downloadEntityList = DownloadManager.getInstance().allDownloadEntity val downloadEntity = downloadEntityList.find { it.name == name } if (downloadEntity != null) { val file = File(downloadEntity.path) @@ -70,7 +70,7 @@ object SimulatorGameManager { fun findDownloadEntityByUrl(url: String?): DownloadEntity? { val downloadEntity = DownloadDao.getInstance(HaloApp.getInstance().application).get(url) if (downloadEntity != null) { - val isFileCompleted = DownloadManager.getInstance(HaloApp.getInstance().application).isDownloadCompleted(url) + val isFileCompleted = DownloadManager.getInstance().isDownloadCompleted(url) if (downloadEntity.isSimulatorGame() && isFileCompleted) { return downloadEntity } @@ -168,7 +168,7 @@ object SimulatorGameManager { requestMap["game_id"] = gameId requestMap["package"] = "-" val body = requestMap.createRequestBodyAny() - RetrofitManager.getInstance(HaloApp.getInstance().application).api + RetrofitManager.getInstance().api .downloadSimulatorGames(HaloApp.getInstance().gid, body) .compose(singleToMain()) .subscribe(object : BiResponse() { @@ -185,7 +185,7 @@ object SimulatorGameManager { @JvmStatic fun recordDownloadSimulatorGames() { val gameArray = JSONArray() - val allGameList = AppDatabase.getInstance(HaloApp.getInstance()).simulatorGameDao().getAllSimulatorGame() + val allGameList = AppDatabase.getInstance().simulatorGameDao().getAllSimulatorGame() for (game in allGameList) { if (!game.isDeleted) { gameArray.put(json { @@ -197,7 +197,7 @@ object SimulatorGameManager { if (gameArray.length() == 0) return - RetrofitManager.getInstance(HaloApp.getInstance().application).api + RetrofitManager.getInstance().api .putDownloadSimulatorGames(HaloApp.getInstance().gid, gameArray.toRequestBody()) .compose(singleToMain()) .subscribe(EmptyResponse()) @@ -205,8 +205,8 @@ object SimulatorGameManager { @SuppressLint("CheckResult") private fun refreshSimulatorGame(gameId: String, type: String) { - val simulatorGameDao = AppDatabase.getInstance(HaloApp.getInstance()).simulatorGameDao() - RetrofitManager.getInstance(HaloApp.getInstance().application).api + val simulatorGameDao = AppDatabase.getInstance().simulatorGameDao() + RetrofitManager.getInstance().api .getSimulatorGames(HaloApp.getInstance().gid, 1, getFilter(type)) .compose(singleToMain()) .subscribe(object : BiResponse>() { @@ -236,7 +236,7 @@ object SimulatorGameManager { requestMap["game_id"] = gameId requestMap["package"] = packageName val body = requestMap.toRequestBody() - RetrofitManager.getInstance(HaloApp.getInstance().application).api + RetrofitManager.getInstance().api .postPlayedGame(UserManager.getInstance().userId, body) .compose(singleToMain()) .subscribe(EmptyResponse()) @@ -253,7 +253,7 @@ object SimulatorGameManager { requestMap["game_id"] = gameId requestMap["package"] = "-" val body = requestMap.createRequestBodyAny() - RetrofitManager.getInstance(HaloApp.getInstance().application).api + RetrofitManager.getInstance().api .playedSimulatorGames(HaloApp.getInstance().gid, body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -265,7 +265,7 @@ object SimulatorGameManager { */ @SuppressLint("CheckResult") fun deleteSimulatorGame(gameId: String, callback: () -> Unit) { - RetrofitManager.getInstance(HaloApp.getInstance().application).api + RetrofitManager.getInstance().api .deleteSimulatorGame(HaloApp.getInstance().gid, gameId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -284,7 +284,7 @@ object SimulatorGameManager { fun deleteSimulatorGames(gameIds: List, callback: () -> Unit) { val requestMap = hashMapOf() requestMap["game_ids"] = gameIds - RetrofitManager.getInstance(HaloApp.getInstance().application).api + RetrofitManager.getInstance().api .deleteSimulatorGames(HaloApp.getInstance().gid, requestMap.toRequestBody()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -301,7 +301,7 @@ object SimulatorGameManager { @JvmStatic @SuppressLint("CheckResult") fun deleteAllSimulatorGame() { - RetrofitManager.getInstance(HaloApp.getInstance().application).api + RetrofitManager.getInstance().api .deleteAllSimulatorGame(HaloApp.getInstance().gid) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -309,7 +309,7 @@ object SimulatorGameManager { } private fun updateSimulatorConfigFile(gameId: String) { - RetrofitManager.getInstance(HaloApp.getInstance().application) + RetrofitManager.getInstance() .api .getGameDigest(gameId) .map(ApkActiveUtils.filterMapper) diff --git a/app/src/main/java/com/gh/common/syncpage/example/ExampleFragment.kt b/app/src/main/java/com/gh/common/syncpage/example/ExampleFragment.kt index 8993998e3e..da90ec2761 100644 --- a/app/src/main/java/com/gh/common/syncpage/example/ExampleFragment.kt +++ b/app/src/main/java/com/gh/common/syncpage/example/ExampleFragment.kt @@ -29,7 +29,7 @@ class ExampleFragment : ListFragment> { - return RetrofitManager.getInstance(context).api.getCommunitiesRecommendNewest(UserManager.getInstance().community.id, page) + return RetrofitManager.getInstance().api.getCommunitiesRecommendNewest(UserManager.getInstance().community.id, page) } override fun provideListViewModel(): NormalListViewModel { diff --git a/app/src/main/java/com/gh/common/util/ActivationHelper.kt b/app/src/main/java/com/gh/common/util/ActivationHelper.kt index 196a52bbe2..612179e59e 100644 --- a/app/src/main/java/com/gh/common/util/ActivationHelper.kt +++ b/app/src/main/java/com/gh/common/util/ActivationHelper.kt @@ -22,7 +22,7 @@ object ActivationHelper { @JvmStatic fun sendActivationInfo() { if (!mHasSentActivatedInfo) { - RetrofitManager.getInstance(HaloApp.getInstance().application) + RetrofitManager.getInstance() .api.postActivationInfo() .subscribeOn(Schedulers.io()) .subscribe(object : Response() { diff --git a/app/src/main/java/com/gh/common/util/AdHelper.kt b/app/src/main/java/com/gh/common/util/AdHelper.kt index c937552f53..d829da3275 100644 --- a/app/src/main/java/com/gh/common/util/AdHelper.kt +++ b/app/src/main/java/com/gh/common/util/AdHelper.kt @@ -30,7 +30,7 @@ object AdHelper { return } - RetrofitManager.getInstance(HaloApp.getInstance()) + RetrofitManager.getInstance() .api .getSplashAd(HaloApp.getInstance().channel) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/common/util/BbsReportHelper.kt b/app/src/main/java/com/gh/common/util/BbsReportHelper.kt index 2e9e0c37b6..4317f48cb4 100644 --- a/app/src/main/java/com/gh/common/util/BbsReportHelper.kt +++ b/app/src/main/java/com/gh/common/util/BbsReportHelper.kt @@ -103,7 +103,7 @@ object BbsReportHelper { @SuppressLint("CheckResult") private fun postReport(contentId: String, reportContent: JSONObject) { - RetrofitManager.getInstance(HaloApp.getInstance()) + RetrofitManager.getInstance() .api .postBbsReport(contentId, reportContent.toRequestBody()) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/common/util/BbsStayTimeHelper.kt b/app/src/main/java/com/gh/common/util/BbsStayTimeHelper.kt index 22ce7deafb..ef8573b305 100644 --- a/app/src/main/java/com/gh/common/util/BbsStayTimeHelper.kt +++ b/app/src/main/java/com/gh/common/util/BbsStayTimeHelper.kt @@ -110,7 +110,7 @@ object BbsStayTimeHelper { @SuppressLint("CheckResult") private fun postExploreFinish() { - RetrofitManager.getInstance(HaloApp.getInstance()) + RetrofitManager.getInstance() .api .postExplorerFinish() .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/common/util/CollectionUtils.kt b/app/src/main/java/com/gh/common/util/CollectionUtils.kt index 21d5cfedd8..691df5349c 100644 --- a/app/src/main/java/com/gh/common/util/CollectionUtils.kt +++ b/app/src/main/java/com/gh/common/util/CollectionUtils.kt @@ -25,9 +25,9 @@ object CollectionUtils { fun postCollection(context: Context, content: String, type: CollectionType, listener: OnCollectionListener) { val postCollection = when (type) { - CollectionType.article -> RetrofitManager.getInstance(context).getApi().postCollectionArticle(UserManager.getInstance().userId, content) - CollectionType.toolkit -> RetrofitManager.getInstance(context).getApi().postCollectionTools(UserManager.getInstance().userId, content) - CollectionType.answer -> RetrofitManager.getInstance(context).getApi().postCollectionAnswer(UserManager.getInstance().userId, content) + CollectionType.article -> RetrofitManager.getInstance().getApi().postCollectionArticle(UserManager.getInstance().userId, content) + CollectionType.toolkit -> RetrofitManager.getInstance().getApi().postCollectionTools(UserManager.getInstance().userId, content) + CollectionType.answer -> RetrofitManager.getInstance().getApi().postCollectionAnswer(UserManager.getInstance().userId, content) else -> return } postCollection @@ -63,9 +63,9 @@ object CollectionUtils { val postCollection: Observable when (type) { - CollectionType.article -> postCollection = RetrofitManager.getInstance(context).getApi().deletaCollectionArticle(UserManager.getInstance().userId, id) - CollectionType.toolkit -> postCollection = RetrofitManager.getInstance(context).getApi().deleteCollectionTools(UserManager.getInstance().userId, id) - CollectionType.answer -> postCollection = RetrofitManager.getInstance(context).getApi().deleteCollectionAnswer(UserManager.getInstance().userId, id) + CollectionType.article -> postCollection = RetrofitManager.getInstance().getApi().deletaCollectionArticle(UserManager.getInstance().userId, id) + CollectionType.toolkit -> postCollection = RetrofitManager.getInstance().getApi().deleteCollectionTools(UserManager.getInstance().userId, id) + CollectionType.answer -> postCollection = RetrofitManager.getInstance().getApi().deleteCollectionAnswer(UserManager.getInstance().userId, id) else -> return } postCollection diff --git a/app/src/main/java/com/gh/common/util/CommentDraftContainer.kt b/app/src/main/java/com/gh/common/util/CommentDraftContainer.kt index 507070249c..aa27aad13b 100644 --- a/app/src/main/java/com/gh/common/util/CommentDraftContainer.kt +++ b/app/src/main/java/com/gh/common/util/CommentDraftContainer.kt @@ -5,5 +5,5 @@ import com.gh.gamecenter.room.dao.CommentDraftDao import com.halo.assistant.HaloApp object CommentDraftContainer { - val commentDraftDao: CommentDraftDao by lazy { AppDatabase.getInstance(HaloApp.getInstance().application).commentDraftDao() } + val commentDraftDao: CommentDraftDao by lazy { AppDatabase.getInstance().commentDraftDao() } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/util/CommentHelper.kt b/app/src/main/java/com/gh/common/util/CommentHelper.kt index fb08bff336..4bc84763ad 100644 --- a/app/src/main/java/com/gh/common/util/CommentHelper.kt +++ b/app/src/main/java/com/gh/common/util/CommentHelper.kt @@ -429,7 +429,7 @@ object CommentHelper { DialogHelper.showDialog( context, highlight, highlightDialogHintContent, "确定", "取消", { - RetrofitManager.getInstance(context).api + RetrofitManager.getInstance().api .highlightAnswerComment(answerId, comment.id) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) @@ -441,7 +441,7 @@ object CommentHelper { DialogHelper.showDialog( context, highlight, highlightDialogHintContent, "确定", "取消", { - RetrofitManager.getInstance(context).api + RetrofitManager.getInstance().api .highlightCommunityArticleComment( communityId, articleId, @@ -491,7 +491,7 @@ object CommentHelper { DialogHelper.showDialog( context, hide, hideDialogHintContent, "确定", "取消", { - RetrofitManager.getInstance(context).api + RetrofitManager.getInstance().api .hideAnswerComment(answerId, comment.id) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) @@ -503,7 +503,7 @@ object CommentHelper { DialogHelper.showDialog( context, hide, hideDialogHintContent, "确定", "取消", { - RetrofitManager.getInstance(context).api + RetrofitManager.getInstance().api .hideCommunityArticleComment(communityId, articleId, comment.id) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/common/util/CommentUtils.java b/app/src/main/java/com/gh/common/util/CommentUtils.java index 57e84b47ac..3c79d2a0da 100644 --- a/app/src/main/java/com/gh/common/util/CommentUtils.java +++ b/app/src/main/java/com/gh/common/util/CommentUtils.java @@ -397,7 +397,7 @@ public class CommentUtils { final ImageView commentLikeIv) { String entrance = "视频流-评论-取消点赞"; CheckLoginUtils.checkLogin(context, entrance, () -> { - RetrofitManager.getInstance(context).getApi() + RetrofitManager.getInstance().getApi() .unVoteVideoComment(videoId, commentEntity.getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -501,7 +501,7 @@ public class CommentUtils { @SuppressLint("CheckResult") public static void isUserCommentedOnThisGame(String gameId, WeakReference> callback) { - RetrofitManager.getInstance(HaloApp.getInstance().getApplication()) + RetrofitManager.getInstance() .getApi() .isUserCommentedOnThisGame(UserManager.getInstance().getUserId(), gameId) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/common/util/ConcernUtils.kt b/app/src/main/java/com/gh/common/util/ConcernUtils.kt index 7ef61ce670..058763efb3 100644 --- a/app/src/main/java/com/gh/common/util/ConcernUtils.kt +++ b/app/src/main/java/com/gh/common/util/ConcernUtils.kt @@ -30,7 +30,7 @@ object ConcernUtils { val userId = UserManager.getInstance().userId if (TextUtils.isEmpty(userId)) return - RetrofitManager.getInstance(context).api + RetrofitManager.getInstance().api .postConcern(UserManager.getInstance().userId, gameId, mode) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -50,7 +50,7 @@ object ConcernUtils { } fun deleteConcernData(context: Context, gameId: String, listener: onConcernListener?) { - RetrofitManager.getInstance(context).api + RetrofitManager.getInstance().api .deleteConcern(UserManager.getInstance().userId, gameId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -72,7 +72,7 @@ object ConcernUtils { fun updateConcernData(context: Context, data: JSONArray) { val body = RequestBody.create(MediaType.parse("application/json"), data.toString()) - RetrofitManager.getInstance(context).api + RetrofitManager.getInstance().api .putConcern(UserManager.getInstance().userId, body) .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) @@ -84,7 +84,7 @@ object ConcernUtils { } fun deleteConcernQuestions(context: Context, questionsId: String, listener: onConcernListener?) { - RetrofitManager.getInstance(context).api + RetrofitManager.getInstance().api .deleteConcernQuestions(UserManager.getInstance().userId, questionsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -109,7 +109,7 @@ object ConcernUtils { } fun postConcernQuestions(context: Context, questionsId: String, listener: onConcernListener?) { - RetrofitManager.getInstance(context).api + RetrofitManager.getInstance().api .postConcernQuestions(UserManager.getInstance().userId, questionsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) 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 15cffcfb54..33b0a5a81f 100644 --- a/app/src/main/java/com/gh/common/util/DataUtils.java +++ b/app/src/main/java/com/gh/common/util/DataUtils.java @@ -195,7 +195,7 @@ public class DataUtils { */ @SuppressLint("CheckResult") public static void getDeviceCertification(String gid) { - RetrofitManager.getInstance(HaloApp.getInstance()) + RetrofitManager.getInstance() .getApi() .getCertification() .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java index 2ffe52d506..57b6d62e86 100644 --- a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java +++ b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java @@ -115,7 +115,7 @@ public class DetailDownloadUtils { } if (isCheck && viewHolder.gameEntity.getApk().size() == 1) { String url = viewHolder.gameEntity.getApk().get(0).getUrl(); - DownloadEntity downloadEntity = DownloadManager.getInstance(viewHolder.context).getDownloadEntityByUrl(url); + DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntityByUrl(url); if (downloadEntity != null) { viewHolder.downloadEntity = downloadEntity; detailInvalidate(viewHolder); diff --git a/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt b/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt index cd181e700c..71f9b6d264 100644 --- a/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt +++ b/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt @@ -23,7 +23,7 @@ object DeviceTokenUtils { @Synchronized fun syncServerTime(context: Context) { val sp = PreferenceManager.getDefaultSharedPreferences(context) - RetrofitManager.getInstance(context).api.time + RetrofitManager.getInstance().api.time .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : Response() { diff --git a/app/src/main/java/com/gh/common/util/DirectUtils.kt b/app/src/main/java/com/gh/common/util/DirectUtils.kt index 8e8295e90f..227fd57ac2 100644 --- a/app/src/main/java/com/gh/common/util/DirectUtils.kt +++ b/app/src/main/java/com/gh/common/util/DirectUtils.kt @@ -1244,7 +1244,7 @@ object DirectUtils { @JvmStatic fun directGameZone(context: Context, gameId: String, url: String, entrance: String? = null) { - RetrofitManager.getInstance(HaloApp.getInstance().application) + RetrofitManager.getInstance() .api .getGameDigest(gameId) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/common/util/DownloadHelper.kt b/app/src/main/java/com/gh/common/util/DownloadHelper.kt index b271ab8594..6d74482b26 100644 --- a/app/src/main/java/com/gh/common/util/DownloadHelper.kt +++ b/app/src/main/java/com/gh/common/util/DownloadHelper.kt @@ -23,7 +23,7 @@ object DownloadHelper { return } - RetrofitManager.getInstance(HaloApp.getInstance().application) + RetrofitManager.getInstance() .api .getGameDigest(gameId) .map(ApkActiveUtils.filterMapper) diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt b/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt index a28e9fc01c..798ed485e6 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt @@ -61,10 +61,10 @@ object DownloadItemUtils { adapter?.notifyItemChanged(index) return } - var queue = DownloadManager.getInstance(context).getQueue(downloadEntity.name) + var queue = DownloadManager.getInstance().getQueue(downloadEntity.name) if (queue == null) { queue = LinkedBlockingQueue() - DownloadManager.getInstance(context).putQueue(downloadEntity.name, queue) + DownloadManager.getInstance().putQueue(downloadEntity.name, queue) } val platform = downloadEntity.platform val entryMap: ArrayMap @@ -87,14 +87,14 @@ object DownloadItemUtils { val msg = Message.obtain() msg.obj = downloadEntity.name msg.what = DownloadConfig.DOWNLOAD_ROLL - DownloadManager.getInstance(context).sendMessageDelayed(msg, 3000) + DownloadManager.getInstance().sendMessageDelayed(msg, 3000) } } if (platform != null && platform == queue.peek()) { entryMap = ArrayMap() gameEntity.setEntryMap(entryMap) entryMap[platform] = downloadEntity - if (DownloadStatus.pause != DownloadManager.getInstance(context).getStatus(downloadEntity.url)) { + if (DownloadStatus.pause != DownloadManager.getInstance().getStatus(downloadEntity.url)) { adapter?.notifyItemChanged(index) } } @@ -220,7 +220,7 @@ object DownloadItemUtils { } } } else if (gameEntity.getApk().size == 1) { - val downloadEntity = DownloadManager.getInstance(context).getDownloadEntitySnapshotByUrl(gameEntity.getApk()[0].url) + val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByUrl(gameEntity.getApk()[0].url) if (downloadEntity != null) { downloadBtn.apply { val status = downloadEntity.status @@ -302,7 +302,7 @@ object DownloadItemUtils { ) { val entryMap = gameEntity.getEntryMap() if (entryMap.isNotEmpty()) { - val queue = DownloadManager.getInstance(context).getQueue(gameEntity.name) + val queue = DownloadManager.getInstance().getQueue(gameEntity.name) val downloadEntity = if (queue != null && !queue.isEmpty()) { entryMap[queue.peek()] } else { @@ -327,7 +327,7 @@ object DownloadItemUtils { val platform = PlatformUtils.getInstance(context).getPlatformName(downloadEntity.platform) val status = downloadEntity.status if (status == DownloadStatus.downloading) { - if (DownloadStatus.pause != DownloadManager.getInstance(context).getStatus(downloadEntity.url)) { + if (DownloadStatus.pause != DownloadManager.getInstance().getStatus(downloadEntity.url)) { holder.gameProgressbar.progress = (downloadEntity.percent * 10).toInt() if (isShowPlatform && platform != null) { holder.gameDownloadSpeed.text = String.format( @@ -824,13 +824,13 @@ object DownloadItemUtils { adapter: RecyclerView.Adapter?, refreshCallback: EmptyCallback? ) { val apkEntity = gameEntity.getApk()[0] - val downloadEntity = DownloadManager.getInstance(context).getDownloadEntitySnapshotByUrl(apkEntity.url) + val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByUrl(apkEntity.url) if (downloadEntity != null) { val path = downloadEntity.path when { FileUtils.isEmptyFile(path) -> { Utils.toast(context, R.string.install_failure_hint) - DownloadManager.getInstance(context).cancel(downloadEntity.url) + DownloadManager.getInstance().cancel(downloadEntity.url) gameEntity.getEntryMap().remove(apkEntity.getPlatform()) adapter?.notifyItemChanged(position) refreshCallback?.onCallback() diff --git a/app/src/main/java/com/gh/common/util/DownloadObserver.kt b/app/src/main/java/com/gh/common/util/DownloadObserver.kt index 6e0b3b0aea..9f53d49d4a 100644 --- a/app/src/main/java/com/gh/common/util/DownloadObserver.kt +++ b/app/src/main/java/com/gh/common/util/DownloadObserver.kt @@ -51,7 +51,7 @@ object DownloadObserver { if (!xapkStatus.isNullOrEmpty()) return val gameId = downloadEntity.gameId - val downloadManager = DownloadManager.getInstance(HaloApp.getInstance().application) + val downloadManager = DownloadManager.getInstance() tryCatchInRelease { DownloadDataHelper.uploadDownloadEvent(downloadEntity) @@ -208,7 +208,7 @@ object DownloadObserver { DialogUtils.showSimulatorParseErrorDialog(currentActivity, downloadEntity.gameId, downloadEntity.name) { val simulator = HaloApp.get(downloadEntity.name, true) as? SimulatorEntity ?: return@showSimulatorParseErrorDialog - DownloadManager.getInstance(currentActivity).cancel(downloadEntity.url, true, true) + DownloadManager.getInstance().cancel(downloadEntity.url, true, true) SimulatorDownloadManager.getInstance().showDownloadDialog(currentActivity, simulator, SimulatorDownloadManager.SimulatorLocation.SIMULATOR_GAME) } } @@ -231,7 +231,7 @@ object DownloadObserver { } // 添加观察者 - DownloadManager.getInstance(mApplication).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) } @@ -283,7 +283,7 @@ object DownloadObserver { private fun processHijack(downloadEntity: DownloadEntity) { // 删除任务 downloadEntity.status = DownloadStatus.cancel - DownloadManager.getInstance(mApplication).cancel(downloadEntity.url) + DownloadManager.getInstance().cancel(downloadEntity.url) // 弹出提示框 EventBus.getDefault().post(EBShowDialog(BaseActivity.DOWNLOAD_HIJACK)) // 记录链接被劫持 @@ -299,7 +299,7 @@ object DownloadObserver { params["platform"] = platform ?: "" val body = RequestBody.create(MediaType.parse("application/json"), JSONObject(params as Map<*, *>).toString()) - RetrofitManager.getInstance(mApplication).api.postDownload(body) + RetrofitManager.getInstance().api.postDownload(body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(Response()) diff --git a/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt b/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt index 2fac2b583c..cd1930ba7d 100644 --- a/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt +++ b/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt @@ -84,7 +84,7 @@ object EnergyTaskHelper { debugOnly { Utils.log("EnergyTaskHelper -> $taskParams") } val body = RequestBody.create(MediaType.parse("application/json"), taskParams.toString()) - RetrofitManager.getInstance(HaloApp.getInstance().application) + RetrofitManager.getInstance() .api.postEnergyTask(UserManager.getInstance().userId, body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -112,7 +112,7 @@ object EnergyTaskHelper { debugOnly { Utils.log("EnergyTaskHelper -> $taskParams") } val body = RequestBody.create(MediaType.parse("application/json"), taskParams.toString()) - RetrofitManager.getInstance(HaloApp.getInstance().application) + RetrofitManager.getInstance() .api.postEnergyTask(UserManager.getInstance().userId, body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/common/util/GameSubstituteRepositoryHelper.kt b/app/src/main/java/com/gh/common/util/GameSubstituteRepositoryHelper.kt index 87518fef9e..2e91849c84 100644 --- a/app/src/main/java/com/gh/common/util/GameSubstituteRepositoryHelper.kt +++ b/app/src/main/java/com/gh/common/util/GameSubstituteRepositoryHelper.kt @@ -20,7 +20,7 @@ object GameSubstituteRepositoryHelper { private const val KEY_GAME_REPOSITORY = "game_substitute_repository" private var mSubstitutableGameIdSet = hashSetOf() - private var mApi = RetrofitManager.getInstance(HaloApp.getInstance().application).api + private var mApi = RetrofitManager.getInstance().api private var mApplicationContext = HaloApp.getInstance().application var gameCollectionList: List = arrayListOf() diff --git a/app/src/main/java/com/gh/common/util/GameUtils.java b/app/src/main/java/com/gh/common/util/GameUtils.java index dca9517419..c34fec1135 100644 --- a/app/src/main/java/com/gh/common/util/GameUtils.java +++ b/app/src/main/java/com/gh/common/util/GameUtils.java @@ -105,7 +105,7 @@ public class GameUtils { } } - downloadEntity = DownloadManager.getInstance(context).getDownloadEntitySnapshotByUrl(apkEntity.getUrl()); + downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByUrl(apkEntity.getUrl()); if (downloadEntity != null) { if (downloadEntity.getStatus().equals(DownloadStatus.done)) { doneCount++; @@ -191,7 +191,7 @@ public class GameUtils { } } - downloadEntity = DownloadManager.getInstance(context).getDownloadEntitySnapshotByUrl(apkEntity.getUrl()); + downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByUrl(apkEntity.getUrl()); if (downloadEntity != null) { if (downloadEntity.getStatus().equals(DownloadStatus.done)) { doneCount++; diff --git a/app/src/main/java/com/gh/common/util/HomePluggableHelper.kt b/app/src/main/java/com/gh/common/util/HomePluggableHelper.kt index 6d3ccef881..5e9f1afdf6 100644 --- a/app/src/main/java/com/gh/common/util/HomePluggableHelper.kt +++ b/app/src/main/java/com/gh/common/util/HomePluggableHelper.kt @@ -10,7 +10,7 @@ import com.halo.assistant.HaloApp */ object HomePluggableHelper { - private val mHomePluggableFilterDao = AppDatabase.getInstance(HaloApp.getInstance().application).homePluggableFilterDao() + private val mHomePluggableFilterDao = AppDatabase.getInstance().homePluggableFilterDao() @JvmStatic fun setHomePluggableFilterData(gameEntity: GameEntity, isNever: Boolean) { diff --git a/app/src/main/java/com/gh/common/util/InstallUtils.java b/app/src/main/java/com/gh/common/util/InstallUtils.java index be29816cc7..bce4c45999 100644 --- a/app/src/main/java/com/gh/common/util/InstallUtils.java +++ b/app/src/main/java/com/gh/common/util/InstallUtils.java @@ -11,6 +11,7 @@ import android.text.TextUtils; import com.gh.download.DownloadManager; import com.gh.gamecenter.eventbus.EBPackage; +import com.halo.assistant.HaloApp; import com.lightgame.download.DownloadEntity; import org.greenrobot.eventbus.EventBus; @@ -33,12 +34,13 @@ public class InstallUtils { private static Map installMap; private static Map uninstallMap; - private static volatile InstallUtils mInstance; private PackageManager packageManager; private Handler handler; private boolean isRunning; - private InstallUtils(Context context) { + private InstallUtils() { + Context context = HaloApp.getInstance().getApplicationContext(); + isRunning = false; packageManager = context.getPackageManager(); @@ -63,7 +65,7 @@ public class InstallUtils { } else if (list.contains(packageName)) { keys.add(packageName); - DownloadEntity downloadEntity = DownloadManager.getInstance(context).getDownloadEntityByPackageName(packageName); + DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntityByPackageName(packageName); String installVersion = PackageUtils.getVersionNameByPackageName(packageName); if (!TextUtils.isEmpty(installVersion) && downloadEntity != null && installVersion.equals(downloadEntity.getVersionName())) { @@ -103,15 +105,8 @@ public class InstallUtils { }; } - public static InstallUtils getInstance(Context context) { - if (mInstance == null) { - synchronized (InstallUtils.class) { - if (mInstance == null) { - mInstance = new InstallUtils(context.getApplicationContext()); - } - } - } - return mInstance; + public static InstallUtils getInstance() { + return SingletonHolder.INSTANCE; } public void addInstall(String packageName) { @@ -153,4 +148,7 @@ public class InstallUtils { } } + private static class SingletonHolder { + private static final InstallUtils INSTANCE = new InstallUtils(); + } } diff --git a/app/src/main/java/com/gh/common/util/LibaoUtils.java b/app/src/main/java/com/gh/common/util/LibaoUtils.java index 078c30e509..fcac135c3c 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -80,9 +80,9 @@ public class LibaoUtils { Observable observable; if (!TextUtils.isEmpty(captchaCode)) { - observable = RetrofitManager.getInstance(context).getApi().postLibaoLing(captchaCode, libaoId); + observable = RetrofitManager.getInstance().getApi().postLibaoLing(captchaCode, libaoId); } else { - observable = RetrofitManager.getInstance(context).getApi().postLibaoLing(libaoId); + observable = RetrofitManager.getInstance().getApi().postLibaoLing(libaoId); } observable.subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -104,7 +104,7 @@ public class LibaoUtils { private static void postLibaoTao(final Context context, final String libaoId, final PostLibaoListener listener) { - RetrofitManager.getInstance(context).getApi().postLibaoTao(libaoId) + RetrofitManager.getInstance().getApi().postLibaoTao(libaoId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new JSONObjectResponse() { @@ -122,7 +122,7 @@ public class LibaoUtils { public static void deleteLibaoCode(final Context context, final String code, final PostLibaoListener listener) { - RetrofitManager.getInstance(context).getApi().deleteLibaoCode(UserManager.getInstance().getUserId(), code) + RetrofitManager.getInstance().getApi().deleteLibaoCode(UserManager.getInstance().getUserId(), code) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -139,7 +139,7 @@ public class LibaoUtils { } public static void getLibaoStatus(Context context, String ids, final PostLibaoListener listener) { - RetrofitManager.getInstance(context).getApi().getLibaoStatus(UrlFilterUtils.getFilterQuery("libao_ids", ids)) + RetrofitManager.getInstance().getApi().getLibaoStatus(UrlFilterUtils.getFilterQuery("libao_ids", ids)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { diff --git a/app/src/main/java/com/gh/common/util/LogUtils.java b/app/src/main/java/com/gh/common/util/LogUtils.java index 259493edfd..b7d2fd2a14 100644 --- a/app/src/main/java/com/gh/common/util/LogUtils.java +++ b/app/src/main/java/com/gh/common/util/LogUtils.java @@ -580,7 +580,7 @@ public class LogUtils { ShareResultEntity entity = new ShareResultEntity(new ShareResultEntity.Content(url, title, summary), shareType, shareResult); RequestBody body = RequestBody.create(MediaType.parse("application/json"), GsonUtils.toJson(entity)); - RetrofitManager.getInstance(HaloApp.getInstance().getApplication()).getApi() + RetrofitManager.getInstance().getApi() .postShareResult(body) .subscribeOn(Schedulers.io()) .subscribe(new EmptyResponse<>()); diff --git a/app/src/main/java/com/gh/common/util/LoginUtils.java b/app/src/main/java/com/gh/common/util/LoginUtils.java index 221c2aa848..1cb900a942 100644 --- a/app/src/main/java/com/gh/common/util/LoginUtils.java +++ b/app/src/main/java/com/gh/common/util/LoginUtils.java @@ -35,7 +35,7 @@ public class LoginUtils { } RequestBody body = RequestBody.create(MediaType.parse("application/json"), content.toString()); - RetrofitManager.getInstance(context) + RetrofitManager.getInstance() .getApi() .loginByCaptcha(body) .subscribeOn(Schedulers.io()) @@ -82,7 +82,7 @@ public class LoginUtils { // 注销登录 public static void logout(final Context context, final OnLogoutListener listener) { - RetrofitManager.getInstance(context) + RetrofitManager.getInstance() .getApi() .logout() .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/common/util/NewLogUtils.kt b/app/src/main/java/com/gh/common/util/NewLogUtils.kt index 1ceb71e44b..f1f909a2ad 100644 --- a/app/src/main/java/com/gh/common/util/NewLogUtils.kt +++ b/app/src/main/java/com/gh/common/util/NewLogUtils.kt @@ -56,7 +56,7 @@ object NewLogUtils { Pair("content_type", contentType) ).createRequestBody() - RetrofitManager.getInstance(HaloApp.getInstance()) + RetrofitManager.getInstance() .api .postBrowses(requestBody) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/common/util/NewsUtils.java b/app/src/main/java/com/gh/common/util/NewsUtils.java index 253bad5a9f..deb917a059 100644 --- a/app/src/main/java/com/gh/common/util/NewsUtils.java +++ b/app/src/main/java/com/gh/common/util/NewsUtils.java @@ -49,7 +49,7 @@ public class NewsUtils { * 统计阅读量 */ public static void statNewsViews(Context context, String news_id) { - RetrofitManager.getInstance(context).getApi().postArticleVisit(news_id) + RetrofitManager.getInstance().getApi().postArticleVisit(news_id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response()); diff --git a/app/src/main/java/com/gh/common/util/OssUploadUtils.kt b/app/src/main/java/com/gh/common/util/OssUploadUtils.kt index 28f2d357e4..99fddac9ee 100644 --- a/app/src/main/java/com/gh/common/util/OssUploadUtils.kt +++ b/app/src/main/java/com/gh/common/util/OssUploadUtils.kt @@ -26,7 +26,7 @@ object OssUploadUtils { //获取Oss配置 private fun getOssUpdateConfig(type: UploadType): Single { - return RetrofitManager.getInstance(HaloApp.getInstance().application) + return RetrofitManager.getInstance() .api .getOssUpdateConfig(type.value) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/common/util/PackageInstaller.kt b/app/src/main/java/com/gh/common/util/PackageInstaller.kt index 67e8d4cbae..58fc319b33 100644 --- a/app/src/main/java/com/gh/common/util/PackageInstaller.kt +++ b/app/src/main/java/com/gh/common/util/PackageInstaller.kt @@ -91,7 +91,7 @@ object PackageInstaller { HaloApp.put(Constants.LAST_INSTALL_GAME, pkgPath) val downloadEntity = - DownloadManager.getInstance(app).allDownloadEntity.firstOrNull { + DownloadManager.getInstance().allDownloadEntity.firstOrNull { it.path == pkgPath } // if (downloadEntity != null) { @@ -121,7 +121,7 @@ object PackageInstaller { fun showCertificateDialogIfNeededBeforeInstall(context: Context, downloadEntity: DownloadEntity, pkgPath: String) { val isOverwrite = LunchType.UPDATE.name == SPUtils.getString(Constants.SP_INSTALL_TYPE) val hashMap = hashMapOf(Pair("url", downloadEntity.url), Pair("overwrite", isOverwrite)) - RetrofitManager.getInstance(context).api.postCertificationCheck(hashMap.toRequestBody()) + RetrofitManager.getInstance().api.postCertificationCheck(hashMap.toRequestBody()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : BiResponse() { @@ -192,7 +192,7 @@ object PackageInstaller { } installIntent.setDataAndType(uri, "application/vnd.android.package-archive") } - InstallUtils.getInstance(context) + InstallUtils.getInstance() .addInstall(PackageUtils.getPackageNameByPath(context, path)) return installIntent } @@ -221,7 +221,7 @@ object PackageInstaller { uninstallIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) } uninstallIntent.data = Uri.parse("package:$pkn") - InstallUtils.getInstance(context).addUninstall(pkn) + InstallUtils.getInstance().addUninstall(pkn) context.startActivity(uninstallIntent) } diff --git a/app/src/main/java/com/gh/common/util/PackageUtils.java b/app/src/main/java/com/gh/common/util/PackageUtils.java index ac9d4d16e5..a1aabf7050 100644 --- a/app/src/main/java/com/gh/common/util/PackageUtils.java +++ b/app/src/main/java/com/gh/common/util/PackageUtils.java @@ -388,7 +388,7 @@ public class PackageUtils { uninstallIntent.addCategory(Intent.CATEGORY_DEFAULT); String packageName = getPackageNameByPath(context, path); uninstallIntent.setData(Uri.parse("package:" + packageName)); - InstallUtils.getInstance(context).addUninstall(packageName); + InstallUtils.getInstance().addUninstall(packageName); return uninstallIntent; } diff --git a/app/src/main/java/com/gh/common/util/PlatformUtils.java b/app/src/main/java/com/gh/common/util/PlatformUtils.java index 69a141bcf9..089513c36e 100644 --- a/app/src/main/java/com/gh/common/util/PlatformUtils.java +++ b/app/src/main/java/com/gh/common/util/PlatformUtils.java @@ -201,7 +201,7 @@ public class PlatformUtils { return; } isUpdate = true; - RetrofitManager.getInstance(context) + RetrofitManager.getInstance() .getApi() .getGamePlatform() .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/common/util/PostCommentUtils.java b/app/src/main/java/com/gh/common/util/PostCommentUtils.java index 7001a34262..4168fab90e 100644 --- a/app/src/main/java/com/gh/common/util/PostCommentUtils.java +++ b/app/src/main/java/com/gh/common/util/PostCommentUtils.java @@ -46,9 +46,9 @@ public class PostCommentUtils { RequestBody body = RequestBody.create(MediaType.parse("application/json"), content.toString()); Observable observable; if (commentEntity != null) { - observable = RetrofitManager.getInstance(context).getApi().postReplyComment(commentEntity.getId(), body); + observable = RetrofitManager.getInstance().getApi().postReplyComment(commentEntity.getId(), body); } else { - observable = RetrofitManager.getInstance(context).getApi().postNewsComment(newsId, body); + observable = RetrofitManager.getInstance().getApi().postNewsComment(newsId, body); } observable.subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -81,16 +81,16 @@ public class PostCommentUtils { Observable observable; if (!TextUtils.isEmpty(articleId)) { if (commentEntity != null) { - observable = RetrofitManager.getInstance(context).getApi().postReplyToCommunityArticleComment(articleCommunityId, + observable = RetrofitManager.getInstance().getApi().postReplyToCommunityArticleComment(articleCommunityId, articleId, commentEntity.getId(), body); } else { - observable = RetrofitManager.getInstance(context).getApi().postCommentToCommunityArticle(articleCommunityId, articleId, body); + observable = RetrofitManager.getInstance().getApi().postCommentToCommunityArticle(articleCommunityId, articleId, body); } } else { if (commentEntity != null) { - observable = RetrofitManager.getInstance(context).getApi().postReplyToAnswerComment(answerId, commentEntity.getId(), body); + observable = RetrofitManager.getInstance().getApi().postReplyToAnswerComment(answerId, commentEntity.getId(), body); } else { - observable = RetrofitManager.getInstance(context).getApi().postNewCommentToAnswer(answerId, body); + observable = RetrofitManager.getInstance().getApi().postNewCommentToAnswer(answerId, body); } } observable.subscribeOn(Schedulers.io()) @@ -124,13 +124,13 @@ public class PostCommentUtils { Observable observable; if (!TextUtils.isEmpty(answerId)) { - observable = RetrofitManager.getInstance(context).getApi().postVoteAnswerComment(answerId, commentId); + observable = RetrofitManager.getInstance().getApi().postVoteAnswerComment(answerId, commentId); } else if (!TextUtils.isEmpty(articleId)) { - observable = RetrofitManager.getInstance(context).getApi().postVoteCommunityArticleComment(articleCommunityId, articleId, commentId); + observable = RetrofitManager.getInstance().getApi().postVoteCommunityArticleComment(articleCommunityId, articleId, commentId); } else if (!TextUtils.isEmpty(questionId)) { - observable = RetrofitManager.getInstance(context).getApi().postVoteQuestionComment(questionId, commentId); + observable = RetrofitManager.getInstance().getApi().postVoteQuestionComment(questionId, commentId); } else { - observable = RetrofitManager.getInstance(context).getApi().postVoteToVideo(videoId, commentId); + observable = RetrofitManager.getInstance().getApi().postVoteToVideo(videoId, commentId); } observable .subscribeOn(Schedulers.io()) @@ -154,7 +154,7 @@ public class PostCommentUtils { public static void addCommentVote(final Context context, final String commentId, final PostCommentListener listener) { - RetrofitManager.getInstance(context).getApi() + RetrofitManager.getInstance().getApi() .postCommentVote(commentId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -178,7 +178,7 @@ public class PostCommentUtils { public static void addReportData(final Context context, final String commentId, final String reportData, final PostCommentListener listener) { RequestBody body = RequestBody.create(MediaType.parse("application/json"), reportData); - RetrofitManager.getInstance(context).getApi() + RetrofitManager.getInstance().getApi() .postReportData(commentId, body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -198,7 +198,7 @@ public class PostCommentUtils { public static void postAnswerReportData(final Context context, final String commentId, final String answerId, final String reportData, final PostCommentListener listener) { RequestBody body = RequestBody.create(MediaType.parse("application/json"), reportData); - RetrofitManager.getInstance(context).getApi() + RetrofitManager.getInstance().getApi() .postReportOfAnswerComment(answerId, commentId, body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -222,7 +222,7 @@ public class PostCommentUtils { final String reportData, final PostCommentListener listener) { RequestBody body = RequestBody.create(MediaType.parse("application/json"), reportData); - RetrofitManager.getInstance(context).getApi() + RetrofitManager.getInstance().getApi() .postCommunityArticleCommentReport(communityId, articleId, commentId, body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -245,7 +245,7 @@ public class PostCommentUtils { final String reportData, final PostCommentListener listener) { RequestBody body = RequestBody.create(MediaType.parse("application/json"), reportData); - RetrofitManager.getInstance(context).getApi() + RetrofitManager.getInstance().getApi() .postVideoCommentReport(videoId, commentId, body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -267,7 +267,7 @@ public class PostCommentUtils { final String reportData, final PostCommentListener listener) { RequestBody body = RequestBody.create(MediaType.parse("application/json"), reportData); - RetrofitManager.getInstance(context).getApi() + RetrofitManager.getInstance().getApi() .postQuestionCommentReport(questionId, commentId, body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -290,7 +290,7 @@ public class PostCommentUtils { final String reportData, final PostCommentListener listener) { RequestBody body = RequestBody.create(MediaType.parse("application/json"), reportData); - RetrofitManager.getInstance(context).getApi() + RetrofitManager.getInstance().getApi() .reportGameCollectionComment(gameCollectionId, commentId, body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/common/util/PushHelper.kt b/app/src/main/java/com/gh/common/util/PushHelper.kt index b50011dedf..486344701d 100644 --- a/app/src/main/java/com/gh/common/util/PushHelper.kt +++ b/app/src/main/java/com/gh/common/util/PushHelper.kt @@ -37,7 +37,7 @@ // // val body = RequestBody.create(MediaType.parse("application/json"), clickEventList.toJson()) // -// RetrofitManager.getInstance(context) +// RetrofitManager.getInstance() // .api // .postUmengReceiveInfo(body) // .subscribeOn(Schedulers.io()) @@ -64,7 +64,7 @@ // jsonObject.put("type", type) // val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()) // -// RetrofitManager.getInstance(context) +// RetrofitManager.getInstance() // .api // .postMessageRead(UserManager.getInstance().userId, notificationMessageId, body) // .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/common/util/QuickLoginHelper.kt b/app/src/main/java/com/gh/common/util/QuickLoginHelper.kt index 70af443e22..13b02e9a1c 100644 --- a/app/src/main/java/com/gh/common/util/QuickLoginHelper.kt +++ b/app/src/main/java/com/gh/common/util/QuickLoginHelper.kt @@ -216,7 +216,7 @@ object QuickLoginHelper { params["token"] = mToken // 4.请求登录接口 - UserRepository.getInstance(context).login( + UserRepository.getInstance().login( JSONObject(params as Map<*, *>), LoginTag.oauth, object : BiCallback> { diff --git a/app/src/main/java/com/gh/common/util/RealNameHelper.kt b/app/src/main/java/com/gh/common/util/RealNameHelper.kt index 9b2b2ee20d..2d3b56032e 100644 --- a/app/src/main/java/com/gh/common/util/RealNameHelper.kt +++ b/app/src/main/java/com/gh/common/util/RealNameHelper.kt @@ -48,7 +48,7 @@ object RealNameHelper { ) } if (downloadEntity.status != DownloadStatus.done) { - DownloadManager.getInstance(HaloApp.getInstance()) + DownloadManager.getInstance() .addInvisiblePendingTask(downloadEntity) } } @@ -97,7 +97,7 @@ object RealNameHelper { cancelClickCallback = { NewLogUtils.logCertificationHintDialogOptionsClicked("取消") if (!isForced) { - DownloadManager.getInstance(HaloApp.getInstance()) + DownloadManager.getInstance() .resumeAllInvisiblePendingTask() } } @@ -106,14 +106,14 @@ object RealNameHelper { dialog?.setOnCancelListener { NewLogUtils.logCertificationHintDialogOptionsClicked("取消") if (!isForced) { - DownloadManager.getInstance(HaloApp.getInstance()) + DownloadManager.getInstance() .resumeAllInvisiblePendingTask() } } } if (downloadEntity.status != DownloadStatus.done) { - DownloadManager.getInstance(HaloApp.getInstance()) + DownloadManager.getInstance() .addInvisiblePendingTask(downloadEntity) } diff --git a/app/src/main/java/com/gh/common/util/ReservationHelper.kt b/app/src/main/java/com/gh/common/util/ReservationHelper.kt index 3caa02625b..b805ec4ce8 100644 --- a/app/src/main/java/com/gh/common/util/ReservationHelper.kt +++ b/app/src/main/java/com/gh/common/util/ReservationHelper.kt @@ -26,7 +26,7 @@ object ReservationHelper { @SuppressLint("CheckResult") private fun deleteOrCancelReservation(game: GameEntity, deleteReservation: Boolean, refreshCallback: EmptyCallback) { - val retrofit = RetrofitManager.getInstance(HaloApp.getInstance().application) + val retrofit = RetrofitManager.getInstance() val requestMap = hashMapOf() requestMap["game_id"] = game.id diff --git a/app/src/main/java/com/gh/common/util/SimpleRequestHelper.kt b/app/src/main/java/com/gh/common/util/SimpleRequestHelper.kt index bf9f29fc20..98b94f2e32 100644 --- a/app/src/main/java/com/gh/common/util/SimpleRequestHelper.kt +++ b/app/src/main/java/com/gh/common/util/SimpleRequestHelper.kt @@ -14,7 +14,7 @@ import retrofit2.HttpException * 可以在此类发送一些无关页面操作的请求 */ object SimpleRequestHelper { - private val mApi = RetrofitManager.getInstance(HaloApp.getInstance().application).api + private val mApi = RetrofitManager.getInstance().api fun reportGameComment(gameId: String, commentId: String, type: String) { val map = HashMap() diff --git a/app/src/main/java/com/gh/common/util/TagUtils.java b/app/src/main/java/com/gh/common/util/TagUtils.java index ede2ff6f78..c75bc3b639 100644 --- a/app/src/main/java/com/gh/common/util/TagUtils.java +++ b/app/src/main/java/com/gh/common/util/TagUtils.java @@ -66,7 +66,7 @@ public class TagUtils { return; } isUpdate = true; - RetrofitManager.getInstance(context).getApi().getTags() + RetrofitManager.getInstance().getApi().getTags() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { diff --git a/app/src/main/java/com/gh/common/util/UploadImageUtils.kt b/app/src/main/java/com/gh/common/util/UploadImageUtils.kt index 16bdf7ba8b..d1259fdcd9 100644 --- a/app/src/main/java/com/gh/common/util/UploadImageUtils.kt +++ b/app/src/main/java/com/gh/common/util/UploadImageUtils.kt @@ -51,7 +51,7 @@ object UploadImageUtils { }) val part = MultipartBody.Part.createFormData("Filedata", getFileName(compressFile), requestBody) - return@flatMap RetrofitManager.getInstance(HaloApp.getInstance().application).uploadApi.uploadImage(part, type.name) + return@flatMap RetrofitManager.getInstance().uploadApi.uploadImage(part, type.name) } .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -87,7 +87,7 @@ object UploadImageUtils { }) val part = MultipartBody.Part.createFormData("Filedata", getFileName(compressFile), requestBody) - return@flatMap RetrofitManager.getInstance(HaloApp.getInstance().application).uploadApi.uploadImage(part, type.name) + return@flatMap RetrofitManager.getInstance().uploadApi.uploadImage(part, type.name) } .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -134,7 +134,7 @@ object UploadImageUtils { } }) val part = MultipartBody.Part.createFormData("Filedata", getFileName(img), requestBody) - RetrofitManager.getInstance(HaloApp.getInstance().application) + RetrofitManager.getInstance() .uploadApi.uploadImage(part, type.name) .subscribe(object : BiResponse() { override fun onSuccess(data: ResponseBody) { @@ -212,7 +212,7 @@ object UploadImageUtils { } }) val part = MultipartBody.Part.createFormData("Filedata", getFileName(file), requestBody) - RetrofitManager.getInstance(HaloApp.getInstance().application) + RetrofitManager.getInstance() .uploadApi.uploadImage(part, type.name) .subscribe(object : BiResponse() { override fun onSuccess(data: ResponseBody) { diff --git a/app/src/main/java/com/gh/common/util/UsageStatsHelper.kt b/app/src/main/java/com/gh/common/util/UsageStatsHelper.kt index 5602a024a3..270d781655 100644 --- a/app/src/main/java/com/gh/common/util/UsageStatsHelper.kt +++ b/app/src/main/java/com/gh/common/util/UsageStatsHelper.kt @@ -48,7 +48,7 @@ object UsageStatsHelper { const val USAGE_STATUS_REQUEST_CODE = 233 const val USAGE_STATUS_SP_KEY = "usage_status_sp_key" - private val mApi = RetrofitManager.getInstance(HaloApp.getInstance().application).api + private val mApi = RetrofitManager.getInstance().api private val mPreference = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().application) /** diff --git a/app/src/main/java/com/gh/common/videolog/VideoRecordUtils.kt b/app/src/main/java/com/gh/common/videolog/VideoRecordUtils.kt index 3f26d55470..362e50db98 100644 --- a/app/src/main/java/com/gh/common/videolog/VideoRecordUtils.kt +++ b/app/src/main/java/com/gh/common/videolog/VideoRecordUtils.kt @@ -22,7 +22,7 @@ object VideoRecordUtils { private val videoRecordSet by lazy { hashSetOf() } private var videoRecordExecutor: ExecutorService? = null - private val videoRecordDao by lazy { AppDatabase.getInstance(mApplication).videoRecordDao() } + private val videoRecordDao by lazy { AppDatabase.getInstance().videoRecordDao() } @JvmStatic fun init(application: Application, executor : ExecutorService) { @@ -77,7 +77,7 @@ object VideoRecordUtils { requestMap["g_id"] = HaloApp.getInstance().gid ?: "" requestMap["time"] = time requestMap["video_id"] = videoIds - RetrofitManager.getInstance(HaloApp.getInstance().application).api + RetrofitManager.getInstance().api .uploadVideoLog(requestMap.toRequestBody()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/common/xapk/XapkInstaller.kt b/app/src/main/java/com/gh/common/xapk/XapkInstaller.kt index e0acc015f1..003eabc464 100644 --- a/app/src/main/java/com/gh/common/xapk/XapkInstaller.kt +++ b/app/src/main/java/com/gh/common/xapk/XapkInstaller.kt @@ -87,7 +87,7 @@ object XapkInstaller : IXapkUnzipListener { override fun onNext(downloadEntity: DownloadEntity, unzipPath: String) { if (PACKAGE_EXTENSION_NAME == unzipPath.getExtension()) { downloadEntity.meta[XAPK_PACKAGE_PATH_TAG] = unzipPath - DownloadManager.getInstance(mContext).updateDownloadEntity(downloadEntity) + DownloadManager.getInstance().updateDownloadEntity(downloadEntity) } debugOnly { @@ -107,7 +107,7 @@ object XapkInstaller : IXapkUnzipListener { downloadEntity.meta[XAPK_UNZIP_PERCENT] = "0.0" downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.CANCEL.name DataChanger.notifyDataChanged(downloadEntity) - DownloadManager.getInstance(mContext).updateDownloadEntity(downloadEntity) + DownloadManager.getInstance().updateDownloadEntity(downloadEntity) } } @@ -118,7 +118,7 @@ object XapkInstaller : IXapkUnzipListener { downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.FAILURE.name DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity) DataChanger.notifyDataChanged(downloadEntity) - DownloadManager.getInstance(mContext).updateDownloadEntity(downloadEntity) + DownloadManager.getInstance().updateDownloadEntity(downloadEntity) } // 仅官网渠道上报 XAPK 异常信息 @@ -152,7 +152,7 @@ object XapkInstaller : IXapkUnzipListener { downloadEntity.meta[XAPK_UNZIP_PERCENT] = "100.0" downloadEntity.meta[XAPK_UNZIP_STATUS] = XapkUnzipStatus.SUCCESS.name DataChanger.notifyDataChanged(downloadEntity) - DownloadManager.getInstance(mContext).updateDownloadEntity(downloadEntity) + DownloadManager.getInstance().updateDownloadEntity(downloadEntity) } debugOnly { diff --git a/app/src/main/java/com/gh/download/DownloadDataHelper.kt b/app/src/main/java/com/gh/download/DownloadDataHelper.kt index dc1bdf824d..7923706ea8 100644 --- a/app/src/main/java/com/gh/download/DownloadDataHelper.kt +++ b/app/src/main/java/com/gh/download/DownloadDataHelper.kt @@ -132,7 +132,7 @@ object DownloadDataHelper { if (startupTime != null) { uploadDownloadStartupTimeEvent(downloadEntity, startupTime.toInt()) downloadEntity.meta.remove(DownloadEntity.DOWNLOAD_STARTUP_TIME_KEY) - DownloadManager.getInstance(HaloApp.getInstance().application).updateDownloadEntity(downloadEntity) + DownloadManager.getInstance().updateDownloadEntity(downloadEntity) } } @@ -142,7 +142,7 @@ object DownloadDataHelper { if (downloadEntity.speed == 0L || time == null || size == null) { downloadEntity.meta[DOWNLOAD_SPEED_TIME] = System.currentTimeMillis().toString() downloadEntity.meta[DOWNLOAD_SPEED_SIZE] = downloadEntity.progress.toString() - DownloadManager.getInstance(HaloApp.getInstance().application).updateDownloadEntity(downloadEntity) + DownloadManager.getInstance().updateDownloadEntity(downloadEntity) } else { val offset = System.currentTimeMillis() - time.toLong() if (offset > 5000) { @@ -165,7 +165,7 @@ object DownloadDataHelper { } downloadEntity.meta[DOWNLOAD_SPEED_TIME] = System.currentTimeMillis().toString() downloadEntity.meta[DOWNLOAD_SPEED_SIZE] = downloadEntity.progress.toString() - DownloadManager.getInstance(HaloApp.getInstance().application).updateDownloadEntity(downloadEntity) + DownloadManager.getInstance().updateDownloadEntity(downloadEntity) } } } @@ -236,7 +236,7 @@ object DownloadDataHelper { if (downloadEntity.status == DownloadStatus.resume || downloadEntity.status == DownloadStatus.add) { downloadEntity.meta[DOWNLOAD_FIRST_START] = "NO" - DownloadManager.getInstance(HaloApp.getInstance().application).updateDownloadEntity(downloadEntity) + DownloadManager.getInstance().updateDownloadEntity(downloadEntity) } jsonObject.put("payload", payloadObject) } catch (e: Exception) { @@ -286,7 +286,7 @@ object DownloadDataHelper { * 请见:https://gitlab.ghzs.com/stats/stats-issues/-/issues/188#note_66919 */ fun uploadDownloadHeartbeat(upload: Boolean) { - val allDownloadEntity = DownloadManager.getInstance(HaloApp.getInstance().application).allDownloadEntity + val allDownloadEntity = DownloadManager.getInstance().allDownloadEntity for (downloadEntity in allDownloadEntity) { /** diff --git a/app/src/main/java/com/gh/download/DownloadManager.java b/app/src/main/java/com/gh/download/DownloadManager.java index fdb370341f..88986f6fdd 100644 --- a/app/src/main/java/com/gh/download/DownloadManager.java +++ b/app/src/main/java/com/gh/download/DownloadManager.java @@ -73,7 +73,6 @@ import java.util.concurrent.LinkedBlockingQueue; public class DownloadManager implements DownloadStatusListener { - private static volatile DownloadManager mInstance; private static final Gson gson = new Gson(); private static final String UPDATE_IS_READ_MARK = "update_is_read"; private static final String DOWNLOADING_IS_READ_MARK = "downloading_is_read"; @@ -107,7 +106,7 @@ public class DownloadManager implements DownloadStatusListener { status.setPluggable(entity.isPluggable()); EventBus.getDefault().post(status); - DownloadManager.getInstance(mContext).putStatus(entity.getUrl(), DownloadStatus.delete); + DownloadManager.getInstance().putStatus(entity.getUrl(), DownloadStatus.delete); downloadingMap.remove(entity.getUrl()); } @@ -152,8 +151,8 @@ public class DownloadManager implements DownloadStatusListener { } - private DownloadManager(Context context) { - mContext = context.getApplicationContext(); + private DownloadManager() { + mContext = HaloApp.getInstance().getApplicationContext(); mDownloadDao = DownloadDao.getInstance(mContext); mDownloadedGameIdAndPackageNameDao = new DownloadedGameIdAndPackageNameDao(); @@ -162,7 +161,7 @@ public class DownloadManager implements DownloadStatusListener { DownloadStatusManager.getInstance().registerTaskStatusListener(this); // 只有下载模块需要这坨东西，因此移动到这里初始化 - ConnectionUtils.initHttpsUrlConnection(context); + ConnectionUtils.initHttpsUrlConnection(mContext); updateDownloadMetaMap(); @@ -220,15 +219,8 @@ public class DownloadManager implements DownloadStatusListener { return downloadingMap; } - public static DownloadManager getInstance(Context context) { - if (mInstance == null) { - synchronized (DownloadManager.class) { - if (mInstance == null) { - mInstance = new DownloadManager(context.getApplicationContext()); - } - } - } - return mInstance; + public static DownloadManager getInstance() { + return SingletonHolder.INSTANCE; } /** @@ -360,10 +352,10 @@ public class DownloadManager implements DownloadStatusListener { downloadEntity.setExposureTrace(gson.toJson(downloadExposureEvent)); if (isSubscribe) { - DownloadManager.getInstance(context).subscribe(downloadEntity); + DownloadManager.getInstance().subscribe(downloadEntity); } else { HistoryHelper.insertGameEntity(gameEntity); - DownloadManager.getInstance(context).add(downloadEntity); + DownloadManager.getInstance().add(downloadEntity); } if (AppDebugConfig.IS_DEBUG) { @@ -371,9 +363,9 @@ public class DownloadManager implements DownloadStatusListener { } //TODO remove - DownloadManager.getInstance(context).putStatus(downloadEntity.getUrl(), DownloadStatus.downloading); + DownloadManager.getInstance().putStatus(downloadEntity.getUrl(), DownloadStatus.downloading); - DownloadManager.getInstance(context).markDownloadingTaskAsUnread(); + DownloadManager.getInstance().markDownloadingTaskAsUnread(); // 收集下载数据 DataCollectionUtils.uploadDownload(context, downloadEntity, "开始"); } @@ -875,15 +867,15 @@ public class DownloadManager implements DownloadStatusListener { public void checkAndRetryDownload() { if (!NetworkUtils.isWifiConnected(mContext)) return; - for (DownloadEntity downloadEntity : DownloadManager.getInstance(mContext).getAllDownloadEntityExcludeSilentUpdate()) { + for (DownloadEntity downloadEntity : DownloadManager.getInstance().getAllDownloadEntityExcludeSilentUpdate()) { if (DownloadStatus.neterror.equals(downloadEntity.getStatus()) || DownloadStatus.timeout.equals(downloadEntity.getStatus()) || DownloadStatus.subscribe.equals(downloadEntity.getStatus())) { - DownloadManager.getInstance(mContext).put(downloadEntity.getUrl(), System.currentTimeMillis()); + DownloadManager.getInstance().put(downloadEntity.getUrl(), System.currentTimeMillis()); Message msg = Message.obtain(); msg.what = DownloadConfig.CONTINUE_DOWNLOAD_AUTO_TASK; msg.obj = downloadEntity.getUrl(); - DownloadManager.getInstance(mContext).sendMessageDelayed(msg, 1000); + DownloadManager.getInstance().sendMessageDelayed(msg, 1000); } Utils.log("checkAndRetryDownload::" + downloadEntity.getStatus()); } @@ -1164,4 +1156,8 @@ public class DownloadManager implements DownloadStatusListener { HttpDnsManager.metaMap = map; } + + private static class SingletonHolder { + private static final DownloadManager INSTANCE = new DownloadManager(); + } } diff --git a/app/src/main/java/com/gh/download/DownloadWorker.kt b/app/src/main/java/com/gh/download/DownloadWorker.kt index a09a495844..f3635f0b90 100644 --- a/app/src/main/java/com/gh/download/DownloadWorker.kt +++ b/app/src/main/java/com/gh/download/DownloadWorker.kt @@ -10,7 +10,7 @@ class DownloadWorker(private val mContext: Context, workerParams: WorkerParamete override fun doWork(): Result { Utils.log("Let's try checkRetryDownload.") - DownloadManager.getInstance(mContext).checkAndRetryDownload() + DownloadManager.getInstance().checkAndRetryDownload() return Result.success() } diff --git a/app/src/main/java/com/gh/download/PackageObserver.kt b/app/src/main/java/com/gh/download/PackageObserver.kt index 47129e3ec8..dde70374b7 100644 --- a/app/src/main/java/com/gh/download/PackageObserver.kt +++ b/app/src/main/java/com/gh/download/PackageObserver.kt @@ -45,7 +45,7 @@ object PackageObserver { var approximateGameId = "" // 模糊的 gameId var foundMatchedGame = false // 是否找到準確的遊戲 (有可能出現同包名同版本的情況) - for (downloadEntity in DownloadManager.getInstance(application).allDownloadEntity) { + for (downloadEntity in DownloadManager.getInstance().allDownloadEntity) { if (packageName == downloadEntity.packageName) { mDownloadEntity = downloadEntity gameId = mDownloadEntity.gameId @@ -96,13 +96,13 @@ object PackageObserver { if (gh_id == null) { ThirdPartyPackageHelper.saveGameId(mDownloadEntity.packageName, mDownloadEntity.gameId) } - DownloadManager.getInstance(application).cancel( + DownloadManager.getInstance().cancel( mDownloadEntity.url, false, true) // 默认不删除安装包 mSp.getBoolean("autodelete", true) } if (sp.getBoolean(CONCERN_GAME_SP_KEY, true)) { //设置页面控制是否安装后自动关注 // 安装后关注游戏 val finalDownloadEntity = mDownloadEntity - RetrofitManager.getInstance(application).api + RetrofitManager.getInstance().api .getGameDigestByPackageName(UrlFilterUtils.getFilterQuery("package", packageName)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -172,7 +172,7 @@ object PackageObserver { jsonObject.put("game_id", gameId) jsonObject.put("package", packageName) val rBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()) - RetrofitManager.getInstance(HaloApp.getInstance().application).api + RetrofitManager.getInstance().api .postPlayedGame(UserManager.getInstance().userId, rBody) .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialog.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialog.kt index a407910114..99caf1fd2d 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialog.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialog.kt @@ -62,7 +62,7 @@ class DownloadDialog : BaseDraggableDialogFragment() { private val mDataWatcher = object : DataWatcher() { override fun onDataChanged(downloadEntity: DownloadEntity) { if (downloadEntity.gameId == mGameEntity?.id && - DownloadStatus.delete != DownloadManager.getInstance(requireContext()).getStatus(downloadEntity.url)) { + DownloadStatus.delete != DownloadManager.getInstance().getStatus(downloadEntity.url)) { mAdapter?.listData?.forEachIndexed { index, entity -> if (entity.normal?.packageName == downloadEntity.packageName || entity.installed?.packageName == downloadEntity.packageName) { @@ -264,14 +264,14 @@ class DownloadDialog : BaseDraggableDialogFragment() { mAdapter?.notifyDataSetChanged() mCollectionAdapter?.notifyDataSetChanged() super.onResume() - DownloadManager.getInstance(requireContext()).addObserver(mDataWatcher) + DownloadManager.getInstance().addObserver(mDataWatcher) mElapsedHelper.resetCounting() mElapsedHelper.resumeCounting() } override fun onPause() { super.onPause() - DownloadManager.getInstance(requireContext()).removeObserver(mDataWatcher) + DownloadManager.getInstance().removeObserver(mDataWatcher) mElapsedHelper.pauseCounting() postBrowseMta() } diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt index f5628810c1..fc7bfc6470 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt @@ -60,7 +60,7 @@ class DownloadDialogInstalledItemViewHolder(val binding: DownloadDialogInstalled } else { binding.collection.visibility = View.GONE - val downloadEntity = DownloadManager.getInstance(HaloApp.getInstance().application).getDownloadEntityByUrl(apkEntity.url) + val downloadEntity = DownloadManager.getInstance().getDownloadEntityByUrl(apkEntity.url) if (downloadEntity != null) { binding.downloadStatusIcon.visibility = View.VISIBLE binding.progressbar.visibility = View.VISIBLE diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt index d5b3a5809c..e188c59304 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt @@ -94,7 +94,7 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas return } binding.root.visibility = View.VISIBLE - val downloadEntity = DownloadManager.getInstance(HaloApp.getInstance().application).getDownloadEntityByUrl(apkEntity.url) + val downloadEntity = DownloadManager.getInstance().getDownloadEntityByUrl(apkEntity.url) if (downloadEntity != null) { binding.downloadStatusIcon.visibility = View.VISIBLE binding.progressbar.visibility = View.VISIBLE @@ -224,7 +224,7 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas viewModel.dismissLiveData.postValue(Any()) } - val downloadEntity = DownloadManager.getInstance(it.context).getDownloadEntityByUrl(apkEntity.url) + val downloadEntity = DownloadManager.getInstance().getDownloadEntityByUrl(apkEntity.url) if (downloadEntity?.status == DownloadStatus.pause) { mtaValue = gameEntity.name + "_" + apkEntity.getPlatformName() + "_暂停中" } else if (downloadEntity?.status == DownloadStatus.waiting) { @@ -237,12 +237,12 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas } DownloadDialogItemStatus.INSTALL -> { - val downloadEntity = DownloadManager.getInstance(it.context).getDownloadEntityByUrl(apkEntity.url) + val downloadEntity = DownloadManager.getInstance().getDownloadEntityByUrl(apkEntity.url) ?: return@setOnClickListener if (FileUtils.isEmptyFile(downloadEntity.path)) { Utils.toast(it.context, R.string.install_failure_hint) - DownloadManager.getInstance(it.context).cancel(apkEntity.url) + DownloadManager.getInstance().cancel(apkEntity.url) } else { if (PackageUtils.isCanPluggable(apkEntity)) { DialogHelper.showPluginDialog(it.context) { diff --git a/app/src/main/java/com/gh/download/dialog/DownloadViewModel.kt b/app/src/main/java/com/gh/download/dialog/DownloadViewModel.kt index 70b05e834a..21b2387dcc 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadViewModel.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadViewModel.kt @@ -158,7 +158,7 @@ class DownloadViewModel(application: Application, val gameEntity: GameEntity) : if (apkEntity.recommend != null) { return SORT_RECOMMEND } - val downloadEntity = DownloadManager.getInstance(getApplication()).getDownloadEntityByUrl(apkEntity.url) + val downloadEntity = DownloadManager.getInstance().getDownloadEntityByUrl(apkEntity.url) if (downloadEntity == null) { if (PackagesManager.isInstalled(packageName)) { when { diff --git a/app/src/main/java/com/gh/download/server/DownloadServer.kt b/app/src/main/java/com/gh/download/server/DownloadServer.kt index 52f47912f3..ed0350c540 100644 --- a/app/src/main/java/com/gh/download/server/DownloadServer.kt +++ b/app/src/main/java/com/gh/download/server/DownloadServer.kt @@ -85,7 +85,7 @@ class DownloadServer(port: Int) : NanoHTTPD(port) { const val APK_SUFFIX = ".apk" fun logBrowserDownload(path: String, isDownloadComplete: Boolean) { - for (download in DownloadManager.getInstance(HaloApp.getInstance()).allDownloadEntity) { + for (download in DownloadManager.getInstance().allDownloadEntity) { if (download.path == path) { download.exposureTrace?.toObject()?.let { BrowserInstallHelper.logWebDownloadStarted(it, download.getMetaExtra(Constants.DOWNLOAD_ID), isDownloadComplete) diff --git a/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt b/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt index 3867ae5b3a..f49b5b388a 100644 --- a/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt @@ -308,7 +308,7 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener { private fun loadImageInfo(position: Int, width: Int) { val url = mUrlList!![position] - RetrofitManager.getInstance(this) + RetrofitManager.getInstance() .api.getImageInfo("$url?x-oss-process=image/info") .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index 1a7f62a4f1..8a320fb944 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -142,7 +142,7 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA if (mGameEntity != null && mGameEntity.getApk().size() == 1) { String url = mGameEntity.getApk().get(0).getUrl(); if (url.equals(downloadEntity.getUrl())) { - if (!"pause".equals(DownloadManager.getInstance(LibaoDetailActivity.this). + if (!"pause".equals(DownloadManager.getInstance(). getStatus(downloadEntity.getUrl()))) { mDownloadEntity = downloadEntity; DetailDownloadUtils.detailInvalidate(getDetailViewHolder()); @@ -238,7 +238,7 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA @Override protected void onPause() { super.onPause(); - DownloadManager.getInstance(this).removeObserver(dataWatcher); + DownloadManager.getInstance().removeObserver(dataWatcher); } @Override @@ -248,7 +248,7 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA && (mGameEntity.getApk().size() == 1 || mGameEntity.isReservable())) { DetailDownloadUtils.detailInitDownload(getDetailViewHolder(), true); } - DownloadManager.getInstance(this).addObserver(dataWatcher); + DownloadManager.getInstance().addObserver(dataWatcher); } @Override @@ -349,7 +349,7 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA } private void getLibaoDigest(final String libaoId) { - RetrofitManager.getInstance(this).getApi().getLibaoDigest(libaoId) + RetrofitManager.getInstance().getApi().getLibaoDigest(libaoId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -395,7 +395,7 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA if (RegionSettingHelper.shouldThisGameBeFiltered(gameId)) { return; } - RetrofitManager.getInstance(this).getApi().getGameNewsDigest(gameId) + RetrofitManager.getInstance().getApi().getGameNewsDigest(gameId) .map(ApkActiveUtils.filterMapper) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 8e7cde52bf..80a4a4df38 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -261,7 +261,7 @@ public class MainActivity extends BaseActivity { // checkTinkerPath(); //　看情况是否需要显示补丁弹窗 // 必须放在这里，否则会导致获取 baseActivity 不是本应用包名 - DownloadManager.getInstance(this).initDownloadService(); + DownloadManager.getInstance().initDownloadService(); ReservationRepository.refreshReservations(); @@ -299,7 +299,7 @@ public class MainActivity extends BaseActivity { // 耗时操作 AppExecutor.getIoExecutor().execute(() -> { // 上传数据 - DataCollectionManager.getInstance(getApplicationContext()).upload(); + DataCollectionManager.getInstance().upload(); // 获取默认配置 if (Config.getSettings() == null) { @@ -338,7 +338,7 @@ public class MainActivity extends BaseActivity { @SuppressLint("CheckResult") private void getTeenagerMode() { - RetrofitManager.getInstance(HaloApp.getInstance().getApplication()) + RetrofitManager.getInstance() .getApi().getTeenagerMode(HaloApp.getInstance().getGid()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -373,7 +373,7 @@ public class MainActivity extends BaseActivity { .flatMap((Function, SingleSource>) strings -> { requestMap.put("cache_video_ids", strings); RequestBody body = ExtensionsKt.toRequestBody(requestMap); - return RetrofitManager.getInstance(HaloApp.getInstance()) + return RetrofitManager.getInstance() .getApi() .postAttentionVideoRecord(UserManager.getInstance().getUserId(), body); }) @@ -391,7 +391,7 @@ public class MainActivity extends BaseActivity { //查询到模拟器游戏表中逻辑删除的数据后，删除服务器中的记录 @SuppressLint("CheckResult") private void deleteSimulatorGame() { - SimulatorGameDao dao = AppDatabase.getInstance(HaloApp.getInstance()).simulatorGameDao(); + SimulatorGameDao dao = AppDatabase.getInstance().simulatorGameDao(); dao.getSimulatorGameByDeleted() .subscribeOn(Schedulers.io()) .subscribe(new BiResponse>() { @@ -642,7 +642,7 @@ public class MainActivity extends BaseActivity { */ private void redirectGameDetail(String packageName) { String filterQuery = UrlFilterUtils.getFilterQuery("package", packageName, "type", "package_redirect"); - RetrofitManager.getInstance(this).getApi().loadGameDataByPackageName(filterQuery) + RetrofitManager.getInstance().getApi().loadGameDataByPackageName(filterQuery) .compose(observableToMain()) .subscribe(new Response>() { @Override @@ -698,7 +698,7 @@ public class MainActivity extends BaseActivity { public boolean onKeyDown(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0 && !mMainWrapperFragment.onHandleBackPressed()) { DownloadEntity downloadEntity = null; - for (DownloadEntity entity : DownloadManager.getInstance(getApplicationContext()).getAllDownloadEntityExcludeSilentUpdate()) { + for (DownloadEntity entity : DownloadManager.getInstance().getAllDownloadEntityExcludeSilentUpdate()) { if (entity.getStatus().equals(DownloadStatus.done)) { if (PackageUtils.isInstalled(getApplicationContext(), entity.getPackageName()) && (!entity.isPlugin() @@ -757,7 +757,7 @@ public class MainActivity extends BaseActivity { @Override public void finish() { // 上传数据 - DataCollectionManager.getInstance(getApplicationContext()).statClickData(); + DataCollectionManager.getInstance().statClickData(); super.finish(); } @@ -878,7 +878,7 @@ public class MainActivity extends BaseActivity { private void checkDevice() { String content = DeviceUtils.getUserDevice(MainActivity.this).toString(); RequestBody body = RequestBody.create(MediaType.parse("application/json"), content); - RetrofitManager.getInstance(this).getApi().checkDevice(body) + RetrofitManager.getInstance().getApi().checkDevice(body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 6110652d14..1ee51f5f03 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -140,7 +140,7 @@ public class NewsDetailActivity extends ToolBarActivity implements OnClickListen if (gameEntity != null && gameEntity.getApk().size() == 1) { String url = gameEntity.getApk().get(0).getUrl(); if (url.equals(downloadEntity.getUrl())) { - if (!"pause".equals(DownloadManager.getInstance(NewsDetailActivity.this). + if (!"pause".equals(DownloadManager.getInstance(). getStatus(downloadEntity.getUrl()))) { mDownloadEntity = downloadEntity; DetailDownloadUtils.detailInvalidate(getDetailViewHolder()); @@ -444,7 +444,7 @@ public class NewsDetailActivity extends ToolBarActivity implements OnClickListen isSentReport = true; } - DownloadManager.getInstance(this).removeObserver(dataWatcher); + DownloadManager.getInstance().removeObserver(dataWatcher); } @Override @@ -454,7 +454,7 @@ public class NewsDetailActivity extends ToolBarActivity implements OnClickListen && (gameEntity.getApk().size() == 1 || gameEntity.isReservable())) { DetailDownloadUtils.detailInitDownload(getDetailViewHolder(), true); } - DownloadManager.getInstance(this).addObserver(dataWatcher); + DownloadManager.getInstance().addObserver(dataWatcher); } @Override @@ -502,7 +502,7 @@ public class NewsDetailActivity extends ToolBarActivity implements OnClickListen } private void getNewsDigest(final String newsId) { - RetrofitManager.getInstance(this).getApi().getNewsDigest(newsId) + RetrofitManager.getInstance().getApi().getNewsDigest(newsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -645,7 +645,7 @@ public class NewsDetailActivity extends ToolBarActivity implements OnClickListen mDetailBottomLl.setVisibility(View.GONE); return; } - RetrofitManager.getInstance(this).getApi().getGameNewsDigest(gameId) + RetrofitManager.getInstance().getApi().getGameNewsDigest(gameId) .map(ApkActiveUtils.filterMapper) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index 67fc86ae5d..bfe277ee2b 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -188,10 +188,10 @@ public class SplashScreenActivity extends BaseActivity { // 删除更新后的光环助手包 private void cancelPreviousUpdateTask() { - List all = DownloadManager.getInstance(this).getAllDownloadEntity(); + List all = DownloadManager.getInstance().getAllDownloadEntity(); for (DownloadEntity downloadEntity : all) { if (downloadEntity.getPackageName().equals(getPackageName())) { - DownloadManager.getInstance(this).cancel(downloadEntity.getUrl(), true, true); + DownloadManager.getInstance().cancel(downloadEntity.getUrl(), true, true); break; } } @@ -205,7 +205,7 @@ public class SplashScreenActivity extends BaseActivity { @SuppressLint("CheckResult") private void deviceDialogSetting() { - RetrofitManager.getInstance(HaloApp.getInstance().getApplication()) + RetrofitManager.getInstance() .getApi().deviceDialogs() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -221,7 +221,7 @@ public class SplashScreenActivity extends BaseActivity { @SuppressLint("CheckResult") private void getRegulationTestStatus() { - RetrofitManager.getInstance(HaloApp.getInstance().getApplication()) + RetrofitManager.getInstance() .getApi().getRegulationTestStatus() .subscribe(new BiResponse() { @Override @@ -237,7 +237,7 @@ public class SplashScreenActivity extends BaseActivity { } private void getFilterDetailTags() { - RetrofitManager.getInstance(HaloApp.getInstance().getApplication()) + RetrofitManager.getInstance() .getApi().getFilterDetailTags() .subscribe(new Response>() { @Override @@ -249,7 +249,7 @@ public class SplashScreenActivity extends BaseActivity { } private void getAuthDialog() { - RetrofitManager.getInstance(HaloApp.getInstance().getApplication()) + RetrofitManager.getInstance() .getApi() .authDialog() .subscribe(new Response>() { @@ -269,7 +269,7 @@ public class SplashScreenActivity extends BaseActivity { return; } - RetrofitManager.getInstance(HaloApp.getInstance().getApplication()) + RetrofitManager.getInstance() .getApi() .getMark() .subscribe(new BiResponse() { @@ -287,7 +287,7 @@ public class SplashScreenActivity extends BaseActivity { @SuppressLint("CheckResult") private void showPrivacyPolicy(SimpleCallback callback) { - RetrofitManager.getInstance(this).getApi() + RetrofitManager.getInstance().getApi() .getPrivacyPolicy() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 55c4de336e..3d143c878f 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -966,7 +966,7 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall postDialog = WaitingDialogFragment.newInstance("反馈中..."); postDialog.show(getSupportFragmentManager(), null); String filter = UrlFilterUtils.getFilterQuery("package", mSelectGameEntity.getPackageName(), "type", "suggestion_check"); - RetrofitManager.getInstance(getBaseContext()) + RetrofitManager.getInstance() .getApi() .getSuggestGameCollectHintData(filter) .map(RegionSettingHelper.filterGame) @@ -1255,7 +1255,7 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()); - RetrofitManager.getInstance(this).getApi().postSuggestion(body) + RetrofitManager.getInstance().getApi().postSuggestion(body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { diff --git a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java index e12a0f9a25..697d3e1268 100644 --- a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java @@ -138,7 +138,7 @@ public class ToolBoxActivity extends ToolBarActivity implements SwipeRefreshLayo } private void findGameAndOpenItsToolboxWebview(String gameId, String url) { - RetrofitManager.getInstance(this) + RetrofitManager.getInstance() .getApi() .getGameToolBoxData(1, UrlFilterUtils.getFilterQuery("game_id", gameId)) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java index 9da8f41a96..920b355b8e 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java @@ -72,7 +72,7 @@ public class CommentDetailAdapter extends BaseRecyclerAdapter { public void loadData() { if (mIsLoading) return; mIsLoading = true; - RetrofitManager.getInstance(mContext).getApi() + RetrofitManager.getInstance().getApi() .getCommentTrace(mCommentId, mPage) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java index 327961276b..84ed6e95fa 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java @@ -95,10 +95,10 @@ public class GameNewsAdapter extends BaseRecyclerAdapter { Observable> observable; if (mContext.getString(R.string.news_all).equals(mNewsType)) { - observable = RetrofitManager.getInstance(mContext).getApi().getGameNews( + observable = RetrofitManager.getInstance().getApi().getGameNews( UrlFilterUtils.getFilterQuery("game_id", mGameId), 20, mPage); } else { - observable = RetrofitManager.getInstance(mContext).getApi().getGameNews( + observable = RetrofitManager.getInstance().getApi().getGameNews( UrlFilterUtils.getFilterQuery("game_id", mGameId, "type", mNewsType), 20, mPage); } observable.subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java index 60f6df3bf7..1adf393a83 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -92,7 +92,7 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { } public void addLibaoDetail(Context context, boolean isExistGameData) { - RetrofitManager.getInstance(context).getApi().getLibaoDetail(mLibaoEntity.getId()) + RetrofitManager.getInstance().getApi().getLibaoDetail(mLibaoEntity.getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java index 494b3d9fb8..00e9b78325 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -118,7 +118,7 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { } public void addHotComment() { - RetrofitManager.getInstance(mContext).getApi().getHotComment(mConcernEntity.getId(), 10, 1) + RetrofitManager.getInstance().getApi().getHotComment(mConcernEntity.getId(), 10, 1) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -144,7 +144,7 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { return; } isLoading = true; - RetrofitManager.getInstance(mContext).getApi().getComment(mConcernEntity.getId(), 10, mPage, Utils.getTime(mContext)) + RetrofitManager.getInstance().getApi().getComment(mConcernEntity.getId(), 10, mPage, Utils.getTime(mContext)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -496,7 +496,7 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { } private void statNewsViews(final String news_id) { - RetrofitManager.getInstance(mContext).getApi().postArticleVisit(news_id) + RetrofitManager.getInstance().getApi().postArticleVisit(news_id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new JSONObjectResponse() { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java index 167631a6e3..63bbfa3363 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java @@ -67,7 +67,7 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter { return; } mIsLoading = true; - RetrofitManager.getInstance(mContext).getApi() + RetrofitManager.getInstance().getApi() .getToolKitData(mPage, UrlFilterUtils.getFilterQuery("keyword", mIsSearch ? mSearchKey : "")) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java index 3d40cf1634..b5e2066e9b 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java @@ -280,13 +280,13 @@ public class DetailViewHolder { PermissionHelper.checkStoragePermissionBeforeAction(mViewHolder.context, () -> { if (mDownloadEntity == null) { - mDownloadEntity = DownloadManager.getInstance(mViewHolder.context).getDownloadEntityByUrl(mGameEntity.getApk().get(0).getUrl()); + mDownloadEntity = DownloadManager.getInstance().getDownloadEntityByUrl(mGameEntity.getApk().get(0).getUrl()); } if (mDownloadEntity != null) { final String path = mDownloadEntity.getPath(); if (FileUtils.isEmptyFile(path)) { Utils.toast(mViewHolder.context, R.string.install_failure_hint); - DownloadManager.getInstance(mViewHolder.context).cancel(mDownloadEntity.getUrl()); + DownloadManager.getInstance().cancel(mDownloadEntity.getUrl()); } else { PackageInstaller.install(mViewHolder.context, mDownloadEntity); } diff --git a/app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt b/app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt index 4d96d743c0..146310ac12 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt @@ -223,7 +223,7 @@ class AmwayFragment : LazyListFragment() { override fun onFragmentPause() { super.onPause() - DownloadManager.getInstance(context).removeObserver(dataWatcher) + DownloadManager.getInstance().removeObserver(dataWatcher) mElapsedHelper.pauseCounting() MtaHelper.onEventWithTime("安利墙", mElapsedHelper.elapsedTime, "浏览") @@ -236,7 +236,7 @@ class AmwayFragment : LazyListFragment() { override fun onFragmentResume() { super.onFragmentResume() - DownloadManager.getInstance(context).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) mElapsedHelper.resetCounting() mElapsedHelper.resumeCounting() diff --git a/app/src/main/java/com/gh/gamecenter/amway/AmwayViewModel.kt b/app/src/main/java/com/gh/gamecenter/amway/AmwayViewModel.kt index 45a7cdcae3..736ebdad76 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwayViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayViewModel.kt @@ -58,7 +58,7 @@ class AmwayViewModel(application: Application) : ListViewModel() { @@ -77,7 +77,7 @@ class AmwayViewModel(application: Application) : ListViewModel>? = null) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getAmwayCommentList(1, 100) .subscribeOn(Schedulers.io()) .subscribe(object : BiResponse>() { @@ -95,7 +95,7 @@ class AmwayViewModel(application: Application) : ListViewModel>? = null) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .amwaySubjectList .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -132,7 +132,7 @@ class AmwayViewModel(application: Application) : ListViewModel extends ListViewModel extends Ba if (!response.isEmpty()) { for (LD entity : response) { GameEntity game = (GameEntity) entity; - game.setEntryMap(DownloadManager.getInstance(HaloApp.getInstance() - .getApplication()).getEntryMap(game.getName())); + game.setEntryMap(DownloadManager.getInstance().getEntryMap(game.getName())); // 当页面是由启动弹窗过来的第一或第二个页面的时候添加启动弹窗信息 if (mEntrance.contains(EntranceUtils.ENTRANCE_WELCOME) diff --git a/app/src/main/java/com/gh/gamecenter/catalog/CatalogViewModel.kt b/app/src/main/java/com/gh/gamecenter/catalog/CatalogViewModel.kt index 6c26e57a64..154b97e34e 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/CatalogViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/CatalogViewModel.kt @@ -17,7 +17,7 @@ import io.reactivex.schedulers.Schedulers class CatalogViewModel(application: Application, val catalogId: String, val catalogTitle: String) : AndroidViewModel(application) { - private val api = RetrofitManager.getInstance(getApplication()).api + private val api = RetrofitManager.getInstance().api var catalogs = MutableLiveData() var selectedCatalogName: String = "" diff --git a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt index 643aa9cf2f..11fb54b7e4 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt @@ -148,12 +148,12 @@ class NewCatalogListFragment : ListFragment override fun onResume() { if (isEverPause && mAdapter != null) mAdapter?.notifyDataSetChanged() super.onResume() - DownloadManager.getInstance(context).addObserver(mDataWatcher) + DownloadManager.getInstance().addObserver(mDataWatcher) } override fun onPause() { super.onPause() - DownloadManager.getInstance(context).removeObserver(mDataWatcher) + DownloadManager.getInstance().removeObserver(mDataWatcher) } override fun onRefresh() { diff --git a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListViewModel.kt b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListViewModel.kt index bf89878769..a9bf98689d 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListViewModel.kt @@ -26,7 +26,7 @@ class NewCatalogListViewModel(application: Application) : ListViewModel>? = null diff --git a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogViewModel.kt b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogViewModel.kt index dc66cc7a16..2e46a2a964 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogViewModel.kt @@ -19,7 +19,7 @@ class SpecialCatalogViewModel(application: Application, private val mIsCategoryV2: Boolean, private val mExposureSource: ExposureSource?) : ListViewModel(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api val basicExposureSource by lazy { arrayListOf().apply { mExposureSource?.let { add(it) } diff --git a/app/src/main/java/com/gh/gamecenter/catalog/SubCatalogViewModel.kt b/app/src/main/java/com/gh/gamecenter/catalog/SubCatalogViewModel.kt index 12acf47463..51a036708d 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/SubCatalogViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/SubCatalogViewModel.kt @@ -15,7 +15,7 @@ import io.reactivex.schedulers.Schedulers class SubCatalogViewModel(application: Application, private val catalogId: String): AndroidViewModel(application) { - private val api = RetrofitManager.getInstance(getApplication()).api + private val api = RetrofitManager.getInstance().api var catalogs = MutableLiveData() diff --git a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryListViewModel.kt b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryListViewModel.kt index 4ff812060e..d8e4464000 100644 --- a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryListViewModel.kt @@ -15,6 +15,6 @@ class CategoryDirectoryListViewModel(application: Application) : ListViewModel> { - return RetrofitManager.getInstance(getApplication()).api.getCategories(categoryId, page) + return RetrofitManager.getInstance().api.getCategories(categoryId, page) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt b/app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt index aa410163f5..7c9e72ea31 100644 --- a/app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt @@ -103,12 +103,12 @@ class NewCategoryListFragment : ListFragment> { - return RetrofitManager.getInstance(getApplication()) + return RetrofitManager.getInstance() .api .getGamesInCategory(selectedCategory.id, getSortType(), getSortSize(), page) } diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt index 8dde5e87d9..f484800d13 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt @@ -260,12 +260,12 @@ class CategoryV2ListFragment : ListFragment override fun onResume() { if (isEverPause && mAdapter != null) mAdapter?.notifyDataSetChanged() super.onResume() - DownloadManager.getInstance(context).addObserver(mDataWatcher) + DownloadManager.getInstance().addObserver(mDataWatcher) } override fun onPause() { super.onPause() - DownloadManager.getInstance(context).removeObserver(mDataWatcher) + DownloadManager.getInstance().removeObserver(mDataWatcher) } override fun onRefresh() { diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListViewModel.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListViewModel.kt index 34b68e721b..5b7f8b861d 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListViewModel.kt @@ -31,7 +31,7 @@ class CategoryV2ListViewModel(application: Application, override fun provideDataSingle(page: Int): Single> { return RetrofitManager - .getInstance(getApplication()) + .getInstance() .api .getCategoryV2Games(categoryId, getFilter(), getSortType(), page) } diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ViewModel.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ViewModel.kt index 9f2a729eab..3196a24d62 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ViewModel.kt @@ -19,7 +19,7 @@ class CategoryV2ViewModel(application: Application, private val mCategoryId: String, val categoryTitle: String) : AndroidViewModel(application) { - private val api = RetrofitManager.getInstance(getApplication()).api + private val api = RetrofitManager.getInstance().api var sidebarsLiveData = MutableLiveData() var directories = ArrayList() var directoriesLiveData = MutableLiveData>() diff --git a/app/src/main/java/com/gh/gamecenter/collection/AnswerViewModel.kt b/app/src/main/java/com/gh/gamecenter/collection/AnswerViewModel.kt index 3e282e0fab..51886fb60c 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/AnswerViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerViewModel.kt @@ -19,7 +19,7 @@ import okhttp3.ResponseBody class AnswerViewModel(application: Application) : ListViewModel(application) { - private var mApi = RetrofitManager.getInstance(getApplication()).api + private var mApi = RetrofitManager.getInstance().api var type: String = AnswerFragment.COLLECTION diff --git a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java index bd9456a0ff..003923a253 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java @@ -242,7 +242,7 @@ public class ArticleAdapter extends ListAdapter { // 统计新闻阅读量 public void statNewsViews(final NewsEntity newsEntity, final int position) { - RetrofitManager.getInstance(mContext).getApi().postArticleVisit(newsEntity.getId()) + RetrofitManager.getInstance().getApi().postArticleVisit(newsEntity.getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new JSONObjectResponse() { diff --git a/app/src/main/java/com/gh/gamecenter/collection/ArticleViewModel.java b/app/src/main/java/com/gh/gamecenter/collection/ArticleViewModel.java index d65e1dcddb..bbc6f3973e 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleViewModel.java @@ -50,7 +50,7 @@ public class ArticleViewModel extends ListViewModel { builder.deleteCharAt(builder.length() - 1); String ids = builder.toString(); mNewsViewsRepository.getNewsViews(RetrofitManager - .getInstance(getApplication()) + .getInstance() .getApi() .getArticlesVisits(UrlFilterUtils.getFilterQuery("article_ids", ids))); } @@ -80,7 +80,7 @@ public class ArticleViewModel extends ListViewModel { @Override public Single> provideDataSingle(int page) { if (ArticleFragment.COLLECTION.equals(type)) { - return Single.fromObservable(RetrofitManager.getInstance(getApplication()).getApi().getCollectionArticle(UserManager.getInstance().getUserId(), page)); + return Single.fromObservable(RetrofitManager.getInstance().getApi().getCollectionArticle(UserManager.getInstance().getUserId(), page)); } else { if (page > 5) { return Single.create(emitter -> emitter.onSuccess(new ArrayList<>())); diff --git a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleViewModel.kt b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleViewModel.kt index 41d3df7963..84e7cca446 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleViewModel.kt @@ -34,7 +34,7 @@ class CommunityArticleViewModel(application: Application) : ListViewModel> { return if (type == CommunityArticleFragment.Type.COLLECTION.value) { Single.fromObservable( - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getCollectionArticleAndQuestion(UserManager.getInstance().userId, page) .flatMap(Function, Observable>> { list -> Observable.create { emitter-> @@ -71,7 +71,7 @@ class CommunityArticleViewModel(application: Application) : ListViewModel(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api val deleteLiveData = MutableLiveData() val publishLiveData = MutableLiveData() diff --git a/app/src/main/java/com/gh/gamecenter/collection/ToolsFragment.java b/app/src/main/java/com/gh/gamecenter/collection/ToolsFragment.java index 47190f87f8..f2f1fa9af5 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ToolsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ToolsFragment.java @@ -39,7 +39,7 @@ public class ToolsFragment extends ListFragment> provideDataObservable(int page) { - return RetrofitManager.getInstance(getContext()).getApi().getCollectionTools(UserManager.getInstance().getUserId(), page); + return RetrofitManager.getInstance().getApi().getCollectionTools(UserManager.getInstance().getUserId(), page); } // 收藏事件 diff --git a/app/src/main/java/com/gh/gamecenter/collection/VideoViewModel.kt b/app/src/main/java/com/gh/gamecenter/collection/VideoViewModel.kt index ad3400ce1d..724f992b4f 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/VideoViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/VideoViewModel.kt @@ -19,7 +19,7 @@ class VideoViewModel(application: Application) : ListViewModel>? { if (type == VideoFragment.VideoStyle.COLLECT.value) { - return RetrofitManager.getInstance(getApplication()).api.getCollectionVideo(UserManager.getInstance().userId, page, Config.VIDEO_PAGE_SIZE) + return RetrofitManager.getInstance().api.getCollectionVideo(UserManager.getInstance().userId, page, Config.VIDEO_PAGE_SIZE) } return null } diff --git a/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt b/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt index 98cb1f3a10..37494f909a 100644 --- a/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt @@ -37,7 +37,7 @@ class DownloadFragment : BaseFragment_TabLayout() { private lateinit var mDownloadNumberTv: TextView private lateinit var mUpdateNumberTv: TextView - private val mDownloadManager: DownloadManager by lazy { DownloadManager.getInstance(HaloApp.getInstance().application) } + private val mDownloadManager: DownloadManager by lazy { DownloadManager.getInstance() } private var mPermanentInactivePluggableApkList: List? = null @@ -102,7 +102,7 @@ class DownloadFragment : BaseFragment_TabLayout() { mDownloadManager.markDownloadedTaskAsRead() updateDownloadHint() } - DownloadManager.getInstance(requireContext()).checkAndRetryDownload() + DownloadManager.getInstance().checkAndRetryDownload() } override fun onParentActivityFinish() { @@ -149,7 +149,7 @@ class DownloadFragment : BaseFragment_TabLayout() { private fun updateDownloadHint() { if (!::mDownloadNumberTv.isInitialized || !isAdded) return - val downloadData = DownloadManager.getInstance(context).allDownloadEntityExcludeSilentUpdate + val downloadData = DownloadManager.getInstance().allDownloadEntityExcludeSilentUpdate if (downloadData.size > 0) { mDownloadNumberTv.visibility = View.VISIBLE } else { diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java index 7727e4322b..db61366d07 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java @@ -157,7 +157,7 @@ public class GameDownloadFragment extends BaseFragment implements View.OnClickLi downloadEntity.getPath()), downloadEntity.getUrl()); // 用户焦点在下载管理页面时有任务完成，直接把所有下载完成的任务标记为已读 - DownloadManager.getInstance(HaloApp.getInstance().getApplication()).markDownloadedTaskAsRead(); + DownloadManager.getInstance().markDownloadedTaskAsRead(); } else if (DownloadStatus.cancel.equals(downloadEntity.getStatus())) { // 有可能由于网络劫持造成的 adapter.initMap(); adapter.notifyDataSetChanged(); @@ -308,7 +308,7 @@ public class GameDownloadFragment extends BaseFragment implements View.OnClickLi public void onResume() { super.onResume(); adapter.initMap(); - DownloadManager.getInstance(getActivity()).addObserver(dataWatcher); + DownloadManager.getInstance().addObserver(dataWatcher); adapter.notifyDataSetChanged(); showScrollToDownloadContainerIfNeeded(); @@ -338,7 +338,7 @@ public class GameDownloadFragment extends BaseFragment implements View.OnClickLi @Override public void onPause() { super.onPause(); - DownloadManager.getInstance(getActivity()).removeObserver(dataWatcher); + DownloadManager.getInstance().removeObserver(dataWatcher); } @Subscribe(threadMode = ThreadMode.MAIN) @@ -419,15 +419,15 @@ public class GameDownloadFragment extends BaseFragment implements View.OnClickLi public void pauseAll() { for (DownloadEntity downloadEntity : adapter.getDownloadingList()) { - DownloadManager.getInstance(getActivity()).put(downloadEntity.getUrl(), + DownloadManager.getInstance().put(downloadEntity.getUrl(), System.currentTimeMillis()); Message msg = Message.obtain(); msg.what = DownloadConfig.PAUSE_DOWNLOAD_TASK; msg.obj = downloadEntity.getUrl(); - DownloadManager.getInstance(getActivity()).sendMessageDelayed(msg, 1000); + DownloadManager.getInstance().sendMessageDelayed(msg, 1000); // DownloadManager.getInstance(getContext()).pause(downloadEntity); } - DownloadManager.getInstance(getContext()).pauseAll(); + DownloadManager.getInstance().pauseAll(); mDownloadmanagerAllstartTv.setText("全部开始"); mDownloadmanagerAllstartTv.setTextColor(ContextCompat.getColor(getContext(), R.color.theme_font)); } @@ -437,12 +437,12 @@ public class GameDownloadFragment extends BaseFragment implements View.OnClickLi // DownloadManager.getInstance(getContext()).add(downloadEntity); // adapter.getStatusMap().put(downloadEntity.getUrl(), "downloading"); - DownloadManager.getInstance(getActivity()).put(downloadEntity.getUrl(), + DownloadManager.getInstance().put(downloadEntity.getUrl(), System.currentTimeMillis()); Message msg = Message.obtain(); msg.what = DownloadConfig.CONTINUE_DOWNLOAD_TASK; msg.obj = downloadEntity.getUrl(); - DownloadManager.getInstance(getActivity()).sendMessageDelayed(msg, 1000); + DownloadManager.getInstance().sendMessageDelayed(msg, 1000); adapter.getStatusMap().put(downloadEntity.getUrl(), "downloading"); } // DownloadManager.getInstance(getContext()).startAll(); diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java index 93ea2c91d5..a8924ddd07 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -78,8 +78,8 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { mNoDataSkip = textView; -// statusMap = DownloadManager.getInstance(mContext).getStatusMap(); -// downloadingList = new ArrayList<>(DownloadManager.getInstance(mContext).getDownloadingMap().values()); +// statusMap = DownloadManager.getInstance().getStatusMap(); +// downloadingList = new ArrayList<>(DownloadManager.getInstance().getDownloadingMap().values()); statusMap = new ArrayMap<>(); downloadingList = new ArrayList<>(); @@ -263,7 +263,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { viewHolder.dmStartorpause.setOnClickListener(v -> { String str = ((TextView) v).getText().toString(); final String url = downloadEntity.getUrl(); - DownloadManager.getInstance(mContext).put(url, System.currentTimeMillis()); + DownloadManager.getInstance().put(url, System.currentTimeMillis()); switch (str) { case "继续": case "下载": @@ -271,7 +271,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { // 下载管理不用判断是否大于50M DialogUtils.checkDownload(mContext, Float.toString(100F), isSubscribe -> { if (isSubscribe) { - DownloadManager.getInstance(mContext).subscribe(downloadEntity); + DownloadManager.getInstance().subscribe(downloadEntity); statusMap.put(url, DownloadStatus.subscribe.getStatus()); notifyItemChanged(doneList.isEmpty() ? 0 : 1 + doneList.size()); } else { @@ -295,7 +295,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { Message msg = Message.obtain(); msg.what = DownloadConfig.CONTINUE_DOWNLOAD_TASK; msg.obj = url; - DownloadManager.getInstance(mContext).sendMessageDelayed(msg, 1000); + DownloadManager.getInstance().sendMessageDelayed(msg, 1000); } }); }); @@ -331,9 +331,9 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { Message msg = Message.obtain(); msg.what = DownloadConfig.PAUSE_DOWNLOAD_TASK; msg.obj = url; - DownloadManager.getInstance(mContext).sendMessageDelayed(msg, 1000); + DownloadManager.getInstance().sendMessageDelayed(msg, 1000); -// DownloadManager.getInstance(mContext).pause(downloadEntity); +// DownloadManager.getInstance().pause(downloadEntity); break; case "等待": Utils.toast(mContext, "最多只能同时启动3个下载任务"); @@ -430,17 +430,17 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { public void startAll(DownloadHeadViewHolder viewHolder) { for (DownloadEntity downloadEntity : downloadingList) { - DownloadManager.getInstance(mContext).put(downloadEntity.getUrl(), + DownloadManager.getInstance().put(downloadEntity.getUrl(), System.currentTimeMillis()); Message msg = Message.obtain(); msg.what = DownloadConfig.CONTINUE_DOWNLOAD_TASK; msg.obj = downloadEntity.getUrl(); - DownloadManager.getInstance(mContext).sendMessageDelayed(msg, 1000); -// DownloadManager.getInstance(mContext).add(downloadEntity); + DownloadManager.getInstance().sendMessageDelayed(msg, 1000); +// DownloadManager.getInstance().add(downloadEntity); statusMap.put(downloadEntity.getUrl(), DownloadStatus.downloading.getStatus()); } -// DownloadManager.getInstance(mContext).startAll(); +// DownloadManager.getInstance().startAll(); viewHolder.dm_item_head_tv_allstart.setText(R.string.download_all_push); viewHolder.dm_item_head_tv_allstart.setTextColor(ContextCompat.getColor(mContext, R.color.btn_gray)); @@ -448,16 +448,16 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { public void pauseAll(DownloadHeadViewHolder viewHolder) { for (DownloadEntity downloadEntity : downloadingList) { - DownloadManager.getInstance(mContext).put(downloadEntity.getUrl(), + DownloadManager.getInstance().put(downloadEntity.getUrl(), System.currentTimeMillis()); Message msg = Message.obtain(); msg.what = DownloadConfig.PAUSE_DOWNLOAD_TASK; msg.obj = downloadEntity.getUrl(); - DownloadManager.getInstance(mContext).sendMessageDelayed(msg, 1000); + DownloadManager.getInstance().sendMessageDelayed(msg, 1000); // DownloadManager.getInstance(getContext()).pause(downloadEntity); } -// DownloadManager.getInstance(mContext).pauseAll(); +// DownloadManager.getInstance().pauseAll(); viewHolder.dm_item_head_tv_allstart.setText("全部开始"); viewHolder.dm_item_head_tv_allstart.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); @@ -489,7 +489,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { // 显示插件化 void showPluginDialog(final String path) { DialogHelper.showPluginDialog(mContext, () -> { - for (DownloadEntity downloadEntity : DownloadManager.getInstance(mContext).getAllDownloadEntityExcludeSilentUpdate()) { + for (DownloadEntity downloadEntity : DownloadManager.getInstance().getAllDownloadEntityExcludeSilentUpdate()) { if (downloadEntity.isPluggable() && downloadEntity.getPath().equals(path)) { Map kv6 = new HashMap<>(); @@ -509,7 +509,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { } private void removeDownload(DownloadEntity entry) { - DownloadManager.getInstance(mContext).cancel(entry.getUrl()); + DownloadManager.getInstance().cancel(entry.getUrl()); Integer location = locationMap.get(entry.getUrl()); if (location == null) { @@ -645,7 +645,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { doneList.clear(); statusMap.clear(); urlMap.clear(); - for (DownloadEntity downloadEntity : DownloadManager.getInstance(mContext).getAllDownloadEntityExcludeSilentUpdate()) { + for (DownloadEntity downloadEntity : DownloadManager.getInstance().getAllDownloadEntityExcludeSilentUpdate()) { statusMap.put(downloadEntity.getUrl(), downloadEntity.getStatus().name()); if (DownloadStatus.done.equals(downloadEntity.getStatus())) { if (!ExtensionsKt.isSimulatorGame(downloadEntity)) { diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java index 672b726dd6..25b10b7272 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -119,9 +119,9 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter implemen Object gh_id = PackageUtils.getMetaData(mContext, packageName, "gh_id"); Observable observable; if (gh_id == null) { - observable = RetrofitManager.getInstance(mContext).getApi().getGameUpdate(UrlFilterUtils.getFilterQuery("packages", packageName)); + observable = RetrofitManager.getInstance().getApi().getGameUpdate(UrlFilterUtils.getFilterQuery("packages", packageName)); } else { - observable = RetrofitManager.getInstance(mContext).getApi().getGameUpdateById((String) gh_id); + observable = RetrofitManager.getInstance().getApi().getGameUpdateById((String) gh_id); } observable.map(ApkActiveUtils.filterMapper) .subscribeOn(Schedulers.io()) @@ -255,7 +255,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter implemen if (lastM != -1) { str = str.substring(0, lastM); size += Float.valueOf(str); - DownloadEntity downloadEntity = DownloadManager.getInstance(mContext).getDownloadEntityByUrl(updateList.get(i).getUrl()); + DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntityByUrl(updateList.get(i).getUrl()); if (downloadEntity != null) { count++; if (downloadEntity.getStatus().equals(DownloadStatus.done)) { @@ -284,7 +284,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter implemen if (NetworkUtils.isWifiConnected(mContext)) { viewHolder.dm_item_head_tv_allstart.setText(R.string.updating); for (int i = 0; i < updateList.size(); i++) { - if (DownloadManager.getInstance(mContext).getDownloadEntityByUrl(updateList.get(i).getUrl()) == null) { + if (DownloadManager.getInstance().getDownloadEntityByUrl(updateList.get(i).getUrl()) == null) { addUpdateDownload(i, false); // notifyItemChanged(i + 1); } @@ -296,7 +296,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter implemen DialogHelper.showDownloadDialog(mContext, () -> { viewHolder.dm_item_head_tv_allstart.setText(R.string.updating); for (int i = 0; i < updateList.size(); i++) { - if (DownloadManager.getInstance(mContext).getDownloadEntityByUrl(updateList.get(i).getUrl()) == null) { + if (DownloadManager.getInstance().getDownloadEntityByUrl(updateList.get(i).getUrl()) == null) { addUpdateDownload(i, false); // notifyItemChanged(i + 1); } @@ -387,12 +387,12 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter implemen notifyItemChanged(0); EventBus.getDefault().post(new EBSkip(DownloadManagerActivity.TAG, DownloadManagerActivity.INDEX_DOWNLOAD)); } else if (mContext.getString(R.string.install).equals(str)) { - PackageInstaller.install(mContext, DownloadManager.getInstance(mContext).getDownloadEntityByUrl(updateEntity.getUrl())); + PackageInstaller.install(mContext, DownloadManager.getInstance().getDownloadEntityByUrl(updateEntity.getUrl())); } // MtaHelper.onEvent("下载管理", "游戏更新", str); }); - DownloadEntity downloadEntity = DownloadManager.getInstance(mContext).getDownloadEntityByUrl(updateEntity.getUrl()); + DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntityByUrl(updateEntity.getUrl()); if (downloadEntity == null) { if (PackagesManager.INSTANCE.isCanUpdate(updateEntity.getId(), updateEntity.getPackageName())) { viewHolder.guUpdate.setText(R.string.update); @@ -401,7 +401,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter implemen } else if (updateEntity.isPluggable()) { viewHolder.guUpdate.setText((finalPluginDesc + "化")); viewHolder.guUpdate.setTextColor(Color.WHITE); - downloadEntity = DownloadManager.getInstance(mContext).getDownloadEntityByPackageName( + downloadEntity = DownloadManager.getInstance().getDownloadEntityByPackageName( updateEntity.getPackageName()); if (downloadEntity == null || downloadEntity.getUrl().equals(updateEntity.getUrl())) { @@ -449,7 +449,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter implemen if (mPackageName != null && mPackageName.equals(updateEntity.getPackageName())) { // 插件跳转游戏更新页面造成闪退，可能是页面未绘制完成点击造成的闪退 AppExecutor.getUiExecutor().execute(() -> { - DownloadEntity entity = DownloadManager.getInstance(mContext).getDownloadEntityByUrl(updateEntity.getUrl()); + DownloadEntity entity = DownloadManager.getInstance().getDownloadEntityByUrl(updateEntity.getUrl()); if (entity != null && DownloadStatus.pause == entity.getStatus()) { addUpdateDownload(viewHolder.getPosition() - 1, false); } else { @@ -557,13 +557,13 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter implemen downloadEntity.setEntrance(entrance + "+(下载管理:游戏更新)"); downloadEntity.setLocation("游戏更新:列表"); if (updateEntity.getName().contains("光环助手")) { - DownloadManager.getInstance(mContext).pauseAll(); + DownloadManager.getInstance().pauseAll(); } if (isSubscribe) { - DownloadManager.getInstance(mContext).subscribe(downloadEntity); + DownloadManager.getInstance().subscribe(downloadEntity); } else { HistoryHelper.insertGameEntity(updateEntity); - DownloadManager.getInstance(mContext).add(downloadEntity); + DownloadManager.getInstance().add(downloadEntity); } // 收集下载数据 diff --git a/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragment.kt b/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragment.kt index 8928e2a8b5..95a0742e96 100644 --- a/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragment.kt @@ -64,7 +64,7 @@ class InstalledGameFragment : NormalFragment(), OnRequestCallBackListener { private val dataWatcher = object : DataWatcher() { override fun onDataChanged(downloadEntity: DownloadEntity) { if (downloadEntity.status == DownloadStatus.done && downloadEntity.isSimulatorGame()) { - DownloadManager.getInstance(requireContext()).getEntryMap(downloadEntity.name)[downloadEntity.platform] = downloadEntity + DownloadManager.getInstance().getEntryMap(downloadEntity.name)[downloadEntity.platform] = downloadEntity mPackageViewModel?.getGameInstalledLiveData()?.value?.let { mAdapter?.initData(PackagesManager.filterSameApk(PackagesManager.filterDownloadBlackPackage(it as MutableList?))) } @@ -116,18 +116,18 @@ class InstalledGameFragment : NormalFragment(), OnRequestCallBackListener { super.onResume() if (isEverpause) { for (entity in mAdapter!!.gameList) { - entity.setEntryMap(DownloadManager.getInstance(requireContext()).getEntryMap(entity.name)) + entity.setEntryMap(DownloadManager.getInstance().getEntryMap(entity.name)) } mAdapter!!.notifyDataSetChanged() } isEverpause = false - DownloadManager.getInstance(requireContext()).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) } override fun onPause() { super.onPause() isEverpause = true - DownloadManager.getInstance(requireContext()).removeObserver(dataWatcher) + DownloadManager.getInstance().removeObserver(dataWatcher) } override fun loadDone() { @@ -161,7 +161,7 @@ class InstalledGameFragment : NormalFragment(), OnRequestCallBackListener { @Subscribe(threadMode = ThreadMode.MAIN) fun onEventMainThread(status: EBDownloadStatus) { if ("delete" == status.status) { - DownloadManager.getInstance(requireContext()).removePlatform(status.name, status.platform) + DownloadManager.getInstance().removePlatform(status.name, status.platform) val locationList = mAdapter!!.locationMap[status.packageName] var gameEntity: GameEntity? diff --git a/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragmentAdapter.java index c0a215bf77..df7efa4b28 100644 --- a/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragmentAdapter.java @@ -84,7 +84,7 @@ public class InstalledGameFragmentAdapter extends BaseRecyclerAdapter list) { - List downloadEntityList = DownloadManager.getInstance(mContext).getAllSimulatorDownloadEntity(); + List downloadEntityList = DownloadManager.getInstance().getAllSimulatorDownloadEntity(); for (DownloadEntity entity : downloadEntityList) { GameInstall gameInstall = new GameInstall(); gameInstall.setId(entity.getGameId()); @@ -139,7 +139,7 @@ public class InstalledGameFragmentAdapter extends BaseRecyclerAdapter> sequences = new ArrayList<>(); for (String id : ids) { - sequences.add(RetrofitManager.getInstance(mContext).getApi().getGameDigest(id)); + sequences.add(RetrofitManager.getInstance().getApi().getGameDigest(id)); } Observable.mergeDelayError(sequences) .map(ApkActiveUtils.filterMapper) @@ -204,7 +204,7 @@ public class InstalledGameFragmentAdapter extends BaseRecyclerAdapter> = ArrayMap() fun initData(list: ArrayList) { - val downloadEntityList = DownloadManager.getInstance(getApplication()).allSimulatorDownloadEntity + val downloadEntityList = DownloadManager.getInstance().allSimulatorDownloadEntity for (entity in downloadEntityList) { list.add(GameInstall(id = entity.gameId)) } @@ -82,7 +82,7 @@ class InstalledGameViewModel(application: Application) : AndroidViewModel(applic val result = ArrayList() val sequences = ArrayList>() for (id in ids) { - sequences.add(RetrofitManager.getInstance(getApplication()).api.getGameDigest(id)) + sequences.add(RetrofitManager.getInstance().api.getGameDigest(id)) } Observable.mergeDelayError(sequences) .map(ApkActiveUtils.filterMapper) @@ -148,7 +148,7 @@ class InstalledGameViewModel(application: Application) : AndroidViewModel(applic i++ } for (entity in newGameList) { - entity.setEntryMap(DownloadManager.getInstance(getApplication()).getEntryMap(entity.name)) + entity.setEntryMap(DownloadManager.getInstance().getEntryMap(entity.name)) } } this.gameList.clear() diff --git a/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt b/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt index af185923da..3144792e81 100644 --- a/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt @@ -46,7 +46,7 @@ class NewInstalledGameFragment : NormalFragment() { private val dataWatcher = object : DataWatcher() { override fun onDataChanged(downloadEntity: DownloadEntity) { if (downloadEntity.status == DownloadStatus.done && downloadEntity.isSimulatorGame()) { - DownloadManager.getInstance(requireContext()) + DownloadManager.getInstance() .getEntryMap(downloadEntity.name)[downloadEntity.platform] = downloadEntity mPackageViewModel?.getGameInstalledLiveData()?.value?.let { mInstallGameViewModel.initData( @@ -140,19 +140,19 @@ class NewInstalledGameFragment : NormalFragment() { if (isEverpause && gameList != null) { for (entity in gameList) { entity.setEntryMap( - DownloadManager.getInstance(requireContext()).getEntryMap(entity.name) + DownloadManager.getInstance().getEntryMap(entity.name) ) } mInstallGameViewModel.gameListLiveData.postValue(gameList) } isEverpause = false - DownloadManager.getInstance(requireContext()).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) } override fun onPause() { super.onPause() isEverpause = true - DownloadManager.getInstance(requireContext()).removeObserver(dataWatcher) + DownloadManager.getInstance().removeObserver(dataWatcher) } // 打开下载按钮事件 @@ -168,7 +168,7 @@ class NewInstalledGameFragment : NormalFragment() { @Subscribe(threadMode = ThreadMode.MAIN) fun onEventMainThread(status: EBDownloadStatus) { if ("delete" == status.status) { - DownloadManager.getInstance(requireContext()) + DownloadManager.getInstance() .removePlatform(status.name, status.platform) val locationList = mInstallGameViewModel.locationMap[status.packageName] var gameEntity: GameEntity? diff --git a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt index d63712b950..ea1cd202f1 100644 --- a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt @@ -136,7 +136,7 @@ class UpdatableGameAdapter(private var mViewModel: UpdatableGameViewModel) : val context = holder.binding.root.context val pluginDesc: String = update.pluginDesc.take(3) - val downloadManager = DownloadManager.getInstance(context) + val downloadManager = DownloadManager.getInstance() holder.binding.run { otherVersionHintIv.goneIf(itemData.normalUpdateWithArrow == null) @@ -401,7 +401,7 @@ class UpdatableGameAdapter(private var mViewModel: UpdatableGameViewModel) : } else if (updateBtn.context.getString(R.string.install) == str) { PackageInstaller.install( updateBtn.context, - DownloadManager.getInstance(updateBtn.context) + DownloadManager.getInstance() .getDownloadEntityByUrl(update.url) ) } diff --git a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameViewModel.kt b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameViewModel.kt index ef70dd1035..5d3e6860c5 100644 --- a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameViewModel.kt @@ -52,7 +52,7 @@ class UpdatableGameViewModel( private val mOtherVersionExpandedMap by lazy { hashMapOf() } private var mShouldShowIgnoredUpdate = false - private val mDownloadManager by lazy { DownloadManager.getInstance(getApplication()) } + private val mDownloadManager by lazy { DownloadManager.getInstance() } var updatableData: LiveData> = mUpdatableListLiveData @@ -405,7 +405,7 @@ class UpdatableGameViewModel( var updateTaskCount = 0 var updateCompleteTaskCount = 0 for (url in matchedVersionValidUpdateUrlList) { - val downloadEntity = DownloadManager.getInstance(getApplication()) + val downloadEntity = DownloadManager.getInstance() .getDownloadEntityByUrl(url) if (downloadEntity != null) { updateTaskCount++ @@ -453,7 +453,7 @@ class UpdatableGameViewModel( private fun getUpdateInfoByPackageName(packageName: String) { val ghId: Any? = PackageUtils.getMetaData(getApplication(), packageName, "gh_id") - val retrofit = RetrofitManager.getInstance(getApplication()).api + val retrofit = RetrofitManager.getInstance().api if (ghId == null) { retrofit.loadGameDataByPackageName( @@ -607,13 +607,13 @@ class UpdatableGameViewModel( downloadEntity.entrance = "$entrance+(下载管理:游戏更新)" downloadEntity.location = "游戏更新:列表" if (update.name?.contains("光环助手") == true) { - DownloadManager.getInstance(getApplication()).pauseAll() + DownloadManager.getInstance().pauseAll() } if (isSubscribe) { - DownloadManager.getInstance(getApplication()).subscribe(downloadEntity) + DownloadManager.getInstance().subscribe(downloadEntity) } else { insertGameEntity(update) - DownloadManager.getInstance(getApplication()).add(downloadEntity) + DownloadManager.getInstance().add(downloadEntity) } // 收集下载数据 diff --git a/app/src/main/java/com/gh/gamecenter/energy/CommodityViewModel.kt b/app/src/main/java/com/gh/gamecenter/energy/CommodityViewModel.kt index 9ae3410b38..28f4b4a0db 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/CommodityViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/CommodityViewModel.kt @@ -25,7 +25,7 @@ class CommodityViewModel(application: Application, var categoryId: String, var e override fun provideDataObservable(page: Int) = null override fun provideDataSingle(page: Int): Single> { - return RetrofitManager.getInstance(getApplication()).api.getCommodities( + return RetrofitManager.getInstance().api.getCommodities( getFilter(), page, if (entrance == "光能中心") 10 diff --git a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterViewModel.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterViewModel.kt index 4ce83d5f36..5f8b5c8509 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterViewModel.kt @@ -12,7 +12,7 @@ import io.reactivex.schedulers.Schedulers class EnergyCenterViewModel(application: Application) : AndroidViewModel(application) { - private val api = RetrofitManager.getInstance(getApplication()).api + private val api = RetrofitManager.getInstance().api var categories = MutableLiveData>() diff --git a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseViewModel.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseViewModel.kt index 651993787f..ef906e18b5 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseViewModel.kt @@ -15,7 +15,7 @@ import io.reactivex.schedulers.Schedulers class EnergyHouseViewModel(application: Application) : AndroidViewModel(application) { - private val api = RetrofitManager.getInstance(getApplication()).api + private val api = RetrofitManager.getInstance().api var commodityCategories = MutableLiveData>() var rollNotices = MutableLiveData>() diff --git a/app/src/main/java/com/gh/gamecenter/energy/TaskViewModel.kt b/app/src/main/java/com/gh/gamecenter/energy/TaskViewModel.kt index aa7116278e..11058652a5 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/TaskViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/TaskViewModel.kt @@ -16,7 +16,7 @@ class TaskViewModel(application: Application) setOverLimitSize(1000) // 该页面不需要分页 } - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api private var mIsFirst = true private var mNoviceTasks = ArrayList() private var mFixedTasks = ArrayList() diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListViewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListViewModel.kt index e7dcf02222..5c88b0001c 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListViewModel.kt @@ -21,16 +21,16 @@ class ForumArticleAskListViewModel(application: Application, val bbsId: String = override fun provideDataObservable(page: Int): Observable> { return when (mPath) { "全部" -> { - RetrofitManager.getInstance(getApplication()).api.getAllForumList(bbsId, UrlFilterUtils.getFilterQuery(sort, "-1"), page) + RetrofitManager.getInstance().api.getAllForumList(bbsId, UrlFilterUtils.getFilterQuery(sort, "-1"), page) } "精华" -> { - RetrofitManager.getInstance(getApplication()).api.getEssenceForumList(bbsId, page) + RetrofitManager.getInstance().api.getEssenceForumList(bbsId, page) } "问答" -> { - RetrofitManager.getInstance(getApplication()).api.getAskForumList(bbsId, page) + RetrofitManager.getInstance().api.getAskForumList(bbsId, page) } else -> { - RetrofitManager.getInstance(getApplication()).api.getVideoForumList(bbsId, UrlFilterUtils.getFilterQuery(videoSort, "-1"), page) + RetrofitManager.getInstance().api.getVideoForumList(bbsId, UrlFilterUtils.getFilterQuery(videoSort, "-1"), page) } } } diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailViewModel.kt index 6b1061d020..47344cbf90 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailViewModel.kt @@ -25,8 +25,8 @@ import retrofit2.HttpException class ForumDetailViewModel(application: Application, val bbsId: String) : AndroidViewModel(application) { - private val mApi = RetrofitManager.getInstance(application).api - private val mForumDao = AppDatabase.getInstance(HaloApp.getInstance()).forumDao() + private val mApi = RetrofitManager.getInstance().api + private val mForumDao = AppDatabase.getInstance().forumDao() var forumDetail = MutableLiveData>() val answerLiveData = MediatorLiveData() @@ -65,7 +65,7 @@ class ForumDetailViewModel(application: Application, val bbsId: String) : Androi @SuppressLint("CheckResult") fun followForum(onSuccess: () -> Unit) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .followForum(bbsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -78,7 +78,7 @@ class ForumDetailViewModel(application: Application, val bbsId: String) : Androi @SuppressLint("CheckResult") fun unFollowForum(onSuccess: () -> Unit) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .unFollowForum(bbsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeViewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeViewModel.kt index 37c4cecf9e..584a0c5360 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeViewModel.kt @@ -13,7 +13,7 @@ import com.gh.gamecenter.retrofit.RetrofitManager class CommunityHomeViewModel(application: Application) : AndroidViewModel(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api val articleLiveData = MediatorLiveData() fun getArticleData(communityId: String, articleId: String) { diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityViewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityViewModel.kt index 1de5cbdf47..5990577d1e 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityViewModel.kt @@ -23,7 +23,7 @@ class ForumActivityViewModel(application: Application) : ListViewModel> { - return RetrofitManager.getInstance(getApplication()) + return RetrofitManager.getInstance() .api.getForumActivities(categoryId, page) } diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListViewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListViewModel.kt index 9f8b9d8d91..393245cb1b 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListViewModel.kt @@ -20,7 +20,7 @@ import io.reactivex.Observable class ForumArticleListViewModel(application: Application) : ListViewModel(application) { - private val mForumDao = AppDatabase.getInstance(HaloApp.getInstance()).forumDao() + private val mForumDao = AppDatabase.getInstance().forumDao() val recordForumsLiveData = MutableLiveData, Boolean>>() var recordForums = arrayListOf() var recordStatusForums = arrayListOf() @@ -33,7 +33,7 @@ class ForumArticleListViewModel(application: Application) : ListViewModel>? { - return RetrofitManager.getInstance(getApplication()) + return RetrofitManager.getInstance() .api.getForumRecommends(UrlFilterUtils.getFilterQuery(sort, "-1"), page) } @@ -75,7 +75,7 @@ class ForumArticleListViewModel(application: Application) : ListViewModel>() fun loadSlide() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .forumSlide .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -68,7 +68,7 @@ class ForumHomeViewModel(application: Application) : AndroidViewModel(applicatio private fun loadFollowsForum(): Observable> { return if (UserManager.getInstance().isLoggedIn) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getFollowsForum(UserManager.getInstance().userId) } else { Observable.create> { @@ -83,10 +83,10 @@ class ForumHomeViewModel(application: Application) : AndroidViewModel(applicatio val requestMap = hashMapOf() requestMap["game_ids"] = gameIds return if (UserManager.getInstance().isLoggedIn) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getRecommendForum(UserManager.getInstance().userId, requestMap.toRequestBody()) } else { - RetrofitManager.getInstance(getApplication()).api.getRecommendForumNotLoggedIn(requestMap.toRequestBody()) + RetrofitManager.getInstance().api.getRecommendForumNotLoggedIn(requestMap.toRequestBody()) } } diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumViewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumViewModel.kt index cc3510a914..9b7bf735ae 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumViewModel.kt @@ -19,7 +19,7 @@ import retrofit2.HttpException class ForumViewModel(application: Application) : AndroidViewModel(application) { - private val api = RetrofitManager.getInstance(getApplication()).api + private val api = RetrofitManager.getInstance().api val followForumsLiveData = MediatorLiveData>() val hotForums = MediatorLiveData>() val officialForums = MediatorLiveData>() @@ -77,7 +77,7 @@ class ForumViewModel(application: Application) : AndroidViewModel(application) { } requestMap["bbs"] = followStatusForums val body = requestMap.createRequestBodyAny() - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api .getForumUnreadStatus(body) .compose(singleToMain()) @@ -137,7 +137,7 @@ class ForumViewModel(application: Application) : AndroidViewModel(application) { @SuppressLint("CheckResult") fun followForum(bbsId: String, onSuccess: () -> Unit) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .followForum(bbsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -150,7 +150,7 @@ class ForumViewModel(application: Application) : AndroidViewModel(application) { @SuppressLint("CheckResult") fun unFollowForum(bbsId: String, onSuccess: () -> Unit) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .unFollowForum(bbsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/forum/list/ForumListVIewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/list/ForumListVIewModel.kt index 6a879c3b14..8addc80180 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/list/ForumListVIewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/list/ForumListVIewModel.kt @@ -14,7 +14,7 @@ import okhttp3.ResponseBody class ForumListViewModel(application: Application): ListViewModel(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api var type = ForumListActivity.TYPE_FOLLOW override fun mergeResultLiveData() { diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorViewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorViewModel.kt index a0ec3b2122..1ee994a1c1 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorViewModel.kt @@ -20,7 +20,7 @@ class ApplyModeratorViewModel(application: Application, val bbsId: String) : val statusEntity = MutableLiveData() fun getModeratorsApplyStatus() { - RetrofitManager.getInstance(getApplication()).api.getApplyModeratorStatus(bbsId) + RetrofitManager.getInstance().api.getApplyModeratorStatus(bbsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : Response() { @@ -37,7 +37,7 @@ class ApplyModeratorViewModel(application: Application, val bbsId: String) : } fun applyModerator(successCallback: (() -> Unit)?, failureCallback: (() -> Unit)?) { - RetrofitManager.getInstance(getApplication()).api.postApplyModerator(bbsId) + RetrofitManager.getInstance().api.postApplyModerator(bbsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : Response() { diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListViewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListViewModel.kt index df0f3fc78b..925e0167fe 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListViewModel.kt @@ -36,7 +36,7 @@ class ModeratorListViewModel(application: Application, val bbsId: String) : } fun getModeratorsApplyStatus() { - RetrofitManager.getInstance(getApplication()).api.getApplyModeratorStatus(bbsId) + RetrofitManager.getInstance().api.getApplyModeratorStatus(bbsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : Response() { @@ -53,7 +53,7 @@ class ModeratorListViewModel(application: Application, val bbsId: String) : } fun getModerators() { - RetrofitManager.getInstance(getApplication()).api.getModerators(bbsId) + RetrofitManager.getInstance().api.getModerators(bbsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : Response>() { @@ -71,7 +71,7 @@ class ModeratorListViewModel(application: Application, val bbsId: String) : @SuppressLint("CheckResult") fun getModeratorsInfo() { - RetrofitManager.getInstance(getApplication()).api.getModeratorsInfo(bbsId) + RetrofitManager.getInstance().api.getModeratorsInfo(bbsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : BiResponse() { @@ -90,9 +90,9 @@ class ModeratorListViewModel(application: Application, val bbsId: String) : fun followingCommand(userId: String, isFollow: Boolean, onSuccess: () -> Unit) { val observable = if (isFollow) { - RetrofitManager.getInstance(getApplication()).api.postFollowing(userId) + RetrofitManager.getInstance().api.postFollowing(userId) } else { - RetrofitManager.getInstance(getApplication()).api.deleteFollowing(userId) + RetrofitManager.getInstance().api.deleteFollowing(userId) } observable .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListViewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListViewModel.kt index 3c2836d59d..450c87cee7 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListViewModel.kt @@ -20,7 +20,7 @@ class ForumContentSearchListViewModel(application: Application, val bbsId: Strin if (bbsId.isNotEmpty()) { map["bbs_id"] = bbsId } - return RetrofitManager.getInstance(getApplication()).api.searchForumContent(map, page) + return RetrofitManager.getInstance().api.searchForumContent(map, page) } override fun mergeResultLiveData() { diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/ForumOrUserSearchDefaultViewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/search/ForumOrUserSearchDefaultViewModel.kt index d1869f9bdf..42a7f92636 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/search/ForumOrUserSearchDefaultViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/search/ForumOrUserSearchDefaultViewModel.kt @@ -12,7 +12,7 @@ class ForumOrUserSearchDefaultViewModel(application: Application) : AndroidViewM val hotSearchLiveData = MutableLiveData>() fun getHotSearch() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .hotSearches .compose(observableToMain()) .subscribe(object : Response>() { diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/UserSearchListViewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/search/UserSearchListViewModel.kt index 2e15dc5606..9c8d6f2915 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/search/UserSearchListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/search/UserSearchListViewModel.kt @@ -19,7 +19,7 @@ import retrofit2.HttpException class UserSearchListViewModel(application: Application) : ListViewModel(application) { var searchKey = "" override fun provideDataObservable(page: Int): Observable> { - return RetrofitManager.getInstance(getApplication()).api.searchUsers(searchKey, page) + return RetrofitManager.getInstance().api.searchUsers(searchKey, page) } override fun mergeResultLiveData() { @@ -41,9 +41,9 @@ class UserSearchListViewModel(application: Application) : ListViewModel Unit) { val observable = if (isFollow) { - RetrofitManager.getInstance(getApplication()).api.postFollowing(userId) + RetrofitManager.getInstance().api.postFollowing(userId) } else { - RetrofitManager.getInstance(getApplication()).api.deleteFollowing(userId) + RetrofitManager.getInstance().api.deleteFollowing(userId) } observable .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectViewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectViewModel.kt index 3f0fa9650e..0aa2ff341f 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectViewModel.kt @@ -26,7 +26,7 @@ class ForumSelectViewModel(application: Application) : AndroidViewModel(applicat val forumData = MutableLiveData>>() fun getForumCategories() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .forumCategories .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -47,10 +47,10 @@ class ForumSelectViewModel(application: Application) : AndroidViewModel(applicat fun getForumList(category: ForumCategoryEntity?) { val observable = if (category?.name != "我的关注") { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getForumByCategories(category?.id ?: "") } else { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getFollowsForum(UserManager.getInstance().userId) } observable.subscribeOn(Schedulers.io()) @@ -72,7 +72,7 @@ class ForumSelectViewModel(application: Application) : AndroidViewModel(applicat @SuppressLint("CheckResult") fun followForum(bbsId: String, onSuccess: () -> Unit) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .followForum(bbsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -85,7 +85,7 @@ class ForumSelectViewModel(application: Application) : AndroidViewModel(applicat @SuppressLint("CheckResult") fun unFollowForum(bbsId: String, onSuccess: () -> Unit) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .unFollowForum(bbsId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperViewModel.kt b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperViewModel.kt index 410de5084a..47237ffe3a 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperViewModel.kt @@ -30,7 +30,7 @@ class HomeSearchToolWrapperViewModel(application: Application) : AndroidViewMode @SuppressLint("CheckResult") fun getTabs() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getHomeTabs(HaloApp.getInstance().channel, BuildConfig.VERSION_NAME) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperViewModel.kt b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperViewModel.kt index d4e3e629ac..2d95c9c6ff 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperViewModel.kt @@ -24,8 +24,8 @@ import io.reactivex.schedulers.Schedulers import retrofit2.HttpException class MainWrapperViewModel(application: Application) : AndroidViewModel(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api - private val mSensitiveApi = RetrofitManager.getInstance(application).api + private val mApi = RetrofitManager.getInstance().api + private val mSensitiveApi = RetrofitManager.getInstance().api private var mLastRequestDiscoveryTime: Long = 0 private val mIntervalRequestDiscoveryData = 5 * 60 * 1000 // 5分钟的发现游戏动态请求间隔 diff --git a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java index de8df5329b..9293f8e603 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java @@ -345,7 +345,7 @@ public class SearchToolbarFragment extends BaseLazyFragment implements View.OnCl } private void setDownloadHint(List updateList) { - String count = DownloadManager.getInstance(requireContext()).getDownloadOrUpdateCount(updateList); + String count = DownloadManager.getInstance().getDownloadOrUpdateCount(updateList); if (count != null) { mDownloadHintTv.setVisibility(View.VISIBLE); mDownloadHintTv.setText(count); diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt index 5ae0a0b5bc..2ec6d2886a 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt @@ -177,7 +177,7 @@ class GameFragment : LazyFragment() { override fun onFragmentPause() { super.onFragmentPause() - DownloadManager.getInstance(context).removeObserver(dataWatcher) + DownloadManager.getInstance().removeObserver(dataWatcher) if (::mListAdapter.isInitialized) { mListAdapter.isAutoScroll = false mListAdapter.notifyItemChanged(0) @@ -187,7 +187,7 @@ class GameFragment : LazyFragment() { override fun onFragmentResume() { super.onFragmentResume() if (::mListAdapter.isInitialized) { - DownloadManager.getInstance(context).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) mListAdapter.isAutoScroll = true mListAdapter.notifyItemChanged(0) } diff --git a/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt b/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt index a6a687b526..3ec27cd57f 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt @@ -41,7 +41,7 @@ class GameViewModel(application: Application, var blockData: SubjectRecommendEnt private var mSubjectPage = 1 // 专题分页 private var mIsLoading = false - private val mSensitiveApi = RetrofitManager.getInstance(application).api + private val mSensitiveApi = RetrofitManager.getInstance().api private var mOffsetMap: HashMap = hashMapOf() @@ -692,7 +692,7 @@ class GameViewModel(application: Application, var blockData: SubjectRecommendEnt } positionAndPackageMap[packages + (mItemDataListCache.size - 1)] = mItemDataListCache.size - 1 game.gameLocation = GameEntity.GameLocation.INDEX - game.setEntryMap(DownloadManager.getInstance(getApplication()).getEntryMap(game.name)) + game.setEntryMap(DownloadManager.getInstance().getEntryMap(game.name)) } /** diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailViewModel.kt index f72a50cd6b..10d11f059d 100644 --- a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailViewModel.kt @@ -22,7 +22,7 @@ import retrofit2.HttpException class ColumnCollectionDetailViewModel(application: Application, private val mCollectionId: String) : ListViewModel(application) { - private val mSensitiveApi = RetrofitManager.getInstance(HaloApp.getInstance().application).api + private val mSensitiveApi = RetrofitManager.getInstance().api val collectionId: String get() = mCollectionId diff --git a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailViewModel.kt index 3504992361..e550e7081a 100644 --- a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailViewModel.kt @@ -21,7 +21,7 @@ class CommonCollectionDetailViewModel( override fun provideDataObservable(page: Int): Observable>? { return if (page == 1) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getCommonCollectionDetail(mCollectionId).map { commonCollectionLiveData.postValue(it) it.collectionList diff --git a/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadViewModel.kt b/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadViewModel.kt index 507650623b..f372adcf0b 100644 --- a/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadViewModel.kt @@ -25,7 +25,7 @@ class GameUploadViewModel(application: Application) : AndroidViewModel(applicati //上传游戏 fun uploadGames(body: RequestBody) { - RetrofitManager.getInstance(HaloApp.getInstance().application) + RetrofitManager.getInstance() .api.uploadGames(UserManager.getInstance().userId, body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -44,7 +44,7 @@ class GameUploadViewModel(application: Application) : AndroidViewModel(applicati @SuppressLint("CheckResult") fun getUploadGamesTips() { - RetrofitManager.getInstance(HaloApp.getInstance().application) + RetrofitManager.getInstance() .api.uploadGamesTips() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchGameFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchGameFragment.kt index bd8b18f471..f946ddfd06 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchGameFragment.kt @@ -59,7 +59,7 @@ class AddSearchGameFragment : GameFragment() { override fun provideDataObservable(page: Int): Observable>? { return RetrofitManager - .getInstance(requireContext()).api + .getInstance().api .getSearchGame(Config.API_HOST + "games:search?keyword=" + searchEt.text + "&view=digest" + "&from=game_list" + "&page=" + page + "&channel=" + HaloApp.getInstance().channel + "&version=" + BuildConfig.VERSION_NAME) } diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt index 7e2e0261ed..df313e36b4 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt @@ -638,7 +638,7 @@ class GameCollectionDetailFragment : override fun onResume() { if (isEverPause && mAdapter != null) mAdapter?.notifyDataSetChanged() super.onResume() - DownloadManager.getInstance(context).addObserver(mDataWatcher) + DownloadManager.getInstance().addObserver(mDataWatcher) if (!mIsPauseTopVideo) { resumeVideo() @@ -647,7 +647,7 @@ class GameCollectionDetailFragment : override fun onPause() { super.onPause() - DownloadManager.getInstance(context).removeObserver(mDataWatcher) + DownloadManager.getInstance().removeObserver(mDataWatcher) pauseVideo() if (mListViewModel.displayTopVideo) { diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailViewModel.kt index 868d461f7c..f0e5ee5767 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailViewModel.kt @@ -134,9 +134,9 @@ open class GameCollectionDetailViewModel(application: Application, fun followingCommand(userId: String, isFollow: Boolean) { val observable = if (isFollow) { - RetrofitManager.getInstance(getApplication()).api.postFollowing(userId) + RetrofitManager.getInstance().api.postFollowing(userId) } else { - RetrofitManager.getInstance(getApplication()).api.deleteFollowing(userId) + RetrofitManager.getInstance().api.deleteFollowing(userId) } observable .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterViewModel.kt index bc37e692d1..e5c93a1b28 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterViewModel.kt @@ -20,9 +20,9 @@ class GameCollectionPosterViewModel(application: Application) : AndroidViewModel fun followingCommand(userId: String, isFollow: Boolean) { val observable = if (isFollow) { - RetrofitManager.getInstance(getApplication()).api.postFollowing(userId) + RetrofitManager.getInstance().api.postFollowing(userId) } else { - RetrofitManager.getInstance(getApplication()).api.deleteFollowing(userId) + RetrofitManager.getInstance().api.deleteFollowing(userId) } observable .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionViewModel.kt index 687f2bb4d1..adb2ec0a40 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionViewModel.kt @@ -15,7 +15,7 @@ import okhttp3.ResponseBody import retrofit2.HttpException class MyGameCollectionViewModel(application: Application) : ListViewModel(application) { - private val mApi = RetrofitManager.getInstance(HaloApp.getInstance()).api + private val mApi = RetrofitManager.getInstance().api val deleteLiveData = MutableLiveData() val publishLiveData = MutableLiveData() override fun provideDataObservable(page: Int): Observable>? { diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditViewModel.kt index 2e3e2f061a..858a129260 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditViewModel.kt @@ -31,8 +31,8 @@ class GameCollectionEditViewModel(application: Application) : AndroidViewModel(a var draftLiveData = MutableLiveData() val postLiveData = MutableLiveData>() val processDialog = MediatorLiveData() - private val mApi = RetrofitManager.getInstance(HaloApp.getInstance()).api - private val mDraftDao = AppDatabase.getInstance(HaloApp.getInstance()).gameCollectionDraftDao() + private val mApi = RetrofitManager.getInstance().api + private val mDraftDao = AppDatabase.getInstance().gameCollectionDraftDao() fun uploadPoster() { if (imagePath.isEmpty()) return diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareViewModel.kt index c82f7f85d4..9d9c6e7d74 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareViewModel.kt @@ -46,10 +46,10 @@ class GameCollectionSquareViewModel(application: Application) : override fun provideDataSingle(page: Int): Single> = if (isHome) - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getHomeGameCollectionSquareList(UUID.randomUUID().toString(), page, PAGE_SIZE) else - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getGameCollectionSquareList(view, selectedTagId, page, PAGE_SIZE) override fun mergeResultLiveData() { @@ -70,7 +70,7 @@ class GameCollectionSquareViewModel(application: Application) : @SuppressLint("CheckResult") fun getAmwayCommentList() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getAmwayCommentList(1, 10) .subscribeOn(Schedulers.io()) .subscribe(object : BiResponse>() { diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagViewModel.kt index f4c26d2804..57079de6bf 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagViewModel.kt @@ -13,7 +13,7 @@ import io.reactivex.schedulers.Schedulers class GameCollectionTagViewModel(application: Application) : AndroidViewModel(application) { var tagListLiveData = MutableLiveData>() - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api init { getGameCollectionTagList() diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt index 8fd6e0be25..df003755fe 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt @@ -280,7 +280,7 @@ class GameDetailFragment : NormalFragment() { if (mGameEntity != null && mGameEntity!!.getApk().size == 1) { val url = mGameEntity!!.getApk()[0].url if (downloadEntity.url == url) { - if ("pause" != DownloadManager.getInstance(context) + if ("pause" != DownloadManager.getInstance() .getStatus(downloadEntity.url)?.status ) { mDownloadEntity = downloadEntity @@ -1303,7 +1303,7 @@ class GameDetailFragment : NormalFragment() { private fun updateDownloadCountHint(updateList: List?) { val count = - DownloadManager.getInstance(requireContext()).getDownloadOrUpdateCount(updateList) + DownloadManager.getInstance().getDownloadOrUpdateCount(updateList) val params = mDownloadCountHint?.layoutParams if (TextUtils.isEmpty(count)) { params?.width = DisplayUtils.dip2px(6f) @@ -1676,7 +1676,7 @@ class GameDetailFragment : NormalFragment() { showBrowserInstallHintIfNeeded() - DownloadManager.getInstance(context).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) controlInstallHint() } @@ -1703,7 +1703,7 @@ class GameDetailFragment : NormalFragment() { mRecommendDisposable!!.dispose() mRecommendDisposable = null } - DownloadManager.getInstance(context).removeObserver(dataWatcher) + DownloadManager.getInstance().removeObserver(dataWatcher) } private fun getCallback(): SuccessCallback { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt index 56bf9a2972..fc12625db5 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt @@ -41,8 +41,8 @@ class GameDetailViewModel(application: Application, } } - private val mApi = RetrofitManager.getInstance(getApplication()).api - private val mSensitiveApi = RetrofitManager.getInstance(application).api + private val mApi = RetrofitManager.getInstance().api + private val mSensitiveApi = RetrofitManager.getInstance().api val concernLiveData = MutableLiveData() val gameLiveData = MutableLiveData>() diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescViewModel.kt index 7c859cde71..e23d241795 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescViewModel.kt @@ -81,7 +81,7 @@ class DescViewModel(application: Application, val result = ArrayList() val sequences = ArrayList>() for (id in idList) { - sequences.add(RetrofitManager.getInstance(getApplication()).api.getGameDigest(id)) + sequences.add(RetrofitManager.getInstance().api.getGameDigest(id)) } Observable.mergeDelayError(sequences) .map(ApkActiveUtils.filterMapper) @@ -107,7 +107,7 @@ class DescViewModel(application: Application, } fun voteComment(commentId: String, callback: () -> Unit) { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api .voteGameComment(game!!.id, commentId) .subscribeOn(Schedulers.io()) @@ -133,7 +133,7 @@ class DescViewModel(application: Application, } fun unvoteComment(commentId: String, callback: () -> Unit) { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api .unvoteGameComment(game!!.id, commentId) .subscribeOn(Schedulers.io()) @@ -206,7 +206,7 @@ class DescViewModel(application: Application, params["game_id"] = game?.id ?: "" params["message"] = "求更新：${game?.name}(${game?.getApk()?.get(0)?.packageName}, ${game?.getApk()?.get(0)?.version})" val requestBody = params.createRequestBody() - RetrofitManager.getInstance(getApplication()).api.postSuggestion(requestBody) + RetrofitManager.getInstance().api.postSuggestion(requestBody) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : Response() { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/InviteCodeDialog.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/InviteCodeDialog.kt index b0051ed15e..27e53e7df7 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/InviteCodeDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/InviteCodeDialog.kt @@ -89,7 +89,7 @@ class InviteCodeDialog : BaseDraggableDialogFragment() { params.put("from", from) val body = RequestBody.create(MediaType.parse("application/json"), params.toString()) - RetrofitManager.getInstance(HaloApp.getInstance().application) + RetrofitManager.getInstance() .api.checkInviteCode(UserManager.getInstance().userId, body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarViewModel.kt index 52afe153b1..8d9815020a 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarViewModel.kt @@ -48,7 +48,7 @@ class ServersCalendarViewModel(application: Application, @SuppressLint("CheckResult") fun loadServerData(isMirror: Boolean = false) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getGameServerCalendar(game.id, if (isMirror) "mirror" else "") .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListAdapter.kt index 593b731292..481146f486 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListAdapter.kt @@ -103,7 +103,7 @@ class HistoryApkListAdapter(context: Context, } else if (gameEntity.getApk().size == 1) { visibility = View.VISIBLE var downloadText = "" - val downloadEntity = DownloadManager.getInstance(mContext).getDownloadEntityByUrl(apkEntity.url) + val downloadEntity = DownloadManager.getInstance().getDownloadEntityByUrl(apkEntity.url) if (downloadEntity != null) { val xapkStatus = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_STATUS] downloadText = if (XapkUnzipStatus.UNZIPPING.name == xapkStatus) { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListFragment.kt index 52e850dae5..95d5ae7408 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListFragment.kt @@ -57,12 +57,12 @@ class HistoryApkListFragment : ListFragment override fun onResume() { if (isEverPause && mAdapter != null) mAdapter?.notifyDataSetChanged() super.onResume() - DownloadManager.getInstance(context).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) } override fun onPause() { super.onPause() - DownloadManager.getInstance(context).removeObserver(dataWatcher) + DownloadManager.getInstance().removeObserver(dataWatcher) } override fun getItemDecoration(): RecyclerView.ItemDecoration { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListViewModel.kt index 500b1ee96e..ec11c61d3c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListViewModel.kt @@ -31,11 +31,11 @@ class HistoryApkListViewModel(application: Application, var gameId: String, var override fun provideDataObservable(page: Int) = null override fun provideDataSingle(page: Int): Single> { - return RetrofitManager.getInstance(getApplication()).api.getHistoryApks(gameId, page) + return RetrofitManager.getInstance().api.getHistoryApks(gameId, page) } fun getGameDigest() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getGameDigest(gameId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingViewModel.kt index 8f5487a61f..7a024cb8e4 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingViewModel.kt @@ -19,7 +19,7 @@ import okhttp3.ResponseBody import retrofit2.HttpException class MyRatingViewModel(application: Application) : ListViewModel(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api override fun provideDataObservable(page: Int): Observable>? { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt index 0efa881e88..dfc8ece508 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt @@ -207,7 +207,7 @@ class RatingReplyActivity : ListActivity(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api - private val mSensitiveApi = RetrofitManager.getInstance(application).api + private val mApi = RetrofitManager.getInstance().api + private val mSensitiveApi = RetrofitManager.getInstance().api private val mRealLoadStatusLiveData = MediatorLiveData() val headDataLiveData = MediatorLiveData() diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingViewModel.kt index af945e094d..dca4de96ad 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingViewModel.kt @@ -27,7 +27,7 @@ import retrofit2.HttpException class RatingViewModel(application: Application, val game: GameEntity, val type: RatingType = RatingType.RATING) : ListViewModel(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api val ratingLiveData = MutableLiveData() val filterMap = HashMap() diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditViewModel.kt index d9549a35ca..1afa354a77 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditViewModel.kt @@ -24,7 +24,7 @@ import retrofit2.HttpException class RatingEditViewModel(application: Application, private val game: GameEntity?) : AndroidViewModel(application) { - private val mApi = RetrofitManager.getInstance(application).api + private val mApi = RetrofitManager.getInstance().api var deviceName: MutableLiveData = MutableLiveData() var guideTags: MutableLiveData> = MutableLiveData() // 引导标签 diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/logs/CommentLogsActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/logs/CommentLogsActivity.kt index 1860ecdc14..a3232b6340 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/logs/CommentLogsActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/logs/CommentLogsActivity.kt @@ -49,7 +49,7 @@ class CommentLogsActivity : ListActivity> { - return RetrofitManager.getInstance(this).api.getGameCommentLogs(mGameId, mCommentId, page) + return RetrofitManager.getInstance().api.getGameCommentLogs(mGameId, mCommentId, page) } override fun provideListViewModel(): NormalListViewModel { diff --git a/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java b/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java index 7de1b73185..e69b32291a 100644 --- a/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java +++ b/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java @@ -22,8 +22,6 @@ import retrofit2.HttpException; */ public class GeetestUtils { - private static final byte[] SLOCK = new byte[0]; - private static volatile GeetestUtils sSingleton; private boolean isOperating; private ProgressDialog mProgressDialog; private GeetestListener mGeetestListener; @@ -31,14 +29,7 @@ public class GeetestUtils { private final int RETRY_MAX_COUNT = 3; public static GeetestUtils getInstance() { - if (sSingleton == null) { - synchronized (SLOCK) { - if (sSingleton == null) { - sSingleton = new GeetestUtils(); - } - } - } - return sSingleton; + return SingletonHolder.INSTANCE; } /** @@ -66,7 +57,7 @@ public class GeetestUtils { private void checkServer(final Context context) { isOperating = true; - RetrofitManager.getInstance(context).getApi() + RetrofitManager.getInstance().getApi() .getCaptchaData() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -239,4 +230,7 @@ public class GeetestUtils { RuntimeUtils.getInstance().toast(context, msg); } + private static class SingletonHolder { + private static final GeetestUtils INSTANCE = new GeetestUtils(); + } } diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpContainerViewModel.kt b/app/src/main/java/com/gh/gamecenter/help/HelpContainerViewModel.kt index 29beb475c3..71fec2a466 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpContainerViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpContainerViewModel.kt @@ -19,7 +19,7 @@ import retrofit2.HttpException class HelpContainerViewModel(application: Application, val qaId: String?, val qaCollectionId: String?) : AndroidViewModel(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api /** * Pair first: 是否显示内容（true：显示，false：隐藏） diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpContentFragment.kt b/app/src/main/java/com/gh/gamecenter/help/HelpContentFragment.kt index e3a75e60cb..0b04a129c3 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpContentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpContentFragment.kt @@ -95,9 +95,9 @@ class HelpContentFragment : ListFragment>>() init { diff --git a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackViewModel.kt b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackViewModel.kt index 57106bb3e2..515bb569b4 100644 --- a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackViewModel.kt @@ -37,7 +37,7 @@ class QaFeedbackViewModel(application: Application, private val contentId: Strin map["rom"] = RomIdentifier.getRom().name + " " + RomIdentifier.getRom().versionName val requestBody = map.toRequestBody() - RetrofitManager.getInstance(HaloApp.getInstance()).api + RetrofitManager.getInstance().api .qaSuggestions(contentId, requestBody) .compose(singleToMain()) .subscribe(object : BiResponse() { diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt index 5fcf186606..7565e79d8c 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt @@ -182,7 +182,7 @@ class HomeFragment : BaseFragment() { super.onPause() pauseVideo() - DownloadManager.getInstance(context).removeObserver(dataWatcher) + DownloadManager.getInstance().removeObserver(dataWatcher) handleAutoScroll(false) mElapsedHelper.pauseCounting() @@ -193,7 +193,7 @@ class HomeFragment : BaseFragment() { resumeVideo() if (isEverPause) mListAdapter.notifyDataSetChanged() super.onResume() - DownloadManager.getInstance(context).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) handleAutoScroll(true) mElapsedHelper.resetCounting() diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt b/app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt index 691062445d..f317fd711a 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt @@ -31,7 +31,7 @@ import kotlin.collections.set class HomeViewModel(application: Application) : AndroidViewModel(application) { - private val mSensitiveApi = RetrofitManager.getInstance(application).api + private val mSensitiveApi = RetrofitManager.getInstance().api private var mSnapshotItemList = ArrayList() private val mSubjectChangedMap: ArrayMap> = ArrayMap() // 存储换一换的数据 @@ -94,7 +94,7 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) { } } for (game in list) { - game.setEntryMap(DownloadManager.getInstance(getApplication()).getEntryMap(game.name)) + game.setEntryMap(DownloadManager.getInstance().getEntryMap(game.name)) } // 下载7天排序 @@ -459,7 +459,7 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) { } positionAndPackageMap[packages + (mSnapshotItemList.size - 1)] = mSnapshotItemList.size - 1 game.gameLocation = GameEntity.GameLocation.INDEX - game.setEntryMap(DownloadManager.getInstance(getApplication()).getEntryMap(game.name)) + game.setEntryMap(DownloadManager.getInstance().getEntryMap(game.name)) } private fun appendAdditionalInfoToRankSubjectGame(subject: SubjectEntity?, outerPosition: Int) { diff --git a/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipFragment.kt b/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipFragment.kt index 6e44a7484a..01ed9be1ef 100644 --- a/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipFragment.kt @@ -79,17 +79,17 @@ class PackageSkipFragment : BaseFragment() { packages += game.simulator?.apk?.packageName positionAndPackageMap[packages + position + game.id] = position game.gameLocation = GameEntity.GameLocation.INDEX - game.setEntryMap(DownloadManager.getInstance(requireContext()).getEntryMap(game.name)) + game.setEntryMap(DownloadManager.getInstance().getEntryMap(game.name)) } override fun onResume() { super.onResume() - DownloadManager.getInstance(requireContext()).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) } override fun onPause() { super.onPause() - DownloadManager.getInstance(requireContext()).removeObserver(dataWatcher) + DownloadManager.getInstance().removeObserver(dataWatcher) } //安装、卸载事件 diff --git a/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java b/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java index 9c9b5cd21e..ba6fa0248e 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java @@ -106,7 +106,7 @@ class ConcernAdapter extends BaseRecyclerAdapter { } isLoading = true; notifyItemChanged(getItemCount() - 1); - RetrofitManager.getInstance(mContext).getApi() + RetrofitManager.getInstance().getApi() .getZiXunConcern(UserManager.getInstance().getUserId(), mPage) .map(list -> removeDuplicateData(concernList, list)) .subscribeOn(Schedulers.io()) @@ -233,7 +233,7 @@ class ConcernAdapter extends BaseRecyclerAdapter { }, new Consumer() { @Override public void accept(String s) { - RetrofitManager.getInstance(mContext).getApi() + RetrofitManager.getInstance().getApi() .getArticlesVisits(UrlFilterUtils.getFilterQuery("article_ids", s)) .map((Function, String>) list1 -> { for (ViewsEntity viewsEntity : list1) { @@ -279,7 +279,7 @@ class ConcernAdapter extends BaseRecyclerAdapter { }, new Consumer() { @Override public void accept(String ids) throws Exception { - RetrofitManager.getInstance(mContext).getApi() + RetrofitManager.getInstance().getApi() .getNewsCommentnum(ids, Utils.getTime(mContext)) .map(new Function, String>() { @Override @@ -459,7 +459,7 @@ class ConcernAdapter extends BaseRecyclerAdapter { // 统计新闻阅读量 public void statNewsViews(final ConcernEntity concernEntity, final int position) { - RetrofitManager.getInstance(mContext).getApi().postArticleVisit(concernEntity.getId()) + RetrofitManager.getInstance().getApi().postArticleVisit(concernEntity.getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new JSONObjectResponse() { diff --git a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java index ead3affb3b..785049919a 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java @@ -197,7 +197,7 @@ public class ConcernFragment extends NormalFragment implements SwipeRefreshLayou private void showRecommendGames() { // 先请求用户已关注的游戏数据 - RetrofitManager.getInstance(requireContext()).getApi() + RetrofitManager.getInstance().getApi() .getConcern(UserManager.getInstance().getUserId()) .map(RegionSettingHelper.filterGame) .map(ApkActiveUtils.filterMapperList) diff --git a/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java b/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java index cbdd69f79e..5a2d90dfe8 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java @@ -167,7 +167,7 @@ class InfoAdapter extends ListAdapter { // 统计新闻阅读量 public void statNewsViews(final NewsEntity newsEntity, final int position) { - RetrofitManager.getInstance(mContext).getApi().postArticleVisit(newsEntity.getId()) + RetrofitManager.getInstance().getApi().postArticleVisit(newsEntity.getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new JSONObjectResponse() { diff --git a/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java b/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java index 03dc8072f2..f89e839763 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java @@ -58,7 +58,7 @@ public class InfoViewModel extends ListViewModel { builder.deleteCharAt(builder.length() - 1); String ids = builder.toString(); mNewsViewsRepository.getNewsViews(RetrofitManager - .getInstance(getApplication()) + .getInstance() .getApi() .getArticlesVisits(UrlFilterUtils.getFilterQuery("article_ids", ids))); } @@ -67,7 +67,7 @@ public class InfoViewModel extends ListViewModel { @Override public Observable> provideDataObservable(int offset) { - return RetrofitManager.getInstance(getApplication()).getApi() + return RetrofitManager.getInstance().getApi() .getArticleList(UrlFilterUtils.getFilterQuery("type_group", "资讯"), offset); } diff --git a/app/src/main/java/com/gh/gamecenter/info/OriginalAdapter.java b/app/src/main/java/com/gh/gamecenter/info/OriginalAdapter.java index 8158d4eace..d63c5a29ee 100644 --- a/app/src/main/java/com/gh/gamecenter/info/OriginalAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/OriginalAdapter.java @@ -147,7 +147,7 @@ class OriginalAdapter extends ListAdapter { } public void statNewsViews(final NewsEntity newsEntity, final int position) { - RetrofitManager.getInstance(mContext).getApi().postArticleVisit(newsEntity.getId()) + RetrofitManager.getInstance().getApi().postArticleVisit(newsEntity.getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new JSONObjectResponse() { diff --git a/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java b/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java index 79bc65a851..d1750761c6 100644 --- a/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java @@ -59,7 +59,7 @@ public class OriginalViewModel extends ListViewModel { builder.deleteCharAt(builder.length() - 1); String ids = builder.toString(); mNewsViewsRepository.getNewsViews(RetrofitManager - .getInstance(getApplication()) + .getInstance() .getApi() .getArticlesVisits(UrlFilterUtils.getFilterQuery("article_ids", ids))); } @@ -68,7 +68,7 @@ public class OriginalViewModel extends ListViewModel { @Override public Observable> provideDataObservable(int offset) { - return RetrofitManager.getInstance(getApplication()).getApi() + return RetrofitManager.getInstance().getApi() .getArticleList(UrlFilterUtils.getFilterQuery("type_group", "原创"), offset); } diff --git a/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java b/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java index 565129ed6c..1512c4d668 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java @@ -119,7 +119,7 @@ class StrategyAdapter extends BaseRecyclerAdapter { public void addList() { isLoading = true; - RetrofitManager.getInstance(mContext) + RetrofitManager.getInstance() .getApi() .getArticleList(UrlFilterUtils.getFilterQuery("type_group", "攻略"), mPage) .map(newsEntities -> { diff --git a/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java b/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java index df2915f990..feb542229a 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java @@ -136,7 +136,7 @@ public class StrategyFragment extends BaseFragment implements SwipeRefreshLayout } private void getConcernGame() { - RetrofitManager.getInstance(getContext()).getApi() + RetrofitManager.getInstance().getApi() .getConcern(UserManager.getInstance().getUserId()) .map(RegionSettingHelper.filterGame) .map(ApkActiveUtils.filterMapperList) diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java index cc90edfe76..2eb7665761 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -85,7 +85,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { isLoading = true; notifyItemChanged(getItemCount() - 1); - RetrofitManager.getInstance(mContext).getApi().getConcernLibao(UserManager.getInstance().getUserId(), mPage) + RetrofitManager.getInstance().getApi().getConcernLibao(UserManager.getInstance().getUserId(), mPage) .map(new Function, List>() { @Override public List apply(List list) { diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java index 98e66b7d20..5845679baf 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java @@ -82,7 +82,7 @@ class Libao3FragmentAdapter extends BaseRecyclerAdapter if (mPage == 1) { mLibaoList.clear(); } - RetrofitManager.getInstance(mContext) + RetrofitManager.getInstance() .getApi().getCunHaoXiang(UserManager.getInstance().getUserId(), mPage, mFilter) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java index 431fd550c6..d93771e421 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java @@ -60,7 +60,7 @@ public class LibaoHistoryAdapter extends BaseRecyclerAdapter { if (isLoading) return; isLoading = true; notifyItemChanged(getItemCount() - 1); - RetrofitManager.getInstance(mContext).getApi() + RetrofitManager.getInstance().getApi() .getHistoryLibao(UrlFilterUtils.getFilterQuery("history", "true"), mPage) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt index f3d9622744..d15d25e58c 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt @@ -54,7 +54,7 @@ class LibaoNewAdapter( if (isLoading) return isLoading = true notifyItemChanged(itemCount - 1) - RetrofitManager.getInstance(mContext).getApi().getLibao(mPage).map { list -> + RetrofitManager.getInstance().getApi().getLibao(mPage).map { list -> // 去掉重复数据 LibaoUtils.removeDuplicateData(mLibaoList, list) } diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt index be711abb99..7e1e80340c 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt @@ -59,7 +59,7 @@ class LibaoSearchAdapter(fragment: LibaoSearchFragment, if (isLoading || TextUtils.isEmpty(searchKey)) return if (mPage == 1) mLibaoList.clear() isLoading = true - RetrofitManager.getInstance(mContext).getApi().getLibaoBySearch(UrlFilterUtils.getFilterQuery("keyword", searchKey), mPage).map { list -> + RetrofitManager.getInstance().getApi().getLibaoBySearch(UrlFilterUtils.getFilterQuery("keyword", searchKey), mPage).map { list -> // 去掉重复数据 LibaoUtils.removeDuplicateData(mLibaoList, list) } diff --git a/app/src/main/java/com/gh/gamecenter/manager/CommentManager.java b/app/src/main/java/com/gh/gamecenter/manager/CommentManager.java index 6182857036..bdef6ddb33 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/CommentManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/CommentManager.java @@ -22,7 +22,6 @@ import io.reactivex.ObservableOnSubscribe; * Created by khy on 2016/11/17. */ public class CommentManager { - private static volatile CommentManager mInstance; private List urlList; private CommentManager() { @@ -70,14 +69,7 @@ public class CommentManager { } public static CommentManager getInstance() { - if (mInstance == null) { - synchronized (CommentManager.class) { - if (mInstance == null) { - mInstance = new CommentManager(); - } - } - } - return mInstance; + return SingletonHolder.INSTANCE; } // 修改新闻详情评论数 id @@ -114,4 +106,7 @@ public class CommentManager { } } + private static class SingletonHolder { + private static final CommentManager INSTANCE = new CommentManager(); + } } diff --git a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java index f7cecb71f8..e7d7b19b50 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java @@ -25,14 +25,12 @@ import java.util.UUID; public class DataCollectionManager { - private static volatile DataCollectionManager mInstance; - private Context mContext; private DataCollectionDao dao; private boolean isUploading; - private DataCollectionManager(Context context) { - mContext = context; + private DataCollectionManager() { + mContext = HaloApp.getInstance().getApplicationContext(); dao = new DataCollectionDao(mContext); isUploading = false; } @@ -41,7 +39,7 @@ public class DataCollectionManager { AppExecutor.getLightWeightIoExecutor().execute(() -> { map.put("createdOn", Utils.getTime(context)); if (isUpload) { - DataCollectionManager.getInstance(context).realTimeUpload(type, map); + DataCollectionManager.getInstance().realTimeUpload(type, map); } else { onEvent(context, type, new JSONObject(map).toString(), false); } @@ -73,16 +71,8 @@ public class DataCollectionManager { LoghubUtils.log(new JSONObject(paramsWrapper), "collection", true); } - public static DataCollectionManager getInstance(Context context) { - if (mInstance == null) { - synchronized (DataCollectionManager.class) { - if (mInstance == null) { - mInstance = new DataCollectionManager( - context.getApplicationContext()); - } - } - } - return mInstance; + public static DataCollectionManager getInstance() { + return SingletonHolder.INSTANCE; } public static void onEvent(Context context, String type, String data, boolean isUpload) { @@ -96,7 +86,7 @@ public class DataCollectionManager { // 添加事件 public static void onEvent(Context context, DataCollectionInfo entity, boolean isUpload) { - DataCollectionManager.getInstance(context).add(entity, isUpload); + DataCollectionManager.getInstance().add(entity, isUpload); } // 把事件加入列表 @@ -156,7 +146,7 @@ public class DataCollectionManager { entity.setId(id); entity.setType(type); entity.setData(new JSONObject(map).toString()); - DataCollectionManager.getInstance(context).upsert(entity, type); + DataCollectionManager.getInstance().upsert(entity, type); } public void upsert(DataCollectionInfo entity, String type) { @@ -217,10 +207,13 @@ public class DataCollectionManager { public static void onEvent(Context context, String type, Map map) { map.put("createdOn", Utils.getTime(context)); if ("news".equals(type) || "download".equals(type) || "search".equals(type)) { - DataCollectionManager.getInstance(context).realTimeUpload(type, map); + DataCollectionManager.getInstance().realTimeUpload(type, map); return; } onEvent(context, type, new JSONObject(map).toString(), true); } + private static class SingletonHolder { + private static final DataCollectionManager INSTANCE = new DataCollectionManager(); + } } diff --git a/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java b/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java index 87044b5224..1adf8af49a 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java @@ -87,7 +87,7 @@ public class FilterManager { } else { since = mFilterDao.getSince(); } - RetrofitManager.getInstance(mContext).getApi().getPackageUsed(UrlFilterUtils.getFilterQuery("since", String.valueOf(since)), skip) + RetrofitManager.getInstance().getApi().getPackageUsed(UrlFilterUtils.getFilterQuery("since", String.valueOf(since)), skip) .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) .subscribe(new Response>() { diff --git a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java index bd03b0ba80..344a9de19a 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java @@ -144,7 +144,7 @@ public class UpdateManager { } if (DownloadStatus.done.equals(downloadEntity.getStatus())) { - DownloadManager.getInstance(mApplicationContext).cancel(downloadEntity.getUrl(), false, true); + DownloadManager.getInstance().cancel(downloadEntity.getUrl(), false, true); if (downloadDialog != null) { try { downloadDialog.dismiss(); @@ -214,7 +214,7 @@ public class UpdateManager { loadingDialog = DialogUtils.showWaitDialog(mContext, "检查更新中..."); } String channel = HaloApp.getInstance().getChannel(); - RetrofitManager.getInstance(mApplicationContext).getApi().getUpdate(PackageUtils.getGhVersionName(), PackageUtils.getGhVersionCode(), channel) + RetrofitManager.getInstance().getApi().getUpdate(PackageUtils.getGhVersionName(), PackageUtils.getGhVersionCode(), channel) .map(appEntity -> { boolean isShowUpdateDialog = false; @@ -438,7 +438,7 @@ public class UpdateManager { appProgressFilling = view.findViewById(R.id.progress_filling); view.findViewById(R.id.app_tv_cancel).setOnClickListener(v -> { - DownloadManager.getInstance(context).cancel(appEntity.getUrl()); + DownloadManager.getInstance().cancel(appEntity.getUrl()); if (appEntity.isForce()) { exitApp(); } else { @@ -447,7 +447,7 @@ public class UpdateManager { }); downloadDialog.setOnDismissListener(dialog -> { - DownloadManager.getInstance(context).removeObserver(dataWatcher); + DownloadManager.getInstance().removeObserver(dataWatcher); isShowDownload = false; }); @@ -466,20 +466,20 @@ public class UpdateManager { } private void createUpdate(String md5, boolean isSilentUpdate) { - DownloadManager.getInstance(mApplicationContext).addObserver(dataWatcher); + DownloadManager.getInstance().addObserver(dataWatcher); boolean shouldCancelPreviousDownload = true; // 是否应该取消旧更新任务 // 在部分设备上取消正在进行中的旧下载任务再创建新下载任务有机率造成新下载任务依然带有 "静默更新" 标签导致无法唤起安装 // 所以这里对当前静默更新任务正在进行中的时候就不用删旧任务，直接改 meta 标签 if (!isSilentUpdate - && DownloadManager.getInstance(mApplicationContext).isTaskDownloading(appEntity.getUrl())) { + && DownloadManager.getInstance().isTaskDownloading(appEntity.getUrl())) { try { DownloadEntity entity = DataChanger.INSTANCE.getDownloadEntries().get(appEntity.getUrl()); if (entity != null) { ExtensionsKt.addMetaExtra(entity, Constants.EXTRA_DOWNLOAD_TYPE, "不再是静默更新"); - DownloadManager.getInstance(mApplicationContext).updateDownloadEntity(entity); - DownloadManager.getInstance(mApplicationContext).resume(entity, false); + DownloadManager.getInstance().updateDownloadEntity(entity); + DownloadManager.getInstance().resume(entity, false); shouldCancelPreviousDownload = false; } @@ -517,11 +517,11 @@ public class UpdateManager { } downloadEntity.setPackageName(mApplicationContext.getPackageName()); - DownloadManager.getInstance(mApplicationContext).cancel(appEntity.getUrl(), true, true); - DownloadManager.getInstance(mApplicationContext).pauseAll(); + DownloadManager.getInstance().cancel(appEntity.getUrl(), true, true); + DownloadManager.getInstance().pauseAll(); AppExecutor.getUiExecutor().executeWithDelay(() -> { - DownloadManager.getInstance(mApplicationContext).add(downloadEntity); + DownloadManager.getInstance().add(downloadEntity); }, 200); } } diff --git a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java b/app/src/main/java/com/gh/gamecenter/manager/UserManager.java index 94ff9df4d4..84e8cf3f8d 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UserManager.java @@ -50,8 +50,6 @@ public class UserManager { private final String COMMUNITY_KEY = "CommunityKey"; - private static volatile UserManager singleton; - private SharedPreferences mSp; @Nullable @@ -62,14 +60,7 @@ public class UserManager { private String deviceId; public static UserManager getInstance() { - if (singleton == null) { - synchronized (UserManager.class) { - if (singleton == null) { - singleton = new UserManager(); - } - } - } - return singleton; + return SingletonHolder.INSTANCE; } private UserManager() { @@ -164,7 +155,7 @@ public class UserManager { TokenEntity refreshToken = tokenEntity.getRefreshToken(); if (refreshToken.getExpire() < Utils.getTime(HaloApp.getInstance().getApplication())) { Utils.toast(HaloApp.getInstance().getApplication(), "账号过期，请重新登录!"); - UserRepository.getInstance(HaloApp.getInstance().getApplication()).logout(); + UserRepository.getInstance().logout(); callBack.onLoginFailure(null); return; } @@ -228,7 +219,7 @@ public class UserManager { "Android版本", Build.VERSION.RELEASE ); - UserRepository.getInstance(HaloApp.getInstance().getApplication()).logout(); + UserRepository.getInstance().logout(); DataUtils.onMtaEvent(HaloApp.getInstance().getApplication(), "登录异常统计_自动登录" , "错误码_RefreshToken", code + "_" + refreshToken.getValue() @@ -251,7 +242,7 @@ public class UserManager { "厂商", Build.MANUFACTURER, "Android版本", Build.VERSION.RELEASE); - UserRepository.getInstance(HaloApp.getInstance().getApplication()).logout(); + UserRepository.getInstance().logout(); } } catch (Exception e1) { e1.printStackTrace(); @@ -351,7 +342,7 @@ public class UserManager { } private ApiService getApiService() { - return RetrofitManager.getInstance(HaloApp.getInstance().getApplication()).getApi(); + return RetrofitManager.getInstance().getApi(); } public boolean userShouldTakeRegulationBaseOnLastRemind() { @@ -381,4 +372,7 @@ public class UserManager { void onLoginFailure(@Nullable String errorMessage); } + private static class SingletonHolder { + private static final UserManager INSTANCE = new UserManager(); + } } diff --git a/app/src/main/java/com/gh/gamecenter/manager/VisitManager.java b/app/src/main/java/com/gh/gamecenter/manager/VisitManager.java index 7bf69f880a..d39d3932b0 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/VisitManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/VisitManager.java @@ -24,7 +24,6 @@ import io.reactivex.ObservableOnSubscribe; */ public class VisitManager { - private static volatile VisitManager mInstance; private List urlList; private VisitManager() { @@ -72,14 +71,7 @@ public class VisitManager { } public static VisitManager getInstance() { - if (mInstance == null) { - synchronized (VisitManager.class) { - if (mInstance == null) { - mInstance = new VisitManager(); - } - } - } - return mInstance; + return SingletonHolder.INSTANCE; } public void addUrl(String ids) { @@ -89,4 +81,7 @@ public class VisitManager { } } + private static class SingletonHolder { + private static final VisitManager INSTANCE = new VisitManager(); + } } diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuViewModel.kt b/app/src/main/java/com/gh/gamecenter/message/KeFuViewModel.kt index fde0f7e287..ccdaea0558 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuViewModel.kt @@ -17,7 +17,7 @@ import org.json.JSONObject class KeFuViewModel(application: Application) : ListViewModel(application) { override fun provideDataObservable(page: Int): Observable>? { - return RetrofitManager.getInstance(getApplication()).api.getMessageKeFuData(UserManager.getInstance().userId, page) + return RetrofitManager.getInstance().api.getMessageKeFuData(UserManager.getInstance().userId, page) } override fun mergeResultLiveData() { @@ -42,7 +42,7 @@ class KeFuViewModel(application: Application) : ListViewModel() { @@ -50,7 +50,7 @@ class KeFuViewModel(application: Application) : ListViewModel() { @@ -263,7 +263,7 @@ public class MessageDetailFragment extends NormalFragment implements OnCommentCa } private void getNewsViews() { - RetrofitManager.getInstance(getContext()).getApi() + RetrofitManager.getInstance().getApi() .getArticlesVisits(UrlFilterUtils.getFilterQuery("article_ids", newsId)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java index 948994a277..acc98d21dc 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java @@ -504,7 +504,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder private void getFoldList(Context context, String resourceId) { RetrofitManager - .getInstance(context) + .getInstance() .getApi() .getMessageFoldList(UserManager.getInstance().getUserId(), resourceId) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageNormalViewModel.kt b/app/src/main/java/com/gh/gamecenter/message/MessageNormalViewModel.kt index 9ddfc15f30..24685c584d 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageNormalViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/message/MessageNormalViewModel.kt @@ -18,7 +18,7 @@ class MessageNormalViewModel(application: Application, val messageType: String) : ListViewModel(application) { override fun provideDataObservable(page: Int): Observable>? { - return RetrofitManager.getInstance(getApplication()).api.getMessage(UserManager.getInstance().userId, messageType, Utils.getTime(getApplication()), page) + return RetrofitManager.getInstance().api.getMessage(UserManager.getInstance().userId, messageType, Utils.getTime(getApplication()), page) } override fun mergeResultLiveData() { @@ -44,7 +44,7 @@ class MessageNormalViewModel(application: Application, // val jsonObject = JSONObject() // jsonObject.put("type", type) // val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()) -// RetrofitManager.getInstance(getApplication()).api.postMessageRead(UserManager.getInstance().userId, messageId, body) +// RetrofitManager.getInstance().api.postMessageRead(UserManager.getInstance().userId, messageId, body) // .subscribeOn(Schedulers.io()) // .observeOn(AndroidSchedulers.mainThread()) // .subscribe(object : Response() { @@ -52,7 +52,7 @@ class MessageNormalViewModel(application: Application, // } fun deleteMessage(messageId: String) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .deleteMessage(UserManager.getInstance().userId, messageId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageUnreadRepository.kt b/app/src/main/java/com/gh/gamecenter/message/MessageUnreadRepository.kt index 2119e0365f..5dcf8c3a08 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageUnreadRepository.kt +++ b/app/src/main/java/com/gh/gamecenter/message/MessageUnreadRepository.kt @@ -30,7 +30,7 @@ import retrofit2.HttpException object MessageUnreadRepository { - private var mApi: ApiService = RetrofitManager.getInstance(HaloApp.getInstance().application).api + private var mApi: ApiService = RetrofitManager.getInstance().api private var isLoading: Boolean = false val unreadLiveData = MediatorLiveData() diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageViewModel.kt b/app/src/main/java/com/gh/gamecenter/message/MessageViewModel.kt index 19ae0555a5..3f1d373979 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/message/MessageViewModel.kt @@ -18,7 +18,7 @@ import org.json.JSONObject class MessageViewModel(application: Application) : ListViewModel(application) { override fun provideDataObservable(page: Int): Observable>? { - return RetrofitManager.getInstance(getApplication()).api.getMessage(UserManager.getInstance().userId, "default", Utils.getTime(getApplication()), page) + return RetrofitManager.getInstance().api.getMessage(UserManager.getInstance().userId, "default", Utils.getTime(getApplication()), page) } override fun mergeResultLiveData() { @@ -26,7 +26,7 @@ class MessageViewModel(application: Application) : ListViewModel() { diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameViewModel.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameViewModel.kt index 434f672f56..2d4adc7dd0 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameViewModel.kt @@ -21,7 +21,7 @@ class MyFollowedGameViewModel(application: Application) : ListViewModel(application) { override fun provideDataObservable(page: Int): Observable>? { - return RetrofitManager.getInstance(getApplication()).api + return RetrofitManager.getInstance().api .getConcern(UserManager.getInstance().userId) .map(RegionSettingHelper.filterGame) .map(ApkActiveUtils.filterMapperList) diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameFragment.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameFragment.kt index ad0ed4e9f1..54c71f3e05 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameFragment.kt @@ -45,7 +45,7 @@ class MyPlayedGameFragment : PlayedGameFragment() { override fun onChanged(ts: MutableList?) { super.onChanged(ts) val installedList = PackagesManager.filterSameApk(PackagesManager.filterDownloadBlackPackage(PackagesManager.getInstalledList())) - val simulatorDownloadEntityList = DownloadManager.getInstance(requireContext()).allSimulatorDownloadEntity + val simulatorDownloadEntityList = DownloadManager.getInstance().allSimulatorDownloadEntity simulatorDownloadEntityList.forEach { entity -> installedList.add(GameInstall(entity.gameId, packageName = entity.packageName, name = entity.name, icon = entity.icon)) } diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt index d644489089..2926ce8944 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt @@ -66,12 +66,12 @@ class MyReservationFragment : ListFragment() override fun onResume() { super.onResume() - DownloadManager.getInstance(context).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) } override fun onPause() { super.onPause() - DownloadManager.getInstance(context).removeObserver(dataWatcher) + DownloadManager.getInstance().removeObserver(dataWatcher) } override fun provideListAdapter(): ListAdapter { diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationViewModel.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationViewModel.kt index 9d2ab213cb..89a5eaa03f 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationViewModel.kt @@ -28,7 +28,7 @@ class MyReservationViewModel(application: Application) : ListViewModel> { - return RetrofitManager.getInstance(getApplication()).api + return RetrofitManager.getInstance().api .getGameReservations(UserManager.getInstance().userId, page, Utils.getTime(getApplication())) } @@ -50,7 +50,7 @@ class MyReservationViewModel(application: Application) : ListViewModel() override fun onResume() { if (isEverPause && mAdapter != null) mAdapter?.notifyDataSetChanged() super.onResume() - DownloadManager.getInstance(context).addObserver(mDataWatcher) + DownloadManager.getInstance().addObserver(mDataWatcher) } override fun onPause() { super.onPause() - DownloadManager.getInstance(context).removeObserver(mDataWatcher) + DownloadManager.getInstance().removeObserver(mDataWatcher) } override fun provideListViewModel(): PlayedGameViewModel { diff --git a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameViewModel.kt b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameViewModel.kt index 17bb6bd809..e15f6bd469 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameViewModel.kt @@ -24,7 +24,7 @@ class PlayedGameViewModel(application: Application, var userId: String, val isKe } override fun provideDataSingle(page: Int): Single> { - return RetrofitManager.getInstance(getApplication()).api.getPlayedGames(userId, page, Utils.getTime(getApplication())) + return RetrofitManager.getInstance().api.getPlayedGames(userId, page, Utils.getTime(getApplication())) } override fun mergeResultLiveData() { @@ -41,7 +41,7 @@ class PlayedGameViewModel(application: Application, var userId: String, val isKe @SuppressLint("CheckResult") fun deletePlayedGame(gameEntity: GameEntity) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .deletePlayedGame(userId, gameEntity.playedGameId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index 2f5cfa8efb..67abf79360 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -122,7 +122,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } public void getNewsDetail() { - RetrofitManager.getInstance(mContext).getApi().getNewsDetail(mId) + RetrofitManager.getInstance().getApi().getNewsDetail(mId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -601,7 +601,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } private void getNewsMore() { - RetrofitManager.getInstance(mContext).getApi().getNewsSuggestion(mNewsDetailEntity.getId()) + RetrofitManager.getInstance().getApi().getNewsSuggestion(mNewsDetailEntity.getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -637,7 +637,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } public void getNewsCommentNum() { - RetrofitManager.getInstance(mContext).getApi() + RetrofitManager.getInstance().getApi() .getNewsCommentnum(mNewsDetailEntity.getId(), Utils.getTime(mContext)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -659,7 +659,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } public void getNewsHotComment() { - RetrofitManager.getInstance(mContext).getApi() + RetrofitManager.getInstance().getApi() .getHotComment(mId, 3, 0) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -683,7 +683,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } private void getNewsComment() { - RetrofitManager.getInstance(mContext).getApi() + RetrofitManager.getInstance().getApi() .getComment(mId, 3, 1, Utils.getTime(mContext)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt index f48442d399..bf25139268 100644 --- a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt +++ b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt @@ -45,8 +45,8 @@ import kotlin.collections.ArrayList object PackageRepository { private val mApplication = HaloApp.getInstance().application - private val mApi = RetrofitManager.getInstance(mApplication).api - private val mSensitiveApi = RetrofitManager.getInstance(mApplication).api + private val mApi = RetrofitManager.getInstance().api + private val mSensitiveApi = RetrofitManager.getInstance().api private const val LAST_UPLOAD_APPLIST_TIME = "last_upload_applist_time" diff --git a/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.kt b/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.kt index 129edc6d59..76828ae1e3 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.kt @@ -244,7 +244,7 @@ class NewPersonalFragment : BaseLazyFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mDatabase = AppDatabase.getInstance(context) + mDatabase = AppDatabase.getInstance() val factory = UserViewModel.Factory(requireActivity().application) mUserViewModel = ViewModelProvider(this, factory).get(UserViewModel::class.java) mUserHomeViewModel = ViewModelProvider( diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt index 2cc6f22544..f10a9add41 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt @@ -196,7 +196,7 @@ class PersonalFragment : BaseLazyFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mDatabase = AppDatabase.getInstance(context) + mDatabase = AppDatabase.getInstance() val factory = UserViewModel.Factory(requireActivity().application) mUserViewModel = ViewModelProvider(this, factory).get(UserViewModel::class.java) mUserHomeViewModel = ViewModelProvider( diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalViewModel.kt b/app/src/main/java/com/gh/gamecenter/personal/PersonalViewModel.kt index 44086bad67..e649d261c9 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalViewModel.kt @@ -69,7 +69,7 @@ class PersonalViewModel(application: Application) : AndroidViewModel(application @SuppressLint("CheckResult") fun getHaloAddons() { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getHaloAddons(HaloApp.getInstance().channel) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -122,7 +122,7 @@ class PersonalViewModel(application: Application) : AndroidViewModel(application } fun checkUpdate() { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api .getUpdate( PackageUtils.getGhVersionName(), @@ -142,7 +142,7 @@ class PersonalViewModel(application: Application) : AndroidViewModel(application } fun postMessageRead(messageId: String, body: RequestBody, callback: () -> Unit) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .postMessageRead( UserManager.getInstance().userId, messageId, @@ -161,7 +161,7 @@ class PersonalViewModel(application: Application) : AndroidViewModel(application fun sign(successCallback: (signEntity: SignEntity) -> Unit) { val context = getApplication().applicationContext - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .postSign(UserManager.getInstance().userId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -186,7 +186,7 @@ class PersonalViewModel(application: Application) : AndroidViewModel(application successCallback: (data: ResponseBody) -> Unit, failureCallback: () -> Unit ) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .applyOrReceiveBadge(id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansViewModel.kt b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansViewModel.kt index 4d67affb4c..77de7a3152 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansViewModel.kt @@ -32,17 +32,17 @@ class FollowersOrFansViewModel(application: Application, override fun provideDataObservable(page: Int): Observable> { return if (mPageSource == FansActivity::class.java.name) { - RetrofitManager.getInstance(getApplication()).api.getPersonalFans(userId, HaloApp.getInstance().channel, page) + RetrofitManager.getInstance().api.getPersonalFans(userId, HaloApp.getInstance().channel, page) } else { - RetrofitManager.getInstance(getApplication()).api.getPersonalFollowers(userId, HaloApp.getInstance().channel, page) + RetrofitManager.getInstance().api.getPersonalFollowers(userId, HaloApp.getInstance().channel, page) } } fun followingCommand(isFollow: Boolean, targetUserId: String, position: Int) { val observable = if (isFollow) { - RetrofitManager.getInstance(getApplication()).api.postFollowing(targetUserId) + RetrofitManager.getInstance().api.postFollowing(targetUserId) } else { - RetrofitManager.getInstance(getApplication()).api.deleteFollowing(targetUserId) + RetrofitManager.getInstance().api.deleteFollowing(targetUserId) } observable .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/InstalledGameDialog.kt b/app/src/main/java/com/gh/gamecenter/personalhome/InstalledGameDialog.kt index 747ebcf202..04269b6bd4 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/InstalledGameDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/InstalledGameDialog.kt @@ -72,7 +72,7 @@ class InstalledGameDialog(val mContext: Context, val games: ArrayList() fun getUserInfo() { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getPersonalData(userId, HaloApp.getInstance().channel, Utils.getTime(getApplication())) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -67,7 +67,7 @@ class UserHomeViewModel(application: Application, var userId: String) : AndroidV @SuppressLint("CheckResult") fun getUserPlayedGameCount() { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getPlayedGamesCount(userId, Utils.getTime(getApplication())) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -81,9 +81,9 @@ class UserHomeViewModel(application: Application, var userId: String) : AndroidV private fun followingCommand(isFollow: Boolean) { val observable = if (isFollow) { - RetrofitManager.getInstance(getApplication()).api.postFollowing(userId) + RetrofitManager.getInstance().api.postFollowing(userId) } else { - RetrofitManager.getInstance(getApplication()).api.deleteFollowing(userId) + RetrofitManager.getInstance().api.deleteFollowing(userId) } observable .subscribeOn(Schedulers.io()) @@ -112,7 +112,7 @@ class UserHomeViewModel(application: Application, var userId: String) : AndroidV } fun getBadgeList() { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getBadges(userId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -125,7 +125,7 @@ class UserHomeViewModel(application: Application, var userId: String) : AndroidV } fun availableBadges() { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.availableBadges(userId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -140,7 +140,7 @@ class UserHomeViewModel(application: Application, var userId: String) : AndroidV @SuppressLint("CheckResult") fun getUserEnergy() { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getUserEnergies(userId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -153,7 +153,7 @@ class UserHomeViewModel(application: Application, var userId: String) : AndroidV @SuppressLint("CheckResult") fun getUserLevel() { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getUserLevels(userId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -171,7 +171,7 @@ class UserHomeViewModel(application: Application, var userId: String) : AndroidV if (reason == "其他原因") { requestMap["description"] = desc } - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.reportUser(userId, requestMap.createRequestBody()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -191,7 +191,7 @@ class UserHomeViewModel(application: Application, var userId: String) : AndroidV @SuppressLint("CheckResult") fun signIn() { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.signIn(userId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -206,7 +206,7 @@ class UserHomeViewModel(application: Application, var userId: String) : AndroidV @SuppressLint("CheckResult") fun getSignInfo() { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getSignStatus(userId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundViewModel.kt b/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundViewModel.kt index 4c67d5c017..459f08fdde 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundViewModel.kt @@ -38,7 +38,7 @@ class PersonalityBackgroundViewModel(application: Application) : AndroidViewMode } fun getBackgroundImages() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .backgroundImages .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderViewModel.kt b/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderViewModel.kt index c2e57f7a67..522f358844 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderViewModel.kt @@ -25,7 +25,7 @@ class AvatarBorderViewModel(application: Application) : AndroidViewModel(applica @SuppressLint("CheckResult") fun getPendantCategories() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .pendantCategories .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderViewModel.kt b/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderViewModel.kt index 1da7b51b74..50b1c1a505 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderViewModel.kt @@ -18,7 +18,7 @@ class ChooseAvatarBorderViewModel(application: Application, val categoryId: Stri @SuppressLint("CheckResult") fun getPendants() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getPendants(getFilter()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryViewModel.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryViewModel.kt index 7edfd6ebde..1c075f3534 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryViewModel.kt @@ -28,7 +28,7 @@ class UserHistoryViewModel(application: Application, var type: TYPE) : ListViewModel(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api var videoList = arrayListOf() diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryViewModel.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryViewModel.kt index e01dd0120d..32f0a31115 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryViewModel.kt @@ -12,7 +12,7 @@ import io.reactivex.Observable class UserVideoHistoryViewModel(application: Application, var userId: String) : ListViewModel(application) { override fun provideDataObservable(page: Int): Observable> { - return RetrofitManager.getInstance(getApplication()).api.getUserVideo(userId, page, Config.VIDEO_PAGE_SIZE) + return RetrofitManager.getInstance().api.getUserVideo(userId, page, Config.VIDEO_PAGE_SIZE) } override fun mergeResultLiveData() { diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserCommentHistoryViewModel.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserCommentHistoryViewModel.kt index e41de14e90..1de6a9d0ae 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserCommentHistoryViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserCommentHistoryViewModel.kt @@ -21,7 +21,7 @@ import retrofit2.HttpException class UserCommentHistoryViewModel(application: Application, var userId: String) : ListViewModel(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api var type: TYPE = TYPE.ALL diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserGameViewModel.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserGameViewModel.kt index d587b49d51..9a66175526 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserGameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserGameViewModel.kt @@ -26,7 +26,7 @@ class UserGameViewModel(application: Application, private val mUserId: String) @SuppressLint("CheckResult") fun getUserPlayedGameCount() { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getPlayedGamesCount(mUserId, Utils.getTime(getApplication())) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameFragment.kt index e810967e03..a4ede9f8db 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameFragment.kt @@ -57,7 +57,7 @@ open class UserPlayedGameFragment: ListFragment override fun onResume() { if (isEverPause && mAdapter != null) mAdapter?.notifyDataSetChanged() super.onResume() - DownloadManager.getInstance(context).addObserver(mDataWatcher) + DownloadManager.getInstance().addObserver(mDataWatcher) } @@ -65,7 +65,7 @@ open class UserPlayedGameFragment: ListFragment super.onLoadEmpty() val installedList = PackagesManager.filterSameApk(PackagesManager.filterDownloadBlackPackage(PackagesManager.getInstalledList())) - val simulatorDownloadEntityList = DownloadManager.getInstance(requireContext()).allSimulatorDownloadEntity + val simulatorDownloadEntityList = DownloadManager.getInstance().allSimulatorDownloadEntity simulatorDownloadEntityList.forEach { entity -> installedList.add(GameInstall(entity.gameId, packageName = entity.packageName, name = entity.name, icon = entity.icon)) } @@ -85,7 +85,7 @@ open class UserPlayedGameFragment: ListFragment override fun onPause() { super.onPause() - DownloadManager.getInstance(context).removeObserver(mDataWatcher) + DownloadManager.getInstance().removeObserver(mDataWatcher) } // 下载被删除事件 diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/rating/RatingActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/rating/RatingActivity.kt index cf51f381d7..8e49b0d915 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/rating/RatingActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/rating/RatingActivity.kt @@ -34,7 +34,7 @@ class RatingActivity : ListActivity>() { } override fun provideDataSingle(page: Int): Single> { - return RetrofitManager.getInstance(this).api.getMyRating(mUserId, page,"view:default") + return RetrofitManager.getInstance().api.getMyRating(mUserId, page,"view:default") } override fun provideListViewModel(): NormalListViewModel { diff --git a/app/src/main/java/com/gh/gamecenter/qa/CommunityViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/CommunityViewModel.kt index 6756d49815..4f1f44f5aa 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/CommunityViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/CommunityViewModel.kt @@ -34,7 +34,7 @@ class CommunityViewModel(application: Application) : AndroidViewModel(applicatio cancelTimer() mTimer = fixedRateTimer("checkUnreadFollowTimeline", false, 0, 2 * 60 * 1000L) { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api .getUnreadCommunityTimeline(UserManager.getInstance().community.id, UserManager.getInstance().userId) .subscribeOn(Schedulers.io()) @@ -65,7 +65,7 @@ class CommunityViewModel(application: Application) : AndroidViewModel(applicatio return } - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getCommunityDesc(id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -92,7 +92,7 @@ class CommunityViewModel(application: Application) : AndroidViewModel(applicatio } private fun getCommunityDefaultSearch() { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getCommunityDefaultSearch(UserManager.getInstance().community.id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/BaseAnswerOrArticleItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/BaseAnswerOrArticleItemViewHolder.kt index 02873febcf..015f817a37 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/BaseAnswerOrArticleItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/BaseAnswerOrArticleItemViewHolder.kt @@ -266,7 +266,7 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH return } if (entity.type == "video") { - RetrofitManager.getInstance(itemView.context) + RetrofitManager.getInstance() .api.voteVideo(entity.id) .subscribeOn(Schedulers.io()) .subscribe(object : BiResponse() { @@ -287,10 +287,10 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH val voteObservable = if (entity.type == "community_article") { val communityId = if (entity.articleCommunityId.isNotEmpty()) entity.articleCommunityId else entity.bbs.id - RetrofitManager.getInstance(itemView.context).api + RetrofitManager.getInstance().api .postCommunityArticleVote(communityId, entity.id) } else { - RetrofitManager.getInstance(itemView.context).api + RetrofitManager.getInstance().api .postVoteQuestionComment(entity.questions.id, entity.id) .map { GsonUtils.fromJson(it.string(), VoteEntity::class.java) } } @@ -351,7 +351,7 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH voteCount.text = if (entity.count.vote > 0) entity.count.vote.toString() else "赞同" if (entity.type == "video") { - RetrofitManager.getInstance(itemView.context) + RetrofitManager.getInstance() .api.undoVoteVideo(entity.id) .subscribeOn(Schedulers.io()) .subscribe(object : BiResponse() { @@ -373,12 +373,12 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH val communityId = if (entity.articleCommunityId.isNotEmpty()) entity.articleCommunityId else entity.bbs.id - RetrofitManager.getInstance(itemView.context).api + RetrofitManager.getInstance().api .postCommunityArticleUnVote(communityId, entity.id) } else { entity.me.isAnswerVoted = false - RetrofitManager.getInstance(itemView.context).api + RetrofitManager.getInstance().api .postAnswerUnvote(entity.id) } unVoteObservable @@ -426,7 +426,7 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH val communityId = if (entity.community.id.isEmpty()) entity.bbs.id else entity.community.id - RetrofitManager.getInstance(itemView.context).api + RetrofitManager.getInstance().api .postCommunityArticleVote(communityId, entity.id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -471,7 +471,7 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH val communityId = if (entity.community.id.isEmpty()) entity.bbs.id else entity.community.id - RetrofitManager.getInstance(itemView.context).api + RetrofitManager.getInstance().api .postCommunityArticleUnVote(communityId, entity.id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -506,7 +506,7 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH } fun followUser(entity: AnswerEntity, callback: EmptyCallback?) { - RetrofitManager.getInstance(itemView.context).api + RetrofitManager.getInstance().api .postFollowing(entity.user.id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.kt index eabf189ee9..410b9655b4 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.kt @@ -54,7 +54,7 @@ class AnswerDetailViewModel(application: Application) : AndroidViewModel(applica get() = mFollowLiveData fun getAnswerDetail(answerId: String, entrance: String) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getAnswerDetail(answerId, Utils.getTime(getApplication())) .subscribeOn(Schedulers.io()) .subscribe(object : Response() { @@ -77,7 +77,7 @@ class AnswerDetailViewModel(application: Application) : AndroidViewModel(applica } fun like(answerId: String) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .postAnswerVote(answerId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -107,7 +107,7 @@ class AnswerDetailViewModel(application: Application) : AndroidViewModel(applica } fun cancelLike(answerId: String) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .postAnswerUnvote(answerId) .subscribeOn(Schedulers.io()) .subscribe(object : Response() { @@ -132,7 +132,7 @@ class AnswerDetailViewModel(application: Application) : AndroidViewModel(applica } fun dislike(answerId: String) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .postAnswerOppose(answerId) .subscribeOn(Schedulers.io()) .subscribe(object : Response() { @@ -155,7 +155,7 @@ class AnswerDetailViewModel(application: Application) : AndroidViewModel(applica } fun cancelDislike(answerId: String) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .postAnswerUnoppose(answerId) .subscribeOn(Schedulers.io()) .subscribe(object : Response() { @@ -222,9 +222,9 @@ class AnswerDetailViewModel(application: Application) : AndroidViewModel(applica private fun followingCommand(isFollow: Boolean, targetUserId: String) { val observable = if (isFollow) { - RetrofitManager.getInstance(getApplication()).api.postFollowing(targetUserId) + RetrofitManager.getInstance().api.postFollowing(targetUserId) } else { - RetrofitManager.getInstance(getApplication()).api.deleteFollowing(targetUserId) + RetrofitManager.getInstance().api.deleteFollowing(targetUserId) } observable .subscribeOn(Schedulers.io()) @@ -255,7 +255,7 @@ class AnswerDetailViewModel(application: Application) : AndroidViewModel(applica val body = RequestBody.create(MediaType.parse("application/json"), JSONObject(params as Map<*, *>).toString()) - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api .postAnswerCommentable(answerId, body) .subscribeOn(Schedulers.io()) @@ -272,7 +272,7 @@ class AnswerDetailViewModel(application: Application) : AndroidViewModel(applica } fun doHighlightThisAnswer(answerId: String) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .highlightAnswer(answerId) .subscribeOn(Schedulers.io()) .subscribe(object : Response() { @@ -289,7 +289,7 @@ class AnswerDetailViewModel(application: Application) : AndroidViewModel(applica } fun doFoldThisAnswer(answerId: String) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .foldAnswer(answerId) .subscribeOn(Schedulers.io()) .subscribe(object : Response() { @@ -306,7 +306,7 @@ class AnswerDetailViewModel(application: Application) : AndroidViewModel(applica } fun doHideThisAnswer(answerId: String) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .hideAnswer(answerId) .subscribeOn(Schedulers.io()) .subscribe(object : Response() { diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftAdapter.java index ff8de722f2..34046b1546 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftAdapter.java @@ -173,7 +173,7 @@ class AnswerDraftAdapter extends ListAdapter { private void deleteAnswerDraft(AnswerEntity entity) { - RetrofitManager.getInstance(mContext) + RetrofitManager.getInstance() .getApi() .deleteAnswerDrafts(UserManager.getInstance().getUserId(), entity.getId()) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftFragment.java b/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftFragment.java index 0af573e74b..fdcb0bf87a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftFragment.java @@ -81,7 +81,7 @@ public class AnswerDraftFragment extends ListFragment> provideDataObservable(int page) { - return RetrofitManager.getInstance(getContext()).getApi().getAnswerDrafts( + return RetrofitManager.getInstance().getApi().getAnswerDrafts( UserManager.getInstance().getUserId(), UrlFilterUtils.getFilterQuery("answer_id", mAnswerId), page); diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldFragment.java b/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldFragment.java index c8b43388b6..4f78a68f30 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldFragment.java @@ -75,7 +75,7 @@ public class AnswerFoldFragment extends ListFragment> provideDataObservable(int page) { - return RetrofitManager.getInstance(getContext()).getApi() + return RetrofitManager.getInstance().getApi() .getQuestionsAnswer(mQuestionsId, UrlFilterUtils.getFilterQuery("fold", "true"), page); } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt index 4612a528e2..5c28e2a23a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt @@ -39,7 +39,7 @@ class MyArticleFragment : ListFragment>? { - return RetrofitManager.getInstance(HaloApp.getInstance().application).api.getMyArticleAndQuestion(mTargetUserId, page) + return RetrofitManager.getInstance().api.getMyArticleAndQuestion(mTargetUserId, page) .flatMap(object :Function, Observable>>{ override fun apply(list: List): Observable> { return Observable.create { emitter-> diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListViewModel.kt index 0927a824a8..88dd4750e4 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListViewModel.kt @@ -27,7 +27,7 @@ class SimpleArticleListViewModel(application: Application) } else { SortType.SORT_BY_TIME } - return RetrofitManager.getInstance(getApplication()) + return RetrofitManager.getInstance() .api .getAllCommunityArticles(UserManager.getInstance().community.id, mSortType.value, page, Utils.getTime(getApplication())) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailViewModel.kt index 735b7cac89..205f501a4b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailViewModel.kt @@ -56,7 +56,7 @@ class ArticleDetailViewModel( var articlePageFinishedLiveData = MutableLiveData() override fun provideDataObservable(page: Int): Observable> { - return RetrofitManager.getInstance(getApplication()).api.getCommunityArticleCommentList( + return RetrofitManager.getInstance().api.getCommunityArticleCommentList( communityId, articleId, currentSortType.value, diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/comment/ArticleDetailCommentViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/comment/ArticleDetailCommentViewModel.kt index cca385a491..810ee373f2 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/comment/ArticleDetailCommentViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/comment/ArticleDetailCommentViewModel.kt @@ -31,12 +31,12 @@ class ArticleDetailCommentViewModel(application: Application, } override fun provideDataSingle(page: Int): Single> { - return RetrofitManager.getInstance(getApplication()).api.getCommunityArticleCommentReply(communityId, articleId, commentId, currentSortType.value, page) + return RetrofitManager.getInstance().api.getCommunityArticleCommentReply(communityId, articleId, commentId, currentSortType.value, page) } @SuppressLint("CheckResult") fun getComment() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getCommunityArticleComment(communityId, articleId, commentId) .subscribeOn(Schedulers.io()) .subscribe(object : BiResponse() { diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftFragment.kt index 59e31f1a01..104b93081b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftFragment.kt @@ -32,7 +32,7 @@ import org.greenrobot.eventbus.ThreadMode import retrofit2.HttpException class ArticleDraftFragment : ListFragment>() { - private val mApi = RetrofitManager.getInstance(context).api + private val mApi = RetrofitManager.getInstance().api private var mAdapter: ArticleDraftAdapter? = null private var mArticleId: String? = null private var mOnlyCreateDraft = false diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleSelectGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleSelectGameAdapter.kt index 8031311d3c..7635d697a9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleSelectGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleSelectGameAdapter.kt @@ -22,7 +22,7 @@ class ArticleSelectGameAdapter(context: Context, loading: ProgressBar, private val mList = ArrayList() init { - RetrofitManager.getInstance(mContext).api + RetrofitManager.getInstance().api .getAskGameSelect(HaloApp.getInstance().channel , UrlFilterUtils.getFilterQuery("status", "opened"), 1, 1000) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnRepository.java b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnRepository.java index 3fff19e529..6558be0b26 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnRepository.java +++ b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnRepository.java @@ -11,6 +11,7 @@ import com.gh.gamecenter.qa.entity.AskTagGroupsEntity; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.user.ApiResponse; +import com.halo.assistant.HaloApp; import java.util.ArrayList; import java.util.Collections; @@ -29,8 +30,6 @@ import retrofit2.HttpException; public class AskColumnRepository { - private static volatile AskColumnRepository mInstance; - private Context mContext; private List mCacheTagGroupsList = new ArrayList<>(); @@ -38,25 +37,18 @@ public class AskColumnRepository { private String mCurCommunityId; - public static AskColumnRepository getInstance(Context context) { - if (mInstance == null) { - synchronized (AskColumnRepository.class) { - if (mInstance == null) { - mInstance = new AskColumnRepository(context); - } - } - } - return mInstance; + public static AskColumnRepository getInstance() { + return SingletonHolder.INSTANCE; } - public AskColumnRepository(Context context) { - mContext = context; + public AskColumnRepository() { + mContext = HaloApp.getInstance().getApplicationContext(); loadUserTagGroups(); } private void loadUserTagGroups() { mCurCommunityId = UserManager.getInstance().getUserId(); - RetrofitManager.getInstance(mContext).getApi() + RetrofitManager.getInstance().getApi() .getUserAskColumnsTags(UserManager.getInstance().getUserId(), UserManager.getInstance().getCommunity().getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -76,7 +68,7 @@ public class AskColumnRepository { } private void loadDefaultTagGroups(List userEntity) { - RetrofitManager.getInstance(mContext).getApi() + RetrofitManager.getInstance().getApi() .getAskColumnsTags(UserManager.getInstance().getCommunity().getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -115,7 +107,7 @@ public class AskColumnRepository { RequestBody body = RequestBody.create(MediaType.parse("application/json"), GsonUtils.toJson(entity)); - RetrofitManager.getInstance(mContext).getApi() + RetrofitManager.getInstance().getApi() .patchUserAskColumnsTags(body, UserManager.getInstance().getUserId(), UserManager.getInstance().getCommunity().getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -141,7 +133,7 @@ public class AskColumnRepository { } private void deleteUserAskTagGroups() { - RetrofitManager.getInstance(mContext) + RetrofitManager.getInstance() .getApi() .deleteUserAskColumnsTags(UserManager.getInstance().getUserId(), UserManager.getInstance().getCommunity().getId()) .subscribeOn(Schedulers.io()) @@ -187,4 +179,8 @@ public class AskColumnRepository { postUserAskTagGroups(entity); } } + + private static class SingletonHolder { + private static final AskColumnRepository INSTANCE = new AskColumnRepository(); + } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnViewModel.kt index 9cd3c0749b..e74e4d56a6 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnViewModel.kt @@ -39,7 +39,7 @@ class AskColumnViewModel(application: Application, private val mRepository: AskC class Factory(private val mApplication: Application) : ViewModelProvider.NewInstanceFactory() { - private val mRepository: AskColumnRepository = AskColumnRepository.getInstance(mApplication) + private val mRepository: AskColumnRepository = AskColumnRepository.getInstance() override fun create(modelClass: Class): T { diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt index 775e9347b7..3ba36aac0b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt @@ -103,7 +103,7 @@ class AskColumnDetailActivity : ToolBarActivity() { private fun loadColumn() { mLoading.visibility = View.VISIBLE mNoConn.visibility = View.GONE - RetrofitManager.getInstance(this).api.getAskColumnsTagsById(mCommunityEntity?.id, + RetrofitManager.getInstance().api.getAskColumnsTagsById(mCommunityEntity?.id, intent.getStringExtra(EntranceUtils.KEY_COLUMN_ID)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotViewModel.kt index 17170d412a..367301f146 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotViewModel.kt @@ -29,9 +29,9 @@ class HotViewModel(application: Application, data: Any, val community: Community override fun provideDataObservable(page: Int): Observable> { if (tag != null) { - return RetrofitManager.getInstance(getApplication()).api.getAnswerHot(community.id, tag, page) + return RetrofitManager.getInstance().api.getAnswerHot(community.id, tag, page) } - return RetrofitManager.getInstance(getApplication()).api.getAskColumnsHot(community.id, columnTagEntity?.id, page) + return RetrofitManager.getInstance().api.getAskColumnsHot(community.id, columnTagEntity?.id, page) } class Factory(private val mApplication: Application, private val data: Any, private val community: CommunityEntity) : ViewModelProvider.NewInstanceFactory() { diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsViewModel.kt index c05e6778e8..d647e2402d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsViewModel.kt @@ -29,9 +29,9 @@ class RecommendsViewModel(application: Application, data: Any, val community: Co override fun provideDataObservable(page: Int): Observable> { if (tag != null) { - return RetrofitManager.getInstance(getApplication()).api.getAnswerChoiceness(community.id, tag, page) + return RetrofitManager.getInstance().api.getAnswerChoiceness(community.id, tag, page) } - return RetrofitManager.getInstance(getApplication()).api.getAskColumnsChoiceness(community.id, columnTagEntity?.id, page) + return RetrofitManager.getInstance().api.getAskColumnsChoiceness(community.id, columnTagEntity?.id, page) } class Factory(private val mApplication: Application, private val data: Any, private val community: CommunityEntity) : ViewModelProvider.NewInstanceFactory() { diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredViewModel.kt index 9f20c4a27f..a21e17ff55 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredViewModel.kt @@ -28,9 +28,9 @@ class UnansweredViewModel(application: Application, data: Any, val community: Co override fun provideDataObservable(page: Int): Observable> { if (tag != null) { - return RetrofitManager.getInstance(getApplication()).api.getQuestionsAnswering(community.id, tag, page) + return RetrofitManager.getInstance().api.getQuestionsAnswering(community.id, tag, page) } - return RetrofitManager.getInstance(getApplication()).api.getAskColumnsQuestions(community.id, columnTagEntity?.id, page) + return RetrofitManager.getInstance().api.getAskColumnsQuestions(community.id, columnTagEntity?.id, page) } class Factory(private val mApplication: Application, private val data: Any, private val community: CommunityEntity) : ViewModelProvider.NewInstanceFactory() { diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentViewModel.kt index a687bca914..9bcf72a7ad 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentViewModel.kt @@ -56,7 +56,7 @@ open class NewCommentViewModel( } override fun provideDataObservable(page: Int): Observable>? { - val api = RetrofitManager.getInstance(getApplication()).api + val api = RetrofitManager.getInstance().api return when (commentType) { CommentType.ANSWER -> api.getAnswerCommentList(answerId, page) @@ -113,7 +113,7 @@ open class NewCommentViewModel( } fun postComment(content: String, imageUrls: List?, commentEntity: CommentEntity?) { - val api = RetrofitManager.getInstance(getApplication()).api + val api = RetrofitManager.getInstance().api val requestMap = hashMapOf() requestMap["content"] = content if (!imageUrls.isNullOrEmpty()) { @@ -311,7 +311,7 @@ open class NewCommentViewModel( @SuppressLint("CheckResult") fun deleteVideoComment(entity: CommentEntity) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .deleteVideoComment(videoId, entity.id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -328,7 +328,7 @@ open class NewCommentViewModel( } fun getCommentReply(videoId: String, commentId: String, page: Int, resultCallback: (result: ArrayList) -> Unit) { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getVideoCommentReply(videoId, commentId, page) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentViewModel.kt index 695ec77801..ed75acaf7e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentViewModel.kt @@ -34,7 +34,7 @@ abstract class BaseCommentViewModel( var questionId: String, var communityId: String ) : ListViewModel(application) { - protected val mApi: ApiService = RetrofitManager.getInstance(application).api + protected val mApi: ApiService = RetrofitManager.getInstance().api var currentSortType: SortType = SortType.OLDEST val loadResultLiveData = MutableLiveData() diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerViewModel.kt index f763592670..1715d307d3 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerViewModel.kt @@ -13,7 +13,7 @@ import com.halo.assistant.HaloApp import io.reactivex.Observable class ChooseForumContainerViewModel(application: Application, val type: String, var searchKey: String) : ListViewModel(application) { - private val mApi: ApiService = RetrofitManager.getInstance(getApplication()).api + private val mApi: ApiService = RetrofitManager.getInstance().api init { if (type != ChooseForumContainerFragment.ChooseForumType.SEARCH.value) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerViewModel.kt index 640d2b2139..f091f632ca 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerViewModel.kt @@ -20,10 +20,10 @@ class AnswerViewModel(application: Application, private val answerType: InsertAn override fun provideDataObservable(page: Int): Observable> { return if (answerType == InsertAnswerWrapperActivity.AnswerType.MINE_ANSWER) { - RetrofitManager.getInstance(getApplication()).api.getMyAnswers(UserManager.getInstance().userId, page, + RetrofitManager.getInstance().api.getMyAnswers(UserManager.getInstance().userId, page, HaloApp.getInstance().channel, Utils.getTime(getApplication())) } else { - RetrofitManager.getInstance(getApplication()).api.getCollectionAnswer(UserManager.getInstance().userId, page) + RetrofitManager.getInstance().api.getCollectionAnswer(UserManager.getInstance().userId, page) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleViewModel.kt index e6bd143144..b3320bc847 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleViewModel.kt @@ -17,9 +17,9 @@ class ArticleViewModel(application: Application, private val articleType: Insert override fun provideDataObservable(page: Int): Observable> { return if (articleType == InsertArticleWrapperActivity.ArticleType.MINE_ARTICLE) { - RetrofitManager.getInstance(HaloApp.getInstance().application).api.getMyArticle(UserManager.getInstance().userId, page) + RetrofitManager.getInstance().api.getMyArticle(UserManager.getInstance().userId, page) } else { - RetrofitManager.getInstance(getApplication()).api.getCollectionCommunityArticle(UserManager.getInstance().userId, page) + RetrofitManager.getInstance().api.getCollectionCommunityArticle(UserManager.getInstance().userId, page) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/GameFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/GameFragment.kt index 4198b325dc..cde1b957fe 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/GameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/GameFragment.kt @@ -159,7 +159,7 @@ open class GameFragment : ListFragment>? { return RetrofitManager - .getInstance(requireContext()).api + .getInstance().api .getSearchGame(Config.API_HOST + "games:search?keyword=" + searchEt.text + "&view=digest" + "&channel=" + HaloApp.getInstance().channel + "&version=" + BuildConfig.VERSION_NAME) } @@ -169,7 +169,7 @@ open class GameFragment : ListFragment() val articleLiveData = MutableLiveData() diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/OnlineVideoViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/OnlineVideoViewModel.kt index 45156a4942..74bb0f2b1b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/OnlineVideoViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/OnlineVideoViewModel.kt @@ -13,7 +13,7 @@ import io.reactivex.Observable @Deprecated("v5.0.0废弃") class OnlineVideoViewModel(application: Application) : ListViewModel(application) { override fun provideDataObservable(page: Int): Observable> { - return RetrofitManager.getInstance(getApplication()).api.getCommunityInsertVideo(UserManager.getInstance().userId, page, Config.VIDEO_PAGE_SIZE) + return RetrofitManager.getInstance().api.getCommunityInsertVideo(UserManager.getInstance().userId, page, Config.VIDEO_PAGE_SIZE) } override fun mergeResultLiveData() { diff --git a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowViewModel.kt index 0ffe76e611..069877de20 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowViewModel.kt @@ -25,7 +25,7 @@ class AskFollowViewModel(application: Application) var followSet = HashSet() override fun provideDataObservable(page: Int): Observable> { - return RetrofitManager.getInstance(getApplication()) + return RetrofitManager.getInstance() .api .getAskFollow(UserManager.getInstance().community.id, UserManager.getInstance().userId, page, Utils.getTime(getApplication())) } @@ -37,7 +37,7 @@ class AskFollowViewModel(application: Application) } fun getRecommendUser() { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api .getRecommendUsers(UserManager.getInstance().community.id, UserManager.getInstance().userId) .subscribeOn(Schedulers.io()) @@ -52,7 +52,7 @@ class AskFollowViewModel(application: Application) fun doFollow() { val requestList = arrayListOf>() for (userId in followSet) { - requestList.add(RetrofitManager.getInstance(getApplication()).api.postFollowing(userId)) + requestList.add(RetrofitManager.getInstance().api.postFollowing(userId)) } Observable.mergeDelayError(requestList) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/ConcernQuestionsFragment.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/ConcernQuestionsFragment.java index 67e3cb6cf9..adcaf10844 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/ConcernQuestionsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/ConcernQuestionsFragment.java @@ -54,7 +54,7 @@ public class ConcernQuestionsFragment extends ListFragment> provideDataObservable(int page) { - return RetrofitManager.getInstance(getContext()).getApi().getConcernQuestions(UserManager.getInstance().getUserId(), page); + return RetrofitManager.getInstance().getApi().getConcernQuestions(UserManager.getInstance().getUserId(), page); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerFragment.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerFragment.java index b3da5197b0..1b5c011b17 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerFragment.java @@ -45,7 +45,7 @@ public class MyAnswerFragment extends ListFragment> provideDataObservable(int page) { - return RetrofitManager.getInstance(getContext()).getApi().getMyAnswers(UserManager.getInstance().getUserId(), page, + return RetrofitManager.getInstance().getApi().getMyAnswers(UserManager.getInstance().getUserId(), page, HaloApp.getInstance().getChannel(), Utils.getTime(getContext())); } diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyQuestionsFragment.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyQuestionsFragment.java index 9dd4fb940e..53845217a9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyQuestionsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyQuestionsFragment.java @@ -45,7 +45,7 @@ public class MyQuestionsFragment extends ListFragment> provideDataObservable(int page) { - return RetrofitManager.getInstance(getContext()).getApi().getMyQuestions(UserManager.getInstance().getUserId(), page, + return RetrofitManager.getInstance().getApi().getMyQuestions(UserManager.getInstance().getUserId(), page, HaloApp.getInstance().getChannel(), Utils.getTime(getContext())); } diff --git a/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewBodyFragment.java b/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewBodyFragment.java index 6a8f5bb606..cbf4505dde 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewBodyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewBodyFragment.java @@ -104,7 +104,7 @@ public class AskQuestionsNewBodyFragment extends ListFragment> provideDataObservable(int page) { - return RetrofitManager.getInstance(getContext()).getApi().getAskQuestions(mCommunityId, UrlFilterUtils.getFilterQuery("tag_group", mType), page); + return RetrofitManager.getInstance().getApi().getAskQuestions(mCommunityId, UrlFilterUtils.getFilterQuery("tag_group", mType), page); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.kt index 3228e7e654..1b198d4603 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.kt @@ -601,7 +601,7 @@ class QuestionsDetailFragment : } private fun getUserAnswerDrafts() { - RetrofitManager.getInstance(context).api + RetrofitManager.getInstance().api .getUserAnswerDrafts(mQuestionsId, "", Utils.getTime(context)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailViewModel.kt index 58d84742c4..876ff7d96c 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailViewModel.kt @@ -117,7 +117,7 @@ class QuestionsDetailViewModel(application: Application, val questionId: String) } val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()) - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .postInvite(body, questionId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftViewModel.kt index 6b720870cf..f73922c0d2 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftViewModel.kt @@ -16,7 +16,7 @@ import retrofit2.HttpException class QuestionDraftViewModel(application: Application) : ListViewModel(application) { val deleteDraftSuccess = MutableLiveData>() - private val api = RetrofitManager.getInstance(HaloApp.getInstance().application).api + private val api = RetrofitManager.getInstance().api override fun provideDataObservable(page: Int): Observable> { return api.getQuestionDrafts(UserManager.getInstance().userId) diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryActivity.kt index 244621e2a3..b05da5a4dd 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryActivity.kt @@ -29,7 +29,7 @@ class HistoryActivity : ListActivity> { - return RetrofitManager.getInstance(this).api.getModeratorModifiedVersion(mQuestionId, page) + return RetrofitManager.getInstance().api.getModeratorModifiedVersion(mQuestionId, page) } override fun provideListViewModel(): NormalListViewModel { diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryDetailViewModel.kt index f18b0539be..1492652791 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/manager/HistoryDetailViewModel.kt @@ -20,7 +20,7 @@ class HistoryDetailViewModel(application: Application, val detailLiveData = MutableLiveData() - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api var originVersion: String = "" diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/tip/QuestionTitleTipAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/tip/QuestionTitleTipAdapter.kt index 23331e584e..d84b020c52 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/tip/QuestionTitleTipAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/tip/QuestionTitleTipAdapter.kt @@ -98,7 +98,7 @@ class QuestionTitleTipAdapter(private val context: Context, title: AutoCompleteT val results = FilterResults() if (prefix.isNullOrBlank()) return results RetrofitManager - .getInstance(context).api + .getInstance().api .getAskSearchByTitle(mCommunityId, prefix.toString(), 1) .subscribe(object : Response>() { override fun onResponse(response: List?) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewModel.kt index 0a0c0f0ee4..35775d9771 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewModel.kt @@ -36,9 +36,9 @@ class QuestionsInviteViewModel(application: Application, var questionId: String? override fun provideDataObservable(page: Int): Observable> { return if (forSearch) { - RetrofitManager.getInstance(getApplication()).api.getInviteExperts(questionId, HaloApp.getInstance().channel, page) + RetrofitManager.getInstance().api.getInviteExperts(questionId, HaloApp.getInstance().channel, page) } else { - RetrofitManager.getInstance(getApplication()).api.getSearchInviteExperts(questionId, + RetrofitManager.getInstance().api.getSearchInviteExperts(questionId, searchKey, HaloApp.getInstance().channel, page) @@ -58,7 +58,7 @@ class QuestionsInviteViewModel(application: Application, var questionId: String? } val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()) - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .postInvite(body, questionId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsViewModel.java b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsViewModel.java index 5c32c41f7d..9accc1a274 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsViewModel.java @@ -70,7 +70,7 @@ public class AskQuestionsRecommendsViewModel extends BaseListViewModel>() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendSubjectViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendSubjectViewModel.kt index 687149b0db..b9c9d4cbcc 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendSubjectViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendSubjectViewModel.kt @@ -26,7 +26,7 @@ class AskRecommendSubjectViewModel(application: Application) : AndroidViewModel( fun loadAskSlideColumn() { val communityId = UserManager.getInstance().community.id - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getAskSlide(UserManager.getInstance().community.id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -48,7 +48,7 @@ class AskRecommendSubjectViewModel(application: Application) : AndroidViewModel( @SuppressLint("CheckResult") fun loadRecommendedEntrance() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getCommunityRecommendedEntrances(UserManager.getInstance().community.id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestFragment.kt index ff87bcbaec..749f4c6914 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestFragment.kt @@ -39,7 +39,7 @@ class RecommendNewestFragment : ListFragment> { - return RetrofitManager.getInstance(context).api.getCommunitiesRecommendNewest(UserManager.getInstance().community.id, page) + return RetrofitManager.getInstance().api.getCommunitiesRecommendNewest(UserManager.getInstance().community.id, page) } override fun provideListViewModel(): NormalListViewModel { diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchActivity.java b/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchActivity.java index c5efc66f9a..60213f2a3b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchActivity.java @@ -222,7 +222,7 @@ public class AskSearchActivity extends ToolBarActivity { private void getCommunityDefaultSearch() { RetrofitManager - .getInstance(this) + .getInstance() .getApi() .getCommunityDefaultSearch(UserManager.getInstance().getCommunity().getId()) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleFragment.kt index 294b749235..d01e2ccc77 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleFragment.kt @@ -38,7 +38,7 @@ class ArticleFragment : BaseAskSearchFragment>? { questionTag = activity?.intent?.getStringExtra(EntranceUtils.KEY_QUESTION_TAG) columnId = activity?.intent?.getStringExtra(EntranceUtils.KEY_COLUMN_ID) - val api = RetrofitManager.getInstance(context).api + val api = RetrofitManager.getInstance().api return if (TextUtils.isEmpty(mSearchKey)) null else if (!questionTag.isNullOrEmpty()) { api.getAskSearchArticle(UserManager.getInstance().community.id, mSearchKey, diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryViewModel.kt index 681f77a761..3522a0c144 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryViewModel.kt @@ -15,7 +15,7 @@ class HistoryViewModel(application: Application) : AndroidViewModel(application) val hotSearchLiveData = MutableLiveData>() fun getHotSearch() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getCommunityHotSearch(UserManager.getInstance().community.id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestFragment.kt index 112554cee0..669e2dc233 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestFragment.kt @@ -35,7 +35,7 @@ class HottestFragment : BaseAskSearchFragment>? { - val api = RetrofitManager.getInstance(context).api + val api = RetrofitManager.getInstance().api return if (TextUtils.isEmpty(mSearchKey)) null else if (!questionTag.isNullOrEmpty()) { api.getAskSearch(UserManager.getInstance().community.id, mSearchKey, diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestFragment.kt index a02e9556ec..4d4b7f7c5b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestFragment.kt @@ -35,7 +35,7 @@ class NewestFragment : BaseAskSearchFragment>? { - val api = RetrofitManager.getInstance(context).api + val api = RetrofitManager.getInstance().api return if (TextUtils.isEmpty(mSearchKey)) null else if (!questionTag.isNullOrEmpty()) { api.getAskSearchNewest(UserManager.getInstance().community.id, mSearchKey, diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionFragment.kt index 5068757b7f..dd4f9eb2c5 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionFragment.kt @@ -35,7 +35,7 @@ class QuestionFragment : BaseAskSearchFragment>? { - val api = RetrofitManager.getInstance(context).api + val api = RetrofitManager.getInstance().api return if (TextUtils.isEmpty(mSearchKey)) null else if (!questionTag.isNullOrEmpty()) { api.getAskSearchQuestion(UserManager.getInstance().community.id, mSearchKey, diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/user/UserFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/search/user/UserFragment.kt index 1a28646ec8..d93cf2133e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/user/UserFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/user/UserFragment.kt @@ -46,7 +46,7 @@ class UserFragment : BaseAskSearchFragment } override fun provideDataObservable(page: Int): Observable>? { - val api = RetrofitManager.getInstance(context).api + val api = RetrofitManager.getInstance().api return if (TextUtils.isEmpty(mSearchKey)) null else if (!questionTag.isNullOrEmpty()) { api.getAskSearchUser(UserManager.getInstance().community.id, mSearchKey, diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/user/UserViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/search/user/UserViewModel.kt index 541a2f508d..3de7d3193e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/user/UserViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/user/UserViewModel.kt @@ -35,9 +35,9 @@ class UserViewModel(application: Application, fun followingCommand(isFollow: Boolean, targetUserId: String, position: Int) { val observable = if (isFollow) { - RetrofitManager.getInstance(getApplication()).api.postFollowing(targetUserId) + RetrofitManager.getInstance().api.postFollowing(targetUserId) } else { - RetrofitManager.getInstance(getApplication()).api.deleteFollowing(targetUserId) + RetrofitManager.getInstance().api.deleteFollowing(targetUserId) } observable .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewModel.kt index 15145144c1..d2b165be6e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewModel.kt @@ -84,7 +84,7 @@ class OpenedViewModel(application: Application) : ListViewModel> { - return RetrofitManager.getInstance(getApplication()).api.getCommunitySelectOpened(HaloApp.getInstance().channel, + return RetrofitManager.getInstance().api.getCommunitySelectOpened(HaloApp.getInstance().channel, UrlFilterUtils.getFilterQuery("category", "all"), page, 100) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/SelectGameDialogAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/select/SelectGameDialogAdapter.java index 8433b86a0d..10ba7190c5 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/SelectGameDialogAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/select/SelectGameDialogAdapter.java @@ -62,7 +62,7 @@ public class SelectGameDialogAdapter extends BaseRecyclerAdapter> provideDataObservable(int page) { - return RetrofitManager.getInstance(getApplication()).getApi().getCommunityVoting(HaloApp.getInstance().getChannel() + return RetrofitManager.getInstance().getApi().getCommunityVoting(HaloApp.getInstance().getChannel() , UrlFilterUtils.getFilterQuery("status", "voting")); } @@ -79,7 +79,7 @@ public class VotingViewModel extends ListViewModel() { @@ -97,7 +97,7 @@ public class VotingViewModel extends ListViewModel> provideDataObservable(int page) { - return RetrofitManager.getInstance(getApplication()).getApi() + return RetrofitManager.getInstance().getApi() .getAskSubjectColumnAnswers(communityData.getId(), columnId, page, "recommend", 20); } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/tags/AskQuestionsNewRepository.java b/app/src/main/java/com/gh/gamecenter/qa/tags/AskQuestionsNewRepository.java index bb1e86a29b..b81872d0a9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/tags/AskQuestionsNewRepository.java +++ b/app/src/main/java/com/gh/gamecenter/qa/tags/AskQuestionsNewRepository.java @@ -12,6 +12,7 @@ import com.gh.gamecenter.qa.entity.AskTagGroupsEntity; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.user.ApiResponse; +import com.halo.assistant.HaloApp; import java.util.ArrayList; import java.util.Collections; @@ -30,31 +31,22 @@ import retrofit2.HttpException; public class AskQuestionsNewRepository { - private static volatile AskQuestionsNewRepository mInstance; - private Context mContext; private List mCacheTagGroupsList = new ArrayList<>(); private MutableLiveData> mObservableTagGroupsList = new MutableLiveData<>(); - public static AskQuestionsNewRepository getInstance(Context context) { - if (mInstance == null) { - synchronized (AskQuestionsNewRepository.class) { - if (mInstance == null) { - mInstance = new AskQuestionsNewRepository(context); - } - } - } - return mInstance; + public static AskQuestionsNewRepository getInstance() { + return SingletonHolder.INSTANCE; } - public AskQuestionsNewRepository(Context context) { - mContext = context; + public AskQuestionsNewRepository() { + mContext = HaloApp.getInstance().getApplicationContext(); loadUserTagGroups(); } private void loadUserTagGroups() { - RetrofitManager.getInstance(mContext).getApi() + RetrofitManager.getInstance().getApi() .getUserAskTagGroups(UserManager.getInstance().getUserId(), UserManager.getInstance().getCommunity().getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -74,7 +66,7 @@ public class AskQuestionsNewRepository { } private void loadDefaultTagGroups(List userEntity) { - RetrofitManager.getInstance(mContext).getApi() + RetrofitManager.getInstance().getApi() .getDefaultAskTagGroups(UserManager.getInstance().getCommunity().getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -121,7 +113,7 @@ public class AskQuestionsNewRepository { RequestBody body = RequestBody.create(MediaType.parse("application/json"), GsonUtils.toJson(entity)); - RetrofitManager.getInstance(mContext).getApi() + RetrofitManager.getInstance().getApi() .postUserAskTagGroups(body, UserManager.getInstance().getUserId(), UserManager.getInstance().getCommunity().getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -147,7 +139,7 @@ public class AskQuestionsNewRepository { } private void deleteUserAskTagGroups() { - RetrofitManager.getInstance(mContext) + RetrofitManager.getInstance() .getApi() .deleteUserAskTagGroups(UserManager.getInstance().getUserId(), UserManager.getInstance().getCommunity().getId()) .subscribeOn(Schedulers.io()) @@ -189,4 +181,8 @@ public class AskQuestionsNewRepository { postUserAskTagGroups(entity); } } + + private static class SingletonHolder { + private static final AskQuestionsNewRepository INSTANCE = new AskQuestionsNewRepository(); + } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/tags/AskQuestionsNewViewModel.java b/app/src/main/java/com/gh/gamecenter/qa/tags/AskQuestionsNewViewModel.java index 66df1c1773..e5f98cf091 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/tags/AskQuestionsNewViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/qa/tags/AskQuestionsNewViewModel.java @@ -56,7 +56,7 @@ public class AskQuestionsNewViewModel extends AndroidViewModel { public Factory(@NonNull Application application) { mApplication = application; - mRepository = AskQuestionsNewRepository.getInstance(application); + mRepository = AskQuestionsNewRepository.getInstance(); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt index 9c53a92203..b11118c5fa 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt @@ -721,7 +721,7 @@ class ForumVideoDetailFragment : BaseFragment_TabLayout() { } else { mBinding.topVideoView.onVideoResume() } - DownloadManager.getInstance(requireContext()).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) } override fun onPause() { @@ -734,7 +734,7 @@ class ForumVideoDetailFragment : BaseFragment_TabLayout() { currentPosition ) } - DownloadManager.getInstance(requireContext()).removeObserver(dataWatcher) + DownloadManager.getInstance().removeObserver(dataWatcher) } override fun onStop() { diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailViewModel.kt index 3069251cdd..664441b9b1 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailViewModel.kt @@ -25,7 +25,7 @@ import tv.danmaku.ijk.media.exo2.ExoSourceManager class ForumVideoDetailViewModel(application: Application, val videoId: String) : AndroidViewModel(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api var videoIsMuted = SPUtils.getBoolean(Constants.SP_VIDEO_PLAY_MUTE, true) val detailLiveData = MediatorLiveData>() val updateDetailLiveData = MediatorLiveData() diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescViewModel.kt index 0cd66822b0..93df40ab02 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescViewModel.kt @@ -32,7 +32,7 @@ class VideoDescViewModel(application: Application) : var handleSuccessLiveData = MutableLiveData() override fun provideDataObservable(page: Int): Observable>? { - return RetrofitManager.getInstance(getApplication()).api.getRecommendVideo( + return RetrofitManager.getInstance().api.getRecommendVideo( topVideoDetail?.id, page ) @@ -75,7 +75,7 @@ class VideoDescViewModel(application: Application) : @SuppressLint("CheckResult") private fun voteVideo(videoId: String) { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.voteVideo(videoId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -119,7 +119,7 @@ class VideoDescViewModel(application: Application) : @SuppressLint("CheckResult") private fun undoVoteVideo(videoId: String) { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.undoVoteVideo(videoId) .subscribeOn(Schedulers.io()) .subscribe(object : BiResponse() { @@ -176,7 +176,7 @@ class VideoDescViewModel(application: Application) : @SuppressLint("CheckResult") private fun favoriteVideo(videoId: String) { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.collectVideo(UserManager.getInstance().userId, videoId) .compose(singleToMain()) .subscribe(object : BiResponse() { @@ -198,7 +198,7 @@ class VideoDescViewModel(application: Application) : @SuppressLint("CheckResult") private fun undoFavoriteVideo(videoId: String) { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.undoCollectVideo(UserManager.getInstance().userId, videoId) .compose(singleToMain()) .subscribe(object : BiResponse() { @@ -225,9 +225,9 @@ class VideoDescViewModel(application: Application) : return } val observable = if (topVideoDetail?.me?.isFollower == false) { - RetrofitManager.getInstance(getApplication()).api.postFollowing(topVideoDetail?.user?.id) + RetrofitManager.getInstance().api.postFollowing(topVideoDetail?.user?.id) } else { - RetrofitManager.getInstance(getApplication()).api.deleteFollowing(topVideoDetail?.user?.id) + RetrofitManager.getInstance().api.deleteFollowing(topVideoDetail?.user?.id) } observable .compose(observableToMain()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishViewModel.kt index 71a64e01ca..b643d1e10c 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishViewModel.kt @@ -33,7 +33,7 @@ import java.io.File import java.io.FileOutputStream class VideoPublishViewModel(application: Application) : AndroidViewModel(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api var type: String = "" var communityEntity: CommunityEntity? = null var selectActivityLabelEntity: ActivityLabelEntity? = null diff --git a/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java index e1bee7eed5..4397f9c9e7 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java @@ -33,7 +33,7 @@ public class InstallAndUninstallReceiver extends BroadcastReceiver { String packageName = intent.getDataString(); packageName = packageName.substring(packageName.indexOf(":") + 1); Utils.log("安装了:" + packageName + "包名的程序"); - InstallUtils.getInstance(context).removeInstall(packageName); + InstallUtils.getInstance().removeInstall(packageName); PackageHelper.refreshLocalPackageList(); String versionName = PackageUtils.getVersionNameByPackageName(packageName); @@ -55,7 +55,7 @@ public class InstallAndUninstallReceiver extends BroadcastReceiver { String packageName = intent.getDataString(); packageName = packageName.substring(packageName.indexOf(":") + 1); Utils.log("卸载了:" + packageName + "包名的程序"); - InstallUtils.getInstance(context).removeUninstall(packageName); + InstallUtils.getInstance().removeUninstall(packageName); PackageHelper.refreshLocalPackageList(); EBPackage uninstallEb = new EBPackage("卸载", packageName, ""); diff --git a/app/src/main/java/com/gh/gamecenter/receiver/NetworkStateReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/NetworkStateReceiver.java index 5c06ebf9e0..fb9b2ea101 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/NetworkStateReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/NetworkStateReceiver.java @@ -25,7 +25,7 @@ public class NetworkStateReceiver extends BroadcastReceiver { RegionSettingHelper.getRegionSetting(); ReservationRepository.refreshReservationsIfNeeded(); EventBus.getDefault().post(new EBNetworkState(NetworkUtils.isNetworkConnected(context))); - DownloadManager.getInstance(HaloApp.getInstance().getApplication()).checkAndRetryDownload(); + DownloadManager.getInstance().checkAndRetryDownload(); if (NetworkUtils.isMobileConnected(context)) { HaloApp.put(Constants.SHOULD_SHOW_VIDEO_MOBILE_WARNING, true); } diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java b/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java index 471a2dec08..9c24c9ca8d 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java @@ -9,6 +9,7 @@ import com.gh.common.constant.Config; import com.gh.common.util.EnvHelper; import com.gh.gamecenter.Injection; import com.gh.gamecenter.retrofit.service.ApiService; +import com.halo.assistant.HaloApp; import java.io.File; import java.util.concurrent.TimeUnit; @@ -25,7 +26,6 @@ import retrofit2.converter.gson.GsonConverterFactory; */ public class RetrofitManager { - private static volatile RetrofitManager sInstance; private static final int NORMAL_CONN_TIME_OUT = 5; private static final int NORMAL_READ_TIME_OUT = 5; private static final int UPLOAD_CALL_TIME_OUT = 20; // 图片上传超时时间 @@ -41,7 +41,8 @@ public class RetrofitManager { .baseUrl(url).build().create(serviceCls); } - private RetrofitManager(Context context) { + private RetrofitManager() { + Context context = HaloApp.getInstance().getApplicationContext(); OkHttpClient okHttpNormalConfig = getOkHttpConfig(context, 0, 2); mApiService = provideService(okHttpNormalConfig, Config.API_HOST, ApiService.class); mUploadApiService = provideService(getOkHttpConfig(context, UPLOAD_CALL_TIME_OUT, 1), Config.API_HOST, ApiService.class); @@ -63,15 +64,8 @@ public class RetrofitManager { .build(); } - public static RetrofitManager getInstance(Context context) { - if (sInstance == null) { - synchronized (LOCK) { - if (sInstance == null) { - sInstance = new RetrofitManager(context); - } - } - } - return sInstance; + public static RetrofitManager getInstance() { + return SingletonHolder.INSTANCE; } public ApiService getApi() { @@ -81,4 +75,8 @@ public class RetrofitManager { public ApiService getUploadApi() { return mUploadApiService; } + + private static class SingletonHolder { + private static final RetrofitManager INSTANCE = new RetrofitManager(); + } } diff --git a/app/src/main/java/com/gh/gamecenter/room/AppDatabase.java b/app/src/main/java/com/gh/gamecenter/room/AppDatabase.java index 193a5a2d7a..084ff0b536 100644 --- a/app/src/main/java/com/gh/gamecenter/room/AppDatabase.java +++ b/app/src/main/java/com/gh/gamecenter/room/AppDatabase.java @@ -37,6 +37,7 @@ import com.gh.gamecenter.room.dao.SignDao; import com.gh.gamecenter.room.dao.SimulatorGameDao; import com.gh.gamecenter.room.dao.UploadDao; import com.gh.gamecenter.video.upload.UploadEntity; +import com.halo.assistant.HaloApp; /** * Created by khy on 28/11/17. @@ -82,21 +83,10 @@ public abstract class AppDatabase extends RoomDatabase { public abstract GameCollectionDraftDao gameCollectionDraftDao(); - private static volatile AppDatabase sInstance; - private static final String DATABASE_NAME = "gh-db"; - private final static byte[] SLOCK = new byte[0]; - - public static AppDatabase getInstance(Context context) { - if (sInstance == null) { - synchronized (SLOCK) { - if (sInstance == null) { - sInstance = buildDatabase(context.getApplicationContext()); - } - } - } - return sInstance; + public static AppDatabase getInstance() { + return SingletonHolder.INSTANCE; } static final Migration MIGRATION_2_4 = new Migration(2, 4) { @@ -234,8 +224,8 @@ public abstract class AppDatabase extends RoomDatabase { } }; - private static AppDatabase buildDatabase(Context context) { - return Room.databaseBuilder(context, AppDatabase.class, DATABASE_NAME) + private static AppDatabase buildDatabase() { + return Room.databaseBuilder(HaloApp.getInstance().getApplicationContext(), AppDatabase.class, DATABASE_NAME) .addMigrations( MIGRATION_2_4, MIGRATION_4_5, @@ -263,4 +253,7 @@ public abstract class AppDatabase extends RoomDatabase { .build(); } + private static class SingletonHolder { + private static final AppDatabase INSTANCE = buildDatabase(); + } } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexFragment.kt b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexFragment.kt index ea81faed3c..4d754cc820 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexFragment.kt @@ -115,12 +115,12 @@ class SearchGameIndexFragment : ListFragment(application) { - private var mApi = RetrofitManager.getInstance(HaloApp.getInstance().application).api + private var mApi = RetrofitManager.getInstance().api private var mPage = 0 var mSearchSubjects = arrayListOf() var key = "" diff --git a/app/src/main/java/com/gh/gamecenter/security/BindPhoneViewModel.kt b/app/src/main/java/com/gh/gamecenter/security/BindPhoneViewModel.kt index 1c922aa1d7..7079488b57 100644 --- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneViewModel.kt @@ -25,7 +25,7 @@ import java.util.* class BindPhoneViewModel(application: Application) : AndroidViewModel(application) { - private val api = RetrofitManager.getInstance(getApplication()).api + private val api = RetrofitManager.getInstance().api var nextLiveData = MutableLiveData() var finishLiveData = MutableLiveData() diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt index 380ab23402..307dbc50cf 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt @@ -320,13 +320,13 @@ class GameServersContentFragment : BaseFragment() { super.onResume() if (mAdapter != null) { mAdapter?.notifyDataSetChanged() - DownloadManager.getInstance(context).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) } } override fun onPause() { super.onPause() - DownloadManager.getInstance(context).removeObserver(dataWatcher) + DownloadManager.getInstance().removeObserver(dataWatcher) } private fun onRefreshPage() { @@ -346,7 +346,7 @@ class GameServersContentFragment : BaseFragment() { // 下载被删除事件 @Subscribe(threadMode = ThreadMode.MAIN) fun onEventMainThread(status: EBDownloadStatus) { - DownloadManager.getInstance(context).removePlatform(status.name, status.platform) + DownloadManager.getInstance().removePlatform(status.name, status.platform) if ("delete" == status.status) { mViewModel?.locationMap?.get(status.packageName)?.let { for (location in it) { diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentViewModel.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentViewModel.kt index 4264404fad..2ca939e9a0 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentViewModel.kt @@ -56,7 +56,7 @@ class GameServersContentViewModel(application: Application) val filterQuery = UrlFilterUtils.getFilterQuery("day", day, "hour", hour, "tag", tags, "action", action, "prev_server_id", prevId, "next_server_id", nextId) - RetrofitManager.getInstance(HaloApp.getInstance()).api + RetrofitManager.getInstance().api .getGameServers(filterQuery) // .map(RegionSettingHelper.filterGame) // .map(ApkActiveUtils.filterMapperList) @@ -100,7 +100,7 @@ class GameServersContentViewModel(application: Application) // } // } // entity.sequence = mRealIndex++ - entity.setEntryMap(DownloadManager.getInstance(HaloApp.getInstance().application).getEntryMap(entity.name)) + entity.setEntryMap(DownloadManager.getInstance().getEntryMap(entity.name)) ApkActiveUtils.filterHideApk(entity) // 过滤隐藏apk var fixedTopItem: GameEntity? = null @@ -208,7 +208,7 @@ class GameServersContentViewModel(application: Application) // } // } // entity.sequence = mRealIndex++ - entity.setEntryMap(DownloadManager.getInstance(HaloApp.getInstance().application).getEntryMap(entity.name)) + entity.setEntryMap(DownloadManager.getInstance().getEntryMap(entity.name)) ApkActiveUtils.filterHideApk(entity) // 过滤隐藏apk var fixedTopItem: GameEntity? = null diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt index 22da0d30d0..896be41ed7 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt @@ -80,7 +80,7 @@ class GameServersPublishFragment : LazyFragment() { @SuppressLint("CheckResult") private fun loadServerFilterTag() { - RetrofitManager.getInstance(context).api + RetrofitManager.getInstance().api .serverFilterTag .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt index ff69d0756b..cb32607d90 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt @@ -226,13 +226,13 @@ class GameServersTestFragment : LazyFragment() { super.onFragmentResume() if (mAdapter != null) { mAdapter?.notifyDataSetChanged() - DownloadManager.getInstance(context).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) } } override fun onFragmentPause() { super.onFragmentPause() - DownloadManager.getInstance(context).removeObserver(dataWatcher) + DownloadManager.getInstance().removeObserver(dataWatcher) } private fun showStandaloneFilter() { @@ -456,7 +456,7 @@ class GameServersTestFragment : LazyFragment() { //下载被删除事件 @Subscribe(threadMode = ThreadMode.MAIN) fun onEventMainThread(status: EBDownloadStatus) { - DownloadManager.getInstance(context).removePlatform(status.name, status.platform) + DownloadManager.getInstance().removePlatform(status.name, status.platform) if (status.status == "delete") { mViewModel?.locationMap?.get(status.packageName)?.let { for (location in it) { diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestViewModel.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestViewModel.kt index d5f7dea33b..cc12375605 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestViewModel.kt @@ -49,7 +49,7 @@ class GameServersTestViewModel(application: Application, private val mColumnId: @SuppressLint("CheckResult") fun load(filter: String = ALL) { mCurrentTypeFilter = filter - RetrofitManager.getInstance(HaloApp.getInstance()).api.getGameTestServers(mColumnId, null) + RetrofitManager.getInstance().api.getGameTestServers(mColumnId, null) .subscribeOn(Schedulers.io()) .subscribe(object : BiResponse() { override fun onSuccess(data: ServerTestEntity) { diff --git a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuViewModel.kt b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuViewModel.kt index 38947ed52b..ac349d4459 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuViewModel.kt @@ -246,7 +246,7 @@ class AddKaiFuViewModel(application: Application) : AndroidViewModel(application private fun postData(postList: ArrayList) { val body = RequestBody.create(MediaType.parse("application/json"), GsonUtils.toJson(postList)) - RetrofitManager.getInstance(getApplication()).api.addKaifu(body, mGameId) + RetrofitManager.getInstance().api.addKaifu(body, mGameId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : Response>() { diff --git a/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuViewModel.kt b/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuViewModel.kt index 9a70497a24..4c72183a42 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuViewModel.kt @@ -17,7 +17,7 @@ import org.json.JSONObject import retrofit2.HttpException class PatchKaifuViewModel(application: Application) : AndroidViewModel(application) { - var apiService = RetrofitManager.getInstance(getApplication()).api + var apiService = RetrofitManager.getInstance().api var serverEntity: ServerCalendarEntity? = null diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt index 51c91add12..bd302304f9 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt @@ -46,7 +46,7 @@ class SimulatorGameListAdapter(context: Context, private var mSelectList = ArrayList() private val mEntrance = "模拟器游戏" private lateinit var mPopWindow: PopupWindow - private val mSimulatorGameDao = AppDatabase.getInstance(HaloApp.getInstance()).simulatorGameDao() + private val mSimulatorGameDao = AppDatabase.getInstance().simulatorGameDao() var mLaunchGameFlag = false override fun setListData(updateData: MutableList?) { 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 deb235a332..96928464b3 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListFragment.kt @@ -95,7 +95,7 @@ class SimulatorGameListFragment : ListFragment?) { diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListViewModel.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListViewModel.kt index 5314cf29d1..b9c30e9376 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListViewModel.kt @@ -21,11 +21,11 @@ import java.io.File class SimulatorGameListViewModel(application: Application, var type: String) : ListViewModel(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api var positionAndPackageMap = HashMap() // key: packageName + position, value: position - private val mSimulatorGameDao = AppDatabase.getInstance(HaloApp.getInstance()).simulatorGameDao() + private val mSimulatorGameDao = AppDatabase.getInstance().simulatorGameDao() override fun mergeResultLiveData() { mResultLiveData.addSource>(mListLiveData) { @@ -80,7 +80,7 @@ class SimulatorGameListViewModel(application: Application, var type: String) : L packages += game.simulator?.apk?.packageName positionAndPackageMap[packages + position] = position game.gameLocation = GameEntity.GameLocation.INDEX - game.setEntryMap(DownloadManager.getInstance(getApplication()).getEntryMap(game.name)) + game.setEntryMap(DownloadManager.getInstance().getEntryMap(game.name)) } diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameViewModel.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameViewModel.kt index 32eac1fa22..cfb878d40f 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameViewModel.kt @@ -19,9 +19,9 @@ class SimulatorGameViewModel(application: Application) : AndroidViewModel(applic private var mSimulatorsList: List? = null private var mTypeList: List? = null private var mResultSimulatorsList = ArrayList() - private val api = RetrofitManager.getInstance(getApplication()).api + private val api = RetrofitManager.getInstance().api var simulators = MutableLiveData>() - private val mSimulatorGameDao = AppDatabase.getInstance(HaloApp.getInstance()).simulatorGameDao() + private val mSimulatorGameDao = AppDatabase.getInstance().simulatorGameDao() var simulatorGameLoadSuccess = MutableLiveData() var isSimulatorGameFirstLoad = true @@ -45,7 +45,7 @@ class SimulatorGameViewModel(application: Application) : AndroidViewModel(applic .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) .subscribe({ - val localSimulatorList: List = AppDatabase.getInstance(HaloApp.getInstance()).simulatorGameDao().getSimulatorList() + val localSimulatorList: List = AppDatabase.getInstance().simulatorGameDao().getSimulatorList() if (it.isNotEmpty()) { when (it[0]) { diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementViewModel.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementViewModel.kt index a17f2ece34..4314d9361d 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementViewModel.kt @@ -15,7 +15,7 @@ import io.reactivex.Single class SimulatorManagementViewModel(application: Application) : ListViewModel(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api override fun mergeResultLiveData() { mResultLiveData.addSource>(mListLiveData) { 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 2062123451..313e3d85c0 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt @@ -155,12 +155,12 @@ class SubjectListFragment : LazyListFragment() override fun onFragmentResume() { super.onFragmentResume() - DownloadManager.getInstance(context).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) } override fun onFragmentPause() { super.onFragmentPause() - DownloadManager.getInstance(context).removeObserver(dataWatcher) + DownloadManager.getInstance().removeObserver(dataWatcher) } // 下载被删除事件 diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt index b015fd57d2..00001025a5 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt @@ -32,7 +32,7 @@ class SubjectListViewModel(application: Application, override fun provideDataObservable(page: Int): Observable>? = null override fun provideDataSingle(page: Int): Single> { - return RetrofitManager.getInstance(getApplication()).api.getColumn( + return RetrofitManager.getInstance().api.getColumn( subjectData.subjectId, subjectData.sort, if (subjectData.filter.isEmpty()) "type:全部" else subjectData.filter, @@ -53,7 +53,7 @@ class SubjectListViewModel(application: Application, private fun updateSubjectSettingBeforeInitialLoad() { // 无论是否加载成功都回落到普通的专题列表加载 - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getColumnSettings(subjectData.subjectId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt index dd6f6247f6..c96d685e59 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt @@ -40,7 +40,7 @@ class SubjectViewModel(application: Application, var subjectData: SubjectData?) } private fun loadSubjectName() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getSubjectName(subjectData?.subjectId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -65,7 +65,7 @@ class SubjectViewModel(application: Application, var subjectData: SubjectData?) } private fun loadSubjectType() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getColumnSettings(subjectData?.subjectId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt b/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt index 46efe40d21..6b6d83efb4 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt @@ -124,12 +124,12 @@ class TagsListFragment : ListFragment() { override fun onResume() { if (isEverPause && mAdapter != null) mAdapter?.notifyDataSetChanged() super.onResume() - DownloadManager.getInstance(context).addObserver(mDataWatcher) + DownloadManager.getInstance().addObserver(mDataWatcher) } override fun onPause() { super.onPause() - DownloadManager.getInstance(context).removeObserver(mDataWatcher) + DownloadManager.getInstance().removeObserver(mDataWatcher) } override fun getItemDecoration() = null diff --git a/app/src/main/java/com/gh/gamecenter/tag/TagsListViewModel.kt b/app/src/main/java/com/gh/gamecenter/tag/TagsListViewModel.kt index a16cf117c3..96b7b917b5 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsListViewModel.kt @@ -36,7 +36,7 @@ class TagsListViewModel(application: Application) : ListViewModel> { - return RetrofitManager.getInstance(getApplication()) + return RetrofitManager.getInstance() .api .getGamesWithSpecificTag(getSortSize(), getSortType(), page) } @@ -71,7 +71,7 @@ class TagsListViewModel(application: Application) : ListViewModel() { @@ -36,7 +36,7 @@ class TeenagerModeViewModel(application: Application) : AndroidViewModel(applica Pair("android_id", HaloApp.getInstance().gid), Pair("password", pwd) ).createRequestBody() - RetrofitManager.getInstance(getApplication()).api.postTeenModeUnlock(body) + RetrofitManager.getInstance().api.postTeenModeUnlock(body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : BiResponse() { @@ -57,7 +57,7 @@ class TeenagerModeViewModel(application: Application) : AndroidViewModel(applica Pair("android_id", HaloApp.getInstance().gid), Pair("password", pwd) ).createRequestBody() - RetrofitManager.getInstance(getApplication()).api.postTeenModeLogout(body) + RetrofitManager.getInstance().api.postTeenModeLogout(body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : BiResponse() { @@ -80,7 +80,7 @@ class TeenagerModeViewModel(application: Application) : AndroidViewModel(applica Pair("password", newPwd), Pair("password_again", newPwd) ).createRequestBody() - RetrofitManager.getInstance(getApplication()).api.putTeenModePassword(body) + RetrofitManager.getInstance().api.putTeenModePassword(body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : BiResponse() { diff --git a/app/src/main/java/com/gh/gamecenter/user/UserRepository.java b/app/src/main/java/com/gh/gamecenter/user/UserRepository.java index c126b50e49..1f79cb8b55 100644 --- a/app/src/main/java/com/gh/gamecenter/user/UserRepository.java +++ b/app/src/main/java/com/gh/gamecenter/user/UserRepository.java @@ -68,7 +68,6 @@ import retrofit2.HttpException; */ public class UserRepository { - private static volatile UserRepository mInstance; private final SharedPreferences mPreferences; private Context mContext; @@ -85,21 +84,14 @@ public class UserRepository { private UserInfoEntity mCacheUserInfoEntity; private LoginTokenEntity mCacheLoginTokenEntity; - public static UserRepository getInstance(Context context) { - if (mInstance == null) { - synchronized (UserRepository.class) { - if (mInstance == null) { - mInstance = new UserRepository(context); - } - } - } - return mInstance; + public static UserRepository getInstance() { + return SingletonHolder.INSTANCE; } - private UserRepository(Context context) { - mContext = context; - mApiService = RetrofitManager.getInstance(context).getApi(); - mPreferences = PreferenceManager.getDefaultSharedPreferences(context); + private UserRepository() { + mContext = HaloApp.getInstance().getApplicationContext(); + mApiService = RetrofitManager.getInstance().getApi(); + mPreferences = PreferenceManager.getDefaultSharedPreferences(mContext); checkLogin(); } @@ -469,7 +461,7 @@ public class UserRepository { userInfoEntity.setIdCard(idCardEntity); RequestBody body = RequestBody.create( MediaType.parse("application/json"), GsonUtils.toJson(userInfoEntity)); - RetrofitManager.getInstance(HaloApp.getInstance()).getApi().postCertification(body) + RetrofitManager.getInstance().getApi().postCertification(body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new BiResponse() { @@ -496,7 +488,7 @@ public class UserRepository { } // 重启因为实名认证而处于等待中的任务 - DownloadManager.getInstance(HaloApp.getInstance()).resumeAllInvisiblePendingTask(); + DownloadManager.getInstance().resumeAllInvisiblePendingTask(); } @Override @@ -628,4 +620,8 @@ public class UserRepository { public MediatorLiveData getUploadAvatarBorderLiveData() { return mUploadAvatarBorderLiveData; } + + private static class SingletonHolder { + private static final UserRepository INSTANCE = new UserRepository(); + } } diff --git a/app/src/main/java/com/gh/gamecenter/user/UserViewModel.java b/app/src/main/java/com/gh/gamecenter/user/UserViewModel.java index 33e43ee2b3..0acc792451 100644 --- a/app/src/main/java/com/gh/gamecenter/user/UserViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/user/UserViewModel.java @@ -98,7 +98,7 @@ public class UserViewModel extends AndroidViewModel { public Factory(@NonNull Application application) { mApplication = application; - mRepository = UserRepository.getInstance(application); + mRepository = UserRepository.getInstance(); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataViewModel.kt b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataViewModel.kt index 71b6059ee7..3d2b94c11d 100644 --- a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataViewModel.kt @@ -17,7 +17,7 @@ import java.util.LinkedHashMap class VideoDataViewModel(application: Application) : AndroidViewModel(application) { - private val api = RetrofitManager.getInstance(getApplication()).api + private val api = RetrofitManager.getInstance().api private var videoDataList = ArrayList() 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 0408ef8ee3..d94caff686 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 @@ -498,7 +498,7 @@ class VideoDetailContainerFragment : BaseLazyFragment(), OnBackPressedListener { override fun onFragmentResume() { findVisibleVideoViewByPosition()?.uploadVideoStreamingPlaying("恢复页面") - DownloadManager.getInstance(requireContext()).addObserver(dataWatcher) + DownloadManager.getInstance().addObserver(dataWatcher) if (mViewModel.isPauseVideo) { val videoView = findVisibleVideoViewByPosition() videoView?.run { @@ -523,7 +523,7 @@ class VideoDetailContainerFragment : BaseLazyFragment(), OnBackPressedListener { } override fun onFragmentPause() { - DownloadManager.getInstance(requireContext()).removeObserver(dataWatcher) + DownloadManager.getInstance().removeObserver(dataWatcher) val videoView = findVisibleVideoViewByPosition() videoView?.run { videoView.uploadVideoStreamingPlaying("暂停页面") diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerViewModel.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerViewModel.kt index 1aa1be671a..40f389fcae 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerViewModel.kt @@ -133,13 +133,13 @@ class VideoDetailContainerViewModel(application: Application) : AndroidViewModel private fun getNormalVideoStream(videoId: String, location: String, isLoadNext: Boolean) { val videoListSingle = if (location == Location.GAME_ZONE.value) { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getVideoDetailList(videoId, getFilter(location, isLoadNext), fieldId, sectionName) } else if (location == Location.VIDEO_ACTIVITY.value) { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getActivitiesVideoStream(videoId, type, act, getFilter(location, isLoadNext)) } else { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getVideoDetailList(videoId, getFilter(location, isLoadNext)) } @@ -173,7 +173,7 @@ class VideoDetailContainerViewModel(application: Application) : AndroidViewModel //获取最新排序的视频流 private fun getNewestVideoStream(isLoadNext: Boolean) { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getVideoStream(page) .subscribeOn(Schedulers.io()) .subscribe(object : BiResponse>() { @@ -219,10 +219,10 @@ class VideoDetailContainerViewModel(application: Application) : AndroidViewModel val body = requestMap.createRequestBodyAny() if (page == 1) { deleteAttentionCacheVideo() - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getAttentionVideoStreamRefresh(UserManager.getInstance().userId, body, page) } else { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getAttentionVideoStream(UserManager.getInstance().userId, body, page) } } @@ -275,10 +275,10 @@ class VideoDetailContainerViewModel(application: Application) : AndroidViewModel cacheId = "${MetaUtil.getIMEI()}${System.currentTimeMillis()}${Random.nextInt(9999)}" } if (type == Location.GAME_DETAIL.value) { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getGameDetailVideoStream(type, body, videoId, gameId, page) } else { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getVideoStream(type, body, videoId, cacheId, page) } }.subscribeOn(Schedulers.io()) @@ -326,7 +326,7 @@ class VideoDetailContainerViewModel(application: Application) : AndroidViewModel //获取活动的视频流 private fun getActivityVideoStream(videoId: String, isLoadNext: Boolean) { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.getActivitiesVideoStream(videoId, page, type, act) .subscribeOn(Schedulers.io()) .subscribe(object : BiResponse>() { @@ -427,7 +427,7 @@ class VideoDetailContainerViewModel(application: Application) : AndroidViewModel } fun voteVideo(videoDetail: VideoEntity?) { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.voteVideo(videoDetail!!.id) .subscribeOn(Schedulers.io()) .subscribe(object : BiResponse() { @@ -448,7 +448,7 @@ class VideoDetailContainerViewModel(application: Application) : AndroidViewModel } fun undoVoteVideo(videoDetail: VideoEntity?) { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.undoVoteVideo(videoDetail!!.id) .subscribeOn(Schedulers.io()) .subscribe(object : BiResponse() { @@ -469,7 +469,7 @@ class VideoDetailContainerViewModel(application: Application) : AndroidViewModel private fun collectVideo(videoDetail: VideoEntity?) { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.collectVideo(UserManager.getInstance().userId, videoDetail!!.id) .subscribeOn(Schedulers.io()) .subscribe(object : BiResponse() { @@ -487,7 +487,7 @@ class VideoDetailContainerViewModel(application: Application) : AndroidViewModel } private fun undoCollectVideo(videoDetail: VideoEntity?) { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.undoCollectVideo(UserManager.getInstance().userId, videoDetail!!.id) .subscribeOn(Schedulers.io()) .subscribe(object : BiResponse() { @@ -535,7 +535,7 @@ class VideoDetailContainerViewModel(application: Application) : AndroidViewModel fun shareVideoStatistics(videoEntity: VideoEntity?) { if (videoEntity == null) return - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.shareVideoStatistics(videoEntity.id) .subscribeOn(Schedulers.io()) .subscribe(object : BiResponse() { @@ -553,7 +553,7 @@ class VideoDetailContainerViewModel(application: Application) : AndroidViewModel } fun follow(videoEntity: VideoEntity?) { - RetrofitManager.getInstance(getApplication()) + RetrofitManager.getInstance() .api.postFollowing(videoEntity!!.user.id) .subscribeOn(Schedulers.io()) .subscribe(object : Response() { @@ -578,7 +578,7 @@ class VideoDetailContainerViewModel(application: Application) : AndroidViewModel packages += game.simulator?.apk?.packageName positionAndPackageMap[packages + position] = position game.gameLocation = GameEntity.GameLocation.INDEX - game.setEntryMap(DownloadManager.getInstance(getApplication()).getEntryMap(game.name)) + game.setEntryMap(DownloadManager.getInstance().getEntryMap(game.name)) } fun reset() { diff --git a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoFragment.kt b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoFragment.kt index c9fa06d6ee..2f5cbcbefa 100644 --- a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoFragment.kt @@ -56,7 +56,7 @@ class GameVideoFragment : ListFragment> { - val api = RetrofitManager.getInstance(requireContext()).api + val api = RetrofitManager.getInstance().api val gameId = arguments?.getString(EntranceUtils.KEY_GAMEID) val sort = arguments?.getString(EntranceUtils.KEY_SORT) return api.getGameVideo(gameId, sort, page, Config.VIDEO_PAGE_SIZE) diff --git a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoViewModel.kt b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoViewModel.kt index f390801fce..96e13e4975 100644 --- a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoViewModel.kt @@ -24,7 +24,7 @@ class GameVideoViewModel(application: Application, val gameId: String) : Android @SuppressLint("CheckResult") private fun getGameVideoInfo() { RetrofitManager - .getInstance(getApplication()) + .getInstance() .api.getGameVideoInfo(gameId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelViewModel.kt b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelViewModel.kt index dcd92d1913..a5f5eec59b 100644 --- a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelViewModel.kt @@ -22,7 +22,7 @@ class VideoLabelViewModel(application: Application, val location: String) : Andr } private fun getActivityTags() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance().api .getActivityTags(location) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/video/upload/UploadManager.kt b/app/src/main/java/com/gh/gamecenter/video/upload/UploadManager.kt index 544eeafb3c..34ae22ce45 100644 --- a/app/src/main/java/com/gh/gamecenter/video/upload/UploadManager.kt +++ b/app/src/main/java/com/gh/gamecenter/video/upload/UploadManager.kt @@ -21,7 +21,7 @@ object UploadManager : OnUploadListener { private val mUploadThreadMap = Collections.synchronizedMap(HashMap()) private val mUploadListenerMap = Collections.synchronizedMap(HashMap()) - private val mUploadDao = AppDatabase.getInstance(HaloApp.getInstance().application).uploadDao() + private val mUploadDao = AppDatabase.getInstance().uploadDao() init { if (BuildConfig.DEBUG) OSSLog.enableLog() @@ -62,7 +62,7 @@ object UploadManager : OnUploadListener { if (mUploadThreadMap[uploadFilePath]?.isAlive == true) return - RetrofitManager.getInstance(HaloApp.getInstance().application) + RetrofitManager.getInstance() .api .ossUpdateConfig .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoViewModel.kt b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoViewModel.kt index 287b95788a..0a67b1814b 100644 --- a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoViewModel.kt @@ -29,7 +29,7 @@ import java.io.File class UploadVideoViewModel(application: Application) : AndroidViewModel(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api val tagsLiveData = MutableLiveData>() val categoryLiveData = MutableLiveData>() diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftViewModel.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftViewModel.kt index daa758d73b..5a9807a048 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftViewModel.kt @@ -16,7 +16,7 @@ import retrofit2.HttpException class VideoDraftViewModel(application: Application) : ListViewModel(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api override fun provideDataObservable(page: Int): Observable>? { return mApi.getVideoDraft(UserManager.getInstance().userId, page, Config.VIDEO_PAGE_SIZE) diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyViewModel.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyViewModel.kt index 536b79227d..799cdee1ac 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyViewModel.kt @@ -17,7 +17,7 @@ import retrofit2.HttpException class VideoVerifyViewModel(application: Application) : ListViewModel(application) { - private val mApi = RetrofitManager.getInstance(getApplication()).api + private val mApi = RetrofitManager.getInstance().api override fun provideDataObservable(page: Int): Observable>? { return mApi.getVideoVerify(UserManager.getInstance().userId, page, Config.VIDEO_PAGE_SIZE) } diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index 05174fd2ff..a466541cae 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -230,7 +230,7 @@ public class HaloApp extends MultiDexApplication { PackageRepository.initData(); // 刷新内存中的用户信息，避免应用进程重建时因没有用户信息数据而显示为掉登录状态 - UserRepository.getInstance(this).getLoginUserInfo(); + UserRepository.getInstance().getLoginUserInfo(); checkIfDeviceIsEmulator(); diff --git a/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java b/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java index 4043f97016..8bdf29d296 100644 --- a/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java @@ -217,7 +217,7 @@ public class ApkCleanerFragment extends NormalFragment implements CleanApkAdapte mDeleteBottom.setVisibility(View.GONE); } - DownloadManager.getInstance(requireContext()).clearTasksThatFileBeenDeleted(); + DownloadManager.getInstance().clearTasksThatFileBeenDeleted(); } private void updateScanData() { diff --git a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java index 4597812eec..f2ff41c25e 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java @@ -376,7 +376,7 @@ public class SettingsFragment extends NormalFragment { "确定退出", "取消", () -> { loadingDialog = DialogUtils.showWaitDialog(getContext(), "退出登录中..."); LoginUtils.logout(getContext(), () -> { - UserRepository.getInstance(HaloApp.getInstance().getApplication()).logout(); + UserRepository.getInstance().logout(); if (loadingDialog != null) loadingDialog.dismiss(); if (getActivity() != null) getActivity().finish(); }); diff --git a/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java b/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java index cb4490693e..e6e6e897b8 100644 --- a/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java @@ -74,7 +74,7 @@ public class VoteFragment extends ListFragment> provideDataObservable(int page) { - return RetrofitManager.getInstance(getContext()).getApi().getVersionVote(mGameId, page); + return RetrofitManager.getInstance().getApi().getVersionVote(mGameId, page); } protected int getLayoutId() { @@ -196,9 +196,9 @@ public class VoteFragment extends ListFragment responseBodyObservable; if (isNewVote) { - responseBodyObservable = RetrofitManager.getInstance(getContext()).getApi().addVersionVote(body, mGameId); + responseBodyObservable = RetrofitManager.getInstance().getApi().addVersionVote(body, mGameId); } else { - responseBodyObservable = RetrofitManager.getInstance(getContext()).getApi().postVersionVote(name); // name is id + responseBodyObservable = RetrofitManager.getInstance().getApi().postVersionVote(name); // name is id } responseBodyObservable .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt b/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt index ac2c1b8dd4..15070787f6 100644 --- a/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt @@ -536,7 +536,7 @@ class WebFragment : LazyFragment(), IScrollable { } private fun getNewsCommentNum() { - RetrofitManager.getInstance(context) + RetrofitManager.getInstance() .api .getNewsCommentnum(newsId, Utils.getTime(context)) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchFragment.java b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchFragment.java index 2b61a1d4b3..1049064a6f 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchFragment.java @@ -179,7 +179,7 @@ public class GameNewsSearchFragment extends NormalFragment { } private void getGameArticleType() { - RetrofitManager.getInstance(getContext()).getApi() + RetrofitManager.getInstance().getApi() .getGameArticleType(mGameId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java index fab304932a..ac609d1844 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java @@ -170,7 +170,7 @@ public class GameNewsSearchResultFragment extends NormalFragment { // DataUtils.onEvent(getContext(), "游戏新闻搜索", mSearchKey); // DataCollectionUtils.uploadSearch(getContext(), mSearchKey, "游戏新闻搜索"); - RetrofitManager.getInstance(getContext()).getApi() + RetrofitManager.getInstance().getApi() .getSearchNews(EnvHelper.getHost() + "articles:search?keyword=" + mSearchKey + "&view=digest&filter=" + UrlFilterUtils.getFilterQuery("game_id", mGameId) + "&page=" + mPage) .map(list -> { diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java index 91fc4c071a..4c62823f15 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java @@ -63,7 +63,7 @@ class MyConcernAdapter extends BaseRecyclerAdapter { return; } - RetrofitManager.getInstance(mContext).getApi() + RetrofitManager.getInstance().getApi() .getConcern(UserManager.getInstance().getUserId()) .map(RegionSettingHelper.filterGame) .map(ApkActiveUtils.filterMapperList) diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java index 481d847a70..afcd6a139c 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java @@ -77,7 +77,7 @@ public class MyConcernRecommendAdapter extends BaseRecyclerAdapter() { diff --git a/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoFragment.kt b/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoFragment.kt index 6a835081c7..4fefcea51e 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoFragment.kt @@ -63,7 +63,7 @@ class RealNameInfoFragment : NormalFragment() { override fun onParentActivityFinish() { super.onParentActivityFinish() if (mHasBackdoor) { - DownloadManager.getInstance(requireContext()).resumeAllInvisiblePendingTask() + DownloadManager.getInstance().resumeAllInvisiblePendingTask() } } diff --git a/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoViewModel.kt b/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoViewModel.kt index fad49ae878..75cf78cd65 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoViewModel.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoViewModel.kt @@ -54,7 +54,7 @@ class RealNameInfoViewModel(application: Application) : AndroidViewModel(applica val body = RequestBody.create( MediaType.parse("application/json"), toJson(userInfoEntity) ) - RetrofitManager.getInstance(HaloApp.getInstance()).api.postCertification(body) + RetrofitManager.getInstance().api.postCertification(body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : BiResponse() { @@ -68,12 +68,12 @@ class RealNameInfoViewModel(application: Application) : AndroidViewModel(applica override fun onSuccess(data: ResponseBody?) { val cachedUserInfo = - UserRepository.getInstance(getApplication()).cacheUserInfoEntity + UserRepository.getInstance().cacheUserInfoEntity // 登录状态下更新实名认证信息 if (cachedUserInfo != null) { cachedUserInfo.idCard = content.toObject() - UserRepository.getInstance(getApplication()) + UserRepository.getInstance() .cacheAndNotifyUserInfo(cachedUserInfo, true) } @@ -94,7 +94,7 @@ class RealNameInfoViewModel(application: Application) : AndroidViewModel(applica // 安装因为实名延迟的游戏 resumeInstallationIfNeeded() // 重启因为实名认证而处于等待中的任务 - DownloadManager.getInstance(HaloApp.getInstance()) + DownloadManager.getInstance() .resumeAllInvisiblePendingTask() } }) @@ -107,7 +107,7 @@ class RealNameInfoViewModel(application: Application) : AndroidViewModel(applica val pendingInstallation = RealNameHelper.pendingInstallPkgPath if (pendingInstallation.isNotEmpty()) { val pendingDownloadEntity = - DownloadManager.getInstance(HaloApp.getInstance()).allDownloadEntity.firstOrNull { + DownloadManager.getInstance().allDownloadEntity.firstOrNull { it.path == pendingInstallation } diff --git a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.java index 284c251c7c..f253876664 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.java @@ -448,7 +448,7 @@ public class UserInfoEditFragment extends NormalFragment { */ @SuppressLint("CheckResult") private void getAuthText() { - RetrofitManager.getInstance(HaloApp.getInstance().getApplication()).getApi() + RetrofitManager.getInstance().getApi() .getAuthText() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread())