From e9ac9aab7f0cc19de43c9a3bd76f88e8755483b9 Mon Sep 17 00:00:00 2001 From: jack Date: Sat, 9 Apr 2022 19:48:45 +0800 Subject: [PATCH 01/52] =?UTF-8?q?=E6=A8=A1=E5=9D=97/=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=8C=96=E5=89=8D=E6=9C=9F=E6=94=B9=E9=80=A0=20https://git.sha?= =?UTF-8?q?nqu.cc/halo/android/assistant-android/-/issues/64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 73 +---- app/proguard-rules.txt | 12 +- .../main/java/com/gh/base/BaseActivity.java | 32 +- .../com/gh/base/BaseActivity_TabLayout.java | 14 +- .../com/gh/base/BaseRichEditorActivity.kt | 6 +- .../com/gh/base/BaseRichEditorViewModel.kt | 6 +- .../base/GlobalActivityLifecycleObserver.kt | 1 + .../java/com/gh/base/ToolBarActivity.java | 10 +- .../main/java/com/gh/common/DefaultJsApi.kt | 13 +- .../java/com/gh/common/DefaultUrlHandler.kt | 125 ++++---- .../java/com/gh/common/FixedRateJobHelper.kt | 4 +- .../java/com/gh/common/constant/Config.java | 13 +- .../common/databind/AddKaiFuBindingAdapter.kt | 8 +- .../gh/common/databind/BindingAdapters.java | 14 +- .../dialog/ApplyModeratorDialogFragment.kt | 14 +- .../dialog/BaseDraggableDialogFragment.kt | 2 +- .../dialog/BaseTrackableDialogFragment.kt | 2 +- .../gh/common/dialog/CertificationDialog.kt | 18 +- .../gh/common/dialog/DeviceRemindDialog.kt | 8 +- .../dialog/GameOffServiceDialogFragment.kt | 6 +- .../dialog/InstallPermissionDialogFragment.kt | 10 +- .../dialog/NotificationHintDialogFragment.kt | 8 +- .../dialog/PackageCheckDialogFragment.kt | 13 +- .../gh/common/dialog/PrivacyDialogFragment.kt | 6 +- .../common/{view => dialog}/ReserveDialog.kt | 11 +- .../gh/common/dialog/ReserveDialogFragment.kt | 2 +- .../common/{view => dialog}/WelcomeDialog.kt | 46 +-- .../gh/common/exposure/ExposureConverters.kt | 4 +- .../com/gh/common/exposure/ExposureEvent.kt | 8 +- .../com/gh/common/exposure/ExposureManager.kt | 20 +- .../com/gh/common/exposure/ExposureUtils.kt | 5 +- .../gh/common/filter/RegionSettingHelper.kt | 10 +- .../com/gh/common/history/HistoryHelper.kt | 12 +- .../main/java/com/gh/common/im/ImHintView.kt | 2 +- .../java/com/gh/common/loghub/LoghubHelper.kt | 2 +- .../java/com/gh/common/loghub/LoghubUtils.kt | 4 +- .../java/com/gh/common/notifier/Notifier.kt | 2 +- .../com/gh/common/notifier/NotifierView.kt | 8 +- .../common/provider/ActivationProviderImpl.kt | 18 ++ .../com/gh/common/provider/AppProviderImpl.kt | 34 ++ .../com/gh/common/provider/BuildConfigImpl.kt | 32 ++ .../common/provider/CheckLoginProviderImpl.kt | 18 ++ .../gh/common/provider/ConfigProviderImpl.kt | 50 +++ .../provider/DefaultUrlHandlerProviderImpl.kt | 19 ++ .../provider/DialogUtilsProviderImpl.kt | 23 ++ .../gh/common/provider/DirectProviderImpl.kt | 23 ++ .../provider/PackageUtilsProviderImpl.kt | 22 ++ .../provider/UserManagerProviderImpl.kt | 22 ++ .../com/gh/common/provider/WebProviderImpl.kt | 19 ++ .../common/repository/RemenkapaiRepository.kt | 2 +- .../simulator/SimulatorDownloadManager.kt | 8 +- .../common/simulator/SimulatorGameManager.kt | 5 +- .../common/syncpage/example/ExampleAdapter.kt | 98 ------ .../syncpage/example/ExampleFragment.kt | 65 ---- .../java/com/gh/common/tracker/Tracker.kt | 2 +- .../com/gh/common/tracker/TrackerLogger.kt | 8 +- .../com/gh/common/util/ActivationHelper.kt | 1 + .../main/java/com/gh/common/util/AdHelper.kt | 1 + .../com/gh/common/util/BbsReportHelper.kt | 10 +- .../com/gh/common/util/BbsStayTimeHelper.kt | 7 +- .../com/gh/common/util/CheckLoginUtils.java | 15 +- .../java/com/gh/common/util/CommentHelper.kt | 9 +- .../java/com/gh/common/util/CommentUtils.java | 6 + .../gh/common/util/ConcernContentUtils.java | 3 +- .../gh/common/util/DataCollectionUtils.java | 6 +- .../java/com/gh/common/util/DataLogUtils.java | 3 +- .../java/com/gh/common/util/DataUtils.java | 11 +- .../gh/common/util/DetailDownloadUtils.java | 3 +- .../com/gh/common/util/DeviceTokenUtils.kt | 2 +- .../java/com/gh/common/util/DialogUtils.java | 33 +- .../java/com/gh/common/util/DirectUtils.kt | 19 +- .../gh/common/util/DownloadDialogHelper.kt | 2 + .../java/com/gh/common/util/DownloadHelper.kt | 5 +- .../com/gh/common/util/DownloadItemUtils.kt | 141 +++++--- .../common/util/DownloadNotificationHelper.kt | 14 +- .../com/gh/common/util/DownloadObserver.kt | 23 +- .../com/gh/common/util/EnergyTaskHelper.kt | 8 +- .../com/gh/common/util/EntranceUtils.java | 271 ++-------------- .../main/java/com/gh/common/util/EnvHelper.kt | 40 --- .../java/com/gh/common/util/ErrorHelper.kt | 4 +- .../gh/common/util/FloatingBackViewManager.kt | 2 + .../common/util/GameActivityDownloadHelper.kt | 67 ++-- .../GameCollectionSquareBrowseTaskHelper.kt | 8 +- .../util/GameSubstituteRepositoryHelper.kt | 5 + .../java/com/gh/common/util/GameUtils.java | 2 +- .../com/gh/common/util/GameViewUtils.java | 5 +- .../common/util/GhMatisseVideoApplyFilter.kt | 2 + .../com/gh/common/util/HomeBottomBarHelper.kt | 3 + .../com/gh/common/util/HomePluggableHelper.kt | 2 + .../com/gh/common/util/IntegralLogHelper.kt | 2 + .../java/com/gh/common/util/LibaoUtils.java | 6 +- .../java/com/gh/common/util/LogUtils.java | 13 +- .../java/com/gh/common/util/LoginHelper.kt | 5 +- .../java/com/gh/common/util/LoginUtils.java | 1 + .../com/gh/common/util/MessageShareUtils.java | 16 +- .../java/com/gh/common/util/NewLogUtils.kt | 5 +- .../com/gh/common/util/NotificationHelper.kt | 4 +- .../com/gh/common/util/OptionDialogHelper.kt | 6 +- .../gh/common/util/PackageFlavorHelper.java | 12 - .../com/gh/common/util/PackageInstaller.kt | 10 +- .../com/gh/common/util/PermissionHelper.kt | 257 --------------- .../com/gh/common/util/PlatformUtils.java | 2 +- .../com/gh/common/util/QuickLoginHelper.kt | 19 +- .../java/com/gh/common/util/RealNameHelper.kt | 11 +- .../gh/common/util/RecommendPopupHelper.kt | 5 +- .../com/gh/common/util/ReservationHelper.kt | 33 +- .../java/com/gh/common/util/ShareUtils.java | 6 + .../com/gh/common/util/SimpleRequestHelper.kt | 2 +- .../common/util/SyncDataBetweenPageHelper.kt | 2 +- .../com/gh/common/util/UploadImageUtils.kt | 1 + .../com/gh/common/util/UsageStatsHelper.kt | 1 + .../com/gh/common/util/WechatBindHelper.kt | 7 +- .../gh/common/videolog/VideoRecordUtils.kt | 6 +- .../java/com/gh/common/view/AdBannerView.kt | 6 +- .../main/java/com/gh/common/view/AsyncUi.kt | 4 +- .../com/gh/common/view/CatalogFilterView.kt | 4 +- .../com/gh/common/view/CategoryFilterView.kt | 5 +- .../gh/common/view/Concern_LinearLayout.java | 5 +- .../com/gh/common/view/ConfigFilterView.kt | 2 +- .../gh/common/view/DownloadProgressBar.java | 2 +- .../java/com/gh/common/view/FilterView.kt | 4 +- .../com/gh/common/view/FlexLinearLayout.kt | 6 +- .../java/com/gh/common/view/GameIconView.kt | 7 +- .../gh/common/view/GameTagFlexLinearLayout.kt | 6 +- .../com/gh/common/view/ImageContainerView.kt | 6 + .../java/com/gh/common/view/RichEditor.java | 26 +- .../java/com/gh/common/xapk/XapkInstaller.kt | 7 +- .../com/gh/common/xapk/XapkUnzipThread.kt | 8 +- .../com/gh/download/DownloadDataHelper.kt | 10 +- .../java/com/gh/download/DownloadManager.java | 21 +- .../com/gh/download/DownloadWorkManager.kt | 2 +- .../java/com/gh/download/PackageObserver.kt | 6 +- .../com/gh/download/cache/ExoCacheManager.kt | 8 +- .../com/gh/download/dialog/DownloadDialog.kt | 18 +- .../download/dialog/DownloadDialogAdapter.kt | 5 +- .../DownloadDialogInstalledItemViewHolder.kt | 6 +- ...DownloadDialogInstructionItemViewHolder.kt | 5 +- .../dialog/DownloadDialogItemViewHolder.kt | 39 ++- .../DownloadDialogLinkItemViewHolder.kt | 2 +- ...loadDialogPlatformRequestItemViewHolder.kt | 3 +- .../DownloadDialogSectionItemViewHolder.kt | 3 +- .../gh/download/dialog/DownloadLinkDialog.kt | 4 +- .../download/server/BrowserInstallHelper.kt | 7 +- .../com/gh/download/server/DownloadServer.kt | 6 +- .../gh/flutter/FlutterAdServiceImplAop.java | 2 +- .../FlutterBoostRouteServiceImplAop.java | 6 +- .../flutter/FlutterContextServiceImplAop.java | 6 +- .../flutter/FlutterImageServiceImplAop.java | 2 +- .../gh/flutter/FlutterLogHubServiceImplAop.kt | 2 +- .../java/com/gh/gamecenter/AboutActivity.java | 7 +- .../java/com/gh/gamecenter/BlockActivity.kt | 8 +- .../com/gh/gamecenter/CleanApkActivity.java | 4 +- .../com/gh/gamecenter/CollectionActivity.java | 4 +- .../gh/gamecenter/CommentDetailActivity.java | 20 +- .../com/gh/gamecenter/ConcernActivity.java | 4 +- .../com/gh/gamecenter/CropImageActivity.java | 26 +- .../gamecenter/DownloadManagerActivity.java | 14 +- .../gh/gamecenter/FullScreenWebActivity.kt | 6 +- .../com/gh/gamecenter/GameDetailActivity.kt | 46 +-- .../com/gh/gamecenter/GameNewsActivity.java | 8 +- .../com/gh/gamecenter/ImageViewerActivity.kt | 18 +- .../java/com/gh/gamecenter/LibaoActivity.java | 4 +- .../gh/gamecenter/LibaoDetailActivity.java | 22 +- .../java/com/gh/gamecenter/LoginActivity.java | 8 +- .../java/com/gh/gamecenter/MainActivity.java | 88 +++-- .../com/gh/gamecenter/MessageActivity.java | 4 +- .../gh/gamecenter/MessageDetailActivity.java | 12 +- .../gh/gamecenter/MessageInviteActivity.java | 8 +- .../gh/gamecenter/MessageKeFuActivity.java | 4 +- .../gh/gamecenter/MessageVoteActivity.java | 8 +- .../gh/gamecenter/NetworkDiagnosisActivity.kt | 3 + .../com/gh/gamecenter/NewsDetailActivity.java | 32 +- .../com/gh/gamecenter/NewsSearchActivity.java | 10 +- .../com/gh/gamecenter/NormalActivity.java | 2 +- .../main/java/com/gh/gamecenter/QaActivity.kt | 8 +- .../java/com/gh/gamecenter/SearchActivity.kt | 11 +- .../java/com/gh/gamecenter/SettingActivity.kt | 6 +- .../com/gh/gamecenter/ShareCardActivity.java | 22 +- .../gh/gamecenter/ShareCardPicActivity.java | 24 +- .../com/gh/gamecenter/ShareGhActivity.java | 4 +- .../java/com/gh/gamecenter/ShellActivity.kt | 8 +- .../com/gh/gamecenter/SingletonWebActivity.kt | 10 +- .../java/com/gh/gamecenter/SkipActivity.java | 147 ++++----- .../gh/gamecenter/SplashScreenActivity.java | 22 +- .../com/gh/gamecenter/SuggestionActivity.java | 84 ++--- .../com/gh/gamecenter/ToolBoxActivity.java | 10 +- .../com/gh/gamecenter/UserInfoEditActivity.kt | 4 +- .../java/com/gh/gamecenter/VoteActivity.java | 6 +- .../java/com/gh/gamecenter/WebActivity.kt | 61 ++-- .../com/gh/gamecenter/WeiBoShareActivity.java | 9 +- .../gamecenter/adapter/CleanApkAdapter.java | 6 +- .../adapter/CommentDetailAdapter.java | 8 +- .../gamecenter/adapter/GameNewsAdapter.java | 8 +- .../gamecenter/adapter/ImagePagerAdapter.java | 10 +- .../adapter/LibaoDetailAdapter.java | 14 +- .../adapter/MessageDetailAdapter.java | 22 +- .../gamecenter/adapter/ReportReasonAdapter.kt | 2 +- .../adapter/SubjectTypeAdapter.java | 2 +- .../gamecenter/adapter/ToolBoxRvAdapter.java | 8 +- .../gh/gamecenter/adapter/VoteAdapter.java | 12 +- .../adapter/viewholder/AreaViewHolder.java | 2 +- .../viewholder/AskTabItemViewHolder.java | 2 +- .../viewholder/CommentHeadViewHolder.java | 2 +- .../adapter/viewholder/CommentViewHolder.java | 2 +- .../adapter/viewholder/ConcernViewHolder.java | 2 +- .../adapter/viewholder/DetailViewHolder.java | 10 +- .../viewholder/DownloadHeadViewHolder.java | 2 +- .../adapter/viewholder/FooterViewHolder.java | 4 +- .../GameCollectionItemViewHolder.kt | 2 +- .../GameDetailCalenderViewHolder.java | 2 +- .../viewholder/GameDetailNewsViewHolder.java | 4 +- .../GameDetailNoticeViewHolder.java | 3 +- .../viewholder/GameDownloadViewHolder.java | 2 +- .../adapter/viewholder/GameHeadViewHolder.kt | 6 +- .../adapter/viewholder/GameImageViewHolder.kt | 8 +- .../viewholder/GameNewsSearchViewHolder.java | 2 +- .../GameNewsTypeListViewHolder.java | 2 +- .../viewholder/GameNewsTypeViewHolder.java | 2 +- .../viewholder/GameUpdateViewHolder.java | 2 +- .../adapter/viewholder/GameViewHolder.java | 2 +- .../viewholder/GameViewPagerViewHolder.java | 2 +- .../viewholder/KcSelectGameViewHolder.java | 2 +- .../viewholder/LiBaoCodeViewHolder.java | 2 +- .../LibaoDetailContentViewHolder.java | 2 +- .../viewholder/LibaoDetailTopViewHolder.java | 2 +- .../viewholder/LibaoNormalViewHolder.java | 4 +- .../viewholder/ListSectionItemViewHolder.kt | 2 +- .../NewsDetailCommentListViewHolder.java | 2 +- .../viewholder/NewsDetailGameViewHolder.java | 2 +- .../viewholder/NewsDigestViewHolder.java | 4 +- .../viewholder/NewsFooterViewHolder.java | 2 +- .../viewholder/NewsImage1ViewHolder.java | 4 +- .../viewholder/NewsImage2ViewHolder.java | 4 +- .../viewholder/NewsImage3ViewHolder.java | 4 +- .../viewholder/NewsTextViewHolder.java | 4 +- .../adapter/viewholder/ReuseViewHolder.java | 4 +- .../viewholder/SearchHistoryViewHolder.java | 2 +- .../viewholder/StrategyDialogViewHolder.java | 2 +- .../adapter/viewholder/ToolBoxViewHolder.java | 4 +- .../adapter/viewholder/ViewHolder.kt | 2 +- .../adapter/viewholder/VoteViewHolder.java | 2 +- .../com/gh/gamecenter/amway/AmwayActivity.kt | 2 +- .../com/gh/gamecenter/amway/AmwayAdapter.kt | 22 +- .../com/gh/gamecenter/amway/AmwayFragment.kt | 16 +- .../gamecenter/amway/AmwaySuccessFragment.kt | 6 +- .../com/gh/gamecenter/amway/AmwayViewModel.kt | 5 +- .../amway/search/AmwaySearchActivity.kt | 2 +- .../amway/search/AmwaySearchAdapter.kt | 2 +- .../gamecenter/amway/search/AmwaySearchDao.kt | 2 +- .../search/AmwaySearchDefaultFragment.kt | 6 +- .../amway/search/AmwaySearchListFragment.kt | 6 +- .../amway/search/AmwaySearchViewHolder.kt | 4 + .../gh/gamecenter/baselist/DiffUtilAdapter.kt | 2 +- .../gamecenter/baselist/LazyListFragment.java | 8 +- .../gh/gamecenter/baselist/ListActivity.java | 6 +- .../gh/gamecenter/baselist/ListAdapter.java | 3 +- .../gh/gamecenter/baselist/ListExecutor.kt | 4 +- .../gh/gamecenter/baselist/ListFragment.java | 8 +- .../gh/gamecenter/baselist/ListViewModel.java | 7 +- .../gh/gamecenter/catalog/BannerAdapter.kt | 2 +- .../gh/gamecenter/catalog/CatalogActivity.kt | 8 +- .../gh/gamecenter/catalog/CatalogAdapter.kt | 8 +- .../gh/gamecenter/catalog/CatalogFragment.kt | 66 ++-- .../catalog/NewCatalogListActivity.kt | 14 +- .../catalog/NewCatalogListAdapter.kt | 5 +- .../catalog/NewCatalogListFragment.kt | 22 +- .../catalog/NewCatalogListViewModel.kt | 2 +- .../catalog/SpecialCatalogAdapter.kt | 8 +- .../catalog/SpecialCatalogFragment.kt | 14 +- .../catalog/SpecialCatalogSubjectAdapter.kt | 6 +- .../SpecialCatalogSubjectCollectionAdapter.kt | 10 +- .../gamecenter/catalog/SubCatalogAdapter.kt | 10 +- .../gamecenter/catalog/SubCatalogFragment.kt | 14 +- .../category/CategoryDirectoryActivity.kt | 6 +- .../category/CategoryDirectoryAdapter.kt | 6 +- .../category/CategoryDirectoryFragment.kt | 16 +- .../category/CategoryListActivity.kt | 10 +- .../category/NewCategoryHorizontalAdapter.kt | 4 +- .../category/NewCategoryListAdapter.kt | 8 +- .../category/NewCategoryListFragment.kt | 16 +- .../category/NewCategoryListViewModel.kt | 2 +- .../category2/CategoryDirectoryAdapter.kt | 15 +- .../category2/CategoryV2Activity.kt | 10 +- .../gamecenter/category2/CategoryV2Adapter.kt | 8 +- .../category2/CategoryV2Fragment.kt | 74 +++-- .../category2/CategoryV2ListAdapter.kt | 11 +- .../category2/CategoryV2ListFragment.kt | 17 +- .../category2/CategoryV2ListViewModel.kt | 2 +- .../category2/SubCategoryAdapter.kt | 8 +- .../gamecenter/collection/AnswerAdapter.java | 12 +- .../gamecenter/collection/AnswerFragment.java | 6 +- .../gamecenter/collection/AnswerViewModel.kt | 2 +- .../gamecenter/collection/ArticleAdapter.java | 14 +- .../collection/ArticleFragment.java | 8 +- .../collection/ArticleViewModel.java | 4 +- .../CollectionCommunityArticleViewHolder.kt | 5 +- .../collection/CollectionWrapperFragment.java | 11 +- .../collection/CommunityArticleAdapter.kt | 6 +- .../collection/CommunityArticleFragment.kt | 10 +- .../collection/CommunityArticleViewModel.kt | 2 +- .../collection/GamesCollectionAdapter.kt | 6 +- .../collection/GamesCollectionFragment.kt | 8 +- .../collection/GamesCollectionViewModel.kt | 8 +- .../gamecenter/collection/ToolsAdapter.java | 6 +- .../gamecenter/collection/ToolsFragment.java | 3 +- .../gh/gamecenter/collection/VideoAdapter.kt | 3 +- .../gh/gamecenter/collection/VideoFragment.kt | 10 +- .../gamecenter/collection/VideoViewModel.kt | 4 +- .../gamecenter/download/DownloadFragment.kt | 8 +- .../DownloadedGameIdAndPackageNameDao.kt | 2 +- .../download/GameDownloadFragment.java | 16 +- .../download/GameDownloadFragmentAdapter.java | 14 +- .../download/GameUpdateFragment.java | 8 +- .../download/GameUpdateFragmentAdapter.java | 20 +- .../download/InstalledGameFragment.kt | 10 +- .../InstalledGameFragmentAdapter.java | 4 +- .../download/InstalledGameViewModel.kt | 2 +- .../download/NewInstalledGameFragment.kt | 11 +- .../NewInstalledGameFragmentAdapter.kt | 3 +- .../download/UpdatableGameAdapter.kt | 5 +- .../download/UpdatableGameFragment.kt | 16 +- .../download/UpdatableGameViewModel.kt | 11 +- .../gh/gamecenter/energy/CommodityAdapter.kt | 6 +- .../gh/gamecenter/energy/CommodityFragment.kt | 13 +- .../gamecenter/energy/CommodityViewModel.kt | 2 +- .../gamecenter/energy/EnergyCenterActivity.kt | 6 +- .../gamecenter/energy/EnergyCenterFragment.kt | 87 ++--- .../gamecenter/energy/EnergyHouseActivity.kt | 6 +- .../gamecenter/energy/EnergyHouseFragment.kt | 10 +- .../energy/HorizontalTaskAdapter.kt | 7 +- .../com/gh/gamecenter/energy/TaskAdapter.kt | 6 +- .../com/gh/gamecenter/energy/TaskFragment.kt | 6 +- .../com/gh/gamecenter/entity/CommentEntity.kt | 4 +- .../com/gh/gamecenter/entity/GameEntity.kt | 2 +- .../java/com/gh/gamecenter/entity/MeEntity.kt | 4 +- .../gamecenter/entity/MessageUnreadEntity.kt | 2 +- .../entity/PersonalHistoryEntity.kt | 10 +- .../com/gh/gamecenter/entity/RatingComment.kt | 2 +- .../detail/ForumArticleAskListAdapter.kt | 8 +- .../detail/ForumArticleAskListFragment.kt | 16 +- .../detail/ForumArticleAskListViewModel.kt | 3 +- .../forum/detail/ForumDetailActivity.kt | 10 +- .../forum/detail/ForumDetailFragment.kt | 32 +- .../forum/detail/ForumDetailViewModel.kt | 5 +- .../forum/detail/ForumTopLinkAdapter.kt | 3 + .../forum/home/ArticleItemVideoView.kt | 2 + .../forum/home/CommunityHomeFragment.kt | 18 +- .../forum/home/CommunityHomeViewModel.kt | 5 +- .../forum/home/ForumActivityAdapter.kt | 9 +- .../forum/home/ForumActivityFragment.kt | 8 +- .../forum/home/ForumActivityViewModel.kt | 3 +- .../home/ForumArticleAskItemViewHolder.kt | 136 +++++--- .../forum/home/ForumArticleListAdapter.kt | 10 +- .../forum/home/ForumArticleListFragment.kt | 14 +- .../forum/home/ForumArticleListViewModel.kt | 6 +- .../forum/home/ForumBannerPageAdapter.java | 4 +- .../forum/home/ForumFollowAdapter.kt | 6 + .../gh/gamecenter/forum/home/ForumFragment.kt | 27 +- .../forum/home/ForumHomeViewModel.kt | 6 +- .../gamecenter/forum/home/ForumRecordDao.kt | 2 +- .../forum/home/ForumRecordsAdapter.kt | 8 +- .../forum/home/ForumScrollCalculatorHelper.kt | 10 +- .../gamecenter/forum/home/ForumViewModel.kt | 4 +- .../gh/gamecenter/forum/home/ForumVisitDao.kt | 2 +- .../gamecenter/forum/home/HotForumsAdapter.kt | 6 +- .../forum/home/OfficialForumAdapter.kt | 4 +- .../gamecenter/forum/home/WelfaresAdapter.kt | 4 +- .../forum/list/ForumListActivity.kt | 4 +- .../gamecenter/forum/list/ForumListAdapter.kt | 8 +- .../forum/list/ForumListFragment.kt | 7 +- .../forum/moderator/ApplyModeratorActivity.kt | 6 +- .../forum/moderator/ApplyModeratorFragment.kt | 12 +- .../forum/moderator/ModeratorListActivity.kt | 12 +- .../forum/moderator/ModeratorListAdapter.kt | 6 +- .../forum/moderator/ModeratorListFragment.kt | 16 +- .../forum/moderator/ModeratorTaskAdapter.kt | 6 +- .../search/ForumContentSearchListAdapter.kt | 21 +- .../search/ForumContentSearchListFragment.kt | 10 +- .../search/ForumContentSearchListViewModel.kt | 2 - .../forum/search/ForumOrUserSearchActivity.kt | 7 +- .../ForumOrUserSearchDefaultFragment.kt | 4 +- .../ForumOrUserSearchDefaultViewModel.kt | 2 +- .../forum/search/ForumOrUserSearchFragment.kt | 5 +- .../gamecenter/forum/search/ForumSearchDao.kt | 2 +- .../forum/search/UserSearchListAdapter.kt | 23 +- .../gamecenter/forum/select/ForumAdapter.kt | 5 +- .../forum/select/ForumCategoryAdapter.kt | 4 +- .../forum/select/ForumSelectFragment.kt | 4 +- .../forum/select/ForumSelectViewModel.kt | 4 - .../fragment/HomeSearchToolWrapperFragment.kt | 58 ++-- .../HomeSearchToolWrapperViewModel.kt | 2 +- .../gh/gamecenter/fragment/LoginFragment.java | 24 +- .../fragment/MainWrapperFragment.java | 33 +- .../fragment/MainWrapperViewModel.kt | 2 +- .../fragment/SearchToolWrapperFragment.java | 8 +- .../fragment/SearchToolbarFragment.java | 24 +- .../com/gh/gamecenter/game/GameFragment.kt | 15 +- .../gh/gamecenter/game/GameFragmentAdapter.kt | 11 +- .../gh/gamecenter/game/GameItemViewHolder.kt | 10 +- .../com/gh/gamecenter/game/GameViewModel.kt | 12 +- .../GameColumnCollectionAdapter.kt | 4 +- .../GameColumnCollectionViewHolder.kt | 8 +- .../detail/ColumnCollectionDetailActivity.kt | 10 +- .../detail/ColumnCollectionDetailAdapter.kt | 8 +- .../detail/ColumnCollectionDetailFragment.kt | 19 +- .../CommonCollectionAdapter.kt | 7 +- .../CommonCollectionViewHolder.kt | 6 +- .../detail/CommonCollectionDetailActivity.kt | 10 +- .../detail/CommonCollectionDetailAdapter.kt | 3 + .../detail/CommonCollectionDetailFragment.kt | 18 +- .../gallery/GameGallerySlideViewHolder.kt | 8 +- .../game/gallery/GameGalleryViewHolder.kt | 8 +- .../game/horizontal/GameHorizontalAdapter.kt | 7 +- .../GameHorizontalItemViewHolder.kt | 8 +- .../GameHorizontalListViewHolder.kt | 4 +- .../GameHorizontalSimpleItemViewHolder.kt | 2 +- .../horizontal/GameHorizontalSlideAdapter.kt | 6 +- .../GameHorizontalSlideListViewHolder.kt | 15 +- .../imageslide/GameImageSlideViewHolder.kt | 15 +- .../game/imageslide/ImageSlideAdapter.kt | 8 +- .../gh/gamecenter/game/rank/RankAdapter.kt | 7 +- .../game/rank/RankCollectionAdapter.kt | 10 +- .../game/rank/RankCollectionViewHolder.kt | 2 +- .../gh/gamecenter/game/rank/RankGameItem.kt | 7 +- .../GameResourcePolicyDialogFragment.kt | 9 +- .../game/upload/GameSubmissionActivity.kt | 6 +- .../game/upload/GameUploadFragment.kt | 15 +- .../game/upload/UploadScheduleDialog.kt | 4 +- .../gh/gamecenter/game/vertical/GameItemUi.kt | 2 +- .../game/vertical/GameVerticalAdapter.kt | 6 +- .../vertical/GameVerticalSlideViewHolder.kt | 2 +- .../gamecollection/choose/AddGamesFragment.kt | 6 +- .../choose/AddSearchAndPlayedGameAdapter.kt | 8 +- .../choose/AddSearchGameFragment.kt | 2 +- .../choose/AddUserPlayedGameFragment.kt | 8 +- .../choose/ChooseGamesAdapter.kt | 11 +- .../choose/ChooseGamesFragment.kt | 8 +- .../choose/ChooseGamesRepository.kt | 2 +- .../detail/GameCollectionDetailActivity.kt | 10 +- .../detail/GameCollectionDetailAdapter.kt | 46 ++- .../detail/GameCollectionDetailFragment.kt | 17 +- .../detail/GameCollectionDetailViewModel.kt | 12 +- .../detail/GameCollectionPosterActivity.kt | 6 +- .../detail/GameCollectionPosterFragment.kt | 11 +- .../detail/GameCollectionVideoView.kt | 15 +- ...ameCollectionCommentConversationAdapter.kt | 2 +- ...meCollectionCommentConversationFragment.kt | 19 +- .../mine/MyGameCollectionAdapter.kt | 6 +- .../mine/MyGameCollectionFragment.kt | 7 +- .../mine/MyGameCollectionViewHolder.kt | 10 +- .../mine/MyGameCollectionViewModel.kt | 4 +- .../ChooseGameCollectionCoverTypeDialog.kt | 10 +- .../ChooseGameCollectionDefaultAdapter.kt | 6 +- .../ChooseGameCollectionDefaultCoverDialog.kt | 14 +- ...ooseGameCollectionDefaultCoverViewModel.kt | 4 +- .../publish/GameCollectionEditActivity.kt | 20 +- .../publish/GameCollectionEditViewModel.kt | 8 +- .../square/GameCollectionAmwayAdapter.kt | 2 +- .../square/GameCollectionSquareActivity.kt | 2 +- .../square/GameCollectionSquareAdapter.kt | 6 +- .../square/GameCollectionSquareFragment.kt | 28 +- .../tag/GameCollectionTagAdapter.kt | 9 +- .../tag/GameCollectionTagSelectFragment.kt | 4 +- .../gamedetail/GameDetailFragment.kt | 56 ++-- .../gamedetail/GameDetailViewModel.kt | 9 +- .../gamecenter/gamedetail/desc/DescAdapter.kt | 17 +- .../gamedetail/desc/DescCommentsAdapter.kt | 19 +- .../gamedetail/desc/DescFragment.kt | 17 +- .../gamedetail/desc/DescViewModel.kt | 6 +- .../desc/GameDetailCustomColumnAdapter.kt | 11 +- .../desc/GameDetailInfoItemAdapter.kt | 5 + .../gamedetail/desc/GameGalleryAdapter.kt | 10 +- .../desc/GameLatestServiceAdapter.kt | 6 +- .../gamedetail/desc/GameLibaoAdapter.kt | 7 +- .../gamedetail/desc/GameRaidersAdapter.kt | 6 + .../desc/GameRelatedVersionAdapter.kt | 4 + .../gamedetail/dialog/GameBigEventAdapter.kt | 4 +- .../gamedetail/dialog/GameBigEventDialog.kt | 6 +- .../gamedetail/dialog/GameDetailMoreDialog.kt | 4 +- .../dialog/GamePermissionAdapter.kt | 6 +- .../dialog/GamePermissionDialogFragment.kt | 12 +- .../gamedetail/dialog/GameTagsDialog.kt | 21 +- .../gamedetail/dialog/InviteCodeDialog.kt | 2 +- .../gamecenter/gamedetail/fuli/FuLiAdapter.kt | 6 +- .../gamedetail/fuli/FuLiFragment.kt | 11 +- .../gamedetail/fuli/FuLiViewModel.kt | 2 - .../gamedetail/fuli/GameNewsAdapter.kt | 4 +- .../fuli/answer/GameDetailAnswerAdapter.kt | 12 +- .../fuli/answer/GameDetailAnswerViewHolder.kt | 2 +- .../fuli/kaifu/ServersCalendarActivity.kt | 3 +- .../fuli/kaifu/ServersCalendarAdapter.kt | 10 +- .../fuli/kaifu/ServersCalendarViewModel.kt | 2 +- .../fuli/kaifu/ServersDetailViewHolder.kt | 4 +- .../fuli/tools/GameDetailToolsAdapter.java | 6 +- .../history/HistoryApkListActivity.kt | 8 +- .../history/HistoryApkListAdapter.kt | 6 +- .../history/HistoryApkListFragment.kt | 14 +- .../history/HistoryApkListViewModel.kt | 2 +- .../gamedetail/myrating/MyRatingActivity.kt | 4 +- .../gamedetail/myrating/MyRatingAdapter.kt | 8 +- .../gamedetail/myrating/MyRatingFragment.kt | 10 +- .../gamedetail/myrating/MyRatingViewHolder.kt | 2 +- .../gamedetail/myrating/MyRatingViewModel.kt | 2 +- .../gamedetail/rating/RatingAdapter.kt | 4 +- .../rating/RatingCommentItemViewHolder.kt | 38 ++- .../gamedetail/rating/RatingFoldActivity.kt | 6 +- .../gamedetail/rating/RatingFragment.kt | 21 +- .../gamedetail/rating/RatingItemViewHolder.kt | 6 +- .../gamedetail/rating/RatingReplyActivity.kt | 40 ++- .../gamedetail/rating/RatingReplyAdapter.kt | 44 +-- .../gamedetail/rating/RatingReplyViewModel.kt | 8 +- .../gamedetail/rating/RatingViewModel.kt | 4 +- .../rating/edit/RatingEditActivity.kt | 66 ++-- .../rating/edit/RatingEditViewModel.kt | 6 +- .../rating/logs/CommentLogsActivity.kt | 12 +- .../rating/logs/CommentLogsAdapter.kt | 6 +- .../gamedetail/video/TopVideoView.kt | 19 +- .../com/gh/gamecenter/geetest/GTWebView.java | 2 +- .../gh/gamecenter/geetest/GeetestUtils.java | 2 +- .../com/gh/gamecenter/geetest/GtDialog.java | 2 +- .../gh/gamecenter/help/HelpCategoryAdapter.kt | 8 +- .../gamecenter/help/HelpCategoryViewHolder.kt | 2 +- .../gamecenter/help/HelpContainerFragment.kt | 22 +- .../gh/gamecenter/help/HelpContentAdapter.kt | 10 +- .../gh/gamecenter/help/HelpContentFragment.kt | 12 +- .../gh/gamecenter/help/HelpItemViewHolder.kt | 2 +- .../com/gh/gamecenter/help/HelpQaAdapter.kt | 6 +- .../gamecenter/help/HelpQaCategoryAdapter.kt | 15 +- .../gamecenter/help/HelpQaCategoryFragment.kt | 16 +- .../help/HelpQaCategoryViewModel.kt | 3 - .../help/QaFeedbackDialogFragment.kt | 11 +- .../help/QaFeedbackReasonAdapter.kt | 4 +- .../gh/gamecenter/help/QaFeedbackViewModel.kt | 6 +- .../gh/gamecenter/history/HistoryActivity.kt | 4 +- .../history/HistoryGameListAdapter.kt | 4 +- .../history/HistoryGameListFragment.kt | 8 +- .../history/HistoryGameListViewModel.kt | 2 +- .../history/HistoryWrapperFragment.kt | 18 +- .../com/gh/gamecenter/home/HomeFragment.kt | 15 +- .../gh/gamecenter/home/HomeFragmentAdapter.kt | 6 +- .../gamecenter/home/HomeGameItemViewHolder.kt | 10 +- .../home/HomeRecommendItemViewHolder.kt | 9 +- .../com/gh/gamecenter/home/HomeViewModel.kt | 2 + .../LegacyHomeFragmentAdapterAssistant.kt | 10 +- .../gamecenter/home/amway/HomeAmwayAdapter.kt | 34 +- .../home/amway/HomeAmwayItemViewHolder.kt | 10 +- .../home/amway/HomeAmwayListViewHolder.kt | 9 +- .../GameCollectionStackAnimation.kt | 4 +- .../GameCollectionStackLayout.kt | 6 +- .../HomeGameCollectionAdapter.kt | 8 +- .../HomeGameCollectionViewHolder.kt | 8 +- .../home/skip/PackageSkipActivity.kt | 2 +- .../home/skip/PackageSkipAdapter.kt | 5 +- .../home/skip/PackageSkipFragment.kt | 2 +- .../home/slide/HomeSlideListAdapter.kt | 5 +- .../home/slide/HomeSlideListItemViewHolder.kt | 8 +- .../home/slide/HomeSlideListViewHolder.kt | 15 +- .../home/video/AutomaticVideoView.kt | 17 +- .../home/video/ScrollCalculatorHelper.kt | 10 +- .../gh/gamecenter/info/ConcernAdapter.java | 14 +- .../gh/gamecenter/info/ConcernFragment.java | 10 +- .../com/gh/gamecenter/info/InfoAdapter.java | 10 +- .../com/gh/gamecenter/info/InfoFragment.java | 4 +- .../com/gh/gamecenter/info/InfoViewModel.java | 2 +- .../gamecenter/info/InfoWrapperFragment.java | 4 +- .../gh/gamecenter/info/OriginalAdapter.java | 10 +- .../gh/gamecenter/info/OriginalFragment.java | 4 +- .../gh/gamecenter/info/OriginalViewModel.java | 2 +- .../gh/gamecenter/info/StrategyAdapter.java | 6 +- .../info/StrategyDialogAdapter.java | 2 +- .../gh/gamecenter/info/StrategyFragment.java | 6 +- .../gh/gamecenter/libao/Libao1Fragment.java | 6 +- .../gh/gamecenter/libao/Libao2Fragment.java | 4 +- .../libao/Libao2FragmentAdapter.java | 11 +- .../gh/gamecenter/libao/Libao3Fragment.java | 4 +- .../libao/Libao3FragmentAdapter.java | 12 +- .../gh/gamecenter/libao/LibaoFragment.java | 4 +- .../gamecenter/libao/LibaoHistoryAdapter.java | 8 +- .../gh/gamecenter/libao/LibaoNewAdapter.kt | 8 +- .../gh/gamecenter/libao/LibaoNewFragment.java | 6 +- .../gh/gamecenter/libao/LibaoSearchAdapter.kt | 10 +- .../gamecenter/libao/LibaoSearchFragment.java | 4 +- .../gh/gamecenter/manager/CommentManager.java | 4 +- .../manager/DataCollectionManager.java | 6 +- .../gh/gamecenter/manager/UpdateManager.java | 28 +- .../gh/gamecenter/manager/UserManager.java | 12 +- .../gh/gamecenter/manager/VisitManager.java | 6 +- .../gh/gamecenter/message/KeFuFragment.java | 2 +- .../message/KeFuFragmentAdapter.java | 22 +- .../gh/gamecenter/message/KeFuViewHolder.java | 4 +- .../gh/gamecenter/message/MessageAdapter.java | 6 +- .../message/MessageDetailFragment.java | 21 +- .../gamecenter/message/MessageFragment.java | 2 +- .../message/MessageItemViewHolder.java | 12 +- .../message/MessageNormalAdapter.java | 6 +- .../message/MessageNormalFragment.java | 7 +- .../message/MessageTopViewHolder.java | 4 +- .../message/MessageUnreadRepository.kt | 12 +- .../mygame/MyFollowedGameAdapter.kt | 7 +- .../mygame/MyFollowedGameFragment.kt | 9 +- .../gh/gamecenter/mygame/MyGameActivity.kt | 11 +- .../gamecenter/mygame/MyPlayedGameFragment.kt | 12 +- .../gamecenter/mygame/MyReservationAdapter.kt | 7 +- .../mygame/MyReservationFragment.kt | 10 +- .../mygame/MyReservationViewModel.kt | 4 +- .../gamecenter/mygame/PlayedGameActivity.kt | 6 +- .../gh/gamecenter/mygame/PlayedGameAdapter.kt | 17 +- .../gamecenter/mygame/PlayedGameFragment.kt | 6 +- .../newsdetail/NewsDetailAdapter.java | 23 +- .../NewsDetailCommentViewHolder.java | 4 +- .../NewsDetailContentViewHolder.java | 2 +- .../packagehelper/PackageFilterManager.kt | 2 +- .../packagehelper/PackageRepository.kt | 7 +- .../personal/DeliveryInfoActivity.kt | 1 - .../personal/DeliveryInfoFragment.kt | 2 +- .../personal/NewPersonalActivity.kt | 2 +- .../personal/NewPersonalFragment.kt | 192 +++++------ .../NewPersonalFunctionGroupAdapter.kt | 6 +- .../gamecenter/personal/PersonalFragment.kt | 206 ++++++------ .../personal/PersonalFunctionAdapter.kt | 13 +- .../personal/PersonalFunctionGroupAdapter.kt | 30 +- .../gamecenter/personal/PersonalViewModel.kt | 7 +- .../personalhome/FollowersOrFansAdapter.kt | 19 +- .../personalhome/FollowersOrFansFragment.kt | 10 +- .../personalhome/InstalledGameDialog.kt | 14 +- .../personalhome/PersonalItemViewHolder.kt | 3 +- .../personalhome/UserHomeActivity.kt | 12 +- .../personalhome/UserHomeFragment.kt | 50 +-- .../personalhome/UserHomeViewModel.kt | 5 +- .../gh/gamecenter/personalhome/ViewHolder.kt | 2 +- .../background/BackgroundClipActivity.kt | 16 +- .../background/BackgroundPreviewActivity.kt | 9 +- .../background/BackgroundPreviewFragment.kt | 11 +- .../PersonalityBackgroundAdapter.kt | 6 +- .../PersonalityBackgroundFragment.kt | 12 +- .../PersonalityBackgroundViewModel.kt | 16 +- .../border/AvatarBorderActivity.kt | 6 +- .../border/AvatarBorderFragment.kt | 15 +- .../border/AvatarBorderViewModel.kt | 5 - .../border/ChooseAvatarBorderAdapter.kt | 6 +- .../border/ChooseAvatarBorderFragment.kt | 23 +- .../border/ChooseAvatarBorderViewModel.kt | 2 +- .../personalhome/fans/FansActivity.kt | 6 +- .../followers/FollowersActivity.kt | 6 +- .../personalhome/home/UserHistoryAdapter.kt | 13 +- .../personalhome/home/UserHistoryFragment.kt | 4 +- .../personalhome/home/UserHistoryViewModel.kt | 4 +- .../home/UserVideoHistoryAdapter.kt | 2 +- .../home/UserVideoHistoryFragment.kt | 8 +- .../home/game/UserCommentHistoryAdapter.kt | 6 +- .../home/game/UserCommentHistoryFragment.kt | 3 +- .../home/game/UserCommentHistoryViewModel.kt | 2 + .../home/game/UserGameFragment.kt | 9 +- .../home/game/UserPlayedGameAdapter.kt | 6 +- .../home/game/UserPlayedGameFragment.kt | 10 +- .../personalhome/rating/RatingActivity.kt | 8 +- .../personalhome/rating/RatingAdapter.kt | 8 +- .../com/gh/gamecenter/qa/CommunityFragment.kt | 4 +- .../gh/gamecenter/qa/all/AskAllFragment.kt | 8 +- .../BaseAnswerOrArticleItemViewHolder.kt | 7 +- .../answer/CommunityAnswerItemViewHolder.kt | 57 ++-- .../answer/detail/AnswerDetailActivity.java | 22 +- .../detail/AnswerDetailContainerFragment.kt | 16 +- .../qa/answer/detail/AnswerDetailFragment.kt | 50 +-- .../qa/answer/detail/AnswerDetailViewModel.kt | 8 +- .../detail/SimpleAnswerDetailActivity.kt | 8 +- .../qa/answer/draft/AnswerDraftActivity.kt | 4 +- .../qa/answer/draft/AnswerDraftAdapter.java | 10 +- .../qa/answer/draft/AnswerDraftFragment.java | 10 +- .../qa/answer/edit/AnswerEditActivity.kt | 67 ++-- .../qa/answer/edit/AnswerEditViewModel.kt | 10 +- .../qa/answer/fold/AnswerFoldActivity.java | 6 +- .../qa/answer/fold/AnswerFoldAdapter.java | 6 +- .../qa/answer/fold/AnswerFoldFragment.java | 12 +- .../qa/article/MyArticleActivity.kt | 6 +- .../gamecenter/qa/article/MyArticleAdapter.kt | 12 +- .../qa/article/MyArticleFragment.kt | 14 +- .../qa/article/SimpleArticleListAdapter.kt | 4 +- .../qa/article/SimpleArticleListFragment.kt | 6 +- .../article/detail/ArticleDetailActivity.kt | 38 +-- .../detail/ArticleDetailContentViewHolder.kt | 35 +- .../article/detail/ArticleDetailFragment.kt | 33 +- .../article/detail/ArticleDetailViewModel.kt | 11 +- .../comment/ArticleDetailCommentActivity.kt | 18 +- .../comment/ArticleDetailCommentAdapter.kt | 2 +- .../comment/ArticleDetailCommentFragment.kt | 19 +- .../qa/article/draft/ArticleDraftActivity.kt | 6 +- .../qa/article/draft/ArticleDraftAdapter.kt | 6 +- .../qa/article/draft/ArticleDraftFragment.kt | 13 +- .../article/draft/ArticleDraftViewHolder.kt | 2 +- .../qa/article/edit/ArticleEditActivity.kt | 38 ++- .../qa/article/edit/ArticleEditViewModel.kt | 7 +- .../article/edit/ArticleSelectGameAdapter.kt | 2 +- .../article/edit/ArticleTagsSelectFragment.kt | 10 +- .../gamecenter/qa/column/AskColumnAdapter.kt | 2 +- .../gamecenter/qa/column/AskColumnFragment.kt | 4 +- .../qa/column/AskColumnRepository.java | 2 +- .../column/detail/AskColumnDetailActivity.kt | 6 +- .../qa/column/detail/hot/HotAdapter.kt | 4 +- .../detail/recommends/RecommendsAdapter.kt | 4 +- .../detail/recommends/RecommendsFragment.kt | 8 +- .../detail/unanswered/UnansweredAdapter.kt | 4 +- .../detail/unanswered/UnansweredFragment.kt | 9 +- .../qa/column/order/AskTabOrderAdapter.java | 2 +- .../qa/column/order/AskTabOrderFragment.java | 8 +- .../gamecenter/qa/comment/CommentActivity.kt | 32 +- .../qa/comment/CommentPictureAdapter.kt | 4 +- .../qa/comment/NewCommentAdapter.kt | 67 ++-- .../comment/NewCommentConversationFragment.kt | 10 +- .../qa/comment/NewCommentFragment.kt | 17 +- .../qa/comment/NewCommentViewModel.kt | 9 +- .../qa/comment/StairsCommentAdapter.kt | 6 +- .../qa/comment/StairsCommentFragment.kt | 4 +- .../qa/comment/StairsCommentReplyAdapter.kt | 2 +- .../qa/comment/StairsCommentViewHolder.kt | 45 +-- .../qa/comment/base/BaseCommentAdapter.kt | 53 ++-- .../qa/comment/base/BaseCommentFragment.kt | 6 +- .../qa/comment/base/BaseCommentViewModel.kt | 11 +- .../CommentConversationAdapter.kt | 2 +- .../CommentConversationFragment.kt | 23 +- .../qa/dialog/ChooseActivityDialogFragment.kt | 14 +- .../qa/dialog/ChooseForumActivity.kt | 11 +- .../qa/dialog/ChooseForumContainerAdapter.kt | 12 +- .../qa/dialog/ChooseForumContainerFragment.kt | 9 +- .../qa/dialog/InputUrlDialogFragment.kt | 18 +- .../qa/dialog/MoreFunctionPanelDialog.kt | 9 +- .../gh/gamecenter/qa/editor/AnswerAdapter.kt | 2 +- .../gh/gamecenter/qa/editor/AnswerFragment.kt | 4 +- .../gh/gamecenter/qa/editor/ArticleAdapter.kt | 21 +- .../gamecenter/qa/editor/ArticleFragment.kt | 4 +- .../qa/editor/FullScreenVideoActivity.kt | 20 +- .../qa/editor/FullScreenVideoView.kt | 22 +- .../gh/gamecenter/qa/editor/GameActivity.kt | 4 +- .../qa/editor/GameDefaultAdapter.kt | 2 +- .../qa/editor/GameDefaultItemViewHolder.kt | 2 +- .../gh/gamecenter/qa/editor/GameFragment.kt | 8 +- .../InsertGameCollectionWrapperActivity.kt | 14 +- .../qa/editor/InsertVideoWrapperActivity.kt | 6 +- .../gh/gamecenter/qa/editor/LinkFragment.kt | 4 +- .../gh/gamecenter/qa/editor/LinkViewModel.kt | 2 +- .../qa/editor/LocalMediaActivity.kt | 12 +- .../gamecenter/qa/editor/LocalMediaAdapter.kt | 7 +- .../qa/editor/LocalMediaFragment.kt | 13 +- .../qa/editor/OnLinkClickListener.kt | 6 +- .../qa/editor/OnlineVideoFragment.kt | 5 +- .../qa/editor/PreviewVideoActivity.kt | 6 +- .../qa/editor/PreviewVideoFragment.kt | 21 +- .../gamecenter/qa/editor/PreviewVideoView.kt | 4 +- .../gh/gamecenter/qa/editor/VideoAdapter.kt | 8 +- .../qa/editor/VideoAlbumsSpanner.kt | 3 +- .../gh/gamecenter/qa/entity/AnswerEntity.kt | 12 +- .../gh/gamecenter/qa/entity/ArticleEntity.kt | 12 +- .../qa/entity/EditorInsertEntity.kt | 2 +- .../com/gh/gamecenter/qa/entity/Questions.kt | 4 +- .../gamecenter/qa/follow/AskFollowAdapter.kt | 4 +- .../gamecenter/qa/follow/AskFollowFragment.kt | 2 +- .../qa/follow/AskFollowMoreDialog.kt | 6 +- .../qa/myqa/AnswerDraftViewHolder.kt | 2 +- .../qa/myqa/ConcernQuestionsAdapter.java | 6 +- .../qa/myqa/ConcernQuestionsFragment.java | 4 +- .../gamecenter/qa/myqa/MyAnswerAdapter.java | 6 +- .../gamecenter/qa/myqa/MyAnswerFragment.java | 9 +- .../gh/gamecenter/qa/myqa/MyAskActivity.java | 4 +- .../qa/myqa/MyAskWrapperFragment.java | 8 +- .../qa/myqa/MyQuestionsAdapter.java | 6 +- .../qa/myqa/MyQuestionsFragment.java | 4 +- .../qa/newest/AskQuestionsNewBodyAdapter.java | 6 +- .../newest/AskQuestionsNewBodyFragment.java | 2 +- .../qa/newest/AskQuestionsNewFragment.java | 6 +- .../qa/newest/AskQuestionsNewViewHolder.java | 6 +- .../questions/CommunityQuestionViewHolder.kt | 6 +- .../qa/questions/detail/AnswerViewHolder.java | 12 +- .../detail/QuestionsDetailActivity.java | 2 +- .../detail/QuestionsDetailAdapter.kt | 10 +- .../detail/QuestionsDetailFragment.kt | 10 +- .../detail/QuestionsDetailItemViewHolder.java | 6 +- .../detail/QuestionsDetailViewModel.kt | 2 +- .../questions/draft/QuestionDraftActivity.kt | 1 - .../questions/draft/QuestionDraftAdapter.kt | 9 +- .../questions/draft/QuestionDraftFragment.kt | 11 +- .../questions/draft/QuestionDraftViewModel.kt | 2 +- .../qa/questions/edit/QuestionEditActivity.kt | 37 ++- .../questions/edit/QuestionEditViewModel.kt | 8 +- .../qa/questions/edit/TagsSelectFragment.kt | 39 ++- .../edit/tip/QuestionTitleTipAdapter.kt | 2 +- .../invite/QuestionsInviteActivity.java | 4 +- .../invite/QuestionsInviteAdapter.kt | 4 +- .../invite/QuestionsInviteFragment.kt | 8 +- .../invite/QuestionsInviteViewHolder.java | 10 +- .../QuestionsInviteWrapperFragment.java | 8 +- .../newdetail/NewQuestionDetailActivity.kt | 33 +- .../newdetail/NewQuestionDetailAdapter.kt | 4 +- .../newdetail/NewQuestionDetailFragment.kt | 21 +- .../newdetail/NewQuestionDetailViewModel.kt | 13 +- .../QuestionDetailContentViewHolder.kt | 23 +- .../AskQuestionsRecommendsAdapter.java | 10 +- .../AskQuestionsRecommendsFragment.java | 8 +- .../AskQuestionsRecommendsViewModel.java | 2 +- .../recommends/AskRecommendWrapperFragment.kt | 8 +- .../AskRecommendsSubjectPageAdapter.java | 4 +- .../qa/recommends/RecommendConcernAdapter.kt | 4 +- .../RecommendConcernItemViewHolder.kt | 2 +- .../RecommendConcernListItemViewHolder.kt | 2 +- .../newest/RecommendNewestAdapter.kt | 4 +- .../newest/RecommendNewestFragment.kt | 4 +- .../qa/search/AskSearchActivity.java | 8 +- .../qa/search/AskSearchFragment.java | 2 +- .../search/AskSearchNormalItemViewHolder.java | 4 +- .../search/AskSearchQuestionItemViewHolder.kt | 2 +- .../qa/search/artilce/ArticleAdapter.kt | 4 +- .../qa/search/artilce/ArticleFragment.kt | 2 +- .../qa/search/base/BaseAskSearchAdapter.kt | 4 +- .../qa/search/history/HistoryFragment.kt | 4 +- .../search/history/HistoryFragmentAdapter.kt | 4 +- .../qa/search/history/HotFragmentAdapter.kt | 4 +- .../qa/search/hottest/HottestAdapter.kt | 10 +- .../qa/search/hottest/HottestFragment.kt | 2 +- .../qa/search/newest/NewestAdapter.kt | 6 +- .../qa/search/newest/NewestFragment.kt | 2 +- .../qa/search/question/QuestionAdapter.kt | 2 +- .../qa/search/question/QuestionFragment.kt | 2 +- .../gamecenter/qa/search/user/UserFragment.kt | 2 +- .../select/AskSelectGameItemViewHolder.java | 4 +- .../CommunitiesSelectWrapperFragment.kt | 2 +- .../gh/gamecenter/qa/select/OpenedAdapter.kt | 6 +- .../qa/select/OpenedNameTextView.kt | 2 +- .../gamecenter/qa/select/OpenedViewHolder.kt | 2 +- .../gamecenter/qa/select/OpenedViewModel.kt | 3 +- .../qa/select/SelectGameDialogAdapter.java | 4 +- .../gamecenter/qa/select/VotingAdapter.java | 4 +- .../gamecenter/qa/select/VotingFragment.java | 4 +- .../qa/select/VotingSelectGameViewHolder.java | 2 +- .../gamecenter/qa/select/VotingViewModel.java | 4 +- .../qa/subject/AskSubjectAdapter.java | 6 +- .../qa/subject/AskSubjectFragment.java | 6 +- .../qa/subject/AskSubjectItemViewHolder.kt | 2 +- .../qa/subject/AskSubjectViewHolder.java | 4 +- .../qa/tags/AskQuestionsNewRepository.java | 2 +- .../qa/video/detail/ForumTopVideoView.kt | 13 +- .../video/detail/ForumVideoDetailActivity.kt | 12 +- .../video/detail/ForumVideoDetailFragment.kt | 19 +- .../video/detail/ForumVideoDetailViewModel.kt | 11 +- .../detail/comment/VideoCommentFragment.kt | 14 +- .../qa/video/detail/desc/VideoDescAdapter.kt | 8 +- .../qa/video/detail/desc/VideoDescFragment.kt | 4 +- .../detail/desc/VideoDescTopViewHolder.kt | 29 +- .../video/detail/desc/VideoDescViewModel.kt | 12 +- .../video/detail/desc/VideoItemViewHolder.kt | 4 +- .../qa/video/publish/VideoPublishActivity.kt | 14 +- .../qa/video/publish/VideoPublishFragment.kt | 17 +- .../qa/video/publish/VideoPublishViewModel.kt | 9 +- .../receiver/ActivitySkipReceiver.java | 6 +- .../gamecenter/receiver/DownloadReceiver.java | 6 +- .../receiver/InstallAndUninstallReceiver.java | 4 +- .../gamecenter/receiver/InstallReceiver.java | 30 +- .../receiver/NetworkStateReceiver.java | 6 +- .../gh/gamecenter/retrofit/OkHttpCache.java | 4 +- .../retrofit/OkHttpCacheInterceptor.java | 8 +- .../retrofit/OkHttpNetworkInterceptor.java | 6 +- .../retrofit/OkHttpRetryInterceptor.kt | 6 +- .../com/gh/gamecenter/retrofit/Response.java | 2 +- .../retrofit/service/ApiService.java | 1 + .../room/converter/AnswerUserConverter.java | 2 +- .../room/converter/ApkArrayListConverter.kt | 6 +- .../room/converter/CommunityConverter.kt | 4 +- .../room/converter/CommunityVideoConverter.kt | 4 +- .../room/converter/CountConverter.kt | 4 +- .../room/converter/ImageInfoConverter.java | 2 +- .../room/converter/ListStringConverter.java | 2 +- .../gamecenter/room/converter/MeConverter.kt | 2 +- .../room/converter/QuestionsConverter.java | 2 +- .../room/converter/SignDataConverter.java | 2 +- .../room/converter/SimpleGameConverter.kt | 4 +- .../room/converter/SimpleGameListConverter.kt | 5 +- .../room/converter/SimulatorConverter.kt | 4 +- .../converter/StringArrayListConverter.kt | 4 +- .../room/converter/TagInfoListConverter.kt | 6 +- .../room/converter/TagStyleListConverter.kt | 4 +- .../room/converter/ThumbnailConverter.kt | 4 +- .../room/converter/TimeConverter.kt | 4 +- .../room/converter/UserConverter.kt | 4 +- .../room/converter/VideoInfoConverter.kt | 4 +- .../search/SearchDefaultFragment.kt | 10 +- .../search/SearchDefaultHotAdapter.kt | 10 +- .../search/SearchDefaultViewModel.kt | 2 +- .../search/SearchGameIndexAdapter.kt | 6 +- .../search/SearchGameIndexFragment.kt | 9 +- .../search/SearchGameIndexItemViewHolder.kt | 2 +- .../search/SearchGameResultAdapter.kt | 6 +- .../search/SearchGameResultFragment.kt | 8 +- .../gamecenter/search/SearchSubjectAdapter.kt | 4 +- .../gamecenter/security/BindPhoneActivity.kt | 12 +- .../security/BindPhoneConflictFragment.kt | 10 +- .../gamecenter/security/BindPhoneFragment.kt | 53 ++-- .../gamecenter/security/BindPhoneViewModel.kt | 6 +- .../gamecenter/security/SecurityActivity.kt | 4 +- .../gamecenter/security/SecurityFragment.kt | 6 +- .../servers/GameServerTestActivity.kt | 4 +- .../servers/GameServerTimeViewHolder.java | 2 +- .../gamecenter/servers/GameServersActivity.kt | 16 +- .../servers/GameServersContentAdapter.kt | 6 +- .../servers/GameServersContentFragment.kt | 8 +- .../servers/GameServersContentViewModel.kt | 5 +- .../servers/GameServersPublishFragment.kt | 14 +- .../servers/GameServersTestAdapter.kt | 8 +- .../servers/GameServersTestFragment.kt | 17 +- .../servers/GameServersTestViewModel.kt | 4 +- .../servers/add/AddKaiFuActivity.kt | 14 +- .../servers/add/AddKaiFuPopupAdapter.kt | 3 +- .../servers/add/AddKaiFuViewModel.kt | 4 +- .../servers/patch/PatchKaifuActivity.kt | 8 +- .../setting/GameDownloadSettingActivity.kt | 4 +- .../setting/GameDownloadSettingFragment.kt | 6 +- .../setting/VideoSettingActivity.kt | 4 +- .../setting/VideoSettingFragment.kt | 6 +- .../simulatorgame/SimulatorGameFragment.kt | 15 +- .../simulatorgame/SimulatorGameListAdapter.kt | 16 +- .../SimulatorGameListFragment.kt | 12 +- .../SimulatorGameListViewModel.kt | 6 +- .../simulatorgame/SimulatorGameViewModel.kt | 4 +- .../SimulatorManagementAdapter.kt | 7 +- .../SimulatorManagementFragment.kt | 11 +- .../SimulatorManagementViewModel.kt | 2 +- .../gh/gamecenter/subject/SubjectActivity.kt | 12 +- .../gh/gamecenter/subject/SubjectAdapter.kt | 4 +- .../gh/gamecenter/subject/SubjectFragment.kt | 10 +- .../gamecenter/subject/SubjectListFragment.kt | 23 +- .../subject/SubjectListViewModel.kt | 2 +- .../subject/rows/SubjectRowsFragment.kt | 12 +- .../subject/tab/SubjectTabFragment.kt | 26 +- .../subject/tile/SubjectTileFragment.kt | 14 +- .../suggest/GameUploadPicViewHolder.java | 4 +- .../suggest/SelectGameViewHolder.java | 2 +- .../suggest/SuggestGameCollectAdapter.kt | 4 +- .../gamecenter/suggest/SuggestPicAdapter.java | 4 +- .../suggest/SuggestPicViewHolder.java | 4 +- .../suggest/SuggestSelectFragment.java | 5 +- .../suggest/SuggestSelectGameAdapter.java | 6 +- .../com/gh/gamecenter/tag/TagsActivity.kt | 5 +- .../gamecenter/tag/TagsHorizontalAdapter.kt | 2 +- .../com/gh/gamecenter/tag/TagsListAdapter.kt | 7 +- .../com/gh/gamecenter/tag/TagsListFragment.kt | 8 +- .../gh/gamecenter/tag/TagsListViewModel.kt | 2 +- .../teenagermode/PasswordSettingFragment.kt | 10 +- .../teenagermode/TeenagerModeFragment.kt | 12 +- .../teenagermode/TeenagerModeViewModel.kt | 2 +- .../toolbox/ToolBoxBlockActivity.kt | 16 +- .../gamecenter/toolbox/ToolBoxBlockAdapter.kt | 6 +- .../gamecenter/toolbox/ToolBoxItemAdapter.kt | 10 +- .../gh/gamecenter/toolbox/ToolBoxViewModel.kt | 7 +- .../gh/gamecenter/user/UserRepository.java | 14 +- .../gamecenter/video/VideoItemViewHolder.kt | 8 +- .../video/VideoVerifyItemViewHolder.kt | 4 +- .../com/gh/gamecenter/video/ViewHolder.kt | 2 +- .../video/data/VideoDataActivity.kt | 2 +- .../gamecenter/video/data/VideoDataAdapter.kt | 8 +- .../video/data/VideoDataFragment.kt | 14 +- .../video/data/VideoDataViewModel.kt | 2 +- .../video/detail/DetailPlayerView.kt | 31 +- .../video/detail/HomeVideoFragment.kt | 38 ++- .../gamecenter/video/detail/VideoAdapter.kt | 8 +- .../video/detail/VideoDetailActivity.kt | 2 +- .../detail/VideoDetailContainerFragment.kt | 42 +-- .../detail/VideoDetailContainerViewModel.kt | 8 +- .../video/game/GameVideoActivity.kt | 25 +- .../gamecenter/video/game/GameVideoAdapter.kt | 2 +- .../video/game/GameVideoFragment.kt | 14 +- .../video/label/VideoLabelAdapter.kt | 6 +- .../video/label/VideoLabelFragment.kt | 14 +- .../video/poster/PosterClipActivity.kt | 16 +- .../video/poster/PosterEditActivity.kt | 12 +- .../video/poster/photo/PhotoPosterAdapter.kt | 2 +- .../video/poster/photo/PhotoPosterFragment.kt | 4 +- .../video/poster/video/VideoPosterFragment.kt | 14 +- .../poster/video/VideoPosterReviewAdapter.kt | 6 +- .../poster/video/VideoPosterViewModel.kt | 8 +- .../gamecenter/video/upload/UploadManager.kt | 4 +- .../gamecenter/video/upload/UploadThread.kt | 2 +- .../video/upload/view/UploadVideoActivity.kt | 193 ++++++----- .../video/upload/view/UploadVideoViewModel.kt | 6 +- .../video/videomanager/VideoDraftAdapter.kt | 11 +- .../video/videomanager/VideoDraftFragment.kt | 8 +- .../videomanager/VideoManagerActivity.kt | 14 +- .../video/videomanager/VideoVerifyAdapter.kt | 6 +- .../video/videomanager/VideoVerifyFragment.kt | 6 +- .../main/java/com/halo/assistant/HaloApp.java | 95 ++++-- .../halo/assistant/fragment/AboutFragment.kt | 14 +- .../fragment/ApkCleanerFragment.java | 18 +- .../assistant/fragment/SettingsFragment.kt | 36 ++- .../fragment/SwitchInstallMethodFragment.kt | 10 +- .../halo/assistant/fragment/VoteFragment.java | 11 +- .../halo/assistant/fragment/WebFragment.kt | 36 ++- .../comment/CommentDetailFragment.java | 14 +- .../fragment/game/GameNewsSearchFragment.java | 16 +- .../game/GameNewsSearchResultFragment.java | 16 +- .../fragment/game/GamePluggableViewHolder.kt | 4 +- .../fragment/game/GamePluginAdapter.java | 10 +- .../fragment/game/GamePluginViewHolder.java | 2 +- .../fragment/myconcern/MyConcernAdapter.java | 6 +- .../fragment/myconcern/MyConcernFragment.java | 4 +- .../myconcern/MyConcernRecommendAdapter.java | 6 +- .../fragment/user/ManuallyRealNameFragment.kt | 14 +- .../user/ManuallyRealNameViewModel.kt | 4 +- .../fragment/user/RealNameInfoFragment.kt | 28 +- .../fragment/user/RealNameInfoViewModel.kt | 10 +- .../fragment/user/SelectPortraitFragment.java | 12 +- .../fragment/user/SelectRegionFragment.java | 6 +- .../fragment/user/UserInfoEditFragment.kt | 13 +- .../fragment/user/UserInfoFragment.kt | 6 +- .../user/UserPortraitCropImageActivity.java | 12 +- .../fragment/user/VerifiedConfirmDialog.kt | 4 +- .../user/region/RegionCounAdapter.java | 3 +- .../user/region/RegionCountFragment.java | 4 +- .../user/region/RegionProvFragment.java | 10 +- app/src/main/res/layout/activity_amway.xml | 6 +- .../res/layout/activity_background_clip.xml | 6 +- .../main/res/layout/activity_cropimage.xml | 8 +- .../layout/activity_editor_insert_game.xml | 2 +- .../res/layout/activity_full_screen_video.xml | 4 +- .../res/layout/activity_help_and_feedback.xml | 2 +- .../main/res/layout/activity_poster_clip.xml | 2 +- .../main/res/layout/activity_poster_edit.xml | 4 +- .../main/res/layout/activity_rating_edit.xml | 4 +- .../main/res/layout/activity_rating_reply.xml | 6 +- .../layout/activity_tablayout_viewpager.xml | 2 +- app/src/main/res/layout/activity_toolbox.xml | 2 +- .../res/layout/activity_toolbox_block.xml | 2 +- .../main/res/layout/activity_video_game.xml | 6 +- .../main/res/layout/activity_video_uplaod.xml | 6 +- .../main/res/layout/activity_viewimage.xml | 2 +- .../main/res/layout/amway_comment_item.xml | 6 +- .../main/res/layout/catalog_banner_item.xml | 2 +- .../catalog_subject_collection_list_item.xml | 2 +- .../main/res/layout/category_game_item.xml | 2 +- .../main/res/layout/community_answer_item.xml | 8 +- .../main/res/layout/dialog_choose_forum.xml | 4 +- .../main/res/layout/dialog_download_link.xml | 4 +- .../main/res/layout/dialog_game_big_event.xml | 2 +- .../main/res/layout/dialog_game_collect.xml | 4 +- .../layout/dialog_game_resource_policy.xml | 2 +- .../main/res/layout/dialog_kaifu_remind.xml | 4 +- .../dialog_servers_calendear_detail.xml | 4 +- .../dialog_stop_service_explanation.xml | 4 +- .../res/layout/dialog_upload_schedule.xml | 2 +- .../layout/dialog_wechat_reserve_success.xml | 4 +- app/src/main/res/layout/dialog_welcome.xml | 2 +- app/src/main/res/layout/downloadmanager.xml | 2 +- .../main/res/layout/empty_control_video.xml | 6 +- .../res/layout/followers_or_fans_item.xml | 2 +- app/src/main/res/layout/fragment_about.xml | 2 +- app/src/main/res/layout/fragment_amway.xml | 8 +- .../res/layout/fragment_answer_detail.xml | 2 +- .../fragment_answer_detail_container.xml | 2 +- .../main/res/layout/fragment_answer_edit.xml | 4 +- .../res/layout/fragment_article_detail.xml | 4 +- .../res/layout/fragment_ask_questions.xml | 2 +- .../fragment_ask_recommends_wrapper.xml | 8 +- .../res/layout/fragment_avatar_border.xml | 10 +- .../layout/fragment_background_preview.xml | 6 +- .../main/res/layout/fragment_bind_phone.xml | 2 +- .../main/res/layout/fragment_community.xml | 6 +- .../res/layout/fragment_community_home.xml | 4 +- .../res/layout/fragment_energy_center.xml | 4 +- .../main/res/layout/fragment_energy_house.xml | 10 +- .../main/res/layout/fragment_forum_detail.xml | 6 +- .../main/res/layout/fragment_forum_home.xml | 12 +- .../main/res/layout/fragment_forum_list.xml | 2 +- .../layout/fragment_forum_video_detail.xml | 6 +- app/src/main/res/layout/fragment_game.xml | 2 +- .../fragment_game_collection_detail.xml | 4 +- .../fragment_game_collection_poster.xml | 4 +- .../fragment_game_collection_square.xml | 10 +- .../main/res/layout/fragment_gamedetail.xml | 6 +- app/src/main/res/layout/fragment_home.xml | 14 +- .../main/res/layout/fragment_home_video.xml | 8 +- app/src/main/res/layout/fragment_invite.xml | 2 +- app/src/main/res/layout/fragment_libao1.xml | 2 +- .../main/res/layout/fragment_libao_new.xml | 4 +- .../res/layout/fragment_libao_wrapper.xml | 2 +- app/src/main/res/layout/fragment_login.xml | 8 +- app/src/main/res/layout/fragment_main.xml | 4 +- .../main/res/layout/fragment_main_home.xml | 2 +- .../res/layout/fragment_main_home_wrapper.xml | 8 +- .../main/res/layout/fragment_new_personal.xml | 10 +- ...ragment_no_padding_tablayout_viewpager.xml | 2 +- .../res/layout/fragment_package_check.xml | 2 +- .../main/res/layout/fragment_package_skip.xml | 2 +- .../res/layout/fragment_password_setting.xml | 2 +- app/src/main/res/layout/fragment_personal.xml | 10 +- .../res/layout/fragment_preview_video.xml | 2 +- .../res/layout/fragment_search_default.xml | 8 +- .../res/layout/fragment_simulator_game.xml | 2 +- .../main/res/layout/fragment_subject_tab.xml | 2 +- .../res/layout/fragment_subject_tiled.xml | 2 +- .../main/res/layout/fragment_video_data.xml | 2 +- .../fragment_video_detail_container.xml | 4 +- .../main/res/layout/fragment_video_poster.xml | 2 +- .../res/layout/fragment_video_publish.xml | 2 +- app/src/main/res/layout/fragment_web.xml | 6 +- .../res/layout/fragment_wrapper_toolbar.xml | 2 +- .../game_collection_detail_image_item.xml | 4 +- .../game_collection_detail_video_item.xml | 2 +- .../layout/game_column_collection_item.xml | 2 +- .../layout/game_column_collection_list.xml | 2 +- .../main/res/layout/game_comment_log_item.xml | 4 +- app/src/main/res/layout/game_gallery_list.xml | 2 +- .../res/layout/game_gallery_slide_item.xml | 4 +- app/src/main/res/layout/game_item.xml | 4 +- .../main/res/layout/game_update_content.xml | 2 +- .../main/res/layout/game_viewpager_item.xml | 2 +- app/src/main/res/layout/gamedetail_body.xml | 4 +- .../layout/gamedetail_item_custom_column.xml | 4 +- .../layout/gamedetail_item_desc_notice.xml | 2 +- .../main/res/layout/gamedetail_item_image.xml | 2 +- .../res/layout/gamedetail_item_notice.xml | 2 +- .../res/layout/gamedetail_screenshot_item.xml | 2 +- app/src/main/res/layout/home_amway_item.xml | 2 +- .../res/layout/home_game_collection_item.xml | 2 +- app/src/main/res/layout/imprint_dialog.xml | 4 +- .../layout/item_article_detail_comment.xml | 4 +- .../layout/item_article_detail_content.xml | 2 +- app/src/main/res/layout/item_choose_games.xml | 2 +- .../item_game_detail_rating_comment.xml | 4 +- app/src/main/res/layout/item_history_apk.xml | 2 +- .../main/res/layout/item_my_game_rating.xml | 4 +- ...em_skeleton_catalog_subject_collection.xml | 4 +- .../item_skeleton_game_detail_gallery.xml | 4 +- .../item_skeleton_game_detail_video.xml | 4 +- .../item_skeleton_horizontal_forum_list.xml | 4 +- .../item_skeleton_horizontal_simple_list.xml | 4 +- .../item_skeleton_simple_gallery_subject.xml | 4 +- .../res/layout/item_user_comment_history.xml | 4 +- .../main/res/layout/item_video_desc_top.xml | 2 +- app/src/main/res/layout/kaifu_add_item.xml | 4 +- .../res/layout/layout_article_item_video.xml | 6 +- ..._forum_video_detail_videoview_portrait.xml | 2 +- ...yout_full_screen_detail_video_portrait.xml | 2 +- .../layout_game_detail_recommend_view.xml | 2 +- .../main/res/layout/layout_preview_video.xml | 2 +- .../layout/layout_video_detail_surface.xml | 4 +- app/src/main/res/layout/message_item.xml | 2 +- app/src/main/res/layout/message_kefu_item.xml | 2 +- .../main/res/layout/personal_home_rating.xml | 6 +- .../res/layout/piece_game_detail_video.xml | 2 +- .../res/layout/piece_question_content.xml | 2 +- .../main/res/layout/rating_comment_item.xml | 8 +- app/src/main/res/layout/rating_item.xml | 10 +- app/src/main/res/layout/rating_reply_item.xml | 2 +- .../main/res/layout/stairs_comment_item.xml | 2 +- app/src/main/res/layout/toolbar_shadow.xml | 6 +- app/src/main/res/layout/user_history_item.xml | 2 +- .../main/res/layout/viewimage_normal_item.xml | 6 +- app/src/main/res/values-night/colors.xml | 300 ------------------ app/src/main/res/values-night/styles.xml | 81 ----- app/src/main/res/values/attrs.xml | 206 ------------ app/src/main/res/values/colors.xml | 300 ------------------ app/src/main/res/values/dimens.xml | 64 ---- app/src/main/res/values/strings.xml | 10 +- app/src/main/res/values/styles.xml | 79 +---- dependencies.gradle | 2 + gradle.properties | 2 + module_common/.gitignore | 1 + module_common/build.gradle | 74 +++++ .../libs/quick_login_android_5.8.1.aar | Bin module_common/proguard-rules.pro | 21 ++ .../common/ExampleInstrumentedTest.kt | 24 ++ module_common/src/main/AndroidManifest.xml | 8 + .../src/main/assets/lottie/loading.json | 0 .../java/com/gh/gamecenter/common/HaloApp.kt | 44 +++ .../common/annotation/SyncIgnore.java | 2 +- .../common/annotation/SyncPage.java | 2 +- .../common/annotation/Synchronize.java | 2 +- .../avoidcallback/ActivityResultInfo.java | 2 +- .../avoidcallback/AvoidOnResultFragment.kt | 2 +- .../avoidcallback/AvoidOnResultManager.kt | 2 +- .../common/avoidcallback/Callback.kt | 2 +- .../common}/base/BaseRecyclerViewHolder.java | 7 +- .../gamecenter/common}/base/BaseSimpleDao.kt | 8 +- .../common/base}/TrackableDialog.kt | 4 +- .../common}/base/adapter/FragmentAdapter.java | 2 +- .../base/adapter/FragmentStateAdapter.java | 2 +- .../base/fragment/BaseDialogFragment.java | 16 +- .../fragment/BaseDialogWrapperFragment.java | 12 +- .../common}/base/fragment/BaseFragment.java | 27 +- .../base/fragment/BaseFragment_TabLayout.java | 23 +- .../base/fragment/BaseFragment_ViewPager.java | 6 +- .../BaseFragment_ViewPager_Checkable.java | 10 +- .../common}/base/fragment/BaseLazyFragment.kt | 3 +- .../base/fragment/BaseLazyTabFragment.kt | 8 +- .../common}/base/fragment/LazyFragment.kt | 4 +- .../common/base/fragment}/NormalFragment.java | 18 +- .../base/fragment}/ToolbarController.java | 2 +- .../base/fragment/WaitingDialogFragment.java | 8 +- .../gamecenter/common/callback}/BiCallback.kt | 2 +- .../common/callback/ConfirmListener.kt | 5 + .../callback}/OnDialogBackListener.java | 2 +- .../common/callback}/OnDoubleTapListener.java | 2 +- .../common/callback}/OnListClickListener.java | 2 +- .../callback}/OnRequestCallBackListener.java | 2 +- .../common/callback}/OnViewClickListener.java | 2 +- .../common/callback}/SimpleCallback.kt | 2 +- .../gamecenter/common/callback}/Typealias.kt | 2 +- .../gh/gamecenter/common/constant/Config.kt | 8 + .../common/constant/Constants.java | 23 +- .../common/constant/EntranceConsts.java | 240 ++++++++++++++ .../common/constant/ItemViewType.java | 2 +- .../gamecenter/common/constant/RouteConsts.kt | 28 ++ .../gamecenter/common}/eventbus/EBMiPush.java | 2 +- .../gamecenter}/common/exposure/meta/Meta.kt | 2 +- .../common/exposure/meta/MetaUtil.kt | 70 ++-- .../gamecenter}/common/image/EmptyDecoder.kt | 2 +- .../gh/gamecenter}/common/json/JsonBuilder.kt | 2 +- .../common/observer/VolumeObserver.kt | 10 +- .../structure/FixedSizeLinkedHashSet.kt | 2 +- .../common/syncpage/ISyncAdapterHandler.kt | 2 +- .../common/syncpage/SyncDataEntity.kt | 2 +- .../common/syncpage/SyncFieldConstants.kt | 2 +- .../common/syncpage/SyncPageRepository.kt | 16 +- .../common/utils}/AsyncImageLoader.kt | 3 +- .../gamecenter/common/utils}/BitmapUtils.java | 36 ++- .../common/utils}/CompressImageUtils.kt | 47 +-- .../gamecenter/common/utils}/DeviceUtils.java | 21 +- .../gamecenter/common/utils}/DialogHelper.kt | 209 +++++++----- .../common/utils}/EmulatorUtil.java | 97 +++--- .../gh/gamecenter/common/utils/EnvHelper.kt | 45 +++ .../gh/gamecenter/common/utils}/Extensions.kt | 96 +++--- .../common/utils}/FastClickUtils.kt | 4 +- .../common/utils/FixedSizeLinkedHashSet.kt | 16 + .../gh/gamecenter/common/utils}/ImageUtils.kt | 65 ++-- .../common/utils}/Installation.java | 4 +- .../common/utils}/NetworkUtils.java | 2 +- .../common/utils}/NightModeUtils.kt | 5 +- .../common/utils/PackageFlavorHelper.java | 16 + .../common/utils/PermissionHelper.kt | 274 ++++++++++++++++ .../common/utils}/PicassoImageGetter.java | 9 +- .../gh/gamecenter/common/utils}/TextHelper.kt | 26 +- .../common/utils}/TimestampUtils.java | 20 +- .../common/utils}/UserIconUtils.java | 4 +- .../view/AbstractSwipeRefreshHeader.java | 3 +- .../AutoScrollRecyclerViewContainerView.kt | 2 +- ...toScrollRecyclerViewContainerViewBackup.kt | 3 +- .../common/view/AvatarBorderView.kt | 10 +- .../common/view/BugFixedPopupWindow.kt | 2 +- .../common/view/CardLinearLayout.java | 7 +- .../common/view/CardRelativeLayout.java | 7 +- .../common/view/CircleProgressBar.java | 6 +- .../common/view/ClearEditTextNormal.java | 6 +- .../common/view/CropImageBorderView.java | 4 +- .../common/view/CropImageCustom.java | 6 +- .../common/view/CropImageZoomView.java | 2 +- .../view/CustomDividerItemDecoration.kt | 2 +- .../common/view/CustomDurationScroller.java | 2 +- .../common/view/CustomLinkMovementMethod.java | 2 +- .../common/view/CustomMarkerView.kt | 8 +- .../view/CustomOrderDrawChildLinearLayout.kt | 2 +- .../gamecenter}/common/view/CustomSeekBar.kt | 11 +- .../common/view/DraggableBigImageView.kt | 2 +- .../gamecenter}/common/view/DrawableView.kt | 20 +- .../common/view/DumbRefreshLayout.java | 2 +- .../common/view/EllipsizeTextView.kt | 4 +- .../common/view/EmptyDrawable.java | 2 +- .../common/view/ExpandAndCloseTextView.java | 4 +- .../common/view/ExpandTextView.java | 5 +- .../common/view/FixAppBarLayoutBehavior.java | 10 +- .../common/view/FixGridLayoutManager.java | 3 +- .../common/view/FixLinearLayoutManager.java | 2 +- .../common/view/FixedHorizontalScrollView.kt | 2 +- .../common/view/FixedScrollView.kt | 2 +- .../common/view/FixedSpeedScroller.java | 2 +- .../common/view/GameTagContainerView.kt | 4 +- .../common/view/Gh_RelativeLayout.java | 2 +- .../common/view/GradientAlphaTextSpan.kt | 2 +- .../view/GradientRoundBackgroundColorSpan.kt | 14 +- .../gamecenter}/common/view/GridDivider.java | 2 +- .../view/GridSpacingItemColorDecoration.java | 2 +- .../common/view/GridSpacingItemDecoration.kt | 2 +- .../common/view/HighlightableTextView.kt | 15 +- .../common/view/HorizontalItemDecoration.java | 4 +- .../common/view/InterceptRecyclerView.kt | 2 +- .../gh/gamecenter}/common/view/LikeView.kt | 4 +- .../common/view/LimitHeightLinearLayout.java | 6 +- .../common/view/LimitHeightScrollView.java | 6 +- .../common/view/LongPressView.java | 6 +- .../common/view/LongScrollbarWebView.kt | 2 +- .../gamecenter}/common/view/MarqueeView.java | 6 +- .../common/view/MaterializedFrameLayout.kt | 2 +- .../common/view/MaterializedRelativeLayout.kt | 4 +- .../common/view/MaxHeightNestedScrollView.kt | 4 +- .../common/view/MaxHeightRecyclerView.kt | 5 +- .../common/view/MessageSpannableTextView.java | 4 +- .../common/view/NavigationBarView.kt | 4 +- .../common/view/NestedRecyclerView.kt | 4 +- .../common/view/NestedScrollWebView.java | 4 +- .../common/view/NestedScrollWebView2.java | 6 +- .../common/view/NoDefaultMinWidthTabLayout.kt | 2 +- .../common/view/NoScrollFocusScrollView.java | 2 +- .../common/view/OffsetLinearLayoutManager.kt | 6 +- .../gamecenter}/common/view/RadiusCardView.kt | 6 +- .../common/view/RecyclerViewExtended.java | 5 +- .../view/RoundStrokeBackgroundColorSpan.kt | 10 +- .../common/view/ScaleAutoScrollViewPager.java | 13 +- .../common/view/ScaleSimpleDraweeView.java | 4 +- .../view/ScrimAwareCollapsingToolbarLayout.kt | 2 +- .../common/view/ScrollEventListener.kt | 2 +- .../common/view/SegmentedFilterView.kt | 6 +- .../common/view/SpacingItemDecoration.kt | 2 +- .../common/view/StackRecyclerView.kt | 2 +- .../gamecenter}/common/view/StatusBarView.kt | 6 +- .../gamecenter}/common/view/SwipeLayout.java | 13 +- .../common/view/SwipeRefreshHeader.java | 16 +- .../common/view/TabIndicatorView.java | 11 +- .../common/view/ThumbProgressBar.kt | 6 +- .../common/view/TouchSlopRecyclerView.kt | 2 +- .../common/view/TrimmedPaddingTextView.java | 2 +- .../view/UrlInterceptedLinkMovementMethod.kt | 9 +- .../gamecenter}/common/view/VerifyEditText.kt | 5 +- .../common/view/VerticalItemDecoration.java | 8 +- .../common/view/VerticalViewPager.kt | 3 +- .../common/view/WrapContentDraweeView.kt | 2 +- .../common/view/WrapHeightViewPager.kt | 2 +- .../common/view/ZoomCoordinatorLayout.java | 2 +- .../AutoScrollViewPager.java | 6 +- .../CustomDurationScroller.java | 2 +- .../divider/FlexibleDividerDecoration.java | 5 +- .../HorizontalDividerItemDecoration.java | 5 +- .../VerticalDividerItemDecoration.java | 5 +- .../view/dsbridge/CompletionHandler.java | 2 +- .../common/view/dsbridge/DWebView.java | 5 +- .../common/view/dsbridge/OnReturnValue.java | 2 +- .../view/materialratingbar/BaseDrawable.java | 2 +- .../materialratingbar/ClipDrawableCompat.java | 5 +- .../materialratingbar/MaterialRatingBar.java | 8 +- .../MaterialRatingDrawable.java | 9 +- .../view/materialratingbar/TileDrawable.java | 2 +- .../materialratingbar/TintableDrawable.java | 2 +- .../internal/DrawableCompat.java | 2 +- .../internal/ThemeUtils.java | 2 +- .../view/stacklayoutmanager/StackAnimation.kt | 4 +- .../view/stacklayoutmanager/StackLayout.kt | 2 +- .../stacklayoutmanager/StackLayoutManager.kt | 2 +- .../vertical_recycler/CustomRecyclerView.kt | 2 +- .../vertical_recycler/OnPagerListener.java | 2 +- .../vertical_recycler/PagerLayoutManager.java | 2 +- .../vertical_recycler/ScrollPageHelper.java | 24 +- .../SnappingLinearLayoutManager.kt | 4 +- .../src/main/res/anim/anim_marquee_in.xml | 0 .../src/main/res/anim/anim_marquee_out.xml | 0 .../res/anim/popwindow_option_anim_enter.xml | 0 .../res/anim/popwindow_option_anim_exit.xml | 0 .../game_collection_rg_button_selector.xml | 0 .../src/main/res/color/text_tabbar_style.xml | 0 .../res/drawable-hdpi/user_default_icon1.webp | Bin .../res/drawable-hdpi/user_default_icon2.webp | Bin .../res/drawable-hdpi/user_default_icon3.webp | Bin .../res/drawable-hdpi/user_default_icon4.webp | Bin .../res/drawable-hdpi/user_default_icon5.webp | Bin .../res/drawable-hdpi/user_default_icon6.webp | Bin .../res/drawable-hdpi/user_default_icon7.webp | Bin .../res/drawable-hdpi/user_default_icon8.webp | Bin .../drawable-night-xxxhdpi/ic_bar_back.webp | Bin .../src/main/res/drawable-nodpi/occupy.9.png | Bin .../src/main/res/drawable-nodpi/occupy2.webp | Bin .../personal_user_default_icon.webp | Bin .../drawable-v24/ic_launcher_foreground.xml | 30 ++ .../main/res/drawable-xhdpi/frame_bottom.webp | Bin .../main/res/drawable-xhdpi/frame_center.webp | Bin .../main/res/drawable-xhdpi/frame_left.webp | Bin .../frame_left_bottom_square.webp | Bin .../drawable-xhdpi/frame_left_top_square.webp | Bin .../main/res/drawable-xhdpi/frame_right.webp | Bin .../frame_right_bottom_square.webp | Bin .../frame_right_top_square.webp | Bin .../main/res/drawable-xhdpi/frame_top.webp | Bin .../res/drawable-xhdpi/frame_tran_bottom.webp | Bin .../res/drawable-xhdpi/frame_tran_center.webp | Bin .../res/drawable-xhdpi/frame_tran_left.webp | Bin .../frame_tran_left_bottom_square.webp | Bin .../frame_tran_left_top_square.webp | Bin .../res/drawable-xhdpi/frame_tran_right.webp | Bin .../frame_tran_right_bottom_square.webp | Bin .../frame_tran_right_top_square.webp | Bin .../res/drawable-xhdpi/frame_tran_top.webp | Bin .../drawable-xxhdpi/ic_video_arrow_down.webp | Bin .../res/drawable-xxhdpi/icon_input_close.webp | Bin .../icon_package_check_rocket.png | Bin .../main/res/drawable-xxhdpi/refresh_01.webp | Bin .../main/res/drawable-xxhdpi/refresh_02.webp | Bin .../main/res/drawable-xxhdpi/refresh_03.webp | Bin .../main/res/drawable-xxhdpi/refresh_04.png | Bin .../main/res/drawable-xxhdpi/refresh_05.webp | Bin .../main/res/drawable-xxhdpi/refresh_06.png | Bin .../main/res/drawable-xxhdpi/refresh_07.png | Bin .../main/res/drawable-xxhdpi/refresh_08.png | Bin .../main/res/drawable-xxhdpi/refresh_09.png | Bin .../main/res/drawable-xxhdpi/refresh_10.png | Bin .../main/res/drawable-xxhdpi/refresh_11.png | Bin .../main/res/drawable-xxhdpi/refresh_12.png | Bin .../main/res/drawable-xxhdpi/refresh_13.png | Bin .../main/res/drawable-xxhdpi/refresh_14.png | Bin .../main/res/drawable-xxhdpi/refresh_15.png | Bin .../main/res/drawable-xxhdpi/refresh_16.png | Bin .../main/res/drawable-xxhdpi/refresh_17.png | Bin .../main/res/drawable-xxhdpi/refresh_18.png | Bin .../main/res/drawable-xxhdpi/refresh_19.png | Bin .../main/res/drawable-xxhdpi/refresh_20.png | Bin .../main/res/drawable-xxhdpi/refresh_21.png | Bin .../main/res/drawable-xxhdpi/refresh_22.png | Bin .../main/res/drawable-xxhdpi/refresh_23.png | Bin .../main/res/drawable-xxhdpi/refresh_24.png | Bin .../main/res/drawable-xxhdpi/refresh_25.png | Bin .../main/res/drawable-xxhdpi/refresh_26.png | Bin .../main/res/drawable-xxhdpi/refresh_27.png | Bin .../main/res/drawable-xxhdpi/refresh_28.png | Bin .../main/res/drawable-xxhdpi/refresh_29.png | Bin .../main/res/drawable-xxhdpi/refresh_30.png | Bin .../main/res/drawable-xxhdpi/refresh_31.png | Bin .../main/res/drawable-xxhdpi/refresh_32.png | Bin .../main/res/drawable-xxhdpi/refresh_33.png | Bin .../main/res/drawable-xxhdpi/refresh_34.png | Bin .../main/res/drawable-xxhdpi/refresh_35.png | Bin .../main/res/drawable-xxhdpi/refresh_36.png | Bin .../main/res/drawable-xxhdpi/refresh_37.png | Bin .../main/res/drawable-xxhdpi/refresh_38.png | Bin .../main/res/drawable-xxhdpi/refresh_39.png | Bin .../main/res/drawable-xxhdpi/refresh_40.png | Bin .../main/res/drawable-xxhdpi/refresh_41.png | Bin .../main/res/drawable-xxhdpi/refresh_42.png | Bin .../main/res/drawable-xxhdpi/refresh_43.png | Bin .../main/res/drawable-xxhdpi/refresh_44.png | Bin .../main/res/drawable-xxhdpi/refresh_45.webp | Bin .../main/res/drawable-xxhdpi/refresh_46.webp | Bin .../main/res/drawable-xxhdpi/refresh_47.webp | Bin .../main/res/drawable-xxhdpi/refresh_48.webp | Bin .../main/res/drawable-xxhdpi/refresh_49.webp | Bin .../main/res/drawable-xxhdpi/refresh_icon.png | Bin .../res/drawable-xxxhdpi/ic_bar_back.webp | Bin .../res/drawable-xxxhdpi/ic_dialog_close.webp | Bin .../ic_double_click_like.webp | Bin .../res/drawable/ask_tab_indicator_bg.xml | 0 .../res/drawable/background_shape_white.xml | 0 ...ckground_shape_white_alpha_10_radius_2.xml | 0 ...kground_shape_white_radius_12_top_only.xml | 0 ...kground_shape_white_radius_16_top_only.xml | 0 .../background_shape_white_radius_4.xml | 0 .../background_shape_white_radius_5.xml | 0 ...ground_shape_white_radius_5_bottm_only.xml | 0 ...ckground_shape_white_radius_5_top_only.xml | 0 .../background_shape_white_radius_6.xml | 0 .../background_shape_white_radius_8.xml | 0 ...round_shape_white_radius_8_bottom_only.xml | 0 ...ckground_shape_white_radius_8_top_only.xml | 0 .../src/main/res/drawable/bg_chart_marker.xml | 0 .../res/drawable/ic_chart_marker_triangle.xml | 0 .../res/drawable/ic_icon_star_ratting.xml | 0 .../drawable/ic_icon_star_ratting_gray.xml | 0 .../res/drawable/ic_launcher_background.xml | 170 ++++++++++ .../src/main/res/drawable/refresh_anim.xml | 0 .../activity_tablayout_no_title_viewpager.xml | 2 +- .../activity_video_tablayout_viewpager.xml | 0 .../main/res/layout/dialog_alert_default.xml | 0 .../src/main/res/layout/dialog_progress.xml | 0 .../res/layout/fragment_dialog_wrapper.xml | 0 .../src/main/res/layout/fragment_stub.xml | 0 .../layout/fragment_tablayout_viewpager.xml | 2 +- .../res/layout/layout_chart_markerview.xml | 0 .../main/res/layout/piece_refresh_hint.xml | 0 .../src/main/res/layout/set_wait_dialog.xml | 0 .../src/main/res/layout/tab_item.xml | 0 .../main/res/layout/view_avatar_border.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes .../src/main/res/values-night/colors.xml | 297 +++++++++++++++++ .../src/main/res/values-night/style.xml | 85 +++++ .../src/main/res/values-night/themes.xml | 16 + module_common/src/main/res/values/attrs.xml | 215 +++++++++++++ module_common/src/main/res/values/colors.xml | 297 +++++++++++++++++ module_common/src/main/res/values/dimens.xml | 68 ++++ module_common/src/main/res/values/strings.xml | 10 + module_common/src/main/res/values/style.xml | 86 +++++ module_common/src/main/res/values/themes.xml | 16 + .../gh/gamecenter/common/ExampleUnitTest.kt | 17 + module_core/.gitignore | 1 + module_core/build.gradle | 93 ++++++ module_core/proguard-rules.pro | 21 ++ .../core/ExampleInstrumentedTest.kt | 24 ++ module_core/src/main/AndroidManifest.xml | 6 + .../com/gh/gamecenter/core}/AppExecutor.kt | 11 +- .../gh/gamecenter/core}/GHThreadFactory.kt | 2 +- .../java/com/gh/gamecenter/core/HaloApp.kt | 45 +++ .../core/iinterface/IApplication.kt | 19 ++ .../core}/iinterface/IOffsetable.kt | 2 +- .../core}/iinterface/IScrollable.kt | 2 +- .../core/iinterface}/SearchBarHint.java | 2 +- .../core/provider/IActivationProvider.kt | 7 + .../gamecenter/core/provider/IAppProvider.kt | 17 + .../core/provider/IBuildConfigProvider.kt | 15 + .../core/provider/ICheckLoginProvider.kt | 8 + .../core/provider/IConfigProvider.kt | 15 + .../provider/IDefaultUrlHandlerProvider.kt | 9 + .../core/provider/IDialogUtilsProvider.kt | 9 + .../core/provider/IDirectProvider.kt | 10 + .../core/provider/IPackageUtilsProvider.kt | 9 + .../core/provider/IUserManagerProvider.kt | 10 + .../gamecenter/core/provider/IWebProvider.kt | 9 + .../com/gh/gamecenter/core/utils}/Animator.kt | 2 +- .../core/utils}/AppDebugConfig.java | 4 +- .../core/utils}/CenterImageSpan.java | 2 +- .../gh/gamecenter/core/utils}/ClassUtils.java | 2 +- .../gh/gamecenter/core/utils}/ClickUtils.java | 2 +- .../core/utils}/CurrentActivityHolder.kt | 2 +- .../gamecenter/core/utils}/DisplayUtils.java | 17 +- .../gh/gamecenter/core/utils}/EmojiUtils.java | 2 +- .../gamecenter/core/utils}/EmptyCallback.kt | 2 +- .../gamecenter/core/utils}/ExtraTagHandler.kt | 2 +- .../gh/gamecenter/core/utils}/GsonUtils.kt | 2 +- .../gh/gamecenter/core/utils}/GzipUtils.java | 2 +- .../gh/gamecenter/core/utils}/HtmlUtils.java | 2 +- .../core/utils}/KeyboardHeightObserver.java | 2 +- .../core/utils}/KeyboardHeightProvider.java | 5 +- .../gh/gamecenter/core/utils}/MD5Utils.java | 2 +- .../gh/gamecenter/core/utils}/MtaHelper.kt | 2 +- .../gh/gamecenter/core/utils}/NumberUtils.kt | 2 +- .../core/utils}/PageSwitchDataHelper.kt | 2 +- .../gamecenter/core/utils}/PatternUtils.java | 2 +- .../gamecenter/core/utils}/RandomUtils.java | 4 +- .../core/utils}/RichEditorUtils.java | 2 +- .../gamecenter/core/utils}/RunningUtils.java | 2 +- .../gh/gamecenter/core/utils}/SentryHelper.kt | 7 +- .../gh/gamecenter/core/utils}/ServiceUtils.kt | 2 +- .../core/utils}/SharedPreferences.kt | 0 .../core/utils}/SimpleImageLoader.java | 2 +- .../gamecenter/core/utils}/SingletonHolder.kt | 2 +- .../com/gh/gamecenter/core/utils}/SpUtils.kt | 6 +- .../gh/gamecenter/core/utils}/SpanBuilder.kt | 15 +- .../gh/gamecenter/core/utils}/SpeedUtils.java | 2 +- .../gamecenter/core/utils}/StringUtils.java | 2 +- .../core/utils}/ThirdPartyPackageHelper.kt | 2 +- .../core/utils}/TimeElapsedHelper.kt | 9 +- .../gh/gamecenter/core/utils}/TimeUtils.kt | 2 +- .../gh/gamecenter/core/utils}/ToastUtils.kt | 4 +- .../gamecenter/core/utils}/TopCutProcess.kt | 3 +- .../core/utils}/UrlFilterUtils.java | 6 +- .../drawable-v24/ic_launcher_foreground.xml | 30 ++ .../res/drawable/ic_launcher_background.xml | 170 ++++++++++ .../src/main/res/layout/popupwindow.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes .../src/main/res/values-night/colors.xml | 9 + .../src/main/res/values-night/themes.xml | 16 + module_core/src/main/res/values/colors.xml | 9 + module_core/src/main/res/values/strings.xml | 3 + module_core/src/main/res/values/themes.xml | 16 + .../com/gh/gamecenter/core/ExampleUnitTest.kt | 17 + settings.gradle | 2 + 1574 files changed, 10104 insertions(+), 7426 deletions(-) rename app/src/main/java/com/gh/common/{view => dialog}/ReserveDialog.kt (91%) rename app/src/main/java/com/gh/common/{view => dialog}/WelcomeDialog.kt (77%) create mode 100644 app/src/main/java/com/gh/common/provider/ActivationProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/AppProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/CheckLoginProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/DefaultUrlHandlerProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/DialogUtilsProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/PackageUtilsProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/WebProviderImpl.kt delete mode 100644 app/src/main/java/com/gh/common/syncpage/example/ExampleAdapter.kt delete mode 100644 app/src/main/java/com/gh/common/syncpage/example/ExampleFragment.kt delete mode 100644 app/src/main/java/com/gh/common/util/EnvHelper.kt delete mode 100644 app/src/main/java/com/gh/common/util/PackageFlavorHelper.java delete mode 100644 app/src/main/java/com/gh/common/util/PermissionHelper.kt create mode 100644 module_common/.gitignore create mode 100644 module_common/build.gradle rename {app => module_common}/libs/quick_login_android_5.8.1.aar (100%) create mode 100644 module_common/proguard-rules.pro create mode 100644 module_common/src/androidTest/java/com/gh/gamecenter/common/ExampleInstrumentedTest.kt create mode 100644 module_common/src/main/AndroidManifest.xml rename {app => module_common}/src/main/assets/lottie/loading.json (100%) create mode 100644 module_common/src/main/java/com/gh/gamecenter/common/HaloApp.kt rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/annotation/SyncIgnore.java (88%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/annotation/SyncPage.java (86%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/annotation/Synchronize.java (85%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/avoidcallback/ActivityResultInfo.java (91%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/avoidcallback/AvoidOnResultFragment.kt (97%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/avoidcallback/AvoidOnResultManager.kt (97%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/avoidcallback/Callback.kt (70%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter/common}/base/BaseRecyclerViewHolder.java (93%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter/common}/base/BaseSimpleDao.kt (92%) rename {app/src/main/java/com/gh/common/dialog => module_common/src/main/java/com/gh/gamecenter/common/base}/TrackableDialog.kt (95%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter/common}/base/adapter/FragmentAdapter.java (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter/common}/base/adapter/FragmentStateAdapter.java (93%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter/common}/base/fragment/BaseDialogFragment.java (95%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter/common}/base/fragment/BaseDialogWrapperFragment.java (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter/common}/base/fragment/BaseFragment.java (93%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter/common}/base/fragment/BaseFragment_TabLayout.java (95%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter/common}/base/fragment/BaseFragment_ViewPager.java (98%) mode change 100755 => 100644 rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter/common}/base/fragment/BaseFragment_ViewPager_Checkable.java (96%) mode change 100755 => 100644 rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter/common}/base/fragment/BaseLazyFragment.kt (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter/common}/base/fragment/BaseLazyTabFragment.kt (95%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter/common}/base/fragment/LazyFragment.kt (97%) rename {app/src/main/java/com/gh/gamecenter/normal => module_common/src/main/java/com/gh/gamecenter/common/base/fragment}/NormalFragment.java (86%) rename {app/src/main/java/com/gh/gamecenter/normal => module_common/src/main/java/com/gh/gamecenter/common/base/fragment}/ToolbarController.java (90%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter/common}/base/fragment/WaitingDialogFragment.java (94%) rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/callback}/BiCallback.kt (71%) create mode 100644 module_common/src/main/java/com/gh/gamecenter/common/callback/ConfirmListener.kt rename {app/src/main/java/com/gh/base/fragment => module_common/src/main/java/com/gh/gamecenter/common/callback}/OnDialogBackListener.java (59%) rename {app/src/main/java/com/gh/base => module_common/src/main/java/com/gh/gamecenter/common/callback}/OnDoubleTapListener.java (95%) rename {app/src/main/java/com/gh/base => module_common/src/main/java/com/gh/gamecenter/common/callback}/OnListClickListener.java (89%) rename {app/src/main/java/com/gh/base => module_common/src/main/java/com/gh/gamecenter/common/callback}/OnRequestCallBackListener.java (84%) rename {app/src/main/java/com/gh/base => module_common/src/main/java/com/gh/gamecenter/common/callback}/OnViewClickListener.java (71%) rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/callback}/SimpleCallback.kt (58%) rename {app/src/main/java/com/gh/common => module_common/src/main/java/com/gh/gamecenter/common/callback}/Typealias.kt (59%) create mode 100644 module_common/src/main/java/com/gh/gamecenter/common/constant/Config.kt rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/constant/Constants.java (95%) create mode 100644 module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/constant/ItemViewType.java (98%) create mode 100644 module_common/src/main/java/com/gh/gamecenter/common/constant/RouteConsts.kt rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/eventbus/EBMiPush.java (91%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/exposure/meta/Meta.kt (93%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/exposure/meta/MetaUtil.kt (74%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/image/EmptyDecoder.kt (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/json/JsonBuilder.kt (95%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/observer/VolumeObserver.kt (79%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/structure/FixedSizeLinkedHashSet.kt (88%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/syncpage/ISyncAdapterHandler.kt (84%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/syncpage/SyncDataEntity.kt (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/syncpage/SyncFieldConstants.kt (95%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/syncpage/SyncPageRepository.kt (92%) rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/utils}/AsyncImageLoader.kt (97%) rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/utils}/BitmapUtils.java (96%) rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/utils}/CompressImageUtils.kt (81%) rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/utils}/DeviceUtils.java (97%) rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/utils}/DialogHelper.kt (61%) rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/utils}/EmulatorUtil.java (78%) create mode 100644 module_common/src/main/java/com/gh/gamecenter/common/utils/EnvHelper.kt rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/utils}/Extensions.kt (88%) rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/utils}/FastClickUtils.kt (84%) create mode 100644 module_common/src/main/java/com/gh/gamecenter/common/utils/FixedSizeLinkedHashSet.kt rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/utils}/ImageUtils.kt (90%) rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/utils}/Installation.java (94%) rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/utils}/NetworkUtils.java (99%) rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/utils}/NightModeUtils.kt (92%) create mode 100644 module_common/src/main/java/com/gh/gamecenter/common/utils/PackageFlavorHelper.java create mode 100644 module_common/src/main/java/com/gh/gamecenter/common/utils/PermissionHelper.kt rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/utils}/PicassoImageGetter.java (95%) rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/utils}/TextHelper.kt (93%) rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/utils}/TimestampUtils.java (88%) rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/utils}/UserIconUtils.java (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/AbstractSwipeRefreshHeader.java (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/AutoScrollRecyclerViewContainerView.kt (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/AutoScrollRecyclerViewContainerViewBackup.kt (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/AvatarBorderView.kt (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/BugFixedPopupWindow.kt (92%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/CardLinearLayout.java (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/CardRelativeLayout.java (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/CircleProgressBar.java (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/ClearEditTextNormal.java (97%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/CropImageBorderView.java (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/CropImageCustom.java (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/CropImageZoomView.java (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/CustomDividerItemDecoration.kt (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/CustomDurationScroller.java (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/CustomLinkMovementMethod.java (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/CustomMarkerView.kt (81%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/CustomOrderDrawChildLinearLayout.kt (92%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/CustomSeekBar.kt (94%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/DraggableBigImageView.kt (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/DrawableView.kt (90%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/DumbRefreshLayout.java (94%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/EllipsizeTextView.kt (95%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/EmptyDrawable.java (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/ExpandAndCloseTextView.java (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/ExpandTextView.java (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/FixAppBarLayoutBehavior.java (97%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/FixGridLayoutManager.java (91%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/FixLinearLayoutManager.java (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/FixedHorizontalScrollView.kt (95%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/FixedScrollView.kt (95%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/FixedSpeedScroller.java (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/GameTagContainerView.kt (92%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/Gh_RelativeLayout.java (97%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/GradientAlphaTextSpan.kt (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/GradientRoundBackgroundColorSpan.kt (87%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/GridDivider.java (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/GridSpacingItemColorDecoration.java (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/GridSpacingItemDecoration.kt (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/HighlightableTextView.kt (76%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/HorizontalItemDecoration.java (95%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/InterceptRecyclerView.kt (97%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/LikeView.kt (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/LimitHeightLinearLayout.java (93%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/LimitHeightScrollView.java (93%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/LongPressView.java (97%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/LongScrollbarWebView.kt (90%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/MarqueeView.java (97%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/MaterializedFrameLayout.kt (95%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/MaterializedRelativeLayout.kt (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/MaxHeightNestedScrollView.kt (94%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/MaxHeightRecyclerView.kt (92%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/MessageSpannableTextView.java (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/NavigationBarView.kt (88%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/NestedRecyclerView.kt (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/NestedScrollWebView.java (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/NestedScrollWebView2.java (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/NoDefaultMinWidthTabLayout.kt (97%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/NoScrollFocusScrollView.java (94%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/OffsetLinearLayoutManager.kt (87%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/RadiusCardView.kt (94%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/RecyclerViewExtended.java (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/RoundStrokeBackgroundColorSpan.kt (88%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/ScaleAutoScrollViewPager.java (79%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/ScaleSimpleDraweeView.java (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/ScrimAwareCollapsingToolbarLayout.kt (92%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/ScrollEventListener.kt (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/SegmentedFilterView.kt (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/SpacingItemDecoration.kt (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/StackRecyclerView.kt (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/StatusBarView.kt (76%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/SwipeLayout.java (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/SwipeRefreshHeader.java (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/TabIndicatorView.java (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/ThumbProgressBar.kt (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/TouchSlopRecyclerView.kt (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/TrimmedPaddingTextView.java (93%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/UrlInterceptedLinkMovementMethod.kt (84%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/VerifyEditText.kt (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/VerticalItemDecoration.java (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/VerticalViewPager.kt (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/WrapContentDraweeView.kt (97%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/WrapHeightViewPager.kt (95%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/ZoomCoordinatorLayout.java (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/autoscrollviewpager/AutoScrollViewPager.java (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/autoscrollviewpager/CustomDurationScroller.java (95%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/divider/FlexibleDividerDecoration.java (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/divider/HorizontalDividerItemDecoration.java (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/divider/VerticalDividerItemDecoration.java (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/dsbridge/CompletionHandler.java (77%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/dsbridge/DWebView.java (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/dsbridge/OnReturnValue.java (69%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/materialratingbar/BaseDrawable.java (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/materialratingbar/ClipDrawableCompat.java (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/materialratingbar/MaterialRatingBar.java (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/materialratingbar/MaterialRatingDrawable.java (96%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/materialratingbar/TileDrawable.java (97%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/materialratingbar/TintableDrawable.java (97%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/materialratingbar/internal/DrawableCompat.java (91%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/materialratingbar/internal/ThemeUtils.java (91%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/stacklayoutmanager/StackAnimation.kt (83%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/stacklayoutmanager/StackLayout.kt (95%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/stacklayoutmanager/StackLayoutManager.kt (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/vertical_recycler/CustomRecyclerView.kt (91%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/vertical_recycler/OnPagerListener.java (91%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/vertical_recycler/PagerLayoutManager.java (99%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/vertical_recycler/ScrollPageHelper.java (95%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/view/vertical_recycler/SnappingLinearLayoutManager.kt (91%) rename {app => module_common}/src/main/res/anim/anim_marquee_in.xml (100%) rename {app => module_common}/src/main/res/anim/anim_marquee_out.xml (100%) rename {app => module_common}/src/main/res/anim/popwindow_option_anim_enter.xml (100%) rename {app => module_common}/src/main/res/anim/popwindow_option_anim_exit.xml (100%) rename {app => module_common}/src/main/res/color/game_collection_rg_button_selector.xml (100%) rename {app => module_common}/src/main/res/color/text_tabbar_style.xml (100%) rename {app => module_common}/src/main/res/drawable-hdpi/user_default_icon1.webp (100%) rename {app => module_common}/src/main/res/drawable-hdpi/user_default_icon2.webp (100%) rename {app => module_common}/src/main/res/drawable-hdpi/user_default_icon3.webp (100%) rename {app => module_common}/src/main/res/drawable-hdpi/user_default_icon4.webp (100%) rename {app => module_common}/src/main/res/drawable-hdpi/user_default_icon5.webp (100%) rename {app => module_common}/src/main/res/drawable-hdpi/user_default_icon6.webp (100%) rename {app => module_common}/src/main/res/drawable-hdpi/user_default_icon7.webp (100%) rename {app => module_common}/src/main/res/drawable-hdpi/user_default_icon8.webp (100%) rename {app => module_common}/src/main/res/drawable-night-xxxhdpi/ic_bar_back.webp (100%) rename {app => module_common}/src/main/res/drawable-nodpi/occupy.9.png (100%) rename {app => module_common}/src/main/res/drawable-nodpi/occupy2.webp (100%) rename {app => module_common}/src/main/res/drawable-nodpi/personal_user_default_icon.webp (100%) create mode 100644 module_common/src/main/res/drawable-v24/ic_launcher_foreground.xml rename {app => module_common}/src/main/res/drawable-xhdpi/frame_bottom.webp (100%) rename {app => module_common}/src/main/res/drawable-xhdpi/frame_center.webp (100%) rename {app => module_common}/src/main/res/drawable-xhdpi/frame_left.webp (100%) rename {app => module_common}/src/main/res/drawable-xhdpi/frame_left_bottom_square.webp (100%) rename {app => module_common}/src/main/res/drawable-xhdpi/frame_left_top_square.webp (100%) rename {app => module_common}/src/main/res/drawable-xhdpi/frame_right.webp (100%) rename {app => module_common}/src/main/res/drawable-xhdpi/frame_right_bottom_square.webp (100%) rename {app => module_common}/src/main/res/drawable-xhdpi/frame_right_top_square.webp (100%) rename {app => module_common}/src/main/res/drawable-xhdpi/frame_top.webp (100%) rename {app => module_common}/src/main/res/drawable-xhdpi/frame_tran_bottom.webp (100%) rename {app => module_common}/src/main/res/drawable-xhdpi/frame_tran_center.webp (100%) rename {app => module_common}/src/main/res/drawable-xhdpi/frame_tran_left.webp (100%) rename {app => module_common}/src/main/res/drawable-xhdpi/frame_tran_left_bottom_square.webp (100%) rename {app => module_common}/src/main/res/drawable-xhdpi/frame_tran_left_top_square.webp (100%) rename {app => module_common}/src/main/res/drawable-xhdpi/frame_tran_right.webp (100%) rename {app => module_common}/src/main/res/drawable-xhdpi/frame_tran_right_bottom_square.webp (100%) rename {app => module_common}/src/main/res/drawable-xhdpi/frame_tran_right_top_square.webp (100%) rename {app => module_common}/src/main/res/drawable-xhdpi/frame_tran_top.webp (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/ic_video_arrow_down.webp (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/icon_input_close.webp (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/icon_package_check_rocket.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_01.webp (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_02.webp (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_03.webp (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_04.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_05.webp (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_06.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_07.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_08.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_09.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_10.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_11.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_12.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_13.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_14.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_15.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_16.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_17.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_18.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_19.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_20.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_21.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_22.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_23.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_24.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_25.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_26.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_27.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_28.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_29.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_30.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_31.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_32.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_33.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_34.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_35.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_36.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_37.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_38.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_39.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_40.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_41.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_42.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_43.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_44.png (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_45.webp (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_46.webp (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_47.webp (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_48.webp (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_49.webp (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/refresh_icon.png (100%) rename {app => module_common}/src/main/res/drawable-xxxhdpi/ic_bar_back.webp (100%) rename {app => module_common}/src/main/res/drawable-xxxhdpi/ic_dialog_close.webp (100%) rename {app => module_common}/src/main/res/drawable-xxxhdpi/ic_double_click_like.webp (100%) rename {app => module_common}/src/main/res/drawable/ask_tab_indicator_bg.xml (100%) rename {app => module_common}/src/main/res/drawable/background_shape_white.xml (100%) rename {app => module_common}/src/main/res/drawable/background_shape_white_alpha_10_radius_2.xml (100%) rename {app => module_common}/src/main/res/drawable/background_shape_white_radius_12_top_only.xml (100%) rename {app => module_common}/src/main/res/drawable/background_shape_white_radius_16_top_only.xml (100%) rename {app => module_common}/src/main/res/drawable/background_shape_white_radius_4.xml (100%) rename {app => module_common}/src/main/res/drawable/background_shape_white_radius_5.xml (100%) rename {app => module_common}/src/main/res/drawable/background_shape_white_radius_5_bottm_only.xml (100%) rename {app => module_common}/src/main/res/drawable/background_shape_white_radius_5_top_only.xml (100%) rename {app => module_common}/src/main/res/drawable/background_shape_white_radius_6.xml (100%) rename {app => module_common}/src/main/res/drawable/background_shape_white_radius_8.xml (100%) rename {app => module_common}/src/main/res/drawable/background_shape_white_radius_8_bottom_only.xml (100%) rename {app => module_common}/src/main/res/drawable/background_shape_white_radius_8_top_only.xml (100%) rename {app => module_common}/src/main/res/drawable/bg_chart_marker.xml (100%) rename {app => module_common}/src/main/res/drawable/ic_chart_marker_triangle.xml (100%) rename {app => module_common}/src/main/res/drawable/ic_icon_star_ratting.xml (100%) rename {app => module_common}/src/main/res/drawable/ic_icon_star_ratting_gray.xml (100%) create mode 100644 module_common/src/main/res/drawable/ic_launcher_background.xml rename {app => module_common}/src/main/res/drawable/refresh_anim.xml (100%) rename {app => module_common}/src/main/res/layout/activity_tablayout_no_title_viewpager.xml (97%) rename {app => module_common}/src/main/res/layout/activity_video_tablayout_viewpager.xml (100%) rename {app => module_common}/src/main/res/layout/dialog_alert_default.xml (100%) rename {app => module_common}/src/main/res/layout/dialog_progress.xml (100%) rename {app => module_common}/src/main/res/layout/fragment_dialog_wrapper.xml (100%) rename {app => module_common}/src/main/res/layout/fragment_stub.xml (100%) rename {app => module_common}/src/main/res/layout/fragment_tablayout_viewpager.xml (96%) rename {app => module_common}/src/main/res/layout/layout_chart_markerview.xml (100%) rename {app => module_common}/src/main/res/layout/piece_refresh_hint.xml (100%) rename {app => module_common}/src/main/res/layout/set_wait_dialog.xml (100%) rename {app => module_common}/src/main/res/layout/tab_item.xml (100%) rename {app => module_common}/src/main/res/layout/view_avatar_border.xml (100%) create mode 100644 module_common/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 module_common/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 module_common/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 module_common/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 module_common/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 module_common/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 module_common/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 module_common/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 module_common/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 module_common/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 module_common/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 module_common/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 module_common/src/main/res/values-night/colors.xml create mode 100644 module_common/src/main/res/values-night/style.xml create mode 100644 module_common/src/main/res/values-night/themes.xml create mode 100644 module_common/src/main/res/values/attrs.xml create mode 100644 module_common/src/main/res/values/colors.xml create mode 100644 module_common/src/main/res/values/dimens.xml create mode 100644 module_common/src/main/res/values/strings.xml create mode 100644 module_common/src/main/res/values/style.xml create mode 100644 module_common/src/main/res/values/themes.xml create mode 100644 module_common/src/test/java/com/gh/gamecenter/common/ExampleUnitTest.kt create mode 100644 module_core/.gitignore create mode 100644 module_core/build.gradle create mode 100644 module_core/proguard-rules.pro create mode 100644 module_core/src/androidTest/java/com/gh/gamecenter/core/ExampleInstrumentedTest.kt create mode 100644 module_core/src/main/AndroidManifest.xml rename {app/src/main/java/com/gh/common => module_core/src/main/java/com/gh/gamecenter/core}/AppExecutor.kt (89%) rename {app/src/main/java/com/gh/base => module_core/src/main/java/com/gh/gamecenter/core}/GHThreadFactory.kt (93%) create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/HaloApp.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/iinterface/IApplication.kt rename {app/src/main/java/com/gh/common => module_core/src/main/java/com/gh/gamecenter/core}/iinterface/IOffsetable.kt (80%) rename {app/src/main/java/com/gh/common => module_core/src/main/java/com/gh/gamecenter/core}/iinterface/IScrollable.kt (53%) rename {app/src/main/java/com/gh/base => module_core/src/main/java/com/gh/gamecenter/core/iinterface}/SearchBarHint.java (80%) create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IActivationProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IAppProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IBuildConfigProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/ICheckLoginProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IConfigProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IDefaultUrlHandlerProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IDialogUtilsProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IDirectProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IPackageUtilsProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IUserManagerProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IWebProvider.kt rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/Animator.kt (99%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/AppDebugConfig.java (97%) rename {app/src/main/java/com/gh/common/view => module_core/src/main/java/com/gh/gamecenter/core/utils}/CenterImageSpan.java (98%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/ClassUtils.java (95%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/ClickUtils.java (97%) rename {app/src/main/java/com/gh/base => module_core/src/main/java/com/gh/gamecenter/core/utils}/CurrentActivityHolder.kt (89%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/DisplayUtils.java (96%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/EmojiUtils.java (99%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/EmptyCallback.kt (56%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/ExtraTagHandler.kt (99%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/GsonUtils.kt (96%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/GzipUtils.java (98%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/HtmlUtils.java (98%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/KeyboardHeightObserver.java (97%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/KeyboardHeightProvider.java (98%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/MD5Utils.java (99%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/MtaHelper.kt (98%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/NumberUtils.kt (97%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/PageSwitchDataHelper.kt (97%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/PatternUtils.java (98%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/RandomUtils.java (96%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/RichEditorUtils.java (97%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/RunningUtils.java (99%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/SentryHelper.kt (84%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/ServiceUtils.kt (93%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/SharedPreferences.kt (100%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/SimpleImageLoader.java (93%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/SingletonHolder.kt (93%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/SpUtils.kt (95%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/SpanBuilder.kt (92%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/SpeedUtils.java (97%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/StringUtils.java (98%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/ThirdPartyPackageHelper.kt (92%) rename {app/src/main/java/com/gh/common => module_core/src/main/java/com/gh/gamecenter/core/utils}/TimeElapsedHelper.kt (93%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/TimeUtils.kt (99%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/ToastUtils.kt (85%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/TopCutProcess.kt (93%) rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/UrlFilterUtils.java (96%) create mode 100644 module_core/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 module_core/src/main/res/drawable/ic_launcher_background.xml rename {app => module_core}/src/main/res/layout/popupwindow.xml (100%) create mode 100644 module_core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 module_core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 module_core/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 module_core/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 module_core/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 module_core/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 module_core/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 module_core/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 module_core/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 module_core/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 module_core/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 module_core/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 module_core/src/main/res/values-night/colors.xml create mode 100644 module_core/src/main/res/values-night/themes.xml create mode 100644 module_core/src/main/res/values/colors.xml create mode 100644 module_core/src/main/res/values/strings.xml create mode 100644 module_core/src/main/res/values/themes.xml create mode 100644 module_core/src/test/java/com/gh/gamecenter/core/ExampleUnitTest.kt diff --git a/app/build.gradle b/app/build.gradle index e187411c95..c72467cd3a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -104,6 +104,12 @@ android { } } + kapt { + arguments { + arg("AROUTER_MODULE_NAME", project.name) + } + } + buildTypes { debug { debuggable true @@ -216,18 +222,12 @@ dependencies { debugImplementation "com.github.nichbar:WhatTheStack:${whatTheStack}" debugImplementation "io.github.didi.dokit:dokitx:${dokit}" - implementation "androidx.core:core-ktx:${core}" - implementation "androidx.fragment:fragment-ktx:${fragment}" + implementation "androidx.multidex:multidex:${multiDex}" - implementation "androidx.appcompat:appcompat:${appCompat}" - implementation "androidx.cardview:cardview:${cardView}" + implementation "androidx.fragment:fragment-ktx:${fragment}" + implementation "androidx.annotation:annotation:${annotation}" - implementation "androidx.constraintlayout:constraintlayout:${constraintLayout}" - implementation "androidx.recyclerview:recyclerview:${recyclerView}" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifeCycle" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifeCycle" - implementation "androidx.lifecycle:lifecycle-common-java8:$lifeCycle" - implementation "androidx.lifecycle:lifecycle-extensions:$lifeCycleExtensions" + implementation "androidx.room:room-runtime:${room}" implementation "androidx.room:room-rxjava2:${room}" implementation "androidx.core:core-ktx:${ktx}" @@ -235,41 +235,17 @@ dependencies { implementation "androidx.webkit:webkit:${webkit}" kapt "androidx.room:room-compiler:${room}" - implementation "com.google.android.material:material:${material}" - implementation "com.kyleduo.switchbutton:library:${switchButton}" - implementation "com.facebook.fresco:fresco:${fresco}" - implementation "com.facebook.fresco:animated-gif-lite:${fresco}" - implementation "com.facebook.fresco:animated-drawable:${fresco}" - implementation "com.facebook.fresco:animated-webp:${fresco}" - implementation "com.facebook.fresco:webpsupport:${fresco}" - - implementation "com.squareup.okhttp3:okhttp:${okHttp}" - implementation "com.leon.channel:helper:${apkChannelPackage}" - implementation "com.squareup.retrofit2:retrofit:${retrofit}" - implementation "com.squareup.retrofit2:converter-gson:${retrofit}" // include gson 2.7 - implementation "com.squareup.retrofit2:adapter-rxjava2:${retrofit}" - implementation "com.j256.ormlite:ormlite-android:${ormlite}" implementation "com.j256.ormlite:ormlite-core:${ormlite}" implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}" - implementation "org.greenrobot:eventbus:${eventbus}" kapt "org.greenrobot:eventbus-annotation-processor:${eventbusApt}" - implementation "io.reactivex.rxjava2:rxjava:${rxJava2}" - implementation "io.reactivex.rxjava2:rxandroid:${rxAndroid2}" - implementation "com.jakewharton.rxbinding2:rxbinding:${rxBinding2}" - - implementation "com.google.zxing:core:${zxing}" - implementation "com.google.zxing:android-core:${zxing}" - - implementation "com.daimajia.swipelayout:library:${swipeLayout}" - implementation "com.google.android:flexbox:${flexbox}" implementation "pub.devrel:easypermissions:${easypermissions}" @@ -278,16 +254,11 @@ dependencies { implementation "com.contrarywind:Android-PickerView:${pickerView}" - implementation "com.scwang.smartrefresh:SmartRefreshLayout:${smartRefreshLayout}" implementation "net.cachapa.expandablelayout:expandablelayout:${expandableLayout}" // 用于比较 versionName 是大于小于或等于 implementation "com.g00fy2:versioncompare:${versioncompare}" - implementation "top.zibin:Luban:${luban}" - - implementation "com.squareup.picasso:picasso:${picasso}" - // for video streaming implementation("com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-java:$gsyVideo", { exclude module: "gsyvideoplayer-androidvideocache" @@ -299,11 +270,8 @@ dependencies { implementation "com.llew.huawei:verifier:${verifier}" - implementation "com.github.tbruyelle:rxpermissions:${rxPermissions}" - implementation "com.lg:skeleton:${skeleton}" implementation "com.tencent.mm.opensdk:wechat-sdk-android-without-mta:${mta}" - implementation "com.github.nichbar:AndroidRomChecker:${romChecker}" debugImplementation "com.github.nichbar.chucker:library:${chucker}" releaseImplementation "com.github.nichbar.chucker:library-no-op:${chucker}" @@ -311,22 +279,8 @@ dependencies { implementation "com.aliyun.dpa:oss-android-sdk:${oss}" - implementation "com.airbnb.android:lottie:${lottie}" - implementation "net.lingala.zip4j:zip4j:${zip4j}" - implementation "io.sentry:sentry-android:4.3.0" - - implementation("com.github.piasy:BigImageViewer:${bigImageViewer}", { - exclude group: 'com.squareup.okhttp3' - exclude group: 'androidx.swiperefreshlayout' - exclude group: 'com.github.bumptech.glide' - exclude group: 'com.facebook.fresco' - }) - implementation "com.github.PhilJay:MPAndroidChart:${chart}" - - implementation "com.lahm.library:easy-protector-release:${easyProtector}" - implementation "com.github.hsiafan:apk-parser:${apkParser}" implementation "org.nanohttpd:nanohttpd:${nanohttpd}" @@ -341,13 +295,10 @@ dependencies { implementation "com.lg:gid:${gid}" - implementation "com.louiscad.splitties:splitties-fun-pack-android-base-with-views-dsl:${splitties}" - compileOnly "com.github.axen1314.lancet:lancet-base:${lancet_version}" + kapt "com.alibaba:arouter-compiler:$arouterVersion" - implementation project(':libraries:LGLibrary') - implementation project(':libraries:QQShare') - implementation project(':libraries:Matisse') + implementation project(':module_common') } File propFile = file('sign.properties') if (propFile.exists()) { diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt index 1e0327f48a..60a55d63a0 100644 --- a/app/proguard-rules.txt +++ b/app/proguard-rules.txt @@ -15,7 +15,7 @@ #--------- remove logs end ---------------- #--------- remove useless mtahelper class -------- --assumenosideeffects class com.gh.common.util.MtaHelper { +-assumenosideeffects class com.gh.gamecenter.core.utils.MtaHelper { public static void onEvent(...); public static void onEventWithTime(...); public static void onEventWithBasicDeviceInfo(...); @@ -65,6 +65,7 @@ -keep class com.gh.common.view.* {*;} -keep class com.gh.gamecenter.db.info.* {*;} -keep class com.gh.gamecenter.entity.* {*;} +-keep class com.gh.gamecenter.common.entity.* {*;} -keep class com.gh.gamecenter.qa.entity.* {*;} -keep class com.gh.gamecenter.retrofit.* {*;} -keep class com.gh.gamecenter.eventbus.* {*;} @@ -160,3 +161,12 @@ public static void directToSuggestion(...); } +# ARouter +-keep public class com.alibaba.android.arouter.routes.**{*;} +-keep public class com.alibaba.android.arouter.facade.**{*;} +-keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;} +# 如果使用了 byType 的方式获取 Service，需添加下面规则，保护接口 +-keep interface * implements com.alibaba.android.arouter.facade.template.IProvider +# 如果使用了 单类注入，即不定义接口实现 IProvider，需添加下面规则，保护实现 +-keep class * implements com.alibaba.android.arouter.facade.template.IProvider + diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index 3f5452abf8..8f19add099 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -1,6 +1,6 @@ package com.gh.base; -import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_ENTRANCE; import android.content.Intent; import android.content.res.Configuration; @@ -27,25 +27,25 @@ import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import androidx.lifecycle.Lifecycle; -import com.gh.base.fragment.BaseFragment; -import com.gh.common.constant.Constants; -import com.gh.common.tracker.IBusiness; -import com.gh.common.util.DialogHelper; -import com.gh.common.util.DialogUtils; -import com.gh.common.util.DisplayUtils; +import com.gh.gamecenter.common.base.fragment.BaseFragment; import com.gh.common.util.EntranceUtils; -import com.gh.common.util.EnvHelper; -import com.gh.common.util.ExtensionsKt; -import com.gh.common.util.MtaHelper; -import com.gh.common.util.NetworkUtils; -import com.gh.common.util.NightModeUtils; -import com.gh.common.util.PackageFlavorHelper; +import com.gh.gamecenter.common.constant.Constants; +import com.gh.common.tracker.IBusiness; +import com.gh.gamecenter.common.utils.DialogHelper; +import com.gh.common.util.DialogUtils; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.utils.EnvHelper; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.common.utils.NetworkUtils; +import com.gh.gamecenter.common.utils.NightModeUtils; +import com.gh.gamecenter.common.utils.PackageFlavorHelper; import com.gh.common.util.PackageInstaller; import com.gh.common.util.QuickLoginHelper; -import com.gh.common.util.RunningUtils; -import com.gh.common.util.SPUtils; +import com.gh.gamecenter.core.utils.RunningUtils; +import com.gh.gamecenter.core.utils.SPUtils; import com.gh.common.util.ShareUtils; -import com.gh.common.util.StringUtils; +import com.gh.gamecenter.core.utils.StringUtils; import com.gh.download.DownloadManager; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.LoginActivity; diff --git a/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java b/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java index 49b1869bea..b6840f9974 100644 --- a/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java +++ b/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java @@ -4,20 +4,20 @@ import android.content.Intent; import android.os.Bundle; import android.view.View; -import com.gh.base.adapter.FragmentAdapter; -import com.gh.base.fragment.BaseFragment_TabLayout; -import com.gh.common.view.TabIndicatorView; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.gh.gamecenter.common.base.adapter.FragmentAdapter; +import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout; import com.gh.gamecenter.R; +import com.gh.gamecenter.common.view.TabIndicatorView; import com.google.android.material.tabs.TabLayout; import com.lightgame.view.NoScrollableViewPager; import java.util.ArrayList; import java.util.List; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; - /** * Created by khy on 15/03/18. */ diff --git a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt index 95d1315fa4..137e875495 100644 --- a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt +++ b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt @@ -14,12 +14,14 @@ import android.widget.CheckBox import android.widget.FrameLayout import android.widget.TextView import androidx.lifecycle.Observer -import com.gh.common.AppExecutor -import com.gh.common.runOnIoThread import com.gh.common.util.* import com.gh.common.view.RichEditor import com.gh.gamecenter.CropImageActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.core.runOnIoThread +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.* import com.gh.gamecenter.qa.editor.* import com.gh.gamecenter.qa.entity.AnswerEntity diff --git a/app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt b/app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt index 86169f0a01..ed11356911 100644 --- a/app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt +++ b/app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt @@ -9,10 +9,12 @@ import android.text.TextUtils import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData -import com.gh.base.fragment.WaitingDialogFragment -import com.gh.common.runOnUiThread +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment +import com.gh.gamecenter.core.runOnUiThread import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.ErrorEntity import com.gh.gamecenter.entity.LocalVideoEntity import com.gh.gamecenter.entity.QuoteCountEntity diff --git a/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt b/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt index 5ac6f1bfbb..20fb63b2a8 100644 --- a/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt +++ b/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt @@ -9,6 +9,7 @@ import com.gh.common.util.FloatingBackViewManager import com.gh.download.DownloadManager import com.gh.gamecenter.MainActivity import com.gh.gamecenter.SplashScreenActivity +import com.gh.gamecenter.core.utils.CurrentActivityHolder import com.gh.gamecenter.energy.EnergyCenterActivity import com.gh.gamecenter.forum.detail.ForumDetailActivity import com.gh.gamecenter.forum.list.ForumListActivity diff --git a/app/src/main/java/com/gh/base/ToolBarActivity.java b/app/src/main/java/com/gh/base/ToolBarActivity.java index c6816457ad..4238ccdfb5 100644 --- a/app/src/main/java/com/gh/base/ToolBarActivity.java +++ b/app/src/main/java/com/gh/base/ToolBarActivity.java @@ -25,17 +25,17 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProviders; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.common.constant.Constants; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.ImageUtils; -import com.gh.common.util.SPUtils; +import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.core.utils.SPUtils; import com.gh.common.view.GameIconView; import com.gh.download.DownloadManager; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.GameUpdateEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; -import com.gh.gamecenter.normal.ToolbarController; +import com.gh.gamecenter.common.base.fragment.ToolbarController; import com.gh.gamecenter.packagehelper.PackageViewModel; import com.lightgame.OnTitleClickListener; diff --git a/app/src/main/java/com/gh/common/DefaultJsApi.kt b/app/src/main/java/com/gh/common/DefaultJsApi.kt index 0e4301e0e2..569b97949d 100644 --- a/app/src/main/java/com/gh/common/DefaultJsApi.kt +++ b/app/src/main/java/com/gh/common/DefaultJsApi.kt @@ -8,13 +8,20 @@ import android.webkit.JavascriptInterface import androidx.annotation.Keep import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.FragmentActivity -import com.gh.base.CurrentActivityHolder -import com.gh.common.constant.Constants +import com.gh.gamecenter.core.utils.CurrentActivityHolder +import com.gh.gamecenter.common.constant.Constants import com.gh.common.loghub.LoghubUtils import com.gh.common.tracker.Tracker import com.gh.common.util.* -import com.gh.common.view.dsbridge.CompletionHandler +import com.gh.gamecenter.common.view.dsbridge.CompletionHandler import com.gh.gamecenter.* +import com.gh.gamecenter.BuildConfig +import com.gh.gamecenter.common.callback.BiCallback +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.core.runOnIoThread +import com.gh.gamecenter.core.runOnUiThread +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.energy.EnergyCenterActivity import com.gh.gamecenter.energy.EnergyHouseActivity import com.gh.gamecenter.entity.* diff --git a/app/src/main/java/com/gh/common/DefaultUrlHandler.kt b/app/src/main/java/com/gh/common/DefaultUrlHandler.kt index 75a55a046e..5d770154b7 100644 --- a/app/src/main/java/com/gh/common/DefaultUrlHandler.kt +++ b/app/src/main/java/com/gh/common/DefaultUrlHandler.kt @@ -5,8 +5,8 @@ import android.content.Intent import android.net.Uri import android.text.TextUtils import android.util.Base64 -import com.gh.base.CurrentActivityHolder -import com.gh.common.constant.Constants +import com.gh.gamecenter.core.utils.CurrentActivityHolder +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* import com.gh.common.util.DirectUtils.directToFeedback import com.gh.common.util.DirectUtils.directToGameDetailVideoStreaming @@ -15,11 +15,16 @@ import com.gh.common.util.DirectUtils.directToGameVideo import com.gh.common.util.DirectUtils.directToLegacyVideoDetail import com.gh.common.util.DirectUtils.directToLinkPage import com.gh.common.util.DirectUtils.directToQa -import com.gh.common.util.GsonUtils.gson +import com.gh.gamecenter.core.utils.GsonUtils.gson import com.gh.gamecenter.LibaoDetailActivity import com.gh.gamecenter.MainActivity import com.gh.gamecenter.NewsDetailActivity import com.gh.gamecenter.WebActivity +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.utils.EnvHelper +import com.gh.gamecenter.core.utils.ToastUtils import com.gh.gamecenter.entity.* import com.gh.gamecenter.gamecollection.publish.GameCollectionEditActivity import com.gh.gamecenter.qa.BbsType @@ -74,7 +79,7 @@ object DefaultUrlHandler { e.printStackTrace() } - EntranceUtils.HOST_QQ_QUN -> { + EntranceConsts.HOST_QQ_QUN -> { val key = uri.getQueryParameter("key") if (!DirectUtils.directToQqGroup(context, key)) { Utils.toast(context, "请检查是否已经安装手机QQ") @@ -142,7 +147,7 @@ object DefaultUrlHandler { ) } } - EntranceUtils.HOST_UPLOAD_VIDEO -> { + EntranceConsts.HOST_UPLOAD_VIDEO -> { val titleParameter = uri.getQueryParameter("title") val title = if (titleParameter.isNullOrEmpty()) "" else "#$titleParameter#" val categoryId = uri.getQueryParameter("category_id") ?: "" @@ -153,16 +158,16 @@ object DefaultUrlHandler { val tagActivityName = uri.getQueryParameter("tagActivityName") ?: "" val linkEntity = VideoLinkEntity(title, categoryId, link, tagActivityId, tagActivityName) val simpleGameEntity = SimpleGameEntity(gameId, gameName) - CheckLoginUtils.checkLogin(context, null, true, EntranceUtils.ENTRANCE_BROWSER) { - DirectUtils.directToVideoManager(context, linkEntity, simpleGameEntity, EntranceUtils.ENTRANCE_BROWSER, "") + CheckLoginUtils.checkLogin(context, null, true, EntranceConsts.ENTRANCE_BROWSER) { + DirectUtils.directToVideoManager(context, linkEntity, simpleGameEntity, EntranceConsts.ENTRANCE_BROWSER, "") } } - EntranceUtils.HOST_USERHOME -> { + EntranceConsts.HOST_USERHOME -> { val position = uri.getQueryParameter("position") val subtype = uri.getQueryParameter("sub_type") ?: "" DirectUtils.directToHomeActivity(context, id, subtype, if (position.isNullOrEmpty()) -1 else position.toInt(), entrance, "") } - EntranceUtils.HOST_VIDEO_MORE -> { + EntranceConsts.HOST_VIDEO_MORE -> { val referer = uri.getQueryParameter("referer") ?: "" val type = uri.getQueryParameter("type") ?: "" val act = uri.getQueryParameter("act") ?: "" @@ -194,48 +199,48 @@ object DefaultUrlHandler { sectionName ) } - EntranceUtils.HOST_VIDEO_DETAIL -> { + EntranceConsts.HOST_VIDEO_DETAIL -> { DirectUtils.directToVideoDetail(context, id, entrance, path) } - EntranceUtils.HOST_VIDEO_SINGLE -> { + EntranceConsts.HOST_VIDEO_SINGLE -> { val referer = uri.getQueryParameter("referer") ?: "" DirectUtils.directToVideoDetail( context, id, VideoDetailContainerViewModel.Location.SINGLE_VIDEO.value, false, "", entrance, "", if (TextUtils.isEmpty(referer)) "" else referer ) } - EntranceUtils.HOST_VIDEO_STREAMING_HOME -> { + EntranceConsts.HOST_VIDEO_STREAMING_HOME -> { intent = Intent(context, MainActivity::class.java) intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP intent.putExtra(MainActivity.SWITCH_TO_VIDEO, true) context.startActivity(intent) } - EntranceUtils.HOST_VIDEO_STREAMING_DESC -> { + EntranceConsts.HOST_VIDEO_STREAMING_DESC -> { directToGameDetailVideoStreaming(context, id, entrance) } - EntranceUtils.HOST_VIDEO_COLLECTION -> { + EntranceConsts.HOST_VIDEO_COLLECTION -> { directToGameVideo(context, id, entrance, "") } - EntranceUtils.HOST_CATEGORY -> { + EntranceConsts.HOST_CATEGORY -> { val title = uri.getQueryParameter("title") DirectUtils.directCategoryDirectory(context, id, title ?: "", entrance, "") } - EntranceUtils.HOST_COLUMN_COLLECTION -> { + EntranceConsts.HOST_COLUMN_COLLECTION -> { val name = uri.getQueryParameter("name") DirectUtils.directToColumnCollection(context, id, -1, entrance, name ?: "") } - EntranceUtils.HOST_COLUMN -> { - DirectUtils.directToSubject(context, id, uri.getQueryParameter(EntranceUtils.KEY_NAME), entrance) + EntranceConsts.HOST_COLUMN -> { + DirectUtils.directToSubject(context, id, uri.getQueryParameter(EntranceConsts.KEY_NAME), entrance) } - EntranceUtils.HOST_COMMUNITY_QUESTION_LABEL_DETAIL -> { + EntranceConsts.HOST_COMMUNITY_QUESTION_LABEL_DETAIL -> { val community = CommunityEntity() community.id = uri.getQueryParameter("community_id") ?: "" community.name = uri.getQueryParameter("community_name") ?: "" val tag = uri.getQueryParameter("tag") ?: "" DirectUtils.directAskColumnLabelDetail(context, tag, community, entrance, "") } - EntranceUtils.HOST_COMMUNITY_COLUMN_DETAIL -> { + EntranceConsts.HOST_COMMUNITY_COLUMN_DETAIL -> { val community = CommunityEntity() community.id = uri.getQueryParameter("community_id") ?: "" community.name = uri.getQueryParameter("community_name") ?: "" @@ -243,42 +248,42 @@ object DefaultUrlHandler { DirectUtils.directAskColumnDetail(context, columnId, community, entrance, "") } - EntranceUtils.HOST_BLOCK -> { + EntranceConsts.HOST_BLOCK -> { val name = uri.getQueryParameter("name") ?: "" val entity = SubjectRecommendEntity(link = id, name = name, text = name) DirectUtils.directToBlock(context, entity, entrance) } - EntranceUtils.HOST_SERVER_BLOCK -> { + EntranceConsts.HOST_SERVER_BLOCK -> { DirectUtils.directToGameServers(context, entrance = entrance, path = "") } - EntranceUtils.HOST_AMWAY_BLOCK -> { + EntranceConsts.HOST_AMWAY_BLOCK -> { DirectUtils.directToAmway(context, entrance = entrance, path = "") } - EntranceUtils.HOST_HELP -> { + EntranceConsts.HOST_HELP -> { val name = uri.getQueryParameter("name") ?: "" DirectUtils.directToQa(context, name, id) } - EntranceUtils.HOST_HELP_COLLECTION -> { + EntranceConsts.HOST_HELP_COLLECTION -> { val name = uri.getQueryParameter("name") ?: "" DirectUtils.directToQaCollection(context, name, id) } - EntranceUtils.HOST_GAME_UPLOAD -> { + EntranceConsts.HOST_GAME_UPLOAD -> { DirectUtils.directGameUpload(context, entrance = entrance, path = "") } - EntranceUtils.HOST_GAME_ZONE -> { + EntranceConsts.HOST_GAME_ZONE -> { val zoneUrl = uri.getQueryParameter("url") ?: "" DirectUtils.directGameZone(context, id, zoneUrl, entrance) } - EntranceUtils.HOST_LINK -> { + EntranceConsts.HOST_LINK -> { try { val dataString = uri.getQueryParameter("data") if (!TextUtils.isEmpty(dataString)) { @@ -292,43 +297,43 @@ object DefaultUrlHandler { } } - EntranceUtils.HOST_GAME_NEWS -> { + EntranceConsts.HOST_GAME_NEWS -> { DirectUtils.directToGameNews( context, - uri.getQueryParameter(EntranceUtils.KEY_GAME_ID), - uri.getQueryParameter(EntranceUtils.KEY_GAME_NAME), + uri.getQueryParameter(EntranceConsts.KEY_GAME_ID), + uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME), entrance ); } - EntranceUtils.HOST_GAME_CALENDAR -> { - directToGameServerCalendar(context, uri.getQueryParameter(EntranceUtils.KEY_GAME_ID)) + EntranceConsts.HOST_GAME_CALENDAR -> { + directToGameServerCalendar(context, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID)) } - EntranceUtils.HOST_HISTORY_APK -> { - DirectUtils.directToHistoryApk(context, uri.getQueryParameter(EntranceUtils.KEY_GAME_ID)) + EntranceConsts.HOST_HISTORY_APK -> { + DirectUtils.directToHistoryApk(context, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID)) } - EntranceUtils.HOST_FORUM_DETAIL -> { + EntranceConsts.HOST_FORUM_DETAIL -> { DirectUtils.directForumDetail(context, id, entrance) } - EntranceUtils.HOST_GAME_RATING_DETAIL -> { + EntranceConsts.HOST_GAME_RATING_DETAIL -> { DirectUtils.directToGameRatingDetail( context, - uri.getQueryParameter(EntranceUtils.KEY_GAME_ID), - uri.getQueryParameter(EntranceUtils.KEY_COMMENT_ID), - EntranceUtils.ENTRANCE_BROWSER + uri.getQueryParameter(EntranceConsts.KEY_GAME_ID), + uri.getQueryParameter(EntranceConsts.KEY_COMMENT_ID), + EntranceConsts.ENTRANCE_BROWSER ) } - EntranceUtils.HOST_FORUM -> { - val position = uri.getQueryParameter(EntranceUtils.KEY_POSITION)?.toInt() + EntranceConsts.HOST_FORUM -> { + val position = uri.getQueryParameter(EntranceConsts.KEY_POSITION)?.toInt() DirectUtils.directToForum(context, position ?: 0) } - EntranceUtils.HOST_UPLOAD_VIDEO_NEW -> { + EntranceConsts.HOST_UPLOAD_VIDEO_NEW -> { val activityName = uri.getQueryParameter("activity_name") ?: "" val activityId = uri.getQueryParameter("activity_id") ?: "" val forumName = uri.getQueryParameter("forum_name") ?: "" @@ -359,39 +364,39 @@ object DefaultUrlHandler { ) } - EntranceUtils.HOST_SUGGESTION -> { - val platform = uri.getQueryParameter(EntranceUtils.KEY_PLATFORM) + EntranceConsts.HOST_SUGGESTION -> { + val platform = uri.getQueryParameter(EntranceConsts.KEY_PLATFORM) val platformName = PlatformUtils.getInstance(context).getPlatformName(platform) - val gameId = uri.getQueryParameter(EntranceUtils.KEY_GAMEID) - val packageMd5 = uri.getQueryParameter(EntranceUtils.KEY_PACKAGE_MD5) - val isQaFeedback = uri.getQueryParameter(EntranceUtils.KEY_IS_QA_FEEDBACK) == "true" + val gameId = uri.getQueryParameter(EntranceConsts.KEY_GAMEID) + val packageMd5 = uri.getQueryParameter(EntranceConsts.KEY_PACKAGE_MD5) + val isQaFeedback = uri.getQueryParameter(EntranceConsts.KEY_IS_QA_FEEDBACK) == "true" val content = if (TextUtils.isEmpty(gameId) || TextUtils.isEmpty(packageMd5)) String.format( "%s-%s-V%s，", - uri.getQueryParameter(EntranceUtils.KEY_GAME_NAME), + uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME), if (TextUtils.isEmpty(platformName)) platform else platformName, - uri.getQueryParameter(EntranceUtils.KEY_VERSION) + uri.getQueryParameter(EntranceConsts.KEY_VERSION) ) else String.format( "%s-%s-V%s\n游戏ID：%s\n游戏包MD5：%s\n", - uri.getQueryParameter(EntranceUtils.KEY_GAME_NAME), + uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME), if (TextUtils.isEmpty(platformName)) platform else platformName, - uri.getQueryParameter(EntranceUtils.KEY_VERSION), gameId, packageMd5 + uri.getQueryParameter(EntranceConsts.KEY_VERSION), gameId, packageMd5 ) val qaId = uri.getQueryParameter("qa_id") ?: "" - val qaContentId = uri.getQueryParameter(EntranceUtils.KEY_QA_CONTENT_ID) ?: "" - val qaTitle = uri.getQueryParameter(EntranceUtils.KEY_QA_TITLE) + val qaContentId = uri.getQueryParameter(EntranceConsts.KEY_QA_CONTENT_ID) ?: "" + val qaTitle = uri.getQueryParameter(EntranceConsts.KEY_QA_TITLE) if (!TextUtils.isEmpty(qaId)) { directToQa(context, qaTitle, qaId) } else { - directToFeedback(context, content, null, isQaFeedback, qaContentId, EntranceUtils.ENTRANCE_BROWSER) + directToFeedback(context, content, null, isQaFeedback, qaContentId, EntranceConsts.ENTRANCE_BROWSER) } } - EntranceUtils.HOST_HELP_AND_FEEDBACK -> { + EntranceConsts.HOST_HELP_AND_FEEDBACK -> { val position = uri.getQueryParameter("position") ?: "" DirectUtils.directToHelpAndFeedback(context, position.toInt()) } - EntranceUtils.HOST_HELP_DETAIL -> { + EntranceConsts.HOST_HELP_DETAIL -> { var url = uri.getQueryParameter("url") if (!url.isNullOrEmpty()) { context.startActivity(WebActivity.getIntent(context, url, false)) @@ -408,15 +413,15 @@ object DefaultUrlHandler { } } - EntranceUtils.HOST_GAME_COLLECTION_DETAIL -> { + EntranceConsts.HOST_GAME_COLLECTION_DETAIL -> { DirectUtils.directToGameCollectionDetail(context, id, entrance) } - EntranceUtils.HOST_GAME_COLLECTION_SQUARE -> { + EntranceConsts.HOST_GAME_COLLECTION_SQUARE -> { DirectUtils.directToGameCollectionSquare(context, entrance) } - EntranceUtils.HOST_GAME_COLLECTION_EDIT -> { + EntranceConsts.HOST_GAME_COLLECTION_EDIT -> { context.startActivity(GameCollectionEditActivity.getIntent(context, entrance)) } diff --git a/app/src/main/java/com/gh/common/FixedRateJobHelper.kt b/app/src/main/java/com/gh/common/FixedRateJobHelper.kt index 8581083b04..c832efebd4 100644 --- a/app/src/main/java/com/gh/common/FixedRateJobHelper.kt +++ b/app/src/main/java/com/gh/common/FixedRateJobHelper.kt @@ -3,8 +3,8 @@ package com.gh.common import com.gh.common.exposure.ExposureManager import com.gh.common.filter.RegionSettingHelper import com.gh.common.loghub.LoghubUtils -import com.gh.common.util.doOnMainProcessOnly -import com.gh.common.util.tryCatchInRelease +import com.gh.gamecenter.common.utils.doOnMainProcessOnly +import com.gh.gamecenter.common.utils.tryCatchInRelease import com.gh.common.videolog.VideoRecordUtils import com.gh.download.DownloadDataHelper import com.gh.gamecenter.entity.TimeEntity 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 017348cd39..b27534fee1 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -7,13 +7,16 @@ import android.os.Build; import android.preference.PreferenceManager; import android.text.TextUtils; -import com.gh.common.util.EnvHelper; -import com.gh.common.util.GsonUtils; +import androidx.annotation.Nullable; + +import com.gh.gamecenter.common.utils.EnvHelper; +import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.common.util.PackageHelper; import com.gh.common.util.PackageUtils; -import com.gh.common.util.SPUtils; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.SuggestionActivity; +import com.gh.gamecenter.core.utils.SPUtils; import com.gh.gamecenter.entity.GameGuidePopupEntity; import com.gh.gamecenter.entity.NewSettingsEntity; import com.gh.gamecenter.entity.NewsEntity; @@ -33,8 +36,6 @@ import java.io.IOException; import java.util.List; import java.util.Locale; -import androidx.annotation.Nullable; - import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; import okhttp3.ResponseBody; @@ -59,8 +60,6 @@ public class Config { // http://www.ghzs666.com/article/${articleId}.html public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // ghzs/ghzs666 统一 - public static final String DEFAULT_CHANNEL = "GH_TEST3"; - public static final String DEFAULT_CHANNEL_FOR_RELEASE = "GH_LOST"; // 正式包的缺省渠道，避免因渠道丢失而回落到测试渠道 private static String SETTINGS_KEY = "settingsKey"; diff --git a/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt b/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt index 1cd7efae08..639f94f22e 100644 --- a/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt +++ b/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt @@ -13,10 +13,10 @@ import android.widget.PopupWindow import androidx.core.content.ContextCompat import androidx.databinding.BindingAdapter import androidx.recyclerview.widget.LinearLayoutManager -import com.gh.base.OnViewClickListener -import com.gh.common.util.dip2px -import com.gh.common.util.toDrawable -import com.gh.common.view.BugFixedPopupWindow +import com.gh.gamecenter.common.callback.OnViewClickListener +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.common.view.BugFixedPopupWindow import com.gh.gamecenter.R import com.gh.gamecenter.databinding.KaifuAddItemBinding import com.gh.gamecenter.databinding.LayoutAddKaifuPopupBinding 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 378758e7e4..47abfe4b73 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -19,7 +19,7 @@ import androidx.core.content.ContextCompat; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.OnViewClickListener; +import com.gh.gamecenter.common.callback.OnViewClickListener; import com.gh.common.constant.Config; import com.gh.common.dialog.CertificationDialog; import com.gh.common.dialog.PackageCheckDialogFragment; @@ -31,23 +31,23 @@ import com.gh.common.simulator.SimulatorGameManager; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; -import com.gh.common.util.DisplayUtils; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.common.util.DownloadDialogHelper; -import com.gh.common.util.ExtensionsKt; import com.gh.common.util.GameUtils; import com.gh.common.util.GameViewUtils; -import com.gh.common.util.ImageUtils; +import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.common.util.LogUtils; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.NewsUtils; -import com.gh.common.util.NumberUtils; +import com.gh.gamecenter.core.utils.NumberUtils; import com.gh.common.util.PackageInstaller; import com.gh.common.util.PackageUtils; import com.gh.common.util.PlatformUtils; import com.gh.common.util.RealNameHelper; import com.gh.common.util.ReservationHelper; import com.gh.common.view.DownloadProgressBar; -import com.gh.common.view.DrawableView; +import com.gh.gamecenter.common.view.DrawableView; import com.gh.common.view.GameIconView; import com.gh.download.DownloadManager; import com.gh.download.dialog.DownloadDialog; diff --git a/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt index 815537a684..d27ab0dd2d 100644 --- a/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt @@ -6,12 +6,12 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity -import com.gh.base.fragment.BaseDialogFragment +import com.gh.gamecenter.common.base.fragment.BaseDialogFragment import com.gh.common.util.DirectUtils -import com.gh.common.util.EntranceUtils -import com.gh.common.util.SpanBuilder -import com.gh.common.util.dip2px -import com.gh.common.view.CustomLinkMovementMethod +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.SpanBuilder +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.view.CustomLinkMovementMethod import com.gh.gamecenter.R import com.gh.gamecenter.databinding.DialogApplyModeratorBinding @@ -27,7 +27,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() { requireArguments().run { mGroupNumber = getString(KEY_GROUP_NUMBER) ?: "" mGroupKey = getString(KEY_GROUP_KEY) ?: "" - mParentTag = getString(EntranceUtils.KEY_PARENT_TAG) ?: "" + mParentTag = getString(EntranceConsts.KEY_PARENT_TAG) ?: "" } } @@ -83,7 +83,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() { arguments = Bundle().apply { putString(KEY_GROUP_NUMBER, number) putString(KEY_GROUP_KEY, key) - putString(EntranceUtils.KEY_PARENT_TAG, tag) + putString(EntranceConsts.KEY_PARENT_TAG, tag) } }.show( activity.supportFragmentManager, diff --git a/app/src/main/java/com/gh/common/dialog/BaseDraggableDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/BaseDraggableDialogFragment.kt index d2008eca04..51adcdc5cf 100644 --- a/app/src/main/java/com/gh/common/dialog/BaseDraggableDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/BaseDraggableDialogFragment.kt @@ -4,7 +4,7 @@ import android.annotation.SuppressLint import android.app.Dialog import android.os.Bundle import android.view.* -import com.gh.base.fragment.BaseDialogFragment +import com.gh.gamecenter.common.base.fragment.BaseDialogFragment import com.gh.gamecenter.R import com.halo.assistant.HaloApp diff --git a/app/src/main/java/com/gh/common/dialog/BaseTrackableDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/BaseTrackableDialogFragment.kt index 43d9b32a0d..c0909c6c9f 100644 --- a/app/src/main/java/com/gh/common/dialog/BaseTrackableDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/BaseTrackableDialogFragment.kt @@ -6,7 +6,7 @@ import android.view.KeyEvent import android.view.View import androidx.fragment.app.DialogFragment import androidx.fragment.app.FragmentManager -import com.gh.common.util.MtaHelper +import com.gh.gamecenter.core.utils.MtaHelper import com.lightgame.dialog.BaseDialogFragment import java.util.concurrent.atomic.AtomicBoolean diff --git a/app/src/main/java/com/gh/common/dialog/CertificationDialog.kt b/app/src/main/java/com/gh/common/dialog/CertificationDialog.kt index 9fbe20eedd..9b18db28a3 100644 --- a/app/src/main/java/com/gh/common/dialog/CertificationDialog.kt +++ b/app/src/main/java/com/gh/common/dialog/CertificationDialog.kt @@ -14,12 +14,16 @@ import android.view.View import android.widget.CheckBox import android.widget.TextView import androidx.appcompat.app.AppCompatActivity -import com.gh.common.avoidcallback.AvoidOnResultManager -import com.gh.common.avoidcallback.Callback -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager +import com.gh.gamecenter.common.avoidcallback.Callback +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.ShellActivity +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.GsonUtils +import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.entity.AuthDialogEntity import com.gh.gamecenter.entity.AuthDialogLevel import com.gh.gamecenter.entity.GameEntity @@ -28,7 +32,7 @@ import com.google.gson.reflect.TypeToken import com.halo.assistant.fragment.user.UserInfoEditFragment import com.lightgame.utils.AppManager -class CertificationDialog(context: Context, private val authDialogEntity: AuthDialogEntity, val gameId: String, val listener: DialogUtils.ConfirmListener) : +class CertificationDialog(context: Context, private val authDialogEntity: AuthDialogEntity, val gameId: String, val listener: ConfirmListener) : Dialog(context, R.style.GhAlertDialog) { private lateinit var view: View @@ -134,7 +138,7 @@ class CertificationDialog(context: Context, private val authDialogEntity: AuthDi context, ShellActivity.Type.REAL_NAME_INFO, ).apply { - putExtra(EntranceUtils.KEY_GAME_ID, gameId) + putExtra(EntranceConsts.KEY_GAME_ID, gameId) }, object : Callback { override fun onActivityResult(resultCode: Int, data: Intent?) { if (resultCode == Activity.RESULT_OK && data != null) { @@ -152,7 +156,7 @@ class CertificationDialog(context: Context, private val authDialogEntity: AuthDi companion object { @JvmStatic - fun showCertificationDialog(context: Context, game: GameEntity, listener: DialogUtils.ConfirmListener) { + fun showCertificationDialog(context: Context, game: GameEntity, listener: ConfirmListener) { //1.先判断是否登录 是执行2 否执行3 //2.判断是否实名认证 是终止 否执行3 //3.判断是否需要弹出认证弹窗接口 @@ -168,7 +172,7 @@ class CertificationDialog(context: Context, private val authDialogEntity: AuthDi } @SuppressLint("CheckResult") - private fun authDialog(context: Context, game: GameEntity, listener: DialogUtils.ConfirmListener) { + private fun authDialog(context: Context, game: GameEntity, listener: ConfirmListener) { var authDialog: AuthDialogEntity? = null if (game.authDialog != null) { authDialog = game.authDialog 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 738a610951..1eabd4963c 100644 --- a/app/src/main/java/com/gh/common/dialog/DeviceRemindDialog.kt +++ b/app/src/main/java/com/gh/common/dialog/DeviceRemindDialog.kt @@ -19,10 +19,14 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import androidx.viewpager2.widget.ViewPager2 import com.facebook.drawee.view.SimpleDraweeView -import com.gh.common.constant.Constants -import com.gh.common.util.* +import com.gh.gamecenter.common.constant.Constants import com.gh.download.DownloadManager import com.gh.gamecenter.R +import com.gh.gamecenter.core.utils.GsonUtils +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.countDownTimer +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.databinding.DialogDeviceRemindBinding import com.gh.gamecenter.entity.DeviceDialogEntity import com.gh.gamecenter.entity.GameEntity diff --git a/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt index 2997a70949..d9feb109b2 100644 --- a/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt @@ -10,10 +10,10 @@ import android.view.ViewGroup import android.widget.LinearLayout import android.widget.TextView import androidx.core.text.HtmlCompat -import com.gh.base.fragment.BaseDialogFragment +import com.gh.gamecenter.common.base.fragment.BaseDialogFragment import com.gh.common.util.DirectUtils -import com.gh.common.util.dip2px -import com.gh.common.util.toColor +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.R import com.gh.gamecenter.databinding.DialogGameOffServiceBinding import com.gh.gamecenter.entity.GameEntity diff --git a/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt index 34bca83c83..2b867161f0 100644 --- a/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt @@ -13,11 +13,15 @@ import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.FragmentTransaction import com.airbnb.lottie.LottieAnimationView import com.gh.common.constant.Config -import com.gh.common.constant.Constants -import com.gh.common.util.* -import com.gh.common.util.PermissionHelper.INSTALL_PERMISSION_CODE +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.utils.PermissionHelper.INSTALL_PERMISSION_CODE import com.gh.common.xapk.XapkInstaller import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.PermissionHelper +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.getExtension +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.core.utils.MtaHelper import com.lightgame.download.DownloadEntity import kotlin.random.Random diff --git a/app/src/main/java/com/gh/common/dialog/NotificationHintDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/NotificationHintDialogFragment.kt index 8ef1e0ebb1..5168404bf7 100644 --- a/app/src/main/java/com/gh/common/dialog/NotificationHintDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/NotificationHintDialogFragment.kt @@ -10,10 +10,10 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat -import com.gh.common.util.GsonUtils -import com.gh.common.util.MtaHelper -import com.gh.common.util.PermissionHelper -import com.gh.common.util.fromHtml +import com.gh.gamecenter.core.utils.GsonUtils +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.common.utils.PermissionHelper +import com.gh.gamecenter.common.utils.fromHtml import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.R import com.gh.gamecenter.databinding.DialogNotificationHintBinding 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 558547b06e..9247fda040 100644 --- a/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt @@ -15,12 +15,15 @@ import androidx.fragment.app.FragmentTransaction import androidx.lifecycle.Lifecycle import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* -import com.gh.common.view.CustomLinkMovementMethod +import com.gh.gamecenter.common.view.CustomLinkMovementMethod import com.gh.download.DownloadManager import com.gh.gamecenter.R +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentPackageCheckBinding import com.gh.gamecenter.databinding.PackageCheckItemBinding import com.gh.gamecenter.entity.DetectionObjectEntity @@ -52,7 +55,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() { private var mAdapter: PackageCheckAdapter? = null private var mAllInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0) var gameEntity: GameEntity? = null - var callBack: DialogUtils.ConfirmListener? = null + var callBack: ConfirmListener? = null private val dataWatcher = object : DataWatcher() { override fun onDataChanged(downloadEntity: DownloadEntity) { @@ -318,7 +321,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() { companion object { @JvmStatic - fun show(activity: AppCompatActivity, gameEntity: GameEntity, callBack: DialogUtils.ConfirmListener) { + fun show(activity: AppCompatActivity, gameEntity: GameEntity, callBack: ConfirmListener) { val packageDialogEntity = gameEntity.packageDialog if (packageDialogEntity == null) { callBack.onConfirm() diff --git a/app/src/main/java/com/gh/common/dialog/PrivacyDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/PrivacyDialogFragment.kt index 525ef65aef..2a91ffd3a2 100644 --- a/app/src/main/java/com/gh/common/dialog/PrivacyDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/PrivacyDialogFragment.kt @@ -13,9 +13,9 @@ import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.fragment.app.FragmentTransaction -import com.gh.base.fragment.BaseDialogFragment -import com.gh.common.util.dip2px -import com.gh.common.view.CustomLinkMovementMethod +import com.gh.gamecenter.common.base.fragment.BaseDialogFragment +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.view.CustomLinkMovementMethod import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity diff --git a/app/src/main/java/com/gh/common/view/ReserveDialog.kt b/app/src/main/java/com/gh/common/dialog/ReserveDialog.kt similarity index 91% rename from app/src/main/java/com/gh/common/view/ReserveDialog.kt rename to app/src/main/java/com/gh/common/dialog/ReserveDialog.kt index 39fbc96ca8..833de11e87 100644 --- a/app/src/main/java/com/gh/common/view/ReserveDialog.kt +++ b/app/src/main/java/com/gh/common/dialog/ReserveDialog.kt @@ -1,4 +1,4 @@ -package com.gh.common.view +package com.gh.common.dialog import android.os.Bundle import android.view.LayoutInflater @@ -6,12 +6,13 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.base.fragment.BaseDialogFragment -import com.gh.common.util.ImageUtils -import com.gh.common.util.fromHtml +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.fragment.BaseDialogFragment +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.utils.fromHtml import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.view.FixLinearLayoutManager import com.gh.gamecenter.databinding.DialogReserveBinding import com.gh.gamecenter.databinding.DialogReserveItemBinding import com.gh.gamecenter.entity.SimpleGameEntity 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 bfa1f8732b..f479f61c51 100644 --- a/app/src/main/java/com/gh/common/dialog/ReserveDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/ReserveDialogFragment.kt @@ -14,7 +14,7 @@ //import butterknife.BindView //import butterknife.ButterKnife //import butterknife.OnClick -//import com.gh.base.fragment.BaseDialogFragment +//import com.gh.gamecenter.common.base.fragment.BaseDialogFragment //import com.gh.common.AppExecutor //import com.gh.common.constant.Config //import com.gh.common.history.HistoryHelper diff --git a/app/src/main/java/com/gh/common/view/WelcomeDialog.kt b/app/src/main/java/com/gh/common/dialog/WelcomeDialog.kt similarity index 77% rename from app/src/main/java/com/gh/common/view/WelcomeDialog.kt rename to app/src/main/java/com/gh/common/dialog/WelcomeDialog.kt index de5dbf1d6f..cd15087337 100644 --- a/app/src/main/java/com/gh/common/view/WelcomeDialog.kt +++ b/app/src/main/java/com/gh/common/dialog/WelcomeDialog.kt @@ -1,16 +1,20 @@ -package com.gh.common.view +package com.gh.common.dialog import android.os.Bundle import android.preference.PreferenceManager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.gh.base.fragment.BaseDialogFragment -import com.gh.common.TimeElapsedHelper -import com.gh.common.constant.Constants -import com.gh.common.constant.Constants.SP_LAST_OPENING_ID -import com.gh.common.constant.Constants.SP_LAST_OPENING_TIME +import com.gh.gamecenter.common.base.fragment.BaseDialogFragment +import com.gh.gamecenter.core.utils.TimeElapsedHelper +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants.SP_LAST_OPENING_ID +import com.gh.gamecenter.common.constant.Constants.SP_LAST_OPENING_TIME import com.gh.common.util.* +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.view.WrapContentDraweeView +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.DialogWelcomeBinding import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.WelcomeDialogEntity @@ -42,33 +46,33 @@ class WelcomeDialog : BaseDialogFragment() { LogUtils.uploadWelcomeDialog("click", mWelcomeEntity?.id, mWelcomeEntity?.text) when (mWelcomeEntity?.type) { - EntranceUtils.HOST_ARTICLE -> { - DirectUtils.directToArticle(requireContext(), mWelcomeEntity?.link!!, EntranceUtils.ENTRANCE_WELCOME) + EntranceConsts.HOST_ARTICLE -> { + DirectUtils.directToArticle(requireContext(), mWelcomeEntity?.link!!, EntranceConsts.ENTRANCE_WELCOME) } - EntranceUtils.HOST_GAME -> { - DirectUtils.directToGameDetail(requireContext(), mWelcomeEntity?.link!!, EntranceUtils.ENTRANCE_WELCOME) + EntranceConsts.HOST_GAME -> { + DirectUtils.directToGameDetail(requireContext(), mWelcomeEntity?.link!!, EntranceConsts.ENTRANCE_WELCOME) } - EntranceUtils.HOST_COLUMN -> { - DirectUtils.directToSubject(requireContext(), mWelcomeEntity?.link!!, null, EntranceUtils.ENTRANCE_WELCOME) + EntranceConsts.HOST_COLUMN -> { + DirectUtils.directToSubject(requireContext(), mWelcomeEntity?.link!!, null, EntranceConsts.ENTRANCE_WELCOME) } - EntranceUtils.HOST_QUESTION -> { - DirectUtils.directToQuestionDetail(requireContext(), mWelcomeEntity?.link!!, EntranceUtils.ENTRANCE_WELCOME) + EntranceConsts.HOST_QUESTION -> { + DirectUtils.directToQuestionDetail(requireContext(), mWelcomeEntity?.link!!, EntranceConsts.ENTRANCE_WELCOME) } - EntranceUtils.HOST_ANSWER -> { - DirectUtils.directToAnswerDetail(requireContext(), mWelcomeEntity?.link!!, EntranceUtils.ENTRANCE_WELCOME) + EntranceConsts.HOST_ANSWER -> { + DirectUtils.directToAnswerDetail(requireContext(), mWelcomeEntity?.link!!, EntranceConsts.ENTRANCE_WELCOME) } - EntranceUtils.HOST_WEB -> { - DirectUtils.directToWebView(requireContext(), mWelcomeEntity?.link!!, EntranceUtils.ENTRANCE_WELCOME) + EntranceConsts.HOST_WEB -> { + DirectUtils.directToWebView(requireContext(), mWelcomeEntity?.link!!, EntranceConsts.ENTRANCE_WELCOME) } - EntranceUtils.HOST_QQ -> { + EntranceConsts.HOST_QQ -> { DirectUtils.directToQqConversation(requireContext(), mWelcomeEntity?.link!!) } - EntranceUtils.HOST_COMMUNITY -> { + EntranceConsts.HOST_COMMUNITY -> { DirectUtils.directToCommunity(requireContext(), CommunityEntity(mWelcomeEntity?.link!!, mWelcomeEntity?.text!!)) } // else -> DialogUtils.showLowVersionDialog(context) else -> DirectUtils.directToLinkPage(requireContext(), mWelcomeEntity - ?: WelcomeDialogEntity(), EntranceUtils.ENTRANCE_WELCOME, "") + ?: WelcomeDialogEntity(), EntranceConsts.ENTRANCE_WELCOME, "") } mDismissByClickImage = true diff --git a/app/src/main/java/com/gh/common/exposure/ExposureConverters.kt b/app/src/main/java/com/gh/common/exposure/ExposureConverters.kt index 0ad6eed89d..c0f3f1e47e 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureConverters.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureConverters.kt @@ -1,8 +1,8 @@ package com.gh.common.exposure import androidx.room.TypeConverter -import com.gh.common.exposure.meta.Meta -import com.gh.common.util.GsonUtils +import com.gh.gamecenter.common.exposure.meta.Meta +import com.gh.gamecenter.core.utils.GsonUtils import java.util.* import kotlin.collections.ArrayList diff --git a/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt b/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt index 4be2f800e1..dbbb1f432a 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt @@ -4,11 +4,11 @@ import android.os.Parcelable import androidx.annotation.Keep import androidx.room.Entity import androidx.room.PrimaryKey -import com.gh.common.constant.Constants -import com.gh.common.exposure.meta.Meta -import com.gh.common.exposure.meta.MetaUtil +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.exposure.meta.Meta +import com.gh.gamecenter.common.exposure.meta.MetaUtil import com.gh.common.exposure.time.TimeUtil -import com.gh.common.util.getFirstElementDividedByDivider +import com.gh.gamecenter.common.utils.getFirstElementDividedByDivider import com.gh.download.server.BrowserInstallHelper import com.gh.gamecenter.entity.GameEntity import com.lightgame.download.DownloadEntity diff --git a/app/src/main/java/com/gh/common/exposure/ExposureManager.kt b/app/src/main/java/com/gh/common/exposure/ExposureManager.kt index 662f8537b5..efd3e8c359 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureManager.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureManager.kt @@ -2,9 +2,10 @@ package com.gh.common.exposure import com.aliyun.sls.android.producer.Log import com.gh.common.loghub.LoghubHelper -import com.gh.common.util.toJson -import com.gh.common.util.tryWithDefaultCatch +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.BuildConfig +import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet import com.halo.assistant.HaloApp import com.lightgame.utils.Utils import java.util.concurrent.ExecutorService @@ -126,19 +127,4 @@ object ExposureManager { logTime = event.time.toLong() } - class FixedSizeLinkedHashSet(var maxSize: Int) : LinkedHashSet() { - override fun add(element: T): Boolean { - if (size == maxSize) { - pop() - } - return super.add(element); - } - - private fun pop() { - if (size > 0) { - remove(iterator().next()) - } - } - } - } \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt b/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt index 50afe9b958..63e0018513 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt @@ -3,7 +3,8 @@ package com.gh.common.exposure import android.text.TextUtils import com.g00fy2.versioncompare.Version import com.gh.common.util.PackageUtils -import com.gh.common.util.toObject +import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.entity.ApkEntity import com.gh.gamecenter.entity.GameEntity import com.halo.assistant.HaloApp @@ -11,7 +12,7 @@ import com.lightgame.download.DownloadEntity object ExposureUtils { - private val mDownloadCompleteTraceEventIdSet = ExposureManager.FixedSizeLinkedHashSet(3) + private val mDownloadCompleteTraceEventIdSet = FixedSizeLinkedHashSet(3) @JvmStatic fun logADownloadExposureEvent( 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 a18d7d3fda..cc77e81de6 100644 --- a/app/src/main/java/com/gh/common/filter/RegionSettingHelper.kt +++ b/app/src/main/java/com/gh/common/filter/RegionSettingHelper.kt @@ -1,11 +1,11 @@ package com.gh.common.filter import android.annotation.SuppressLint -import com.gh.common.constant.Constants -import com.gh.common.util.SPUtils -import com.gh.common.util.debounceActionWithInterval -import com.gh.common.util.toJson -import com.gh.common.util.toObject +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.debounceActionWithInterval +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.R import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.retrofit.BiResponse diff --git a/app/src/main/java/com/gh/common/history/HistoryHelper.kt b/app/src/main/java/com/gh/common/history/HistoryHelper.kt index a045ac5bbe..b0a58dba7b 100644 --- a/app/src/main/java/com/gh/common/history/HistoryHelper.kt +++ b/app/src/main/java/com/gh/common/history/HistoryHelper.kt @@ -1,10 +1,10 @@ package com.gh.common.history -import com.gh.common.runOnIoThread -import com.gh.common.util.clearHtmlFormatCompletely -import com.gh.common.util.removeInsertedContent -import com.gh.common.util.removeVideoContent -import com.gh.common.util.tryCatchInRelease +import com.gh.gamecenter.common.utils.clearHtmlFormatCompletely +import com.gh.gamecenter.common.utils.removeInsertedContent +import com.gh.gamecenter.common.utils.removeVideoContent +import com.gh.gamecenter.common.utils.tryCatchInRelease +import com.gh.gamecenter.core.runOnIoThread import com.gh.gamecenter.entity.* import com.gh.gamecenter.qa.entity.AnswerDetailEntity import com.gh.gamecenter.qa.entity.AnswerEntity @@ -108,7 +108,7 @@ object HistoryHelper { @JvmStatic fun deleteGamesCollectionEntity(gameCollectionId: String) { - runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.gamesCollectionDao().deleteGamesCollection(GamesCollectionEntity(id = gameCollectionId)) }} + runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.gamesCollectionDao().deleteGamesCollection(GamesCollectionEntity(id = gameCollectionId)) } } } diff --git a/app/src/main/java/com/gh/common/im/ImHintView.kt b/app/src/main/java/com/gh/common/im/ImHintView.kt index e4893a338f..4f98a73259 100644 --- a/app/src/main/java/com/gh/common/im/ImHintView.kt +++ b/app/src/main/java/com/gh/common/im/ImHintView.kt @@ -7,7 +7,7 @@ //import android.view.View //import android.widget.RelativeLayout //import androidx.core.view.ViewCompat -//import com.gh.common.util.DisplayUtils +//import com.gh.gamecenter.core.utils.DisplayUtils //import com.gh.gamecenter.R //import kotlinx.android.synthetic.main.view_im_hint.view.* // diff --git a/app/src/main/java/com/gh/common/loghub/LoghubHelper.kt b/app/src/main/java/com/gh/common/loghub/LoghubHelper.kt index 393ba1ba27..3a745d3350 100644 --- a/app/src/main/java/com/gh/common/loghub/LoghubHelper.kt +++ b/app/src/main/java/com/gh/common/loghub/LoghubHelper.kt @@ -1,7 +1,7 @@ package com.gh.common.loghub import com.aliyun.sls.android.producer.* -import com.gh.common.util.PackageFlavorHelper +import com.gh.gamecenter.common.utils.PackageFlavorHelper import com.halo.assistant.HaloApp import com.lightgame.utils.Utils diff --git a/app/src/main/java/com/gh/common/loghub/LoghubUtils.kt b/app/src/main/java/com/gh/common/loghub/LoghubUtils.kt index 6862d9c871..b902b274af 100644 --- a/app/src/main/java/com/gh/common/loghub/LoghubUtils.kt +++ b/app/src/main/java/com/gh/common/loghub/LoghubUtils.kt @@ -4,8 +4,8 @@ import android.app.Application import androidx.annotation.Keep import com.aliyun.sls.android.producer.Log import com.gh.common.exposure.ExposureEntity -import com.gh.common.exposure.meta.Meta -import com.gh.common.util.tryWithDefaultCatch +import com.gh.gamecenter.common.exposure.meta.Meta +import com.gh.gamecenter.common.utils.tryWithDefaultCatch import org.json.JSONObject import java.util.concurrent.ExecutorService diff --git a/app/src/main/java/com/gh/common/notifier/Notifier.kt b/app/src/main/java/com/gh/common/notifier/Notifier.kt index f443c4905e..3e6eed494c 100644 --- a/app/src/main/java/com/gh/common/notifier/Notifier.kt +++ b/app/src/main/java/com/gh/common/notifier/Notifier.kt @@ -4,7 +4,7 @@ import android.app.Activity import androidx.core.view.ViewCompat import android.view.View import android.view.ViewGroup -import com.gh.common.util.SPUtils +import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.* import java.lang.ref.WeakReference diff --git a/app/src/main/java/com/gh/common/notifier/NotifierView.kt b/app/src/main/java/com/gh/common/notifier/NotifierView.kt index f2eeb0f41f..e87c80a80d 100644 --- a/app/src/main/java/com/gh/common/notifier/NotifierView.kt +++ b/app/src/main/java/com/gh/common/notifier/NotifierView.kt @@ -16,10 +16,10 @@ import android.widget.TextView import androidx.cardview.widget.CardView import androidx.core.view.ViewCompat import com.facebook.drawee.view.SimpleDraweeView -import com.gh.common.util.DisplayUtils -import com.gh.common.util.ImageUtils -import com.gh.common.util.doOnEnd -import com.gh.common.util.doOnStart +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.core.utils.doOnEnd +import com.gh.gamecenter.core.utils.doOnStart import com.gh.gamecenter.R class NotifierView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) diff --git a/app/src/main/java/com/gh/common/provider/ActivationProviderImpl.kt b/app/src/main/java/com/gh/common/provider/ActivationProviderImpl.kt new file mode 100644 index 0000000000..4c7fa2f3b8 --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/ActivationProviderImpl.kt @@ -0,0 +1,18 @@ +package com.gh.common.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.common.util.ActivationHelper +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IActivationProvider + +@Route(path = RouteConsts.provider.activation, name = "ActivationHelper暴露服务") +interface ActivationProviderImpl : IActivationProvider { + override fun init(context: Context?) { + + } + + override fun sendActivationInfo() { + ActivationHelper.sendActivationInfo() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/AppProviderImpl.kt b/app/src/main/java/com/gh/common/provider/AppProviderImpl.kt new file mode 100644 index 0000000000..8fcd73b563 --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/AppProviderImpl.kt @@ -0,0 +1,34 @@ +package com.gh.common.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IAppProvider +import com.halo.assistant.HaloApp + +@Route(path = RouteConsts.provider.app, name = "Application暴露服务") +class AppProviderImpl : IAppProvider { + override fun init(context: Context?) { + + } + + override fun getGid(): String { + return HaloApp.getInstance().gid ?: "" + } + + override fun getOaid(): String { + return HaloApp.getInstance().oaid ?: "" + } + + override fun getChannel(): String { + return HaloApp.getInstance().channel ?: "" + } + + override fun getDeviceRamSize(): Long { + return HaloApp.getInstance().deviceRamSize + } + + override fun isUserAcceptPrivacyPolicy(context: Context): Boolean { + return HaloApp.isUserAcceptPrivacyPolicy(context) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt b/app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt new file mode 100644 index 0000000000..4478379456 --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt @@ -0,0 +1,32 @@ +package com.gh.common.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.gamecenter.BuildConfig +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IBuildConfigProvider + +@Route(path = RouteConsts.provider.buildConfig, name = "BuildConfig暴露服务") +class BuildConfigImpl : IBuildConfigProvider { + override fun init(context: Context?) { + + } + + override fun getApplicationId(): String = BuildConfig.APPLICATION_ID + + override fun getVersionName(): String = BuildConfig.VERSION_NAME + + override fun getExposureVersion(): String = BuildConfig.EXPOSURE_VERSION + + override fun isDebug(): Boolean = BuildConfig.DEBUG + + override fun getBuildTime(): Long = BuildConfig.BUILD_TIME + + override fun getApiHost(): String = BuildConfig.API_HOST + + override fun getDevApiHost(): String = BuildConfig.DEV_API_HOST + + override fun getNewApiHost(): String = BuildConfig.NEW_API_HOST + + override fun getNewDevApiHost(): String = BuildConfig.NEW_DEV_API_HOST +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/CheckLoginProviderImpl.kt b/app/src/main/java/com/gh/common/provider/CheckLoginProviderImpl.kt new file mode 100644 index 0000000000..a5f2987745 --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/CheckLoginProviderImpl.kt @@ -0,0 +1,18 @@ +package com.gh.common.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.common.util.CheckLoginUtils +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.ICheckLoginProvider + +@Route(path = RouteConsts.provider.checkLogin, name = "CheckLoginUtils暴露服务") +class CheckLoginProviderImpl : ICheckLoginProvider { + override fun checkLogin(context: Context, entrance: String, action: (() -> Unit)?) { + CheckLoginUtils.checkLogin(context, entrance, action) + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt b/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt new file mode 100644 index 0000000000..80df61465e --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt @@ -0,0 +1,50 @@ +package com.gh.common.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.common.constant.Config +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IConfigProvider + +@Route(path = RouteConsts.provider.config, name = "Config暴露服务") +class ConfigProviderImpl : IConfigProvider { + override fun getUploadLimitSize(): Long { + return Config.getSettings()?.image?.uploadLimitSize ?: 0L + } + + override fun getSize(): Int { + return Config.getSettings()?.image?.size ?: 0 + } + + override fun getRatio(): Int { + return Config.getSettings()?.image?.ratio ?: 0 + } + + override fun getQuality(): Int { + return Config.getSettings()?.image?.quality ?: 0 + } + + override fun getGif(): String { + return Config.getSettings()?.image?.oss?.gif ?: "" + } + + override fun getJpeg(): String { + return Config.getSettings()?.image?.oss?.jpeg ?: "" + } + + override fun getWebp(): String { + return Config.getSettings()?.image?.oss?.webp ?: "" + } + + override fun getGitThumb(): String { + return Config.getSettings()?.image?.oss?.gitThumb ?: "" + } + + override fun getGifWaterMark(): String { + return Config.getSettings()?.image?.oss?.gifWaterMark ?: "" + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/DefaultUrlHandlerProviderImpl.kt b/app/src/main/java/com/gh/common/provider/DefaultUrlHandlerProviderImpl.kt new file mode 100644 index 0000000000..d7b1da9fb2 --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/DefaultUrlHandlerProviderImpl.kt @@ -0,0 +1,19 @@ +package com.gh.common.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.common.DefaultUrlHandler +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IDefaultUrlHandlerProvider + +@Route(path = RouteConsts.provider.defaultUrlHandler, name = "DefaultUrlHandler暴露服务") +class DefaultUrlHandlerProviderImpl : IDefaultUrlHandlerProvider { + + override fun interceptUrl(context: Context, url: String, entrance: String):Boolean { + return DefaultUrlHandler.interceptUrl(context, url, entrance) + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/DialogUtilsProviderImpl.kt b/app/src/main/java/com/gh/common/provider/DialogUtilsProviderImpl.kt new file mode 100644 index 0000000000..3810409211 --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/DialogUtilsProviderImpl.kt @@ -0,0 +1,23 @@ +package com.gh.common.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.common.util.DialogUtils +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IDialogUtilsProvider + +@Route(path = RouteConsts.provider.dialogUtils, name = "DialogUtils暴露服务") +class DialogUtilsProviderImpl : IDialogUtilsProvider { + override fun showRegulationTestDialog(context: Context, confirm: () -> Unit, cancel: () -> Unit) { + DialogUtils.showRegulationTestDialog(context, object : ConfirmListener { + override fun onConfirm() { + confirm.invoke() + } + }, cancel) + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt b/app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt new file mode 100644 index 0000000000..be9f102e6e --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt @@ -0,0 +1,23 @@ +package com.gh.common.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.common.util.DirectUtils +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IDirectProvider + +@Route(path = RouteConsts.provider.directUtils, name = "DirectUtils暴露服务") +class DirectProviderImpl : IDirectProvider { + + override fun directToWebView(context: Context, url: String, entrance: String?) { + DirectUtils.directToWebView(context, url, entrance) + } + + override fun directToRegulationTestPage(context: Context) { + DirectUtils.directToRegulationTestPage(context) + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/PackageUtilsProviderImpl.kt b/app/src/main/java/com/gh/common/provider/PackageUtilsProviderImpl.kt new file mode 100644 index 0000000000..4a94aa16b3 --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/PackageUtilsProviderImpl.kt @@ -0,0 +1,22 @@ +package com.gh.common.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.common.util.PackageUtils +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IPackageUtilsProvider + +@Route(path = RouteConsts.provider.packageUtils, name = "PackageUtils暴露服务") +class PackageUtilsProviderImpl : IPackageUtilsProvider { + override fun obtainProcessName(context: Context): String { + return PackageUtils.obtainProcessName(context) + } + + override fun getGhVersionName(): String { + return PackageUtils.getGhVersionName() + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt b/app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt new file mode 100644 index 0000000000..c208ca2030 --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt @@ -0,0 +1,22 @@ +package com.gh.common.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IUserManagerProvider +import com.gh.gamecenter.manager.UserManager + +@Route(path = RouteConsts.provider.userManager, name = "UserManager暴露服务") +class UserManagerProviderImpl: IUserManagerProvider { + override fun userShouldTakeRegulationBaseOnLastRemind(): Boolean { + return UserManager.getInstance().userShouldTakeRegulationBaseOnLastRemind() + } + + override fun getUserId(): String { + return UserManager.getInstance().userId + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/WebProviderImpl.kt b/app/src/main/java/com/gh/common/provider/WebProviderImpl.kt new file mode 100644 index 0000000000..9676f2a62a --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/WebProviderImpl.kt @@ -0,0 +1,19 @@ +package com.gh.common.provider + +import android.content.Context +import android.content.Intent +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.gamecenter.WebActivity +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IWebProvider + +@Route(path = RouteConsts.provider.webActivity, name = "WebActivity暴露服务") +class WebProviderImpl : IWebProvider { + override fun getIntent(context: Context, url: String, autoCompletionTitle: Boolean): Intent { + return WebActivity.getIntent(context, url, autoCompletionTitle) + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file 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 08993dc0b8..caaf902660 100644 --- a/app/src/main/java/com/gh/common/repository/RemenkapaiRepository.kt +++ b/app/src/main/java/com/gh/common/repository/RemenkapaiRepository.kt @@ -2,7 +2,7 @@ package com.gh.common.repository import com.gh.common.filter.RegionSettingHelper import com.gh.common.util.ApkActiveUtils -import com.gh.common.util.RandomUtils +import com.gh.gamecenter.core.utils.RandomUtils import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable 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 aad6f8f14f..c6ca6c3e99 100644 --- a/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt +++ b/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt @@ -9,12 +9,14 @@ import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.constraintlayout.widget.ConstraintLayout import com.g00fy2.versioncompare.Version -import com.gh.common.AppExecutor.uiExecutor -import com.gh.common.constant.Constants -import com.gh.common.dialog.TrackableDialog +import com.gh.gamecenter.core.AppExecutor.uiExecutor +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.base.TrackableDialog import com.gh.common.util.* import com.gh.download.DownloadManager import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.ApkEntity import com.gh.gamecenter.entity.SimulatorEntity import com.gh.gamecenter.entity.TrackableEntity 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 03dfa4f5e7..3194cd20f3 100644 --- a/app/src/main/java/com/gh/common/simulator/SimulatorGameManager.kt +++ b/app/src/main/java/com/gh/common/simulator/SimulatorGameManager.kt @@ -7,9 +7,12 @@ import android.graphics.Bitmap import android.net.Uri import android.text.TextUtils import com.g00fy2.versioncompare.Version -import com.gh.common.json.json +import com.gh.gamecenter.common.json.json import com.gh.common.util.* import com.gh.download.DownloadManager +import com.gh.gamecenter.common.callback.BiCallback +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.SimulatorGameRecordEntity import com.gh.gamecenter.manager.UserManager diff --git a/app/src/main/java/com/gh/common/syncpage/example/ExampleAdapter.kt b/app/src/main/java/com/gh/common/syncpage/example/ExampleAdapter.kt deleted file mode 100644 index 29dfea48ce..0000000000 --- a/app/src/main/java/com/gh/common/syncpage/example/ExampleAdapter.kt +++ /dev/null @@ -1,98 +0,0 @@ -package com.gh.common.syncpage.example - -import android.content.Context -import android.view.View -import android.view.ViewGroup -import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType -import com.gh.common.syncpage.ISyncAdapterHandler -import com.gh.gamecenter.R -import com.gh.gamecenter.adapter.viewholder.FooterViewHolder -import com.gh.gamecenter.baselist.ListAdapter -import com.gh.gamecenter.databinding.CommunityAnswerItemBinding -import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.qa.answer.CommunityAnswerItemViewHolder -import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity -import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity -import com.gh.gamecenter.qa.entity.AnswerEntity -import com.gh.gamecenter.qa.entity.Questions - -class ExampleAdapter(context: Context) : ListAdapter(context), ISyncAdapterHandler { - - override fun areItemsTheSame(oldItem: AnswerEntity?, newItem: AnswerEntity?): Boolean { - return oldItem?.id == newItem?.id - } - - override fun getItemViewType(position: Int): Int { - if (position == itemCount - 1) return ItemViewType.ITEM_FOOTER - return ItemViewType.ITEM_BODY - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { - val view: View - return when (viewType) { - ItemViewType.ITEM_FOOTER -> { - view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false) - FooterViewHolder(view) - } - else -> { - view = mLayoutInflater.inflate(R.layout.community_answer_item, parent, false) - CommunityAnswerItemViewHolder(CommunityAnswerItemBinding.bind(view)) - } - } - } - - override fun getItemCount(): Int { - return if (mEntityList.isNotEmpty()) mEntityList.size + FOOTER_ITEM_COUNT else 0 - } - - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { - when (getItemViewType(position)) { - ItemViewType.ITEM_BODY -> { - val answer = mEntityList[position] - if ("community_article" == answer.type) { - val questions = Questions() - questions.title = answer.articleTitle - answer.questions = questions - } - - val answerViewHolder = holder as CommunityAnswerItemViewHolder - val binding = answerViewHolder.binding - answerViewHolder.bindAnswerItem(answer, "", getPath()) - binding.title.setOnClickListener { - if ("community_article" == answer.type) { - mContext.startActivity(ArticleDetailActivity.getIntent(mContext, UserManager.getInstance().community, answer.id!!, "", getPath())) - } -// else { -// val questions = answer.questions -// mContext.startActivity(QuestionsDetailActivity.getIntent(mContext, questions.id, "", getPath())) -// } - } - - answerViewHolder.itemView.setOnClickListener { - if ("community_article" == answer.type) { - mContext.startActivity(ArticleDetailActivity.getIntent(mContext, UserManager.getInstance().community, answer.id!!, "", getPath())) - } else { - mContext.startActivity(AnswerDetailActivity.getIntent(mContext, answer.id, "", getPath())) - } - } - } - ItemViewType.ITEM_FOOTER -> { - val footerViewHolder = holder as FooterViewHolder - footerViewHolder.initItemPadding() - footerViewHolder.initFooterViewHolder(mIsLoading, mIsNetworkError, mIsOver) - } - } - } - - override fun getSyncData(position: Int): Pair? { - if (position >= mEntityList.size) return null - val entity = mEntityList[position] - return Pair(entity.id ?: "", entity) - } - - fun getPath(): String { - return "问答-推荐-按时间" - } - -} \ No newline at end of file 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 deleted file mode 100644 index da90ec2761..0000000000 --- a/app/src/main/java/com/gh/common/syncpage/example/ExampleFragment.kt +++ /dev/null @@ -1,65 +0,0 @@ -package com.gh.common.syncpage.example - -import android.os.Bundle -import android.view.View -import androidx.lifecycle.ViewModelProviders -import androidx.recyclerview.widget.RecyclerView -import com.gh.common.view.VerticalItemDecoration -import com.gh.gamecenter.baselist.ListFragment -import com.gh.gamecenter.baselist.NormalListViewModel -import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.qa.entity.AnswerEntity -import com.gh.gamecenter.retrofit.RetrofitManager -import com.halo.assistant.HaloApp -import io.reactivex.Observable - -class ExampleFragment : ListFragment>() { - - private var mAdapter: ExampleAdapter? = null - - override fun provideListAdapter(): ExampleAdapter { - if (mAdapter == null) { - mAdapter = ExampleAdapter(requireContext()) - } - return mAdapter!! - } - - override fun getItemDecoration(): RecyclerView.ItemDecoration { - return VerticalItemDecoration(context, 8F, false) - } - - override fun provideDataObservable(page: Int): Observable> { - return RetrofitManager.getInstance().api.getCommunitiesRecommendNewest(UserManager.getInstance().community.id, page) - } - - override fun provideListViewModel(): NormalListViewModel { - val factory = NormalListViewModel.Factory(HaloApp.getInstance().application, this) - return ViewModelProviders.of(this, factory).get(NormalListViewModel::class.java) as NormalListViewModel - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) -// SyncPageRepository.syncPageLiveData.observe(this, Observer { -// it ?: return@Observer -// val adapter = mListRv.adapter -// if (adapter !is ISyncAdapterHandler) return@Observer -// for(position in 0 until adapter.itemCount) { -// val syncKey = adapter.getSyncData(position) -// for (syncDataEntity in it) { -// if (syncDataEntity.syncId == syncKey?.first) { -// val isSuccess = SyncPageRepository.handleSyncData(syncKey.second, syncDataEntity) -// if (isSuccess) adapter.notifyItemChanged(position) -// } -// } -// } -// }) - } - - override fun provideSyncAdapter(): RecyclerView.Adapter<*>? { - return mListRv.adapter - } - - override fun addSyncPageObserver(): Boolean { - return true - } -} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/tracker/Tracker.kt b/app/src/main/java/com/gh/common/tracker/Tracker.kt index e97a6d8d22..055874cfee 100644 --- a/app/src/main/java/com/gh/common/tracker/Tracker.kt +++ b/app/src/main/java/com/gh/common/tracker/Tracker.kt @@ -3,7 +3,7 @@ package com.gh.common.tracker import android.app.Activity import android.app.Application import androidx.lifecycle.ProcessLifecycleOwner -import com.gh.common.runOnUiThread +import com.gh.gamecenter.core.runOnUiThread import java.util.* /** diff --git a/app/src/main/java/com/gh/common/tracker/TrackerLogger.kt b/app/src/main/java/com/gh/common/tracker/TrackerLogger.kt index 9db61185f2..cd2a262ab3 100644 --- a/app/src/main/java/com/gh/common/tracker/TrackerLogger.kt +++ b/app/src/main/java/com/gh/common/tracker/TrackerLogger.kt @@ -1,12 +1,12 @@ package com.gh.common.tracker import android.content.Context -import com.gh.common.exposure.meta.MetaUtil -import com.gh.common.exposure.meta.MetaUtil.getBase64EncodedAndroidId -import com.gh.common.exposure.meta.MetaUtil.getBase64EncodedIMEI +import com.gh.gamecenter.common.exposure.meta.MetaUtil +import com.gh.gamecenter.common.exposure.meta.MetaUtil.getBase64EncodedAndroidId +import com.gh.gamecenter.common.exposure.meta.MetaUtil.getBase64EncodedIMEI import com.gh.common.loghub.LoghubUtils import com.gh.common.util.PackageUtils -import com.gh.common.util.tryCatchInRelease +import com.gh.gamecenter.common.utils.tryCatchInRelease import com.gh.gamecenter.R import com.lightgame.utils.Utils import org.json.JSONException 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 c2fc5de779..65560c0a90 100644 --- a/app/src/main/java/com/gh/common/util/ActivationHelper.kt +++ b/app/src/main/java/com/gh/common/util/ActivationHelper.kt @@ -1,5 +1,6 @@ package com.gh.common.util +import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.schedulers.Schedulers 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 d829da3275..199c3bcd6d 100644 --- a/app/src/main/java/com/gh/common/util/AdHelper.kt +++ b/app/src/main/java/com/gh/common/util/AdHelper.kt @@ -3,6 +3,7 @@ package com.gh.common.util import android.annotation.SuppressLint import androidx.lifecycle.MutableLiveData import com.gh.common.constant.Config +import com.gh.gamecenter.common.utils.NetworkUtils import com.gh.gamecenter.entity.SettingsEntity import com.gh.gamecenter.entity.StartupAdEntity import com.gh.gamecenter.retrofit.BiResponse 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 4317f48cb4..293e921cea 100644 --- a/app/src/main/java/com/gh/common/util/BbsReportHelper.kt +++ b/app/src/main/java/com/gh/common/util/BbsReportHelper.kt @@ -9,12 +9,16 @@ import android.view.View import android.view.Window import androidx.core.widget.doOnTextChanged import androidx.recyclerview.widget.LinearLayoutManager -import com.gh.base.CurrentActivityHolder -import com.gh.common.json.json -import com.gh.common.view.VerticalItemDecoration +import com.gh.gamecenter.core.utils.CurrentActivityHolder +import com.gh.gamecenter.common.json.json +import com.gh.gamecenter.common.view.VerticalItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity import com.gh.gamecenter.adapter.ReportReasonAdapter +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toObject +import com.gh.gamecenter.common.utils.toRequestBody import com.gh.gamecenter.databinding.DialogReportReasonBinding import com.gh.gamecenter.entity.SettingsEntity import com.gh.gamecenter.retrofit.BiResponse 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 ef8573b305..2500cd6018 100644 --- a/app/src/main/java/com/gh/common/util/BbsStayTimeHelper.kt +++ b/app/src/main/java/com/gh/common/util/BbsStayTimeHelper.kt @@ -4,9 +4,12 @@ import android.annotation.SuppressLint import android.app.Activity import android.app.Application import android.os.Bundle -import com.gh.base.CurrentActivityHolder -import com.gh.base.GHThreadFactory +import com.gh.gamecenter.core.utils.CurrentActivityHolder +import com.gh.gamecenter.core.GHThreadFactory import com.gh.gamecenter.MainActivity +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.common.utils.isPublishEnv +import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.forum.detail.ForumDetailActivity import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity import com.gh.gamecenter.qa.comment.CommentActivity diff --git a/app/src/main/java/com/gh/common/util/CheckLoginUtils.java b/app/src/main/java/com/gh/common/util/CheckLoginUtils.java index 92b9550043..0c88426412 100644 --- a/app/src/main/java/com/gh/common/util/CheckLoginUtils.java +++ b/app/src/main/java/com/gh/common/util/CheckLoginUtils.java @@ -5,9 +5,12 @@ import android.content.Context; import android.os.Bundle; import android.text.TextUtils; -import com.gh.base.CurrentActivityHolder; -import com.gh.common.constant.Constants; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.core.utils.CurrentActivityHolder; +import com.gh.gamecenter.common.constant.Constants; import com.gh.gamecenter.LoginActivity; +import com.gh.gamecenter.common.utils.NetworkUtils; +import com.gh.gamecenter.core.utils.SPUtils; import com.gh.gamecenter.manager.UserManager; import com.lightgame.utils.Utils; @@ -36,8 +39,8 @@ public class CheckLoginUtils { } else { // 有可能App未启动 Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); - bundle.putString(EntranceUtils.KEY_TO, LoginActivity.class.getName()); + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance); + bundle.putString(EntranceConsts.KEY_TO, LoginActivity.class.getName()); EntranceUtils.jumpActivity(context, bundle); } } else { @@ -55,8 +58,8 @@ public class CheckLoginUtils { // 有可能App未启动 Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); - bundle.putString(EntranceUtils.KEY_TO, LoginActivity.class.getName()); + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance); + bundle.putString(EntranceConsts.KEY_TO, LoginActivity.class.getName()); EntranceUtils.jumpActivity(context, nextToBundle, bundle, (resultCode, data) -> { if (isTriggerNextStep && listener != null && isLogin()) { listener.onLogin(); 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 8a6c557701..2099e19fa2 100644 --- a/app/src/main/java/com/gh/common/util/CommentHelper.kt +++ b/app/src/main/java/com/gh/common/util/CommentHelper.kt @@ -5,12 +5,15 @@ import android.view.LayoutInflater import android.view.View import android.widget.LinearLayout import android.widget.TextView -import com.gh.common.constant.Constants -import com.gh.common.json.json +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.json.json import com.gh.common.util.CommentUtils.copyText -import com.gh.common.view.BugFixedPopupWindow +import com.gh.gamecenter.common.view.BugFixedPopupWindow import com.gh.gamecenter.CommentDetailActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.utils.ifLogin +import com.gh.gamecenter.common.utils.showAutoOrientation import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.entity.MeEntity import com.gh.gamecenter.entity.Permissions 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 aad2c6c007..d43bf9ce9c 100644 --- a/app/src/main/java/com/gh/common/util/CommentUtils.java +++ b/app/src/main/java/com/gh/common/util/CommentUtils.java @@ -17,6 +17,12 @@ import androidx.core.content.ContextCompat; import com.gh.gamecenter.CommentDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.CommentViewHolder; +import com.gh.gamecenter.common.callback.SimpleCallback; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.core.utils.NumberUtils; +import com.gh.gamecenter.core.utils.ToastUtils; import com.gh.gamecenter.entity.CommentEntity; import com.gh.gamecenter.entity.MeEntity; import com.gh.gamecenter.entity.UserInfoEntity; diff --git a/app/src/main/java/com/gh/common/util/ConcernContentUtils.java b/app/src/main/java/com/gh/common/util/ConcernContentUtils.java index 23e9d0a501..49f8a86ff3 100644 --- a/app/src/main/java/com/gh/common/util/ConcernContentUtils.java +++ b/app/src/main/java/com/gh/common/util/ConcernContentUtils.java @@ -2,12 +2,13 @@ package com.gh.common.util; import android.content.Context; import android.content.Intent; -import android.view.View; import android.widget.LinearLayout; import com.facebook.drawee.drawable.ScalingUtils; import com.facebook.drawee.view.SimpleDraweeView; import com.gh.gamecenter.ImageViewerActivity; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.utils.ImageUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/gh/common/util/DataCollectionUtils.java b/app/src/main/java/com/gh/common/util/DataCollectionUtils.java index 8a4429f28f..8e514a3acf 100644 --- a/app/src/main/java/com/gh/common/util/DataCollectionUtils.java +++ b/app/src/main/java/com/gh/common/util/DataCollectionUtils.java @@ -3,7 +3,9 @@ package com.gh.common.util; import android.content.Context; import android.os.Build; -import com.gh.common.constant.Constants; +import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.utils.NetworkUtils; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.NewsDetailEntity; import com.gh.gamecenter.manager.DataCollectionManager; @@ -49,7 +51,7 @@ public class DataCollectionUtils { map.put("platform", PlatformUtils.getInstance(context).getPlatformName(downloadEntity.getPlatform())); map.put("status", status); map.put("location", downloadEntity.getLocation()); - map.put(EntranceUtils.KEY_ENTRANCE, downloadEntity.getEntrance()); + map.put(EntranceConsts.KEY_ENTRANCE, downloadEntity.getEntrance()); map.put("installed", downloadEntity.getInstalled()); map.put("network", NetworkUtils.getConnectedType(context)); DataCollectionManager.onEvent(context, "download", map); diff --git a/app/src/main/java/com/gh/common/util/DataLogUtils.java b/app/src/main/java/com/gh/common/util/DataLogUtils.java index 21440726c0..28a2405e1a 100644 --- a/app/src/main/java/com/gh/common/util/DataLogUtils.java +++ b/app/src/main/java/com/gh/common/util/DataLogUtils.java @@ -2,8 +2,9 @@ package com.gh.common.util; import android.content.Context; -import com.gh.common.exposure.meta.MetaUtil; +import com.gh.gamecenter.common.exposure.meta.MetaUtil; import com.gh.common.loghub.LoghubUtils; +import com.gh.gamecenter.common.utils.Installation; import com.halo.assistant.HaloApp; import com.lightgame.download.DownloadEntity; import com.lightgame.utils.Utils; 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 33b0a5a81f..bb7dedd032 100644 --- a/app/src/main/java/com/gh/common/util/DataUtils.java +++ b/app/src/main/java/com/gh/common/util/DataUtils.java @@ -8,10 +8,14 @@ import android.os.Build; import android.preference.PreferenceManager; import android.text.TextUtils; -import com.gh.common.AppExecutor; -import com.gh.common.constant.Constants; -import com.gh.common.exposure.meta.MetaUtil; +import com.gh.gamecenter.core.AppExecutor; +import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.exposure.meta.MetaUtil; import com.gh.gamecenter.BuildConfig; +import com.gh.gamecenter.common.utils.DeviceUtils; +import com.gh.gamecenter.core.utils.GsonUtils; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.core.utils.SPUtils; import com.gh.gamecenter.entity.UserInfoEntity; import com.gh.gamecenter.retrofit.BiResponse; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -24,7 +28,6 @@ import com.lightgame.utils.Utils; import java.util.HashMap; import java.util.Map; -import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; import io.sentry.Sentry; import io.sentry.android.core.SentryAndroid; 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 57b6d62e86..55b946f3c5 100644 --- a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java +++ b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java @@ -4,7 +4,7 @@ import android.text.TextUtils; import android.view.View; import com.gh.common.constant.Config; -import com.gh.common.constant.Constants; +import com.gh.gamecenter.common.constant.Constants; import com.gh.common.repository.ReservationRepository; import com.gh.common.simulator.SimulatorGameManager; import com.gh.common.view.DownloadProgressBar; @@ -13,6 +13,7 @@ import com.gh.common.xapk.XapkUnzipStatus; import com.gh.download.DownloadManager; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.DetailViewHolder; +import com.gh.gamecenter.core.utils.SPUtils; import com.gh.gamecenter.entity.LinkEntity; import com.gh.gamecenter.entity.PluginLocation; import com.gh.gamecenter.manager.PackagesManager; 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 809806bb93..b282020620 100644 --- a/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt +++ b/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt @@ -3,7 +3,7 @@ package com.gh.common.util import android.content.Context import android.os.Environment import android.preference.PreferenceManager -import com.gh.common.exposure.meta.MetaUtil +import com.gh.gamecenter.common.exposure.meta.MetaUtil import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.entity.TimeEntity import com.gh.gamecenter.retrofit.Response diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index d6336149fa..e84216fa1e 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -49,20 +49,31 @@ import androidx.recyclerview.widget.RecyclerView; import com.facebook.drawee.generic.GenericDraweeHierarchy; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.common.AppExecutor; import com.gh.common.constant.Config; -import com.gh.common.dialog.TrackableDialog; -import com.gh.common.view.CustomLinkMovementMethod; -import com.gh.common.view.DrawableView; -import com.gh.common.view.FixLinearLayoutManager; -import com.gh.common.view.LimitHeightLinearLayout; -import com.gh.common.view.MaxHeightNestedScrollView; -import com.gh.common.view.VerticalItemDecoration; +import com.gh.gamecenter.common.view.DrawableView; +import com.gh.gamecenter.common.view.FixLinearLayoutManager; +import com.gh.gamecenter.common.view.LimitHeightLinearLayout; +import com.gh.gamecenter.common.view.MaxHeightNestedScrollView; +import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.adapter.ReportReasonAdapter; import com.gh.gamecenter.adapter.viewholder.PrivacyPolicyItemViewHolder; -import com.gh.gamecenter.databinding.DialogAlertDefaultBinding; +import com.gh.gamecenter.common.base.TrackableDialog; +import com.gh.gamecenter.common.callback.ConfirmListener; +import com.gh.gamecenter.common.callback.SimpleCallback; +import com.gh.gamecenter.common.databinding.DialogAlertDefaultBinding; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.common.utils.NetworkUtils; +import com.gh.gamecenter.common.view.CustomLinkMovementMethod; +import com.gh.gamecenter.core.AppExecutor; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.core.utils.EmptyCallback; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.core.utils.SpanBuilder; +import com.gh.gamecenter.core.utils.StringUtils; +import com.gh.gamecenter.core.utils.ToastUtils; import com.gh.gamecenter.databinding.DialogBindPhoneBinding; import com.gh.gamecenter.databinding.DialogEnergySignBinding; import com.gh.gamecenter.databinding.DialogOverseaConfirmationBinding; @@ -2284,10 +2295,6 @@ public class DialogUtils { return AppManager.getInstance().currentActivity(); } - public interface ConfirmListener { - void onConfirm(); - } - public interface CancelListener { void onCancel(); } 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 537570d6ee..70f5d07136 100644 --- a/app/src/main/java/com/gh/common/util/DirectUtils.kt +++ b/app/src/main/java/com/gh/common/util/DirectUtils.kt @@ -12,21 +12,28 @@ import androidx.appcompat.app.AppCompatActivity import com.gh.base.BaseActivity import com.gh.base.BaseActivity_TabLayout import com.gh.base.ToolBarActivity -import com.gh.base.fragment.BaseFragment_TabLayout -import com.gh.common.AppExecutor +import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout +import com.gh.gamecenter.core.AppExecutor import com.gh.common.constant.Config -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureEvent.Companion.createEvent import com.gh.common.exposure.ExposureManager.log import com.gh.common.exposure.ExposureTraceUtils.appendTrace import com.gh.common.exposure.ExposureType +import com.gh.gamecenter.common.constant.EntranceConsts.* import com.gh.common.util.EntranceUtils.* import com.gh.gamecenter.* import com.gh.gamecenter.amway.AmwayActivity import com.gh.gamecenter.catalog.CatalogActivity import com.gh.gamecenter.category.CategoryDirectoryActivity import com.gh.gamecenter.category2.CategoryV2Activity +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.core.utils.RunningUtils +import com.gh.gamecenter.common.utils.copyTextAndToast +import com.gh.gamecenter.common.utils.isPublishEnv +import com.gh.gamecenter.common.utils.EnvHelper import com.gh.gamecenter.download.DownloadFragment.Companion.INDEX_UPDATE import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.EBSkip @@ -625,7 +632,7 @@ object DirectUtils { val subjectData = SubjectData(subjectId = id, subjectName = subjectName, isOrder = false) bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER) bundle.putString(KEY_TO, SubjectActivity::class.java.name) - bundle.putParcelable(EntranceUtils.KEY_SUBJECT_DATA, subjectData) + bundle.putParcelable(EntranceConsts.KEY_SUBJECT_DATA, subjectData) jumpActivity(context, bundle) } @@ -744,7 +751,7 @@ object DirectUtils { if (url.contains("leave_web_page_handle_back_pressed=true")) { bundle.putBoolean(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_BACK_PRESSED, true) } - bundle.putString(EntranceUtils.KEY_URL, url) + bundle.putString(EntranceConsts.KEY_URL, url) jumpActivity(context, bundle) } @@ -834,7 +841,7 @@ object DirectUtils { val bundle = Bundle() bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER) bundle.putString(KEY_TO, LibaoDetailActivity::class.java.simpleName) - bundle.putString(EntranceUtils.KEY_ID, giftId) + bundle.putString(EntranceConsts.KEY_ID, giftId) HaloApp.put(LibaoEntity.TAG, null) jumpActivity(context, bundle) } diff --git a/app/src/main/java/com/gh/common/util/DownloadDialogHelper.kt b/app/src/main/java/com/gh/common/util/DownloadDialogHelper.kt index 28038b73cd..ae936df40f 100644 --- a/app/src/main/java/com/gh/common/util/DownloadDialogHelper.kt +++ b/app/src/main/java/com/gh/common/util/DownloadDialogHelper.kt @@ -2,6 +2,8 @@ package com.gh.common.util import android.content.Context import android.os.Build +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.core.utils.EmptyCallback import com.gh.gamecenter.entity.ApkEntity import com.gh.gamecenter.entity.GameEntity 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 6d74482b26..ed46db9488 100644 --- a/app/src/main/java/com/gh/common/util/DownloadHelper.kt +++ b/app/src/main/java/com/gh/common/util/DownloadHelper.kt @@ -2,6 +2,7 @@ package com.gh.common.util import com.gh.common.filter.RegionSettingHelper import com.gh.download.DownloadManager +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager @@ -35,13 +36,13 @@ object DownloadHelper { for (apk in response.getApk()) { if (packageName == apk.packageName) { DownloadManager.createDownload(HaloApp.getInstance().application, - apk, response, "", EntranceUtils.ENTRANCE_RECOMMEND, "", false, null) + apk, response, "", EntranceConsts.ENTRANCE_RECOMMEND, "", false, null) block.invoke() } } } else if (response.getApk().size == 1) { DownloadManager.createDownload(HaloApp.getInstance().application, - response, "", EntranceUtils.ENTRANCE_RECOMMEND, "", false, null) + response, "", EntranceConsts.ENTRANCE_RECOMMEND, "", false, null) block.invoke() } } 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 a72188ad06..e0a96cc99e 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt @@ -11,7 +11,7 @@ import androidx.collection.ArrayMap import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.common.constant.Config -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.dialog.CertificationDialog import com.gh.common.dialog.DeviceRemindDialog import com.gh.common.dialog.PackageCheckDialogFragment @@ -29,6 +29,9 @@ import com.gh.gamecenter.DownloadManagerActivity import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.adapter.viewholder.GameViewHolder +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.LinkEntity import com.gh.gamecenter.entity.PluginLocation @@ -609,17 +612,23 @@ object DownloadItemUtils { clickCallback?.onCallback() RealNameHelper.checkIfAuth(view.context, gameEntity, object : EmptyCallback { override fun onCallback() { - GamePermissionDialogFragment.show(context, gameEntity, gameEntity.info) { - PermissionHelper.checkStoragePermissionBeforeAction(context, object : EmptyCallback { - override fun onCallback() { - CertificationDialog.showCertificationDialog(context, gameEntity) { - DialogUtils.showVersionNumberDialog(context, gameEntity) { - DownloadDialog.showDownloadDialog(view.context, gameEntity, traceEvent, entrance, location) - } + GamePermissionDialogFragment.show(context, gameEntity, gameEntity.info, object : ConfirmListener { + override fun onConfirm() { + PermissionHelper.checkStoragePermissionBeforeAction(context, object : EmptyCallback { + override fun onCallback() { + CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener { + override fun onConfirm() { + DialogUtils.showVersionNumberDialog(context, gameEntity, object : ConfirmListener { + override fun onConfirm() { + DownloadDialog.showDownloadDialog(view.context, gameEntity, traceEvent, entrance, location) + } + }) + } + }) } - } - }) - } + }) + } + }) } }) } @@ -645,52 +654,90 @@ object DownloadItemUtils { // 先弹下载弹窗(如果需要的话) RealNameHelper.checkIfAuth(context, gameEntity, object : EmptyCallback { override fun onCallback() { - GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) { - BrowserInstallHelper.showBrowserInstallHintDialog(context, object : EmptyCallback { - override fun onCallback() { - PackageCheckDialogFragment.show(context, gameEntity) { - DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback { - override fun onCallback() { - CertificationDialog.showCertificationDialog(context, gameEntity) { - DialogUtils.showOverseaDownloadDialog(context, gameEntity) { - DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean -> - download(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent) - } + GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info, object : ConfirmListener { + override fun onConfirm() { + BrowserInstallHelper.showBrowserInstallHintDialog(context, object : EmptyCallback { + override fun onCallback() { + PackageCheckDialogFragment.show(context, gameEntity, object : ConfirmListener { + override fun onConfirm() { + DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback { + override fun onCallback() { + CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener { + override fun onConfirm() { + DialogUtils.showOverseaDownloadDialog(context, gameEntity, object : ConfirmListener { + override fun onConfirm() { + DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean -> + download( + context, + gameEntity, + downloadBtn, + entrance, + location, + isSubscribe, + traceEvent + ) + } + } + }) + } + }) } - } + }) } }) } - } - }) - } + }) + + } + }) } }) DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance) } else if (str == context.getString(R.string.attempt)) { RealNameHelper.checkIfAuth(context, gameEntity, object : EmptyCallback { override fun onCallback() { - GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) { - BrowserInstallHelper.showBrowserInstallHintDialog(context, object : EmptyCallback { - override fun onCallback() { - PackageCheckDialogFragment.show(context, gameEntity) { - DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback { - override fun onCallback() { - CertificationDialog.showCertificationDialog(context, gameEntity) { - DialogUtils.showVersionNumberDialog(context, gameEntity) { - DialogUtils.showOverseaDownloadDialog(context, gameEntity) { - DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean -> - download(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent) + GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info, object : ConfirmListener { + override fun onConfirm() { + BrowserInstallHelper.showBrowserInstallHintDialog(context, object : EmptyCallback { + override fun onCallback() { + PackageCheckDialogFragment.show(context, gameEntity, object : ConfirmListener { + override fun onConfirm() { + DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback { + override fun onCallback() { + CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener { + override fun onConfirm() { + DialogUtils.showVersionNumberDialog(context, gameEntity, object : ConfirmListener { + override fun onConfirm() { + DialogUtils.showOverseaDownloadDialog( + context, + gameEntity, + object : ConfirmListener { + override fun onConfirm() { + DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean -> + download( + context, + gameEntity, + downloadBtn, + entrance, + location, + isSubscribe, + traceEvent + ) + } + } + }) + } + }) } - } + }) } - } + }) } }) } - } - }) - } + }) + } + }) } }) DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance) @@ -703,11 +750,13 @@ object DownloadItemUtils { } else { DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback { override fun onCallback() { - CertificationDialog.showCertificationDialog(context, gameEntity) { - DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean -> - plugin(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent) + CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener { + override fun onConfirm() { + DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean -> + plugin(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent) + } } - } + }) } }) } diff --git a/app/src/main/java/com/gh/common/util/DownloadNotificationHelper.kt b/app/src/main/java/com/gh/common/util/DownloadNotificationHelper.kt index 4c273fb5c9..4c7570a817 100644 --- a/app/src/main/java/com/gh/common/util/DownloadNotificationHelper.kt +++ b/app/src/main/java/com/gh/common/util/DownloadNotificationHelper.kt @@ -8,11 +8,17 @@ import android.content.Context import android.content.Intent import android.os.Build import androidx.core.app.NotificationCompat -import com.gh.common.AppExecutor -import com.gh.common.constant.Constants +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.common.constant.Constants import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.getMetaExtra +import com.gh.gamecenter.common.utils.isSimulatorGame +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.tryCatchInRelease +import com.gh.gamecenter.core.utils.* import com.halo.assistant.HaloApp import com.lightgame.download.DownloadEntity import com.lightgame.download.DownloadStatus @@ -49,8 +55,8 @@ object DownloadNotificationHelper { val intent = Intent() if (entity.status == DownloadStatus.done && xapkStatus != XapkUnzipStatus.FAILURE.name) { - intent.putExtra(EntranceUtils.KEY_DATA, entity.toJson()) - intent.putExtra(EntranceUtils.KEY_PATH, entity.path) + intent.putExtra(EntranceConsts.KEY_DATA, entity.toJson()) + intent.putExtra(EntranceConsts.KEY_PATH, entity.path) intent.action = ACTION_INSTALL } else { intent.action = ACTION_DOWNLOAD 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 c4abed9f94..5eb7dba93c 100644 --- a/app/src/main/java/com/gh/common/util/DownloadObserver.kt +++ b/app/src/main/java/com/gh/common/util/DownloadObserver.kt @@ -3,9 +3,9 @@ package com.gh.common.util import android.os.Build import android.preference.PreferenceManager import com.gh.base.BaseActivity -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureUtils -import com.gh.common.exposure.meta.MetaUtil +import com.gh.gamecenter.common.exposure.meta.MetaUtil import com.gh.common.simulator.SimulatorDownloadManager import com.gh.common.simulator.SimulatorGameManager import com.gh.common.xapk.XapkInstaller @@ -14,6 +14,9 @@ import com.gh.download.DownloadManager import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.SimpleGameEntity import com.gh.gamecenter.entity.SimulatorEntity @@ -261,13 +264,15 @@ object DownloadObserver { if (downloadType == Constants.SIMULATOR_DOWNLOAD) { val currentActivity = AppManager.getInstance().currentActivity() ?: return - DialogUtils.showSimulatorParseErrorDialog(currentActivity, downloadEntity.gameId, downloadEntity.name) { - val simulator = HaloApp.get(downloadEntity.name, true) as? SimulatorEntity - ?: return@showSimulatorParseErrorDialog - DownloadManager.getInstance().cancel(downloadEntity.url, true, true) - SimulatorDownloadManager.getInstance() - .showDownloadDialog(currentActivity, simulator, SimulatorDownloadManager.SimulatorLocation.SIMULATOR_GAME) - } + DialogUtils.showSimulatorParseErrorDialog(currentActivity, downloadEntity.gameId, downloadEntity.name,object :ConfirmListener{ + override fun onConfirm() { + val simulator = HaloApp.get(downloadEntity.name, true) as? SimulatorEntity + ?: return + DownloadManager.getInstance().cancel(downloadEntity.url, true, true) + SimulatorDownloadManager.getInstance() + .showDownloadDialog(currentActivity, simulator, SimulatorDownloadManager.SimulatorLocation.SIMULATOR_GAME) + } + }) } } } 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 3d66975eb5..77d6da4c3d 100644 --- a/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt +++ b/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt @@ -6,8 +6,14 @@ import android.view.View import android.widget.LinearLayout import android.widget.PopupWindow import android.widget.TextView -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.debugOnly +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.tryCatchInRelease +import com.gh.gamecenter.common.utils.tryWithDefaultCatch +import com.gh.gamecenter.common.utils.PackageFlavorHelper +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.energy.EnergyCenterActivity import com.gh.gamecenter.entity.EnergyTaskCompleteEntity import com.gh.gamecenter.manager.UserManager diff --git a/app/src/main/java/com/gh/common/util/EntranceUtils.java b/app/src/main/java/com/gh/common/util/EntranceUtils.java index aa20866511..a29fa43aaa 100644 --- a/app/src/main/java/com/gh/common/util/EntranceUtils.java +++ b/app/src/main/java/com/gh/common/util/EntranceUtils.java @@ -1,5 +1,9 @@ package com.gh.common.util; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_NEXT_TO; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_REQUIRE_REDIRECT; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_TO; + import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -11,13 +15,18 @@ import android.text.TextUtils; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.gh.common.avoidcallback.AvoidOnResultManager; -import com.gh.common.avoidcallback.Callback; +import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager; +import com.gh.gamecenter.common.avoidcallback.Callback; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.NormalActivity; import com.gh.gamecenter.SplashScreenActivity; -import com.gh.gamecenter.normal.NormalFragment; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.core.utils.ClassUtils; +import com.gh.gamecenter.core.utils.GsonUtils; +import com.gh.gamecenter.core.utils.RunningUtils; +import com.gh.gamecenter.core.utils.SPUtils; +import com.gh.gamecenter.common.base.fragment.NormalFragment; import com.halo.assistant.HaloApp; import com.lightgame.utils.Utils; @@ -27,244 +36,7 @@ import org.json.JSONObject; import java.util.Iterator; import java.util.Set; - -/** - * @author CsHeng - * @Date 2017/4/25 - * @Time 16:39 - */ - public class EntranceUtils { - - public static final String KEY_TO = "to"; - public static final String KEY_NEXT_TO = "next_to"; - public static final String KEY_NEWSID = "newsId"; - public static final String KEY_GAMEID = "gameId"; - public static final String KEY_GAME_ID = "game_id"; - public static final String KEY_ID = "id"; - public static final String KEY_URL = "url"; - public static final String KEY_BUNDLE = "bundle"; - public static final String KEY_GAMENAME = "gameName"; - public static final String KEY_PACKAGE_MD5 = "package_md5"; - public static final String HOST_ARTICLE = "article"; - public static final String HOST_UPLOAD_VIDEO = "upload_video";//上传视频 - public static final String HOST_UPLOAD_VIDEO_NEW = "upload_video_new"; // 上传视频新(AKA 发视频) - public static final String HOST_VIDEO_SINGLE = "video_single";//指定视频-不能划动 - public static final String HOST_VIDEO_MORE = "video_more";//指定视频-能划动 - public static final String HOST_VIDEO_STREAMING_HOME = "video_streaming_home";//视频流-首页 - public static final String HOST_VIDEO_STREAMING_DESC = "video_streaming_desc";//视频流-游戏介绍进入 - public static final String HOST_VIDEO_COLLECTION = "video_collection";//视频合集 - public static final String HOST_VIDEO_DETAIL = "video_detail"; - public static final String HOST_USERHOME = "userhome";//个人主页 - public static final String HOST_VIDEO = "video"; - public static final String HOST_FORUM = "forum"; - public static final String HOST_CATEGORY = "category";//分类 - public static final String HOST_COLUMN_COLLECTION = "column_collection";//专题合集 - public static final String HOST_COMMUNITY_QUESTION_LABEL_DETAIL = "community_question_label_detail";//问题标签详情 - public static final String HOST_COMMUNITY_COLUMN_DETAIL = "community_column_detail";//专栏详情 - public static final String HOST_BLOCK = "block";//板块 - public static final String HOST_SERVER_BLOCK = "server";//开服表板块 - public static final String HOST_AMWAY_BLOCK = "amway";//安利墙板块 - public static final String HOST_GAME_CALENDAR = "game_calendar";// 指定游戏的开服表页面 - public static final String HOST_HISTORY_APK = "history_apk"; // 历史版本页面 - public static final String HOST_HELP = "help";//Q&A - public static final String HOST_HELP_COLLECTION = "help_collection";//Q&A合集 - public static final String HOST_GAME_UPLOAD = "game_upload";//游戏上传 - public static final String HOST_GAME_ZONE = "game_zone";//游戏专区 - public static final String HOST_COMMUNITY_ARTICLE = "community_article"; - public static final String HOST_COMMUNITY_COLUMN = "community_column"; - public static final String HOST_GAME = "game"; - public static final String HOST_GAME_DOWNLOAD = "game_download"; - public static final String HOST_GAME_NEWS = "game_news"; - public static final String HOST_COLUMN = "column"; - public static final String HOST_WEB = "web"; - public static final String HOST_QQ = "qq"; - public static final String HOST_QQ_GROUP = "qqgroup"; - public static final String HOST_QQ_QUN = "qqqun"; - public static final String HOST_DOWNLOAD = "download"; - public static final String HOST_UPDATE = "update"; - public static final String HOST_LINK = "link"; - public static final String HOST_LIBAO = "libao"; - public static final String HOST_COMMUNITY = "community"; - public static final String HOST_SUGGESTION = "suggestion"; - public static final String HOST_ANSWER = "answer"; - public static final String HOST_QUESTION = "question"; - public static final String HOST_TOOLBOX = "toolbox"; - public static final String HOST_FORUM_DETAIL = "forum_detail"; - public static final String HOST_GAME_RATING_DETAIL = "game_rating_detail"; - public static final String HOST_HELP_AND_FEEDBACK = "help_and_feedback"; - public static final String HOST_LAUNCH_SIMULATOR_GAME = "launch_simulator_game"; - public static final String HOST_HELP_DETAIL = "help_detail"; - public static final String HOST_GAME_COLLECTION_DETAIL = "game_collection_detail"; - public static final String HOST_GAME_COLLECTION_SQUARE = "game_collection_square"; - public static final String HOST_GAME_COLLECTION_EDIT = "game_collection_edit"; - public static final String KEY_DATA = "data"; - public static final String KEY_MESSAGE = "message"; - public static final String KEY_MESSAGE_ID = "message_id"; - public static final String KEY_TYPE = "type"; - public static final String KEY_LINK = "link"; - public static final String KEY_NAME = "name"; - public static final String KEY_POSITION = "position"; - public static final String KEY_SUB_POSITION = "sub_position"; - public static final String KEY_ENTRANCE = "entrance"; - public static final String KEY_ENTRANCE_LINK = "entrance_link"; - public static final String KEY_TARGET = "target"; - public static final String ENTRANCE_BROWSER = "(浏览器)"; - public static final String ENTRANCE_WELCOME = "(启动弹窗)"; - public static final String ENTRANCE_UMENG = "(友盟推送)"; - public static final String ENTRANCE_MIPUSH = "(小米推送)"; - public static final String ENTRANCE_DOWNLOAD = "(下载跳转)"; - public static final String ENTRANCE_RECOMMEND = "(落地页)"; - public static final String ENTRANCE_BLOCK_RECOMMEND = "(推荐入口)"; - public static final String ENTRANCE_AMWAY = "(安利墙)"; - public static final String KEY_SUGGEST_HINT_TYPE = "suggestHintType"; - public static final String KEY_PACKAGENAME = "packageName"; - public static final String KEY_PLATFORM = "platform"; - public static final String KEY_GAME_NAME = "game_name"; - public static final String KEY_VERSION = "version"; - public static final String KEY_CONTENT = "content"; - public static final String KEY_PLUGIN = "plugin"; - public static final String KEY_LOCATION = "location"; - public static final String KEY_CURRENTITEM = "currentItem"; - public static final String KEY_COMMENTID = "commentId"; - public static final String KEY_COMMENT_ID = "comment_id"; - public static final String KEY_SHOW_KEYBOARD_IF_NEEDED = "show_key_board_if_needed"; - public static final String KEY_PATH = "path"; - public static final String KEY_LOCAL_PATH = "local_path"; - public static final String KEY_OUTER_INFO = "outerInfo"; - public static final String KEY_OLDERUSER = "isOldUser"; - public static final String KEY_SEARCHKEY = "searchKey"; - public static final String KEY_HINT = "hint"; - public static final String KEY_GAME = "game"; - public static final String KEY_GAME_ICON_URL = "gameIconUrl"; - public static final String KEY_SHARECONTENT = "shareContent"; - public static final String KEY_SUGGESTTYPE = "suggestType"; - public static final String KEY_PROLIST = "provinceList"; - public static final String KEY_ORDER = "order"; - public static final String KEY_TAGTYPE = "tagType"; - public static final String KEY_ANSWER_ID = "answerId"; - public static final String KEY_ANSWER_CONTENT = "answerContent"; - public static final String KEY_QUESTIONS_ID = "questionsId"; - public static final String KEY_QUESTIONS_TITLE = "questionsTitle"; - public static final String KEY_ANSWER_OPEN_IN_NEW_PAGE = "openInNewPage"; - public static final String KEY_QUESTIONS_PATCH = "questionsPatch"; - public static final String KEY_INVITE_SEARCH_KEY = "inviteSearchKey"; - public static final String KEY_MESSAGE_TYPE = "messageType"; - public static final String KEY_QUESTIONS_SEARCH_KEY = "questionsSearchKey"; - public static final String KEY_SHOW_COMMENT = "showComment"; - public static final String KEY_SHOW_ANSWER_COMMENT = "showAnswerComment"; - public static final String KEY_RECOMMENDS_CONTENTS = "isRecommendsContents"; - public static final String KEY_VERSION_UPDATE = "versionUpdate"; - public static final String KEY_CHECK_QUESTION_CONCERN = "check_question_concern"; - public static final String KEY_IS_COLUMN_COLLECTION = "is_column_collection";//是专题合集 - public static final String KEY_DRAFT_ID = "draft_id"; - public static final String KEY_KAIFU_LIST = "kaifuList"; - public static final String KEY_CATEGORY = "category"; - public static final String KEY_CATEGORY_ID = "category_id"; - public static final String KEY_CATEGORY_TITLE = "category_title"; - public static final String KEY_CATEGORY_INIT_TITLE = "category_init_title"; - public static final String KEY_BLOCK_DATA = "blockData"; - public static final String KEY_ASK_TAG = "askTag"; - public static final String KEY_SCROLL_TO_LIBAO = "libao"; - public static final String KEY_SCROLL_TO_SERVER = "scroll_to_server"; - public static final String KEY_ASK_COLUMN_TAG = "askColumnTag"; - public static final String KEY_COMMUNITY_ID = "community_id"; - public static final String KEY_COMMUNITY_NAME = "community_name"; - public static final String KEY_COMMUNITY_DATA = "communityData"; - public static final String KEY_TRACE_EVENT = "trace_event"; - public static final String KEY_SUBJECT_DATA = "subjectData"; - public static final String KEY_SUBJECT_TYPE = "subjectType"; - public static final String KEY_USER_ID = "user_id"; - public static final String KEY_QUESTION_TAG = "question_tag"; - public static final String KEY_COLUMN_ID = "column_id"; - public static final String KEY_AUTO_DOWNLOAD = "auto_download"; - public static final String KEY_HIDE_SUGGEST_HINT = "hide_suggest_hint"; - public static final String KEY_HIDE_USELESS_INFO = "hide_useless_info"; - public static final String KEY_COMMUNITY_ARTICLE_ID = "communityArticleId"; - public static final String KEY_ARTICLE_COMMENT_ID = "articleCommentId"; - public static final String KEY_SHOW_ARTICLE_COMMENT = "showArticleComment"; - public static final String KEY_SCROLL_TO_COMMENT_AREA = "scroll_to_comment_area"; - public static final String KEY_RATING_STAR_COUNT = "ratingStarCount"; - public static final String KEY_QUESTION_MODERATOR_PATCH = "questionModeratorPatch"; - public static final String KEY_SKIP_GAME_COMMENT = "skipGameComment"; - public static final String KEY_OPEN_PLATFORM_WINDOW = "openPlatformWindow"; - public static final String KEY_OPEN_KEYBOARD = "openKeyboard"; - public static final String KEY_PATH_VIDEO = "pathVideo"; - public static final String KEY_VIDEO_ID = "videoId"; - public static final String KEY_DIRECT_COMMENT = "directComment"; - public static final String KEY_SORT = "sort"; - public static final String KEY_AMWAY = "amway"; - public static final String KEY_SKIP_SUCCESS_PAGE = "skipSuccessPage"; - public static final String KEY_COLLECTION_ID = "collectionId"; - public static final String KEY_NAVIGATION_TITLE = "navigationTitle"; - public static final String KEY_IMAGE_CROP_RATIO = "imageCropRatio"; - public static final String KEY_OPEN_VIDEO_STREAMING = "openVideoStreaming"; - public static final String KEY_REFERER = "referer"; - public static final String KEY_UUID = "uuid"; - public static final String KEY_IS_HOME_VIDEO = "isHomeVideo"; - public static final String KEY_IS_HOME = "isHome"; - public static final String KEY_TAB_COUNT = "tab_count"; - public static final String KEY_WEB_SHARE = "webShare"; - public static final String KEY_ACTIVITY_NAME = "activityName";//活动名称 - public static final String KEY_PAGINATION_TYPE = "paginationType";//活动分页方式 - public static final String KEY_REQUIRE_REDIRECT = "require_redirect"; // 标记需要再跳转 - public static final String KEY_FIELD_ID = "field_id"; // 专区板块id - public static final String KEY_SECTION_NAME = "section_name"; // 专区专题名 - public static final String KEY_COLUMNNAME = "columnName"; - public static final String KEY_QA_ID = "qaId"; - public static final String KEY_QA_CONTENT_ID = "qaContentId"; - public static final String KEY_QA_CATEGORY_NAME = "qaCategoryName"; - public static final String KEY_QA_TITLE = "qa_title"; - public static final String KEY_QA_COLLECTION_ID = "qaCollectionId"; - public static final String KEY_SHOW_EDIT_DRAFT = "showEditDraft"; - public static final String KEY_ARTICLE_OPEN_IN_NEW_PAGE = "openArticleInNewPage"; - public static final String KEY_ONLY_CREATE_DRAFT = "onlyCreateDraft"; - public static final String KEY_KAIFU_SELECT_TIME = "kaifuSelectTime"; - public static final String KEY_POSTER_PATH = "posterPath"; - public static final String KEY_BLACK_THEME = "blackTheme"; - public static final String KEY_FROM_LOGIN = "fromLogin"; - public static final String KEY_CHANGE_PHONE = "changePhone"; - public static final String KEY_CONFLICT_PHONE = "conflictPhone"; - public static final String KEY_CONFLICT_USER = "conflictUser"; - public static final String KEY_EXPOSURE_SOURCE = "exposure_source"; - public static final String KEY_BBS_ID = "bbs_id"; - public static final String KEY_DIAGNOSIS = "diagnosis"; - public static final String KEY_SIMULATOR = "simulator"; - public static final String KEY_MARKET_DETAILS = "market_details"; - public static final String KEY_CATALOG_ID = "catalogId"; - public static final String KEY_PRIMARY_CATALOG_ID = "primaryCatalogId"; - public static final String KEY_PRIMARY_CATALOG_NAME = "primaryCatalogName"; - public static final String KEY_CATALOG_TITLE = "catalog_title"; - public static final String KEY_CATALOG_INIT_TITLE = "catalog_init_title"; - public static final String KEY_CATEGORY_LIST = "categoty_list"; - public static final String KEY_IS_FREE = "is_free"; - public static final String KEY_IS_SIGN = "is_sign"; - public static final String KEY_IS_FORCED_TO_CERTIFICATE = "is_forced_to_certificate"; - public static final String KEY_IS_FORCED_TO_CERTIFICATE_BUT_WITH_BACKDOOR = "is_forced_to_certificate_but_with_backdoor"; - public static final String KEY_IS_CHOOSE_APK = "is_choose_apk"; - public static final String KEY_TAB_INDEX = "tab_index"; - public static final String KEY_IS_CATEGORY_V2 = "is_category_v2"; - public static final String KEY_SUB_CATEGORY_ID = "sub_category_id"; - public static final String KEY_IS_QA_FEEDBACK = "is_qa_feedback"; - public static final String KEY_IS_CLICK_RECEIVE_BTN = "is_click_receive_btn"; - public static final String KEY_SHOW_QUICK_LOGIN = "show_quick_login"; - public static final String KEY_VIDEO_LIST = "video_list"; - public static final String KEY_CHOOSE_FORUM_TYPE = "choose_forum_type"; - public static final String KEY_CHOOSE_MAX_COUNT = "choose_max_count"; - public static final String KEY_COMMENT_COUNT = "comment_count"; - public static final String KEY_IS_COMMENT_CONVERSATION = "is_comment_conversation"; - public static final String KEY_PARENT_TAG = "parent_tag"; - public static final String KEY_BLOCK_ID = "block_id"; - public static final String KEY_BLOCK_NAME = "block_name"; - public static final String KEY_INSERT_GAME_COLLECTION = "insert_game_collection"; - public static final String KEY_INSERT_BBS_VIDEO = "insert_bbs_video"; - public static final String KEY_IS_FROM_SQUARE = "is_from_square"; - public static final String KEY_FORUM_NAME = "forum_name";//版块名称 - public static final String KEY_GAME_COLLECTION_TITLE = "game_collection_title";//游戏单标题 - public static final String KEY_GAME_COLLECTION_ID = "game_collection_id";//游戏单ID - public static final String KEY_ASSIST_RES = "assist_res"; - public static final String KEY_LAST_SELECTED_POSITION = "last_selected_position"; - public static void jumpActivity(Context context, Bundle bundle) { bundle.putBoolean(KEY_REQUIRE_REDIRECT, true); @@ -293,7 +65,6 @@ public class EntranceUtils { } } - public static void jumpActivity(Context context, Bundle nextToBundle, Bundle bundle, Callback callback) { bundle.putBoolean(KEY_REQUIRE_REDIRECT, true); @@ -323,11 +94,10 @@ public class EntranceUtils { context.startActivity(SplashScreenActivity.getSplashScreenIntent(context, bundle)); } } - public static void saveShortcut(String activityName, @Nullable Bundle bundle) { if (BuildConfig.DEBUG) { if (activityName.contains("MainActivity")) { - SPUtils.setString(EntranceUtils.KEY_BUNDLE, ""); + SPUtils.setString(EntranceConsts.KEY_BUNDLE, ""); return; } @@ -337,14 +107,16 @@ public class EntranceUtils { json.put(KEY_TO, activityName); json = getJsonFromBundle(bundle, json, null); Utils.toast(HaloApp.getInstance().getApplication(), "保存捷径成功"); - SPUtils.setString(EntranceUtils.KEY_BUNDLE, json.toString()); + SPUtils.setString(EntranceConsts.KEY_BUNDLE, json.toString()); } catch (Exception e) { e.printStackTrace(); - SPUtils.setString(EntranceUtils.KEY_BUNDLE, ""); + SPUtils.setString(EntranceConsts.KEY_BUNDLE, ""); } } } + + /** * 将 Bundle 转为 Json */ @@ -386,6 +158,8 @@ public class EntranceUtils { return json; } + + /** * 快捷地跳转到上次保存的页面 */ @@ -395,13 +169,13 @@ public class EntranceUtils { Bundle bundle = new Bundle(); try { - JSONObject jsonObject = new JSONObject(SPUtils.getString(EntranceUtils.KEY_BUNDLE)); + JSONObject jsonObject = new JSONObject(SPUtils.getString(EntranceConsts.KEY_BUNDLE)); getBundleFromJson(bundle, jsonObject, null); } catch (Exception e) { e.printStackTrace(); } - jumpActivity(activity, bundle); + EntranceUtils.jumpActivity(activity, bundle); } } @@ -445,7 +219,6 @@ public class EntranceUtils { } public static boolean hasShortcut() { - return !TextUtils.isEmpty(SPUtils.getString(EntranceUtils.KEY_BUNDLE)); + return !TextUtils.isEmpty(SPUtils.getString(EntranceConsts.KEY_BUNDLE)); } - } diff --git a/app/src/main/java/com/gh/common/util/EnvHelper.kt b/app/src/main/java/com/gh/common/util/EnvHelper.kt deleted file mode 100644 index 0db9ea1ba4..0000000000 --- a/app/src/main/java/com/gh/common/util/EnvHelper.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.gh.common.util - -import com.gh.common.constant.Constants -import com.gh.gamecenter.BuildConfig - -object EnvHelper { - - // API 环境是否为测试环境 - @JvmStatic - val isDevEnv: Boolean by lazy { - SPUtils.getBoolean(Constants.SP_IS_DEV_ENV, false) - } - - @JvmStatic - fun getHost(): String { - return if (!PackageFlavorHelper.IS_TEST_FLAVOR) { - BuildConfig.API_HOST - } else { - if (isDevEnv) { - BuildConfig.DEV_API_HOST - } else { - BuildConfig.API_HOST - } - } - } - - @JvmStatic - fun getNewHost(): String { - return if (!PackageFlavorHelper.IS_TEST_FLAVOR) { - BuildConfig.NEW_API_HOST - } else { - if (isDevEnv) { - BuildConfig.NEW_DEV_API_HOST - } else { - BuildConfig.NEW_API_HOST - } - } - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/util/ErrorHelper.kt b/app/src/main/java/com/gh/common/util/ErrorHelper.kt index 8190457165..fa9743e076 100644 --- a/app/src/main/java/com/gh/common/util/ErrorHelper.kt +++ b/app/src/main/java/com/gh/common/util/ErrorHelper.kt @@ -2,9 +2,11 @@ package com.gh.common.util import android.content.Context import com.gh.common.constant.Config -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.entity.ErrorEntity import com.lightgame.utils.Utils import retrofit2.HttpException diff --git a/app/src/main/java/com/gh/common/util/FloatingBackViewManager.kt b/app/src/main/java/com/gh/common/util/FloatingBackViewManager.kt index e0cd351cd7..31e09f962a 100644 --- a/app/src/main/java/com/gh/common/util/FloatingBackViewManager.kt +++ b/app/src/main/java/com/gh/common/util/FloatingBackViewManager.kt @@ -5,6 +5,8 @@ import android.os.Build import android.view.Gravity import android.widget.TextView import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.energy.EnergyCenterActivity import com.lightgame.utils.Util_System_Keyboard import com.lzf.easyfloat.EasyFloat diff --git a/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt b/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt index e9fba77d1b..72700046de 100644 --- a/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt +++ b/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt @@ -5,7 +5,7 @@ import android.content.Context import android.text.TextUtils import androidx.appcompat.app.AppCompatActivity import com.gh.common.DefaultJsApi -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.dialog.CertificationDialog import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureManager @@ -13,12 +13,17 @@ import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.ExposureType import com.gh.common.history.HistoryHelper import com.gh.common.repository.ReservationRepository -import com.gh.common.runOnUiThread -import com.gh.common.view.dsbridge.CompletionHandler +import com.gh.gamecenter.core.runOnUiThread +import com.gh.gamecenter.common.view.dsbridge.CompletionHandler import com.gh.download.DownloadManager import com.gh.download.dialog.DownloadDialog import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.observableToMain +import com.gh.gamecenter.common.utils.singleToMain +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.ApkEntity import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.PluginLocation @@ -165,24 +170,32 @@ object GameActivityDownloadHelper { } else { val str = GameUtils.getDownloadBtnText(context, gameEntity, PluginLocation.only_game) if (str == context.getString(R.string.download)) { - GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) { - CertificationDialog.showCertificationDialog(context, gameEntity) { - DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean -> - download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent) - } - } - } - DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance) - } else if (str == context.getString(R.string.attempt)) { - RealNameHelper.checkIfAuth(context, gameEntity, object : EmptyCallback { - override fun onCallback() { - GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) { - CertificationDialog.showCertificationDialog(context, gameEntity) { + GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info, object : ConfirmListener { + override fun onConfirm() { + CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener { + override fun onConfirm() { DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean -> download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent) } } - } + }) + } + }) + DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance) + } else if (str == context.getString(R.string.attempt)) { + RealNameHelper.checkIfAuth(context, gameEntity, object : EmptyCallback { + override fun onCallback() { + GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info, object : ConfirmListener { + override fun onConfirm() { + CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener { + override fun onConfirm() { + DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean -> + download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent) + } + } + }) + } + }) } }) DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance) @@ -190,11 +203,13 @@ object GameActivityDownloadHelper { if (gameEntity.pluggableCollection != null) { DownloadDialog.showDownloadDialog(context, gameEntity, traceEvent, entrance, location) } else { - CertificationDialog.showCertificationDialog(context, gameEntity) { - DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean -> - plugin(context, gameEntity, apk, entrance, location, isSubscribe, traceEvent) + CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener { + override fun onConfirm() { + DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean -> + plugin(context, gameEntity, apk, entrance, location, isSubscribe, traceEvent) + } } - } + }) } } else if (str == context.getString(R.string.install) || str == context.getString(R.string.launch)) { ToastUtils.toast("${gameEntity.name}已加入下载队列") @@ -260,8 +275,11 @@ object GameActivityDownloadHelper { val msg = FileUtils.isCanDownload(context, apk.size) if (TextUtils.isEmpty(msg)) { DataUtils.onGameDownloadEvent(context, gameEntity.name, apk.getPlatform(), entrance, "下载开始", "下载") - DownloadManager.createDownload(context, apk, gameEntity, context.getString( - R.string.download), entrance, location, isSubscribe, traceEvent) + DownloadManager.createDownload( + context, apk, gameEntity, context.getString( + R.string.download + ), entrance, location, isSubscribe, traceEvent + ) ToastUtils.toast("${gameEntity.name}已加入下载队列") } else { ToastUtils.toast(msg) @@ -367,7 +385,8 @@ object GameActivityDownloadHelper { if (PackageUtils.isInstalled(context, apk.packageName)) { // 是否可更新 if (PackageUtils.isCanUpdate(apk, event.gameId) - || PackageUtils.isNonPluginUpdatable(apk, gameEntity)) { + || PackageUtils.isNonPluginUpdatable(apk, gameEntity) + ) { handler.complete(false) } else { // 已安装且无更新 diff --git a/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt b/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt index 65265f5885..c8c66353aa 100644 --- a/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt +++ b/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt @@ -9,11 +9,13 @@ import android.view.Gravity import android.view.View import android.widget.ImageView import android.widget.ProgressBar -import com.gh.base.CurrentActivityHolder -import com.gh.base.GHThreadFactory -import com.gh.common.runOnUiThread +import com.gh.gamecenter.core.utils.CurrentActivityHolder +import com.gh.gamecenter.core.GHThreadFactory +import com.gh.gamecenter.core.runOnUiThread import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.singleToMain +import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity import com.gh.gamecenter.gamecollection.square.GameCollectionSquareActivity import com.gh.gamecenter.retrofit.BiResponse 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 2e91849c84..9e579c3201 100644 --- a/app/src/main/java/com/gh/common/util/GameSubstituteRepositoryHelper.kt +++ b/app/src/main/java/com/gh/common/util/GameSubstituteRepositoryHelper.kt @@ -2,6 +2,11 @@ package com.gh.common.util import android.annotation.SuppressLint import android.text.TextUtils +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.doOnMainProcessOnly +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toObject +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.SubjectEntity import com.gh.gamecenter.manager.UserManager 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 b5d51b6aac..c5df50b715 100644 --- a/app/src/main/java/com/gh/common/util/GameUtils.java +++ b/app/src/main/java/com/gh/common/util/GameUtils.java @@ -5,7 +5,7 @@ import android.graphics.Color; import android.text.TextUtils; import android.widget.TextView; -import com.gh.common.AppExecutor; +import com.gh.gamecenter.core.AppExecutor; import com.gh.common.constant.Config; import com.gh.common.simulator.SimulatorGameManager; import com.gh.download.DownloadManager; diff --git a/app/src/main/java/com/gh/common/util/GameViewUtils.java b/app/src/main/java/com/gh/common/util/GameViewUtils.java index 70df1a507f..753d1ac6bd 100644 --- a/app/src/main/java/com/gh/common/util/GameViewUtils.java +++ b/app/src/main/java/com/gh/common/util/GameViewUtils.java @@ -12,9 +12,10 @@ import android.widget.TextView; import androidx.core.content.ContextCompat; -import com.gh.common.AppExecutor; -import com.gh.common.view.DrawableView; +import com.gh.gamecenter.core.AppExecutor; +import com.gh.gamecenter.common.view.DrawableView; import com.gh.gamecenter.R; +import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.entity.TagStyleEntity; import java.text.ParseException; diff --git a/app/src/main/java/com/gh/common/util/GhMatisseVideoApplyFilter.kt b/app/src/main/java/com/gh/common/util/GhMatisseVideoApplyFilter.kt index ff69355283..ae79b3cd68 100644 --- a/app/src/main/java/com/gh/common/util/GhMatisseVideoApplyFilter.kt +++ b/app/src/main/java/com/gh/common/util/GhMatisseVideoApplyFilter.kt @@ -1,6 +1,8 @@ package com.gh.common.util import android.content.Context +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.utils.NetworkUtils import com.lightgame.utils.Utils import com.zhihu.matisse.filter.ApplyFilter import com.zhihu.matisse.internal.entity.Item diff --git a/app/src/main/java/com/gh/common/util/HomeBottomBarHelper.kt b/app/src/main/java/com/gh/common/util/HomeBottomBarHelper.kt index 8252479a7c..ceeb229e72 100644 --- a/app/src/main/java/com/gh/common/util/HomeBottomBarHelper.kt +++ b/app/src/main/java/com/gh/common/util/HomeBottomBarHelper.kt @@ -1,5 +1,8 @@ package com.gh.common.util +import com.gh.gamecenter.core.utils.GsonUtils +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.toJson import com.gh.gamecenter.entity.Display import com.gh.gamecenter.entity.SubjectRecommendEntity import com.halo.assistant.HaloApp 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 c81a7a001f..b0776a84ff 100644 --- a/app/src/main/java/com/gh/common/util/HomePluggableHelper.kt +++ b/app/src/main/java/com/gh/common/util/HomePluggableHelper.kt @@ -1,5 +1,7 @@ package com.gh.common.util +import com.gh.gamecenter.common.utils.toastInInternalRelease +import com.gh.gamecenter.common.utils.tryCatchInRelease import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.HomePluggableFilterEntity import com.gh.gamecenter.room.AppDatabase diff --git a/app/src/main/java/com/gh/common/util/IntegralLogHelper.kt b/app/src/main/java/com/gh/common/util/IntegralLogHelper.kt index 87546c5eee..086f97de3d 100644 --- a/app/src/main/java/com/gh/common/util/IntegralLogHelper.kt +++ b/app/src/main/java/com/gh/common/util/IntegralLogHelper.kt @@ -3,6 +3,8 @@ package com.gh.common.util import com.gh.common.loghub.LoghubUtils.log import com.gh.common.tracker.Tracker.launchId import com.gh.common.tracker.Tracker.sessionId +import com.gh.gamecenter.common.utils.debugOnly +import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.lightgame.utils.Utils import org.json.JSONObject 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 a94941de1b..148460330c 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -8,7 +8,6 @@ import android.text.Html; import android.text.Spanned; import android.text.TextUtils; import android.util.Log; -import android.widget.Button; import android.widget.TextView; import androidx.core.content.ContextCompat; @@ -16,6 +15,11 @@ import androidx.core.content.ContextCompat; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.LibaoDetailAdapter; +import com.gh.gamecenter.common.utils.DialogHelper; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.utils.GsonUtils; +import com.gh.gamecenter.core.utils.ToastUtils; +import com.gh.gamecenter.core.utils.UrlFilterUtils; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.entity.LibaoStatusEntity; 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 20beffc0f0..e4b588f67b 100644 --- a/app/src/main/java/com/gh/common/util/LogUtils.java +++ b/app/src/main/java/com/gh/common/util/LogUtils.java @@ -6,15 +6,20 @@ import android.content.Context; import android.os.Build; import android.text.TextUtils; -import com.gh.common.constant.Constants; +import androidx.annotation.Nullable; + import com.gh.common.exposure.ExposureEntity; import com.gh.common.exposure.ExposureEvent; import com.gh.common.exposure.ExposureSource; -import com.gh.common.exposure.meta.Meta; -import com.gh.common.exposure.meta.MetaUtil; import com.gh.common.loghub.LoghubUtils; import com.gh.common.loghub.SimpleLogContainerEntity; import com.gh.gamecenter.BuildConfig; +import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.exposure.meta.Meta; +import com.gh.gamecenter.common.exposure.meta.MetaUtil; +import com.gh.gamecenter.common.utils.DeviceUtils; +import com.gh.gamecenter.common.utils.EnvHelper; +import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.entity.CommunityEntity; import com.gh.gamecenter.entity.DetectionObjectEntity; import com.gh.gamecenter.entity.GameEntity; @@ -36,8 +41,6 @@ import org.json.JSONObject; import java.util.ArrayList; import java.util.List; -import androidx.annotation.Nullable; - import io.reactivex.schedulers.Schedulers; import okhttp3.MediaType; import okhttp3.RequestBody; diff --git a/app/src/main/java/com/gh/common/util/LoginHelper.kt b/app/src/main/java/com/gh/common/util/LoginHelper.kt index fbeb23dc73..8270127af1 100644 --- a/app/src/main/java/com/gh/common/util/LoginHelper.kt +++ b/app/src/main/java/com/gh/common/util/LoginHelper.kt @@ -3,8 +3,11 @@ package com.gh.common.util import android.app.Activity import android.content.Intent import com.gh.common.constant.Config -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.R +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.tryWithDefaultCatch +import com.gh.gamecenter.core.utils.SentryHelper import com.gh.gamecenter.user.LoginTag import com.halo.assistant.HaloApp import com.lightgame.utils.RuntimeUtils 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 38d3110693..c883d4558c 100644 --- a/app/src/main/java/com/gh/common/util/LoginUtils.java +++ b/app/src/main/java/com/gh/common/util/LoginUtils.java @@ -2,6 +2,7 @@ package com.gh.common.util; import android.content.Context; +import com.gh.gamecenter.common.utils.DeviceUtils; import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; diff --git a/app/src/main/java/com/gh/common/util/MessageShareUtils.java b/app/src/main/java/com/gh/common/util/MessageShareUtils.java index aa4b81b474..b99399daff 100644 --- a/app/src/main/java/com/gh/common/util/MessageShareUtils.java +++ b/app/src/main/java/com/gh/common/util/MessageShareUtils.java @@ -32,6 +32,9 @@ import com.gh.common.constant.Config; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.R; import com.gh.gamecenter.WeiBoShareActivity; +import com.gh.gamecenter.common.utils.BitmapUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.utils.ImageUtils; import com.lightgame.utils.Utils; import com.tencent.connect.auth.QQToken; import com.tencent.connect.share.QQShare; @@ -478,7 +481,7 @@ public class MessageShareUtils { if (isToast) { Utils.toast(mContext, "图片已保存到/Pictures/ghzhushou/"); //刷新手机图片库 - refreshImage(mContext, _file); + BitmapUtils.refreshImage(mContext, _file); } } } @@ -512,17 +515,6 @@ public class MessageShareUtils { return path; } - /** - * 注意，第二个入参需要是 file 本身而不是 folder - */ - public static void refreshImage(Context context, File imageFile) { - Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE); - Uri uri = Uri.fromFile(imageFile); - intent.setData(uri); - context.sendBroadcast(intent); - Utils.log("保存分享图片路径：" + imageFile.getAbsolutePath()); - } - // 获取保存图片通用路径 public static String getSaveBitmapBasePath(Context context) { String path; 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 ee96a7dd05..a2fd6d6fc2 100644 --- a/app/src/main/java/com/gh/common/util/NewLogUtils.kt +++ b/app/src/main/java/com/gh/common/util/NewLogUtils.kt @@ -1,10 +1,11 @@ package com.gh.common.util import android.annotation.SuppressLint -import com.gh.common.json.JsonObjectBuilder -import com.gh.common.json.json +import com.gh.gamecenter.common.json.JsonObjectBuilder +import com.gh.gamecenter.common.json.json import com.gh.common.loghub.LoghubUtils import com.gh.common.tracker.Tracker +import com.gh.gamecenter.common.utils.createRequestBody import com.gh.gamecenter.entity.AdditionalParamsEntity import com.gh.gamecenter.entity.LinkEntity import com.gh.gamecenter.entity.QuoteCountEntity diff --git a/app/src/main/java/com/gh/common/util/NotificationHelper.kt b/app/src/main/java/com/gh/common/util/NotificationHelper.kt index 9d89443464..4353c8c4e7 100644 --- a/app/src/main/java/com/gh/common/util/NotificationHelper.kt +++ b/app/src/main/java/com/gh/common/util/NotificationHelper.kt @@ -3,8 +3,10 @@ package com.gh.common.util import android.annotation.SuppressLint import androidx.appcompat.app.AppCompatActivity import androidx.core.app.NotificationManagerCompat -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.dialog.NotificationHintDialogFragment +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.core.utils.TimeUtils import com.gh.gamecenter.entity.NotificationUgc import com.halo.assistant.HaloApp import com.lightgame.utils.AppManager diff --git a/app/src/main/java/com/gh/common/util/OptionDialogHelper.kt b/app/src/main/java/com/gh/common/util/OptionDialogHelper.kt index 105b16ab99..d4cc2e07d8 100644 --- a/app/src/main/java/com/gh/common/util/OptionDialogHelper.kt +++ b/app/src/main/java/com/gh/common/util/OptionDialogHelper.kt @@ -2,12 +2,13 @@ package com.gh.common.util import android.app.Dialog import android.content.Context -import android.graphics.Color import androidx.core.content.ContextCompat import android.view.Window import android.widget.LinearLayout import android.widget.TextView import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.core.utils.DisplayUtils object OptionDialogHelper { @@ -27,7 +28,8 @@ object OptionDialogHelper { val widthPixels = context.resources.displayMetrics.widthPixels reportTv.layoutParams = LinearLayout.LayoutParams(widthPixels * 9 / 10, LinearLayout.LayoutParams.WRAP_CONTENT) - reportTv.setPadding(DisplayUtils.dip2px(context, 20f), DisplayUtils.dip2px(context, 12f), + reportTv.setPadding( + DisplayUtils.dip2px(context, 20f), DisplayUtils.dip2px(context, 12f), 0, DisplayUtils.dip2px(context, 12f)) container.addView(reportTv) diff --git a/app/src/main/java/com/gh/common/util/PackageFlavorHelper.java b/app/src/main/java/com/gh/common/util/PackageFlavorHelper.java deleted file mode 100644 index 0bf008fd04..0000000000 --- a/app/src/main/java/com/gh/common/util/PackageFlavorHelper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.gh.common.util; - -import com.gh.gamecenter.BuildConfig; - -public class PackageFlavorHelper { - - private PackageFlavorHelper() {} - - // 包体是否为测试包 - public static final boolean IS_TEST_FLAVOR = BuildConfig.BUILD_TIME != 0L || BuildConfig.DEBUG; - -} 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 b9aae9125e..844d40393e 100644 --- a/app/src/main/java/com/gh/common/util/PackageInstaller.kt +++ b/app/src/main/java/com/gh/common/util/PackageInstaller.kt @@ -8,12 +8,18 @@ import android.net.Uri import android.os.Build import androidx.appcompat.app.AppCompatActivity import androidx.core.content.FileProvider -import com.gh.base.CurrentActivityHolder -import com.gh.common.constant.Constants +import com.gh.gamecenter.core.utils.CurrentActivityHolder +import com.gh.gamecenter.common.constant.Constants import com.gh.common.dialog.InstallPermissionDialogFragment import com.gh.common.xapk.XapkInstaller import com.gh.download.server.BrowserInstallHelper import com.gh.gamecenter.BuildConfig +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.common.utils.getExtension +import com.gh.gamecenter.common.utils.toRequestBody +import com.gh.gamecenter.core.utils.MD5Utils import com.gh.gamecenter.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp diff --git a/app/src/main/java/com/gh/common/util/PermissionHelper.kt b/app/src/main/java/com/gh/common/util/PermissionHelper.kt deleted file mode 100644 index ea91c2088f..0000000000 --- a/app/src/main/java/com/gh/common/util/PermissionHelper.kt +++ /dev/null @@ -1,257 +0,0 @@ -package com.gh.common.util - -import android.Manifest -import android.annotation.SuppressLint -import android.app.Activity -import android.content.Context -import android.content.Intent -import android.content.pm.PackageManager -import android.net.Uri -import android.os.Build -import android.provider.Settings -import androidx.core.content.ContextCompat -import androidx.fragment.app.FragmentActivity -import com.gh.common.constant.Constants -import com.gh.gamecenter.R -import com.tbruyelle.rxpermissions2.RxPermissions - -object PermissionHelper { - - const val INSTALL_PERMISSION_CODE = 100 - - @JvmStatic - fun requestReadPhoneStateAndStoragePermissionFromStartUp(context: Context) { - if (context is FragmentActivity) { - val rxPermission = RxPermissions(context) - - var requestCount = 0 - val permissionsStatusMap = hashMapOf() - permissionsStatusMap[Manifest.permission.READ_PHONE_STATE] = false - permissionsStatusMap[Manifest.permission.READ_EXTERNAL_STORAGE] = false - permissionsStatusMap[Manifest.permission.WRITE_EXTERNAL_STORAGE] = false - - tryWithDefaultCatch { - rxPermission - .requestEach(Manifest.permission.READ_PHONE_STATE, - Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE) - .subscribe { permission -> - requestCount++ - permissionsStatusMap[permission.name] = permission.granted - - if (requestCount == 2) { - val hasReadPhoneStatePermission = permissionsStatusMap[Manifest.permission.READ_PHONE_STATE] == true - val hasReadStoragePermission = permissionsStatusMap[Manifest.permission.READ_EXTERNAL_STORAGE] == true - - if (hasReadPhoneStatePermission && hasReadStoragePermission) { - MtaHelper.onEvent("授权情况", "启动授权", "都授权") - } else if (!hasReadPhoneStatePermission && !hasReadStoragePermission) { - MtaHelper.onEvent("授权情况", "启动授权", "都不授权") - } else if (hasReadPhoneStatePermission) { - MtaHelper.onEvent("授权情况", "启动授权", "只授权IMEI") - } else if (hasReadStoragePermission) { - MtaHelper.onEvent("授权情况", "启动授权", "只授权存储") - } - } - } - } - - } - } - - @SuppressLint("CheckResult") - @JvmStatic - fun checkStoragePermissionBeforeAction(context: Context, emptyCallback: EmptyCallback) { - if (context is FragmentActivity) { - if (context.checkCallingOrSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED - && context.checkCallingOrSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) { - emptyCallback.onCallback() - SPUtils.setBoolean(Constants.SP_USER_HAS_PERMANENTLY_DENIED_STORAGE_PERMISSION, false) - } else { - showDialogBeforeRequestingStorageDialog(context, emptyCallback) - } - } - } - - private fun checkStoragePermissionBeforeAction(context: FragmentActivity, emptyCallback: EmptyCallback) { - tryWithDefaultCatch { - val rxPermission = RxPermissions(context) - rxPermission - .requestEachCombined(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE) - .subscribe { permission -> - when { - permission.granted -> { - emptyCallback.onCallback() - SPUtils.setBoolean(Constants.SP_USER_HAS_PERMANENTLY_DENIED_STORAGE_PERMISSION, false) - } - permission.shouldShowRequestPermissionRationale -> { - // do nothing - } - else -> { - if (SPUtils.getBoolean(Constants.SP_USER_HAS_PERMANENTLY_DENIED_STORAGE_PERMISSION)) { - val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS) - intent.data = Uri.parse("package:" + context.packageName) - context.startActivity(intent) - } else { - SPUtils.setBoolean(Constants.SP_USER_HAS_PERMANENTLY_DENIED_STORAGE_PERMISSION, true) - } - } - } - } - } - } - - @SuppressLint("CheckResult") - @JvmStatic - fun checkReadPhoneStateAndStoragePermissionBeforeAction(context: Context, emptyCallback: EmptyCallback) { - if (context is FragmentActivity) { - if (context.checkCallingOrSelfPermission(Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED - && context.checkCallingOrSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED - && context.checkCallingOrSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) { - emptyCallback.onCallback() - } else { - val rxPermission = RxPermissions(context) - - tryWithDefaultCatch { - rxPermission - .requestEachCombined( - Manifest.permission.READ_PHONE_STATE, - Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE) - .subscribe { permission -> - when { - permission.granted -> { - emptyCallback.onCallback() - - ActivationHelper.sendActivationInfo() - } - permission.shouldShowRequestPermissionRationale -> { - // do nothing - } - else -> { - val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS) - intent.data = Uri.parse("package:" + context.getPackageName()) - context.startActivity(intent) - } - } - } - } - } - } - } - - @SuppressLint("CheckResult") - @JvmStatic - fun checkReadPhoneStatePermissionBeforeAction(context: Context, emptyCallback: EmptyCallback) { - if (context is FragmentActivity) { - - if (context.checkCallingOrSelfPermission(Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) { - emptyCallback.onCallback() - } else { - val rxPermission = RxPermissions(context) - - tryWithDefaultCatch { - rxPermission - .requestEachCombined(Manifest.permission.READ_PHONE_STATE) - .subscribe { permission -> - when { - permission.granted -> { - emptyCallback.onCallback() - - ActivationHelper.sendActivationInfo() - } - permission.shouldShowRequestPermissionRationale -> { - // do nothing - } - else -> { - val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS) - intent.data = Uri.parse("package:" + context.getPackageName()) - context.startActivity(intent) - } - } - } - } - } - } - } - - /** - * 跳转到权限设置 - * - * @param activity - */ - fun toPermissionSetting(activity: Activity) { - if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) { - toSystemConfig(activity) - } else { - try { - toApplicationInfo(activity) - } catch (e: Exception) { - e.printStackTrace() - toSystemConfig(activity) - } - - } - } - - /** - * 应用信息界面 - * - * @param activity - */ - private fun toApplicationInfo(activity: Activity) { - val localIntent = Intent() - localIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - localIntent.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS - localIntent.data = Uri.fromParts("package", activity.packageName, null) - activity.startActivity(localIntent) - } - - /** - * 系统设置界面 - * - * @param activity - */ - private fun toSystemConfig(activity: Activity) { - try { - val intent = Intent(Settings.ACTION_SETTINGS) - activity.startActivity(intent) - } catch (e: Exception) { - e.printStackTrace() - } - } - - private fun showDialogBeforeRequestingStorageDialog(context: FragmentActivity, emptyCallback: EmptyCallback) { - DialogHelper.showDialog( - context, - title = "权限申请", - content = "光环助手将向您申请开启设备的存储权限，以保证能正常使用相关功能。拒绝授权将无法正常使用部分功能。", - cancelText = "放弃", - confirmText = "去授权", - cancelClickCallback = null, - confirmClickCallback = { checkStoragePermissionBeforeAction(context, emptyCallback) }, - extraConfig = DialogHelper.Config(hint = "查看权限应用场景"), - uiModificationCallback = { - it.hintTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font)) - it.hintTv.setOnClickListener { - DirectUtils.directToWebView(context, Constants.PERMISSION_SCENARIO_ADDRESS, "(权限弹窗)") - } - it.contentTv.setTextColor(ContextCompat.getColor(context, R.color.text_title)) - } - ) - } - - /** - * 开启安装未知来源权限 - */ - fun toInstallPermissionSetting(activity: Activity) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { - toSystemConfig(activity) - } else { - val packageURI = Uri.fromParts("package", activity.packageName, null) - val intent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI) - activity.startActivityForResult(intent, INSTALL_PERMISSION_CODE) - } - } - -} \ No newline at end of file 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 089513c36e..3b73673f32 100644 --- a/app/src/main/java/com/gh/common/util/PlatformUtils.java +++ b/app/src/main/java/com/gh/common/util/PlatformUtils.java @@ -6,7 +6,7 @@ import android.content.SharedPreferences.Editor; import android.os.Handler; import android.text.TextUtils; -import com.gh.common.AppExecutor; +import com.gh.gamecenter.core.AppExecutor; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.PlatformEntity; import com.gh.gamecenter.eventbus.EBReuse; 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 13b02e9a1c..84d3ab7eeb 100644 --- a/app/src/main/java/com/gh/common/util/QuickLoginHelper.kt +++ b/app/src/main/java/com/gh/common/util/QuickLoginHelper.kt @@ -15,13 +15,17 @@ import com.cmic.sso.sdk.auth.AuthnHelper import com.cmic.sso.sdk.auth.LoginClickListener import com.cmic.sso.sdk.auth.TokenListener import com.gh.common.constant.Config -import com.gh.common.constant.Constants -import com.gh.common.util.PermissionHelper.checkReadPhoneStatePermissionBeforeAction -import com.gh.common.util.ToastUtils.toast +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.utils.PermissionHelper.checkReadPhoneStatePermissionBeforeAction +import com.gh.gamecenter.core.utils.ToastUtils.toast import com.gh.gamecenter.LoginActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.callback.BiCallback +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.databinding.SetWaitDialogBinding +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.DialogQuickLoginBinding -import com.gh.gamecenter.databinding.SetWaitDialogBinding import com.gh.gamecenter.entity.LoginTokenEntity import com.gh.gamecenter.user.ApiResponse import com.gh.gamecenter.user.LoginTag @@ -102,14 +106,15 @@ object QuickLoginHelper { loginAuth(context) } else { DialogUtils.showQuickLoginPermissionDialog( - context, - { + context,object :ConfirmListener{ + override fun onConfirm() { checkReadPhoneStatePermissionBeforeAction(context, object : EmptyCallback { override fun onCallback() { loginAuth(context) } }) - }, + } + }, { startCodeLoginPage( context, 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 a05145f77a..13239ee8cb 100644 --- a/app/src/main/java/com/gh/common/util/RealNameHelper.kt +++ b/app/src/main/java/com/gh/common/util/RealNameHelper.kt @@ -1,9 +1,14 @@ package com.gh.common.util import android.content.Context -import com.gh.base.CurrentActivityHolder +import com.gh.gamecenter.core.utils.CurrentActivityHolder import com.gh.download.DownloadManager import com.gh.gamecenter.ShellActivity +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.core.utils.EmptyCallback +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.common.utils.getMetaExtra import com.gh.gamecenter.entity.GameEntity import com.lightgame.download.DownloadEntity import com.lightgame.download.DownloadStatus @@ -82,8 +87,8 @@ object RealNameHelper { currentActivity, ShellActivity.Type.REAL_NAME_INFO ).apply { - putExtra(EntranceUtils.KEY_IS_FORCED_TO_CERTIFICATE, true) - putExtra(EntranceUtils.KEY_IS_FORCED_TO_CERTIFICATE_BUT_WITH_BACKDOOR, !isForced) + putExtra(EntranceConsts.KEY_IS_FORCED_TO_CERTIFICATE, true) + putExtra(EntranceConsts.KEY_IS_FORCED_TO_CERTIFICATE_BUT_WITH_BACKDOOR, !isForced) } ) if (downloadEntity.status == DownloadStatus.done) { diff --git a/app/src/main/java/com/gh/common/util/RecommendPopupHelper.kt b/app/src/main/java/com/gh/common/util/RecommendPopupHelper.kt index 38149a4029..c4c8fe7979 100644 --- a/app/src/main/java/com/gh/common/util/RecommendPopupHelper.kt +++ b/app/src/main/java/com/gh/common/util/RecommendPopupHelper.kt @@ -1,7 +1,10 @@ package com.gh.common.util -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.dialog.DeviceRemindDialog +import com.gh.gamecenter.core.utils.GsonUtils +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.core.utils.TimeUtils import com.gh.gamecenter.entity.* import com.google.gson.reflect.TypeToken import com.halo.assistant.HaloApp 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 11c95137ee..0c3ea1839b 100644 --- a/app/src/main/java/com/gh/common/util/ReservationHelper.kt +++ b/app/src/main/java/com/gh/common/util/ReservationHelper.kt @@ -2,9 +2,14 @@ package com.gh.common.util import android.annotation.SuppressLint import android.content.Context -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.repository.ReservationRepository import com.gh.gamecenter.WebActivity +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.createRequestBody +import com.gh.gamecenter.common.utils.singleToMain +import com.gh.gamecenter.common.utils.toObject +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.WechatConfigEntity import com.gh.gamecenter.retrofit.BiResponse @@ -79,12 +84,14 @@ object ReservationHelper { DialogUtils.showReserveSuccessDialog(context) } else { NewLogUtils.logReserveWechatRemindPopShow(wechatConfig) - DialogUtils.showReserveSuccess2WechatBindDialog(context,{ - NewLogUtils.logReserveWechatRemindPopClick(wechatConfig,"开启微信提醒") - context.startActivity(WebActivity.getBindWechatIntent(context)) - },{ - NewLogUtils.logReserveWechatRemindPopClick(wechatConfig,"关闭弹窗") - }) + DialogUtils.showReserveSuccess2WechatBindDialog(context,object :ConfirmListener{ + override fun onConfirm() { + NewLogUtils.logReserveWechatRemindPopClick(wechatConfig,"开启微信提醒") + context.startActivity(WebActivity.getBindWechatIntent(context)) + } + }) { + NewLogUtils.logReserveWechatRemindPopClick(wechatConfig, "关闭弹窗") + } } } } @@ -102,8 +109,10 @@ object ReservationHelper { "删除预约", "游戏已上线，你可以删除此预约记录，确定删除吗？", "确定删除", - "暂不删除", { - emptyCallback.onCallback() + "暂不删除", object :ConfirmListener{ + override fun onConfirm() { + emptyCallback.onCallback() + } }, null ) } @@ -115,8 +124,10 @@ object ReservationHelper { "取消预约", "取消之后你将无法收到游戏上线的通知，确定取消预约吗？", "确定取消", - "暂不取消", { - emptyCallback.onCallback() + "暂不取消", object :ConfirmListener{ + override fun onConfirm() { + emptyCallback.onCallback() + } }, null ) } diff --git a/app/src/main/java/com/gh/common/util/ShareUtils.java b/app/src/main/java/com/gh/common/util/ShareUtils.java index 38558183c5..2293f17073 100644 --- a/app/src/main/java/com/gh/common/util/ShareUtils.java +++ b/app/src/main/java/com/gh/common/util/ShareUtils.java @@ -28,6 +28,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.gh.common.constant.Config; import com.gh.gamecenter.R; import com.gh.gamecenter.WeiBoShareActivity; +import com.gh.gamecenter.common.callback.BiCallback; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.common.utils.BitmapUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.entity.AdditionalParamsEntity; import com.gh.gamecenter.entity.ShareEntity; import com.gh.gamecenter.eventbus.EBShare; 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 98b94f2e32..b44902d342 100644 --- a/app/src/main/java/com/gh/common/util/SimpleRequestHelper.kt +++ b/app/src/main/java/com/gh/common/util/SimpleRequestHelper.kt @@ -1,5 +1,6 @@ package com.gh.common.util +import com.gh.gamecenter.common.utils.createRequestBody import com.gh.gamecenter.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp @@ -7,7 +8,6 @@ import com.lightgame.utils.Utils import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers import okhttp3.ResponseBody -import org.json.JSONObject import retrofit2.HttpException /** diff --git a/app/src/main/java/com/gh/common/util/SyncDataBetweenPageHelper.kt b/app/src/main/java/com/gh/common/util/SyncDataBetweenPageHelper.kt index f980b1248e..1fdf994cf4 100644 --- a/app/src/main/java/com/gh/common/util/SyncDataBetweenPageHelper.kt +++ b/app/src/main/java/com/gh/common/util/SyncDataBetweenPageHelper.kt @@ -5,7 +5,7 @@ import android.content.Context import android.content.Intent import android.os.Parcelable import androidx.fragment.app.Fragment -import com.gh.common.annotation.Synchronize +import com.gh.gamecenter.common.annotation.Synchronize import com.gh.common.util.SyncDataBetweenPageHelper.resultHandle import com.gh.common.util.SyncDataBetweenPageHelper.startActivityForResult import com.gh.gamecenter.entity.RatingComment 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 5c4d2a9217..b47f0d68e4 100644 --- a/app/src/main/java/com/gh/common/util/UploadImageUtils.kt +++ b/app/src/main/java/com/gh/common/util/UploadImageUtils.kt @@ -2,6 +2,7 @@ package com.gh.common.util import android.annotation.SuppressLint import android.graphics.BitmapFactory +import com.gh.gamecenter.common.utils.CompressImageUtils import com.gh.gamecenter.retrofit.BiResponse import com.gh.gamecenter.retrofit.FileRequestBody import com.gh.gamecenter.retrofit.RetrofitCallback 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 270d781655..b4420dbbcf 100644 --- a/app/src/main/java/com/gh/common/util/UsageStatsHelper.kt +++ b/app/src/main/java/com/gh/common/util/UsageStatsHelper.kt @@ -20,6 +20,7 @@ import android.provider.Settings import androidx.annotation.RequiresApi import com.gh.common.util.UsageStatsHelper.getDataByUsageEvents import com.gh.common.util.UsageStatsHelper.getDataByUsageStats +import com.gh.gamecenter.common.utils.debugOnly import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager diff --git a/app/src/main/java/com/gh/common/util/WechatBindHelper.kt b/app/src/main/java/com/gh/common/util/WechatBindHelper.kt index 5b5cc7c401..634c41d527 100644 --- a/app/src/main/java/com/gh/common/util/WechatBindHelper.kt +++ b/app/src/main/java/com/gh/common/util/WechatBindHelper.kt @@ -1,7 +1,12 @@ package com.gh.common.util import android.annotation.SuppressLint -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.callback.BiCallback +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.createRequestBody +import com.gh.gamecenter.common.utils.singleToMain +import com.gh.gamecenter.common.utils.toJson import com.gh.gamecenter.entity.WechatConfigEntity import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.retrofit.BiResponse 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 362e50db98..ae4f02ae76 100644 --- a/app/src/main/java/com/gh/common/videolog/VideoRecordUtils.kt +++ b/app/src/main/java/com/gh/common/videolog/VideoRecordUtils.kt @@ -3,9 +3,9 @@ package com.gh.common.videolog import android.annotation.SuppressLint import android.app.Application import android.database.sqlite.SQLiteFullException -import com.gh.common.util.toRequestBody -import com.gh.common.util.toastInInternalRelease -import com.gh.common.util.tryWithDefaultCatch +import com.gh.gamecenter.common.utils.toRequestBody +import com.gh.gamecenter.common.utils.toastInInternalRelease +import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager diff --git a/app/src/main/java/com/gh/common/view/AdBannerView.kt b/app/src/main/java/com/gh/common/view/AdBannerView.kt index 48d75974bb..0aac78de52 100644 --- a/app/src/main/java/com/gh/common/view/AdBannerView.kt +++ b/app/src/main/java/com/gh/common/view/AdBannerView.kt @@ -8,9 +8,9 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import androidx.viewpager2.widget.ViewPager2 import com.facebook.drawee.view.SimpleDraweeView -import com.gh.common.util.DisplayUtils -import com.gh.common.util.ImageUtils -import com.gh.common.util.rxTimer +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.utils.rxTimer import com.gh.gamecenter.R import com.gh.gamecenter.entity.SettingsEntity import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/gh/common/view/AsyncUi.kt b/app/src/main/java/com/gh/common/view/AsyncUi.kt index bf89288c62..fa1966def2 100644 --- a/app/src/main/java/com/gh/common/view/AsyncUi.kt +++ b/app/src/main/java/com/gh/common/view/AsyncUi.kt @@ -1,8 +1,8 @@ package com.gh.common.view import android.content.Context -import com.gh.common.runOnIoThread -import com.gh.common.runOnUiThread +import com.gh.gamecenter.core.runOnIoThread +import com.gh.gamecenter.core.runOnUiThread import splitties.views.dsl.core.Ui open class AsyncUi(context: Context) : diff --git a/app/src/main/java/com/gh/common/view/CatalogFilterView.kt b/app/src/main/java/com/gh/common/view/CatalogFilterView.kt index 19a5f4c742..5f9e12ee3f 100644 --- a/app/src/main/java/com/gh/common/view/CatalogFilterView.kt +++ b/app/src/main/java/com/gh/common/view/CatalogFilterView.kt @@ -11,8 +11,8 @@ import android.widget.LinearLayout import android.widget.PopupWindow import android.widget.TextView import androidx.core.content.ContextCompat -import com.gh.common.util.toColor -import com.gh.common.util.visibleIf +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.visibleIf import com.gh.gamecenter.R import com.gh.gamecenter.entity.CatalogEntity import com.gh.gamecenter.entity.SubjectSettingEntity diff --git a/app/src/main/java/com/gh/common/view/CategoryFilterView.kt b/app/src/main/java/com/gh/common/view/CategoryFilterView.kt index 99a00a9f7c..a82fa62b4e 100644 --- a/app/src/main/java/com/gh/common/view/CategoryFilterView.kt +++ b/app/src/main/java/com/gh/common/view/CategoryFilterView.kt @@ -10,10 +10,9 @@ import android.widget.LinearLayout import android.widget.PopupWindow import android.widget.TextView import androidx.core.content.ContextCompat -import com.gh.common.util.dip2px -import com.gh.common.util.toColor +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.R -import com.gh.gamecenter.entity.SidebarsEntity import com.gh.gamecenter.entity.SubjectSettingEntity import com.google.android.flexbox.FlexboxLayout diff --git a/app/src/main/java/com/gh/common/view/Concern_LinearLayout.java b/app/src/main/java/com/gh/common/view/Concern_LinearLayout.java index 89d2134f8b..eebda9b7ec 100644 --- a/app/src/main/java/com/gh/common/view/Concern_LinearLayout.java +++ b/app/src/main/java/com/gh/common/view/Concern_LinearLayout.java @@ -1,14 +1,15 @@ package com.gh.common.view; import android.content.Context; -import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; -import com.gh.common.util.DisplayUtils; +import androidx.recyclerview.widget.RecyclerView; + import com.gh.gamecenter.R; +import com.gh.gamecenter.core.utils.DisplayUtils; public class Concern_LinearLayout extends LinearLayout { diff --git a/app/src/main/java/com/gh/common/view/ConfigFilterView.kt b/app/src/main/java/com/gh/common/view/ConfigFilterView.kt index 98bdef2e0c..f891588c67 100644 --- a/app/src/main/java/com/gh/common/view/ConfigFilterView.kt +++ b/app/src/main/java/com/gh/common/view/ConfigFilterView.kt @@ -11,7 +11,7 @@ import android.widget.PopupWindow import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat -import com.gh.common.util.toColor +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.R import com.gh.gamecenter.entity.SubjectSettingEntity import com.google.android.flexbox.FlexboxLayout diff --git a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java index 8eb9aa23b4..80c768fe7e 100644 --- a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java +++ b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java @@ -18,7 +18,7 @@ import android.widget.ProgressBar; import androidx.annotation.StringRes; import androidx.core.content.ContextCompat; -import com.gh.common.util.DisplayUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.R; public class DownloadProgressBar extends ProgressBar { diff --git a/app/src/main/java/com/gh/common/view/FilterView.kt b/app/src/main/java/com/gh/common/view/FilterView.kt index 60f5756d25..4438b20270 100644 --- a/app/src/main/java/com/gh/common/view/FilterView.kt +++ b/app/src/main/java/com/gh/common/view/FilterView.kt @@ -13,8 +13,8 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.dip2px -import com.gh.common.util.toColor +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.R import com.gh.gamecenter.databinding.ItemFilterBinding import com.gh.gamecenter.databinding.LayoutFilterBinding diff --git a/app/src/main/java/com/gh/common/view/FlexLinearLayout.kt b/app/src/main/java/com/gh/common/view/FlexLinearLayout.kt index a4a96b9e4c..ec0509b009 100644 --- a/app/src/main/java/com/gh/common/view/FlexLinearLayout.kt +++ b/app/src/main/java/com/gh/common/view/FlexLinearLayout.kt @@ -11,9 +11,9 @@ import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView import androidx.core.content.ContextCompat -import com.gh.common.util.DisplayUtils -import com.gh.common.util.dip2px -import com.gh.common.util.sp2px +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.sp2px import com.gh.gamecenter.R import com.gh.gamecenter.entity.TagStyleEntity import kotlin.math.ceil diff --git a/app/src/main/java/com/gh/common/view/GameIconView.kt b/app/src/main/java/com/gh/common/view/GameIconView.kt index bb8b05a847..94b5eff0f3 100644 --- a/app/src/main/java/com/gh/common/view/GameIconView.kt +++ b/app/src/main/java/com/gh/common/view/GameIconView.kt @@ -8,8 +8,13 @@ import android.view.View import androidx.cardview.widget.CardView import com.facebook.drawee.generic.RoundingParams import com.facebook.drawee.view.SimpleDraweeView -import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.display +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.entity.GameEntity import splitties.views.dsl.core.add import splitties.views.dsl.core.lParams diff --git a/app/src/main/java/com/gh/common/view/GameTagFlexLinearLayout.kt b/app/src/main/java/com/gh/common/view/GameTagFlexLinearLayout.kt index 23ca27bcf8..51a72e2f9a 100644 --- a/app/src/main/java/com/gh/common/view/GameTagFlexLinearLayout.kt +++ b/app/src/main/java/com/gh/common/view/GameTagFlexLinearLayout.kt @@ -7,12 +7,10 @@ import android.graphics.drawable.GradientDrawable import android.util.AttributeSet import android.view.Gravity import android.view.View -import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView -import androidx.core.content.ContextCompat -import com.gh.common.util.DisplayUtils -import com.gh.common.util.toColor +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.R import com.gh.gamecenter.entity.TagStyleEntity import kotlin.math.ceil diff --git a/app/src/main/java/com/gh/common/view/ImageContainerView.kt b/app/src/main/java/com/gh/common/view/ImageContainerView.kt index 26da2a35a7..c6ea94605a 100644 --- a/app/src/main/java/com/gh/common/view/ImageContainerView.kt +++ b/app/src/main/java/com/gh/common/view/ImageContainerView.kt @@ -11,6 +11,12 @@ import com.facebook.drawee.view.SimpleDraweeView import com.gh.common.util.* import com.gh.gamecenter.ImageViewerActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.debounceActionWithInterval +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toResString +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.core.utils.TopCutProcess import com.gh.gamecenter.databinding.ItemCommunityImageBinding import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.entity.AnswerEntity diff --git a/app/src/main/java/com/gh/common/view/RichEditor.java b/app/src/main/java/com/gh/common/view/RichEditor.java index 4d86b2bea8..348c76773b 100644 --- a/app/src/main/java/com/gh/common/view/RichEditor.java +++ b/app/src/main/java/com/gh/common/view/RichEditor.java @@ -14,21 +14,21 @@ import android.webkit.WebChromeClient; import android.webkit.WebView; import android.webkit.WebViewClient; -import com.gh.common.constant.Config; -import com.gh.common.util.DeviceUtils; -import com.gh.common.util.DialogHelper; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EmptyCallback; -import com.gh.common.util.EnvHelper; -import com.gh.common.util.GsonUtils; -import com.gh.common.util.HtmlUtils; -import com.gh.common.util.ImageUtils; -import com.gh.common.util.MtaHelper; -import com.gh.common.util.NetworkUtils; +import com.gh.gamecenter.common.utils.DeviceUtils; +import com.gh.gamecenter.core.utils.HtmlUtils; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.common.utils.NetworkUtils; import com.gh.common.util.PackageUtils; -import com.gh.common.util.RichEditorUtils; -import com.gh.common.util.SPUtils; +import com.gh.gamecenter.core.utils.RichEditorUtils; import com.gh.gamecenter.BuildConfig; +import com.gh.gamecenter.common.constant.Config; +import com.gh.gamecenter.common.utils.DialogHelper; +import com.gh.gamecenter.common.utils.EnvHelper; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.core.utils.EmptyCallback; +import com.gh.gamecenter.core.utils.GsonUtils; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.core.utils.SPUtils; import com.gh.gamecenter.entity.MtaEvent; import com.gh.gamecenter.entity.MyVideoEntity; import com.gh.gamecenter.qa.entity.EditorInsertEntity; 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 003eabc464..4aeae9e6e3 100644 --- a/app/src/main/java/com/gh/common/xapk/XapkInstaller.kt +++ b/app/src/main/java/com/gh/common/xapk/XapkInstaller.kt @@ -1,9 +1,14 @@ package com.gh.common.xapk import android.content.Context -import com.gh.common.AppExecutor +import com.gh.gamecenter.core.AppExecutor import com.gh.common.util.* import com.gh.download.DownloadManager +import com.gh.gamecenter.common.utils.debugOnly +import com.gh.gamecenter.common.utils.getExtension +import com.gh.gamecenter.common.utils.throwExceptionInDebug +import com.gh.gamecenter.common.utils.tryCatchInRelease +import com.gh.gamecenter.core.utils.SentryHelper import com.halo.assistant.HaloApp import com.lightgame.download.DataChanger import com.lightgame.download.DownloadEntity diff --git a/app/src/main/java/com/gh/common/xapk/XapkUnzipThread.kt b/app/src/main/java/com/gh/common/xapk/XapkUnzipThread.kt index f5379c7333..4eca5009d5 100644 --- a/app/src/main/java/com/gh/common/xapk/XapkUnzipThread.kt +++ b/app/src/main/java/com/gh/common/xapk/XapkUnzipThread.kt @@ -2,10 +2,10 @@ package com.gh.common.xapk import android.os.Build import android.os.Environment -import com.gh.common.util.debounceActionWithInterval -import com.gh.common.util.getExtension -import com.gh.common.util.throwException -import com.gh.common.util.throwExceptionInDebug +import com.gh.gamecenter.common.utils.debounceActionWithInterval +import com.gh.gamecenter.common.utils.getExtension +import com.gh.gamecenter.common.utils.throwException +import com.gh.gamecenter.common.utils.throwExceptionInDebug import com.gh.gamecenter.BuildConfig import com.halo.assistant.HaloApp import com.lightgame.download.DownloadEntity diff --git a/app/src/main/java/com/gh/download/DownloadDataHelper.kt b/app/src/main/java/com/gh/download/DownloadDataHelper.kt index 2f5cc6064f..78dd18c643 100644 --- a/app/src/main/java/com/gh/download/DownloadDataHelper.kt +++ b/app/src/main/java/com/gh/download/DownloadDataHelper.kt @@ -2,13 +2,17 @@ package com.gh.download import android.content.pm.PackageInfo import android.text.TextUtils -import com.gh.common.constant.Constants -import com.gh.common.exposure.meta.MetaUtil -import com.gh.common.exposure.meta.MetaUtil.getMeta +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.exposure.meta.MetaUtil +import com.gh.gamecenter.common.exposure.meta.MetaUtil.getMeta import com.gh.common.loghub.LoghubUtils import com.gh.common.util.* import com.gh.common.xapk.XapkInstaller import com.gh.gamecenter.BuildConfig +import com.gh.gamecenter.common.utils.getExtension +import com.gh.gamecenter.common.utils.getMetaExtra +import com.gh.gamecenter.common.utils.isSimulatorGame +import com.gh.gamecenter.common.utils.DeviceUtils import com.halo.assistant.HaloApp import com.lightgame.download.DataChanger import com.lightgame.download.DownloadEntity diff --git a/app/src/main/java/com/gh/download/DownloadManager.java b/app/src/main/java/com/gh/download/DownloadManager.java index 1c87467aa3..fc3882d661 100644 --- a/app/src/main/java/com/gh/download/DownloadManager.java +++ b/app/src/main/java/com/gh/download/DownloadManager.java @@ -13,26 +13,26 @@ import androidx.annotation.Nullable; import androidx.annotation.WorkerThread; import androidx.collection.ArrayMap; -import com.gh.common.AppExecutor; -import com.gh.common.constant.Constants; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.AppExecutor; +import com.gh.gamecenter.common.constant.Constants; import com.gh.common.exposure.ExposureEvent; import com.gh.common.exposure.ExposureUtils; -import com.gh.common.exposure.meta.MetaUtil; +import com.gh.gamecenter.common.exposure.meta.MetaUtil; import com.gh.common.history.HistoryHelper; import com.gh.common.simulator.SimulatorGameManager; -import com.gh.common.util.AppDebugConfig; +import com.gh.gamecenter.core.utils.AppDebugConfig; import com.gh.common.util.DataCollectionUtils; -import com.gh.common.util.DeviceUtils; +import com.gh.gamecenter.common.utils.DeviceUtils; import com.gh.common.util.DialogUtils; -import com.gh.common.util.ExtensionsKt; -import com.gh.common.util.GsonUtils; +import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.common.util.HomePluggableHelper; import com.gh.common.util.LunchType; -import com.gh.common.util.NetworkUtils; +import com.gh.gamecenter.common.utils.NetworkUtils; import com.gh.common.util.PackageInstaller; import com.gh.common.util.PackageUtils; -import com.gh.common.util.PageSwitchDataHelper; -import com.gh.common.util.SPUtils; +import com.gh.gamecenter.core.utils.PageSwitchDataHelper; +import com.gh.gamecenter.core.utils.SPUtils; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.download.DownloadedGameIdAndPackageNameDao; import com.gh.gamecenter.entity.ApkEntity; @@ -44,7 +44,6 @@ import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.manager.PackagesManager; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.packagehelper.PackageRepository; -import com.google.gson.Gson; import com.halo.assistant.HaloApp; import com.lightgame.download.ConnectionUtils; import com.lightgame.download.DataChanger; diff --git a/app/src/main/java/com/gh/download/DownloadWorkManager.kt b/app/src/main/java/com/gh/download/DownloadWorkManager.kt index c8e81f296a..c9f8ce54a5 100644 --- a/app/src/main/java/com/gh/download/DownloadWorkManager.kt +++ b/app/src/main/java/com/gh/download/DownloadWorkManager.kt @@ -2,7 +2,7 @@ package com.gh.download import androidx.work.PeriodicWorkRequest import androidx.work.WorkManager -import com.gh.common.util.tryWithDefaultCatch +import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.halo.assistant.HaloApp import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/com/gh/download/PackageObserver.kt b/app/src/main/java/com/gh/download/PackageObserver.kt index dde70374b7..af8ebb0d9a 100644 --- a/app/src/main/java/com/gh/download/PackageObserver.kt +++ b/app/src/main/java/com/gh/download/PackageObserver.kt @@ -3,11 +3,13 @@ package com.gh.download import android.annotation.SuppressLint import android.preference.PreferenceManager import android.text.TextUtils -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.loghub.LoghubUtils -import com.gh.common.runOnIoThread +import com.gh.gamecenter.core.runOnIoThread import com.gh.common.util.* import com.gh.download.server.BrowserInstallHelper +import com.gh.gamecenter.core.utils.ThirdPartyPackageHelper +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.entity.GameDigestEntity import com.gh.gamecenter.eventbus.EBPackage import com.gh.gamecenter.manager.UserManager diff --git a/app/src/main/java/com/gh/download/cache/ExoCacheManager.kt b/app/src/main/java/com/gh/download/cache/ExoCacheManager.kt index aeea4d2e50..9096504294 100644 --- a/app/src/main/java/com/gh/download/cache/ExoCacheManager.kt +++ b/app/src/main/java/com/gh/download/cache/ExoCacheManager.kt @@ -1,17 +1,15 @@ package com.gh.download.cache import android.net.Uri -import com.gh.common.runOnIoThread -import com.gh.common.util.DeviceUtils -import com.gh.common.util.NetworkUtils -import com.gh.common.util.debugOnly +import com.gh.gamecenter.core.runOnIoThread +import com.gh.gamecenter.common.utils.DeviceUtils +import com.gh.gamecenter.common.utils.NetworkUtils import com.google.android.exoplayer2.upstream.DataSource import com.google.android.exoplayer2.upstream.DataSpec import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory import com.google.android.exoplayer2.upstream.cache.CacheDataSource import com.google.android.exoplayer2.upstream.cache.CacheWriter import com.halo.assistant.HaloApp -import com.lightgame.utils.Utils import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response 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 1b259997ff..44ec86a909 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialog.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialog.kt @@ -14,13 +14,17 @@ import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.* import androidx.recyclerview.widget.RecyclerView.SmoothScroller -import com.gh.common.TimeElapsedHelper +import com.gh.gamecenter.core.utils.TimeElapsedHelper import com.gh.common.dialog.BaseDraggableDialogFragment import com.gh.common.exposure.ExposureEvent import com.gh.common.util.* import com.gh.download.DownloadManager import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.throwExceptionInDebug import com.gh.gamecenter.databinding.DialogDownloadBinding import com.gh.gamecenter.entity.ApkEntity import com.gh.gamecenter.entity.GameEntity @@ -88,9 +92,9 @@ class DownloadDialog : BaseDraggableDialogFragment() { super.onCreate(savedInstanceState) mGameEntity = requireArguments().getParcelable(GameEntity::class.java.simpleName)!! - mEntrance = requireArguments().getString(EntranceUtils.KEY_ENTRANCE) ?: "" - mLocation = requireArguments().getString(EntranceUtils.KEY_LOCATION) ?: "" - mTraceEvent = requireArguments().getParcelable(EntranceUtils.KEY_TRACE_EVENT) ?: null + mEntrance = requireArguments().getString(EntranceConsts.KEY_ENTRANCE) ?: "" + mLocation = requireArguments().getString(EntranceConsts.KEY_LOCATION) ?: "" + mTraceEvent = requireArguments().getParcelable(EntranceConsts.KEY_TRACE_EVENT) ?: null val factory = DownloadViewModel.Factory(HaloApp.getInstance().application, mGameEntity) mViewModel = ViewModelProviders.of(this, factory).get(DownloadViewModel::class.java) @@ -353,10 +357,10 @@ class DownloadDialog : BaseDraggableDialogFragment() { val downloadDialog = DownloadDialog().apply { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance) - bundle.putString(EntranceUtils.KEY_LOCATION, location) + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance) + bundle.putString(EntranceConsts.KEY_LOCATION, location) bundle.putParcelable(GameEntity::class.java.simpleName, gameEntity) - bundle.putParcelable(EntranceUtils.KEY_TRACE_EVENT, traceEvent) + bundle.putParcelable(EntranceConsts.KEY_TRACE_EVENT, traceEvent) arguments = bundle } downloadDialog.show(fragmentActivity.supportFragmentManager, DownloadDialog::class.java.name) diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogAdapter.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogAdapter.kt index ff05bd25a0..8ddb08ae09 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialogAdapter.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogAdapter.kt @@ -5,16 +5,15 @@ import android.graphics.drawable.GradientDrawable import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.base.OnViewClickListener +import com.gh.gamecenter.common.callback.OnViewClickListener import com.gh.common.exposure.ExposureEvent import com.gh.common.util.* import com.gh.gamecenter.NewsDetailActivity -import com.gh.gamecenter.QaActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.databinding.* import com.gh.gamecenter.entity.GameEntity import com.lightgame.adapter.BaseRecyclerAdapter -import com.lightgame.utils.Utils class DownloadDialogAdapter( context: Context, 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 968a7251fc..71924485e5 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt @@ -1,12 +1,16 @@ package com.gh.download.dialog import android.view.View -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.constant.Config import com.gh.common.exposure.ExposureEvent import com.gh.common.util.* import com.gh.download.DownloadManager import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.throwExceptionInDebug +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.databinding.DownloadDialogInstalledItemBinding import com.gh.gamecenter.entity.ApkEntity import com.lightgame.download.DownloadStatus diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogInstructionItemViewHolder.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogInstructionItemViewHolder.kt index 48595b0939..0b363a7086 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialogInstructionItemViewHolder.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogInstructionItemViewHolder.kt @@ -4,10 +4,9 @@ import android.graphics.Color import android.webkit.WebView import android.webkit.WebViewClient import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.DefaultUrlHandler -import com.gh.common.util.EntranceUtils -import com.gh.common.util.dip2px +import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.databinding.DownloadDialogInstructionItemBinding class DownloadDialogInstructionItemViewHolder(val binding: DownloadDialogInstructionItemBinding) : BaseRecyclerViewHolder(binding.root) { 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 df9cc30d55..20c832ffd8 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt @@ -7,7 +7,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.base.BaseActivity -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.constant.Config import com.gh.common.dialog.CertificationDialog import com.gh.common.dialog.DeviceRemindDialog @@ -19,6 +19,9 @@ import com.gh.download.DownloadManager import com.gh.download.server.BrowserInstallHelper import com.gh.gamecenter.DownloadManagerActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.DownloadDialogItemBinding import com.gh.gamecenter.entity.ApkEntity import com.gh.gamecenter.entity.GameCollectionEntity @@ -351,22 +354,26 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas override fun onCallback() { DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apkEntity, object : EmptyCallback { override fun onCallback() { - PackageCheckDialogFragment.show(context as AppCompatActivity, gameEntity, DialogUtils.ConfirmListener { - CertificationDialog.showCertificationDialog(context, gameEntity, DialogUtils.ConfirmListener { - DialogUtils.checkDownload(context, apkEntity.size) { isSubscribe -> - DownloadManager.createDownload( - context, - apkEntity, - gameEntity, - downloadMethod, - entrance, - location, - isSubscribe, traceEvent - ) + PackageCheckDialogFragment.show(context as AppCompatActivity, gameEntity, object : ConfirmListener { + override fun onConfirm() { + CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener { + override fun onConfirm() { + DialogUtils.checkDownload(context, apkEntity.size) { isSubscribe -> + DownloadManager.createDownload( + context, + apkEntity, + gameEntity, + downloadMethod, + entrance, + location, + isSubscribe, traceEvent + ) - DeviceRemindDialog.showDeviceRemindDialog(context, gameEntity) - } - }) + DeviceRemindDialog.showDeviceRemindDialog(context, gameEntity) + } + } + }) + } }) } }) diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogLinkItemViewHolder.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogLinkItemViewHolder.kt index 0a0b777454..cf454507e8 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialogLinkItemViewHolder.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogLinkItemViewHolder.kt @@ -1,6 +1,6 @@ package com.gh.download.dialog -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.databinding.DownloadDialogLinkItemBinding class DownloadDialogLinkItemViewHolder(val binding: DownloadDialogLinkItemBinding) : BaseRecyclerViewHolder(binding.root) { diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogPlatformRequestItemViewHolder.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogPlatformRequestItemViewHolder.kt index 724d575815..b61775c90b 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialogPlatformRequestItemViewHolder.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogPlatformRequestItemViewHolder.kt @@ -1,7 +1,6 @@ package com.gh.download.dialog -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.MtaHelper +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.VoteActivity import com.gh.gamecenter.databinding.DownloadDialogPlatformRequestItemBinding import com.gh.gamecenter.entity.GameEntity diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogSectionItemViewHolder.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogSectionItemViewHolder.kt index 268be73cd7..13ee777928 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialogSectionItemViewHolder.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogSectionItemViewHolder.kt @@ -1,7 +1,6 @@ package com.gh.download.dialog -import com.gh.base.BaseRecyclerViewHolder -import com.gh.gamecenter.databinding.DownloadDialogLinkItemBinding +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.databinding.DownloadDialogSectionItemBinding class DownloadDialogSectionItemViewHolder(val binding: DownloadDialogSectionItemBinding) : BaseRecyclerViewHolder(binding.root) { diff --git a/app/src/main/java/com/gh/download/dialog/DownloadLinkDialog.kt b/app/src/main/java/com/gh/download/dialog/DownloadLinkDialog.kt index 67f26089a1..75ae3d0b90 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadLinkDialog.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadLinkDialog.kt @@ -6,8 +6,8 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.FragmentActivity -import com.gh.base.fragment.BaseDialogFragment -import com.gh.common.util.dip2px +import com.gh.gamecenter.common.base.fragment.BaseDialogFragment +import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.databinding.DialogDownloadLinkBinding import com.gh.gamecenter.entity.GameEntity diff --git a/app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt b/app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt index 9543a82ec2..d5dc4cd2a5 100644 --- a/app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt +++ b/app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt @@ -4,12 +4,17 @@ import android.content.Context import android.os.Build import android.util.Base64 import com.gh.common.constant.Config -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureEntity import com.gh.common.exposure.ExposureEvent import com.gh.common.loghub.LoghubUtils import com.gh.common.util.* import com.gh.gamecenter.ShellActivity +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.core.utils.EmptyCallback +import com.gh.gamecenter.core.utils.GsonUtils +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.tryCatchInRelease import com.google.gson.JsonObject import com.halo.assistant.HaloApp import com.lightgame.utils.Utils 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 ed0350c540..686e1f3cf0 100644 --- a/app/src/main/java/com/gh/download/server/DownloadServer.kt +++ b/app/src/main/java/com/gh/download/server/DownloadServer.kt @@ -1,9 +1,9 @@ package com.gh.download.server -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureEvent -import com.gh.common.util.getMetaExtra -import com.gh.common.util.toObject +import com.gh.gamecenter.common.utils.getMetaExtra +import com.gh.gamecenter.common.utils.toObject import com.gh.download.DownloadManager import com.halo.assistant.HaloApp import com.lightgame.download.FileUtils diff --git a/app/src/main/java/com/gh/flutter/FlutterAdServiceImplAop.java b/app/src/main/java/com/gh/flutter/FlutterAdServiceImplAop.java index 16a9445545..fe708d558f 100644 --- a/app/src/main/java/com/gh/flutter/FlutterAdServiceImplAop.java +++ b/app/src/main/java/com/gh/flutter/FlutterAdServiceImplAop.java @@ -4,7 +4,7 @@ import android.content.Context; import com.gh.common.util.AdHelper; import com.gh.common.util.DirectUtils; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.entity.SettingsEntity; import me.ele.lancet.base.annotations.Insert; diff --git a/app/src/main/java/com/gh/flutter/FlutterBoostRouteServiceImplAop.java b/app/src/main/java/com/gh/flutter/FlutterBoostRouteServiceImplAop.java index befccd0d60..4ab7d1ff09 100644 --- a/app/src/main/java/com/gh/flutter/FlutterBoostRouteServiceImplAop.java +++ b/app/src/main/java/com/gh/flutter/FlutterBoostRouteServiceImplAop.java @@ -10,7 +10,7 @@ import android.content.Intent; import com.gh.common.DefaultUrlHandler; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DirectUtils; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.LibaoDetailActivity; import com.gh.gamecenter.MessageDetailActivity; @@ -45,7 +45,7 @@ public class FlutterBoostRouteServiceImplAop { @TargetClass(TARGET_CLASS) @Insert(METHOD_HANDLE_HELP_DETAIL) public void handleHelpDetail(Context context, Map params) { - StringBuilder builder = new StringBuilder("ghzhushou://" + EntranceUtils.HOST_HELP_DETAIL); + StringBuilder builder = new StringBuilder("ghzhushou://" + EntranceConsts.HOST_HELP_DETAIL); String url = (String) params.get("url"); if (url != null && !url.isEmpty()) { builder.append("?url=").append(params.get("url")); @@ -67,7 +67,7 @@ public class FlutterBoostRouteServiceImplAop { @TargetClass(TARGET_CLASS) @Insert(METHOD_HANDLE_QQ_GROUP) public void handleQQGroup(Context context, Map params) { - String url = "ghzhushou://" + EntranceUtils.HOST_QQ_QUN + "?key=" + params.get("key"); + String url = "ghzhushou://" + EntranceConsts.HOST_QQ_QUN + "?key=" + params.get("key"); DefaultUrlHandler.interceptUrl(context, url, ""); } diff --git a/app/src/main/java/com/gh/flutter/FlutterContextServiceImplAop.java b/app/src/main/java/com/gh/flutter/FlutterContextServiceImplAop.java index 17e23bbb75..5093e2ca67 100644 --- a/app/src/main/java/com/gh/flutter/FlutterContextServiceImplAop.java +++ b/app/src/main/java/com/gh/flutter/FlutterContextServiceImplAop.java @@ -3,9 +3,9 @@ package com.gh.flutter; import android.text.TextUtils; import com.gh.common.constant.Config; -import com.gh.common.exposure.meta.MetaUtil; -import com.gh.common.util.EnvHelper; -import com.gh.common.util.TimestampUtils; +import com.gh.gamecenter.common.exposure.meta.MetaUtil; +import com.gh.gamecenter.common.utils.EnvHelper; +import com.gh.gamecenter.common.utils.TimestampUtils; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.entity.SettingsEntity; import com.halo.assistant.HaloApp; diff --git a/app/src/main/java/com/gh/flutter/FlutterImageServiceImplAop.java b/app/src/main/java/com/gh/flutter/FlutterImageServiceImplAop.java index 5d8bb0cf91..d8193eb747 100644 --- a/app/src/main/java/com/gh/flutter/FlutterImageServiceImplAop.java +++ b/app/src/main/java/com/gh/flutter/FlutterImageServiceImplAop.java @@ -1,6 +1,6 @@ package com.gh.flutter; -import com.gh.common.util.CompressImageUtils; +import com.gh.gamecenter.common.utils.CompressImageUtils; import java.io.File; diff --git a/app/src/main/java/com/gh/flutter/FlutterLogHubServiceImplAop.kt b/app/src/main/java/com/gh/flutter/FlutterLogHubServiceImplAop.kt index 76127b5e8e..12198786ac 100644 --- a/app/src/main/java/com/gh/flutter/FlutterLogHubServiceImplAop.kt +++ b/app/src/main/java/com/gh/flutter/FlutterLogHubServiceImplAop.kt @@ -1,6 +1,6 @@ package com.gh.flutter -import com.gh.common.json.json +import com.gh.gamecenter.common.json.json import com.gh.common.loghub.LoghubUtils import com.gh.common.tracker.Tracker import com.gh.common.util.LogUtils diff --git a/app/src/main/java/com/gh/gamecenter/AboutActivity.java b/app/src/main/java/com/gh/gamecenter/AboutActivity.java index 463b1fd912..98bf891c09 100644 --- a/app/src/main/java/com/gh/gamecenter/AboutActivity.java +++ b/app/src/main/java/com/gh/gamecenter/AboutActivity.java @@ -5,18 +5,21 @@ import android.content.Intent; import android.os.Bundle; import androidx.annotation.NonNull; -import com.gh.common.util.EntranceUtils; +import com.alibaba.android.arouter.facade.annotation.Route; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.constant.RouteConsts; import com.halo.assistant.fragment.AboutFragment; /** * Created by khy on 2017/2/28. */ +@Route(path = RouteConsts.activity.aboutActivity) public class AboutActivity extends NormalActivity { @NonNull public static Intent getIntent(Context context, boolean isUpdate) { Bundle bundle = new Bundle(); - bundle.putBoolean(EntranceUtils.KEY_VERSION_UPDATE, isUpdate); + bundle.putBoolean(EntranceConsts.KEY_VERSION_UPDATE, isUpdate); return getTargetIntent(context, AboutActivity.class, AboutFragment.class, bundle); } diff --git a/app/src/main/java/com/gh/gamecenter/BlockActivity.kt b/app/src/main/java/com/gh/gamecenter/BlockActivity.kt index 9126220cea..2cb2b31069 100644 --- a/app/src/main/java/com/gh/gamecenter/BlockActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/BlockActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.entity.SubjectRecommendEntity import com.gh.gamecenter.game.GameFragment @@ -12,8 +12,8 @@ class BlockActivity : NormalActivity() { companion object { fun getIntent(context: Context, blockData: SubjectRecommendEntity, entrance: String): Intent { val args = Bundle() - args.putParcelable(EntranceUtils.KEY_BLOCK_DATA, blockData) - args.putString(EntranceUtils.KEY_ENTRANCE, entrance) + args.putParcelable(EntranceConsts.KEY_BLOCK_DATA, blockData) + args.putString(EntranceConsts.KEY_ENTRANCE, entrance) return getTargetIntent(context, BlockActivity::class.java, GameFragment::class.java, args) } } @@ -36,7 +36,7 @@ class BlockActivity : NormalActivity() { } override fun getBusinessId(): Pair { - return Pair(targetFragment?.arguments?.getParcelable(EntranceUtils.KEY_BLOCK_DATA)?.link ?: "", "") + return Pair(targetFragment?.arguments?.getParcelable(EntranceConsts.KEY_BLOCK_DATA)?.link ?: "", "") } } diff --git a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java index c061cbd3af..ca7d564ddb 100644 --- a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java @@ -6,7 +6,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.halo.assistant.fragment.ApkCleanerFragment; /** @@ -22,7 +22,7 @@ public class CleanApkActivity extends NormalActivity { @NonNull public static Intent getIntent(Context context, Boolean isChooseApk) { Bundle bundle = new Bundle(); - bundle.putBoolean(EntranceUtils.KEY_IS_CHOOSE_APK, isChooseApk); + bundle.putBoolean(EntranceConsts.KEY_IS_CHOOSE_APK, isChooseApk); return getTargetIntent(context, CleanApkActivity.class, ApkCleanerFragment.class, bundle); } diff --git a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java index b80b612b83..0d3951a1b4 100644 --- a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java @@ -5,7 +5,7 @@ import android.content.Intent; import android.os.Bundle; import androidx.annotation.NonNull; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.collection.CollectionWrapperFragment; /** @@ -16,7 +16,7 @@ public class CollectionActivity extends NormalActivity { @NonNull public static Intent getCollectionActivity(Context context, String entrance) { Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance); return getTargetIntent(context, CollectionActivity.class, CollectionWrapperFragment.class, bundle); } diff --git a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java index 1c691b9dc1..b1ee6dc541 100644 --- a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java @@ -6,8 +6,8 @@ import android.os.Bundle; import android.view.View; import android.view.ViewGroup; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.entity.LinkEntity; import com.gh.gamecenter.entity.MessageEntity; import com.gh.gamecenter.qa.comment.CommentActivity; @@ -43,7 +43,7 @@ public class CommentDetailActivity extends NormalActivity { // article 不为空则显示跳转原文按钮 public static Intent getIntent(Context context, String commentId, MessageEntity.Article article) { Bundle args = new Bundle(); - args.putString(EntranceUtils.KEY_COMMENTID, commentId); + args.putString(EntranceConsts.KEY_COMMENTID, commentId); args.putParcelable(MessageEntity.Article.TAG, article); return getTargetIntent(context, CommentDetailActivity.class, CommentDetailFragment.class, args); } @@ -53,9 +53,9 @@ public class CommentDetailActivity extends NormalActivity { String answerId, LinkEntity linkEntity) { Bundle args = new Bundle(); - args.putString(EntranceUtils.KEY_COMMENTID, commentId); - args.putString(EntranceUtils.KEY_ANSWER_ID, answerId); - args.putParcelable(EntranceUtils.KEY_LINK, linkEntity); + args.putString(EntranceConsts.KEY_COMMENTID, commentId); + args.putString(EntranceConsts.KEY_ANSWER_ID, answerId); + args.putParcelable(EntranceConsts.KEY_LINK, linkEntity); return getTargetIntent(context, CommentDetailActivity.class, NewCommentConversationFragment.class, args); } @@ -67,9 +67,9 @@ public class CommentDetailActivity extends NormalActivity { LinkEntity linkEntity) { Bundle args = new Bundle(); args.putString(CommentActivity.ARTICLE_ID, articleId); - args.putString(EntranceUtils.KEY_COMMENTID, articleCommentId); + args.putString(EntranceConsts.KEY_COMMENTID, articleCommentId); args.putString(CommentActivity.COMMUNITY_ID, communityId); - args.putParcelable(EntranceUtils.KEY_LINK, linkEntity); + args.putParcelable(EntranceConsts.KEY_LINK, linkEntity); return getTargetIntent(context, CommentDetailActivity.class, NewCommentConversationFragment.class, args); } @@ -79,10 +79,10 @@ public class CommentDetailActivity extends NormalActivity { boolean isVideoAuthor, LinkEntity linkEntity) { Bundle args = new Bundle(); - args.putString(EntranceUtils.KEY_COMMENTID, commentId); + args.putString(EntranceConsts.KEY_COMMENTID, commentId); args.putString(CommentActivity.VIDEO_ID, videoId); args.putBoolean(CommentActivity.IS_VIDEO_AUTHOR, isVideoAuthor); - args.putParcelable(EntranceUtils.KEY_LINK, linkEntity); + args.putParcelable(EntranceConsts.KEY_LINK, linkEntity); return getTargetIntent(context, CommentDetailActivity.class, NewCommentConversationFragment.class, args); } } diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index f82443d514..f89ff3adb8 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -5,7 +5,7 @@ import android.content.Intent; import android.os.Bundle; import androidx.annotation.NonNull; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.halo.assistant.fragment.myconcern.MyConcernFragment; /** @@ -16,7 +16,7 @@ public class ConcernActivity extends NormalActivity { @NonNull public static Intent getIntent(Context context, String entrance) { Bundle args = new Bundle(); - args.putString(EntranceUtils.KEY_ENTRANCE, entrance); + args.putString(EntranceConsts.KEY_ENTRANCE, entrance); return getTargetIntent(context, ConcernActivity.class, MyConcernFragment.class, args); } diff --git a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java index be068434d4..23399f6d15 100644 --- a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java @@ -12,10 +12,10 @@ import android.widget.ImageView; import android.widget.TextView; import com.gh.base.ToolBarActivity; -import com.gh.common.util.BitmapUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; -import com.gh.common.view.CropImageCustom; +import com.gh.gamecenter.common.utils.BitmapUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.view.CropImageCustom; import java.io.File; import java.lang.ref.SoftReference; @@ -46,11 +46,11 @@ public class CropImageActivity extends ToolBarActivity { @NonNull public static Intent getIntent(Context context, String picturePath, float cropRatio, boolean isBlackTheme, @LayoutRes int assistRes, String entrance) { Intent intent = new Intent(context, CropImageActivity.class); - intent.putExtra(EntranceUtils.KEY_PATH, picturePath); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); - intent.putExtra(EntranceUtils.KEY_IMAGE_CROP_RATIO, cropRatio); - intent.putExtra(EntranceUtils.KEY_BLACK_THEME, isBlackTheme); - intent.putExtra(EntranceUtils.KEY_ASSIST_RES, assistRes); + intent.putExtra(EntranceConsts.KEY_PATH, picturePath); + intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance); + intent.putExtra(EntranceConsts.KEY_IMAGE_CROP_RATIO, cropRatio); + intent.putExtra(EntranceConsts.KEY_BLACK_THEME, isBlackTheme); + intent.putExtra(EntranceConsts.KEY_ASSIST_RES, assistRes); return intent; } @@ -61,7 +61,7 @@ public class CropImageActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { - mBlackTheme = getIntent().getBooleanExtra(EntranceUtils.KEY_BLACK_THEME, false); + mBlackTheme = getIntent().getBooleanExtra(EntranceConsts.KEY_BLACK_THEME, false); super.onCreate(savedInstanceState); mCropImageCustom = findViewById(R.id.cropimage_custom); @@ -77,10 +77,10 @@ public class CropImageActivity extends ToolBarActivity { TextView menuButton = menuItem.getActionView().findViewById(R.id.menu_answer_post); menuButton.setTextColor(getResources().getColor(R.color.theme_font)); - float ratio = getIntent().getFloatExtra(EntranceUtils.KEY_IMAGE_CROP_RATIO, 1F); + float ratio = getIntent().getFloatExtra(EntranceConsts.KEY_IMAGE_CROP_RATIO, 1F); mCropImageCustom.setCropRatio(ratio); - int assistRes = getIntent().getIntExtra(EntranceUtils.KEY_ASSIST_RES, -1); + int assistRes = getIntent().getIntExtra(EntranceConsts.KEY_ASSIST_RES, -1); if (assistRes > 0) { View view = LayoutInflater.from(this).inflate(assistRes, null, false); addAssistView(view); @@ -126,7 +126,7 @@ public class CropImageActivity extends ToolBarActivity { super.onWindowFocusChanged(hasFocus); if (hasFocus && (reference == null || reference.get() == null)) { ImageView imageView = mCropImageCustom.getCropImageZoomView(); - Bitmap bitmap = BitmapUtils.getBitmapByFile(getIntent().getStringExtra(EntranceUtils.KEY_PATH), + Bitmap bitmap = BitmapUtils.getBitmapByFile(getIntent().getStringExtra(EntranceConsts.KEY_PATH), imageView.getWidth(), imageView.getHeight()); if (bitmap != null) { reference = new SoftReference<>(bitmap); diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java index 9bb829ad64..b6f0f383cf 100644 --- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java +++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java @@ -4,8 +4,8 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import com.gh.base.fragment.BaseFragment_TabLayout; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.download.DownloadFragment; /** @@ -27,14 +27,14 @@ public class DownloadManagerActivity extends NormalActivity { public static Intent getDownloadMangerIntent(Context context, String url, String entrance) { Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_URL, url); - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); + bundle.putString(EntranceConsts.KEY_URL, url); + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance); return getTargetIntent(context, DownloadManagerActivity.class, DownloadFragment.class, bundle); } public static Intent getDownloadMangerIntent(Context context, String entrance) { Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance); return getTargetIntent(context, DownloadManagerActivity.class, DownloadFragment.class, bundle); } @@ -43,9 +43,9 @@ public class DownloadManagerActivity extends NormalActivity { */ public static Intent getDownloadMangerIntent(Context context, String packageName, int position, String entrance) { Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance); bundle.putInt(BaseFragment_TabLayout.PAGE_INDEX, position); - bundle.putString(EntranceUtils.KEY_PACKAGENAME, packageName); + bundle.putString(EntranceConsts.KEY_PACKAGENAME, packageName); return getTargetIntent(context, DownloadManagerActivity.class, DownloadFragment.class, bundle); } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/FullScreenWebActivity.kt b/app/src/main/java/com/gh/gamecenter/FullScreenWebActivity.kt index 545a9e7c26..44683dbc79 100644 --- a/app/src/main/java/com/gh/gamecenter/FullScreenWebActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/FullScreenWebActivity.kt @@ -4,8 +4,8 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.halo.assistant.fragment.WebFragment class FullScreenWebActivity : BaseActivity() { @@ -30,7 +30,7 @@ class FullScreenWebActivity : BaseActivity() { companion object { fun getIntent(context: Context, url: String, webViewHandleBackPressed: Boolean = false): Intent { val intent = Intent(context, FullScreenWebActivity::class.java) - intent.putExtra(EntranceUtils.KEY_URL, url) + intent.putExtra(EntranceConsts.KEY_URL, url) intent.putExtra(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_BACK_PRESSED, webViewHandleBackPressed) return intent } diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt index 8d382e8f40..9cc78c1b35 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt @@ -4,15 +4,15 @@ import android.content.Context import android.content.ContextWrapper import android.content.Intent import android.os.Bundle -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureEvent.Companion.createEvent import com.gh.common.exposure.ExposureManager.log import com.gh.common.exposure.ExposureTraceUtils.appendTrace import com.gh.common.exposure.ExposureType import com.gh.common.util.DataUtils -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.gamedetail.GameDetailFragment import com.halo.assistant.HaloApp @@ -56,7 +56,7 @@ class GameDetailActivity : NormalActivity() { override fun getBusinessId(): Pair { val fragment = targetFragment as GameDetailFragment return if (fragment.arguments != null) { - Pair(fragment.requireArguments().getString(EntranceUtils.KEY_GAMEID) ?: "", "") + Pair(fragment.requireArguments().getString(EntranceConsts.KEY_GAMEID) ?: "", "") } else { super.getBusinessId() } @@ -107,7 +107,7 @@ class GameDetailActivity : NormalActivity() { if (traceEvent != null) { val clickEvent = createEvent(gameEntity, traceEvent.source, appendTrace(traceEvent), ExposureType.CLICK) log(clickEvent) - bundle.putParcelable(EntranceUtils.KEY_TRACE_EVENT, clickEvent) + bundle.putParcelable(EntranceConsts.KEY_TRACE_EVENT, clickEvent) } if (gameEntity != null && traceEvent != null && gameEntity.id != traceEvent.payload.gameId) { // 当游戏 ID 跟曝光 traceEvent 的游戏ID 不一样的时候更新 traceEvent 的游戏ID @@ -120,21 +120,21 @@ class GameDetailActivity : NormalActivity() { traceEvent.payload = payload } if (defaultTab != -1) { - bundle.putInt(EntranceUtils.KEY_TARGET, defaultTab) + bundle.putInt(EntranceConsts.KEY_TARGET, defaultTab) } if (isSkipGameComment) { - bundle.putBoolean(EntranceUtils.KEY_SKIP_GAME_COMMENT, true) + bundle.putBoolean(EntranceConsts.KEY_SKIP_GAME_COMMENT, true) } if (scrollToLibao) { - bundle.putInt(EntranceUtils.KEY_TARGET, GameDetailFragment.INDEX_DESC) - bundle.putBoolean(EntranceUtils.KEY_SCROLL_TO_LIBAO, true) + bundle.putInt(EntranceConsts.KEY_TARGET, GameDetailFragment.INDEX_DESC) + bundle.putBoolean(EntranceConsts.KEY_SCROLL_TO_LIBAO, true) } if (scrollToServer) { - bundle.putInt(EntranceUtils.KEY_TARGET, GameDetailFragment.INDEX_DESC) - bundle.putBoolean(EntranceUtils.KEY_SCROLL_TO_SERVER, true) + bundle.putInt(EntranceConsts.KEY_TARGET, GameDetailFragment.INDEX_DESC) + bundle.putBoolean(EntranceConsts.KEY_SCROLL_TO_SERVER, true) } - bundle.putString(EntranceUtils.KEY_GAMEID, gameEntity?.id) - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance) + bundle.putString(EntranceConsts.KEY_GAMEID, gameEntity?.id) + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance) bundle.putParcelable(GameEntity.TAG, gameEntity) context.startActivity(getTargetIntent(context, GameDetailActivity::class.java, GameDetailFragment::class.java, bundle)) } @@ -178,7 +178,7 @@ class GameDetailActivity : NormalActivity() { ExposureType.CLICK ) log(clickEvent) - bundle.putParcelable(EntranceUtils.KEY_TRACE_EVENT, clickEvent) + bundle.putParcelable(EntranceConsts.KEY_TRACE_EVENT, clickEvent) } if (traceEvent != null && gameId != traceEvent.payload.gameId) { // 当游戏 ID 跟曝光 traceEvent 的游戏ID 不一样的时候更新 traceEvent 的游戏ID @@ -191,24 +191,24 @@ class GameDetailActivity : NormalActivity() { traceEvent.payload = payload } if (defaultTab != -1) { - bundle.putInt(EntranceUtils.KEY_TARGET, defaultTab) + bundle.putInt(EntranceConsts.KEY_TARGET, defaultTab) } if (isSkipGameComment) { - bundle.putBoolean(EntranceUtils.KEY_SKIP_GAME_COMMENT, true) + bundle.putBoolean(EntranceConsts.KEY_SKIP_GAME_COMMENT, true) } if (openVideoStreaming) { - bundle.putBoolean(EntranceUtils.KEY_OPEN_VIDEO_STREAMING, true) - bundle.putInt(EntranceUtils.KEY_TARGET, GameDetailFragment.INDEX_DESC) + bundle.putBoolean(EntranceConsts.KEY_OPEN_VIDEO_STREAMING, true) + bundle.putInt(EntranceConsts.KEY_TARGET, GameDetailFragment.INDEX_DESC) } if (openPlatformWindow) { - bundle.putBoolean(EntranceUtils.KEY_OPEN_PLATFORM_WINDOW, true) + bundle.putBoolean(EntranceConsts.KEY_OPEN_PLATFORM_WINDOW, true) } if (scrollToLibao) { - bundle.putInt(EntranceUtils.KEY_TARGET, GameDetailFragment.INDEX_TRENDES) - bundle.putBoolean(EntranceUtils.KEY_SCROLL_TO_LIBAO, true) + bundle.putInt(EntranceConsts.KEY_TARGET, GameDetailFragment.INDEX_TRENDES) + bundle.putBoolean(EntranceConsts.KEY_SCROLL_TO_LIBAO, true) } - bundle.putString(EntranceUtils.KEY_GAMEID, gameId) - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance) + bundle.putString(EntranceConsts.KEY_GAMEID, gameId) + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance) context.startActivity(getTargetIntent(context, GameDetailActivity::class.java, GameDetailFragment::class.java, bundle)) } diff --git a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java index 2e55256df2..cd78071061 100644 --- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java @@ -6,7 +6,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.halo.assistant.fragment.game.GameNewsSearchFragment; /** @@ -20,9 +20,9 @@ public class GameNewsActivity extends NormalActivity { public static Intent getIntent(Context context, String gameName, String gameId, String entrance) { final Bundle args = new Bundle(); - args.putString(EntranceUtils.KEY_GAMENAME, gameName); - args.putString(EntranceUtils.KEY_GAMEID, gameId); - args.putString(EntranceUtils.KEY_ENTRANCE, entrance); + args.putString(EntranceConsts.KEY_GAMENAME, gameName); + args.putString(EntranceConsts.KEY_GAMEID, gameId); + args.putString(EntranceConsts.KEY_ENTRANCE, entrance); return getTargetIntent(context, GameNewsActivity.class, GameNewsSearchFragment.class, args); } diff --git a/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt b/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt index 6cf1dd9707..c8cd0dc14b 100644 --- a/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt @@ -41,11 +41,13 @@ import com.facebook.imagepipeline.request.ImageRequest import com.gh.base.BaseActivity import com.gh.common.Base64ImageHolder.image import com.gh.common.constant.Config -import com.gh.common.runOnIoThread -import com.gh.common.util.* -import com.gh.common.util.ImageUtils.getTransformedUrl -import com.gh.common.view.DraggableBigImageView -import com.gh.common.view.Gh_RelativeLayout +import com.gh.gamecenter.core.runOnIoThread +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.ImageUtils.getTransformedUrl +import com.gh.gamecenter.common.view.DraggableBigImageView +import com.gh.gamecenter.common.view.Gh_RelativeLayout +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ActivityViewimageBinding import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.ImageInfoEntity @@ -141,7 +143,7 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener { mImageInfoMap = HashMap() mImagePipeline = Fresco.getImagePipeline() - mInitialPosition = savedInstanceState?.getInt(EntranceUtils.KEY_CURRENTITEM, 0) ?: 0 + mInitialPosition = savedInstanceState?.getInt(EntranceConsts.KEY_CURRENTITEM, 0) ?: 0 intent.extras?.let { if (it.getBoolean(KEY_BASE64)) { @@ -240,7 +242,7 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener { override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) - outState.putInt(EntranceUtils.KEY_CURRENTITEM, mViewPager.currentItem) + outState.putInt(EntranceConsts.KEY_CURRENTITEM, mViewPager.currentItem) } override fun onDestroy() { @@ -923,7 +925,7 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener { intent.putExtra(KEY_CURRENT, position) intent.putExtra(KEY_SHOW_SAVE, isShowSaveBtn) intent.putExtra(AnswerEntity::class.java.name, answerEntity) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance) intent.putExtra(KEY_IS_FROM_IMAGE_CONTAINER_VIEW, isFromICV) if (originalViewList != null) { diff --git a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java index 852c822a3c..f6845bf82c 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java @@ -5,7 +5,7 @@ import android.content.Intent; import android.os.Bundle; import androidx.annotation.NonNull; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.libao.LibaoFragment; /** @@ -17,7 +17,7 @@ public class LibaoActivity extends NormalActivity { @NonNull public static Intent getIntent(Context context, String entrance) { Bundle args = new Bundle(); - args.putString(EntranceUtils.KEY_ENTRANCE, entrance); + args.putString(EntranceConsts.KEY_ENTRANCE, entrance); return getTargetIntent(context, LibaoActivity.class, LibaoFragment.class, args); } diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index 38ccb91942..b778b92bdd 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -17,21 +17,21 @@ import androidx.recyclerview.widget.RecyclerView; import com.ethanhua.skeleton.Skeleton; import com.ethanhua.skeleton.ViewSkeletonScreen; -import com.gh.base.OnRequestCallBackListener; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; import com.gh.base.ToolBarActivity; import com.gh.common.filter.RegionSettingHelper; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DetailDownloadUtils; import com.gh.common.util.DeviceTokenUtils; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.ExtensionsKt; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.common.util.LibaoUtils; import com.gh.common.view.DownloadProgressBar; -import com.gh.common.view.VerticalItemDecoration; +import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.download.DownloadManager; import com.gh.gamecenter.adapter.LibaoDetailAdapter; import com.gh.gamecenter.adapter.viewholder.DetailViewHolder; +import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.LibaoEntity; @@ -152,8 +152,8 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA public static Intent getIntent(Context context, LibaoEntity libaoEntity, boolean isClickReceiveBtnIn, String entrance) { Intent intent = new Intent(context, LibaoDetailActivity.class); HaloApp.put(LibaoEntity.TAG, libaoEntity); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); - intent.putExtra(EntranceUtils.KEY_IS_CLICK_RECEIVE_BTN, isClickReceiveBtnIn); + intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance); + intent.putExtra(EntranceConsts.KEY_IS_CLICK_RECEIVE_BTN, isClickReceiveBtnIn); return intent; } @@ -165,8 +165,8 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA @NonNull public static Intent getIntentById(Context context, String id, String entrance) { Intent intent = new Intent(context, LibaoDetailActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); - intent.putExtra(EntranceUtils.KEY_ID, id); + intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance); + intent.putExtra(EntranceConsts.KEY_ID, id); return intent; } @@ -192,7 +192,7 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA mName = getString(R.string.libao_detail); setNavigationTitle(mName); mLibaoEntity = (LibaoEntity) HaloApp.get(LibaoEntity.TAG, false); - isClickReceiveBtnIn = getIntent().getBooleanExtra(EntranceUtils.KEY_IS_CLICK_RECEIVE_BTN, false); + isClickReceiveBtnIn = getIntent().getBooleanExtra(EntranceConsts.KEY_IS_CLICK_RECEIVE_BTN, false); if (mLibaoEntity != null) { mLibaoEntity.setClickReceiveBtnIn(isClickReceiveBtnIn); } @@ -218,7 +218,7 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA }); if (mLibaoEntity == null) { - String id = getIntent().getStringExtra(EntranceUtils.KEY_ID); + String id = getIntent().getStringExtra(EntranceConsts.KEY_ID); if (!TextUtils.isEmpty(id)) { getLibaoDigest(id); } @@ -407,7 +407,7 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA mAdapter.setGameEntity(mGameEntity); // 添加启动弹窗的相关信息 - if (mEntrance.contains(EntranceUtils.ENTRANCE_WELCOME) + if (mEntrance.contains(EntranceConsts.ENTRANCE_WELCOME) && ExtensionsKt.countOccurrences(mEntrance, ("+")) <= 1) { mGameEntity.setWelcomeDialogInfoIfAvailable(); } diff --git a/app/src/main/java/com/gh/gamecenter/LoginActivity.java b/app/src/main/java/com/gh/gamecenter/LoginActivity.java index fa2a6ade50..543cca8244 100644 --- a/app/src/main/java/com/gh/gamecenter/LoginActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LoginActivity.java @@ -6,8 +6,8 @@ import android.os.Bundle; import androidx.annotation.NonNull; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.fragment.LoginFragment; /** @@ -33,8 +33,8 @@ public class LoginActivity extends NormalActivity { @NonNull public static Intent getIntent(Context context, String entrance, int status) { Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); - bundle.putInt(EntranceUtils.KEY_SHOW_QUICK_LOGIN, status); + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance); + bundle.putInt(EntranceConsts.KEY_SHOW_QUICK_LOGIN, status); return getTargetIntent(context, LoginActivity.class, LoginFragment.class, bundle); } diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 4f093e73af..fcc3c55c65 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -1,17 +1,17 @@ package com.gh.gamecenter; -import static com.gh.common.util.EntranceUtils.ENTRANCE_BROWSER; -import static com.gh.common.util.EntranceUtils.HOST_LAUNCH_SIMULATOR_GAME; -import static com.gh.common.util.EntranceUtils.HOST_QQ; -import static com.gh.common.util.EntranceUtils.HOST_QQ_GROUP; -import static com.gh.common.util.EntranceUtils.HOST_WEB; -import static com.gh.common.util.EntranceUtils.KEY_DATA; -import static com.gh.common.util.EntranceUtils.KEY_MARKET_DETAILS; -import static com.gh.common.util.EntranceUtils.KEY_NEXT_TO; -import static com.gh.common.util.EntranceUtils.KEY_TO; -import static com.gh.common.util.EntranceUtils.KEY_TYPE; -import static com.gh.common.util.ExtensionsKt.observableToMain; +import static com.gh.gamecenter.common.constant.EntranceConsts.ENTRANCE_BROWSER; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_LAUNCH_SIMULATOR_GAME; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_QQ; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_QQ_GROUP; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_WEB; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_DATA; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_MARKET_DETAILS; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_NEXT_TO; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_TO; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_TYPE; import static com.gh.common.util.LoginHelper.WEIBO_SCOPE; +import static com.gh.gamecenter.common.utils.ExtensionsKt.observableToMain; import static com.gh.gamecenter.fragment.MainWrapperFragment.INDEX_PERSONAL; import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; import static com.gh.gamecenter.personal.PersonalFragment.LOGOUT_TAG; @@ -22,7 +22,6 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; -import android.content.res.Configuration; import android.graphics.Color; import android.os.Build; import android.os.Bundle; @@ -42,47 +41,48 @@ import androidx.lifecycle.ViewModelProviders; import com.gh.base.AppUncaughtHandler; import com.gh.base.BaseActivity; -import com.gh.base.fragment.BaseFragment_ViewPager; -import com.gh.common.AppExecutor; +import com.gh.gamecenter.common.base.fragment.BaseFragment_ViewPager; import com.gh.common.DefaultUrlHandler; -import com.gh.common.avoidcallback.AvoidOnResultManager; +import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager; import com.gh.common.constant.Config; -import com.gh.common.constant.Constants; -import com.gh.common.exposure.meta.MetaUtil; import com.gh.common.history.HistoryDatabase; import com.gh.common.history.HistoryHelper; import com.gh.common.repository.ReservationRepository; import com.gh.common.simulator.SimulatorGameManager; import com.gh.common.util.ActivationHelper; import com.gh.common.util.AdHelper; -import com.gh.common.util.ClassUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DeviceTokenUtils; -import com.gh.common.util.DeviceUtils; -import com.gh.common.util.DialogHelper; import com.gh.common.util.DialogUtils; import com.gh.common.util.DirectUtils; -import com.gh.common.util.DisplayUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.common.util.EntranceUtils; import com.gh.common.util.ErrorHelper; -import com.gh.common.util.ExtensionsKt; -import com.gh.common.util.GsonUtils; import com.gh.common.util.HomePluggableHelper; import com.gh.common.util.LogUtils; import com.gh.common.util.LunchType; -import com.gh.common.util.MtaHelper; import com.gh.common.util.NotificationHelper; import com.gh.common.util.PackageInstaller; import com.gh.common.util.PackageUtils; import com.gh.common.util.PlatformUtils; import com.gh.common.util.QuickLoginHelper; -import com.gh.common.util.SPUtils; -import com.gh.common.util.SentryHelper; import com.gh.common.util.ShareUtils; -import com.gh.common.util.ToastUtils; -import com.gh.common.util.UrlFilterUtils; import com.gh.common.util.WechatBindHelper; import com.gh.download.DownloadManager; +import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.exposure.meta.MetaUtil; +import com.gh.gamecenter.common.utils.DeviceUtils; +import com.gh.gamecenter.common.utils.DialogHelper; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.AppExecutor; +import com.gh.gamecenter.core.utils.ClassUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.core.utils.GsonUtils; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.core.utils.SPUtils; +import com.gh.gamecenter.core.utils.SentryHelper; +import com.gh.gamecenter.core.utils.ToastUtils; +import com.gh.gamecenter.core.utils.UrlFilterUtils; import com.gh.gamecenter.download.DownloadFragment; import com.gh.gamecenter.entity.CommunityEntity; import com.gh.gamecenter.entity.GameEntity; @@ -97,7 +97,7 @@ import com.gh.gamecenter.home.skip.PackageSkipActivity; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.UpdateManager; import com.gh.gamecenter.manager.UserManager; -import com.gh.gamecenter.normal.NormalFragment; +import com.gh.gamecenter.common.base.fragment.NormalFragment; import com.gh.gamecenter.packagehelper.PackageViewModel; import com.gh.gamecenter.retrofit.BiResponse; import com.gh.gamecenter.retrofit.Response; @@ -107,7 +107,6 @@ import com.gh.gamecenter.room.dao.SimulatorGameDao; import com.gh.gamecenter.suggest.SuggestSelectFragment; import com.gh.gamecenter.suggest.SuggestType; import com.google.android.exoplayer2.upstream.cache.Cache; -import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; import com.google.gson.reflect.TypeToken; import com.halo.assistant.HaloApp; @@ -233,7 +232,7 @@ public class MainActivity extends BaseActivity { Config.setExceptionMsg(null); AppUncaughtHandler.reportException(this, new Throwable(message)); // 被改过的包闪退时增加跳转到光环游戏详情并自动下载的方法 - if (Config.DEFAULT_CHANNEL_FOR_RELEASE.equals(HaloApp.getInstance().getChannel())) { + if (com.gh.gamecenter.common.constant.Config.DEFAULT_CHANNEL_FOR_RELEASE.equals(HaloApp.getInstance().getChannel())) { DialogHelper.showCenterWarningDialog(this, "发生闪退", "光环助手发生了闪退，建议安装到最新版本修复异常" , "马上反馈", "马上安装修复", () -> { @@ -280,7 +279,7 @@ public class MainActivity extends BaseActivity { // 跳转至其它页面 if (getIntent() != null && getIntent().getExtras() != null - && getIntent().getBooleanExtra(EntranceUtils.KEY_REQUIRE_REDIRECT, false)) { + && getIntent().getBooleanExtra(EntranceConsts.KEY_REQUIRE_REDIRECT, false)) { doSkip(); } @@ -553,7 +552,7 @@ public class MainActivity extends BaseActivity { private void doSkip() { if (getIntent() != null && getIntent().getExtras() != null) { - getIntent().getExtras().putBoolean(EntranceUtils.KEY_REQUIRE_REDIRECT, false); + getIntent().getExtras().putBoolean(EntranceConsts.KEY_REQUIRE_REDIRECT, false); } handler.postDelayed(() -> { Bundle bundle = getIntent().getExtras(); @@ -562,9 +561,9 @@ public class MainActivity extends BaseActivity { if (!TextUtils.isEmpty(to)) { Class clazz = ClassUtils.forName(to); if (clazz != null) { - String entrance = bundle.getString(EntranceUtils.KEY_ENTRANCE); + String entrance = bundle.getString(EntranceConsts.KEY_ENTRANCE); if (TextUtils.isEmpty(entrance) || !entrance.startsWith("(") || !entrance.endsWith(")")) { - bundle.putString(EntranceUtils.KEY_ENTRANCE, "(插件跳转)"); + bundle.putString(EntranceConsts.KEY_ENTRANCE, "(插件跳转)"); } String packageName = bundle.getString("packageName"); @@ -604,7 +603,7 @@ public class MainActivity extends BaseActivity { } break; case HOST_LAUNCH_SIMULATOR_GAME: - String json = getIntent().getStringExtra(EntranceUtils.KEY_GAME); + String json = getIntent().getStringExtra(EntranceConsts.KEY_GAME); try { GameEntity gameEntity = GsonUtils.getGson().fromJson(json, new TypeToken() { }.getType()); @@ -636,8 +635,8 @@ public class MainActivity extends BaseActivity { } Utils.log(bundle); - if (bundle.getInt(EntranceUtils.KEY_POSITION) != -1) { - EventBus.getDefault().post(new EBSkip(MainActivity.EB_SKIP_MAIN, bundle.getInt(EntranceUtils.KEY_POSITION))); + if (bundle.getInt(EntranceConsts.KEY_POSITION) != -1) { + EventBus.getDefault().post(new EBSkip(MainActivity.EB_SKIP_MAIN, bundle.getInt(EntranceConsts.KEY_POSITION))); } } }, 500); @@ -797,7 +796,7 @@ public class MainActivity extends BaseActivity { // 跳转至其它页面 if (getIntent() != null && getIntent().getExtras() != null - && getIntent().getBooleanExtra(EntranceUtils.KEY_REQUIRE_REDIRECT, false)) { + && getIntent().getBooleanExtra(EntranceConsts.KEY_REQUIRE_REDIRECT, false)) { doSkip(); } @@ -899,12 +898,7 @@ public class MainActivity extends BaseActivity { mSp.edit().putString("syncDeviceID", deviceId).apply(); DialogUtils.showForceDialog(MainActivity.this, "数据同步提醒" , "系统检测到你是光环助手的老用户，为了避免数据丢失，请尽快登录" - , "前往登录", "残忍拒绝", new DialogUtils.ConfirmListener() { - @Override - public void onConfirm() { - EventBus.getDefault().post(new EBSkip(MainActivity.EB_SKIP_MAIN, INDEX_PERSONAL)); - } - }, null); + , "前往登录", "残忍拒绝", () -> EventBus.getDefault().post(new EBSkip(MainActivity.EB_SKIP_MAIN, INDEX_PERSONAL)), null); } // 获取META-INF中的plugin_update 文件，判断是否从游戏插件中下载的app，是则获取游戏id，启动游戏更新，下载该游戏 @@ -933,7 +927,7 @@ public class MainActivity extends BaseActivity { InnerMetaInfoEntity info = GsonUtils.getGson().fromJson(reader, InnerMetaInfoEntity.class); if (info != null) { - if (EntranceUtils.HOST_COMMUNITY.equals(info.getType())) { + if (EntranceConsts.HOST_COMMUNITY.equals(info.getType())) { UserManager.getInstance().setCommunityData(new CommunityEntity(info.getLink(), info.getText())); runOnUiThread(() -> mMainWrapperFragment.setCurrentItem(MainWrapperFragment.INDEX_BBS)); } else { @@ -941,7 +935,7 @@ public class MainActivity extends BaseActivity { info.getType(), info.getLink(), info.getText(), - EntranceUtils.KEY_PLUGIN, + EntranceConsts.KEY_PLUGIN, "特定包启动跳转"); } } diff --git a/app/src/main/java/com/gh/gamecenter/MessageActivity.java b/app/src/main/java/com/gh/gamecenter/MessageActivity.java index c99dbf386f..86f09971af 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageActivity.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.message.MessageFragment; /** @@ -15,7 +15,7 @@ public class MessageActivity extends NormalActivity { public static Intent getIntent(Context context, String entrance) { Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance); return getTargetIntent(context, MessageActivity.class, MessageFragment.class, bundle); } diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index 81f971b427..f2f9bac543 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -6,8 +6,8 @@ import android.os.Bundle; import android.view.View; import android.view.ViewGroup; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.entity.CommentEntity; import com.gh.gamecenter.entity.ConcernEntity; import com.gh.gamecenter.message.MessageDetailFragment; @@ -45,7 +45,7 @@ public class MessageDetailActivity extends NormalActivity { public static Intent getMessageDetailIntent(Context context, CommentEntity entity, String newsId) { Intent intent = new Intent(context, MessageDetailActivity.class); intent.putExtra("commentNum", -1); - intent.putExtra(EntranceUtils.KEY_NEWSID, newsId); + intent.putExtra(EntranceConsts.KEY_NEWSID, newsId); intent.putExtra("openSoftInput", true); intent.putExtra(CommentEntity.TAG, entity); @@ -56,15 +56,15 @@ public class MessageDetailActivity extends NormalActivity { Intent intent = new Intent(context, MessageDetailActivity.class); // intent.putExtra(ConcernEntity.TAG, concernEntity); HaloApp.put(ConcernEntity.TAG, concernEntity); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance); // return intent; return getTargetIntent(context, MessageDetailActivity.class, MessageDetailFragment.class, intent.getExtras()); } public static Intent getIntentById(Context context, String newsId, Integer commentNum, Boolean openSoftInput, String entrance) { Intent intent = new Intent(context, MessageDetailActivity.class); - intent.putExtra(EntranceUtils.KEY_NEWSID, newsId); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + intent.putExtra(EntranceConsts.KEY_NEWSID, newsId); + intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance); intent.putExtra("commentNum", commentNum); intent.putExtra("openSoftInput", openSoftInput); // return intent; diff --git a/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java b/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java index a716cad268..28bfc37f90 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.message.MessageNormalFragment; /** @@ -15,9 +15,9 @@ public class MessageInviteActivity extends NormalActivity { public static Intent getIntent(Context context, String messageType, String outerInfo, String entrance) { Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_MESSAGE_TYPE, messageType); - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); - bundle.putString(EntranceUtils.KEY_OUTER_INFO, outerInfo); + bundle.putString(EntranceConsts.KEY_MESSAGE_TYPE, messageType); + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance); + bundle.putString(EntranceConsts.KEY_OUTER_INFO, outerInfo); return getTargetIntent(context, MessageInviteActivity.class, MessageNormalFragment.class, bundle); } } diff --git a/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java b/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java index 113c47b872..afbb8161ad 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.message.KeFuFragment; /** @@ -20,7 +20,7 @@ public class MessageKeFuActivity extends NormalActivity { public static Intent getIntent(Context context, String entrance) { Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance); return getTargetIntent(context, MessageKeFuActivity.class, KeFuFragment.class, bundle); } } diff --git a/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java b/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java index 28bbe3ccd3..2467273265 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.message.MessageNormalFragment; /** @@ -15,9 +15,9 @@ public class MessageVoteActivity extends NormalActivity { public static Intent getIntent(Context context, String messageType, String outerInfo, String entrance) { Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); - bundle.putString(EntranceUtils.KEY_MESSAGE_TYPE, messageType); - bundle.putString(EntranceUtils.KEY_OUTER_INFO, outerInfo); + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance); + bundle.putString(EntranceConsts.KEY_MESSAGE_TYPE, messageType); + bundle.putString(EntranceConsts.KEY_OUTER_INFO, outerInfo); return getTargetIntent(context, MessageVoteActivity.class, MessageNormalFragment.class, bundle); } } diff --git a/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt b/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt index 4604b97e1d..594815236a 100644 --- a/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt @@ -19,6 +19,9 @@ import android.widget.ScrollView import android.widget.TextView import com.gh.base.ToolBarActivity import com.gh.common.util.* +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.utils.tryCatchInRelease +import com.gh.gamecenter.common.utils.DeviceUtils import com.gh.gamecenter.retrofit.Response import io.reactivex.Observable import io.reactivex.ObservableOnSubscribe diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 401b4ed487..9e4ec4549e 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -24,25 +24,25 @@ import androidx.recyclerview.widget.RecyclerView; import com.ethanhua.skeleton.Skeleton; import com.ethanhua.skeleton.ViewSkeletonScreen; -import com.gh.base.OnRequestCallBackListener; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; import com.gh.base.ToolBarActivity; import com.gh.common.filter.RegionSettingHelper; import com.gh.common.history.HistoryHelper; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; -import com.gh.common.util.ClickUtils; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.utils.ClickUtils; import com.gh.common.util.CollectionUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DetailDownloadUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.ExtensionsKt; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.NewLogUtils; import com.gh.common.util.ShareUtils; -import com.gh.common.view.FixLinearLayoutManager; -import com.gh.common.view.VerticalItemDecoration; +import com.gh.gamecenter.common.view.FixLinearLayoutManager; +import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.download.DownloadManager; import com.gh.gamecenter.adapter.viewholder.DetailViewHolder; import com.gh.gamecenter.entity.GameEntity; @@ -175,7 +175,7 @@ public class NewsDetailActivity extends ToolBarActivity implements OnClickListen } else { Intent intent = new Intent(context, NewsDetailActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance); intent.putExtra(NewsEntity.TAG, newsEntity); context.startActivity(intent); } @@ -193,7 +193,7 @@ public class NewsDetailActivity extends ToolBarActivity implements OnClickListen } else { Intent intent = new Intent(context, NewsDetailActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance); intent.putExtra(NewsEntity.TAG, newsEntity); intent.putExtra(KEY_COLLECTIONNEWS, true); context.startActivity(intent); @@ -204,17 +204,17 @@ public class NewsDetailActivity extends ToolBarActivity implements OnClickListen @NonNull public static Intent getIntentById(Context context, String newsId, boolean isCollectionNews, String entrance) { Intent intent = new Intent(context, NewsDetailActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance); intent.putExtra(KEY_COLLECTIONNEWS, isCollectionNews); - intent.putExtra(EntranceUtils.KEY_NEWSID, newsId); + intent.putExtra(EntranceConsts.KEY_NEWSID, newsId); return intent; } @NonNull public static Intent getIntentById(Context context, String newsId, String entrance) { Intent intent = new Intent(context, NewsDetailActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); - intent.putExtra(EntranceUtils.KEY_NEWSID, newsId); + intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance); + intent.putExtra(EntranceConsts.KEY_NEWSID, newsId); return intent; } @@ -256,7 +256,7 @@ public class NewsDetailActivity extends ToolBarActivity implements OnClickListen mDetailRv.setLayoutManager(new FixLinearLayoutManager(this)); mDetailRv.addItemDecoration(new VerticalItemDecoration(this, 8, false)); - mHideUselessInfo = getIntent().getBooleanExtra(EntranceUtils.KEY_HIDE_USELESS_INFO, false); + mHideUselessInfo = getIntent().getBooleanExtra(EntranceConsts.KEY_HIDE_USELESS_INFO, false); setToolbarMenu(R.menu.menu_news_detail); mNewsShare = getMenuItem(R.id.menu_share); @@ -271,7 +271,7 @@ public class NewsDetailActivity extends ToolBarActivity implements OnClickListen adapter = new NewsDetailAdapter(this, this, mHideUselessInfo, mEntrance); mDetailRv.setAdapter(adapter); - newsId = getIntent().getStringExtra(EntranceUtils.KEY_NEWSID); + newsId = getIntent().getStringExtra(EntranceConsts.KEY_NEWSID); mIsCollectionNews = getIntent().getBooleanExtra(KEY_COLLECTIONNEWS, false); if (newsId == null) { diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index e956b7ff2a..04eaff4f3a 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -5,7 +5,7 @@ import android.content.Intent; import android.os.Bundle; import androidx.annotation.NonNull; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.halo.assistant.fragment.game.GameNewsSearchResultFragment; /** @@ -18,10 +18,10 @@ public class NewsSearchActivity extends NormalActivity { @NonNull public static Intent getIntent(Context context, String gameName, String searchKey, String gameId, String entrance) { Bundle args = new Bundle(); - args.putString(EntranceUtils.KEY_GAMENAME, gameName); - args.putString(EntranceUtils.KEY_SEARCHKEY, searchKey); - args.putString(EntranceUtils.KEY_GAMEID, gameId); - args.putString(EntranceUtils.KEY_ENTRANCE, entrance); + args.putString(EntranceConsts.KEY_GAMENAME, gameName); + args.putString(EntranceConsts.KEY_SEARCHKEY, searchKey); + args.putString(EntranceConsts.KEY_GAMEID, gameId); + args.putString(EntranceConsts.KEY_ENTRANCE, entrance); return getTargetIntent(context, NewsSearchActivity.class, GameNewsSearchResultFragment.class, args); } diff --git a/app/src/main/java/com/gh/gamecenter/NormalActivity.java b/app/src/main/java/com/gh/gamecenter/NormalActivity.java index 490774afbc..8287306d47 100644 --- a/app/src/main/java/com/gh/gamecenter/NormalActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NormalActivity.java @@ -8,7 +8,7 @@ import android.view.MenuItem; import android.view.MotionEvent; import com.gh.base.ToolBarActivity; -import com.gh.gamecenter.normal.NormalFragment; +import com.gh.gamecenter.common.base.fragment.NormalFragment; import androidx.fragment.app.Fragment; diff --git a/app/src/main/java/com/gh/gamecenter/QaActivity.kt b/app/src/main/java/com/gh/gamecenter/QaActivity.kt index d0818a689c..c6ade3e8d9 100644 --- a/app/src/main/java/com/gh/gamecenter/QaActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/QaActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.help.HelpContainerFragment class QaActivity : NormalActivity() { @@ -16,9 +16,9 @@ class QaActivity : NormalActivity() { */ fun getIntent(context: Context, navigationTitle: String, qaId: String? = null, qaCollectionId: String? = null): Intent { val args = Bundle() - args.putString(EntranceUtils.KEY_QA_ID, qaId) - args.putString(EntranceUtils.KEY_QA_COLLECTION_ID, qaCollectionId) - args.putString(EntranceUtils.KEY_NAVIGATION_TITLE, navigationTitle) + args.putString(EntranceConsts.KEY_QA_ID, qaId) + args.putString(EntranceConsts.KEY_QA_COLLECTION_ID, qaCollectionId) + args.putString(EntranceConsts.KEY_NAVIGATION_TITLE, navigationTitle) return getTargetIntent(context, QaActivity::class.java, HelpContainerFragment::class.java, args) } } diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt index aef681a248..d2b03c1d34 100644 --- a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt @@ -16,6 +16,9 @@ import androidx.core.widget.doOnTextChanged import com.gh.base.BaseActivity import com.gh.common.util.* import com.gh.gamecenter.DisplayType.* +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.TextHelper import com.gh.gamecenter.db.SearchHistoryDao import com.gh.gamecenter.eventbus.EBSearch import com.gh.gamecenter.search.SearchDefaultFragment @@ -48,7 +51,7 @@ open class SearchActivity : BaseActivity() { override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) outState.putInt(KEY_DISPLAY_TYPE, mDisplayType.value) - outState.putString(EntranceUtils.KEY_SEARCHKEY, mSearchKey) + outState.putString(EntranceConsts.KEY_SEARCHKEY, mSearchKey) outState.putString(KEY_SEARCH_TYPE, mSearchType.value) } @@ -65,7 +68,7 @@ open class SearchActivity : BaseActivity() { deleteIv = findViewById(R.id.deleteIv) backBtn = findViewById(R.id.backBtn) - val hint = intent.getStringExtra(EntranceUtils.KEY_HINT) + val hint = intent.getStringExtra(EntranceConsts.KEY_HINT) val searchImmediately = intent.getBooleanExtra(KEY_SEARCH_IMMEDIATELY, false) var ignoreTextChanges = savedInstanceState != null @@ -271,8 +274,8 @@ open class SearchActivity : BaseActivity() { fun getIntent(context: Context, searchImmediately: Boolean, hint: String, entrance: String): Intent { val intent = Intent(context, SearchActivity::class.java) intent.putExtra(KEY_SEARCH_IMMEDIATELY, searchImmediately) - intent.putExtra(EntranceUtils.KEY_HINT, hint) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance) + intent.putExtra(EntranceConsts.KEY_HINT, hint) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.kt b/app/src/main/java/com/gh/gamecenter/SettingActivity.kt index 30e6d45baf..4419b50fe5 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.halo.assistant.fragment.SettingsFragment class SettingActivity : NormalActivity() { @@ -13,8 +13,8 @@ class SettingActivity : NormalActivity() { context, SettingActivity::class.java, SettingsFragment::class.java, Bundle().apply { - putString(EntranceUtils.KEY_ENTRANCE, entrance) - putBoolean(EntranceUtils.KEY_VERSION_UPDATE, isUpdate) + putString(EntranceConsts.KEY_ENTRANCE, entrance) + putBoolean(EntranceConsts.KEY_VERSION_UPDATE, isUpdate) } ) } diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java index e03749b504..bf345dda3b 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java @@ -19,8 +19,8 @@ import androidx.core.content.ContextCompat; import com.facebook.drawee.view.SimpleDraweeView; import com.gh.base.ToolBarActivity; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.ImageUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.common.util.MessageShareUtils; import com.gh.common.util.QRCodeUtils; import com.gh.gamecenter.entity.ConcernEntity; @@ -51,14 +51,14 @@ public class ShareCardActivity extends ToolBarActivity { public static Intent getIntent(Context context, ConcernEntity concernEntity, String shareContent) { Intent intent = new Intent(context, ShareCardActivity.class); Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_GAMENAME, concernEntity.getGameName()); - bundle.putString(EntranceUtils.KEY_GAME_ICON_URL, concernEntity.getGameIcon()); - bundle.putString(EntranceUtils.KEY_SHARECONTENT, shareContent); + bundle.putString(EntranceConsts.KEY_GAMENAME, concernEntity.getGameName()); + bundle.putString(EntranceConsts.KEY_GAME_ICON_URL, concernEntity.getGameIcon()); + bundle.putString(EntranceConsts.KEY_SHARECONTENT, shareContent); if (concernEntity.getLink() == null) { - bundle.putString(EntranceUtils.KEY_NEWSID, concernEntity.getId()); + bundle.putString(EntranceConsts.KEY_NEWSID, concernEntity.getId()); } intent.putExtras(bundle); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(资讯:关注[2-4])"); + intent.putExtra(EntranceConsts.KEY_ENTRANCE, "(资讯:关注[2-4])"); return intent; } @@ -80,10 +80,10 @@ public class ShareCardActivity extends ToolBarActivity { mShareBottomLl = findViewById(R.id.sharecard_bottom); Bundle extras = getIntent().getExtras(); - gameName = extras.getString(EntranceUtils.KEY_GAMENAME); - gameIconUrl = extras.getString(EntranceUtils.KEY_GAME_ICON_URL); - shareContent = extras.getString(EntranceUtils.KEY_SHARECONTENT); - newsId = extras.getString(EntranceUtils.KEY_NEWSID); + gameName = extras.getString(EntranceConsts.KEY_GAMENAME); + gameIconUrl = extras.getString(EntranceConsts.KEY_GAME_ICON_URL); + shareContent = extras.getString(EntranceConsts.KEY_SHARECONTENT); + newsId = extras.getString(EntranceConsts.KEY_NEWSID); picName = "shareImg.jpg"; diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java index 2e89cff6f3..93ed8eb1ce 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java @@ -27,11 +27,11 @@ import com.facebook.drawee.interfaces.DraweeController; import com.facebook.drawee.view.SimpleDraweeView; import com.facebook.imagepipeline.image.ImageInfo; import com.gh.base.ToolBarActivity; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.ImageUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.common.util.MessageShareUtils; import com.gh.common.util.QRCodeUtils; -import com.gh.common.util.StringUtils; +import com.gh.gamecenter.core.utils.StringUtils; import com.gh.gamecenter.entity.ConcernEntity; import com.gh.gamecenter.retrofit.ObservableUtil; @@ -91,17 +91,17 @@ public class ShareCardPicActivity extends ToolBarActivity { Intent intent = new Intent(context, ShareCardPicActivity.class); Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_GAMENAME, concernEntity.getGameName()); - bundle.putString(EntranceUtils.KEY_GAME_ICON_URL, concernEntity.getGameIcon()); - bundle.putString(EntranceUtils.KEY_SHARECONTENT, shareContent); + bundle.putString(EntranceConsts.KEY_GAMENAME, concernEntity.getGameName()); + bundle.putString(EntranceConsts.KEY_GAME_ICON_URL, concernEntity.getGameIcon()); + bundle.putString(EntranceConsts.KEY_SHARECONTENT, shareContent); if (concernEntity.getLink() == null) { - bundle.putString(EntranceUtils.KEY_NEWSID, concernEntity.getId()); + bundle.putString(EntranceConsts.KEY_NEWSID, concernEntity.getId()); } if (concernEntity.getImg() != null && concernEntity.getImg().size() > 0) { bundle.putStringArrayList(KEY_SHARE_ARRIMG, (ArrayList) concernEntity.getImg()); } intent.putExtras(bundle); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString(entrance, "+(消息详情[", concernEntity.getGameName(), "])")); + intent.putExtra(EntranceConsts.KEY_ENTRANCE, StringUtils.buildString(entrance, "+(消息详情[", concernEntity.getGameName(), "])")); context.startActivity(intent); } @@ -117,10 +117,10 @@ public class ShareCardPicActivity extends ToolBarActivity { initView(); Bundle extras = getIntent().getExtras(); - gameName = extras.getString(EntranceUtils.KEY_GAMENAME); - gameIconUrl = extras.getString(EntranceUtils.KEY_GAME_ICON_URL); - shareContent = extras.getString(EntranceUtils.KEY_SHARECONTENT); - newsId = extras.getString(EntranceUtils.KEY_NEWSID); + gameName = extras.getString(EntranceConsts.KEY_GAMENAME); + gameIconUrl = extras.getString(EntranceConsts.KEY_GAME_ICON_URL); + shareContent = extras.getString(EntranceConsts.KEY_SHARECONTENT); + newsId = extras.getString(EntranceConsts.KEY_NEWSID); List arrImg = extras.getStringArrayList(KEY_SHARE_ARRIMG); picName = "shareImgPic.jpg"; diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java index 6a4c30696b..151ddeec6a 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java @@ -12,9 +12,9 @@ import android.widget.TextView; import androidx.annotation.NonNull; import com.gh.base.ToolBarActivity; -import com.gh.common.util.ExtensionsKt; import com.gh.common.util.MessageShareUtils; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.QRCodeUtils; import com.gh.common.util.ShareUtils; import com.tencent.tauth.Tencent; diff --git a/app/src/main/java/com/gh/gamecenter/ShellActivity.kt b/app/src/main/java/com/gh/gamecenter/ShellActivity.kt index 1bd90e3061..a31e0db3a7 100644 --- a/app/src/main/java/com/gh/gamecenter/ShellActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/ShellActivity.kt @@ -5,8 +5,8 @@ import android.content.Intent import android.os.Bundle import android.os.Parcelable import com.gh.base.ToolBarActivity -import com.gh.base.fragment.BaseFragment -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.base.fragment.BaseFragment +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.amway.AmwaySuccessFragment import com.halo.assistant.fragment.SwitchInstallMethodFragment import com.halo.assistant.fragment.user.ManuallyRealNameFragment @@ -33,7 +33,7 @@ class ShellActivity : ToolBarActivity() { Type.AMWAY_SUCCESS -> startFragment(AmwaySuccessFragment().with(bundle)) Type.SWITCH_INSTALL_METHOD -> startFragment(SwitchInstallMethodFragment()) Type.REAL_NAME_INFO -> startFragment(RealNameInfoFragment().with(bundle)) - Type.MANUALLY_REAL_NAME -> startFragment(ManuallyRealNameFragment().with(bundle?.getBundle(EntranceUtils.KEY_DATA))) + Type.MANUALLY_REAL_NAME -> startFragment(ManuallyRealNameFragment().with(bundle?.getBundle(EntranceConsts.KEY_DATA))) } } @@ -51,7 +51,7 @@ class ShellActivity : ToolBarActivity() { fun getIntent(context: Context, type: Type, extraParcelable: Parcelable? = null): Intent { val intent = Intent(context, ShellActivity::class.java) intent.putExtra(INTENT_TYPE, type.value) - intent.putExtra(EntranceUtils.KEY_DATA, extraParcelable) + intent.putExtra(EntranceConsts.KEY_DATA, extraParcelable) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/SingletonWebActivity.kt b/app/src/main/java/com/gh/gamecenter/SingletonWebActivity.kt index 50daa3aca6..41f4e53d7c 100644 --- a/app/src/main/java/com/gh/gamecenter/SingletonWebActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SingletonWebActivity.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter import android.content.Intent -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.halo.assistant.fragment.WebFragment class SingletonWebActivity : WebActivity() { @@ -9,12 +9,14 @@ class SingletonWebActivity : WebActivity() { override fun onNewIntent(intent: Intent?) { super.onNewIntent(intent) - if (intent?.extras?.getString(EntranceUtils.KEY_URL) - == targetFragment.arguments?.getString(EntranceUtils.KEY_URL)) { + if (intent?.extras?.getString(EntranceConsts.KEY_URL) + == targetFragment.arguments?.getString(EntranceConsts.KEY_URL)) { // 同样的地址，不理会 } else { if (targetFragment is WebFragment) { - targetFragment.arguments?.putString(EntranceUtils.KEY_URL, intent?.extras?.getString(EntranceUtils.KEY_URL)) + targetFragment.arguments?.putString( + EntranceConsts.KEY_URL, intent?.extras?.getString( + EntranceConsts.KEY_URL)) (targetFragment as WebFragment).reload() } } diff --git a/app/src/main/java/com/gh/gamecenter/SkipActivity.java b/app/src/main/java/com/gh/gamecenter/SkipActivity.java index 1f81b69921..946c246e22 100644 --- a/app/src/main/java/com/gh/gamecenter/SkipActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SkipActivity.java @@ -1,5 +1,44 @@ package com.gh.gamecenter; +import static com.gh.gamecenter.common.constant.EntranceConsts.ENTRANCE_BROWSER; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_ANSWER; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_ARTICLE; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_CATEGORY; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_COLUMN; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_COLUMN_COLLECTION; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_COMMUNITY; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_COMMUNITY_COLUMN; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_COMMUNITY_COLUMN_DETAIL; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_COMMUNITY_QUESTION_LABEL_DETAIL; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_DOWNLOAD; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_GAME; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_GAME_COLLECTION_DETAIL; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_GAME_COLLECTION_SQUARE; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_LIBAO; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_QQ; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_QQ_GROUP; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_QQ_QUN; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_QUESTION; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_SUGGESTION; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_TOOLBOX; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_UPLOAD_VIDEO; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_USERHOME; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_VIDEO; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_VIDEO_COLLECTION; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_VIDEO_MORE; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_VIDEO_SINGLE; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_VIDEO_STREAMING_DESC; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_VIDEO_STREAMING_HOME; +import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_WEB; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_DATA; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_GAME_NAME; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_NAME; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_PACKAGENAME; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_PLATFORM; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_TO; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_TYPE; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_VERSION; + import android.content.Intent; import android.net.Uri; import android.os.Bundle; @@ -9,10 +48,11 @@ import android.util.Base64; import com.gh.base.BaseActivity; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DirectUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.common.util.EntranceUtils; -import com.gh.common.util.GsonUtils; import com.gh.common.util.PlatformUtils; -import com.gh.common.util.RunningUtils; +import com.gh.gamecenter.core.utils.GsonUtils; +import com.gh.gamecenter.core.utils.RunningUtils; import com.gh.gamecenter.entity.CommunityEntity; import com.gh.gamecenter.entity.LinkEntity; import com.gh.gamecenter.entity.SimpleGameEntity; @@ -24,45 +64,6 @@ import com.gh.gamecenter.video.videomanager.VideoManagerActivity; import com.lightgame.config.CommonDebug; import com.lightgame.utils.Utils; -import static com.gh.common.util.EntranceUtils.ENTRANCE_BROWSER; -import static com.gh.common.util.EntranceUtils.HOST_ANSWER; -import static com.gh.common.util.EntranceUtils.HOST_ARTICLE; -import static com.gh.common.util.EntranceUtils.HOST_CATEGORY; -import static com.gh.common.util.EntranceUtils.HOST_COLUMN; -import static com.gh.common.util.EntranceUtils.HOST_COLUMN_COLLECTION; -import static com.gh.common.util.EntranceUtils.HOST_COMMUNITY; -import static com.gh.common.util.EntranceUtils.HOST_COMMUNITY_COLUMN; -import static com.gh.common.util.EntranceUtils.HOST_COMMUNITY_COLUMN_DETAIL; -import static com.gh.common.util.EntranceUtils.HOST_COMMUNITY_QUESTION_LABEL_DETAIL; -import static com.gh.common.util.EntranceUtils.HOST_DOWNLOAD; -import static com.gh.common.util.EntranceUtils.HOST_GAME; -import static com.gh.common.util.EntranceUtils.HOST_GAME_COLLECTION_DETAIL; -import static com.gh.common.util.EntranceUtils.HOST_GAME_COLLECTION_SQUARE; -import static com.gh.common.util.EntranceUtils.HOST_LIBAO; -import static com.gh.common.util.EntranceUtils.HOST_QQ; -import static com.gh.common.util.EntranceUtils.HOST_QQ_GROUP; -import static com.gh.common.util.EntranceUtils.HOST_QQ_QUN; -import static com.gh.common.util.EntranceUtils.HOST_QUESTION; -import static com.gh.common.util.EntranceUtils.HOST_SUGGESTION; -import static com.gh.common.util.EntranceUtils.HOST_TOOLBOX; -import static com.gh.common.util.EntranceUtils.HOST_UPLOAD_VIDEO; -import static com.gh.common.util.EntranceUtils.HOST_USERHOME; -import static com.gh.common.util.EntranceUtils.HOST_VIDEO; -import static com.gh.common.util.EntranceUtils.HOST_VIDEO_COLLECTION; -import static com.gh.common.util.EntranceUtils.HOST_VIDEO_MORE; -import static com.gh.common.util.EntranceUtils.HOST_VIDEO_SINGLE; -import static com.gh.common.util.EntranceUtils.HOST_VIDEO_STREAMING_DESC; -import static com.gh.common.util.EntranceUtils.HOST_VIDEO_STREAMING_HOME; -import static com.gh.common.util.EntranceUtils.HOST_WEB; -import static com.gh.common.util.EntranceUtils.KEY_DATA; -import static com.gh.common.util.EntranceUtils.KEY_GAME_NAME; -import static com.gh.common.util.EntranceUtils.KEY_NAME; -import static com.gh.common.util.EntranceUtils.KEY_PACKAGENAME; -import static com.gh.common.util.EntranceUtils.KEY_PLATFORM; -import static com.gh.common.util.EntranceUtils.KEY_TO; -import static com.gh.common.util.EntranceUtils.KEY_TYPE; -import static com.gh.common.util.EntranceUtils.KEY_VERSION; - /** * Created by LGT on 2016/11/16. * 链接跳转用 @@ -112,9 +113,9 @@ public class SkipActivity extends BaseActivity { case HOST_SUGGESTION: String platform = uri.getQueryParameter(KEY_PLATFORM); String platformName = PlatformUtils.getInstance(this).getPlatformName(platform); - String gameId = uri.getQueryParameter(EntranceUtils.KEY_GAMEID); - String packageMd5 = uri.getQueryParameter(EntranceUtils.KEY_PACKAGE_MD5); - String isQaFeedbackString = uri.getQueryParameter(EntranceUtils.KEY_IS_QA_FEEDBACK); + String gameId = uri.getQueryParameter(EntranceConsts.KEY_GAMEID); + String packageMd5 = uri.getQueryParameter(EntranceConsts.KEY_PACKAGE_MD5); + String isQaFeedbackString = uri.getQueryParameter(EntranceConsts.KEY_IS_QA_FEEDBACK); boolean isQaFeedback = !TextUtils.isEmpty(isQaFeedbackString) && isQaFeedbackString.equals("true"); String content = (TextUtils.isEmpty(gameId) || TextUtils.isEmpty(packageMd5)) ? String.format("%s-%s-V%s，", @@ -126,12 +127,12 @@ public class SkipActivity extends BaseActivity { TextUtils.isEmpty(platformName) ? platform : platformName, uri.getQueryParameter(KEY_VERSION), gameId, packageMd5); String qaId = uri.getQueryParameter("qa_id"); - String qaContentId = uri.getQueryParameter(EntranceUtils.KEY_QA_CONTENT_ID); - String qaTitle = uri.getQueryParameter(EntranceUtils.KEY_QA_TITLE); + String qaContentId = uri.getQueryParameter(EntranceConsts.KEY_QA_CONTENT_ID); + String qaTitle = uri.getQueryParameter(EntranceConsts.KEY_QA_TITLE); if (!TextUtils.isEmpty(qaId)) { DirectUtils.directToQa(this, qaTitle, qaId); } else { - DirectUtils.directToFeedback(this, content, null, isQaFeedback, qaContentId, EntranceUtils.ENTRANCE_BROWSER); + DirectUtils.directToFeedback(this, content, null, isQaFeedback, qaContentId, EntranceConsts.ENTRANCE_BROWSER); } break; case HOST_DOWNLOAD: @@ -204,9 +205,9 @@ public class SkipActivity extends BaseActivity { VideoLinkEntity linkEntity = new VideoLinkEntity(title, categoryId, link, tagActivityId, tagActivityName); SimpleGameEntity simpleGameEntity = new SimpleGameEntity(gameId != null ? gameId : "", gameName != null ? gameName : "", ""); - Bundle nextToBundle = VideoManagerActivity.getVideoManagerBundle(linkEntity, simpleGameEntity, EntranceUtils.ENTRANCE_BROWSER, ""); - CheckLoginUtils.checkLogin(this, nextToBundle, true, EntranceUtils.ENTRANCE_BROWSER, () -> - DirectUtils.directToVideoManager(SkipActivity.this, linkEntity, simpleGameEntity, EntranceUtils.ENTRANCE_BROWSER, "浏览器")); + Bundle nextToBundle = VideoManagerActivity.getVideoManagerBundle(linkEntity, simpleGameEntity, EntranceConsts.ENTRANCE_BROWSER, ""); + CheckLoginUtils.checkLogin(this, nextToBundle, true, EntranceConsts.ENTRANCE_BROWSER, () -> + DirectUtils.directToVideoManager(SkipActivity.this, linkEntity, simpleGameEntity, EntranceConsts.ENTRANCE_BROWSER, "浏览器")); break; case HOST_VIDEO_SINGLE: DirectUtils.directToVideoDetail(this, path, VideoDetailContainerViewModel.Location.SINGLE_VIDEO.getValue(), @@ -277,7 +278,7 @@ public class SkipActivity extends BaseActivity { bundle.putString(KEY_TYPE, type); EntranceUtils.jumpActivity(this, bundle); break; - case EntranceUtils.HOST_VIDEO_DETAIL: + case EntranceConsts.HOST_VIDEO_DETAIL: DirectUtils.directToVideoDetail(this, path, ENTRANCE_BROWSER, ""); break; case HOST_LIBAO: @@ -318,7 +319,7 @@ public class SkipActivity extends BaseActivity { columnId = uri.getQueryParameter("column_id"); DirectUtils.directAskColumnDetail(this, columnId, community, ENTRANCE_BROWSER, "浏览器"); break; - case EntranceUtils.HOST_BLOCK: + case EntranceConsts.HOST_BLOCK: name = uri.getQueryParameter("name"); SubjectRecommendEntity entity = new SubjectRecommendEntity(); entity.setLink(path); @@ -327,31 +328,31 @@ public class SkipActivity extends BaseActivity { DirectUtils.directToBlock(this, entity, mEntrance); break; - case EntranceUtils.HOST_SERVER_BLOCK: + case EntranceConsts.HOST_SERVER_BLOCK: DirectUtils.directToGameServers(this, ENTRANCE_BROWSER, "浏览器"); break; - case EntranceUtils.HOST_AMWAY_BLOCK: + case EntranceConsts.HOST_AMWAY_BLOCK: DirectUtils.directToAmway(this, null, ENTRANCE_BROWSER, "浏览器"); break; - case EntranceUtils.HOST_HELP: + case EntranceConsts.HOST_HELP: name = uri.getQueryParameter("name"); DirectUtils.directToQa(this, name, path); break; - case EntranceUtils.HOST_HELP_COLLECTION: + case EntranceConsts.HOST_HELP_COLLECTION: name = uri.getQueryParameter("name"); DirectUtils.directToQaCollection(this, name, path); break; - case EntranceUtils.HOST_GAME_UPLOAD: + case EntranceConsts.HOST_GAME_UPLOAD: DirectUtils.directGameUpload(this, ENTRANCE_BROWSER, "浏览器"); break; - case EntranceUtils.HOST_GAME_ZONE: + case EntranceConsts.HOST_GAME_ZONE: String zoneUrl = uri.getQueryParameter("url"); DirectUtils.directGameZone(this, path, zoneUrl, ENTRANCE_BROWSER); break; - case EntranceUtils.HOST_LINK: + case EntranceConsts.HOST_LINK: try { String dataString = uri.getQueryParameter("data"); if (!TextUtils.isEmpty(dataString)) { @@ -365,30 +366,30 @@ public class SkipActivity extends BaseActivity { toast(e.getMessage()); } break; - case EntranceUtils.HOST_GAME_NEWS: + case EntranceConsts.HOST_GAME_NEWS: DirectUtils.directToGameNews( this, - uri.getQueryParameter(EntranceUtils.KEY_GAME_ID), - uri.getQueryParameter(EntranceUtils.KEY_GAME_NAME), - EntranceUtils.ENTRANCE_BROWSER); + uri.getQueryParameter(EntranceConsts.KEY_GAME_ID), + uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME), + EntranceConsts.ENTRANCE_BROWSER); break; - case EntranceUtils.HOST_GAME_CALENDAR: - DirectUtils.directToGameServerCalendar(this, uri.getQueryParameter(EntranceUtils.KEY_GAME_ID)); + case EntranceConsts.HOST_GAME_CALENDAR: + DirectUtils.directToGameServerCalendar(this, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID)); break; - case EntranceUtils.HOST_HISTORY_APK: - DirectUtils.directToHistoryApk(this, uri.getQueryParameter(EntranceUtils.KEY_GAME_ID)); + case EntranceConsts.HOST_HISTORY_APK: + DirectUtils.directToHistoryApk(this, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID)); break; - case EntranceUtils.HOST_FORUM_DETAIL: + case EntranceConsts.HOST_FORUM_DETAIL: DirectUtils.directForumDetail(this, id, ENTRANCE_BROWSER); break; - case EntranceUtils.HOST_GAME_RATING_DETAIL: - DirectUtils.directToGameRatingDetail(this, uri.getQueryParameter(EntranceUtils.KEY_GAME_ID), uri.getQueryParameter(EntranceUtils.KEY_COMMENT_ID), ENTRANCE_BROWSER); + case EntranceConsts.HOST_GAME_RATING_DETAIL: + DirectUtils.directToGameRatingDetail(this, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID), uri.getQueryParameter(EntranceConsts.KEY_COMMENT_ID), ENTRANCE_BROWSER); break; - case EntranceUtils.HOST_FORUM: + case EntranceConsts.HOST_FORUM: position = uri.getQueryParameter("position"); DirectUtils.directToForum(this, TextUtils.isEmpty(position) ? 0 : Integer.parseInt(position)); break; - case EntranceUtils.HOST_HELP_AND_FEEDBACK: + case EntranceConsts.HOST_HELP_AND_FEEDBACK: position = uri.getQueryParameter("position"); DirectUtils.directToHelpAndFeedback(this, TextUtils.isEmpty(position) ? 0 : Integer.parseInt(position)); break; @@ -414,7 +415,7 @@ public class SkipActivity extends BaseActivity { if (host != null) { if ("details".equals(host)) { bundle = new Bundle(); - bundle.putString(KEY_TO, EntranceUtils.KEY_MARKET_DETAILS); + bundle.putString(KEY_TO, EntranceConsts.KEY_MARKET_DETAILS); bundle.putString(KEY_DATA, id); EntranceUtils.jumpActivity(this, bundle); } else { diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index 82a88d201b..884ed90f5d 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -22,27 +22,27 @@ import androidx.viewpager.widget.ViewPager; import com.g00fy2.versioncompare.Version; import com.gh.base.BaseActivity; -import com.gh.common.AppExecutor; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.AppExecutor; import com.gh.common.constant.Config; -import com.gh.common.constant.Constants; +import com.gh.gamecenter.common.constant.Constants; import com.gh.common.dialog.PrivacyDialogFragment; import com.gh.common.tracker.TrackerLogger; import com.gh.common.util.AdHelper; import com.gh.common.util.DeviceTokenUtils; -import com.gh.common.util.DeviceUtils; -import com.gh.common.util.DialogHelper; +import com.gh.gamecenter.common.utils.DeviceUtils; +import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.common.util.DialogUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.PackageFlavorHelper; -import com.gh.common.util.ExtensionsKt; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.utils.PackageFlavorHelper; import com.gh.common.util.GameSubstituteRepositoryHelper; -import com.gh.common.util.GsonUtils; +import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.common.util.LunchType; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.PackageUtils; import com.gh.common.util.PlatformUtils; -import com.gh.common.util.SPUtils; -import com.gh.common.util.SimpleCallback; +import com.gh.gamecenter.core.utils.SPUtils; +import com.gh.gamecenter.common.callback.SimpleCallback; import com.gh.common.util.TagUtils; import com.gh.common.util.UsageStatsHelper; import com.gh.download.DownloadManager; diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 47eaefcbad..2602a7409e 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -33,34 +33,34 @@ import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.gh.base.OnListClickListener; -import com.gh.base.OnRequestCallBackListener; +import com.gh.gamecenter.common.callback.OnListClickListener; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; import com.gh.base.ToolBarActivity; -import com.gh.base.fragment.WaitingDialogFragment; -import com.gh.common.AppExecutor; -import com.gh.common.dialog.TrackableDialog; -import com.gh.common.exposure.meta.MetaUtil; +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment; +import com.gh.gamecenter.core.AppExecutor; +import com.gh.gamecenter.common.base.TrackableDialog; +import com.gh.gamecenter.common.exposure.meta.MetaUtil; import com.gh.common.filter.RegionSettingHelper; import com.gh.common.util.AdHelper; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; -import com.gh.common.util.DialogHelper; +import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.common.util.DirectUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.GsonUtils; -import com.gh.common.util.ImageUtils; -import com.gh.common.util.MtaHelper; -import com.gh.common.util.NetworkUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.core.utils.GsonUtils; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.common.utils.NetworkUtils; import com.gh.common.util.NotificationHelper; import com.gh.common.util.PackageUtils; import com.gh.common.util.ShareUtils; -import com.gh.common.util.TextHelper; -import com.gh.common.util.TimeUtils; -import com.gh.common.util.ToastUtils; +import com.gh.gamecenter.common.utils.TextHelper; +import com.gh.gamecenter.core.utils.TimeUtils; +import com.gh.gamecenter.core.utils.ToastUtils; import com.gh.common.util.UploadImageUtils; -import com.gh.common.util.UrlFilterUtils; -import com.gh.common.view.FixLinearLayoutManager; +import com.gh.gamecenter.core.utils.UrlFilterUtils; +import com.gh.gamecenter.common.view.FixLinearLayoutManager; import com.gh.gamecenter.entity.ErrorEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.InstallGameEntity; @@ -237,9 +237,9 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall public static Intent getIntentFromNetworkDiagnosis(Context context, String diagnosis) { Intent intent = new Intent(context, SuggestionActivity.class); - intent.putExtra(EntranceUtils.KEY_SUGGESTTYPE, SuggestType.normal); - intent.putExtra(EntranceUtils.KEY_CONTENT, "网络诊断结果" + TimeUtils.getFormatTime(System.currentTimeMillis(), "yyyy.MM.dd")); - intent.putExtra(EntranceUtils.KEY_DIAGNOSIS, diagnosis); + intent.putExtra(EntranceConsts.KEY_SUGGESTTYPE, SuggestType.normal); + intent.putExtra(EntranceConsts.KEY_CONTENT, "网络诊断结果" + TimeUtils.getFormatTime(System.currentTimeMillis(), "yyyy.MM.dd")); + intent.putExtra(EntranceConsts.KEY_DIAGNOSIS, diagnosis); return intent; } @@ -258,19 +258,19 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall ) { Intent intent = new Intent(context, SuggestionActivity.class); if (!diagnosis.isEmpty()) { - intent.putExtra(EntranceUtils.KEY_SUGGESTTYPE, SuggestType.normal); - intent.putExtra(EntranceUtils.KEY_CONTENT, "网络诊断结果" + TimeUtils.getFormatTime(System.currentTimeMillis(), "yyyy.MM.dd")); - intent.putExtra(EntranceUtils.KEY_DIAGNOSIS, diagnosis); + intent.putExtra(EntranceConsts.KEY_SUGGESTTYPE, SuggestType.normal); + intent.putExtra(EntranceConsts.KEY_CONTENT, "网络诊断结果" + TimeUtils.getFormatTime(System.currentTimeMillis(), "yyyy.MM.dd")); + intent.putExtra(EntranceConsts.KEY_DIAGNOSIS, diagnosis); } else { - intent.putExtra(EntranceUtils.KEY_SUGGESTTYPE, suggestType); - intent.putExtra(EntranceUtils.KEY_HIDE_SUGGEST_HINT, hiddenHint); - intent.putExtra(EntranceUtils.KEY_SUGGEST_HINT_TYPE, suggestHintType); - intent.putExtra(EntranceUtils.KEY_CONTENT, content); + intent.putExtra(EntranceConsts.KEY_SUGGESTTYPE, suggestType); + intent.putExtra(EntranceConsts.KEY_HIDE_SUGGEST_HINT, hiddenHint); + intent.putExtra(EntranceConsts.KEY_SUGGEST_HINT_TYPE, suggestHintType); + intent.putExtra(EntranceConsts.KEY_CONTENT, content); intent.putExtra(FROM_RATING_KEY, fromRatingKey); - intent.putExtra(EntranceUtils.KEY_PLATFORM, platform); + intent.putExtra(EntranceConsts.KEY_PLATFORM, platform); intent.putExtra(SimpleGameEntity.class.getSimpleName(), game); - intent.putExtra(EntranceUtils.KEY_IS_QA_FEEDBACK, isQaFeedback); - intent.putExtra(EntranceUtils.KEY_QA_CONTENT_ID, qaContentId); + intent.putExtra(EntranceConsts.KEY_IS_QA_FEEDBACK, isQaFeedback); + intent.putExtra(EntranceConsts.KEY_QA_CONTENT_ID, qaContentId); } return intent; } @@ -331,22 +331,22 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall Bundle extras = getIntent().getExtras(); if (extras == null) return; - Object suggestType = extras.get(EntranceUtils.KEY_SUGGESTTYPE); + Object suggestType = extras.get(EntranceConsts.KEY_SUGGESTTYPE); if (suggestType instanceof SuggestType) { mSuggestType = (SuggestType) suggestType; } else { mSuggestType = SuggestType.normal; } - mSuggestContent = extras.getString(EntranceUtils.KEY_CONTENT); - mSuggestHintType = extras.getString(EntranceUtils.KEY_SUGGEST_HINT_TYPE); - mHideHint = extras.getString(EntranceUtils.KEY_HIDE_SUGGEST_HINT, ""); - String gamePlatform = extras.getString(EntranceUtils.KEY_PLATFORM, ""); + mSuggestContent = extras.getString(EntranceConsts.KEY_CONTENT); + mSuggestHintType = extras.getString(EntranceConsts.KEY_SUGGEST_HINT_TYPE); + mHideHint = extras.getString(EntranceConsts.KEY_HIDE_SUGGEST_HINT, ""); + String gamePlatform = extras.getString(EntranceConsts.KEY_PLATFORM, ""); mFunctionTypeName = getResources().getStringArray(R.array.suggest_function_type); mGameEntity = extras.getParcelable(SimpleGameEntity.class.getSimpleName()); fromRating = extras.getBoolean(FROM_RATING_KEY, false); - isQaFeedback = extras.getBoolean(EntranceUtils.KEY_IS_QA_FEEDBACK, false); - qaContentId = extras.getString(EntranceUtils.KEY_QA_CONTENT_ID, ""); - mDiagnosisResult = extras.getString(EntranceUtils.KEY_DIAGNOSIS, ""); + isQaFeedback = extras.getBoolean(EntranceConsts.KEY_IS_QA_FEEDBACK, false); + qaContentId = extras.getString(EntranceConsts.KEY_QA_CONTENT_ID, ""); + mDiagnosisResult = extras.getString(EntranceConsts.KEY_DIAGNOSIS, ""); if (!mDiagnosisResult.isEmpty()) { mDiagnosisMessage = mSuggestContent; } @@ -407,7 +407,7 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall SettingsEntity.Suggestion typeEntity = GsonUtils.fromJson(suggestionType, SettingsEntity.Suggestion.class); if (typeEntity != null) { switch (mSuggestHintType) { - case EntranceUtils.KEY_PLUGIN: + case EntranceConsts.KEY_PLUGIN: List plugin = typeEntity.getPlugin(); if (plugin != null && plugin.size() > 0) { showHintDialog(plugin); @@ -636,7 +636,7 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall } else if (type == SuggestType.gameQuestion) { mSuggestTypeContainer.setVisibility(View.GONE); mCopyrightContainer.setVisibility(View.GONE); - if (!EntranceUtils.KEY_PLUGIN.equals(mSuggestHintType)) { + if (!EntranceConsts.KEY_PLUGIN.equals(mSuggestHintType)) { mSuggestContentEt.setHint("请描述具体遇到的问题... \n ↓↓你还可以上传截图"); mSuggestGameLl.setVisibility(View.VISIBLE); mPlatformContainer.setVisibility(View.VISIBLE); @@ -1246,7 +1246,7 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall } message = mGameInfo + "，" + typeName + "，" + content; } else if (mSuggestType == SuggestType.gameQuestion) { - if (EntranceUtils.KEY_PLUGIN.equals(mSuggestHintType)) { + if (EntranceConsts.KEY_PLUGIN.equals(mSuggestHintType)) { message = "【插件问题】" + content; } else { if (isQaFeedback && !qaContentId.isEmpty()) { diff --git a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java index 5bff6c15bf..0eb0f604af 100644 --- a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java @@ -10,13 +10,13 @@ //import android.widget.LinearLayout; //import android.widget.TextView; // -//import com.gh.base.OnRequestCallBackListener; +//import com.gh.gamecenter.common.callback.OnRequestCallBackListener; //import com.gh.base.ToolBarActivity; //import com.gh.common.util.EntranceUtils; -//import com.gh.common.util.MtaHelper; -//import com.gh.common.util.TextHelper; -//import com.gh.common.util.UrlFilterUtils; -//import com.gh.common.view.VerticalItemDecoration; +//import com.gh.gamecenter.core.utils.MtaHelper; +//import com.gh.gamecenter.common.utils.TextHelper; +//import com.gh.gamecenter.core.utils.UrlFilterUtils; +//import com.gh.gamecenter.common.view.VerticalItemDecoration; //import com.gh.gamecenter.adapter.ToolBoxRvAdapter; //import com.gh.gamecenter.entity.ToolBoxEntity; //import com.gh.gamecenter.retrofit.Response; diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt index 2df7300067..5bc2706519 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.user.UserViewModel import com.halo.assistant.fragment.user.UserInfoEditFragment @@ -25,7 +25,7 @@ class UserInfoEditActivity : NormalActivity() { ): Intent { val args = Bundle() args.putString(UserViewModel.KEY_EDIT_TYPE, editType) - args.putBoolean(EntranceUtils.KEY_IS_FORCED_TO_CERTIFICATE, isForcedToCertificate) + args.putBoolean(EntranceConsts.KEY_IS_FORCED_TO_CERTIFICATE, isForcedToCertificate) return getTargetIntent( context, UserInfoEditActivity::class.java, diff --git a/app/src/main/java/com/gh/gamecenter/VoteActivity.java b/app/src/main/java/com/gh/gamecenter/VoteActivity.java index 7dd38ed43f..2b8c16dd40 100644 --- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java @@ -5,7 +5,7 @@ import android.content.Intent; import android.os.Bundle; import androidx.annotation.NonNull; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.halo.assistant.fragment.VoteFragment; /** @@ -18,8 +18,8 @@ public class VoteActivity extends NormalActivity { @NonNull public static Intent getIntent(Context context, String gameName, String gameId) { Bundle args = new Bundle(); - args.putString(EntranceUtils.KEY_GAMENAME, gameName); - args.putString(EntranceUtils.KEY_GAMEID, gameId); + args.putString(EntranceConsts.KEY_GAMENAME, gameName); + args.putString(EntranceConsts.KEY_GAMEID, gameId); return getTargetIntent(context, VoteActivity.class, VoteFragment.class, args); } diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.kt b/app/src/main/java/com/gh/gamecenter/WebActivity.kt index 6f84ba500d..a26773272a 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.kt @@ -6,15 +6,18 @@ import android.os.Bundle import android.text.TextUtils import android.view.KeyEvent import android.view.View -import com.gh.common.constant.Constants -import com.gh.common.util.EntranceUtils -import com.gh.common.util.EnvHelper +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.EnvHelper import com.gh.common.util.IntentUtils +import com.gh.gamecenter.common.constant.RouteConsts import com.gh.gamecenter.entity.ConcernEntity import com.gh.gamecenter.entity.NewsEntity import com.gh.gamecenter.entity.ToolBoxEntity import com.halo.assistant.fragment.WebFragment +@Route(path = RouteConsts.activity.webActivity) open class WebActivity : NormalActivity() { private var mIsFullScreen = false @@ -70,8 +73,8 @@ open class WebActivity : NormalActivity() { @JvmStatic fun getWebIntentByShare(context: Context?, url: String?, showWebShare: Boolean): Intent { val bundle = Bundle() - bundle.putBoolean(EntranceUtils.KEY_WEB_SHARE, showWebShare) - bundle.putString(EntranceUtils.KEY_URL, url) + bundle.putBoolean(EntranceConsts.KEY_WEB_SHARE, showWebShare) + bundle.putString(EntranceConsts.KEY_URL, url) bundle.putBoolean(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_TITLE, true) return IntentUtils.getWebTargetIntent(context, bundle, url) } @@ -80,8 +83,8 @@ open class WebActivity : NormalActivity() { @JvmStatic fun getWebIntent(context: Context, title: String, url: String): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_GAMENAME, title) - bundle.putString(EntranceUtils.KEY_URL, url) + bundle.putString(EntranceConsts.KEY_GAMENAME, title) + bundle.putString(EntranceConsts.KEY_URL, url) return getTargetIntent(context, WebActivity::class.java, WebFragment::class.java, bundle) } @@ -90,11 +93,11 @@ open class WebActivity : NormalActivity() { fun getThirdPartySdkStatementIntent(context: Context): Intent { val bundle = Bundle() bundle.putString( - EntranceUtils.KEY_GAMENAME, + EntranceConsts.KEY_GAMENAME, context.getString(R.string.third_party_sdk_title) ) bundle.putString( - EntranceUtils.KEY_URL, + EntranceConsts.KEY_URL, context.getString(R.string.third_party_sdk_statement_url) ) return getTargetIntent( @@ -111,7 +114,7 @@ open class WebActivity : NormalActivity() { // bundle.putString(EntranceUtils.KEY_GAMENAME, context.getString(R.string.upload_game_policy_title)); bundle.putBoolean(WebFragment.KEY_COMPLETION_TITLE, true) bundle.putString( - EntranceUtils.KEY_URL, + EntranceConsts.KEY_URL, context.getString(R.string.upload_game_policy_url) ) return getTargetIntent( @@ -126,11 +129,11 @@ open class WebActivity : NormalActivity() { fun getSecurityCertificationIntent(context: Context): Intent { val bundle = Bundle() bundle.putString( - EntranceUtils.KEY_GAMENAME, + EntranceConsts.KEY_GAMENAME, context.getString(R.string.comment_security_certification) ) bundle.putString( - EntranceUtils.KEY_URL, + EntranceConsts.KEY_URL, context.getString(R.string.comment_security_certification_url) ) bundle.putBoolean(WebFragment.KEY_IS_SECURITY_CERTIFICATION, true) @@ -149,9 +152,9 @@ open class WebActivity : NormalActivity() { isCollectionTools: Boolean ): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_URL, toolBoxEntity.url) + bundle.putString(EntranceConsts.KEY_URL, toolBoxEntity.url) bundle.putBoolean(WebFragment.KEY_ISTOOLS, true) - bundle.putString(EntranceUtils.KEY_GAMENAME, toolBoxEntity.name) + bundle.putString(EntranceConsts.KEY_GAMENAME, toolBoxEntity.name) bundle.putParcelable(ToolBoxEntity.TAG, toolBoxEntity) bundle.putBoolean(WebFragment.KEY_ISCOLLECTIONTOOLS, isCollectionTools) return getTargetIntent( @@ -170,7 +173,7 @@ open class WebActivity : NormalActivity() { Constants.WECHAT_BIND_ADDRESS } val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_URL, url) + bundle.putString(EntranceConsts.KEY_URL, url) bundle.putBoolean(WebFragment.KEY_IS_BIND_WECHAT, true) bundle.putBoolean(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_BACK_PRESSED, true) return getTargetIntent( @@ -188,10 +191,10 @@ open class WebActivity : NormalActivity() { entrance: String? ): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_URL, concernEntity.link) - bundle.putString(EntranceUtils.KEY_GAMENAME, concernEntity.getGameName()) - bundle.putString(EntranceUtils.KEY_NEWSID, concernEntity.id) - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance) + bundle.putString(EntranceConsts.KEY_URL, concernEntity.link) + bundle.putString(EntranceConsts.KEY_GAMENAME, concernEntity.getGameName()) + bundle.putString(EntranceConsts.KEY_NEWSID, concernEntity.id) + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance) return getTargetIntent( context, WebActivity::class.java, @@ -203,10 +206,10 @@ open class WebActivity : NormalActivity() { @JvmStatic fun getIntentByNews(context: Context?, newsEntity: NewsEntity, entrance: String?): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_URL, newsEntity.link) - bundle.putString(EntranceUtils.KEY_GAMENAME, newsEntity.gameName) - bundle.putString(EntranceUtils.KEY_NEWSID, newsEntity.id) - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance) + bundle.putString(EntranceConsts.KEY_URL, newsEntity.link) + bundle.putString(EntranceConsts.KEY_GAMENAME, newsEntity.gameName) + bundle.putString(EntranceConsts.KEY_NEWSID, newsEntity.id) + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance) return getTargetIntent( context, WebActivity::class.java, @@ -217,7 +220,7 @@ open class WebActivity : NormalActivity() { @JvmStatic fun getIntent(context: Context?, url: String?, autoCompletionTitle: Boolean): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_URL, url) + bundle.putString(EntranceConsts.KEY_URL, url) bundle.putBoolean(WebFragment.KEY_COMPLETION_TITLE, autoCompletionTitle) bundle.putBoolean(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_TITLE, false) return IntentUtils.getWebTargetIntent(context, bundle, url) @@ -232,8 +235,8 @@ open class WebActivity : NormalActivity() { isOpenNativePage: Boolean ): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_URL, url) - bundle.putString(EntranceUtils.KEY_GAMENAME, title) + bundle.putString(EntranceConsts.KEY_URL, url) + bundle.putString(EntranceConsts.KEY_GAMENAME, title) bundle.putBoolean(WebFragment.KEY_COMPLETION_TITLE, autoCompletionTitle) bundle.putBoolean(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_TITLE, false) bundle.putBoolean(WebFragment.KEY_OPEN_NATIVE_PAGE, isOpenNativePage) @@ -250,8 +253,8 @@ open class WebActivity : NormalActivity() { qaType: Int ): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_URL, url) - bundle.putString(EntranceUtils.KEY_GAMENAME, title) + bundle.putString(EntranceConsts.KEY_URL, url) + bundle.putString(EntranceConsts.KEY_GAMENAME, title) bundle.putBoolean(WebFragment.KEY_COMPLETION_TITLE, false) bundle.putBoolean(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_TITLE, false) bundle.putBoolean(WebFragment.KEY_OPEN_NATIVE_PAGE, false) @@ -274,7 +277,7 @@ open class WebActivity : NormalActivity() { closeButton: String? ): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_URL, url) + bundle.putString(EntranceConsts.KEY_URL, url) bundle.putString(WebFragment.KEY_GAME_NAME, gameName) bundle.putBoolean(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_TITLE, true) bundle.putString(WebFragment.KEY_CLOSE_BUTTON, closeButton) diff --git a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java index 052bb3130a..59b26daf48 100644 --- a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java @@ -14,10 +14,10 @@ import androidx.annotation.NonNull; import com.gh.common.Base64ImageHolder; import com.gh.common.constant.Config; -import com.gh.common.util.BiCallback; -import com.gh.common.util.BitmapUtils; +import com.gh.gamecenter.common.callback.BiCallback; +import com.gh.gamecenter.common.utils.BitmapUtils; import com.gh.common.util.EnergyTaskHelper; -import com.gh.common.util.ImageUtils; +import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.common.util.IntegralLogHelper; import com.gh.common.util.LogUtils; import com.gh.common.util.NewLogUtils; @@ -26,7 +26,6 @@ import com.gh.gamecenter.eventbus.EBShare; import com.lightgame.utils.Utils; import com.sina.weibo.sdk.api.ImageObject; import com.sina.weibo.sdk.api.TextObject; -import com.sina.weibo.sdk.api.WebpageObject; import com.sina.weibo.sdk.api.WeiboMultiMessage; import com.sina.weibo.sdk.auth.AuthInfo; import com.sina.weibo.sdk.common.UiError; @@ -37,8 +36,6 @@ import com.sina.weibo.sdk.share.WbShareCallback; import org.greenrobot.eventbus.EventBus; import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.util.UUID; /** * Created by khy on 2016/11/23. diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java index 36d8ebab21..7a66a37f53 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java @@ -15,11 +15,11 @@ import android.widget.TextView; import androidx.collection.ArrayMap; import androidx.core.content.ContextCompat; -import com.gh.common.util.BitmapUtils; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.common.utils.BitmapUtils; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.PackageInstaller; import com.gh.common.util.PackageUtils; -import com.gh.common.util.TimeUtils; +import com.gh.gamecenter.core.utils.TimeUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.KcSelectGameViewHolder; import com.gh.gamecenter.databinding.KcGameSelectItemBinding; 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 920b355b8e..2c14a8f33d 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java @@ -8,14 +8,14 @@ import android.view.ViewGroup; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.ViewHolder; -import com.gh.common.constant.ItemViewType; +import com.gh.gamecenter.common.constant.ItemViewType; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.CommentUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DirectUtils; -import com.gh.common.util.ImageUtils; -import com.gh.common.util.MtaHelper; -import com.gh.common.util.TextHelper; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.common.utils.TextHelper; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.CommentViewHolder; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; 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 ab0d87d11a..e502b1e6e2 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java @@ -14,11 +14,11 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder; import com.gh.common.constant.Config; import com.gh.common.util.DataCollectionUtils; -import com.gh.common.util.DisplayUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.common.util.NewsUtils; -import com.gh.common.util.StringUtils; -import com.gh.common.util.TextHelper; -import com.gh.common.util.UrlFilterUtils; +import com.gh.gamecenter.core.utils.StringUtils; +import com.gh.gamecenter.common.utils.TextHelper; +import com.gh.gamecenter.core.utils.UrlFilterUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.NewsSearchActivity; import com.gh.gamecenter.R; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java index f3e83703e4..1bbbd9f9ec 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java @@ -18,10 +18,10 @@ import com.gh.common.exposure.ExposureSource; import com.gh.common.exposure.ExposureType; import com.gh.common.util.DataLogUtils; import com.gh.common.util.DirectUtils; -import com.gh.common.util.ImageUtils; -import com.gh.common.util.MtaHelper; -import com.gh.common.util.PageSwitchDataHelper; -import com.gh.common.util.StringUtils; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.core.utils.PageSwitchDataHelper; +import com.gh.gamecenter.core.utils.StringUtils; import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.GameEntity; @@ -33,8 +33,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import kotlin.Pair; - /** * ImagePagerAdapter * 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 ac20201b99..a273bca813 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -17,15 +17,15 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.ViewHolder; -import com.gh.base.OnRequestCallBackListener; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.ExtensionsKt; -import com.gh.common.util.ExtraTagHandler; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.core.utils.ExtraTagHandler; import com.gh.common.util.LibaoUtils; -import com.gh.common.util.PicassoImageGetter; +import com.gh.gamecenter.common.utils.PicassoImageGetter; import com.gh.common.util.PlatformUtils; -import com.gh.common.util.SpanBuilder; -import com.gh.common.util.StringUtils; +import com.gh.gamecenter.core.utils.SpanBuilder; +import com.gh.gamecenter.core.utils.StringUtils; import com.gh.common.view.DownloadProgressBar; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.R; 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 90bf213c8e..44bff3b3a5 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -17,16 +17,16 @@ import com.gh.common.util.ConcernContentUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DirectUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.ExtensionsKt; -import com.gh.common.util.ImageUtils; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.NewsUtils; -import com.gh.common.util.NumberUtils; -import com.gh.common.util.StringUtils; -import com.gh.common.util.TextHelper; -import com.gh.common.util.TimestampUtils; +import com.gh.gamecenter.core.utils.NumberUtils; +import com.gh.gamecenter.core.utils.StringUtils; +import com.gh.gamecenter.common.utils.TextHelper; +import com.gh.gamecenter.common.utils.TimestampUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.ShareCardActivity; @@ -307,8 +307,8 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { , StringUtils.buildString(mEntrance, "+(消息详情)"))); } else { Intent intent = new Intent(mContext, NewsDetailActivity.class); - intent.putExtra(EntranceUtils.KEY_NEWSID, mConcernEntity.getId()); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString(mEntrance, "+(消息详情)")); + intent.putExtra(EntranceConsts.KEY_NEWSID, mConcernEntity.getId()); + intent.putExtra(EntranceConsts.KEY_ENTRANCE, StringUtils.buildString(mEntrance, "+(消息详情)")); mContext.startActivity(intent); } }); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ReportReasonAdapter.kt b/app/src/main/java/com/gh/gamecenter/adapter/ReportReasonAdapter.kt index cab6368e17..8ee3c5fcd4 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ReportReasonAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/adapter/ReportReasonAdapter.kt @@ -4,7 +4,7 @@ import android.content.Context import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.goneIf +import com.gh.gamecenter.common.utils.goneIf import com.gh.gamecenter.databinding.ItemReportReasonBinding import com.lightgame.adapter.BaseRecyclerAdapter diff --git a/app/src/main/java/com/gh/gamecenter/adapter/SubjectTypeAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/SubjectTypeAdapter.java index 3932b38590..d411f2544a 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/SubjectTypeAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/SubjectTypeAdapter.java @@ -13,7 +13,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.lightgame.adapter.BaseRecyclerAdapter; -import com.gh.common.util.DisplayUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.SubjectTypeAdapter.GameTypeViewHolder; 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 3a7015f9f4..e3e19f74d4 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java @@ -5,10 +5,10 @@ import android.content.Intent; import android.view.View; import android.view.ViewGroup; -import com.gh.base.OnRequestCallBackListener; -import com.gh.common.util.ImageUtils; -import com.gh.common.util.MtaHelper; -import com.gh.common.util.UrlFilterUtils; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.core.utils.UrlFilterUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java index 33c364164a..7488b3065b 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java @@ -8,10 +8,10 @@ import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; -import com.gh.base.OnRequestCallBackListener; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; import com.gh.common.util.DirectUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; @@ -84,7 +84,7 @@ public class VoteAdapter extends ListAdapter { } } else { LinkEntity link = versionVoteEntity.getLink(); - if (EntranceUtils.HOST_GAME.equals(link.getType())) { + if (EntranceConsts.HOST_GAME.equals(link.getType())) { viewHolder.binding.voteItemBtn.setText(R.string.download); } else { viewHolder.binding.voteItemBtn.setText(R.string.libao_check); @@ -126,10 +126,10 @@ public class VoteAdapter extends ListAdapter { LinkEntity link = versionVoteEntity.getLink(); String entrance = "(游戏求版本)"; switch (link.getType() == null ? "" : link.getType()) { - case EntranceUtils.HOST_GAME: + case EntranceConsts.HOST_GAME: GameDetailActivity.startGameDetailActivity(mContext, link.getLink(), entrance, -1, false, false, false, true, null); break; - case EntranceUtils.HOST_ARTICLE: + case EntranceConsts.HOST_ARTICLE: mContext.startActivity(NewsDetailActivity.getIntentById(mContext, link.getLink(), entrance)); break; default: diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AreaViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AreaViewHolder.java index a876d4a42e..113e217a03 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AreaViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AreaViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.AreaItemBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AskTabItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AskTabItemViewHolder.java index 9f328308ea..4acaa1bbd0 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AskTabItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AskTabItemViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.AskOrderTabItemBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentHeadViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentHeadViewHolder.java index e2070a9e9f..29baf44c36 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentHeadViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentHeadViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.CommentHeadItemBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentViewHolder.java index 7655882333..de4d04d150 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentViewHolder.java @@ -8,7 +8,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ConcernViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ConcernViewHolder.java index 0ef452837e..dc0a131967 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ConcernViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ConcernViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.ConcernItemBinding; /** 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 eb4aa5d7c4..20187f82e0 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 @@ -9,7 +9,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.FragmentActivity; -import com.gh.common.constant.Constants; +import com.gh.gamecenter.common.constant.Constants; import com.gh.common.dialog.CertificationDialog; import com.gh.common.dialog.DeviceRemindDialog; import com.gh.common.dialog.GameOffServiceDialogFragment; @@ -22,18 +22,18 @@ import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DataLogUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DetailDownloadUtils; -import com.gh.common.util.DialogHelper; +import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.common.util.DialogUtils; import com.gh.common.util.DownloadDialogHelper; import com.gh.common.util.EnergyTaskHelper; import com.gh.common.util.LogUtils; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.PackageInstaller; import com.gh.common.util.PackageUtils; -import com.gh.common.util.PermissionHelper; +import com.gh.gamecenter.common.utils.PermissionHelper; import com.gh.common.util.RealNameHelper; import com.gh.common.util.ReservationHelper; -import com.gh.common.util.StringUtils; +import com.gh.gamecenter.core.utils.StringUtils; import com.gh.common.view.DownloadProgressBar; import com.gh.download.DownloadManager; import com.gh.download.dialog.DownloadDialog; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DownloadHeadViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DownloadHeadViewHolder.java index 036588a7ac..8edb5bb97a 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DownloadHeadViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DownloadHeadViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.DownloadmanagerItemHeadBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/FooterViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/FooterViewHolder.java index 2bcab214b0..ee84f90e7d 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/FooterViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/FooterViewHolder.java @@ -7,8 +7,8 @@ import android.widget.TextView; import androidx.annotation.StringRes; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.callback.OnListClickListener; import com.gh.gamecenter.R; import com.gh.gamecenter.baselist.ListViewModel; import com.gh.gamecenter.baselist.LoadType; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameCollectionItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameCollectionItemViewHolder.kt index 24ebf431eb..d395a20fef 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameCollectionItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameCollectionItemViewHolder.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.databinding.GameCollectionItemBinding class GameCollectionItemViewHolder(var binding: GameCollectionItemBinding) : BaseRecyclerViewHolder(binding.root) diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailCalenderViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailCalenderViewHolder.java index 0634b687df..28590ad905 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailCalenderViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailCalenderViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.GamedetailCalendarItemBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsViewHolder.java index 6eb6833649..79959b4adb 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsViewHolder.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.callback.OnListClickListener; import com.gh.gamecenter.databinding.GamedetailItemNewsBinding; import com.gh.gamecenter.entity.GameDetailEntity; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNoticeViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNoticeViewHolder.java index ad5c876969..1c0e230a0c 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNoticeViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNoticeViewHolder.java @@ -1,7 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.GamedetailItemNoticeBinding; import com.gh.gamecenter.entity.GameDetailEntity; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDownloadViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDownloadViewHolder.java index 230c0d9a84..a48247480c 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDownloadViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDownloadViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.FmDownloadmanagerItemBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.kt b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.kt index 8c47c2bf6a..05b9b4e86b 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.kt @@ -2,9 +2,9 @@ package com.gh.gamecenter.adapter.viewholder import android.view.View import android.view.ViewGroup -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.dip2px -import com.gh.common.util.toColor +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.R import com.gh.gamecenter.databinding.GameHeadItemBinding import com.gh.gamecenter.entity.SubjectEntity diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameImageViewHolder.kt b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameImageViewHolder.kt index d66ebe17d0..f4eb909cb1 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameImageViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameImageViewHolder.kt @@ -1,11 +1,11 @@ package com.gh.gamecenter.adapter.viewholder import com.facebook.drawee.generic.RoundingParams -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.databind.BindingAdapters -import com.gh.common.util.DisplayUtils -import com.gh.common.util.ImageUtils -import com.gh.common.util.goneIf +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.utils.goneIf import com.gh.gamecenter.R import com.gh.gamecenter.databinding.GameImageItemBinding import com.gh.gamecenter.entity.GameEntity diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsSearchViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsSearchViewHolder.java index 66cc318f00..5581386d11 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsSearchViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsSearchViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.GameNewsSearchItemBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeListViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeListViewHolder.java index 67610ea4e7..f5bbfd54b3 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeListViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeListViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.GameNewsTypeItemBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeViewHolder.java index a99fa46b00..3953127b6a 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.GameNewsTypeListItemBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameUpdateViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameUpdateViewHolder.java index a2f8b786b5..e823f48354 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameUpdateViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameUpdateViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.FmUpdateItemBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java index f4260eec92..19f5fbdf86 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java @@ -9,7 +9,7 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.common.view.DrawableView; +import com.gh.gamecenter.common.view.DrawableView; import com.gh.common.view.GameIconView; import com.gh.gamecenter.databinding.GameItemBinding; import com.gh.gamecenter.entity.ColorEntity; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewPagerViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewPagerViewHolder.java index cf749c18e5..b26e0684a5 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewPagerViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewPagerViewHolder.java @@ -3,7 +3,7 @@ package com.gh.gamecenter.adapter.viewholder; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.GameViewpagerItemBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/KcSelectGameViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/KcSelectGameViewHolder.java index 41f2a129b6..d38d60ce73 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/KcSelectGameViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/KcSelectGameViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.KcGameSelectItemBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LiBaoCodeViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LiBaoCodeViewHolder.java index 9eefab7b98..88edc71e17 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LiBaoCodeViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LiBaoCodeViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.LibaoCodeItemBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoDetailContentViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoDetailContentViewHolder.java index 940cf01c65..d76d674fb2 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoDetailContentViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoDetailContentViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.LibaodetailItemContentBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoDetailTopViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoDetailTopViewHolder.java index 5686faa5c4..061b61e4ff 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoDetailTopViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoDetailTopViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.LibaodetailItemTopBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoNormalViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoNormalViewHolder.java index 0ba24e4d30..17373990ee 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoNormalViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoNormalViewHolder.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.callback.OnListClickListener; import com.gh.gamecenter.databinding.LibaoItemBinding; import com.gh.gamecenter.entity.LibaoEntity; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ListSectionItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ListSectionItemViewHolder.kt index a855da9882..3ccfbd0e3c 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ListSectionItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ListSectionItemViewHolder.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.databinding.ListSectionItemBinding class ListSectionItemViewHolder(val binding: ListSectionItemBinding) : BaseRecyclerViewHolder(binding.root) { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDetailCommentListViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDetailCommentListViewHolder.java index f62b0c1598..c9416b5220 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDetailCommentListViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDetailCommentListViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.NewsDetailCommentBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDetailGameViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDetailGameViewHolder.java index 286e8add9e..b2a1adf8b6 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDetailGameViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDetailGameViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.NewsdetailItemGameBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDigestViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDigestViewHolder.java index a5c71e4163..26a86065cf 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDigestViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDigestViewHolder.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.callback.OnListClickListener; import com.gh.gamecenter.databinding.NewsDigestItemBinding; import com.gh.gamecenter.entity.ConcernEntity; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsFooterViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsFooterViewHolder.java index f889669944..7e6304b642 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsFooterViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsFooterViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.NewsFooterItemBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage1ViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage1ViewHolder.java index 32af142c9e..44b69b3ecb 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage1ViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage1ViewHolder.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.callback.OnListClickListener; import com.gh.gamecenter.databinding.NewsImage1ItemBinding; import com.gh.gamecenter.entity.NewsEntity; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage2ViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage2ViewHolder.java index 3b08cc4d0a..129b6d5da8 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage2ViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage2ViewHolder.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.callback.OnListClickListener; import com.gh.gamecenter.databinding.NewsImage2ItemBinding; import com.gh.gamecenter.entity.NewsEntity; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage3ViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage3ViewHolder.java index a93d563557..0eff73f6f1 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage3ViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage3ViewHolder.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.callback.OnListClickListener; import com.gh.gamecenter.databinding.NewsImage3ItemBinding; import com.gh.gamecenter.entity.NewsEntity; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsTextViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsTextViewHolder.java index 5622ee4575..3fce23ff3b 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsTextViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsTextViewHolder.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.callback.OnListClickListener; import com.gh.gamecenter.databinding.NewsTextItemBinding; import com.gh.gamecenter.entity.NewsEntity; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ReuseViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ReuseViewHolder.java index e370ca6a9d..40815ed094 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ReuseViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ReuseViewHolder.java @@ -2,8 +2,8 @@ package com.gh.gamecenter.adapter.viewholder; import android.view.View; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.callback.OnListClickListener; /** * Created by LGT on 2016/8/12. diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/SearchHistoryViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/SearchHistoryViewHolder.java index f25ccdf573..28b60d30b1 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/SearchHistoryViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/SearchHistoryViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.FmSearchHistoryItemBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/StrategyDialogViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/StrategyDialogViewHolder.java index 347fa07bb1..4abccf9560 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/StrategyDialogViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/StrategyDialogViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.DialogStrategyItemBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ToolBoxViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ToolBoxViewHolder.java index 6220018c67..889b4f7ed4 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ToolBoxViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ToolBoxViewHolder.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.callback.OnListClickListener; import com.gh.gamecenter.databinding.ToolboxItemBinding; import com.gh.gamecenter.entity.ToolBoxEntity; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ViewHolder.kt b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ViewHolder.kt index e54127a06b..a56e7dd830 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ViewHolder.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.databinding.* class SearchGameFooterViewHolder(val binding: SearchGameFooterBinding) : BaseRecyclerViewHolder(binding.root) diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/VoteViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/VoteViewHolder.java index 5cc3fe8da0..7ee3fac1b2 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/VoteViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/VoteViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.VoteItemBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/amway/AmwayActivity.kt b/app/src/main/java/com/gh/gamecenter/amway/AmwayActivity.kt index 0bdd6f1f95..0e9137afde 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwayActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayActivity.kt @@ -2,7 +2,7 @@ package com.gh.gamecenter.amway import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.DisplayUtils +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.R /** diff --git a/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt b/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt index 14c775a761..171a491a72 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt @@ -7,7 +7,7 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.airbnb.lottie.LottieAnimationView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable @@ -16,6 +16,10 @@ import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.AmwayCommentItemBinding import com.gh.gamecenter.eventbus.EBDownloadStatus import com.gh.gamecenter.game.GameAndPosition @@ -228,14 +232,14 @@ class AmwayAdapter( binding.commentContainer.setOnClickListener { val intent = RatingReplyActivity.getIntent( context, amway.game.id, amway.comment, false, viewModel.entrance - ?: "", EntranceUtils.ENTRANCE_AMWAY + ?: "", EntranceConsts.ENTRANCE_AMWAY ) SyncDataBetweenPageHelper.startActivityForResult(binding.root.context, intent, RatingFragment.RATING_REPLAY_REQUEST, adapterPosition) MtaHelper.onEvent("安利墙", "点击", "评论${blockPosition}_${amway.game.name}_评论") } binding.userClickableView.setOnClickListener { - DirectUtils.directToHomeActivity(context, amway.comment.user.id, viewModel.entrance, EntranceUtils.ENTRANCE_AMWAY) + DirectUtils.directToHomeActivity(context, amway.comment.user.id, viewModel.entrance, EntranceConsts.ENTRANCE_AMWAY) } if (amway.comment.me.isVoted) { @@ -266,11 +270,13 @@ class AmwayAdapter( ImageUtils.display(binding.sdvUserBadge, amway.comment.user.badge?.icon) binding.sdvUserBadge.goneIf(amway.comment.user.badge == null) binding.sdvUserBadge.setOnClickListener { - DialogUtils.showViewBadgeDialog(context, amway.comment.user.badge) { - MtaHelper.onEvent("进入徽章墙_用户记录", "安利墙", "${amway.comment.user.name}（${amway.comment.user.id}）") - MtaHelper.onEvent("徽章中心", "进入徽章中心", "安利墙") - DirectUtils.directToBadgeWall(context, amway.comment.user.id, amway.comment.user.name, amway.comment.user.icon) - } + DialogUtils.showViewBadgeDialog(context, amway.comment.user.badge, object : ConfirmListener { + override fun onConfirm() { + MtaHelper.onEvent("进入徽章墙_用户记录", "安利墙", "${amway.comment.user.name}（${amway.comment.user.id}）") + MtaHelper.onEvent("徽章中心", "进入徽章中心", "安利墙") + DirectUtils.directToBadgeWall(context, amway.comment.user.id, amway.comment.user.name, amway.comment.user.icon) + } + }) } } 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 097308eac9..ca90b35d87 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt @@ -9,11 +9,11 @@ import androidx.core.content.ContextCompat import androidx.core.view.ViewCompat import androidx.recyclerview.widget.RecyclerView import com.ethanhua.skeleton.Skeleton -import com.gh.common.TimeElapsedHelper +import com.gh.gamecenter.core.utils.TimeElapsedHelper import com.gh.common.exposure.ExposureListener import com.gh.common.exposure.ExposureSource import com.gh.common.util.* -import com.gh.common.view.VerticalItemDecoration +import com.gh.gamecenter.common.view.VerticalItemDecoration import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus import com.gh.download.DownloadManager @@ -21,6 +21,9 @@ import com.gh.gamecenter.R import com.gh.gamecenter.amway.search.AmwaySearchActivity import com.gh.gamecenter.baselist.LazyListFragment import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentAmwayAlBinding import com.gh.gamecenter.databinding.FragmentAmwayBinding import com.gh.gamecenter.entity.RatingComment @@ -63,7 +66,7 @@ class AmwayFragment : LazyListFragment() { } override fun onCreate(savedInstanceState: Bundle?) { - mUseAlternativeLayout = arguments?.getBoolean(EntranceUtils.KEY_IS_HOME, false) ?: false + mUseAlternativeLayout = arguments?.getBoolean(EntranceConsts.KEY_IS_HOME, false) ?: false super.onCreate(savedInstanceState) } @@ -76,7 +79,7 @@ class AmwayFragment : LazyListFragment() { override fun onFragmentFirstVisible() { super.onFragmentFirstVisible() - mViewModel.fixedTopAmwayId = arguments?.getString(EntranceUtils.KEY_ID) + mViewModel.fixedTopAmwayId = arguments?.getString(EntranceConsts.KEY_ID) mViewModel.initData() mViewModel.entrance = mEntrance } @@ -125,12 +128,13 @@ class AmwayFragment : LazyListFragment() { return mViewModel } - override fun getItemDecoration() = VerticalItemDecoration(context, 12F, false).apply { mItemDecoration = this } + override fun getItemDecoration() = VerticalItemDecoration(context, 12F, false) + .apply { mItemDecoration = this } override fun provideListAdapter(): ListAdapter<*> { if (mAdapter == null) { val basicExposureSource = arrayListOf().apply { - arguments?.getParcelable(EntranceUtils.KEY_EXPOSURE_SOURCE)?.let { + arguments?.getParcelable(EntranceConsts.KEY_EXPOSURE_SOURCE)?.let { add(it) } add(ExposureSource("安利墙", "")) diff --git a/app/src/main/java/com/gh/gamecenter/amway/AmwaySuccessFragment.kt b/app/src/main/java/com/gh/gamecenter/amway/AmwaySuccessFragment.kt index 0789945051..6b528e9fb8 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwaySuccessFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwaySuccessFragment.kt @@ -2,13 +2,13 @@ package com.gh.gamecenter.amway import android.os.Bundle import android.view.View -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.databinding.FragmentAmwaySuccessBinding import com.gh.gamecenter.entity.GameEntity -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment class AmwaySuccessFragment : NormalFragment() { @@ -18,7 +18,7 @@ class AmwaySuccessFragment : NormalFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mGameEntity = arguments?.get(EntranceUtils.KEY_DATA) as GameEntity? + mGameEntity = arguments?.get(EntranceConsts.KEY_DATA) as GameEntity? } override fun getLayoutId() = 0 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 736ebdad76..17ded3d6ef 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwayViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayViewModel.kt @@ -7,6 +7,7 @@ import com.gh.download.DownloadManager import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.baselist.LoadType +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.entity.AmwayCommentEntity import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.RatingComment @@ -102,7 +103,7 @@ class AmwayViewModel(application: Application) : ListViewModel>() { override fun onSuccess(data: List) { // 为从启动弹窗跳转过来的 gameEntity 附上启动弹窗的相关数据供曝光数据使用 (草) - if (entrance == EntranceUtils.ENTRANCE_WELCOME) { + if (entrance == EntranceConsts.ENTRANCE_WELCOME) { for (subject in data) { subject.data?.let { for (game in it) { @@ -193,7 +194,7 @@ class AmwayViewModel(application: Application) : ListViewModel(context: Context) : diff --git a/app/src/main/java/com/gh/gamecenter/baselist/LazyListFragment.java b/app/src/main/java/com/gh/gamecenter/baselist/LazyListFragment.java index aa11083c2c..37f305efa5 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/LazyListFragment.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/LazyListFragment.java @@ -15,10 +15,10 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.ethanhua.skeleton.SkeletonScreen; -import com.gh.base.fragment.LazyFragment; -import com.gh.common.util.NumberUtils; -import com.gh.common.view.FixLinearLayoutManager; -import com.gh.common.view.VerticalItemDecoration; +import com.gh.gamecenter.common.base.fragment.LazyFragment; +import com.gh.gamecenter.core.utils.NumberUtils; +import com.gh.gamecenter.common.view.FixLinearLayoutManager; +import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.gamecenter.R; import com.halo.assistant.HaloApp; diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java b/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java index eb940d47e4..4c54dda238 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java @@ -15,9 +15,9 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.gh.base.ToolBarActivity; -import com.gh.common.util.NumberUtils; -import com.gh.common.view.FixLinearLayoutManager; -import com.gh.common.view.VerticalItemDecoration; +import com.gh.gamecenter.core.utils.NumberUtils; +import com.gh.gamecenter.common.view.FixLinearLayoutManager; +import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.gamecenter.R; import com.halo.assistant.HaloApp; diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java b/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java index d2140c0f1b..9e65c7ab71 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java @@ -2,9 +2,8 @@ package com.gh.gamecenter.baselist; import android.annotation.SuppressLint; import android.content.Context; -import android.os.AsyncTask; -import com.gh.common.util.ExtensionsKt; +import com.gh.gamecenter.common.utils.ExtensionsKt; import com.lightgame.adapter.BaseRecyclerAdapter; import java.util.ArrayList; diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListExecutor.kt b/app/src/main/java/com/gh/gamecenter/baselist/ListExecutor.kt index c47ee78391..c85fdb63e6 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListExecutor.kt +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListExecutor.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.baselist -import com.gh.base.GHThreadFactory -import com.gh.common.AppExecutor +import com.gh.gamecenter.core.GHThreadFactory +import com.gh.gamecenter.core.AppExecutor import java.util.concurrent.Executors object ListExecutor { diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java b/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java index 6b6a3c7509..adbc11d765 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java @@ -15,11 +15,11 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.ethanhua.skeleton.SkeletonScreen; -import com.gh.common.util.NumberUtils; -import com.gh.common.view.FixLinearLayoutManager; -import com.gh.common.view.VerticalItemDecoration; +import com.gh.gamecenter.core.utils.NumberUtils; +import com.gh.gamecenter.common.view.FixLinearLayoutManager; +import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.gamecenter.R; -import com.gh.gamecenter.normal.NormalFragment; +import com.gh.gamecenter.common.base.fragment.NormalFragment; import com.halo.assistant.HaloApp; import java.lang.reflect.ParameterizedType; diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListViewModel.java b/app/src/main/java/com/gh/gamecenter/baselist/ListViewModel.java index 31924e577e..e1bbc77661 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListViewModel.java @@ -8,13 +8,12 @@ import androidx.lifecycle.MutableLiveData; import com.gh.common.filter.RegionSettingHelper; import com.gh.common.util.ApkActiveUtils; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.ExtensionsKt; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.download.DownloadManager; +import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.retrofit.BiResponse; import com.gh.gamecenter.retrofit.Response; -import com.halo.assistant.HaloApp; import org.jetbrains.annotations.NotNull; @@ -121,7 +120,7 @@ public abstract class ListViewModel extends Ba game.setEntryMap(DownloadManager.getInstance().getEntryMap(game.getName())); // 当页面是由启动弹窗过来的第一或第二个页面的时候添加启动弹窗信息 - if (mEntrance.contains(EntranceUtils.ENTRANCE_WELCOME) + if (mEntrance.contains(EntranceConsts.ENTRANCE_WELCOME) && ExtensionsKt.countOccurrences(mEntrance, "+") <= 1) { game.setWelcomeDialogInfoIfAvailable(); } diff --git a/app/src/main/java/com/gh/gamecenter/catalog/BannerAdapter.kt b/app/src/main/java/com/gh/gamecenter/catalog/BannerAdapter.kt index b970b736e7..d5c7fcbbe9 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/BannerAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/BannerAdapter.kt @@ -9,7 +9,7 @@ import com.facebook.drawee.view.SimpleDraweeView import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.util.DirectUtils -import com.gh.common.util.ImageUtils +import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.R import com.gh.gamecenter.adapter.RecyclingPagerAdapter import com.gh.gamecenter.entity.GameEntity diff --git a/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt b/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt index 798c478567..488ec04090 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.catalog import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R @@ -25,9 +25,9 @@ class CatalogActivity : NormalActivity() { companion object { fun getIntent(context: Context, catalogId: String, catalogTitle: String, entrance: String): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_CATALOG_ID, catalogId) - bundle.putString(EntranceUtils.KEY_CATALOG_TITLE, catalogTitle) - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance) + bundle.putString(EntranceConsts.KEY_CATALOG_ID, catalogId) + bundle.putString(EntranceConsts.KEY_CATALOG_TITLE, catalogTitle) + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance) return getTargetIntent(context, CatalogActivity::class.java, CatalogFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/catalog/CatalogAdapter.kt b/app/src/main/java/com/gh/gamecenter/catalog/CatalogAdapter.kt index 45b7dd3810..47c28d7cbd 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/CatalogAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/CatalogAdapter.kt @@ -3,10 +3,10 @@ package com.gh.gamecenter.catalog import android.content.Context import android.view.View import android.view.ViewGroup -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.goneIf -import com.gh.common.util.toBinding -import com.gh.common.util.toColor +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.R import com.gh.gamecenter.databinding.CatalogItemBinding import com.gh.gamecenter.entity.CatalogEntity diff --git a/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt b/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt index a459ab2d01..cff42ed85b 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt @@ -5,12 +5,12 @@ import android.os.Bundle import android.view.View import androidx.core.os.bundleOf import androidx.lifecycle.Observer -import com.gh.base.fragment.LazyFragment -import com.gh.common.util.EntranceUtils -import com.gh.common.util.dip2px -import com.gh.common.util.toColor -import com.gh.common.util.viewModelProviderFromParent -import com.gh.common.view.FixLinearLayoutManager +import com.gh.gamecenter.common.base.fragment.LazyFragment +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.viewModelProviderFromParent +import com.gh.gamecenter.common.view.FixLinearLayoutManager import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentCatalogBinding import com.gh.gamecenter.entity.CatalogEntity @@ -30,13 +30,13 @@ class CatalogFragment : LazyFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) savedInstanceState?.run { - mLastSelectedPosition = getInt(EntranceUtils.KEY_LAST_SELECTED_POSITION) + mLastSelectedPosition = getInt(EntranceConsts.KEY_LAST_SELECTED_POSITION) } } override fun onSaveInstanceState(outState: Bundle) { mViewModel?.run { - outState.putInt(EntranceUtils.KEY_LAST_SELECTED_POSITION, selectedCatalogPosition) + outState.putInt(EntranceConsts.KEY_LAST_SELECTED_POSITION, selectedCatalogPosition) } super.onSaveInstanceState(outState) } @@ -48,12 +48,12 @@ class CatalogFragment : LazyFragment() { } override fun onFragmentFirstVisible() { - mCatalogId = arguments?.getString(EntranceUtils.KEY_CATALOG_ID) ?: "" - mCatalogTitle = arguments?.getString(EntranceUtils.KEY_CATALOG_TITLE) ?: "" + mCatalogId = arguments?.getString(EntranceConsts.KEY_CATALOG_ID) ?: "" + mCatalogTitle = arguments?.getString(EntranceConsts.KEY_CATALOG_TITLE) ?: "" mViewModel = viewModelProviderFromParent(CatalogViewModel.Factory(mCatalogId, mCatalogTitle), mCatalogId) mViewModel?.validEntranceName = if (mEntrance.contains("首页")) "首页" else "板块" - if (arguments?.getBoolean(EntranceUtils.KEY_IS_HOME) == true) { + if (arguments?.getBoolean(EntranceConsts.KEY_IS_HOME) == true) { mViewModel?.validEntranceName = "首页Tab栏" } mViewModel?.logAppearance() @@ -97,7 +97,7 @@ class CatalogFragment : LazyFragment() { }) // 嵌入在首页时特殊处理 - if (arguments?.getBoolean(EntranceUtils.KEY_IS_HOME) == true) { + if (arguments?.getBoolean(EntranceConsts.KEY_IS_HOME) == true) { mBinding?.divider?.visibility = View.GONE mBinding?.root?.setBackgroundColor(Color.WHITE) mBinding?.root?.setPadding(0, 8F.dip2px(), 0, 0) @@ -123,19 +123,20 @@ class CatalogFragment : LazyFragment() { mSpecialCatalogFragment = childFragmentManager.findFragmentByTag(SpecialCatalogFragment::class.java.simpleName) as? SpecialCatalogFragment ?: SpecialCatalogFragment() mSpecialCatalogFragment?.arguments = bundleOf( - EntranceUtils.KEY_IS_CATEGORY_V2 to false, - EntranceUtils.KEY_CATALOG_ID to id, - EntranceUtils.KEY_CATALOG_TITLE to mCatalogTitle, - EntranceUtils.KEY_EXPOSURE_SOURCE to arguments?.getParcelable(EntranceUtils.KEY_EXPOSURE_SOURCE) + EntranceConsts.KEY_IS_CATEGORY_V2 to false, + EntranceConsts.KEY_CATALOG_ID to id, + EntranceConsts.KEY_CATALOG_TITLE to mCatalogTitle, + EntranceConsts.KEY_EXPOSURE_SOURCE to arguments?.getParcelable( + EntranceConsts.KEY_EXPOSURE_SOURCE) ) childFragmentManager.beginTransaction().replace(R.id.container_sub_catalog, mSpecialCatalogFragment!!, SpecialCatalogFragment::class.java.simpleName).commitAllowingStateLoss() } else { mSubCatalogFragment = childFragmentManager.findFragmentByTag(SubCatalogFragment::class.java.simpleName) as? SubCatalogFragment ?: SubCatalogFragment() mSubCatalogFragment?.arguments = bundleOf( - EntranceUtils.KEY_CATALOG_ID to id, - EntranceUtils.KEY_PRIMARY_CATALOG_ID to subCatalog[selectedCatalogPosition].id, - EntranceUtils.KEY_CATALOG_TITLE to mCatalogTitle + EntranceConsts.KEY_CATALOG_ID to id, + EntranceConsts.KEY_PRIMARY_CATALOG_ID to subCatalog[selectedCatalogPosition].id, + EntranceConsts.KEY_CATALOG_TITLE to mCatalogTitle ) childFragmentManager.beginTransaction().replace(R.id.container_sub_catalog, mSubCatalogFragment!!, SubCatalogFragment::class.java.simpleName).commitAllowingStateLoss() } @@ -152,9 +153,9 @@ class CatalogFragment : LazyFragment() { mSubCatalogFragment = childFragmentManager.findFragmentByTag(SubCatalogFragment::class.java.simpleName) as? SubCatalogFragment ?: SubCatalogFragment() mSubCatalogFragment?.arguments = bundleOf( - EntranceUtils.KEY_CATALOG_ID to id, - EntranceUtils.KEY_PRIMARY_CATALOG_ID to subCatalog[position].id, - EntranceUtils.KEY_CATALOG_TITLE to mCatalogTitle + EntranceConsts.KEY_CATALOG_ID to id, + EntranceConsts.KEY_PRIMARY_CATALOG_ID to subCatalog[position].id, + EntranceConsts.KEY_CATALOG_TITLE to mCatalogTitle ) childFragmentManager.beginTransaction().replace(R.id.container_sub_catalog, mSubCatalogFragment!!, SubCatalogFragment::class.java.simpleName).commitAllowingStateLoss() } else { @@ -162,18 +163,19 @@ class CatalogFragment : LazyFragment() { mSpecialCatalogFragment = childFragmentManager.findFragmentByTag(SpecialCatalogFragment::class.java.simpleName) as? SpecialCatalogFragment ?: SpecialCatalogFragment() mSpecialCatalogFragment?.arguments = bundleOf( - EntranceUtils.KEY_IS_CATEGORY_V2 to false, - EntranceUtils.KEY_CATALOG_ID to id, - EntranceUtils.KEY_CATALOG_TITLE to mCatalogTitle, - EntranceUtils.KEY_EXPOSURE_SOURCE to arguments?.getParcelable(EntranceUtils.KEY_EXPOSURE_SOURCE) + EntranceConsts.KEY_IS_CATEGORY_V2 to false, + EntranceConsts.KEY_CATALOG_ID to id, + EntranceConsts.KEY_CATALOG_TITLE to mCatalogTitle, + EntranceConsts.KEY_EXPOSURE_SOURCE to arguments?.getParcelable( + EntranceConsts.KEY_EXPOSURE_SOURCE) ) childFragmentManager.beginTransaction().replace(R.id.container_sub_catalog, mSpecialCatalogFragment!!, SpecialCatalogFragment::class.java.simpleName).commitAllowingStateLoss() } else { if (mSubCatalogFragment?.isStateSaved == false) { mSubCatalogFragment?.arguments = bundleOf( - EntranceUtils.KEY_CATALOG_ID to id, - EntranceUtils.KEY_PRIMARY_CATALOG_ID to subCatalog[position].id, - EntranceUtils.KEY_CATALOG_TITLE to mCatalogTitle + EntranceConsts.KEY_CATALOG_ID to id, + EntranceConsts.KEY_PRIMARY_CATALOG_ID to subCatalog[position].id, + EntranceConsts.KEY_CATALOG_TITLE to mCatalogTitle ) } mSubCatalogFragment?.changeSubCatalog(subCatalog[position].id) @@ -182,9 +184,9 @@ class CatalogFragment : LazyFragment() { } else { if (mSubCatalogFragment?.isStateSaved == false) { mSubCatalogFragment?.arguments = bundleOf( - EntranceUtils.KEY_CATALOG_ID to id, - EntranceUtils.KEY_PRIMARY_CATALOG_ID to subCatalog[position].id, - EntranceUtils.KEY_CATALOG_TITLE to mCatalogTitle + EntranceConsts.KEY_CATALOG_ID to id, + EntranceConsts.KEY_PRIMARY_CATALOG_ID to subCatalog[position].id, + EntranceConsts.KEY_CATALOG_TITLE to mCatalogTitle ) } mSubCatalogFragment?.changeSubCatalog(subCatalog[position].id) diff --git a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt index da99fd90a7..6bb81aff6b 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.catalog import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R import com.gh.gamecenter.entity.CatalogEntity @@ -18,12 +18,12 @@ class NewCatalogListActivity : NormalActivity() { catalog: CatalogEntity, initTitle: String): Intent { val bundle = Bundle() - bundle.putParcelable(EntranceUtils.KEY_DATA, catalog) - bundle.putString(EntranceUtils.KEY_PRIMARY_CATALOG_ID, primaryCatalogId) - bundle.putString(EntranceUtils.KEY_PRIMARY_CATALOG_NAME, primaryCatalogName) - bundle.putString(EntranceUtils.KEY_NAME, catalog.name) - bundle.putString(EntranceUtils.KEY_CATALOG_TITLE, catalogTitle) - bundle.putString(EntranceUtils.KEY_CATALOG_INIT_TITLE, initTitle) + bundle.putParcelable(EntranceConsts.KEY_DATA, catalog) + bundle.putString(EntranceConsts.KEY_PRIMARY_CATALOG_ID, primaryCatalogId) + bundle.putString(EntranceConsts.KEY_PRIMARY_CATALOG_NAME, primaryCatalogName) + bundle.putString(EntranceConsts.KEY_NAME, catalog.name) + bundle.putString(EntranceConsts.KEY_CATALOG_TITLE, catalogTitle) + bundle.putString(EntranceConsts.KEY_CATALOG_INIT_TITLE, initTitle) return getTargetIntent(context, NewCatalogListActivity::class.java, NewCatalogListFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListAdapter.kt b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListAdapter.kt index 69c2d417aa..6e1f3e118b 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListAdapter.kt @@ -4,7 +4,7 @@ import android.content.Context import android.util.SparseArray import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.ExposureType @@ -15,6 +15,9 @@ import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.GameViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.core.utils.StringUtils +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.eventbus.EBDownloadStatus import com.gh.gamecenter.game.GameItemViewHolder 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 11fb54b7e4..cc4b1997d0 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt @@ -3,13 +3,13 @@ package com.gh.gamecenter.catalog import android.os.Bundle import android.view.View import com.ethanhua.skeleton.Skeleton -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureListener import com.gh.common.exposure.ExposureSource import com.gh.common.util.DialogUtils -import com.gh.common.util.EntranceUtils -import com.gh.common.util.observeNonNull -import com.gh.common.util.viewModelProvider +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.common.view.CatalogFilterView import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus @@ -65,15 +65,15 @@ class NewCatalogListFragment : ListFragment override fun onCreate(savedInstanceState: Bundle?) { mViewModel = provideListViewModel() - mViewModel.title = arguments?.getString(EntranceUtils.KEY_NAME) ?: "" - mViewModel.categoryTitle = arguments?.getString(EntranceUtils.KEY_CATALOG_TITLE) ?: "" - mEntrance = arguments?.getString(EntranceUtils.KEY_ENTRANCE) ?: Constants.ENTRANCE_UNKNOWN - mPrimeCatalog = arguments?.getParcelable(EntranceUtils.KEY_DATA) + mViewModel.title = arguments?.getString(EntranceConsts.KEY_NAME) ?: "" + mViewModel.categoryTitle = arguments?.getString(EntranceConsts.KEY_CATALOG_TITLE) ?: "" + mEntrance = arguments?.getString(EntranceConsts.KEY_ENTRANCE) ?: Constants.ENTRANCE_UNKNOWN + mPrimeCatalog = arguments?.getParcelable(EntranceConsts.KEY_DATA) mSubCatalogList = mPrimeCatalog?.subCatalog as? ArrayList ?: arrayListOf() - mInitCatalogName = arguments?.getString(EntranceUtils.KEY_CATALOG_INIT_TITLE) ?: "" - mPrimaryCatalogName = arguments?.getString(EntranceUtils.KEY_PRIMARY_CATALOG_NAME) ?: "" - mPrimaryCatalogId = arguments?.getString(EntranceUtils.KEY_PRIMARY_CATALOG_ID) ?: "" + mInitCatalogName = arguments?.getString(EntranceConsts.KEY_CATALOG_INIT_TITLE) ?: "" + mPrimaryCatalogName = arguments?.getString(EntranceConsts.KEY_PRIMARY_CATALOG_NAME) ?: "" + mPrimaryCatalogId = arguments?.getString(EntranceConsts.KEY_PRIMARY_CATALOG_ID) ?: "" mViewModel.selectedCatalog = mSubCatalogList.find { entity -> entity.name == mInitCatalogName } ?: CatalogEntity.SubCatalogEntity() 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 a9bf98689d..6a8d8fdde5 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListViewModel.kt @@ -4,7 +4,7 @@ import android.app.Application import androidx.lifecycle.MutableLiveData import com.gh.common.exposure.ExposureEntity import com.gh.common.exposure.ExposureUtils -import com.gh.common.util.UrlFilterUtils +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.common.view.CatalogFilterView import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.CatalogEntity diff --git a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogAdapter.kt b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogAdapter.kt index 2f13f937df..d6de9608e3 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogAdapter.kt @@ -11,8 +11,8 @@ import android.widget.LinearLayout import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable @@ -20,6 +20,10 @@ import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.doOnPageSelected +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.databinding.* import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.subject.SubjectActivity.Companion.startSubjectActivity diff --git a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt index ff6f4792e6..6101e4a147 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt @@ -4,10 +4,10 @@ import android.graphics.Color import android.os.Bundle import android.view.View import com.ethanhua.skeleton.Skeleton -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureListener -import com.gh.common.util.EntranceUtils -import com.gh.common.util.viewModelProvider +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.databinding.FragmentListBaseSkeletonBinding @@ -32,7 +32,7 @@ class SpecialCatalogFragment : ListFragment ?: arrayListOf() - val initSelectedCategory = arguments?.getString(EntranceUtils.KEY_CATEGORY_INIT_TITLE) + val initSelectedCategory = arguments?.getString(EntranceConsts.KEY_CATEGORY_INIT_TITLE) mViewModel.selectedCategory = mSubCategoryList.find { categoryEntity -> categoryEntity.name == initSelectedCategory } ?: CategoryEntity() diff --git a/app/src/main/java/com/gh/gamecenter/category/NewCategoryListViewModel.kt b/app/src/main/java/com/gh/gamecenter/category/NewCategoryListViewModel.kt index d4aded6bae..011ed1de94 100644 --- a/app/src/main/java/com/gh/gamecenter/category/NewCategoryListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/category/NewCategoryListViewModel.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.category import android.app.Application import androidx.lifecycle.MutableLiveData import com.gh.common.exposure.ExposureUtils -import com.gh.common.util.UrlFilterUtils +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.common.view.ConfigFilterView import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.CategoryEntity diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryDirectoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryDirectoryAdapter.kt index 3a73e156f7..b2edb82d28 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryDirectoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryDirectoryAdapter.kt @@ -4,9 +4,9 @@ import android.content.Context import android.view.ViewGroup import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.dip2px -import com.gh.common.view.GridSpacingItemColorDecoration +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.view.GridSpacingItemColorDecoration import com.gh.gamecenter.R import com.gh.gamecenter.databinding.CategoryDirectoryItemBinding import com.gh.gamecenter.entity.CategoryEntity @@ -62,7 +62,14 @@ class CategoryDirectoryAdapter(context: Context, position ) } - addItemDecoration(GridSpacingItemColorDecoration(mContext, 6, 6, R.color.transparent)) + addItemDecoration( + GridSpacingItemColorDecoration( + mContext, + 6, + 6, + R.color.transparent + ) + ) } } } diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt index 5d82f7b5ab..ca06d2661f 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt @@ -3,11 +3,9 @@ package com.gh.gamecenter.category2 import android.content.Context import android.content.Intent import android.os.Bundle -import android.view.MenuItem -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R -import com.gh.gamecenter.SearchActivity class CategoryV2Activity : NormalActivity() { @@ -27,9 +25,9 @@ class CategoryV2Activity : NormalActivity() { companion object { fun getIntent(context: Context, catalogId: String, catalogTitle: String, entrance: String): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_CATEGORY_ID, catalogId) - bundle.putString(EntranceUtils.KEY_CATEGORY_TITLE, catalogTitle) - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance) + bundle.putString(EntranceConsts.KEY_CATEGORY_ID, catalogId) + bundle.putString(EntranceConsts.KEY_CATEGORY_TITLE, catalogTitle) + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance) return getTargetIntent(context, CategoryV2Activity::class.java, CategoryV2Fragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Adapter.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Adapter.kt index 610cd46c6c..f47b82477f 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Adapter.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Adapter.kt @@ -3,10 +3,10 @@ package com.gh.gamecenter.category2 import android.content.Context import android.view.View import android.view.ViewGroup -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.goneIf -import com.gh.common.util.toBinding -import com.gh.common.util.toColor +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.R import com.gh.gamecenter.databinding.CategoryV2ItemBinding import com.gh.gamecenter.entity.SidebarsEntity diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt index c77bacd334..5ba62d9ed4 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt @@ -10,13 +10,16 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager -import com.gh.base.fragment.LazyFragment -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.base.fragment.LazyFragment +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* -import com.gh.common.view.FixLinearLayoutManager +import com.gh.gamecenter.common.view.FixLinearLayoutManager import com.gh.gamecenter.R import com.gh.gamecenter.SearchActivity import com.gh.gamecenter.catalog.SpecialCatalogFragment +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentCategoryBinding import com.gh.gamecenter.entity.CategoryEntity import com.gh.gamecenter.entity.SidebarsEntity @@ -38,13 +41,13 @@ class CategoryV2Fragment : LazyFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) savedInstanceState?.run { - mLastSelectedPosition = getInt(EntranceUtils.KEY_LAST_SELECTED_POSITION) + mLastSelectedPosition = getInt(EntranceConsts.KEY_LAST_SELECTED_POSITION) } } override fun onSaveInstanceState(outState: Bundle) { mViewModel?.run { - outState.putInt(EntranceUtils.KEY_LAST_SELECTED_POSITION, selectedCategoryPosition) + outState.putInt(EntranceConsts.KEY_LAST_SELECTED_POSITION, selectedCategoryPosition) } super.onSaveInstanceState(outState) } @@ -56,13 +59,13 @@ class CategoryV2Fragment : LazyFragment() { } override fun onFragmentFirstVisible() { - mCategoryId = arguments?.getString(EntranceUtils.KEY_CATEGORY_ID) ?: "" - mCategoryTitle = arguments?.getString(EntranceUtils.KEY_CATEGORY_TITLE) ?: "" + mCategoryId = arguments?.getString(EntranceConsts.KEY_CATEGORY_ID) ?: "" + mCategoryTitle = arguments?.getString(EntranceConsts.KEY_CATEGORY_TITLE) ?: "" mViewModel = viewModelProviderFromParent(CategoryV2ViewModel.Factory(mCategoryId, mCategoryTitle), mCategoryId) // 除了这里以外，下面还有一个判断是否为首页 tab 栏的赋值 mViewModel?.entrance = if (mEntrance.contains("首页")) "首页" else "板块" - if (arguments?.getBoolean(EntranceUtils.KEY_IS_HOME) == true) { + if (arguments?.getBoolean(EntranceConsts.KEY_IS_HOME) == true) { mHomeViewModel = viewModelProviderFromParent() mViewModel?.entrance = "首页Tab栏" } @@ -100,7 +103,7 @@ class CategoryV2Fragment : LazyFragment() { directoryRv.layoutParams.width = width // 嵌入在首页时特殊处理 - if (arguments?.getBoolean(EntranceUtils.KEY_IS_HOME) == true) { + if (arguments?.getBoolean(EntranceConsts.KEY_IS_HOME) == true) { root.setBackgroundColor(Color.WHITE) root.setPadding(0, 8F.dip2px(), 0, 0) directoryRv.isNestedScrollingEnabled = false @@ -298,10 +301,10 @@ class CategoryV2Fragment : LazyFragment() { .findFragmentByTag(SpecialCatalogFragment::class.java.simpleName) as? SpecialCatalogFragment ?: SpecialCatalogFragment() mSpecialCatalogFragment?.arguments = bundleOf( - EntranceUtils.KEY_IS_CATEGORY_V2 to true, - EntranceUtils.KEY_CATALOG_ID to id, - EntranceUtils.KEY_CATALOG_TITLE to mCategoryTitle, - EntranceUtils.KEY_EXPOSURE_SOURCE to arguments?.getParcelable(EntranceUtils.KEY_EXPOSURE_SOURCE) + EntranceConsts.KEY_IS_CATEGORY_V2 to true, + EntranceConsts.KEY_CATALOG_ID to id, + EntranceConsts.KEY_CATALOG_TITLE to mCategoryTitle, + EntranceConsts.KEY_EXPOSURE_SOURCE to arguments?.getParcelable(EntranceConsts.KEY_EXPOSURE_SOURCE) ) childFragmentManager .beginTransaction() @@ -321,10 +324,11 @@ class CategoryV2Fragment : LazyFragment() { .findFragmentByTag(CategoryV2ListFragment::class.java.simpleName) as? CategoryV2ListFragment ?: CategoryV2ListFragment() mCategoryV2ListFragment?.arguments = bundleOf( - EntranceUtils.KEY_CATEGORY_ID to id, - EntranceUtils.KEY_SUB_CATEGORY_ID to sidebars[selectedCategoryPosition].categoryId, - EntranceUtils.KEY_CATEGORY_TITLE to mCategoryTitle, - EntranceUtils.KEY_EXPOSURE_SOURCE to arguments?.getParcelable(EntranceUtils.KEY_EXPOSURE_SOURCE) + EntranceConsts.KEY_CATEGORY_ID to id, + EntranceConsts.KEY_SUB_CATEGORY_ID to sidebars[selectedCategoryPosition].categoryId, + EntranceConsts.KEY_CATEGORY_TITLE to mCategoryTitle, + EntranceConsts.KEY_EXPOSURE_SOURCE to arguments?.getParcelable( + EntranceConsts.KEY_EXPOSURE_SOURCE) ) childFragmentManager .beginTransaction() @@ -349,10 +353,11 @@ class CategoryV2Fragment : LazyFragment() { .findFragmentByTag(CategoryV2ListFragment::class.java.simpleName) as? CategoryV2ListFragment ?: CategoryV2ListFragment() mCategoryV2ListFragment?.arguments = bundleOf( - EntranceUtils.KEY_CATEGORY_ID to id, - EntranceUtils.KEY_SUB_CATEGORY_ID to sidebars[position].categoryId, - EntranceUtils.KEY_CATALOG_TITLE to mCategoryTitle, - EntranceUtils.KEY_EXPOSURE_SOURCE to arguments?.getParcelable(EntranceUtils.KEY_EXPOSURE_SOURCE) + EntranceConsts.KEY_CATEGORY_ID to id, + EntranceConsts.KEY_SUB_CATEGORY_ID to sidebars[position].categoryId, + EntranceConsts.KEY_CATALOG_TITLE to mCategoryTitle, + EntranceConsts.KEY_EXPOSURE_SOURCE to arguments?.getParcelable( + EntranceConsts.KEY_EXPOSURE_SOURCE) ) childFragmentManager .beginTransaction() @@ -366,10 +371,11 @@ class CategoryV2Fragment : LazyFragment() { .findFragmentByTag(SpecialCatalogFragment::class.java.simpleName) as? SpecialCatalogFragment ?: SpecialCatalogFragment() mSpecialCatalogFragment?.arguments = bundleOf( - EntranceUtils.KEY_IS_CATEGORY_V2 to true, - EntranceUtils.KEY_CATALOG_ID to id, - EntranceUtils.KEY_CATALOG_TITLE to mCategoryTitle, - EntranceUtils.KEY_EXPOSURE_SOURCE to arguments?.getParcelable(EntranceUtils.KEY_EXPOSURE_SOURCE) + EntranceConsts.KEY_IS_CATEGORY_V2 to true, + EntranceConsts.KEY_CATALOG_ID to id, + EntranceConsts.KEY_CATALOG_TITLE to mCategoryTitle, + EntranceConsts.KEY_EXPOSURE_SOURCE to arguments?.getParcelable( + EntranceConsts.KEY_EXPOSURE_SOURCE) ) childFragmentManager .beginTransaction() @@ -378,10 +384,11 @@ class CategoryV2Fragment : LazyFragment() { } else { if (mCategoryV2ListFragment?.isStateSaved == false) { mCategoryV2ListFragment?.arguments = bundleOf( - EntranceUtils.KEY_CATEGORY_ID to id, - EntranceUtils.KEY_SUB_CATEGORY_ID to sidebars[position].categoryId, - EntranceUtils.KEY_CATALOG_TITLE to mCategoryTitle, - EntranceUtils.KEY_EXPOSURE_SOURCE to arguments?.getParcelable(EntranceUtils.KEY_EXPOSURE_SOURCE) + EntranceConsts.KEY_CATEGORY_ID to id, + EntranceConsts.KEY_SUB_CATEGORY_ID to sidebars[position].categoryId, + EntranceConsts.KEY_CATALOG_TITLE to mCategoryTitle, + EntranceConsts.KEY_EXPOSURE_SOURCE to arguments?.getParcelable( + EntranceConsts.KEY_EXPOSURE_SOURCE) ) } mCategoryV2ListFragment?.changeCategoryTab(sidebars[position].categoryId) @@ -399,10 +406,11 @@ class CategoryV2Fragment : LazyFragment() { } else { if (mCategoryV2ListFragment?.isStateSaved == false) { mCategoryV2ListFragment?.arguments = bundleOf( - EntranceUtils.KEY_CATEGORY_ID to id, - EntranceUtils.KEY_SUB_CATEGORY_ID to sidebars[position].categoryId, - EntranceUtils.KEY_CATALOG_TITLE to mCategoryTitle, - EntranceUtils.KEY_EXPOSURE_SOURCE to arguments?.getParcelable(EntranceUtils.KEY_EXPOSURE_SOURCE) + EntranceConsts.KEY_CATEGORY_ID to id, + EntranceConsts.KEY_SUB_CATEGORY_ID to sidebars[position].categoryId, + EntranceConsts.KEY_CATALOG_TITLE to mCategoryTitle, + EntranceConsts.KEY_EXPOSURE_SOURCE to arguments?.getParcelable( + EntranceConsts.KEY_EXPOSURE_SOURCE) ) } mCategoryV2ListFragment?.changeCategoryTab(sidebars[position].categoryId) diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListAdapter.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListAdapter.kt index 532eb0a49c..f0fbd33a5d 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListAdapter.kt @@ -5,20 +5,25 @@ import android.util.SparseArray import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.databind.BindingAdapters import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.ExposureType import com.gh.common.exposure.IExposable import com.gh.common.util.* -import com.gh.common.view.DrawableView +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.GameViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.CategoryGameItemBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.eventbus.EBDownloadStatus 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 f484800d13..b83f39c7b5 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt @@ -4,7 +4,7 @@ import android.os.Bundle import android.view.View import android.view.ViewGroup import com.ethanhua.skeleton.Skeleton -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureListener import com.gh.common.util.* import com.gh.common.view.CategoryFilterView @@ -13,6 +13,11 @@ import com.gh.common.xapk.XapkUnzipStatus import com.gh.download.DownloadManager import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.common.utils.viewModelProviderFromParent import com.gh.gamecenter.databinding.FragmentCategoryListBinding import com.gh.gamecenter.databinding.LayoutSelectedCategoryBinding import com.gh.gamecenter.entity.CategoryEntity @@ -53,7 +58,7 @@ class CategoryV2ListFragment : ListFragment viewModelProvider(CategoryV2ListViewModel.Factory( mCategoryId, mSubCategoryId, - arguments?.getParcelable(EntranceUtils.KEY_EXPOSURE_SOURCE))) + arguments?.getParcelable(EntranceConsts.KEY_EXPOSURE_SOURCE))) override fun provideListAdapter() = mAdapter ?: CategoryV2ListAdapter( @@ -65,12 +70,12 @@ class CategoryV2ListFragment : ListFragment override fun getItemDecoration() = null override fun onCreate(savedInstanceState: Bundle?) { - mCategoryId = arguments?.getString(EntranceUtils.KEY_CATEGORY_ID) ?: "" - mSubCategoryId = arguments?.getString(EntranceUtils.KEY_SUB_CATEGORY_ID) ?: "" - mCategoryTitle = arguments?.getString(EntranceUtils.KEY_CATEGORY_TITLE) ?: "" + mCategoryId = arguments?.getString(EntranceConsts.KEY_CATEGORY_ID) ?: "" + mSubCategoryId = arguments?.getString(EntranceConsts.KEY_SUB_CATEGORY_ID) ?: "" + mCategoryTitle = arguments?.getString(EntranceConsts.KEY_CATEGORY_TITLE) ?: "" mCategoryViewModel = viewModelProviderFromParent(CategoryV2ViewModel.Factory(mCategoryId, mCategoryTitle), mCategoryId) - mEntrance = arguments?.getString(EntranceUtils.KEY_ENTRANCE) ?: Constants.ENTRANCE_UNKNOWN + mEntrance = arguments?.getString(EntranceConsts.KEY_ENTRANCE) ?: Constants.ENTRANCE_UNKNOWN super.onCreate(savedInstanceState) } 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 5b7f8b861d..6102637618 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListViewModel.kt @@ -7,7 +7,7 @@ import androidx.lifecycle.ViewModelProvider import com.gh.common.exposure.ExposureEntity import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.ExposureUtils -import com.gh.common.util.UrlFilterUtils +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.common.view.CategoryFilterView import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.GameEntity diff --git a/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt index cff08601e1..2a7f99b6f8 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt @@ -3,10 +3,10 @@ package com.gh.gamecenter.category2 import android.content.Context import android.view.View import android.view.ViewGroup -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.ToastUtils -import com.gh.common.util.goneIf -import com.gh.common.util.toColor +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.R import com.gh.gamecenter.databinding.SubCategoryItemBinding import com.gh.gamecenter.entity.CategoryEntity diff --git a/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java index e0c328f3f0..4f52920db5 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java @@ -8,13 +8,13 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.PopupWindow; -import com.gh.base.OnListClickListener; -import com.gh.common.constant.ItemViewType; -import com.gh.common.syncpage.ISyncAdapterHandler; +import com.gh.gamecenter.common.callback.OnListClickListener; +import com.gh.gamecenter.common.constant.ItemViewType; +import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler; import com.gh.common.util.CollectionUtils; -import com.gh.common.util.DialogHelper; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.ExtensionsKt; +import com.gh.gamecenter.common.utils.DialogHelper; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.baselist.ListAdapter; diff --git a/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java b/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java index 7b4b06a9c3..ed0272e4c7 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java @@ -5,8 +5,8 @@ import android.os.Bundle; import android.view.View; import com.gh.common.util.CollectionUtils; -import com.gh.common.util.EntranceUtils; -import com.gh.common.view.CustomDividerItemDecoration; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.view.CustomDividerItemDecoration; import com.gh.gamecenter.R; import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListFragment; @@ -45,7 +45,7 @@ public class AnswerFragment extends ListFragment @Override public void onCreate(@Nullable Bundle savedInstanceState) { - mType = getArguments().getString(EntranceUtils.KEY_TYPE, COLLECTION); + mType = getArguments().getString(EntranceConsts.KEY_TYPE, COLLECTION); super.onCreate(savedInstanceState); mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.white)); } 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 2f7cca644c..b4532b7e0f 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/AnswerViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerViewModel.kt @@ -2,7 +2,7 @@ package com.gh.gamecenter.collection import android.annotation.SuppressLint import android.app.Application -import com.gh.common.AppExecutor +import com.gh.gamecenter.core.AppExecutor import com.gh.common.history.HistoryDatabase import com.gh.common.history.HistoryHelper import com.gh.gamecenter.baselist.ListViewModel 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 ab2583d564..2d80242edf 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java @@ -12,14 +12,14 @@ import android.view.WindowManager; import android.widget.LinearLayout; import android.widget.PopupWindow; -import com.gh.base.OnListClickListener; -import com.gh.common.constant.ItemViewType; -import com.gh.common.util.DialogHelper; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.ExtensionsKt; -import com.gh.common.util.ImageUtils; +import com.gh.gamecenter.common.callback.OnListClickListener; +import com.gh.gamecenter.common.constant.ItemViewType; +import com.gh.gamecenter.common.utils.DialogHelper; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.common.util.NewsUtils; -import com.gh.common.util.NumberUtils; +import com.gh.gamecenter.core.utils.NumberUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsImage1ViewHolder; diff --git a/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java b/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java index 85bf1d5373..86ad879aaf 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java @@ -6,9 +6,9 @@ import android.view.View; import com.gh.common.util.CollectionUtils; import com.gh.common.util.DataCollectionUtils; -import com.gh.common.util.DialogHelper; -import com.gh.common.util.EntranceUtils; -import com.gh.common.view.CustomDividerItemDecoration; +import com.gh.gamecenter.common.utils.DialogHelper; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.view.CustomDividerItemDecoration; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.baselist.ListAdapter; @@ -42,7 +42,7 @@ public class ArticleFragment extends ListFragment @Override public void onCreate(@Nullable Bundle savedInstanceState) { - mType = getArguments().getString(EntranceUtils.KEY_TYPE, COLLECTION); + mType = getArguments().getString(EntranceConsts.KEY_TYPE, COLLECTION); super.onCreate(savedInstanceState); mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.white)); } 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 56a5d41d3e..2ccd953e6a 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleViewModel.java @@ -2,10 +2,10 @@ package com.gh.gamecenter.collection; import android.app.Application; -import com.gh.common.AppExecutor; +import com.gh.gamecenter.core.AppExecutor; import com.gh.common.history.HistoryDatabase; import com.gh.common.history.HistoryHelper; -import com.gh.common.util.UrlFilterUtils; +import com.gh.gamecenter.core.utils.UrlFilterUtils; import com.gh.gamecenter.baselist.ListViewModel; import com.gh.gamecenter.baselist.LoadType; import com.gh.gamecenter.entity.NewsEntity; diff --git a/app/src/main/java/com/gh/gamecenter/collection/CollectionCommunityArticleViewHolder.kt b/app/src/main/java/com/gh/gamecenter/collection/CollectionCommunityArticleViewHolder.kt index 2007478ccc..042f7ec251 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CollectionCommunityArticleViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/CollectionCommunityArticleViewHolder.kt @@ -1,6 +1,7 @@ package com.gh.gamecenter.collection -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.databinding.CollectionComunityArticleItemBinding -class CollectionCommunityArticleViewHolder(val binding: CollectionComunityArticleItemBinding):BaseRecyclerViewHolder(binding.root) +class CollectionCommunityArticleViewHolder(val binding: CollectionComunityArticleItemBinding): + BaseRecyclerViewHolder(binding.root) diff --git a/app/src/main/java/com/gh/gamecenter/collection/CollectionWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/collection/CollectionWrapperFragment.java index d62ac44944..368a5cae60 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CollectionWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/CollectionWrapperFragment.java @@ -3,15 +3,14 @@ package com.gh.gamecenter.collection; import android.os.Bundle; import android.view.View; -import com.gh.base.fragment.BaseFragment_TabLayout; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.R; import com.gh.gamecenter.manager.UserManager; import java.util.List; -import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; /** @@ -76,8 +75,8 @@ public class CollectionWrapperFragment extends BaseFragment_TabLayout { } else { gameCollectionArguments = new Bundle(); } - gameCollectionArguments.putString(EntranceUtils.KEY_USER_ID, UserManager.getInstance().getUserId()); - gameCollectionArguments.putString(EntranceUtils.KEY_TYPE, GamesCollectionFragment.TYPE_COLLECT); + gameCollectionArguments.putString(EntranceConsts.KEY_USER_ID, UserManager.getInstance().getUserId()); + gameCollectionArguments.putString(EntranceConsts.KEY_TYPE, GamesCollectionFragment.TYPE_COLLECT); fragments.add(new GamesCollectionFragment().with(gameCollectionArguments)); fragments.add(new ToolsFragment().with(getArguments())); diff --git a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt index 1d7765d312..91df199a22 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt @@ -9,12 +9,12 @@ import android.widget.LinearLayout import android.widget.PopupWindow import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType -import com.gh.common.syncpage.ISyncAdapterHandler -import com.gh.common.util.* +import com.gh.gamecenter.common.constant.ItemViewType +import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.databinding.CommunityAnswerItemBinding import com.gh.gamecenter.databinding.PopupHistoryOptionBinding import com.gh.gamecenter.entity.CommunityEntity diff --git a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt index 111b5b8ed0..f41fb0bf4b 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt @@ -4,10 +4,10 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.RecyclerView import com.gh.common.util.CollectionUtils -import com.gh.common.util.EntranceUtils -import com.gh.common.util.toColor -import com.gh.common.util.toDrawable -import com.gh.common.view.CustomDividerItemDecoration +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.common.view.CustomDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.baselist.LoadType @@ -25,7 +25,7 @@ class CommunityArticleFragment : ListFragment(), IBatchDelet override fun onCreate(savedInstanceState: Bundle?) { mVideoStyle = requireArguments().getString("videoStyle") ?: "" - mIsInsertBbsVideo = requireArguments().getBoolean(EntranceUtils.KEY_INSERT_BBS_VIDEO) + mIsInsertBbsVideo = requireArguments().getBoolean(EntranceConsts.KEY_INSERT_BBS_VIDEO) super.onCreate(savedInstanceState) mListRv.setPadding(8f.dip2px(), 0, 8f.dip2px(), 0) } 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 60d5c4d76e..b897744744 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/VideoViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/VideoViewModel.kt @@ -1,11 +1,11 @@ package com.gh.gamecenter.collection import android.app.Application -import com.gh.common.AppExecutor +import com.gh.gamecenter.core.AppExecutor import com.gh.common.constant.Config import com.gh.common.history.HistoryDatabase import com.gh.common.history.HistoryHelper -import com.gh.common.util.UrlFilterUtils +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.entity.MyVideoEntity 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 4973752dc5..6e7d87a6fa 100644 --- a/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt @@ -8,10 +8,10 @@ import android.view.ViewGroup import android.widget.LinearLayout import android.widget.TextView import androidx.fragment.app.Fragment -import com.gh.base.fragment.BaseFragment_TabLayout +import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout import com.gh.common.util.HomePluggableHelper -import com.gh.common.util.dip2px -import com.gh.common.util.visibleIf +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.visibleIf import com.gh.download.DownloadManager import com.gh.gamecenter.DownloadManagerActivity import com.gh.gamecenter.R @@ -19,7 +19,7 @@ import com.gh.gamecenter.databinding.TabItemDownloadNumberBinding import com.gh.gamecenter.entity.HomePluggableFilterEntity import com.gh.gamecenter.entity.PluginLocation import com.gh.gamecenter.eventbus.EBDownloadChanged -import com.gh.gamecenter.eventbus.EBMiPush +import com.gh.gamecenter.common.eventbus.EBMiPush import com.gh.gamecenter.eventbus.EBSkip import com.gh.gamecenter.eventbus.EBUISwitch import com.gh.gamecenter.manager.PackagesManager diff --git a/app/src/main/java/com/gh/gamecenter/download/DownloadedGameIdAndPackageNameDao.kt b/app/src/main/java/com/gh/gamecenter/download/DownloadedGameIdAndPackageNameDao.kt index 969feaa1e3..e19115e401 100644 --- a/app/src/main/java/com/gh/gamecenter/download/DownloadedGameIdAndPackageNameDao.kt +++ b/app/src/main/java/com/gh/gamecenter/download/DownloadedGameIdAndPackageNameDao.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.download -import com.gh.base.BaseSimpleDao +import com.gh.gamecenter.common.base.BaseSimpleDao /** * 用来记录光环下载过什么包名和游戏ID间合集的一个简单类 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 2fbc732d2d..20ffe8f45c 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java @@ -13,11 +13,10 @@ import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.gh.base.fragment.BaseFragment; -import com.gh.common.util.DialogHelper; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.ExtensionsKt; -import com.gh.common.util.NetworkUtils; +import com.gh.gamecenter.common.base.fragment.BaseFragment; +import com.gh.gamecenter.common.utils.DialogHelper; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.utils.NetworkUtils; import com.gh.common.util.PackageUtils; import com.gh.common.xapk.XapkInstaller; import com.gh.common.xapk.XapkUnzipStatus; @@ -25,9 +24,10 @@ import com.gh.download.DownloadManager; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.R; +import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.databinding.DownloadmanagerBinding; import com.gh.gamecenter.eventbus.EBDownloadChanged; -import com.gh.gamecenter.eventbus.EBMiPush; +import com.gh.gamecenter.common.eventbus.EBMiPush; import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.fragment.MainWrapperFragment; @@ -215,8 +215,8 @@ public class GameDownloadFragment extends BaseFragment implements View.OnClickLi @Override protected void initView(View view) { super.initView(view); - String path = getActivity().getIntent().getStringExtra(EntranceUtils.KEY_PATH); - url = getActivity().getIntent().getStringExtra(EntranceUtils.KEY_URL); + String path = getActivity().getIntent().getStringExtra(EntranceConsts.KEY_PATH); + url = getActivity().getIntent().getStringExtra(EntranceConsts.KEY_URL); isScroll = false; 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 20e9f69415..a008c1cabd 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -9,18 +9,18 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; -import com.gh.common.constant.Constants; +import com.gh.gamecenter.common.constant.Constants; import com.gh.common.util.DataUtils; -import com.gh.common.util.DialogHelper; +import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.common.util.DialogUtils; -import com.gh.common.util.ExtensionsKt; -import com.gh.common.util.ImageUtils; -import com.gh.common.util.NetworkUtils; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.common.utils.NetworkUtils; import com.gh.common.util.PackageInstaller; import com.gh.common.util.PackageUtils; -import com.gh.common.util.PermissionHelper; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.common.utils.PermissionHelper; import com.gh.common.util.PlatformUtils; -import com.gh.common.util.SpeedUtils; +import com.gh.gamecenter.core.utils.SpeedUtils; import com.gh.common.xapk.XapkInstaller; import com.gh.common.xapk.XapkUnzipStatus; import com.gh.download.DownloadManager; diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java index 6d74fc2020..93bbad16fa 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java @@ -9,9 +9,9 @@ import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.LinearLayoutManager; -import com.gh.base.fragment.BaseFragment; +import com.gh.gamecenter.common.base.fragment.BaseFragment; import com.gh.common.exposure.ExposureListener; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.databinding.GameupdateBinding; import com.gh.gamecenter.eventbus.EBDownloadStatus; @@ -62,8 +62,8 @@ public class GameUpdateFragment extends BaseFragment { protected void initView(View view) { super.initView(view); Intent intent = getActivity().getIntent(); - String packageName = intent.getStringExtra(EntranceUtils.KEY_PACKAGENAME); - String entrance = intent.getStringExtra(EntranceUtils.KEY_ENTRANCE); + String packageName = intent.getStringExtra(EntranceConsts.KEY_PACKAGENAME); + String entrance = intent.getStringExtra(EntranceConsts.KEY_ENTRANCE); mBinding.reuseNodataSkip.getRoot().setVisibility(View.GONE); mBinding.reuseNodataSkip.reuseNodataSkipTvHint.setText("暂无更新"); 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 a3d36c179f..c0c3bb5f79 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -12,8 +12,9 @@ import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.ViewHolder; -import com.gh.common.AppExecutor; -import com.gh.common.constant.Constants; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.AppExecutor; +import com.gh.gamecenter.common.constant.Constants; import com.gh.common.databind.BindingAdapters; import com.gh.common.exposure.ExposureEvent; import com.gh.common.exposure.ExposureSource; @@ -24,18 +25,17 @@ import com.gh.common.history.HistoryHelper; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; -import com.gh.common.util.DialogHelper; +import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.common.util.DialogUtils; -import com.gh.common.util.ExtensionsKt; -import com.gh.common.util.GsonUtils; -import com.gh.common.util.ImageUtils; -import com.gh.common.util.NetworkUtils; +import com.gh.gamecenter.core.utils.GsonUtils; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.common.utils.NetworkUtils; import com.gh.common.util.PackageInstaller; import com.gh.common.util.PackageUtils; -import com.gh.common.util.PermissionHelper; +import com.gh.gamecenter.common.utils.PermissionHelper; import com.gh.common.util.PlatformUtils; -import com.gh.common.util.StringUtils; -import com.gh.common.util.UrlFilterUtils; +import com.gh.gamecenter.core.utils.StringUtils; +import com.gh.gamecenter.core.utils.UrlFilterUtils; import com.gh.download.DownloadManager; import com.gh.download.dialog.DownloadDialog; import com.gh.gamecenter.DownloadManagerActivity; 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 1e09201327..ee4cb48dd5 100644 --- a/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragment.kt @@ -12,12 +12,12 @@ //import butterknife.BindView //import com.ethanhua.skeleton.Skeleton //import com.ethanhua.skeleton.ViewSkeletonScreen -//import com.gh.base.OnRequestCallBackListener +//import com.gh.gamecenter.common.callback.OnRequestCallBackListener //import com.gh.common.exposure.ExposureListener //import com.gh.common.util.DownloadItemUtils -//import com.gh.common.util.isSimulatorGame -//import com.gh.common.view.FixLinearLayoutManager -//import com.gh.common.view.VerticalItemDecoration +//import com.gh.gamecenter.common.utils.isSimulatorGame +//import com.gh.gamecenter.common.view.FixLinearLayoutManager +//import com.gh.gamecenter.common.view.VerticalItemDecoration //import com.gh.download.DownloadManager //import com.gh.gamecenter.MainActivity //import com.gh.gamecenter.R @@ -27,7 +27,7 @@ //import com.gh.gamecenter.eventbus.EBReuse //import com.gh.gamecenter.fragment.MainWrapperFragment //import com.gh.gamecenter.manager.PackagesManager -//import com.gh.gamecenter.normal.NormalFragment +//import com.gh.gamecenter.common.base.fragment.NormalFragment //import com.gh.gamecenter.packagehelper.PackageViewModel //import com.lightgame.download.DataWatcher //import com.lightgame.download.DownloadEntity 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 c78285bc46..4795650f6f 100644 --- a/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragmentAdapter.java @@ -4,7 +4,7 @@ //import android.view.View; //import android.view.ViewGroup; // -//import com.gh.common.constant.ItemViewType; +//import com.gh.gamecenter.common.constant.ItemViewType; //import com.gh.common.exposure.ExposureEvent; //import com.gh.common.exposure.ExposureSource; //import com.gh.common.exposure.ExposureType; @@ -18,7 +18,7 @@ //import com.gh.common.util.GameUtils; //import com.gh.common.util.PackageUtils; //import com.gh.common.util.PlatformUtils; -//import com.gh.common.util.ThirdPartyPackageHelper; +//import com.gh.gamecenter.core.utils.ThirdPartyPackageHelper; //import com.gh.download.DownloadManager; //import com.gh.gamecenter.GameDetailActivity; //import com.gh.gamecenter.R; diff --git a/app/src/main/java/com/gh/gamecenter/download/InstalledGameViewModel.kt b/app/src/main/java/com/gh/gamecenter/download/InstalledGameViewModel.kt index 5ddf547b66..2959f3c6d6 100644 --- a/app/src/main/java/com/gh/gamecenter/download/InstalledGameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/download/InstalledGameViewModel.kt @@ -9,7 +9,7 @@ import com.gh.common.filter.RegionSettingHelper.shouldThisGameBeFiltered import com.gh.common.util.ApkActiveUtils import com.gh.common.util.GameUtils import com.gh.common.util.PackageUtils -import com.gh.common.util.ThirdPartyPackageHelper.getGameId +import com.gh.gamecenter.core.utils.ThirdPartyPackageHelper.getGameId import com.gh.download.DownloadManager import com.gh.gamecenter.entity.ApkEntity import com.gh.gamecenter.entity.GameEntity 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 f7eb57096d..42951d6403 100644 --- a/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt @@ -1,7 +1,6 @@ package com.gh.gamecenter.download import android.annotation.SuppressLint -import android.graphics.Color import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider @@ -10,10 +9,10 @@ import com.ethanhua.skeleton.Skeleton import com.ethanhua.skeleton.ViewSkeletonScreen import com.gh.common.exposure.ExposureListener import com.gh.common.util.DownloadItemUtils -import com.gh.common.util.isSimulatorGame -import com.gh.common.util.toColor -import com.gh.common.view.FixLinearLayoutManager -import com.gh.common.view.VerticalItemDecoration +import com.gh.gamecenter.common.utils.isSimulatorGame +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.view.FixLinearLayoutManager +import com.gh.gamecenter.common.view.VerticalItemDecoration import com.gh.download.DownloadManager import com.gh.gamecenter.MainActivity import com.gh.gamecenter.R @@ -24,7 +23,7 @@ import com.gh.gamecenter.eventbus.EBDownloadStatus import com.gh.gamecenter.eventbus.EBReuse import com.gh.gamecenter.fragment.MainWrapperFragment import com.gh.gamecenter.manager.PackagesManager -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.gh.gamecenter.packagehelper.PackageViewModel import com.lightgame.download.DataWatcher import com.lightgame.download.DownloadEntity diff --git a/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragmentAdapter.kt index 08012c0dd1..ba5aeaa2e4 100644 --- a/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragmentAdapter.kt @@ -7,7 +7,7 @@ import android.view.ViewGroup import androidx.core.graphics.drawable.toBitmap import androidx.core.graphics.drawable.toDrawable import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureEvent.Companion.createEvent import com.gh.common.exposure.ExposureSource @@ -21,6 +21,7 @@ import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.GameViewHolder +import com.gh.gamecenter.common.utils.safelyGetInRelease import com.gh.gamecenter.databinding.GameItemBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.game.GameItemViewHolder 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 ea1cd202f1..8d59644f41 100644 --- a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt @@ -11,17 +11,18 @@ import androidx.core.content.ContextCompat import androidx.core.view.setPadding import androidx.fragment.app.FragmentActivity import androidx.recyclerview.widget.RecyclerView -import com.gh.base.CurrentActivityHolder +import com.gh.gamecenter.core.utils.CurrentActivityHolder import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureEvent.Companion.createEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable import com.gh.common.util.* -import com.gh.common.view.BugFixedPopupWindow +import com.gh.gamecenter.common.view.BugFixedPopupWindow import com.gh.download.DownloadManager import com.gh.download.dialog.DownloadDialog import com.gh.gamecenter.DownloadManagerActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.databinding.* import com.gh.gamecenter.entity.GameUpdateEntity import com.gh.gamecenter.eventbus.EBSkip diff --git a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameFragment.kt b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameFragment.kt index ef8b727847..7d7ef14188 100644 --- a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameFragment.kt @@ -1,13 +1,13 @@ package com.gh.gamecenter.download import android.view.View -import com.gh.base.fragment.LazyFragment +import com.gh.gamecenter.common.base.fragment.LazyFragment import com.gh.common.exposure.ExposureListener -import com.gh.common.util.EntranceUtils -import com.gh.common.util.goneIf -import com.gh.common.util.observeNonNull -import com.gh.common.util.viewModelProvider -import com.gh.common.view.FixLinearLayoutManager +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.common.view.FixLinearLayoutManager import com.gh.gamecenter.MainActivity import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentGameUpdatableBinding @@ -31,8 +31,8 @@ class UpdatableGameFragment : LazyFragment() { } override fun onFragmentFirstVisible() { - val packageName = activity?.intent?.getStringExtra(EntranceUtils.KEY_PACKAGENAME) ?: "" - val entrance = activity?.intent?.getStringExtra(EntranceUtils.KEY_ENTRANCE) ?: "" + val packageName = activity?.intent?.getStringExtra(EntranceConsts.KEY_PACKAGENAME) ?: "" + val entrance = activity?.intent?.getStringExtra(EntranceConsts.KEY_ENTRANCE) ?: "" mViewModel = viewModelProvider(UpdatableGameViewModel.Factory(packageName, entrance)) 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 974d7a6d2c..e923b3e17d 100644 --- a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameViewModel.kt @@ -3,16 +3,21 @@ package com.gh.gamecenter.download import android.app.Application import android.view.View import androidx.lifecycle.* -import com.gh.base.BaseSimpleDao -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.base.BaseSimpleDao +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureUtils import com.gh.common.exposure.ExposureUtils.logADownloadExposureEvent import com.gh.common.history.HistoryHelper.insertGameEntity import com.gh.common.util.* -import com.gh.common.util.GsonUtils.toJson +import com.gh.gamecenter.core.utils.GsonUtils.toJson import com.gh.common.util.PackageInstaller.createDownloadId import com.gh.common.util.PackageInstaller.getDownloadPathWithId import com.gh.download.DownloadManager +import com.gh.gamecenter.common.utils.addMetaExtra +import com.gh.gamecenter.common.utils.secondOrNull +import com.gh.gamecenter.common.utils.toProperReadableSize +import com.gh.gamecenter.common.utils.tryCatchInRelease +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.GameUpdateEntity import com.gh.gamecenter.entity.PluginLocation diff --git a/app/src/main/java/com/gh/gamecenter/energy/CommodityAdapter.kt b/app/src/main/java/com/gh/gamecenter/energy/CommodityAdapter.kt index 3242cf4626..866c2ca002 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/CommodityAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/CommodityAdapter.kt @@ -6,13 +6,15 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.StaggeredGridLayoutManager -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.exposure.time.TimeUtil import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.CommodityItemBinding import com.gh.gamecenter.entity.CommodityCategoryEntity import com.gh.gamecenter.entity.CommodityEntity diff --git a/app/src/main/java/com/gh/gamecenter/energy/CommodityFragment.kt b/app/src/main/java/com/gh/gamecenter/energy/CommodityFragment.kt index 42f4074d0d..0c48ed228d 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/CommodityFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/CommodityFragment.kt @@ -9,10 +9,15 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.StaggeredGridLayoutManager import com.gh.common.util.* -import com.gh.common.util.NumberUtils.findMax +import com.gh.gamecenter.core.utils.NumberUtils.findMax import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.baselist.LoadType +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.layoutInflater +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.databinding.FragmentCommodityListBinding import com.gh.gamecenter.databinding.ItemFilterCommodityCategoryBinding import com.gh.gamecenter.databinding.LayoutFilterCategoryBinding @@ -39,8 +44,8 @@ class CommodityFragment : ListFragment() { override fun getInflatedLayout() = FragmentCommodityListBinding.inflate(layoutInflater).apply { mBinding = this }.root override fun provideListViewModel(): CommodityViewModel { - mEntrance = requireArguments().getString(EntranceUtils.KEY_ENTRANCE) ?: "" - mCategory = requireArguments().getParcelable(EntranceUtils.KEY_CATEGORY) + mEntrance = requireArguments().getString(EntranceConsts.KEY_ENTRANCE) ?: "" + mCategory = requireArguments().getParcelable(EntranceConsts.KEY_CATEGORY) val factory = CommodityViewModel.Factory(mCategory?.id ?: "", mEntrance) return viewModelProvider(factory) } @@ -62,7 +67,7 @@ class CommodityFragment : ListFragment() { rightMargin = 12F.dip2px() } - requireArguments().getParcelableArrayList(EntranceUtils.KEY_CATEGORY_LIST)?.run { + requireArguments().getParcelableArrayList(EntranceConsts.KEY_CATEGORY_LIST)?.run { mCategoryList = this mCategoryItemWidth = (resources.displayMetrics.widthPixels - ((14F * 2 + 8F * 4 + 28F).dip2px())) / 4 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 28f4b4a0db..1963425595 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/CommodityViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/CommodityViewModel.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.energy import android.app.Application import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.gh.common.util.UrlFilterUtils +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadParams import com.gh.gamecenter.entity.CommodityEntity diff --git a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterActivity.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterActivity.kt index ac81cc2502..317351c499 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterActivity.kt @@ -4,8 +4,8 @@ import android.content.Context import android.content.Intent import android.os.Build import android.os.Bundle -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity class EnergyCenterActivity : NormalActivity() { @@ -29,7 +29,7 @@ class EnergyCenterActivity : NormalActivity() { fun getIntent(context: Context?, initTabIndex: Int): Intent? { val bundle = Bundle() - bundle.putInt(EntranceUtils.KEY_TAB_INDEX, if (initTabIndex == 0 || initTabIndex == 1) initTabIndex else 0) + bundle.putInt(EntranceConsts.KEY_TAB_INDEX, if (initTabIndex == 0 || initTabIndex == 1) initTabIndex else 0) return getTargetIntent(context, EnergyCenterActivity::class.java, EnergyCenterFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt index 55262c46fd..cab94da5ca 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt @@ -8,10 +8,14 @@ import android.view.LayoutInflater import android.view.View import android.widget.* import androidx.fragment.app.Fragment -import com.gh.base.adapter.FragmentAdapter -import com.gh.base.fragment.BaseLazyFragment +import com.gh.gamecenter.common.base.adapter.FragmentAdapter +import com.gh.gamecenter.common.base.fragment.BaseLazyFragment import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentEnergyCenterBinding import com.gh.gamecenter.databinding.TabItemMainBinding import com.gh.gamecenter.entity.CommodityCategoryEntity @@ -34,7 +38,7 @@ class EnergyCenterFragment : BaseLazyFragment() { private val mTitleList = listOf("赚光能", "兑换区") private var mTabList = arrayListOf() private var mFragmentsList = ArrayList() - private var mCategoryList = ArrayList() + private var mCategoryList = ArrayList() private var mUserInfo: UserInfoEntity? = null private var mEnergy = 0L private var mSignStatus: SignStatusEntity? = null @@ -60,7 +64,7 @@ class EnergyCenterFragment : BaseLazyFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mInitTabIndex = arguments?.getInt(EntranceUtils.KEY_TAB_INDEX) ?: 0 + mInitTabIndex = arguments?.getInt(EntranceConsts.KEY_TAB_INDEX) ?: 0 if (mInitTabIndex != 0 && mInitTabIndex != 1) mInitTabIndex = 0 mEnergyCenterViewModel = viewModelProvider() @@ -104,10 +108,12 @@ class EnergyCenterFragment : BaseLazyFragment() { mUserHomeViewModel?.sign?.observeNonNull(this) { mSignStatus = it - DialogUtils.showSignSuccessDialog(requireContext()) { - mUserHomeViewModel?.getUserEnergy() - refreshTaskList() - } + DialogUtils.showSignSuccessDialog(requireContext(), object : ConfirmListener { + override fun onConfirm() { + mUserHomeViewModel?.getUserEnergy() + refreshTaskList() + } + }) } mUserHomeViewModel?.signStatus?.observeNonNull(this) { @@ -131,15 +137,15 @@ class EnergyCenterFragment : BaseLazyFragment() { Build.VERSION.SDK_INT >= Build.VERSION_CODES.R -> { DisplayMetrics() - .apply { requireActivity().display?.getRealMetrics(this) } - .heightPixels + .apply { requireActivity().display?.getRealMetrics(this) } + .heightPixels } else -> { @Suppress("DEPRECATION") DisplayMetrics() - .apply { requireActivity().windowManager.defaultDisplay.getRealMetrics(this) } - .heightPixels + .apply { requireActivity().windowManager.defaultDisplay.getRealMetrics(this) } + .heightPixels } } @@ -197,48 +203,49 @@ class EnergyCenterFragment : BaseLazyFragment() { val tag = "android:switcher:${viewpager.id}:" val taskFragment = childFragmentManager.findFragmentByTag("${tag}0") ?: TaskFragment() val commodityListFragment = childFragmentManager.findFragmentByTag("${tag}1") - ?: CommodityFragment().apply { - val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_ENTRANCE, "光能中心") - if (mCategoryList.isNotEmpty()) { - bundle.putParcelable(EntranceUtils.KEY_CATEGORY, mCategoryList[0]) - bundle.putParcelableArrayList(EntranceUtils.KEY_CATEGORY_LIST, mCategoryList) - } - arguments = bundle + ?: CommodityFragment().apply { + val bundle = Bundle() + bundle.putString(EntranceConsts.KEY_ENTRANCE, "光能中心") + if (mCategoryList.isNotEmpty()) { + bundle.putParcelable(EntranceConsts.KEY_CATEGORY, mCategoryList[0]) + bundle.putParcelableArrayList(EntranceConsts.KEY_CATEGORY_LIST, mCategoryList) } + arguments = bundle + } mFragmentsList.add(taskFragment) mFragmentsList.add(commodityListFragment) viewpager.offscreenPageLimit = mFragmentsList.size - viewpager.adapter = FragmentAdapter(childFragmentManager, mFragmentsList, mTitleList) + viewpager.adapter = + FragmentAdapter(childFragmentManager, mFragmentsList, mTitleList) viewpager.doOnScroll( - onPageSelected = { position -> - updateTabTextStyle(position, 0F) - }, - onPageScrolled = { position, positionOffset, _ -> - if (position + 1 != mTabList.size) { - mTabList[position].run { - textSize = (DEFAULT_TAB_TEXT_SIZE + ((1 - positionOffset) * 4)).roundTo(1) + onPageSelected = { position -> + updateTabTextStyle(position, 0F) + }, + onPageScrolled = { position, positionOffset, _ -> + if (position + 1 != mTabList.size) { + mTabList[position].run { + textSize = (DEFAULT_TAB_TEXT_SIZE + ((1 - positionOffset) * 4)).roundTo(1) // setTextColor(ColorUtils.blendARGB(TAB_DEFAULT_COLOR, TAB_SELECTED_COLOR, 1 - positionOffset)) - } - mTabList[position + 1].run { - textSize = (DEFAULT_TAB_TEXT_SIZE + ((positionOffset) * 4)).roundTo(1) + } + mTabList[position + 1].run { + textSize = (DEFAULT_TAB_TEXT_SIZE + ((positionOffset) * 4)).roundTo(1) // setTextColor(ColorUtils.blendARGB(TAB_DEFAULT_COLOR, TAB_SELECTED_COLOR, positionOffset)) - } + } - // 多 tab 切换的时候可能会出现某些 tab 的文字没有回归到原始大小的问题的问题 (positionOffset 不保证连续) - for ((index, tabTv) in mTabList.withIndex()) { - if (abs(index - position) >= 2) { - if (tabTv.textSize != DEFAULT_TAB_TEXT_SIZE) { - tabTv.textSize = DEFAULT_TAB_TEXT_SIZE + // 多 tab 切换的时候可能会出现某些 tab 的文字没有回归到原始大小的问题的问题 (positionOffset 不保证连续) + for ((index, tabTv) in mTabList.withIndex()) { + if (abs(index - position) >= 2) { + if (tabTv.textSize != DEFAULT_TAB_TEXT_SIZE) { + tabTv.textSize = DEFAULT_TAB_TEXT_SIZE // tabTv.setTextColor(TAB_DEFAULT_COLOR) - } } } } - - updateTabTextStyle(position, positionOffset) } + + updateTabTextStyle(position, positionOffset) + } ) tabLayout.setupWithViewPager(viewpager) diff --git a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseActivity.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseActivity.kt index 66995f63e3..55586c0ba3 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseActivity.kt @@ -3,8 +3,8 @@ package com.gh.gamecenter.energy import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity class EnergyHouseActivity : NormalActivity() { @@ -21,7 +21,7 @@ class EnergyHouseActivity : NormalActivity() { fun getIntent(context: Context?, categoryId: String? = null): Intent? { if (categoryId != null) { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_CATEGORY_ID, categoryId) + bundle.putString(EntranceConsts.KEY_CATEGORY_ID, categoryId) return getTargetIntent(context, EnergyHouseActivity::class.java, EnergyHouseFragment::class.java, bundle) } return getTargetIntent(context, EnergyHouseActivity::class.java, EnergyHouseFragment::class.java) diff --git a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt index dcd31cc58d..aae27390bb 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt @@ -11,9 +11,11 @@ import android.widget.TextView import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentStatePagerAdapter -import com.gh.base.fragment.BaseLazyFragment +import com.gh.gamecenter.common.base.fragment.BaseLazyFragment import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.databinding.FragmentEnergyHouseBinding import com.gh.gamecenter.databinding.TabItemCommodityBinding import com.gh.gamecenter.entity.CommodityCategoryEntity @@ -62,7 +64,7 @@ class EnergyHouseFragment: BaseLazyFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mCategoryId = arguments?.getString(EntranceUtils.KEY_CATEGORY_ID) ?: "" + mCategoryId = arguments?.getString(EntranceConsts.KEY_CATEGORY_ID) ?: "" mEnergyHouseViewModel = viewModelProvider() mUserViewModel = viewModelProvider(UserViewModel.Factory(HaloApp.getInstance().application)) mUserHomeViewModel = viewModelProvider(UserHomeViewModel.Factory(HaloApp.getInstance().application, UserManager.getInstance().userId)) @@ -185,8 +187,8 @@ class EnergyHouseFragment: BaseLazyFragment() { mTitleList.add(entity.name) val commodityListFragment = childFragmentManager.findFragmentByTag("$tag$index") ?: CommodityFragment().with(bundleOf( - EntranceUtils.KEY_ENTRANCE to "光能屋", - EntranceUtils.KEY_CATEGORY to entity)) + EntranceConsts.KEY_ENTRANCE to "光能屋", + EntranceConsts.KEY_CATEGORY to entity)) mFragments.add(commodityListFragment) } diff --git a/app/src/main/java/com/gh/gamecenter/energy/HorizontalTaskAdapter.kt b/app/src/main/java/com/gh/gamecenter/energy/HorizontalTaskAdapter.kt index b96f9a67d6..fc8749953c 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/HorizontalTaskAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/HorizontalTaskAdapter.kt @@ -3,9 +3,14 @@ package com.gh.gamecenter.energy import android.content.Context import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.utils.toResString +import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.databinding.NoviceTaskItemBinding import com.gh.gamecenter.entity.TaskEntity import com.gh.gamecenter.gamedetail.dialog.InviteCodeDialog diff --git a/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt b/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt index 12112cc19c..3692ae7f94 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt @@ -6,13 +6,15 @@ import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.LoadStatus +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.DailyTaskItemBinding import com.gh.gamecenter.databinding.NoviceTasksItemBinding import com.gh.gamecenter.databinding.TaskBottomItemBinding diff --git a/app/src/main/java/com/gh/gamecenter/energy/TaskFragment.kt b/app/src/main/java/com/gh/gamecenter/energy/TaskFragment.kt index f84aa14668..e657baacc7 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/TaskFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/TaskFragment.kt @@ -1,9 +1,9 @@ package com.gh.gamecenter.energy import android.os.Bundle -import com.gh.common.util.ClickUtils -import com.gh.common.util.safelyGetInRelease -import com.gh.common.util.viewModelProvider +import com.gh.gamecenter.core.utils.ClickUtils +import com.gh.gamecenter.common.utils.safelyGetInRelease +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.eventbus.EBTask diff --git a/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt index 70693a2c2c..b258c49336 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.entity import android.os.Parcelable -import com.gh.common.annotation.SyncPage -import com.gh.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.common.annotation.SyncPage +import com.gh.gamecenter.common.syncpage.SyncFieldConstants import com.google.gson.annotations.SerializedName import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt index aed63a3647..9238164299 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.entity import android.os.Parcelable import android.text.TextUtils import com.gh.common.constant.Config -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureEvent import com.gh.common.filter.RegionSettingHelper import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/entity/MeEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/MeEntity.kt index 6c0bd137db..13fb3f8e01 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/MeEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/MeEntity.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.entity import android.os.Parcelable -import com.gh.common.annotation.SyncPage -import com.gh.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.common.annotation.SyncPage +import com.gh.gamecenter.common.syncpage.SyncFieldConstants import com.gh.gamecenter.qa.entity.ArticleDraftEntity import com.gh.gamecenter.qa.entity.QuestionDraftEntity import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/gh/gamecenter/entity/MessageUnreadEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/MessageUnreadEntity.kt index b4c7e4b094..fd8b4c51a0 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/MessageUnreadEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/MessageUnreadEntity.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.entity -import com.gh.common.util.tryWithDefaultCatch +import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.google.gson.annotations.SerializedName import java.util.* diff --git a/app/src/main/java/com/gh/gamecenter/entity/PersonalHistoryEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/PersonalHistoryEntity.kt index 9b1b345eb8..c05e01b1c8 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/PersonalHistoryEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/PersonalHistoryEntity.kt @@ -2,11 +2,11 @@ package com.gh.gamecenter.entity import android.os.Parcel import android.os.Parcelable -import com.gh.common.annotation.SyncPage -import com.gh.common.constant.Constants -import com.gh.common.syncpage.SyncFieldConstants -import com.gh.common.util.SPUtils -import com.gh.common.util.TimeUtils +import com.gh.gamecenter.common.annotation.SyncPage +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.core.utils.TimeUtils import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.entity.AnswerEntity import com.gh.gamecenter.qa.entity.CommunityVideoEntity diff --git a/app/src/main/java/com/gh/gamecenter/entity/RatingComment.kt b/app/src/main/java/com/gh/gamecenter/entity/RatingComment.kt index f092c04d1f..6aa421f247 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/RatingComment.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/RatingComment.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.entity import android.os.Parcelable -import com.gh.common.annotation.Synchronize +import com.gh.gamecenter.common.annotation.Synchronize import com.google.gson.annotations.SerializedName import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt index 651f5a27d0..a62a1b395c 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt @@ -7,11 +7,11 @@ import android.widget.LinearLayout import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.base.BaseActivity -import com.gh.common.constant.ItemViewType -import com.gh.common.syncpage.ISyncAdapterHandler -import com.gh.common.util.MtaHelper +import com.gh.gamecenter.common.constant.ItemViewType +import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.common.util.NewLogUtils -import com.gh.common.util.dip2px +import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt index 49e147e2db..9881f252bf 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt @@ -6,12 +6,18 @@ import android.view.View import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.ethanhua.skeleton.Skeleton -import com.gh.common.AppExecutor -import com.gh.common.constant.Constants +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* -import com.gh.common.view.divider.HorizontalDividerItemDecoration +import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.LazyListFragment +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.safelyGetInRelease +import com.gh.gamecenter.common.utils.tryCatchInRelease +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.core.utils.MD5Utils import com.gh.gamecenter.databinding.FragmentListBaseSkeletonBinding import com.gh.gamecenter.eventbus.EBDeleteDetail import com.gh.gamecenter.eventbus.EBTypeChange @@ -62,8 +68,8 @@ class ForumArticleAskListFragment : LazyListFragment { - return Pair(intent.getStringExtra(EntranceUtils.KEY_BBS_ID) ?: "", "") + return Pair(intent.getStringExtra(EntranceConsts.KEY_BBS_ID) ?: "", "") } override fun preventRecreateFragmentByFragmentManager(): Boolean = true @@ -38,8 +38,8 @@ class ForumDetailActivity : BaseActivity() { @JvmStatic fun getIntent(context: Context, bbsId: String, entrance: String): Intent { val intent = Intent(context, ForumDetailActivity::class.java) - intent.putExtra(EntranceUtils.KEY_BBS_ID, bbsId) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance) + intent.putExtra(EntranceConsts.KEY_BBS_ID, bbsId) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt index 4eaa776a8d..dc73f1d581 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt @@ -27,14 +27,18 @@ import com.facebook.drawee.drawable.ScalingUtils import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder import com.facebook.drawee.generic.RoundingParams import com.facebook.drawee.view.SimpleDraweeView -import com.gh.base.fragment.BaseLazyTabFragment -import com.gh.common.constant.Constants -import com.gh.common.dialog.TrackableDialog -import com.gh.common.runOnUiThread +import com.gh.gamecenter.common.base.fragment.BaseLazyTabFragment +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.base.TrackableDialog +import com.gh.gamecenter.core.runOnUiThread import com.gh.common.util.* import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.NewsDetailActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.callback.BiCallback +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentForumDetailBinding import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.EBForumFollowChange @@ -76,26 +80,26 @@ class ForumDetailFragment : BaseLazyTabFragment() { override fun initFragmentList(fragments: MutableList) { mAllForumArticleAskListFragment = ForumArticleAskListFragment().with( bundleOf( - EntranceUtils.KEY_ENTRANCE to "论坛详情", - EntranceUtils.KEY_PATH to "全部", EntranceUtils.KEY_BBS_ID to bbsId + EntranceConsts.KEY_ENTRANCE to "论坛详情", + EntranceConsts.KEY_PATH to "全部", EntranceConsts.KEY_BBS_ID to bbsId ) ) as ForumArticleAskListFragment? mEssenceForumArticleAskListFragment = ForumArticleAskListFragment().with( bundleOf( - EntranceUtils.KEY_ENTRANCE to "论坛详情", - EntranceUtils.KEY_PATH to "精华", EntranceUtils.KEY_BBS_ID to bbsId + EntranceConsts.KEY_ENTRANCE to "论坛详情", + EntranceConsts.KEY_PATH to "精华", EntranceConsts.KEY_BBS_ID to bbsId ) ) as ForumArticleAskListFragment? mAskForumArticleAskListFragment = ForumArticleAskListFragment().with( bundleOf( - EntranceUtils.KEY_ENTRANCE to "论坛详情", - EntranceUtils.KEY_PATH to "问答", EntranceUtils.KEY_BBS_ID to bbsId + EntranceConsts.KEY_ENTRANCE to "论坛详情", + EntranceConsts.KEY_PATH to "问答", EntranceConsts.KEY_BBS_ID to bbsId ) ) as ForumArticleAskListFragment? mVideoForumArticleAskListFragment = ForumArticleAskListFragment().with( bundleOf( - EntranceUtils.KEY_ENTRANCE to "论坛详情", - EntranceUtils.KEY_PATH to "视频", EntranceUtils.KEY_BBS_ID to bbsId + EntranceConsts.KEY_ENTRANCE to "论坛详情", + EntranceConsts.KEY_PATH to "视频", EntranceConsts.KEY_BBS_ID to bbsId ) ) as ForumArticleAskListFragment? fragments.add(mAllForumArticleAskListFragment!!) @@ -105,7 +109,7 @@ class ForumDetailFragment : BaseLazyTabFragment() { } override fun restoreFragment(fragment: Fragment) { - when (fragment.arguments?.getString(EntranceUtils.KEY_PATH)) { + when (fragment.arguments?.getString(EntranceConsts.KEY_PATH)) { "全部" -> { mAllForumArticleAskListFragment = fragment as ForumArticleAskListFragment } @@ -135,7 +139,7 @@ class ForumDetailFragment : BaseLazyTabFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - bbsId = arguments?.getString(EntranceUtils.KEY_BBS_ID, "") ?: "" + bbsId = arguments?.getString(EntranceConsts.KEY_BBS_ID, "") ?: "" val factory = ForumDetailViewModel.Factory(bbsId) mViewModel = viewModelProvider(factory) mViewModel?.forumDetail?.observe(this, Observer { 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 f24c4109cc..b01b6c2c09 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 @@ -3,7 +3,10 @@ package com.gh.gamecenter.forum.detail import android.annotation.SuppressLint import android.app.Application import androidx.lifecycle.* -import com.gh.common.util.* +import com.gh.gamecenter.common.utils.clearHtmlFormatCompletely +import com.gh.gamecenter.common.utils.observableToMain +import com.gh.gamecenter.common.utils.removeVideoContent +import com.gh.gamecenter.common.utils.singleToMain import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.ForumDetailEntity import com.gh.gamecenter.entity.ForumVideoEntity diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumTopLinkAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumTopLinkAdapter.kt index 83beda78ff..b64a5aa7c7 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumTopLinkAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumTopLinkAdapter.kt @@ -4,6 +4,9 @@ import android.content.Context import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.gh.common.util.* +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.ForumTopLinkItemBinding import com.gh.gamecenter.entity.LinkEntity import com.lightgame.adapter.BaseRecyclerAdapter diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt index ebb7938525..52adfa0b5b 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt @@ -13,6 +13,8 @@ import androidx.core.content.ContextCompat import com.facebook.drawee.view.SimpleDraweeView import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.MD5Utils import com.gh.gamecenter.entity.ForumVideoEntity import com.gh.gamecenter.video.detail.CustomManager import com.lightgame.utils.Utils diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt index 201f17f0d6..1bae54d6cb 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt @@ -13,11 +13,15 @@ import android.widget.TextView import androidx.core.graphics.ColorUtils import androidx.core.os.bundleOf import androidx.fragment.app.Fragment -import com.gh.base.adapter.FragmentAdapter -import com.gh.base.fragment.LazyFragment -import com.gh.common.dialog.TrackableDialog +import com.gh.gamecenter.common.base.adapter.FragmentAdapter +import com.gh.gamecenter.common.base.fragment.LazyFragment +import com.gh.gamecenter.common.base.TrackableDialog import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.FragmentCommunityHomeBinding import com.gh.gamecenter.databinding.TabItemCommunityBinding import com.gh.gamecenter.entity.ForumVideoEntity @@ -105,21 +109,21 @@ class CommunityHomeFragment : LazyFragment() { private fun initViewPager() { val defaultSelectedPosition = if (mDefaultSelectedTab != -1) mDefaultSelectedTab - else arguments?.getInt(EntranceUtils.KEY_SUB_POSITION) ?: 0 + else arguments?.getInt(EntranceConsts.KEY_SUB_POSITION) ?: 0 mBinding?.run { mFragmentList.clear() val tag = "android:switcher:${viewPager.id}:" val forumArticleListFragment = childFragmentManager.findFragmentByTag("${tag}0") - ?: ForumArticleListFragment().with(bundleOf(EntranceUtils.KEY_ENTRANCE to "社区", EntranceUtils.KEY_PATH to "推荐")) + ?: ForumArticleListFragment().with(bundleOf(EntranceConsts.KEY_ENTRANCE to "社区", EntranceConsts.KEY_PATH to "推荐")) mFragmentList.add(forumArticleListFragment) val forumFragment = childFragmentManager.findFragmentByTag("${tag}1") - ?: ForumFragment().with(bundleOf(EntranceUtils.KEY_ENTRANCE to "社区")) + ?: ForumFragment().with(bundleOf(EntranceConsts.KEY_ENTRANCE to "社区")) mFragmentList.add(forumFragment) val activityFragment = childFragmentManager.findFragmentByTag("${tag}2") - ?: ForumActivityFragment().with(bundleOf(EntranceUtils.KEY_ENTRANCE to "活动")) + ?: ForumActivityFragment().with(bundleOf(EntranceConsts.KEY_ENTRANCE to "活动")) mFragmentList.add(activityFragment) viewPager.run { 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 a0ebc46aca..d3c976fd15 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 @@ -2,7 +2,10 @@ package com.gh.gamecenter.forum.home import android.app.Application import androidx.lifecycle.* -import com.gh.common.util.* +import com.gh.gamecenter.common.utils.clearHtmlFormatCompletely +import com.gh.gamecenter.common.utils.observableToMain +import com.gh.gamecenter.common.utils.removeInsertedContent +import com.gh.gamecenter.common.utils.removeVideoContent import com.gh.gamecenter.entity.* import com.gh.gamecenter.qa.entity.ArticleDetailEntity import com.gh.gamecenter.qa.entity.ArticleEntity diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt index ad59c0d8d2..4062d8e76f 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt @@ -3,13 +3,18 @@ package com.gh.gamecenter.forum.home import android.content.Context import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.exposure.time.TimeUtil import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ForumActivityItemBinding import com.gh.gamecenter.entity.ForumActivityEntity diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityFragment.kt index 753ae51c77..1040b51004 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityFragment.kt @@ -4,11 +4,11 @@ import android.view.View import android.view.ViewGroup import android.widget.CheckedTextView import com.ethanhua.skeleton.Skeleton -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.NewLogUtils -import com.gh.common.util.dip2px -import com.gh.common.util.observeNonNull -import com.gh.common.util.viewModelProvider +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.R import com.gh.gamecenter.baselist.LazyListFragment import com.gh.gamecenter.databinding.FragmentForumActivityBinding 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 5990577d1e..081383d70f 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 @@ -3,8 +3,7 @@ package com.gh.gamecenter.forum.home import android.annotation.SuppressLint import android.app.Application import androidx.lifecycle.MutableLiveData -import com.gh.common.util.UrlFilterUtils -import com.gh.common.util.singleToMain +import com.gh.gamecenter.common.utils.singleToMain import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.ForumActivityCategoryEntity import com.gh.gamecenter.entity.ForumActivityEntity diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt index 4985d56a6b..28faf1fbc7 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt @@ -11,6 +11,9 @@ import androidx.core.content.ContextCompat import com.gh.base.BaseActivity import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.CommunityAnswerItemBinding import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.ForumVideoEntity @@ -53,7 +56,8 @@ class ForumArticleAskItemViewHolder(val binding: CommunityAnswerItemBinding) : B userBadgeIcon.goneIf(entity.user.badge == null) concernBtn.goneIf(entity.me.isFollower || entity.user.id == UserManager.getInstance().userId) followedUserTv.goneIf(!entity.me.isFollower) - time.text = (if (entity.me.isFollower) " · " else "") + NewsUtils.getFormattedTime(entity.time!!) + (if (entity.status == "pending" || entity.status == "fail") " · " else "") + time.text = + (if (entity.me.isFollower) " · " else "") + NewsUtils.getFormattedTime(entity.time!!) + (if (entity.status == "pending" || entity.status == "fail") " · " else "") statusTv.setText(if (entity.status == "pending") R.string.content_pending_status else R.string.fail_status) statusTv.setTextColor(if (entity.status == "pending") R.color.theme_green.toColor() else R.color.theme_red.toColor()) statusTv.goneIf(!(entity.status == "pending" || entity.status == "fail")) @@ -105,8 +109,8 @@ class ForumArticleAskItemViewHolder(val binding: CommunityAnswerItemBinding) : B if (entity.getPassVideos().isNotEmpty()) { val videoSpan = SpanBuilder(" ").image(1, " ".length, R.drawable.ic_article_video_label).build() binding.title.text = SpannableStringBuilder() - .append(entity.questions.title) - .append(videoSpan) + .append(entity.questions.title) + .append(videoSpan) } else { binding.title.text = entity.questions.title } @@ -133,11 +137,13 @@ class ForumArticleAskItemViewHolder(val binding: CommunityAnswerItemBinding) : B if (entrance == "论坛详情") { NewLogUtils.logForumDetailFeedBadgeClick(user.badge?.name ?: "", bbsId, bbsType) } - DialogUtils.showViewBadgeDialog(binding.root.context, user.badge) { - MtaHelper.onEvent("进入徽章墙_用户记录", path, user.name + "（" + user.id + "）") - MtaHelper.onEvent("徽章中心", "进入徽章中心", path) - DirectUtils.directToBadgeWall(binding.root.context, user.id, user.name, user.icon) - } + DialogUtils.showViewBadgeDialog(binding.root.context, user.badge, object : ConfirmListener { + override fun onConfirm() { + MtaHelper.onEvent("进入徽章墙_用户记录", path, user.name + "（" + user.id + "）") + MtaHelper.onEvent("徽章中心", "进入徽章中心", path) + DirectUtils.directToBadgeWall(binding.root.context, user.id, user.name, user.icon) + } + }) } binding.userIcon.setOnClickListener { @@ -147,7 +153,11 @@ class ForumArticleAskItemViewHolder(val binding: CommunityAnswerItemBinding) : B if (entrance == "论坛详情") { NewLogUtils.logForumDetailFeedUserClick("click_forum_detail_profile_photo", userId, contentType, "${path}tab", bbsId, bbsType) } - MtaHelper.onEvent(getEventId(BaseActivity.mergeEntranceAndPath(entrance, path)), getKey(BaseActivity.mergeEntranceAndPath(entrance, path)), "用户头像") + MtaHelper.onEvent( + getEventId(BaseActivity.mergeEntranceAndPath(entrance, path)), + getKey(BaseActivity.mergeEntranceAndPath(entrance, path)), + "用户头像" + ) DirectUtils.directToHomeActivity(binding.root.context, entity.user.id, 1, entrance, path) } binding.userName.setOnClickListener { @@ -157,7 +167,11 @@ class ForumArticleAskItemViewHolder(val binding: CommunityAnswerItemBinding) : B if (entrance == "论坛详情") { NewLogUtils.logForumDetailFeedUserClick("click_forum_detail_nickname", userId, contentType, "${path}tab", bbsId, bbsType) } - MtaHelper.onEvent(getEventId(BaseActivity.mergeEntranceAndPath(entrance, path)), getKey(BaseActivity.mergeEntranceAndPath(entrance, path)), "用户名字") + MtaHelper.onEvent( + getEventId(BaseActivity.mergeEntranceAndPath(entrance, path)), + getKey(BaseActivity.mergeEntranceAndPath(entrance, path)), + "用户名字" + ) DirectUtils.directToHomeActivity(binding.root.context, entity.user.id, 1, entrance, path) } binding.concernBtn.setOnClickListener { @@ -207,23 +221,23 @@ class ForumArticleAskItemViewHolder(val binding: CommunityAnswerItemBinding) : B val orientationUtils = OrientationUtils(itemView.context as Activity, visibleView) orientationUtils.isEnable = false GSYVideoOptionBuilder() - .setIsTouchWiget(false) - .setUrl(entity.url) - .setRotateViewAuto(false) - .setCacheWithPlay(true) - .setRotateWithSystem(false) - .setReleaseWhenLossAudio(true) - .setLooping(false) - .setShowFullAnimation(false) - .setEnlargeImageRes(R.drawable.ic_game_detail_enter_full_screen) - .setShrinkImageRes(R.drawable.ic_game_detail_exit_full_screen) - .setVideoAllCallBack(object : GSYSampleCallBack() { - override fun onQuitFullscreen(url: String?, vararg objects: Any) { - orientationUtils.backToProtVideo() - visibleView.uploadVideoStreamingPlaying("退出全屏") - } - }) - .build(visibleView) + .setIsTouchWiget(false) + .setUrl(entity.url) + .setRotateViewAuto(false) + .setCacheWithPlay(true) + .setRotateWithSystem(false) + .setReleaseWhenLossAudio(true) + .setLooping(false) + .setShowFullAnimation(false) + .setEnlargeImageRes(R.drawable.ic_game_detail_enter_full_screen) + .setShrinkImageRes(R.drawable.ic_game_detail_exit_full_screen) + .setVideoAllCallBack(object : GSYSampleCallBack() { + override fun onQuitFullscreen(url: String?, vararg objects: Any) { + orientationUtils.backToProtVideo() + visibleView.uploadVideoStreamingPlaying("退出全屏") + } + }) + .build(visibleView) visibleView.run { updateVideoData(entity) updateThumb(entity.poster) @@ -302,23 +316,39 @@ class ForumArticleAskItemViewHolder(val binding: CommunityAnswerItemBinding) : B "video" -> "视频帖评论" else -> "提问帖评论" } - NewLogUtils.logForumDetailFeedContentClick("click_forum_detail_comment", userId, contentId, contentType, sequence, bbsId, bbsType, tabInfo, commentType) + NewLogUtils.logForumDetailFeedContentClick( + "click_forum_detail_comment", + userId, + contentId, + contentType, + sequence, + bbsId, + bbsType, + tabInfo, + commentType + ) } } when (entity.type) { "community_article" -> { val communityId = if (entity.bbs.id.isNotEmpty()) entity.bbs.id else UserManager.getInstance().community.id - val intent = ArticleDetailActivity.getCommentIntent(itemView.context, - CommunityEntity(communityId, entity.communityName ?: ""), - entity.id ?: "", - entrance, "") + val intent = ArticleDetailActivity.getCommentIntent( + itemView.context, + CommunityEntity(communityId, entity.communityName ?: ""), + entity.id ?: "", + entrance, "" + ) itemView.context.startActivity(intent) MtaHelper.onEvent(getEventId(entrance), getKey(entrance), "评论图标") } "video" -> { val communityId = if (entity.bbs.id.isNotEmpty()) entity.bbs.id else UserManager.getInstance().community.id - itemView.context.startActivity(ForumVideoDetailActivity.getIntent(itemView.context, entity.id - ?: "",communityId, true)) + itemView.context.startActivity( + ForumVideoDetailActivity.getIntent( + itemView.context, entity.id + ?: "", communityId, true + ) + ) } "question" -> { if (entity.questions.answerCount == 0) { @@ -327,7 +357,15 @@ class ForumArticleAskItemViewHolder(val binding: CommunityAnswerItemBinding) : B itemView.context.startActivity(NewQuestionDetailActivity.getCommentIntent(it.context, entity.questions.id, entrance, "")) } "answer" -> { - itemView.context.startActivity(NewQuestionDetailActivity.getCommentIntent(it.context, entity.questions.id, entity.id ?: "", entrance, "")) + itemView.context.startActivity( + NewQuestionDetailActivity.getCommentIntent( + it.context, + entity.questions.id, + entity.id ?: "", + entrance, + "" + ) + ) } } } @@ -351,7 +389,16 @@ class ForumArticleAskItemViewHolder(val binding: CommunityAnswerItemBinding) : B val bbsId = entity.bbs.id val bbsType = if (entity.bbs.type == "official_bbs") "综合论坛" else "游戏论坛" val tabInfo = "${path}tab" - NewLogUtils.logForumDetailFeedContentClick("click_forum_detail_like", userId, contentId, contentType, sequence, bbsId, bbsType, tabInfo) + NewLogUtils.logForumDetailFeedContentClick( + "click_forum_detail_like", + userId, + contentId, + contentType, + sequence, + bbsId, + bbsType, + tabInfo + ) } } @@ -362,13 +409,18 @@ class ForumArticleAskItemViewHolder(val binding: CommunityAnswerItemBinding) : B } else { MtaHelper.onEvent(getEventId(entrance), getKey(entrance), "邀请回答") val questionsDetailEntity = QuestionsDetailEntity( - id = entity.id, - title = entity.questions.title, - images = entity.images, - description = entity.questions.description) - it.context.startActivity(QuestionsInviteActivity.getIntent(it.context, + id = entity.id, + title = entity.questions.title, + images = entity.images, + description = entity.questions.description + ) + it.context.startActivity( + QuestionsInviteActivity.getIntent( + it.context, questionsDetailEntity, - entrance)) + entrance + ) + ) } } } diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt index d877ada1f3..405405571a 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt @@ -8,12 +8,12 @@ import android.widget.LinearLayout import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.base.BaseActivity -import com.gh.common.constant.ItemViewType -import com.gh.common.syncpage.ISyncAdapterHandler -import com.gh.common.util.MtaHelper +import com.gh.gamecenter.common.constant.ItemViewType +import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.common.util.NewLogUtils -import com.gh.common.util.dip2px -import com.gh.common.util.goneIf +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.goneIf import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt index 07885a43f8..63fd987022 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt @@ -6,12 +6,18 @@ import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.ethanhua.skeleton.Skeleton -import com.gh.common.AppExecutor -import com.gh.common.constant.Constants -import com.gh.common.iinterface.IScrollable +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.core.iinterface.IScrollable import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.baselist.LazyListFragment +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.safelyGetInRelease +import com.gh.gamecenter.common.utils.tryCatchInRelease +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.core.utils.MD5Utils import com.gh.gamecenter.databinding.FragmentForumListBinding import com.gh.gamecenter.entity.ForumEntity import com.gh.gamecenter.eventbus.EBDeleteDetail @@ -48,7 +54,7 @@ class ForumArticleListFragment : LazyListFragment 6) list.subList(0, 6) else list @@ -245,7 +255,14 @@ class ForumFragment: LazyFragment(), SwipeRefreshLayout.OnRefreshListener { otherWelfareContainer.visibility = View.VISIBLE otherWelfareRv.layoutManager = GridLayoutManager(requireContext(), 2) otherWelfareRv.adapter = WelfaresAdapter(requireContext(), welfareLists) - otherWelfareRv.addItemDecoration(GridSpacingItemColorDecoration(requireContext(), 0, 16, R.color.transparent)) + otherWelfareRv.addItemDecoration( + GridSpacingItemColorDecoration( + requireContext(), + 0, + 16, + R.color.transparent + ) + ) } } diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumHomeViewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumHomeViewModel.kt index 81f3f871bf..a6b88271d8 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumHomeViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumHomeViewModel.kt @@ -1,11 +1,10 @@ package com.gh.gamecenter.forum.home -import android.annotation.SuppressLint import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MediatorLiveData -import com.gh.common.util.observableToMain -import com.gh.common.util.toRequestBody +import com.gh.gamecenter.common.utils.observableToMain +import com.gh.gamecenter.common.utils.toRequestBody import com.gh.gamecenter.entity.ForumEntity import com.gh.gamecenter.entity.LinkEntity import com.gh.gamecenter.manager.PackagesManager @@ -15,7 +14,6 @@ import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.functions.BiFunction -import io.reactivex.functions.Function import io.reactivex.schedulers.Schedulers import retrofit2.HttpException diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumRecordDao.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumRecordDao.kt index 35ec1e0875..ca8b932df1 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumRecordDao.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumRecordDao.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.forum.home -import com.gh.common.util.SPUtils +import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.entity.ForumEntity class ForumRecordDao { diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumRecordsAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumRecordsAdapter.kt index 8b4c2de243..8d79271d92 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumRecordsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumRecordsAdapter.kt @@ -2,11 +2,11 @@ package com.gh.gamecenter.forum.home import android.content.Context import android.view.ViewGroup -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.util.NewLogUtils -import com.gh.common.util.dip2px -import com.gh.common.util.goneIf -import com.gh.common.util.toBinding +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.toBinding import com.gh.gamecenter.databinding.ForumRecordItemBinding import com.gh.gamecenter.entity.ForumEntity import com.gh.gamecenter.forum.detail.ForumDetailActivity diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumScrollCalculatorHelper.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumScrollCalculatorHelper.kt index aa42e22c10..b5a41fb79a 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumScrollCalculatorHelper.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumScrollCalculatorHelper.kt @@ -6,11 +6,11 @@ import android.os.Looper import android.text.TextUtils import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.Constants -import com.gh.common.util.MD5Utils -import com.gh.common.util.NetworkUtils -import com.gh.common.util.SPUtils -import com.gh.common.util.safelyGetInRelease +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.core.utils.MD5Utils +import com.gh.gamecenter.common.utils.NetworkUtils +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.safelyGetInRelease import com.gh.gamecenter.entity.ForumVideoEntity import com.gh.gamecenter.setting.VideoSettingFragment import com.gh.gamecenter.video.detail.CustomManager 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 9b7bf735ae..d44fa1c429 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 @@ -4,8 +4,8 @@ import android.annotation.SuppressLint import android.app.Application import androidx.lifecycle.* import com.gh.common.util.CheckLoginUtils -import com.gh.common.util.createRequestBodyAny -import com.gh.common.util.singleToMain +import com.gh.gamecenter.common.utils.createRequestBodyAny +import com.gh.gamecenter.common.utils.singleToMain import com.gh.gamecenter.entity.ForumEntity import com.gh.gamecenter.entity.ForumUnreadEntity import com.gh.gamecenter.manager.UserManager diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumVisitDao.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumVisitDao.kt index 5bbc52040b..203ec66c3e 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumVisitDao.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumVisitDao.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.forum.home -import com.gh.common.util.SPUtils +import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.entity.ForumEntity class ForumVisitDao { diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/HotForumsAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/HotForumsAdapter.kt index f5348b65bc..5c704ed5d2 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/HotForumsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/HotForumsAdapter.kt @@ -2,9 +2,13 @@ package com.gh.gamecenter.forum.home import android.content.Context import android.view.ViewGroup -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.common.utils.debounceActionWithInterval +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.databinding.HotForumItemBinding import com.gh.gamecenter.entity.ForumEntity import com.gh.gamecenter.eventbus.EBForumFollowChange diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/OfficialForumAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/OfficialForumAdapter.kt index a1dc26e1ae..367fa335d2 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/OfficialForumAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/OfficialForumAdapter.kt @@ -2,9 +2,9 @@ package com.gh.gamecenter.forum.home import android.content.Context import android.view.ViewGroup -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.util.NewLogUtils -import com.gh.common.util.toBinding +import com.gh.gamecenter.common.utils.toBinding import com.gh.gamecenter.databinding.OfficialForumItemBinding import com.gh.gamecenter.entity.ForumEntity import com.gh.gamecenter.forum.detail.ForumDetailActivity diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/WelfaresAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/WelfaresAdapter.kt index 0b721e90ca..e7b571087c 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/WelfaresAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/WelfaresAdapter.kt @@ -2,11 +2,11 @@ package com.gh.gamecenter.forum.home import android.content.Context import android.view.ViewGroup -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.util.CheckLoginUtils import com.gh.common.util.DirectUtils import com.gh.common.util.NewLogUtils -import com.gh.common.util.toBinding +import com.gh.gamecenter.common.utils.toBinding import com.gh.gamecenter.InfoActivity import com.gh.gamecenter.databinding.ForumWelfareItemBinding import com.gh.gamecenter.toolbox.ToolBoxBlockActivity diff --git a/app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt index bb19f73862..e6b5ee798c 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.forum.list import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity class ForumListActivity : NormalActivity() { @@ -15,7 +15,7 @@ class ForumListActivity : NormalActivity() { fun getIntent(context: Context, type: String): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_TYPE, type) + bundle.putString(EntranceConsts.KEY_TYPE, type) return getTargetIntent(context, ForumListActivity::class.java, ForumListFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/forum/list/ForumListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/list/ForumListAdapter.kt index 696eb18b44..41cf5fdaa3 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/list/ForumListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/list/ForumListAdapter.kt @@ -4,12 +4,16 @@ import android.content.Context import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.common.utils.debounceActionWithInterval +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.databinding.ForumMyFollowBinding import com.gh.gamecenter.entity.ForumEntity import com.gh.gamecenter.eventbus.EBForumFollowChange diff --git a/app/src/main/java/com/gh/gamecenter/forum/list/ForumListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/list/ForumListFragment.kt index da72296a71..3d725d1cb2 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/list/ForumListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/list/ForumListFragment.kt @@ -2,8 +2,11 @@ package com.gh.gamecenter.forum.list import android.os.Bundle import com.gh.common.util.* -import com.gh.common.view.SpacingItemDecoration +import com.gh.gamecenter.common.view.SpacingItemDecoration import com.gh.gamecenter.baselist.ListFragment +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.entity.ForumEntity class ForumListFragment: ListFragment() { @@ -20,7 +23,7 @@ class ForumListFragment: ListFragment() { override fun getItemDecoration()= SpacingItemDecoration(onlyDecorateTheFirstItem = true, top = 8F.dip2px()) override fun onCreate(savedInstanceState: Bundle?) { - val type = arguments?.getString(EntranceUtils.KEY_TYPE) ?: "" + val type = arguments?.getString(EntranceConsts.KEY_TYPE) ?: "" mViewModel = provideListViewModel() mViewModel?.type = type when (type) { diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt index 195f6f6eb2..539d3afe7c 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt @@ -5,8 +5,8 @@ import android.content.Intent import android.os.Build import android.os.Bundle import android.view.View -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R import com.gh.gamecenter.entity.ApplyModeratorStatusEntity @@ -15,7 +15,7 @@ class ApplyModeratorActivity : NormalActivity() { companion object { fun getIntent(context: Context, bbsId: String, status: ApplyModeratorStatusEntity): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_BBS_ID, bbsId) + bundle.putString(EntranceConsts.KEY_BBS_ID, bbsId) bundle.putParcelable("status", status) return getTargetIntent( context, diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorFragment.kt index 31c0c920a0..9495e2ed3b 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorFragment.kt @@ -8,18 +8,22 @@ import android.widget.LinearLayout import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager -import com.gh.common.avoidcallback.AvoidOnResultManager -import com.gh.common.avoidcallback.Callback +import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager +import com.gh.gamecenter.common.avoidcallback.Callback import com.gh.common.dialog.ApplyModeratorDialogFragment import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.ShellActivity +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.ClickUtils +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.databinding.FragmentApplyModeratorBinding import com.gh.gamecenter.entity.ApplyModeratorStatusEntity import com.gh.gamecenter.entity.ApplyModeratorTaskEntity import com.gh.gamecenter.forum.detail.ForumDetailActivity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.lightgame.utils.AppManager import com.lightgame.utils.Utils @@ -40,7 +44,7 @@ class ApplyModeratorFragment : NormalFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mBbsId = arguments?.getString(EntranceUtils.KEY_BBS_ID) ?: "" + mBbsId = arguments?.getString(EntranceConsts.KEY_BBS_ID) ?: "" mStatus = arguments?.getParcelable("status") ?: ApplyModeratorStatusEntity() val factory = ApplyModeratorViewModel.Factory(mBbsId) mDataList = getModeratorTaskList() diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt index e21f718842..ccd6f28efd 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.forum.moderator import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity class ModeratorListActivity : NormalActivity() { @@ -11,11 +11,11 @@ class ModeratorListActivity : NormalActivity() { companion object { fun getIntent(context: Context, bbsId: String, bbsName: String, bbsType: String, entrance: String, path: String): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance) - bundle.putString(EntranceUtils.KEY_PATH, path) - bundle.putString(EntranceUtils.KEY_BBS_ID, bbsId) - bundle.putString(EntranceUtils.KEY_NAME, bbsName) - bundle.putString(EntranceUtils.KEY_TYPE, bbsType) + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance) + bundle.putString(EntranceConsts.KEY_PATH, path) + bundle.putString(EntranceConsts.KEY_BBS_ID, bbsId) + bundle.putString(EntranceConsts.KEY_NAME, bbsName) + bundle.putString(EntranceConsts.KEY_TYPE, bbsType) return getTargetIntent(context, ModeratorListActivity::class.java, ModeratorListFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListAdapter.kt index b9d8762bb4..01cedafa38 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListAdapter.kt @@ -3,15 +3,15 @@ package com.gh.gamecenter.forum.moderator import android.content.Context import android.view.View import android.view.ViewGroup -import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.databinding.ModeratorListItemBinding import com.gh.gamecenter.entity.PersonalEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.personalhome.UserHomeActivity import com.lightgame.adapter.BaseRecyclerAdapter class ModeratorListAdapter(context: Context, val mViewModel: ModeratorListViewModel?) : BaseRecyclerAdapter(context) { diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListFragment.kt index b2b855446e..a16e4bb87a 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListFragment.kt @@ -4,14 +4,20 @@ import android.os.Bundle import android.view.View import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* import com.gh.gamecenter.NewsDetailActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.ifLogin +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentModeratorListBinding import com.gh.gamecenter.entity.ApplyModeratorStatusEntity import com.gh.gamecenter.eventbus.EBUserFollow -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -28,9 +34,9 @@ class ModeratorListFragment : NormalFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) mBinding = FragmentModeratorListBinding.bind(mCachedView) - mBbsId = arguments?.getString(EntranceUtils.KEY_BBS_ID) ?: "" - mBbsType = arguments?.getString(EntranceUtils.KEY_TYPE) ?: "" - val bbsName = arguments?.getString(EntranceUtils.KEY_NAME) ?: "" + mBbsId = arguments?.getString(EntranceConsts.KEY_BBS_ID) ?: "" + mBbsType = arguments?.getString(EntranceConsts.KEY_TYPE) ?: "" + val bbsName = arguments?.getString(EntranceConsts.KEY_NAME) ?: "" val factory = ModeratorListViewModel.Factory(mBbsId) mViewModel = viewModelProvider(factory) diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorTaskAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorTaskAdapter.kt index fd9d03e950..e15bbc5a22 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorTaskAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorTaskAdapter.kt @@ -5,9 +5,9 @@ import android.text.TextUtils import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.toColor -import com.gh.common.util.toDrawable +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable import com.gh.gamecenter.R import com.gh.gamecenter.databinding.ItemModeratorTaskBinding import com.gh.gamecenter.entity.ApplyModeratorTaskEntity diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt index c6f3eaad56..2829bf9fd1 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt @@ -11,14 +11,15 @@ import android.widget.LinearLayout import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.base.BaseActivity -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.constant.ItemViewType -import com.gh.common.syncpage.ISyncAdapterHandler +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.constant.ItemViewType +import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler import com.gh.common.util.* -import com.gh.common.view.CenterImageSpan import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.CommunityAnswerItemBinding import com.gh.gamecenter.databinding.ForumSearchContentListBinding import com.gh.gamecenter.entity.CommunityEntity @@ -86,7 +87,11 @@ class ForumContentSearchListAdapter(context: Context, val mListViewModel: ForumC answerViewHolder.binding.content.visibility = View.GONE val title = answer.questions.title ?: "" val spannableStringBuilder = SpannableStringBuilder(" ") - spannableStringBuilder.setSpan(CenterImageSpan(mContext, R.drawable.ic_ask_label), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) + spannableStringBuilder.setSpan( + CenterImageSpan( + mContext, + R.drawable.ic_ask_label + ), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) spannableStringBuilder.append(title.fromHtml()) answerViewHolder.binding.title.text = spannableStringBuilder } else { @@ -198,7 +203,11 @@ class ForumContentSearchListAdapter(context: Context, val mListViewModel: ForumC forumSearchHolder.binding.content.visibility = View.GONE val title = answer.questions.title ?: "" val spannableStringBuilder = SpannableStringBuilder(" ") - spannableStringBuilder.setSpan(CenterImageSpan(mContext, R.drawable.ic_ask_label), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) + spannableStringBuilder.setSpan( + CenterImageSpan( + mContext, + R.drawable.ic_ask_label + ), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) spannableStringBuilder.append(title.fromHtml()) forumSearchHolder.binding.title.text = spannableStringBuilder } else { diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt index 28ab079ade..236e30b13b 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt @@ -6,10 +6,10 @@ import android.widget.ImageView import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils -import com.gh.common.util.viewModelProvider -import com.gh.common.view.divider.HorizontalDividerItemDecoration +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.ListFragment @@ -39,7 +39,7 @@ class ForumContentSearchListFragment : ListFragment HomeFragment().with(Bundle()) "top_game_comment" -> AmwayFragment().with(Bundle()) "block" -> GameFragment().with(Bundle().apply { - putParcelable(EntranceUtils.KEY_BLOCK_DATA, tab) + putParcelable(EntranceConsts.KEY_BLOCK_DATA, tab) }) "server" -> GameServersPublishFragment().with(Bundle()) "game_list" -> GameCollectionSquareFragment().with(Bundle().apply { - putString(EntranceUtils.KEY_ENTRANCE, "顶部tab") - putInt(EntranceUtils.KEY_TAB_INDEX, index) - putString(EntranceUtils.KEY_NAME, tab.name) + putString(EntranceConsts.KEY_ENTRANCE, "顶部tab") + putInt(EntranceConsts.KEY_TAB_INDEX, index) + putString(EntranceConsts.KEY_NAME, tab.name) }) "column_test" -> GameServersTestFragment().with(Bundle().apply { putString(GameServersTestFragment.TEST_COLUMN_ID, tab.link) }) "category" -> CategoryDirectoryFragment().with(Bundle().apply { - putString(EntranceUtils.KEY_CATEGORY_ID, tab.link) - putString(EntranceUtils.KEY_CATEGORY_TITLE, tab.text) + putString(EntranceConsts.KEY_CATEGORY_ID, tab.link) + putString(EntranceConsts.KEY_CATEGORY_TITLE, tab.text) }) "catalog" -> CatalogFragment().with(Bundle().apply { - putString(EntranceUtils.KEY_CATALOG_ID, tab.link) - putString(EntranceUtils.KEY_CATALOG_TITLE, tab.text) + putString(EntranceConsts.KEY_CATALOG_ID, tab.link) + putString(EntranceConsts.KEY_CATALOG_TITLE, tab.text) }) "category_v2" -> CategoryV2Fragment().with(Bundle().apply { - putString(EntranceUtils.KEY_CATEGORY_ID, tab.link) - putString(EntranceUtils.KEY_CATEGORY_TITLE, tab.text) + putString(EntranceConsts.KEY_CATEGORY_ID, tab.link) + putString(EntranceConsts.KEY_CATEGORY_TITLE, tab.text) }) "ranking", "column_collection" -> ColumnCollectionDetailFragment().with(Bundle().apply { - putString(EntranceUtils.KEY_ENTRANCE, "首页") - putString(EntranceUtils.KEY_COLLECTION_ID, tab.link) - putInt(EntranceUtils.KEY_POSITION, 0) - putString(EntranceUtils.KEY_COLUMNNAME, tab.text) - putBoolean(EntranceUtils.KEY_IS_COLUMN_COLLECTION, true) + putString(EntranceConsts.KEY_ENTRANCE, "首页") + putString(EntranceConsts.KEY_COLLECTION_ID, tab.link) + putInt(EntranceConsts.KEY_POSITION, 0) + putString(EntranceConsts.KEY_COLUMNNAME, tab.text) + putBoolean(EntranceConsts.KEY_IS_COLUMN_COLLECTION, true) }) "column" -> SubjectFragment().with(Bundle().apply { - putString(EntranceUtils.KEY_ENTRANCE, "首页") + putString(EntranceConsts.KEY_ENTRANCE, "首页") putParcelable( - EntranceUtils.KEY_SUBJECT_DATA, + EntranceConsts.KEY_SUBJECT_DATA, SubjectData(tab.link, tab.text, false) ) }) "web" -> WebFragment().with(Bundle().apply { - putString(EntranceUtils.KEY_URL, tab.link) + putString(EntranceConsts.KEY_URL, tab.link) putBoolean(WebFragment.KEY_OPEN_NATIVE_PAGE, false) putBoolean(WebFragment.KEY_ENABLE_HORIZONTAL_SCROLL_DISPATCH, true) if (tab.link?.contains("leave_web_page_handle_back_pressed=true") == true) { @@ -442,17 +446,17 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() { } }) "common_collection" -> CommonCollectionDetailFragment().with(Bundle().apply { - putString(EntranceUtils.KEY_ENTRANCE, "首页顶部Tab栏") - putString(EntranceUtils.KEY_COLLECTION_ID, tab.link) - putString(EntranceUtils.KEY_COLUMNNAME, tab.text) + putString(EntranceConsts.KEY_ENTRANCE, "首页顶部Tab栏") + putString(EntranceConsts.KEY_COLLECTION_ID, tab.link) + putString(EntranceConsts.KEY_COLUMNNAME, tab.text) }) "bbs" -> Fragment() else -> Fragment() } - fragment.arguments?.putInt(EntranceUtils.KEY_TAB_COUNT, tabList.size) - fragment.arguments?.putBoolean(EntranceUtils.KEY_IS_HOME, true) + fragment.arguments?.putInt(EntranceConsts.KEY_TAB_COUNT, tabList.size) + fragment.arguments?.putBoolean(EntranceConsts.KEY_IS_HOME, true) fragment.arguments?.putParcelable( - EntranceUtils.KEY_EXPOSURE_SOURCE, + EntranceConsts.KEY_EXPOSURE_SOURCE, ExposureSource("首页顶部Tab栏", tab.name ?: "") ) fragmentList.add(fragment) 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 47237ffe3a..0ca3b1dc03 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperViewModel.kt @@ -4,7 +4,7 @@ import android.annotation.SuppressLint import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData -import com.gh.common.util.toColor +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.R import com.gh.gamecenter.entity.SubjectRecommendEntity diff --git a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java index 79a169bf21..de4d37a3ce 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java @@ -29,23 +29,23 @@ import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProviders; -import com.gh.base.fragment.WaitingDialogFragment; -import com.gh.common.constant.Constants; +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment; +import com.gh.gamecenter.common.constant.Constants; import com.gh.common.util.CheckLoginUtils; -import com.gh.common.util.ClickUtils; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.utils.ClickUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.EnergyTaskHelper; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.PackageFlavorHelper; -import com.gh.common.util.ExtensionsKt; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.utils.PackageFlavorHelper; import com.gh.common.util.LogUtils; import com.gh.common.util.LoginHelper; import com.gh.common.util.LoginUtils; -import com.gh.common.util.MtaHelper; -import com.gh.common.util.PatternUtils; -import com.gh.common.util.PermissionHelper; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.core.utils.PatternUtils; +import com.gh.gamecenter.common.utils.PermissionHelper; import com.gh.common.util.QuickLoginHelper; -import com.gh.common.util.SPUtils; +import com.gh.gamecenter.core.utils.SPUtils; import com.gh.gamecenter.LoginActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.WebActivity; @@ -54,7 +54,7 @@ import com.gh.gamecenter.entity.LoginTokenEntity; import com.gh.gamecenter.entity.UserInfoEntity; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.manager.UserManager; -import com.gh.gamecenter.normal.NormalFragment; +import com.gh.gamecenter.common.base.fragment.NormalFragment; import com.gh.gamecenter.security.BindPhoneActivity; import com.gh.gamecenter.user.ApiResponse; import com.gh.gamecenter.user.LoginTag; @@ -138,7 +138,7 @@ public class LoginFragment super.onCreate(savedInstanceState); if (getArguments() != null) { - mStatus = getArguments().getInt(EntranceUtils.KEY_SHOW_QUICK_LOGIN, LoginActivity.STATUS_DEFAULT); + mStatus = getArguments().getInt(EntranceConsts.KEY_SHOW_QUICK_LOGIN, LoginActivity.STATUS_DEFAULT); } else { mStatus = LoginActivity.STATUS_DEFAULT; } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java index 56824d4b36..9086b68a4b 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java @@ -1,6 +1,7 @@ package com.gh.gamecenter.fragment; -import android.content.res.Configuration; +import static com.gh.gamecenter.MainActivity.EB_SKIP_MAIN; + import android.graphics.Bitmap; import android.graphics.PorterDuff; import android.graphics.drawable.Animatable; @@ -12,7 +13,6 @@ import android.widget.CheckedTextView; import android.widget.ImageView; import androidx.annotation.ColorRes; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; @@ -26,25 +26,25 @@ import com.facebook.drawee.view.SimpleDraweeView; import com.facebook.fresco.animation.drawable.AnimatedDrawable2; import com.facebook.fresco.animation.drawable.BaseAnimationListener; import com.facebook.imagepipeline.image.ImageInfo; -import com.gh.base.OnDoubleTapListener; -import com.gh.base.fragment.BaseFragment_ViewPager_Checkable; +import com.gh.gamecenter.common.base.fragment.BaseFragment_ViewPager_Checkable; import com.gh.common.constant.Config; -import com.gh.common.syncpage.SyncPageRepository; import com.gh.common.tracker.TrackerLogger; -import com.gh.common.util.BiCallback; import com.gh.common.util.DataUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.ExtensionsKt; import com.gh.common.util.FloatingBackViewManager; import com.gh.common.util.HomeBottomBarHelper; -import com.gh.common.util.ImageUtils; import com.gh.common.util.IntegralLogHelper; import com.gh.common.util.LogUtils; -import com.gh.common.util.NightModeUtils; -import com.gh.common.view.ReserveDialog; -import com.gh.common.view.WelcomeDialog; +import com.gh.common.dialog.ReserveDialog; +import com.gh.common.dialog.WelcomeDialog; import com.gh.gamecenter.R; +import com.gh.gamecenter.common.callback.BiCallback; +import com.gh.gamecenter.common.callback.OnDoubleTapListener; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.syncpage.SyncPageRepository; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.common.utils.NightModeUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.databinding.FragmentMainBinding; import com.gh.gamecenter.entity.SettingsEntity; import com.gh.gamecenter.entity.SubjectRecommendEntity; @@ -61,7 +61,6 @@ import com.halo.assistant.HaloApp; import com.lightgame.listeners.OnBackPressedListener; import com.lightgame.view.CheckableLinearLayout; import com.lightgame.view.NoScrollableViewPager; -import com.squareup.picasso.Picasso; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -70,8 +69,6 @@ import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; import java.util.List; -import static com.gh.gamecenter.MainActivity.EB_SKIP_MAIN; - public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implements OnBackPressedListener { public static final int INDEX_HOME = 0; @@ -120,14 +117,14 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem mGameWrapperFragment = new SearchToolWrapperFragment(); Bundle homeArgs = new Bundle(); - homeArgs.putBoolean(EntranceUtils.KEY_IS_HOME, true); + homeArgs.putBoolean(EntranceConsts.KEY_IS_HOME, true); homeArgs.putString(SearchToolWrapperFragment.WRAPPER_FRAGMENT_NAME, GameFragment.class.getName()); mGameWrapperFragment.setArguments(homeArgs); fragments.add(mGameWrapperFragment); mHomeVideoFragment = new HomeVideoFragment(); Bundle videoArgs = new Bundle(); - videoArgs.putBoolean(EntranceUtils.KEY_IS_HOME_VIDEO, true); + videoArgs.putBoolean(EntranceConsts.KEY_IS_HOME_VIDEO, true); mHomeVideoFragment.setArguments(videoArgs); mCommunityHomeFragment = new CommunityHomeFragment(); 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 2d95c9c6ff..a8402334ef 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperViewModel.kt @@ -5,7 +5,7 @@ import android.app.Application import android.preference.PreferenceManager import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.CheckLoginUtils import com.gh.common.util.HomeBottomBarHelper import com.gh.common.util.PackageUtils diff --git a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java index 2092eef1c3..45e365a17b 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java @@ -6,10 +6,10 @@ import android.view.View; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; -import com.gh.base.fragment.LazyFragment; +import com.gh.gamecenter.common.base.fragment.LazyFragment; import com.gh.common.constant.Config; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.R; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.game.GameFragment; @@ -48,7 +48,7 @@ public class SearchToolWrapperFragment extends LazyFragment { Bundle bundle = new Bundle(); if (GameFragment.class.getName().equals(className)) { - bundle.putString(EntranceUtils.KEY_LOCATION, "游戏库"); + bundle.putString(EntranceConsts.KEY_LOCATION, "游戏库"); } mSearchToolbarFragment.setArguments(bundle); } 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 1196246e9b..6c33f8b248 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java @@ -20,21 +20,21 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProviders; -import com.gh.base.SearchBarHint; -import com.gh.base.fragment.BaseLazyFragment; +import com.gh.gamecenter.core.iinterface.SearchBarHint; +import com.gh.gamecenter.common.base.fragment.BaseLazyFragment; import com.gh.common.constant.Config; -import com.gh.common.constant.Constants; +import com.gh.gamecenter.common.constant.Constants; import com.gh.common.databind.BindingAdapters; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.PackageFlavorHelper; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.utils.PackageFlavorHelper; import com.gh.common.util.IntegralLogHelper; import com.gh.common.util.LogUtils; -import com.gh.common.util.MtaHelper; -import com.gh.common.util.SPUtils; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.core.utils.SPUtils; import com.gh.download.DownloadManager; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.MessageActivity; @@ -198,12 +198,12 @@ public class SearchToolbarFragment extends BaseLazyFragment implements View.OnCl @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (getArguments() != null && getArguments().getString(EntranceUtils.KEY_LOCATION) != null) { - mLocation = getArguments().getString(EntranceUtils.KEY_LOCATION); + if (getArguments() != null && getArguments().getString(EntranceConsts.KEY_LOCATION) != null) { + mLocation = getArguments().getString(EntranceConsts.KEY_LOCATION); } mHintIndex = 0; if (savedInstanceState != null) { - mHintList = savedInstanceState.getStringArrayList(EntranceUtils.KEY_HINT); + mHintList = savedInstanceState.getStringArrayList(EntranceConsts.KEY_HINT); } mPackageViewModel = ViewModelProviders.of(this, new PackageViewModel.Factory()).get(PackageViewModel.class); mPackageViewModel.getFilterSameUpdateLiveData().observe(this, this::setDownloadHint); @@ -225,7 +225,7 @@ public class SearchToolbarFragment extends BaseLazyFragment implements View.OnCl public void onSaveInstanceState(@NonNull Bundle outState) { super.onSaveInstanceState(outState); if (mHintList != null && !mHintList.isEmpty()) { - outState.putStringArrayList(EntranceUtils.KEY_HINT, mHintList); + outState.putStringArrayList(EntranceConsts.KEY_HINT, mHintList); } } 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 b48d047328..118d880caf 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt @@ -10,17 +10,22 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.ethanhua.skeleton.Skeleton import com.ethanhua.skeleton.ViewSkeletonScreen -import com.gh.base.fragment.LazyFragment -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.base.fragment.LazyFragment +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureListener import com.gh.common.exposure.ExposureSource import com.gh.common.util.* -import com.gh.common.view.FixLinearLayoutManager +import com.gh.gamecenter.common.view.FixLinearLayoutManager import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus import com.gh.download.DownloadManager import com.gh.gamecenter.R import com.gh.gamecenter.baselist.LoadStatus +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.visibleIf import com.gh.gamecenter.databinding.FragmentGameBinding import com.gh.gamecenter.eventbus.EBDownloadStatus import com.gh.gamecenter.eventbus.EBPackage @@ -58,7 +63,7 @@ class GameFragment : LazyFragment() { override fun getRealLayoutId() = R.layout.fragment_game override fun onFragmentFirstVisible() { - val factory = GameViewModel.Factory(HaloApp.getInstance().application, arguments?.getParcelable(EntranceUtils.KEY_BLOCK_DATA)) + val factory = GameViewModel.Factory(HaloApp.getInstance().application, arguments?.getParcelable(EntranceConsts.KEY_BLOCK_DATA)) mViewModel = ViewModelProviders.of(this, factory).get(GameViewModel::class.java) mViewModel.entrance = mEntrance @@ -100,7 +105,7 @@ class GameFragment : LazyFragment() { mBinding.gameRefresh.setColorSchemeColors(ContextCompat.getColor(requireContext(), R.color.theme)) mLayoutManager = FixLinearLayoutManager(context) val exposureSourceList = arrayListOf().apply { - arguments?.getParcelable(EntranceUtils.KEY_EXPOSURE_SOURCE)?.let { + arguments?.getParcelable(EntranceConsts.KEY_EXPOSURE_SOURCE)?.let { add(it) } add(ExposureSource("板块", if (mViewModel.blockData?.text.isNullOrEmpty()) "" else mViewModel.blockData?.text!!)) diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt index babe749ef0..4a5d825036 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt @@ -10,15 +10,15 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.base.OnViewClickListener +import com.gh.gamecenter.common.callback.OnViewClickListener import com.gh.common.constant.Config -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.databind.BindingAdapters import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.ExposureType import com.gh.common.exposure.IExposable -import com.gh.common.runOnIoThread +import com.gh.gamecenter.core.runOnIoThread import com.gh.common.util.* import com.gh.gamecenter.BlockActivity import com.gh.gamecenter.GameDetailActivity @@ -29,6 +29,9 @@ import com.gh.gamecenter.adapter.viewholder.* import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.catalog.CatalogActivity import com.gh.gamecenter.category.CategoryDirectoryActivity +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.* import com.gh.gamecenter.entity.CommonCollectionContentEntity import com.gh.gamecenter.entity.CommunityEntity @@ -632,7 +635,7 @@ class GameFragmentAdapter( ) } entity.type == "game" -> GameDetailActivity.startGameDetailActivity(mContext, entity.link ?: "", "(推荐入口)") - entity.type == EntranceUtils.HOST_COMMUNITY -> DirectUtils.directToCommunity( + entity.type == EntranceConsts.HOST_COMMUNITY -> DirectUtils.directToCommunity( mContext, CommunityEntity(entity.link!!, entity.text!!) ) diff --git a/app/src/main/java/com/gh/gamecenter/game/GameItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/game/GameItemViewHolder.kt index f190fca939..4164e8a5de 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameItemViewHolder.kt @@ -2,12 +2,12 @@ package com.gh.gamecenter.game import android.view.View import android.widget.TextView -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.databind.BindingAdapters -import com.gh.common.util.dip2px -import com.gh.common.util.toColor -import com.gh.common.util.toDrawable -import com.gh.common.view.DrawableView +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.R import com.gh.gamecenter.databinding.GameItemBinding import com.gh.gamecenter.entity.GameEntity 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 3ec27cd57f..0ffc1124f9 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt @@ -7,10 +7,16 @@ import androidx.collection.ArrayMap import androidx.lifecycle.* import com.gh.common.exposure.ExposureEntity import com.gh.common.filter.RegionSettingHelper -import com.gh.common.iinterface.IOffsetable +import com.gh.gamecenter.core.iinterface.IOffsetable import com.gh.common.util.* import com.gh.download.DownloadManager import com.gh.gamecenter.baselist.LoadStatus +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.RandomUtils +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.countOccurrences +import com.gh.gamecenter.common.utils.debugOnly +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.entity.* import com.gh.gamecenter.game.data.GameItemData import com.gh.gamecenter.game.data.GameSubjectData @@ -175,7 +181,7 @@ class GameViewModel(application: Application, var blockData: SubjectRecommendEnt ApkActiveUtils.filterHideApk(game) // 当页面是由启动弹窗过来的第一或第二个页面的时候添加启动弹窗信息 - if (entrance.contains(EntranceUtils.ENTRANCE_WELCOME) + if (entrance.contains(EntranceConsts.ENTRANCE_WELCOME) && entrance.countOccurrences("+") <= 1 ) { game.setWelcomeDialogInfoIfAvailable() @@ -246,7 +252,7 @@ class GameViewModel(application: Application, var blockData: SubjectRecommendEnt ApkActiveUtils.filterHideApk(game) // 当页面是由启动弹窗过来的第一或第二个页面的时候添加启动弹窗信息 - if (entrance.contains(EntranceUtils.ENTRANCE_WELCOME) + if (entrance.contains(EntranceConsts.ENTRANCE_WELCOME) && entrance.countOccurrences("+") <= 1 ) { game.setWelcomeDialogInfoIfAvailable() diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/GameColumnCollectionAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/GameColumnCollectionAdapter.kt index a6294b8ced..3cf3ed0f77 100644 --- a/app/src/main/java/com/gh/gamecenter/game/columncollection/GameColumnCollectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/GameColumnCollectionAdapter.kt @@ -2,8 +2,8 @@ package com.gh.gamecenter.game.columncollection import android.content.Context import android.view.ViewGroup -import com.gh.common.util.ImageUtils -import com.gh.common.view.WrapContentDraweeView +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.view.WrapContentDraweeView import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.GameColumnCollectionItemViewHolder import com.gh.gamecenter.databinding.GameColumnCollectionItemBinding diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/GameColumnCollectionViewHolder.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/GameColumnCollectionViewHolder.kt index d8c089ba75..6b21bcd14b 100644 --- a/app/src/main/java/com/gh/gamecenter/game/columncollection/GameColumnCollectionViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/GameColumnCollectionViewHolder.kt @@ -3,10 +3,10 @@ package com.gh.gamecenter.game.columncollection import android.view.View import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.ImageUtils -import com.gh.common.util.dip2px -import com.gh.common.view.SpacingItemDecoration +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.view.SpacingItemDecoration import com.gh.gamecenter.databinding.GameColumnCollectionListBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.SubjectEntity diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt index 3a87e422b3..63347a34ca 100644 --- a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.game.columncollection.detail import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.catalog.CatalogActivity @@ -19,10 +19,10 @@ class ColumnCollectionDetailActivity : NormalActivity() { */ fun getIntent(context: Context, collectionId: String, position: Int = -1, entrance: String = "", columnName: String = ""): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance) - bundle.putString(EntranceUtils.KEY_COLLECTION_ID, collectionId) - bundle.putInt(EntranceUtils.KEY_POSITION, position) - bundle.putString(EntranceUtils.KEY_COLUMNNAME, columnName) + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance) + bundle.putString(EntranceConsts.KEY_COLLECTION_ID, collectionId) + bundle.putInt(EntranceConsts.KEY_POSITION, position) + bundle.putString(EntranceConsts.KEY_COLUMNNAME, columnName) return NormalActivity.getTargetIntent(context, CatalogActivity::class.java, ColumnCollectionDetailFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailAdapter.kt index 5998d7dd73..76fc1cf1ff 100644 --- a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailAdapter.kt @@ -5,11 +5,11 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.StaggeredGridLayoutManager -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.DirectUtils -import com.gh.common.util.ImageUtils -import com.gh.common.util.MtaHelper -import com.gh.common.util.PageSwitchDataHelper +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.core.utils.PageSwitchDataHelper import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.GameColumnCollectionItemViewHolder diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt index 3ade59542e..7c4aede84d 100644 --- a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt @@ -1,16 +1,15 @@ package com.gh.gamecenter.game.columncollection.detail -import android.graphics.Color import android.view.View import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.StaggeredGridLayoutManager import com.ethanhua.skeleton.Skeleton -import com.gh.common.constant.Constants -import com.gh.common.util.EntranceUtils -import com.gh.common.util.dip2px -import com.gh.common.util.observeNonNull -import com.gh.common.util.toColor -import com.gh.common.view.GridSpacingItemDecoration +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.view.GridSpacingItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.LazyListFragment import com.gh.gamecenter.databinding.FragmentColumnCollectionDetailBinding @@ -96,8 +95,8 @@ class ColumnCollectionDetailFragment : LazyListFragment 5 * 1024 * 1024 * 1024) { diff --git a/app/src/main/java/com/gh/gamecenter/game/upload/UploadScheduleDialog.kt b/app/src/main/java/com/gh/gamecenter/game/upload/UploadScheduleDialog.kt index 3b3bcf195b..74cfb94e11 100644 --- a/app/src/main/java/com/gh/gamecenter/game/upload/UploadScheduleDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/game/upload/UploadScheduleDialog.kt @@ -5,8 +5,8 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat -import com.gh.base.fragment.BaseDialogFragment -import com.gh.common.util.MtaHelper +import com.gh.gamecenter.common.base.fragment.BaseDialogFragment +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.R import com.gh.gamecenter.databinding.DialogUploadScheduleBinding diff --git a/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt b/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt index 32ba75ab63..688a1b1768 100644 --- a/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt +++ b/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt @@ -16,7 +16,7 @@ import androidx.constraintlayout.widget.Group import androidx.core.content.ContextCompat import com.facebook.drawee.view.SimpleDraweeView import com.gh.common.view.GameIconView -import com.gh.common.view.GameTagContainerView +import com.gh.gamecenter.common.view.GameTagContainerView import com.gh.gamecenter.R import splitties.dimensions.dip import splitties.views.* diff --git a/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt index 20489bff08..83aa52ebd9 100644 --- a/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt @@ -6,9 +6,9 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.gh.common.databind.BindingAdapters import com.gh.common.util.DownloadItemUtils -import com.gh.common.util.dip2px -import com.gh.common.util.toColor -import com.gh.common.util.toDrawable +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable import com.gh.common.view.AsyncUi import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.GameViewHolder diff --git a/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalSlideViewHolder.kt b/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalSlideViewHolder.kt index b3230d10e9..a92aa43599 100644 --- a/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalSlideViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalSlideViewHolder.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.game.vertical import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.databinding.GameVerticalSlideItemBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.SubjectEntity diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesFragment.kt index b994ba2dfa..caf6f3524d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesFragment.kt @@ -2,13 +2,13 @@ package com.gh.gamecenter.gamecollection.choose import androidx.core.os.bundleOf import androidx.fragment.app.Fragment -import com.gh.base.fragment.BaseLazyTabFragment -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.base.fragment.BaseLazyTabFragment +import com.gh.gamecenter.common.constant.EntranceConsts class AddGamesFragment : BaseLazyTabFragment() { override fun initFragmentList(fragments: MutableList) { - fragments.add(AddSearchGameFragment().apply { bundleOf(EntranceUtils.KEY_NAVIGATION_TITLE to "添加游戏") }) + fragments.add(AddSearchGameFragment().apply { bundleOf(EntranceConsts.KEY_NAVIGATION_TITLE to "添加游戏") }) fragments.add(AddUserPlayedGameFragment()) } diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchAndPlayedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchAndPlayedGameAdapter.kt index c639f8c830..966e37b7a3 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchAndPlayedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchAndPlayedGameAdapter.kt @@ -4,10 +4,10 @@ import android.content.Context import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType -import com.gh.common.util.DisplayUtils -import com.gh.common.util.toColor -import com.gh.common.util.toDrawable +import com.gh.gamecenter.common.constant.ItemViewType +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.databinding.GameItemBinding 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 f946ddfd06..f5dc558ad2 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 @@ -5,7 +5,7 @@ import android.view.View import androidx.core.widget.doOnTextChanged import androidx.recyclerview.widget.RecyclerView import com.gh.common.constant.Config -import com.gh.common.util.viewModelProvider +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.SuggestionActivity import com.gh.gamecenter.databinding.FragmentSearchGameBinding diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddUserPlayedGameFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddUserPlayedGameFragment.kt index 3bfab148bf..cde67b3d7e 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddUserPlayedGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddUserPlayedGameFragment.kt @@ -3,9 +3,9 @@ package com.gh.gamecenter.gamecollection.choose import android.os.Bundle import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.EntranceUtils -import com.gh.common.util.toColor -import com.gh.common.util.viewModelProvider +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.ListFragment @@ -50,7 +50,7 @@ class AddUserPlayedGameFragment : ListFragment( } override fun provideListViewModel(): PlayedGameViewModel { - val userId = arguments?.getString(EntranceUtils.KEY_USER_ID) + val userId = arguments?.getString(EntranceConsts.KEY_USER_ID) ?: UserManager.getInstance().userId mViewModel = viewModelProvider(AddUserPlayedGameViewModel.Factory(userId, true)) return mViewModel diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesAdapter.kt index 5289747923..6e25873476 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesAdapter.kt @@ -6,15 +6,14 @@ import android.view.MotionEvent import android.view.ViewGroup import androidx.core.widget.doOnTextChanged import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.PatternUtils -import com.gh.common.util.TextHelper -import com.gh.common.util.consume -import com.gh.common.util.toBinding +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.core.utils.PatternUtils +import com.gh.gamecenter.common.utils.TextHelper +import com.gh.gamecenter.common.utils.consume +import com.gh.gamecenter.common.utils.toBinding import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.databinding.ItemChooseGamesBinding import com.gh.gamecenter.entity.GameEntity -import com.lightgame.adapter.BaseRecyclerAdapter class ChooseGamesAdapter(context: Context, val dragListener: ItemDragListener) : ListAdapter(context) { diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt index bbeea3b7a6..b47183252a 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt @@ -6,13 +6,13 @@ import android.view.View import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.DialogHelper -import com.gh.common.util.goneIf -import com.gh.common.util.viewModelProvider +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentChooseGamesBinding import com.gh.gamecenter.entity.GameEntity -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import java.lang.ref.WeakReference import java.util.* diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesRepository.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesRepository.kt index fe394d38d7..2e2d848eab 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesRepository.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesRepository.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.gamecollection.choose import androidx.lifecycle.MutableLiveData -import com.gh.common.util.SingletonHolder +import com.gh.gamecenter.core.utils.SingletonHolder import com.gh.gamecenter.entity.GameEntity class ChooseGamesRepository private constructor() { diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt index f6ff9e6876..ce17d2c3ac 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt @@ -3,8 +3,8 @@ package com.gh.gamecenter.gamecollection.detail import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.common.util.GameCollectionSquareBrowseTaskHelper import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R @@ -31,9 +31,9 @@ class GameCollectionDetailActivity : NormalActivity() { @JvmStatic fun getIntent(context: Context, gameCollectionId: String, isFromSquare: Boolean = false, isScrollToCommentArea: Boolean = false): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_GAME_COLLECTION_ID, gameCollectionId) - bundle.putBoolean(EntranceUtils.KEY_IS_FROM_SQUARE, isFromSquare) - bundle.putBoolean(EntranceUtils.KEY_SCROLL_TO_COMMENT_AREA, isScrollToCommentArea) + bundle.putString(EntranceConsts.KEY_GAME_COLLECTION_ID, gameCollectionId) + bundle.putBoolean(EntranceConsts.KEY_IS_FROM_SQUARE, isFromSquare) + bundle.putBoolean(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, isScrollToCommentArea) if (context is GameCollectionSquareActivity) { val isFromBrowseTask = context.intent.getBooleanExtra(GameCollectionSquareBrowseTaskHelper.KEY_IS_FORM_BROWSE_TASK, false) bundle.putBoolean(GameCollectionSquareBrowseTaskHelper.KEY_IS_FORM_BROWSE_TASK, isFromBrowseTask) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt index a4997bab5e..01ca8df50e 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt @@ -16,15 +16,18 @@ import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.ExposureType import com.gh.common.exposure.IExposable -import com.gh.common.syncpage.SyncDataEntity -import com.gh.common.syncpage.SyncFieldConstants -import com.gh.common.syncpage.SyncPageRepository +import com.gh.gamecenter.common.syncpage.SyncDataEntity +import com.gh.gamecenter.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* -import com.gh.common.view.DrawableView -import com.gh.common.view.GridSpacingItemColorDecoration +import com.gh.gamecenter.common.view.DrawableView +import com.gh.gamecenter.common.view.GridSpacingItemColorDecoration import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.GameViewHolder +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.GameCollectionGameItemBinding import com.gh.gamecenter.databinding.ItemArticleDetailCommentBinding import com.gh.gamecenter.databinding.LayoutGameCollectionAuthTagBinding @@ -280,7 +283,13 @@ open class GameCollectionDetailAdapter( layoutManager = GridLayoutManager(context, 3) adapter = CommentPictureAdapter(context, comment.images!!, "") if (itemDecorationCount == 0) { - addItemDecoration(GridSpacingItemColorDecoration(context, 2, R.color.white)) + addItemDecoration( + GridSpacingItemColorDecoration( + context, + 2, + R.color.white + ) + ) } visibility = View.VISIBLE } @@ -363,14 +372,16 @@ open class GameCollectionDetailAdapter( } badgeTv.setOnClickListener { - DialogUtils.showViewBadgeDialog(mContext, comment.user.badge) { - DirectUtils.directToBadgeWall( - mContext, - comment.user.id, - comment.user.name, - comment.user.icon - ) - } + DialogUtils.showViewBadgeDialog(mContext, comment.user.badge, object : ConfirmListener { + override fun onConfirm() { + DirectUtils.directToBadgeWall( + mContext, + comment.user.id, + comment.user.name, + comment.user.icon + ) + } + }) } badgeIv.setOnClickListener { badgeTv.performClick() } @@ -504,7 +515,12 @@ open class GameCollectionDetailAdapter( BindingAdapters.setGameName(gameName, gameEntity, false, null) BindingAdapters.setTextSize(gameRating, if (gameEntity.commentCount > 3) 12 else 10) BindingAdapters.setGameTags(labelList, gameEntity) - gameRating.setCompoundDrawablesWithIntrinsicBounds(if (gameEntity.commentCount > 3) R.drawable.game_horizontal_rating.toDrawable() else null, null, null, null) + gameRating.setCompoundDrawablesWithIntrinsicBounds( + if (gameEntity.commentCount > 3) R.drawable.game_horizontal_rating.toDrawable() else null, + null, + null, + null + ) gameRating.setPadding(0, 0, if (gameEntity.commentCount > 3) 8F.dip2px() else 0, 0) gameRating.text = if (gameEntity.commentCount > 3) { if (gameEntity.star == 10.0F) "10" else gameEntity.star.toString() 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 942f79c926..eddbedf41f 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 @@ -11,12 +11,12 @@ import androidx.core.view.ViewCompat import androidx.lifecycle.Lifecycle import androidx.recyclerview.widget.RecyclerView import com.ethanhua.skeleton.Skeleton -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureListener import com.gh.common.history.HistoryHelper -import com.gh.common.syncpage.SyncDataEntity -import com.gh.common.syncpage.SyncFieldConstants -import com.gh.common.syncpage.SyncPageRepository +import com.gh.gamecenter.common.syncpage.SyncDataEntity +import com.gh.gamecenter.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus @@ -24,6 +24,9 @@ import com.gh.download.DownloadManager import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.baselist.LoadType +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentGameCollectionDetailBinding import com.gh.gamecenter.databinding.LayoutGameCollectionTagBinding import com.gh.gamecenter.entity.* @@ -97,9 +100,9 @@ class GameCollectionDetailFragment : override fun provideSyncAdapter() = mAdapter override fun onCreate(savedInstanceState: Bundle?) { - mGameCollectionId = arguments?.getString(EntranceUtils.KEY_GAME_COLLECTION_ID) ?: "" - mFromSquare = arguments?.getBoolean(EntranceUtils.KEY_IS_FROM_SQUARE, false) ?: false - mScrollToCommentArea = arguments?.getBoolean(EntranceUtils.KEY_SCROLL_TO_COMMENT_AREA, false) ?: false + mGameCollectionId = arguments?.getString(EntranceConsts.KEY_GAME_COLLECTION_ID) ?: "" + mFromSquare = arguments?.getBoolean(EntranceConsts.KEY_IS_FROM_SQUARE, false) ?: false + mScrollToCommentArea = arguments?.getBoolean(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, false) ?: false mUserViewModel = viewModelProvider(UserViewModel.Factory(HaloApp.getInstance().application)) super.onCreate(savedInstanceState) } 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 da05af0817..67fc2887ca 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 @@ -8,13 +8,17 @@ import android.text.TextUtils import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.gh.common.constant.Constants -import com.gh.common.syncpage.SyncDataEntity -import com.gh.common.syncpage.SyncFieldConstants -import com.gh.common.syncpage.SyncPageRepository +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.syncpage.SyncDataEntity +import com.gh.gamecenter.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.baselist.LoadStatus +import com.gh.gamecenter.common.utils.observableToMain +import com.gh.gamecenter.common.utils.singleToMain +import com.gh.gamecenter.common.utils.toNewSimpleCount +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.entity.GamesCollectionDetailEntity import com.gh.gamecenter.eventbus.EBUserFollow diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterActivity.kt index 491c030e9c..01dd09ab69 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterActivity.kt @@ -3,8 +3,8 @@ package com.gh.gamecenter.gamecollection.detail import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R import com.gh.gamecenter.entity.GamesCollectionDetailEntity @@ -21,7 +21,7 @@ class GameCollectionPosterActivity : NormalActivity() { @JvmStatic fun getIntent(context: Context, entity: GamesCollectionDetailEntity): Intent { val bundle = Bundle() - bundle.putParcelable(EntranceUtils.KEY_DATA, entity) + bundle.putParcelable(EntranceConsts.KEY_DATA, entity) return getTargetIntent(context, GameCollectionPosterActivity::class.java, GameCollectionPosterFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterFragment.kt index 8f90900c44..50fb47f647 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterFragment.kt @@ -5,14 +5,19 @@ import android.os.Build import android.os.Bundle import android.view.View import androidx.annotation.RequiresApi -import com.gh.common.runOnUiThread +import com.gh.gamecenter.core.runOnUiThread import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.callback.BiCallback +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.utils.BitmapUtils import com.gh.gamecenter.databinding.FragmentGameCollectionPosterBinding import com.gh.gamecenter.databinding.LayoutGameCollectionTagBinding import com.gh.gamecenter.entity.GamesCollectionDetailEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment class GameCollectionPosterFragment : NormalFragment() { @@ -28,7 +33,7 @@ class GameCollectionPosterFragment : NormalFragment() { super.onCreate(savedInstanceState) mViewModel = viewModelProvider() - mEntity = arguments?.getParcelable(EntranceUtils.KEY_DATA) ?: GamesCollectionDetailEntity() + mEntity = arguments?.getParcelable(EntranceConsts.KEY_DATA) ?: GamesCollectionDetailEntity() } diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionVideoView.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionVideoView.kt index 4f00d3d706..b9e99a13fb 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionVideoView.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionVideoView.kt @@ -13,11 +13,16 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager -import com.gh.common.observer.MuteCallback -import com.gh.common.observer.VolumeObserver -import com.gh.common.runOnIoThread +import com.gh.gamecenter.common.observer.MuteCallback +import com.gh.gamecenter.common.observer.VolumeObserver +import com.gh.gamecenter.core.runOnIoThread import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.debounceActionWithInterval +import com.gh.gamecenter.common.utils.rxTimer +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.utils.NetworkUtils +import com.gh.gamecenter.core.utils.MD5Utils import com.gh.gamecenter.entity.GamesCollectionDetailEntity import com.gh.gamecenter.home.video.ScrollCalculatorHelper import com.gh.gamecenter.video.detail.CustomManager @@ -92,8 +97,8 @@ class GameCollectionVideoView @JvmOverloads constructor(context: Context, attrs: debounceActionWithInterval(errorBtn.id, 1000) { if (!com.shuyu.gsyvideoplayer.utils.NetworkUtils.isAvailable(mContext)) { Utils.toast(context, "网络异常，请检查手机网络状态") - setViewShowState(mStartButton, View.INVISIBLE) - errorContainer.visibility = View.VISIBLE + setViewShowState(mStartButton, INVISIBLE) + errorContainer.visibility = VISIBLE return@debounceActionWithInterval } startPlayLogic(false) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationAdapter.kt index 86155840d4..94b86b39d2 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationAdapter.kt @@ -6,7 +6,7 @@ import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.dip2px +import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.databinding.ItemArticleDetailCommentBinding import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailAdapter diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationFragment.kt index e868027ac6..afae41d362 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationFragment.kt @@ -7,14 +7,15 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import com.ethanhua.skeleton.Skeleton -import com.gh.common.AppExecutor -import com.gh.common.syncpage.SyncDataEntity -import com.gh.common.syncpage.SyncFieldConstants -import com.gh.common.syncpage.SyncPageRepository -import com.gh.common.util.* +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.common.syncpage.SyncDataEntity +import com.gh.gamecenter.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.LoadType +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.databinding.FragmentArticleDetailCommentBinding import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.manager.UserManager @@ -36,7 +37,7 @@ class GameCollectionCommentConversationFragment : BaseCommentFragment(EntranceUtils.KEY_DATA) + val entity = data.getParcelableExtra(EntranceConsts.KEY_DATA) if (entity != null) { mViewModel.imageUrl = entity.url mViewModel.uploadImageSuccessLiveData.postValue(entity.url) @@ -435,8 +439,8 @@ class GameCollectionEditActivity : ToolBarActivity() { @JvmStatic fun getIntent(context: Context, entrance: String = "", path: String = ""): Intent { val intent = Intent(context, GameCollectionEditActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) - intent.putExtra(EntranceUtils.KEY_PATH, path) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_PATH, path) return intent } @@ -444,8 +448,8 @@ class GameCollectionEditActivity : ToolBarActivity() { fun getIntent(context: Context, entity: GamesCollectionEntity, entrance: String = "", path: String = ""): Intent { val intent = Intent(context, GameCollectionEditActivity::class.java) intent.putExtra(GamesCollectionEntity::class.java.name, entity) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) - intent.putExtra(EntranceUtils.KEY_PATH, path) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_PATH, path) return intent } } 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 89aa93b440..d584c0d33a 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 @@ -5,9 +5,13 @@ import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData -import com.gh.base.fragment.WaitingDialogFragment -import com.gh.common.runOnIoThread +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.common.util.* +import com.gh.gamecenter.core.runOnIoThread +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.common.utils.observableToMain +import com.gh.gamecenter.common.utils.singleToMain +import com.gh.gamecenter.common.utils.toRequestBody import com.gh.gamecenter.entity.GameCollectionDraft import com.gh.gamecenter.entity.GamesCollectionEntity import com.gh.gamecenter.entity.TagInfoEntity diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionAmwayAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionAmwayAdapter.kt index eb14309988..400dcf0561 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionAmwayAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionAmwayAdapter.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.gamecollection.square import android.content.Context import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.TextHelper +import com.gh.gamecenter.common.utils.TextHelper import com.gh.gamecenter.R import com.gh.gamecenter.databinding.GameCollectionAmwayContentItemBinding import com.gh.gamecenter.entity.AmwayCommentEntity diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareActivity.kt index 3b25e841ed..5c45108156 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareActivity.kt @@ -2,7 +2,7 @@ package com.gh.gamecenter.gamecollection.square import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.DisplayUtils +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.common.util.GameCollectionSquareBrowseTaskHelper import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareAdapter.kt index 1d1c4ed29a..53c2c69e65 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareAdapter.kt @@ -10,17 +10,19 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.base.BaseActivity -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable import com.gh.common.util.* -import com.gh.common.util.ImageUtils.display +import com.gh.gamecenter.common.utils.ImageUtils.display import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.LoadStatus +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.databinding.GameCollectionSquareAmwayItemBinding import com.gh.gamecenter.databinding.GameCollectionSquareItemBinding import com.gh.gamecenter.entity.AmwayCommentEntity diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt index 0b84ac9add..498af6cc0d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt @@ -14,16 +14,19 @@ import androidx.core.content.ContextCompat import androidx.core.view.ViewCompat import androidx.recyclerview.widget.RecyclerView import com.ethanhua.skeleton.Skeleton -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureListener import com.gh.common.exposure.ExposureSource import com.gh.common.util.* -import com.gh.common.view.SegmentedFilterView -import com.gh.common.view.VerticalItemDecoration +import com.gh.gamecenter.common.view.SegmentedFilterView +import com.gh.gamecenter.common.view.VerticalItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.LazyListFragment import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.LoadType +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentGameCollectionSquareAlBinding import com.gh.gamecenter.databinding.FragmentGameCollectionSquareBinding import com.gh.gamecenter.entity.GamesCollectionEntity @@ -56,10 +59,10 @@ class GameCollectionSquareFragment : LazyListFragment { if (mAdapter == null) { - val outerSequence = arguments?.getInt(EntranceUtils.KEY_TAB_INDEX) - val tabName = arguments?.getString(EntranceUtils.KEY_NAME) ?: "" + val outerSequence = arguments?.getInt(EntranceConsts.KEY_TAB_INDEX) + val tabName = arguments?.getString(EntranceConsts.KEY_NAME) ?: "" val basicExposureSource = arrayListOf().apply { add(ExposureSource(if (mUseAlternativeLayout) "顶部tab" else "游戏单广场", if (mUseAlternativeLayout) tabName else "")) } diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagAdapter.kt index ff913b8e0f..95fad4a404 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagAdapter.kt @@ -1,13 +1,12 @@ package com.gh.gamecenter.gamecollection.tag import android.content.Context -import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.DisplayUtils -import com.gh.common.util.ToastUtils -import com.gh.common.util.dip2px -import com.gh.common.util.goneIf +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.goneIf import com.gh.gamecenter.databinding.* import com.gh.gamecenter.entity.GameCollectionTagEntity import com.gh.gamecenter.entity.TagInfoEntity diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt index adf873f23a..4f86d7a43c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt @@ -9,12 +9,12 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.SimpleItemAnimator import com.gh.common.util.NewLogUtils -import com.gh.common.util.viewModelProvider +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentGameCollectionTagSelectBinding import com.gh.gamecenter.databinding.ItemGameCollectionSelectedTagBinding import com.gh.gamecenter.entity.TagInfoEntity -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment class GameCollectionTagSelectFragment : NormalFragment() { 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 d6ebb300bf..7f864edd97 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt @@ -16,18 +16,18 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.Observer import com.ethanhua.skeleton.Skeleton import com.ethanhua.skeleton.ViewSkeletonScreen -import com.gh.base.adapter.FragmentAdapter -import com.gh.base.fragment.BaseFragment_TabLayout +import com.gh.gamecenter.common.base.adapter.FragmentAdapter +import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout import com.gh.common.constant.Config -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.databind.BindingAdapters import com.gh.common.exposure.ExposureEvent -import com.gh.common.iinterface.IScrollable +import com.gh.gamecenter.core.iinterface.IScrollable import com.gh.common.repository.ReservationRepository import com.gh.common.simulator.SimulatorGameManager import com.gh.common.util.* import com.gh.common.view.FlexLinearLayout -import com.gh.common.view.WrapContentDraweeView +import com.gh.gamecenter.common.view.WrapContentDraweeView import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus import com.gh.download.DownloadManager @@ -37,6 +37,9 @@ import com.gh.gamecenter.R import com.gh.gamecenter.SearchActivity import com.gh.gamecenter.ShellActivity import com.gh.gamecenter.adapter.viewholder.DetailViewHolder +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.* import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.* @@ -50,7 +53,7 @@ import com.gh.gamecenter.gamedetail.rating.RatingFragment import com.gh.gamecenter.gamedetail.video.TopVideoView import com.gh.gamecenter.home.video.ScrollCalculatorHelper import com.gh.gamecenter.mvvm.Status -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.gh.gamecenter.packagehelper.PackageViewModel import com.gh.gamecenter.setting.VideoSettingFragment import com.gh.gamecenter.simulatorgame.SimulatorGameActivity @@ -266,11 +269,11 @@ class GameDetailFragment : NormalFragment() { mMaxWidth = resources.displayMetrics.widthPixels - DisplayUtils.dip2px(40f) val args = arguments ?: Bundle() - mAutoDownload = args.getBoolean(EntranceUtils.KEY_AUTO_DOWNLOAD) - mTraceEvent = args.getParcelable(EntranceUtils.KEY_TRACE_EVENT) - mSkipGameComment = args.getBoolean(EntranceUtils.KEY_SKIP_GAME_COMMENT) - mDestinationTab = if (mDestinationTab >= 0) mDestinationTab else args.getInt(EntranceUtils.KEY_TARGET, -1) - mIsOpenPlatformWindow = args.getBoolean(EntranceUtils.KEY_OPEN_PLATFORM_WINDOW) + mAutoDownload = args.getBoolean(EntranceConsts.KEY_AUTO_DOWNLOAD) + mTraceEvent = args.getParcelable(EntranceConsts.KEY_TRACE_EVENT) + mSkipGameComment = args.getBoolean(EntranceConsts.KEY_SKIP_GAME_COMMENT) + mDestinationTab = if (mDestinationTab >= 0) mDestinationTab else args.getInt(EntranceConsts.KEY_TARGET, -1) + mIsOpenPlatformWindow = args.getBoolean(EntranceConsts.KEY_OPEN_PLATFORM_WINDOW) mSkeleton = Skeleton.bind(mBinding.listSkeleton) .shimmer(true) @@ -284,7 +287,7 @@ class GameDetailFragment : NormalFragment() { val factory = GameDetailViewModel.Factory( HaloApp.getInstance().application, - args.getString(EntranceUtils.KEY_GAMEID), + args.getString(EntranceConsts.KEY_GAMEID), args.getParcelable(GameEntity.TAG) ) mViewModel = viewModelProviderFromParent(factory) @@ -422,7 +425,7 @@ class GameDetailFragment : NormalFragment() { mGameEntity = gameResource.data controlInstallHint() // 添加启动弹窗的相关信息 - if (mEntrance.contains(EntranceUtils.ENTRANCE_WELCOME) && mEntrance.countOccurrences("+") <= 1) { + if (mEntrance.contains(EntranceConsts.ENTRANCE_WELCOME) && mEntrance.countOccurrences("+") <= 1) { mGameEntity?.setWelcomeDialogInfoIfAvailable() } } else if (gameResource.status == Status.ERROR) { @@ -549,24 +552,24 @@ class GameDetailFragment : NormalFragment() { @SuppressLint("ClickableViewAccessibility") private fun initViewPage(data: NewGameDetailEntity) { - val scrollToLibao = arguments?.getBoolean(EntranceUtils.KEY_SCROLL_TO_LIBAO) ?: false - val scrollToServer = arguments?.getBoolean(EntranceUtils.KEY_SCROLL_TO_SERVER) ?: false + val scrollToLibao = arguments?.getBoolean(EntranceConsts.KEY_SCROLL_TO_LIBAO) ?: false + val scrollToServer = arguments?.getBoolean(EntranceConsts.KEY_SCROLL_TO_SERVER) ?: false if (scrollToLibao || scrollToServer) { mBodyBinding.gamedetailAppbar.setExpanded(false, true) } val bundle = Bundle() bundle.putParcelable(GameEntity.TAG, mGameEntity) - bundle.putString(EntranceUtils.KEY_ENTRANCE, mEntrance) - bundle.putBoolean(EntranceUtils.KEY_SCROLL_TO_LIBAO, scrollToLibao) - bundle.putBoolean(EntranceUtils.KEY_SCROLL_TO_SERVER, scrollToServer) + bundle.putString(EntranceConsts.KEY_ENTRANCE, mEntrance) + bundle.putBoolean(EntranceConsts.KEY_SCROLL_TO_LIBAO, scrollToLibao) + bundle.putBoolean(EntranceConsts.KEY_SCROLL_TO_SERVER, scrollToServer) bundle.putBoolean( - EntranceUtils.KEY_SCROLL_TO_LIBAO, - arguments?.getBoolean(EntranceUtils.KEY_SCROLL_TO_LIBAO) ?: false + EntranceConsts.KEY_SCROLL_TO_LIBAO, + arguments?.getBoolean(EntranceConsts.KEY_SCROLL_TO_LIBAO) ?: false ) bundle.putBoolean( - EntranceUtils.KEY_OPEN_VIDEO_STREAMING, - arguments?.getBoolean(EntranceUtils.KEY_OPEN_VIDEO_STREAMING) ?: false + EntranceConsts.KEY_OPEN_VIDEO_STREAMING, + arguments?.getBoolean(EntranceConsts.KEY_OPEN_VIDEO_STREAMING) ?: false ) mFragmentsList.clear() mTabTitleList.clear() @@ -581,7 +584,7 @@ class GameDetailFragment : NormalFragment() { if (it.style == "link") {//显示web页面 val webFragment = childFragmentManager.findFragmentByTag("${tag}${INDEX_TRENDES}") ?: WebFragment() val webBundle = Bundle() - webBundle.putString(EntranceUtils.KEY_URL, it.link) + webBundle.putString(EntranceConsts.KEY_URL, it.link) webBundle.putBoolean(WebFragment.KEY_OPEN_NATIVE_PAGE, true) webFragment.arguments = webBundle mFragmentsList.add(webFragment) @@ -595,8 +598,8 @@ class GameDetailFragment : NormalFragment() { if (data.showComment) { val ratingFragment = childFragmentManager.findFragmentByTag("${tag}${INDEX_RATING}") ?: RatingFragment() - bundle.putBoolean(EntranceUtils.KEY_SKIP_GAME_COMMENT, mSkipGameComment) - bundle.putBoolean(EntranceUtils.KEY_DIRECT_COMMENT, data.directComment) + bundle.putBoolean(EntranceConsts.KEY_SKIP_GAME_COMMENT, mSkipGameComment) + bundle.putBoolean(EntranceConsts.KEY_DIRECT_COMMENT, data.directComment) ratingFragment.arguments = bundle mFragmentsList.add(ratingFragment) mTabTitleList.add(getString(R.string.game_detail_comment)) @@ -611,7 +614,8 @@ class GameDetailFragment : NormalFragment() { mBodyBinding.toolbarGapView.goneIf(mTabTitleList.size == 1) mBodyBinding.run { - gamedetailVp.adapter = FragmentAdapter(childFragmentManager, mFragmentsList, mTabTitleList) + gamedetailVp.adapter = + FragmentAdapter(childFragmentManager, mFragmentsList, mTabTitleList) gamedetailVp.doOnPageSelected { logTabClick(it) } 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 9a6447205a..7a968cedea 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt @@ -9,11 +9,16 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.filter.RegionSettingHelper import com.gh.common.history.HistoryHelper -import com.gh.common.runOnUiThread +import com.gh.gamecenter.core.runOnUiThread import com.gh.common.util.* +import com.gh.gamecenter.core.utils.GsonUtils +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.singleToMain +import com.gh.gamecenter.common.utils.toRequestBody +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.entity.* import com.gh.gamecenter.gamedetail.entity.BigEvent import com.gh.gamecenter.gamedetail.entity.CustomColumn diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt index 3e705e74ea..59685c59f1 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt @@ -18,20 +18,23 @@ import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.base.OnListClickListener +import com.gh.gamecenter.common.callback.OnListClickListener import com.gh.common.DefaultUrlHandler -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.databind.BindingAdapters import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureManager import com.gh.common.exposure.ExposureSource import com.gh.common.util.* -import com.gh.common.view.GridSpacingItemColorDecoration -import com.gh.common.view.divider.HorizontalDividerItemDecoration +import com.gh.gamecenter.common.view.GridSpacingItemColorDecoration +import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration import com.gh.gamecenter.GameNewsActivity import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity import com.gh.gamecenter.adapter.viewholder.FooterViewHolder +import com.gh.gamecenter.common.* +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.* import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.GameEntity @@ -669,8 +672,10 @@ class DescAdapter( setExpandMaxLines(maxDesLines) setIsExpanded(Int.MAX_VALUE == maxDesLines) if (customColumn.isHtmlDes == true) { - shrankSpanned = HtmlCompat.fromHtml(customColumn.desBrief ?: "", HtmlCompat.FROM_HTML_MODE_COMPACT, PicassoImageGetter(contentTv), ExtraTagHandler()) - expandedSpanned = HtmlCompat.fromHtml(customColumn.des ?: "", HtmlCompat.FROM_HTML_MODE_COMPACT, PicassoImageGetter(contentTv), ExtraTagHandler()) + shrankSpanned = HtmlCompat.fromHtml(customColumn.desBrief ?: "", HtmlCompat.FROM_HTML_MODE_COMPACT, + PicassoImageGetter(contentTv), ExtraTagHandler()) + expandedSpanned = HtmlCompat.fromHtml(customColumn.des ?: "", HtmlCompat.FROM_HTML_MODE_COMPACT, + PicassoImageGetter(contentTv), ExtraTagHandler()) setTextWithInterceptingInternalUrl(shrankText = shrankSpanned, expandedText = expandedSpanned) { val linkEntity = DefaultUrlHandler.urlToLinkEntity(it) logCustomColumnLinkClicked(title = customColumn.name, linkEntity, "正文说明") diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt index 2ddc297133..8ddea93572 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt @@ -11,11 +11,14 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.base.BaseActivity -import com.gh.common.constant.Constants -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ItemGameDetailRatingCommentBinding import com.gh.gamecenter.entity.RatingComment import com.gh.gamecenter.eventbus.EBReuse @@ -115,11 +118,13 @@ class DescCommentsAdapter( } sdvUserBadge.setOnClickListener { - DialogUtils.showViewBadgeDialog(mContext, commentData.user.badge) { - MtaHelper.onEvent("进入徽章墙_用户记录", "游戏详情-玩家评论", "${commentData.user.name}（${commentData.user.id}）") - MtaHelper.onEvent("徽章中心", "进入徽章中心", "游戏详情-玩家评论") - DirectUtils.directToBadgeWall(mContext, commentData.user.id, commentData.user.name, commentData.user.icon) - } + DialogUtils.showViewBadgeDialog(mContext, commentData.user.badge, object : ConfirmListener { + override fun onConfirm() { + MtaHelper.onEvent("进入徽章墙_用户记录", "游戏详情-玩家评论", "${commentData.user.name}（${commentData.user.id}）") + MtaHelper.onEvent("徽章中心", "进入徽章中心", "游戏详情-玩家评论") + DirectUtils.directToBadgeWall(mContext, commentData.user.id, commentData.user.name, commentData.user.icon) + } + }) } userIcon.setOnClickListener { DirectUtils.directToHomeActivity(mContext, commentData.user.id, mEntrance, "游戏详情-玩家评论") diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt index 8ad1395bf1..dc5893cd4f 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt @@ -7,12 +7,17 @@ import android.view.View import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.base.fragment.BaseFragment -import com.gh.common.constant.Constants -import com.gh.common.iinterface.IScrollable +import com.gh.gamecenter.common.base.fragment.BaseFragment +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.core.iinterface.IScrollable import com.gh.common.util.* import com.gh.gamecenter.LibaoDetailActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.common.utils.viewModelProviderFromParent +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentDescBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.LibaoEntity @@ -85,11 +90,11 @@ class DescFragment : BaseFragment(), IScrollable { override fun onCreate(savedInstanceState: Bundle?) { mGameEntity = arguments?.getParcelable(GameEntity.TAG) - openVideoStreaming = arguments?.getBoolean(EntranceUtils.KEY_OPEN_VIDEO_STREAMING, false) + openVideoStreaming = arguments?.getBoolean(EntranceConsts.KEY_OPEN_VIDEO_STREAMING, false) ?: false - mScrollToLibao = arguments?.getBoolean(EntranceUtils.KEY_SCROLL_TO_LIBAO, false) + mScrollToLibao = arguments?.getBoolean(EntranceConsts.KEY_SCROLL_TO_LIBAO, false) ?: false - mScrollToServer = arguments?.getBoolean(EntranceUtils.KEY_SCROLL_TO_SERVER, false) + mScrollToServer = arguments?.getBoolean(EntranceConsts.KEY_SCROLL_TO_SERVER, false) ?: false val gameDetailFactory = GameDetailViewModel.Factory(HaloApp.getInstance().application, mGameEntity?.id, mGameEntity) 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 c929f7c77a..3c64c4a63f 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 @@ -9,11 +9,13 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.facebook.common.util.UriUtil -import com.gh.common.constant.Constants -import com.gh.common.exposure.meta.MetaUtil +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.exposure.meta.MetaUtil import com.gh.common.repository.RemenkapaiRepository import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.ErrorEntity import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.SubjectEntity diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailCustomColumnAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailCustomColumnAdapter.kt index 9b28810d6a..067b875070 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailCustomColumnAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailCustomColumnAdapter.kt @@ -6,10 +6,13 @@ import android.net.Uri import android.text.Spanned import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.* -import com.gh.common.view.CenterImageSpan -import com.gh.common.view.CustomLinkMovementMethod +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.view.CustomLinkMovementMethod +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.utils.tryWithDefaultCatch +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.GamedetailItemCustomColumnItemBinding import com.gh.gamecenter.entity.TagEntity import com.lightgame.adapter.BaseRecyclerAdapter diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailInfoItemAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailInfoItemAdapter.kt index 21182428f5..462ca79baa 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailInfoItemAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailInfoItemAdapter.kt @@ -10,6 +10,11 @@ import com.gh.common.DefaultUrlHandler import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.core.utils.TimeUtils +import com.gh.gamecenter.common.utils.copyTextAndToast +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.ItemGameInfoBinding import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment import com.gh.gamecenter.gamedetail.entity.GameInfo diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameGalleryAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameGalleryAdapter.kt index 1c7400254c..47f63ed40e 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameGalleryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameGalleryAdapter.kt @@ -4,11 +4,17 @@ import android.content.Context import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.facebook.drawee.view.SimpleDraweeView -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.util.* -import com.gh.common.view.WrapContentDraweeView +import com.gh.gamecenter.common.view.WrapContentDraweeView import com.gh.gamecenter.ImageViewerActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.setDebouncedClickListener +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.utils.toPx +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.GalleryVideoItemBinding import com.gh.gamecenter.databinding.GamedetailScreenshotItemBinding import com.gh.gamecenter.entity.GameDetailEntity diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLatestServiceAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLatestServiceAdapter.kt index 0de452c641..0779c73f77 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLatestServiceAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLatestServiceAdapter.kt @@ -7,9 +7,9 @@ import android.view.View.MeasureSpec import android.view.ViewGroup import android.view.ViewTreeObserver import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.TimeUtils -import com.gh.common.util.safelyGetInRelease -import com.gh.common.util.toBinding +import com.gh.gamecenter.core.utils.TimeUtils +import com.gh.gamecenter.common.utils.safelyGetInRelease +import com.gh.gamecenter.common.utils.toBinding import com.gh.gamecenter.databinding.ItemGameDetailLatestServiceBinding import com.gh.gamecenter.databinding.ItemGameDetailMoreBinding import com.gh.gamecenter.entity.ServerCalendarEntity diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt index 2a85525971..46e0867cba 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt @@ -5,9 +5,14 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.base.OnListClickListener +import com.gh.gamecenter.common.callback.OnListClickListener import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.core.utils.SpanBuilder +import com.gh.gamecenter.common.utils.copyTextAndToast +import com.gh.gamecenter.common.utils.fromHtml +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.ItemGameDetailMoreBinding import com.gh.gamecenter.databinding.ItemGameLibaoBinding import com.gh.gamecenter.entity.LibaoEntity diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRaidersAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRaidersAdapter.kt index 16d56f4d3b..0a2df88578 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRaidersAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRaidersAdapter.kt @@ -8,6 +8,12 @@ import com.gh.common.DefaultUrlHandler import com.gh.common.util.* import com.gh.gamecenter.NewsDetailActivity import com.gh.gamecenter.R +import com.gh.gamecenter.core.utils.TimeUtils +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.utils.toPx +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.ItemGameRaidersBinding import com.gh.gamecenter.databinding.ItemGameRaidersFixedTopBinding import com.gh.gamecenter.entity.GameEntity diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRelatedVersionAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRelatedVersionAdapter.kt index f454086e5c..5fb6f878e3 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRelatedVersionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRelatedVersionAdapter.kt @@ -9,6 +9,10 @@ import com.gh.common.exposure.ExposureEvent import com.gh.common.util.* import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R +import com.gh.gamecenter.core.utils.StringUtils +import com.gh.gamecenter.common.utils.safelyGetInRelease +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.ItemGameDetailRelatedVersionBinding import com.gh.gamecenter.entity.GameDetailEntity diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventAdapter.kt index 7bc1bd602f..12ea06f8bd 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventAdapter.kt @@ -11,8 +11,8 @@ import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.common.util.DirectUtils -import com.gh.common.util.TimeUtils -import com.gh.common.util.toBinding +import com.gh.gamecenter.core.utils.TimeUtils +import com.gh.gamecenter.common.utils.toBinding import com.gh.gamecenter.R import com.gh.gamecenter.databinding.ItemGameDetailBigEventBinding import com.gh.gamecenter.gamedetail.entity.BigEvent diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventDialog.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventDialog.kt index 9ff9468c2d..e0e57b54c0 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventDialog.kt @@ -9,9 +9,9 @@ import android.view.Window import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.common.dialog.TrackableDialog -import com.gh.common.util.DisplayUtils -import com.gh.common.view.VerticalItemDecoration +import com.gh.gamecenter.common.base.TrackableDialog +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.view.VerticalItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.gamedetail.entity.BigEvent diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt index be75607b89..ed0a9d3026 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt @@ -7,9 +7,9 @@ import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import com.gh.common.dialog.BaseDraggableDialogFragment import com.gh.common.util.EnergyTaskHelper.postEnergyTask -import com.gh.common.util.MtaHelper +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.common.util.ShareUtils -import com.gh.common.util.isPublishEnv +import com.gh.gamecenter.common.utils.isPublishEnv import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity import com.gh.gamecenter.WebActivity diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GamePermissionAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GamePermissionAdapter.kt index da4641f0d4..a73a249ff0 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GamePermissionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GamePermissionAdapter.kt @@ -8,9 +8,9 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.dip2px -import com.gh.common.util.toBinding +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toBinding import com.gh.gamecenter.R import com.gh.gamecenter.databinding.GamePermissionItemBinding import com.gh.gamecenter.gamedetail.entity.Permission diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GamePermissionDialogFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GamePermissionDialogFragment.kt index b5439c631f..c83bc32a51 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GamePermissionDialogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GamePermissionDialogFragment.kt @@ -6,13 +6,13 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.LinearLayoutManager -import com.gh.base.fragment.BaseDialogFragment +import com.gh.gamecenter.common.base.fragment.BaseDialogFragment import com.gh.common.DefaultUrlHandler -import com.gh.common.util.DialogUtils -import com.gh.common.util.dip2px -import com.gh.common.util.goneIf +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.goneIf import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity +import com.gh.gamecenter.common.callback.ConfirmListener import com.gh.gamecenter.databinding.GamePermissionDialogBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.gamedetail.entity.GameInfo @@ -23,7 +23,7 @@ class GamePermissionDialogFragment : BaseDialogFragment() { private var mGame: GameEntity? = null private var mGameInfo: GameInfo? = null - var callback: DialogUtils.ConfirmListener? = null + var callback: ConfirmListener? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -81,7 +81,7 @@ class GamePermissionDialogFragment : BaseDialogFragment() { fun show(activity: AppCompatActivity, game: GameEntity?, gameInfo: GameInfo?, - callBack: DialogUtils.ConfirmListener? = null) { + callBack: ConfirmListener? = null) { if (callBack == null || game?.permissionDialogStatus == "on") { GamePermissionDialogFragment().apply { arguments = Bundle().apply { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt index b3e238d378..d42b470af7 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt @@ -11,11 +11,11 @@ import androidx.core.os.bundleOf import androidx.fragment.app.FragmentActivity import androidx.recyclerview.widget.LinearLayoutManager import com.gh.common.dialog.BaseTrackableDialogFragment -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils -import com.gh.common.util.MtaHelper +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.common.util.NewLogUtils -import com.gh.common.view.divider.HorizontalDividerItemDecoration +import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration import com.gh.download.dialog.DownloadDialog import com.gh.gamecenter.R import com.gh.gamecenter.databinding.DialogGameTagsBinding @@ -32,9 +32,9 @@ class GameTagsDialog : BaseTrackableDialogFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mGameId = requireArguments().getString(EntranceUtils.KEY_GAME_ID) ?: "" - mGameName = requireArguments().getString(EntranceUtils.KEY_GAME_NAME) ?: "" - mTagStyles = requireArguments().getParcelableArrayList(EntranceUtils.KEY_TAGTYPE) + mGameId = requireArguments().getString(EntranceConsts.KEY_GAME_ID) ?: "" + mGameName = requireArguments().getString(EntranceConsts.KEY_GAME_NAME) ?: "" + mTagStyles = requireArguments().getParcelableArrayList(EntranceConsts.KEY_TAGTYPE) ?: ArrayList() } @@ -88,9 +88,10 @@ class GameTagsDialog : BaseTrackableDialogFragment() { companion object { fun showGameTagsDialog(context: FragmentActivity, tagStyles: ArrayList, gameId: String, gameName: String) { val dialog = GameTagsDialog().apply { - arguments = bundleOf(EntranceUtils.KEY_GAME_ID to gameId, - EntranceUtils.KEY_GAME_NAME to gameName, - EntranceUtils.KEY_TAGTYPE to tagStyles + arguments = bundleOf( + EntranceConsts.KEY_GAME_ID to gameId, + EntranceConsts.KEY_GAME_NAME to gameName, + EntranceConsts.KEY_TAGTYPE to tagStyles ) } dialog.show(context.supportFragmentManager, DownloadDialog::class.java.name) 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 db3fdf7e36..d920ba0323 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 @@ -6,7 +6,7 @@ import android.view.* import androidx.appcompat.app.AppCompatActivity import com.gh.common.dialog.BaseDraggableDialogFragment import com.gh.common.util.EnergyTaskHelper -import com.gh.common.util.ToastUtils +import com.gh.gamecenter.core.utils.ToastUtils import com.gh.gamecenter.databinding.DialogInviteCodeBinding import com.gh.gamecenter.eventbus.EBTask import com.gh.gamecenter.manager.UserManager diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiAdapter.kt index 11569f33cf..b9b0c8dddf 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiAdapter.kt @@ -8,13 +8,17 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.gh.common.util.* -import com.gh.common.view.MarqueeView +import com.gh.gamecenter.common.view.MarqueeView import com.gh.gamecenter.GameNewsActivity import com.gh.gamecenter.NewsDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.GameDetailNoticeViewHolder +import com.gh.gamecenter.core.utils.StringUtils +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.GameGalleryListBinding import com.gh.gamecenter.databinding.GamedetailItemAnswerBinding import com.gh.gamecenter.databinding.GamedetailItemNoticeBinding diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt index ecb16cfb1d..13de9975e0 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt @@ -8,10 +8,15 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.ethanhua.skeleton.Skeleton import com.ethanhua.skeleton.ViewSkeletonScreen -import com.gh.base.fragment.LazyFragment -import com.gh.common.iinterface.IScrollable +import com.gh.gamecenter.common.base.fragment.LazyFragment +import com.gh.gamecenter.core.iinterface.IScrollable import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.common.utils.viewModelProviderFromParent import com.gh.gamecenter.databinding.FragmentFuliBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.eventbus.EBReuse @@ -60,7 +65,7 @@ class FuLiFragment : LazyFragment(), IScrollable { override fun onFragmentFirstVisible() { val gameEntity = arguments?.getParcelable(GameEntity.TAG) as? GameEntity val gameDetailFactory = GameDetailViewModel.Factory(HaloApp.getInstance().application, gameEntity?.id, gameEntity) - shouldScroolToLibao = arguments?.getBoolean(EntranceUtils.KEY_SCROLL_TO_LIBAO) ?: false + shouldScroolToLibao = arguments?.getBoolean(EntranceConsts.KEY_SCROLL_TO_LIBAO) ?: false mGameDetailViewModel = viewModelProviderFromParent(gameDetailFactory) mFuLiViewModel = viewModelProvider() diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiViewModel.kt index 868fa9b5e8..01ada55019 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiViewModel.kt @@ -8,8 +8,6 @@ import com.gh.gamecenter.entity.UnifiedGameDetailEntity import com.gh.gamecenter.gamedetail.entity.ZoneContentEntity import com.gh.gamecenter.gamedetail.entity.ZoneEntity import com.gh.gamecenter.mvvm.Resource -import com.gh.gamecenter.retrofit.RetrofitManager -import com.halo.assistant.HaloApp class FuLiViewModel : ViewModel() { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/GameNewsAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/GameNewsAdapter.kt index ff1cd345d4..df93c24e9d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/GameNewsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/GameNewsAdapter.kt @@ -7,8 +7,8 @@ import androidx.recyclerview.widget.RecyclerView import com.gh.common.util.DataCollectionUtils import com.gh.common.util.DataUtils import com.gh.common.util.NewsUtils -import com.gh.common.util.toBinding -import com.gh.common.view.DrawableView +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.NewsDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.databinding.ItemGameDetailNewsBinding diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/answer/GameDetailAnswerAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/answer/GameDetailAnswerAdapter.kt index 3c66cb4a60..38f2e2e065 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/answer/GameDetailAnswerAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/answer/GameDetailAnswerAdapter.kt @@ -3,12 +3,12 @@ package com.gh.gamecenter.gamedetail.fuli.answer import android.content.Context import android.view.ViewGroup import androidx.core.content.ContextCompat -import com.gh.common.constant.Constants -import com.gh.common.syncpage.ISyncAdapterHandler -import com.gh.common.util.DisplayUtils -import com.gh.common.util.MtaHelper -import com.gh.common.util.StringUtils -import com.gh.common.util.visibleIf +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.core.utils.StringUtils +import com.gh.gamecenter.common.utils.visibleIf import com.gh.gamecenter.R import com.gh.gamecenter.databinding.CommunityAnswerItemBinding import com.gh.gamecenter.entity.CommunityEntity diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/answer/GameDetailAnswerViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/answer/GameDetailAnswerViewHolder.kt index 869b281434..1dd75dba7e 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/answer/GameDetailAnswerViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/answer/GameDetailAnswerViewHolder.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.gamedetail.fuli.answer -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.databinding.GamedetailItemAnswerBinding class GameDetailAnswerViewHolder(val binding: GamedetailItemAnswerBinding) : BaseRecyclerViewHolder(binding.root) \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt index baa1c0a827..efcf25b9a6 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt @@ -15,9 +15,10 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.gh.base.ToolBarActivity -import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ActivityServersCalendarBinding import com.gh.gamecenter.databinding.DialogServersCalendearDetailItemBinding import com.gh.gamecenter.entity.* diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarAdapter.kt index 485d670404..78a68e0b35 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarAdapter.kt @@ -9,11 +9,11 @@ import android.view.ViewGroup import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.MtaHelper -import com.gh.common.util.dip2px -import com.gh.common.util.toBinding -import com.gh.common.util.toColor -import com.gh.common.view.DrawableView +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.GameDetailCalenderViewHolder import com.gh.gamecenter.entity.CalendarEntity 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 8d9815020a..8d4a4ca246 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 @@ -6,7 +6,7 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.gh.common.util.throwExceptionInDebug +import com.gh.gamecenter.common.utils.throwExceptionInDebug import com.gh.gamecenter.entity.* import com.gh.gamecenter.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersDetailViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersDetailViewHolder.kt index 53a54af874..b435504547 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersDetailViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersDetailViewHolder.kt @@ -2,8 +2,8 @@ package com.gh.gamecenter.gamedetail.fuli.kaifu import android.app.Activity import android.graphics.Paint -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.toColor +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.R import com.gh.gamecenter.databinding.DialogServersCalendearDetailItemBinding import com.gh.gamecenter.entity.GameEntity diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/tools/GameDetailToolsAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/tools/GameDetailToolsAdapter.java index 9a0ce6a0b1..835dd93639 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/tools/GameDetailToolsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/tools/GameDetailToolsAdapter.java @@ -8,9 +8,9 @@ import android.view.ViewGroup; import com.gh.common.constant.Config; import com.gh.common.util.DataUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.ImageUtils; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.WebActivity; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt index c126d0ecc3..1ede9cadf3 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R import com.gh.gamecenter.entity.GameEntity @@ -14,9 +14,9 @@ class HistoryApkListActivity : NormalActivity() { companion object { fun getIntent(context: Context, gameEntity: GameEntity, entrance: String, path: String): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) - bundle.putString(EntranceUtils.KEY_GAMEID, gameEntity.id) - bundle.putParcelable(EntranceUtils.KEY_GAME, gameEntity) + bundle.putString(EntranceConsts.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) + bundle.putString(EntranceConsts.KEY_GAMEID, gameEntity.id) + bundle.putParcelable(EntranceConsts.KEY_GAME, gameEntity) return getTargetIntent(context, HistoryApkListActivity::class.java, HistoryApkListFragment::class.java, bundle) } } 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 aaede0dc20..fc8a210b55 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 @@ -12,7 +12,7 @@ import androidx.constraintlayout.widget.ConstraintSet import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.g00fy2.versioncompare.Version -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable @@ -22,6 +22,10 @@ import com.gh.common.xapk.XapkUnzipStatus import com.gh.download.DownloadManager import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.core.utils.TimeUtils +import com.gh.gamecenter.common.utils.getMetaExtra +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.ItemHistoryApkBinding import com.gh.gamecenter.entity.ApkEntity import com.gh.gamecenter.entity.GameEntity 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 b3307cfe83..d6e36650f8 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 @@ -6,12 +6,16 @@ import android.view.View import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.common.exposure.ExposureListener -import com.gh.common.util.* -import com.gh.common.view.CustomDividerItemDecoration +import com.gh.gamecenter.common.view.CustomDividerItemDecoration import com.gh.download.DownloadManager import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.ListFragment +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.databinding.FragmentHistoryApkListBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.eventbus.EBPackage @@ -72,14 +76,14 @@ class HistoryApkListFragment : ListFragment override fun getLayoutId() = 0 override fun getInflatedLayout() = mBinding.root - override fun isAutomaticLoad() = arguments?.getParcelable(EntranceUtils.KEY_GAME) != null + override fun isAutomaticLoad() = arguments?.getParcelable(EntranceConsts.KEY_GAME) != null override fun provideListViewModel(): HistoryApkListViewModel { if (mViewModel == null) { val factory = HistoryApkListViewModel.Factory( HaloApp.getInstance().application, - arguments?.getString(EntranceUtils.KEY_GAMEID) ?: "", - arguments?.getParcelable(EntranceUtils.KEY_GAME)) + arguments?.getString(EntranceConsts.KEY_GAMEID) ?: "", + arguments?.getParcelable(EntranceConsts.KEY_GAME)) mViewModel = viewModelProvider(factory) } 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 d04703a60c..70bdaf5f8e 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 @@ -4,7 +4,7 @@ import android.app.Application import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.entity.ApkEntity diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingActivity.kt index 1fb370f8e0..edb2f5f7fd 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingActivity.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R @@ -16,7 +16,7 @@ class MyRatingActivity : NormalActivity() { companion object { fun getIntent(context: Context, entrance: String, path: String): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) + bundle.putString(EntranceConsts.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) return getTargetIntent(context, MyRatingActivity::class.java, MyRatingFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingAdapter.kt index 14411d6862..1f161f8a78 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingAdapter.kt @@ -5,11 +5,17 @@ import android.util.SparseBooleanArray import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.utils.copyTextAndToast +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.ifLogin +import com.gh.gamecenter.common.utils.setTextWithHighlightedTextWrappedInsideWrapper +import com.gh.gamecenter.common.utils.TextHelper +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ItemMyGameRatingBinding import com.gh.gamecenter.entity.TagStyleEntity import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingFragment.kt index ce17b49079..9c053a4f25 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingFragment.kt @@ -6,11 +6,11 @@ import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.MtaHelper -import com.gh.common.util.safelyGetInRelease -import com.gh.common.util.toColor -import com.gh.common.util.toDrawable -import com.gh.common.view.CustomDividerItemDecoration +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.common.utils.safelyGetInRelease +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.common.view.CustomDividerItemDecoration import com.gh.gamecenter.MainActivity import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingViewHolder.kt index a7736f89aa..14dfa24c91 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingViewHolder.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.gamedetail.myrating -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.databinding.ItemMyGameRatingBinding class MyRatingViewHolder(var binding: ItemMyGameRatingBinding) : BaseRecyclerViewHolder(binding.root) \ No newline at end of file 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 7a024cb8e4..7e3bfe5433 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 @@ -3,7 +3,7 @@ package com.gh.gamecenter.gamedetail.myrating import android.app.Application import com.gh.common.util.ErrorHelper import com.gh.common.util.EnergyTaskHelper -import com.gh.common.util.toObject +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.ErrorEntity import com.gh.gamecenter.manager.UserManager diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt index 1396565aeb..9b33fb6e4c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt @@ -9,11 +9,13 @@ import android.view.ViewGroup import android.widget.ProgressBar import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.RatingCommentItemBinding import com.gh.gamecenter.databinding.RatingItemBinding import com.gh.gamecenter.entity.Rating diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt index 1dcda98bf4..31e6d065df 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt @@ -19,14 +19,16 @@ import android.widget.PopupWindow import android.widget.TextView import androidx.core.content.ContextCompat import com.gh.base.BaseActivity -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* -import com.gh.common.view.CenterImageSpan -import com.gh.common.view.CustomLinkMovementMethod -import com.gh.common.view.DrawableView +import com.gh.gamecenter.common.view.CustomLinkMovementMethod +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.RatingCommentItemBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.RatingComment @@ -153,20 +155,22 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR // "评论详情" -> "游戏评论详情" // else -> "" // } - DialogUtils.showViewBadgeDialog(context, commentData.replyData!!.user.badge) { + DialogUtils.showViewBadgeDialog(context, commentData.replyData!!.user.badge, object : ConfirmListener { + override fun onConfirm() { // MtaHelper.onEvent( // "进入徽章墙_用户记录", // key, // "${commentData.replyData?.user?.name}（${commentData.replyData?.user?.id}）" // ) // MtaHelper.onEvent("徽章中心", "进入徽章中心", key) - DirectUtils.directToBadgeWall( - context, - commentData.replyData!!.user.id, - commentData.replyData!!.user.name, - commentData.replyData!!.user.icon - ) - } + DirectUtils.directToBadgeWall( + context, + commentData.replyData!!.user.id, + commentData.replyData!!.user.name, + commentData.replyData!!.user.icon + ) + } + }) } }, @@ -264,11 +268,13 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR } sdvUserBadge.setOnClickListener { - DialogUtils.showViewBadgeDialog(context, commentData.user.badge) { + DialogUtils.showViewBadgeDialog(context, commentData.user.badge, object : ConfirmListener { + override fun onConfirm() { // MtaHelper.onEvent("进入徽章墙_用户记录", getKey(path), "${commentData.user.name}（${commentData.user.id}）") // MtaHelper.onEvent("徽章中心", "进入徽章中心", getKey(path)) - DirectUtils.directToBadgeWall(context, commentData.user.id, commentData.user.name, commentData.user.icon) - } + DirectUtils.directToBadgeWall(context, commentData.user.id, commentData.user.name, commentData.user.icon) + } + }) } tvBadgeName.setOnClickListener { sdvUserBadge.performClick() } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFoldActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFoldActivity.kt index 8b9dad38d1..5c45e62b58 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFoldActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFoldActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.gamedetail.rating import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.entity.GameEntity @@ -18,8 +18,8 @@ class RatingFoldActivity : NormalActivity() { fun getIntent(context: Context, game: GameEntity, entrance: String, path: String): Intent { val bundle = Bundle() bundle.putParcelable(GameEntity.TAG, game) - bundle.putString(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) - bundle.putSerializable(EntranceUtils.KEY_LOCATION, RatingViewModel.RatingType.FOLD_RATING) + bundle.putString(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + bundle.putSerializable(EntranceConsts.KEY_LOCATION, RatingViewModel.RatingType.FOLD_RATING) return getTargetIntent(context, RatingFoldActivity::class.java, RatingFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFragment.kt index 96140c4f4d..ffbd9de526 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFragment.kt @@ -10,14 +10,18 @@ import androidx.core.content.ContextCompat import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.RecyclerView -import com.gh.common.iinterface.IScrollable +import com.gh.gamecenter.core.iinterface.IScrollable import com.gh.common.util.* -import com.gh.common.view.VerticalItemDecoration +import com.gh.gamecenter.common.view.VerticalItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.baselist.LazyListFragment import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.baselist.LoadType +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.SpanBuilder +import com.gh.gamecenter.common.utils.toPx +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.RatingComment import com.gh.gamecenter.eventbus.EBReuse @@ -38,7 +42,7 @@ class RatingFragment : LazyListFragment(), IScro private var mRatingType: RatingViewModel.RatingType? = null override fun onCreate(savedInstanceState: Bundle?) { - mRatingType = arguments?.getSerializable(EntranceUtils.KEY_LOCATION) as? RatingViewModel.RatingType + mRatingType = arguments?.getSerializable(EntranceConsts.KEY_LOCATION) as? RatingViewModel.RatingType ?: RatingViewModel.RatingType.RATING super.onCreate(savedInstanceState) } @@ -63,12 +67,17 @@ class RatingFragment : LazyListFragment(), IScro } override fun getItemDecoration(): RecyclerView.ItemDecoration? { - return VerticalItemDecoration(requireContext(), 12F, mRatingType != RatingViewModel.RatingType.RATING, R.color.transparent) + return VerticalItemDecoration( + requireContext(), + 12F, + mRatingType != RatingViewModel.RatingType.RATING, + R.color.transparent + ) } override fun provideListAdapter(): RatingAdapter { if (mAdapter == null) { - val directComment = arguments?.getBoolean(EntranceUtils.KEY_DIRECT_COMMENT, false) + val directComment = arguments?.getBoolean(EntranceConsts.KEY_DIRECT_COMMENT, false) ?: false mAdapter = RatingAdapter(requireContext(), mListViewModel, directComment, mEntrance) } @@ -109,7 +118,7 @@ class RatingFragment : LazyListFragment(), IScro super.onFragmentFirstVisible() val horizontalPadding = R.dimen.game_detail_item_horizontal_padding.toPx() - mSkipGameComment = arguments?.getBoolean(EntranceUtils.KEY_SKIP_GAME_COMMENT) + mSkipGameComment = arguments?.getBoolean(EntranceConsts.KEY_SKIP_GAME_COMMENT) mListRv.setPadding(horizontalPadding, 0, horizontalPadding, 0) mListRefresh?.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.transparent)) mListRefresh?.isEnabled = mRatingType != RatingViewModel.RatingType.RATING diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingItemViewHolder.kt index 37c9a20f06..b55dd0567a 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingItemViewHolder.kt @@ -4,9 +4,9 @@ import android.view.LayoutInflater import android.widget.LinearLayout import android.widget.TextView import androidx.core.content.ContextCompat -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.showAutoOrientation -import com.gh.common.view.BugFixedPopupWindow +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.showAutoOrientation +import com.gh.gamecenter.common.view.BugFixedPopupWindow import com.gh.gamecenter.R import com.gh.gamecenter.databinding.RatingItemBinding 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 3a9d0904a8..33f7ccb1a3 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 @@ -11,13 +11,18 @@ import androidx.core.content.ContextCompat import androidx.core.widget.doOnTextChanged import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.RecyclerView -import com.gh.base.fragment.WaitingDialogFragment +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.common.exposure.ExposureManager import com.gh.common.util.* -import com.gh.common.view.VerticalItemDecoration +import com.gh.gamecenter.common.view.VerticalItemDecoration import com.gh.download.DownloadManager import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListActivity +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.core.utils.KeyboardHeightObserver +import com.gh.gamecenter.core.utils.KeyboardHeightProvider import com.gh.gamecenter.databinding.ActivityRatingReplyBinding import com.gh.gamecenter.databinding.PieceCommentTypingContainerBinding import com.gh.gamecenter.entity.GameEntity @@ -34,7 +39,8 @@ import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import kotlin.math.abs -class RatingReplyActivity : ListActivity(), KeyboardHeightObserver { +class RatingReplyActivity : ListActivity(), + KeyboardHeightObserver { private lateinit var mBinding: ActivityRatingReplyBinding private lateinit var mInputBinding: PieceCommentTypingContainerBinding @@ -121,7 +127,7 @@ class RatingReplyActivity : ListActivity { content -> - DirectUtils.directToSuggestion( - context = this@RatingEditActivity, - type = SuggestType.gameQuestion, - content = content.replace(LABEL_REPLACE_REGEX.toRegex(), ""), - fromRatingKey = true, - game = SimpleGameEntity(mGame?.id ?: "", mGame?.name ?: "") - ) - finish() - }) + object :ConfirmListener{ + override fun onConfirm() { + MtaHelper.onEvent("游戏评论跳转", "意见反馈弹窗", "点击问题反馈") + mBinding.mWebView.callHandler("getComment", OnReturnValue { content -> + DirectUtils.directToSuggestion( + context = this@RatingEditActivity, + type = SuggestType.gameQuestion, + content = content.replace(LABEL_REPLACE_REGEX.toRegex(), ""), + fromRatingKey = true, + game = SimpleGameEntity(mGame?.id ?: "", mGame?.name ?: "") + ) + finish() + }) + } }, { MtaHelper.onEvent("游戏评论跳转", "意见反馈弹窗", "点击继续提交") @@ -495,10 +503,10 @@ class RatingEditActivity : ToolBarActivity(), KeyboardHeightObserver { ): Intent { val intent = Intent(context, RatingEditActivity::class.java) intent.putExtra(GameEntity.TAG, game) - intent.putExtra(EntranceUtils.KEY_RATING_STAR_COUNT, starCount) - intent.putExtra(EntranceUtils.KEY_AMWAY, fromAmway) - intent.putExtra(EntranceUtils.KEY_SKIP_SUCCESS_PAGE, isSkipSuccessPage) - intent.putExtra(EntranceUtils.KEY_PACKAGENAME, installPackageName) + intent.putExtra(EntranceConsts.KEY_RATING_STAR_COUNT, starCount) + intent.putExtra(EntranceConsts.KEY_AMWAY, fromAmway) + intent.putExtra(EntranceConsts.KEY_SKIP_SUCCESS_PAGE, isSkipSuccessPage) + intent.putExtra(EntranceConsts.KEY_PACKAGENAME, installPackageName) return intent } 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 1afa354a77..57db61389a 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 @@ -5,8 +5,12 @@ import android.app.Application import android.content.Context import android.os.Build import androidx.lifecycle.* -import com.gh.base.fragment.WaitingDialogFragment +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.common.util.* +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toObject +import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.RatingComment import com.gh.gamecenter.mvvm.Resource 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 3ba64850dc..717a07f7ec 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 @@ -7,8 +7,8 @@ import android.os.Bundle import android.widget.TextView import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.EntranceUtils -import com.gh.common.view.VerticalItemDecoration +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.view.VerticalItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListActivity import com.gh.gamecenter.baselist.NormalListViewModel @@ -29,8 +29,8 @@ class CommentLogsActivity : ListActivity(R.id.delete)?.paint?.flags = Paint.STRIKE_THRU_TEXT_FLAG @@ -57,8 +57,8 @@ class CommentLogsActivity : ListActivity(R.id.errorContainer)?.visibility = View.VISIBLE + setViewShowState(mStartButton, INVISIBLE) + findViewById(R.id.errorContainer)?.visibility = VISIBLE return@debounceActionWithInterval } startPlayLogic(false) diff --git a/app/src/main/java/com/gh/gamecenter/geetest/GTWebView.java b/app/src/main/java/com/gh/gamecenter/geetest/GTWebView.java index 6c25bb2c6d..22243d1aa2 100644 --- a/app/src/main/java/com/gh/gamecenter/geetest/GTWebView.java +++ b/app/src/main/java/com/gh/gamecenter/geetest/GTWebView.java @@ -21,7 +21,7 @@ import android.webkit.WebSettings; import android.webkit.WebView; import android.webkit.WebViewClient; -import com.gh.common.util.AppDebugConfig; +import com.gh.gamecenter.core.utils.AppDebugConfig; import org.json.JSONArray; import org.json.JSONObject; 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 e69b32291a..1712bd2202 100644 --- a/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java +++ b/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java @@ -4,7 +4,7 @@ import android.app.ProgressDialog; import android.content.Context; import android.content.DialogInterface; -import com.gh.common.util.AppDebugConfig; +import com.gh.gamecenter.core.utils.AppDebugConfig; import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.utils.RuntimeUtils; diff --git a/app/src/main/java/com/gh/gamecenter/geetest/GtDialog.java b/app/src/main/java/com/gh/gamecenter/geetest/GtDialog.java index 89683dc4f4..8bb7f01a8c 100644 --- a/app/src/main/java/com/gh/gamecenter/geetest/GtDialog.java +++ b/app/src/main/java/com/gh/gamecenter/geetest/GtDialog.java @@ -11,7 +11,7 @@ import android.view.Window; import android.widget.RelativeLayout; import android.widget.TextView; -import com.gh.common.exposure.meta.MetaUtil; +import com.gh.gamecenter.common.exposure.meta.MetaUtil; import com.lightgame.utils.Utils; import org.json.JSONException; diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpCategoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/help/HelpCategoryAdapter.kt index 72ed9ceb3e..3aa99ed18f 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpCategoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpCategoryAdapter.kt @@ -2,10 +2,10 @@ package com.gh.gamecenter.help import android.content.Context import android.view.ViewGroup -import com.gh.common.util.ImageUtils -import com.gh.common.util.MtaHelper -import com.gh.common.util.goneIf -import com.gh.common.util.toColor +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.R import com.gh.gamecenter.databinding.HelpCategoryItemBinding import com.gh.gamecenter.entity.HelpCategoryEntity diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpCategoryViewHolder.kt b/app/src/main/java/com/gh/gamecenter/help/HelpCategoryViewHolder.kt index 12dac6d90a..a642d4c5f1 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpCategoryViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpCategoryViewHolder.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.help -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.databinding.HelpCategoryItemBinding class HelpCategoryViewHolder(val binding: HelpCategoryItemBinding) : BaseRecyclerViewHolder(binding.root) \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpContainerFragment.kt b/app/src/main/java/com/gh/gamecenter/help/HelpContainerFragment.kt index b58731eb1e..2d6b73f0ad 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpContainerFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpContainerFragment.kt @@ -10,14 +10,14 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentTransaction import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders -import com.gh.common.util.EntranceUtils -import com.gh.common.util.MtaHelper -import com.gh.common.util.TextHelper +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.common.utils.TextHelper import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentHelpContaierBinding import com.gh.gamecenter.eventbus.EBNetworkState import com.gh.gamecenter.mvvm.Status -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.halo.assistant.HaloApp import com.lightgame.utils.Util_System_Keyboard import org.greenrobot.eventbus.Subscribe @@ -46,11 +46,11 @@ class HelpContainerFragment : NormalFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mNavigationTitle = arguments?.getString(EntranceUtils.KEY_NAVIGATION_TITLE) ?: "" + mNavigationTitle = arguments?.getString(EntranceConsts.KEY_NAVIGATION_TITLE) ?: "" if (mNavigationTitle.isNotEmpty()) setNavigationTitle(mNavigationTitle) - val qaCollectionId = arguments?.getString(EntranceUtils.KEY_QA_COLLECTION_ID) - val qaId = arguments?.getString(EntranceUtils.KEY_QA_ID) + val qaCollectionId = arguments?.getString(EntranceConsts.KEY_QA_COLLECTION_ID) + val qaId = arguments?.getString(EntranceConsts.KEY_QA_ID) val factory = HelpContainerViewModel.Factory(HaloApp.getInstance().application, qaId, qaCollectionId) mViewModel = ViewModelProviders.of(this, factory).get(HelpContainerViewModel::class.java) @@ -174,11 +174,11 @@ class HelpContainerFragment : NormalFragment() { } else { fragmentByTag = cls.newInstance() val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_QA_ID, mViewModel.qaId) - bundle.putString(EntranceUtils.KEY_QA_COLLECTION_ID, mViewModel.qaCollectionId) + bundle.putString(EntranceConsts.KEY_QA_ID, mViewModel.qaId) + bundle.putString(EntranceConsts.KEY_QA_COLLECTION_ID, mViewModel.qaCollectionId) if (!default) { - bundle.putString(EntranceUtils.KEY_SEARCHKEY, mBinding.searchInput.text.toString()) - bundle.putString(EntranceUtils.KEY_NAVIGATION_TITLE, mNavigationTitle) + bundle.putString(EntranceConsts.KEY_SEARCHKEY, mBinding.searchInput.text.toString()) + bundle.putString(EntranceConsts.KEY_NAVIGATION_TITLE, mNavigationTitle) } fragmentByTag.arguments = bundle transaction.add(R.id.content_container, fragmentByTag, tag) diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpContentAdapter.kt b/app/src/main/java/com/gh/gamecenter/help/HelpContentAdapter.kt index 91147b9868..7a867891ca 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpContentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpContentAdapter.kt @@ -6,8 +6,8 @@ import android.view.View import android.view.ViewGroup import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.Constants -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* import com.gh.gamecenter.QaActivity import com.gh.gamecenter.R @@ -15,6 +15,12 @@ import com.gh.gamecenter.WebActivity import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.NormalListViewModel +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.fromHtml +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.EnvHelper +import com.gh.gamecenter.core.utils.HtmlUtils +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.HelpItemBinding import com.gh.gamecenter.entity.HelpEntity 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 0b04a129c3..a81920150d 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpContentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpContentFragment.kt @@ -5,9 +5,9 @@ import android.view.View import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.RecyclerView import com.gh.common.util.DirectUtils -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.common.util.NewLogUtils -import com.gh.common.util.UrlFilterUtils +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.HelpAndFeedbackActivity import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment @@ -53,10 +53,10 @@ class HelpContentFragment : ListFragment(binding.root) \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpQaAdapter.kt b/app/src/main/java/com/gh/gamecenter/help/HelpQaAdapter.kt index a92940ca9d..792dea726d 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpQaAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpQaAdapter.kt @@ -8,10 +8,14 @@ import android.view.ViewGroup import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.EnvHelper +import com.gh.gamecenter.core.utils.HtmlUtils +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.entity.HelpCategoryEntity class HelpQaAdapter(val context: Context, val helpCategoryEntity: HelpCategoryEntity, val mQaCollectionId: String?) : diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryAdapter.kt index 6266e82756..2ee8e463ac 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryAdapter.kt @@ -6,10 +6,10 @@ import android.view.ViewGroup import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import com.gh.common.util.DirectUtils -import com.gh.common.util.ImageUtils -import com.gh.common.util.MtaHelper +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.common.util.NewLogUtils -import com.gh.common.view.GridSpacingItemColorDecoration +import com.gh.gamecenter.common.view.GridSpacingItemColorDecoration import com.gh.gamecenter.R import com.gh.gamecenter.databinding.HelpQaCategoryItemBinding import com.gh.gamecenter.entity.HelpCategoryEntity @@ -40,7 +40,14 @@ class HelpQaCategoryAdapter(val context: Context, private val mQaCollectionId: S holder.binding.qaRv.apply { layoutManager = GridLayoutManager(context, 2) - addItemDecoration(GridSpacingItemColorDecoration(context, 28, 0, R.color.transparent)) + addItemDecoration( + GridSpacingItemColorDecoration( + context, + 28, + 0, + R.color.transparent + ) + ) adapter = HelpQaAdapter(context, helpCategoryEntity, mQaCollectionId) } holder.binding.categoryMore.setOnClickListener { diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt index a59a418ebe..f8fcbcbe7d 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt @@ -5,16 +5,16 @@ import android.view.View import android.widget.TextView import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager -import com.gh.common.util.EntranceUtils -import com.gh.common.util.toDrawable -import com.gh.common.util.toObject -import com.gh.common.util.viewModelProvider -import com.gh.common.view.CustomDividerItemDecoration +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.common.utils.toObject +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.common.view.CustomDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentQaCategoryBinding import com.gh.gamecenter.entity.ErrorEntity import com.gh.gamecenter.mvvm.Status -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment class HelpQaCategoryFragment : NormalFragment() { @@ -33,8 +33,8 @@ class HelpQaCategoryFragment : NormalFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mQaCollectionId = arguments?.getString(EntranceUtils.KEY_QA_COLLECTION_ID) ?: "" - mQaId = arguments?.getString(EntranceUtils.KEY_QA_ID) ?: "" + mQaCollectionId = arguments?.getString(EntranceConsts.KEY_QA_COLLECTION_ID) ?: "" + mQaId = arguments?.getString(EntranceConsts.KEY_QA_ID) ?: "" val factory = HelpQaCategoryViewModel.Factory(mQaCollectionId) mViewModel = viewModelProvider(factory) diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryViewModel.kt b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryViewModel.kt index d5f54885c2..ce51e8f8e3 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryViewModel.kt @@ -6,14 +6,11 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.HelpCategoryEntity import com.gh.gamecenter.mvvm.Resource import com.gh.gamecenter.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp -import io.reactivex.Observable -import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers import retrofit2.HttpException diff --git a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt index 486e1723b8..4856f3ff0a 100644 --- a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt @@ -5,17 +5,20 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.RadioButton import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.FragmentTransaction import androidx.lifecycle.Lifecycle -import androidx.lifecycle.Observer import androidx.recyclerview.widget.GridLayoutManager -import androidx.recyclerview.widget.LinearLayoutManager import com.gh.common.util.* -import com.gh.common.view.GridSpacingItemDecoration +import com.gh.gamecenter.common.view.GridSpacingItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.common.utils.TextHelper +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.DialogQaFeedbackBinding import com.gh.gamecenter.eventbus.EBReuse import com.gh.gamecenter.suggest.SuggestType diff --git a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackReasonAdapter.kt b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackReasonAdapter.kt index 30e96cb7ae..fcdec0c055 100644 --- a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackReasonAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackReasonAdapter.kt @@ -4,8 +4,8 @@ import android.content.Context import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.toColor -import com.gh.common.util.toDrawable +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable import com.gh.gamecenter.R import com.gh.gamecenter.databinding.ItemQaFeedbackReasonBinding import com.lightgame.adapter.BaseRecyclerAdapter 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 515bb569b4..2f1b9f5791 100644 --- a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackViewModel.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.gh.common.exposure.meta.MetaUtil.getBase64EncodedIMEI +import com.gh.gamecenter.common.exposure.meta.MetaUtil.getBase64EncodedIMEI import com.gh.common.util.PackageUtils -import com.gh.common.util.singleToMain -import com.gh.common.util.toRequestBody +import com.gh.gamecenter.common.utils.singleToMain +import com.gh.gamecenter.common.utils.toRequestBody import com.gh.gamecenter.R import com.gh.gamecenter.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager diff --git a/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt b/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt index ba2b90d0b6..7233b17195 100644 --- a/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.history import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity class HistoryActivity: NormalActivity() { @@ -12,7 +12,7 @@ class HistoryActivity: NormalActivity() { @JvmStatic fun getHistoryIntent(context: Context, entrance: String): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance) + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance) return NormalActivity.getTargetIntent(context, HistoryActivity::class.java, HistoryWrapperFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt index 1cb15d51e4..acdd62e36f 100644 --- a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt @@ -8,13 +8,15 @@ import android.widget.LinearLayout import android.widget.PopupWindow import androidx.appcompat.app.AppCompatActivity import androidx.constraintlayout.widget.ConstraintLayout -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.GameViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.GameItemBinding import com.gh.gamecenter.databinding.PopupHistoryOptionBinding import com.gh.gamecenter.entity.GameEntity diff --git a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListFragment.kt b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListFragment.kt index b3f0b581cc..d5a18f9ad9 100644 --- a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListFragment.kt @@ -4,10 +4,10 @@ import android.os.Bundle import android.view.View import androidx.recyclerview.widget.RecyclerView import com.ethanhua.skeleton.Skeleton -import com.gh.common.util.toColor -import com.gh.common.util.toDrawable -import com.gh.common.util.viewModelProvider -import com.gh.common.view.CustomDividerItemDecoration +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.common.view.CustomDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.databinding.FragmentListBaseSkeletonBinding diff --git a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListViewModel.kt b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListViewModel.kt index aa5cabdb1d..648e98de5a 100644 --- a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListViewModel.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.history import android.app.Application -import com.gh.common.AppExecutor +import com.gh.gamecenter.core.AppExecutor import com.gh.common.history.HistoryDatabase import com.gh.common.history.HistoryHelper import com.gh.gamecenter.baselist.ListViewModel diff --git a/app/src/main/java/com/gh/gamecenter/history/HistoryWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/history/HistoryWrapperFragment.kt index 3d1c7e9d1b..36b71706c4 100644 --- a/app/src/main/java/com/gh/gamecenter/history/HistoryWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/history/HistoryWrapperFragment.kt @@ -5,10 +5,10 @@ import android.view.MenuItem import android.view.View import android.widget.TextView import androidx.fragment.app.Fragment -import com.gh.base.fragment.BaseFragment_TabLayout -import com.gh.common.util.EntranceUtils -import com.gh.common.util.MtaHelper -import com.gh.common.util.viewModelProvider +import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.R import com.gh.gamecenter.collection.* import com.gh.gamecenter.manager.UserManager @@ -70,15 +70,15 @@ class HistoryWrapperFragment : BaseFragment_TabLayout() { override fun initFragmentList(fragments: MutableList) { fragments.add(HistoryGameListFragment().with(arguments)) fragments.add(GamesCollectionFragment().with((arguments?.clone() as? Bundle)?.apply { - putString(EntranceUtils.KEY_USER_ID, UserManager.getInstance().userId) - putString(EntranceUtils.KEY_TYPE, GamesCollectionFragment.TYPE_HISTORY) + putString(EntranceConsts.KEY_USER_ID, UserManager.getInstance().userId) + putString(EntranceConsts.KEY_TYPE, GamesCollectionFragment.TYPE_HISTORY) })) fragments.add(VideoFragment().with((arguments?.clone() as? Bundle)?.apply { putString("videoStyle", VideoFragment.VideoStyle.BROWSING_HISTORY.value) })) - fragments.add(AnswerFragment().with((arguments?.clone() as? Bundle)?.apply { putString(EntranceUtils.KEY_TYPE, AnswerFragment.HISTORY) })) - fragments.add(CommunityArticleFragment().with((arguments?.clone() as? Bundle)?.apply { putString(EntranceUtils.KEY_TYPE, CommunityArticleFragment.Type.HISTORY.value) })) - fragments.add(ArticleFragment().with((arguments?.clone() as? Bundle)?.apply { putString(EntranceUtils.KEY_TYPE, ArticleFragment.HISTORY) })) + fragments.add(AnswerFragment().with((arguments?.clone() as? Bundle)?.apply { putString(EntranceConsts.KEY_TYPE, AnswerFragment.HISTORY) })) + fragments.add(CommunityArticleFragment().with((arguments?.clone() as? Bundle)?.apply { putString(EntranceConsts.KEY_TYPE, CommunityArticleFragment.Type.HISTORY.value) })) + fragments.add(ArticleFragment().with((arguments?.clone() as? Bundle)?.apply { putString(EntranceConsts.KEY_TYPE, ArticleFragment.HISTORY) })) } override fun onPageSelected(position: Int) { 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 174ba6f2aa..67a54dafaa 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt @@ -5,19 +5,22 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.base.fragment.LazyFragment -import com.gh.common.AppExecutor -import com.gh.common.TimeElapsedHelper -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.base.fragment.LazyFragment +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.core.utils.TimeElapsedHelper +import com.gh.gamecenter.common.constant.Constants import com.gh.common.databind.BindingAdapters import com.gh.common.exposure.ExposureListener import com.gh.common.util.* -import com.gh.common.view.OffsetLinearLayoutManager +import com.gh.gamecenter.common.view.OffsetLinearLayoutManager import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus import com.gh.download.DownloadManager import com.gh.gamecenter.R import com.gh.gamecenter.baselist.LoadStatus +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentMainHomeBinding import com.gh.gamecenter.eventbus.EBDownloadStatus import com.gh.gamecenter.eventbus.EBPackage @@ -59,7 +62,7 @@ class HomeFragment : LazyFragment() { override fun onFragmentFirstVisible() { mViewModel = viewModelProvider() - mViewModel.homeOnlyWithoutOtherTab = arguments?.getInt(EntranceUtils.KEY_TAB_COUNT) == 1 + mViewModel.homeOnlyWithoutOtherTab = arguments?.getInt(EntranceConsts.KEY_TAB_COUNT) == 1 super.onFragmentFirstVisible() diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.kt index f492305adc..428ea948ff 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.kt @@ -6,11 +6,11 @@ import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable -import com.gh.common.runOnIoThread +import com.gh.gamecenter.core.runOnIoThread import com.gh.common.util.* import com.gh.gamecenter.AboutActivity import com.gh.gamecenter.GameDetailActivity @@ -19,6 +19,8 @@ import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.ReuseViewHolder import com.gh.gamecenter.baselist.DiffUtilAdapter import com.gh.gamecenter.baselist.LoadStatus +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.* import com.gh.gamecenter.entity.AmwayCommentEntity import com.gh.gamecenter.eventbus.EBDownloadStatus diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeGameItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/HomeGameItemViewHolder.kt index 7cf2e076d4..bc23c84662 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeGameItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeGameItemViewHolder.kt @@ -3,11 +3,11 @@ package com.gh.gamecenter.home import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.view.View -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.ImageUtils -import com.gh.common.util.RandomUtils -import com.gh.common.util.goneIf -import com.gh.common.util.toColor +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.core.utils.RandomUtils +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.R import com.gh.gamecenter.databinding.HomeGameItemBinding import com.gh.gamecenter.entity.GameEntity diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeRecommendItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/HomeRecommendItemViewHolder.kt index c231571701..9b8c88a06f 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeRecommendItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeRecommendItemViewHolder.kt @@ -1,9 +1,14 @@ package com.gh.gamecenter.home -import com.gh.base.BaseRecyclerViewHolder -import com.gh.base.OnViewClickListener +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.callback.OnViewClickListener import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.core.utils.PageSwitchDataHelper import com.gh.gamecenter.databinding.HomeRecommendItemBinding import com.gh.gamecenter.entity.HomeRecommend 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 f317fd711a..b13721f08a 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt @@ -12,6 +12,8 @@ import com.gh.common.util.* import com.gh.download.DownloadManager import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.baselist.LoadStatus +import com.gh.gamecenter.core.utils.RandomUtils +import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.entity.* import com.gh.gamecenter.game.rank.RankCollectionAdapter import com.gh.gamecenter.gamecollection.square.GameCollectionListItemData diff --git a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt index ca96d5d617..ee520dca66 100644 --- a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt +++ b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt @@ -1,7 +1,6 @@ package com.gh.gamecenter.home import android.content.Context -import android.graphics.Color import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -10,12 +9,11 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.databind.BindingAdapters import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource -import com.gh.common.iinterface.IOffsetable -import com.gh.common.runOnIoThread +import com.gh.gamecenter.core.iinterface.IOffsetable import com.gh.common.util.* import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.MainActivity @@ -23,6 +21,10 @@ import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.GameHeadViewHolder import com.gh.gamecenter.adapter.viewholder.GameImageViewHolder import com.gh.gamecenter.adapter.viewholder.GameViewHolder +import com.gh.gamecenter.common.* +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.runOnIoThread +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ItemBlankDividerBinding import com.gh.gamecenter.entity.CommonCollectionContentEntity import com.gh.gamecenter.entity.GameEntity diff --git a/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayAdapter.kt index 57817b396e..22b39a3283 100644 --- a/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayAdapter.kt @@ -4,6 +4,10 @@ import android.content.Context import android.view.View import android.view.ViewGroup import com.gh.common.util.* +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.entity.AmwayCommentEntity import com.lightgame.adapter.BaseRecyclerAdapter @@ -46,20 +50,22 @@ class HomeAmwayAdapter( sdvUserBadge.visibility = View.GONE } sdvUserBadge.setOnClickListener { - DialogUtils.showViewBadgeDialog(mContext, amway.comment.user.badge) { - MtaHelper.onEvent( - "进入徽章墙_用户记录", - "安利墙", - "${amway.comment.user.name}（${amway.comment.user.id}）" - ) - MtaHelper.onEvent("徽章中心", "进入徽章中心", "安利墙") - DirectUtils.directToBadgeWall( - mContext, - amway.comment.user.id, - amway.comment.user.name, - amway.comment.user.icon - ) - } + DialogUtils.showViewBadgeDialog(mContext, amway.comment.user.badge, object : ConfirmListener { + override fun onConfirm() { + MtaHelper.onEvent( + "进入徽章墙_用户记录", + "安利墙", + "${amway.comment.user.name}（${amway.comment.user.id}）" + ) + MtaHelper.onEvent("徽章中心", "进入徽章中心", "安利墙") + DirectUtils.directToBadgeWall( + mContext, + amway.comment.user.id, + amway.comment.user.name, + amway.comment.user.icon + ) + } + }) } all.setOnClickListener { diff --git a/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayItemViewHolder.kt index a598433b39..65dedc744c 100644 --- a/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayItemViewHolder.kt @@ -2,12 +2,12 @@ package com.gh.gamecenter.home.amway import android.content.Context import android.view.View -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.databind.BindingAdapters -import com.gh.common.util.ImageUtils -import com.gh.common.util.TextHelper -import com.gh.common.util.toColor -import com.gh.common.util.toDrawable +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.utils.TextHelper +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable import com.gh.common.view.AsyncCell import com.gh.gamecenter.R import com.gh.gamecenter.databinding.HomeAmwayItemBinding diff --git a/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayListViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayListViewHolder.kt index 03bfb23d24..84c416cec2 100644 --- a/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayListViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayListViewHolder.kt @@ -2,9 +2,9 @@ package com.gh.gamecenter.home.amway import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.dip2px -import com.gh.common.view.FixLinearLayoutManager +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.view.FixLinearLayoutManager import com.gh.gamecenter.databinding.HomeAmwayListBinding import com.gh.gamecenter.entity.AmwayCommentEntity @@ -18,7 +18,8 @@ class HomeAmwayListViewHolder(val binding: HomeAmwayListBinding) : BaseRecyclerV return } adapter = HomeAmwayAdapter(context, amwayList, itemClick) - binding.recyclerView.layoutManager = FixLinearLayoutManager(context, RecyclerView.HORIZONTAL, false) + binding.recyclerView.layoutManager = + FixLinearLayoutManager(context, RecyclerView.HORIZONTAL, false) binding.recyclerView.adapter = adapter binding.recyclerView.onFlingListener = null binding.recyclerView.isNestedScrollingEnabled = false diff --git a/app/src/main/java/com/gh/gamecenter/home/gamecollection/GameCollectionStackAnimation.kt b/app/src/main/java/com/gh/gamecenter/home/gamecollection/GameCollectionStackAnimation.kt index a217858b30..353a6f053b 100644 --- a/app/src/main/java/com/gh/gamecenter/home/gamecollection/GameCollectionStackAnimation.kt +++ b/app/src/main/java/com/gh/gamecenter/home/gamecollection/GameCollectionStackAnimation.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.home.gamecollection import android.view.View -import com.gh.common.view.stacklayoutmanager.StackAnimation -import com.gh.common.view.stacklayoutmanager.StackLayoutManager +import com.gh.gamecenter.common.view.stacklayoutmanager.StackAnimation +import com.gh.gamecenter.common.view.stacklayoutmanager.StackLayoutManager import com.gh.gamecenter.R import kotlin.math.pow diff --git a/app/src/main/java/com/gh/gamecenter/home/gamecollection/GameCollectionStackLayout.kt b/app/src/main/java/com/gh/gamecenter/home/gamecollection/GameCollectionStackLayout.kt index 96841de825..c7da18bd0c 100644 --- a/app/src/main/java/com/gh/gamecenter/home/gamecollection/GameCollectionStackLayout.kt +++ b/app/src/main/java/com/gh/gamecenter/home/gamecollection/GameCollectionStackLayout.kt @@ -1,9 +1,9 @@ package com.gh.gamecenter.home.gamecollection import android.view.View -import com.gh.common.util.dip2px -import com.gh.common.view.stacklayoutmanager.StackLayout -import com.gh.common.view.stacklayoutmanager.StackLayoutManager +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.view.stacklayoutmanager.StackLayout +import com.gh.gamecenter.common.view.stacklayoutmanager.StackLayoutManager class GameCollectionStackLayout( scrollOrientation: StackLayoutManager.ScrollOrientation, diff --git a/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionAdapter.kt index 36f706cafc..3688f52f7e 100644 --- a/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionAdapter.kt @@ -4,11 +4,17 @@ import android.content.Context import android.view.View import android.view.ViewGroup import com.gh.base.BaseActivity -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.util.* import com.gh.common.view.AsyncCell import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R +import com.gh.gamecenter.core.utils.TimeUtils +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.safelyGetInRelease +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.databinding.HomeGameCollectionCardItemBinding import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity import com.gh.gamecenter.gamecollection.square.GameCollectionListItemData diff --git a/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionViewHolder.kt index 828a77526f..bd36f5d2cf 100644 --- a/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionViewHolder.kt @@ -1,10 +1,10 @@ package com.gh.gamecenter.home.gamecollection import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.DisplayUtils -import com.gh.common.util.dip2px -import com.gh.common.view.stacklayoutmanager.StackLayoutManager +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.view.stacklayoutmanager.StackLayoutManager import com.gh.gamecenter.databinding.HomeGameCollectionItemBinding import com.gh.gamecenter.gamecollection.square.GameCollectionListItemData diff --git a/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipActivity.kt b/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipActivity.kt index 18f7fddc80..4443c1343d 100644 --- a/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipActivity.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.DisplayUtils +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.R import com.gh.gamecenter.entity.GameEntity diff --git a/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipAdapter.kt index 70549dc43c..d402f7a568 100644 --- a/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipAdapter.kt @@ -4,12 +4,15 @@ import android.content.Context import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.GameViewHolder +import com.gh.gamecenter.core.utils.EmptyCallback +import com.gh.gamecenter.core.utils.StringUtils +import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.databinding.GameItemBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.game.GameItemViewHolder 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 01ed9be1ef..304ccdd57c 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 @@ -5,7 +5,7 @@ import android.view.LayoutInflater import android.view.View import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.LinearLayoutManager -import com.gh.base.fragment.BaseFragment +import com.gh.gamecenter.common.base.fragment.BaseFragment import com.gh.common.util.LogUtils import com.gh.download.DownloadManager import com.gh.gamecenter.databinding.FragmentPackageSkipBinding diff --git a/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListAdapter.kt index dbc8798190..8e9261e6f5 100644 --- a/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListAdapter.kt @@ -10,11 +10,14 @@ import androidx.recyclerview.widget.RecyclerView import com.gh.common.databind.BindingAdapters import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource -import com.gh.common.runOnIoThread +import com.gh.gamecenter.core.runOnIoThread import com.gh.common.util.* import com.gh.gamecenter.AboutActivity import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.core.utils.PageSwitchDataHelper import com.gh.gamecenter.databinding.HomeSlideListItemBinding import com.gh.gamecenter.entity.HomeSlide import com.gh.gamecenter.home.HomeItemData diff --git a/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListItemViewHolder.kt index 3e32db72b1..baa1f6ce21 100644 --- a/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListItemViewHolder.kt @@ -4,9 +4,13 @@ import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.view.View import com.facebook.imagepipeline.image.ImageInfo -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.* +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.R +import com.gh.gamecenter.core.utils.RandomUtils +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.databinding.HomeSlideListItemBinding import com.gh.gamecenter.entity.HomeSlide import com.halo.assistant.HaloApp diff --git a/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListViewHolder.kt index 5d23fba829..77a451fa36 100644 --- a/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListViewHolder.kt @@ -8,14 +8,19 @@ import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.PagerSnapHelper import androidx.recyclerview.widget.RecyclerView import androidx.viewpager2.widget.ViewPager2 -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.exposure.ExposureSource import com.gh.common.util.* -import com.gh.common.view.DrawableView -import com.gh.common.view.FixLinearLayoutManager -import com.gh.common.view.ScrollEventListener -import com.gh.common.view.TouchSlopRecyclerView +import com.gh.gamecenter.common.view.DrawableView +import com.gh.gamecenter.common.view.FixLinearLayoutManager +import com.gh.gamecenter.common.view.ScrollEventListener +import com.gh.gamecenter.common.view.TouchSlopRecyclerView import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.hexStringToIntColor +import com.gh.gamecenter.common.utils.safelyGetInRelease +import com.gh.gamecenter.common.utils.throwExceptionInDebug +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.HomeSlideListBinding import com.gh.gamecenter.home.HomeItemData import kotlin.math.abs diff --git a/app/src/main/java/com/gh/gamecenter/home/video/AutomaticVideoView.kt b/app/src/main/java/com/gh/gamecenter/home/video/AutomaticVideoView.kt index 0df711d88c..bc6d37c630 100644 --- a/app/src/main/java/com/gh/gamecenter/home/video/AutomaticVideoView.kt +++ b/app/src/main/java/com/gh/gamecenter/home/video/AutomaticVideoView.kt @@ -13,14 +13,19 @@ import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat import com.facebook.drawee.view.SimpleDraweeView -import com.gh.common.constant.Constants -import com.gh.common.runOnIoThread -import com.gh.common.runOnUiThread +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.core.runOnIoThread +import com.gh.gamecenter.core.runOnUiThread import com.gh.common.util.* -import com.gh.common.view.DrawableView -import com.gh.common.view.RadiusCardView +import com.gh.gamecenter.common.view.DrawableView +import com.gh.gamecenter.common.view.RadiusCardView import com.gh.download.cache.ExoCacheManager import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.utils.countDownTimer +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.rxTimer +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.video.detail.CustomManager import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer @@ -112,7 +117,7 @@ class AutomaticVideoView @JvmOverloads constructor(context: Context, attrs: Attr params.height = 0 mask.layoutParams = params mask.alpha = 0f - mask.visibility = View.VISIBLE + mask.visibility = VISIBLE val heightAnimator = ValueAnimator.ofFloat(0f, offset).apply { addUpdateListener { params = mask.layoutParams as ConstraintLayout.LayoutParams diff --git a/app/src/main/java/com/gh/gamecenter/home/video/ScrollCalculatorHelper.kt b/app/src/main/java/com/gh/gamecenter/home/video/ScrollCalculatorHelper.kt index e383a00c28..b1e1ab475b 100644 --- a/app/src/main/java/com/gh/gamecenter/home/video/ScrollCalculatorHelper.kt +++ b/app/src/main/java/com/gh/gamecenter/home/video/ScrollCalculatorHelper.kt @@ -5,11 +5,11 @@ import android.os.Handler import android.os.Looper import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.Constants -import com.gh.common.util.MD5Utils -import com.gh.common.util.NetworkUtils -import com.gh.common.util.SPUtils -import com.gh.common.util.safelyGetInRelease +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.core.utils.MD5Utils +import com.gh.gamecenter.common.utils.NetworkUtils +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.safelyGetInRelease import com.gh.gamecenter.entity.SimpleVideoEntity import com.gh.gamecenter.home.HomeItemData import com.gh.gamecenter.setting.VideoSettingFragment 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 94391250e3..9bb0e76880 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java @@ -9,17 +9,17 @@ import android.view.ViewGroup; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.ViewHolder; -import com.gh.base.OnListClickListener; -import com.gh.base.OnRequestCallBackListener; -import com.gh.common.constant.ItemViewType; +import com.gh.gamecenter.common.callback.OnListClickListener; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; +import com.gh.gamecenter.common.constant.ItemViewType; import com.gh.common.util.ConcernContentUtils; -import com.gh.common.util.DisplayUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.common.util.LibaoUtils; import com.gh.common.util.NewsUtils; -import com.gh.common.util.NumberUtils; +import com.gh.gamecenter.core.utils.NumberUtils; import com.gh.common.util.PlatformUtils; -import com.gh.common.util.StringUtils; -import com.gh.common.util.UrlFilterUtils; +import com.gh.gamecenter.core.utils.StringUtils; +import com.gh.gamecenter.core.utils.UrlFilterUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsDigestViewHolder; 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 c709bc12fa..fa6b150b74 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java @@ -17,16 +17,16 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.gh.base.OnRequestCallBackListener; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; import com.gh.base.ToolBarActivity; import com.gh.common.filter.RegionSettingHelper; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DataCollectionUtils; -import com.gh.common.util.MtaHelper; -import com.gh.common.util.StringUtils; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.core.utils.StringUtils; import com.gh.common.view.Concern_LinearLayout; -import com.gh.common.view.CustomDividerItemDecoration; +import com.gh.gamecenter.common.view.CustomDividerItemDecoration; import com.gh.gamecenter.ConcernActivity; import com.gh.gamecenter.LibaoDetailActivity; import com.gh.gamecenter.MessageDetailActivity; @@ -46,7 +46,7 @@ import com.gh.gamecenter.eventbus.EBConcernChanged; import com.gh.gamecenter.eventbus.EBNetworkState; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.manager.UserManager; -import com.gh.gamecenter.normal.NormalFragment; +import com.gh.gamecenter.common.base.fragment.NormalFragment; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.fragment.myconcern.MyConcernRecommendAdapter; 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 915690a23b..325b8c1e87 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java @@ -9,12 +9,12 @@ import android.widget.LinearLayout; import androidx.recyclerview.widget.RecyclerView; -import com.gh.base.OnListClickListener; -import com.gh.common.constant.ItemViewType; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.ImageUtils; +import com.gh.gamecenter.common.callback.OnListClickListener; +import com.gh.gamecenter.common.constant.ItemViewType; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.common.util.NewsUtils; -import com.gh.common.util.NumberUtils; +import com.gh.gamecenter.core.utils.NumberUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsImage1ViewHolder; diff --git a/app/src/main/java/com/gh/gamecenter/info/InfoFragment.java b/app/src/main/java/com/gh/gamecenter/info/InfoFragment.java index a56ca4f724..536c454c26 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoFragment.java @@ -13,8 +13,8 @@ import android.widget.FrameLayout; import com.ethanhua.skeleton.Skeleton; import com.ethanhua.skeleton.ViewSkeletonScreen; import com.gh.common.util.DataCollectionUtils; -import com.gh.common.util.StringUtils; -import com.gh.common.view.CustomDividerItemDecoration; +import com.gh.gamecenter.core.utils.StringUtils; +import com.gh.gamecenter.common.view.CustomDividerItemDecoration; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.baselist.ListAdapter; 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 f89e839763..3000c62401 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java @@ -5,7 +5,7 @@ import androidx.lifecycle.LiveData; import androidx.annotation.NonNull; import com.gh.common.constant.Config; -import com.gh.common.util.UrlFilterUtils; +import com.gh.gamecenter.core.utils.UrlFilterUtils; import com.gh.gamecenter.baselist.ListViewModel; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.entity.ViewsEntity; diff --git a/app/src/main/java/com/gh/gamecenter/info/InfoWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/info/InfoWrapperFragment.java index c8051638cb..271cfe2419 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoWrapperFragment.java @@ -4,8 +4,8 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; -import com.gh.base.fragment.BaseFragment_TabLayout; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.R; import com.gh.gamecenter.eventbus.EBUISwitch; 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 66e5e2a7ea..639c72a193 100644 --- a/app/src/main/java/com/gh/gamecenter/info/OriginalAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/OriginalAdapter.java @@ -8,12 +8,12 @@ import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; -import com.gh.base.OnListClickListener; -import com.gh.common.constant.ItemViewType; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.ImageUtils; +import com.gh.gamecenter.common.callback.OnListClickListener; +import com.gh.gamecenter.common.constant.ItemViewType; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.common.util.NewsUtils; -import com.gh.common.util.NumberUtils; +import com.gh.gamecenter.core.utils.NumberUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsImage1ViewHolder; diff --git a/app/src/main/java/com/gh/gamecenter/info/OriginalFragment.java b/app/src/main/java/com/gh/gamecenter/info/OriginalFragment.java index 57a908c0b4..0e4c58267e 100644 --- a/app/src/main/java/com/gh/gamecenter/info/OriginalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/OriginalFragment.java @@ -10,8 +10,8 @@ import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import com.gh.common.util.DataCollectionUtils; -import com.gh.common.util.StringUtils; -import com.gh.common.view.CustomDividerItemDecoration; +import com.gh.gamecenter.core.utils.StringUtils; +import com.gh.gamecenter.common.view.CustomDividerItemDecoration; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.baselist.ListAdapter; 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 d1750761c6..2a5fcf622b 100644 --- a/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java @@ -5,7 +5,7 @@ import androidx.lifecycle.LiveData; import androidx.annotation.NonNull; import com.gh.common.constant.Config; -import com.gh.common.util.UrlFilterUtils; +import com.gh.gamecenter.core.utils.UrlFilterUtils; import com.gh.gamecenter.baselist.ListViewModel; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.entity.ViewsEntity; 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 4bbbe34c1d..a19915c237 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java @@ -7,11 +7,11 @@ import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; -import com.gh.base.OnListClickListener; -import com.gh.base.OnRequestCallBackListener; +import com.gh.gamecenter.common.callback.OnListClickListener; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; import com.gh.common.constant.Config; import com.gh.common.util.NewsUtils; -import com.gh.common.util.UrlFilterUtils; +import com.gh.gamecenter.core.utils.UrlFilterUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.NewsFooterViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsTextViewHolder; diff --git a/app/src/main/java/com/gh/gamecenter/info/StrategyDialogAdapter.java b/app/src/main/java/com/gh/gamecenter/info/StrategyDialogAdapter.java index bfbc7d7e39..4e45075f12 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyDialogAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyDialogAdapter.java @@ -4,7 +4,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; -import com.gh.common.util.DisplayUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.StrategyDialogViewHolder; import com.gh.gamecenter.databinding.DialogStrategyItemBinding; 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 0fb58a3552..08f015585e 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java @@ -14,13 +14,13 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.gh.base.fragment.BaseFragment; +import com.gh.gamecenter.common.base.fragment.BaseFragment; import com.gh.common.filter.RegionSettingHelper; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; -import com.gh.common.util.DisplayUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.common.util.NewsUtils; -import com.gh.common.util.StringUtils; +import com.gh.gamecenter.core.utils.StringUtils; import com.gh.gamecenter.ConcernActivity; import com.gh.gamecenter.GameNewsActivity; import com.gh.gamecenter.NewsDetailActivity; diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java index 699111887c..ed23031c3b 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java @@ -11,9 +11,9 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.gh.base.fragment.BaseFragment; -import com.gh.common.util.MtaHelper; -import com.gh.common.util.TextHelper; +import com.gh.gamecenter.common.base.fragment.BaseFragment; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.common.utils.TextHelper; import com.gh.gamecenter.R; import com.gh.gamecenter.databinding.FragmentLibao1Binding; import com.gh.gamecenter.eventbus.EBReuse; diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java index 08fa96106c..04c633b6b9 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java @@ -13,9 +13,9 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.gh.base.fragment.BaseFragment; +import com.gh.gamecenter.common.base.fragment.BaseFragment; import com.gh.common.util.CheckLoginUtils; -import com.gh.common.view.CustomDividerItemDecoration; +import com.gh.gamecenter.common.view.CustomDividerItemDecoration; import com.gh.gamecenter.ConcernActivity; import com.gh.gamecenter.LibaoDetailActivity; import com.gh.gamecenter.R; 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 35cfd8e759..af42b5a4ac 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.libao; -import static com.gh.common.constant.Constants.LIST_FOOTER_ITEM; -import static com.gh.common.constant.Constants.LIST_HEAD_ITEM; +import static com.gh.gamecenter.common.constant.Constants.LIST_FOOTER_ITEM; +import static com.gh.gamecenter.common.constant.Constants.LIST_HEAD_ITEM; import android.content.Context; import android.text.TextUtils; @@ -12,9 +12,9 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.ViewHolder; -import com.gh.base.OnListClickListener; -import com.gh.base.OnRequestCallBackListener; -import com.gh.common.constant.ItemViewType; +import com.gh.gamecenter.common.callback.OnListClickListener; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; +import com.gh.gamecenter.common.constant.ItemViewType; import com.gh.common.util.LibaoUtils; import com.gh.common.util.PlatformUtils; import com.gh.gamecenter.R; @@ -24,7 +24,6 @@ import com.gh.gamecenter.databinding.LibaoItemBinding; import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.entity.LibaoStatusEntity; import com.gh.gamecenter.manager.UserManager; -import com.gh.gamecenter.newsdetail.NewsDetailCommentViewHolder; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.adapter.BaseRecyclerAdapter; diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java index 33ec9759e0..b9ff80f906 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java @@ -12,9 +12,9 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.gh.base.fragment.BaseFragment; +import com.gh.gamecenter.common.base.fragment.BaseFragment; import com.gh.common.util.CheckLoginUtils; -import com.gh.common.view.CustomDividerItemDecoration; +import com.gh.gamecenter.common.view.CustomDividerItemDecoration; import com.gh.gamecenter.R; import com.gh.gamecenter.databinding.FragmentLibao3Binding; import com.gh.gamecenter.eventbus.EBReuse; 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 b11adfbdc4..af6d575d81 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java @@ -4,7 +4,6 @@ import android.content.Context; import android.text.Html; import android.text.Spanned; import android.text.TextUtils; -import android.util.Pair; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -14,14 +13,13 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; -import com.gh.base.OnRequestCallBackListener; -import com.gh.common.util.DialogHelper; -import com.gh.common.util.DialogUtils; -import com.gh.common.util.ExtensionsKt; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; +import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.common.util.LibaoUtils; import com.gh.common.util.PlatformUtils; -import com.gh.common.util.TimeUtils; -import com.gh.common.view.BugFixedPopupWindow; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.utils.TimeUtils; +import com.gh.gamecenter.common.view.BugFixedPopupWindow; import com.gh.gamecenter.LibaoDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java index 558b3d4232..a8223d4760 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java @@ -15,8 +15,8 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; -import com.gh.base.fragment.BaseFragment_TabLayout; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.ConcernActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.databinding.FragmentLibaoWrapperBinding; 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 e2fe4119e4..b6d8219939 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java @@ -10,11 +10,11 @@ import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.ViewHolder; -import com.gh.base.OnRequestCallBackListener; -import com.gh.common.constant.ItemViewType; -import com.gh.common.util.DisplayUtils; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; +import com.gh.gamecenter.common.constant.ItemViewType; +import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.common.util.LibaoUtils; -import com.gh.common.util.UrlFilterUtils; +import com.gh.gamecenter.core.utils.UrlFilterUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.LibaoNormalViewHolder; 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 47e9692afa..72ae98404c 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt @@ -4,12 +4,12 @@ import android.content.Context import android.text.TextUtils import android.view.View import android.view.ViewGroup -import com.gh.base.OnListClickListener -import com.gh.base.OnRequestCallBackListener -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.callback.OnListClickListener +import com.gh.gamecenter.common.callback.OnRequestCallBackListener +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.LibaoUtils import com.gh.common.util.PlatformUtils -import com.gh.common.util.StringUtils +import com.gh.gamecenter.core.utils.StringUtils import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.LibaoNormalViewHolder diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java index 7a27a60c0a..2cea8a6c4b 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java @@ -16,9 +16,9 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.ethanhua.skeleton.Skeleton; import com.ethanhua.skeleton.ViewSkeletonScreen; -import com.gh.base.fragment.BaseFragment; -import com.gh.common.view.CustomDividerItemDecoration; -import com.gh.common.view.SwipeLayout; +import com.gh.gamecenter.common.base.fragment.BaseFragment; +import com.gh.gamecenter.common.view.CustomDividerItemDecoration; +import com.gh.gamecenter.common.view.SwipeLayout; import com.gh.gamecenter.LibaoDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.databinding.FragmentLibaoNewBinding; 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 7646f93a39..c87375753e 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt @@ -3,13 +3,13 @@ package com.gh.gamecenter.libao import android.text.TextUtils import android.view.View import android.view.ViewGroup -import com.gh.base.OnListClickListener -import com.gh.base.OnRequestCallBackListener -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.callback.OnListClickListener +import com.gh.gamecenter.common.callback.OnRequestCallBackListener +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.LibaoUtils import com.gh.common.util.PlatformUtils -import com.gh.common.util.StringUtils -import com.gh.common.util.UrlFilterUtils +import com.gh.gamecenter.core.utils.StringUtils +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.LibaoNormalViewHolder diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java index 186bb76451..0ffb05bdfa 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java @@ -10,8 +10,8 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.gh.base.fragment.BaseFragment; -import com.gh.common.view.CustomDividerItemDecoration; +import com.gh.gamecenter.common.base.fragment.BaseFragment; +import com.gh.gamecenter.common.view.CustomDividerItemDecoration; import com.gh.gamecenter.LibaoDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.databinding.FragmentLibaoSerachBinding; 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 bdef6ddb33..bb11a2f8ce 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/CommentManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/CommentManager.java @@ -3,8 +3,8 @@ package com.gh.gamecenter.manager; import android.content.Context; import com.gh.common.constant.Config; -import com.gh.common.util.StringUtils; -import com.gh.common.util.TimestampUtils; +import com.gh.gamecenter.core.utils.StringUtils; +import com.gh.gamecenter.common.utils.TimestampUtils; import com.gh.gamecenter.retrofit.ObservableUtil; import com.gh.gamecenter.retrofit.OkHttpCache; 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 dad018f8d1..b68b958f76 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java @@ -2,10 +2,10 @@ package com.gh.gamecenter.manager; import android.content.Context; -import com.gh.common.AppExecutor; -import com.gh.common.exposure.meta.MetaUtil; +import com.gh.gamecenter.core.AppExecutor; +import com.gh.gamecenter.common.exposure.meta.MetaUtil; import com.gh.common.loghub.LoghubUtils; -import com.gh.common.util.Installation; +import com.gh.gamecenter.common.utils.Installation; import com.gh.common.util.LogUtils; import com.gh.common.util.PackageUtils; import com.gh.gamecenter.db.DataCollectionDao; 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 344a9de19a..f4af051c2a 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java @@ -19,27 +19,27 @@ import android.widget.TextView; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.core.app.NotificationManagerCompat; -import com.gh.base.CurrentActivityHolder; -import com.gh.common.AppExecutor; -import com.gh.common.constant.Constants; +import com.gh.gamecenter.core.utils.CurrentActivityHolder; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.AppExecutor; +import com.gh.gamecenter.common.constant.Constants; import com.gh.common.exposure.ExposureEvent; import com.gh.common.exposure.ExposureUtils; import com.gh.common.util.DataLogUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DirectUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EmptyCallback; -import com.gh.common.util.ExtensionsKt; -import com.gh.common.util.GsonUtils; -import com.gh.common.util.MD5Utils; -import com.gh.common.util.MtaHelper; -import com.gh.common.util.NetworkUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.core.utils.EmptyCallback; +import com.gh.gamecenter.core.utils.GsonUtils; +import com.gh.gamecenter.core.utils.MD5Utils; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.common.utils.NetworkUtils; import com.gh.common.util.PackageInstaller; import com.gh.common.util.PackageUtils; -import com.gh.common.util.SPUtils; -import com.gh.common.util.SpanBuilder; -import com.gh.common.util.SpeedUtils; -import com.gh.common.view.CustomLinkMovementMethod; +import com.gh.gamecenter.core.utils.SPUtils; +import com.gh.gamecenter.core.utils.SpanBuilder; +import com.gh.gamecenter.core.utils.SpeedUtils; +import com.gh.gamecenter.common.view.CustomLinkMovementMethod; import com.gh.download.DownloadManager; import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.R; 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 84e8cf3f8d..dc53465cb4 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UserManager.java @@ -10,14 +10,14 @@ import androidx.annotation.Nullable; import com.gh.base.BaseActivity; import com.gh.common.PushManager; -import com.gh.common.constant.Constants; -import com.gh.common.exposure.meta.MetaUtil; +import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.exposure.meta.MetaUtil; import com.gh.common.repository.ReservationRepository; import com.gh.common.util.DataUtils; -import com.gh.common.util.DeviceUtils; -import com.gh.common.util.EnvHelper; -import com.gh.common.util.GsonUtils; -import com.gh.common.util.SPUtils; +import com.gh.gamecenter.common.utils.DeviceUtils; +import com.gh.gamecenter.common.utils.EnvHelper; +import com.gh.gamecenter.core.utils.GsonUtils; +import com.gh.gamecenter.core.utils.SPUtils; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.entity.CommunityEntity; import com.gh.gamecenter.entity.LoginTokenEntity; 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 d39d3932b0..77bf1c46a8 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/VisitManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/VisitManager.java @@ -3,9 +3,9 @@ package com.gh.gamecenter.manager; import android.content.Context; import com.gh.common.constant.Config; -import com.gh.common.util.StringUtils; -import com.gh.common.util.TimestampUtils; -import com.gh.common.util.UrlFilterUtils; +import com.gh.gamecenter.core.utils.StringUtils; +import com.gh.gamecenter.common.utils.TimestampUtils; +import com.gh.gamecenter.core.utils.UrlFilterUtils; import com.gh.gamecenter.retrofit.ObservableUtil; import com.gh.gamecenter.retrofit.OkHttpCache; diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java index 7f6b39996c..86decdae19 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java @@ -8,7 +8,7 @@ import androidx.annotation.Nullable; import android.view.View; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.R; import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListFragment; diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java index 43db012d54..984eea7557 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java @@ -15,17 +15,17 @@ import androidx.recyclerview.widget.RecyclerView; import com.facebook.drawee.generic.GenericDraweeHierarchy; import com.facebook.drawee.generic.RoundingParams; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.OnListClickListener; -import com.gh.common.constant.Constants; -import com.gh.common.constant.ItemViewType; +import com.gh.gamecenter.common.callback.OnListClickListener; +import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.constant.ItemViewType; import com.gh.common.util.CommentUtils; -import com.gh.common.util.DialogHelper; +import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.common.util.DirectUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.ExtensionsKt; -import com.gh.common.util.ImageUtils; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.ImageViewerActivity; import com.gh.gamecenter.NewsDetailActivity; @@ -309,8 +309,8 @@ public class KeFuFragmentAdapter extends ListAdapter { case "新闻": if (!TextUtils.isEmpty(data.getId())) { Intent intent2 = new Intent(mContext, NewsDetailActivity.class); - intent2.putExtra(EntranceUtils.KEY_ENTRANCE, "(消息-公告)"); - intent2.putExtra(EntranceUtils.KEY_NEWSID, data.getId()); + intent2.putExtra(EntranceConsts.KEY_ENTRANCE, "(消息-公告)"); + intent2.putExtra(EntranceConsts.KEY_NEWSID, data.getId()); mContext.startActivity(intent2); } break; diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/KeFuViewHolder.java index fa1f9e781f..fefccb557c 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuViewHolder.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.message; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.callback.OnListClickListener; import com.gh.gamecenter.databinding.MessageKefuItemBinding; import com.gh.gamecenter.entity.MessageKeFuEntity; diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageAdapter.java b/app/src/main/java/com/gh/gamecenter/message/MessageAdapter.java index afd82aa638..7b83671590 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageAdapter.java @@ -6,10 +6,10 @@ import android.view.ViewGroup; import androidx.recyclerview.widget.RecyclerView; -import com.gh.base.OnListClickListener; -import com.gh.common.constant.ItemViewType; +import com.gh.gamecenter.common.callback.OnListClickListener; +import com.gh.gamecenter.common.constant.ItemViewType; import com.gh.common.databind.BindingAdapters; -import com.gh.common.util.DialogHelper; +import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.baselist.ListAdapter; diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java index 09abdae1d7..e07d09a11f 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java @@ -21,16 +21,16 @@ import androidx.recyclerview.widget.RecyclerView; import com.gh.common.constant.Config; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DialogUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.common.util.ErrorHelper; -import com.gh.common.util.GsonUtils; -import com.gh.common.util.KeyboardHeightObserver; -import com.gh.common.util.KeyboardHeightProvider; +import com.gh.gamecenter.core.utils.GsonUtils; +import com.gh.gamecenter.core.utils.KeyboardHeightObserver; +import com.gh.gamecenter.core.utils.KeyboardHeightProvider; import com.gh.common.util.PostCommentUtils; -import com.gh.common.util.TextHelper; -import com.gh.common.util.TimestampUtils; -import com.gh.common.util.UrlFilterUtils; +import com.gh.gamecenter.common.utils.TextHelper; +import com.gh.gamecenter.common.utils.TimestampUtils; +import com.gh.gamecenter.core.utils.UrlFilterUtils; import com.gh.gamecenter.MessageDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.MessageDetailAdapter; @@ -44,11 +44,10 @@ import com.gh.gamecenter.entity.ViewsEntity; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.manager.CommentManager; import com.gh.gamecenter.manager.UserManager; -import com.gh.gamecenter.normal.NormalFragment; +import com.gh.gamecenter.common.base.fragment.NormalFragment; import com.gh.gamecenter.retrofit.OkHttpCache; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; -import com.google.gson.Gson; import com.halo.assistant.HaloApp; import com.lightgame.listeners.OnBackPressedListener; import com.lightgame.utils.Util_System_Keyboard; @@ -139,7 +138,7 @@ public class MessageDetailFragment extends NormalFragment implements OnCommentCa mConcernEntity = (ConcernEntity) HaloApp.get(ConcernEntity.TAG, true); mCommentEntity = args.getParcelable(CommentEntity.TAG); - newsId = args.getString(EntranceUtils.KEY_NEWSID); + newsId = args.getString(EntranceConsts.KEY_NEWSID); commentNum = args.getInt("commentNum", -1); //复用问题 mConcernEntity对应的文章有可能和跳转之前的文章不一致 diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java index 3193aa7731..2ca26c1ff3 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java @@ -6,7 +6,7 @@ import android.view.View; import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProviders; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.MessageInviteActivity; import com.gh.gamecenter.MessageKeFuActivity; import com.gh.gamecenter.MessageVoteActivity; 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 d6a7969a71..1f76ae7ec2 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java @@ -6,14 +6,14 @@ import android.view.View; import android.widget.RelativeLayout; import com.gh.base.BaseActivity; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.callback.OnListClickListener; import com.gh.common.databind.BindingAdapters; -import com.gh.common.util.ClickUtils; +import com.gh.gamecenter.core.utils.ClickUtils; import com.gh.common.util.DirectUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.ImageUtils; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.NewsUtils; import com.gh.gamecenter.CommentDetailActivity; import com.gh.gamecenter.GameDetailActivity; diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageNormalAdapter.java b/app/src/main/java/com/gh/gamecenter/message/MessageNormalAdapter.java index b36be8a4e8..5295d20d5c 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageNormalAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageNormalAdapter.java @@ -6,9 +6,9 @@ import android.view.ViewGroup; import androidx.recyclerview.widget.RecyclerView; -import com.gh.base.OnListClickListener; -import com.gh.common.constant.ItemViewType; -import com.gh.common.util.DialogHelper; +import com.gh.gamecenter.common.callback.OnListClickListener; +import com.gh.gamecenter.common.constant.ItemViewType; +import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.baselist.ListAdapter; diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java index 04f7a672e8..9d0574377b 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java @@ -8,8 +8,7 @@ import androidx.annotation.Nullable; import android.view.View; -import com.gh.common.util.DialogUtils; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.R; import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListFragment; @@ -38,8 +37,8 @@ public class MessageNormalFragment extends ListFragment 0) if (isRecordData) { addUnreadRecord(t1, t2, t3, t4) - SPUtils.setString(Constants.SP_PRIVACY_MINE_MD5, SPUtils.getString(Constants.SP_PRIVACY_CURRENT_MD5)) + SPUtils.setString( + Constants.SP_PRIVACY_MINE_MD5, SPUtils.getString( + Constants.SP_PRIVACY_CURRENT_MD5)) } val isSameAsLast = checkDataIsSameAsLast(t1, t2, t3, t4) val privacyIsSame = checkPrivacyIsSame() diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt index 02a6482209..67ebbce288 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt @@ -6,18 +6,19 @@ import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.databind.BindingAdapters import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable -import com.gh.common.util.* -import com.gh.common.view.DrawableView +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.LoadType +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.ItemFollowedGameBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.gamedetail.GameDetailFragment diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt index 7ef35d45b1..413a4efe35 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt @@ -5,14 +5,14 @@ import android.view.View import androidx.core.content.ContextCompat import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.base.OnRequestCallBackListener +import com.gh.gamecenter.common.callback.OnRequestCallBackListener import com.gh.common.exposure.ExposureListener -import com.gh.common.util.* -import com.gh.common.view.CustomDividerItemDecoration +import com.gh.gamecenter.common.view.CustomDividerItemDecoration import com.gh.gamecenter.ConcernActivity import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.ListFragment +import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.databinding.FragmentFollowedGameBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.eventbus.EBConcernChanged @@ -84,7 +84,8 @@ class MyFollowedGameFragment : ListFragment super.onLoadDone() postDelayedRunnable({ if (mRecommendAdapter == null && context != null) { - mRecommendAdapter = MyConcernRecommendAdapter(context, object : OnRequestCallBackListener { + mRecommendAdapter = MyConcernRecommendAdapter(context, object : + OnRequestCallBackListener { override fun loadDone() { mBinding.concernRlTitle.goneIf(mViewModel.getListData().size > 3) mBinding.concernRvRecommend.goneIf(mViewModel.getListData().size > 3) diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt index d9e0bb7fe3..d120a0f6fa 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt @@ -9,11 +9,14 @@ import android.view.View import android.widget.LinearLayout import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout -import com.gh.common.AppExecutor -import com.gh.common.constant.Constants -import com.gh.common.util.* -import com.gh.common.view.BugFixedPopupWindow +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.view.BugFixedPopupWindow import com.gh.gamecenter.R +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.showRegulationTestDialogIfNeeded +import com.gh.gamecenter.common.utils.tryCatchInRelease +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.PopupMyGameGuideBinding import com.gh.gamecenter.gamecollection.publish.GameCollectionEditActivity 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 56b7517a06..dc5ecf7d50 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameFragment.kt @@ -5,14 +5,14 @@ import android.os.Build import android.os.Bundle import androidx.recyclerview.widget.RecyclerView import com.gh.base.BaseActivity_TabLayout -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureListener -import com.gh.common.runOnIoThread -import com.gh.common.util.SPUtils +import com.gh.gamecenter.core.runOnIoThread +import com.gh.gamecenter.core.utils.SPUtils import com.gh.common.util.UsageStatsHelper -import com.gh.common.util.toColor -import com.gh.common.util.toDrawable -import com.gh.common.view.CustomDividerItemDecoration +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.common.view.CustomDividerItemDecoration import com.gh.download.DownloadManager import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationAdapter.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationAdapter.kt index c3906eaba5..6cb9da270e 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationAdapter.kt @@ -4,7 +4,7 @@ import android.content.Context import android.util.SparseArray import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.databind.BindingAdapters import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource @@ -15,6 +15,11 @@ import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.GameViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.safelyGetInRelease +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ItemFollowedGameBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.eventbus.EBDownloadStatus 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 9841d7a749..be79ff9de5 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt @@ -6,11 +6,11 @@ import android.view.View import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.common.exposure.ExposureListener -import com.gh.common.util.ifLogin -import com.gh.common.util.toColor -import com.gh.common.util.toDrawable -import com.gh.common.util.viewModelProvider -import com.gh.common.view.CustomDividerItemDecoration +import com.gh.gamecenter.common.utils.ifLogin +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.common.view.CustomDividerItemDecoration import com.gh.download.DownloadManager import com.gh.gamecenter.R import com.gh.gamecenter.baselist.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 89a5eaa03f..f9ed0363e3 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationViewModel.kt @@ -3,8 +3,8 @@ package com.gh.gamecenter.mygame import android.annotation.SuppressLint import android.app.Application import com.gh.common.repository.ReservationRepository -import com.gh.common.runOnUiThread -import com.gh.common.util.createRequestBody +import com.gh.gamecenter.core.runOnUiThread +import com.gh.gamecenter.common.utils.createRequestBody import com.gh.download.DownloadManager import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadType diff --git a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameActivity.kt b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameActivity.kt index 548a039ea7..45563bad61 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameActivity.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity class PlayedGameActivity: NormalActivity() { @@ -12,8 +12,8 @@ class PlayedGameActivity: NormalActivity() { companion object { fun getIntent(context: Context, userId: String, entrance: String, path: String): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_USER_ID, userId) - bundle.putString(EntranceUtils.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) + bundle.putString(EntranceConsts.KEY_USER_ID, userId) + bundle.putString(EntranceConsts.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) return getTargetIntent(context, PlayedGameActivity::class.java, PlayedGameFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt index bef6bcfbc7..9222690e9a 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt @@ -11,20 +11,23 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.RecyclerView -import com.gh.common.AppExecutor -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.databind.BindingAdapters import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable import com.gh.common.util.* -import com.gh.common.view.BugFixedPopupWindow -import com.gh.common.view.DrawableView +import com.gh.gamecenter.common.view.BugFixedPopupWindow +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.GameViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ItemPlayedGameBinding import com.gh.gamecenter.databinding.ItemUsageStatsBinding import com.gh.gamecenter.entity.GameEntity @@ -194,8 +197,10 @@ open class PlayedGameAdapter( holder.binding.switchIv.setOnClickListener { if (!UsageStatsHelper.checkForPermission()) { DialogUtils.showUsageStatsDialog( - mContext, { - UsageStatsHelper.skipToUsageStats(mContext, UsageStatsHelper.USAGE_STATUS_REQUEST_CODE) + mContext, object :ConfirmListener{ + override fun onConfirm() { + UsageStatsHelper.skipToUsageStats(mContext, UsageStatsHelper.USAGE_STATUS_REQUEST_CODE) + } }) {} } } diff --git a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameFragment.kt b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameFragment.kt index 02df1ad16e..75fa380046 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameFragment.kt @@ -3,8 +3,8 @@ package com.gh.gamecenter.mygame import android.os.Bundle import android.view.View import com.gh.common.exposure.ExposureListener -import com.gh.common.util.EntranceUtils -import com.gh.common.util.viewModelProvider +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.download.DownloadManager import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.ListFragment @@ -50,7 +50,7 @@ open class PlayedGameFragment : ListFragment() } override fun provideListViewModel(): PlayedGameViewModel { - val userId = arguments?.getString(EntranceUtils.KEY_USER_ID) + val userId = arguments?.getString(EntranceConsts.KEY_USER_ID) ?: UserManager.getInstance().userId mViewModel = viewModelProvider(PlayedGameViewModel.Factory(userId)) return mViewModel 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 e39e7b37cb..0e92d276d6 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -22,7 +22,7 @@ import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.ViewHolder; -import com.gh.base.OnRequestCallBackListener; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; import com.gh.common.DefaultUrlHandler; import com.gh.common.constant.Config; import com.gh.common.databind.BindingAdapters; @@ -32,19 +32,19 @@ import com.gh.common.util.CommentUtils; import com.gh.common.util.ConcernUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; -import com.gh.common.util.DialogHelper; +import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.common.util.DialogUtils; import com.gh.common.util.DirectUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.ExtensionsKt; -import com.gh.common.util.ImageUtils; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.NewsUtils; -import com.gh.common.util.NumberUtils; -import com.gh.common.util.RandomUtils; -import com.gh.common.util.StringUtils; -import com.gh.common.util.TextHelper; -import com.gh.common.view.DrawableView; +import com.gh.gamecenter.core.utils.NumberUtils; +import com.gh.gamecenter.core.utils.RandomUtils; +import com.gh.gamecenter.core.utils.StringUtils; +import com.gh.gamecenter.common.utils.TextHelper; +import com.gh.gamecenter.common.view.DrawableView; import com.gh.common.view.RichEditor; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.ImageViewerActivity; @@ -55,7 +55,6 @@ import com.gh.gamecenter.adapter.viewholder.CommentViewHolder; import com.gh.gamecenter.adapter.viewholder.GameDetailNewsViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsDetailCommentListViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsDetailGameViewHolder; -import com.gh.gamecenter.databinding.CommentItemBinding; import com.gh.gamecenter.databinding.GamedetailItemNewsBinding; import com.gh.gamecenter.databinding.NewsDetailCommentBinding; import com.gh.gamecenter.databinding.NewsdetailItemContentBinding; diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailCommentViewHolder.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailCommentViewHolder.java index 86825d6cd6..ad469a055d 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailCommentViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailCommentViewHolder.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.newsdetail; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.callback.OnListClickListener; import com.gh.gamecenter.databinding.NewsdetailItemCommentBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailContentViewHolder.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailContentViewHolder.java index e5a8a48a6b..c7ba1ef948 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailContentViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailContentViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.newsdetail; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.NewsdetailItemContentBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageFilterManager.kt b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageFilterManager.kt index dd23d958d6..97b150716a 100644 --- a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageFilterManager.kt +++ b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageFilterManager.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.packagehelper import android.annotation.SuppressLint -import com.gh.common.util.toRequestBody +import com.gh.gamecenter.common.utils.toRequestBody import com.gh.gamecenter.entity.PackageFilter import com.gh.gamecenter.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager 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 d96b04017a..e6adb9f766 100644 --- a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt +++ b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt @@ -3,12 +3,15 @@ package com.gh.gamecenter.packagehelper import android.annotation.SuppressLint import android.text.TextUtils import androidx.lifecycle.MutableLiveData -import com.gh.common.exposure.meta.MetaUtil +import com.gh.gamecenter.common.exposure.meta.MetaUtil import com.gh.common.filter.RegionSettingHelper import com.gh.common.loghub.LoghubUtils -import com.gh.common.runOnIoThread import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.core.runOnIoThread +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.secondOrNull +import com.gh.gamecenter.common.utils.tryCatchInRelease import com.gh.gamecenter.entity.* import com.gh.gamecenter.manager.PackagesManager import com.gh.gamecenter.manager.UserManager diff --git a/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoActivity.kt b/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoActivity.kt index 00c26a55b9..b75a96e6e7 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoActivity.kt @@ -3,7 +3,6 @@ package com.gh.gamecenter.personal import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.DisplayUtils import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoFragment.kt b/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoFragment.kt index 9f7dc46c59..e45354f306 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoFragment.kt @@ -5,7 +5,7 @@ import android.view.View import com.gh.common.util.DirectUtils import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentDeliveryInfoBinding -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment class DeliveryInfoFragment: NormalFragment() { diff --git a/app/src/main/java/com/gh/gamecenter/personal/NewPersonalActivity.kt b/app/src/main/java/com/gh/gamecenter/personal/NewPersonalActivity.kt index c5dda40b00..ddfb1307aa 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/NewPersonalActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/NewPersonalActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.personal import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.DisplayUtils +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.NormalActivity class NewPersonalActivity : NormalActivity() { 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 e000371927..465a593c36 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.kt @@ -10,7 +10,7 @@ import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager -import com.gh.base.fragment.BaseLazyFragment +import com.gh.gamecenter.common.base.fragment.BaseLazyFragment import com.gh.common.databind.BindingAdapters import com.gh.common.notifier.Notifier.Companion.create import com.gh.common.notifier.Notifier.Companion.hide @@ -21,19 +21,26 @@ import com.gh.common.util.DirectUtils.directToBadgeDetail import com.gh.common.util.DirectUtils.directToBadgeWall import com.gh.common.util.DirectUtils.directToEnergyRecord import com.gh.common.util.DirectUtils.directToHomeActivity -import com.gh.common.util.ImageUtils.display -import com.gh.common.util.ImageUtils.displayIcon +import com.gh.gamecenter.common.utils.ImageUtils.display +import com.gh.gamecenter.common.utils.ImageUtils.displayIcon import com.gh.common.util.IntegralLogHelper.log import com.gh.common.util.LoginHelper.onQQLoginCallback import com.gh.common.util.LoginHelper.onWeiboLoginCallback -import com.gh.common.util.MtaHelper.onEvent -import com.gh.common.util.SPUtils.getLong -import com.gh.common.util.SPUtils.setLong -import com.gh.common.util.TimeUtils.getStartTimeOfDay -import com.gh.common.util.ToastUtils.showToast -import com.gh.common.view.SpacingItemDecoration +import com.gh.gamecenter.core.utils.MtaHelper.onEvent +import com.gh.gamecenter.core.utils.SPUtils.getLong +import com.gh.gamecenter.core.utils.SPUtils.setLong +import com.gh.gamecenter.core.utils.TimeUtils.getStartTimeOfDay +import com.gh.gamecenter.core.utils.ToastUtils.showToast +import com.gh.gamecenter.common.view.SpacingItemDecoration import com.gh.gamecenter.MessageActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.NetworkUtils +import com.gh.gamecenter.core.utils.StringUtils +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.tryCatchInRelease +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.databinding.FragmentNewPersonalBinding import com.gh.gamecenter.databinding.FragmentNewPersonalStubBinding import com.gh.gamecenter.energy.EnergyCenterActivity @@ -279,109 +286,114 @@ class NewPersonalFragment : BaseLazyFragment() { @SuppressLint("CheckResult", "SetTextI18n") private fun observeUIRelatedChanges() { - mPersonalViewModel.appEntity.observe(this, { + mPersonalViewModel.appEntity.observe(this) { if (it.versionCode > PackageUtils.getGhVersionCode()) { notifyItemChange("设置", FunctionalMessageType.NEW_VERSION) } else { notifyItemChange("设置", null) } - }) + } mUserViewModel.loginObsUserinfo.observe( - this, - { userInfoEntity: ApiResponse? -> - if (userInfoEntity != null && userInfoEntity.data != null) { - changeLoginState(true) - } else { - changeLoginState(false) - } - }) + this + ) { userInfoEntity: ApiResponse? -> + if (userInfoEntity != null && userInfoEntity.data != null) { + changeLoginState(true) + } else { + changeLoginState(false) + } + } - mUserHomeViewModel.badges.observe(this, - { badgeEntities: List -> - mStubBinding.personalBadgeIcon.setImageURI("") - if (badgeEntities.isEmpty()) { - mStubBinding.personalBadgeTv.visibility = View.GONE - mStubBinding.personalBadgeCountTv.visibility = View.GONE - mStubBinding.personalMyBadgeIcon.visibility = View.VISIBLE - } else { - mStubBinding.personalBadgeTv.visibility = View.VISIBLE - mStubBinding.personalBadgeCountTv.visibility = View.VISIBLE - mStubBinding.personalMyBadgeIcon.visibility = View.GONE - mStubBinding.personalBadgeCountTv.text = badgeEntities.size.toString() + "" - for ((_, _, icon, name, _, wear, _, actions) in badgeEntities) { - if (wear) { - display( - mStubBinding.personalBadgeIcon, - icon - ) - mStubBinding.personalBadgeIcon.setOnClickListener { - DialogUtils.showViewBadgeDialog( - requireContext(), - Badge(name, icon, actions) - ) { - directToBadgeWall( - requireContext(), - mUserInfoEntity?.userId, - mUserInfoEntity?.name, - mUserInfoEntity?.icon - ) + mUserHomeViewModel.badges.observe(this + ) { badgeEntities: List -> + mStubBinding.personalBadgeIcon.setImageURI("") + if (badgeEntities.isEmpty()) { + mStubBinding.personalBadgeTv.visibility = View.GONE + mStubBinding.personalBadgeCountTv.visibility = View.GONE + mStubBinding.personalMyBadgeIcon.visibility = View.VISIBLE + } else { + mStubBinding.personalBadgeTv.visibility = View.VISIBLE + mStubBinding.personalBadgeCountTv.visibility = View.VISIBLE + mStubBinding.personalMyBadgeIcon.visibility = View.GONE + mStubBinding.personalBadgeCountTv.text = badgeEntities.size.toString() + "" + for ((_, _, icon, name, _, wear, _, actions) in badgeEntities) { + if (wear) { + display( + mStubBinding.personalBadgeIcon, + icon + ) + mStubBinding.personalBadgeIcon.setOnClickListener { + DialogUtils.showViewBadgeDialog( + requireContext(), + Badge(name, icon, actions), + object : ConfirmListener { + override fun onConfirm() { + directToBadgeWall( + requireContext(), + mUserInfoEntity?.userId, + mUserInfoEntity?.name, + mUserInfoEntity?.icon + ) + } } - } - break + ) } + break } } - }) + } + } mUserHomeViewModel.availableBadgeCount.observe(this, { count: Int -> mStubBinding.personalBadgeTips.visibility = if (count > 0) View.VISIBLE else View.GONE }) - mUserHomeViewModel.availableBadge.observe(this, - { badge: BadgeEntity? -> - // 徽章领取弹窗每隔7天弹出一次，所以要判断现在是否是上一次弹出的第7天或者之后 - if (badge != null && System.currentTimeMillis() >= getLong(SP_BADGE_RECORD_SEVEN_DAY)) { - // 徽章领取弹窗每隔7天弹出一次，所以本次弹出后就记录7天后的时间戳 - setLong( - SP_BADGE_RECORD_SEVEN_DAY, - getStartTimeOfDay(System.currentTimeMillis() + 86400000 * 6) - ) - DialogUtils.showReceiveBadgeDialog( - requireContext(), badge - ) { - mPersonalViewModel.applyOrReceiveBadge(badge.id, { - if ("self" == badge.receive?.type) { - showToast("领取成功") - } else { - showToast("申请成功") - } - // 跳转到徽章详情 - directToBadgeDetail( - requireContext(), - mUserInfoEntity?.userId, - badge.id - ) - }, { - if ("self" == badge.receive?.type) { - showToast("领取失败") - } else { - showToast("申请失败") - } - }) + mUserHomeViewModel.availableBadge.observe(this + ) { badge: BadgeEntity? -> + // 徽章领取弹窗每隔7天弹出一次，所以要判断现在是否是上一次弹出的第7天或者之后 + if (badge != null && System.currentTimeMillis() >= getLong(SP_BADGE_RECORD_SEVEN_DAY)) { + // 徽章领取弹窗每隔7天弹出一次，所以本次弹出后就记录7天后的时间戳 + setLong( + SP_BADGE_RECORD_SEVEN_DAY, + getStartTimeOfDay(System.currentTimeMillis() + 86400000 * 6) + ) + DialogUtils.showReceiveBadgeDialog( + requireContext(), badge, object : ConfirmListener { + override fun onConfirm() { + mPersonalViewModel.applyOrReceiveBadge(badge.id, { + if ("self" == badge.receive?.type) { + showToast("领取成功") + } else { + showToast("申请成功") + } + // 跳转到徽章详情 + directToBadgeDetail( + requireContext(), + mUserInfoEntity?.userId, + badge.id + ) + }, { + if ("self" == badge.receive?.type) { + showToast("领取失败") + } else { + showToast("申请失败") + } + }) + } } - } - }) + ) + } + } - mUserHomeViewModel.energy.observe(this, { energy: Long -> + mUserHomeViewModel.energy.observe(this) { energy: Long -> mEnergy = energy if (energy > 9999) { mStubBinding.personalEnergyTv.text = "9999+" } else { mStubBinding.personalEnergyTv.text = energy.toString() + "" } - }) + } mUserHomeViewModel.signStatus.observe(this, { (todaySignIn) -> @@ -649,15 +661,15 @@ class NewPersonalFragment : BaseLazyFragment() { .setOnClickListener { val bundle = Bundle() bundle.putString( - EntranceUtils.KEY_ANSWER_ID, + EntranceConsts.KEY_ANSWER_ID, messageUnread.meta?.answerId ) bundle.putString( - EntranceUtils.KEY_ENTRANCE, - EntranceUtils.ENTRANCE_UMENG + EntranceConsts.KEY_ENTRANCE, + EntranceConsts.ENTRANCE_UMENG ) bundle.putString( - EntranceUtils.KEY_TO, + EntranceConsts.KEY_TO, SimpleAnswerDetailActivity::class.java.name ) EntranceUtils.jumpActivity(activity, bundle) diff --git a/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFunctionGroupAdapter.kt b/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFunctionGroupAdapter.kt index 6f863fbdfd..f6251826b6 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFunctionGroupAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFunctionGroupAdapter.kt @@ -8,9 +8,9 @@ import android.widget.TextView import androidx.core.util.isEmpty import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.Constants -import com.gh.common.util.SPUtils -import com.gh.common.view.GridSpacingItemColorDecoration +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.view.GridSpacingItemColorDecoration import com.gh.gamecenter.R import com.gh.gamecenter.entity.FunctionalGroupEntity import com.lightgame.adapter.BaseRecyclerAdapter 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 614532d647..d6a0257770 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt @@ -13,7 +13,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.gh.base.BaseActivity -import com.gh.base.fragment.BaseLazyFragment +import com.gh.gamecenter.common.base.fragment.BaseLazyFragment import com.gh.common.databind.BindingAdapters import com.gh.common.notifier.Notifier.Companion.create import com.gh.common.notifier.Notifier.Companion.hide @@ -23,18 +23,26 @@ import com.gh.common.util.* import com.gh.common.util.DirectUtils.directToBadgeDetail import com.gh.common.util.DirectUtils.directToBadgeWall import com.gh.common.util.DirectUtils.directToHomeActivity -import com.gh.common.util.ImageUtils.display -import com.gh.common.util.ImageUtils.displayIcon +import com.gh.gamecenter.common.utils.ImageUtils.display +import com.gh.gamecenter.common.utils.ImageUtils.displayIcon import com.gh.common.util.LoginHelper.onQQLoginCallback import com.gh.common.util.LoginHelper.onWeiboLoginCallback -import com.gh.common.util.MtaHelper.onEvent -import com.gh.common.util.SPUtils.getLong -import com.gh.common.util.SPUtils.setLong -import com.gh.common.util.TimeUtils.getStartTimeOfDay -import com.gh.common.util.ToastUtils.showToast -import com.gh.common.view.VerticalItemDecoration +import com.gh.gamecenter.core.utils.MtaHelper.onEvent +import com.gh.gamecenter.core.utils.SPUtils.getLong +import com.gh.gamecenter.core.utils.SPUtils.setLong +import com.gh.gamecenter.core.utils.TimeUtils.getStartTimeOfDay +import com.gh.gamecenter.core.utils.ToastUtils.showToast +import com.gh.gamecenter.common.view.VerticalItemDecoration import com.gh.gamecenter.MessageActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.NetworkUtils +import com.gh.gamecenter.core.utils.StringUtils +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.tryCatchInRelease +import com.gh.gamecenter.common.utils.PackageFlavorHelper +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.databinding.FragmentPersonalBinding import com.gh.gamecenter.databinding.FragmentPersonalStubBinding import com.gh.gamecenter.entity.* @@ -269,41 +277,44 @@ class PersonalFragment : BaseLazyFragment() { } }) - mUserHomeViewModel.badges.observe(this, - { badgeEntities: List -> - mStubBinding.personalBadgeIcon.setImageURI("") - if (badgeEntities.isEmpty()) { - mStubBinding.personalBadgeTv.visibility = View.GONE - mStubBinding.personalBadgeCountTv.visibility = View.GONE - mStubBinding.personalMyBadgeIcon.visibility = View.VISIBLE - } else { - mStubBinding.personalBadgeTv.visibility = View.VISIBLE - mStubBinding.personalBadgeCountTv.visibility = View.VISIBLE - mStubBinding.personalMyBadgeIcon.visibility = View.GONE - mStubBinding.personalBadgeCountTv.text = badgeEntities.size.toString() + "" - for ((_, _, icon, name, _, wear, _, actions) in badgeEntities) { - if (wear) { - display( - mStubBinding.personalBadgeIcon, - icon - ) - mStubBinding.personalBadgeIcon.setOnClickListener { - DialogUtils.showViewBadgeDialog( - requireContext(), - Badge(name, icon, actions) - ) { - directToBadgeWall( - requireContext(), - mUserInfoEntity?.userId, - mUserInfoEntity?.name, - mUserInfoEntity?.icon - ) + mUserHomeViewModel.badges.observe(this + ) { badgeEntities: List -> + mStubBinding.personalBadgeIcon.setImageURI("") + if (badgeEntities.isEmpty()) { + mStubBinding.personalBadgeTv.visibility = View.GONE + mStubBinding.personalBadgeCountTv.visibility = View.GONE + mStubBinding.personalMyBadgeIcon.visibility = View.VISIBLE + } else { + mStubBinding.personalBadgeTv.visibility = View.VISIBLE + mStubBinding.personalBadgeCountTv.visibility = View.VISIBLE + mStubBinding.personalMyBadgeIcon.visibility = View.GONE + mStubBinding.personalBadgeCountTv.text = badgeEntities.size.toString() + "" + for ((_, _, icon, name, _, wear, _, actions) in badgeEntities) { + if (wear) { + display( + mStubBinding.personalBadgeIcon, + icon + ) + mStubBinding.personalBadgeIcon.setOnClickListener { + DialogUtils.showViewBadgeDialog( + requireContext(), + Badge(name, icon, actions), + object :ConfirmListener{ + override fun onConfirm() { + directToBadgeWall( + requireContext(), + mUserInfoEntity?.userId, + mUserInfoEntity?.name, + mUserInfoEntity?.icon + ) + } } - } - break + ) } + break } } + } // mStubBinding.personalBadgeIcon.setImageURI("") // // if (badgeEntities.isEmpty()) { @@ -336,58 +347,60 @@ class PersonalFragment : BaseLazyFragment() { // } // } // } - }) + } mUserHomeViewModel.availableBadgeCount.observe(this, { count: Int -> mStubBinding.personalBadgeTips.visibility = if (count > 0) View.VISIBLE else View.GONE }) - mUserHomeViewModel.availableBadge.observe(this, - { badge: BadgeEntity? -> - // 徽章领取弹窗每隔7天弹出一次，所以要判断现在是否是上一次弹出的第7天或者之后 - if (badge != null && System.currentTimeMillis() >= getLong(SP_BADGE_RECORD_SEVEN_DAY)) { - // 徽章领取弹窗每隔7天弹出一次，所以本次弹出后就记录7天后的时间戳 - setLong( - SP_BADGE_RECORD_SEVEN_DAY, - getStartTimeOfDay(System.currentTimeMillis() + 86400000 * 6) - ) - DialogUtils.showReceiveBadgeDialog( - requireContext(), badge - ) { - mPersonalViewModel.applyOrReceiveBadge(badge.id, { - if ("self" == badge.receive?.type) { - showToast("领取成功") - } else { - showToast("申请成功") - } - // 跳转到徽章详情 - directToBadgeDetail( - requireContext(), - mUserInfoEntity?.userId, - badge.id - ) - }, { - if ("self" == badge.receive?.type) { - showToast("领取失败") - } else { - showToast("申请失败") - } - }) + mUserHomeViewModel.availableBadge.observe(this + ) { badge: BadgeEntity? -> + // 徽章领取弹窗每隔7天弹出一次，所以要判断现在是否是上一次弹出的第7天或者之后 + if (badge != null && System.currentTimeMillis() >= getLong(SP_BADGE_RECORD_SEVEN_DAY)) { + // 徽章领取弹窗每隔7天弹出一次，所以本次弹出后就记录7天后的时间戳 + setLong( + SP_BADGE_RECORD_SEVEN_DAY, + getStartTimeOfDay(System.currentTimeMillis() + 86400000 * 6) + ) + DialogUtils.showReceiveBadgeDialog( + requireContext(), badge,object :ConfirmListener{ + override fun onConfirm() { + mPersonalViewModel.applyOrReceiveBadge(badge.id, { + if ("self" == badge.receive?.type) { + showToast("领取成功") + } else { + showToast("申请成功") + } + // 跳转到徽章详情 + directToBadgeDetail( + requireContext(), + mUserInfoEntity?.userId, + badge.id + ) + }, { + if ("self" == badge.receive?.type) { + showToast("领取失败") + } else { + showToast("申请失败") + } + }) + } } - } - }) + ) + } + } mPersonalViewModel.haloAddData.observe( - this, - { datas: ArrayList -> - if (datas.isNotEmpty()) { - mPersonalFuncGroupAdapter.setListData(datas) - mPersonalViewModel.checkUpdate() - } - }) + this + ) { datas: ArrayList -> + if (datas.isNotEmpty()) { + mPersonalFuncGroupAdapter.setListData(datas) + mPersonalViewModel.checkUpdate() + } + } - mUnreadViewModel.liveData.observe(this, { messageUnread: MessageUnreadEntity? -> + mUnreadViewModel.liveData.observe(this) { messageUnread: MessageUnreadEntity? -> if (messageUnread != null && messageUnread.total > 0) { mStubBinding.personalNewFansTips.visibility = if (messageUnread.fans > 0) View.VISIBLE else View.GONE @@ -404,7 +417,7 @@ class PersonalFragment : BaseLazyFragment() { EventBus.getDefault() .post(EBReuse(MESSAGE_READ_OVER)) } - }) + } mUnreadViewModel.zixunConcernLiveData.observe(this, { hasConcern: Boolean -> notifyItemChange( @@ -449,8 +462,13 @@ class PersonalFragment : BaseLazyFragment() { "签到成功，获得经验：1", getString(R.string.sign_dialog_content, signEntity.serialSign), getString(R.string.sign_dialog_content2, signEntity.experience), - getSignSkipText(signEntity.title) - ) { mPersonalViewModel.signSkip(signEntity) } + getSignSkipText(signEntity.title), + object :ConfirmListener{ + override fun onConfirm() { + mPersonalViewModel.signSkip(signEntity) + } + } + ) signEntity.lastTime = System.currentTimeMillis() / 1000 } else { DialogUtils.showSignDialog( @@ -458,8 +476,11 @@ class PersonalFragment : BaseLazyFragment() { "今天已签到，明天再来吧~", getString(R.string.sign_dialog_content, signEntity.serialSign), getString(R.string.sign_dialog_content2, signEntity.experience), - getSignSkipText(signEntity.title) - ) { mPersonalViewModel.signSkip(signEntity) } + getSignSkipText(signEntity.title), object : ConfirmListener { + override fun onConfirm() { + mPersonalViewModel.signSkip(signEntity) + } + }) } signEntity.id = UserManager.getInstance().userId if (mDatabase.signDao().updateSignEntity(signEntity) <= 0) { @@ -696,15 +717,15 @@ class PersonalFragment : BaseLazyFragment() { .setOnClickListener { val bundle = Bundle() bundle.putString( - EntranceUtils.KEY_ANSWER_ID, + EntranceConsts.KEY_ANSWER_ID, messageUnread.meta?.answerId ) bundle.putString( - EntranceUtils.KEY_ENTRANCE, - EntranceUtils.ENTRANCE_UMENG + EntranceConsts.KEY_ENTRANCE, + EntranceConsts.ENTRANCE_UMENG ) bundle.putString( - EntranceUtils.KEY_TO, + EntranceConsts.KEY_TO, SimpleAnswerDetailActivity::class.java.name ) EntranceUtils.jumpActivity(activity, bundle) @@ -767,7 +788,8 @@ class PersonalFragment : BaseLazyFragment() { } } - private fun getItemDecoration() = VerticalItemDecoration(requireContext(), 8F, false).apply { mItemDecoration = this } + private fun getItemDecoration() = VerticalItemDecoration(requireContext(), 8F, false) + .apply { mItemDecoration = this } override fun onNightModeChange() { super.onNightModeChange() diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt index 926b1e43a0..7bb359ab78 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt @@ -10,9 +10,16 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.facebook.drawee.view.SimpleDraweeView -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* import com.gh.gamecenter.* +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.core.utils.EmptyCallback +import com.gh.gamecenter.common.utils.PermissionHelper +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.db.GameTrendsDao import com.gh.gamecenter.entity.FunctionalGroupEntity import com.gh.gamecenter.entity.FunctionalLinkEntity @@ -219,7 +226,9 @@ class PersonalFunctionAdapter(val context: Context, val groupName: String, var m } "设置" -> { if (!checkPrivacyIsSame()) { - SPUtils.setString(Constants.SP_PRIVACY_SETTING_MD5, SPUtils.getString(Constants.SP_PRIVACY_CURRENT_MD5)) + SPUtils.setString( + Constants.SP_PRIVACY_SETTING_MD5, SPUtils.getString( + Constants.SP_PRIVACY_CURRENT_MD5)) notifyDataSetChanged() } MtaHelper.onEvent("我的光环", "设置图标") diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionGroupAdapter.kt b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionGroupAdapter.kt index 1eda210f8d..a73a27ec9d 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionGroupAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionGroupAdapter.kt @@ -8,12 +8,12 @@ import android.widget.TextView import androidx.core.util.isEmpty import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.Constants -import com.gh.common.util.SPUtils -import com.gh.common.util.dip2px -import com.gh.common.util.toColor -import com.gh.common.util.toDrawable -import com.gh.common.view.GridSpacingItemColorDecoration +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.common.view.GridSpacingItemColorDecoration import com.gh.gamecenter.R import com.gh.gamecenter.entity.FunctionalGroupEntity import com.lightgame.adapter.BaseRecyclerAdapter @@ -55,7 +55,14 @@ class PersonalFunctionGroupAdapter(val context: Context) : BaseRecyclerAdapter if (link.type == "设置") { - SPUtils.setString(Constants.SP_PRIVACY_CURRENT_MD5, link.checkSum?.privacyPolicy + SPUtils.setString( + Constants.SP_PRIVACY_CURRENT_MD5, link.checkSum?.privacyPolicy ?: "") return@loop } diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt index e757f948a5..f1b2326f3b 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt @@ -4,11 +4,18 @@ import android.content.Context import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.core.utils.NumberUtils +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.ifLogin +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.databinding.FollowersOrFansItemBinding import com.gh.gamecenter.entity.FollowersOrFansEntity import com.gh.gamecenter.manager.UserManager @@ -105,10 +112,12 @@ class FollowersOrFansAdapter(context: Context, val mViewModel: FollowersOrFansVi } holder.binding.sdvUserBadge.setOnClickListener { v -> - DialogUtils.showViewBadgeDialog(mContext, entity.badge) { - onBadgeClickListener?.invoke(entity) - DirectUtils.directToBadgeWall(mContext, entity.id, entity.name, entity.icon) - } + DialogUtils.showViewBadgeDialog(mContext, entity.badge, object : ConfirmListener { + override fun onConfirm() { + onBadgeClickListener?.invoke(entity) + DirectUtils.directToBadgeWall(mContext, entity.id, entity.name, entity.icon) + } + }) } } else if (holder is FooterViewHolder) { holder.initFooterViewHolder(mViewModel, mIsLoading, mIsNetworkError, mIsOver) diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansFragment.kt index 80ff28d426..0cd01ac675 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansFragment.kt @@ -4,10 +4,10 @@ import android.os.Bundle import android.view.View import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders -import com.gh.common.util.EntranceUtils -import com.gh.common.util.MtaHelper -import com.gh.common.util.dip2px -import com.gh.common.view.SpacingItemDecoration +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.view.SpacingItemDecoration import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.entity.FollowersOrFansEntity import com.gh.gamecenter.manager.UserManager @@ -34,7 +34,7 @@ class FollowersOrFansFragment : ListFragment { - return Pair(targetFragment.arguments?.getString(EntranceUtils.KEY_USER_ID) ?: "", "") + return Pair(targetFragment.arguments?.getString(EntranceConsts.KEY_USER_ID) ?: "", "") } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt index 8e35af1259..a6b08d8330 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt @@ -15,18 +15,24 @@ import androidx.constraintlayout.widget.ConstraintSet import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.lifecycle.Observer -import com.gh.base.adapter.FragmentAdapter -import com.gh.base.fragment.BaseFragment_TabLayout -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.base.adapter.FragmentAdapter +import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout +import com.gh.gamecenter.common.constant.Constants import com.gh.common.databind.BindingAdapters import com.gh.common.util.* import com.gh.common.util.DirectUtils.directToBadgeWall import com.gh.gamecenter.* +import com.gh.gamecenter.R +import com.gh.gamecenter.common.callback.BiCallback +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentHomeBinding import com.gh.gamecenter.entity.* import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.message.MessageUnreadViewModel -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.gh.gamecenter.personalhome.background.PersonalityBackgroundActivity import com.gh.gamecenter.personalhome.border.AvatarBorderActivity import com.gh.gamecenter.personalhome.fans.FansActivity @@ -63,8 +69,8 @@ class UserHomeFragment : NormalFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mPath = arguments?.getString(EntranceUtils.KEY_PATH) ?: "" - val userId = arguments?.getString(EntranceUtils.KEY_USER_ID) ?: "" + mPath = arguments?.getString(EntranceConsts.KEY_PATH) ?: "" + val userId = arguments?.getString(EntranceConsts.KEY_USER_ID) ?: "" mUserHomeViewModel = viewModelProvider(UserHomeViewModel.Factory(HaloApp.getInstance().application, userId)) @@ -126,17 +132,20 @@ class UserHomeFragment : NormalFragment() { mHomeBinding?.badgeIcon?.setOnClickListener { DialogUtils.showViewBadgeDialog( requireContext(), - Badge(badge.name, badge.icon, badge.actions) - ) { - if (::mPersonalEntity.isInitialized) { - directToBadgeWall( - requireContext(), - mPersonalEntity.id, - mPersonalEntity.name, - mPersonalEntity.icon - ) + Badge(badge.name, badge.icon, badge.actions), + object : ConfirmListener { + override fun onConfirm() { + if (::mPersonalEntity.isInitialized) { + directToBadgeWall( + requireContext(), + mPersonalEntity.id, + mPersonalEntity.name, + mPersonalEntity.icon + ) + } + } } - } + ) } return@outside } @@ -249,7 +258,7 @@ class UserHomeFragment : NormalFragment() { } userCountContainer.post { - if(!isAdded) return@post + if (!isAdded) return@post val newHeight = userCountContainer.bottom + (12F + 16F).dip2px() userBackgroundContainer.layoutParams = userBackgroundContainer.layoutParams.apply { @@ -325,8 +334,8 @@ class UserHomeFragment : NormalFragment() { } private fun updateTab(personalData: PersonalEntity) { - val keyPosition = arguments?.getInt(EntranceUtils.KEY_POSITION, -1) ?: -1 - val type = UserHistoryViewModel.TYPE.fromValue(arguments?.getString(EntranceUtils.KEY_TYPE)) + val keyPosition = arguments?.getInt(EntranceConsts.KEY_POSITION, -1) ?: -1 + val type = UserHistoryViewModel.TYPE.fromValue(arguments?.getString(EntranceConsts.KEY_TYPE)) val count = personalData.count val position = if (keyPosition > -1) { keyPosition @@ -357,7 +366,8 @@ class UserHomeFragment : NormalFragment() { val titleList = listOf("游戏", "发布") mHomeBinding?.viewpager?.offscreenPageLimit = mFragmentList.size - mHomeBinding?.viewpager?.adapter = FragmentAdapter(childFragmentManager, mFragmentList, titleList) + mHomeBinding?.viewpager?.adapter = + FragmentAdapter(childFragmentManager, mFragmentList, titleList) mHomeBinding?.viewpager?.currentItem = position mHomeBinding?.viewpager?.doOnPageSelected { MtaHelper.onEvent("个人主页详情", "个人主页详情", titleList[it]) diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeViewModel.kt b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeViewModel.kt index 9a95d2fe2b..12e1477215 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeViewModel.kt @@ -9,8 +9,8 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.common.util.EnergyTaskHelper import com.gh.common.util.ErrorHelper -import com.gh.common.util.ToastUtils -import com.gh.common.util.createRequestBody +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.common.utils.createRequestBody import com.gh.gamecenter.R import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.EBUserFollow @@ -24,7 +24,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers import okhttp3.ResponseBody import org.greenrobot.eventbus.EventBus -import org.json.JSONObject import retrofit2.HttpException class UserHomeViewModel(application: Application, var userId: String) : AndroidViewModel(application) { diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/ViewHolder.kt b/app/src/main/java/com/gh/gamecenter/personalhome/ViewHolder.kt index c6b535f97d..7b882464ef 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/ViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/ViewHolder.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.personalhome -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.databinding.FollowersOrFansItemBinding class FollowersOrFansViewHolder(val binding: FollowersOrFansItemBinding) : BaseRecyclerViewHolder(binding.root) \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundClipActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundClipActivity.kt index ced4ec51b9..7eaacec3fd 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundClipActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundClipActivity.kt @@ -7,13 +7,13 @@ import android.graphics.Bitmap import android.os.Bundle import android.widget.ImageView import com.gh.base.BaseActivity -import com.gh.base.fragment.WaitingDialogFragment -import com.gh.common.runOnIoThread -import com.gh.common.util.BitmapUtils -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment +import com.gh.gamecenter.common.utils.BitmapUtils +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.CropImageActivity import com.gh.gamecenter.R +import com.gh.gamecenter.core.runOnIoThread import com.gh.gamecenter.databinding.ActivityBackgroundClipBinding import java.io.File import java.lang.ref.SoftReference @@ -57,7 +57,7 @@ class BackgroundClipActivity : BaseActivity() { super.onWindowFocusChanged(hasFocus) if (hasFocus && (reference == null || reference?.get() == null)) { val imageView: ImageView = mBinding.cropImageIv.cropImageZoomView - val bitmap = BitmapUtils.getBitmapByFile(intent.getStringExtra(EntranceUtils.KEY_PATH), + val bitmap = BitmapUtils.getBitmapByFile(intent.getStringExtra(EntranceConsts.KEY_PATH), imageView.width, imageView.height) if (bitmap != null) { reference = SoftReference(bitmap) @@ -77,8 +77,8 @@ class BackgroundClipActivity : BaseActivity() { companion object { fun getIntent(context: Context, picturePath: String, entrance: String = ""): Intent? { val intent = Intent(context, BackgroundClipActivity::class.java) - intent.putExtra(EntranceUtils.KEY_PATH, picturePath) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance) + intent.putExtra(EntranceConsts.KEY_PATH, picturePath) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundPreviewActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundPreviewActivity.kt index ab1f03e1dc..84eef0e0f2 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundPreviewActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundPreviewActivity.kt @@ -4,12 +4,9 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.AppExecutor -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.R -import com.gh.gamecenter.amway.AmwayFragment import com.gh.gamecenter.entity.BackgroundImageEntity class BackgroundPreviewActivity : BaseActivity() { @@ -31,7 +28,7 @@ class BackgroundPreviewActivity : BaseActivity() { companion object { fun getIntent(context: Context, localPath: String, entity: BackgroundImageEntity?): Intent { val intent = Intent(context, BackgroundPreviewActivity::class.java) - intent.putExtra(EntranceUtils.KEY_LOCAL_PATH, localPath) + intent.putExtra(EntranceConsts.KEY_LOCAL_PATH, localPath) if (entity != null) { intent.putExtra(BackgroundImageEntity::class.java.simpleName, entity) } diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundPreviewFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundPreviewFragment.kt index d385043922..270ac55010 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundPreviewFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundPreviewFragment.kt @@ -11,15 +11,18 @@ import android.view.View import androidx.annotation.RequiresApi import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat -import com.gh.base.fragment.WaitingDialogFragment +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.common.util.* import com.gh.gamecenter.CropImageActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentBackgroundPreviewBinding import com.gh.gamecenter.entity.BackgroundImageEntity import com.gh.gamecenter.entity.ErrorEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.gh.gamecenter.user.UserViewModel import com.halo.assistant.HaloApp import com.zhihu.matisse.Matisse @@ -53,7 +56,7 @@ class BackgroundPreviewFragment : NormalFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mLocalPath = arguments?.getString(EntranceUtils.KEY_LOCAL_PATH) ?: "" + mLocalPath = arguments?.getString(EntranceConsts.KEY_LOCAL_PATH) ?: "" backgroundImageEntity = arguments?.getParcelable(BackgroundImageEntity::class.java.simpleName) @@ -106,7 +109,7 @@ class BackgroundPreviewFragment : NormalFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - mLocalPath = arguments?.getString(EntranceUtils.KEY_LOCAL_PATH) ?: "" + mLocalPath = arguments?.getString(EntranceConsts.KEY_LOCAL_PATH) ?: "" backgroundImageEntity = arguments?.getParcelable(BackgroundImageEntity::class.java.simpleName) mOriginBitmap = BitmapUtils.getBitmapByFile(mLocalPath, Bitmap.Config.ARGB_8888) diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundAdapter.kt index 59eef008de..55884688dc 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundAdapter.kt @@ -3,9 +3,9 @@ package com.gh.gamecenter.personalhome.background import android.content.Context import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.ImageUtils -import com.gh.common.util.visibleIf +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.utils.visibleIf import com.gh.gamecenter.R import com.gh.gamecenter.databinding.AvatarBackgroundItemBinding import com.gh.gamecenter.entity.BackgroundImageEntity diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundFragment.kt index 9162f89123..c0b21b4e2c 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundFragment.kt @@ -8,16 +8,16 @@ import android.os.Bundle import android.view.View import androidx.lifecycle.Observer import androidx.recyclerview.widget.GridLayoutManager -import com.gh.base.fragment.WaitingDialogFragment -import com.gh.common.util.EmptyCallback +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment +import com.gh.gamecenter.core.utils.EmptyCallback import com.gh.common.util.GhMatisseFilter -import com.gh.common.util.PermissionHelper -import com.gh.common.util.viewModelProvider -import com.gh.common.view.GridSpacingItemColorDecoration +import com.gh.gamecenter.common.utils.PermissionHelper +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.common.view.GridSpacingItemColorDecoration import com.gh.gamecenter.CropImageActivity import com.gh.gamecenter.R import com.gh.gamecenter.databinding.PersonalityBackgroundFragmentBinding -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.gh.gamecenter.user.UserViewModel import com.halo.assistant.HaloApp import com.zhihu.matisse.Matisse 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 459f08fdde..8c2349b6bc 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 @@ -4,25 +4,15 @@ import android.annotation.SuppressLint import android.app.Application import android.content.Context import android.graphics.Bitmap -import android.graphics.BitmapFactory -import android.net.Uri import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData -import com.facebook.binaryresource.BinaryResource -import com.facebook.binaryresource.FileBinaryResource -import com.facebook.cache.common.CacheKey -import com.facebook.imagepipeline.cache.DefaultCacheKeyFactory -import com.facebook.imagepipeline.core.ImagePipelineFactory -import com.facebook.imagepipeline.request.ImageRequest -import com.facebook.imagepipeline.request.ImageRequestBuilder -import com.gh.common.util.BiCallback -import com.gh.common.util.BitmapUtils -import com.gh.common.util.ImageUtils +import com.gh.gamecenter.common.callback.BiCallback +import com.gh.gamecenter.common.utils.BitmapUtils +import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.entity.BackgroundImageEntity import com.gh.gamecenter.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager -import com.squareup.picasso.Picasso import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderActivity.kt index 261a46cad5..c5c738143d 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderActivity.kt @@ -4,8 +4,8 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.R class AvatarBorderActivity : BaseActivity() { @@ -29,7 +29,7 @@ class AvatarBorderActivity : BaseActivity() { fun getIntent(context: Context, categoryId: String? = null): Intent { return Intent(context, AvatarBorderActivity::class.java).apply { categoryId?.let { - putExtra(EntranceUtils.KEY_CATEGORY_ID, it) + putExtra(EntranceConsts.KEY_CATEGORY_ID, it) } } } diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderFragment.kt index 9cbba19c09..3db30f3521 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderFragment.kt @@ -14,17 +14,20 @@ import androidx.core.view.ViewCompat import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentStatePagerAdapter import androidx.lifecycle.Observer -import com.gh.base.fragment.WaitingDialogFragment -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* import com.gh.gamecenter.ImageViewerActivity import com.gh.gamecenter.R import com.gh.gamecenter.SelectUserIconActivity +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentAvatarBorderBinding import com.gh.gamecenter.entity.AvatarBorderCategoryEntity import com.gh.gamecenter.entity.AvatarBorderEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.gh.gamecenter.user.UserViewModel import com.google.android.material.tabs.TabLayout import com.halo.assistant.HaloApp @@ -55,7 +58,7 @@ class AvatarBorderFragment : NormalFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mInitCategoryId = arguments?.getString(EntranceUtils.KEY_CATEGORY_ID) ?: "" + mInitCategoryId = arguments?.getString(EntranceConsts.KEY_CATEGORY_ID) ?: "" mAvatarBorderViewModel = viewModelProvider() mUserViewModel = viewModelProvider(UserViewModel.Factory(HaloApp.getInstance().application)) mUserViewModel?.loginObsUserinfo?.observeNonNull(this) { @@ -203,8 +206,8 @@ class AvatarBorderFragment : NormalFragment() { mTitleList.add(entity.name) val chooseAvatarBorderFragment = childFragmentManager.findFragmentByTag("$tag$index") ?: ChooseAvatarBorderFragment().with(bundleOf( - EntranceUtils.KEY_CATEGORY_ID to entity.id, - EntranceUtils.KEY_IS_FREE to entity.isFree)) + EntranceConsts.KEY_CATEGORY_ID to entity.id, + EntranceConsts.KEY_IS_FREE to entity.isFree)) mFragments.add(chooseAvatarBorderFragment) } 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 522f358844..c1ff556289 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 @@ -4,12 +4,7 @@ import android.annotation.SuppressLint import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.ViewModel -import androidx.lifecycle.ViewModelProvider -import com.gh.common.util.UrlFilterUtils import com.gh.gamecenter.entity.AvatarBorderCategoryEntity -import com.gh.gamecenter.entity.AvatarBorderEntity -import com.gh.gamecenter.personalhome.UserHomeViewModel import com.gh.gamecenter.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderAdapter.kt index d55858a2d0..60a428b0b5 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderAdapter.kt @@ -4,11 +4,13 @@ import android.content.Context import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.time.TimeUtil import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.AvatarItemBinding import com.gh.gamecenter.energy.EnergyHouseActivity import com.gh.gamecenter.entity.AvatarBorderEntity diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderFragment.kt index 8be8f89db3..6fc208cb2b 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderFragment.kt @@ -6,13 +6,13 @@ import android.view.View import android.widget.RelativeLayout import androidx.lifecycle.Observer import androidx.recyclerview.widget.GridLayoutManager -import com.gh.common.util.EntranceUtils -import com.gh.common.util.dip2px -import com.gh.common.util.viewModelProvider -import com.gh.common.view.GridSpacingItemColorDecoration +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.common.view.GridSpacingItemColorDecoration import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentAvatarListBinding -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.halo.assistant.HaloApp class ChooseAvatarBorderFragment : NormalFragment() { @@ -28,8 +28,8 @@ class ChooseAvatarBorderFragment : NormalFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) mBinding = FragmentAvatarListBinding.bind(mCachedView) - mCategoryId = arguments?.getString(EntranceUtils.KEY_CATEGORY_ID) ?: "" - mIsFree = arguments?.getBoolean(EntranceUtils.KEY_IS_FREE) ?: true + mCategoryId = arguments?.getString(EntranceConsts.KEY_CATEGORY_ID) ?: "" + mIsFree = arguments?.getBoolean(EntranceConsts.KEY_IS_FREE) ?: true mViewModel = viewModelProvider(ChooseAvatarBorderViewModel.Factory(HaloApp.getInstance().application, mCategoryId)) mViewModel?.pendantsLiveData?.observe(this, Observer { mBinding.reuseLoading.root.visibility = View.GONE @@ -68,7 +68,14 @@ class ChooseAvatarBorderFragment : NormalFragment() { val avatarPendantFragment = parentFragment as? AvatarBorderFragment avatarPendantFragment?.choosePendant(entity, isSelected) } - addItemDecoration(GridSpacingItemColorDecoration(requireContext(), 8, 8, R.color.transparent)) + addItemDecoration( + GridSpacingItemColorDecoration( + requireContext(), + 8, + 8, + R.color.transparent + ) + ) adapter = mAdapter } 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 50b1c1a505..335b3a0ee8 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 @@ -6,7 +6,7 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.gh.common.util.UrlFilterUtils +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.entity.AvatarBorderEntity import com.gh.gamecenter.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt index 1aa3c07ed1..39aa663c54 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.personalhome.FollowersOrFansFragment @@ -13,8 +13,8 @@ class FansActivity : NormalActivity() { companion object { fun getIntent(context: Context, userId: String, entrance: String, path: String): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_USER_ID, userId) - bundle.putString(EntranceUtils.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) + bundle.putString(EntranceConsts.KEY_USER_ID, userId) + bundle.putString(EntranceConsts.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) bundle.putString(FollowersOrFansFragment.PAGE_SOURCE, FansActivity::class.java.name) return getTargetIntent(context, FansActivity::class.java, FollowersOrFansFragment::class.java, bundle) } diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt index 2af38e0a35..315f555f49 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.personalhome.FollowersOrFansFragment @@ -13,8 +13,8 @@ class FollowersActivity : NormalActivity() { companion object { fun getIntent(context: Context, userId: String, entrance: String, path: String): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_USER_ID, userId) - bundle.putString(EntranceUtils.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) + bundle.putString(EntranceConsts.KEY_USER_ID, userId) + bundle.putString(EntranceConsts.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) bundle.putString(FollowersOrFansFragment.PAGE_SOURCE, FollowersActivity::class.java.name) return getTargetIntent(context, FollowersActivity::class.java, FollowersOrFansFragment::class.java, bundle) } diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryAdapter.kt index a46007fd88..cf44e3805b 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryAdapter.kt @@ -7,13 +7,16 @@ import android.util.SparseBooleanArray import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.PersonalHomeRatingViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.PersonalHomeRatingBinding import com.gh.gamecenter.databinding.UserHistoryItemBinding import com.gh.gamecenter.entity.ForumVideoEntity @@ -133,9 +136,11 @@ class UserHistoryAdapter( historyEntity.user?.run { userBadgeName.setOnClickListener { userBadgeIcon.performClick() } userBadgeIcon.setOnClickListener { - DialogUtils.showViewBadgeDialog(mContext, badge) { - DirectUtils.directToBadgeWall(mContext, id, name, icon) - } + DialogUtils.showViewBadgeDialog(mContext, badge, object : ConfirmListener { + override fun onConfirm() { + DirectUtils.directToBadgeWall(mContext, id, name, icon) + } + }) } } diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt index 1e461da208..cca6e2e2b7 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt @@ -7,11 +7,13 @@ import android.view.View import android.widget.TextView import androidx.core.os.bundleOf import androidx.recyclerview.widget.RecyclerView -import com.gh.common.AppExecutor +import com.gh.gamecenter.core.AppExecutor import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.ListFragment +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.MD5Utils import com.gh.gamecenter.databinding.FragmentUserPublishBinding import com.gh.gamecenter.entity.ForumVideoEntity import com.gh.gamecenter.entity.PersonalEntity 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 1c075f3534..251e6f383f 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 @@ -5,8 +5,8 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.common.util.EnergyTaskHelper import com.gh.common.util.ErrorHelper -import com.gh.common.util.UrlFilterUtils -import com.gh.common.util.toObject +import com.gh.gamecenter.core.utils.UrlFilterUtils +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.entity.ErrorEntity diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryAdapter.kt index 7d4caa20ed..0fb648bd31 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryAdapter.kt @@ -5,7 +5,7 @@ import android.view.View import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.DirectUtils import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryFragment.kt index 76c2391e92..4e4c813b6b 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserVideoHistoryFragment.kt @@ -6,10 +6,10 @@ //import androidx.core.os.bundleOf //import androidx.recyclerview.widget.GridLayoutManager //import androidx.recyclerview.widget.RecyclerView -//import com.gh.common.util.dip2px -//import com.gh.common.util.viewModelProvider -//import com.gh.common.view.FixGridLayoutManager -//import com.gh.common.view.GridSpacingItemDecoration +//import com.gh.gamecenter.common.utils.dip2px +//import com.gh.gamecenter.common.utils.viewModelProvider +//import com.gh.gamecenter.common.view.FixGridLayoutManager +//import com.gh.gamecenter.common.view.GridSpacingItemDecoration //import com.gh.gamecenter.R //import com.gh.gamecenter.baselist.ListAdapter //import com.gh.gamecenter.baselist.ListFragment diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserCommentHistoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserCommentHistoryAdapter.kt index 37f9597335..e4e5083ef7 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserCommentHistoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserCommentHistoryAdapter.kt @@ -7,12 +7,14 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ItemUserCommentHistoryBinding import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity import com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserCommentHistoryFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserCommentHistoryFragment.kt index 37be60b22f..2fb2327de1 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserCommentHistoryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserCommentHistoryFragment.kt @@ -6,10 +6,11 @@ import android.os.Bundle import android.view.View import androidx.core.content.ContextCompat import androidx.core.os.bundleOf -import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.ListFragment +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.entity.RatingComment import com.gh.gamecenter.personalhome.home.UserHistoryFragment import com.gh.gamecenter.personalhome.rating.MyRating 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 1de6a9d0ae..12f391e51b 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 @@ -6,6 +6,8 @@ import androidx.lifecycle.ViewModelProvider import com.gh.common.util.* import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadType +import com.gh.gamecenter.common.utils.toObject +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.entity.ErrorEntity import com.gh.gamecenter.personalhome.rating.MyRating import com.gh.gamecenter.retrofit.Response diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserGameFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserGameFragment.kt index d35f97f81f..f6341d1491 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserGameFragment.kt @@ -9,13 +9,16 @@ import android.widget.PopupWindow import android.widget.TextView import androidx.core.content.ContextCompat import androidx.core.os.bundleOf -import com.gh.common.util.* -import com.gh.common.util.EntranceUtils.* +import com.gh.gamecenter.common.constant.EntranceConsts.* import com.gh.gamecenter.R import com.gh.gamecenter.collection.GamesCollectionFragment +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.showAutoOrientation +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.databinding.FragmentUserGameBinding import com.gh.gamecenter.entity.PersonalEntity -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment class UserGameFragment: NormalFragment() { diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameAdapter.kt index 5dfbd44201..13bc953088 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameAdapter.kt @@ -7,13 +7,17 @@ import android.view.ViewGroup import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.GameViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.core.utils.NumberUtils +import com.gh.gamecenter.core.utils.StringUtils +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.databinding.GameItemBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.eventbus.EBDownloadStatus 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 a4ede9f8db..bb424fed2b 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 @@ -2,12 +2,12 @@ package com.gh.gamecenter.personalhome.home.game import android.os.Bundle import android.view.View -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.DialogUtils -import com.gh.common.util.EntranceUtils.KEY_USER_ID -import com.gh.common.util.SPUtils -import com.gh.common.util.toColor -import com.gh.common.util.viewModelProvider +import com.gh.gamecenter.common.constant.EntranceConsts.KEY_USER_ID +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus import com.gh.download.DownloadManager 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 8e49b0d915..b703bac441 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 @@ -5,7 +5,7 @@ import android.content.Intent import android.os.Bundle import androidx.lifecycle.ViewModelProviders import com.gh.base.BaseActivity -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.baselist.ListActivity import com.gh.gamecenter.baselist.NormalListViewModel import com.gh.gamecenter.manager.UserManager @@ -19,7 +19,7 @@ class RatingActivity : ListActivity>() { private var mUserId: String? = null override fun onCreate(savedInstanceState: Bundle?) { - mUserId = intent.getStringExtra(EntranceUtils.KEY_USER_ID) + mUserId = intent.getStringExtra(EntranceConsts.KEY_USER_ID) super.onCreate(savedInstanceState) if (mUserId == UserManager.getInstance().userId) { setNavigationTitle("我的评分") @@ -45,8 +45,8 @@ class RatingActivity : ListActivity>() { companion object { fun getIntent(context: Context, userId: String, entrance: String, path: String): Intent { val intent = Intent(context, RatingActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) - intent.putExtra(EntranceUtils.KEY_USER_ID, userId) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_USER_ID, userId) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/rating/RatingAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/rating/RatingAdapter.kt index 6dd26c2b27..ddeda00f62 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/rating/RatingAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/rating/RatingAdapter.kt @@ -4,11 +4,11 @@ import android.content.Context import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.NewsUtils -import com.gh.common.util.NumberUtils -import com.gh.common.util.fromHtml -import com.gh.common.util.setTextWithHighlightedTextWrappedInsideWrapper +import com.gh.gamecenter.core.utils.NumberUtils +import com.gh.gamecenter.common.utils.fromHtml +import com.gh.gamecenter.common.utils.setTextWithHighlightedTextWrappedInsideWrapper import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder diff --git a/app/src/main/java/com/gh/gamecenter/qa/CommunityFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/CommunityFragment.kt index 312b8c2f6f..8d281598c3 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/CommunityFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/CommunityFragment.kt @@ -20,8 +20,8 @@ //import androidx.lifecycle.ViewModelProviders //import androidx.viewpager.widget.PagerAdapter //import butterknife.OnClick -//import com.gh.base.fragment.BaseLazyTabFragment -//import com.gh.common.dialog.TrackableDialog +//import com.gh.gamecenter.common.base.fragment.BaseLazyTabFragment +//import com.gh.gamecenter.common.base.TrackableDialog //import com.gh.common.util.* //import com.gh.common.view.GameIconView //import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/qa/all/AskAllFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/all/AskAllFragment.kt index 7c5e3b60bd..4d5049a723 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/all/AskAllFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/all/AskAllFragment.kt @@ -5,10 +5,10 @@ //import android.view.View //import androidx.fragment.app.Fragment //import androidx.viewpager.widget.ViewPager -//import com.gh.base.adapter.FragmentAdapter -//import com.gh.base.fragment.BaseFragment -//import com.gh.common.util.MtaHelper -//import com.gh.common.view.DrawableView +//import com.gh.gamecenter.common.base.adapter.FragmentAdapter +//import com.gh.gamecenter.common.base.fragment.BaseFragment +//import com.gh.gamecenter.core.utils.MtaHelper +//import com.gh.gamecenter.common.view.DrawableView //import com.gh.gamecenter.R //import com.gh.gamecenter.databinding.FragmentAskAllBinding //import com.gh.gamecenter.manager.UserManager 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 015f817a37..31216cd3c5 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 @@ -4,10 +4,15 @@ import android.annotation.SuppressLint import android.view.View import android.widget.TextView import com.airbnb.lottie.LottieAnimationView -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.util.* import com.gh.common.view.GameIconView import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.debounceActionWithInterval +import com.gh.gamecenter.common.utils.doOnAnimationEnd +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.VoteEntity import com.gh.gamecenter.forum.detail.ForumDetailActivity diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/CommunityAnswerItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/CommunityAnswerItemViewHolder.kt index b81515875c..0aa81d98f8 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/CommunityAnswerItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/CommunityAnswerItemViewHolder.kt @@ -11,6 +11,14 @@ import androidx.core.content.ContextCompat import com.gh.common.util.* import com.gh.gamecenter.CollectionActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.core.utils.SpanBuilder +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.CommunityAnswerItemBinding import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.entity.AnswerEntity @@ -75,7 +83,8 @@ class CommunityAnswerItemViewHolder(val binding: CommunityAnswerItemBinding) : B userBadgeIcon.goneIf(entity.user.badge == null) concernBtn.goneIf(entity.me.isFollower || entity.user.id == UserManager.getInstance().userId) followedUserTv.goneIf(!entity.me.isFollower) - time.text = (if (entity.me.isFollower) " · " else "") + NewsUtils.getFormattedTime(entity.time!!) + (if (entity.status == "pending" || entity.status == "fail") " · " else "") + time.text = + (if (entity.me.isFollower) " · " else "") + NewsUtils.getFormattedTime(entity.time!!) + (if (entity.status == "pending" || entity.status == "fail") " · " else "") statusTv.setText(if (entity.status == "pending") R.string.content_pending_status else R.string.fail_status) statusTv.setTextColor(if (entity.status == "pending") R.color.theme_green.toColor() else R.color.theme_red.toColor()) statusTv.goneIf(!(entity.status == "pending" || entity.status == "fail")) @@ -110,29 +119,31 @@ class CommunityAnswerItemViewHolder(val binding: CommunityAnswerItemBinding) : B val user = entity.user binding.userBadgeName.setOnClickListener { binding.userBadgeIcon.performClick() } binding.userBadgeIcon.setOnClickListener { - DialogUtils.showViewBadgeDialog(binding.root.context, user.badge) { - var key = "" - if (path == "标签专栏-热门") { - key = "问题标签详情-热门" - } else if (path == "标签专栏-精华") { - key = "问题标签详情-精华" - } else if (path == "专栏-热门") { - key = "问答-专栏详情-热门" - } else if (path == "专栏-精华") { - key = "问答-专栏详情-精华" - } else if (path == "游戏详情-动态") { - key = "游戏详情-热门回答" - } else if (path == "问答-推荐-按精选" || path == "问答-推荐-按时间") { - key = "问答-推荐" - } else if (path == "问题详情" || path == "折叠答案") { - key = path - } else { - key = path // 默认就使用path字段吧，总比为空的好 + DialogUtils.showViewBadgeDialog(binding.root.context, user.badge, object : ConfirmListener { + override fun onConfirm() { + var key = "" + if (path == "标签专栏-热门") { + key = "问题标签详情-热门" + } else if (path == "标签专栏-精华") { + key = "问题标签详情-精华" + } else if (path == "专栏-热门") { + key = "问答-专栏详情-热门" + } else if (path == "专栏-精华") { + key = "问答-专栏详情-精华" + } else if (path == "游戏详情-动态") { + key = "游戏详情-热门回答" + } else if (path == "问答-推荐-按精选" || path == "问答-推荐-按时间") { + key = "问答-推荐" + } else if (path == "问题详情" || path == "折叠答案") { + key = path + } else { + key = path // 默认就使用path字段吧，总比为空的好 + } + MtaHelper.onEvent("进入徽章墙_用户记录", key, user.name + "（" + user.id + "）") + MtaHelper.onEvent("徽章中心", "进入徽章中心", key) + DirectUtils.directToBadgeWall(binding.root.context, user.id, user.name, user.icon) } - MtaHelper.onEvent("进入徽章墙_用户记录", key, user.name + "（" + user.id + "）") - MtaHelper.onEvent("徽章中心", "进入徽章中心", key) - DirectUtils.directToBadgeWall(binding.root.context, user.id, user.name, user.icon) - } + }) } val userClick = View.OnClickListener { DirectUtils.directToHomeActivity(binding.root.context, entity.user.id, entrance, path) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailActivity.java b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailActivity.java index fa20a46393..2eabe75e06 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailActivity.java @@ -4,14 +4,14 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.NormalActivity; import com.gh.gamecenter.entity.SpecialColumn; import com.halo.assistant.HaloApp; import androidx.annotation.NonNull; -import static com.gh.common.constant.Constants.GAME_DETAIL_COME_IN; +import static com.gh.gamecenter.common.constant.Constants.GAME_DETAIL_COME_IN; /** * Created by khy on 10/04/18. @@ -46,21 +46,21 @@ public class AnswerDetailActivity extends NormalActivity { @NonNull public static Intent getIntent(Context context, String answerId, String entrance, String path, boolean isOpenCommentManager, SpecialColumn specialColumn) { Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ANSWER_ID, answerId); - bundle.putString(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)); - bundle.putBoolean(EntranceUtils.KEY_SHOW_ANSWER_COMMENT, isOpenCommentManager); - bundle.putString(EntranceUtils.KEY_PATH, path); - bundle.putParcelable(EntranceUtils.KEY_DATA, specialColumn); + bundle.putString(EntranceConsts.KEY_ANSWER_ID, answerId); + bundle.putString(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)); + bundle.putBoolean(EntranceConsts.KEY_SHOW_ANSWER_COMMENT, isOpenCommentManager); + bundle.putString(EntranceConsts.KEY_PATH, path); + bundle.putParcelable(EntranceConsts.KEY_DATA, specialColumn); return getTargetIntent(context, AnswerDetailActivity.class, AnswerDetailContainerFragment.class, bundle); } @NonNull public static Intent getRecommendsIntent(Context context, String answerId, String entrance, String path) { Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ANSWER_ID, answerId); - bundle.putString(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)); - bundle.putBoolean(EntranceUtils.KEY_RECOMMENDS_CONTENTS, true); - bundle.putString(EntranceUtils.KEY_PATH, path); + bundle.putString(EntranceConsts.KEY_ANSWER_ID, answerId); + bundle.putString(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)); + bundle.putBoolean(EntranceConsts.KEY_RECOMMENDS_CONTENTS, true); + bundle.putString(EntranceConsts.KEY_PATH, path); return getTargetIntent(context, AnswerDetailActivity.class, AnswerDetailContainerFragment.class, bundle); } diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailContainerFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailContainerFragment.kt index 11166eb0db..0162dd7e60 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailContainerFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailContainerFragment.kt @@ -4,12 +4,12 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.MenuItem import android.view.View -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.common.util.SyncDataBetweenPageHelper -import com.gh.common.util.observeNonNull -import com.gh.common.util.viewModelProviderFromParent +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.viewModelProviderFromParent import com.gh.gamecenter.databinding.FragmentAnswerDetailContainerBinding -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment class AnswerDetailContainerFragment : NormalFragment() { @@ -45,7 +45,7 @@ class AnswerDetailContainerFragment : NormalFragment() { mContainerViewModel = viewModelProviderFromParent() - val answerId = arguments?.getString(EntranceUtils.KEY_ANSWER_ID) ?: "" + val answerId = arguments?.getString(EntranceConsts.KEY_ANSWER_ID) ?: "" if (!mContainerViewModel.answerIdList.contains(answerId)) { mContainerViewModel.answerIdList.add(answerId) } @@ -55,13 +55,13 @@ class AnswerDetailContainerFragment : NormalFragment() { if (fragment == null) { fragment = AnswerDetailFragment().apply { if (mHasPassedOneTimeArgumentToChild) { - this@AnswerDetailContainerFragment.arguments?.putBoolean(EntranceUtils.KEY_SHOW_ANSWER_COMMENT, false) - this@AnswerDetailContainerFragment.arguments?.putBoolean(EntranceUtils.KEY_RECOMMENDS_CONTENTS, false) + this@AnswerDetailContainerFragment.arguments?.putBoolean(EntranceConsts.KEY_SHOW_ANSWER_COMMENT, false) + this@AnswerDetailContainerFragment.arguments?.putBoolean(EntranceConsts.KEY_RECOMMENDS_CONTENTS, false) } // 将外部的 argument 传给里面的 fragment this.arguments = this@AnswerDetailContainerFragment.arguments - this.arguments?.putString(EntranceUtils.KEY_ANSWER_ID, id) + this.arguments?.putString(EntranceConsts.KEY_ANSWER_ID, id) mHasPassedOneTimeArgumentToChild = true fragments.add(this) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt index fa67c9074a..965171b2ce 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt @@ -21,24 +21,28 @@ import com.ethanhua.skeleton.Skeleton import com.ethanhua.skeleton.SkeletonScreen import com.facebook.drawee.view.SimpleDraweeView import com.gh.base.ToolBarActivity -import com.gh.base.fragment.BaseFragment -import com.gh.common.AppExecutor -import com.gh.common.TimeElapsedHelper -import com.gh.common.constant.Constants.GAME_DETAIL_COME_IN +import com.gh.gamecenter.common.base.fragment.BaseFragment +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.core.utils.TimeElapsedHelper +import com.gh.gamecenter.common.constant.Constants.GAME_DETAIL_COME_IN import com.gh.common.history.HistoryHelper import com.gh.common.util.* -import com.gh.common.view.DrawableView +import com.gh.gamecenter.common.view.DrawableView import com.gh.common.view.RichEditor import com.gh.gamecenter.ImageViewerActivity import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentAnswerDetailBinding import com.gh.gamecenter.databinding.PieceQuestionContentBinding import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.EBReuse import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.gh.gamecenter.personal.PersonalFragment import com.gh.gamecenter.qa.answer.edit.AnswerEditActivity import com.gh.gamecenter.qa.comment.CommentActivity @@ -93,12 +97,12 @@ open class AnswerDetailFragment : NormalFragment() { onClickView() arguments?.let { - mAnswerId = it.getString(EntranceUtils.KEY_ANSWER_ID) ?: "" + mAnswerId = it.getString(EntranceConsts.KEY_ANSWER_ID) ?: "" - mIsShowCommentManager = it.getBoolean(EntranceUtils.KEY_SHOW_ANSWER_COMMENT, false) - mIsRecommendsAnswer = it.getBoolean(EntranceUtils.KEY_RECOMMENDS_CONTENTS, false) - mPath = it.getString(EntranceUtils.KEY_PATH) - mSpecialColumn = it.getParcelable(EntranceUtils.KEY_DATA) + mIsShowCommentManager = it.getBoolean(EntranceConsts.KEY_SHOW_ANSWER_COMMENT, false) + mIsRecommendsAnswer = it.getBoolean(EntranceConsts.KEY_RECOMMENDS_CONTENTS, false) + mPath = it.getString(EntranceConsts.KEY_PATH) + mSpecialColumn = it.getParcelable(EntranceConsts.KEY_DATA) mViewModel.getAnswerDetail(mAnswerId, mEntrance) } @@ -180,8 +184,8 @@ open class AnswerDetailFragment : NormalFragment() { (requestCode == ANSWER_PATCH_REQUEST || requestCode == ANSWER_POST_REQUEST) ) { if (mViewModel.answerDetail != null && requestCode == ANSWER_PATCH_REQUEST) { - if (mAnswerId == data.getStringExtra(EntranceUtils.KEY_ANSWER_ID)) { - mViewModel.answerDetail?.content = data.getStringExtra(EntranceUtils.KEY_ANSWER_CONTENT) ?: "" + if (mAnswerId == data.getStringExtra(EntranceConsts.KEY_ANSWER_ID)) { + mViewModel.answerDetail?.content = data.getStringExtra(EntranceConsts.KEY_ANSWER_CONTENT) ?: "" bindView(mViewModel.answerDetail) } } @@ -197,7 +201,7 @@ open class AnswerDetailFragment : NormalFragment() { ?: 0 ) - if (EntranceUtils.ENTRANCE_WELCOME == mEntrance) { + if (EntranceConsts.ENTRANCE_WELCOME == mEntrance) { LogUtils.uploadCommentFromWelcomeDialog() } } @@ -211,7 +215,7 @@ open class AnswerDetailFragment : NormalFragment() { } } else if (requestCode == MoreFunctionPanelDialog.REQUEST_CODE && resultCode == Activity.RESULT_OK) { mViewModel.answerDetail?.run { - getItemClickCallback(this).invoke(data.getParcelableExtra(EntranceUtils.KEY_DATA)) + getItemClickCallback(this).invoke(data.getParcelableExtra(EntranceConsts.KEY_DATA)) } } } @@ -274,7 +278,7 @@ open class AnswerDetailFragment : NormalFragment() { val activity = activity if (activity != null) { val data = Intent() - data.putExtra(EntranceUtils.KEY_ANSWER_ID, mAnswerId) + data.putExtra(EntranceConsts.KEY_ANSWER_ID, mAnswerId) activity.setResult(Activity.RESULT_OK, data) DialogHelper.showDialog( requireContext(), @@ -783,7 +787,7 @@ open class AnswerDetailFragment : NormalFragment() { if (mViewModel.answerDetail != null && !mViewModel.answerDetail!!.me.isAnswerVoted) { mViewModel.like(mAnswerId) - if (EntranceUtils.ENTRANCE_WELCOME == mEntrance) { + if (EntranceConsts.ENTRANCE_WELCOME == mEntrance) { LogUtils.uploadLikeFromWelcomeDialog() } @@ -1115,11 +1119,13 @@ open class AnswerDetailFragment : NormalFragment() { mBinding.tvBadgeName.visibility = View.GONE } mBinding.sdvUserBadge.setOnClickListener { - DialogUtils.showViewBadgeDialog(requireContext(), user.badge) { - MtaHelper.onEvent("进入徽章墙_用户记录", "回答详情", "${user.name}（${user.id}）") - MtaHelper.onEvent("徽章中心", "进入徽章中心", "回答详情") - DirectUtils.directToBadgeWall(requireContext(), user.id, user.name, user.icon) - } + DialogUtils.showViewBadgeDialog(requireContext(), user.badge, object : ConfirmListener { + override fun onConfirm() { + MtaHelper.onEvent("进入徽章墙_用户记录", "回答详情", "${user.name}（${user.id}）") + MtaHelper.onEvent("徽章中心", "进入徽章中心", "回答详情") + DirectUtils.directToBadgeWall(requireContext(), user.id, user.name, user.icon) + } + }) } mBinding.tvBadgeName.setOnClickListener { mBinding.sdvUserBadge.performClick() } } 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 410b9655b4..898641b858 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 @@ -6,11 +6,13 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.gh.common.history.HistoryHelper -import com.gh.common.syncpage.SyncDataEntity -import com.gh.common.syncpage.SyncFieldConstants -import com.gh.common.syncpage.SyncPageRepository +import com.gh.gamecenter.common.syncpage.SyncDataEntity +import com.gh.gamecenter.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.core.utils.StringUtils import com.gh.gamecenter.entity.SpecialColumn import com.gh.gamecenter.entity.VoteEntity import com.gh.gamecenter.eventbus.EBUserFollow diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt index 5c06d50528..fe112efb9a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity class SimpleAnswerDetailActivity : NormalActivity() { @@ -21,9 +21,9 @@ class SimpleAnswerDetailActivity : NormalActivity() { @JvmStatic fun getIntent(context: Context, answerId: String, entrance: String, path: String): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_ANSWER_ID, answerId) - bundle.putString(EntranceUtils.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) - bundle.putString(EntranceUtils.KEY_PATH, path) + bundle.putString(EntranceConsts.KEY_ANSWER_ID, answerId) + bundle.putString(EntranceConsts.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) + bundle.putString(EntranceConsts.KEY_PATH, path) return getTargetIntent(context, SimpleAnswerDetailActivity::class.java, SimpleAnswerDetailFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftActivity.kt index 530917188e..898b43d65b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.qa.answer.draft import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity class AnswerDraftActivity : NormalActivity() { @@ -11,7 +11,7 @@ class AnswerDraftActivity : NormalActivity() { companion object { fun getIntent(context: Context, answerId: String? = null): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_ANSWER_ID, answerId) + bundle.putString(EntranceConsts.KEY_ANSWER_ID, answerId) return getTargetIntent(context, AnswerDraftActivity::class.java, AnswerDraftFragment::class.java, bundle) } } 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 8b29a294e6..a2947a1608 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 @@ -9,11 +9,11 @@ import android.view.ViewGroup; import androidx.recyclerview.widget.RecyclerView; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.OnListClickListener; -import com.gh.common.constant.ItemViewType; -import com.gh.common.util.DialogHelper; -import com.gh.common.util.ImageUtils; -import com.gh.common.util.PermissionHelper; +import com.gh.gamecenter.common.callback.OnListClickListener; +import com.gh.gamecenter.common.constant.ItemViewType; +import com.gh.gamecenter.common.utils.DialogHelper; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.common.utils.PermissionHelper; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.baselist.ListAdapter; 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 7da118c6e4..eda0dc33e8 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 @@ -5,9 +5,9 @@ import android.os.Bundle; import androidx.annotation.Nullable; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.UrlFilterUtils; -import com.gh.common.view.CustomDividerItemDecoration; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.core.utils.UrlFilterUtils; +import com.gh.gamecenter.common.view.CustomDividerItemDecoration; import com.gh.gamecenter.R; import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListFragment; @@ -42,7 +42,7 @@ public class AnswerDraftFragment extends ListFragment(), Keyboa setToolbarMenu(R.menu.menu_answer_post) mMenuDraft = mToolbar.menu.findItem(R.id.menu_draft) mMenuPost = mToolbar.menu.findItem(R.id.menu_answer_post) - mCommunityName = intent?.getStringExtra(EntranceUtils.KEY_COMMUNITY_NAME) - mOpenAnswerInNewPage = intent?.getBooleanExtra(EntranceUtils.KEY_ANSWER_OPEN_IN_NEW_PAGE, false)!! + mCommunityName = intent?.getStringExtra(EntranceConsts.KEY_COMMUNITY_NAME) + mOpenAnswerInNewPage = intent?.getBooleanExtra(EntranceConsts.KEY_ANSWER_OPEN_IN_NEW_PAGE, false)!! mBinding = FragmentAnswerEditBinding.bind(mContentView) onClickView() addObserver() @@ -102,7 +106,7 @@ class AnswerEditActivity : BaseRichEditorActivity(), Keyboa mViewModel.cacheAnswerContent = mViewModel.answerContent mMenuDraft.isVisible = true - if (intent.getBooleanExtra(EntranceUtils.KEY_SHOW_EDIT_DRAFT, false)) { + if (intent.getBooleanExtra(EntranceConsts.KEY_SHOW_EDIT_DRAFT, false)) { mViewModel.getUserAnswerDrafts() } else { mRichEditor.setHtml(mViewModel.answerContent, false) @@ -121,9 +125,9 @@ class AnswerEditActivity : BaseRichEditorActivity(), Keyboa override fun provideViewModel(): AnswerEditViewModel { val factory = AnswerEditViewModel.Factory( HaloApp.getInstance().application, - intent?.getStringExtra(EntranceUtils.KEY_ANSWER_ID), - intent?.getStringExtra(EntranceUtils.KEY_ANSWER_CONTENT), - intent?.getStringExtra(EntranceUtils.KEY_DRAFT_ID), + intent?.getStringExtra(EntranceConsts.KEY_ANSWER_ID), + intent?.getStringExtra(EntranceConsts.KEY_ANSWER_CONTENT), + intent?.getStringExtra(EntranceConsts.KEY_DRAFT_ID), intent?.getParcelableExtra(Questions::class.java.simpleName) ?: Questions() ) mViewModel = ViewModelProviders.of(this, factory).get(AnswerEditViewModel::class.java) @@ -165,8 +169,8 @@ class AnswerEditActivity : BaseRichEditorActivity(), Keyboa } val data = Intent() - data.putExtra(EntranceUtils.KEY_ANSWER_CONTENT, getReplaceRealContent()) - data.putExtra(EntranceUtils.KEY_ANSWER_ID, answerId ?: mViewModel.answerId) + data.putExtra(EntranceConsts.KEY_ANSWER_CONTENT, getReplaceRealContent()) + data.putExtra(EntranceConsts.KEY_ANSWER_ID, answerId ?: mViewModel.answerId) setResult(Activity.RESULT_OK, data) if (mOpenAnswerInNewPage) { val intent = AnswerDetailActivity @@ -211,12 +215,15 @@ class AnswerEditActivity : BaseRichEditorActivity(), Keyboa mProcessingDialog = WaitingDialogFragment.newInstance(it.msg, false) mProcessingDialog?.show(supportFragmentManager, null) { if (mViewModel.uploadImageSubscription != null && !mViewModel.uploadImageSubscription!!.isDisposed) { - mUploadImageCancelDialog = DialogUtils.showAlertDialog(this, "提示", "图片正在上传中，确定取消吗？", "确定", "取消", { - mViewModel.uploadImageSubscription?.dispose() - mUploadImageCancelDialog?.dismiss() - mProcessingDialog?.dismiss() - }, null) - + mUploadImageCancelDialog = DialogUtils.showAlertDialog(this, "提示", "图片正在上传中，确定取消吗？", + "确定", "取消", object : ConfirmListener { + override fun onConfirm() { + mViewModel.uploadImageSubscription?.dispose() + mUploadImageCancelDialog?.dismiss() + mProcessingDialog?.dismiss() + } + }, null + ) } } } @@ -242,7 +249,7 @@ class AnswerEditActivity : BaseRichEditorActivity(), Keyboa mViewModel.saveDraftsLiveData.observeNonNull(this) { if (it) { val data = Intent() - data.putExtra(EntranceUtils.KEY_ANSWER_CONTENT, getReplaceRealContent()) + data.putExtra(EntranceConsts.KEY_ANSWER_CONTENT, getReplaceRealContent()) setResult(SAVE_DRAFTS, data) finish() } else { @@ -501,9 +508,9 @@ class AnswerEditActivity : BaseRichEditorActivity(), Keyboa showHintBackground: Boolean = false ): Intent { val intent = Intent(context, AnswerEditActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ANSWER_OPEN_IN_NEW_PAGE, showInNewPage) - intent.putExtra(EntranceUtils.KEY_COMMUNITY_NAME, communityName) - intent.putExtra(EntranceUtils.KEY_HINT, showHintBackground) + intent.putExtra(EntranceConsts.KEY_ANSWER_OPEN_IN_NEW_PAGE, showInNewPage) + intent.putExtra(EntranceConsts.KEY_COMMUNITY_NAME, communityName) + intent.putExtra(EntranceConsts.KEY_HINT, showHintBackground) intent.putExtra(Questions::class.java.simpleName, question) return intent } @@ -513,9 +520,9 @@ class AnswerEditActivity : BaseRichEditorActivity(), Keyboa */ fun getIntent(context: Context, question: Questions?, draftId: String?, showInNewPage: Boolean?, communityName: String?): Intent { val intent = Intent(context, AnswerEditActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ANSWER_OPEN_IN_NEW_PAGE, showInNewPage) - intent.putExtra(EntranceUtils.KEY_DRAFT_ID, draftId) - intent.putExtra(EntranceUtils.KEY_COMMUNITY_NAME, communityName) + intent.putExtra(EntranceConsts.KEY_ANSWER_OPEN_IN_NEW_PAGE, showInNewPage) + intent.putExtra(EntranceConsts.KEY_DRAFT_ID, draftId) + intent.putExtra(EntranceConsts.KEY_COMMUNITY_NAME, communityName) intent.putExtra(Questions::class.java.simpleName, question) return intent } @@ -525,7 +532,7 @@ class AnswerEditActivity : BaseRichEditorActivity(), Keyboa */ fun getIntent(context: Context, question: Questions?, communityName: String?): Intent { val intent = Intent(context, AnswerEditActivity::class.java) - intent.putExtra(EntranceUtils.KEY_COMMUNITY_NAME, communityName) + intent.putExtra(EntranceConsts.KEY_COMMUNITY_NAME, communityName) intent.putExtra(Questions::class.java.simpleName, question) return intent } @@ -543,12 +550,12 @@ class AnswerEditActivity : BaseRichEditorActivity(), Keyboa showInNewPage: Boolean = false ): Intent { val intent = Intent(context, AnswerEditActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ANSWER_ID, answerId) - intent.putExtra(EntranceUtils.KEY_ANSWER_CONTENT, content) - intent.putExtra(EntranceUtils.KEY_COMMUNITY_NAME, communityName) - intent.putExtra(EntranceUtils.KEY_SHOW_EDIT_DRAFT, showEditDraft) + intent.putExtra(EntranceConsts.KEY_ANSWER_ID, answerId) + intent.putExtra(EntranceConsts.KEY_ANSWER_CONTENT, content) + intent.putExtra(EntranceConsts.KEY_COMMUNITY_NAME, communityName) + intent.putExtra(EntranceConsts.KEY_SHOW_EDIT_DRAFT, showEditDraft) intent.putExtra(Questions::class.java.simpleName, question) - intent.putExtra(EntranceUtils.KEY_ANSWER_OPEN_IN_NEW_PAGE, showInNewPage) + intent.putExtra(EntranceConsts.KEY_ANSWER_OPEN_IN_NEW_PAGE, showInNewPage) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditViewModel.kt index 9c6ebae86f..2f20897f40 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditViewModel.kt @@ -3,10 +3,10 @@ package com.gh.gamecenter.qa.answer.edit import android.app.Application import android.text.TextUtils import androidx.lifecycle.* -import com.gh.base.fragment.WaitingDialogFragment -import com.gh.common.syncpage.SyncDataEntity -import com.gh.common.syncpage.SyncFieldConstants -import com.gh.common.syncpage.SyncPageRepository +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment +import com.gh.gamecenter.common.syncpage.SyncDataEntity +import com.gh.gamecenter.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.eventbus.EBReuse @@ -14,6 +14,8 @@ import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.mvvm.Resource import com.gh.base.BaseRichEditorViewModel import com.gh.base.RichType +import com.gh.gamecenter.common.utils.tryWithDefaultCatch +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.qa.entity.AnswerDraftEntity import com.gh.gamecenter.qa.entity.Questions import com.gh.gamecenter.retrofit.Response diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldActivity.java b/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldActivity.java index 688577ccde..0eaacba839 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldActivity.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldActivity.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.NormalActivity; /** @@ -15,8 +15,8 @@ public class AnswerFoldActivity extends NormalActivity { public static Intent getIntent(Context context, String questionsId, String entrance) { Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_QUESTIONS_ID, questionsId); - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); + bundle.putString(EntranceConsts.KEY_QUESTIONS_ID, questionsId); + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance); return getTargetIntent(context, AnswerFoldActivity.class, AnswerFoldFragment.class, bundle); } diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldAdapter.java index 27ae1d4164..f43eb6c06e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldAdapter.java @@ -4,9 +4,9 @@ import android.content.Context; import android.view.View; import android.view.ViewGroup; -import com.gh.base.OnListClickListener; -import com.gh.common.constant.ItemViewType; -import com.gh.common.syncpage.ISyncAdapterHandler; +import com.gh.gamecenter.common.callback.OnListClickListener; +import com.gh.gamecenter.common.constant.ItemViewType; +import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.baselist.ListAdapter; 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 f9360e942d..7b1e18b1aa 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 @@ -6,9 +6,9 @@ import android.view.View; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.UrlFilterUtils; -import com.gh.common.view.VerticalItemDecoration; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.core.utils.UrlFilterUtils; +import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.baselist.ListAdapter; @@ -35,8 +35,8 @@ public class AnswerFoldFragment extends ListFragment startActivity(NewsDetailActivity.getIntentById(getContext(), diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleActivity.kt index 4fccc24c72..e4ea7d728b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleActivity.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity class MyArticleActivity : NormalActivity() { @@ -15,8 +15,8 @@ class MyArticleActivity : NormalActivity() { @JvmStatic fun getIntent(context: Context, userId: String, entrance: String, path: String): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_USER_ID, userId) - bundle.putString(EntranceUtils.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) + bundle.putString(EntranceConsts.KEY_USER_ID, userId) + bundle.putString(EntranceConsts.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) return getTargetIntent(context, MyArticleActivity::class.java, MyArticleFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleAdapter.kt index 22090e399b..e1d8ad65e1 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleAdapter.kt @@ -4,23 +4,17 @@ import android.content.Context import android.text.SpannableStringBuilder import android.view.View import android.view.ViewGroup -import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType -import com.gh.common.syncpage.ISyncAdapterHandler -import com.gh.common.util.SpanBuilder -import com.gh.common.util.toDrawable +import com.gh.gamecenter.common.constant.ItemViewType +import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler +import com.gh.gamecenter.core.utils.SpanBuilder import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.databinding.CommunityMyAnswerItemBinding import com.gh.gamecenter.qa.answer.MyAnswerViewHolder import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity -import com.gh.gamecenter.qa.entity.AnswerEntity import com.gh.gamecenter.qa.entity.ArticleEntity -import com.gh.gamecenter.qa.entity.Questions -import com.gh.gamecenter.qa.entity.QuestionsDetailEntity -import com.gh.gamecenter.qa.questions.invite.QuestionsInviteActivity import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity class MyArticleAdapter(context: Context, 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 2f6c3c986e..4c59bc45f5 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 @@ -7,12 +7,16 @@ import android.view.MenuItem import android.view.View import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.* -import com.gh.common.view.CustomDividerItemDecoration +import com.gh.gamecenter.common.view.CustomDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.baselist.NormalListViewModel +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.checkStoragePermissionBeforeAction +import com.gh.gamecenter.common.utils.ifLogin +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.article.edit.ArticleEditActivity import com.gh.gamecenter.qa.entity.AnswerEntity @@ -65,7 +69,7 @@ class MyArticleFragment : ListFragment { return Pair( - targetFragment.arguments?.getString(EntranceUtils.KEY_COMMUNITY_ARTICLE_ID) ?: "", - targetFragment.arguments?.getParcelable(EntranceUtils.KEY_COMMUNITY_DATA)?.id ?: "") + targetFragment.arguments?.getString(EntranceConsts.KEY_COMMUNITY_ARTICLE_ID) ?: "", + targetFragment.arguments?.getParcelable(EntranceConsts.KEY_COMMUNITY_DATA)?.id ?: "") } companion object { @@ -40,11 +40,11 @@ class ArticleDetailActivity : NormalActivity() { @JvmStatic fun getIntent(context: Context, community: CommunityEntity, articleId: String, entrance: String, path: String, specialColumn: SpecialColumn? = null): Intent { val intent = Intent(context, ArticleDetailActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) - intent.putExtra(EntranceUtils.KEY_COMMUNITY_ARTICLE_ID, articleId) - intent.putExtra(EntranceUtils.KEY_COMMUNITY_DATA, community) - intent.putExtra(EntranceUtils.KEY_PATH, path) - intent.putExtra(EntranceUtils.KEY_DATA, specialColumn) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_COMMUNITY_ARTICLE_ID, articleId) + intent.putExtra(EntranceConsts.KEY_COMMUNITY_DATA, community) + intent.putExtra(EntranceConsts.KEY_PATH, path) + intent.putExtra(EntranceConsts.KEY_DATA, specialColumn) return intent } @@ -54,22 +54,22 @@ class ArticleDetailActivity : NormalActivity() { @JvmStatic fun getCommentIntent(context: Context, community: CommunityEntity, articleId: String, entrance: String, path: String): Intent { val intent = Intent(context, ArticleDetailActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) - intent.putExtra(EntranceUtils.KEY_COMMUNITY_ARTICLE_ID, articleId) - intent.putExtra(EntranceUtils.KEY_COMMUNITY_DATA, community) - intent.putExtra(EntranceUtils.KEY_SCROLL_TO_COMMENT_AREA, true) - intent.putExtra(EntranceUtils.KEY_PATH, path) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_COMMUNITY_ARTICLE_ID, articleId) + intent.putExtra(EntranceConsts.KEY_COMMUNITY_DATA, community) + intent.putExtra(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, true) + intent.putExtra(EntranceConsts.KEY_PATH, path) return intent } @JvmStatic fun getRecommendsIntent(context: Context, community: CommunityEntity, articleId: String, entrance: String, path: String): Intent { val intent = Intent(context, ArticleDetailActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) - intent.putExtra(EntranceUtils.KEY_COMMUNITY_ARTICLE_ID, articleId) - intent.putExtra(EntranceUtils.KEY_COMMUNITY_DATA, community) - intent.putExtra(EntranceUtils.KEY_RECOMMENDS_CONTENTS, true) - intent.putExtra(EntranceUtils.KEY_PATH, path) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_COMMUNITY_ARTICLE_ID, articleId) + intent.putExtra(EntranceConsts.KEY_COMMUNITY_DATA, community) + intent.putExtra(EntranceConsts.KEY_RECOMMENDS_CONTENTS, true) + intent.putExtra(EntranceConsts.KEY_PATH, path) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt index effbe1cf1b..a8166113d9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt @@ -9,11 +9,14 @@ import android.widget.LinearLayout import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.common.DefaultUrlHandler -import com.gh.common.runOnUiThread +import com.gh.gamecenter.core.runOnUiThread import com.gh.common.util.* import com.gh.common.view.RichEditor import com.gh.gamecenter.ImageViewerActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ItemArticleDetailContentBinding import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.editor.OnLinkClickListener @@ -193,20 +196,22 @@ class ArticleDetailContentViewHolder( badgeTv.text = article.user.badge?.name ImageUtils.display(badgeIv, article.user.badge?.icon) badgeIv.setOnClickListener { - DialogUtils.showViewBadgeDialog(root.context, article.user.badge) { - MtaHelper.onEvent( - "进入徽章墙_用户记录", - "帖子详情", - "${article.user.name}（${article.user.id}）" - ) - MtaHelper.onEvent("徽章中心", "进入徽章中心", "帖子详情") - DirectUtils.directToBadgeWall( - root.context, - viewModel.detailEntity?.user?.id, - article.user.name, - article.user.icon - ) - } + DialogUtils.showViewBadgeDialog(root.context, article.user.badge, object : ConfirmListener { + override fun onConfirm() { + MtaHelper.onEvent( + "进入徽章墙_用户记录", + "帖子详情", + "${article.user.name}（${article.user.id}）" + ) + MtaHelper.onEvent("徽章中心", "进入徽章中心", "帖子详情") + DirectUtils.directToBadgeWall( + root.context, + viewModel.detailEntity?.user?.id, + article.user.name, + article.user.icon + ) + } + }) } badgeTv.setOnClickListener { badgeIv.performClick() } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt index c7c12fd28f..5c4fba2d64 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt @@ -16,17 +16,20 @@ import androidx.core.view.ViewCompat import androidx.lifecycle.Lifecycle import androidx.recyclerview.widget.RecyclerView import com.ethanhua.skeleton.Skeleton -import com.gh.common.TimeElapsedHelper -import com.gh.common.constant.Constants +import com.gh.gamecenter.core.utils.TimeElapsedHelper +import com.gh.gamecenter.common.constant.Constants import com.gh.common.history.HistoryHelper -import com.gh.common.syncpage.SyncDataEntity -import com.gh.common.syncpage.SyncFieldConstants -import com.gh.common.syncpage.SyncPageRepository +import com.gh.gamecenter.common.syncpage.SyncDataEntity +import com.gh.gamecenter.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* import com.gh.gamecenter.ImageViewerActivity import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.LoadType +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentArticleDetailBinding import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.EBDeleteCommentDetail @@ -78,9 +81,9 @@ class ArticleDetailFragment : BaseCommentFragment(EntranceUtils.KEY_COMMUNITY_DATA)?.id + arguments?.getString(EntranceConsts.KEY_COMMUNITY_ARTICLE_ID) ?: "", + arguments?.getParcelable(EntranceConsts.KEY_COMMUNITY_DATA)?.id ?: "" ) ) @@ -239,7 +242,7 @@ class ArticleDetailFragment : BaseCommentFragment { @@ -119,7 +124,7 @@ class ArticleDetailCommentFragment : BaseCommentFragment(binding.root) \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt index 749e555c07..990886c044 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt @@ -15,11 +15,20 @@ import androidx.core.widget.doOnTextChanged import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders import com.gh.base.BaseRichEditorActivity -import com.gh.base.fragment.WaitingDialogFragment -import com.gh.common.AppExecutor -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.debounceActionWithInterval +import com.gh.gamecenter.common.utils.ifLogin +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.utils.TextHelper +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ActivityCommunityArticleEditBinding import com.gh.gamecenter.entity.ActivityLabelEntity import com.gh.gamecenter.entity.CommunityEntity @@ -83,7 +92,7 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb setArticleDraft() } } else if (requestCode == ChooseForumActivity.CHOOSE_FORUM_REQUEST) { - val community = data.getParcelableExtra(EntranceUtils.KEY_COMMUNITY_DATA) + val community = data.getParcelableExtra(EntranceConsts.KEY_COMMUNITY_DATA) mViewModel.type = community?.type ?: "" mViewModel.mSelectCommunityData = community if (mViewModel.type == BbsType.GAME_BBS.value) { @@ -101,7 +110,7 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb override fun onActivityDialogResult(requestCode: Int, resultCode: Int, data: Intent?) { if (requestCode == ChooseActivityDialogFragment.REQUEST_CODE && resultCode == Activity.RESULT_OK) { - getChooseSelectCallback().invoke(data?.getParcelableExtra(EntranceUtils.KEY_DATA)) + getChooseSelectCallback().invoke(data?.getParcelableExtra(EntranceConsts.KEY_DATA)) } } @@ -157,7 +166,7 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb mViewModel = ViewModelProviders.of(this).get(ArticleEditViewModel::class.java) mViewModel.detailEntity = intent.getParcelableExtra(ArticleDetailEntity::class.java.simpleName) mViewModel.draftEntity = intent.getParcelableExtra(ArticleDraftEntity::class.java.simpleName) - mViewModel.openArticleInNewPage = intent.getBooleanExtra(EntranceUtils.KEY_ARTICLE_OPEN_IN_NEW_PAGE, false) + mViewModel.openArticleInNewPage = intent.getBooleanExtra(EntranceConsts.KEY_ARTICLE_OPEN_IN_NEW_PAGE, false) return mViewModel } @@ -220,11 +229,14 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb mProcessingDialog = WaitingDialogFragment.newInstance(it.msg, false) mProcessingDialog?.show(supportFragmentManager, null) { if (mViewModel.uploadImageSubscription != null && !mViewModel?.uploadImageSubscription!!.isDisposed) { - mUploadImageCancelDialog = DialogUtils.showAlertDialog(this, "提示", "图片正在上传中，确定取消吗？", "确定", "取消", { - mViewModel.uploadImageSubscription!!.dispose() - mUploadImageCancelDialog?.dismiss() - mProcessingDialog?.dismiss() - }, null) + mUploadImageCancelDialog = DialogUtils.showAlertDialog(this, "提示", "图片正在上传中，确定取消吗？", + "确定", "取消", object :ConfirmListener{ + override fun onConfirm() { + mViewModel.uploadImageSubscription!!.dispose() + mUploadImageCancelDialog?.dismiss() + mProcessingDialog?.dismiss() + } + }, null) } } } @@ -607,7 +619,7 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb val intent = Intent(context, ArticleEditActivity::class.java) intent.putExtra(ArticleDetailEntity::class.java.simpleName, detailEntity) intent.putExtra(ArticleDraftEntity::class.java.simpleName, draftEntity) - intent.putExtra(EntranceUtils.KEY_ARTICLE_OPEN_IN_NEW_PAGE, showInNewPage) + intent.putExtra(EntranceConsts.KEY_ARTICLE_OPEN_IN_NEW_PAGE, showInNewPage) return intent } @@ -615,7 +627,7 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb fun getDraftIntent(context: Context, draftEntity: ArticleDraftEntity, showInNewPage: Boolean = true): Intent { val intent = Intent(context, ArticleEditActivity::class.java) intent.putExtra(ArticleDraftEntity::class.java.simpleName, draftEntity) - intent.putExtra(EntranceUtils.KEY_ARTICLE_OPEN_IN_NEW_PAGE, showInNewPage) + intent.putExtra(EntranceConsts.KEY_ARTICLE_OPEN_IN_NEW_PAGE, showInNewPage) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt index e0cd7e334d..8915367f3a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt @@ -5,7 +5,7 @@ import android.text.TextUtils import android.view.Gravity import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData -import com.gh.base.fragment.WaitingDialogFragment +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.entity.CommunityEntity @@ -13,9 +13,12 @@ import com.gh.gamecenter.eventbus.EBReuse import com.gh.gamecenter.manager.UserManager import com.gh.base.BaseRichEditorViewModel import com.gh.base.RichType +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.common.utils.tryWithDefaultCatch +import com.gh.gamecenter.core.utils.HtmlUtils +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.entity.ActivityLabelEntity import com.gh.gamecenter.entity.GameEntity -import com.gh.gamecenter.qa.BbsType import com.gh.gamecenter.qa.entity.ArticleDetailEntity import com.gh.gamecenter.qa.entity.ArticleDraftEntity import com.gh.gamecenter.qa.questions.edit.QuestionEditViewModel 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 569830a18e..ac07d99437 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 @@ -5,7 +5,7 @@ import android.view.View import android.view.ViewGroup import android.widget.ProgressBar import com.gh.common.util.CommunityHelper -import com.gh.common.util.UrlFilterUtils +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.databinding.DialogSelectGameItemBinding import com.gh.gamecenter.qa.entity.CommunitySelectEntity import com.gh.gamecenter.retrofit.Response diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt index 9c79cdd7ec..6d74b381ec 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt @@ -14,12 +14,12 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders -import com.gh.base.fragment.BaseFragment -import com.gh.common.AppExecutor +import com.gh.gamecenter.common.base.fragment.BaseFragment +import com.gh.gamecenter.core.AppExecutor import com.gh.common.util.NotificationHelper -import com.gh.common.util.TextHelper -import com.gh.common.util.dip2px -import com.gh.common.util.tryWithDefaultCatch +import com.gh.gamecenter.common.utils.TextHelper +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.R import com.gh.gamecenter.databinding.QuestionsEditTagBinding import com.gh.gamecenter.entity.NotificationUgc diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnAdapter.kt index 50c785f29a..7fcdb734a9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnAdapter.kt @@ -2,7 +2,7 @@ // //import android.content.Context //import android.view.ViewGroup -//import com.gh.base.BaseRecyclerViewHolder +//import com.gh.gamecenter.common.base.BaseRecyclerViewHolder //import com.gh.common.util.DataUtils //import com.gh.gamecenter.R //import com.gh.gamecenter.databinding.AskColumnTagItemBinding diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnFragment.kt index c042d0c3bc..9720f4d8d2 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnFragment.kt @@ -6,8 +6,8 @@ //import androidx.lifecycle.Observer //import androidx.lifecycle.ViewModelProviders //import androidx.recyclerview.widget.GridLayoutManager -//import com.gh.base.fragment.BaseFragment -//import com.gh.common.view.GridDivider +//import com.gh.gamecenter.common.base.fragment.BaseFragment +//import com.gh.gamecenter.common.view.GridDivider //import com.gh.gamecenter.R //import com.gh.gamecenter.databinding.FragmentAskColumnBinding //import com.halo.assistant.HaloApp 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 6558be0b26..c427aaa622 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 @@ -5,7 +5,7 @@ import android.content.Context; import android.text.TextUtils; import com.gh.common.util.ErrorHelper; -import com.gh.common.util.GsonUtils; +import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.qa.entity.AskTagGroupsEntity; import com.gh.gamecenter.retrofit.Response; 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 42e0e09ba6..262c902f76 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 @@ -9,9 +9,9 @@ //import android.widget.LinearLayout //import androidx.fragment.app.Fragment //import com.gh.base.ToolBarActivity -//import com.gh.base.adapter.FragmentAdapter -//import com.gh.base.fragment.BaseFragment_TabLayout -//import com.gh.common.util.DisplayUtils +//import com.gh.gamecenter.common.base.adapter.FragmentAdapter +//import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout +//import com.gh.gamecenter.core.utils.DisplayUtils //import com.gh.common.util.EntranceUtils //import com.gh.gamecenter.R //import com.gh.gamecenter.databinding.ActivityAskColumnDetailBinding diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotAdapter.kt index 49a8a54739..b2acc41341 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/hot/HotAdapter.kt @@ -3,8 +3,8 @@ //import android.content.Context //import android.view.ViewGroup //import androidx.recyclerview.widget.RecyclerView -//import com.gh.common.constant.ItemViewType -//import com.gh.common.syncpage.ISyncAdapterHandler +//import com.gh.gamecenter.common.constant.ItemViewType +//import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler //import com.gh.gamecenter.R //import com.gh.gamecenter.adapter.viewholder.FooterViewHolder //import com.gh.gamecenter.baselist.ListAdapter diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsAdapter.kt index cebc6c0e68..888350cacd 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsAdapter.kt @@ -3,8 +3,8 @@ package com.gh.gamecenter.qa.column.detail.recommends import android.content.Context import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType -import com.gh.common.syncpage.ISyncAdapterHandler +import com.gh.gamecenter.common.constant.ItemViewType +import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsFragment.kt index 37dbcee5b4..014918e481 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/recommends/RecommendsFragment.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.qa.column.detail.recommends import androidx.lifecycle.ViewModelProviders import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.SpecialColumn @@ -33,10 +33,10 @@ class RecommendsFragment : ListFragment() { } override fun provideListViewModel(): RecommendsViewModel { - val tag = requireArguments().getString(EntranceUtils.KEY_ASK_TAG) - val entity = requireArguments().getParcelable(EntranceUtils.KEY_ASK_COLUMN_TAG) + val tag = requireArguments().getString(EntranceConsts.KEY_ASK_TAG) + val entity = requireArguments().getParcelable(EntranceConsts.KEY_ASK_COLUMN_TAG) val factory = RecommendsViewModel.Factory(HaloApp.getInstance().application - , if (tag.isNullOrEmpty()) entity as Any else tag, requireArguments().getParcelable(EntranceUtils.KEY_COMMUNITY_DATA)?: CommunityEntity()) + , if (tag.isNullOrEmpty()) entity as Any else tag, requireArguments().getParcelable(EntranceConsts.KEY_COMMUNITY_DATA)?: CommunityEntity()) return ViewModelProviders.of(this, factory).get(RecommendsViewModel::class.java) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredAdapter.kt index 813827c4b6..85e4db16dc 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredAdapter.kt @@ -3,8 +3,8 @@ package com.gh.gamecenter.qa.column.detail.unanswered import android.content.Context import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType -import com.gh.common.syncpage.ISyncAdapterHandler +import com.gh.gamecenter.common.constant.ItemViewType +import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredFragment.kt index 695f762ca1..2a0f2e7495 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/unanswered/UnansweredFragment.kt @@ -2,8 +2,7 @@ package com.gh.gamecenter.qa.column.detail.unanswered import android.view.View import androidx.lifecycle.ViewModelProviders -import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.SpecialColumn @@ -33,10 +32,10 @@ class UnansweredFragment : ListFragment() { } override fun provideListViewModel(): UnansweredViewModel { - val tag = requireArguments().getString(EntranceUtils.KEY_ASK_TAG) - val entity = requireArguments().getParcelable(EntranceUtils.KEY_ASK_COLUMN_TAG) + val tag = requireArguments().getString(EntranceConsts.KEY_ASK_TAG) + val entity = requireArguments().getParcelable(EntranceConsts.KEY_ASK_COLUMN_TAG) val factory = UnansweredViewModel.Factory(HaloApp.getInstance().application - , if (tag.isNullOrEmpty()) entity as Any else tag, requireArguments().getParcelable(EntranceUtils.KEY_COMMUNITY_DATA)?: CommunityEntity()) + , if (tag.isNullOrEmpty()) entity as Any else tag, requireArguments().getParcelable(EntranceConsts.KEY_COMMUNITY_DATA)?: CommunityEntity()) return ViewModelProviders.of(this, factory).get(UnansweredViewModel::class.java) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/order/AskTabOrderAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/column/order/AskTabOrderAdapter.java index 0ba9e4d351..91666e8017 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/order/AskTabOrderAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/column/order/AskTabOrderAdapter.java @@ -9,7 +9,7 @@ //import android.view.View; //import android.view.ViewGroup; // -//import com.gh.common.util.ImageUtils; +//import com.gh.gamecenter.common.utils.ImageUtils; //import com.gh.gamecenter.R; //import com.gh.gamecenter.adapter.viewholder.AskTabItemViewHolder; //import com.gh.gamecenter.databinding.AskOrderTabItemBinding; diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/order/AskTabOrderFragment.java b/app/src/main/java/com/gh/gamecenter/qa/column/order/AskTabOrderFragment.java index 6e30aab604..8efa4b76a1 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/order/AskTabOrderFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/column/order/AskTabOrderFragment.java @@ -17,12 +17,12 @@ //import androidx.recyclerview.widget.ItemTouchHelper; //import androidx.recyclerview.widget.RecyclerView; // -//import com.gh.base.fragment.WaitingDialogFragment; -//import com.gh.common.util.DialogHelper; -//import com.gh.common.view.GridDivider; +//import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment; +//import com.gh.gamecenter.common.utils.DialogHelper; +//import com.gh.gamecenter.common.view.GridDivider; //import com.gh.gamecenter.R; //import com.gh.gamecenter.databinding.ActivityAsktabOrderBinding; -//import com.gh.gamecenter.normal.NormalFragment; +//import com.gh.gamecenter.common.base.fragment.NormalFragment; //import com.gh.gamecenter.qa.column.AskColumnViewModel; //import com.gh.gamecenter.qa.entity.AskTagGroupsEntity; //import com.halo.assistant.HaloApp; diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentActivity.kt index 2c79279b77..eb82cd24c0 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentActivity.kt @@ -5,10 +5,10 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils -import com.gh.common.util.EntranceUtils.KEY_COMMENT_ID -import com.gh.common.util.doOnEnd +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.constant.EntranceConsts.KEY_COMMENT_ID +import com.gh.gamecenter.core.utils.doOnEnd import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R import com.gh.gamecenter.databinding.ActivityCommentBinding @@ -32,7 +32,7 @@ class CommentActivity : BaseActivity() { DisplayUtils.transparentStatusBar(this) val commentCount = intent.getIntExtra(COMMENT_COUNT, 0) val showKeyboard = intent.getBooleanExtra(SHOW_KEYBOARD, false) - val isCommentConversation = intent.getBooleanExtra(EntranceUtils.KEY_IS_COMMENT_CONVERSATION, false) + val isCommentConversation = intent.getBooleanExtra(EntranceConsts.KEY_IS_COMMENT_CONVERSATION, false) val answerId = intent.getStringExtra(ANSWER_ID) ?: "" val articleId = intent.getStringExtra(ARTICLE_ID) ?: "" @@ -265,16 +265,16 @@ class CommentActivity : BaseActivity() { path: String ): Intent { val intent = Intent(context, CommentActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, NormalActivity.mergeEntranceAndPath(entrance, path)) - intent.putExtra(EntranceUtils.KEY_COMMUNITY_ARTICLE_ID, articleId) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, NormalActivity.mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_COMMUNITY_ARTICLE_ID, articleId) intent.putExtra(VIDEO_ID, videoId) intent.putExtra(QUESTION_ID, questionId) - intent.putExtra(EntranceUtils.KEY_COMMUNITY_ID, communityId) - intent.putExtra(EntranceUtils.KEY_POSITION, position) + intent.putExtra(EntranceConsts.KEY_COMMUNITY_ID, communityId) + intent.putExtra(EntranceConsts.KEY_POSITION, position) intent.putExtra(KEY_COMMENT_ID, commentId) - intent.putExtra(EntranceUtils.KEY_SHOW_KEYBOARD_IF_NEEDED, showKeyboard) - intent.putExtra(EntranceUtils.KEY_PATH, path) - intent.putExtra(EntranceUtils.KEY_IS_COMMENT_CONVERSATION, true) + intent.putExtra(EntranceConsts.KEY_SHOW_KEYBOARD_IF_NEEDED, showKeyboard) + intent.putExtra(EntranceConsts.KEY_PATH, path) + intent.putExtra(EntranceConsts.KEY_IS_COMMENT_CONVERSATION, true) return intent } @@ -436,12 +436,12 @@ class CommentActivity : BaseActivity() { path: String ): Intent { val intent = Intent(context, CommentActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, NormalActivity.mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, NormalActivity.mergeEntranceAndPath(entrance, path)) intent.putExtra(GAME_COLLECTION_ID, gameCollectionId) intent.putExtra(KEY_COMMENT_ID, commentId) - intent.putExtra(EntranceUtils.KEY_SHOW_KEYBOARD_IF_NEEDED, showKeyboard) - intent.putExtra(EntranceUtils.KEY_PATH, path) - intent.putExtra(EntranceUtils.KEY_IS_COMMENT_CONVERSATION, true) + intent.putExtra(EntranceConsts.KEY_SHOW_KEYBOARD_IF_NEEDED, showKeyboard) + intent.putExtra(EntranceConsts.KEY_PATH, path) + intent.putExtra(EntranceConsts.KEY_IS_COMMENT_CONVERSATION, true) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentPictureAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentPictureAdapter.kt index 0eca59e805..84b3a74f01 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentPictureAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentPictureAdapter.kt @@ -4,8 +4,8 @@ import android.content.Context import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.facebook.drawee.view.SimpleDraweeView -import com.gh.common.util.ImageUtils -import com.gh.common.util.toBinding +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.utils.toBinding import com.gh.gamecenter.ImageViewerActivity import com.gh.gamecenter.databinding.ItemCommentPictureBinding import com.lightgame.adapter.BaseRecyclerAdapter diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt index c430fc5406..d6796f9af5 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt @@ -6,13 +6,18 @@ import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.adapter.OnCommentCallBackListener import com.gh.gamecenter.adapter.viewholder.AnswerCommentViewHolder import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.core.utils.SpanBuilder +import com.gh.gamecenter.common.utils.copyTextAndToast +import com.gh.gamecenter.common.utils.ifLogin +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.NewCommentItemBinding import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity @@ -119,37 +124,41 @@ class NewCommentAdapter( } holder.userBadgeSdv.setOnClickListener { v -> - DialogUtils.showViewBadgeDialog(mContext, commentEntity.user.badge) { - MtaHelper.onEvent( - "进入徽章墙_用户记录", - key, - commentEntity.user.name + "（" + commentEntity.user.id + "）" - ) - MtaHelper.onEvent("徽章中心", "进入徽章中心", key) - DirectUtils.directToBadgeWall( - mContext, - commentEntity.user.id, - commentEntity.user.name, - commentEntity.user.icon - ) - } + DialogUtils.showViewBadgeDialog(mContext, commentEntity.user.badge, object : ConfirmListener { + override fun onConfirm() { + MtaHelper.onEvent( + "进入徽章墙_用户记录", + key, + commentEntity.user.name + "（" + commentEntity.user.id + "）" + ) + MtaHelper.onEvent("徽章中心", "进入徽章中心", key) + DirectUtils.directToBadgeWall( + mContext, + commentEntity.user.id, + commentEntity.user.name, + commentEntity.user.icon + ) + } + }) } holder.badgeNameTv.setOnClickListener { v -> holder.userBadgeSdv.performClick() } holder.quoteAuthorBadgeSdv.setOnClickListener { v -> - DialogUtils.showViewBadgeDialog(mContext, commentEntity.parentUser!!.badge) { - MtaHelper.onEvent( - "进入徽章墙_用户记录", - key, - commentEntity.parentUser!!.name + "（" + commentEntity.parentUser!!.id + "）" - ) - MtaHelper.onEvent("徽章中心", "进入徽章中心", key) - DirectUtils.directToBadgeWall( - mContext, - commentEntity.parentUser!!.id, - commentEntity.parentUser!!.name, - commentEntity.parentUser!!.icon - ) - } + DialogUtils.showViewBadgeDialog(mContext, commentEntity.parentUser!!.badge, object : ConfirmListener { + override fun onConfirm() { + MtaHelper.onEvent( + "进入徽章墙_用户记录", + key, + commentEntity.parentUser!!.name + "（" + commentEntity.parentUser!!.id + "）" + ) + MtaHelper.onEvent("徽章中心", "进入徽章中心", key) + DirectUtils.directToBadgeWall( + mContext, + commentEntity.parentUser!!.id, + commentEntity.parentUser!!.name, + commentEntity.parentUser!!.icon + ) + } + }) } holder.commentLikeContainer.setOnClickListener { diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentConversationFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentConversationFragment.kt index 27e429bbbe..4c3960ae74 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentConversationFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentConversationFragment.kt @@ -4,9 +4,9 @@ import android.annotation.SuppressLint import android.os.Bundle import android.text.TextUtils import android.view.View -import com.gh.common.AppExecutor +import com.gh.gamecenter.core.AppExecutor import com.gh.common.util.DirectUtils -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.databinding.FragmentAnswerCommentConversationBinding @@ -35,8 +35,8 @@ class NewCommentConversationFragment : NewCommentFragment() { } override fun onCreate(savedInstanceState: Bundle?) { - mCommentId = arguments?.getString(EntranceUtils.KEY_COMMENTID) ?: "" - mAnswerId = arguments?.getString(EntranceUtils.KEY_ANSWER_ID) ?: "" + mCommentId = arguments?.getString(EntranceConsts.KEY_COMMENTID) ?: "" + mAnswerId = arguments?.getString(EntranceConsts.KEY_ANSWER_ID) ?: "" mArticleId = arguments?.getString(CommentActivity.ARTICLE_ID) ?: "" mCommunityId = arguments?.getString(CommentActivity.COMMUNITY_ID) ?: "" @@ -50,7 +50,7 @@ class NewCommentConversationFragment : NewCommentFragment() { else -> CommentType.VIDEO_CONVERSATION } - mLinkEntity = arguments?.getParcelable(EntranceUtils.KEY_LINK) + mLinkEntity = arguments?.getParcelable(EntranceConsts.KEY_LINK) super.onCreate(savedInstanceState) mBinding = FragmentAnswerCommentConversationBinding.bind(mCachedView) commentContainer = mBinding.pieceCommentTypingContainer.answerCommentContentContainer diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt index 3200c48cad..9295d0c07e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt @@ -16,18 +16,20 @@ import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import androidx.lifecycle.Observer import androidx.recyclerview.widget.RecyclerView -import com.gh.base.fragment.BaseDialogWrapperFragment -import com.gh.common.syncpage.SyncDataEntity -import com.gh.common.syncpage.SyncFieldConstants -import com.gh.common.syncpage.SyncPageRepository +import com.gh.gamecenter.common.base.fragment.BaseDialogWrapperFragment +import com.gh.gamecenter.common.syncpage.SyncDataEntity +import com.gh.gamecenter.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* -import com.gh.common.util.EntranceUtils.KEY_COMMENT_ID -import com.gh.common.view.VerticalItemDecoration +import com.gh.gamecenter.common.constant.EntranceConsts.KEY_COMMENT_ID +import com.gh.gamecenter.common.view.VerticalItemDecoration import com.gh.gamecenter.CommentDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.OnCommentCallBackListener import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.ListFragment +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ItemCommentEditImageBinding import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.eventbus.EBCommentSuccess @@ -49,7 +51,8 @@ import java.io.File import java.util.ArrayList import kotlin.math.abs -open class NewCommentFragment : ListFragment(), OnCommentCallBackListener, KeyboardHeightObserver, +open class NewCommentFragment : ListFragment(), OnCommentCallBackListener, + KeyboardHeightObserver, OnCommentOptionClickListener { private lateinit var commentEt: EditText 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 9bcf72a7ad..ce3eba7b93 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 @@ -6,11 +6,14 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.gh.common.syncpage.SyncDataEntity -import com.gh.common.syncpage.SyncFieldConstants -import com.gh.common.syncpage.SyncPageRepository +import com.gh.gamecenter.common.syncpage.SyncDataEntity +import com.gh.gamecenter.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* import com.gh.gamecenter.baselist.ListViewModel +import com.gh.gamecenter.common.utils.createRequestBodyAny +import com.gh.gamecenter.common.utils.tryCatchInRelease +import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.entity.CommentDraft import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.retrofit.BiResponse diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentAdapter.kt index e4a037a8bd..9715630502 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentAdapter.kt @@ -1,20 +1,16 @@ package com.gh.gamecenter.qa.comment import android.content.Context -import android.text.TextUtils import android.view.View import android.view.ViewGroup -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType -import com.gh.common.util.* +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.gamecenter.R import com.gh.gamecenter.adapter.OnCommentCallBackListener import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.databinding.StairsCommentItemBinding import com.gh.gamecenter.entity.CommentEntity -import com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity class StairsCommentAdapter(context: Context, var mViewModel: NewCommentViewModel, diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentFragment.kt index 477b033f4f..483a586799 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentFragment.kt @@ -6,8 +6,8 @@ import android.widget.FrameLayout import android.widget.ImageView import android.widget.LinearLayout import androidx.core.content.ContextCompat -import com.gh.common.util.DisplayUtils -import com.gh.common.util.goneIf +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.utils.goneIf import com.gh.gamecenter.CommentDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentReplyAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentReplyAdapter.kt index 6ea35eb320..04a4964aa4 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentReplyAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentReplyAdapter.kt @@ -6,7 +6,7 @@ import android.view.ViewGroup import android.widget.LinearLayout import android.widget.RelativeLayout import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.dip2px +import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.R import com.gh.gamecenter.adapter.OnCommentCallBackListener import com.gh.gamecenter.databinding.StairsCommentItemBinding diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentViewHolder.kt index 46b04749c1..350b6cb3d9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentViewHolder.kt @@ -7,13 +7,20 @@ import android.view.View import android.widget.LinearLayout import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.util.* -import com.gh.common.util.ImageUtils.display -import com.gh.common.util.NumberUtils.transSimpleCount -import com.gh.common.view.CenterImageSpan +import com.gh.gamecenter.common.utils.ImageUtils.display +import com.gh.gamecenter.core.utils.NumberUtils.transSimpleCount +import com.gh.gamecenter.core.utils.CenterImageSpan import com.gh.gamecenter.R import com.gh.gamecenter.adapter.OnCommentCallBackListener +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.FastClickUtils +import com.gh.gamecenter.core.utils.SpanBuilder +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.ifLogin +import com.gh.gamecenter.common.utils.TextHelper +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.StairsCommentItemBinding import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.manager.UserManager @@ -170,20 +177,22 @@ class StairsCommentViewHolder( } holder.binding.sdvUserBadge.setOnClickListener { v -> - DialogUtils.showViewBadgeDialog(binding.root.context, commentEntity.user.badge) { - MtaHelper.onEvent( - "进入徽章墙_用户记录", - key, - commentEntity.user.name + "（" + commentEntity.user.id + "）" - ) - MtaHelper.onEvent("徽章中心", "进入徽章中心", key) - DirectUtils.directToBadgeWall( - binding.root.context, - commentEntity.user.id, - commentEntity.user.name, - commentEntity.user.icon - ) - } + DialogUtils.showViewBadgeDialog(binding.root.context, commentEntity.user.badge, object : ConfirmListener { + override fun onConfirm() { + MtaHelper.onEvent( + "进入徽章墙_用户记录", + key, + commentEntity.user.name + "（" + commentEntity.user.id + "）" + ) + MtaHelper.onEvent("徽章中心", "进入徽章中心", key) + DirectUtils.directToBadgeWall( + binding.root.context, + commentEntity.user.id, + commentEntity.user.name, + commentEntity.user.icon + ) + } + }) } var isVote = holder.binding.commentLikeCount.currentTextColor == ContextCompat.getColor( diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt index fdc487030c..636da08089 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt @@ -9,17 +9,20 @@ import androidx.annotation.StringRes import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType -import com.gh.common.syncpage.ISyncAdapterHandler -import com.gh.common.syncpage.SyncDataEntity -import com.gh.common.syncpage.SyncFieldConstants -import com.gh.common.syncpage.SyncPageRepository +import com.gh.gamecenter.common.constant.ItemViewType +import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler +import com.gh.gamecenter.common.syncpage.SyncDataEntity +import com.gh.gamecenter.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* -import com.gh.common.view.GridSpacingItemColorDecoration +import com.gh.gamecenter.common.view.GridSpacingItemColorDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.baselist.LoadType +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ItemArticleDetailCommentBinding import com.gh.gamecenter.databinding.ItemArticleDetailCommentFooterBinding import com.gh.gamecenter.databinding.PieceArticleDetailCommentFilterBinding @@ -581,7 +584,13 @@ abstract class BaseCommentAdapter( layoutManager = GridLayoutManager(context, 3) adapter = CommentPictureAdapter(context, comment.images!!, entrance) if (itemDecorationCount == 0) { - addItemDecoration(GridSpacingItemColorDecoration(context, 2, R.color.white)) + addItemDecoration( + GridSpacingItemColorDecoration( + context, + 2, + R.color.white + ) + ) } } } else { @@ -686,20 +695,22 @@ abstract class BaseCommentAdapter( } binding.badgeTv.setOnClickListener { - DialogUtils.showViewBadgeDialog(binding.root.context, comment.user.badge) { - MtaHelper.onEvent( - "进入徽章墙_用户记录", - "帖子详情-评论管理", - comment.user.name + "（" + comment.user.id + "）" - ) - MtaHelper.onEvent("徽章中心", "进入徽章中心", "帖子详情-评论管理") - DirectUtils.directToBadgeWall( - binding.root.context, - comment.user.id, - comment.user.name, - comment.user.icon - ) - } + DialogUtils.showViewBadgeDialog(binding.root.context, comment.user.badge, object : ConfirmListener { + override fun onConfirm() { + MtaHelper.onEvent( + "进入徽章墙_用户记录", + "帖子详情-评论管理", + comment.user.name + "（" + comment.user.id + "）" + ) + MtaHelper.onEvent("徽章中心", "进入徽章中心", "帖子详情-评论管理") + DirectUtils.directToBadgeWall( + binding.root.context, + comment.user.id, + comment.user.name, + comment.user.icon + ) + } + }) } binding.badgeIv.setOnClickListener { binding.badgeTv.performClick() } diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentFragment.kt index fb6c294bcb..78a5c7968b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentFragment.kt @@ -6,9 +6,9 @@ import android.view.View import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.DisplayUtils -import com.gh.common.view.CustomDividerItemDecoration -import com.gh.common.view.vertical_recycler.SnappingLinearLayoutManager +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.view.CustomDividerItemDecoration +import com.gh.gamecenter.common.view.vertical_recycler.SnappingLinearLayoutManager import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.gamecollection.detail.conversation.GameCollectionCommentConversationFragment 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 5dd9040229..58b0413184 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 @@ -3,15 +3,18 @@ package com.gh.gamecenter.qa.comment.base import android.annotation.SuppressLint import android.app.Application import androidx.lifecycle.MutableLiveData -import com.gh.common.json.json -import com.gh.common.syncpage.SyncDataEntity -import com.gh.common.syncpage.SyncFieldConstants -import com.gh.common.syncpage.SyncPageRepository +import com.gh.gamecenter.common.json.json +import com.gh.gamecenter.common.syncpage.SyncDataEntity +import com.gh.gamecenter.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadParams import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.baselist.LoadType +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.common.utils.observableToMain +import com.gh.gamecenter.common.utils.toRequestBody import com.gh.gamecenter.entity.CommentDraft import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.entity.MeEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationAdapter.kt index c9c82819b7..a2368747d4 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationAdapter.kt @@ -6,7 +6,7 @@ import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.dip2px +import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.databinding.ItemArticleDetailCommentBinding import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.qa.comment.base.BaseCommentAdapter diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationFragment.kt index b4062c022d..8122f97097 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationFragment.kt @@ -7,14 +7,15 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import com.ethanhua.skeleton.Skeleton -import com.gh.common.AppExecutor -import com.gh.common.syncpage.SyncDataEntity -import com.gh.common.syncpage.SyncFieldConstants -import com.gh.common.syncpage.SyncPageRepository -import com.gh.common.util.* +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.common.syncpage.SyncDataEntity +import com.gh.gamecenter.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.LoadType +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.databinding.FragmentArticleDetailCommentBinding import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.manager.UserManager @@ -36,7 +37,7 @@ class CommentConversationFragment : BaseCommentFragment) @@ -98,9 +98,9 @@ class ChooseActivityDialogFragment : BaseDialogFragment() { ChooseActivityDialogFragment().apply { arguments = bundleOf( TAG_ACTIVITY_ID to tagActivityId, - EntranceUtils.KEY_BBS_ID to bbsId, - EntranceUtils.KEY_LOCATION to location.value, - EntranceUtils.KEY_PARENT_TAG to parentTag + EntranceConsts.KEY_BBS_ID to bbsId, + EntranceConsts.KEY_LOCATION to location.value, + EntranceConsts.KEY_PARENT_TAG to parentTag ) }.show(activity.supportFragmentManager, ChooseActivityDialogFragment::class.java.name) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt index 0b6b62c833..63980379ba 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt @@ -9,9 +9,13 @@ import android.view.View import androidx.core.widget.doOnTextChanged import androidx.fragment.app.Fragment import com.gh.base.BaseActivity -import com.gh.base.adapter.FragmentAdapter +import com.gh.gamecenter.common.base.adapter.FragmentAdapter import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.doOnPageSelected +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.core.utils.doOnEnd import com.gh.gamecenter.databinding.DialogChooseForumBinding import com.gh.gamecenter.entity.CommunityEntity @@ -61,7 +65,8 @@ class ChooseForumActivity : BaseActivity() { mFragmentsList.add(ChooseForumContainerFragment.getInstance(ChooseForumContainerFragment.ChooseForumType.ATTENTION)) mFragmentsList.add(ChooseForumContainerFragment.getInstance(ChooseForumContainerFragment.ChooseForumType.HOT)) binding.viewPager.offscreenPageLimit = mFragmentsList.size - binding.viewPager.adapter = FragmentAdapter(supportFragmentManager, mFragmentsList, mTabTitleList) + binding.viewPager.adapter = + FragmentAdapter(supportFragmentManager, mFragmentsList, mTabTitleList) binding.tabLayout.setupWithViewPager(binding.viewPager) binding.tabIndicator.setupWithTabLayout(binding.tabLayout) binding.tabIndicator.setupWithViewPager(binding.viewPager) @@ -95,7 +100,7 @@ class ChooseForumActivity : BaseActivity() { fun chooseSuccess(community: CommunityEntity) { val intent = Intent() - intent.putExtra(EntranceUtils.KEY_COMMUNITY_DATA, community) + intent.putExtra(EntranceConsts.KEY_COMMUNITY_DATA, community) setResult(Activity.RESULT_OK, intent) finish() } diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerAdapter.kt index b6c0a51784..1f11b79381 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerAdapter.kt @@ -1,22 +1,24 @@ package com.gh.gamecenter.qa.dialog import android.content.Context -import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.utils.fromHtml +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.core.utils.HtmlUtils import com.gh.gamecenter.databinding.ForumItemBinding import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.ForumEntity -import com.gh.gamecenter.forum.detail.ForumDetailActivity -import com.gh.gamecenter.qa.entity.CommunitySelectEntity class ChooseForumContainerAdapter(content: Context, val type: String, val onSelectCallback: ((entity: CommunityEntity) -> Unit)? = null) : ListAdapter(content) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerFragment.kt index 1ca818801e..5df3344841 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerFragment.kt @@ -5,12 +5,11 @@ import android.view.View import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.common.util.NewLogUtils -import com.gh.common.util.viewModelProvider +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.ListFragment -import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.ForumEntity import com.gh.gamecenter.forum.detail.ForumDetailActivity @@ -22,7 +21,7 @@ class ChooseForumContainerFragment : ListFragment - DialogUtils.showViewBadgeDialog(mContext, entity.user.badge) { - MtaHelper.onEvent("进入徽章墙_用户记录", "插入文章-收藏文章列表", entity.user.name + "（" + entity.user.id + "）") - MtaHelper.onEvent("徽章中心", "进入徽章中心", "插入文章-收藏文章列表") - DirectUtils.directToBadgeWall(mContext, entity.user.id, entity.user.name, entity.user.icon) - } + DialogUtils.showViewBadgeDialog(mContext, entity.user.badge, object : ConfirmListener { + override fun onConfirm() { + MtaHelper.onEvent("进入徽章墙_用户记录", "插入文章-收藏文章列表", entity.user.name + "（" + entity.user.id + "）") + MtaHelper.onEvent("徽章中心", "进入徽章中心", "插入文章-收藏文章列表") + DirectUtils.directToBadgeWall(mContext, entity.user.id, entity.user.name, entity.user.icon) + } + }) } articleHolder.binding.tvBadgeName.setOnClickListener { v -> articleHolder.binding.sdvUserBadge.performClick() } diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleFragment.kt index db2ab8784a..a5788245d4 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleFragment.kt @@ -3,8 +3,8 @@ package com.gh.gamecenter.qa.editor import android.os.Bundle import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.viewModelProvider -import com.gh.common.view.CustomDividerItemDecoration +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.common.view.CustomDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.qa.entity.ArticleEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoActivity.kt index e6d21d7284..d7568313e1 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoActivity.kt @@ -4,10 +4,10 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils -import com.gh.common.util.MD5Utils -import com.gh.common.util.NetworkUtils +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.MD5Utils +import com.gh.gamecenter.common.utils.NetworkUtils import com.gh.gamecenter.R import com.gh.gamecenter.databinding.ActivityFullScreenVideoBinding import com.gh.gamecenter.forum.home.ForumScrollCalculatorHelper @@ -26,9 +26,9 @@ class FullScreenVideoActivity : BaseActivity() { DisplayUtils.hideNavigationBar(this) mBinding = ActivityFullScreenVideoBinding.bind(mContentView) - mVideoUrl = intent.getStringExtra(EntranceUtils.KEY_URL) ?: "" - val poster = intent.getStringExtra(EntranceUtils.KEY_POSTER_PATH) ?: "" - val title = intent.getStringExtra(EntranceUtils.KEY_NAVIGATION_TITLE) ?: "" + mVideoUrl = intent.getStringExtra(EntranceConsts.KEY_URL) ?: "" + val poster = intent.getStringExtra(EntranceConsts.KEY_POSTER_PATH) ?: "" + val title = intent.getStringExtra(EntranceConsts.KEY_NAVIGATION_TITLE) ?: "" mBinding.videoView.backBtn.setOnClickListener { finish() } setUpTopVideo(title, mVideoUrl, poster) } @@ -74,9 +74,9 @@ class FullScreenVideoActivity : BaseActivity() { companion object { fun start(context: Context, title: String, url: String, poster: String) { val intent = Intent(context, FullScreenVideoActivity::class.java) - intent.putExtra(EntranceUtils.KEY_URL, url) - intent.putExtra(EntranceUtils.KEY_NAVIGATION_TITLE, title) - intent.putExtra(EntranceUtils.KEY_POSTER_PATH, poster) + intent.putExtra(EntranceConsts.KEY_URL, url) + intent.putExtra(EntranceConsts.KEY_NAVIGATION_TITLE, title) + intent.putExtra(EntranceConsts.KEY_POSTER_PATH, poster) context.startActivity(intent) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoView.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoView.kt index 148ef3b8f5..083fe92e58 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoView.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoView.kt @@ -4,6 +4,7 @@ import android.app.Activity import android.app.Application import android.content.Context import android.os.Bundle +import android.provider.Settings import android.util.AttributeSet import android.view.GestureDetector import android.view.MotionEvent @@ -12,11 +13,16 @@ import android.view.View import android.widget.ImageView import android.widget.SeekBar import androidx.core.content.ContextCompat -import com.gh.common.constant.Constants -import com.gh.common.observer.MuteCallback -import com.gh.common.observer.VolumeObserver -import com.gh.common.util.* +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.observer.MuteCallback +import com.gh.gamecenter.common.observer.VolumeObserver import com.gh.gamecenter.R +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.debounceActionWithInterval +import com.gh.gamecenter.common.utils.rxTimer +import com.gh.gamecenter.common.utils.tryWithDefaultCatch +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.core.utils.MD5Utils import com.gh.gamecenter.databinding.LayoutFullScreenDetailVideoPortraitBinding import com.gh.gamecenter.forum.home.ForumScrollCalculatorHelper import com.gh.gamecenter.video.detail.CustomManager @@ -76,8 +82,8 @@ class FullScreenVideoView @JvmOverloads constructor(context: Context, attrs: Att debounceActionWithInterval(mBinding.errorBtn.id, 1000) { if (!NetworkUtils.isAvailable(mContext)) { Utils.toast(context, "网络异常，请检查手机网络状态") - setViewShowState(mStartButton, View.INVISIBLE) - mBinding.errorContainer.visibility = View.VISIBLE + setViewShowState(mStartButton, INVISIBLE) + mBinding.errorContainer.visibility = VISIBLE return@debounceActionWithInterval } startPlayLogic(false) @@ -98,7 +104,7 @@ class FullScreenVideoView @JvmOverloads constructor(context: Context, attrs: Att fun observeVolume(activity: Activity?) { tryWithDefaultCatch { activity?.applicationContext?.contentResolver?.registerContentObserver( - android.provider.Settings.System.CONTENT_URI, true, mVolumeObserver + Settings.System.CONTENT_URI, true, mVolumeObserver ) activity?.application?.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks { @@ -217,7 +223,7 @@ class FullScreenVideoView @JvmOverloads constructor(context: Context, attrs: Att // 这个库的 NetworkUtils.isWifiConnected 可能会触发空指针，这里换为我们自己的 if (!com.shuyu.gsyvideoplayer.utils.NetworkUtils.isAvailable(mContext) && !gsyVideoManager.isCacheFile) { Utils.toast(context, "网络异常，请检查手机网络状态") - } else if (!com.gh.common.util.NetworkUtils.isWifiConnected(mContext) && !gsyVideoManager.isCacheFile) { + } else if (!com.gh.gamecenter.common.utils.NetworkUtils.isWifiConnected(mContext) && !gsyVideoManager.isCacheFile) { Utils.toast(context, "当前为非Wi-Fi环境，请注意流量消耗") } }, 100) diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt index bddaa7d784..0da58f5794 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.qa.editor import android.content.Context import android.content.Intent import androidx.core.os.bundleOf -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity class GameActivity : NormalActivity() { @@ -15,7 +15,7 @@ class GameActivity : NormalActivity() { companion object { fun getIntent(context: Context, title: String): Intent { val bundle = bundleOf( - EntranceUtils.KEY_NAVIGATION_TITLE to title + EntranceConsts.KEY_NAVIGATION_TITLE to title ) return getTargetIntent(context, GameActivity::class.java, GameFragment::class.java, bundle) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/GameDefaultAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/GameDefaultAdapter.kt index 29e3173fd3..f663ae300b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/GameDefaultAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/GameDefaultAdapter.kt @@ -4,7 +4,7 @@ import android.app.Activity import android.content.Context import android.content.Intent import android.view.ViewGroup -import com.gh.common.util.ImageUtils +import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.R import com.gh.gamecenter.databinding.EditorInsertDefaultItemBinding import com.gh.gamecenter.entity.GameEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/GameDefaultItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/GameDefaultItemViewHolder.kt index 7a2bf32fff..1886e5deee 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/GameDefaultItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/GameDefaultItemViewHolder.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.qa.editor -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.databinding.EditorInsertDefaultItemBinding class GameDefaultItemViewHolder(val binding: EditorInsertDefaultItemBinding) : BaseRecyclerViewHolder(binding.root) \ No newline at end of file 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 a2ec7f0ef8..3b17ee0211 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 @@ -11,9 +11,9 @@ import android.widget.TextView import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.RecyclerView import com.gh.common.constant.Config -import com.gh.common.util.EntranceUtils -import com.gh.common.view.FixLinearLayoutManager -import com.gh.common.view.VerticalItemDecoration +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.view.FixLinearLayoutManager +import com.gh.gamecenter.common.view.VerticalItemDecoration import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment @@ -76,7 +76,7 @@ open class GameFragment : ListFragment(), AlbumMediaCollection.AlbumMediaC override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mChooseType = arguments?.getString(EntranceUtils.KEY_TYPE) ?: "" + mChooseType = arguments?.getString(EntranceConsts.KEY_TYPE) ?: "" mBinding.reuseTvNoneData.text = "暂无数据~" mBinding.listRv.layoutManager = GridLayoutManager(requireContext(), 3) mBinding.listRv.addItemDecoration(GridSpacingItemDecoration(3, 4F.dip2px(), false)) - val maxChooseCount = arguments?.getInt(EntranceUtils.KEY_CHOOSE_MAX_COUNT, 1) + val maxChooseCount = arguments?.getInt(EntranceConsts.KEY_CHOOSE_MAX_COUNT, 1) mAdapter = LocalMediaAdapter( requireContext(), mChooseType, maxChooseCount ?: 1, mEntrance diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/OnLinkClickListener.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/OnLinkClickListener.kt index 2800d52a81..2e45bfe995 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/OnLinkClickListener.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/OnLinkClickListener.kt @@ -3,9 +3,13 @@ package com.gh.gamecenter.qa.editor import android.content.Context import android.webkit.JavascriptInterface import com.gh.base.BaseActivity -import com.gh.common.AppExecutor +import com.gh.gamecenter.core.AppExecutor import com.gh.common.util.* import com.gh.gamecenter.GameDetailActivity +import com.gh.gamecenter.core.utils.GsonUtils +import com.gh.gamecenter.common.utils.clickToastByStatus +import com.gh.gamecenter.common.utils.tryWithDefaultCatch +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.MtaEvent import com.gh.gamecenter.entity.MyVideoEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/OnlineVideoFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/OnlineVideoFragment.kt index 8f944f01ad..0afb34c3e7 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/OnlineVideoFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/OnlineVideoFragment.kt @@ -6,9 +6,10 @@ import android.view.LayoutInflater import android.view.View import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.* -import com.gh.common.view.GridSpacingItemDecoration +import com.gh.gamecenter.common.view.GridSpacingItemDecoration import com.gh.gamecenter.baselist.ListFragment +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.databinding.FragmentLocalMediaBinding import com.gh.gamecenter.entity.MyVideoEntity import com.gh.gamecenter.video.upload.view.UploadVideoActivity diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoActivity.kt index 45421caa37..e610919c59 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoActivity.kt @@ -4,8 +4,8 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.R import com.zhihu.matisse.internal.entity.Item @@ -27,7 +27,7 @@ class PreviewVideoActivity : BaseActivity() { companion object { fun getIntent(context: Context,videos:ArrayList): Intent { val intent = Intent(context, PreviewVideoActivity::class.java) - intent.putExtra(EntranceUtils.KEY_VIDEO_LIST,videos) + intent.putExtra(EntranceConsts.KEY_VIDEO_LIST,videos) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoFragment.kt index 82eb2fad4a..d5cd681cf8 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoFragment.kt @@ -12,19 +12,21 @@ import androidx.recyclerview.widget.RecyclerView import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder import com.facebook.drawee.generic.RoundingParams import com.facebook.drawee.view.SimpleDraweeView -import com.gh.base.fragment.BaseFragment -import com.gh.base.fragment.WaitingDialogFragment +import com.gh.gamecenter.common.base.fragment.BaseFragment +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.common.util.* -import com.gh.common.view.GridSpacingItemColorDecoration +import com.gh.gamecenter.common.view.GridSpacingItemColorDecoration import com.gh.gamecenter.CropImageActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentPreviewVideoBinding import com.gh.gamecenter.databinding.ItemVideoSelectorBinding import com.gh.gamecenter.entity.LocalVideoEntity import com.gh.gamecenter.video.poster.PosterEditActivity import com.gh.gamecenter.video.upload.view.UploadVideoActivity import com.lightgame.adapter.BaseRecyclerAdapter -import com.lightgame.download.FileUtils import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.zhihu.matisse.internal.entity.Item @@ -45,7 +47,7 @@ class PreviewVideoFragment : BaseFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - mVideoItems = arguments?.getParcelableArrayList(EntranceUtils.KEY_VIDEO_LIST) + mVideoItems = arguments?.getParcelableArrayList(EntranceConsts.KEY_VIDEO_LIST) ?: arrayListOf() if (mVideoItems.isNotEmpty()) { mVideoItems.forEach { @@ -72,7 +74,14 @@ class PreviewVideoFragment : BaseFragment() { } mBinding.videoSelectorRv.adapter = mVideoSelectorAdapter mBinding.videoSelectorRv.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) - mBinding.videoSelectorRv.addItemDecoration(GridSpacingItemColorDecoration(requireContext(), 4, 0, R.color.transparent)) + mBinding.videoSelectorRv.addItemDecoration( + GridSpacingItemColorDecoration( + requireContext(), + 4, + 0, + R.color.transparent + ) + ) mBinding.confirmTv.setOnClickListener { val intent = Intent() intent.putExtra(LocalVideoEntity::class.java.name, mLocalVideoList) diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoView.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoView.kt index b9aaf54735..40711a9c06 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoView.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoView.kt @@ -2,14 +2,12 @@ package com.gh.gamecenter.qa.editor import android.content.Context import android.util.AttributeSet -import android.view.GestureDetector -import android.view.GestureDetector.SimpleOnGestureListener import android.view.MotionEvent import android.view.Surface import android.view.View import android.widget.ImageView import com.facebook.drawee.view.SimpleDraweeView -import com.gh.common.util.ImageUtils +import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.R import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer import com.shuyu.gsyvideoplayer.video.base.GSYVideoView diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAdapter.kt index bcb515912a..91db64a311 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAdapter.kt @@ -6,12 +6,14 @@ import android.content.Intent import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType -import com.gh.common.util.* +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter -import com.gh.gamecenter.baselist.NormalListViewModel +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.toSimpleCount +import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.databinding.VideoStatusItemBinding import com.gh.gamecenter.entity.MyVideoEntity import com.gh.gamecenter.video.VideoStatusItemViewHolder diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAlbumsSpanner.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAlbumsSpanner.kt index 132356a44b..b662aa15f2 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAlbumsSpanner.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAlbumsSpanner.kt @@ -1,6 +1,5 @@ package com.gh.gamecenter.qa.editor -import android.animation.ValueAnimator import android.content.Context import android.graphics.drawable.ColorDrawable import android.view.View @@ -8,7 +7,7 @@ import android.view.ViewGroup import android.widget.* import androidx.appcompat.widget.ListPopupWindow import androidx.core.content.ContextCompat -import com.gh.common.util.dip2px +import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.R class VideoAlbumsSpanner(val context: Context) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/entity/AnswerEntity.kt b/app/src/main/java/com/gh/gamecenter/qa/entity/AnswerEntity.kt index 88b76e931a..bee277b9c9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/entity/AnswerEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/entity/AnswerEntity.kt @@ -7,12 +7,12 @@ import androidx.room.Entity import androidx.room.Ignore import androidx.room.PrimaryKey import androidx.room.TypeConverters -import com.gh.common.annotation.SyncIgnore -import com.gh.common.annotation.SyncPage -import com.gh.common.constant.Constants -import com.gh.common.syncpage.SyncFieldConstants -import com.gh.common.util.SPUtils -import com.gh.common.util.TimeUtils +import com.gh.gamecenter.common.annotation.SyncIgnore +import com.gh.gamecenter.common.annotation.SyncPage +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.core.utils.TimeUtils import com.gh.gamecenter.entity.* import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.room.converter.* diff --git a/app/src/main/java/com/gh/gamecenter/qa/entity/ArticleEntity.kt b/app/src/main/java/com/gh/gamecenter/qa/entity/ArticleEntity.kt index 22d141b2cc..4399c6cf06 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/entity/ArticleEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/entity/ArticleEntity.kt @@ -6,12 +6,12 @@ import androidx.room.Entity import androidx.room.Ignore import androidx.room.PrimaryKey import androidx.room.TypeConverters -import com.gh.common.annotation.SyncIgnore -import com.gh.common.annotation.SyncPage -import com.gh.common.constant.Constants -import com.gh.common.syncpage.SyncFieldConstants -import com.gh.common.util.SPUtils -import com.gh.common.util.TimeUtils +import com.gh.gamecenter.common.annotation.SyncIgnore +import com.gh.gamecenter.common.annotation.SyncPage +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.core.utils.TimeUtils import com.gh.gamecenter.entity.* import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.room.converter.* diff --git a/app/src/main/java/com/gh/gamecenter/qa/entity/EditorInsertEntity.kt b/app/src/main/java/com/gh/gamecenter/qa/entity/EditorInsertEntity.kt index d5ef98465e..455dc8d14d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/entity/EditorInsertEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/entity/EditorInsertEntity.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.entity import android.os.Parcelable -import com.gh.common.util.eliminateDoubleQuote +import com.gh.gamecenter.common.utils.eliminateDoubleQuote import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.GamesCollectionEntity import com.gh.gamecenter.entity.MyVideoEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/entity/Questions.kt b/app/src/main/java/com/gh/gamecenter/qa/entity/Questions.kt index 1748e8982d..de4b39c69e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/entity/Questions.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/entity/Questions.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.entity import android.os.Parcelable -import com.gh.common.annotation.SyncPage -import com.gh.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.common.annotation.SyncPage +import com.gh.gamecenter.common.syncpage.SyncFieldConstants import com.gh.gamecenter.entity.MeEntity import com.google.gson.annotations.SerializedName import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowAdapter.kt index 022dae5d5e..9555bd5fc5 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowAdapter.kt @@ -5,8 +5,8 @@ package com.gh.gamecenter.qa.follow //import android.view.ViewGroup //import androidx.appcompat.app.AppCompatActivity //import androidx.recyclerview.widget.RecyclerView -//import com.gh.common.constant.ItemViewType -//import com.gh.common.syncpage.ISyncAdapterHandler +//import com.gh.gamecenter.common.constant.ItemViewType +//import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler //import com.gh.common.util.* //import com.gh.gamecenter.R //import com.gh.gamecenter.adapter.viewholder.FooterViewHolder diff --git a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowFragment.kt index dc0a339228..f20aa4bf9a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowFragment.kt @@ -13,7 +13,7 @@ package com.gh.gamecenter.qa.follow //import butterknife.BindView //import butterknife.OnClick //import com.facebook.drawee.view.SimpleDraweeView -//import com.gh.common.constant.Constants +//import com.gh.gamecenter.common.constant.Constants //import com.gh.common.util.* //import com.gh.gamecenter.R //import com.gh.gamecenter.baselist.ListFragment diff --git a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowMoreDialog.kt b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowMoreDialog.kt index f6d929b1fd..1e532529b9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowMoreDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowMoreDialog.kt @@ -9,11 +9,11 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.base.fragment.BaseDialogFragment +import com.gh.gamecenter.common.base.fragment.BaseDialogFragment import com.gh.common.util.DirectUtils -import com.gh.common.util.ImageUtils +import com.gh.gamecenter.common.utils.ImageUtils import com.gh.common.util.NewsUtils -import com.gh.common.util.toBinding +import com.gh.gamecenter.common.utils.toBinding import com.gh.gamecenter.databinding.DialogAskFollowMoreBinding import com.gh.gamecenter.databinding.ItemAskFollowMoreBinding import com.gh.gamecenter.entity.UserEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/AnswerDraftViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/myqa/AnswerDraftViewHolder.kt index 72893f3464..7570277168 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/AnswerDraftViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/AnswerDraftViewHolder.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.qa.myqa -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.databinding.AnswerDraftItemBinding class AnswerDraftViewHolder(val binding: AnswerDraftItemBinding): BaseRecyclerViewHolder(binding.root) diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/ConcernQuestionsAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/ConcernQuestionsAdapter.java index 8243ee9c5d..8a6f013bab 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/ConcernQuestionsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/ConcernQuestionsAdapter.java @@ -7,9 +7,9 @@ import android.view.ViewGroup; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; -import com.gh.base.OnListClickListener; -import com.gh.common.constant.ItemViewType; -import com.gh.common.syncpage.ISyncAdapterHandler; +import com.gh.gamecenter.common.callback.OnListClickListener; +import com.gh.gamecenter.common.constant.ItemViewType; +import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.baselist.ListAdapter; 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 adcaf10844..218cffbc82 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 @@ -8,7 +8,7 @@ import android.view.View; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.R; import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListFragment; @@ -42,7 +42,7 @@ public class ConcernQuestionsFragment extends ListFragment fragments) { String entrance = null; - if (getArguments() != null) entrance = getArguments().getString(EntranceUtils.KEY_ENTRANCE); + if (getArguments() != null) entrance = getArguments().getString(EntranceConsts.KEY_ENTRANCE); // fragments.add(ConcernQuestionsFragment.getInstance(entrance)); // fragments.add(MyQuestionsFragment.getInstance(entrance)); diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyQuestionsAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyQuestionsAdapter.java index 0c6c3ad23a..793160578b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyQuestionsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyQuestionsAdapter.java @@ -7,9 +7,9 @@ import android.view.ViewGroup; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; -import com.gh.base.OnListClickListener; -import com.gh.common.constant.ItemViewType; -import com.gh.common.syncpage.ISyncAdapterHandler; +import com.gh.gamecenter.common.callback.OnListClickListener; +import com.gh.gamecenter.common.constant.ItemViewType; +import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.baselist.ListAdapter; 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 53845217a9..823097350b 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 @@ -6,7 +6,7 @@ import android.view.View; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.R; import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListFragment; @@ -33,7 +33,7 @@ public class MyQuestionsFragment extends ListFragment(), } } else if (requestCode == ChooseForumActivity.CHOOSE_FORUM_REQUEST) { val community = - data.getParcelableExtra(EntranceUtils.KEY_COMMUNITY_DATA) + data.getParcelableExtra(EntranceConsts.KEY_COMMUNITY_DATA) mViewModel.communityEntity = community mViewModel.type = community?.type ?: "" if (mViewModel.questionEntity != null) { @@ -108,7 +117,7 @@ class QuestionEditActivity : BaseRichEditorActivity(), override fun onActivityDialogResult(requestCode: Int, resultCode: Int, data: Intent?) { if (requestCode == ChooseActivityDialogFragment.REQUEST_CODE && resultCode == Activity.RESULT_OK) { - getChooseSelectCallback().invoke(data?.getParcelableExtra(EntranceUtils.KEY_DATA)) + getChooseSelectCallback().invoke(data?.getParcelableExtra(EntranceConsts.KEY_DATA)) } } @@ -250,7 +259,7 @@ class QuestionEditActivity : BaseRichEditorActivity(), mBaseHandler.sendEmptyMessageDelayed(1, SAVE_DRAFTS_INTERVAL_TIME.toLong()) } else -> { // 新增问题 - var searchKey = intent.getStringExtra(EntranceUtils.KEY_QUESTIONS_SEARCH_KEY) + var searchKey = intent.getStringExtra(EntranceConsts.KEY_QUESTIONS_SEARCH_KEY) if (!searchKey.isNullOrEmpty() && searchKey.length > QuestionEditViewModel.QUESTION_TITLE_MAX_LENGTH) searchKey = searchKey.substring(0, QuestionEditViewModel.QUESTION_TITLE_MAX_LENGTH) @@ -313,7 +322,7 @@ class QuestionEditActivity : BaseRichEditorActivity(), mBinding.chooseForumTv.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null) mViewModel.isModeratorPatch = - intent.getBooleanExtra(EntranceUtils.KEY_QUESTION_MODERATOR_PATCH, false) + intent.getBooleanExtra(EntranceConsts.KEY_QUESTION_MODERATOR_PATCH, false) // 编辑问题时可能存在草稿 if (mViewModel.questionDraftEntity != null) { @@ -456,10 +465,12 @@ class QuestionEditActivity : BaseRichEditorActivity(), "图片正在上传中，确定取消吗？", "确定", "取消", - { - mViewModel.uploadImageSubscription!!.dispose() - mUploadImageCancelDialog?.dismiss() - mProcessingDialog?.dismiss() + object :ConfirmListener{ + override fun onConfirm() { + mViewModel.uploadImageSubscription!!.dispose() + mUploadImageCancelDialog?.dismiss() + mProcessingDialog?.dismiss() + } }, null ) @@ -803,7 +814,7 @@ class QuestionEditActivity : BaseRichEditorActivity(), // searchKey 补充到标题(新增问题) fun getIntent(context: Context, searchKey: String?): Intent { val intent = Intent(context, QuestionEditActivity::class.java) - intent.putExtra(EntranceUtils.KEY_QUESTIONS_SEARCH_KEY, searchKey) + intent.putExtra(EntranceConsts.KEY_QUESTIONS_SEARCH_KEY, searchKey) intent.putExtra(QuestionEditViewModel.QUESTION_FORM_SEARCH, true) return intent } @@ -838,7 +849,7 @@ class QuestionEditActivity : BaseRichEditorActivity(), fun getManagerIntent(context: Context, entity: QuestionsDetailEntity): Intent { val intent = Intent(context, QuestionEditActivity::class.java) intent.putExtra(QuestionsDetailEntity::class.java.simpleName, entity) - intent.putExtra(EntranceUtils.KEY_QUESTION_MODERATOR_PATCH, true) + intent.putExtra(EntranceConsts.KEY_QUESTION_MODERATOR_PATCH, true) return intent } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditViewModel.kt index 70ef6ed91a..5706763e75 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditViewModel.kt @@ -8,9 +8,14 @@ import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData import com.gh.base.BaseRichEditorViewModel import com.gh.base.RichType -import com.gh.base.fragment.WaitingDialogFragment +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.singleToMain +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toRequestBody +import com.gh.gamecenter.common.utils.tryWithDefaultCatch +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.ActivityLabelEntity import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.GameEntity @@ -18,7 +23,6 @@ import com.gh.gamecenter.entity.Permissions import com.gh.gamecenter.eventbus.EBReuse import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.mvvm.Resource -import com.gh.gamecenter.qa.BbsType import com.gh.gamecenter.qa.entity.QuestionDraftEntity import com.gh.gamecenter.qa.entity.QuestionsDetailEntity import com.gh.gamecenter.retrofit.BiResponse diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt index 43432d9a45..aa2f21dd64 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt @@ -14,11 +14,19 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders -import com.gh.base.fragment.BaseDialogWrapperFragment -import com.gh.base.fragment.BaseFragment -import com.gh.common.AppExecutor +import com.gh.gamecenter.common.base.fragment.BaseDialogWrapperFragment +import com.gh.gamecenter.common.base.fragment.BaseFragment +import com.gh.gamecenter.core.AppExecutor import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.utils.checkSameFromStringArray +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toObject +import com.gh.gamecenter.common.utils.TextHelper +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.QuestionsEditTagBinding import com.gh.gamecenter.entity.ErrorEntity import com.gh.gamecenter.entity.NotificationUgc @@ -47,7 +55,7 @@ class TagsSelectFragment : BaseFragment() { fun getInstance(detail: QuestionsDetailEntity): TagsSelectFragment { val bundle = Bundle() bundle.putParcelable(QuestionsDetailEntity::class.java.simpleName, detail) - bundle.putBoolean(EntranceUtils.KEY_QUESTION_MODERATOR_PATCH, true) + bundle.putBoolean(EntranceConsts.KEY_QUESTION_MODERATOR_PATCH, true) val fragment = TagsSelectFragment() fragment.arguments = bundle return fragment @@ -68,7 +76,7 @@ class TagsSelectFragment : BaseFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) mBinding = QuestionsEditTagBinding.bind(mCachedView) - val isModeratorPatch = arguments?.getBoolean(EntranceUtils.KEY_QUESTION_MODERATOR_PATCH) + val isModeratorPatch = arguments?.getBoolean(EntranceConsts.KEY_QUESTION_MODERATOR_PATCH) if (isModeratorPatch != null && isModeratorPatch) { mViewModel = ViewModelProviders.of(this).get(QuestionEditViewModel::class.java) mViewModel?.isModeratorPatch = isModeratorPatch @@ -148,11 +156,12 @@ class TagsSelectFragment : BaseFragment() { { mViewModel?.uploadPicAndPostQuestion(true) MtaHelper.onEvent("提交相似问题弹窗", UserManager.getInstance().community.name, "问题相似-继续提交") - }, - { - MtaHelper.onEvent("提交相似问题弹窗", UserManager.getInstance().community.name, "问题相似-去看看") - val intent = NewQuestionDetailActivity.getIntent(requireContext(), data?.questionId ?: "", mEntrance, "相似问题") - context?.startActivity(intent) + },object :ConfirmListener{ + override fun onConfirm() { + MtaHelper.onEvent("提交相似问题弹窗", UserManager.getInstance().community.name, "问题相似-去看看") + val intent = NewQuestionDetailActivity.getIntent(requireContext(), data?.questionId ?: "", mEntrance, "相似问题") + context?.startActivity(intent) + } }) } errorEntity?.code == 403067 -> { @@ -162,10 +171,12 @@ class TagsSelectFragment : BaseFragment() { data?.questionTitle, data?.getFollowCount().toString() + " 关注 · " + data?.answerCount + " 回答", null, "去看看", null, - { - MtaHelper.onEvent("提交重复问题弹窗", UserManager.getInstance().community.name, "问题重复-去看看") - val intent = NewQuestionDetailActivity.getIntent(requireContext(), data?.questionId ?: "", mEntrance, "重复问题") - context?.startActivity(intent) + object :ConfirmListener{ + override fun onConfirm() { + MtaHelper.onEvent("提交重复问题弹窗", UserManager.getInstance().community.name, "问题重复-去看看") + val intent = NewQuestionDetailActivity.getIntent(requireContext(), data?.questionId ?: "", mEntrance, "重复问题") + context?.startActivity(intent) + } }) } else -> { 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 cc799840ec..150e6b3d7e 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 @@ -10,7 +10,7 @@ import android.widget.AutoCompleteTextView import android.widget.BaseAdapter import android.widget.Filter import android.widget.Filterable -import com.gh.common.util.DisplayUtils +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.databinding.QuestionEditTitleSearchItemBinding import com.gh.gamecenter.qa.entity.QuestionsIndexEntity import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteActivity.java b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteActivity.java index 80fdbe2bef..615036f762 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteActivity.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.NormalActivity; import com.gh.gamecenter.qa.entity.QuestionsDetailEntity; @@ -17,7 +17,7 @@ public class QuestionsInviteActivity extends NormalActivity { public static Intent getIntent(Context context, QuestionsDetailEntity entity, String entrance) { Bundle bundle = new Bundle(); bundle.putParcelable(QuestionsDetailEntity.class.getSimpleName(), entity); - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance); return getTargetIntent(context, QuestionsInviteActivity.class, QuestionsInviteWrapperFragment.class, bundle); } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteAdapter.kt index 72865e6955..9489d5d865 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteAdapter.kt @@ -4,8 +4,8 @@ import android.content.Context import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.base.OnListClickListener -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.callback.OnListClickListener +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.DirectUtils import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteFragment.kt index 328679b4b8..39f746be44 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteFragment.kt @@ -3,11 +3,15 @@ package com.gh.gamecenter.qa.questions.invite import android.os.Bundle import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.baselist.LoadType +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.utils.ifLogin +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.qa.answer.detail.SimpleAnswerDetailActivity import com.gh.gamecenter.qa.entity.InviteEntity import com.gh.gamecenter.qa.entity.QuestionsDetailEntity @@ -25,7 +29,7 @@ class QuestionsInviteFragment : ListFragment { return Pair( - targetFragment.arguments?.getString(EntranceUtils.KEY_QUESTIONS_ID) ?: "", - targetFragment.arguments?.getParcelable(EntranceUtils.KEY_COMMUNITY_DATA)?.id + targetFragment.arguments?.getString(EntranceConsts.KEY_QUESTIONS_ID) ?: "", + targetFragment.arguments?.getParcelable(EntranceConsts.KEY_COMMUNITY_DATA)?.id ?: "") } @@ -39,9 +38,9 @@ class NewQuestionDetailActivity : NormalActivity() { @JvmStatic fun getIntent(context: Context, questionId: String, entrance: String, path: String): Intent { val intent = Intent(context, NewQuestionDetailActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) - intent.putExtra(EntranceUtils.KEY_QUESTIONS_ID, questionId) - intent.putExtra(EntranceUtils.KEY_PATH, path) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_QUESTIONS_ID, questionId) + intent.putExtra(EntranceConsts.KEY_PATH, path) return intent } @@ -51,21 +50,21 @@ class NewQuestionDetailActivity : NormalActivity() { @JvmStatic fun getCommentIntent(context: Context, questionId: String, entrance: String, path: String): Intent { val intent = Intent(context, NewQuestionDetailActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) - intent.putExtra(EntranceUtils.KEY_QUESTIONS_ID, questionId) - intent.putExtra(EntranceUtils.KEY_SCROLL_TO_COMMENT_AREA, true) - intent.putExtra(EntranceUtils.KEY_PATH, path) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_QUESTIONS_ID, questionId) + intent.putExtra(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, true) + intent.putExtra(EntranceConsts.KEY_PATH, path) return intent } @JvmStatic fun getCommentIntent(context: Context, questionId: String, answerId: String, entrance: String, path: String): Intent { val intent = Intent(context, NewQuestionDetailActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) - intent.putExtra(EntranceUtils.KEY_QUESTIONS_ID, questionId) - intent.putExtra(EntranceUtils.KEY_ANSWER_ID, answerId) - intent.putExtra(EntranceUtils.KEY_SCROLL_TO_COMMENT_AREA, true) - intent.putExtra(EntranceUtils.KEY_PATH, path) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_QUESTIONS_ID, questionId) + intent.putExtra(EntranceConsts.KEY_ANSWER_ID, answerId) + intent.putExtra(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, true) + intent.putExtra(EntranceConsts.KEY_PATH, path) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailAdapter.kt index 128082c565..9a239aaa48 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailAdapter.kt @@ -4,8 +4,8 @@ import android.content.Context import android.text.SpannableStringBuilder import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.SpanBuilder -import com.gh.common.view.CustomLinkMovementMethod +import com.gh.gamecenter.core.utils.SpanBuilder +import com.gh.gamecenter.common.view.CustomLinkMovementMethod import com.gh.gamecenter.R import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.databinding.ItemArticleDetailContentBinding diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt index 9db514d090..047f7fc992 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt @@ -15,12 +15,15 @@ import androidx.core.view.ViewCompat import androidx.lifecycle.Lifecycle import androidx.recyclerview.widget.RecyclerView import com.ethanhua.skeleton.Skeleton -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* import com.gh.gamecenter.ImageViewerActivity import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.LoadType +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.databinding.FragmentArticleDetailBinding import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.EBDeleteDetail @@ -66,9 +69,9 @@ class NewQuestionDetailFragment : super.onCreate(savedInstanceState) mScrollToCommentArea = - arguments?.getBoolean(EntranceUtils.KEY_SCROLL_TO_COMMENT_AREA, false) + arguments?.getBoolean(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, false) ?: false - mIsRecommendsContent = arguments?.getBoolean(EntranceUtils.KEY_RECOMMENDS_CONTENTS, false) + mIsRecommendsContent = arguments?.getBoolean(EntranceConsts.KEY_RECOMMENDS_CONTENTS, false) ?: false NewLogUtils.logQuestionDetailClick("view_question_detail") } @@ -121,14 +124,14 @@ class NewQuestionDetailFragment : ?: 0, "回答" ) updateFilterView() - if (EntranceUtils.ENTRANCE_WELCOME == mEntrance) { + if (EntranceConsts.ENTRANCE_WELCOME == mEntrance) { LogUtils.uploadCommentFromWelcomeDialog() } mViewModel.load(LoadType.REFRESH) } } else if (requestCode == MoreFunctionPanelDialog.REQUEST_CODE && resultCode == Activity.RESULT_OK) { mViewModel.questionDetail?.run { - getItemClickCallback(this).invoke(data.getParcelableExtra(EntranceUtils.KEY_DATA)) + getItemClickCallback(this).invoke(data.getParcelableExtra(EntranceConsts.KEY_DATA)) } } } @@ -244,7 +247,7 @@ class NewQuestionDetailFragment : mReuseNoData?.visibility = View.VISIBLE if (mIsRecommendsContent) { val data = Intent() - data.putExtra(EntranceUtils.KEY_ANSWER_ID, mViewModel.questionId) + data.putExtra(EntranceConsts.KEY_ANSWER_ID, mViewModel.questionId) requireActivity().setResult(Activity.RESULT_OK, data) DialogHelper.showDialog( requireContext(), @@ -451,10 +454,10 @@ class NewQuestionDetailFragment : return viewModelProvider( NewQuestionDetailViewModel.Factory( HaloApp.getInstance().application, - arguments?.getString(EntranceUtils.KEY_QUESTIONS_ID) ?: "", - arguments?.getParcelable(EntranceUtils.KEY_COMMUNITY_DATA)?.id + arguments?.getString(EntranceConsts.KEY_QUESTIONS_ID) ?: "", + arguments?.getParcelable(EntranceConsts.KEY_COMMUNITY_DATA)?.id ?: "", - arguments?.getString(EntranceUtils.KEY_ANSWER_ID) ?: "" + arguments?.getString(EntranceConsts.KEY_ANSWER_ID) ?: "" ) ) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailViewModel.kt index 79340dc3d5..46ca00e6ae 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailViewModel.kt @@ -5,16 +5,19 @@ import android.app.Application import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.gh.common.json.json -import com.gh.common.syncpage.SyncDataEntity -import com.gh.common.syncpage.SyncFieldConstants -import com.gh.common.syncpage.SyncPageRepository +import com.gh.gamecenter.common.json.json +import com.gh.gamecenter.common.syncpage.SyncDataEntity +import com.gh.gamecenter.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.baselist.LoadType +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.common.utils.observableToMain +import com.gh.gamecenter.common.utils.singleToMain +import com.gh.gamecenter.common.utils.toRequestBody import com.gh.gamecenter.entity.CommentEntity -import com.gh.gamecenter.entity.Permissions import com.gh.gamecenter.eventbus.EBUserFollow import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.article.detail.CommentItemData diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt index 7e41eb068f..dbf224cbc5 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt @@ -9,11 +9,14 @@ import android.widget.LinearLayout import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.common.DefaultUrlHandler -import com.gh.common.runOnUiThread +import com.gh.gamecenter.core.runOnUiThread import com.gh.common.util.* import com.gh.common.view.RichEditor import com.gh.gamecenter.ImageViewerActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ItemArticleDetailContentBinding import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.editor.OnLinkClickListener @@ -188,14 +191,16 @@ class QuestionDetailContentViewHolder( badgeTv.text = question.user.badge?.name ImageUtils.display(badgeIv, question.user.badge?.icon) badgeIv.setOnClickListener { - DialogUtils.showViewBadgeDialog(root.context, question.user.badge) { - DirectUtils.directToBadgeWall( - root.context, - question.user.id, - question.user.name, - question.user.icon - ) - } + DialogUtils.showViewBadgeDialog(root.context, question.user.badge, object : ConfirmListener { + override fun onConfirm() { + DirectUtils.directToBadgeWall( + root.context, + question.user.id, + question.user.name, + question.user.icon + ) + } + }) } badgeTv.setOnClickListener { badgeIv.performClick() } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsAdapter.java index b55a419b47..a6c7d624e1 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsAdapter.java @@ -10,11 +10,11 @@ //import android.view.View; //import android.view.ViewGroup; // -//import com.gh.base.OnListClickListener; -//import com.gh.common.constant.ItemViewType; -//import com.gh.common.syncpage.ISyncAdapterHandler; -//import com.gh.common.util.DialogHelper; -//import com.gh.common.util.MtaHelper; +//import com.gh.gamecenter.common.callback.OnListClickListener; +//import com.gh.gamecenter.common.constant.ItemViewType; +//import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler; +//import com.gh.gamecenter.common.utils.DialogHelper; +//import com.gh.gamecenter.core.utils.MtaHelper; //import com.gh.gamecenter.R; //import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; //import com.gh.gamecenter.adapter.viewholder.ReuseViewHolder; diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsFragment.java b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsFragment.java index 0c02c7204c..3c6409e16f 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsFragment.java @@ -18,13 +18,13 @@ //import androidx.fragment.app.Fragment; //import androidx.recyclerview.widget.RecyclerView; // -//import com.gh.common.constant.Constants; +//import com.gh.gamecenter.common.constant.Constants; //import com.gh.common.util.CheckLoginUtils; //import com.gh.common.util.EntranceUtils; //import com.gh.common.util.LogUtils; -//import com.gh.common.view.DumbRefreshLayout; -//import com.gh.common.view.SwipeRefreshHeader; -//import com.gh.common.view.VerticalItemDecoration; +//import com.gh.gamecenter.common.view.DumbRefreshLayout; +//import com.gh.gamecenter.common.view.SwipeRefreshHeader; +//import com.gh.gamecenter.common.view.VerticalItemDecoration; //import com.gh.gamecenter.R; //import com.gh.gamecenter.baselist.ListFragment; //import com.gh.gamecenter.baselist.LoadStatus; 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 24a053e120..58587944dd 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 @@ -12,7 +12,7 @@ //import androidx.lifecycle.MediatorLiveData; //import androidx.lifecycle.MutableLiveData; // -//import com.gh.common.util.UrlFilterUtils; +//import com.gh.gamecenter.core.utils.UrlFilterUtils; //import com.gh.gamecenter.R; //import com.gh.gamecenter.baselist.BaseListViewModel; //import com.gh.gamecenter.baselist.LoadStatus; diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendWrapperFragment.kt index 29f4c8b8d4..8aedac4c6e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendWrapperFragment.kt @@ -15,11 +15,11 @@ //import androidx.lifecycle.ViewModelProviders //import androidx.viewpager.widget.ViewPager //import com.facebook.drawee.view.SimpleDraweeView -//import com.gh.base.fragment.BaseFragment +//import com.gh.gamecenter.common.base.fragment.BaseFragment //import com.gh.common.util.* -//import com.gh.common.view.BugFixedPopupWindow -//import com.gh.common.view.DumbRefreshLayout -//import com.gh.common.view.SwipeRefreshHeader +//import com.gh.gamecenter.common.view.BugFixedPopupWindow +//import com.gh.gamecenter.common.view.DumbRefreshLayout +//import com.gh.gamecenter.common.view.SwipeRefreshHeader //import com.gh.gamecenter.R //import com.gh.gamecenter.entity.CommunityEntity //import com.gh.gamecenter.entity.LinkEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendsSubjectPageAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendsSubjectPageAdapter.java index 9b13be224a..e957557f3e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendsSubjectPageAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendsSubjectPageAdapter.java @@ -8,8 +8,8 @@ //import android.view.ViewGroup; // //import com.gh.common.util.DirectUtils; -//import com.gh.common.util.ImageUtils; -//import com.gh.common.util.MtaHelper; +//import com.gh.gamecenter.common.utils.ImageUtils; +//import com.gh.gamecenter.core.utils.MtaHelper; //import com.gh.gamecenter.R; //import com.gh.gamecenter.adapter.RecyclingPagerAdapter; //import com.gh.gamecenter.databinding.AskRecommendsSubjectItemBinding; diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt index 28ee764c69..16a1467d2f 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt @@ -4,8 +4,8 @@ //import android.view.ViewGroup //import androidx.core.content.ContextCompat //import com.gh.common.util.DirectUtils -//import com.gh.common.util.MtaHelper -//import com.gh.common.util.toColor +//import com.gh.gamecenter.core.utils.MtaHelper +//import com.gh.gamecenter.common.utils.toColor //import com.gh.gamecenter.R //import com.gh.gamecenter.databinding.AskRecommendsConcernListItemBinding //import com.gh.gamecenter.manager.UserManager diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernItemViewHolder.kt index f5e647b285..ac2a6f4efd 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernItemViewHolder.kt @@ -1,6 +1,6 @@ //package com.gh.gamecenter.qa.recommends // -//import com.gh.base.BaseRecyclerViewHolder +//import com.gh.gamecenter.common.base.BaseRecyclerViewHolder //import com.gh.gamecenter.databinding.AskRecommendsItemConcernBinding // //class RecommendConcernItemViewHolder(val binding: AskRecommendsItemConcernBinding) : BaseRecyclerViewHolder(binding.root) diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernListItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernListItemViewHolder.kt index 047c429157..5c989d8303 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernListItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernListItemViewHolder.kt @@ -1,6 +1,6 @@ //package com.gh.gamecenter.qa.recommends // -//import com.gh.base.BaseRecyclerViewHolder +//import com.gh.gamecenter.common.base.BaseRecyclerViewHolder //import com.gh.gamecenter.databinding.AskRecommendsConcernListItemBinding // //class RecommendConcernListItemViewHolder(val binding: AskRecommendsConcernListItemBinding) : BaseRecyclerViewHolder(binding.root) diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestAdapter.kt index ec331b6693..8b2a8fccfb 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestAdapter.kt @@ -4,8 +4,8 @@ //import android.view.View //import android.view.ViewGroup //import androidx.recyclerview.widget.RecyclerView -//import com.gh.common.constant.ItemViewType -//import com.gh.common.syncpage.ISyncAdapterHandler +//import com.gh.gamecenter.common.constant.ItemViewType +//import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler //import com.gh.gamecenter.R //import com.gh.gamecenter.adapter.viewholder.FooterViewHolder //import com.gh.gamecenter.baselist.ListAdapter 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 e706409ec5..d1e50dcf47 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 @@ -6,8 +6,8 @@ //import android.view.View //import androidx.lifecycle.ViewModelProviders //import androidx.recyclerview.widget.RecyclerView -//import com.gh.common.view.DumbRefreshLayout -//import com.gh.common.view.VerticalItemDecoration +//import com.gh.gamecenter.common.view.DumbRefreshLayout +//import com.gh.gamecenter.common.view.VerticalItemDecoration //import com.gh.gamecenter.baselist.ListFragment //import com.gh.gamecenter.baselist.LoadStatus //import com.gh.gamecenter.baselist.LoadType 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 dd35189e81..d2599a383f 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 @@ -23,10 +23,10 @@ //import com.gh.common.util.CheckLoginUtils; //import com.gh.common.util.EntranceUtils; //import com.gh.common.util.LogUtils; -//import com.gh.common.util.MtaHelper; -//import com.gh.common.util.PatternUtils; -//import com.gh.common.util.PermissionHelper; -//import com.gh.common.util.TextHelper; +//import com.gh.gamecenter.core.utils.MtaHelper; +//import com.gh.gamecenter.core.utils.PatternUtils; +//import com.gh.gamecenter.common.utils.PermissionHelper; +//import com.gh.gamecenter.common.utils.TextHelper; //import com.gh.gamecenter.R; //import com.gh.gamecenter.db.AskSearchHistoryDao; //import com.gh.gamecenter.eventbus.EBSearch; diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchFragment.java b/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchFragment.java index a692d126c7..d5c390dfdf 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchFragment.java @@ -4,7 +4,7 @@ //import android.text.TextUtils; //import android.view.View; // -//import com.gh.base.fragment.BaseFragment_TabLayout; +//import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout; //import com.gh.common.util.EntranceUtils; //import com.gh.gamecenter.R; //import com.gh.gamecenter.qa.search.artilce.ArticleFragment; diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchNormalItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchNormalItemViewHolder.java index 7e7893347f..c83a842f2d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchNormalItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchNormalItemViewHolder.java @@ -5,8 +5,8 @@ //import android.widget.TextView; // //import com.facebook.drawee.view.SimpleDraweeView; -//import com.gh.base.BaseRecyclerViewHolder; -//import com.gh.common.view.DrawableView; +//import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +//import com.gh.gamecenter.common.view.DrawableView; //import com.gh.gamecenter.R; //import com.gh.gamecenter.qa.entity.SearchHottestEntity; // diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchQuestionItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchQuestionItemViewHolder.kt index 3cc9d26e2a..8070dadbcf 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchQuestionItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchQuestionItemViewHolder.kt @@ -1,6 +1,6 @@ //package com.gh.gamecenter.qa.search // -//import com.gh.base.BaseRecyclerViewHolder +//import com.gh.gamecenter.common.base.BaseRecyclerViewHolder //import com.gh.gamecenter.databinding.AskSearchQuestionItemBinding // //class AskSearchQuestionItemViewHolder(val binding: AskSearchQuestionItemBinding) : BaseRecyclerViewHolder(binding.root) \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleAdapter.kt index 04a3e67456..5d3f0f92a6 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleAdapter.kt @@ -5,8 +5,8 @@ //import android.view.View //import android.view.ViewGroup //import androidx.recyclerview.widget.RecyclerView -//import com.gh.common.util.ImageUtils -//import com.gh.common.util.NumberUtils +//import com.gh.gamecenter.common.utils.ImageUtils +//import com.gh.gamecenter.core.utils.NumberUtils //import com.gh.gamecenter.R //import com.gh.gamecenter.baselist.NormalListViewModel //import com.gh.gamecenter.qa.entity.ArticleEntity 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 5efe2f4804..a1291b304c 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 @@ -3,7 +3,7 @@ //import androidx.lifecycle.ViewModelProviders //import android.text.TextUtils //import com.gh.common.util.EntranceUtils -//import com.gh.common.util.UrlFilterUtils +//import com.gh.gamecenter.core.utils.UrlFilterUtils //import com.gh.gamecenter.baselist.NormalListViewModel //import com.gh.gamecenter.manager.UserManager //import com.gh.gamecenter.qa.entity.ArticleEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/base/BaseAskSearchAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/base/BaseAskSearchAdapter.kt index 925195f131..e9154c9d1c 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/base/BaseAskSearchAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/base/BaseAskSearchAdapter.kt @@ -4,8 +4,8 @@ //import android.text.TextUtils //import android.view.View //import android.view.ViewGroup -//import com.gh.common.constant.ItemViewType -//import com.gh.common.syncpage.ISyncAdapterHandler +//import com.gh.gamecenter.common.constant.ItemViewType +//import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler //import com.gh.common.util.DirectUtils //import com.gh.gamecenter.R //import com.gh.gamecenter.adapter.viewholder.FooterViewHolder diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryFragment.kt index 6f5b35466d..dc9fa3776c 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryFragment.kt @@ -7,8 +7,8 @@ //import androidx.recyclerview.widget.RecyclerView //import android.view.View //import butterknife.OnClick -//import com.gh.base.fragment.BaseFragment -//import com.gh.common.util.DialogHelper +//import com.gh.gamecenter.common.base.fragment.BaseFragment +//import com.gh.gamecenter.common.utils.DialogHelper //import com.gh.common.util.DialogUtils //import com.gh.common.util.EntranceUtils //import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryFragmentAdapter.kt index 7cc16950f0..a5104736b1 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryFragmentAdapter.kt @@ -2,8 +2,8 @@ // //import android.content.Context //import android.view.ViewGroup -//import com.gh.base.BaseRecyclerViewHolder -//import com.gh.common.util.MtaHelper +//import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +//import com.gh.gamecenter.core.utils.MtaHelper //import com.gh.gamecenter.R //import com.gh.gamecenter.databinding.CommunitySearchHistoryItemBinding //import com.gh.gamecenter.db.AskSearchHistoryDao diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/history/HotFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/history/HotFragmentAdapter.kt index 0ddd65dbb0..64023749b1 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/history/HotFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/history/HotFragmentAdapter.kt @@ -2,8 +2,8 @@ // //import android.content.Context //import android.view.ViewGroup -//import com.gh.base.BaseRecyclerViewHolder -//import com.gh.common.util.MtaHelper +//import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +//import com.gh.gamecenter.core.utils.MtaHelper //import com.gh.gamecenter.R //import com.gh.gamecenter.databinding.CommunitySearchHotItemBinding //import com.gh.gamecenter.db.AskSearchHistoryDao diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestAdapter.kt index 2397c4a968..7f2a311bf9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestAdapter.kt @@ -7,11 +7,11 @@ //import android.text.style.LeadingMarginSpan //import android.view.View //import android.view.ViewGroup -//import com.gh.base.BaseRecyclerViewHolder -//import com.gh.common.constant.ItemViewType -//import com.gh.common.util.DisplayUtils -//import com.gh.common.util.ImageUtils -//import com.gh.common.util.NumberUtils +//import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +//import com.gh.gamecenter.common.constant.ItemViewType +//import com.gh.gamecenter.core.utils.DisplayUtils +//import com.gh.gamecenter.common.utils.ImageUtils +//import com.gh.gamecenter.core.utils.NumberUtils //import com.gh.gamecenter.R //import com.gh.gamecenter.baselist.NormalListViewModel //import com.gh.gamecenter.databinding.AskSearchQuestionItemBinding 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 4e2a1521e4..3017fe0729 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 @@ -2,7 +2,7 @@ // //import android.text.TextUtils //import androidx.lifecycle.ViewModelProviders -//import com.gh.common.util.UrlFilterUtils +//import com.gh.gamecenter.core.utils.UrlFilterUtils //import com.gh.gamecenter.baselist.NormalListViewModel //import com.gh.gamecenter.manager.UserManager //import com.gh.gamecenter.qa.entity.SearchHottestEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestAdapter.kt index b78c965603..05997b880a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestAdapter.kt @@ -5,9 +5,9 @@ //import android.text.Html //import android.view.View //import android.view.ViewGroup -//import com.gh.common.constant.ItemViewType -//import com.gh.common.util.ImageUtils -//import com.gh.common.util.NumberUtils +//import com.gh.gamecenter.common.constant.ItemViewType +//import com.gh.gamecenter.common.utils.ImageUtils +//import com.gh.gamecenter.core.utils.NumberUtils //import com.gh.gamecenter.R //import com.gh.gamecenter.baselist.NormalListViewModel //import com.gh.gamecenter.qa.entity.SearchNewestEntity 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 4d9e9fa3c9..0d2da831c6 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 @@ -2,7 +2,7 @@ // //import android.text.TextUtils //import androidx.lifecycle.ViewModelProviders -//import com.gh.common.util.UrlFilterUtils +//import com.gh.gamecenter.core.utils.UrlFilterUtils //import com.gh.gamecenter.baselist.NormalListViewModel //import com.gh.gamecenter.manager.UserManager //import com.gh.gamecenter.qa.entity.SearchNewestEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionAdapter.kt index aa868f24cf..6d305ad30d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionAdapter.kt @@ -4,7 +4,7 @@ //import android.text.Html //import android.view.ViewGroup //import androidx.recyclerview.widget.RecyclerView -//import com.gh.common.util.NumberUtils +//import com.gh.gamecenter.core.utils.NumberUtils //import com.gh.gamecenter.R //import com.gh.gamecenter.baselist.NormalListViewModel //import com.gh.gamecenter.databinding.AskSearchQuestionItemBinding 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 3d7a465fa3..2c8d39b086 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 @@ -2,7 +2,7 @@ // //import android.text.TextUtils //import androidx.lifecycle.ViewModelProviders -//import com.gh.common.util.UrlFilterUtils +//import com.gh.gamecenter.core.utils.UrlFilterUtils //import com.gh.gamecenter.baselist.NormalListViewModel //import com.gh.gamecenter.manager.UserManager //import com.gh.gamecenter.qa.entity.Questions 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 58927a4262..7c172d4c11 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 @@ -4,7 +4,7 @@ //import android.text.TextUtils //import androidx.lifecycle.Observer //import androidx.lifecycle.ViewModelProviders -//import com.gh.common.util.UrlFilterUtils +//import com.gh.gamecenter.core.utils.UrlFilterUtils //import com.gh.gamecenter.entity.FollowersOrFansEntity //import com.gh.gamecenter.manager.UserManager //import com.gh.gamecenter.qa.search.base.BaseAskSearchFragment diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/AskSelectGameItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/qa/select/AskSelectGameItemViewHolder.java index f5a642f890..c177073a93 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/AskSelectGameItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/qa/select/AskSelectGameItemViewHolder.java @@ -3,8 +3,8 @@ //import android.view.View; //import android.widget.TextView; // -//import com.gh.base.BaseRecyclerViewHolder; -//import com.gh.base.OnListClickListener; +//import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +//import com.gh.gamecenter.common.callback.OnListClickListener; //import com.gh.common.view.GameIconView; //import com.gh.gamecenter.R; //import com.gh.gamecenter.qa.entity.CommunitySelectEntity; diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectWrapperFragment.kt index 9aee916601..3218046dff 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectWrapperFragment.kt @@ -2,7 +2,7 @@ // //import android.os.Bundle //import androidx.fragment.app.Fragment -//import com.gh.base.fragment.BaseFragment_TabLayout +//import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout //import com.gh.gamecenter.R // //class CommunitiesSelectWrapperFragment : BaseFragment_TabLayout() { diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt index 01eafee74d..ec8ffb8af3 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt @@ -10,9 +10,9 @@ //import androidx.constraintlayout.widget.ConstraintLayout //import androidx.constraintlayout.widget.ConstraintSet //import androidx.core.content.ContextCompat -//import com.gh.common.constant.ItemViewType -//import com.gh.common.util.dip2px -//import com.gh.common.util.toColor +//import com.gh.gamecenter.common.constant.ItemViewType +//import com.gh.gamecenter.common.utils.dip2px +//import com.gh.gamecenter.common.utils.toColor //import com.gh.common.view.GameIconView //import com.gh.gamecenter.R //import com.gh.gamecenter.adapter.viewholder.FooterViewHolder diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedNameTextView.kt b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedNameTextView.kt index 0d10a524d9..12c7501e26 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedNameTextView.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedNameTextView.kt @@ -7,7 +7,7 @@ import android.util.AttributeSet import androidx.appcompat.widget.AppCompatTextView -import com.gh.common.util.dip2px +import com.gh.gamecenter.common.utils.dip2px class OpenedNameTextView : AppCompatTextView { diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewHolder.kt index 9a20aab8ff..073a7db76b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewHolder.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.qa.select -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.databinding.CommunitySelectOpenedHeadItemBinding import com.gh.gamecenter.databinding.CommunitySelectOpenedItemBinding 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 d2b165be6e..fa8ac89f22 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 @@ -1,14 +1,13 @@ package com.gh.gamecenter.qa.select import android.app.Application -import com.gh.common.util.UrlFilterUtils +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.manager.PackagesManager import com.gh.gamecenter.qa.entity.CommunitySelectEntity import com.gh.gamecenter.qa.entity.CommunitySelectOpenEntity import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp -import com.lightgame.utils.Utils import io.reactivex.Observable class OpenedViewModel(application: Application) : ListViewModel(application) { 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 67770b25c0..e7372b6367 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 @@ -13,9 +13,9 @@ import android.widget.ProgressBar; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; -import com.gh.common.util.BitmapUtils; +import com.gh.gamecenter.common.utils.BitmapUtils; import com.gh.common.util.PackageUtils; -import com.gh.common.util.UrlFilterUtils; +import com.gh.gamecenter.core.utils.UrlFilterUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.databinding.DialogVotingSelectGameItemBinding; import com.gh.gamecenter.entity.GameInstall; diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/VotingAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/select/VotingAdapter.java index 9d42b2f5da..50f7d5c206 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/VotingAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/select/VotingAdapter.java @@ -6,8 +6,8 @@ // //import androidx.recyclerview.widget.RecyclerView; // -//import com.gh.base.OnListClickListener; -//import com.gh.common.constant.ItemViewType; +//import com.gh.gamecenter.common.callback.OnListClickListener; +//import com.gh.gamecenter.common.constant.ItemViewType; //import com.gh.gamecenter.R; //import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; //import com.gh.gamecenter.adapter.viewholder.ReuseViewHolder; diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/VotingFragment.java b/app/src/main/java/com/gh/gamecenter/qa/select/VotingFragment.java index b329bd9e61..0cc2fb38ee 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/VotingFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/select/VotingFragment.java @@ -13,9 +13,9 @@ //import android.widget.ProgressBar; //import android.widget.TextView; // -//import com.gh.base.fragment.WaitingDialogFragment; +//import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment; //import com.gh.common.util.CheckLoginUtils; -//import com.gh.common.view.VerticalItemDecoration; +//import com.gh.gamecenter.common.view.VerticalItemDecoration; //import com.gh.gamecenter.GameDetailActivity; //import com.gh.gamecenter.R; //import com.gh.gamecenter.baselist.ListFragment; diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/VotingSelectGameViewHolder.java b/app/src/main/java/com/gh/gamecenter/qa/select/VotingSelectGameViewHolder.java index 5242fb2809..30d819b4ff 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/VotingSelectGameViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/qa/select/VotingSelectGameViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.qa.select; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.DialogVotingSelectGameItemBinding; public class VotingSelectGameViewHolder extends BaseRecyclerViewHolder { diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/VotingViewModel.java b/app/src/main/java/com/gh/gamecenter/qa/select/VotingViewModel.java index d5f17c06df..79c3c1ae51 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/VotingViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/qa/select/VotingViewModel.java @@ -6,9 +6,9 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.lifecycle.MutableLiveData; -import com.gh.common.exposure.meta.MetaUtil; +import com.gh.gamecenter.common.exposure.meta.MetaUtil; import com.gh.common.util.PackageUtils; -import com.gh.common.util.UrlFilterUtils; +import com.gh.gamecenter.core.utils.UrlFilterUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.baselist.ListViewModel; import com.gh.gamecenter.baselist.LoadType; diff --git a/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectAdapter.java index b637d91484..0795d405ef 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectAdapter.java @@ -4,9 +4,9 @@ //import android.view.View; //import android.view.ViewGroup; // -//import com.gh.base.OnListClickListener; -//import com.gh.common.constant.ItemViewType; -//import com.gh.common.syncpage.ISyncAdapterHandler; +//import com.gh.gamecenter.common.callback.OnListClickListener; +//import com.gh.gamecenter.common.constant.ItemViewType; +//import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler; //import com.gh.gamecenter.R; //import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; //import com.gh.gamecenter.baselist.ListAdapter; diff --git a/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectFragment.java b/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectFragment.java index f06c577f0b..89a0a6ed9b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectFragment.java @@ -8,11 +8,11 @@ //import android.view.View; //import android.widget.TextView; // -//import com.gh.common.TimeElapsedHelper; +//import com.gh.gamecenter.core.utils.TimeElapsedHelper; //import com.gh.common.util.DataUtils; -//import com.gh.common.util.DisplayUtils; +//import com.gh.gamecenter.core.utils.DisplayUtils; //import com.gh.common.util.EntranceUtils; -//import com.gh.common.view.VerticalItemDecoration; +//import com.gh.gamecenter.common.view.VerticalItemDecoration; //import com.gh.gamecenter.R; //import com.gh.gamecenter.baselist.ListAdapter; //import com.gh.gamecenter.baselist.ListFragment; diff --git a/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectItemViewHolder.kt index 49f36a0c84..80e706fac4 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectItemViewHolder.kt @@ -1,6 +1,6 @@ //package com.gh.gamecenter.qa.subject // -//import com.gh.base.BaseRecyclerViewHolder +//import com.gh.gamecenter.common.base.BaseRecyclerViewHolder //import com.gh.gamecenter.databinding.AskSubjectItemBinding //import com.gh.gamecenter.qa.entity.AskSubjectEntity // diff --git a/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectViewHolder.java b/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectViewHolder.java index 03e4489e7a..9218a99c61 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectViewHolder.java @@ -1,7 +1,7 @@ //package com.gh.gamecenter.qa.subject; // -//import com.gh.base.BaseRecyclerViewHolder; -//import com.gh.base.OnListClickListener; +//import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +//import com.gh.gamecenter.common.callback.OnListClickListener; //import com.gh.gamecenter.databinding.AskSubjectTopItemBinding; //import com.gh.gamecenter.qa.entity.AskSubjectEntity; // 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 b81872d0a9..b4d75a7223 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 @@ -5,7 +5,7 @@ import android.content.Context; import android.text.TextUtils; import com.gh.common.util.ErrorHelper; -import com.gh.common.util.GsonUtils; +import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.qa.entity.AskTagGroupsEntity; diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumTopVideoView.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumTopVideoView.kt index 1cdde81230..0d7dd5843d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumTopVideoView.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumTopVideoView.kt @@ -12,11 +12,14 @@ import android.widget.SeekBar import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager -import com.gh.common.constant.Constants -import com.gh.common.observer.MuteCallback -import com.gh.common.observer.VolumeObserver +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.observer.MuteCallback +import com.gh.gamecenter.common.observer.VolumeObserver import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.core.utils.MD5Utils import com.gh.gamecenter.databinding.LayoutForumVideoDetailVideoviewPortraitBinding import com.gh.gamecenter.entity.ForumVideoEntity import com.gh.gamecenter.forum.home.ForumScrollCalculatorHelper @@ -79,8 +82,8 @@ class ForumTopVideoView @JvmOverloads constructor(context: Context, attrs: Attri debounceActionWithInterval(mBinding.errorBtn.id, 1000) { if (!com.shuyu.gsyvideoplayer.utils.NetworkUtils.isAvailable(mContext)) { Utils.toast(context, "网络异常，请检查手机网络状态") - setViewShowState(mStartButton, View.INVISIBLE) - mBinding.errorContainer.visibility = View.VISIBLE + setViewShowState(mStartButton, INVISIBLE) + mBinding.errorContainer.visibility = VISIBLE return@debounceActionWithInterval } startPlayLogic(false) diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt index 3bb98439f0..77c420fb86 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt @@ -5,11 +5,11 @@ import android.content.Intent import android.os.Bundle import androidx.fragment.app.Fragment import com.gh.base.BaseActivity -import com.gh.base.fragment.BaseFragment_TabLayout.PAGE_INDEX -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout.PAGE_INDEX +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.R -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment class ForumVideoDetailActivity : BaseActivity() { var containerFragment: Fragment? = null @@ -45,8 +45,8 @@ class ForumVideoDetailActivity : BaseActivity() { fun getIntent(context: Context, videoId: String, bbsId: String, scrollToComment: Boolean = false): Intent { val intent = Intent(context, ForumVideoDetailActivity::class.java) - intent.putExtra(EntranceUtils.KEY_VIDEO_ID, videoId) - intent.putExtra(EntranceUtils.KEY_BBS_ID, bbsId) + intent.putExtra(EntranceConsts.KEY_VIDEO_ID, videoId) + intent.putExtra(EntranceConsts.KEY_BBS_ID, bbsId) if (scrollToComment) { intent.putExtra(PAGE_INDEX, 1) } 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 4c9f0a025c..f8fa4898cd 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 @@ -21,13 +21,16 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.Lifecycle import com.ethanhua.skeleton.Skeleton import com.ethanhua.skeleton.ViewSkeletonScreen -import com.gh.base.fragment.BaseFragment_TabLayout -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout +import com.gh.gamecenter.common.constant.Constants import com.gh.common.databind.BindingAdapters import com.gh.common.util.* import com.gh.download.DownloadManager import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentForumVideoDetailBinding import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.EBDeleteDetail @@ -89,12 +92,12 @@ class ForumVideoDetailFragment : BaseFragment_TabLayout() { override fun initFragmentList(fragments: MutableList) { fragments.add(VideoDescFragment().apply { - arguments = bundleOf(EntranceUtils.KEY_VIDEO_ID to mVideoId) + arguments = bundleOf(EntranceConsts.KEY_VIDEO_ID to mVideoId) mVideoDescFragment = this }) fragments.add(VideoCommentFragment().apply { arguments = - bundleOf(EntranceUtils.KEY_VIDEO_ID to mVideoId, EntranceUtils.KEY_BBS_ID to mBbsId) + bundleOf(EntranceConsts.KEY_VIDEO_ID to mVideoId, EntranceConsts.KEY_BBS_ID to mBbsId) mVideoCommentFragment = this }) } @@ -105,8 +108,8 @@ class ForumVideoDetailFragment : BaseFragment_TabLayout() { } override fun onCreate(savedInstanceState: Bundle?) { - mVideoId = arguments?.getString(EntranceUtils.KEY_VIDEO_ID) ?: "" - mBbsId = arguments?.getString(EntranceUtils.KEY_BBS_ID) ?: "" + mVideoId = arguments?.getString(EntranceConsts.KEY_VIDEO_ID) ?: "" + mBbsId = arguments?.getString(EntranceConsts.KEY_BBS_ID) ?: "" super.onCreate(savedInstanceState) NewLogUtils.logVideoDetailClick("view_video_detail") } @@ -702,11 +705,11 @@ class ForumVideoDetailFragment : BaseFragment_TabLayout() { } if (requestCode == MoreFunctionPanelDialog.REQUEST_CODE) { - getItemClickCallback().invoke(data.getParcelableExtra(EntranceUtils.KEY_DATA)) + getItemClickCallback().invoke(data.getParcelableExtra(EntranceConsts.KEY_DATA)) } if (requestCode == ChooseActivityDialogFragment.REQUEST_CODE) { - getChooseSelectCallback().invoke(data.getParcelableExtra(EntranceUtils.KEY_DATA)) + getChooseSelectCallback().invoke(data.getParcelableExtra(EntranceConsts.KEY_DATA)) } } 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 664441b9b1..e745d542da 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 @@ -5,17 +5,20 @@ import android.app.Application import android.net.Uri import android.text.TextUtils import androidx.lifecycle.* -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.history.HistoryDatabase -import com.gh.common.json.json -import com.gh.common.runOnIoThread +import com.gh.gamecenter.common.json.json +import com.gh.gamecenter.core.runOnIoThread import com.gh.common.util.* +import com.gh.gamecenter.common.utils.observableToMain +import com.gh.gamecenter.common.utils.toRequestBody +import com.gh.gamecenter.common.utils.tryCatchInRelease +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.* import com.gh.gamecenter.mvvm.Resource import com.gh.gamecenter.retrofit.BiResponse import com.gh.gamecenter.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager -import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel import com.google.gson.JsonObject import com.halo.assistant.HaloApp import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt index aff983da25..b4b556c039 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt @@ -6,15 +6,17 @@ import android.os.Bundle import android.view.View import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.common.syncpage.SyncDataEntity -import com.gh.common.syncpage.SyncFieldConstants -import com.gh.common.syncpage.SyncPageRepository +import com.gh.gamecenter.common.syncpage.SyncDataEntity +import com.gh.gamecenter.common.syncpage.SyncFieldConstants +import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* -import com.gh.common.view.CustomDividerItemDecoration +import com.gh.gamecenter.common.view.CustomDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.LazyListFragment import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.LoadType +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.databinding.FragmentVideoCommentListBinding import com.gh.gamecenter.entity.ForumVideoEntity import com.gh.gamecenter.manager.UserManager @@ -57,8 +59,8 @@ class VideoCommentFragment : LazyListFragment(binding.root) \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt index 6027c549a1..5c746729f9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt @@ -5,7 +5,7 @@ import android.content.Intent import android.os.Bundle import android.view.View import com.gh.base.ToolBarActivity -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R import com.gh.gamecenter.entity.* @@ -38,8 +38,8 @@ class VideoPublishActivity : NormalActivity() { bundle.putParcelable(GameEntity::class.java.simpleName, gameEntity) bundle.putString(BbsType::class.java.simpleName, type) bundle.putBoolean(VideoPublishFragment.IS_FORUM_SELECTION_DISABLED, disableForumSelection) - bundle.putString(EntranceUtils.KEY_ENTRANCE, ToolBarActivity.mergeEntranceAndPath(entrance, path)) - bundle.putString(EntranceUtils.KEY_PATH, path) + bundle.putString(EntranceConsts.KEY_ENTRANCE, ToolBarActivity.mergeEntranceAndPath(entrance, path)) + bundle.putString(EntranceConsts.KEY_PATH, path) return getTargetIntent(context, VideoPublishActivity::class.java, VideoPublishFragment::class.java, bundle) } @@ -47,8 +47,8 @@ class VideoPublishActivity : NormalActivity() { fun getIntent(context: Context, videoEntity: ForumVideoEntity, entrance: String, path: String): Intent { val bundle = Bundle() bundle.putParcelable(ForumVideoEntity::class.java.simpleName, videoEntity) - bundle.putString(EntranceUtils.KEY_ENTRANCE, ToolBarActivity.mergeEntranceAndPath(entrance, path)) - bundle.putString(EntranceUtils.KEY_PATH, path) + bundle.putString(EntranceConsts.KEY_ENTRANCE, ToolBarActivity.mergeEntranceAndPath(entrance, path)) + bundle.putString(EntranceConsts.KEY_PATH, path) return getTargetIntent(context, VideoPublishActivity::class.java, VideoPublishFragment::class.java, bundle) } @@ -56,8 +56,8 @@ class VideoPublishActivity : NormalActivity() { fun getDraftIntent(context: Context, draftEntity: VideoDraftEntity, entrance: String, path: String): Intent { val bundle = Bundle() bundle.putParcelable(VideoDraftEntity::class.java.simpleName, draftEntity) - bundle.putString(EntranceUtils.KEY_ENTRANCE, ToolBarActivity.mergeEntranceAndPath(entrance, path)) - bundle.putString(EntranceUtils.KEY_PATH, path) + bundle.putString(EntranceConsts.KEY_ENTRANCE, ToolBarActivity.mergeEntranceAndPath(entrance, path)) + bundle.putString(EntranceConsts.KEY_PATH, path) return getTargetIntent(context, VideoPublishActivity::class.java, VideoPublishFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishFragment.kt index 857382a16b..2c8fbd3b5e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishFragment.kt @@ -14,17 +14,20 @@ import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.core.widget.doOnTextChanged import com.gh.base.BaseRichEditorActivity -import com.gh.base.fragment.WaitingDialogFragment -import com.gh.common.AppExecutor -import com.gh.common.runOnUiThread +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.core.runOnUiThread import com.gh.common.util.* import com.gh.gamecenter.CropImageActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentVideoPublishBinding import com.gh.gamecenter.entity.* import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.mvvm.Status -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.gh.gamecenter.qa.BbsType import com.gh.gamecenter.qa.dialog.ChooseActivityDialogFragment import com.gh.gamecenter.qa.dialog.ChooseForumActivity @@ -315,7 +318,7 @@ class VideoPublishFragment : NormalFragment(), KeyboardHeightObserver { mBinding.videoPoster.setImageURI("file://$imagePath") mUpdatedPosterPath = imagePath ?: "" } else if (requestCode == ChooseForumActivity.CHOOSE_FORUM_REQUEST) { - val community = data.getParcelableExtra(EntranceUtils.KEY_COMMUNITY_DATA) + val community = data.getParcelableExtra(EntranceConsts.KEY_COMMUNITY_DATA) mViewModel.communityEntity = community mViewModel.type = community?.type ?: "" if (mViewModel.type == BbsType.GAME_BBS.value) { @@ -336,9 +339,9 @@ class VideoPublishFragment : NormalFragment(), KeyboardHeightObserver { setVideoDraft() } } else if (requestCode == ChooseActivityDialogFragment.REQUEST_CODE) { - getChooseSelectCallback().invoke(data.getParcelableExtra(EntranceUtils.KEY_DATA)) + getChooseSelectCallback().invoke(data.getParcelableExtra(EntranceConsts.KEY_DATA)) } else if (requestCode == InputUrlDialogFragment.REQUEST_CODE) { - getCallBack().invoke(data.getStringExtra(EntranceUtils.KEY_DATA) ?: "") + getCallBack().invoke(data.getStringExtra(EntranceConsts.KEY_DATA) ?: "") } } 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 b643d1e10c..458048c19b 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 @@ -9,9 +9,14 @@ import android.net.Uri import android.provider.MediaStore import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MediatorLiveData -import com.gh.base.fragment.WaitingDialogFragment -import com.gh.common.runOnIoThread +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment +import com.gh.gamecenter.core.runOnIoThread import com.gh.common.util.* +import com.gh.gamecenter.common.utils.observableToMain +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.tryCatchInRelease +import com.gh.gamecenter.common.utils.tryWithDefaultCatch +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.* import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.mvvm.Resource diff --git a/app/src/main/java/com/gh/gamecenter/receiver/ActivitySkipReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/ActivitySkipReceiver.java index c6fb4e785b..423c59cfff 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/ActivitySkipReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/ActivitySkipReceiver.java @@ -6,9 +6,9 @@ import android.content.Intent; import android.os.Bundle; import android.text.TextUtils; -import com.gh.common.util.ClassUtils; -import com.gh.common.util.ExtensionsKt; -import com.gh.common.util.RunningUtils; +import com.gh.gamecenter.core.utils.ClassUtils; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.utils.RunningUtils; import com.gh.gamecenter.SplashScreenActivity; /** diff --git a/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java index 98dde4cca4..d92eb6f11d 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java @@ -1,13 +1,13 @@ package com.gh.gamecenter.receiver; +import static com.gh.gamecenter.common.constant.EntranceConsts.ENTRANCE_DOWNLOAD; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import com.gh.common.util.DirectUtils; -import com.gh.common.util.ExtensionsKt; - -import static com.gh.common.util.EntranceUtils.ENTRANCE_DOWNLOAD; +import com.gh.gamecenter.common.utils.ExtensionsKt; /** * Created by LGT on 2016/10/10. 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 4397f9c9e7..fe1c17560b 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java @@ -4,9 +4,9 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.gh.common.AppExecutor; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.AppExecutor; import com.gh.common.util.DataUtils; -import com.gh.common.util.ExtensionsKt; import com.gh.common.util.InstallUtils; import com.gh.common.util.PackageHelper; import com.gh.common.util.PackageUtils; diff --git a/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java index 69e48dc8bf..8e8824fcfd 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java @@ -1,29 +1,29 @@ package com.gh.gamecenter.receiver; +import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_TO; + import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import com.gh.base.fragment.BaseFragment_ViewPager; -import com.gh.common.constant.Constants; import com.gh.common.util.DownloadNotificationHelper; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.ExtensionsKt; -import com.gh.common.util.GsonUtils; import com.gh.common.util.PackageInstaller; import com.gh.common.util.PackageUtils; -import com.gh.common.util.RunningUtils; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.SplashScreenActivity; -import com.gh.gamecenter.eventbus.EBMiPush; +import com.gh.gamecenter.common.base.fragment.BaseFragment_ViewPager; +import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.eventbus.EBMiPush; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.utils.GsonUtils; +import com.gh.gamecenter.core.utils.RunningUtils; import com.lightgame.download.DownloadEntity; import org.greenrobot.eventbus.EventBus; -import static com.gh.common.util.EntranceUtils.KEY_TO; - /** * Created by LGT on 2016/10/10. @@ -34,10 +34,10 @@ public class InstallReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { ExtensionsKt.doOnMainProcessOnly(context, () -> { - String path = intent.getStringExtra(EntranceUtils.KEY_PATH); + String path = intent.getStringExtra(EntranceConsts.KEY_PATH); DownloadEntity downloadEntity = null; try { - String downloadEntityString = intent.getStringExtra(EntranceUtils.KEY_DATA); + String downloadEntityString = intent.getStringExtra(EntranceConsts.KEY_DATA); downloadEntity = GsonUtils.fromJson(downloadEntityString, DownloadEntity.class); } catch (Exception e) { e.printStackTrace(); @@ -65,8 +65,8 @@ public class InstallReceiver extends BroadcastReceiver { } else { Intent intent2 = new Intent(context, DownloadManagerActivity.class); intent2.putExtra(BaseFragment_ViewPager.ARGS_INDEX, 0); - intent2.putExtra(EntranceUtils.KEY_PATH, path); - intent2.putExtra(EntranceUtils.KEY_ENTRANCE, "(安装跳转)"); + intent2.putExtra(EntranceConsts.KEY_PATH, path); + intent2.putExtra(EntranceConsts.KEY_ENTRANCE, "(安装跳转)"); intent2.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); context.startActivity(intent2); } @@ -75,8 +75,8 @@ public class InstallReceiver extends BroadcastReceiver { Bundle bundle = new Bundle(); bundle.putString(KEY_TO, DownloadManagerActivity.TAG); bundle.putInt(BaseFragment_ViewPager.ARGS_INDEX, 0); - bundle.putString(EntranceUtils.KEY_PATH, path); - bundle.putString(EntranceUtils.KEY_ENTRANCE, "(安装跳转)"); + bundle.putString(EntranceConsts.KEY_PATH, path); + bundle.putString(EntranceConsts.KEY_ENTRANCE, "(安装跳转)"); context.startActivity(SplashScreenActivity.getSplashScreenIntent(context, bundle)); } } 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 fb9b2ea101..8630a99306 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/NetworkStateReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/NetworkStateReceiver.java @@ -4,12 +4,12 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.gh.common.constant.Constants; +import com.gh.gamecenter.common.constant.Constants; import com.gh.common.filter.RegionSettingHelper; import com.gh.common.repository.ReservationRepository; -import com.gh.common.util.ExtensionsKt; -import com.gh.common.util.NetworkUtils; +import com.gh.gamecenter.common.utils.NetworkUtils; import com.gh.download.DownloadManager; +import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.eventbus.EBNetworkState; import com.halo.assistant.HaloApp; diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCache.java b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCache.java index 2482c1a0dd..be3b6750bb 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCache.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCache.java @@ -2,8 +2,8 @@ package com.gh.gamecenter.retrofit; import android.content.Context; -import com.gh.common.util.MD5Utils; -import com.gh.common.util.TimestampUtils; +import com.gh.gamecenter.core.utils.MD5Utils; +import com.gh.gamecenter.common.utils.TimestampUtils; import com.lightgame.download.FileUtils; import java.io.File; diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCacheInterceptor.java b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCacheInterceptor.java index 0c823515ca..877d2bf1eb 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCacheInterceptor.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCacheInterceptor.java @@ -3,11 +3,11 @@ package com.gh.gamecenter.retrofit; import android.content.Context; import android.text.TextUtils; -import com.gh.common.exposure.meta.MetaUtil; -import com.gh.common.util.GzipUtils; -import com.gh.common.util.NetworkUtils; +import com.gh.gamecenter.common.exposure.meta.MetaUtil; +import com.gh.gamecenter.core.utils.GzipUtils; +import com.gh.gamecenter.common.utils.NetworkUtils; import com.gh.common.util.PackageUtils; -import com.gh.common.util.TimestampUtils; +import com.gh.gamecenter.common.utils.TimestampUtils; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.manager.UserManager; import com.halo.assistant.HaloApp; diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpNetworkInterceptor.java b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpNetworkInterceptor.java index dacf3429f1..3d70656759 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpNetworkInterceptor.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpNetworkInterceptor.java @@ -2,9 +2,9 @@ package com.gh.gamecenter.retrofit; import android.content.Context; -import com.gh.common.util.GzipUtils; -import com.gh.common.util.NetworkUtils; -import com.gh.common.util.TimestampUtils; +import com.gh.gamecenter.core.utils.GzipUtils; +import com.gh.gamecenter.common.utils.NetworkUtils; +import com.gh.gamecenter.common.utils.TimestampUtils; import java.io.IOException; diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpRetryInterceptor.kt b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpRetryInterceptor.kt index 71af64c510..26c755559a 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpRetryInterceptor.kt +++ b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpRetryInterceptor.kt @@ -3,9 +3,9 @@ package com.gh.gamecenter.retrofit import android.content.Context import android.os.Build import android.text.TextUtils -import com.gh.common.exposure.meta.MetaUtil -import com.gh.common.util.DeviceUtils -import com.gh.common.util.MtaHelper +import com.gh.gamecenter.common.exposure.meta.MetaUtil +import com.gh.gamecenter.common.utils.DeviceUtils +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.manager.UserManager import com.halo.assistant.HaloApp diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/Response.java b/app/src/main/java/com/gh/gamecenter/retrofit/Response.java index d4fc399630..950e125cb6 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/Response.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/Response.java @@ -2,7 +2,7 @@ package com.gh.gamecenter.retrofit; import androidx.annotation.Nullable; -import com.gh.common.util.AppDebugConfig; +import com.gh.gamecenter.core.utils.AppDebugConfig; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.user.ApiResponse; diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java index 1e8120ea76..8725b229a4 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java @@ -1,6 +1,7 @@ package com.gh.gamecenter.retrofit.service; import com.gh.common.filter.RegionSetting; +import com.gh.gamecenter.entity.SettingsEntity; import com.gh.gamecenter.entity.*; import com.gh.gamecenter.gamedetail.entity.BigEvent; import com.gh.gamecenter.gamedetail.entity.NewGameDetailEntity; diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/AnswerUserConverter.java b/app/src/main/java/com/gh/gamecenter/room/converter/AnswerUserConverter.java index af2a8eadfa..1e93e191f4 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/AnswerUserConverter.java +++ b/app/src/main/java/com/gh/gamecenter/room/converter/AnswerUserConverter.java @@ -2,7 +2,7 @@ package com.gh.gamecenter.room.converter; import androidx.room.TypeConverter; -import com.gh.common.util.GsonUtils; +import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.entity.UserEntity; /** diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/ApkArrayListConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/ApkArrayListConverter.kt index 41c1470ed9..93721b71de 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/ApkArrayListConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/ApkArrayListConverter.kt @@ -1,11 +1,9 @@ package com.gh.gamecenter.room.converter import androidx.room.TypeConverter -import com.gh.common.util.toJson -import com.gh.common.util.toObject +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.entity.ApkEntity -import com.gh.gamecenter.entity.SimulatorEntity -import com.gh.gamecenter.entity.TagStyleEntity class ApkArrayListConverter { @TypeConverter diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/CommunityConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/CommunityConverter.kt index 3f65e2665e..ae02ce4ee6 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/CommunityConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/CommunityConverter.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.room.converter import androidx.room.TypeConverter -import com.gh.common.util.toJson -import com.gh.common.util.toObject +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.entity.CommunityEntity class CommunityConverter { diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/CommunityVideoConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/CommunityVideoConverter.kt index fa8bb29692..fa6d5a595a 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/CommunityVideoConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/CommunityVideoConverter.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.room.converter import androidx.room.TypeConverter -import com.gh.common.util.toJson -import com.gh.common.util.toObject +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.qa.entity.CommunityVideoEntity class CommunityVideoConverter { diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/CountConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/CountConverter.kt index 14413842c0..9a4c1321aa 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/CountConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/CountConverter.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.room.converter import androidx.room.TypeConverter -import com.gh.common.util.toJson -import com.gh.common.util.toObject +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.qa.entity.Count class CountConverter { diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/ImageInfoConverter.java b/app/src/main/java/com/gh/gamecenter/room/converter/ImageInfoConverter.java index fd2471d8a5..3db36c2cd9 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/ImageInfoConverter.java +++ b/app/src/main/java/com/gh/gamecenter/room/converter/ImageInfoConverter.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.room.converter; -import com.gh.common.util.GsonUtils; +import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.qa.entity.ImageInfo; import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/ListStringConverter.java b/app/src/main/java/com/gh/gamecenter/room/converter/ListStringConverter.java index 6f87a6317c..2dc3743b1e 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/ListStringConverter.java +++ b/app/src/main/java/com/gh/gamecenter/room/converter/ListStringConverter.java @@ -2,7 +2,7 @@ package com.gh.gamecenter.room.converter; import androidx.room.TypeConverter; -import com.gh.common.util.GsonUtils; +import com.gh.gamecenter.core.utils.GsonUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/MeConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/MeConverter.kt index ac95651b77..049886763e 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/MeConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/MeConverter.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.room.converter import androidx.room.TypeConverter -import com.gh.common.util.GsonUtils +import com.gh.gamecenter.core.utils.GsonUtils import com.gh.gamecenter.entity.MeEntity class MeConverter { diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/QuestionsConverter.java b/app/src/main/java/com/gh/gamecenter/room/converter/QuestionsConverter.java index 1ca4851375..ec88e04ea5 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/QuestionsConverter.java +++ b/app/src/main/java/com/gh/gamecenter/room/converter/QuestionsConverter.java @@ -2,7 +2,7 @@ package com.gh.gamecenter.room.converter; import androidx.room.TypeConverter; -import com.gh.common.util.GsonUtils; +import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.qa.entity.Questions; /** diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/SignDataConverter.java b/app/src/main/java/com/gh/gamecenter/room/converter/SignDataConverter.java index 5b40106b1a..46ad832fd8 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/SignDataConverter.java +++ b/app/src/main/java/com/gh/gamecenter/room/converter/SignDataConverter.java @@ -2,7 +2,7 @@ package com.gh.gamecenter.room.converter; import androidx.room.TypeConverter; -import com.gh.common.util.GsonUtils; +import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.entity.SignEntity; /** diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/SimpleGameConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/SimpleGameConverter.kt index 2ae56bf945..2475ee4485 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/SimpleGameConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/SimpleGameConverter.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.room.converter import androidx.room.TypeConverter -import com.gh.common.util.toJson -import com.gh.common.util.toObject +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.entity.SimpleGame class SimpleGameConverter { diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/SimpleGameListConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/SimpleGameListConverter.kt index e439911df1..00ac2be75c 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/SimpleGameListConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/SimpleGameListConverter.kt @@ -1,9 +1,8 @@ package com.gh.gamecenter.room.converter import androidx.room.TypeConverter -import com.gh.common.util.toJson -import com.gh.common.util.toObject -import com.gh.gamecenter.entity.ApkEntity +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.entity.SimpleGame class SimpleGameListConverter { diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/SimulatorConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/SimulatorConverter.kt index 7f12c074e1..904ae286f5 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/SimulatorConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/SimulatorConverter.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.room.converter import androidx.room.TypeConverter -import com.gh.common.util.toJson -import com.gh.common.util.toObject +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.entity.SimulatorEntity class SimulatorConverter { diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/StringArrayListConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/StringArrayListConverter.kt index 29d2d14577..dba07ceed5 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/StringArrayListConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/StringArrayListConverter.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.room.converter import androidx.room.TypeConverter -import com.gh.common.util.toJson -import com.gh.common.util.toObject +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toObject class StringArrayListConverter { diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/TagInfoListConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/TagInfoListConverter.kt index 9f07ce30c4..c47fc17a8d 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/TagInfoListConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/TagInfoListConverter.kt @@ -1,10 +1,8 @@ package com.gh.gamecenter.room.converter import androidx.room.TypeConverter -import com.gh.common.util.toJson -import com.gh.common.util.toObject -import com.gh.gamecenter.entity.ApkEntity -import com.gh.gamecenter.entity.SimpleGame +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.entity.TagInfoEntity class TagInfoListConverter { diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/TagStyleListConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/TagStyleListConverter.kt index 43b5602468..efb849b0de 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/TagStyleListConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/TagStyleListConverter.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.room.converter import androidx.room.TypeConverter -import com.gh.common.util.toJson -import com.gh.common.util.toObject +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.entity.TagStyleEntity class TagStyleListConverter { diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/ThumbnailConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/ThumbnailConverter.kt index 49e5c399df..e843d6fde4 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/ThumbnailConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/ThumbnailConverter.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.room.converter import androidx.room.TypeConverter -import com.gh.common.util.toJson -import com.gh.common.util.toObject +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.entity.ThumbnailEntity class ThumbnailConverter { diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/TimeConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/TimeConverter.kt index 7e89b1e27e..cfa2d98529 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/TimeConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/TimeConverter.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.room.converter import androidx.room.TypeConverter -import com.gh.common.util.toJson -import com.gh.common.util.toObject +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.qa.entity.TimeEntity class TimeConverter { diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/UserConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/UserConverter.kt index 28527fb87e..0b9e01e8ca 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/UserConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/UserConverter.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.room.converter import androidx.room.TypeConverter -import com.gh.common.util.toJson -import com.gh.common.util.toObject +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.entity.User class UserConverter { diff --git a/app/src/main/java/com/gh/gamecenter/room/converter/VideoInfoConverter.kt b/app/src/main/java/com/gh/gamecenter/room/converter/VideoInfoConverter.kt index 70d6b5ac66..b042300f77 100644 --- a/app/src/main/java/com/gh/gamecenter/room/converter/VideoInfoConverter.kt +++ b/app/src/main/java/com/gh/gamecenter/room/converter/VideoInfoConverter.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.room.converter import androidx.room.TypeConverter -import com.gh.common.util.toJson -import com.gh.common.util.toObject +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.entity.VideoInfo class VideoInfoConverter { diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt index c7fd36bf57..9913c24a4c 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt @@ -7,15 +7,21 @@ import android.view.View import android.view.ViewGroup import android.widget.TextView import androidx.recyclerview.widget.GridLayoutManager -import com.gh.base.fragment.BaseFragment +import com.gh.gamecenter.common.base.fragment.BaseFragment import com.gh.common.constant.Config import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureManager import com.gh.common.exposure.ExposureSource import com.gh.common.util.* -import com.gh.common.view.DrawableView +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.core.utils.PageSwitchDataHelper import com.gh.gamecenter.databinding.FragmentSearchDefaultBinding import com.gh.gamecenter.db.SearchHistoryDao import com.gh.gamecenter.entity.HotTagEntity diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultHotAdapter.kt b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultHotAdapter.kt index 122877d0d3..8382dd779c 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultHotAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultHotAdapter.kt @@ -3,11 +3,11 @@ package com.gh.gamecenter.search import android.content.Context import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.dip2px -import com.gh.common.util.toColor -import com.gh.common.util.toDrawable -import com.gh.common.util.tryWithDefaultCatch +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.R import com.gh.gamecenter.databinding.SearchDefaultHotItemBinding import com.gh.gamecenter.entity.SettingsEntity diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultViewModel.kt b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultViewModel.kt index 8e1e2c3b91..8e8bd97bda 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultViewModel.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.search import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData -import com.gh.common.runOnIoThread +import com.gh.gamecenter.core.runOnIoThread import com.gh.gamecenter.db.SearchHistoryDao class SearchDefaultViewModel(application: Application) : AndroidViewModel(application) { diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt index 55cecacebb..db8622eaa2 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt @@ -8,8 +8,8 @@ import android.view.ViewGroup import android.widget.LinearLayout import androidx.collection.ArrayMap import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.Constants -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.databind.BindingAdapters import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource @@ -23,6 +23,8 @@ import com.gh.gamecenter.SearchType import com.gh.gamecenter.adapter.viewholder.GameViewHolder import com.gh.gamecenter.adapter.viewholder.SearchHistoryViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FmSearchHistoryItemBinding import com.gh.gamecenter.databinding.LayoutSearchGameContentTagBinding import com.gh.gamecenter.databinding.SearchGameIndexItemBinding 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 180388180c..e0ba7a870d 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexFragment.kt @@ -8,7 +8,7 @@ import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan import android.view.View import androidx.core.content.ContextCompat -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.exposure.ExposureListener import com.gh.common.util.* import com.gh.common.xapk.XapkInstaller @@ -20,6 +20,9 @@ import com.gh.gamecenter.SearchType import com.gh.gamecenter.SuggestionActivity import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.baselist.LoadType +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.FragmentSearchResultBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.SettingsEntity @@ -67,7 +70,7 @@ class SearchGameIndexFragment : ListFragment { - DialogUtils.showBindPhoneDialog(requireContext()) { requireActivity().finish() } + DialogUtils.showBindPhoneDialog(requireContext(), object : ConfirmListener { + override fun onConfirm() { + requireActivity().finish() + } + }) } R.id.bind_phone_captcha -> { @@ -224,9 +233,11 @@ class BindPhoneFragment : NormalFragment() { val phoneNum: String = mBinding.bindPhoneEt.text.toString().trim { it <= ' ' }.replace(" ".toRegex(), "") // 更换手机号，当输入手机号和当前手机号相同则弹出提示 if (mChangePhone && phoneNum == oldPhoneNum) { - DialogUtils.showNoticeDialog(requireContext(), null, getString(R.string.change_phone_same)) { - mBinding.bindPhoneEt.setText("") - } + DialogUtils.showNoticeDialog(requireContext(), null, getString(R.string.change_phone_same), object : ConfirmListener { + override fun onConfirm() { + mBinding.bindPhoneEt.setText("") + } + }) return } @@ -245,16 +256,20 @@ class BindPhoneFragment : NormalFragment() { } } else { if (mChangePhone) { - mViewModel.reBindPhoneTwo(oldPhoneNum, - phoneNum, - mBinding.bindPhonePassEt.text.toString().trim(), - mBinding.bindPhoneInviteEt.text.toString().trim(), - requireContext()) + mViewModel.reBindPhoneTwo( + oldPhoneNum, + phoneNum, + mBinding.bindPhonePassEt.text.toString().trim(), + mBinding.bindPhoneInviteEt.text.toString().trim(), + requireContext() + ) } else { - mViewModel.bindPhoneTwo(phoneNum, - mBinding.bindPhonePassEt.text.toString().trim(), - mBinding.bindPhoneInviteEt.text.toString().trim(), - requireContext()) + mViewModel.bindPhoneTwo( + phoneNum, + mBinding.bindPhonePassEt.text.toString().trim(), + mBinding.bindPhoneInviteEt.text.toString().trim(), + requireContext() + ) } } } 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 223da0ef0f..9f985c994b 100644 --- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneViewModel.kt @@ -5,10 +5,10 @@ import android.app.Application import android.content.Context import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData -import com.gh.common.util.DeviceUtils -import com.gh.common.util.GsonUtils +import com.gh.gamecenter.common.utils.DeviceUtils +import com.gh.gamecenter.core.utils.GsonUtils import com.gh.common.util.LoginUtils -import com.gh.common.util.ToastUtils +import com.gh.gamecenter.core.utils.ToastUtils import com.gh.gamecenter.entity.ConflictUserEntity import com.gh.gamecenter.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager diff --git a/app/src/main/java/com/gh/gamecenter/security/SecurityActivity.kt b/app/src/main/java/com/gh/gamecenter/security/SecurityActivity.kt index 30c4b6cbe2..29b44cdddd 100644 --- a/app/src/main/java/com/gh/gamecenter/security/SecurityActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/security/SecurityActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.security import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R @@ -19,7 +19,7 @@ class SecurityActivity : NormalActivity() { @JvmStatic fun getIntent(context: Context, entrance: String, isLogoutStyle: Boolean = false): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance) + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance) bundle.putString(SecurityFragment.DISPLAY_TYPE, if (isLogoutStyle) { SecurityFragment.DisplayType.LOGOUT.value diff --git a/app/src/main/java/com/gh/gamecenter/security/SecurityFragment.kt b/app/src/main/java/com/gh/gamecenter/security/SecurityFragment.kt index 0ca0e3aa1f..700dd466a6 100644 --- a/app/src/main/java/com/gh/gamecenter/security/SecurityFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/security/SecurityFragment.kt @@ -3,14 +3,14 @@ package com.gh.gamecenter.security import android.content.Intent import android.os.Bundle import android.view.View -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.DirectUtils -import com.gh.common.util.EnvHelper +import com.gh.gamecenter.common.utils.EnvHelper import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentSecurityBinding import com.gh.gamecenter.eventbus.EBReuse import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.gh.gamecenter.personal.PersonalFragment import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServerTestActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServerTestActivity.kt index 19aa27be11..34e155ecaf 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServerTestActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServerTestActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.servers import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R @@ -25,7 +25,7 @@ class GameServerTestActivity : NormalActivity() { val bundle = Bundle() bundle.putString(GameServersTestFragment.TEST_COLUMN_ID, id) bundle.putString(GameServersTestFragment.TEST_TITLE, title) - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance) + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance) return getTargetIntent(context, GameServerTestActivity::class.java, GameServersTestFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServerTimeViewHolder.java b/app/src/main/java/com/gh/gamecenter/servers/GameServerTimeViewHolder.java index bda6db9785..cd3c6b6b99 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServerTimeViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServerTimeViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.servers; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.KaifuItemTimeBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt index 94f343788c..a852e46b1f 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt @@ -10,13 +10,13 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.Observer import androidx.viewpager.widget.ViewPager import com.gh.base.ToolBarActivity -import com.gh.base.adapter.FragmentAdapter -import com.gh.common.runOnIoThread -import com.gh.common.util.EntranceUtils -import com.gh.common.util.EntranceUtils.KEY_LAST_SELECTED_POSITION -import com.gh.common.util.MtaHelper -import com.gh.common.util.viewModelProviderFromParent -import com.gh.common.view.DrawableView +import com.gh.gamecenter.common.base.adapter.FragmentAdapter +import com.gh.gamecenter.core.runOnIoThread +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.constant.EntranceConsts.KEY_LAST_SELECTED_POSITION +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.common.utils.viewModelProviderFromParent +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.R import com.halo.assistant.HaloApp import com.lightgame.view.NoScrollableViewPager @@ -148,7 +148,7 @@ class GameServersActivity : ToolBarActivity() { @JvmStatic fun getIntent(context: Context, entrance: String, path: String): Intent { val intent = Intent(context, GameServersActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentAdapter.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentAdapter.kt index e49e49d5e5..c3e21af8a2 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentAdapter.kt @@ -13,12 +13,16 @@ import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.ExposureType import com.gh.common.exposure.IExposable import com.gh.common.util.* -import com.gh.common.view.DrawableView.getServerDrawableBySource +import com.gh.gamecenter.common.view.DrawableView.getServerDrawableBySource import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.GameTestViewHolder import com.gh.gamecenter.baselist.LoadStatus +import com.gh.gamecenter.core.utils.StringUtils +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.entity.GameEntity import com.lightgame.adapter.BaseRecyclerAdapter import java.text.SimpleDateFormat 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 622514422c..97d969d87b 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt @@ -12,16 +12,18 @@ import androidx.recyclerview.widget.RecyclerView import androidx.viewpager.widget.ViewPager import com.ethanhua.skeleton.Skeleton import com.ethanhua.skeleton.ViewSkeletonScreen -import com.gh.base.fragment.BaseFragment -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.base.fragment.BaseFragment +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureListener import com.gh.common.util.* -import com.gh.common.util.MtaHelper.onEvent +import com.gh.gamecenter.core.utils.MtaHelper.onEvent import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus import com.gh.download.DownloadManager import com.gh.gamecenter.R import com.gh.gamecenter.baselist.LoadStatus +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentKaifuContentBinding import com.gh.gamecenter.eventbus.EBDownloadStatus import com.lightgame.download.DataWatcher 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 dacde261ee..a773919903 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentViewModel.kt @@ -9,6 +9,9 @@ import androidx.lifecycle.MutableLiveData import com.gh.common.util.* import com.gh.download.DownloadManager import com.gh.gamecenter.baselist.LoadStatus +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.countOccurrences +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.ServerCalendarEntity import com.gh.gamecenter.entity.ServerPublishEntity @@ -104,7 +107,7 @@ class GameServersContentViewModel(application: Application) var fixedTopItem: GameEntity? = null // 当页面是由启动弹窗过来的第一或第二个页面的时候添加启动弹窗信息 - if (mEntrance.contains(EntranceUtils.ENTRANCE_WELCOME) + if (mEntrance.contains(EntranceConsts.ENTRANCE_WELCOME) && mEntrance.countOccurrences("+") <= 1) { entity.setWelcomeDialogInfoIfAvailable() } 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 896be41ed7..6464b839b1 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt @@ -10,12 +10,12 @@ import android.widget.CheckedTextView import android.widget.LinearLayout import android.widget.PopupWindow import android.widget.TextView -import com.gh.base.fragment.LazyFragment -import com.gh.common.util.EntranceUtils -import com.gh.common.util.MtaHelper -import com.gh.common.util.dip2px -import com.gh.common.util.toColor -import com.gh.common.view.DrawableView +import com.gh.gamecenter.common.base.fragment.LazyFragment +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentGameServersPublishBinding import com.gh.gamecenter.entity.ServersGameCategory @@ -69,7 +69,7 @@ class GameServersPublishFragment : LazyFragment() { } val bundle = arguments - bundle?.putString(EntranceUtils.KEY_TYPE, "开服") + bundle?.putString(EntranceConsts.KEY_TYPE, "开服") mContentFragment = childFragmentManager.findFragmentByTag(GameServersContentFragment::class.java.simpleName) as? GameServersContentFragment ?: GameServersContentFragment() mContentFragment.arguments = bundle diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestAdapter.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestAdapter.kt index e7c1e7d9c9..3d0fd1e128 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestAdapter.kt @@ -5,15 +5,15 @@ import android.util.SparseArray import android.view.ViewGroup import androidx.annotation.Nullable import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureEvent.Companion.createEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable import com.gh.common.util.DownloadItemUtils -import com.gh.common.util.StringUtils -import com.gh.common.util.dip2px -import com.gh.common.util.toBinding +import com.gh.gamecenter.core.utils.StringUtils +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toBinding import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder 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 f3242b48b2..92dbb41484 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt @@ -14,16 +14,23 @@ import androidx.recyclerview.widget.RecyclerView import androidx.viewpager.widget.ViewPager import com.ethanhua.skeleton.Skeleton import com.ethanhua.skeleton.ViewSkeletonScreen -import com.gh.base.fragment.LazyFragment -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.base.fragment.LazyFragment +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureListener import com.gh.common.exposure.ExposureSource import com.gh.common.util.* -import com.gh.common.view.DrawableView +import com.gh.gamecenter.common.view.DrawableView import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus import com.gh.download.DownloadManager import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.safelyGetInRelease +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.viewModelProviderFromParent +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.core.utils.PageSwitchDataHelper import com.gh.gamecenter.databinding.FragmentGameServersBinding import com.gh.gamecenter.databinding.FragmentKaifuContentBinding import com.gh.gamecenter.databinding.PopupServerStatusBinding @@ -146,8 +153,8 @@ class GameServersTestFragment : LazyFragment() { showDefaultFilter() } - val exposureSource = if (arguments?.getParcelable(EntranceUtils.KEY_EXPOSURE_SOURCE) != null) { - listOf(arguments?.getParcelable(EntranceUtils.KEY_EXPOSURE_SOURCE)!!) + val exposureSource = if (arguments?.getParcelable(EntranceConsts.KEY_EXPOSURE_SOURCE) != null) { + listOf(arguments?.getParcelable(EntranceConsts.KEY_EXPOSURE_SOURCE)!!) } else { null } 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 4f6b4e9ec5..8254de9d16 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestViewModel.kt @@ -11,8 +11,8 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.common.exposure.ExposureEntity import com.gh.common.util.ApkActiveUtils -import com.gh.common.util.TimeUtils -import com.gh.common.util.safelyGetInRelease +import com.gh.gamecenter.core.utils.TimeUtils +import com.gh.gamecenter.common.utils.safelyGetInRelease import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.ServerTestEntity import com.gh.gamecenter.retrofit.BiResponse diff --git a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt index 851cf29c64..b8af18f3f1 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt @@ -21,7 +21,7 @@ import com.bigkoo.pickerview.listener.OnTimeSelectListener import com.contrarywind.view.WheelView import com.gh.base.ToolBarActivity import com.gh.common.databind.AddKaiFuBindingAdapter -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.common.util.HaloWheelViewAdapter import com.gh.gamecenter.R import com.gh.gamecenter.databinding.ActivityKaifuAddBinding @@ -50,14 +50,14 @@ class AddKaiFuActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle("新增开服") - mSelectTime = intent.getLongExtra(EntranceUtils.KEY_KAIFU_SELECT_TIME, 0) + mSelectTime = intent.getLongExtra(EntranceConsts.KEY_KAIFU_SELECT_TIME, 0) // initViewModel mViewModel = ViewModelProviders.of(this).get(AddKaiFuViewModel::class.java) mViewModel?.initData( intent.getParcelableExtra(ServerCalendarEntity.TAG) ?: ServerCalendarEntity(), - intent.getParcelableArrayListExtra(EntranceUtils.KEY_KAIFU_LIST) ?: arrayListOf(), - intent.getStringExtra(EntranceUtils.KEY_GAMEID) ?: "") + intent.getParcelableArrayListExtra(EntranceConsts.KEY_KAIFU_LIST) ?: arrayListOf(), + intent.getStringExtra(EntranceConsts.KEY_GAMEID) ?: "") mViewModel?.postResult?.observe(this, androidx.lifecycle.Observer { it -> if (it == null) { toast(R.string.post_failure_hint) @@ -201,9 +201,9 @@ class AddKaiFuActivity : ToolBarActivity() { selectTime: Long): Intent { val intent = Intent(context, AddKaiFuActivity::class.java) intent.putExtra(ServerCalendarEntity.TAG, entity) - intent.putExtra(EntranceUtils.KEY_GAMEID, gameId) - intent.putParcelableArrayListExtra(EntranceUtils.KEY_KAIFU_LIST, kaifuList) - intent.putExtra(EntranceUtils.KEY_KAIFU_SELECT_TIME, selectTime) + intent.putExtra(EntranceConsts.KEY_GAMEID, gameId) + intent.putParcelableArrayListExtra(EntranceConsts.KEY_KAIFU_LIST, kaifuList) + intent.putExtra(EntranceConsts.KEY_KAIFU_SELECT_TIME, selectTime) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuPopupAdapter.kt b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuPopupAdapter.kt index e431d62097..8d82285621 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuPopupAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuPopupAdapter.kt @@ -4,10 +4,9 @@ import android.content.Context import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.R import com.gh.gamecenter.databinding.LayoutAddKaifuPopupItemBinding -import com.gh.gamecenter.entity.ApplyModeratorTaskEntity import com.lightgame.adapter.BaseRecyclerAdapter class AddKaiFuPopupAdapter( 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 ac349d4459..9734c528df 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 @@ -7,8 +7,8 @@ import android.text.Html import android.text.Spanned import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData -import com.gh.common.util.DialogHelper -import com.gh.common.util.GsonUtils +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.core.utils.GsonUtils import com.gh.gamecenter.entity.ServerCalendarEntity import com.gh.gamecenter.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager diff --git a/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuActivity.kt index 82440aaa41..96646027e2 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuActivity.kt @@ -7,8 +7,8 @@ import android.os.Bundle import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders import com.gh.base.ToolBarActivity -import com.gh.common.util.DialogHelper -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.R import com.gh.gamecenter.databinding.ActivityKaifuPatchBinding import com.gh.gamecenter.entity.ServerCalendarEntity @@ -32,7 +32,7 @@ class PatchKaifuActivity : ToolBarActivity() { mViewModel = ViewModelProviders.of(this).get(PatchKaifuViewModel::class.java) mViewModel?.initData( intent.getParcelableExtra(ServerCalendarEntity.TAG) ?: ServerCalendarEntity(), - intent.getStringExtra(EntranceUtils.KEY_GAMEID) ?: "" + intent.getStringExtra(EntranceConsts.KEY_GAMEID) ?: "" ) mViewModel?.postResult?.observe(this, Observer { if (it != null) { @@ -104,7 +104,7 @@ class PatchKaifuActivity : ToolBarActivity() { fun getIntent(context: Context, serverEntity: ServerCalendarEntity, gameId: String): Intent { val intent = Intent(context, PatchKaifuActivity::class.java) intent.putExtra(ServerCalendarEntity.TAG, serverEntity) - intent.putExtra(EntranceUtils.KEY_GAMEID, gameId) + intent.putExtra(EntranceConsts.KEY_GAMEID, gameId) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingActivity.kt b/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingActivity.kt index 9cb51ddd3b..2f5875b417 100644 --- a/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingActivity.kt @@ -2,7 +2,7 @@ package com.gh.gamecenter.setting import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R @@ -13,7 +13,7 @@ class GameDownloadSettingActivity : NormalActivity() { @JvmStatic fun getIntent(context: Context, entrance: String): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance) + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance) return getTargetIntent(context, GameDownloadSettingActivity::class.java, GameDownloadSettingFragment::class.java, bundle) } diff --git a/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingFragment.kt b/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingFragment.kt index bd32a43dde..634654074e 100644 --- a/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingFragment.kt @@ -9,14 +9,14 @@ import android.text.TextUtils import android.view.View import androidx.core.content.FileProvider import com.airbnb.lottie.LottieAnimationView -import com.gh.common.util.MtaHelper.onEvent +import com.gh.gamecenter.core.utils.MtaHelper.onEvent import com.gh.common.util.PackageUtils -import com.gh.common.util.SPUtils +import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.CleanApkActivity import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentGameDownloadSettingBinding -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import java.io.File class GameDownloadSettingFragment: NormalFragment() { diff --git a/app/src/main/java/com/gh/gamecenter/setting/VideoSettingActivity.kt b/app/src/main/java/com/gh/gamecenter/setting/VideoSettingActivity.kt index 490098c37a..1c6dfa4a03 100644 --- a/app/src/main/java/com/gh/gamecenter/setting/VideoSettingActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/setting/VideoSettingActivity.kt @@ -2,7 +2,7 @@ package com.gh.gamecenter.setting import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R @@ -13,7 +13,7 @@ class VideoSettingActivity : NormalActivity() { @JvmStatic fun getIntent(context: Context, entrance: String): Intent { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance) + bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance) return getTargetIntent(context, VideoSettingActivity::class.java, VideoSettingFragment::class.java, bundle) } diff --git a/app/src/main/java/com/gh/gamecenter/setting/VideoSettingFragment.kt b/app/src/main/java/com/gh/gamecenter/setting/VideoSettingFragment.kt index dad2a94ef7..02d0f7875a 100644 --- a/app/src/main/java/com/gh/gamecenter/setting/VideoSettingFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/setting/VideoSettingFragment.kt @@ -3,11 +3,11 @@ package com.gh.gamecenter.setting import android.os.Bundle import android.view.View import com.airbnb.lottie.LottieAnimationView -import com.gh.common.constant.Constants -import com.gh.common.util.SPUtils +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentVideoSettingBinding -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment class VideoSettingFragment: NormalFragment() { diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameFragment.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameFragment.kt index bd045a6d7c..7751402fe4 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameFragment.kt @@ -14,17 +14,20 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentStatePagerAdapter import androidx.lifecycle.Observer import androidx.viewpager.widget.PagerAdapter -import com.gh.base.fragment.BaseFragment_TabLayout -import com.gh.common.AppExecutor -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* import com.gh.common.util.DirectUtils.directToLinkPage -import com.gh.common.view.BugFixedPopupWindow +import com.gh.gamecenter.common.view.BugFixedPopupWindow import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.DialogSimulaorGameGuideBinding import com.gh.gamecenter.databinding.FragmentSimulatorGameBinding import com.gh.gamecenter.databinding.PopupSimulatorGuideBinding -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment class SimulatorGameFragment : NormalFragment() { @@ -98,7 +101,7 @@ class SimulatorGameFragment : NormalFragment() { mBinding.fragmentTabContainer.goneIf(list.size == 1) mTypeAliasList.add(entity.typeAlias) mFragmentsList.add(childFragmentManager.findFragmentByTag("android:switcher:${mBinding.fragmentViewPager.id}:$index") - ?: SimulatorGameListFragment().apply { with(bundleOf(EntranceUtils.KEY_SIMULATOR to entity)) }) + ?: SimulatorGameListFragment().apply { with(bundleOf(EntranceConsts.KEY_SIMULATOR to entity)) }) } if (mBinding.fragmentViewPager.adapter != 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 f2a346f925..298b54baae 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt @@ -19,19 +19,23 @@ import androidx.core.content.pm.ShortcutManagerCompat import androidx.core.graphics.drawable.IconCompat import androidx.recyclerview.widget.RecyclerView import com.g00fy2.versioncompare.Version -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.databind.BindingAdapters import com.gh.common.simulator.SimulatorDownloadManager import com.gh.common.simulator.SimulatorGameManager import com.gh.common.util.* -import com.gh.common.view.BugFixedPopupWindow +import com.gh.gamecenter.common.view.BugFixedPopupWindow import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.MainActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.GameViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.callback.BiCallback +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.SimulatorGameItemBinding import com.gh.gamecenter.databinding.SimulatorHeaderViewBinding import com.gh.gamecenter.entity.GameEntity @@ -431,9 +435,9 @@ class SimulatorGameListAdapter(context: Context, val shortcutInfoIntent = Intent(mContext, MainActivity::class.java) shortcutInfoIntent.run { action = Intent.ACTION_VIEW - putExtra(EntranceUtils.KEY_REQUIRE_REDIRECT, true) - putExtra(EntranceUtils.KEY_TO, EntranceUtils.HOST_LAUNCH_SIMULATOR_GAME) - putExtra(EntranceUtils.KEY_GAME, gameEntity.toJson()) + putExtra(EntranceConsts.KEY_REQUIRE_REDIRECT, true) + putExtra(EntranceConsts.KEY_TO, EntranceConsts.HOST_LAUNCH_SIMULATOR_GAME) + putExtra(EntranceConsts.KEY_GAME, gameEntity.toJson()) val info = ShortcutInfoCompat.Builder(mContext, gameName) .setIcon(IconCompat.createWithBitmap(bitmap)) .setShortLabel(gameName) 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 96928464b3..274dbe57e5 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListFragment.kt @@ -2,11 +2,11 @@ package com.gh.gamecenter.simulatorgame import android.os.Bundle import android.view.View -import com.gh.common.AppExecutor -import com.gh.common.util.EntranceUtils -import com.gh.common.util.safelyGetInRelease -import com.gh.common.util.viewModelProvider -import com.gh.common.util.viewModelProviderFromParent +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.safelyGetInRelease +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.common.utils.viewModelProviderFromParent import com.gh.download.DownloadManager import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.baselist.LoadType @@ -69,7 +69,7 @@ class SimulatorGameListFragment : ListFragment() override fun getStubLayoutId() = R.layout.fragment_list_base_skeleton_stub override fun getItemDecoration(): RecyclerView.ItemDecoration? { - return if (arguments?.getBoolean(EntranceUtils.KEY_IS_HOME) == true) { + return if (arguments?.getBoolean(EntranceConsts.KEY_IS_HOME) == true) { null } else { SpacingItemDecoration(onlyDecorateTheFirstItem = true, top = DisplayUtils.dip2px(1F)) @@ -64,7 +67,7 @@ class SubjectListFragment : LazyListFragment() mAdapter = SubjectAdapter(requireContext(), mListViewModel, mSubjectViewModel, - arguments?.getString(EntranceUtils.KEY_ENTRANCE), + arguments?.getString(EntranceConsts.KEY_ENTRANCE), mIsColumnCollection) } return mAdapter as SubjectAdapter @@ -73,10 +76,10 @@ class SubjectListFragment : LazyListFragment() override fun provideListViewModel(): SubjectListViewModel { val factory = SubjectListViewModel.Factory( HaloApp.getInstance().application, - arguments?.getParcelable(EntranceUtils.KEY_SUBJECT_DATA)!!, - arguments?.getParcelable(EntranceUtils.KEY_EXPOSURE_SOURCE)) + arguments?.getParcelable(EntranceConsts.KEY_SUBJECT_DATA)!!, + arguments?.getParcelable(EntranceConsts.KEY_EXPOSURE_SOURCE)) if (requireContext() is SubjectActivity) { - requireActivity().intent.getParcelableExtra(EntranceUtils.KEY_SUBJECT_DATA)?.let { + requireActivity().intent.getParcelableExtra(EntranceConsts.KEY_SUBJECT_DATA)?.let { val f = SubjectViewModel.Factory(HaloApp.getInstance().application, it) mSubjectViewModel = viewModelProviderFromParent(f) } @@ -85,12 +88,12 @@ class SubjectListFragment : LazyListFragment() } override fun onFragmentFirstVisible() { - mIsColumnCollection = arguments?.getBoolean(EntranceUtils.KEY_IS_COLUMN_COLLECTION, false) ?: false + mIsColumnCollection = arguments?.getBoolean(EntranceConsts.KEY_IS_COLUMN_COLLECTION, false) ?: false super.onFragmentFirstVisible() (mListViewModel as SubjectListViewModel).lastPageDataMap = arguments?.get(SubjectFragment.LAST_PAGE_DATA) as? HashMap mCachedView?.setBackgroundColor(R.color.background_white.toColor(requireContext())) - val skeletonLayoutId = when (arguments?.getString(EntranceUtils.KEY_SUBJECT_TYPE) ?: "") { + val skeletonLayoutId = when (arguments?.getString(EntranceConsts.KEY_SUBJECT_TYPE) ?: "") { "detail" -> R.layout.fragment_subject_detail_skeleton "tab" -> R.layout.fragment_subject_tab_skeleton else -> R.layout.fragment_subject_skeleton 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 ef449fb83a..dc3d27f69b 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt @@ -5,7 +5,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.ExposureUtils -import com.gh.common.util.TimeUtils +import com.gh.gamecenter.core.utils.TimeUtils import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.baselist.LoadType diff --git a/app/src/main/java/com/gh/gamecenter/subject/rows/SubjectRowsFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/rows/SubjectRowsFragment.kt index 5313124815..0f46ae0eb1 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/rows/SubjectRowsFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/rows/SubjectRowsFragment.kt @@ -7,11 +7,11 @@ import android.view.ViewGroup import android.widget.CheckedTextView import android.widget.LinearLayout import androidx.core.view.children -import com.gh.base.fragment.BaseFragment -import com.gh.common.util.EntranceUtils -import com.gh.common.util.MtaHelper -import com.gh.common.util.UrlFilterUtils -import com.gh.common.util.goneIf +import com.gh.gamecenter.common.base.fragment.BaseFragment +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.core.utils.UrlFilterUtils +import com.gh.gamecenter.common.utils.goneIf import com.gh.common.view.ConfigFilterView import com.gh.gamecenter.R import com.gh.gamecenter.entity.SubjectData @@ -40,7 +40,7 @@ class SubjectRowsFragment : BaseFragment() { super.initView(view) mSettingEntity = arguments?.getParcelable(SubjectSettingEntity::class.java.simpleName) ?: return - mSubjectData = arguments?.getParcelable(EntranceUtils.KEY_SUBJECT_DATA) ?: return + mSubjectData = arguments?.getParcelable(EntranceConsts.KEY_SUBJECT_DATA) ?: return val labels = mSettingEntity.typeEntity.labels for (label in labels) { diff --git a/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt index 3563e31b05..df845275a0 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt @@ -9,9 +9,13 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentStatePagerAdapter import androidx.viewpager.widget.ViewPager -import com.gh.base.fragment.BaseFragment -import com.gh.common.util.* +import com.gh.gamecenter.common.base.fragment.BaseFragment import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.databinding.FragmentSubjectTabBinding import com.gh.gamecenter.entity.SubjectData import com.gh.gamecenter.entity.SubjectSettingEntity @@ -28,13 +32,13 @@ class SubjectTabFragment : BaseFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - val mSubjectList = arguments?.getParcelableArrayList(EntranceUtils.KEY_DATA) + val mSubjectList = arguments?.getParcelableArrayList(EntranceConsts.KEY_DATA) val fragments = ArrayList() var tagList = arrayListOf() val fragmentTag = "android:switcher:${mBinding.subjectViewpager.id}:" if (mSubjectList.isNullOrEmpty()) { // 专题详情 - val subjectData = arguments?.getParcelable(EntranceUtils.KEY_SUBJECT_DATA) + val subjectData = arguments?.getParcelable(EntranceConsts.KEY_SUBJECT_DATA) ?: return val settingsEntity = arguments?.getParcelable(SubjectSettingEntity::class.java.simpleName) ?: return @@ -52,8 +56,8 @@ class SubjectTabFragment : BaseFragment() { } else { UrlFilterUtils.getFilterQuery("tags", tag) } - bundle?.putParcelable(EntranceUtils.KEY_SUBJECT_DATA, copyData) - bundle?.putString(EntranceUtils.KEY_SUBJECT_TYPE, "detail") + bundle?.putParcelable(EntranceConsts.KEY_SUBJECT_DATA, copyData) + bundle?.putString(EntranceConsts.KEY_SUBJECT_TYPE, "detail") element.arguments = bundle fragments.add(element) } @@ -65,8 +69,8 @@ class SubjectTabFragment : BaseFragment() { val element = childFragmentManager.findFragmentByTag("${fragmentTag}$index") ?: SubjectListFragment() val bundle = arguments?.clone() as Bundle? - bundle?.putParcelable(EntranceUtils.KEY_SUBJECT_DATA, subjectData) - bundle?.putString(EntranceUtils.KEY_SUBJECT_TYPE, "tab") + bundle?.putParcelable(EntranceConsts.KEY_SUBJECT_DATA, subjectData) + bundle?.putString(EntranceConsts.KEY_SUBJECT_TYPE, "tab") element.arguments = bundle fragments.add(element) @@ -75,8 +79,8 @@ class SubjectTabFragment : BaseFragment() { mBinding.subjectViewpager.post { mBinding.subjectViewpager.offscreenPageLimit = fragments.size - var position = arguments?.getInt(EntranceUtils.KEY_POSITION, 0) ?: 0 - val columnName = arguments?.getString(EntranceUtils.KEY_COLUMNNAME) ?: "" + var position = arguments?.getInt(EntranceConsts.KEY_POSITION, 0) ?: 0 + val columnName = arguments?.getString(EntranceConsts.KEY_COLUMNNAME) ?: "" if (columnName.isNotEmpty()) { position = mSubjectList.indexOfFirst { it.subjectName == columnName } } @@ -120,7 +124,7 @@ class SubjectTabFragment : BaseFragment() { mBinding.subjectViewpager.adapter = adapter mBinding.subjectTab.setupWithViewPager(mBinding.subjectViewpager) // 首页样式的 tabLayout - if (arguments?.getBoolean(EntranceUtils.KEY_IS_HOME) == true) { + if (arguments?.getBoolean(EntranceConsts.KEY_IS_HOME) == true) { mBinding.subjectTabIndicator.visibility = View.GONE for (i in 0 until mBinding.subjectTab.tabCount) { val tab = mBinding.subjectTab.getTabAt(i) ?: continue diff --git a/app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTileFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTileFragment.kt index bcdaecb541..462a52ed8b 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTileFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTileFragment.kt @@ -5,16 +5,16 @@ import android.text.TextUtils import android.view.MotionEvent import android.view.View import androidx.recyclerview.widget.GridLayoutManager -import com.gh.base.fragment.BaseFragment -import com.gh.common.util.EntranceUtils -import com.gh.common.util.StringUtils -import com.gh.common.util.UrlFilterUtils +import com.gh.gamecenter.common.base.fragment.BaseFragment +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.StringUtils +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentSubjectTiledBinding import com.gh.gamecenter.entity.SubjectData import com.gh.gamecenter.entity.SubjectSettingEntity import com.gh.gamecenter.eventbus.EBReuse -import com.gh.gamecenter.normal.ToolbarController +import com.gh.gamecenter.common.base.fragment.ToolbarController import com.gh.gamecenter.subject.SubjectListFragment import com.google.android.material.appbar.AppBarLayout import org.greenrobot.eventbus.Subscribe @@ -38,7 +38,7 @@ class SubjectTileFragment : BaseFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) // 初始化数据 - mSubjectData = arguments?.getParcelable(EntranceUtils.KEY_SUBJECT_DATA) ?: return + mSubjectData = arguments?.getParcelable(EntranceConsts.KEY_SUBJECT_DATA) ?: return mSettingsEntity = arguments?.getParcelable(SubjectSettingEntity::class.java.simpleName) ?: return @@ -148,7 +148,7 @@ class SubjectTileFragment : BaseFragment() { } else { fragmentByTag = SubjectListFragment() val bundle = arguments ?: Bundle() - bundle.putParcelable(EntranceUtils.KEY_SUBJECT_DATA, mSubjectData) + bundle.putParcelable(EntranceConsts.KEY_SUBJECT_DATA, mSubjectData) fragmentByTag.arguments = bundle transaction.add(R.id.subject_content_rl, fragmentByTag, fmTag) } diff --git a/app/src/main/java/com/gh/gamecenter/suggest/GameUploadPicViewHolder.java b/app/src/main/java/com/gh/gamecenter/suggest/GameUploadPicViewHolder.java index f68298b8b5..52d016f46c 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/GameUploadPicViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/GameUploadPicViewHolder.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.suggest; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.callback.OnListClickListener; import com.gh.gamecenter.databinding.GameUploadPicItemBinding; import java.util.List; diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SelectGameViewHolder.java b/app/src/main/java/com/gh/gamecenter/suggest/SelectGameViewHolder.java index 3394193c8b..937a24d05c 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SelectGameViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SelectGameViewHolder.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.suggest; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.DialogSelectGameItemBinding; /** diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestGameCollectAdapter.kt b/app/src/main/java/com/gh/gamecenter/suggest/SuggestGameCollectAdapter.kt index 197aebc78c..115bb86172 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestGameCollectAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestGameCollectAdapter.kt @@ -2,8 +2,8 @@ package com.gh.gamecenter.suggest import android.content.Context import android.view.ViewGroup -import com.gh.common.util.MtaHelper -import com.gh.common.util.dip2px +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.databinding.GameItemBinding diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java index 995b4a14ee..b2f02a6892 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java @@ -4,8 +4,8 @@ import android.content.Context; import android.view.View; import android.view.ViewGroup; -import com.gh.base.OnListClickListener; -import com.gh.common.util.ImageUtils; +import com.gh.gamecenter.common.callback.OnListClickListener; +import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.databinding.GameUploadPicItemBinding; import com.gh.gamecenter.databinding.SuggestPicItemBinding; diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicViewHolder.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicViewHolder.java index 32079ef3ed..f7deb2efea 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicViewHolder.java @@ -1,7 +1,7 @@ package com.gh.gamecenter.suggest; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.callback.OnListClickListener; import com.gh.gamecenter.databinding.SuggestPicItemBinding; import java.util.List; diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectFragment.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectFragment.java index 39be11a70f..6490ec1f9d 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectFragment.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectFragment.java @@ -6,13 +6,12 @@ import android.view.View; import androidx.annotation.Nullable; -import com.gh.base.fragment.BaseFragment; +import com.gh.gamecenter.common.base.fragment.BaseFragment; import com.gh.common.constant.Config; import com.gh.common.util.DirectUtils; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.ShareUtils; import com.gh.gamecenter.R; -import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.databinding.FragmentSuggestSelectBinding; import com.gh.gamecenter.entity.SettingsEntity; diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java index cb55f5ae28..267ad44b4b 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java @@ -8,9 +8,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ProgressBar; -import com.gh.base.OnRequestCallBackListener; -import com.gh.base.fragment.BaseFragment; -import com.gh.common.util.BitmapUtils; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; +import com.gh.gamecenter.common.base.fragment.BaseFragment; +import com.gh.gamecenter.common.utils.BitmapUtils; import com.gh.common.util.PackageUtils; import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.databinding.DialogSelectGameItemBinding; diff --git a/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt b/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt index fd94c3ae2e..652031616d 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt @@ -4,8 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.EntranceUtils -import com.gh.download.DownloadManager +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R @@ -23,7 +22,7 @@ class TagsActivity : NormalActivity() { fun getIntent(context: Context, tag: String, source: String?, entrance: String, path: String): Intent { val bundle = Bundle() bundle.putString(TAG, tag) - bundle.putString(EntranceUtils.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) + bundle.putString(EntranceConsts.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) bundle.putString(SOURCE, source ?: "") when (context) { diff --git a/app/src/main/java/com/gh/gamecenter/tag/TagsHorizontalAdapter.kt b/app/src/main/java/com/gh/gamecenter/tag/TagsHorizontalAdapter.kt index 1c18cc6d0f..15f16f3abd 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsHorizontalAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsHorizontalAdapter.kt @@ -4,7 +4,7 @@ import android.content.Context import android.graphics.Color import android.view.ViewGroup import androidx.core.content.ContextCompat -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.R import com.gh.gamecenter.databinding.ItemTagBinding import com.gh.gamecenter.entity.TagEntity diff --git a/app/src/main/java/com/gh/gamecenter/tag/TagsListAdapter.kt b/app/src/main/java/com/gh/gamecenter/tag/TagsListAdapter.kt index d6baeaf258..e0540bfdc1 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsListAdapter.kt @@ -3,19 +3,18 @@ package com.gh.gamecenter.tag import android.content.Context import android.util.SparseArray import android.view.ViewGroup -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable import com.gh.common.util.DownloadItemUtils -import com.gh.common.util.StringUtils -import com.gh.common.util.dip2px +import com.gh.gamecenter.core.utils.StringUtils +import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.GameViewHolder import com.gh.gamecenter.baselist.ListAdapter -import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.databinding.GameItemBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.eventbus.EBDownloadStatus 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 4305dec216..4506732fc2 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt @@ -5,13 +5,13 @@ import android.os.Bundle import android.view.View import androidx.recyclerview.widget.LinearLayoutManager import com.ethanhua.skeleton.Skeleton -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureListener import com.gh.common.exposure.ExposureSource import com.gh.common.util.DialogUtils -import com.gh.common.util.observeNonNull -import com.gh.common.util.toColor -import com.gh.common.util.viewModelProvider +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.common.view.ConfigFilterView import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus 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 96b7b917b5..ba14c7f3a7 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsListViewModel.kt @@ -5,7 +5,7 @@ import android.app.Application import androidx.lifecycle.MutableLiveData import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.ExposureUtils -import com.gh.common.util.UrlFilterUtils +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.common.view.ConfigFilterView import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.GameEntity diff --git a/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt b/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt index c7be31273a..3709a7b402 100644 --- a/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt @@ -3,16 +3,16 @@ package com.gh.gamecenter.teenagermode import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider -import com.gh.common.constant.Constants -import com.gh.common.util.SPUtils -import com.gh.common.util.toColor -import com.gh.common.view.VerifyEditText +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.view.VerifyEditText import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.MainActivity import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.databinding.FragmentPasswordSettingBinding -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.lightgame.utils.AppManager class PasswordSettingFragment : NormalFragment() { diff --git a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt index 681f6a661d..87364bb94d 100644 --- a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt @@ -3,15 +3,15 @@ package com.gh.gamecenter.teenagermode import android.os.Bundle import android.view.View import androidx.constraintlayout.widget.ConstraintLayout -import com.gh.common.constant.Constants -import com.gh.common.util.SPUtils -import com.gh.common.util.SpanBuilder -import com.gh.common.util.dip2px -import com.gh.common.view.CustomLinkMovementMethod +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.core.utils.SpanBuilder +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.view.CustomLinkMovementMethod import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.databinding.FragmentTeenagerModeBinding -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment class TeenagerModeFragment : NormalFragment() { diff --git a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeViewModel.kt b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeViewModel.kt index 67e2fb2a37..3ee2d01867 100644 --- a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeViewModel.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.teenagermode import android.annotation.SuppressLint import android.app.Application import androidx.lifecycle.AndroidViewModel -import com.gh.common.util.createRequestBody +import com.gh.gamecenter.common.utils.createRequestBody import com.gh.gamecenter.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp diff --git a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt index cc8a5d5743..1468ada718 100644 --- a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt @@ -14,13 +14,19 @@ import androidx.activity.viewModels import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.SimpleItemAnimator import com.gh.base.ToolBarActivity -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* -import com.gh.common.view.CustomLinkMovementMethod +import com.gh.gamecenter.common.view.CustomLinkMovementMethod import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity import com.gh.gamecenter.WebActivity import com.gh.gamecenter.baselist.LoadStatus +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.TextHelper +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ActivityToolboxBlockBinding import com.gh.gamecenter.entity.ToolBoxEntity import com.gh.gamecenter.suggest.SuggestType @@ -51,8 +57,8 @@ class ToolBoxBlockActivity : ToolBarActivity() { setNavigationTitle("光环工具箱") // 跳转到工具箱 https://gitlab.ghzs.com/pm/halo-app-issues/issues/636 - val gameId = intent.getStringExtra(EntranceUtils.KEY_GAMEID) - val targetUrl = intent.getStringExtra(EntranceUtils.KEY_URL) + val gameId = intent.getStringExtra(EntranceConsts.KEY_GAMEID) + val targetUrl = intent.getStringExtra(EntranceConsts.KEY_URL) if (!gameId.isNullOrEmpty() && !targetUrl.isNullOrEmpty()) { mViewModel.getGameToolBoxData(gameId) { for (toolbox in it) { @@ -272,7 +278,7 @@ class ToolBoxBlockActivity : ToolBarActivity() { @JvmStatic fun getIntent(context: Context, entrance: String?): Intent { val intent = Intent(context, ToolBoxBlockActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockAdapter.kt b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockAdapter.kt index b56dc8b1a8..a4696a80ea 100644 --- a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockAdapter.kt @@ -4,9 +4,9 @@ import android.content.Context import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.GridLayoutManager -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.goneIf -import com.gh.common.util.safelyGetInRelease +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.safelyGetInRelease import com.gh.gamecenter.baselist.ListExecutor import com.gh.gamecenter.databinding.ToolboxBlockItemBinding import com.gh.gamecenter.entity.ToolBoxBlockEntity diff --git a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxItemAdapter.kt b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxItemAdapter.kt index cad03d9053..592dbe9f94 100644 --- a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxItemAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxItemAdapter.kt @@ -4,15 +4,19 @@ import android.content.Context import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.constant.Config -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* -import com.gh.common.util.ImageUtils.display +import com.gh.gamecenter.common.utils.ImageUtils.display import com.gh.gamecenter.NewsDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity.Companion.getWebByCollectionTools import com.gh.gamecenter.baselist.ListExecutor +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.safelyGetInRelease +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ItemToolboxBinding import com.gh.gamecenter.entity.ToolBoxEntity import com.lightgame.adapter.BaseRecyclerAdapter diff --git a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxViewModel.kt b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxViewModel.kt index 3f52da104d..415e75dbc5 100644 --- a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxViewModel.kt @@ -3,9 +3,14 @@ package com.gh.gamecenter.toolbox import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* import com.gh.gamecenter.baselist.LoadStatus +import com.gh.gamecenter.core.utils.GsonUtils +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.core.utils.TimeUtils +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.entity.ToolBoxBlockEntity import com.gh.gamecenter.entity.ToolBoxEntity import com.gh.gamecenter.retrofit.Response 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 48f0d31aa4..fffd95bc6a 100644 --- a/app/src/main/java/com/gh/gamecenter/user/UserRepository.java +++ b/app/src/main/java/com/gh/gamecenter/user/UserRepository.java @@ -13,21 +13,21 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MediatorLiveData; import com.gh.common.PushManager; -import com.gh.common.constant.Constants; -import com.gh.common.exposure.meta.MetaUtil; +import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.exposure.meta.MetaUtil; import com.gh.common.repository.ReservationRepository; -import com.gh.common.util.BiCallback; +import com.gh.gamecenter.common.callback.BiCallback; import com.gh.common.util.DataUtils; -import com.gh.common.util.DeviceUtils; +import com.gh.gamecenter.common.utils.DeviceUtils; import com.gh.common.util.EnergyTaskHelper; -import com.gh.common.util.EnvHelper; +import com.gh.gamecenter.common.utils.EnvHelper; import com.gh.common.util.ErrorHelper; import com.gh.common.util.GameSubstituteRepositoryHelper; -import com.gh.common.util.GsonUtils; +import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.common.util.LoginHelper; import com.gh.common.util.LoginUtils; import com.gh.common.util.NewLogUtils; -import com.gh.common.util.SPUtils; +import com.gh.gamecenter.core.utils.SPUtils; import com.gh.common.util.WechatBindHelper; import com.gh.download.DownloadManager; import com.gh.gamecenter.BuildConfig; diff --git a/app/src/main/java/com/gh/gamecenter/video/VideoItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/video/VideoItemViewHolder.kt index 913fa6b111..052702c00d 100644 --- a/app/src/main/java/com/gh/gamecenter/video/VideoItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/video/VideoItemViewHolder.kt @@ -1,9 +1,9 @@ package com.gh.gamecenter.video -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.ImageUtils -import com.gh.common.util.TimeUtils -import com.gh.common.util.toSimpleCount +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.core.utils.TimeUtils +import com.gh.gamecenter.common.utils.toSimpleCount import com.gh.gamecenter.databinding.VideoNewItemBinding import com.gh.gamecenter.entity.MyVideoEntity diff --git a/app/src/main/java/com/gh/gamecenter/video/VideoVerifyItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/video/VideoVerifyItemViewHolder.kt index 63766be488..969080e59d 100644 --- a/app/src/main/java/com/gh/gamecenter/video/VideoVerifyItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/video/VideoVerifyItemViewHolder.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.video import android.widget.TextView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.toColor +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.R import com.gh.gamecenter.databinding.VideoVerifyItemBinding diff --git a/app/src/main/java/com/gh/gamecenter/video/ViewHolder.kt b/app/src/main/java/com/gh/gamecenter/video/ViewHolder.kt index 7b1c9fec81..10c0c22fed 100644 --- a/app/src/main/java/com/gh/gamecenter/video/ViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/video/ViewHolder.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.video -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.databinding.VideoStatusItemBinding class VideoStatusItemViewHolder(var binding: VideoStatusItemBinding) : BaseRecyclerViewHolder(binding.root) \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataActivity.kt b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataActivity.kt index 9a198197a8..8ee76f4030 100644 --- a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataActivity.kt @@ -2,7 +2,7 @@ package com.gh.gamecenter.video.data import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.DisplayUtils +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.R class VideoDataActivity : BaseActivity() { diff --git a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataAdapter.kt index 9671d29968..41c79f83f1 100644 --- a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataAdapter.kt @@ -4,10 +4,10 @@ import android.content.Context import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.NumberUtils -import com.gh.common.util.SpanBuilder -import com.gh.common.util.toBinding -import com.gh.common.view.CustomMarkerView +import com.gh.gamecenter.core.utils.NumberUtils +import com.gh.gamecenter.core.utils.SpanBuilder +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.view.CustomMarkerView import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.databinding.ItemVideoDataChartBinding diff --git a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataFragment.kt b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataFragment.kt index 20d24441a4..cd624db35c 100644 --- a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataFragment.kt @@ -5,13 +5,13 @@ import android.view.LayoutInflater import android.view.View import androidx.core.content.ContextCompat import androidx.lifecycle.Observer -import com.gh.base.fragment.BaseFragment -import com.gh.common.util.DisplayUtils -import com.gh.common.util.dip2px -import com.gh.common.util.toDrawable -import com.gh.common.util.viewModelProvider -import com.gh.common.view.FixLinearLayoutManager -import com.gh.common.view.VerticalItemDecoration +import com.gh.gamecenter.common.base.fragment.BaseFragment +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toDrawable +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.common.view.FixLinearLayoutManager +import com.gh.gamecenter.common.view.VerticalItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentVideoDataBinding import com.gh.gamecenter.mvvm.Status 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 3d2b94c11d..289cfe4883 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 @@ -3,7 +3,7 @@ package com.gh.gamecenter.video.data import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData -import com.gh.common.util.TimeUtils +import com.gh.gamecenter.core.utils.TimeUtils import com.gh.gamecenter.entity.VideoDataItem import com.gh.gamecenter.entity.VideoDataOverViewEntity import com.gh.gamecenter.manager.UserManager diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt b/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt index 94f8f0f385..89ab8377c9 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt @@ -19,16 +19,20 @@ import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import com.airbnb.lottie.LottieAnimationView -import com.gh.common.AppExecutor -import com.gh.common.constant.Constants -import com.gh.common.observer.MuteCallback -import com.gh.common.observer.VolumeObserver -import com.gh.common.runOnIoThread -import com.gh.common.runOnUiThread +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.observer.MuteCallback +import com.gh.gamecenter.common.observer.VolumeObserver +import com.gh.gamecenter.core.runOnIoThread +import com.gh.gamecenter.core.runOnUiThread import com.gh.common.util.* import com.gh.download.cache.ExoCacheManager import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.LayoutVideoDetailSurfaceBinding import com.gh.gamecenter.entity.VideoEntity import com.gh.gamecenter.eventbus.EBRecommed @@ -46,7 +50,6 @@ import com.shuyu.gsyvideoplayer.utils.NetworkUtils import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer import com.shuyu.gsyvideoplayer.video.base.GSYVideoView import com.shuyu.gsyvideoplayer.video.base.GSYVideoViewBridge -import com.squareup.picasso.Picasso import io.reactivex.disposables.Disposable import org.greenrobot.eventbus.EventBus import java.util.concurrent.TimeUnit @@ -166,11 +169,13 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib mBinding.sdvUserBadge.visibility = View.GONE } mBinding.sdvUserBadge.setOnClickListener { - DialogUtils.showViewBadgeDialog(context, videoEntity.user.badge) { - MtaHelper.onEvent("进入徽章墙_用户记录", "视频详情", "${videoEntity.user.name}（${videoEntity.user.id}）") - MtaHelper.onEvent("徽章中心", "进入徽章中心", "视频详情") - DirectUtils.directToBadgeWall(context, videoEntity.user.id, videoEntity.user.name, videoEntity.user.icon) - } + DialogUtils.showViewBadgeDialog(context, videoEntity.user.badge, object : ConfirmListener { + override fun onConfirm() { + MtaHelper.onEvent("进入徽章墙_用户记录", "视频详情", "${videoEntity.user.name}（${videoEntity.user.id}）") + MtaHelper.onEvent("徽章中心", "进入徽章中心", "视频详情") + DirectUtils.directToBadgeWall(context, videoEntity.user.id, videoEntity.user.name, videoEntity.user.icon) + } + }) } if (videoEntity.me.isVoted && UserManager.getInstance().isLoggedIn) { @@ -410,7 +415,7 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib } mViewModel?.voteVideo(mVideoEntity) - if (mViewModel?.entrance?.contains(EntranceUtils.ENTRANCE_WELCOME) == true + if (mViewModel?.entrance?.contains(EntranceConsts.ENTRANCE_WELCOME) == true && mViewModel?.entrance?.countOccurrences("+")!! <= 1 ) { LogUtils.uploadLikeFromWelcomeDialog() diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/HomeVideoFragment.kt b/app/src/main/java/com/gh/gamecenter/video/detail/HomeVideoFragment.kt index 3949c56b2e..1053fac008 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/HomeVideoFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/HomeVideoFragment.kt @@ -7,14 +7,21 @@ import android.view.View import android.widget.TextView import androidx.core.os.bundleOf import androidx.fragment.app.Fragment -import com.gh.base.adapter.FragmentAdapter -import com.gh.base.fragment.BaseLazyFragment +import com.gh.gamecenter.common.base.adapter.FragmentAdapter +import com.gh.gamecenter.common.base.fragment.BaseLazyFragment import com.gh.common.constant.Config -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* import com.gh.common.view.AdBannerView import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.countDownTimer +import com.gh.gamecenter.common.utils.doOnPageSelected +import com.gh.gamecenter.common.utils.visibleIf +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.FragmentHomeVideoBinding import com.gh.gamecenter.entity.LinkEntity import com.gh.gamecenter.entity.SettingsEntity @@ -62,7 +69,7 @@ class HomeVideoFragment : BaseLazyFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - val mLocation = arguments?.getString(EntranceUtils.KEY_LOCATION) ?: "" + val mLocation = arguments?.getString(EntranceConsts.KEY_LOCATION) ?: "" if (mLocation != VideoDetailContainerViewModel.Location.USER_UPLOADED_VIDEO.value) { mBinding.moreIv.visibility = View.VISIBLE mBinding.moreIv.setOnClickListener { @@ -73,17 +80,17 @@ class HomeVideoFragment : BaseLazyFragment() { override fun onFragmentFirstVisible() { super.onFragmentFirstVisible() - val mIsHomeVideo = arguments?.getBoolean(EntranceUtils.KEY_IS_HOME_VIDEO, false) ?: false + val mIsHomeVideo = arguments?.getBoolean(EntranceConsts.KEY_IS_HOME_VIDEO, false) ?: false titles = if (mIsHomeVideo) { arrayListOf("关注", "推荐") } else { arrayListOf("推荐") } if (mIsHomeVideo) { - val newestBundle = bundleOf(EntranceUtils.KEY_UUID to UUID.randomUUID().toString()) + val newestBundle = bundleOf(EntranceConsts.KEY_UUID to UUID.randomUUID().toString()) newestBundle.putAll(arguments) - newestBundle.putString(EntranceUtils.KEY_PATH, "视频流-关注Tab") - newestBundle.putString(EntranceUtils.KEY_LOCATION, VideoDetailContainerViewModel.Location.VIDEO_ATTENTION.value) + newestBundle.putString(EntranceConsts.KEY_PATH, "视频流-关注Tab") + newestBundle.putString(EntranceConsts.KEY_LOCATION, VideoDetailContainerViewModel.Location.VIDEO_ATTENTION.value) newestVideoDetailFragment = VideoDetailContainerFragment() newestVideoDetailFragment?.with(newestBundle) fragments.add(newestVideoDetailFragment!!) @@ -92,10 +99,10 @@ class HomeVideoFragment : BaseLazyFragment() { recommendVideoDetailFragment = VideoDetailContainerFragment() if (mIsHomeVideo) { - val recommendBundle = bundleOf(EntranceUtils.KEY_UUID to UUID.randomUUID().toString()) + val recommendBundle = bundleOf(EntranceConsts.KEY_UUID to UUID.randomUUID().toString()) recommendBundle.putAll(arguments) - recommendBundle.putString(EntranceUtils.KEY_PATH, "视频流-推荐Tab") - recommendBundle.putString(EntranceUtils.KEY_LOCATION, VideoDetailContainerViewModel.Location.VIDEO_CHOICENESS.value) + recommendBundle.putString(EntranceConsts.KEY_PATH, "视频流-推荐Tab") + recommendBundle.putString(EntranceConsts.KEY_LOCATION, VideoDetailContainerViewModel.Location.VIDEO_CHOICENESS.value) recommendVideoDetailFragment?.with(recommendBundle) } else { recommendVideoDetailFragment?.with(arguments) @@ -116,7 +123,8 @@ class HomeVideoFragment : BaseLazyFragment() { MtaHelper.onEvent("视频流_最新", "顶部Tab", "最新Tab") LogUtils.uploadVideoStreamingPlaying( "点击最新Tab", "", "视频流-最新Tab", - arguments?.getString(EntranceUtils.KEY_REFERER), "", newestVideoDetailFragment?.arguments?.getString(EntranceUtils.KEY_UUID) + arguments?.getString(EntranceConsts.KEY_REFERER), "", newestVideoDetailFragment?.arguments?.getString( + EntranceConsts.KEY_UUID) ?: "", 0.0, 0, 0, "play" ) } else { @@ -125,9 +133,9 @@ class HomeVideoFragment : BaseLazyFragment() { "点击推荐Tab", "", "视频流-推荐Tab", - arguments?.getString(EntranceUtils.KEY_REFERER), + arguments?.getString(EntranceConsts.KEY_REFERER), "", - recommendVideoDetailFragment?.arguments?.getString(EntranceUtils.KEY_UUID) + recommendVideoDetailFragment?.arguments?.getString(EntranceConsts.KEY_UUID) ?: "", 0.0, 0, @@ -163,7 +171,7 @@ class HomeVideoFragment : BaseLazyFragment() { } fun getCurrentFragment(): VideoDetailContainerFragment? { - val mIsHomeVideo = arguments?.getBoolean(EntranceUtils.KEY_IS_HOME_VIDEO, false) ?: false + val mIsHomeVideo = arguments?.getBoolean(EntranceConsts.KEY_IS_HOME_VIDEO, false) ?: false return if (mIsHomeVideo) { if (mBinding.mViewPager.currentItem == 0) { newestVideoDetailFragment diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt index d223db8b65..f917f52ad4 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt @@ -9,7 +9,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.RecyclerView import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import com.gh.base.BaseActivity -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable @@ -17,6 +17,11 @@ import com.gh.common.util.* import com.gh.common.videolog.VideoRecordUtils import com.gh.download.cache.ExoCacheManager import com.gh.gamecenter.R +import com.gh.gamecenter.core.utils.EmptyCallback +import com.gh.gamecenter.common.utils.goneIf +import com.gh.gamecenter.common.utils.safelyGetInRelease +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.PluginLocation import com.gh.gamecenter.entity.VideoEntity @@ -28,7 +33,6 @@ import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack import com.shuyu.gsyvideoplayer.utils.OrientationUtils import com.shuyu.gsyvideoplayer.video.base.GSYVideoView -import com.squareup.picasso.Picasso class VideoAdapter( val mContext: Context, diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailActivity.kt index 17c978c524..93eada488e 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailActivity.kt @@ -2,7 +2,7 @@ package com.gh.gamecenter.video.detail import android.os.Bundle import com.gh.base.BaseActivity -import com.gh.common.util.DisplayUtils +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.R import java.util.* 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 48f4f8ca11..7e3239d2f5 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 @@ -15,15 +15,18 @@ import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.Observer import androidx.recyclerview.widget.OrientationHelper import androidx.recyclerview.widget.RecyclerView -import com.gh.base.fragment.BaseLazyFragment +import com.gh.gamecenter.common.base.fragment.BaseLazyFragment import com.gh.common.exposure.ExposureListener import com.gh.common.util.* import com.gh.common.videolog.VideoRecordUtils -import com.gh.common.view.vertical_recycler.OnPagerListener -import com.gh.common.view.vertical_recycler.PagerLayoutManager +import com.gh.gamecenter.common.view.vertical_recycler.OnPagerListener +import com.gh.gamecenter.common.view.vertical_recycler.PagerLayoutManager import com.gh.download.DownloadManager import com.gh.download.cache.ExoCacheManager import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentVideoDetailContainerBinding import com.gh.gamecenter.entity.VideoEntity import com.gh.gamecenter.eventbus.* @@ -37,7 +40,6 @@ import com.lightgame.download.DownloadEntity import com.lightgame.listeners.OnBackPressedListener import com.lightgame.utils.AppManager import com.scwang.smartrefresh.layout.footer.ClassicsFooter -import com.squareup.picasso.Picasso import io.reactivex.disposables.Disposable import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -81,25 +83,25 @@ class VideoDetailContainerFragment : BaseLazyFragment(), OnBackPressedListener { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mInitialVideoId = arguments?.getString(EntranceUtils.KEY_ID) ?: "" - mLocation = arguments?.getString(EntranceUtils.KEY_LOCATION) ?: "" - mReferer = arguments?.getString(EntranceUtils.KEY_REFERER) ?: "" + mInitialVideoId = arguments?.getString(EntranceConsts.KEY_ID) ?: "" + mLocation = arguments?.getString(EntranceConsts.KEY_LOCATION) ?: "" + mReferer = arguments?.getString(EntranceConsts.KEY_REFERER) ?: "" mUserViewModel = viewModelProviderFromParent(UserViewModel.Factory(HaloApp.getInstance().application)) mViewModel = viewModelProvider() - mViewModel.path = arguments?.getString(EntranceUtils.KEY_PATH) ?: "" - mViewModel.entrance = arguments?.getString(EntranceUtils.KEY_ENTRANCE) ?: "" - mViewModel.entranceDetail = arguments?.getString(EntranceUtils.KEY_REFERER) ?: "" - mViewModel.uuid = arguments?.getString(EntranceUtils.KEY_UUID) ?: "" - mViewModel.gameId = arguments?.getString(EntranceUtils.KEY_GAMEID) ?: "" - mViewModel.type = arguments?.getString(EntranceUtils.KEY_TYPE) ?: "" - mViewModel.act = arguments?.getString(EntranceUtils.KEY_ACTIVITY_NAME) ?: "" - mViewModel.paginationType = arguments?.getString(EntranceUtils.KEY_PAGINATION_TYPE) + mViewModel.path = arguments?.getString(EntranceConsts.KEY_PATH) ?: "" + mViewModel.entrance = arguments?.getString(EntranceConsts.KEY_ENTRANCE) ?: "" + mViewModel.entranceDetail = arguments?.getString(EntranceConsts.KEY_REFERER) ?: "" + mViewModel.uuid = arguments?.getString(EntranceConsts.KEY_UUID) ?: "" + mViewModel.gameId = arguments?.getString(EntranceConsts.KEY_GAMEID) ?: "" + mViewModel.type = arguments?.getString(EntranceConsts.KEY_TYPE) ?: "" + mViewModel.act = arguments?.getString(EntranceConsts.KEY_ACTIVITY_NAME) ?: "" + mViewModel.paginationType = arguments?.getString(EntranceConsts.KEY_PAGINATION_TYPE) ?: "type" - mViewModel.fieldId = arguments?.getString(EntranceUtils.KEY_FIELD_ID) ?: "" - mViewModel.sectionName = arguments?.getString(EntranceUtils.KEY_SECTION_NAME) ?: "" - mIsHomeVideo = arguments?.getBoolean(EntranceUtils.KEY_IS_HOME_VIDEO) ?: false - mViewModel.showComment = arguments?.getBoolean(EntranceUtils.KEY_SHOW_COMMENT) ?: false + mViewModel.fieldId = arguments?.getString(EntranceConsts.KEY_FIELD_ID) ?: "" + mViewModel.sectionName = arguments?.getString(EntranceConsts.KEY_SECTION_NAME) ?: "" + mIsHomeVideo = arguments?.getBoolean(EntranceConsts.KEY_IS_HOME_VIDEO) ?: false + mViewModel.showComment = arguments?.getBoolean(EntranceConsts.KEY_SHOW_COMMENT) ?: false mViewModel.location = mLocation mViewModel.isHomeVideo = mIsHomeVideo mViewModel.isPauseVideo = true @@ -728,7 +730,7 @@ class VideoDetailContainerFragment : BaseLazyFragment(), OnBackPressedListener { videoEntity.commentCount = commentCount findVisibleVideoViewByPosition()?.updateViewDetail(videoEntity) - if (mViewModel.entrance.contains(EntranceUtils.ENTRANCE_WELCOME) + if (mViewModel.entrance.contains(EntranceConsts.ENTRANCE_WELCOME) && mViewModel.entrance.countOccurrences("+") <= 1) { LogUtils.uploadCommentFromWelcomeDialog() } 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 40f389fcae..0b5fbdd15c 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 @@ -5,11 +5,15 @@ import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import androidx.recyclerview.widget.RecyclerView -import com.gh.common.exposure.meta.MetaUtil +import com.gh.gamecenter.common.exposure.meta.MetaUtil import com.gh.common.history.HistoryDatabase -import com.gh.common.runOnIoThread +import com.gh.gamecenter.core.runOnIoThread import com.gh.common.util.* import com.gh.download.DownloadManager +import com.gh.gamecenter.common.utils.createRequestBodyAny +import com.gh.gamecenter.common.utils.singleToMain +import com.gh.gamecenter.common.utils.tryCatchInRelease +import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.MyVideoEntity import com.gh.gamecenter.entity.User diff --git a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt index f4ff9c80e1..98149c75c0 100644 --- a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt @@ -8,10 +8,14 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProviders import com.gh.base.BaseActivity import com.gh.base.ToolBarActivity -import com.gh.base.adapter.FragmentAdapter -import com.gh.common.util.* +import com.gh.gamecenter.common.base.adapter.FragmentAdapter import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.NumberUtils +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.databinding.ActivityVideoGameBinding import com.gh.gamecenter.mvvm.Status @@ -34,28 +38,29 @@ class GameVideoActivity : ToolBarActivity() { mBinding = ActivityVideoGameBinding.bind(mContentView) // viewpager & tab content - val gameId = intent.getStringExtra(EntranceUtils.KEY_GAMEID) ?: "" + val gameId = intent.getStringExtra(EntranceConsts.KEY_GAMEID) ?: "" val titles = arrayListOf("最热", "最新") val fragments = ArrayList() val tag = "android:switcher:${mBinding.viewpager.id}:" val hottest = supportFragmentManager.findFragmentByTag("${tag}0") ?: GameVideoFragment() val hottestBundle = Bundle() - hottestBundle.putString(EntranceUtils.KEY_GAMEID, gameId) - hottestBundle.putString(EntranceUtils.KEY_SORT, "vote_recently:-1") + hottestBundle.putString(EntranceConsts.KEY_GAMEID, gameId) + hottestBundle.putString(EntranceConsts.KEY_SORT, "vote_recently:-1") hottest.arguments = hottestBundle fragments.add(hottest) val newest = supportFragmentManager.findFragmentByTag("${tag}1") ?: GameVideoFragment() val newestBundle = Bundle() - newestBundle.putString(EntranceUtils.KEY_GAMEID, gameId) - newestBundle.putString(EntranceUtils.KEY_SORT, "time.upload:-1") + newestBundle.putString(EntranceConsts.KEY_GAMEID, gameId) + newestBundle.putString(EntranceConsts.KEY_SORT, "time.upload:-1") newest.arguments = newestBundle fragments.add(newest) // view mBinding.viewpager.offscreenPageLimit = fragments.size - mBinding.viewpager.adapter = FragmentAdapter(supportFragmentManager, fragments, titles) + mBinding.viewpager.adapter = + FragmentAdapter(supportFragmentManager, fragments, titles) mBinding.tabLayout.setupWithViewPager(mBinding.viewpager) mBinding.tabIndicator.setupWithTabLayout(mBinding.tabLayout) mBinding.tabIndicator.setupWithViewPager(mBinding.viewpager) @@ -92,8 +97,8 @@ class GameVideoActivity : ToolBarActivity() { @JvmStatic fun getIntent(context: Context, gameId: String, entrance: String?, path: String?): Intent { val intent = Intent(context, GameVideoActivity::class.java) - intent.putExtra(EntranceUtils.KEY_GAMEID, gameId) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_GAMEID, gameId) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoAdapter.kt index d56c525c98..e1a906507a 100644 --- a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoAdapter.kt @@ -4,7 +4,7 @@ import android.content.Context import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.DirectUtils import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder 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 2f5cbcbefa..df9853ad53 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 @@ -6,9 +6,9 @@ import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import com.gh.common.constant.Config -import com.gh.common.util.EntranceUtils -import com.gh.common.util.dip2px -import com.gh.common.view.GridSpacingItemDecoration +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.view.GridSpacingItemDecoration import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.baselist.NormalListViewModel import com.gh.gamecenter.entity.MyVideoEntity @@ -24,8 +24,8 @@ class GameVideoFragment : ListFragment> { val api = RetrofitManager.getInstance().api - val gameId = arguments?.getString(EntranceUtils.KEY_GAMEID) - val sort = arguments?.getString(EntranceUtils.KEY_SORT) + val gameId = arguments?.getString(EntranceConsts.KEY_GAMEID) + val sort = arguments?.getString(EntranceConsts.KEY_SORT) return api.getGameVideo(gameId, sort, page, Config.VIDEO_PAGE_SIZE) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelAdapter.kt index 254d24182f..6dee5ad11d 100644 --- a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelAdapter.kt @@ -3,9 +3,9 @@ package com.gh.gamecenter.video.label import android.content.Context import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.toBinding -import com.gh.common.util.visibleIf +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.utils.visibleIf import com.gh.gamecenter.databinding.VideoLabelItemBinding import com.gh.gamecenter.entity.ActivityLabelEntity import com.lightgame.adapter.BaseRecyclerAdapter diff --git a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt index 643df1c237..82baa966d3 100644 --- a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt @@ -6,14 +6,14 @@ import androidx.core.content.ContextCompat import androidx.lifecycle.Observer import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.LinearLayoutManager -import com.gh.common.util.EntranceUtils -import com.gh.common.util.dip2px -import com.gh.common.util.viewModelProvider -import com.gh.common.view.divider.HorizontalDividerItemDecoration +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentListBaseBinding import com.gh.gamecenter.entity.ActivityLabelEntity -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.gh.gamecenter.qa.dialog.ChooseActivityDialogFragment class VideoLabelFragment : NormalFragment() { @@ -29,8 +29,8 @@ class VideoLabelFragment : NormalFragment() { mBinding.listRefresh.isEnabled = false val selectTagActivityId = arguments?.getString(VideoLabelActivity.TAG_ACTIVITY_ID) ?: "" - val location = arguments?.getString(EntranceUtils.KEY_LOCATION) ?: "" - val bbsId = arguments?.getString(EntranceUtils.KEY_BBS_ID) ?: "" + val location = arguments?.getString(EntranceConsts.KEY_LOCATION) ?: "" + val bbsId = arguments?.getString(EntranceConsts.KEY_BBS_ID) ?: "" mViewModel = viewModelProvider(VideoLabelViewModel.Factory(location, bbsId)) mBinding.listRv.apply { layoutManager = LinearLayoutManager(requireContext()) diff --git a/app/src/main/java/com/gh/gamecenter/video/poster/PosterClipActivity.kt b/app/src/main/java/com/gh/gamecenter/video/poster/PosterClipActivity.kt index 56b664e0fe..9939775538 100644 --- a/app/src/main/java/com/gh/gamecenter/video/poster/PosterClipActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/poster/PosterClipActivity.kt @@ -6,13 +6,11 @@ import android.content.Intent import android.os.Bundle import android.view.View import com.gh.base.ToolBarActivity -import com.gh.common.util.DialogHelper -import com.gh.common.util.DialogUtils -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.R import com.gh.gamecenter.video.poster.video.VideoPosterFragment -import com.gh.gamecenter.video.upload.view.UploadVideoActivity import java.io.File class PosterClipActivity : ToolBarActivity() { @@ -24,7 +22,7 @@ class PosterClipActivity : ToolBarActivity() { super.onCreate(savedInstanceState) setNavigationTitle("剪辑封面") - val videoPath = intent.getStringExtra(EntranceUtils.KEY_PATH_VIDEO) + val videoPath = intent.getStringExtra(EntranceConsts.KEY_PATH_VIDEO) val fragment = supportFragmentManager.findFragmentByTag(VideoPosterFragment::class.java.simpleName) as? VideoPosterFragment ?: VideoPosterFragment.newInstance(videoPath, null) supportFragmentManager @@ -37,8 +35,8 @@ class PosterClipActivity : ToolBarActivity() { fragment.savePicture(clipPath) val intent = Intent() - intent.putExtra(EntranceUtils.KEY_PATH_VIDEO, videoPath) - intent.putExtra(EntranceUtils.KEY_POSTER_PATH, clipPath) + intent.putExtra(EntranceConsts.KEY_PATH_VIDEO, videoPath) + intent.putExtra(EntranceConsts.KEY_POSTER_PATH, clipPath) setResult(Activity.RESULT_OK, intent) finish() } @@ -62,7 +60,7 @@ class PosterClipActivity : ToolBarActivity() { companion object { fun getIntent(context: Context, videoPath: String): Intent { val intent = Intent(context, PosterClipActivity::class.java) - intent.putExtra(EntranceUtils.KEY_PATH_VIDEO, videoPath) + intent.putExtra(EntranceConsts.KEY_PATH_VIDEO, videoPath) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/video/poster/PosterEditActivity.kt b/app/src/main/java/com/gh/gamecenter/video/poster/PosterEditActivity.kt index e3059f8eba..4d1b944799 100644 --- a/app/src/main/java/com/gh/gamecenter/video/poster/PosterEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/poster/PosterEditActivity.kt @@ -12,10 +12,14 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout -import com.gh.base.fragment.BaseFragment_TabLayout -import com.gh.common.util.* +import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout import com.gh.gamecenter.CropImageActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.utils.addOnPageChangeListener +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.databinding.ActivityPosterEditBinding import com.gh.gamecenter.entity.VideoEntity import com.gh.gamecenter.video.poster.photo.PhotoAlbumsAdapter @@ -58,7 +62,7 @@ class PosterEditActivity : BaseActivity_TabLayout(), AdapterView.OnItemSelectedL } override fun initFragmentList(fragments: MutableList) { - val videoPath = intent.getStringExtra(EntranceUtils.KEY_PATH_VIDEO) + val videoPath = intent.getStringExtra(EntranceConsts.KEY_PATH_VIDEO) val videoEntity = intent.getParcelableExtra(VideoEntity::class.java.simpleName) mPhotoPosterFragment = PhotoPosterFragment() mVideoPosterFragment = VideoPosterFragment.newInstance(videoPath, videoEntity) @@ -221,7 +225,7 @@ class PosterEditActivity : BaseActivity_TabLayout(), AdapterView.OnItemSelectedL fun getIntentByPath(context: Context, videoPath: String): Intent { val intent = Intent(context, PosterEditActivity::class.java) - intent.putExtra(EntranceUtils.KEY_PATH_VIDEO, videoPath) + intent.putExtra(EntranceConsts.KEY_PATH_VIDEO, videoPath) return intent } diff --git a/app/src/main/java/com/gh/gamecenter/video/poster/photo/PhotoPosterAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/poster/photo/PhotoPosterAdapter.kt index 398aa62278..7bd05ed44d 100644 --- a/app/src/main/java/com/gh/gamecenter/video/poster/photo/PhotoPosterAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/poster/photo/PhotoPosterAdapter.kt @@ -4,7 +4,7 @@ import android.database.Cursor import android.net.Uri import android.view.LayoutInflater import android.view.ViewGroup -import com.gh.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.R import com.gh.gamecenter.databinding.PhotoPosterItemBinding import com.halo.assistant.HaloApp diff --git a/app/src/main/java/com/gh/gamecenter/video/poster/photo/PhotoPosterFragment.kt b/app/src/main/java/com/gh/gamecenter/video/poster/photo/PhotoPosterFragment.kt index 3bb3368448..e8ba96cf72 100644 --- a/app/src/main/java/com/gh/gamecenter/video/poster/photo/PhotoPosterFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/poster/photo/PhotoPosterFragment.kt @@ -4,8 +4,8 @@ import android.database.Cursor import android.os.Bundle import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.GridLayoutManager -import com.gh.base.fragment.BaseFragment -import com.gh.common.util.dip2px +import com.gh.gamecenter.common.base.fragment.BaseFragment +import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentPhotoPosterBinding import com.zhihu.matisse.internal.entity.Album diff --git a/app/src/main/java/com/gh/gamecenter/video/poster/video/VideoPosterFragment.kt b/app/src/main/java/com/gh/gamecenter/video/poster/video/VideoPosterFragment.kt index 3964e48b08..1968b4fb7a 100644 --- a/app/src/main/java/com/gh/gamecenter/video/poster/video/VideoPosterFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/poster/video/VideoPosterFragment.kt @@ -5,11 +5,11 @@ import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.GridLayoutManager -import com.gh.base.fragment.BaseFragment -import com.gh.common.util.EntranceUtils -import com.gh.common.util.ImageUtils -import com.gh.common.util.observeNonNull -import com.gh.common.util.throwExceptionInDebug +import com.gh.gamecenter.common.base.fragment.BaseFragment +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.throwExceptionInDebug import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentVideoPosterBinding import com.gh.gamecenter.entity.VideoEntity @@ -30,7 +30,7 @@ class VideoPosterFragment : BaseFragment() { super.onCreate(savedInstanceState) mBinding = FragmentVideoPosterBinding.bind(mCachedView) - val videoPath = arguments?.getString(EntranceUtils.KEY_PATH_VIDEO) + val videoPath = arguments?.getString(EntranceConsts.KEY_PATH_VIDEO) val videoEntity = arguments?.getParcelable(VideoEntity::class.java.simpleName) val factory = VideoPosterViewModel.Factory(HaloApp.getInstance().application, videoPath, videoEntity) @@ -66,7 +66,7 @@ class VideoPosterFragment : BaseFragment() { fun newInstance(videoPath: String?, videoEntity: VideoEntity?): VideoPosterFragment { val fragment = VideoPosterFragment() val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_PATH_VIDEO, videoPath) + bundle.putString(EntranceConsts.KEY_PATH_VIDEO, videoPath) bundle.putParcelable(VideoEntity::class.java.simpleName, videoEntity) fragment.arguments = bundle return fragment diff --git a/app/src/main/java/com/gh/gamecenter/video/poster/video/VideoPosterReviewAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/poster/video/VideoPosterReviewAdapter.kt index d12de277d0..965756a458 100644 --- a/app/src/main/java/com/gh/gamecenter/video/poster/video/VideoPosterReviewAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/poster/video/VideoPosterReviewAdapter.kt @@ -5,9 +5,9 @@ import android.net.Uri import android.view.View import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.util.ImageUtils -import com.gh.common.util.dip2px +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.R import com.gh.gamecenter.databinding.VideoPosterPreviewItemBinding import com.lightgame.adapter.BaseRecyclerAdapter diff --git a/app/src/main/java/com/gh/gamecenter/video/poster/video/VideoPosterViewModel.kt b/app/src/main/java/com/gh/gamecenter/video/poster/video/VideoPosterViewModel.kt index 3f859e79df..aab2227d8f 100644 --- a/app/src/main/java/com/gh/gamecenter/video/poster/video/VideoPosterViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/video/poster/video/VideoPosterViewModel.kt @@ -4,10 +4,10 @@ import android.app.Application import android.graphics.Bitmap import android.media.MediaMetadataRetriever import androidx.lifecycle.* -import com.gh.common.AppExecutor -import com.gh.common.util.ImageUtils -import com.gh.common.util.throwExceptionInDebug -import com.gh.common.util.tryCatchInRelease +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.utils.throwExceptionInDebug +import com.gh.gamecenter.common.utils.tryCatchInRelease import com.gh.gamecenter.entity.VideoEntity import java.io.File import kotlin.math.roundToLong 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 ac5caf4d5d..916c14ba86 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 @@ -2,8 +2,8 @@ package com.gh.gamecenter.video.upload import android.annotation.SuppressLint import com.alibaba.sdk.android.oss.common.OSSLog -import com.gh.common.util.MD5Utils -import com.gh.common.util.tryCatchInRelease +import com.gh.gamecenter.core.utils.MD5Utils +import com.gh.gamecenter.common.utils.tryCatchInRelease import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.entity.OssEntity import com.gh.gamecenter.retrofit.BiResponse diff --git a/app/src/main/java/com/gh/gamecenter/video/upload/UploadThread.kt b/app/src/main/java/com/gh/gamecenter/video/upload/UploadThread.kt index 2156690033..10370904eb 100644 --- a/app/src/main/java/com/gh/gamecenter/video/upload/UploadThread.kt +++ b/app/src/main/java/com/gh/gamecenter/video/upload/UploadThread.kt @@ -10,7 +10,7 @@ import com.alibaba.sdk.android.oss.callback.OSSProgressCallback import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider import com.alibaba.sdk.android.oss.internal.OSSAsyncTask import com.alibaba.sdk.android.oss.model.* -import com.gh.common.util.NetworkUtils +import com.gh.gamecenter.common.utils.NetworkUtils import com.gh.gamecenter.entity.OssEntity import com.halo.assistant.HaloApp import com.lightgame.utils.Utils diff --git a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt index f79c791395..bf02bcd662 100644 --- a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt @@ -26,14 +26,19 @@ import androidx.core.content.ContextCompat import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders import com.gh.base.ToolBarActivity -import com.gh.base.fragment.WaitingDialogFragment -import com.gh.common.AppExecutor +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment +import com.gh.gamecenter.core.AppExecutor import com.gh.common.util.* -import com.gh.common.view.DrawableView +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.CropImageActivity import com.gh.gamecenter.NewsDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity +import com.gh.gamecenter.common.* +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ActivityVideoUplaodBinding import com.gh.gamecenter.entity.* import com.gh.gamecenter.mvvm.Status @@ -128,8 +133,8 @@ class UploadVideoActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) mVideoLink = intent.getParcelableExtra(VideoLinkEntity::class.java.simpleName) - mEntranceLink = intent.getStringExtra(EntranceUtils.KEY_ENTRANCE_LINK) ?: "" - mPath = intent.getStringExtra(EntranceUtils.KEY_PATH) ?: "其他" + mEntranceLink = intent.getStringExtra(EntranceConsts.KEY_ENTRANCE_LINK) ?: "" + mPath = intent.getStringExtra(EntranceConsts.KEY_PATH) ?: "其他" // toolbar setToolbarMenu(R.menu.menu_text) @@ -172,8 +177,12 @@ class UploadVideoActivity : ToolBarActivity() { return@setOnClickListener } - startActivityForResult(VideoLabelActivity.getIntent(this, mActivityLabelEntity?.id - ?: ""), REQUEST_CODE_CHOOSE_LABEL) + startActivityForResult( + VideoLabelActivity.getIntent( + this, mActivityLabelEntity?.id + ?: "" + ), REQUEST_CODE_CHOOSE_LABEL + ) LogUtils.logVideoStreamingUpload("查看活动标签", mPath, mEntranceLink, "") } mBinding.deleteActivity.setOnClickListener { @@ -284,8 +293,10 @@ class UploadVideoActivity : ToolBarActivity() { mViewModel.activityTagLiveData.observe(this, Observer { mBinding.activityFlexbox.goneIf(!it) if (it && !mVideoLink?.tagActivityId.isNullOrEmpty() && !mVideoLink?.tagActivityName.isNullOrEmpty()) { - mActivityLabelEntity = ActivityLabelEntity(mVideoLink?.tagActivityId - ?: "", mVideoLink?.tagActivityName ?: "") + mActivityLabelEntity = ActivityLabelEntity( + mVideoLink?.tagActivityId + ?: "", mVideoLink?.tagActivityName ?: "" + ) mBinding.activityContainer.visibility = View.VISIBLE mBinding.activityTv.text = mActivityLabelEntity?.name } @@ -400,7 +411,7 @@ class UploadVideoActivity : ToolBarActivity() { mBinding.gameTitle.setSelection(mBinding.gameTitle.text.toString().length) } - initUpload(intent.getStringExtra(EntranceUtils.KEY_PATH_VIDEO)) + initUpload(intent.getStringExtra(EntranceConsts.KEY_PATH_VIDEO)) } } @@ -420,7 +431,7 @@ class UploadVideoActivity : ToolBarActivity() { val videoPath = if (mViewModel.videoDraft != null) { mViewModel.videoDraft?.localPath } else { - intent.getStringExtra(EntranceUtils.KEY_PATH_VIDEO) + intent.getStringExtra(EntranceConsts.KEY_PATH_VIDEO) } var intent: Intent? = null @@ -456,19 +467,20 @@ class UploadVideoActivity : ToolBarActivity() { handleFileNotFound() } else { DialogUtils.showUploadDraftDialog(this@UploadVideoActivity, - { - if (!File(mVideoFileEntity?.path).exists()) { - toast("上传失败，视频文件不存在") - handleFileNotFound() - } - MtaHelper.onEvent("上传视频", "上传视频-存草稿", "继续上传") - LogUtils.logVideoStreamingUpload("存草稿-取消", mPath, mEntranceLink, "") - }, - { + { + if (!File(mVideoFileEntity?.path).exists()) { + toast("上传失败，视频文件不存在") + handleFileNotFound() + } + MtaHelper.onEvent("上传视频", "上传视频-存草稿", "继续上传") + LogUtils.logVideoStreamingUpload("存草稿-取消", mPath, mEntranceLink, "") + }, object : ConfirmListener { + override fun onConfirm() { verifyData(true) MtaHelper.onEvent("上传视频", "上传视频-存草稿", "确定保存") LogUtils.logVideoStreamingUpload("存草稿-确定", mPath, mEntranceLink, "") - }) + } + }) } } return super.onMenuItemClick(item) @@ -560,20 +572,21 @@ class UploadVideoActivity : ToolBarActivity() { mViewModel.videoPatch!! } else { VideoEntity( - id = mViewModel.videoDraft?.id ?: "", - title = title.toString(), - url = mVideoFileEntity?.url ?: "", - gameId = mViewModel.gameEntity?.id ?: "", - size = mVideoFileEntity?.size ?: 0, - length = mVideoFileEntity?.length ?: 0, - poster = mViewModel.videoDraft?.poster ?: "", - categoryId = gameCategory, - format = mVideoFileEntity?.format ?: "", - tagsId = GsonUtils.fromJsonList(gameTags), - original = if (mBinding.originalTv.isChecked) "yes" else if (mBinding.reprintTv.isChecked) "no" else "", - source = if (mBinding.reprintTv.isChecked) mBinding.videoSourceEt.text.toString() else "", - tagActivityId = if (mBinding.originalTv.isChecked && mActivityLabelEntity != null) mActivityLabelEntity?.id - ?: "" else "") + id = mViewModel.videoDraft?.id ?: "", + title = title.toString(), + url = mVideoFileEntity?.url ?: "", + gameId = mViewModel.gameEntity?.id ?: "", + size = mVideoFileEntity?.size ?: 0, + length = mVideoFileEntity?.length ?: 0, + poster = mViewModel.videoDraft?.poster ?: "", + categoryId = gameCategory, + format = mVideoFileEntity?.format ?: "", + tagsId = GsonUtils.fromJsonList(gameTags), + original = if (mBinding.originalTv.isChecked) "yes" else if (mBinding.reprintTv.isChecked) "no" else "", + source = if (mBinding.reprintTv.isChecked) mBinding.videoSourceEt.text.toString() else "", + tagActivityId = if (mBinding.originalTv.isChecked && mActivityLabelEntity != null) mActivityLabelEntity?.id + ?: "" else "" + ) } if (mUpdatedPosterPath.isEmpty() && videoData.poster.isNotEmpty()) { @@ -584,8 +597,10 @@ class UploadVideoActivity : ToolBarActivity() { } else { val localVideoPoster = application.cacheDir.absolutePath + File.separator + System.currentTimeMillis() + ".jpg" try { - val bmp = ThumbnailUtils.createVideoThumbnail(mVideoFileEntity?.path - ?: "", MediaStore.Images.Thumbnails.MINI_KIND) + val bmp = ThumbnailUtils.createVideoThumbnail( + mVideoFileEntity?.path + ?: "", MediaStore.Images.Thumbnails.MINI_KIND + ) // bmp 可能为空 FileOutputStream(localVideoPoster).use { out -> bmp?.compress(Bitmap.CompressFormat.PNG, 100, out) @@ -597,13 +612,21 @@ class UploadVideoActivity : ToolBarActivity() { } localVideoPoster } - mViewModel.postVideoPosterAndContent(isDraft, videoData, mVideoFileEntity?.path, posterPath, mBinding.originalTv.isChecked && mBinding.watermarkSb.isChecked) + mViewModel.postVideoPosterAndContent( + isDraft, + videoData, + mVideoFileEntity?.path, + posterPath, + mBinding.originalTv.isChecked && mBinding.watermarkSb.isChecked + ) } } - private fun createFlexContent(flexView: FlexboxLayout, - contentList: List, - clickListener: (View, VideoTagEntity) -> Unit) { + private fun createFlexContent( + flexView: FlexboxLayout, + contentList: List, + clickListener: (View, VideoTagEntity) -> Unit + ) { flexView.removeAllViews() for (index in 0 until contentList.count()) { @@ -653,7 +676,13 @@ class UploadVideoActivity : ToolBarActivity() { } override fun onClick(widget: View) { - startActivity(WebActivity.getWebIntent(this@UploadVideoActivity, this@UploadVideoActivity.getString(R.string.upload_protocol_title), this@UploadVideoActivity.getString(R.string.upload_protocol_url))) + startActivity( + WebActivity.getWebIntent( + this@UploadVideoActivity, + this@UploadVideoActivity.getString(R.string.upload_protocol_title), + this@UploadVideoActivity.getString(R.string.upload_protocol_url) + ) + ) } }, uploadProtocolText.length - 10, uploadProtocolText.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) mBinding.updateProtocol.text = uploadProtocolText @@ -677,7 +706,7 @@ class UploadVideoActivity : ToolBarActivity() { if (!mViewModel.videoDraft?.poster.isNullOrEmpty()) { ImageUtils.display(mBinding.videoPoster, mViewModel.videoDraft?.poster) } else { - val poster = intent.getStringExtra(EntranceUtils.KEY_POSTER_PATH) + val poster = intent.getStringExtra(EntranceConsts.KEY_POSTER_PATH) if (poster.isNullOrEmpty()) { val thumbnail = ThumbnailUtils.createVideoThumbnail(videoPath, MediaStore.Images.Thumbnails.MINI_KIND) mBinding.videoPoster.setImageBitmap(thumbnail) @@ -798,32 +827,32 @@ class UploadVideoActivity : ToolBarActivity() { if (mVideoFileEntity?.path.isNullOrEmpty() || !File(mVideoFileEntity?.path).exists()) { val id = mViewModel.videoDraft?.id ?: return false DialogHelper.showDialog(this, - "提示", "视频文件不存在，无法完成上传", - "退出并删除草稿", "", { - // delete draft - mViewModel.deleteDraft(id) - }) + "提示", "视频文件不存在，无法完成上传", + "退出并删除草稿", "", { + // delete draft + mViewModel.deleteDraft(id) + }) return true } if (mVideoFileEntity?.url.isNullOrEmpty()) { DialogHelper.showDialog(this, "提示", - "视频正在上传中，确定要退出吗？", "确定退出", - "暂时不了", { - finish() - LogUtils.logVideoStreamingUpload("返回-确定返回", mPath, mEntranceLink, "") - }, { - LogUtils.logVideoStreamingUpload("返回-暂时不了", mPath, mEntranceLink, "") - }) + "视频正在上传中，确定要退出吗？", "确定退出", + "暂时不了", { + finish() + LogUtils.logVideoStreamingUpload("返回-确定返回", mPath, mEntranceLink, "") + }, { + LogUtils.logVideoStreamingUpload("返回-暂时不了", mPath, mEntranceLink, "") + }) } else { DialogHelper.showDialog(this, "提示", - "视频已上传完毕，确定退出并放弃提交吗？", "确定退出", - "继续提交", { - LogUtils.logVideoStreamingUpload("返回-确定返回", mPath, mEntranceLink, "") - finish() - }, { - LogUtils.logVideoStreamingUpload("返回-继续提交", mPath, mEntranceLink, "") - }) + "视频已上传完毕，确定退出并放弃提交吗？", "确定退出", + "继续提交", { + LogUtils.logVideoStreamingUpload("返回-确定返回", mPath, mEntranceLink, "") + finish() + }, { + LogUtils.logVideoStreamingUpload("返回-继续提交", mPath, mEntranceLink, "") + }) } return true @@ -903,10 +932,10 @@ class UploadVideoActivity : ToolBarActivity() { */ fun getIntent(context: Context, videoPath: String, entrance: String, path: String, poster: String? = null): Intent { val intent = Intent(context, UploadVideoActivity::class.java) - intent.putExtra(EntranceUtils.KEY_PATH, path) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) - intent.putExtra(EntranceUtils.KEY_PATH_VIDEO, videoPath) - intent.putExtra(EntranceUtils.KEY_POSTER_PATH, poster) + intent.putExtra(EntranceConsts.KEY_PATH, path) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_PATH_VIDEO, videoPath) + intent.putExtra(EntranceConsts.KEY_POSTER_PATH, poster) return intent } @@ -915,20 +944,22 @@ class UploadVideoActivity : ToolBarActivity() { * * @param link 只用于数据统计 */ - fun getIntent(context: Context, - videoPath: String, - linkEntity: VideoLinkEntity, - simpleGameEntity: SimpleGameEntity? = null, - entrance: String, - path: String, - poster: String? = null): Intent { + fun getIntent( + context: Context, + videoPath: String, + linkEntity: VideoLinkEntity, + simpleGameEntity: SimpleGameEntity? = null, + entrance: String, + path: String, + poster: String? = null + ): Intent { val intent = Intent(context, UploadVideoActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) - intent.putExtra(EntranceUtils.KEY_PATH, path) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_PATH, path) intent.putExtra(VideoLinkEntity::class.java.simpleName, linkEntity) intent.putExtra(SimpleGameEntity::class.java.simpleName, simpleGameEntity) - intent.putExtra(EntranceUtils.KEY_PATH_VIDEO, videoPath) - intent.putExtra(EntranceUtils.KEY_POSTER_PATH, poster) + intent.putExtra(EntranceConsts.KEY_PATH_VIDEO, videoPath) + intent.putExtra(EntranceConsts.KEY_POSTER_PATH, poster) return intent } @@ -937,8 +968,8 @@ class UploadVideoActivity : ToolBarActivity() { */ fun getIntent(context: Context, videoDraft: VideoDraftEntity, entrance: String, path: String): Intent { val intent = Intent(context, UploadVideoActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) - intent.putExtra(EntranceUtils.KEY_PATH, path) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_PATH, path) intent.putExtra(VideoDraftEntity::class.java.simpleName, videoDraft) return intent } @@ -948,8 +979,8 @@ class UploadVideoActivity : ToolBarActivity() { */ fun getIntent(context: Context, video: VideoEntity, entrance: String, path: String): Intent { val intent = Intent(context, UploadVideoActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) - intent.putExtra(EntranceUtils.KEY_PATH, path) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_PATH, path) intent.putExtra(VideoEntity::class.java.simpleName, video) return intent } 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 0a67b1814b..531dc1bcd5 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 @@ -7,8 +7,12 @@ import android.net.Uri import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData -import com.gh.base.fragment.WaitingDialogFragment +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.common.util.* +import com.gh.gamecenter.core.utils.GsonUtils +import com.gh.gamecenter.common.utils.toJson +import com.gh.gamecenter.common.utils.tryCatchInRelease +import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.entity.* import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.mvvm.Resource diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftAdapter.kt index 416535cfc0..99a5f6130e 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftAdapter.kt @@ -8,13 +8,18 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* -import com.gh.common.view.BugFixedPopupWindow +import com.gh.gamecenter.common.view.BugFixedPopupWindow import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.core.utils.EmptyCallback +import com.gh.gamecenter.common.utils.PermissionHelper +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.showAutoOrientation import com.gh.gamecenter.databinding.CommunityVideoDraftItemBinding import com.gh.gamecenter.entity.VideoDraftEntity diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftFragment.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftFragment.kt index 4b47adce31..1da826b97d 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftFragment.kt @@ -4,14 +4,10 @@ import android.app.Activity import android.content.Intent import android.os.Bundle import android.view.View -import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat -import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.dip2px -import com.gh.common.view.CustomDividerItemDecoration -import com.gh.common.view.FixLinearLayoutManager -import com.gh.common.view.GridSpacingItemDecoration +import com.gh.gamecenter.common.view.CustomDividerItemDecoration +import com.gh.gamecenter.common.view.FixLinearLayoutManager import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.entity.VideoDraftEntity diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt index f79e8e0f01..6dc2fbade8 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt @@ -11,6 +11,10 @@ import com.gh.base.BaseActivity import com.gh.base.BaseActivity_TabLayout import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.EmptyCallback +import com.gh.gamecenter.common.utils.PermissionHelper +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.entity.SimpleGameEntity import com.gh.gamecenter.entity.VideoLinkEntity import com.gh.gamecenter.video.upload.view.UploadVideoActivity @@ -108,18 +112,18 @@ class VideoManagerActivity : BaseActivity_TabLayout() { @JvmStatic fun getIntent(context: Context, entrance: String?, path: String?): Intent { val intent = Intent(context, VideoManagerActivity::class.java) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) return intent } @JvmStatic fun getVideoManagerBundle(linkEntity: VideoLinkEntity, simpleGameEntity: SimpleGameEntity, entrance: String? = null, path: String? = ""): Bundle { val bundle = Bundle() - bundle.putString(EntranceUtils.KEY_PATH, path) + bundle.putString(EntranceConsts.KEY_PATH, path) bundle.putParcelable(VideoLinkEntity::class.java.simpleName, linkEntity) bundle.putParcelable(SimpleGameEntity::class.java.simpleName, simpleGameEntity) - bundle.putString(EntranceUtils.KEY_TO, VideoManagerActivity::class.java.name) - bundle.putString(EntranceUtils.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) + bundle.putString(EntranceConsts.KEY_TO, VideoManagerActivity::class.java.name) + bundle.putString(EntranceConsts.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) return bundle } @@ -135,7 +139,7 @@ class VideoManagerActivity : BaseActivity_TabLayout() { path: String?): Intent { val intent = Intent(context, VideoManagerActivity::class.java) intent.putExtra(VideoLinkEntity::class.java.simpleName, linkEntity) - intent.putExtra(EntranceUtils.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path)) return intent } } diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt index 7324678126..8e8dcf947d 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt @@ -8,12 +8,14 @@ import android.view.ViewGroup import android.widget.LinearLayout import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.gh.common.constant.ItemViewType +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* -import com.gh.common.view.BugFixedPopupWindow +import com.gh.gamecenter.common.view.BugFixedPopupWindow import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.VideoVerifyItemBinding import com.gh.gamecenter.entity.VideoEntity import com.gh.gamecenter.video.VideoVerifyItemViewHolder diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyFragment.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyFragment.kt index 2ff637a5c1..6c8ecd8363 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyFragment.kt @@ -4,9 +4,9 @@ import android.content.Intent import android.os.Bundle import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.dip2px -import com.gh.common.view.FixLinearLayoutManager -import com.gh.common.view.GridSpacingItemDecoration +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.view.FixLinearLayoutManager +import com.gh.gamecenter.common.view.GridSpacingItemDecoration import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.entity.VideoEntity import com.gh.gamecenter.video.upload.view.UploadVideoActivity diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index 4418bf354c..d7d7fbdd83 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -11,11 +11,13 @@ import android.os.StrictMode; import android.preference.PreferenceManager; import android.text.TextUtils; +import androidx.annotation.NonNull; import androidx.collection.ArrayMap; import androidx.lifecycle.ProcessLifecycleOwner; import androidx.multidex.MultiDexApplication; import androidx.work.Configuration; +import com.alibaba.android.arouter.launcher.ARouter; import com.facebook.animated.giflite.GifDecoder; import com.facebook.imageformat.DefaultImageFormats; import com.facebook.imagepipeline.core.ImagePipelineConfig; @@ -23,32 +25,33 @@ import com.facebook.imagepipeline.core.ImageTranscoderType; import com.facebook.imagepipeline.core.MemoryChunkType; import com.facebook.imagepipeline.decoder.ImageDecoderConfig; import com.gh.base.GlobalActivityLifecycleObserver; -import com.gh.common.AppExecutor; import com.gh.common.FixedRateJobHelper; -import com.gh.common.constant.Config; -import com.gh.common.constant.Constants; import com.gh.common.exposure.ExposureManager; import com.gh.common.filter.RegionSettingHelper; -import com.gh.common.image.EmptyDecoder; +import com.gh.gamecenter.common.image.EmptyDecoder; import com.gh.common.loghub.LoghubUtils; import com.gh.common.tracker.Tracker; import com.gh.common.util.DataUtils; -import com.gh.common.util.DeviceUtils; import com.gh.common.util.DownloadNotificationHelper; import com.gh.common.util.DownloadObserver; -import com.gh.common.util.EmulatorUtil; -import com.gh.common.util.ExtensionsKt; +import com.gh.gamecenter.common.utils.EmulatorUtil; import com.gh.common.util.HomeBottomBarHelper; -import com.gh.common.util.ImageUtils; -import com.gh.common.util.NightModeUtils; -import com.gh.common.util.PackageFlavorHelper; +import com.gh.gamecenter.common.utils.NightModeUtils; import com.gh.common.util.PackageHelper; import com.gh.common.util.PackageUtils; -import com.gh.common.util.SPUtils; -import com.gh.common.util.TimestampUtils; +import com.gh.gamecenter.common.utils.TimestampUtils; import com.gh.common.videolog.VideoRecordUtils; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.Injection; +import com.gh.gamecenter.common.constant.Config; +import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.utils.DeviceUtils; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.common.utils.PackageFlavorHelper; +import com.gh.gamecenter.core.AppExecutor; +import com.gh.gamecenter.core.iinterface.IApplication; +import com.gh.gamecenter.core.utils.SPUtils; import com.gh.gamecenter.entity.SubjectRecommendEntity; import com.gh.gamecenter.packagehelper.PackageRepository; import com.gh.gamecenter.receiver.ActivitySkipReceiver; @@ -66,6 +69,7 @@ import com.shuyu.gsyvideoplayer.cache.CacheFactory; import com.shuyu.gsyvideoplayer.player.PlayerFactory; import java.lang.reflect.Method; +import java.util.ServiceLoader; import java.util.concurrent.ExecutorService; import io.reactivex.plugins.RxJavaPlugins; @@ -95,6 +99,8 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid public int mCacheKeyboardHeight = 0; + private final ServiceLoader mApplicationList = ServiceLoader.load(IApplication.class, this.getClass().getClassLoader()); + public static void put(String key, Object object) { sObjectMap.put(key, object); } @@ -166,6 +172,7 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid @Override public void onCreate() { super.onCreate(); + initArouter(); if (!Injection.appInit(this)) { return; @@ -173,6 +180,10 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid mInstance = this; + for (IApplication application : mApplicationList) { + application.onCreate(mInstance); + } + // 70ms PlayerFactory.setPlayManager(Exo2PlayerManager.class); CacheFactory.setCacheManager(ExoPlayerCacheManager.class); @@ -287,6 +298,14 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid }, delay); } + private void initArouter() { + if (BuildConfig.DEBUG) { // 这两行必须写在init之前，否则这些配置在init过程中将无效 + ARouter.openLog(); // 打印日志 + ARouter.openDebug(); // 开启调试模式(如果在InstantRun模式下运行，必须开启调试模式！线上版本需要关闭,否则有安全风险) + } + ARouter.init(this); // 尽可能早，推荐在Application中初始化 + } + private void initThirdPartySdk() { DataUtils.init(this, mChannel); initGdt(); @@ -386,21 +405,21 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid || Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP_MR1) { pipelineConfigBuilder.setMemoryChunkType(MemoryChunkType.BUFFER_MEMORY) .setImageTranscoderType(ImageTranscoderType.JAVA_TRANSCODER); - + decodeConfigBuilder.overrideDecoder(DefaultImageFormats.GIF, new GifDecoder()).build(); String manufacture = Build.MANUFACTURER.toLowerCase(); - + // OPPO 和 VIVO 的 5.1.1 设备还会去加载 WEBP_ANIMATED 的 SO， // 实测没有发现有地方使用 WEBP_ANIMATED 的图片，这里用空占位图来替换 WEBP 动图 if ("oppo".equals(manufacture) || "vivo".equals(manufacture)) { decodeConfigBuilder.overrideDecoder(DefaultImageFormats.WEBP_ANIMATED, new EmptyDecoder()).build(); } - + pipelineConfigBuilder - .setImageDecoderConfig(decodeConfigBuilder.build()) - .experiment() - .setNativeCodeDisabled(true); + .setImageDecoderConfig(decodeConfigBuilder.build()) + .experiment() + .setNativeCodeDisabled(true); // 图片仅加载静态图片 ImageUtils.disableAnimatedImage(); @@ -463,4 +482,44 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid public Configuration getWorkManagerConfiguration() { return new Configuration.Builder().build(); } + + @Override + protected void attachBaseContext(Context base) { + super.attachBaseContext(base); + for (IApplication application : mApplicationList) { + application.attachBaseContext(); + } + } + + @Override + public void onLowMemory() { + super.onLowMemory(); + for (IApplication application : mApplicationList) { + application.onLowMemory(); + } + } + + @Override + public void onConfigurationChanged(@NonNull android.content.res.Configuration newConfig) { + super.onConfigurationChanged(newConfig); + for (IApplication application : mApplicationList) { + application.onConfigurationChanged(newConfig); + } + } + + @Override + public void onTerminate() { + super.onTerminate(); + for (IApplication application : mApplicationList) { + application.onTerminate(); + } + } + + @Override + public void onTrimMemory(int level) { + super.onTrimMemory(level); + for (IApplication application : mApplicationList) { + application.onTrimMemory(level); + } + } } diff --git a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.kt b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.kt index f43d9ef4c9..e17a3f03aa 100644 --- a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.kt @@ -9,13 +9,19 @@ import android.preference.PreferenceManager import android.view.View import androidx.core.content.ContextCompat import com.gh.common.util.* -import com.gh.common.util.MtaHelper.onEvent -import com.gh.common.util.TimeUtils.getFormatTime +import com.gh.gamecenter.core.utils.MtaHelper.onEvent +import com.gh.gamecenter.core.utils.TimeUtils.getFormatTime import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.core.utils.StringUtils +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.common.utils.copyTextAndToast +import com.gh.gamecenter.common.utils.PackageFlavorHelper import com.gh.gamecenter.databinding.FragmentAboutBinding import com.gh.gamecenter.manager.UpdateManager -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.halo.assistant.HaloApp import java.util.* @@ -57,7 +63,7 @@ class AboutFragment : NormalFragment() { val year = getFormatTime(serverTime, "yyyy") mBinding.copyrightTv.text = getString(R.string.copyright_hint, year) - if (arguments != null && requireArguments().getBoolean(EntranceUtils.KEY_VERSION_UPDATE)) { + if (arguments != null && requireArguments().getBoolean(EntranceConsts.KEY_VERSION_UPDATE)) { UpdateManager.getInstance(context).checkUpdate(false, mBaseHandler) // 检查更新 } 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 45565eff10..0a9006daf9 100644 --- a/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java @@ -17,18 +17,18 @@ import androidx.lifecycle.Lifecycle; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.gh.common.util.DialogHelper; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.MtaHelper; -import com.gh.common.util.ToastUtils; -import com.gh.common.view.VerticalItemDecoration; +import com.gh.gamecenter.common.utils.DialogHelper; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.core.utils.ToastUtils; +import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.download.DownloadManager; import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.CleanApkAdapter; import com.gh.gamecenter.entity.InstallGameEntity; import com.gh.gamecenter.fragment.MainWrapperFragment; -import com.gh.gamecenter.normal.NormalFragment; +import com.gh.gamecenter.common.base.fragment.NormalFragment; import com.lightgame.utils.Utils; import java.io.File; @@ -78,7 +78,7 @@ public class ApkCleanerFragment extends NormalFragment implements CleanApkAdapte mApkDeleteBtn.setOnClickListener(this); mNodataSkipBtn.setOnClickListener(this); - isChooseApk = requireArguments().getBoolean(EntranceUtils.KEY_IS_CHOOSE_APK, false); + isChooseApk = requireArguments().getBoolean(EntranceConsts.KEY_IS_CHOOSE_APK, false); setNavigationTitle(isChooseApk ? getString(R.string.title_choose_apk) : getString(R.string.title_clean_apk)); mNodataSkipLl.setVisibility(View.GONE); @@ -153,8 +153,8 @@ public class ApkCleanerFragment extends NormalFragment implements CleanApkAdapte ToastUtils.showToast("请选择需要上传的安装包"); } else { Intent intent = new Intent(); - intent.putExtra(EntranceUtils.KEY_PACKAGENAME, installGameEntity.getPackageName()); - intent.putExtra(EntranceUtils.KEY_PATH, installGameEntity.getGamePath()); + intent.putExtra(EntranceConsts.KEY_PACKAGENAME, installGameEntity.getPackageName()); + intent.putExtra(EntranceConsts.KEY_PATH, installGameEntity.getGamePath()); requireActivity().setResult(Activity.RESULT_OK, intent); requireActivity().finish(); } diff --git a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt index 4d6cc03a70..b25f83cf2e 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt @@ -11,13 +11,19 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import com.airbnb.lottie.LottieAnimationView import com.gh.common.constant.Config -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.history.HistoryHelper -import com.gh.common.runOnIoThread -import com.gh.common.runOnUiThread +import com.gh.gamecenter.core.runOnIoThread +import com.gh.gamecenter.core.runOnUiThread import com.gh.common.util.* import com.gh.download.server.BrowserInstallHelper import com.gh.gamecenter.* +import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.utils.PermissionHelper +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentSettingBinding import com.gh.gamecenter.entity.UserInfoEntity import com.gh.gamecenter.entity.WechatConfigEntity @@ -25,7 +31,7 @@ import com.gh.gamecenter.eventbus.EBReuse import com.gh.gamecenter.fragment.MainWrapperFragment import com.gh.gamecenter.game.upload.GameSubmissionActivity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.gh.gamecenter.security.SecurityActivity import com.gh.gamecenter.setting.GameDownloadSettingActivity import com.gh.gamecenter.setting.VideoSettingActivity @@ -60,7 +66,7 @@ class SettingsFragment : NormalFragment() { super.onCreate(savedInstanceState) initView() if (arguments != null) { - mIsUpdate = requireArguments().getBoolean(EntranceUtils.KEY_VERSION_UPDATE, false) + mIsUpdate = requireArguments().getBoolean(EntranceConsts.KEY_VERSION_UPDATE, false) if (mIsUpdate) { mBinding.aboutItem.contentTv.text = getString(R.string.personal_update_hint) mBinding.aboutItem.contentTv.setTextColor(Color.WHITE) @@ -229,8 +235,10 @@ class SettingsFragment : NormalFragment() { ) } else { DialogUtils.showUsageStatsDialog( - requireContext(), { - UsageStatsHelper.skipToUsageStats(requireContext(), UsageStatsHelper.USAGE_STATUS_REQUEST_CODE) + requireContext(), object : ConfirmListener { + override fun onConfirm() { + UsageStatsHelper.skipToUsageStats(requireContext(), UsageStatsHelper.USAGE_STATUS_REQUEST_CODE) + } }) {} } } @@ -339,12 +347,14 @@ class SettingsFragment : NormalFragment() { mBinding.settingLogout.setOnClickListener { DialogUtils.showForceDialog( context, "退出登录", "退出账号即会回到游客状态，很多功能将无法使用（例如评论、客服消息），确定退出吗？", - "确定退出", "取消", { - loadingDialog = DialogUtils.showWaitDialog(context, "退出登录中...") - LoginUtils.logout { - UserRepository.getInstance().logout() - if (loadingDialog != null) loadingDialog!!.dismiss() - if (activity != null) requireActivity().finish() + "确定退出", "取消", object : ConfirmListener { + override fun onConfirm() { + loadingDialog = DialogUtils.showWaitDialog(context, "退出登录中...") + LoginUtils.logout { + UserRepository.getInstance().logout() + if (loadingDialog != null) loadingDialog!!.dismiss() + if (activity != null) requireActivity().finish() + } } }, null ) diff --git a/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt b/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt index ea3d8ed4fd..f43b282b30 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt @@ -5,15 +5,15 @@ import android.os.Build import android.os.Bundle import android.provider.Settings import android.view.View -import com.gh.common.constant.Constants -import com.gh.common.util.SPUtils -import com.gh.common.util.SpanBuilder -import com.gh.common.view.CustomLinkMovementMethod +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.core.utils.SpanBuilder +import com.gh.gamecenter.common.view.CustomLinkMovementMethod import com.gh.download.server.BrowserInstallHelper import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.databinding.FragmentSwitchInstallMethodBinding -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import java.util.* /** 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 4888911bff..cec3da1d75 100644 --- a/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java @@ -9,7 +9,6 @@ import android.view.inputmethod.EditorInfo; import android.widget.EditText; import android.widget.TextView; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; @@ -18,9 +17,9 @@ import com.gh.common.util.AdHelper; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DirectUtils; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.MtaHelper; -import com.gh.common.view.VerticalItemDecoration; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.VoteAdapter; import com.gh.gamecenter.baselist.ListAdapter; @@ -80,8 +79,8 @@ public class VoteFragment extends ListFragment(); mTypeList = new ArrayList<>(); - mGameId = args.getString(EntranceUtils.KEY_GAMEID); + mGameId = args.getString(EntranceConsts.KEY_GAMEID); mLayoutManager = new LinearLayoutManager(getContext()); mGameNewsRv.setHasFixedSize(true); 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 5dd7bfdd09..742972f576 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 @@ -17,18 +17,18 @@ import android.widget.TextView; import com.gh.common.constant.Config; import com.gh.common.util.DataCollectionUtils; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.EnvHelper; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.utils.EnvHelper; import com.gh.common.util.NewsUtils; -import com.gh.common.util.UrlFilterUtils; -import com.gh.common.view.VerticalItemDecoration; +import com.gh.gamecenter.core.utils.UrlFilterUtils; +import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsTextViewHolder; import com.gh.gamecenter.databinding.NewsTextItemBinding; import com.gh.gamecenter.entity.NewsEntity; -import com.gh.gamecenter.normal.NormalFragment; +import com.gh.gamecenter.common.base.fragment.NormalFragment; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.utils.Util_System_Keyboard; @@ -84,9 +84,9 @@ public class GameNewsSearchResultFragment extends NormalFragment { Bundle args = getArguments(); - String gameName = args.getString(EntranceUtils.KEY_GAMENAME); - mSearchKey = args.getString(EntranceUtils.KEY_SEARCHKEY); - mGameId = args.getString(EntranceUtils.KEY_GAMEID); + String gameName = args.getString(EntranceConsts.KEY_GAMENAME); + mSearchKey = args.getString(EntranceConsts.KEY_SEARCHKEY); + mGameId = args.getString(EntranceConsts.KEY_GAMEID); setNavigationTitle(gameName); diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GamePluggableViewHolder.kt b/app/src/main/java/com/halo/assistant/fragment/game/GamePluggableViewHolder.kt index d798576133..7a7c9d2160 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GamePluggableViewHolder.kt +++ b/app/src/main/java/com/halo/assistant/fragment/game/GamePluggableViewHolder.kt @@ -1,8 +1,8 @@ package com.halo.assistant.fragment.game import android.view.View -import com.gh.base.BaseRecyclerViewHolder -import com.gh.common.view.DrawableView +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.databinding.GamePluggableItemBinding import com.gh.gamecenter.entity.GameEntity diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java b/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java index f1477fc16a..1cb86229c9 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java @@ -8,17 +8,17 @@ import android.widget.LinearLayout; import androidx.recyclerview.widget.RecyclerView; -import com.gh.common.constant.ItemViewType; +import com.gh.gamecenter.common.constant.ItemViewType; import com.gh.common.databind.BindingAdapters; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DialogUtils; -import com.gh.common.util.DisplayUtils; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.common.util.DownloadItemUtils; -import com.gh.common.util.ExtensionsKt; import com.gh.common.util.HomePluggableHelper; -import com.gh.common.util.MtaHelper; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.PlatformUtils; -import com.gh.common.util.StringUtils; +import com.gh.gamecenter.core.utils.StringUtils; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.GameViewHolder; diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GamePluginViewHolder.java b/app/src/main/java/com/halo/assistant/fragment/game/GamePluginViewHolder.java index 9b90a7368d..ee8ca18362 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GamePluginViewHolder.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GamePluginViewHolder.java @@ -1,7 +1,7 @@ package com.halo.assistant.fragment.game; -import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; import com.gh.gamecenter.databinding.GamePluginItemBinding; /** 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 41891cdf35..58453632a5 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 @@ -6,15 +6,15 @@ import android.view.ViewGroup; import androidx.core.content.ContextCompat; -import com.gh.base.OnRequestCallBackListener; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; import com.gh.common.databind.BindingAdapters; import com.gh.common.filter.RegionSettingHelper; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.ConcernUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.StringUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.core.utils.StringUtils; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.ConcernViewHolder; diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java index 01a0f0c6dd..ec7b6c74b2 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java @@ -5,14 +5,14 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import com.gh.base.OnRequestCallBackListener; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; import com.gh.common.util.CheckLoginUtils; import com.gh.common.view.Concern_LinearLayout; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBConcernChanged; import com.gh.gamecenter.eventbus.EBReuse; -import com.gh.gamecenter.normal.NormalFragment; +import com.gh.gamecenter.common.base.fragment.NormalFragment; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; 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 27fc1b9b79..95fd55876b 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 @@ -6,7 +6,7 @@ import android.view.ViewGroup; import androidx.annotation.Nullable; -import com.gh.base.OnRequestCallBackListener; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; import com.gh.common.constant.Config; import com.gh.common.databind.BindingAdapters; import com.gh.common.filter.RegionSettingHelper; @@ -16,8 +16,8 @@ import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.ConcernUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.StringUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.core.utils.StringUtils; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.ConcernViewHolder; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameFragment.kt b/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameFragment.kt index fe6b02756b..96d959f5ea 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameFragment.kt @@ -9,12 +9,18 @@ import android.text.TextUtils import android.view.View import androidx.core.widget.doOnTextChanged import androidx.fragment.app.viewModels -import com.gh.base.fragment.WaitingDialogFragment +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.EmptyCallback +import com.gh.gamecenter.common.utils.PermissionHelper +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.common.utils.enlargeTouchArea +import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.databinding.FragmentManuallyRealNameBinding import com.gh.gamecenter.entity.IdCardEntity -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.squareup.picasso.MemoryPolicy import io.reactivex.disposables.Disposable @@ -103,8 +109,8 @@ class ManuallyRealNameFragment : NormalFragment() { updateSubmitBtn() } - mBinding.nameEt.setText(arguments?.getString(EntranceUtils.KEY_NAME) ?: "") - mBinding.idCardEt.setText(arguments?.getString(EntranceUtils.KEY_ID) ?: "") + mBinding.nameEt.setText(arguments?.getString(EntranceConsts.KEY_NAME) ?: "") + mBinding.idCardEt.setText(arguments?.getString(EntranceConsts.KEY_ID) ?: "") mBinding.nameEt.setSelection(mBinding.nameEt.text.length) mBinding.idCardEt.setSelection(mBinding.idCardEt.text.length) diff --git a/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameViewModel.kt b/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameViewModel.kt index 163ad1a3f0..4fbad108f1 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameViewModel.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameViewModel.kt @@ -5,8 +5,8 @@ import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import com.gh.common.util.ErrorHelper -import com.gh.common.util.GsonUtils -import com.gh.common.util.tryWithDefaultCatch +import com.gh.gamecenter.core.utils.GsonUtils +import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.entity.IdCardEntity import com.gh.gamecenter.entity.UserInfoEntity import com.gh.gamecenter.retrofit.BiResponse 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 89c9fde871..693e0abdd2 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 @@ -12,12 +12,20 @@ import androidx.constraintlayout.widget.ConstraintSet import androidx.core.widget.doOnTextChanged import androidx.fragment.app.viewModels import com.gh.common.util.* -import com.gh.common.view.CustomLinkMovementMethod +import com.gh.gamecenter.common.view.CustomLinkMovementMethod import com.gh.download.DownloadManager import com.gh.gamecenter.R import com.gh.gamecenter.ShellActivity +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.enlargeTouchArea +import com.gh.gamecenter.common.utils.observeNonNull +import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.utils.TextHelper +import com.gh.gamecenter.common.utils.visibleIf +import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentRealNameBinding -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import org.json.JSONObject class RealNameInfoFragment : NormalFragment() { @@ -41,11 +49,11 @@ class RealNameInfoFragment : NormalFragment() { super.onViewCreated(view, savedInstanceState) mIsForcedToCertificate = - arguments?.getBoolean(EntranceUtils.KEY_IS_FORCED_TO_CERTIFICATE) ?: false + arguments?.getBoolean(EntranceConsts.KEY_IS_FORCED_TO_CERTIFICATE) ?: false mHasBackdoor = - arguments?.getBoolean(EntranceUtils.KEY_IS_FORCED_TO_CERTIFICATE_BUT_WITH_BACKDOOR) + arguments?.getBoolean(EntranceConsts.KEY_IS_FORCED_TO_CERTIFICATE_BUT_WITH_BACKDOOR) ?: false - mGameId = arguments?.getString(EntranceUtils.KEY_GAME_ID) ?: "" + mGameId = arguments?.getString(EntranceConsts.KEY_GAME_ID) ?: "" mBinding.toolbar.normalTitle.text = "实名认证" mBinding.toolbar.normalToolbar.setNavigationOnClickListener { requireActivity().finish() } @@ -71,8 +79,8 @@ class RealNameInfoFragment : NormalFragment() { requireContext(), ShellActivity.Type.MANUALLY_REAL_NAME, Bundle().apply { - putString(EntranceUtils.KEY_NAME, mBinding.nameEt.text.toString()) - putString(EntranceUtils.KEY_ID, mBinding.idCardEt.text.toString()) + putString(EntranceConsts.KEY_NAME, mBinding.nameEt.text.toString()) + putString(EntranceConsts.KEY_ID, mBinding.idCardEt.text.toString()) } ) ) @@ -153,8 +161,8 @@ class RealNameInfoFragment : NormalFragment() { requireContext(), ShellActivity.Type.MANUALLY_REAL_NAME, Bundle().apply { - putString(EntranceUtils.KEY_NAME, mBinding.nameEt.text.toString()) - putString(EntranceUtils.KEY_ID, mBinding.idCardEt.text.toString()) + putString(EntranceConsts.KEY_NAME, mBinding.nameEt.text.toString()) + putString(EntranceConsts.KEY_ID, mBinding.idCardEt.text.toString()) } ) ) @@ -222,7 +230,7 @@ class RealNameInfoFragment : NormalFragment() { mBinding.reEditInfoBtn.setOnClickListener { startActivity( ShellActivity.getIntent(requireContext(), ShellActivity.Type.REAL_NAME_INFO).apply { - putExtra(EntranceUtils.KEY_IS_FORCED_TO_CERTIFICATE, true) + putExtra(EntranceConsts.KEY_IS_FORCED_TO_CERTIFICATE, true) } ) requireActivity().finish() 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 bd2cf8c365..28951b2a80 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 @@ -5,11 +5,15 @@ import android.app.Application import android.text.TextUtils import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData -import com.gh.common.constant.Constants -import com.gh.common.json.json +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.json.json import com.gh.common.util.* -import com.gh.common.util.GsonUtils.fromJson +import com.gh.gamecenter.core.utils.GsonUtils.fromJson import com.gh.download.DownloadManager +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.toObject +import com.gh.gamecenter.common.utils.toRequestBody +import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.entity.IdCardEntity import com.gh.gamecenter.entity.UserInfoEntity import com.gh.gamecenter.manager.UserManager diff --git a/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java index 33c976a39d..c8b4821ca1 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java @@ -16,12 +16,12 @@ import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProviders; import com.gh.common.util.DialogUtils; -import com.gh.common.util.EntranceUtils; -import com.gh.common.util.PermissionHelper; -import com.gh.common.util.RandomUtils; -import com.gh.common.util.UserIconUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.utils.PermissionHelper; +import com.gh.gamecenter.core.utils.RandomUtils; +import com.gh.gamecenter.common.utils.UserIconUtils; import com.gh.gamecenter.R; -import com.gh.gamecenter.normal.NormalFragment; +import com.gh.gamecenter.common.base.fragment.NormalFragment; import com.gh.gamecenter.user.UserViewModel; import com.lightgame.utils.Utils; import com.zhihu.matisse.internal.utils.PathUtils; @@ -77,7 +77,7 @@ public class SelectPortraitFragment extends NormalFragment { break; case REQUEST_CROP_ICON: if (data != null && data.getExtras() != null) { - String url = data.getExtras().getString(EntranceUtils.KEY_URL); + String url = data.getExtras().getString(EntranceConsts.KEY_URL); change(url); } break; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java index ce07f0118f..e105f649d2 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java @@ -14,12 +14,12 @@ import androidx.fragment.app.FragmentTransaction; import android.text.TextUtils; import com.gh.common.util.DialogUtils; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.UserInfoEntity; import com.gh.gamecenter.user.ApiResponse; import com.gh.gamecenter.user.UserViewModel; -import com.gh.gamecenter.normal.NormalFragment; +import com.gh.gamecenter.common.base.fragment.NormalFragment; import com.halo.assistant.fragment.user.region.OnRegionSelectListener; import com.halo.assistant.fragment.user.region.RegionCountFragment; import com.halo.assistant.fragment.user.region.RegionProvFragment; @@ -76,7 +76,7 @@ public class SelectRegionFragment extends NormalFragment implements OnBackPresse } else { mProvFragment = alterFragment(transaction, RegionProvFragment.class); Bundle args = new Bundle(); - args.putStringArrayList(EntranceUtils.KEY_PROLIST, new ArrayList<>(provinceList)); + args.putStringArrayList(EntranceConsts.KEY_PROLIST, new ArrayList<>(provinceList)); if (mProvFragment != null) { mProvFragment.setArguments(args); } diff --git a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.kt b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.kt index c1dc9a2e59..713a8dec57 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.kt @@ -13,14 +13,19 @@ import android.view.View import android.widget.EditText import android.widget.TextView import androidx.lifecycle.ViewModelProviders -import com.gh.common.constant.Constants +import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* -import com.gh.common.view.UrlInterceptedLinkMovementMethod +import com.gh.gamecenter.common.view.UrlInterceptedLinkMovementMethod import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.GsonUtils +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.common.utils.fromHtml +import com.gh.gamecenter.common.utils.TextHelper import com.gh.gamecenter.databinding.FragmentUserinfoEditBinding import com.gh.gamecenter.entity.UserInfoEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.gh.gamecenter.retrofit.JSONObjectResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.user.ApiResponse @@ -52,7 +57,7 @@ class UserInfoEditFragment : NormalFragment() { super.onCreate(savedInstanceState) setHasOptionsMenu(true) mEditType = requireArguments().getString(UserViewModel.KEY_EDIT_TYPE)!! - mIsForcedToCertificate = requireArguments().getBoolean(EntranceUtils.KEY_IS_FORCED_TO_CERTIFICATE) + mIsForcedToCertificate = requireArguments().getBoolean(EntranceConsts.KEY_IS_FORCED_TO_CERTIFICATE) initMenu(R.menu.menu_button) mSaveMenuItem = getItemMenu(R.id.menu_button) diff --git a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.kt b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.kt index d4d0580b6a..234ca31c9a 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.kt @@ -5,12 +5,12 @@ import android.text.TextUtils import android.view.View import androidx.lifecycle.ViewModelProviders import com.gh.common.util.DirectUtils -import com.gh.common.util.ImageUtils.display -import com.gh.common.util.MtaHelper +import com.gh.gamecenter.common.utils.ImageUtils.display +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.* import com.gh.gamecenter.databinding.FragmentUserinfoBinding import com.gh.gamecenter.entity.UserInfoEntity -import com.gh.gamecenter.normal.NormalFragment +import com.gh.gamecenter.common.base.fragment.NormalFragment import com.gh.gamecenter.user.ApiResponse import com.gh.gamecenter.user.UserViewModel diff --git a/app/src/main/java/com/halo/assistant/fragment/user/UserPortraitCropImageActivity.java b/app/src/main/java/com/halo/assistant/fragment/user/UserPortraitCropImageActivity.java index bda5c09948..8305221bd7 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/UserPortraitCropImageActivity.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/UserPortraitCropImageActivity.java @@ -12,8 +12,8 @@ import android.view.MenuItem; import androidx.annotation.NonNull; -import com.gh.base.fragment.WaitingDialogFragment; -import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.common.util.UploadImageUtils; import com.gh.gamecenter.CropImageActivity; import com.gh.gamecenter.R; @@ -132,7 +132,7 @@ public class UserPortraitCropImageActivity extends CropImageActivity { sp.edit().putString("updateIconCount", jsonObject.toString()).apply(); Intent data = new Intent(); - data.putExtra(EntranceUtils.KEY_URL, url); + data.putExtra(EntranceConsts.KEY_URL, url); setResult(RESULT_OK, data); finish(); } catch (Exception e) { @@ -187,9 +187,9 @@ public class UserPortraitCropImageActivity extends CropImageActivity { @NonNull public static Intent getIntent(Context context, String picturePath, float cropRatio, String entrance) { Intent intent = new Intent(context, UserPortraitCropImageActivity.class); - intent.putExtra(EntranceUtils.KEY_PATH, picturePath); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); - intent.putExtra(EntranceUtils.KEY_IMAGE_CROP_RATIO, cropRatio); + intent.putExtra(EntranceConsts.KEY_PATH, picturePath); + intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance); + intent.putExtra(EntranceConsts.KEY_IMAGE_CROP_RATIO, cropRatio); return intent; } } diff --git a/app/src/main/java/com/halo/assistant/fragment/user/VerifiedConfirmDialog.kt b/app/src/main/java/com/halo/assistant/fragment/user/VerifiedConfirmDialog.kt index 4ee96c6efb..061502945d 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/VerifiedConfirmDialog.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/VerifiedConfirmDialog.kt @@ -2,8 +2,8 @@ package com.halo.assistant.fragment.user import android.content.Context import android.os.Bundle -import com.gh.common.dialog.TrackableDialog -import com.gh.common.util.MtaHelper +import com.gh.gamecenter.common.base.TrackableDialog +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.R import com.gh.gamecenter.databinding.DialogVerifiedConfirmBinding diff --git a/app/src/main/java/com/halo/assistant/fragment/user/region/RegionCounAdapter.java b/app/src/main/java/com/halo/assistant/fragment/user/region/RegionCounAdapter.java index ae8ccc210f..c24900df55 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/region/RegionCounAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/region/RegionCounAdapter.java @@ -7,13 +7,12 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.gh.common.util.GsonUtils; +import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.AreaViewHolder; import com.gh.gamecenter.databinding.AreaItemBinding; import com.gh.gamecenter.entity.LocalEntity; import com.gh.gamecenter.manager.UserManager; -import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.lightgame.adapter.BaseRecyclerAdapter; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/region/RegionCountFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/region/RegionCountFragment.java index a6bfe37181..a17716d0b2 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/region/RegionCountFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/region/RegionCountFragment.java @@ -10,8 +10,8 @@ import android.view.View; import android.widget.RelativeLayout; import android.widget.TextView; -import com.gh.base.fragment.BaseFragment; -import com.gh.common.view.VerticalItemDecoration; +import com.gh.gamecenter.common.base.fragment.BaseFragment; +import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.gamecenter.R; import java.util.List; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/region/RegionProvFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/region/RegionProvFragment.java index 805573b5a7..7f462ed050 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/region/RegionProvFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/region/RegionProvFragment.java @@ -8,9 +8,9 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.gh.base.fragment.BaseFragment; -import com.gh.common.util.EntranceUtils; -import com.gh.common.view.VerticalItemDecoration; +import com.gh.gamecenter.common.base.fragment.BaseFragment; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.gamecenter.R; import java.util.List; @@ -35,8 +35,8 @@ public class RegionProvFragment extends BaseFragment implements OnRegionSelectLi recyclerView.addItemDecoration(new VerticalItemDecoration(getContext(), false)); Bundle arguments = getArguments(); - if (arguments != null && arguments.getStringArrayList(EntranceUtils.KEY_PROLIST) != null) { - recyclerView.setAdapter(new RegionProvAdapter(getContext(), arguments.getStringArrayList(EntranceUtils.KEY_PROLIST), this)); + if (arguments != null && arguments.getStringArrayList(EntranceConsts.KEY_PROLIST) != null) { + recyclerView.setAdapter(new RegionProvAdapter(getContext(), arguments.getStringArrayList(EntranceConsts.KEY_PROLIST), this)); } } diff --git a/app/src/main/res/layout/activity_amway.xml b/app/src/main/res/layout/activity_amway.xml index 8e9eae2216..501cf5a52b 100644 --- a/app/src/main/res/layout/activity_amway.xml +++ b/app/src/main/res/layout/activity_amway.xml @@ -1,12 +1,12 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_background_clip.xml b/app/src/main/res/layout/activity_background_clip.xml index 2ce069b904..a224040b30 100644 --- a/app/src/main/res/layout/activity_background_clip.xml +++ b/app/src/main/res/layout/activity_background_clip.xml @@ -1,5 +1,5 @@ - - - + diff --git a/app/src/main/res/layout/activity_cropimage.xml b/app/src/main/res/layout/activity_cropimage.xml index 826ece8e81..54583bf6aa 100644 --- a/app/src/main/res/layout/activity_cropimage.xml +++ b/app/src/main/res/layout/activity_cropimage.xml @@ -1,5 +1,5 @@ - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_editor_insert_game.xml b/app/src/main/res/layout/activity_editor_insert_game.xml index d853d68753..26a28ebcda 100644 --- a/app/src/main/res/layout/activity_editor_insert_game.xml +++ b/app/src/main/res/layout/activity_editor_insert_game.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:background="@color/background" android:gravity="center" - app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_and_feedback.xml b/app/src/main/res/layout/activity_help_and_feedback.xml index c98a851533..829bb1c643 100644 --- a/app/src/main/res/layout/activity_help_and_feedback.xml +++ b/app/src/main/res/layout/activity_help_and_feedback.xml @@ -19,7 +19,7 @@ android:layout_alignParentBottom="true" android:background="@color/divider" /> - - - - - - diff --git a/app/src/main/res/layout/activity_rating_reply.xml b/app/src/main/res/layout/activity_rating_reply.xml index f71cafa9a4..118a9ca0bb 100644 --- a/app/src/main/res/layout/activity_rating_reply.xml +++ b/app/src/main/res/layout/activity_rating_reply.xml @@ -1,5 +1,5 @@ - - - + diff --git a/app/src/main/res/layout/activity_tablayout_viewpager.xml b/app/src/main/res/layout/activity_tablayout_viewpager.xml index 76ae7633ab..f39a3dffad 100644 --- a/app/src/main/res/layout/activity_tablayout_viewpager.xml +++ b/app/src/main/res/layout/activity_tablayout_viewpager.xml @@ -13,7 +13,7 @@ android:layout_height = "@dimen/tab_layout_height" android:background = "@color/white" > - + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> diff --git a/app/src/main/res/layout/activity_toolbox_block.xml b/app/src/main/res/layout/activity_toolbox_block.xml index da78de6705..6aeef44f27 100644 --- a/app/src/main/res/layout/activity_toolbox_block.xml +++ b/app/src/main/res/layout/activity_toolbox_block.xml @@ -28,7 +28,7 @@ android:background="@color/background" android:gravity="center" app:elevation="0dp" - app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> - @@ -48,7 +48,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" - app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> - - - - + - diff --git a/app/src/main/res/layout/amway_comment_item.xml b/app/src/main/res/layout/amway_comment_item.xml index 59829608a1..051391290b 100644 --- a/app/src/main/res/layout/amway_comment_item.xml +++ b/app/src/main/res/layout/amway_comment_item.xml @@ -97,7 +97,7 @@ app:layout_constraintLeft_toLeftOf="@id/gameContainer" app:layout_constraintTop_toBottomOf="@id/gameContainer"> - - - - - - - - - - - - - - + diff --git a/app/src/main/res/layout/dialog_game_big_event.xml b/app/src/main/res/layout/dialog_game_big_event.xml index 2cd3233c7e..385a8ef492 100644 --- a/app/src/main/res/layout/dialog_game_big_event.xml +++ b/app/src/main/res/layout/dialog_game_big_event.xml @@ -28,7 +28,7 @@ android:text="游戏动态"/> - - - + - - - + - - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_stop_service_explanation.xml b/app/src/main/res/layout/dialog_stop_service_explanation.xml index 571e6860c1..edb508524e 100644 --- a/app/src/main/res/layout/dialog_stop_service_explanation.xml +++ b/app/src/main/res/layout/dialog_stop_service_explanation.xml @@ -26,7 +26,7 @@ android:textSize="16sp" android:textStyle="bold" /> - - + - - - + - diff --git a/app/src/main/res/layout/downloadmanager.xml b/app/src/main/res/layout/downloadmanager.xml index b03c128d84..4a44d7c3ea 100644 --- a/app/src/main/res/layout/downloadmanager.xml +++ b/app/src/main/res/layout/downloadmanager.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - + diff --git a/app/src/main/res/layout/followers_or_fans_item.xml b/app/src/main/res/layout/followers_or_fans_item.xml index ef87b3fd7a..006851cb53 100644 --- a/app/src/main/res/layout/followers_or_fans_item.xml +++ b/app/src/main/res/layout/followers_or_fans_item.xml @@ -106,7 +106,7 @@ app:layout_constraintLeft_toRightOf="@id/user_name" app:layout_constraintTop_toTopOf="@id/user_name" /> - - + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> - - @@ -124,7 +124,7 @@ android:textStyle="bold" /> - + diff --git a/app/src/main/res/layout/fragment_answer_detail.xml b/app/src/main/res/layout/fragment_answer_detail.xml index 82bebd227f..093df546c5 100644 --- a/app/src/main/res/layout/fragment_answer_detail.xml +++ b/app/src/main/res/layout/fragment_answer_detail.xml @@ -130,7 +130,7 @@ android:background="@color/cutting_line" app:layout_constraintTop_toBottomOf="@id/answer_detail_title_rl" /> - - diff --git a/app/src/main/res/layout/fragment_answer_edit.xml b/app/src/main/res/layout/fragment_answer_edit.xml index bda92d51f4..f6642f9d7a 100644 --- a/app/src/main/res/layout/fragment_answer_edit.xml +++ b/app/src/main/res/layout/fragment_answer_edit.xml @@ -38,7 +38,7 @@ android:layout_height="wrap_content" android:background="@color/white" android:gravity="center" - app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_ask_questions.xml b/app/src/main/res/layout/fragment_ask_questions.xml index 3edecb260a..7efa64b9db 100644 --- a/app/src/main/res/layout/fragment_ask_questions.xml +++ b/app/src/main/res/layout/fragment_ask_questions.xml @@ -10,7 +10,7 @@ android:layout_height = "76dp" android:background = "@color/white" > - - - @@ -25,7 +25,7 @@ android:layout_height = "wrap_content" android:background = "@color/white" android:gravity = "center" - app:layout_behavior = "com.gh.common.view.FixAppBarLayoutBehavior" > + app:layout_behavior = ".common.view.FixAppBarLayoutBehavior" > @@ -37,4 +37,4 @@ app:layout_behavior = "@string/appbar_scrolling_view_behavior" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_avatar_border.xml b/app/src/main/res/layout/fragment_avatar_border.xml index bf34c70e28..f7226aeded 100644 --- a/app/src/main/res/layout/fragment_avatar_border.xml +++ b/app/src/main/res/layout/fragment_avatar_border.xml @@ -20,9 +20,9 @@ android:background="@color/background" android:fitsSystemWindows="true" android:gravity="center" - app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> - - - @@ -124,7 +124,7 @@ android:textStyle="bold" /> - + - @@ -156,7 +156,7 @@ app:layout_constraintEnd_toStartOf="@+id/alphaSeek" app:layout_constraintStart_toStartOf="parent" /> - - - - @@ -98,7 +98,7 @@ android:layout_alignParentBottom="true" android:background="@color/divider" /> - - diff --git a/app/src/main/res/layout/fragment_community_home.xml b/app/src/main/res/layout/fragment_community_home.xml index 9059e5d776..044b9c1658 100644 --- a/app/src/main/res/layout/fragment_community_home.xml +++ b/app/src/main/res/layout/fragment_community_home.xml @@ -12,7 +12,7 @@ android:scaleType="centerCrop" android:src="@drawable/bg_forum_home_top" /> - @@ -25,7 +25,7 @@ android:paddingBottom="8dp" android:layout_marginLeft="4dp"> - - - diff --git a/app/src/main/res/layout/fragment_energy_house.xml b/app/src/main/res/layout/fragment_energy_house.xml index 553d21793f..6a2b639db7 100644 --- a/app/src/main/res/layout/fragment_energy_house.xml +++ b/app/src/main/res/layout/fragment_energy_house.xml @@ -19,14 +19,14 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintLeft_toLeftOf="parent" /> - - - - - diff --git a/app/src/main/res/layout/fragment_forum_detail.xml b/app/src/main/res/layout/fragment_forum_detail.xml index 2bb2df9bdb..18051435c5 100644 --- a/app/src/main/res/layout/fragment_forum_detail.xml +++ b/app/src/main/res/layout/fragment_forum_detail.xml @@ -26,7 +26,7 @@ android:background="@color/white" android:fitsSystemWindows="true" android:gravity="center" - app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> - - - - - @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:background="@color/white" android:gravity="center" - app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> - - + + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> - - - + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> - - @@ -80,7 +80,7 @@ android:paddingRight="16dp" android:paddingBottom="16dp"> - + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> - - @@ -69,7 +69,7 @@ android:textStyle="bold" /> - + - - - @@ -110,4 +110,4 @@ android:layout_marginBottom="164dp" android:visibility="invisible" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 0e736c4fb5..37fe17ebfe 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - @@ -15,7 +15,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:elevation="0dp" - app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> - - - @@ -704,7 +704,7 @@ app:layout_constraintTop_toTopOf="parent" app:tabTextAppearance="@style/TabLayoutTextAppearance" /> - - + - - @@ -48,7 +48,7 @@ android:visibility="gone" android:src="@drawable/ic_video_detail_menu_more"/> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_invite.xml b/app/src/main/res/layout/fragment_invite.xml index 577898c89f..955c392f3a 100644 --- a/app/src/main/res/layout/fragment_invite.xml +++ b/app/src/main/res/layout/fragment_invite.xml @@ -12,7 +12,7 @@ android:layout_marginTop="8dp" android:background="@color/white" android:gravity="center" - app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> - @@ -46,7 +46,7 @@ - + - - - - @@ -240,4 +240,4 @@ android:layout_marginLeft="2dp" android:src="@drawable/ic_login_close"/> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 49aa686a56..83cb23c90b 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main_home.xml b/app/src/main/res/layout/fragment_main_home.xml index 5ea97f08b2..d0b7da4fd9 100644 --- a/app/src/main/res/layout/fragment_main_home.xml +++ b/app/src/main/res/layout/fragment_main_home.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:background="@color/transparent" app:elevation="0dp" - app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> - - + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> - - - @@ -462,7 +462,7 @@ - + - - - diff --git a/app/src/main/res/layout/fragment_password_setting.xml b/app/src/main/res/layout/fragment_password_setting.xml index 5c51c3472f..6f480dd7a5 100644 --- a/app/src/main/res/layout/fragment_password_setting.xml +++ b/app/src/main/res/layout/fragment_password_setting.xml @@ -40,7 +40,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/titleTv" /> - + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> - - - @@ -339,7 +339,7 @@ - + - - - + - - + - - + app:layout_behavior=".common.view.FixAppBarLayoutBehavior"> - diff --git a/app/src/main/res/layout/fragment_video_detail_container.xml b/app/src/main/res/layout/fragment_video_detail_container.xml index 6baa3dd889..2738cd85e9 100644 --- a/app/src/main/res/layout/fragment_video_detail_container.xml +++ b/app/src/main/res/layout/fragment_video_detail_container.xml @@ -26,7 +26,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - @@ -57,7 +57,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - diff --git a/app/src/main/res/layout/fragment_video_poster.xml b/app/src/main/res/layout/fragment_video_poster.xml index 1cdfb38e63..8ef5406566 100644 --- a/app/src/main/res/layout/fragment_video_poster.xml +++ b/app/src/main/res/layout/fragment_video_poster.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_wrapper_toolbar.xml b/app/src/main/res/layout/fragment_wrapper_toolbar.xml index 8d7bca88ef..8ceb24edce 100644 --- a/app/src/main/res/layout/fragment_wrapper_toolbar.xml +++ b/app/src/main/res/layout/fragment_wrapper_toolbar.xml @@ -6,7 +6,7 @@ android:orientation="vertical" android:paddingBottom="@dimen/main_bottom_tab_height"> - - - - - - - - - - - + diff --git a/app/src/main/res/layout/game_item.xml b/app/src/main/res/layout/game_item.xml index c5c5cedaa8..17e5a7f53d 100644 --- a/app/src/main/res/layout/game_item.xml +++ b/app/src/main/res/layout/game_item.xml @@ -247,7 +247,7 @@ app:layout_constraintLeft_toLeftOf="@+id/gameDesSpace" app:layout_constraintTop_toTopOf="@+id/gameDesSpace" /> - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_article_detail_comment.xml b/app/src/main/res/layout/item_article_detail_comment.xml index 15aa19c05c..95e0b18b47 100644 --- a/app/src/main/res/layout/item_article_detail_comment.xml +++ b/app/src/main/res/layout/item_article_detail_comment.xml @@ -6,7 +6,7 @@ android:layout_height="wrap_content" android:background="@color/white"> - - - - - - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_game_detail_gallery.xml b/app/src/main/res/layout/item_skeleton_game_detail_gallery.xml index 62120b21f4..3ef0779e53 100644 --- a/app/src/main/res/layout/item_skeleton_game_detail_gallery.xml +++ b/app/src/main/res/layout/item_skeleton_game_detail_gallery.xml @@ -13,7 +13,7 @@ android:layout_marginTop="24dp" android:background="@drawable/bg_skeleton_radius_4" /> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_game_detail_video.xml b/app/src/main/res/layout/item_skeleton_game_detail_video.xml index 0ba4e75a5b..614b583e43 100644 --- a/app/src/main/res/layout/item_skeleton_game_detail_video.xml +++ b/app/src/main/res/layout/item_skeleton_game_detail_video.xml @@ -13,7 +13,7 @@ android:layout_marginTop="24dp" android:background="@drawable/bg_skeleton_radius_4" /> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_horizontal_forum_list.xml b/app/src/main/res/layout/item_skeleton_horizontal_forum_list.xml index d2072558d3..71763fc239 100644 --- a/app/src/main/res/layout/item_skeleton_horizontal_forum_list.xml +++ b/app/src/main/res/layout/item_skeleton_horizontal_forum_list.xml @@ -6,7 +6,7 @@ - - + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_horizontal_simple_list.xml b/app/src/main/res/layout/item_skeleton_horizontal_simple_list.xml index 1309fc5d23..3359901f2c 100644 --- a/app/src/main/res/layout/item_skeleton_horizontal_simple_list.xml +++ b/app/src/main/res/layout/item_skeleton_horizontal_simple_list.xml @@ -14,7 +14,7 @@ android:layout_marginStart="16dp" android:background="@drawable/bg_skeleton_radius_4" /> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_simple_gallery_subject.xml b/app/src/main/res/layout/item_skeleton_simple_gallery_subject.xml index 470a8a1777..85bb260ea5 100644 --- a/app/src/main/res/layout/item_skeleton_simple_gallery_subject.xml +++ b/app/src/main/res/layout/item_skeleton_simple_gallery_subject.xml @@ -14,7 +14,7 @@ android:layout_marginStart="16dp" android:background="@drawable/bg_skeleton_radius_4" /> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/item_user_comment_history.xml b/app/src/main/res/layout/item_user_comment_history.xml index 741d45fb0d..5d938f8fcd 100644 --- a/app/src/main/res/layout/item_user_comment_history.xml +++ b/app/src/main/res/layout/item_user_comment_history.xml @@ -72,7 +72,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - + type="com.gh.gamecenter.common.callback.OnViewClickListener" /> - + - - - + diff --git a/app/src/main/res/layout/layout_forum_video_detail_videoview_portrait.xml b/app/src/main/res/layout/layout_forum_video_detail_videoview_portrait.xml index 1f2ffa0c20..e0461106bd 100644 --- a/app/src/main/res/layout/layout_forum_video_detail_videoview_portrait.xml +++ b/app/src/main/res/layout/layout_forum_video_detail_videoview_portrait.xml @@ -18,7 +18,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - + diff --git a/app/src/main/res/layout/message_item.xml b/app/src/main/res/layout/message_item.xml index 0cd2ad6860..d313b96a27 100644 --- a/app/src/main/res/layout/message_item.xml +++ b/app/src/main/res/layout/message_item.xml @@ -88,7 +88,7 @@ app:layout_constraintTop_toBottomOf="@id/message_user_name" tools:text="一个小时前" /> - - - - - - diff --git a/app/src/main/res/layout/piece_question_content.xml b/app/src/main/res/layout/piece_question_content.xml index 7d1544078b..d29a3b7cad 100644 --- a/app/src/main/res/layout/piece_question_content.xml +++ b/app/src/main/res/layout/piece_question_content.xml @@ -7,7 +7,7 @@ android:orientation="vertical" tools:showIn="@layout/questionsdetail_item"> - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/user_history_item.xml b/app/src/main/res/layout/user_history_item.xml index 4f7df0d30a..d4e334b171 100644 --- a/app/src/main/res/layout/user_history_item.xml +++ b/app/src/main/res/layout/user_history_item.xml @@ -26,7 +26,7 @@ app:layout_constraintTop_toTopOf="parent" tools:visibility="visible" /> - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index b1161aeadb..134b699a7a 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -1,306 +1,6 @@ - - #2888E0 - #332888E0 - - #EB9238 - - #E0393E - - #07A385 - - #2888E0 - #991383EB - - - #E0FFFFFF - #A3FFFFFF - #7AFFFFFF - #3DFFFFFF - @color/black - @color/white - - - #121212 - #000000 - - #333333 - - #1A000000 - - #66000000 - - #33000000 - - - @color/white - - @color/text_title - - @color/text_subtitleDesc - - #B3B3B3 - - - @color/divider - - - #0D000000 - - #14FFFFFF - - #d1e5f7 - - - #08FFFFFF - - - @color/theme - #06D0A8 - #FFB13C - @color/c7c7c7 - #A7A8B2 - - - #05C400 - #FFB13C - #FF6A28 - - - #FDA34D - - #1BA4FC - - #D63338 - - #FDA34D - - #2EC991 - - #ECECEC - - #30000000 - - #1668d0 - - #59d3ff - - #717171 - - #676767 - - #f8f8f8 - - #FF4E00 - - #175aa3 - - #60d6d5ff - - #949494 - - #454545 - - #e9e9e9 - - #FFB048 - - #F7F7F7 - - @color/white_alpha_20 - - #CCCCCC - #FFFDF2 - - #4BC3FF - - #ecfaff - - @android:color/black - #08000000 - #0D000000 - #1A000000 - #33000000 - #4D000000 - #99000000 - #66000000 - #80000000 - - #1AFFFFFF - #33FFFFFF - #66FFFFFF - #80FFFFFF - #99FFFFFF - #CCFFFFFF - #E6FFFFFF - @android:color/white - @android:color/white - @android:color/transparent - - #b3b3b3 - - #5C8399 - #5C9599 - #6F5EA8 - #996283 - #748054 - #946262 - - - #aaaaaa - #AAAAAA - #dcdcdc - #c7c7c7 - #d6d5ff - #f8f8f8 - #e5e5e5 - #e6e6e6 - #ECF6FF - #EDEDED - #F2F2F2 - #FFC247 - #FF9933 - #F4F5F6 - #CDF5F0 - #80000000 - #404040 - #ededed - #26262B - #1F1F23 - #303030 - #F7F7F7 - #FFF6E6 - #EBF5FF - #3797FF - #EFF7FF - #806F9CEF - #EBFDFF - #7CE7F8 - #E6F8FA - #91F0FD - #F6FBFF - #50DCDC - #81B5FF - #20FFB5 - #00DDDD - #74FFFF - #60D5FF - #EDF5FC - #F2F7FC - #EBFAF7 - #b2b2b2 - @color/text_subtitleDesc - @color/text_title - #3A3A3A - #5d5d5d - #5D5D5D - #949494 - #fbfbfb - #d5d5d5 - #b3b3b3 - #B3B3B3 - #6c6c6c - #ff5151 - #ffbf00 - #FA8500 - #f67722 - #989898 - #444444 - #777777 - #f2f2f2 - #292929 - #00DD08 - #E0FFF9 - #F10000 - #EA3333 - #FF700F - #FF7C1F - #181927 - #e6f3ff - #1F89EC - #EEF5FB - #C1BFC9 - #FF5F14 - #FFDAA2 - #F9A755 - #FF9B06 - #D8D8D8 - @color/background - #3BABFF - #2461FF - #FF0000 - #A1A5B7 - #50556B - #979A9F - #C2C6CC - #C0C0C0 - #242529 - #ebebeb - #4BC7FF - #F8F8F8 - #F0F0F0 - #00DBB0 - #00B8B8 - #00D7B0 - #dddddd - #FFB749 - #FF6D3C - #F56614 - #FF6455 - #F0F8FF - #2A85FB - #F3F3F3 - #3CB9FF - #E8F3FF - #05CBA3 - #F2F3F7 - #EDF4FB - #2E96FF - #FFB84F - #FFEACC - #FEDD26 - #140B6D - #16161A - #28282E - #8798A8 - #3796FF - #213964 - #06CCF4 - #F8A142 - #f9f9f9 - #a9a9a9 - #757575 - #0E0E0E - #F9FAFB - #00CDEB - #80EFFF - #00BFDB - #00DFFF - #3682C2 - #F67722 - #4B4B4B - #FF925C - #3087D9 - #C0C6CC - #717C8E - #DAF7F1 - #FFE5E6 - #17C2A1 - #0089D1 - #00DBA4 - #07B896 - #279BFE - #C4C4C4 - - #99666666 - #6621282E \ No newline at end of file diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index c1137f56bf..89186826cb 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -76,14 +76,6 @@ fixed - - - - - - - - - - - - @@ -173,20 +126,6 @@ @drawable/fontsize_radio_style - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module_common/src/main/res/values-night/themes.xml b/module_common/src/main/res/values-night/themes.xml new file mode 100644 index 0000000000..757059b8ed --- /dev/null +++ b/module_common/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/module_common/src/main/res/values/attrs.xml b/module_common/src/main/res/values/attrs.xml new file mode 100644 index 0000000000..57951d5e42 --- /dev/null +++ b/module_common/src/main/res/values/attrs.xml @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module_common/src/main/res/values/colors.xml b/module_common/src/main/res/values/colors.xml new file mode 100644 index 0000000000..ddcbc2b56f --- /dev/null +++ b/module_common/src/main/res/values/colors.xml @@ -0,0 +1,297 @@ + + + + #2496FF + #332496FF + + #FFA142 + + #FF4147 + + #06CEA8 + + + #1383EB + #991383EB + + + #333333 + #666666 + #999999 + #CCCCCC + @color/white + @color/black + + + #F5F5F5 + #FFFFFF + + #EEEEEE + + #1A000000 + + #66000000 + + #33000000 + + + @color/white + + @color/text_5d5d5d + + @color/text_9a9a9a + + #B3B3B3 + + + @color/bg_ededed + + + #0D000000 + + #E1E1E1 + + #d1e5f7 + + + #F5F5F5 + + + @color/theme + #06D0A8 + #FFB13C + @color/c7c7c7 + #A7A8B2 + + + #05C400 + #FFB13C + #FF6A28 + + + #FDA34D + + #1BA4FC + + #D63338 + + #FDA34D + + #2EC991 + + #ECECEC + + #30000000 + + #1668d0 + + #59d3ff + + #717171 + + #676767 + + #f8f8f8 + + #FF4E00 + + #175aa3 + + #60d6d5ff + + #949494 + + #454545 + + #e9e9e9 + + #FFB048 + + #F7F7F7 + + @color/white_alpha_20 + + #CCCCCC + #FFFDF2 + + #4BC3FF + + #ecfaff + + @android:color/black + #08000000 + #0D000000 + #1A000000 + #33000000 + #4D000000 + #99000000 + #66000000 + #80000000 + + #1AFFFFFF + #33FFFFFF + #66FFFFFF + #80FFFFFF + #99FFFFFF + #CCFFFFFF + #E6FFFFFF + @android:color/white + @android:color/white + @android:color/transparent + + #b3b3b3 + + + #aaaaaa + #AAAAAA + #dcdcdc + #c7c7c7 + #d6d5ff + #f8f8f8 + #e5e5e5 + #e6e6e6 + #ECF6FF + #EDEDED + #F2F2F2 + #FFC247 + #FF9933 + #F4F5F6 + #CDF5F0 + #80000000 + #404040 + #ededed + #26262B + #1F1F23 + #303030 + #F7F7F7 + #FFF6E6 + #EBF5FF + #3797FF + #EFF7FF + #806F9CEF + #EBFDFF + #7CE7F8 + #E6F8FA + #91F0FD + #F6FBFF + #50DCDC + #81B5FF + #20FFB5 + #00DDDD + #74FFFF + #60D5FF + #EDF5FC + #F2F7FC + #EBFAF7 + #b2b2b2 + #9a9a9a + #3a3a3a + #3A3A3A + #5d5d5d + #5D5D5D + #949494 + #fbfbfb + #d5d5d5 + #b3b3b3 + #B3B3B3 + #6c6c6c + #ff5151 + #ffbf00 + #FA8500 + #f67722 + #989898 + #444444 + #777777 + #f2f2f2 + #292929 + #00DD08 + #E0FFF9 + #F10000 + #EA3333 + #FF700F + #FF7C1F + #181927 + #e6f3ff + #1F89EC + #EEF5FB + #C1BFC9 + #FF5F14 + #FFDAA2 + #F9A755 + #FF9B06 + #D8D8D8 + #FAFAFA + #3BABFF + #2461FF + #FF0000 + #A1A5B7 + #50556B + #979A9F + #C2C6CC + #C0C0C0 + #242529 + #ebebeb + #4BC7FF + #F8F8F8 + #F0F0F0 + #00DBB0 + #00B8B8 + #00D7B0 + #dddddd + #FFB749 + #FF6D3C + #F56614 + #FF6455 + #F0F8FF + #2A85FB + #F3F3F3 + #3CB9FF + #E8F3FF + #05CBA3 + #F2F3F7 + #EDF4FB + #2E96FF + #FFB84F + #FFEACC + #FEDD26 + #140B6D + #16161A + #28282E + #8798A8 + #3796FF + #213964 + #06CCF4 + #F8A142 + #f9f9f9 + #a9a9a9 + #757575 + #0E0E0E + #F9FAFB + #00CDEB + #80EFFF + #00BFDB + #00DFFF + #3682C2 + #F67722 + #4B4B4B + #FF925C + #3087D9 + #C0C6CC + #717C8E + #DAF7F1 + #FFE5E6 + #17C2A1 + #0089D1 + #00DBA4 + #07B896 + #279BFE + #C4C4C4 + + #99666666 + #6621282E + \ No newline at end of file diff --git a/module_common/src/main/res/values/dimens.xml b/module_common/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..d3f7a47d64 --- /dev/null +++ b/module_common/src/main/res/values/dimens.xml @@ -0,0 +1,68 @@ + + + + 20sp + 18sp + 16sp + 14sp + 13sp + 12sp + 11sp + 10sp + + 0dp + + + 150dp + + 22dp + + 48dp + + 45dp + + 0.5dp + + 146dp + 81dp + + 80dp + 20dp + 55dp + + 54dp + + 16dp + 6dp + 4dp + + 122dp + + 300dp + + 20dp + 3dp + 14dp + + 48dp + + 40dp + 16dp + 4dp + + 113dp + + 16dp + + + + \ No newline at end of file diff --git a/module_common/src/main/res/values/strings.xml b/module_common/src/main/res/values/strings.xml new file mode 100644 index 0000000000..145e9309d1 --- /dev/null +++ b/module_common/src/main/res/values/strings.xml @@ -0,0 +1,10 @@ + + module_common + 取消 + 确定 + 不需要内存缓存 + highResImage + 取消关注游戏后，您将无法及时收到游戏的攻略、资讯等最新动态提醒。]]> + 检查更新中... + + \ No newline at end of file diff --git a/module_common/src/main/res/values/style.xml b/module_common/src/main/res/values/style.xml new file mode 100644 index 0000000000..6b2e6d785c --- /dev/null +++ b/module_common/src/main/res/values/style.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module_common/src/main/res/values/themes.xml b/module_common/src/main/res/values/themes.xml new file mode 100644 index 0000000000..a3032f82eb --- /dev/null +++ b/module_common/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/module_common/src/test/java/com/gh/gamecenter/common/ExampleUnitTest.kt b/module_common/src/test/java/com/gh/gamecenter/common/ExampleUnitTest.kt new file mode 100644 index 0000000000..b79550db21 --- /dev/null +++ b/module_common/src/test/java/com/gh/gamecenter/common/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.gh.gamecenter.common + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/module_core/.gitignore b/module_core/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/module_core/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/module_core/build.gradle b/module_core/build.gradle new file mode 100644 index 0000000000..f08b151e78 --- /dev/null +++ b/module_core/build.gradle @@ -0,0 +1,93 @@ +plugins { + id 'com.android.library' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' +} + +android { + + compileSdkVersion rootProject.ext.compileSdkVersion + + defaultConfig { + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion + versionCode rootProject.ext.versionCode + versionName rootProject.ext.versionName + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + + kapt { + arguments { + arg("AROUTER_MODULE_NAME", project.name) + } + } + + buildFeatures { + viewBinding true + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } +} + +dependencies { + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + + api "androidx.core:core-ktx:${core}" + api "androidx.recyclerview:recyclerview:${recyclerView}" + api "androidx.appcompat:appcompat:${appCompat}" + api "com.airbnb.android:lottie:${lottie}" + api "com.google.auto.service:auto-service:${autoServiceVersion}" + kapt "com.google.auto.service:auto-service:${autoServiceVersion}" + api "io.reactivex.rxjava2:rxjava:${rxJava2}" + api "io.reactivex.rxjava2:rxandroid:${rxAndroid2}" + api "com.jakewharton.rxbinding2:rxbinding:${rxBinding2}" + api "com.github.tbruyelle:rxpermissions:${rxPermissions}" + api "com.squareup.okhttp3:okhttp:${okHttp}" + api "com.squareup.retrofit2:retrofit:${retrofit}" + api "com.squareup.retrofit2:converter-gson:${retrofit}" // include gson 2.7 + api "com.squareup.retrofit2:adapter-rxjava2:${retrofit}" + api "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifeCycle" + api "androidx.lifecycle:lifecycle-livedata-ktx:$lifeCycle" + api "androidx.lifecycle:lifecycle-common-java8:$lifeCycle" + api "androidx.lifecycle:lifecycle-extensions:$lifeCycleExtensions" + api "com.facebook.fresco:fresco:${fresco}" + api "com.facebook.fresco:animated-gif-lite:${fresco}" + api "com.facebook.fresco:animated-drawable:${fresco}" + api "com.facebook.fresco:animated-webp:${fresco}" + api "com.facebook.fresco:webpsupport:${fresco}" + api "com.squareup.picasso:picasso:${picasso}" + api "com.google.zxing:core:${zxing}" + api "com.google.zxing:android-core:${zxing}" + api "top.zibin:Luban:${luban}" + api("com.github.piasy:BigImageViewer:${bigImageViewer}", { + exclude group: 'com.squareup.okhttp3' + exclude group: 'androidx.swiperefreshlayout' + exclude group: 'com.github.bumptech.glide' + exclude group: 'com.facebook.fresco' + }) + api "com.lahm.library:easy-protector-release:${easyProtector}" + api "io.sentry:sentry-android:4.3.0" + + api "com.alibaba:arouter-api:$arouterVersion" + kapt "com.alibaba:arouter-compiler:$arouterVersion" + + api project(':libraries:LGLibrary') + api project(':libraries:QQShare') + api project(':libraries:Matisse') +} \ No newline at end of file diff --git a/module_core/proguard-rules.pro b/module_core/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/module_core/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/module_core/src/androidTest/java/com/gh/gamecenter/core/ExampleInstrumentedTest.kt b/module_core/src/androidTest/java/com/gh/gamecenter/core/ExampleInstrumentedTest.kt new file mode 100644 index 0000000000..e4066bc1a2 --- /dev/null +++ b/module_core/src/androidTest/java/com/gh/gamecenter/core/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.gh.gamecenter.core + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.gh.gamecenter.core", appContext.packageName) + } +} \ No newline at end of file diff --git a/module_core/src/main/AndroidManifest.xml b/module_core/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..54114a5299 --- /dev/null +++ b/module_core/src/main/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/AppExecutor.kt b/module_core/src/main/java/com/gh/gamecenter/core/AppExecutor.kt similarity index 89% rename from app/src/main/java/com/gh/common/AppExecutor.kt rename to module_core/src/main/java/com/gh/gamecenter/core/AppExecutor.kt index f277b325d5..0557db419c 100644 --- a/app/src/main/java/com/gh/common/AppExecutor.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/AppExecutor.kt @@ -1,12 +1,11 @@ -package com.gh.common +package com.gh.gamecenter.core import android.os.Handler import android.os.Looper -import com.gh.base.GHThreadFactory -import com.gh.common.AppExecutor.ioExecutor -import com.gh.common.AppExecutor.lightWeightIoExecutor -import com.gh.common.AppExecutor.logExecutor -import com.gh.common.AppExecutor.uiExecutor +import com.gh.gamecenter.core.AppExecutor.ioExecutor +import com.gh.gamecenter.core.AppExecutor.lightWeightIoExecutor +import com.gh.gamecenter.core.AppExecutor.uiExecutor + import io.reactivex.schedulers.Schedulers import java.util.concurrent.* diff --git a/app/src/main/java/com/gh/base/GHThreadFactory.kt b/module_core/src/main/java/com/gh/gamecenter/core/GHThreadFactory.kt similarity index 93% rename from app/src/main/java/com/gh/base/GHThreadFactory.kt rename to module_core/src/main/java/com/gh/gamecenter/core/GHThreadFactory.kt index 9bb468e288..73be3478df 100644 --- a/app/src/main/java/com/gh/base/GHThreadFactory.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/GHThreadFactory.kt @@ -1,4 +1,4 @@ -package com.gh.base +package com.gh.gamecenter.core import java.util.concurrent.ThreadFactory import java.util.concurrent.atomic.AtomicInteger diff --git a/module_core/src/main/java/com/gh/gamecenter/core/HaloApp.kt b/module_core/src/main/java/com/gh/gamecenter/core/HaloApp.kt new file mode 100644 index 0000000000..dd999e7a55 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/HaloApp.kt @@ -0,0 +1,45 @@ +package com.gh.gamecenter.core + +import android.app.Application +import android.content.Context +import android.content.res.Configuration +import com.gh.gamecenter.core.iinterface.IApplication +import com.google.auto.service.AutoService + +@AutoService(IApplication::class) +class HaloApp : IApplication { + + override fun attachBaseContext() { + + } + + override fun onCreate(application: Application) { + mApp = application + } + + + override fun onLowMemory() { + + } + + override fun onTerminate() { + + } + + override fun onTrimMemory(level: Int) { + + } + + override fun onConfigurationChanged(newConfig: Configuration) { + + } + + companion object { + private lateinit var mApp: Application + + @JvmStatic + fun getInstance(): Application { + return mApp + } + } +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/iinterface/IApplication.kt b/module_core/src/main/java/com/gh/gamecenter/core/iinterface/IApplication.kt new file mode 100644 index 0000000000..25f5474304 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/iinterface/IApplication.kt @@ -0,0 +1,19 @@ +package com.gh.gamecenter.core.iinterface + +import android.app.Application +import android.content.res.Configuration + +interface IApplication { + + fun attachBaseContext() + + fun onCreate(application: Application) + + fun onLowMemory() + + fun onTerminate() + + fun onTrimMemory(level: Int) + + fun onConfigurationChanged(newConfig: Configuration) +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/iinterface/IOffsetable.kt b/module_core/src/main/java/com/gh/gamecenter/core/iinterface/IOffsetable.kt similarity index 80% rename from app/src/main/java/com/gh/common/iinterface/IOffsetable.kt rename to module_core/src/main/java/com/gh/gamecenter/core/iinterface/IOffsetable.kt index 71ccf4e76c..bc5be929ce 100644 --- a/app/src/main/java/com/gh/common/iinterface/IOffsetable.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/iinterface/IOffsetable.kt @@ -1,4 +1,4 @@ -package com.gh.common.iinterface +package com.gh.gamecenter.core.iinterface @Suppress("SpellCheckingInspection") interface IOffsetable { diff --git a/app/src/main/java/com/gh/common/iinterface/IScrollable.kt b/module_core/src/main/java/com/gh/gamecenter/core/iinterface/IScrollable.kt similarity index 53% rename from app/src/main/java/com/gh/common/iinterface/IScrollable.kt rename to module_core/src/main/java/com/gh/gamecenter/core/iinterface/IScrollable.kt index 1b3a423a21..223391e579 100644 --- a/app/src/main/java/com/gh/common/iinterface/IScrollable.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/iinterface/IScrollable.kt @@ -1,4 +1,4 @@ -package com.gh.common.iinterface +package com.gh.gamecenter.core.iinterface interface IScrollable { fun scrollToTop() diff --git a/app/src/main/java/com/gh/base/SearchBarHint.java b/module_core/src/main/java/com/gh/gamecenter/core/iinterface/SearchBarHint.java similarity index 80% rename from app/src/main/java/com/gh/base/SearchBarHint.java rename to module_core/src/main/java/com/gh/gamecenter/core/iinterface/SearchBarHint.java index b3f10032ca..be1741fd1e 100644 --- a/app/src/main/java/com/gh/base/SearchBarHint.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/iinterface/SearchBarHint.java @@ -1,4 +1,4 @@ -package com.gh.base; +package com.gh.gamecenter.core.iinterface; import java.util.ArrayList; diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IActivationProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IActivationProvider.kt new file mode 100644 index 0000000000..49528bb70f --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IActivationProvider.kt @@ -0,0 +1,7 @@ +package com.gh.gamecenter.core.provider + +import com.alibaba.android.arouter.facade.template.IProvider + +interface IActivationProvider : IProvider { + fun sendActivationInfo() +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IAppProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IAppProvider.kt new file mode 100644 index 0000000000..48640e9536 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IAppProvider.kt @@ -0,0 +1,17 @@ +package com.gh.gamecenter.core.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.template.IProvider + +interface IAppProvider : IProvider { + + fun getGid():String + + fun getOaid():String + + fun getChannel():String + + fun getDeviceRamSize():Long + + fun isUserAcceptPrivacyPolicy(context: Context):Boolean +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IBuildConfigProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IBuildConfigProvider.kt new file mode 100644 index 0000000000..01c7c34b04 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IBuildConfigProvider.kt @@ -0,0 +1,15 @@ +package com.gh.gamecenter.core.provider + +import com.alibaba.android.arouter.facade.template.IProvider + +interface IBuildConfigProvider : IProvider { + fun getApplicationId(): String + fun getVersionName(): String + fun getExposureVersion(): String + fun isDebug(): Boolean + fun getBuildTime(): Long + fun getApiHost(): String + fun getDevApiHost(): String + fun getNewApiHost(): String + fun getNewDevApiHost(): String +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/ICheckLoginProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/ICheckLoginProvider.kt new file mode 100644 index 0000000000..36c4bd6011 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/ICheckLoginProvider.kt @@ -0,0 +1,8 @@ +package com.gh.gamecenter.core.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.template.IProvider + +interface ICheckLoginProvider : IProvider { + fun checkLogin(context: Context, entrance: String, action: (() -> Unit)? = null) +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IConfigProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IConfigProvider.kt new file mode 100644 index 0000000000..b10c6ed687 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IConfigProvider.kt @@ -0,0 +1,15 @@ +package com.gh.gamecenter.core.provider + +import com.alibaba.android.arouter.facade.template.IProvider + +interface IConfigProvider : IProvider { + fun getUploadLimitSize(): Long + fun getSize(): Int + fun getQuality(): Int + fun getRatio(): Int + fun getGif(): String + fun getJpeg(): String + fun getWebp(): String + fun getGitThumb(): String + fun getGifWaterMark(): String +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IDefaultUrlHandlerProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IDefaultUrlHandlerProvider.kt new file mode 100644 index 0000000000..b588635285 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IDefaultUrlHandlerProvider.kt @@ -0,0 +1,9 @@ +package com.gh.gamecenter.core.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.template.IProvider + +interface IDefaultUrlHandlerProvider : IProvider { + + fun interceptUrl(context: Context, url: String, entrance: String):Boolean +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IDialogUtilsProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IDialogUtilsProvider.kt new file mode 100644 index 0000000000..7290261546 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IDialogUtilsProvider.kt @@ -0,0 +1,9 @@ +package com.gh.gamecenter.core.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.template.IProvider + +interface IDialogUtilsProvider : IProvider { + + fun showRegulationTestDialog(context: Context, confirm: () -> Unit, cancel: () -> Unit) +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IDirectProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IDirectProvider.kt new file mode 100644 index 0000000000..01631dff65 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IDirectProvider.kt @@ -0,0 +1,10 @@ +package com.gh.gamecenter.core.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.template.IProvider + +interface IDirectProvider: IProvider { + fun directToWebView(context: Context, url: String, entrance: String? = null) + + fun directToRegulationTestPage(context: Context) +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IPackageUtilsProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IPackageUtilsProvider.kt new file mode 100644 index 0000000000..73a1748e98 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IPackageUtilsProvider.kt @@ -0,0 +1,9 @@ +package com.gh.gamecenter.core.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.template.IProvider + +interface IPackageUtilsProvider : IProvider { + fun obtainProcessName(context: Context): String + fun getGhVersionName(): String +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IUserManagerProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IUserManagerProvider.kt new file mode 100644 index 0000000000..6b939353ac --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IUserManagerProvider.kt @@ -0,0 +1,10 @@ +package com.gh.gamecenter.core.provider + +import com.alibaba.android.arouter.facade.template.IProvider + +interface IUserManagerProvider : IProvider { + + fun userShouldTakeRegulationBaseOnLastRemind(): Boolean + + fun getUserId(): String +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IWebProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IWebProvider.kt new file mode 100644 index 0000000000..3a34869316 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IWebProvider.kt @@ -0,0 +1,9 @@ +package com.gh.gamecenter.core.provider + +import android.content.Context +import android.content.Intent +import com.alibaba.android.arouter.facade.template.IProvider + +interface IWebProvider : IProvider { + fun getIntent(context: Context, url: String, autoCompletionTitle: Boolean): Intent +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/util/Animator.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/Animator.kt similarity index 99% rename from app/src/main/java/com/gh/common/util/Animator.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/Animator.kt index 3497607dcb..79e52016f1 100644 --- a/app/src/main/java/com/gh/common/util/Animator.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/Animator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.gh.common.util +package com.gh.gamecenter.core.utils import android.animation.Animator import androidx.annotation.RequiresApi diff --git a/app/src/main/java/com/gh/common/util/AppDebugConfig.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/AppDebugConfig.java similarity index 97% rename from app/src/main/java/com/gh/common/util/AppDebugConfig.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/AppDebugConfig.java index 1f6bc80de3..31b7c74e5e 100644 --- a/app/src/main/java/com/gh/common/util/AppDebugConfig.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/AppDebugConfig.java @@ -1,9 +1,9 @@ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; import android.os.Debug; import android.util.Log; -import com.gh.gamecenter.BuildConfig; +import com.gh.gamecenter.core.BuildConfig; import java.lang.reflect.Field; diff --git a/app/src/main/java/com/gh/common/view/CenterImageSpan.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/CenterImageSpan.java similarity index 98% rename from app/src/main/java/com/gh/common/view/CenterImageSpan.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/CenterImageSpan.java index c446bb4a4a..955d512651 100644 --- a/app/src/main/java/com/gh/common/view/CenterImageSpan.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/CenterImageSpan.java @@ -1,4 +1,4 @@ -package com.gh.common.view; +package com.gh.gamecenter.core.utils; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/gh/common/util/ClassUtils.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/ClassUtils.java similarity index 95% rename from app/src/main/java/com/gh/common/util/ClassUtils.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/ClassUtils.java index 846a766ab0..2f0601ad58 100644 --- a/app/src/main/java/com/gh/common/util/ClassUtils.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/ClassUtils.java @@ -1,4 +1,4 @@ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; import android.text.TextUtils; diff --git a/app/src/main/java/com/gh/common/util/ClickUtils.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/ClickUtils.java similarity index 97% rename from app/src/main/java/com/gh/common/util/ClickUtils.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/ClickUtils.java index 0d6f9dd4a7..9d301788e5 100644 --- a/app/src/main/java/com/gh/common/util/ClickUtils.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/ClickUtils.java @@ -1,4 +1,4 @@ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; import android.util.Log; diff --git a/app/src/main/java/com/gh/base/CurrentActivityHolder.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/CurrentActivityHolder.kt similarity index 89% rename from app/src/main/java/com/gh/base/CurrentActivityHolder.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/CurrentActivityHolder.kt index c0a33eea04..51c3d2f721 100644 --- a/app/src/main/java/com/gh/base/CurrentActivityHolder.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/CurrentActivityHolder.kt @@ -1,4 +1,4 @@ -package com.gh.base +package com.gh.gamecenter.core.utils import android.app.Activity diff --git a/app/src/main/java/com/gh/common/util/DisplayUtils.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/DisplayUtils.java similarity index 96% rename from app/src/main/java/com/gh/common/util/DisplayUtils.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/DisplayUtils.java index 972aebdd2b..dbc8b6f069 100644 --- a/app/src/main/java/com/gh/common/util/DisplayUtils.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/DisplayUtils.java @@ -1,4 +1,4 @@ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; import android.annotation.SuppressLint; import android.app.Activity; @@ -18,13 +18,13 @@ import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; -import com.halo.assistant.HaloApp; +import androidx.core.content.ContextCompat; + +import com.gh.gamecenter.core.HaloApp; import java.lang.reflect.Field; import java.lang.reflect.Method; -import androidx.core.content.ContextCompat; - public class DisplayUtils { /** @@ -48,7 +48,6 @@ public class DisplayUtils { */ public static int dip2px(float dpValue) { final float scale = HaloApp.getInstance() - .getApplication() .getResources() .getDisplayMetrics().density; return (int) (dpValue * scale + 0.5f); @@ -271,14 +270,14 @@ public class DisplayUtils { } public static int getScreenWidth() { - WindowManager manager = (WindowManager) HaloApp.getInstance().getApplication().getSystemService(Context.WINDOW_SERVICE); + WindowManager manager = (WindowManager) HaloApp.getInstance().getSystemService(Context.WINDOW_SERVICE); DisplayMetrics metrics = new DisplayMetrics(); manager.getDefaultDisplay().getMetrics(metrics); return metrics.widthPixels; } public static int getScreenHeight() { - WindowManager manager = (WindowManager) HaloApp.getInstance().getApplication().getSystemService(Context.WINDOW_SERVICE); + WindowManager manager = (WindowManager) HaloApp.getInstance().getSystemService(Context.WINDOW_SERVICE); DisplayMetrics metrics = new DisplayMetrics(); manager.getDefaultDisplay().getMetrics(metrics); return metrics.heightPixels; @@ -287,7 +286,7 @@ public class DisplayUtils { public static int getToastOffset() { try { int i = Resources.getSystem().getIdentifier("toast_y_offset", "dimen", "android"); - return HaloApp.getInstance().getApplication().getResources().getDimensionPixelSize(i); + return HaloApp.getInstance().getResources().getDimensionPixelSize(i); } catch (Resources.NotFoundException e) { e.printStackTrace(); return dip2px(24); @@ -297,7 +296,7 @@ public class DisplayUtils { public static int getToastDefaultGravity() { try { int i = Resources.getSystem().getIdentifier("config_toastDefaultGravity", "integer", "android"); - return HaloApp.getInstance().getApplication().getResources().getInteger(i); + return HaloApp.getInstance().getResources().getInteger(i); } catch (Resources.NotFoundException e) { e.printStackTrace(); return Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL; diff --git a/app/src/main/java/com/gh/common/util/EmojiUtils.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/EmojiUtils.java similarity index 99% rename from app/src/main/java/com/gh/common/util/EmojiUtils.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/EmojiUtils.java index 97a241e4b6..dee17d9d1d 100644 --- a/app/src/main/java/com/gh/common/util/EmojiUtils.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/EmojiUtils.java @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; import java.util.Arrays; import java.util.HashSet; diff --git a/app/src/main/java/com/gh/common/util/EmptyCallback.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/EmptyCallback.kt similarity index 56% rename from app/src/main/java/com/gh/common/util/EmptyCallback.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/EmptyCallback.kt index a74dfde5a5..9ada726343 100644 --- a/app/src/main/java/com/gh/common/util/EmptyCallback.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/EmptyCallback.kt @@ -1,4 +1,4 @@ -package com.gh.common.util +package com.gh.gamecenter.core.utils interface EmptyCallback { fun onCallback() diff --git a/app/src/main/java/com/gh/common/util/ExtraTagHandler.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/ExtraTagHandler.kt similarity index 99% rename from app/src/main/java/com/gh/common/util/ExtraTagHandler.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/ExtraTagHandler.kt index 9221da1856..be95072b8e 100644 --- a/app/src/main/java/com/gh/common/util/ExtraTagHandler.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/ExtraTagHandler.kt @@ -1,4 +1,4 @@ -package com.gh.common.util +package com.gh.gamecenter.core.utils import android.text.Editable import android.text.Html.TagHandler diff --git a/app/src/main/java/com/gh/common/util/GsonUtils.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/GsonUtils.kt similarity index 96% rename from app/src/main/java/com/gh/common/util/GsonUtils.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/GsonUtils.kt index 8a5a52386e..1c58fb3e66 100644 --- a/app/src/main/java/com/gh/common/util/GsonUtils.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/GsonUtils.kt @@ -1,4 +1,4 @@ -package com.gh.common.util +package com.gh.gamecenter.core.utils import com.google.gson.Gson import com.google.gson.GsonBuilder diff --git a/app/src/main/java/com/gh/common/util/GzipUtils.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/GzipUtils.java similarity index 98% rename from app/src/main/java/com/gh/common/util/GzipUtils.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/GzipUtils.java index 3a54ebd0f7..ebf36d722e 100644 --- a/app/src/main/java/com/gh/common/util/GzipUtils.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/GzipUtils.java @@ -1,4 +1,4 @@ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/app/src/main/java/com/gh/common/util/HtmlUtils.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/HtmlUtils.java similarity index 98% rename from app/src/main/java/com/gh/common/util/HtmlUtils.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/HtmlUtils.java index ef3cc45db5..db3b5199d7 100644 --- a/app/src/main/java/com/gh/common/util/HtmlUtils.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/HtmlUtils.java @@ -1,4 +1,4 @@ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; import android.text.TextUtils; diff --git a/app/src/main/java/com/gh/common/util/KeyboardHeightObserver.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/KeyboardHeightObserver.java similarity index 97% rename from app/src/main/java/com/gh/common/util/KeyboardHeightObserver.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/KeyboardHeightObserver.java index 73fb028578..17097e83a4 100644 --- a/app/src/main/java/com/gh/common/util/KeyboardHeightObserver.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/KeyboardHeightObserver.java @@ -15,7 +15,7 @@ * along with Siebe Projects samples. If not, see . */ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; /** * The observer that will be notified when the height of diff --git a/app/src/main/java/com/gh/common/util/KeyboardHeightProvider.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/KeyboardHeightProvider.java similarity index 98% rename from app/src/main/java/com/gh/common/util/KeyboardHeightProvider.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/KeyboardHeightProvider.java index f1c0f55e70..921e2bcc02 100644 --- a/app/src/main/java/com/gh/common/util/KeyboardHeightProvider.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/KeyboardHeightProvider.java @@ -15,7 +15,7 @@ * along with Siebe Projects samples. If not, see . */ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; import android.app.Activity; import android.content.res.Configuration; @@ -28,7 +28,8 @@ import android.view.View; import android.view.WindowManager.LayoutParams; import android.widget.PopupWindow; -import com.gh.gamecenter.R; +import com.gh.gamecenter.core.R; + /** * The keyboard height provider, this class uses a PopupWindow diff --git a/app/src/main/java/com/gh/common/util/MD5Utils.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/MD5Utils.java similarity index 99% rename from app/src/main/java/com/gh/common/util/MD5Utils.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/MD5Utils.java index b060845690..702570e0f7 100644 --- a/app/src/main/java/com/gh/common/util/MD5Utils.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/MD5Utils.java @@ -1,4 +1,4 @@ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; import android.text.TextUtils; diff --git a/app/src/main/java/com/gh/common/util/MtaHelper.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/MtaHelper.kt similarity index 98% rename from app/src/main/java/com/gh/common/util/MtaHelper.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/MtaHelper.kt index dc1a2533aa..02ef9fc807 100644 --- a/app/src/main/java/com/gh/common/util/MtaHelper.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/MtaHelper.kt @@ -1,4 +1,4 @@ -package com.gh.common.util +package com.gh.gamecenter.core.utils object MtaHelper { diff --git a/app/src/main/java/com/gh/common/util/NumberUtils.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/NumberUtils.kt similarity index 97% rename from app/src/main/java/com/gh/common/util/NumberUtils.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/NumberUtils.kt index d09c0cdf91..62b1911a4e 100644 --- a/app/src/main/java/com/gh/common/util/NumberUtils.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/NumberUtils.kt @@ -1,4 +1,4 @@ -package com.gh.common.util +package com.gh.gamecenter.core.utils import java.text.DecimalFormat import kotlin.math.roundToInt diff --git a/app/src/main/java/com/gh/common/util/PageSwitchDataHelper.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/PageSwitchDataHelper.kt similarity index 97% rename from app/src/main/java/com/gh/common/util/PageSwitchDataHelper.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/PageSwitchDataHelper.kt index b6a4ee6d66..3089408f08 100644 --- a/app/src/main/java/com/gh/common/util/PageSwitchDataHelper.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/PageSwitchDataHelper.kt @@ -1,4 +1,4 @@ -package com.gh.common.util +package com.gh.gamecenter.core.utils import com.lightgame.utils.AppManager diff --git a/app/src/main/java/com/gh/common/util/PatternUtils.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/PatternUtils.java similarity index 98% rename from app/src/main/java/com/gh/common/util/PatternUtils.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/PatternUtils.java index 5ddef8ee17..5b7b886f20 100644 --- a/app/src/main/java/com/gh/common/util/PatternUtils.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/PatternUtils.java @@ -1,4 +1,4 @@ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; import android.util.Patterns; diff --git a/app/src/main/java/com/gh/common/util/RandomUtils.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/RandomUtils.java similarity index 96% rename from app/src/main/java/com/gh/common/util/RandomUtils.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/RandomUtils.java index f0d3f9dbb3..15b352dc85 100644 --- a/app/src/main/java/com/gh/common/util/RandomUtils.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/RandomUtils.java @@ -1,8 +1,8 @@ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; import androidx.annotation.ColorRes; -import com.gh.gamecenter.R; +import com.gh.gamecenter.core.R; import java.math.BigDecimal; import java.util.Random; diff --git a/app/src/main/java/com/gh/common/util/RichEditorUtils.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/RichEditorUtils.java similarity index 97% rename from app/src/main/java/com/gh/common/util/RichEditorUtils.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/RichEditorUtils.java index 650a9026c7..2de87e8c66 100644 --- a/app/src/main/java/com/gh/common/util/RichEditorUtils.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/RichEditorUtils.java @@ -1,4 +1,4 @@ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; import android.content.Context; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/gh/common/util/RunningUtils.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/RunningUtils.java similarity index 99% rename from app/src/main/java/com/gh/common/util/RunningUtils.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/RunningUtils.java index 905096fd52..ee66bc9cf9 100644 --- a/app/src/main/java/com/gh/common/util/RunningUtils.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/RunningUtils.java @@ -1,4 +1,4 @@ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; import android.Manifest; import android.app.ActivityManager; diff --git a/app/src/main/java/com/gh/common/util/SentryHelper.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/SentryHelper.kt similarity index 84% rename from app/src/main/java/com/gh/common/util/SentryHelper.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/SentryHelper.kt index c04a2edf23..4d7e82c8fc 100644 --- a/app/src/main/java/com/gh/common/util/SentryHelper.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/SentryHelper.kt @@ -1,6 +1,7 @@ -package com.gh.common.util +package com.gh.gamecenter.core.utils import android.text.TextUtils +import com.gh.gamecenter.core.BuildConfig import com.lightgame.utils.Utils import io.sentry.Sentry import io.sentry.SentryEvent @@ -25,8 +26,8 @@ object SentryHelper { val value = kv[i] if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(value)) { sentryEvent.setTag(key, value) - debugOnly { - throwExceptionInDebug("tag-key 不支持中文", isContainChinese(key)) + if (BuildConfig.DEBUG && isContainChinese(key)) { + throw RuntimeException("tag-key 不支持中文") } } } diff --git a/app/src/main/java/com/gh/common/util/ServiceUtils.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/ServiceUtils.kt similarity index 93% rename from app/src/main/java/com/gh/common/util/ServiceUtils.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/ServiceUtils.kt index fcc2ae9a3f..967d048a26 100644 --- a/app/src/main/java/com/gh/common/util/ServiceUtils.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/ServiceUtils.kt @@ -1,4 +1,4 @@ -package com.gh.common.util +package com.gh.gamecenter.core.utils import android.app.ActivityManager import android.content.Context diff --git a/app/src/main/java/com/gh/common/util/SharedPreferences.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/SharedPreferences.kt similarity index 100% rename from app/src/main/java/com/gh/common/util/SharedPreferences.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/SharedPreferences.kt diff --git a/app/src/main/java/com/gh/common/util/SimpleImageLoader.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/SimpleImageLoader.java similarity index 93% rename from app/src/main/java/com/gh/common/util/SimpleImageLoader.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/SimpleImageLoader.java index 31bcf4c51f..aafebdc023 100644 --- a/app/src/main/java/com/gh/common/util/SimpleImageLoader.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/SimpleImageLoader.java @@ -1,4 +1,4 @@ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; import com.github.piasy.biv.loader.ImageLoader; diff --git a/app/src/main/java/com/gh/common/util/SingletonHolder.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/SingletonHolder.kt similarity index 93% rename from app/src/main/java/com/gh/common/util/SingletonHolder.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/SingletonHolder.kt index aead75f1e2..d26e213022 100644 --- a/app/src/main/java/com/gh/common/util/SingletonHolder.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/SingletonHolder.kt @@ -1,4 +1,4 @@ -package com.gh.common.util +package com.gh.gamecenter.core.utils open class SingletonHolder(creator: () -> T) { private var creator: (() -> T)? = creator diff --git a/app/src/main/java/com/gh/common/util/SpUtils.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/SpUtils.kt similarity index 95% rename from app/src/main/java/com/gh/common/util/SpUtils.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/SpUtils.kt index db004f46f2..215ef085f2 100644 --- a/app/src/main/java/com/gh/common/util/SpUtils.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/SpUtils.kt @@ -1,9 +1,9 @@ -package com.gh.common.util +package com.gh.gamecenter.core.utils import android.content.Context import android.content.SharedPreferences +import com.gh.gamecenter.core.HaloApp import com.google.gson.reflect.TypeToken -import com.halo.assistant.HaloApp object SPUtils { private var mSp: SharedPreferences? = null @@ -11,7 +11,7 @@ object SPUtils { private val sp: SharedPreferences get() { if (mSp == null) { - mSp = HaloApp.getInstance().application.getSharedPreferences("Halo", Context.MODE_PRIVATE) + mSp = HaloApp.getInstance().getSharedPreferences("Halo", Context.MODE_PRIVATE) } return mSp!! } diff --git a/app/src/main/java/com/gh/common/util/SpanBuilder.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/SpanBuilder.kt similarity index 92% rename from app/src/main/java/com/gh/common/util/SpanBuilder.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/SpanBuilder.kt index b8200f2271..7650700bd1 100644 --- a/app/src/main/java/com/gh/common/util/SpanBuilder.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/SpanBuilder.kt @@ -1,4 +1,4 @@ -package com.gh.common.util +package com.gh.gamecenter.core.utils import android.content.Context import android.graphics.Color @@ -11,8 +11,7 @@ import android.text.style.* import android.view.View import androidx.annotation.DrawableRes import androidx.core.content.ContextCompat -import com.gh.common.view.CenterImageSpan -import com.halo.assistant.HaloApp +import com.gh.gamecenter.core.HaloApp class SpanBuilder(content: CharSequence) { private var spannableString: SpannableStringBuilder = SpannableStringBuilder(content) @@ -24,15 +23,17 @@ class SpanBuilder(content: CharSequence) { } fun color(start: Int, end: Int, colorRes: Int): SpanBuilder { - val colorSpan = ForegroundColorSpan(ContextCompat.getColor(HaloApp.getInstance().application, colorRes)) + val colorSpan = ForegroundColorSpan(ContextCompat.getColor(HaloApp.getInstance(), colorRes)) spannableString.setSpan(colorSpan, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) return this } fun color(start: Int, end: Int, colorHexInString: String): SpanBuilder { - tryWithDefaultCatch { + try { val colorSpan = ForegroundColorSpan(Color.parseColor(colorHexInString)) spannableString.setSpan(colorSpan, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) + } catch (e: Throwable) { + e.printStackTrace() } return this } @@ -66,7 +67,7 @@ class SpanBuilder(content: CharSequence) { //添加图标 fun image(start: Int, end: Int, @DrawableRes res: Int): SpanBuilder { - val imageSpan = CenterImageSpan(HaloApp.getInstance().application, res) + val imageSpan = CenterImageSpan(HaloApp.getInstance(), res) spannableString.setSpan(imageSpan, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) return this } @@ -82,7 +83,7 @@ class SpanBuilder(content: CharSequence) { val clickSpan = object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = ContextCompat.getColor(HaloApp.getInstance().application, colorRes) + ds.color = ContextCompat.getColor(HaloApp.getInstance(), colorRes) ds.isUnderlineText = isUnderlineText } diff --git a/app/src/main/java/com/gh/common/util/SpeedUtils.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/SpeedUtils.java similarity index 97% rename from app/src/main/java/com/gh/common/util/SpeedUtils.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/SpeedUtils.java index 787145e624..b0fea37ef7 100644 --- a/app/src/main/java/com/gh/common/util/SpeedUtils.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/SpeedUtils.java @@ -1,4 +1,4 @@ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; public class SpeedUtils { diff --git a/app/src/main/java/com/gh/common/util/StringUtils.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/StringUtils.java similarity index 98% rename from app/src/main/java/com/gh/common/util/StringUtils.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/StringUtils.java index 407b036fb0..3a87d6efd5 100644 --- a/app/src/main/java/com/gh/common/util/StringUtils.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; import android.text.Html; import android.text.TextUtils; diff --git a/app/src/main/java/com/gh/common/util/ThirdPartyPackageHelper.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/ThirdPartyPackageHelper.kt similarity index 92% rename from app/src/main/java/com/gh/common/util/ThirdPartyPackageHelper.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/ThirdPartyPackageHelper.kt index e1b9212133..283f42af3c 100644 --- a/app/src/main/java/com/gh/common/util/ThirdPartyPackageHelper.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/ThirdPartyPackageHelper.kt @@ -1,4 +1,4 @@ -package com.gh.common.util +package com.gh.gamecenter.core.utils /** * 第三方安装包（即安装包里没有 gh-id）的辅助类 diff --git a/app/src/main/java/com/gh/common/TimeElapsedHelper.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/TimeElapsedHelper.kt similarity index 93% rename from app/src/main/java/com/gh/common/TimeElapsedHelper.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/TimeElapsedHelper.kt index b5e4c97a0c..fdb0035378 100644 --- a/app/src/main/java/com/gh/common/TimeElapsedHelper.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/TimeElapsedHelper.kt @@ -1,12 +1,13 @@ -package com.gh.common +package com.gh.gamecenter.core.utils import android.app.Activity import android.app.Application import android.os.Bundle import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager -import com.gh.base.GHThreadFactory -import com.halo.assistant.HaloApp +import com.gh.gamecenter.core.AppExecutor +import com.gh.gamecenter.core.GHThreadFactory +import com.gh.gamecenter.core.HaloApp import java.util.concurrent.ExecutorService import java.util.concurrent.Executors @@ -56,7 +57,7 @@ class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) { override fun onActivityDestroyed(a: Activity) { if (activity == a) { - HaloApp.getInstance().application.unregisterActivityLifecycleCallbacks(this) + HaloApp.getInstance().unregisterActivityLifecycleCallbacks(this) } } }) diff --git a/app/src/main/java/com/gh/common/util/TimeUtils.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/TimeUtils.kt similarity index 99% rename from app/src/main/java/com/gh/common/util/TimeUtils.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/TimeUtils.kt index ae99de688f..ebe195fc93 100644 --- a/app/src/main/java/com/gh/common/util/TimeUtils.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/TimeUtils.kt @@ -1,4 +1,4 @@ -package com.gh.common.util +package com.gh.gamecenter.core.utils import java.text.ParseException import java.text.SimpleDateFormat diff --git a/app/src/main/java/com/gh/common/util/ToastUtils.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/ToastUtils.kt similarity index 85% rename from app/src/main/java/com/gh/common/util/ToastUtils.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/ToastUtils.kt index 16d96de377..950a243502 100644 --- a/app/src/main/java/com/gh/common/util/ToastUtils.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/ToastUtils.kt @@ -1,6 +1,6 @@ -package com.gh.common.util +package com.gh.gamecenter.core.utils -import com.halo.assistant.HaloApp +import com.gh.gamecenter.core.HaloApp import com.lightgame.utils.toast.ToastHelper object ToastUtils { diff --git a/app/src/main/java/com/gh/common/util/TopCutProcess.kt b/module_core/src/main/java/com/gh/gamecenter/core/utils/TopCutProcess.kt similarity index 93% rename from app/src/main/java/com/gh/common/util/TopCutProcess.kt rename to module_core/src/main/java/com/gh/gamecenter/core/utils/TopCutProcess.kt index 262e24cd91..18af825bd6 100644 --- a/app/src/main/java/com/gh/common/util/TopCutProcess.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/TopCutProcess.kt @@ -1,7 +1,6 @@ -package com.gh.common.util +package com.gh.gamecenter.core.utils import android.graphics.Bitmap -import android.graphics.Matrix import com.facebook.common.references.CloseableReference import com.facebook.imagepipeline.bitmaps.PlatformBitmapFactory import com.facebook.imagepipeline.request.BasePostprocessor diff --git a/app/src/main/java/com/gh/common/util/UrlFilterUtils.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/UrlFilterUtils.java similarity index 96% rename from app/src/main/java/com/gh/common/util/UrlFilterUtils.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/UrlFilterUtils.java index f5345964b8..cf859430a1 100644 --- a/app/src/main/java/com/gh/common/util/UrlFilterUtils.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/UrlFilterUtils.java @@ -1,11 +1,11 @@ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; import android.text.TextUtils; -import com.lightgame.config.CommonDebug; - import androidx.annotation.NonNull; +import com.lightgame.config.CommonDebug; + /** * Created by khy on 27/03/18. */ diff --git a/module_core/src/main/res/drawable-v24/ic_launcher_foreground.xml b/module_core/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000000..2b068d1146 --- /dev/null +++ b/module_core/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/module_core/src/main/res/drawable/ic_launcher_background.xml b/module_core/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000000..07d5da9cbf --- /dev/null +++ b/module_core/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/popupwindow.xml b/module_core/src/main/res/layout/popupwindow.xml similarity index 100% rename from app/src/main/res/layout/popupwindow.xml rename to module_core/src/main/res/layout/popupwindow.xml diff --git a/module_core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/module_core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000000..eca70cfe52 --- /dev/null +++ b/module_core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module_core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/module_core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000000..eca70cfe52 --- /dev/null +++ b/module_core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module_core/src/main/res/mipmap-hdpi/ic_launcher.webp b/module_core/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/module_core/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/module_core/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 zcmV-Y3$650Nk&FW3jhFDMM6+kP&il$0000G0000-002h-06|PpNWB9900E$G+qN-D z+81ABX7q?;bwx%xBg?kcwr$(C-Tex-ZCkHUw(Y9#+`E5-zuONG5fgw~E2WDng@Bc@ z24xy+R1n%~6xI#u9vJ8zREI)sb<&Il(016}Z~V1n^PU3-_H17A*Bf^o)&{_uBv}Py zulRfeE8g(g6HFhk_?o_;0@tz?1I+l+Y#Q*;RVC?(ud`_cU-~n|AX-b`JHrOIqn(-t&rOg-o`#C zh0LPxmbOAEb;zHTu!R3LDh1QO zZTf-|lJNUxi-PpcbRjw3n~n-pG;$+dIF6eqM5+L();B2O2tQ~|p{PlpNcvDbd1l%c zLtXn%lu(3!aNK!V#+HNn_D3lp z2%l+hK-nsj|Bi9;V*WIcQRTt5j90A<=am+cc`J zTYIN|PsYAhJ|=&h*4wI4ebv-C=Be#u>}%m;a{IGmJDU`0snWS&$9zdrT(z8#{OZ_Y zxwJx!ZClUi%YJjD6Xz@OP8{ieyJB=tn?>zaI-4JN;rr`JQbb%y5h2O-?_V@7pG_+y z(lqAsqYr!NyVb0C^|uclHaeecG)Sz;WV?rtoqOdAAN{j%?Uo%owya(F&qps@Id|Of zo@~Y-(YmfB+chv^%*3g4k3R0WqvuYUIA+8^SGJ{2Bl$X&X&v02>+0$4?di(34{pt* zG=f#yMs@Y|b&=HyH3k4yP&goF2LJ#tBLJNNDo6lG06r}ghC-pC4Q*=x3;|+W04zte zAl>l4kzUBQFYF(E`KJy?ZXd1tnfbH+Z~SMmA21KokJNs#eqcXWKUIC>{TuoKe^vhF z);H)o`t9j~`$h1D`#bxe@E`oE`cM9w(@)5Bp8BNukIwM>wZHfd0S;5bcXA*5KT3bj zc&_~`&{z7u{Et!Z_k78H75gXf4g8<_ul!H$eVspPeU3j&&Au=2R*Zp#M9$9s;fqwgzfiX=E_?BwVcfx3tG9Q-+<5fw z%Hs64z)@Q*%s3_Xd5>S4dg$s>@rN^ixeVj*tqu3ZV)biDcFf&l?lGwsa zWj3rvK}?43c{IruV2L`hUU0t^MemAn3U~x3$4mFDxj=Byowu^Q+#wKRPrWywLjIAp z9*n}eQ9-gZmnd9Y0WHtwi2sn6n~?i#n9VN1B*074_VbZZ=WrpkMYr{RsI ztM_8X1)J*DZejxkjOTRJ&a*lrvMKBQURNP#K)a5wIitfu(CFYV4FT?LUB$jVwJSZz zNBFTWg->Yk0j&h3e*a5>B=-xM7dE`IuOQna!u$OoxLlE;WdrNlN)1 z7**de7-hZ!(%_ZllHBLg`Ir#|t>2$*xVOZ-ADZKTN?{(NUeLU9GbuG-+Axf*AZ-P1 z0ZZ*fx+ck4{XtFsbcc%GRStht@q!m*ImssGwuK+P@%gEK!f5dHymg<9nSCXsB6 zQ*{<`%^bxB($Z@5286^-A(tR;r+p7B%^%$N5h%lb*Vlz-?DL9x;!j<5>~kmXP$E}m zQV|7uv4SwFs0jUervsxVUm>&9Y3DBIzc1XW|CUZrUdb<&{@D5yuLe%Xniw^x&{A2s z0q1+owDSfc3Gs?ht;3jw49c#mmrViUfX-yvc_B*wY|Lo7; zGh!t2R#BHx{1wFXReX*~`NS-LpSX z#TV*miO^~B9PF%O0huw!1Zv>^d0G3$^8dsC6VI!$oKDKiXdJt{mGkyA`+Gwd4D-^1qtNTUK)`N*=NTG-6}=5k6suNfdLt*dt8D| z%H#$k)z#ZRcf|zDWB|pn<3+7Nz>?WW9WdkO5(a^m+D4WRJ9{wc>Y}IN)2Kbgn;_O? zGqdr&9~|$Y0tP=N(k7^Eu;iO*w+f%W`20BNo)=Xa@M_)+o$4LXJyiw{F?a633SC{B zl~9FH%?^Rm*LVz`lkULs)%idDX^O)SxQol(3jDRyBVR!7d`;ar+D7do)jQ}m`g$TevUD5@?*P8)voa?kEe@_hl{_h8j&5eB-5FrYW&*FHVt$ z$kRF9Nstj%KRzpjdd_9wO=4zO8ritN*NPk_9avYrsF(!4))tm{Ga#OY z(r{0buexOzu7+rw8E08Gxd`LTOID{*AC1m*6Nw@osfB%0oBF5sf<~wH1kL;sd zo)k6^VyRFU`)dt*iX^9&QtWbo6yE8XXH?`ztvpiOLgI3R+=MOBQ9=rMVgi<*CU%+d1PQQ0a1U=&b0vkF207%xU0ssI2 literal 0 HcmV?d00001 diff --git a/module_core/src/main/res/mipmap-mdpi/ic_launcher.webp b/module_core/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/module_core/src/main/res/mipmap-xhdpi/ic_launcher.webp b/module_core/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/module_core/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/module_core/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 zcmV-U53%r4Nk&FS4*&pHMM6+kP&il$0000G0001A003VA06|PpNSy@$00HoY|G(*G z+qV7x14$dSO^Re!iqt-AAIE9iwr$(CZQJL$blA4B`>;C3fBY6Q8_YSjb2%a=fc}4E zrSzssacq<^nmW|Rs93PJni30R<8w<(bK_$LO4L?!_OxLl$}K$MUEllnMK|rg=f3;y z*?;3j|Nh>)p0JQ3A~rf(MibH2r+)3cyV1qF&;8m{w-S*y+0mM){KTK^M5}ksc`qX3 zy>rf^b>~l>SSHds8(I@hz3&PD@LmEs4&prkT=BjsBCXTMhN$_)+kvnl0bLKW5rEsj z*d#KXGDB4P&>etx0X+`R19yC=LS)j!mgs5M0L~+o-T~Jl!p!AJxnGAhV%~rhYUL4hlWhgES3Kb5oA&X z{}?3OBSS-{!v$nCIGj->(-TAG)8LR{htr41^gxsT8yqt2@DEG6Yl`Uma3Nd4;YUoW zTbkYl3CMU5ypMF3EIkYmWL|*BknM`0+Kq6CpvO(y$#j94e+q{vI{Zp8cV_6RK!`&C zob$*5Q|$IZ09dW=L!V zw@#2wviu|<#3lgGE8GEhcx+zBt`} zOwP8j9X%^f7i_bth4PiJ$LYtFJSCN$3xwDN;8mr*B;CJwBP2G0TMq0uNt7S^DO_wE zepk!Wrn#Z#03j{`c*Rf~y3o7?J}w?tEELRUR2cgxB*Y{LzA#pxHgf}q?u5idu>077 zd^=p)`nA}6e`|@`p?u}YU66PP_MA}Zqqe!c{nK&z%Jwq1N4e_q<#4g^xaz=ao;u|6 zwpRcW2Lax=ZGbx=Q*HhlJ`Ns#Y*r0*%!T?P*TTiX;rb)$CGLz=rSUum$)3Qyv{BL2 zO*=OI2|%(Yz~`pNEOnLp>+?T@glq-DujlIp?hdJeZ7ctP4_OKx|5@EOps3rr(pWzg zK4d3&oN-X2qN(d_MkfwB4I)_)!I_6nj2iA9u^pQ{;GckGLxBGrJUM2Wdda!k)Y>lq zmjws>dVQ*vW9lvEMkiN3wE-__6OWD0txS&Qn0n22cyj4Q*8(nG4!G{6OOwNvsrPIL zCl-$W9UwkEUVuLwyD%|inbOF*xMODZ4VMEVAq_zUxZ+K#Gdqf!DW$5f)?7UNOFMz! zrB~tuu=6X2FE(p^iqgxr+?ZK;=yz`e;C$#_@D9Lj-+TDVOrva>(#*PVbaHO>A)mhl z07OJWCqYC60518$!&c`eNBcBW%GnfaQ*$eazV^2_AW?j)h;J1nUjN(I9=0+!RVx~% z3@Tf!P0TE+98jA?WceK-}A1% zW!K)lyKcGqy#M~})315-A#2NXQ`?6NR#Apo=S!oF=JfpX>iR*49ec{7AN$xxpK{D$ z2d%Fz&rdfSqourN$~Y^NFIMV1CZ?J*bMx~H3k&meGtH@q9ra2vZxmA$S(#jaaj-g4 ztJmxG+DLV<*q<|sDXPp$X>E)#S}Vm&sRaO5P&goh2><}FEdZSXDqsL$06sAkh(e+v zAsBhKSRexgwg6tIy~GFJzaTxXD(}|+0eOwFDA%rn`X;MVwDHT9=4=g%OaJ9s%3b9>9EUTnnp0t;2Zpa{*>mk~hZqItE_!dQ zOtC>8`$l|mV43Jbudf0N6&&X;{=z}Zi}d1`2qmJ}i|0*GsulD3>GgQXHN)pkR6sf1 z?5ZU%&xtL}oH;YiAA)d*^Ndw2T$+Mjuzyzz@-SM`9df7LqTxLuIwC~S0092~+=qYv z@*ja;?Wt!T!{U?c*Z0YtGe)XbI&y-?B&G2$`JDM)(dIV9G`Sc#6?sI60de6kv+)Qb zUW~2|WjvJq3TA8`0+sWA3zRhY9a~ow)O~&StBkG2{*{TGiY~S8ep{V&Vo2l<6LWsu z^#p0-v*t2?3&aA1)ozu|%efSR=XnpX$lvTeRdKlvM!@|pM5p2w3u-6 zU>}t2xiYLS+{|%C65AzX+23Mtlq?BS&YdYcYsVjoiE&rT>;Necn6l^K)T^lmE`5u{ zm1i+-a-gc;Z&v-{;8r)z6NYfBUv+=_L}ef}qa9FX01)+Aaf+;xj(mL6|JUzGJR1|fnanb%?BPPIp>SCjP|8qE5qJ{=n5ZGw?81z3(k;pzH%1CtlX50{E7h)$h{qGKfzC`e2o`*IqA#tjA z`Fz&^%$b9F*N`)U-#6>a)Z`55`$Dd0cfcs0$d13^ONrdCu9xcv_=n#WQo8stcz3jP9|2EvdI-RhJM3%Q%oM&!OlShM|0 z?gz?wHZSnm45njLtsz8PVT1S&jAlbKg5kVam$p16=EK@Sj4EP0OtH zmJDmdc^v)x>56Qg_wmYHz6h)>kl_h$>0@J!ypv%APmjZTAQVLy6Fu50RGY&JAVNhx zrF_qG6`x9MkT;1SFWo$)l{M$;3qUDn9JwE}z zRl#E_bDRJFii61kPgBybIgp8dNW!Cc1b*^YYk-#oWLJvtM_v^hQx~9?8LD4VFFxBF z3MlrsSC%f9Oupn*ctPL0U1fwfX?`tRhPD{PSLFPQOmIt$mDy0SgpNVvHS+f#Do>h1Gn?LZU9(KaN>Q_=Y*_T zvtD7%_u^^+{g`0VGzg(VZrpVQ6Ub5M=tI_p7T93R8@3Zulu3|#{iNcu!oiHxZ4Rf*( zfmiN$$ru(*_Zqn=`Gq#OuHRTSwp7uH_SokR&|)RuW5yo=Z|_4?qU-JU+tpt>!B&Is z@N(=SG;bpVc;AO@zbmMM zScqq1)b-ZQIrs={oD}|?6y{$HNB1U0^LsBh8JI&3!GBZxOXI<}&5-$lgkAaYqhOTb z?2vEnZ$-kk;*M_17(upJF3%+iH*s0-r{vttXVB2OUwI1s^+G(Ft(U8gYFXC}#P&E^ z>T@C^tS`Z7{6HT4_nF~n>JlZtk5&qDBl6r|^kzQYe`wq!C)n@$c>WOPA61NDFj<<6 zGW71NMMhwAl!U-yqrq2xrSFqRCI8acw7?}3j;ynxo*-b7Co;g5r%^j=H@9({PXXBf z@r>U>>N;E)81wx`B4f%{PB~MHka_);%kBCb(d|Jy5!MqJ%2p`t&@L)4$T2j&-WHvG zv3(uyA_gwqNu(k?jQTtv3dgPKRZoH8prxe7>pQBW5L&dpumS&5Ld2?(sCpJjvc4L5 zEnh&?91WVm)ZdTj=fjJ$pPDdgAttLXuke+?KdKxu*;kTC(r!tQk6;gxj4h%FdHAt(^M3YvYj(!tOeN)+Hvj6+< zzyJRG?^lZfWuR#t!tUKP&(?%3v&Zd$R2YN>lB(Lq`OInY48%4%yTv2 zYe1{G`3)(PDEio5Y@-I5tUf`c%%OCJMtSW56g3iEg%3`$7XSJJHyA z<|7&N)5Xrlgv~%BO24eFd;Hd;uiK%D`EdK|quUeRZDqbh9l)%j%J#0lfrZumvA<_w zu&=AVvdChf6}eqh(bUz`(`Ue*p01{fBAcTgKyDYLs_I+YyJEk+rM@avU~>fB$n)HS zM7pfJydu`i%gfS<{PF94kZDv$t>06sAkheDzu40NJ$5CMW%n^Lls?8^p^QGWURbKu3ZduZQZ((s2? zzE`}<{;Zt7<$C|9R8A~DJ~@%x>TfP zF>TX8)@v|t)q4GjRt<}5s6hLHwRel7>V@&r-O|Av(yh;Q1A{E>Ir>p+%dHD|=l+lT zpr(Dg&>#Nu=!)6bCLr-ZS%|;h)Ij$+e@r8_{qO19QvDe=&1tmpY*0lcA^Cc-#{9fQ z<~$*<&P$Q<_jy#<$40PMofM7aQ}C=jphI`4kLg}Z7CIN#26D{-4v-_CA-LiE@(%{y!BzsU%gG`Q?sjLUf%qFSl0y)2#ae*+EI>s|i`d^V$Dn)qmzqRq6VJRY|{4ujsIU%#bnqU6MR&-1I_43=|5(6Jr;Jvert) zE?S|Tmn}Tv<-??sxV5@9t}3D=>YZ0JrQe$CO~|EY=Lj9RM&4svQHPQL6%pV5fPFiH zfXDx;l@~et{*{U*#c#Dvzu)|znDO7$#CRx)Z&yp-}SrD{&|(MQtfUz~n35@RLfUy=aqrhCX0M}J_r5QsK~NmRCR|Nm&L z41UdsLjWxSUlL41r^0K&nCCK>fdR-!MYjFg(z9_mF^C|#ZQw?`)f6uVzF^`bRnVY& zo}@M06J&_+>w9@jpaO4snmU;0t-(zYW1qVBHtuD!d?%?AtN7Plp><-1Y8Rqb20ZaP zTCgn*-Sri4Q8Xn>=gNaWQ57%!D35UkA@ksOlPB*Dvw}t02ENAqw|kFhn%ZyyW%+t{ zNdM!uqEM^;2}f+tECHbwLmH*!nZVrb$-az%t50Y2pg(HqhvY-^-lb}>^6l{$jOI6} zo_kBzj%8aX|6H5M0Y<)7pzz_wLkIpRm!;PzY)9+24wk2&TT{w--phDGDCOz{cN_ca zpnm7`$oDy=HX%0i-`769*0M6(e5j-?(?24%)<)&46y0e&6@HCDZAm9W6Ib#Y#BF6- z=30crHGg+RRTe%VBC>T00OV6F+gQDAK38Ne3N9bm|62tPccBJi)5{B z4zc^Db72XiBd}v$CF|yU{Z=M|DZ%-(XarYNclODlb1Kz1_EKLy(NSLCN`eUl(rBCL zT*jx@wNvze0|TSqgE(QArOZU)_?qH(sj#TwzElLs9q)(0u!_P|R%Cy_0JFQxgGV>1 zz4?_uq<8_gM0`c*Hh|;UMz~vrg1gQXp{ufg`hM_qU;U>+zmvc5blCLSq@PrEBSGR# z&8=2Z4uXN`F3p73ueD1l{s{k$WipAvSh5W7ABe?4)t;r@V?y`bNB5FvBuE|0VRTb< zM1Hn^?DSsJY+sX@T5xW=#>T9VEV|?<(=6|ge$X6Sb05!LFdjDcoq*gM(Zq=t;_)Le&jyt(&9jzR73noru`a# zN*<`KwGa^gZU3-)MSLF0aFag#f0<>E(bYTeHmtdbns#|I)-$)mJ`q9ctQ8g0=ET?| zdO}eZ*b_p>ygRTtR^5Ggdam=Zb5wmd{}np+Jn1d_=M`~P=M67jj})fH4ztb5yQqQW z^C|C&^LHAK-u+ooIK)yM)QM?t;|<{P;;{`p=BclzAN#JzL4jCwXkQB1Dy{=^KR`=~ zTrr)y7eiYBzSNs_DvO=4A6#EgGS-zY%Vi)N*Yb`U;6o}KR}dq{r9pT5wqZ@3NOE8- z9-(}D|Nc5732CSYQbL)!gPQ#RbD8BhK3dl{sUuPvei0tkvnJBxDEAYTesU8H$)g(Plra{VH(v3u^CO1~(+ zU0O7#)jaS4{NcwA+LuSm&VBcX2#Im3xg)W}ySNw%->orn1taZ&+d)}8gJTqA!u|5P z{yv?zol_3|(1(%M(EVU=cp?L`{Pi|ixk{U)*guFML3P!OSlz;zGA#T+E@8@cgQ_mv1o7RSU=Zo_82F?&&2r;WE z@wk}JHYEZ9nYUc(Vv~iTCa3u8e4q(yq<29VoNbKk|`mq%I6u)My=gPIDuUb&lzf4`MEA9^g8u z)vp8|$$HE9m_BTV?lOosIGa4jud=jIbw)O2eCMfyw2*S8?hjWw^nqws$O*M$3I1)x zR0PWFb3$ySOcGTe1dz%N0l;RPc`x%05FtT^f^j{YCP}*Q=lvp4$ZXrTZQHhO+w%wJn3c8j%+5C3UAFD&%8dBl_qi9D5g8fry}6Ev z2_Q~)5^N$!IU`BPh1O|=BxQ#*C5*}`lluC515$lxc-vNC)IgW=K|=z7o%cWFpndn= zX}f{`!VK02_kU+Q5a3m37J;c} zTzbxteE{GNf?yLt5X=Bzc-mio^Up0nunMCgp*ZJ;%MJvPM3QK)BryP(_v@ei4UvHr z6+sbCifQaOkL6-;5fL8$W($zZ_;CZp305C;~$hhRquZr-r)jjd1z z31%ZK{-(`P#|Um_Sivn@p$-vz46uqT>QG0B1w9znfS9A8PB2LaHdzA|_)yjXVR*l{ zkcu3@vEf7bxH0nkh`q?8FmoO_Ucui*>_a~P?qQrlZ9@+D7%MTpSnztpylXrt5!-k8_QPB?YL8Kx_On8WD zgT+111d(Op$^$&KLAN5+@?>f7F4~wFi(8TL8+szgVmcMDTp5l&k6~=rA{Dt}!gb^r zSWY<)M7D|Z2P0cEodj6E42PV>&>DFmQpgt)E-|#sSUU@uKed+F680H@<;-x{p|nuH4!_mn85rx>wz;0mPi2ZkL#k6;sznu?cXh!T0S>{w6 zL^gvR05NY64l*<+_L>On$rjx9!US;l;LX6@z}yi#2XHh)F@Oo+l)h%fq$v}DNmF2> zfs^_t0)3N-W<9-N?uedVv{)-J0W5mh#29QM5R5h&KuiRM=0Zvnf#lF=K#WlCgc#9c zS;qvh(P$!_a8JwyhI^ZJV2k+B6Z^64?w|1?5gyo6y{}923CRZfYVe1#?F% z7h2SUiNO3;T#JUOyovSs@@C1GtwipycA=*x5{BpIZ_#GCMuV8XK=x;qCNy{d7?wA~ zC+=vjls;ci&zW=6$H~4^K%v{p}Ab?U%C6Z4p%eC<3ExqU$XR<}LLF67A$Sr20DR_pJ3yeBa~ z^sw{V0FI5;UpwXsScYuhbqGQ`YQ25;6p6W^+tgL&;Ml;>S3CGpSZ>VrTn0m1$y$HU z&65)I!c?oREz};c=nLCliriqQX->4uivHTgd${GqeAlf*!P^B|jkU|*IdNP(&6C>4 zqOW$)Nw9nvjy^&`?E|gotDV{JmJ9Q~vuhy<`^C4XIUDt|j4o6rK^e8_(=YqC zuaR6TRVf@tUFHB079o4MBIh{M~4>WwnGgesQH*3?w(RA%hCZ*7)b!aNV=yOQ%o_Y=Lt0Sl*(9^jfRnC210Om$=y>*o|3z} zAR&vAdrB#mWoaB0fJSw9xw|Am$fzK>rx-~R#7IFSAwdu_EI|SRfB*yl0w8oX09H^q zAjl2?0I)v*odGJ40FVGaF&2qJq9Gv`>V>2r0|c`GX8h>CX8eHcOy>S0@<;M3<_6UM z7yCEpug5NZL!H_0>Hg_HasQGxR`rY&Z{geOy?N92Z z{lER^um|$*?*G63*njwc(R?NT)Bei*3jVzR>FWUDb^gKhtL4A=kE_1p-%Fo2`!8M} z(0AjuCiS;G{?*^1tB-uY%=)SRx&D)pK4u@>f6@KPe3}2j_har$>HqzH;UCR^ssFD0 z7h+VLO4o@_Yt>>AeaZKUxqyvxWCAjKB>qjQ30UA)#w z&=RmdwlT`7a8J8Yae=7*c8XL|{@%wA8uvCqfsNX^?UZsS>wX}QD{K}ad4y~iO*p%4 z_cS{u7Ek%?WV6em2(U9#d8(&JDirb^u~7wK4+xP$iiI6IlD|a&S)6o=kG;59N|>K1 zn(0mUqbG3YIY7dQd+*4~)`!S9m7H6HP6YcKHhBc#b%1L}VIisp%;TckEkcu0>lo@u995$<*Em;XNodjTiCdC%R+TX|_ZR#|1`RR|`^@Teh zl#w@8fI1FTx2Dy+{blUT{`^kY*V-AZUd?ZZqCS4gW(kY5?retkLbF=>p=59Nl|=sf zo1Pc|{{N4>5nt#627ylGF`3n>X%`w%bw-Y~zWM_{Si$dc82|=YhISal{N7OY?O`C4 zD|qb}6nLWJ`hUyL+E>-;ricg9J@ZNYP(x(Sct&OI$Y!QWr*=^VN;G3#i>^1n4e#Je zOVhbFbLpXVu*16enDM+ic;97@R~u&kh__kgP#!R`*rQEnA+_dLkNP~L`0alC|J;c; zeiK=s8;BsLE)KbG3BD&Br@(Ha@SBT&$?xX`=$;eeel=|R_dIr6-Ro?=HEjnsJ_b`1 zK6Yg^-6;^2aW!xeTK)A~3Rm|L^FCHB_I>jIju7ZGo&N_1*QHkxH2!!%@o4iZ?vntS;&zJdPe1dH#04YD93A44o-MpfD zP{rn_aq>U%RDvC2+bp;xPlsOzauIi3*Lf42`jVKKZCRuKdYhi>FDuL2l=v{$BCN#Q6796s%r-AG$Q^t(3c@ zD?w0UhYr11@feiyl9kY_@H8~|xlmO<8PfQmj1!$@WieW@VxR@Psxfe-v9WCi1+f>F4VL?0O~K7T?m4-u|pSkBpUJZZe*16_wAp zSYZ@;k`3;W3UHKUWc8QeI}0jH5Ly=cGWQPw(Kr2fm=-5L(d`lcXofy8tJY3@Tuadz zYWXR{mW7XT!RF#RVCe%}=tM*O6!AD3^(!8un~opNI%Uko7$5t@<8+?; zTxDys(MyyGsUjtSu9$+|_-t!U3fVb1dkK?l`17<+jfl=hrBHnDSV>^R1=TnQeyqbW z>ov#l%!1|S!1>8UUxIdhQq`_klcHVx0{?#>K3#$4GlXncwldt!g17TcvKq-jo_996 z>oA=tH9CqRl6Yw?Uc`am!V?lHJbizOJaVaScf1UP5e7Dbgabq=b!B~T&_F6?ooU>w%x0A zH~&MHJ=q`fCH{U<7MDXE4SD32cDZA)WJeWkllJ`UspWaS#eDe^kg^oU_A14UE9zG-a^g{xaXf$})Wik>gT zl#dkzGr(;h0JZDuFn(+k8wNq?PZ5grQ<+sM?wBGt@JnH6v0#or-5wBQWKU~(S_> zkE!tc*ZJ1Y&*p(xX84POb3cClRMd!^qJ#CAZfIepEj-<`VURS_yCz0(?*Ixcj4 z-!zV1_QZhpm=0<;*(nm+F>T=)o?ep@CK5I%g^VAA+RB25ab?7)A~z~egru=I1S|@v zH7tXV!0wmGS^qj#e+MY;C5eUjEAp$Y?LDkS^QPZ}8WN85?r$u<-Epi;yZ1|J2J`se z$D6DpH~2F=eI0B&=UFAUnJvZAmClJlK)sutJ?M>xpZiWV&0=G4MZP+x+p>EX=HbCz zxls%Mw?*u^;LbHWIWCyq+yi)`GmFn9J112CZda_u@YIP%i;srFg_paU02Ifij*7}l z&CF-(3|>*a|+vbNR`^RP=9G?ymEJ0Z~)d&c*UE$UMepZ zcITr{0WqhxkjUnM15js_gW=e3Uh|y6ZReaXHIz-=p`x5VvB&rH9y>Amv@^WmXFEw) zQXYrk3feir=a{jMQ+wDIkkFnZ$k{sJakHn*?u za%4b!00ev8NVLM1TY=cl?KB&55BY_MU-sg?c>=Dbz_W{(Z~c?HJi*XpYL)C6Bd8WH zt+v-#0&o~@t4qESi*)+eW%@VD0|o^yF)n0hME$UtXF$*Lvh}7sso{`|pn*JDIy5^Fm3s$5*zEE=?u5<=l8FJc3r%+H} zdfoNl2J0^~!-*mOL5o-x32|e0Im*E!yY7F7E5N)W3>+v_LBydlEx?4$RL5f2oYRD# zaR0wv(-p~wO0eLDl3K=%`{5+0Gd$ktO=W)gWlGZJ0`K z$_RNA=ckrfa;H0KA~dR^p�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} zs4%E?srLW`CJh0GCIK@hTkrW7A15Iu%N&?Q^$0+!{Tv&|t^Y@u%!L zglTg&?Q5q#ijZ;&HBQ?FNPp;k3J5!&{^+SGq?AX~SiOM9jJMRpyP?RCr@z38AQyy&WRMaC;n4una$~nJKSp?q|s8F00c9?Q! zY_ovvjTFm+DeQM^LXJ#v0}6HRt3R1%5PT*}W!k8BEM;Jrj8dIceFo2fhzTqaB3KKk zGlCLI)gU25(#u6ch6GeB1k@eHq7l{EHXv0n6xE#ws#ri}08kkCf8hUt{|Ejb`2YW* zvg}0nSSX1m=76s?sZhRY$K=3dpJ+y*eDULGnL2}4>4nvW^7_<~wIM_5fjvwt4h1|g z)g0Z6ZFq9j<~9~b8((~TN{Z?ZQfw|is&Xp~AC61sj;xItKyCHdI|tCMC_LbXF>~vR z=w6V3^H=W4CbAgR4#xw}ETTwu2guW~=Crl@SMXv85jQ=%y!s^?m4PI0My7MWICO;- z175jm%&PcPWh8QdOU(#8bp4!N7ET-+)N}N2zk2)8ch|4Q&lPFNQgT-thu053`r*h3 z_8dI@G;`zn;lH$zX3RzIk`E8~`J=BBdR}qD%n@vVG1834)!pS1Y?zVkJGtsa(sB~y zNfMYKsOJb%5J(0ivK8d+l2D2y&5X!cg3BG!AJ}910|_${nF}sC1QF^nLIhzXk-Y#x z0)&1iK!O;Og0Ky!;`b~v%b$`S4E&fB)1NB4v@8wr( z&+NX4e^&o)ecb=)dd~C!{(1e6t?&9j{l8%U*k4)?`(L3;Qjw z#w7FS+U(94MaJKS!J9O8^$)36_J8;thW#2$y9i{bB{?M{QS_inZIJ!jwqAbfXYVd$ zQ5fC$6Nc9hFi8m^;oI-%C#BS|c8vy+@{jx6hFcf^_;2VRgkoN(0h!_VSGmgNPRsxI z8$rTo0LaYq-H5i&gtj81=&xU?H-Y2==G@uQV7E`@+2E9XQW@{&j`?EOktk|Ho{HU>ZqDzvgjwBmdex z&uZNd2C1h{{}2k6Ys9$*nFP3;K%u!MhW`uZy7Sn`1M1zs@Es&;z*Z>Gsh@-3Fe6pE zQD2@cqF((NrRevgvLsvM_8;;iNyJ5nyPyy?e!kvKjGj`6diRFBEe49Oa7wwkJFV7Z z$YT&DWloYu-H?3<0BKn9L&JYDT-SK~*6c5pi18P26$JESKRYj{T7Zk6KiRJcbvOO*{P56Q6s8msbeI3>|j>K9}Q9UBeq*inXKemCm`-<5|-$ZyN4u$(3 z&HcvqehFD%5Yrmykg-^d`=BSa8(i=>ZoC77^mWY{evp(km@aHqhUECBz76YiR+VYK zY_avFC~V3$=`6C4JhfHAQ@DZtUOwH`L;oYX6zK0-uI^?hS$ALfq}A7evR;ohJHij} zHSZdW?EKv9U1s4oD*<(0oQ*;MaQ6@cvGL zuHCPgm_NhVsgp^sfr*ia^Db}swo1?O(_Q2)y+S$CBm+g=9wCOUPbz(x)_GbaKa@A7 zuI&!ynLiZRT#V%_y_-D`0Z5lT*auoe{(U5NylTzFSJW()W-#F6*&A`LNO1bV#Y;QJ zSbLBnp|B^dtK|KIWC|No>JjWBWE@n7O)x{&^E(WMeMvp57#qA8m* zeTow*U@_86B#Fm*rxyYu5PRWaWHx8y> z*qmHEp(AMDl0v)ij(AY8fnH=~ZwwjVAbu*m5;xPfidh@ov6d8g zfJsi&!QyK53Es%sC39ts;54V68koALD4b|%tNHW0bIkZAJKa=W&FomJSEDT>W1xIX z1x%Z>AvNIsSPLcn3RTcHXb@KB?cuM)=x6fcIx>&(GxqZ8w3p#jJ(GVgc*`c0HG}dv zIop&Qim!K1NFwic%07KcjWgHBPUkq7f~lj;TPqVGTiT#cUeim>;nY`>h@a*S{qQex zQ`z62WK|Mj)Y{tfF{;T4P;c8$Q|KU?Joh zIkA^z%X7z|r>4aTh@|StTi!-r1D!g=zb#3d#{{&K3CqE$Iz-UH<%37c zRfkO`&uM%#AD3PHv`g5t0e^O%nVL0d{Xlx^EjEC3#skF@`zl-7PF^0oxW)1!C!JxR zWvuAHH?)61FKA1QeT*_sY7;_Id#!GmV4n`MO{~sv}VLSK` zXRw=Y=Clz*00B(5y^K;gCZMAzjT5+c3IC=)l(9VIDdatpxj3y89WwI|bH&$!ZEvp` zPR!T@#!(|KfI-w?!&+7$N3F6>tD{YO4Qg$d_`nNEdfVCha9vaPn0jI0`)`@*72hq! zpU5ND^P*RoEkbD5o#az(-g=Y)L>HH>Oc%}$ zT3Rs_ih0;4+Lv4Y;@Iv(;fUbQ=i-G(#>vghec~*j(I#r|5mqFiJBpzi&hzEcD{u$< zRsm0BVYn=pT;0>R(itW|*D&;O%bOc7et9ACaH#J>z3A1A~6fdP>pmbM%xzm4>|;c_?B+%sl;Qs2{t!60$^u zH1t@9^6>;?!FuusnISi$f5CL&;z?EqJN$FBuWDA#D5`cy_UvCFIVvf{c?4N0teh;d zET$7aVbj08KTQS!x?Nd1Is8q8qFzs}a=!@nJ;7FSfCY^T@D-gpw`w<6e#X3+;O}1h z$%I!M)0bg|EKUA04Qjn@+x{Rj8vt6Wn!R|3A92z}^$KfF5(#CWr4y#~re1CN4i4w0 z#GsypBR{xA3Er7sgAi(|}1-W?s~n$7?K|9WL8kpVfw-;#b9 z+mn;=ep!162U5R>_t}fOt~tE?s#m( zO-S$7>Ay6*hHdZ)7_oU915WYYCIX;hFI-U2EWYX!pllONr@Q--2o~`!isi6vTPLJ4@(|o=%NHYjo0_S&q*UQIROw@*N-By@PaQ&;YxFZ0aR zX&}LeOEz);#m~Hwm^VAY8DK}b$F4bo{jMN?d!lxKPhNklzr^Cd`0f4oJr^z=I|l`* zm8AHm*fPV`0=lF3Pnnp}&J0N1X@}-D94YvmUabFrLGSnTz7Mu^21F#O5tN#CuY9Vh zUZBH=ez%h*wkf0hBtXJh1SN3d+IF{gzT7lp)j}n?03lt;XSQRAh7qd&v;RwTYDuQ# zbI2*r<>?x-G0@hM{;%{VBD7nLKt~D`T~-HAt5;h%i0_=Ifs=yHma5dhJ+QMG?Ux(a z|E?1CMy1!~oA`FP!k~iG=t&5#>bVdz=peT8HMB6Y)#7PpETtNryT^+Rv3vpJaF^zP z{H}0-LyV9Fu21ID%wO9f1IKlFr1p4c{o-?03vyB-tr5duk^&L$;m_|f$vs`^Sl{j2 z95}oY{LlY+=ZS%J+tZoXCd0*sSU7w^gjovXn+g7uyra5{cU49@yHf#Z^Jl-$9cIfo z+AJuxH$VLb=#+uBbVmUjnx zxb1pZ@-O9=AIk4@S)m6fJ2?{HrNYwwnL3a45muuNjr;6$O`bGEM0T4A2_S$t=86*- zcO+0mywg*j#A4mU}enR_!cGmIYQ;qwfchWtFEXL)AK%*;=j znYne+hS4EMy3S)C*mZ1KI>!+)0V@9!N6H$Y}~MJ{rYuf zz^KljIWvFi-?#?V@LPR&c6Nn{!=XM z>}-h$S76;$H{E{Y%@^zlmOl^efBwa%UU+jJD9UVukQ3ti_kH-?H*RC0?M1W%FCvMB zM_+v6fk$6X2sx)-p~B3&Kl{nscK}pNLM*qjtpaf9>AU{-iPKQZR8yCg!TY}Qg*(;) z)gdvCcB%kppZc$VdvsK@)3l1{&DG!d_6OHOS`y=ITLEVu`unSKA2E%JD*DVX{LJ}K z9l>hMRDqxQh0lnpGHpVYneX}eA3Pt|2v%=q;rt)``R|#bDyB)OXY&vI_@|*}h}G?^ z@aZ4_!7cQPX`!fW_?{oT1NTwHs#l5L-0`E|y@48<3Q^HFf8=Idi zpJYD%1MkII!~|7I^WGo)IF=?{>ACnjJ_WUi39C}!Q{QnheVJqeKKqq5^o5CBde(g9 zvw$X6^jz_^E2$wSw4!q5*RG(C2_^XO$HBn_55vbl44OnTTRwRaePP0vo{K)U1#99& z<>rq7V&V(<&@I%MFoN5zrY}sz=(*-L&}1QQ*a%`u25h{cFj===17eB_uGuzG&byQ< zrm8BJZl4r_E$3k|Wo6FW0-6M7>qac5uFQsQcmkLWGfeH74S3Z_rJ!jgN++!@i=HW8 zkyjI(oPH-+-N#Qc^-mpNO`bc6r=2-<%&Wy5K1vfFJB(L_IkpS6fY^NmuL8qsgj>MD zn~BHH9WM~32_3vd=W&B)k7F9q%stJx+b_L_X-4zr^LVUMCmyCTA3sWtkvsmME?Xiy z?xOSfB=_$oY06~J-HcCq&)qcW{j;uP;?Dm}=hkq?zh&n!;m((-G-u_t|6x399Q;>A zgNpxoJNj{u|MFDH7Rhq@FCAl0dE|ddnl!oh9{Lq?@JDoR6L;C941IK`ISfdE$4S zE0AUQ8+2|Ncl_q5QkSp#AODp~(^mfP&%Au@@|TBQwoP`UU+V{6u8|)6ZA{~uKmQ*M zmrMTDU8S~8Eqi{^v0Ug&5Upcm#y7Z1(RbgZAG8jB$eRwCspQ)>5;U)oGZ&E5aeR*K z8Yt`Y0$G))Yd(Y3KH}tA4`-_QmNke5hU_|nq=xtyjwW(_o?itz>B>WM&^63bNdQ)k@-IgDHW*RW$Xo9#RzrTrCn7L2H{9Amq|qNg@#eZY=|P zCoI?2s+L)zsM%WX(NbVEY^`C>lFjIBYmJ6@DKJ0ZT4&F&WHW!dwa%QzOG!?jY_2(S zDcEzZbz*2Q!43|z))9yOP9X1Xt%DXzwY(3tl-TR=Qb_MbZYRrooh;dYYmS!U_as1(=YVB?Q_A|tNu5Ut&_q3jbfDM zoFxT^uEuH`nX3*sB%K?GuHUkweYReBwnHqh3P)~`+s3+Tj!rDA1e)8vuBv5J*IsxC zkd^~b(aGzArj08{>cnzOuy04C+C`}gb|Yz-1avxeWzev3NzcHbz_&4W@QCr$z3~w=8Ua- z`;vfG1~BP8CyLb=F7t1am~ph_#|O%$khSJ9%Vtcn)YmpgQxF?xM^_Vb+5fnpB^W0I`f%X8gb9#X{Q-yJG0{Z56aWeI&zPxnf5pdJA38bM`cYnS#x)% z`n1tFf$i)W-hGm(f9mde^=X@NcV_lFb=P`4&CI&H=IArijGwdCk&X@uQ$5xmj!~^? z#$ROCI)V-~t%L%GS#wo@U27ddR`4`3)WoB{R-4snfNrfee|kI8^bu#yDgYqOwas9# zmcb`3!kRJ`Cr=_tq)8aMt{aGtUZsqwVlj6DgCGre>AEt&x8H_in!x@uwgExIh|-mA zjdaC(29~CTVSaaF7HPbql&*9Uo8P@f)>LqCXclr}peS7_1BQ28u9PO8Eq1@`l3q9o zkfKCaO2?T?ZyA6loW<#9_c^O=m<&h}CA!ineAD@=(gbq`vyT|tiJ6#^B1$P;;qax` z55k&Q?wEh#87niLo*+n4L@65J(Nz~=Ya%7^(miLb(E>A3B@|Jjl;FU&D>o|9#7PJH z?|ago!o;WC^h=|T7PVBg(DAB}72cyUS zb(f>Bwbr!F1eTCO5fpj<{PqhY5>143p?~5ZA5H40);=@M#MYvrB6gqHbU_!GSY??i z%s=>-ciA4*zOOZHds0a(kWewZ4h(k8h(ua7HX)Au&mY~H8KY6(_cb$_&fA@QjIW-*heP3%$d!m5^AdnT}`12qA^c@!g3DOwZ5WwE2?)-yU z!)Vx#Mtxt?FzFTwK!77sy7)sMzUd->w4^bxtpM2j!b1pjgyk zGKwWGeb4)^zjy{9Es&PU1}gwg?|J#L$KJB7ett9@4M%-nGtIQr0>Fl@8-yh`-+1ed zS6r}(MeSvgSoFmH*_WPu@i?}!AB~2?;i&IxrkNg~cQ9Som98tcq)k^|eeER|Zl77t za-TVUc;DNvzVXJ%w52+#weN?+;i#{f#!Oc&z?81*N>^e~ltRS%ZI@lR{rs()HmqG! zx*}ZrI-EZ}ckJMiy>A^oofwDfC~IH)z8{VHKGT@#E5I(Ll&+MnMCl>~AV7+>Gi%mF zkU1QlKASdR0B80!YhP<$Ywi0?W2Ux45oPfxv9QolWzJPD^weBfvo4SONxP35106sAmh(e+vAs0GboFD@PvNs)jNPvarhW}0YliZEg{Gazv z+JDIpoojRVPr<*C|BTq<`6ga{5q^8^!|0cxe=rZ!zxH3%f5ZO0cQ*Z<^$Yt2{|Ek0 zyT|*F+CO@K;(owBKtGg!S^xj-Z~rga2m6nxKl9J=fBSuNKW_dLKWhJKeg^-Xe`^1? z`TyJj)8E!#>_3Y?uKrwqq3LJ#SGU>AzUO|6`nR^u&3FNN_jGOc zw)Nw`wr3yIKhgcee6IaN=ws>M{6677%)hPwx&HzC(f&u~&)6@b2kNRzBDQAP0*H73 zq%McOmRk{B3i47qRe=DA*$&odrbEJZ*pV9XXa&p@wlW~@Yfs>V{yiTtplMhgM*-Bz zsSnlq&pG;z0OUN%$~$3=g1UF+G*>+17eRbBf3=y79J}KR8owon@$1Z7MIrvvWWH)34nK2SD)GsrJ{l z1Cl#oVo3A8qY3e=aF)qzms~FG#2$LzT=gs&aVMOj>(%{y<&O0cG!nCiESl~x=^dF{ zKvj8F1K8Ng171wwM5Fh4KoQw`_c6#y$(5cAm7e}~nJ#A*fx+c9;y#&W!#VukR)ugk zKp3=+;Ut+IYn%m+r4d*<`L2h%aDnX5}^!5R|H;(34AoVWjRx(msBZvk;rCI*|~ zdOijqI@9Z{Vu!~jvHW{lBa$rnl4+!s_5sfK3bCGk-B%iDe&@-}+%fOKU|(9?V1 zHE8&@4z)Kx!RAvAs z!Wic9=o#(bg?kc-G68-m(jZ`^=XGUXb)}t(%&~sjFnV^sEX%hSy6UKC4iOhgV=BHV z2w`4g7Y=s#Vu2B_?#VQ|hP39@eArgfX>-0S+dd&^mx0*wp}>)x;c4RUgxz%;oNe?& z-7-lJ@Y^2^C;=qJsxx5|xF)*pTGhch2B&kxtn;f!7=gznk}I3}Dh}(CoMXgA5-p&kS202!l?!fT3t|HG*rIP~mS* z$Wjo}jq3}z$Qq!9yrtd3fM0N629ZM?LU$nv@Tv9b7I;D|;0H2dsA~g7Z7zp1| zB)XmrkMgF6OQr|R)HHD^TE{Y#j!~SR?b`Xt3Qs`B+x<hxexYeAjMUWdZ-*n9%(1)Wb(n2U<><7&9dwGJmrob)4%H? zlQ%z+L-^$dFhhH|@u$%97Qz?*Ynh2VG@q|?8vY&L74&fs&_b&3$x&Oyjl~LQDRRap zJU4U*R+(2Dd!G+lh8!V{pT_UJn+^1Qg6$` zqkNm(a#hWyc6SP+p5=C4HL8-m`pO`5o~`-LI?_h5CsH?F_%?nDodmz&pWR20WTpJE z?N|wSzLjMUK8E)a2tI}Lf;+;*M|h3Y(U#>)g1>zk9|Hd}oZAa2 zLYBWBoSW!Ts!RwXr^8h+U*@{9{zqS^iH)Op<;r`Uw~nc}<^$V~_i%$GFjaG?X1@E|M`h)nekvFKt`Dh-f>@|0-`Xoq)o` zx;JmzDfOV9qCx|EVpogEe0LK~tGS?5$$L_i6P$P6wIsCQaP_;d{{N=iV@+8LI}o#( zvo*Ejy=IIn{rdIQh1&q-{EuohpVOjJ^Q3lD*YTp37$^RRgn8ihpdu5{Ct%5-KO!VL zcNB6dUajXI9jkm-P|i3~GB-A(X`P1Oqqb$tcku)UJw0w3GeUijb__#QT4j%64z%EeB7S?jlWwx_7&+EEvB|6N=kV}DwnyAlX=?j`) zmU#!$*^@NIu#n_d7;WoJV@*Fbv9|yJO4;n|BNF2xy(54RyB>t~8lUOUW$&2%Nwi1y zx6JxW88>U2$#qhl^6KUbtmg9}D0o5vYDT7kWJthLGkpGnN4T>{St^_EU>4;DmLF9o zr|LqsA8_MoNLQ=}w?8u!ziSZ@PC#Y<#9uJFo-ozVo6D;<8j^1$c|qAE3ZTE5i~zmE z$BU5lw6l=EWsg^y^;8>r9qH{xfL|~PZYK#md$zZ0?o11gV<*WSW~cgy2GYGQir%wf zt4iW8D+;s*;RGrmd(-T<@2&j(Cb9xhV*l-x`TpK`xq|7p?5R%5*s!69?2c!cC*VY* z2DE^9pvOPLU!1e}wA8S8opcTJ3`NB>hY=JQnL~QFXR4K8A$BqJnoEB$wn-%u@E6Mh zCfMF4kusv3N!(aHC}4)Xs^xoOwXd%e^6pi5|DZo=Q25j+6HlJ^7FodH6y1bMROR^q zGu6)fopS`h%Sw<;ZH%TEPf+#81-#_v+@8nlR0jLcIDKQtLleOC)6yLZgC!D9X3GgS zohwU{v$jl=quD#Go^hB{`@Qw*a%`(^jyT~=q^bWgGzRj;|12J55HWdCWV}EB|K=%N z3Nq-qxJJ`>^|1MNN+q}zTB&ooE3j==AgK@^UW<^oSbeALa2peF)Th6{@sj0KyMNHZ zksk1+MXN2tv+22A%cQOGpS9)77(uP9mh+!5T5ERLvF@b}$+WvXM45Z?-kCa)fb~f1 znVbTD$Gx-0Zxc`0D@YgHakge6SL0H`-vN_x?AP0>iGH0_EE&=v83hMJgaKAI0jJXm zVxVz;X<$v6WW7}fxROO7vr#YLP;;lij5VrX{;>7kK6TtOH&6|Ar^xo>00%+u$C4@# z>!jOt6*3><171+WxoZnKDTzJtDRw+T030;yI}~uV@9fCnei^I*j>Bp&mzP2d=FPb_ zCM*l_+$LDR3B*a!A$g#>xsrZvw0lckxmMg>0aQd7tPyN=t{dgXb;Ie+T8{fZH=gdu zM7Rg9c(kg(Jg0?ARRRl=AONFKrvFj)lTY$KfT%6^6s`mk*ABGhsce*LsoD>K{z_M2 ziPpnu+lw22PfF!CoId^6n*G4H(Ix+#+N{C(da7t1BYMGEaE#PdpOLxsVD5riQXHp@OX;`S`8VnpM~)I920w~<3|mo0 zf8~Az`*?2?H&gZ&*K&bRkV@qzvMlRHXys8*Ze2+1c?5o!^+$&MHxB@4Ee5cke52R! zmn7AZtY6ST%ixgU5)%$%QcwHj7Es-Qu^kLAPwy%7pGBw_4Q9#da^W2$}axNHr03)_nw z5?yuNmXrI5HgS46)c5&}B)Tts49oU92>3xBLLy}FMUW=84DQbVq^;7_e7|(Sdz|&J z73N+M`rc2rt*oSWu#7S{*s~nH6HRHJS1SmzeXk|;CA)FI4bat3<%}nkB%;;?=F>B7ms9QSxv#@+69;@>QaR?REYX4&)=itG>rM{<{A79Rmk)`5ON#GL`*KX%}Ihk3w(RtM-WLt z?f&FLF}4N^yE!(pZ&Yj&Bc`~K0@4_}*0Om?wN|}4WJ>WL;G^H2*QpgEkGA~OET-Km zkwz|5{6dnz1U<2Pe9DNL>3g5FEIvp1jzP&2K#z~j%g6!7B;^zF+o95?fV{3mnB8*RMhCDNp>Am-3e@jNfMj?jHV$MWjk!DDKP zkAz$Y?Sr)!GUOX}qTQ5aMh|wq1uq}~joWyKl=b_LboM#wi{CMuz5x6BKlA-qy++cM01D3b7`uD z#l6M4pI;JCypO8JZ6?U&wNxR!{4oB_ zlV!x9+-&Qy6{%MQ{~yoZGkKiTSC`YS_j22~G;xUV855g2&C(zm^V!(wpcm@zn{%!g z4}JGo(sGZ1O~to-}le

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/module_core/src/main/res/values-night/colors.xml b/module_core/src/main/res/values-night/colors.xml new file mode 100644 index 0000000000..388508876e --- /dev/null +++ b/module_core/src/main/res/values-night/colors.xml @@ -0,0 +1,9 @@ + + + #5C8399 + #5C9599 + #6F5EA8 + #996283 + #748054 + #946262 + \ No newline at end of file diff --git a/module_core/src/main/res/values-night/themes.xml b/module_core/src/main/res/values-night/themes.xml new file mode 100644 index 0000000000..757059b8ed --- /dev/null +++ b/module_core/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/module_core/src/main/res/values/colors.xml b/module_core/src/main/res/values/colors.xml new file mode 100644 index 0000000000..388508876e --- /dev/null +++ b/module_core/src/main/res/values/colors.xml @@ -0,0 +1,9 @@ + + + #5C8399 + #5C9599 + #6F5EA8 + #996283 + #748054 + #946262 + \ No newline at end of file diff --git a/module_core/src/main/res/values/strings.xml b/module_core/src/main/res/values/strings.xml new file mode 100644 index 0000000000..8048959145 --- /dev/null +++ b/module_core/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + module_core + \ No newline at end of file diff --git a/module_core/src/main/res/values/themes.xml b/module_core/src/main/res/values/themes.xml new file mode 100644 index 0000000000..a3032f82eb --- /dev/null +++ b/module_core/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/module_core/src/test/java/com/gh/gamecenter/core/ExampleUnitTest.kt b/module_core/src/test/java/com/gh/gamecenter/core/ExampleUnitTest.kt new file mode 100644 index 0000000000..2131858922 --- /dev/null +++ b/module_core/src/test/java/com/gh/gamecenter/core/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.gh.gamecenter.core + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 9d1351d890..e0cf03553b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,3 +9,5 @@ include ':libraries:QQShare' include ':libraries:Matisse' //setBinding(new Binding([gradle: this])) //evaluate(new File(settingsDir, "assistant_flutter/.android/include_flutter.groovy")) +include ':module_core' +include ':module_common' From 7a89ef3e7499dfe5027d9b6cc139c1a55f46f03b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Mon, 18 Apr 2022 10:06:38 +0800 Subject: [PATCH 02/52] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=90=8E=E5=AF=BC=E5=8C=85=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gamecollection/detail/GameCollectionDetailFragment.kt | 2 +- .../publish/ChooseGameCollectionActivityDialog.kt | 7 ++++--- .../publish/GameCollectionActivityLabelFragment.kt | 8 ++++---- module_common/src/main/res/values-night/colors.xml | 4 +++- module_common/src/main/res/values/colors.xml | 2 ++ 5 files changed, 14 insertions(+), 9 deletions(-) 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 51c9c35aae..96cbe63e49 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 @@ -19,7 +19,6 @@ import com.gh.gamecenter.common.syncpage.SyncDataEntity import com.gh.gamecenter.common.syncpage.SyncFieldConstants import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* -import com.gh.common.view.SegmentedFilterView import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus import com.gh.download.DownloadManager @@ -28,6 +27,7 @@ import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.common.view.SegmentedFilterView import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentGameCollectionDetailBinding import com.gh.gamecenter.databinding.LayoutGameCollectionTagBinding diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/ChooseGameCollectionActivityDialog.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/ChooseGameCollectionActivityDialog.kt index 4c8307426d..7ab9e6116b 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/ChooseGameCollectionActivityDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/ChooseGameCollectionActivityDialog.kt @@ -10,9 +10,10 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.core.os.bundleOf -import com.gh.base.fragment.BaseDialogFragment import com.gh.common.util.EntranceUtils import com.gh.gamecenter.R +import com.gh.gamecenter.common.base.fragment.BaseDialogFragment +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.databinding.DialogChooseActivityBinding import com.gh.gamecenter.entity.ActivityLabelEntity import com.halo.assistant.HaloApp @@ -39,7 +40,7 @@ class ChooseGameCollectionActivityDialog : BaseDialogFragment() { mBinding.confirmTv.setOnClickListener { val activityLabelEntity = fragment.getSelectedActivity() val intent = Intent().apply { - putExtra(EntranceUtils.KEY_DATA, activityLabelEntity) + putExtra(EntranceConsts.KEY_DATA, activityLabelEntity) } (requireActivity() as GameCollectionEditActivity).onActivityDialogResult(GameCollectionEditActivity.REQUEST_CHOOSE_ACTIVITY, Activity.RESULT_OK, intent) @@ -90,7 +91,7 @@ class ChooseGameCollectionActivityDialog : BaseDialogFragment() { ChooseGameCollectionActivityDialog().apply { arguments = bundleOf( TAG_ACTIVITY_ID to tagActivityId, - EntranceUtils.KEY_PARENT_TAG to parentTag + EntranceConsts.KEY_PARENT_TAG to parentTag ) }.show(activity.supportFragmentManager, ChooseGameCollectionActivityDialog::class.java.name) } diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelFragment.kt index 3da8b90bec..38cd1c8cd7 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelFragment.kt @@ -5,13 +5,13 @@ import android.view.View import androidx.core.content.ContextCompat import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.LinearLayoutManager -import com.gh.common.util.dip2px -import com.gh.common.util.viewModelProvider -import com.gh.common.view.divider.HorizontalDividerItemDecoration import com.gh.gamecenter.R +import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration import com.gh.gamecenter.databinding.FragmentListBaseBinding import com.gh.gamecenter.entity.ActivityLabelEntity -import com.gh.gamecenter.normal.NormalFragment import com.gh.gamecenter.video.label.VideoLabelActivity import com.gh.gamecenter.video.label.VideoLabelAdapter diff --git a/module_common/src/main/res/values-night/colors.xml b/module_common/src/main/res/values-night/colors.xml index dcb48a809c..60c10b5334 100644 --- a/module_common/src/main/res/values-night/colors.xml +++ b/module_common/src/main/res/values-night/colors.xml @@ -122,6 +122,8 @@ #4BC3FF #ecfaff + + #FA8850 @android:color/black #08000000 @@ -269,7 +271,7 @@ #F8A142 #f9f9f9 #a9a9a9 - #757575 + @color/text_subtitle #0E0E0E #F9FAFB #00CDEB diff --git a/module_common/src/main/res/values/colors.xml b/module_common/src/main/res/values/colors.xml index ddcbc2b56f..b444e54fae 100644 --- a/module_common/src/main/res/values/colors.xml +++ b/module_common/src/main/res/values/colors.xml @@ -122,6 +122,8 @@ #4BC3FF #ecfaff + + #FA8850 @android:color/black #08000000 From eaba77b3a71dcca8a3716341652bb8ada3d2f0f2 Mon Sep 17 00:00:00 2001 From: leafwai Date: Mon, 9 May 2022 10:32:18 +0800 Subject: [PATCH 03/52] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.10.0=E3=80=91=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=B1=87=E6=80=BB5=E6=9C=88=E7=AC=AC2=E5=91=A8(3)=20https://gi?= =?UTF-8?q?t.shanqu.cc/pm/halo-app-issues/-/issues/1845?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stacklayoutmanager/StackLayoutManager.kt | 6 -- .../HomeGameCollectionViewHolder.kt | 89 +++++++++++++++---- 2 files changed, 71 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/com/gh/common/view/stacklayoutmanager/StackLayoutManager.kt b/app/src/main/java/com/gh/common/view/stacklayoutmanager/StackLayoutManager.kt index 181d49573a..c7c313b54e 100644 --- a/app/src/main/java/com/gh/common/view/stacklayoutmanager/StackLayoutManager.kt +++ b/app/src/main/java/com/gh/common/view/stacklayoutmanager/StackLayoutManager.kt @@ -308,17 +308,11 @@ class StackLayoutManager(scrollOrientation: ScrollOrientation, } override fun scrollToPosition(position: Int) { - if (position < 0 || position >= itemCount) { - throw ArrayIndexOutOfBoundsException("$position is out of bound [0..$itemCount-1]") - } mScrollOffset = getPositionOffset(position) requestLayout() } override fun smoothScrollToPosition(recyclerView: RecyclerView, state: State?, position: Int) { - if (position < 0 || position >= itemCount) { - throw ArrayIndexOutOfBoundsException("$position is out of bound [0..$itemCount-1]") - } mFixScrolling = true scrollToCenter(position, recyclerView, true) } diff --git a/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionViewHolder.kt index 828a77526f..6a895b35c5 100644 --- a/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionViewHolder.kt @@ -1,5 +1,9 @@ package com.gh.gamecenter.home.gamecollection +import android.os.Handler +import android.os.Looper +import android.os.Message +import android.view.MotionEvent import androidx.recyclerview.widget.RecyclerView import com.gh.base.BaseRecyclerViewHolder import com.gh.common.util.DisplayUtils @@ -7,38 +11,87 @@ import com.gh.common.util.dip2px import com.gh.common.view.stacklayoutmanager.StackLayoutManager import com.gh.gamecenter.databinding.HomeGameCollectionItemBinding import com.gh.gamecenter.gamecollection.square.GameCollectionListItemData +import java.lang.ref.WeakReference class HomeGameCollectionViewHolder(val binding: HomeGameCollectionItemBinding) : BaseRecyclerViewHolder(binding.root) { + + private var mAdapter: HomeGameCollectionAdapter? = null + private var mLayoutManager: StackLayoutManager? = null + private val mLooperHandle = LooperHandle(this) + private val mSlideLooperKey = 222 + fun bindGameCollectionList(gameCollectionItemDataList: List, entrance: String) { if (binding.recyclerView.adapter is HomeGameCollectionAdapter) { return } - val adapter = HomeGameCollectionAdapter(binding.root.context, entrance) - val manager = StackLayoutManager( + mAdapter = HomeGameCollectionAdapter(binding.root.context, entrance) + mLayoutManager = StackLayoutManager( StackLayoutManager.ScrollOrientation.RIGHT_TO_LEFT, 3, GameCollectionStackAnimation::class.java, GameCollectionStackLayout::class.java ).apply { setPagerFlingVelocity(DisplayUtils.getScreenWidth() / 2) } - - binding.recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() { - override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { - super.onScrollStateChanged(recyclerView, newState) - if (newState == RecyclerView.SCROLL_STATE_IDLE) { - binding.recyclerView.post { - binding.recyclerView.suppressLayout(false) + mLayoutManager?.setItemOffset(4F.dip2px()) + binding.recyclerView.run { + layoutManager = mLayoutManager + adapter = mAdapter + isNestedScrollingEnabled = false + addOnScrollListener(object : RecyclerView.OnScrollListener() { + override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { + super.onScrollStateChanged(recyclerView, newState) + if (newState == RecyclerView.SCROLL_STATE_IDLE) { + binding.recyclerView.post { + binding.recyclerView.suppressLayout(false) + } + } else if (newState == RecyclerView.SCROLL_STATE_SETTLING) { + binding.recyclerView.suppressLayout(true) } - } else if (newState == RecyclerView.SCROLL_STATE_SETTLING) { - binding.recyclerView.suppressLayout(true) } - } - }) - manager.setItemOffset(4F.dip2px()) - binding.recyclerView.layoutManager = manager - binding.recyclerView.adapter = adapter - binding.recyclerView.isNestedScrollingEnabled = false + }) + addOnItemTouchListener(object : RecyclerView.SimpleOnItemTouchListener() { + override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean { + val isStop = e.action == MotionEvent.ACTION_DOWN || e.action == MotionEvent.ACTION_MOVE + if (isStop) stopAutoPlay() else startAutoPlay() + return false + } + }) + } + mAdapter?.setGameCollectionList(gameCollectionItemDataList) + startAutoPlay() + } - adapter.setGameCollectionList(gameCollectionItemDataList) + private fun scrollToNextPage() { + mLayoutManager?.run { + binding.recyclerView.smoothScrollToPosition(getFirstVisibleItemPosition() + 1) + } + } + + private fun startAutoPlay() { + if (mAdapter?.itemCount ?: 0 <= 1) return + stopAutoPlay() + mLooperHandle.sendEmptyMessageDelayed(mSlideLooperKey, HOME_GAME_COLLECTION_LOOP_TIME) + } + + private fun stopAutoPlay() { + mLooperHandle.removeMessages(mSlideLooperKey) + } + + companion object { + const val HOME_GAME_COLLECTION_LOOP_TIME = 5000L + } + + class LooperHandle(viewHolder: HomeGameCollectionViewHolder): Handler( + Looper.getMainLooper()) { + private val mWeakReference: WeakReference = WeakReference(viewHolder) + + override fun handleMessage(msg: Message) { + super.handleMessage(msg) + val viewHolder = mWeakReference.get() + if (viewHolder != null && msg.what == viewHolder.mSlideLooperKey) { + viewHolder.scrollToNextPage() + viewHolder.startAutoPlay() + } + } } } \ No newline at end of file From 2938e843f0cc476ed634fa2795b25f0e32e4da74 Mon Sep 17 00:00:00 2001 From: juntao Date: Mon, 9 May 2022 14:15:17 +0800 Subject: [PATCH 04/52] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E4=B8=BA=205.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index cda040ed5b..ce1fce6952 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,8 +7,8 @@ ext { targetSdkVersion = 28 // application info (每个大版本之间的 versionCode 增加 20) - versionCode = 530 - versionName = "5.9.0" + versionCode = 550 + versionName = "5.10.0" applicationId = "com.gh.gamecenter" // AndroidX From 373cec9ff2c3454c6a3696c648ed1411b486f46f Mon Sep 17 00:00:00 2001 From: lyr Date: Mon, 9 May 2022 15:19:42 +0800 Subject: [PATCH 05/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E6=96=B0=E5=88=86?= =?UTF-8?q?=E7=B1=BB2.0=E9=A1=B5=E9=9D=A2)=20https://git.shanqu.cc/halo/an?= =?UTF-8?q?droid/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/view/CategoryFilterView.kt | 12 +++++++++++- .../gamecenter/category2/CategoryDirectoryAdapter.kt | 2 ++ .../gh/gamecenter/category2/CategoryV2Activity.kt | 2 ++ .../com/gh/gamecenter/category2/CategoryV2Adapter.kt | 8 ++++---- .../gh/gamecenter/category2/CategoryV2Fragment.kt | 10 ++++++++++ .../gamecenter/category2/CategoryV2ListFragment.kt | 8 ++++++++ .../gh/gamecenter/category2/SubCategoryAdapter.kt | 8 ++++---- app/src/main/res/layout/category_directory_item.xml | 3 +-- app/src/main/res/layout/fragment_category.xml | 10 +++++----- app/src/main/res/layout/fragment_category_list.xml | 3 +-- app/src/main/res/layout/layout_category_filter.xml | 1 + 11 files changed, 49 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/gh/common/view/CategoryFilterView.kt b/app/src/main/java/com/gh/common/view/CategoryFilterView.kt index 99a00a9f7c..a4aacc4c09 100644 --- a/app/src/main/java/com/gh/common/view/CategoryFilterView.kt +++ b/app/src/main/java/com/gh/common/view/CategoryFilterView.kt @@ -9,11 +9,11 @@ import android.view.ViewGroup import android.widget.LinearLayout import android.widget.PopupWindow import android.widget.TextView +import androidx.annotation.ColorInt import androidx.core.content.ContextCompat import com.gh.common.util.dip2px import com.gh.common.util.toColor import com.gh.gamecenter.R -import com.gh.gamecenter.entity.SidebarsEntity import com.gh.gamecenter.entity.SubjectSettingEntity import com.google.android.flexbox.FlexboxLayout @@ -71,6 +71,16 @@ class CategoryFilterView @JvmOverloads constructor(context: Context, attrs: Attr mSizeTv.text = "全部大小" } + fun setRootBackgroundColor(@ColorInt color: Int) { + findViewById(R.id.config_controller).setBackgroundColor(color) + } + + fun setItemTextColor(@ColorInt color: Int) { + mTypeTv.setTextColor(color) + mCatalogTv.setTextColor(color) + mSizeTv.setTextColor(color) + } + private fun toggleHighlightedTextView(targetTextView: TextView, highlightIt: Boolean) { if (highlightIt) { targetTextView.background = ContextCompat.getDrawable(targetTextView.context, R.drawable.bg_tag_text) diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryDirectoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryDirectoryAdapter.kt index 3a73e156f7..08121e2c56 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryDirectoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryDirectoryAdapter.kt @@ -6,6 +6,7 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import com.gh.base.BaseRecyclerViewHolder import com.gh.common.util.dip2px +import com.gh.common.util.toColor import com.gh.common.view.GridSpacingItemColorDecoration import com.gh.gamecenter.R import com.gh.gamecenter.databinding.CategoryDirectoryItemBinding @@ -40,6 +41,7 @@ class CategoryDirectoryAdapter(context: Context, val entity = mList[position] title.text = entity.name + title.setTextColor(R.color.text_title.toColor(mContext)) subCategoryRv.run { if (adapter is SubCategoryAdapter) { diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt index 5d82f7b5ab..ba46451d1a 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt @@ -24,6 +24,8 @@ class CategoryV2Activity : NormalActivity() { return getTargetIntent(this, CategoryV2Activity::class.java, CategoryV2Fragment::class.java) } + override fun isAutoResetViewBackgroundEnabled() = true + companion object { fun getIntent(context: Context, catalogId: String, catalogTitle: String, entrance: String): Intent { val bundle = Bundle() diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Adapter.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Adapter.kt index 610cd46c6c..678a3fc304 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Adapter.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Adapter.kt @@ -31,12 +31,12 @@ class CategoryV2Adapter( recommendTag.goneIf(!catalogEntity.recommended) if (catalogEntity.name == mViewModel.selectedCategoryName) { selectedTag.visibility = View.VISIBLE - catalogName.setTextColor(R.color.theme_font.toColor()) - root.setBackgroundColor(R.color.white.toColor()) + catalogName.setTextColor(R.color.theme_font.toColor(mContext)) + root.setBackgroundColor(R.color.background_white.toColor(mContext)) } else { selectedTag.visibility = View.GONE - catalogName.setTextColor(R.color.text_title.toColor()) - root.setBackgroundColor(R.color.background.toColor()) + catalogName.setTextColor(R.color.text_title.toColor(mContext)) + root.setBackgroundColor(R.color.background.toColor(mContext)) } root.setOnClickListener { if (catalogEntity.name != mViewModel.selectedCategoryName) { diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt index 3968b40de6..c5f77b4d33 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt @@ -461,4 +461,14 @@ class CategoryV2Fragment : LazyFragment() { requireContext().resources.getDimension(R.dimen.main_bottom_tab_height).toInt() - it.appBarOffset) } } + + override fun onNightModeChange() { + super.onNightModeChange() + mBinding?.categoryRv?.adapter?.run { + notifyItemRangeChanged(0, itemCount) + } + mBinding?.directoryRv?.adapter?.run { + notifyItemRangeChanged(0, itemCount) + } + } } \ No newline at end of file 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 4f0cae0f4c..9ae585c017 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt @@ -315,4 +315,12 @@ class CategoryV2ListFragment : ListFragment fun openDirectoryLayout() { (parentFragment as? CategoryV2Fragment)?.openDirectoryLayout() } + + override fun onNightModeChange() { + super.onNightModeChange() + mBinding?.run { + filterContainer.setRootBackgroundColor(R.color.background_white.toColor(requireContext())) + filterContainer.setItemTextColor(R.color.text_subtitle.toColor(requireContext())) + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt index cff08601e1..a43230ca8f 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt @@ -33,11 +33,11 @@ class SubCategoryAdapter( if (categoryEntity.selected) { selectedIv.visibility = View.VISIBLE container.setBackgroundResource(R.drawable.bg_category_selected) - name.setTextColor(R.color.theme_font.toColor()) + name.setTextColor(R.color.theme_font.toColor(mContext)) } else { selectedIv.visibility = View.GONE container.setBackgroundResource(R.drawable.bg_shape_f8_radius_8) - name.setTextColor(R.color.text_title.toColor()) + name.setTextColor(R.color.text_title.toColor(mContext)) } root.setOnClickListener { @@ -48,7 +48,7 @@ class SubCategoryAdapter( categoryEntity.selected = false selectedIv.visibility = View.GONE container.setBackgroundResource(R.drawable.bg_shape_f8_radius_8) - name.setTextColor(R.color.text_title.toColor()) + name.setTextColor(R.color.text_title.toColor(mContext)) mViewModel.run { if (selectedCount > 0) { selectedCount-- @@ -64,7 +64,7 @@ class SubCategoryAdapter( categoryEntity.primaryIndex = mPrimaryIndex selectedIv.visibility = View.VISIBLE container.setBackgroundResource(R.drawable.bg_category_selected) - name.setTextColor(R.color.theme_font.toColor()) + name.setTextColor(R.color.theme_font.toColor(mContext)) mViewModel.run { if (selectedCount < 5) { selectedCount++ diff --git a/app/src/main/res/layout/category_directory_item.xml b/app/src/main/res/layout/category_directory_item.xml index d60347763c..28b2c792b1 100644 --- a/app/src/main/res/layout/category_directory_item.xml +++ b/app/src/main/res/layout/category_directory_item.xml @@ -22,6 +22,5 @@ android:id="@+id/subCategoryRv" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="12dp" - android:background="@color/white"/> + android:paddingTop="12dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_category.xml b/app/src/main/res/layout/fragment_category.xml index 99b9900d49..fda43337dc 100644 --- a/app/src/main/res/layout/fragment_category.xml +++ b/app/src/main/res/layout/fragment_category.xml @@ -1,10 +1,10 @@ + android:layout_height="match_parent" + android:background="@color/background_white"> + android:layout_height="match_parent" + android:background="@color/background" /> + android:background="@color/background_white"> diff --git a/app/src/main/res/layout/fragment_category_list.xml b/app/src/main/res/layout/fragment_category_list.xml index f0c25eef08..f2981a7a61 100644 --- a/app/src/main/res/layout/fragment_category_list.xml +++ b/app/src/main/res/layout/fragment_category_list.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white"> + android:background="@color/background_white"> Date: Mon, 9 May 2022 15:36:37 +0800 Subject: [PATCH 06/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E6=96=B0=E5=88=86?= =?UTF-8?q?=E7=B1=BB2.0=E9=A1=B5=E9=9D=A2)=20https://git.shanqu.cc/halo/an?= =?UTF-8?q?droid/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/category2/CategoryV2Activity.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt index ba46451d1a..8be2143715 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt @@ -3,17 +3,17 @@ package com.gh.gamecenter.category2 import android.content.Context import android.content.Intent import android.os.Bundle -import android.view.MenuItem import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R -import com.gh.gamecenter.SearchActivity class CategoryV2Activity : NormalActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setToolbarMenu(R.menu.menu_search) + updateStatusBarColor(R.color.black, R.color.white) } override fun showDownloadMenu(): Boolean { @@ -26,6 +26,11 @@ class CategoryV2Activity : NormalActivity() { override fun isAutoResetViewBackgroundEnabled() = true + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { fun getIntent(context: Context, catalogId: String, catalogTitle: String, entrance: String): Intent { val bundle = Bundle() From 7bd779b8e3313485a236873154f13bbc874f7c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Mon, 9 May 2022 17:31:02 +0800 Subject: [PATCH 07/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=E5=B8=96=E5=AD=90=E9=83=A8=E5=88=86)=20https://git.shanqu.cc/h?= =?UTF-8?q?alo/android/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/base/BaseRichEditorActivity.kt | 9 ++++ .../collection/GamesCollectionFragment.kt | 7 ++- .../gh/gamecenter/collection/VideoFragment.kt | 9 ++++ .../detail/ForumArticleAskListFragment.kt | 6 +-- .../forum/moderator/ModeratorListActivity.kt | 2 +- .../PersonalityBackgroundActivity.kt | 1 + .../personalhome/fans/FansActivity.kt | 5 ++ .../followers/FollowersActivity.kt | 5 ++ .../personalhome/rating/RatingActivity.kt | 1 + .../qa/answer/detail/AnswerDetailFragment.kt | 2 +- .../detail/SimpleAnswerDetailActivity.kt | 14 +++++ .../qa/article/MyArticleFragment.kt | 31 ++++++----- .../article/detail/ArticleDetailActivity.kt | 18 +++++-- .../detail/ArticleDetailContentViewHolder.kt | 3 +- .../article/detail/ArticleDetailFragment.kt | 5 ++ .../qa/article/draft/ArticleDraftActivity.kt | 16 ++++++ .../qa/article/draft/ArticleDraftFragment.kt | 53 +++++++++++-------- .../qa/article/edit/ArticleEditActivity.kt | 1 + .../qa/dialog/ChooseForumActivity.kt | 23 +++++--- .../qa/draft/CommunityDraftWrapperActivity.kt | 10 ++++ .../gh/gamecenter/qa/editor/AnswerFragment.kt | 11 ++++ .../gamecenter/qa/editor/ArticleFragment.kt | 10 +++- .../gh/gamecenter/qa/editor/GameActivity.kt | 14 +++++ .../gh/gamecenter/qa/editor/GameFragment.kt | 10 ++++ .../qa/editor/InsertAnswerWrapperActivity.kt | 13 +++++ .../qa/editor/InsertArticleWrapperActivity.kt | 11 ++++ .../InsertGameCollectionWrapperActivity.kt | 15 ++++++ .../qa/editor/InsertVideoWrapperActivity.kt | 14 +++++ .../qa/editor/LocalMediaActivity.kt | 8 +++ .../qa/editor/VideoAlbumsSpanner.kt | 8 +-- .../gamecenter/qa/myqa/MyAnswerFragment.java | 14 +++-- .../gh/gamecenter/qa/myqa/MyAskActivity.java | 19 +++++++ .../questions/draft/QuestionDraftActivity.kt | 14 +++++ .../questions/draft/QuestionDraftFragment.kt | 10 +++- .../invite/QuestionsInviteActivity.java | 13 +++++ .../newdetail/NewQuestionDetailActivity.kt | 8 +++ .../QuestionDetailContentViewHolder.kt | 1 + .../video/detail/ForumVideoDetailActivity.kt | 13 +++-- .../qa/video/publish/VideoPublishActivity.kt | 8 +++ .../video/videomanager/VideoDraftActivity.kt | 9 ++++ .../video/videomanager/VideoDraftFragment.kt | 8 +++ .../bg_shape_white_editor_label_left.xml | 2 +- .../bg_shape_white_editor_label_right.xml | 2 +- .../res/drawable/bg_shape_white_radius_1.xml | 2 +- .../drawable/divider_item_line_space_20.xml | 2 +- .../activity_community_article_edit.xml | 2 +- .../layout/activity_editor_insert_game.xml | 5 +- .../res/layout/activity_questions_edit.xml | 4 +- .../activity_tablayout_no_title_viewpager.xml | 2 +- .../main/res/layout/dialog_choose_forum.xml | 2 +- .../res/layout/editor_insert_container.xml | 2 +- .../main/res/layout/forum_top_link_item.xml | 1 - .../res/layout/fragment_answer_detail.xml | 5 +- .../fragment_answer_detail_skeleton.xml | 7 +-- .../res/layout/fragment_article_detail.xml | 4 +- .../fragment_article_detail_skeleton.xml | 3 +- .../layout/fragment_forum_video_detail.xml | 6 +-- app/src/main/res/layout/fragment_invite.xml | 3 +- .../main/res/layout/fragment_local_media.xml | 2 +- .../layout/fragment_video_comment_list.xml | 5 +- .../res/layout/fragment_video_publish.xml | 4 +- .../item_article_detail_comment_footer.xml | 3 +- .../layout/item_article_detail_content.xml | 2 +- app/src/main/res/layout/item_forum_video.xml | 2 +- .../main/res/layout/item_video_desc_top.xml | 4 +- .../layout/piece_article_input_container.xml | 2 +- .../main/res/layout/questionsinvite_item.xml | 2 +- .../main/res/layout/share_popup_layout.xml | 2 +- app/src/main/res/layout/video_albums_item.xml | 2 +- 69 files changed, 429 insertions(+), 107 deletions(-) diff --git a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt index 95d1315fa4..a4f522c2c4 100644 --- a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt +++ b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt @@ -205,6 +205,7 @@ abstract class BaseRichEditorActivity : ToolBarAct mViewModel.setUploadVideoListener(this) mKeyboardHeightProvider = KeyboardHeightProvider(this) mRichEditor.post { mKeyboardHeightProvider?.start() } + mRichEditor.enableForceDark(NightModeUtils.isNightMode(this)) // 防止个别手机在Js里无法获取粘贴内容 mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener") mRichEditor.addJavascriptInterface(OnCursorChangeListener(), "OnCursorChangeListener") @@ -735,6 +736,14 @@ abstract class BaseRichEditorActivity : ToolBarAct abstract fun provideViewModel(): VM abstract fun getVideoGuideKey(): String + override fun isAutoResetViewBackgroundEnabled(): Boolean =true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + mRichEditor.enableForceDark(NightModeUtils.isNightMode(this)) + } + companion object { const val ELEMENT_NAME_BOLD = " b " const val ELEMENT_NAME_ITALIC = " i " diff --git a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionFragment.kt b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionFragment.kt index 16c4e4022a..d10457985e 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionFragment.kt @@ -46,7 +46,7 @@ class GamesCollectionFragment : ListFragment 0) { + removeItemDecorationAt(0) + addItemDecoration(itemDecoration) + } } } + companion object { const val TYPE_HISTORY = "history" const val TYPE_COLLECT = "collect" diff --git a/app/src/main/java/com/gh/gamecenter/collection/VideoFragment.kt b/app/src/main/java/com/gh/gamecenter/collection/VideoFragment.kt index b4657b3779..4103ab5759 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/VideoFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/VideoFragment.kt @@ -71,4 +71,13 @@ class VideoFragment : ListFragment(), IBatchDelet override fun toString() = value } + + override fun onNightModeChange() { + super.onNightModeChange() + if ((mListRv?.itemDecorationCount ?: 0) > 0) { + mListRv?.removeItemDecorationAt(0) + mListRv?.addItemDecoration(itemDecoration) + } + } + } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt index 0671bdd89d..ac32afb208 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt @@ -66,10 +66,10 @@ class ForumArticleAskListFragment : LazyListFragment>() { } else { setNavigationTitle("Ta的评分") } + updateStatusBarColor(R.color.black, R.color.white) } override fun provideListAdapter(): RatingAdapter { diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt index cc64d78724..4a1aee74f3 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt @@ -101,7 +101,7 @@ open class AnswerDetailFragment : NormalFragment() { mSpecialColumn = it.getParcelable(EntranceUtils.KEY_DATA) mViewModel.getAnswerDetail(mAnswerId, mEntrance) } - + mBinding.richEditor.enableForceDark(NightModeUtils.isNightMode(requireContext())) mBinding.richEditor.setInputEnabled(false) mBinding.richEditor.setPadding(20, 15, 20, 15) mBinding.bottomController.replyTv.text = "说点什么吧" diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt index 5c06d50528..060e7c4325 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt @@ -5,10 +5,17 @@ import android.content.Intent import android.os.Bundle import com.gh.base.BaseActivity import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.R class SimpleAnswerDetailActivity : NormalActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) + } + override fun provideNormalIntent(): Intent? { return getTargetIntent( this, @@ -17,6 +24,13 @@ class SimpleAnswerDetailActivity : NormalActivity() { ) } + override fun isAutoResetViewBackgroundEnabled(): Boolean =true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { @JvmStatic fun getIntent(context: Context, answerId: String, entrance: String, path: String): Intent { 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 2f6c3c986e..b63262bd11 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 @@ -41,15 +41,13 @@ class MyArticleFragment : ListFragment>? { return RetrofitManager.getInstance().api.getMyArticleAndQuestion(mTargetUserId, page) - .flatMap(object :Function, Observable>>{ - override fun apply(list: List): Observable> { - return Observable.create { emitter-> - val articleList = list.map { it.transformArticleEntity() }.toMutableList() - emitter.onNext(articleList) - emitter.onComplete() - } - } - }) + .flatMap { list -> + Observable.create { emitter -> + val articleList = list.map { it.transformArticleEntity() }.toMutableList() + emitter.onNext(articleList) + emitter.onComplete() + } + } } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { @@ -80,7 +78,7 @@ class MyArticleFragment : ListFragment 0) { + mListRv.removeItemDecorationAt(0) + mListRv.addItemDecoration(itemDecoration) + } + } + companion object { @JvmStatic fun getInstance(entrance: String?, userId: String): MyArticleFragment { diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt index 7c36df7aea..8c23ba4b48 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt @@ -3,8 +3,7 @@ package com.gh.gamecenter.qa.article.detail import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils +import com.gh.common.util.* import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R import com.gh.gamecenter.entity.CommunityEntity @@ -21,7 +20,7 @@ class ArticleDetailActivity : NormalActivity() { // TODO 让状态栏透明 // DisplayUtils.transparentStatusBar(this) - DisplayUtils.setLightStatusBar(this, true) + updateStatusBarColor(R.color.black, R.color.white) } override fun provideNormalIntent(): Intent { @@ -30,10 +29,19 @@ class ArticleDetailActivity : NormalActivity() { override fun getBusinessId(): Pair { return Pair( - targetFragment.arguments?.getString(EntranceUtils.KEY_COMMUNITY_ARTICLE_ID) ?: "", - targetFragment.arguments?.getParcelable(EntranceUtils.KEY_COMMUNITY_DATA)?.id ?: "") + targetFragment.arguments?.getString(EntranceUtils.KEY_COMMUNITY_ARTICLE_ID) ?: "", + targetFragment.arguments?.getParcelable(EntranceUtils.KEY_COMMUNITY_DATA)?.id ?: "" + ) } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + + companion object { const val ARTICLE_PATCH_REQUEST = 123 diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt index f1bb40387d..642e940b66 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt @@ -31,6 +31,7 @@ class ArticleDetailContentViewHolder( @SuppressLint("AddJavascriptInterface") fun bindView(article: ArticleDetailEntity) { binding.run { + richEditor.enableForceDark(NightModeUtils.isNightMode(binding.root.context)) richEditor.setInputEnabled(false) richEditor.setPadding(16, 4, 16, 4) richEditor.addJavascriptInterface(JsInterface(article.status ?: ""), "imagelistener") @@ -134,7 +135,7 @@ class ArticleDetailContentViewHolder( ) } labelIv.goneIf(article.getSimplifyChoicenessStatus() != "pass") - if (article.getSimplifyChoicenessStatus() == "pass"){ + if (article.getSimplifyChoicenessStatus() == "pass") { labelIv.setImageDrawable(R.drawable.ic_essence_label.toDrawable()) } titleTv.text = article.title diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt index 682f91fb70..bb2b670aa9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt @@ -953,4 +953,9 @@ class ArticleDetailFragment : BaseCommentFragment() { - override fun onResponse(response: ResponseBody?) { - val index = mAdapter?.entityList?.indexOf(entity) ?: -1 - if (index >= 0) { - mAdapter?.entityList?.remove(entity) - if (mAdapter?.entityList.isNullOrEmpty()) { - mListViewModel.load(LoadType.REFRESH) - } else { - mAdapter?.notifyItemRemoved(index) - } + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(object : Response() { + override fun onResponse(response: ResponseBody?) { + val index = mAdapter?.entityList?.indexOf(entity) ?: -1 + if (index >= 0) { + mAdapter?.entityList?.remove(entity) + if (mAdapter?.entityList.isNullOrEmpty()) { + mListViewModel.load(LoadType.REFRESH) + } else { + mAdapter?.notifyItemRemoved(index) } } + } - override fun onFailure(e: HttpException?) { - toast(R.string.post_failure_hint) - } - }) + override fun onFailure(e: HttpException?) { + toast(R.string.post_failure_hint) + } + }) } @Subscribe(threadMode = ThreadMode.MAIN) @@ -129,4 +128,12 @@ class ArticleDraftFragment : ListFragment 0) { + mListRv?.removeItemDecorationAt(0) + mListRv?.addItemDecoration(itemDecoration) + } + } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt index 749e555c07..59f5bc4028 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt @@ -19,6 +19,7 @@ import com.gh.base.fragment.WaitingDialogFragment import com.gh.common.AppExecutor import com.gh.common.constant.Constants import com.gh.common.util.* +import com.gh.common.util.NightModeUtils.isNightMode import com.gh.gamecenter.R import com.gh.gamecenter.databinding.ActivityCommunityArticleEditBinding import com.gh.gamecenter.entity.ActivityLabelEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt index ceab2aae64..0845fe8a93 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt @@ -85,9 +85,14 @@ class ChooseForumActivity : BaseActivity() { if (mSearchResultFragment == null || mSearchResultFragment?.isAdded == false) { val beginTransaction = supportFragmentManager.beginTransaction() - mSearchResultFragment = supportFragmentManager.findFragmentByTag(ChooseForumContainerFragment::class.java.simpleName) as? ChooseForumContainerFragment + mSearchResultFragment = + supportFragmentManager.findFragmentByTag(ChooseForumContainerFragment::class.java.simpleName) as? ChooseForumContainerFragment ?: ChooseForumContainerFragment.getInstance(ChooseForumContainerFragment.ChooseForumType.SEARCH) as ChooseForumContainerFragment - beginTransaction.replace(binding.searchResultContainer.id, mSearchResultFragment!!, ChooseForumContainerFragment::class.java.simpleName) + beginTransaction.replace( + binding.searchResultContainer.id, + mSearchResultFragment!!, + ChooseForumContainerFragment::class.java.simpleName + ) beginTransaction.commitAllowingStateLoss() } } else { @@ -113,14 +118,16 @@ class ChooseForumActivity : BaseActivity() { overridePendingTransition(0, 0) binding.maskView.animate().alpha(0f).setDuration(300).start() binding.forumContainer.animate() - .translationY(DisplayUtils.getScreenHeight().toFloat()) - .setDuration(300) - .doOnEnd { - super.finish() - } - .start() + .translationY(DisplayUtils.getScreenHeight().toFloat()) + .setDuration(300) + .doOnEnd { + super.finish() + } + .start() } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + companion object { const val CHOOSE_FORUM_REQUEST = 10 diff --git a/app/src/main/java/com/gh/gamecenter/qa/draft/CommunityDraftWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/draft/CommunityDraftWrapperActivity.kt index 74272d938f..2cde1a9f42 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/draft/CommunityDraftWrapperActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/draft/CommunityDraftWrapperActivity.kt @@ -5,6 +5,8 @@ import android.content.Intent import android.os.Bundle import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout +import com.gh.common.util.updateStatusBarColor +import com.gh.gamecenter.R import com.gh.gamecenter.qa.article.draft.ArticleDraftFragment import com.gh.gamecenter.qa.questions.draft.QuestionDraftFragment import com.gh.gamecenter.video.videomanager.VideoDraftFragment @@ -14,6 +16,7 @@ class CommunityDraftWrapperActivity : BaseActivity_TabLayout() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle("我的草稿") + updateStatusBarColor(R.color.black, R.color.white) } override fun initFragmentList(fragments: MutableList) { @@ -28,6 +31,13 @@ class CommunityDraftWrapperActivity : BaseActivity_TabLayout() { tabTitleList.add("视频草稿") } + override fun isAutoResetViewBackgroundEnabled(): Boolean =true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { @JvmStatic fun getIntent(context: Context): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerFragment.kt index 165647890b..fd956309ff 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerFragment.kt @@ -35,4 +35,15 @@ class AnswerFragment : ListFragment() { return itemDecoration } + + override fun onNightModeChange() { + super.onNightModeChange() + if ((mListRv?.itemDecorationCount ?: 0) > 0) { + mListRv?.removeItemDecorationAt(0) + itemDecoration?.let { + mListRv?.addItemDecoration(it) + } + } + } + } diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleFragment.kt index 5fc9acc787..275b2cdea0 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleFragment.kt @@ -28,10 +28,18 @@ class ArticleFragment : ListFragment() { return mAdapter!! } - override fun getItemDecoration(): RecyclerView.ItemDecoration? { + override fun getItemDecoration(): RecyclerView.ItemDecoration { val insetDivider = ContextCompat.getDrawable(requireContext(), R.drawable.divider_item_line_space_20) val itemDecoration = CustomDividerItemDecoration(requireContext(), notDecorateTheLastItem = true) itemDecoration.setDrawable(insetDivider!!) return itemDecoration } + + override fun onNightModeChange() { + super.onNightModeChange() + if ((mListRv?.itemDecorationCount ?: 0) > 0) { + mListRv?.removeItemDecorationAt(0) + mListRv?.addItemDecoration(itemDecoration) + } + } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt index bddaa7d784..b22c736efe 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt @@ -2,16 +2,30 @@ package com.gh.gamecenter.qa.editor import android.content.Context import android.content.Intent +import android.os.Bundle import androidx.core.os.bundleOf import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.R class GameActivity : NormalActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) + } override fun provideNormalIntent(): Intent { return getTargetIntent(this, GameActivity::class.java, GameFragment::class.java) } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { fun getIntent(context: Context, title: String): Intent { val bundle = bundleOf( 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 a2ec7f0ef8..021e7c9794 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 @@ -211,4 +211,14 @@ open class GameFragment : ListFragment 0) { + mListRv?.removeItemDecorationAt(0) + itemDecoration?.let { + mListRv?.addItemDecoration(it) + } + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertAnswerWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertAnswerWrapperActivity.kt index 05ebef7ec4..b6e52cf344 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertAnswerWrapperActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertAnswerWrapperActivity.kt @@ -6,10 +6,16 @@ import android.os.Bundle import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.R class InsertAnswerWrapperActivity : BaseActivity_TabLayout() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) + } + override fun getLayoutId(): Int = R.layout.activity_tablayout_no_title_viewpager override fun initFragmentList(fragments: MutableList?) { @@ -22,6 +28,13 @@ class InsertAnswerWrapperActivity : BaseActivity_TabLayout() { tabTitleList?.add("收藏回答") } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { const val KEY_ANSWER_TYPE = "AnswerType" diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertArticleWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertArticleWrapperActivity.kt index 44cfdce631..4e32cc88b5 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertArticleWrapperActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertArticleWrapperActivity.kt @@ -6,10 +6,15 @@ import android.os.Bundle import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.R class InsertArticleWrapperActivity : BaseActivity_TabLayout() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) + } override fun getLayoutId(): Int = R.layout.activity_tablayout_no_title_viewpager override fun initFragmentList(fragments: MutableList?) { @@ -22,6 +27,12 @@ class InsertArticleWrapperActivity : BaseActivity_TabLayout() { tabTitleList?.add("收藏帖子") } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } companion object { const val KEY_ARTICLE_TYPE = "ArticleType" diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertGameCollectionWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertGameCollectionWrapperActivity.kt index 0baf3555ef..f7867468b3 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertGameCollectionWrapperActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertGameCollectionWrapperActivity.kt @@ -2,16 +2,23 @@ package com.gh.gamecenter.qa.editor import android.content.Context import android.content.Intent +import android.os.Bundle import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.R import com.gh.gamecenter.collection.GamesCollectionFragment import com.gh.gamecenter.manager.UserManager class InsertGameCollectionWrapperActivity : BaseActivity_TabLayout() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) + } + override fun getLayoutId(): Int = R.layout.activity_tablayout_no_title_viewpager override fun initFragmentList(fragments: MutableList?) { @@ -40,6 +47,14 @@ class InsertGameCollectionWrapperActivity : BaseActivity_TabLayout() { tabTitleList?.add("收藏游戏单") } + + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { fun getIntent(context: Context): Intent { return Intent(context, InsertGameCollectionWrapperActivity::class.java) diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertVideoWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertVideoWrapperActivity.kt index aab641d485..94845db7ff 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertVideoWrapperActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertVideoWrapperActivity.kt @@ -2,15 +2,22 @@ package com.gh.gamecenter.qa.editor import android.content.Context import android.content.Intent +import android.os.Bundle import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.R import com.gh.gamecenter.collection.VideoFragment class InsertVideoWrapperActivity : BaseActivity_TabLayout() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) + } + override fun getLayoutId(): Int = R.layout.activity_tablayout_no_title_viewpager override fun initFragmentList(fragments: MutableList?) { @@ -37,6 +44,13 @@ class InsertVideoWrapperActivity : BaseActivity_TabLayout() { tabTitleList?.add("收藏视频帖") } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { fun getIntent(context: Context): Intent { return Intent(context, InsertVideoWrapperActivity::class.java) diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaActivity.kt index 6f98c70ff3..88048cca63 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaActivity.kt @@ -11,6 +11,7 @@ import android.widget.PopupWindow import androidx.core.content.ContextCompat import com.gh.base.ToolBarActivity import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.R import com.halo.assistant.HaloApp import com.zhihu.matisse.Matisse @@ -114,6 +115,13 @@ class LocalMediaActivity : ToolBarActivity(), AlbumCollection.AlbumCallbacks { arrowIv?.setImageDrawable(drawable) } + override fun isAutoResetViewBackgroundEnabled(): Boolean =true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { fun getIntent(context: Context, chooseType: ChooseType, maxChooseCount: Int = 1, entrance: String): Intent { return Intent(context, LocalMediaActivity::class.java).apply { diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAlbumsSpanner.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAlbumsSpanner.kt index 132356a44b..2692c9a945 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAlbumsSpanner.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAlbumsSpanner.kt @@ -1,11 +1,13 @@ package com.gh.gamecenter.qa.editor -import android.animation.ValueAnimator import android.content.Context import android.graphics.drawable.ColorDrawable import android.view.View import android.view.ViewGroup -import android.widget.* +import android.widget.AdapterView +import android.widget.CursorAdapter +import android.widget.FrameLayout +import android.widget.PopupWindow import androidx.appcompat.widget.ListPopupWindow import androidx.core.content.ContextCompat import com.gh.common.util.dip2px @@ -51,7 +53,7 @@ class VideoAlbumsSpanner(val context: Context) { val containerView = mListPopupWindow.listView as? ViewGroup val params = containerView?.layoutParams as ViewGroup.LayoutParams params.height = 280f.dip2px() - containerView.background = ColorDrawable(ContextCompat.getColor(context, R.color.white)) + containerView.background = ColorDrawable(ContextCompat.getColor(context, R.color.background_white)) containerView.layoutParams = params val parentContainer = containerView.parent as FrameLayout 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 2044714896..bda62969f9 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 @@ -4,7 +4,6 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.View; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; @@ -22,8 +21,6 @@ import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; import com.lightgame.utils.Utils; -import org.jetbrains.annotations.NotNull; - import java.util.List; import io.reactivex.Observable; @@ -58,7 +55,7 @@ public class MyAnswerFragment extends ListFragment 0) { + mListRv.removeItemDecorationAt(0); + mListRv.addItemDecoration(getItemDecoration()); + } + } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskActivity.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskActivity.java index 8e4c651ccf..5fa1f06d4f 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskActivity.java +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.os.Bundle; import com.gh.common.util.EntranceUtils; +import com.gh.common.util.ExtensionsKt; import com.gh.gamecenter.NormalActivity; +import com.gh.gamecenter.R; /** * Created by khy on 10/04/18. @@ -13,6 +15,23 @@ import com.gh.gamecenter.NormalActivity; public class MyAskActivity extends NormalActivity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + ExtensionsKt.updateStatusBarColor(this, R.color.black, R.color.white); + } + + @Override + protected boolean isAutoResetViewBackgroundEnabled() { + return true; + } + + @Override + protected void onNightModeChange() { + super.onNightModeChange(); + ExtensionsKt.updateStatusBarColor(this, R.color.black, R.color.white); + } + public static Intent getIntent(Context context) { Bundle bundle = new Bundle(); bundle.putString(EntranceUtils.KEY_ENTRANCE, "(我的光环)+(我的问答)"); diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftActivity.kt index 349eee17ab..d2c1ae211e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftActivity.kt @@ -4,10 +4,24 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.R class QuestionDraftActivity : NormalActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) + } + + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { fun getIntent(context: Context): Intent { val bundle = Bundle() diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftFragment.kt index 1921561f7a..59b8960ecd 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftFragment.kt @@ -78,7 +78,7 @@ class QuestionDraftFragment : ListFragment 0) { + mListRv?.removeItemDecorationAt(0) + mListRv?.addItemDecoration(itemDecoration) + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteActivity.java b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteActivity.java index 80fdbe2bef..ae356402a8 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.os.Bundle; import com.gh.common.util.EntranceUtils; +import com.gh.common.util.ExtensionsKt; import com.gh.gamecenter.NormalActivity; +import com.gh.gamecenter.R; import com.gh.gamecenter.qa.entity.QuestionsDetailEntity; /** @@ -14,6 +16,17 @@ import com.gh.gamecenter.qa.entity.QuestionsDetailEntity; public class QuestionsInviteActivity extends NormalActivity { + @Override + protected boolean isAutoResetViewBackgroundEnabled() { + return true; + } + + @Override + protected void onNightModeChange() { + super.onNightModeChange(); + ExtensionsKt.updateStatusBarColor(this, R.color.black, R.color.white); + } + public static Intent getIntent(Context context, QuestionsDetailEntity entity, String entrance) { Bundle bundle = new Bundle(); bundle.putParcelable(QuestionsDetailEntity.class.getSimpleName(), entity); diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt index bcff3faa07..887896aa58 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt @@ -5,6 +5,7 @@ import android.content.Intent import android.os.Bundle import com.gh.common.util.DisplayUtils import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R import com.gh.gamecenter.entity.CommunityEntity @@ -35,6 +36,13 @@ class NewQuestionDetailActivity : NormalActivity() { ?: "") } + override fun isAutoResetViewBackgroundEnabled(): Boolean =true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { @JvmStatic fun getIntent( diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt index cd46a19148..47fc9798ff 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt @@ -32,6 +32,7 @@ class QuestionDetailContentViewHolder( fun bindView(question: QuestionsDetailEntity) { binding.run { richEditor.setInputEnabled(false) + richEditor.enableForceDark(NightModeUtils.isNightMode(binding.root.context)) richEditor.setPadding(16, 4, 16, 4) richEditor.addJavascriptInterface(JsInterface(question.status), "imagelistener") richEditor.addJavascriptInterface( diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt index dee4cfa70f..8bc2adbc18 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt @@ -8,6 +8,7 @@ import com.gh.base.BaseActivity import com.gh.base.fragment.BaseFragment_TabLayout.PAGE_INDEX import com.gh.common.util.DisplayUtils import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.R import com.gh.gamecenter.normal.NormalFragment @@ -23,19 +24,23 @@ class ForumVideoDetailActivity : BaseActivity() { DisplayUtils.transparentStatusBar(this) containerFragment = supportFragmentManager.findFragmentByTag(ForumVideoDetailFragment::class.java.simpleName) - ?: ForumVideoDetailFragment().with(intent.extras) + ?: ForumVideoDetailFragment().with(intent.extras) // 若 placeholder 外层为 RelativeLayout 的话，会出现莫名的偏移 - supportFragmentManager.beginTransaction().replace(R.id.placeholder, containerFragment!!, ForumVideoDetailFragment::class.java.simpleName).commitAllowingStateLoss() + supportFragmentManager.beginTransaction().replace(R.id.placeholder, containerFragment!!, ForumVideoDetailFragment::class.java.simpleName) + .commitAllowingStateLoss() } override fun onBackPressed() { if (containerFragment is NormalFragment - && (containerFragment as NormalFragment).isAdded - && !(containerFragment as NormalFragment).onBackPressed()) { + && (containerFragment as NormalFragment).isAdded + && !(containerFragment as NormalFragment).onBackPressed() + ) { super.onBackPressed() } } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + companion object { const val VIDEO_PATCH_REQUEST = 100 diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt index 274def7c51..32ba678a26 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt @@ -6,6 +6,7 @@ import android.os.Bundle import android.view.View import com.gh.base.ToolBarActivity import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R import com.gh.gamecenter.entity.* @@ -20,6 +21,13 @@ class VideoPublishActivity : NormalActivity() { findViewById(R.id.backBtn).setOnClickListener { onBackPressed() } } + override fun isAutoResetViewBackgroundEnabled(): Boolean =true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { @JvmStatic diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt index 91d2406bf3..23fd25161c 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt @@ -3,15 +3,24 @@ package com.gh.gamecenter.video.videomanager import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.R class VideoDraftActivity : NormalActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle("视频草稿") + updateStatusBarColor(R.color.black, R.color.white) } + override fun isAutoResetViewBackgroundEnabled(): Boolean =true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } companion object { fun getIntent(context: Context): Intent { return getTargetIntent(context, VideoDraftActivity::class.java, VideoDraftFragment::class.java) diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftFragment.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftFragment.kt index 4b47adce31..838663975d 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftFragment.kt @@ -58,4 +58,12 @@ class VideoDraftFragment : ListFragment() super.onViewCreated(view, savedInstanceState) mListRv.layoutManager = FixLinearLayoutManager(requireContext()) } + + override fun onNightModeChange() { + super.onNightModeChange() + if ((mListRv?.itemDecorationCount ?: 0) > 0) { + mListRv?.removeItemDecorationAt(0) + mListRv?.addItemDecoration(itemDecoration) + } + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_white_editor_label_left.xml b/app/src/main/res/drawable/bg_shape_white_editor_label_left.xml index b439e68e0c..f3020b4bab 100644 --- a/app/src/main/res/drawable/bg_shape_white_editor_label_left.xml +++ b/app/src/main/res/drawable/bg_shape_white_editor_label_left.xml @@ -9,5 +9,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_white_editor_label_right.xml b/app/src/main/res/drawable/bg_shape_white_editor_label_right.xml index 7387725fd5..013c1d07a2 100644 --- a/app/src/main/res/drawable/bg_shape_white_editor_label_right.xml +++ b/app/src/main/res/drawable/bg_shape_white_editor_label_right.xml @@ -6,7 +6,7 @@ android:bottomRightRadius="4dp" android:topLeftRadius="1dp" android:topRightRadius="4dp" /> - + diff --git a/app/src/main/res/drawable/bg_shape_white_radius_1.xml b/app/src/main/res/drawable/bg_shape_white_radius_1.xml index dc14a42ce6..f5011d2552 100644 --- a/app/src/main/res/drawable/bg_shape_white_radius_1.xml +++ b/app/src/main/res/drawable/bg_shape_white_radius_1.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/divider_item_line_space_20.xml b/app/src/main/res/drawable/divider_item_line_space_20.xml index 50d9e9e25b..e657b1334b 100644 --- a/app/src/main/res/drawable/divider_item_line_space_20.xml +++ b/app/src/main/res/drawable/divider_item_line_space_20.xml @@ -3,7 +3,7 @@ - + diff --git a/app/src/main/res/layout/activity_community_article_edit.xml b/app/src/main/res/layout/activity_community_article_edit.xml index d046b441d0..84c6e67d18 100644 --- a/app/src/main/res/layout/activity_community_article_edit.xml +++ b/app/src/main/res/layout/activity_community_article_edit.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" + android:background="@color/background_white" android:focusable="true" android:focusableInTouchMode="true" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_editor_insert_game.xml b/app/src/main/res/layout/activity_editor_insert_game.xml index d853d68753..a9f27e976f 100644 --- a/app/src/main/res/layout/activity_editor_insert_game.xml +++ b/app/src/main/res/layout/activity_editor_insert_game.xml @@ -3,6 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/background" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_questions_edit.xml b/app/src/main/res/layout/activity_questions_edit.xml index e71f854aea..c32d56b1fd 100644 --- a/app/src/main/res/layout/activity_questions_edit.xml +++ b/app/src/main/res/layout/activity_questions_edit.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" + android:background="@color/background_white" android:focusable="true" android:focusableInTouchMode="true" android:orientation="vertical"> @@ -164,7 +164,7 @@ android:layout_width="match_parent" android:layout_height="44dp" android:layout_above="@+id/editor_insert_container" - android:background="@color/white"> + android:background="@color/background_white"> + android:background="@color/background_white"> diff --git a/app/src/main/res/layout/editor_insert_container.xml b/app/src/main/res/layout/editor_insert_container.xml index 6f0da6899e..d24e8d6f28 100644 --- a/app/src/main/res/layout/editor_insert_container.xml +++ b/app/src/main/res/layout/editor_insert_container.xml @@ -11,7 +11,7 @@ android:id="@+id/editor_insert_container" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@color/background_white" android:gravity="center_vertical" android:orientation="horizontal"> diff --git a/app/src/main/res/layout/forum_top_link_item.xml b/app/src/main/res/layout/forum_top_link_item.xml index d97b9c0e03..595fda27c4 100644 --- a/app/src/main/res/layout/forum_top_link_item.xml +++ b/app/src/main/res/layout/forum_top_link_item.xml @@ -13,7 +13,6 @@ android:gravity="center" android:textSize="10sp" android:textColor="@color/text_white" - android:background="@color/theme" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@+id/linkNameTv" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/fragment_answer_detail.xml b/app/src/main/res/layout/fragment_answer_detail.xml index 82bebd227f..cf28cad55c 100644 --- a/app/src/main/res/layout/fragment_answer_detail.xml +++ b/app/src/main/res/layout/fragment_answer_detail.xml @@ -3,7 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:background="@color/background"> + android:layout_height="match_parent" + android:background="@color/background"> + android:background="@color/background_white"> + android:background="@color/background_white"> + android:layout_height="match_parent" + android:background="@color/background"> + android:background="@color/background_white" /> diff --git a/app/src/main/res/layout/fragment_local_media.xml b/app/src/main/res/layout/fragment_local_media.xml index 171cd4f220..8edafdd1e3 100644 --- a/app/src/main/res/layout/fragment_local_media.xml +++ b/app/src/main/res/layout/fragment_local_media.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" + android:background="@color/background_white" android:orientation="vertical"> + android:background="@color/background_white" /> @@ -71,6 +71,7 @@ android:id="@+id/list_rv" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/background" android:paddingBottom="56dp" /> diff --git a/app/src/main/res/layout/fragment_video_publish.xml b/app/src/main/res/layout/fragment_video_publish.xml index 7ee88a0e0f..9d069d1b88 100644 --- a/app/src/main/res/layout/fragment_video_publish.xml +++ b/app/src/main/res/layout/fragment_video_publish.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="@color/white"> + android:background="@color/background_white"> + android:layout_height="wrap_content" + android:background="@color/background"> @@ -238,7 +238,7 @@ android:layout_height="1dp" android:layout_marginTop="20dp" android:layout_marginBottom="4dp" - android:background="@color/F4F5F6" + android:background="@color/divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/piece_article_input_container.xml b/app/src/main/res/layout/piece_article_input_container.xml index b97a59d6b2..f515f2a7f8 100644 --- a/app/src/main/res/layout/piece_article_input_container.xml +++ b/app/src/main/res/layout/piece_article_input_container.xml @@ -17,7 +17,7 @@ android:layout_height="32dp" android:layout_marginLeft="16dp" android:layout_marginRight="28dp" - android:background="@color/background" + android:background="@drawable/bg_shape_f5_radius_999" android:gravity="center_vertical" android:includeFontPadding="false" android:maxLines="1" diff --git a/app/src/main/res/layout/questionsinvite_item.xml b/app/src/main/res/layout/questionsinvite_item.xml index d6a5b0280a..e0a2c7d2c2 100644 --- a/app/src/main/res/layout/questionsinvite_item.xml +++ b/app/src/main/res/layout/questionsinvite_item.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@color/background_white" android:paddingLeft="20dp" android:paddingTop="15dp" android:paddingRight="20dp" diff --git a/app/src/main/res/layout/share_popup_layout.xml b/app/src/main/res/layout/share_popup_layout.xml index 4b60ed7e99..289c9e42ed 100644 --- a/app/src/main/res/layout/share_popup_layout.xml +++ b/app/src/main/res/layout/share_popup_layout.xml @@ -12,6 +12,6 @@ android:layout_alignParentBottom = "true" android:layout_alignParentLeft = "true" android:layout_alignParentStart = "true" - android:background = "@color/white" /> + android:background = "@color/background_white" /> \ No newline at end of file diff --git a/app/src/main/res/layout/video_albums_item.xml b/app/src/main/res/layout/video_albums_item.xml index 4c7a20ccbe..edc4d56102 100644 --- a/app/src/main/res/layout/video_albums_item.xml +++ b/app/src/main/res/layout/video_albums_item.xml @@ -1,7 +1,7 @@ + android:background="@color/background_white"> Date: Mon, 9 May 2022 18:26:39 +0800 Subject: [PATCH 08/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81=E6=A0=8F=E5=BA=95?= =?UTF-8?q?=E8=89=B2=E6=9B=BF=E6=8D=A2=E4=B8=BAExtensions=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/gamecenter/LibaoDetailActivity.java | 5 ++--- .../com/gh/gamecenter/forum/detail/ForumDetailFragment.kt | 2 +- .../main/java/com/gh/gamecenter/libao/LibaoFragment.java | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index a285e3696d..fa61dbf114 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -27,7 +27,6 @@ import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DetailDownloadUtils; import com.gh.common.util.DeviceTokenUtils; -import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.ExtensionsKt; import com.gh.common.util.LibaoUtils; @@ -198,7 +197,7 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA if (mLibaoEntity != null) { mLibaoEntity.setClickReceiveBtnIn(isClickReceiveBtnIn); } - DisplayUtils.setStatusBarColor(this, mNightMode ? android.R.color.black : R.color.white); + ExtensionsKt.updateStatusBarColor(this, R.color.black, R.color.white); mIsScroll = true; mSkeleton = Skeleton.bind(mListSkeleton).shimmer(false).load(R.layout.activity_libaodetail_skeleton).show(); @@ -567,6 +566,6 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA mLibaoDetailRv.removeItemDecorationAt(0); mLibaoDetailRv.addItemDecoration(getItemDecoration()); } - DisplayUtils.setStatusBarColor(this, mNightMode ? android.R.color.black : R.color.white); + ExtensionsKt.updateStatusBarColor(this, R.color.black, R.color.white); } } diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt index 4568599c08..301e916819 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt @@ -760,7 +760,7 @@ class ForumDetailFragment : BaseLazyTabFragment() { if (mBinding.forumThumbSmall.visibility == View.GONE) { DisplayUtils.setStatusBarColor(requireActivity(), R.color.transparent) } else { - DisplayUtils.setStatusBarColor(requireActivity(), if (mNightMode) R.color.black else R.color.white) + requireActivity().updateStatusBarColor(R.color.black, R.color.white) } mBinding.allOrderSfv.run { setContainerBackground(R.drawable.button_round_f5f5f5.toDrawable(requireContext())) diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java index 8105f410e1..7835a54002 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java @@ -17,7 +17,7 @@ import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.gh.base.fragment.BaseFragment_TabLayout; -import com.gh.common.util.DisplayUtils; +import com.gh.common.util.ExtensionsKt; import com.gh.common.util.MtaHelper; import com.gh.gamecenter.ConcernActivity; import com.gh.gamecenter.R; @@ -86,7 +86,7 @@ public class LibaoFragment extends BaseFragment_TabLayout { @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - DisplayUtils.setStatusBarColor(requireActivity(), mNightMode ? R.color.black : R.color.white); + ExtensionsKt.updateStatusBarColor(requireActivity(), R.color.black, R.color.white); setNavigationTitle(R.string.title_libao); initMenu(R.menu.menu_manage); mManageMenu = getItemMenu(R.id.layout_menu_manage); @@ -152,7 +152,7 @@ public class LibaoFragment extends BaseFragment_TabLayout { super.onNightModeChange(); mBinding.fragmentTabRl.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); mBinding.divider.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.divider)); - DisplayUtils.setStatusBarColor(requireActivity(), mNightMode ? R.color.black : R.color.white); + ExtensionsKt.updateStatusBarColor(requireActivity(), R.color.black, R.color.white); for (int i = 0; i < mTabLayout.getTabCount(); i++) { TabLayout.Tab tab = mTabLayout.getTabAt(i); if (tab == null) continue; From 029a12c481ab21d77ba381d86913443b5289166b Mon Sep 17 00:00:00 2001 From: lyr Date: Tue, 10 May 2022 10:31:40 +0800 Subject: [PATCH 09/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E6=97=A7=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E9=A1=B5=E9=9D=A2)=20https://git.shanqu.cc/halo/andro?= =?UTF-8?q?id/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/common/view/CatalogFilterView.kt | 67 +++++++++++++------ .../com/gh/common/view/CategoryFilterView.kt | 53 ++++++++++----- .../com/gh/common/view/ConfigFilterView.kt | 13 ++-- .../catalog/NewCatalogListFragment.kt | 7 +- .../category/CategoryDirectoryActivity.kt | 8 +++ .../category/CategoryDirectoryFragment.kt | 7 +- .../category/CategoryListActivity.kt | 6 ++ .../category/NewCategoryHorizontalAdapter.kt | 10 +-- .../category/NewCategoryListFragment.kt | 18 ++++- .../category/NewCategoryListViewModel.kt | 8 +-- .../category2/CategoryV2ListFragment.kt | 7 +- .../main/res/layout/layout_sub_category.xml | 6 +- app/src/main/res/values-night/styles.xml | 2 +- app/src/main/res/values/styles.xml | 2 +- 14 files changed, 148 insertions(+), 66 deletions(-) diff --git a/app/src/main/java/com/gh/common/view/CatalogFilterView.kt b/app/src/main/java/com/gh/common/view/CatalogFilterView.kt index 51e933d719..2cbd2c6ab2 100644 --- a/app/src/main/java/com/gh/common/view/CatalogFilterView.kt +++ b/app/src/main/java/com/gh/common/view/CatalogFilterView.kt @@ -34,6 +34,10 @@ class CatalogFilterView @JvmOverloads constructor(context: Context, attrs: Attri private var mOnCatalogFilterSetupListener: OnCatalogFilterSetupListener? = null + private var mTypePopupWindow: PopupWindow? = null + private var mCatalogPopupWindow: PopupWindow? = null + private var mSizePopupWindow: PopupWindow? = null + init { View.inflate(context, R.layout.layout_catalog_filter, this) @@ -75,16 +79,6 @@ class CatalogFilterView @JvmOverloads constructor(context: Context, attrs: Attri mOnCatalogFilterSetupListener = onCatalogFilterSetupListener } - fun setRootBackgroundColor(@ColorInt color: Int) { - findViewById(R.id.config_controller).setBackgroundColor(color) - } - - fun setItemTextColor(@ColorInt color: Int) { - mTypeTv.setTextColor(color) - mCatalogTv.setTextColor(color) - mSizeTv.setTextColor(color) - } - private fun toggleHighlightedTextView(targetTextView: TextView, highlightIt: Boolean) { if (highlightIt) { targetTextView.background = ContextCompat.getDrawable(targetTextView.context, R.drawable.bg_tag_text) @@ -107,9 +101,10 @@ class CatalogFilterView @JvmOverloads constructor(context: Context, attrs: Attri val inflater = LayoutInflater.from(typeTv.context) val layout = inflater.inflate(R.layout.layout_filter_size, null) val popupWindow = PopupWindow( - layout, - LayoutParams.MATCH_PARENT, - LayoutParams.WRAP_CONTENT) + layout, + LayoutParams.MATCH_PARENT, + LayoutParams.WRAP_CONTENT + ).apply { mTypePopupWindow = this } val flexboxLayout = layout.findViewById(R.id.flexbox) val backgroundView = layout.findViewById(R.id.background) @@ -147,6 +142,7 @@ class CatalogFilterView @JvmOverloads constructor(context: Context, attrs: Attri popupWindow.setOnDismissListener { typeTv.setTextColor(R.color.text_757575.toColor(context)) typeTv.setCompoundDrawables(null, null, drawableDown, null) + mTypePopupWindow = null } popupWindow.isTouchable = true @@ -167,9 +163,10 @@ class CatalogFilterView @JvmOverloads constructor(context: Context, attrs: Attri val inflater = LayoutInflater.from(catalogTv.context) val layout = inflater.inflate(R.layout.layout_filter_size, null) val popupWindow = PopupWindow( - layout, - LayoutParams.MATCH_PARENT, - LayoutParams.WRAP_CONTENT) + layout, + LayoutParams.MATCH_PARENT, + LayoutParams.WRAP_CONTENT + ).apply { mCatalogPopupWindow = this } val flexboxLayout = layout.findViewById(R.id.flexbox) val backgroundView = layout.findViewById(R.id.background) @@ -209,6 +206,7 @@ class CatalogFilterView @JvmOverloads constructor(context: Context, attrs: Attri popupWindow.setOnDismissListener { catalogTv.setTextColor(R.color.text_757575.toColor(context)) catalogTv.setCompoundDrawables(null, null, drawableDown, null) + mCatalogPopupWindow = null } popupWindow.isTouchable = true @@ -229,9 +227,10 @@ class CatalogFilterView @JvmOverloads constructor(context: Context, attrs: Attri val inflater = LayoutInflater.from(sizeTv.context) val layout = inflater.inflate(R.layout.layout_filter_size, null) val popupWindow = PopupWindow( - layout, - LayoutParams.MATCH_PARENT, - LayoutParams.WRAP_CONTENT) + layout, + LayoutParams.MATCH_PARENT, + LayoutParams.WRAP_CONTENT + ).apply { mSizePopupWindow = this } val flexboxLayout = layout.findViewById(R.id.flexbox) val backgroundView = layout.findViewById(R.id.background) @@ -279,6 +278,7 @@ class CatalogFilterView @JvmOverloads constructor(context: Context, attrs: Attri popupWindow.setOnDismissListener { sizeTv.setTextColor(R.color.text_757575.toColor(context)) sizeTv.setCompoundDrawables(null, null, drawableDown, null) + mSizePopupWindow = null } popupWindow.isTouchable = true @@ -298,6 +298,35 @@ class CatalogFilterView @JvmOverloads constructor(context: Context, attrs: Attri } } + fun setRootBackgroundColor(@ColorInt color: Int) { + findViewById(R.id.config_controller).setBackgroundColor(color) + } + + fun setItemTextColor(@ColorInt color: Int) { + mTypeTv.setTextColor(color) + mCatalogTv.setTextColor(color) + mSizeTv.setTextColor(color) + } + + fun updatePopupWindow() { + when { + mTypePopupWindow != null && mTypePopupWindow!!.isShowing -> { + mTypePopupWindow?.dismiss() + showSelectTypePopupWindow(this, mTypeTv, mTypeTv.text.toString()) + } + + mCatalogPopupWindow != null && mCatalogPopupWindow!!.isShowing -> { + mCatalogPopupWindow?.dismiss() + showSelectCatalogPopupWindow(this, mCatalogTv, mCatalogTv.text.toString()) + } + + mSizePopupWindow != null && mSizePopupWindow!!.isShowing -> { + mSizePopupWindow?.dismiss() + showSelectSizePopupWindow(this, mSizeTv, mSizeTv.text.toString()) + } + } + } + interface OnCatalogFilterSetupListener { fun onSetupSortSize(sortSize: SubjectSettingEntity.Size) fun onSetupSortType(sortType: SortType) diff --git a/app/src/main/java/com/gh/common/view/CategoryFilterView.kt b/app/src/main/java/com/gh/common/view/CategoryFilterView.kt index a4aacc4c09..b0e81d2ced 100644 --- a/app/src/main/java/com/gh/common/view/CategoryFilterView.kt +++ b/app/src/main/java/com/gh/common/view/CategoryFilterView.kt @@ -32,6 +32,9 @@ class CategoryFilterView @JvmOverloads constructor(context: Context, attrs: Attr private var mOnCategoryFilterSetupListener: OnCategoryFilterSetupListener? = null private var mOnFilterClickListener: OnFilterClickListener? = null + private var mTypePopupWindow: PopupWindow? = null + private var mSizePopupWindow: PopupWindow? = null + init { View.inflate(context, R.layout.layout_category_filter, this) @@ -71,16 +74,6 @@ class CategoryFilterView @JvmOverloads constructor(context: Context, attrs: Attr mSizeTv.text = "全部大小" } - fun setRootBackgroundColor(@ColorInt color: Int) { - findViewById(R.id.config_controller).setBackgroundColor(color) - } - - fun setItemTextColor(@ColorInt color: Int) { - mTypeTv.setTextColor(color) - mCatalogTv.setTextColor(color) - mSizeTv.setTextColor(color) - } - private fun toggleHighlightedTextView(targetTextView: TextView, highlightIt: Boolean) { if (highlightIt) { targetTextView.background = ContextCompat.getDrawable(targetTextView.context, R.drawable.bg_tag_text) @@ -104,9 +97,10 @@ class CategoryFilterView @JvmOverloads constructor(context: Context, attrs: Attr val layout = inflater.inflate(R.layout.layout_filter_size, null) val windowWidth = typeTv.context.resources.displayMetrics.widthPixels - 80F.dip2px() val popupWindow = PopupWindow( - layout, - windowWidth, - LayoutParams.WRAP_CONTENT) + layout, + windowWidth, + LayoutParams.WRAP_CONTENT + ).apply { mTypePopupWindow = this } val flexboxLayout = layout.findViewById(R.id.flexbox) val backgroundView = layout.findViewById(R.id.background) @@ -144,6 +138,7 @@ class CategoryFilterView @JvmOverloads constructor(context: Context, attrs: Attr popupWindow.setOnDismissListener { typeTv.setTextColor(R.color.text_757575.toColor()) typeTv.setCompoundDrawables(null, null, drawableDown, null) + mTypePopupWindow = null } popupWindow.isTouchable = true @@ -165,9 +160,10 @@ class CategoryFilterView @JvmOverloads constructor(context: Context, attrs: Attr val layout = inflater.inflate(R.layout.layout_filter_size, null) val windowWidth = sizeTv.context.resources.displayMetrics.widthPixels - 80F.dip2px() val popupWindow = PopupWindow( - layout, - windowWidth, - LayoutParams.WRAP_CONTENT) + layout, + windowWidth, + LayoutParams.WRAP_CONTENT + ).apply { mSizePopupWindow = this } val flexboxLayout = layout.findViewById(R.id.flexbox) val backgroundView = layout.findViewById(R.id.background) @@ -215,6 +211,7 @@ class CategoryFilterView @JvmOverloads constructor(context: Context, attrs: Attr popupWindow.setOnDismissListener { sizeTv.setTextColor(R.color.text_757575.toColor()) sizeTv.setCompoundDrawables(null, null, drawableDown, null) + mSizePopupWindow = null } popupWindow.isTouchable = true @@ -234,6 +231,30 @@ class CategoryFilterView @JvmOverloads constructor(context: Context, attrs: Attr } } + fun setRootBackgroundColor(@ColorInt color: Int) { + findViewById(R.id.config_controller).setBackgroundColor(color) + } + + fun setItemTextColor(@ColorInt color: Int) { + mTypeTv.setTextColor(color) + mCatalogTv.setTextColor(color) + mSizeTv.setTextColor(color) + } + + fun updatePopupWindow() { + when { + mTypePopupWindow != null && mTypePopupWindow!!.isShowing -> { + mTypePopupWindow?.dismiss() + showSelectTypePopupWindow(this, mTypeTv, mTypeTv.text.toString()) + } + + mSizePopupWindow != null && mSizePopupWindow!!.isShowing -> { + mSizePopupWindow?.dismiss() + showSelectSizePopupWindow(this, mSizeTv, mSizeTv.text.toString()) + } + } + } + interface OnCategoryFilterSetupListener { fun onSetupSortSize(sortSize: SubjectSettingEntity.Size) fun onSetupSortType(sortType: SortType) diff --git a/app/src/main/java/com/gh/common/view/ConfigFilterView.kt b/app/src/main/java/com/gh/common/view/ConfigFilterView.kt index 759821b350..7eb22b51a0 100644 --- a/app/src/main/java/com/gh/common/view/ConfigFilterView.kt +++ b/app/src/main/java/com/gh/common/view/ConfigFilterView.kt @@ -12,6 +12,7 @@ import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat import com.gh.common.util.toColor +import com.gh.common.util.toDrawable import com.gh.gamecenter.R import com.gh.gamecenter.entity.SubjectSettingEntity import com.google.android.flexbox.FlexboxLayout @@ -96,17 +97,11 @@ class ConfigFilterView @JvmOverloads constructor( private fun toggleHighlightedTextView(targetTextView: TextView, highlightIt: Boolean) { if (highlightIt) { - targetTextView.background = - ContextCompat.getDrawable(targetTextView.context, R.drawable.bg_tag_text) - targetTextView.setTextColor(Color.WHITE) + targetTextView.background = R.drawable.bg_tag_text.toDrawable() + targetTextView.setTextColor(R.color.text_white.toColor(context)) } else { targetTextView.background = null - targetTextView.setTextColor( - ContextCompat.getColor( - targetTextView.context, - R.color.text_757575 - ) - ) + targetTextView.setTextColor(R.color.text_757575.toColor(context)) } } 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 20b46e6d42..1ee15f01de 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt @@ -190,9 +190,10 @@ class NewCatalogListFragment : ListFragment override fun onNightModeChange() { super.onNightModeChange() - mBinding?.run { - filterContainer.setRootBackgroundColor(R.color.background_white.toColor(requireContext())) - filterContainer.setItemTextColor(R.color.text_subtitle.toColor(requireContext())) + mBinding?.filterContainer?.run { + setRootBackgroundColor(R.color.background_white.toColor(requireContext())) + setItemTextColor(R.color.text_subtitle.toColor(requireContext())) + updatePopupWindow() } } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt index e528b19922..4562529591 100644 --- a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R @@ -21,6 +22,7 @@ class CategoryDirectoryActivity : NormalActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setToolbarMenu(R.menu.menu_download) + updateStatusBarColor(R.color.black, R.color.white) } override fun showDownloadMenu(): Boolean { @@ -35,4 +37,10 @@ class CategoryDirectoryActivity : NormalActivity() { return getTargetIntent(this, CategoryDirectoryActivity::class.java, CategoryDirectoryFragment::class.java) } + override fun isAutoResetViewBackgroundEnabled() = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt index 686d9c8903..635a6d9050 100644 --- a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt @@ -54,7 +54,7 @@ class CategoryDirectoryFragment : LazyListFragment>? { @@ -56,8 +56,8 @@ class NewCategoryListViewModel(application: Application) if (sortSize != null && sortSize != mSortSize) { mSortSize = sortSize refresh.postValue(true) - } else if (sortType != null && sortType != mSortType) { - mSortType = sortType + } else if (sortType != null && sortType != this.sortType) { + this.sortType = sortType refresh.postValue(true) } } @@ -69,7 +69,7 @@ class NewCategoryListViewModel(application: Application) } fun getSortType(): String? { - return if (mSortType == ConfigFilterView.SortType.RECOMMENDED) { + return if (sortType == ConfigFilterView.SortType.RECOMMENDED) { "download:-1" } else { "publish:-1" 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 9ae585c017..60972abb0a 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt @@ -318,9 +318,10 @@ class CategoryV2ListFragment : ListFragment override fun onNightModeChange() { super.onNightModeChange() - mBinding?.run { - filterContainer.setRootBackgroundColor(R.color.background_white.toColor(requireContext())) - filterContainer.setItemTextColor(R.color.text_subtitle.toColor(requireContext())) + mBinding?.filterContainer?.run { + setRootBackgroundColor(R.color.background_white.toColor(requireContext())) + setItemTextColor(R.color.text_subtitle.toColor(requireContext())) + updatePopupWindow() } } } \ No newline at end of file diff --git a/app/src/main/res/layout/layout_sub_category.xml b/app/src/main/res/layout/layout_sub_category.xml index ab6af54954..32186b9f62 100644 --- a/app/src/main/res/layout/layout_sub_category.xml +++ b/app/src/main/res/layout/layout_sub_category.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:gravity="center" android:ellipsize="end" - android:textColor="#000000" + android:textColor="@color/text_black" android:maxLines="1" android:textSize="12sp" tools:text="星海爭霸" /> @@ -33,7 +33,7 @@ android:gravity="center" android:ellipsize="end" android:maxLines="1" - android:textColor="#000000" + android:textColor="@color/text_black" android:textSize="12sp" tools:text="空海爭霸" /> @@ -53,7 +53,7 @@ android:layout_height="wrap_content" android:gravity="center" android:maxLines="1" - android:textColor="#000000" + android:textColor="@color/text_black" android:textSize="12sp" tools:text="地海爭霸" /> \ No newline at end of file diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index 6bd4722eed..374dc23412 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -415,7 +415,7 @@ end 8dp 8dp - @color/white + @color/text_white bold 12sp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index c1c2590f5b..d2d721c307 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -415,7 +415,7 @@ end 8dp 8dp - @color/white + @color/text_white bold 12sp From 64ae5d02fb85ea30ed81a7e6f14c60aab3ec37dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Tue, 10 May 2022 10:47:15 +0800 Subject: [PATCH 10/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E3=80=81=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F=E9=83=A8=E5=88=86?= =?UTF-8?q?)=20https://git.shanqu.cc/halo/android/assistant-android/-/issu?= =?UTF-8?q?es/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/CollectionActivity.java | 18 +++++++++++++++ .../gamecenter/collection/AnswerFragment.java | 19 +++++++++++---- .../collection/ArticleFragment.java | 20 ++++++++++++---- .../collection/CommunityArticleFragment.kt | 16 ++++++++++--- .../gamecenter/collection/ToolsFragment.java | 17 ++++++++++---- .../gamecenter/video/VideoItemViewHolder.kt | 3 +++ .../video/data/VideoDataActivity.kt | 6 +++-- .../video/data/VideoDataFragment.kt | 15 +++++++++++- .../video/game/GameVideoActivity.kt | 23 +++++++++++++++++-- .../video/game/GameVideoFragment.kt | 18 +++++++++++---- .../main/res/layout/activity_video_game.xml | 2 +- .../main/res/layout/fragment_video_data.xml | 2 +- .../res/layout/item_video_data_overview.xml | 2 +- app/src/main/res/layout/news_image1_item.xml | 2 +- app/src/main/res/layout/news_image2_item.xml | 2 +- app/src/main/res/layout/news_image3_item.xml | 2 +- app/src/main/res/layout/reuse_none_data.xml | 1 + app/src/main/res/layout/toolbox_item.xml | 2 +- 18 files changed, 136 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java index b80b612b83..cc1c7b3109 100644 --- a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java @@ -3,15 +3,33 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; + import androidx.annotation.NonNull; import com.gh.common.util.EntranceUtils; +import com.gh.common.util.ExtensionsKt; import com.gh.gamecenter.collection.CollectionWrapperFragment; /** * Created by khy on 18/07/17. */ public class CollectionActivity extends NormalActivity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + ExtensionsKt.updateStatusBarColor(this, R.color.black, R.color.white); + } + + @Override + protected boolean isAutoResetViewBackgroundEnabled() { + return true; + } + + @Override + protected void onNightModeChange() { + super.onNightModeChange(); + ExtensionsKt.updateStatusBarColor(this, R.color.black, R.color.white); + } @NonNull public static Intent getCollectionActivity(Context context, String entrance) { diff --git a/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java b/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java index 7b4b06a9c3..e563294d68 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java @@ -4,6 +4,11 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.View; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.lifecycle.ViewModelProviders; +import androidx.recyclerview.widget.RecyclerView; + import com.gh.common.util.CollectionUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.view.CustomDividerItemDecoration; @@ -20,11 +25,6 @@ import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import org.jetbrains.annotations.NotNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.lifecycle.ViewModelProviders; -import androidx.recyclerview.widget.RecyclerView; - /** * Created by khy on 22/12/17. */ @@ -97,4 +97,13 @@ public class AnswerFragment extends ListFragment itemDecoration.setDrawable(insetDivider); return itemDecoration; } + + @Override + protected void onNightModeChange() { + super.onNightModeChange(); + if (mListRv != null && mListRv.getItemDecorationCount() > 0) { + mListRv.removeItemDecorationAt(0); + mListRv.addItemDecoration(getItemDecoration()); + } + } } diff --git a/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java b/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java index 85bf1d5373..bb8514b9c2 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java @@ -4,6 +4,10 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.View; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; + import com.gh.common.util.CollectionUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DialogHelper; @@ -23,10 +27,6 @@ import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import org.jetbrains.annotations.NotNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - /** * Created by khy on 18/07/17. */ @@ -44,7 +44,7 @@ public class ArticleFragment extends ListFragment public void onCreate(@Nullable Bundle savedInstanceState) { mType = getArguments().getString(EntranceUtils.KEY_TYPE, COLLECTION); super.onCreate(savedInstanceState); - mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.white)); + mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); } @Override @@ -121,4 +121,14 @@ public class ArticleFragment extends ListFragment itemDecoration.setDrawable(insetDivider); return itemDecoration; } + + @Override + protected void onNightModeChange() { + super.onNightModeChange(); + mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); + if (mListRv != null && mListRv.getItemDecorationCount() > 0) { + mListRv.removeItemDecorationAt(0); + mListRv.addItemDecoration(getItemDecoration()); + } + } } diff --git a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt index 111b5b8ed0..f66fe68783 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt @@ -27,7 +27,7 @@ class CommunityArticleFragment : ListFragment 0) { + mListRv?.removeItemDecorationAt(0) + mListRv?.addItemDecoration(itemDecoration) + } + } } \ No newline at end of file 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 6404f4ef8a..910b617a74 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ToolsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ToolsFragment.java @@ -1,11 +1,12 @@ package com.gh.gamecenter.collection; +import static com.gh.common.constant.Config.URL_ARTICLE; + import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.View; -import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; @@ -30,8 +31,6 @@ import java.util.List; import io.reactivex.Observable; -import static com.gh.common.constant.Config.URL_ARTICLE; - /** * Created by khy on 18/07/17. */ @@ -43,7 +42,7 @@ public class ToolsFragment extends ListFragment 0) { + mListRv.removeItemDecorationAt(0); + mListRv.addItemDecoration(getItemDecoration()); + } + } } diff --git a/app/src/main/java/com/gh/gamecenter/video/VideoItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/video/VideoItemViewHolder.kt index 913fa6b111..12a63ec26d 100644 --- a/app/src/main/java/com/gh/gamecenter/video/VideoItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/video/VideoItemViewHolder.kt @@ -3,7 +3,9 @@ package com.gh.gamecenter.video import com.gh.base.BaseRecyclerViewHolder import com.gh.common.util.ImageUtils import com.gh.common.util.TimeUtils +import com.gh.common.util.setRootBackgroundDrawable import com.gh.common.util.toSimpleCount +import com.gh.gamecenter.R import com.gh.gamecenter.databinding.VideoNewItemBinding import com.gh.gamecenter.entity.MyVideoEntity @@ -11,6 +13,7 @@ class VideoItemViewHolder(var binding: VideoNewItemBinding) : BaseRecyclerViewHo fun bindVideoItem(entity: MyVideoEntity) { binding.run { + root.setRootBackgroundDrawable(R.drawable.background_shape_white_radius_6) ImageUtils.display(videoCover, entity.poster) videoLikeCount.text = entity.vote.toSimpleCount() videoCommentCount.text = entity.commentCount.toSimpleCount() diff --git a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataActivity.kt b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataActivity.kt index 9a198197a8..c8af5ba9ee 100644 --- a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataActivity.kt @@ -16,9 +16,11 @@ class VideoDataActivity : BaseActivity() { DisplayUtils.transparentStatusBar(this) val containerFragment = supportFragmentManager.findFragmentByTag(VideoDataFragment::class.java.simpleName) - ?: VideoDataFragment().with(intent.extras) + ?: VideoDataFragment().with(intent.extras) // 若 placeholder 外层为 RelativeLayout 的话，会出现莫名的偏移 - supportFragmentManager.beginTransaction().replace(R.id.placeholder, containerFragment, VideoDataFragment::class.java.simpleName).commitAllowingStateLoss() + supportFragmentManager.beginTransaction().replace(R.id.placeholder, containerFragment, VideoDataFragment::class.java.simpleName) + .commitAllowingStateLoss() } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataFragment.kt b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataFragment.kt index 20d24441a4..754d34784c 100644 --- a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataFragment.kt @@ -5,6 +5,7 @@ import android.view.LayoutInflater import android.view.View import androidx.core.content.ContextCompat import androidx.lifecycle.Observer +import androidx.recyclerview.widget.RecyclerView import com.gh.base.fragment.BaseFragment import com.gh.common.util.DisplayUtils import com.gh.common.util.dip2px @@ -15,6 +16,7 @@ import com.gh.common.view.VerticalItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentVideoDataBinding import com.gh.gamecenter.mvvm.Status +import splitties.views.dsl.core.add class VideoDataFragment : BaseFragment() { private lateinit var mViewModel: VideoDataViewModel @@ -45,7 +47,7 @@ class VideoDataFragment : BaseFragment() { mAdapter = VideoDataAdapter(requireContext()) mBinding.listRv.apply { layoutManager = FixLinearLayoutManager(requireContext()) - addItemDecoration(VerticalItemDecoration(requireContext(), 40F, false, R.color.white)) + addItemDecoration(getItemDecoration()) adapter = mAdapter } mViewModel.loadData() @@ -62,7 +64,10 @@ class VideoDataFragment : BaseFragment() { loadErrorControl() } }) + } + private fun getItemDecoration(): RecyclerView.ItemDecoration { + return VerticalItemDecoration(requireContext(), 40F, false, R.color.background_white) } private fun loadErrorControl() { @@ -74,4 +79,12 @@ class VideoDataFragment : BaseFragment() { mViewModel.loadData() } } + + override fun onNightModeChange() { + super.onNightModeChange() + if (mBinding.listRv.itemDecorationCount > 0) { + mBinding.listRv.removeItemDecorationAt(0) + mBinding.listRv.addItemDecoration(getItemDecoration()) + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt index f4ff9c80e1..09622b781f 100644 --- a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt @@ -4,6 +4,8 @@ import android.content.Context import android.content.Intent import android.graphics.Color import android.os.Bundle +import android.widget.TextView +import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProviders import com.gh.base.BaseActivity @@ -65,8 +67,10 @@ class GameVideoActivity : ToolBarActivity() { mViewModel = ViewModelProviders.of(this, factory).get(GameVideoViewModel::class.java) mViewModel.gameViewInfo.observeNonNull(this, callback = { if (it.status == Status.SUCCESS) { - mBinding.gameIcon.displayGameIcon(it.data?.game?.getIcon() - ?: it.data?.gameIcon, it.data?.game?.iconSubscript) + mBinding.gameIcon.displayGameIcon( + it.data?.game?.getIcon() + ?: it.data?.gameIcon, it.data?.game?.iconSubscript + ) mBinding.gameName.text = it.data?.game?.name mBinding.likeCount.text = NumberUtils.transSimpleCount(it.data?.likeCount ?: 0) mBinding.videoCount.text = NumberUtils.transSimpleCount(it.data?.videoCount ?: 0) @@ -87,6 +91,21 @@ class GameVideoActivity : ToolBarActivity() { return R.drawable.ic_toolbar_back_white } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + mToolbar.setBackgroundColor(R.color.transparent.toColor(this)) + mToolbar.setNavigationIcon(R.drawable.ic_toolbar_back_white) + mBinding.tabContainer.setBackgroundColor(R.color.background_white.toColor(this)) + for (i in 0 until mBinding.tabLayout.tabCount) { + val tab = mBinding.tabLayout.getTabAt(i) + if (tab != null) { + val customView = tab.view.getChildAt(1) as? TextView + customView?.setTextColor(ContextCompat.getColorStateList(this, R.color.text_tabbar_style)) + } + } + } + companion object { @JvmStatic 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 2f5cbcbefa..e0f9273729 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 @@ -21,11 +21,13 @@ class GameVideoFragment : ListFragment + android:background="@color/background_white"> + android:background="@color/background_white"> diff --git a/app/src/main/res/layout/news_image1_item.xml b/app/src/main/res/layout/news_image1_item.xml index cc59aa9775..e448d70aec 100644 --- a/app/src/main/res/layout/news_image1_item.xml +++ b/app/src/main/res/layout/news_image1_item.xml @@ -59,7 +59,7 @@ android:layout_alignParentBottom="true" android:gravity="center" android:text="@string/news_activity" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" /> diff --git a/app/src/main/res/layout/news_image2_item.xml b/app/src/main/res/layout/news_image2_item.xml index 9af9f8bdd3..e7a040625a 100644 --- a/app/src/main/res/layout/news_image2_item.xml +++ b/app/src/main/res/layout/news_image2_item.xml @@ -90,7 +90,7 @@ android:layout_alignParentRight="true" android:gravity="center" android:text="@string/news_activity" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" /> diff --git a/app/src/main/res/layout/news_image3_item.xml b/app/src/main/res/layout/news_image3_item.xml index 1eeddc20fc..91ecd5c1e0 100644 --- a/app/src/main/res/layout/news_image3_item.xml +++ b/app/src/main/res/layout/news_image3_item.xml @@ -64,7 +64,7 @@ android:layout_alignParentRight="true" android:gravity="center" android:text="@string/news_activity" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" /> diff --git a/app/src/main/res/layout/reuse_none_data.xml b/app/src/main/res/layout/reuse_none_data.xml index 7fef040a6f..550123f7a0 100644 --- a/app/src/main/res/layout/reuse_none_data.xml +++ b/app/src/main/res/layout/reuse_none_data.xml @@ -6,6 +6,7 @@ android:layout_gravity="center" android:gravity="center" android:orientation="vertical" + android:background="@color/background" android:visibility="gone"> Date: Tue, 10 May 2022 14:34:46 +0800 Subject: [PATCH 11/52] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E9=A1=B5=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/gamedetail/GameDetailFragment.kt | 1 + .../gamedetail/rating/edit/RatingEditActivity.kt | 9 +++++++++ .../main/java/com/halo/assistant/fragment/WebFragment.kt | 6 ++++++ app/src/main/res/layout/activity_rating_edit.xml | 2 +- app/src/main/res/layout/gamedetail_body.xml | 1 - 5 files changed, 17 insertions(+), 2 deletions(-) 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 9463cedd81..edb94fb742 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt @@ -628,6 +628,7 @@ class GameDetailFragment : NormalFragment() { } BaseFragment_TabLayout.initTabStyle(mBodyBinding.tabLayout, gamedetailVp.currentItem) + updateToolbarStyle(gamedetailThumbSmall.visibility == View.VISIBLE) } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt index c7ccdcf6f6..4010cad3de 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt @@ -150,6 +150,7 @@ class RatingEditActivity : ToolBarActivity(), KeyboardHeightObserver { private fun initWebView() { val settings = mBinding.mWebView.settings settings.javaScriptEnabled = true + mBinding.mWebView.enableForceDark(NightModeUtils.isNightMode(this)) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { settings.mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW } @@ -474,6 +475,14 @@ class RatingEditActivity : ToolBarActivity(), KeyboardHeightObserver { ) } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor( R.color.black, R.color.white) + mBinding.mWebView.enableForceDark(NightModeUtils.isNightMode(this)) + } + companion object { const val LABEL_REPLACE_REGEX = "]*?>[\\s\\S]*?<\\/tag>" const val LABEL_PREFIX = "" 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 4a89351477..8f3cc81354 100644 --- a/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt @@ -299,6 +299,7 @@ class WebFragment : LazyFragment(), IScrollable { mBinding?.run { val settings = newsWebview.settings settings.javaScriptEnabled = true + newsWebview.enableForceDark(NightModeUtils.isNightMode(requireContext())) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { settings.mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW } @@ -745,6 +746,11 @@ class WebFragment : LazyFragment(), IScrollable { } } + override fun onNightModeChange() { + super.onNightModeChange() + mBinding?.newsWebview?.enableForceDark(NightModeUtils.isNightMode(requireContext())) + } + companion object { const val KEY_ISTOOLS = "isTools" const val KEY_IS_BIND_WECHAT = "is_bind_wechat" diff --git a/app/src/main/res/layout/activity_rating_edit.xml b/app/src/main/res/layout/activity_rating_edit.xml index 6bb80d7a86..1891c6a92e 100644 --- a/app/src/main/res/layout/activity_rating_edit.xml +++ b/app/src/main/res/layout/activity_rating_edit.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white"> + android:background="@color/background_white"> From 9628af41680abee5d3e20a835f166416f999bb74 Mon Sep 17 00:00:00 2001 From: lyr Date: Tue, 10 May 2022 16:01:11 +0800 Subject: [PATCH 12/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E4=B8=8E=E5=AE=89=E5=85=A8=E9=A1=B5=E9=9D=A2)=20https://git.sh?= =?UTF-8?q?anqu.cc/halo/android/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gamecenter/security/BindPhoneActivity.kt | 11 +++++++++- .../gamecenter/security/BindPhoneFragment.kt | 20 +++++++++++++++++-- .../gamecenter/security/SecurityActivity.kt | 9 +++++++++ .../main/res/layout/fragment_bind_phone.xml | 4 ++-- .../layout/fragment_bind_phone_conflict.xml | 6 ++++-- 5 files changed, 43 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/security/BindPhoneActivity.kt b/app/src/main/java/com/gh/gamecenter/security/BindPhoneActivity.kt index a019a58b74..28c220aacf 100644 --- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneActivity.kt @@ -4,15 +4,24 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.R import com.gh.gamecenter.entity.ConflictUserEntity class BindPhoneActivity : NormalActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - hideToolbar(intent.extras?.getBundle(NORMAL_FRAGMENT_BUNDLE)?.getBoolean(EntranceUtils.KEY_FROM_LOGIN) == true) + updateStatusBarColor(R.color.black, R.color.white) + } + + override fun isAutoResetViewBackgroundEnabled() = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt b/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt index b6cb41f5ac..ea6ce1bf7f 100644 --- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt @@ -36,7 +36,7 @@ class BindPhoneFragment : NormalFragment() { } else { mBinding.bindPhoneCaptcha.run { text = "重新获取" - setTextColor(R.color.theme_font.toColor()) + setTextColor(R.color.theme_font.toColor(requireContext())) isEnabled = true } } @@ -100,7 +100,7 @@ class BindPhoneFragment : NormalFragment() { message.arg1 = 60 // 倒数时间 mBaseHandler.sendMessage(message) - mBinding.bindPhoneCaptcha.setTextColor(R.color.hint.toColor()) + mBinding.bindPhoneCaptcha.setTextColor(R.color.hint.toColor(requireContext())) mBinding.bindPhoneCaptcha.isEnabled = false }) @@ -260,4 +260,20 @@ class BindPhoneFragment : NormalFragment() { } } } + + override fun onNightModeChange() { + super.onNightModeChange() + mBinding.run { + bindPhoneEt.post { + listOf( + bindPhoneEt, + bindPhonePassEt, + bindPhoneInviteEt + ).forEach { + it.setHintTextColor(R.color.text_body.toColor(requireContext())) + it.setTextColor(R.color.text_title.toColor(requireContext())) + } + } + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/security/SecurityActivity.kt b/app/src/main/java/com/gh/gamecenter/security/SecurityActivity.kt index 30c4b6cbe2..18e7a81357 100644 --- a/app/src/main/java/com/gh/gamecenter/security/SecurityActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/security/SecurityActivity.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R @@ -12,6 +13,14 @@ class SecurityActivity : NormalActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle(R.string.setting_security) + updateStatusBarColor(R.color.black, R.color.white) + } + + override fun isAutoResetViewBackgroundEnabled() = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) } companion object { diff --git a/app/src/main/res/layout/fragment_bind_phone.xml b/app/src/main/res/layout/fragment_bind_phone.xml index f54b49d326..6cd50c3e01 100644 --- a/app/src/main/res/layout/fragment_bind_phone.xml +++ b/app/src/main/res/layout/fragment_bind_phone.xml @@ -6,7 +6,7 @@ android:paddingLeft="20dp" android:paddingRight="20dp" android:orientation="vertical" - android:background="@color/white"> + android:background="@color/background_white"> + android:background="@color/background_white"> @@ -103,6 +104,7 @@ From fb4e38e50f7eebe303a03ddb1cd4a0838c8cfad9 Mon Sep 17 00:00:00 2001 From: lyr Date: Wed, 11 May 2022 11:46:36 +0800 Subject: [PATCH 13/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E4=B8=8E=E5=AE=89=E5=85=A8=E9=A1=B5=E9=9D=A2)=20https://git.sh?= =?UTF-8?q?anqu.cc/halo/android/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/util/DialogUtils.java | 3 ++- .../gamecenter/security/BindPhoneFragment.kt | 25 +++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index d6336149fa..0efdcb5fe5 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -2115,7 +2115,7 @@ public class DialogUtils { dialog.show(); } - public static void showBindPhoneDialog(Context context, ConfirmListener listener) { + public static Dialog showBindPhoneDialog(Context context, ConfirmListener listener) { context = checkDialogContext(context); final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent); @@ -2133,6 +2133,7 @@ public class DialogUtils { dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); dialog.setContentView(binding.getRoot()); dialog.show(); + return dialog; } public static void showReceiveLibaoSuccessDialog(Context context, String title, String des, String libaoCode, ConfirmListener listener) { diff --git a/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt b/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt index ea6ce1bf7f..ee4bd002d5 100644 --- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt @@ -1,5 +1,6 @@ package com.gh.gamecenter.security +import android.app.Dialog import android.content.Intent import android.os.Bundle import android.os.Message @@ -22,6 +23,7 @@ class BindPhoneFragment : NormalFragment() { private lateinit var mViewModel: BindPhoneViewModel private val mBinding by lazy { FragmentBindPhoneBinding.inflate(layoutInflater) } + private var mDialog: Dialog? = null override fun handleMessage(msg: Message) { if (msg.what == 0) { // 验证码倒计时 @@ -66,7 +68,7 @@ class BindPhoneFragment : NormalFragment() { it.setOnClickListener(this) } - mBinding.bindPhoneSkip.goneIf(!mFromLogin) + mBinding.bindPhoneSkip.goneIf(!true) mBinding.bindPhoneTitle.text = if (mChangePhone) requireContext().resources.getString(R.string.bind_phone_title2) else requireContext().resources.getString(R.string.bind_phone_title1) mBinding.bindPhoneDesc.text = if (mChangePhone) { @@ -206,7 +208,7 @@ class BindPhoneFragment : NormalFragment() { when (v.id) { R.id.bind_phone_skip -> { - DialogUtils.showBindPhoneDialog(requireContext()) { requireActivity().finish() } + showBindPhoneDialog() } R.id.bind_phone_captcha -> { @@ -261,6 +263,15 @@ class BindPhoneFragment : NormalFragment() { } } + private fun showBindPhoneDialog() { + mDialog = DialogUtils.showBindPhoneDialog(requireContext()) { requireActivity().finish() } + } + + override fun onStop() { + super.onStop() + mDialog = null + } + override fun onNightModeChange() { super.onNightModeChange() mBinding.run { @@ -274,6 +285,16 @@ class BindPhoneFragment : NormalFragment() { it.setTextColor(R.color.text_title.toColor(requireContext())) } } + + bindPhoneBtn.run { + background = R.drawable.download_button_normal_style.toDrawable(requireContext()) + setTextColor(R.color.text_white.toColor(requireContext())) + } + + if (mDialog != null && mDialog!!.isShowing) { + mDialog?.dismiss() + showBindPhoneDialog() + } } } } \ No newline at end of file From 21fa841e3a5591c699f37520c7fd71ea604e30a6 Mon Sep 17 00:00:00 2001 From: lyr Date: Wed, 11 May 2022 11:48:49 +0800 Subject: [PATCH 14/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E5=B8=AE=E5=8A=A9?= =?UTF-8?q?=E4=B8=8E=E5=8F=8D=E9=A6=88=E9=A1=B5=E9=9D=A2)=20https://git.sh?= =?UTF-8?q?anqu.cc/halo/android/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/gamecenter/HelpAndFeedbackActivity.kt | 3 +- .../main/java/com/gh/gamecenter/QaActivity.kt | 13 +++++ .../gamecenter/help/HelpContainerFragment.kt | 11 ++++ .../gh/gamecenter/help/HelpContentAdapter.kt | 4 +- .../com/gh/gamecenter/help/HelpQaAdapter.kt | 24 +++----- .../gamecenter/help/HelpQaCategoryAdapter.kt | 1 - .../gamecenter/help/HelpQaCategoryFragment.kt | 38 +++++++----- .../help/QaFeedbackDialogFragment.kt | 58 +++++++++++++++++-- .../help/QaFeedbackReasonAdapter.kt | 10 +++- .../res/drawable/bg_shape_white_radius_8.xml | 2 +- .../drawable/border_round_stroke_eee_4.xml | 2 +- .../qa_feedback_rg_button_checked.xml | 2 +- .../drawable/qa_feedback_rg_button_normal.xml | 2 +- .../res/layout/fragment_help_contaier.xml | 5 +- .../main/res/layout/fragment_help_content.xml | 3 +- .../main/res/layout/fragment_qa_category.xml | 2 +- .../main/res/layout/help_qa_category_item.xml | 2 +- app/src/main/res/layout/help_qa_item.xml | 10 ++++ app/src/main/res/values-night/styles.xml | 2 +- app/src/main/res/values/styles.xml | 2 +- 20 files changed, 145 insertions(+), 51 deletions(-) create mode 100644 app/src/main/res/layout/help_qa_item.xml diff --git a/app/src/main/java/com/gh/gamecenter/HelpAndFeedbackActivity.kt b/app/src/main/java/com/gh/gamecenter/HelpAndFeedbackActivity.kt index f9a6c98c1d..4d3aada984 100644 --- a/app/src/main/java/com/gh/gamecenter/HelpAndFeedbackActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/HelpAndFeedbackActivity.kt @@ -5,7 +5,6 @@ import android.content.Intent import android.os.Bundle import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout -import com.gh.common.util.DisplayUtils import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.help.HelpContainerFragment import com.gh.gamecenter.suggest.SuggestSelectFragment @@ -54,6 +53,8 @@ class HelpAndFeedbackActivity : BaseActivity_TabLayout() { mViewPager.currentItem = position } + override fun isAutoResetViewBackgroundEnabled() = true + override fun onNightModeChange() { super.onNightModeChange() updateStatusBarColor(R.color.black, R.color.white) diff --git a/app/src/main/java/com/gh/gamecenter/QaActivity.kt b/app/src/main/java/com/gh/gamecenter/QaActivity.kt index d0818a689c..c4c31ad961 100644 --- a/app/src/main/java/com/gh/gamecenter/QaActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/QaActivity.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.help.HelpContainerFragment class QaActivity : NormalActivity() { @@ -26,4 +27,16 @@ class QaActivity : NormalActivity() { override fun provideNormalIntent(): Intent { return getTargetIntent(this, QaActivity::class.java, HelpContainerFragment::class.java) } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) + } + + override fun isAutoResetViewBackgroundEnabled() = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpContainerFragment.kt b/app/src/main/java/com/gh/gamecenter/help/HelpContainerFragment.kt index b58731eb1e..9f529fd2ba 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpContainerFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpContainerFragment.kt @@ -13,6 +13,7 @@ import androidx.lifecycle.ViewModelProviders import com.gh.common.util.EntranceUtils import com.gh.common.util.MtaHelper import com.gh.common.util.TextHelper +import com.gh.common.util.toColor import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentHelpContaierBinding import com.gh.gamecenter.eventbus.EBNetworkState @@ -199,4 +200,14 @@ class HelpContainerFragment : NormalFragment() { mViewModel.initData() } } + + override fun onNightModeChange() { + super.onNightModeChange() + mBinding.searchInput.run { + post { + setHintTextColor(R.color.text_body.toColor(requireContext())) + setTextColor(R.color.text_title.toColor(requireContext())) + } + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpContentAdapter.kt b/app/src/main/java/com/gh/gamecenter/help/HelpContentAdapter.kt index 91147b9868..e9d5f7179a 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpContentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpContentAdapter.kt @@ -157,8 +157,8 @@ class HelpContentAdapter( is FooterViewHolder -> { holder.initFooterViewHolder(mViewModel, mIsLoading, mIsNetworkError, mIsOver) holder.hint.text = "没有更多了~" - holder.hint.setTextColor(R.color.text_subtitle.toColor()) - holder.hint.textSize = 12f + holder.hint.setTextColor(R.color.text_subtitle.toColor(mContext)) + holder.hint.textSize = 12F } } } diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpQaAdapter.kt b/app/src/main/java/com/gh/gamecenter/help/HelpQaAdapter.kt index a92940ca9d..2081be80ee 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpQaAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpQaAdapter.kt @@ -1,33 +1,27 @@ package com.gh.gamecenter.help import android.content.Context -import android.text.TextUtils -import android.view.Gravity +import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView -import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.common.constant.Constants import com.gh.common.util.* -import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity +import com.gh.gamecenter.databinding.HelpQaItemBinding import com.gh.gamecenter.entity.HelpCategoryEntity class HelpQaAdapter(val context: Context, val helpCategoryEntity: HelpCategoryEntity, val mQaCollectionId: String?) : RecyclerView.Adapter() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { - val helpView = TextView(context).apply { - val params = RecyclerView.LayoutParams(RecyclerView.LayoutParams.MATCH_PARENT, 30f.dip2px()) - layoutParams = params - setTextColor(ContextCompat.getColor(context, R.color.text_title)) - textSize = 14f - includeFontPadding = false - gravity = Gravity.CENTER_VERTICAL - ellipsize = TextUtils.TruncateAt.END - maxLines = 1 - } - return HelpQaItemViewHolder(helpView) + return HelpQaItemViewHolder( + HelpQaItemBinding.inflate( + LayoutInflater.from(context), + parent, + false + ).root + ) } override fun getItemCount(): Int = helpCategoryEntity.helpEntities.size diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryAdapter.kt index 6266e82756..e72dfe7fb7 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryAdapter.kt @@ -37,7 +37,6 @@ class HelpQaCategoryAdapter(val context: Context, private val mQaCollectionId: S ImageUtils.display(holder.binding.categoryIcon, helpCategoryEntity.icon) holder.binding.categoryName.text = helpCategoryEntity.name - holder.binding.qaRv.apply { layoutManager = GridLayoutManager(context, 2) addItemDecoration(GridSpacingItemColorDecoration(context, 28, 0, R.color.transparent)) diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt index a59a418ebe..2bea1ba6ff 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt @@ -5,10 +5,8 @@ import android.view.View import android.widget.TextView import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager -import com.gh.common.util.EntranceUtils -import com.gh.common.util.toDrawable -import com.gh.common.util.toObject -import com.gh.common.util.viewModelProvider +import androidx.recyclerview.widget.RecyclerView +import com.gh.common.util.* import com.gh.common.view.CustomDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentQaCategoryBinding @@ -69,15 +67,7 @@ class HelpQaCategoryFragment : NormalFragment() { super.onViewCreated(view, savedInstanceState) mBinding.listRv.apply { layoutManager = LinearLayoutManager(context) - val itemDecoration = CustomDividerItemDecoration( - requireContext(), - onlyDecorateTheFirstItem = false, - notDecorateTheFirstItem = false, - notDecorateTheLastItem = true, - notDecorateTheFirstTwoItems = false - ) - itemDecoration.setDrawable(R.drawable.divider_item_line_space_16.toDrawable()!!) - addItemDecoration(itemDecoration) + addItemDecoration(getItemDecoration()) mAdapter = HelpQaCategoryAdapter(requireContext(), mQaCollectionId) adapter = mAdapter } @@ -88,4 +78,26 @@ class HelpQaCategoryFragment : NormalFragment() { mViewModel?.initData() } } + + fun getItemDecoration(): RecyclerView.ItemDecoration { + return CustomDividerItemDecoration( + requireContext(), + onlyDecorateTheFirstItem = false, + notDecorateTheFirstItem = false, + notDecorateTheLastItem = true, + notDecorateTheFirstTwoItems = false + ).apply { + setDrawable(R.drawable.divider_item_line_space_16.toDrawable(requireContext())!!) + } + } + + override fun onNightModeChange() { + super.onNightModeChange() + mBinding.listRv.run { + if (itemDecorationCount > 0) { + removeItemDecorationAt(0) + addItemDecoration(getItemDecoration()) + } + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt index 486e1723b8..3f515e3ea0 100644 --- a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt @@ -1,19 +1,20 @@ package com.gh.gamecenter.help import android.app.Dialog +import android.content.res.Configuration import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.RadioButton import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.FragmentTransaction import androidx.lifecycle.Lifecycle -import androidx.lifecycle.Observer import androidx.recyclerview.widget.GridLayoutManager -import androidx.recyclerview.widget.LinearLayoutManager import com.gh.common.util.* +import com.gh.common.util.NightModeUtils.getSystemMode +import com.gh.common.util.NightModeUtils.isNightMode import com.gh.common.view.GridSpacingItemDecoration +import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity import com.gh.gamecenter.databinding.DialogQaFeedbackBinding @@ -30,6 +31,8 @@ class QaFeedbackDialogFragment : BaseDialogFragment() { private val mReasonList = arrayListOf("内容看不懂", "没有解决办法", "方法不可行", "其他原因") private lateinit var mAdapter: QaFeedbackReasonAdapter + private var mNightMode = false + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -49,6 +52,12 @@ class QaFeedbackDialogFragment : BaseDialogFragment() { } mLoadingDialog?.dismiss() } + + mNightMode = if (BuildConfig.IS_NIGHT_MODE_ON) { + isNightMode(requireContext()) + } else { + false + } } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -59,8 +68,8 @@ class QaFeedbackDialogFragment : BaseDialogFragment() { addItemDecoration(GridSpacingItemDecoration(2, 8f.dip2px(), false)) adapter = QaFeedbackReasonAdapter(requireContext(), mReasonList) { mBinding.commitBtn.background = - R.drawable.bg_notification_open_btn_style_2.toDrawable() - mBinding.commitBtn.setTextColor(R.color.white.toColor()) + R.drawable.bg_notification_open_btn_style_2.toDrawable(requireContext()) + mBinding.commitBtn.setTextColor(R.color.text_white.toColor(requireContext())) }.apply { mAdapter = this } @@ -105,6 +114,45 @@ class QaFeedbackDialogFragment : BaseDialogFragment() { requireDialog().setCanceledOnTouchOutside(false) } + override fun onResume() { + super.onResume() + if (!getSystemMode() && mNightMode != isNightMode(requireContext())) { + onNightModeChange() + } + } + + override fun onConfigurationChanged(newConfig: Configuration) { + super.onConfigurationChanged(newConfig) + onNightModeChange() + } + + private fun onNightModeChange() { + mNightMode = isNightMode(requireContext()) + + mBinding.run { + root.background = R.drawable.background_shape_white_radius_8.toDrawable(requireContext()) + title.setTextColor(R.color.text_title.toColor(requireContext())) + reasonRv.adapter?.run { + notifyItemRangeChanged(0, itemCount) + } + contentEt.run { + background = R.drawable.border_round_stroke_eee_4.toDrawable(requireContext()) + setHintTextColor(R.color.text_body.toColor(requireContext())) + setTextColor(R.color.text_title.toColor(requireContext())) + } + commitBtn.run { + if (::mAdapter.isInitialized && mAdapter.getSelectReason().isEmpty()) { + background = R.drawable.button_round_f5f5f5.toDrawable(requireContext()) + setTextColor(R.color.text_body.toColor(requireContext())) + } else { + background = R.drawable.bg_notification_open_btn_style_2.toDrawable(requireContext()) + setTextColor(R.color.text_white.toColor(requireContext())) + } + } + feedbackMoreTv.setTextColor(R.color.theme_font.toColor(requireContext())) + } + } + companion object { @JvmStatic fun show(activity: AppCompatActivity, contentId: String) { diff --git a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackReasonAdapter.kt b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackReasonAdapter.kt index 30e96cb7ae..da9f8fdc57 100644 --- a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackReasonAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackReasonAdapter.kt @@ -30,9 +30,13 @@ class QaFeedbackReasonAdapter( if (holder is QaFeedbackReasonViewHolder) { holder.binding.reasonTv.apply { text = reason - background = if (mSelectPosition == position) R.drawable.qa_feedback_rg_button_checked.toDrawable() else - R.drawable.qa_feedback_rg_button_normal.toDrawable() - setTextColor(if (mSelectPosition == position) R.color.theme_font.toColor() else R.color.text_title.toColor()) + background = + if (mSelectPosition == position) R.drawable.qa_feedback_rg_button_checked.toDrawable(mContext) + else R.drawable.qa_feedback_rg_button_normal.toDrawable(mContext) + setTextColor( + if (mSelectPosition == position) R.color.theme_font.toColor(mContext) + else R.color.text_title.toColor(mContext) + ) } holder.binding.reasonTv.setOnClickListener { mSelectPosition = position diff --git a/app/src/main/res/drawable/bg_shape_white_radius_8.xml b/app/src/main/res/drawable/bg_shape_white_radius_8.xml index e3d1bdb280..8a9e9ee524 100644 --- a/app/src/main/res/drawable/bg_shape_white_radius_8.xml +++ b/app/src/main/res/drawable/bg_shape_white_radius_8.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/border_round_stroke_eee_4.xml b/app/src/main/res/drawable/border_round_stroke_eee_4.xml index 89417aa899..358e603295 100644 --- a/app/src/main/res/drawable/border_round_stroke_eee_4.xml +++ b/app/src/main/res/drawable/border_round_stroke_eee_4.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/qa_feedback_rg_button_checked.xml b/app/src/main/res/drawable/qa_feedback_rg_button_checked.xml index 99129fdc0a..bce6f2c049 100644 --- a/app/src/main/res/drawable/qa_feedback_rg_button_checked.xml +++ b/app/src/main/res/drawable/qa_feedback_rg_button_checked.xml @@ -2,7 +2,7 @@ - + - + + android:background="@color/background_white" /> + android:layout_height="match_parent" + android:background="@color/background_white"> + android:background="@color/background_white"> + android:background="@color/background_white"> + \ No newline at end of file diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index 374dc23412..014b5273ce 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -453,7 +453,7 @@ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d2d721c307..a8d89e279c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -453,7 +453,7 @@ From 9d4c6f660a32ee691ad52b7c69ca7010e7f9fa80 Mon Sep 17 00:00:00 2001 From: juntao Date: Wed, 11 May 2022 14:34:23 +0800 Subject: [PATCH 15/52] =?UTF-8?q?=E5=86=85=E8=81=94=20getter=20=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E7=A7=BB=E9=99=A4=E9=87=8D=E5=A4=8D=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/proguard-rules.txt | 3 +++ init.gradle | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt index 7b697e4cb6..bafd8161ff 100644 --- a/app/proguard-rules.txt +++ b/app/proguard-rules.txt @@ -14,6 +14,9 @@ } #--------- remove logs end ---------------- +# inline getter method +-allowaccessmodification + #--------- remove useless mtahelper class -------- -assumenosideeffects class com.gh.common.util.MtaHelper { public static void onEvent(...); diff --git a/init.gradle b/init.gradle index 7bc11978db..7414fa3bdd 100644 --- a/init.gradle +++ b/init.gradle @@ -26,6 +26,7 @@ allprojects { project -> classpath "com.bytedance.android.byteX:const-inline-plugin:${plugin_version}" classpath "com.bytedance.android.byteX:method-call-opt-plugin:${plugin_version}" classpath "com.bytedance.android.byteX:access-inline-plugin:${plugin_version}" + classpath "com.bytedance.android.byteX:field-assign-opt-plugin:${plugin_version}" } } repositories { @@ -47,6 +48,7 @@ allprojects { project -> project.apply plugin: 'bytex.const_inline' // inline 常量 https://github.com/bytedance/ByteX/blob/master/const-inline-plugin/README-zh.md project.apply plugin: 'bytex.method_call_opt' // 移除 log https://github.com/bytedance/ByteX/blob/master/method-call-opt-plugin/README-zh.md project.apply plugin: 'bytex.access_inline' // inline access https://github.com/bytedance/ByteX/blob/master/access-inline-plugin/README-zh.md + project.apply plugin: 'bytex.field_assign_opt' //去除重复的赋值 https://github.com/bytedance/ByteX/blob/master/field-assign-opt-plugin/README-zh.md project.const_inline { enable true @@ -106,6 +108,17 @@ allprojects { project -> enableInDebug false logLevel "DEBUG" } + + project.field_assign_opt { + enable false + enableInDebug false + logLevel "INFO" + removeLineNumber true // 同时移除赋值对应的行号信息(如果有的话),默认true。 + whiteList = [ + //白名单，ClassName.FieldName 。不支持模式匹配 + //"android.support.constraint.solver.ArrayRow.isSimpleDefinition" + ] + } } } From a15dd256f0606a4d98130ba157da062d84a90592 Mon Sep 17 00:00:00 2001 From: lyr Date: Wed, 11 May 2022 15:13:09 +0800 Subject: [PATCH 16/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2)=20https://git.shanqu.cc/h?= =?UTF-8?q?alo/android/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/gamecenter/collection/AnswerFragment.java | 5 ++++- .../gh/gamecenter/collection/ArticleFragment.java | 4 +++- .../collection/CommunityArticleFragment.kt | 4 +++- .../com/gh/gamecenter/history/HistoryActivity.kt | 14 ++++++++++++++ .../gamecenter/history/HistoryGameListFragment.kt | 11 ++++++----- app/src/main/res/values-night/styles.xml | 2 +- app/src/main/res/values/styles.xml | 2 +- 7 files changed, 32 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java b/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java index e563294d68..03b32fd1cd 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java @@ -47,7 +47,7 @@ public class AnswerFragment extends ListFragment public void onCreate(@Nullable Bundle savedInstanceState) { mType = getArguments().getString(EntranceUtils.KEY_TYPE, COLLECTION); super.onCreate(savedInstanceState); - mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.white)); + mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); } @Override @@ -101,6 +101,9 @@ public class AnswerFragment extends ListFragment @Override protected void onNightModeChange() { super.onNightModeChange(); + mCachedView.post(() -> { + mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); + }); if (mListRv != null && mListRv.getItemDecorationCount() > 0) { mListRv.removeItemDecorationAt(0); mListRv.addItemDecoration(getItemDecoration()); diff --git a/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java b/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java index bb8514b9c2..5ad7275ce9 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java @@ -125,7 +125,9 @@ public class ArticleFragment extends ListFragment @Override protected void onNightModeChange() { super.onNightModeChange(); - mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); + mCachedView.post(() -> { + mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); + }); if (mListRv != null && mListRv.getItemDecorationCount() > 0) { mListRv.removeItemDecorationAt(0); mListRv.addItemDecoration(getItemDecoration()); diff --git a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt index f66fe68783..a51788b066 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt @@ -87,7 +87,9 @@ class CommunityArticleFragment : ListFragment 0) { mListRv?.removeItemDecorationAt(0) mListRv?.addItemDecoration(itemDecoration) diff --git a/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt b/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt index ba2b90d0b6..7fe992c0a0 100644 --- a/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt @@ -4,10 +4,24 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.R class HistoryActivity: NormalActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) + } + + override fun isAutoResetViewBackgroundEnabled() = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { @JvmStatic fun getHistoryIntent(context: Context, entrance: String): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListFragment.kt b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListFragment.kt index b3f0b581cc..93707a9047 100644 --- a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListFragment.kt @@ -34,7 +34,7 @@ open class HistoryGameListFragment : ListFragment diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index a8d89e279c..d2d721c307 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -453,7 +453,7 @@ From 2d5a363215abf413d40649f85556c2ac0aa259dc Mon Sep 17 00:00:00 2001 From: lyr Date: Wed, 11 May 2022 16:20:27 +0800 Subject: [PATCH 17/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E4=B8=8E=E5=AE=89=E5=85=A8=E9=A1=B5=E9=9D=A2)=20https://git.sh?= =?UTF-8?q?anqu.cc/halo/android/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/gamecenter/security/BindPhoneFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt b/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt index ee4bd002d5..3e67844f70 100644 --- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt @@ -68,7 +68,7 @@ class BindPhoneFragment : NormalFragment() { it.setOnClickListener(this) } - mBinding.bindPhoneSkip.goneIf(!true) + mBinding.bindPhoneSkip.goneIf(!mFromLogin) mBinding.bindPhoneTitle.text = if (mChangePhone) requireContext().resources.getString(R.string.bind_phone_title2) else requireContext().resources.getString(R.string.bind_phone_title1) mBinding.bindPhoneDesc.text = if (mChangePhone) { From 5af3894ae3b8bc7c178c27d638bc4dd6bc1f4656 Mon Sep 17 00:00:00 2001 From: lyr Date: Wed, 11 May 2022 17:42:09 +0800 Subject: [PATCH 18/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E6=A8=A1=E6=8B=9F?= =?UTF-8?q?=E5=99=A8=E6=B8=B8=E6=88=8F=E9=A1=B5=E9=9D=A2)=20https://git.sh?= =?UTF-8?q?anqu.cc/halo/android/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simulatorgame/SimulatorGameActivity.kt | 10 ++++++ .../SimulatorManagementActivity.kt | 10 ++++++ .../SimulatorManagementAdapter.kt | 33 ++++++++++++++----- .../SimulatorManagementFragment.kt | 5 +++ .../res/drawable/dialog_app_updating_bg.xml | 2 +- .../res/layout/download_simulator_dialog.xml | 4 +-- .../res/layout/fragment_simulator_game.xml | 4 +-- .../res/layout/popup_simulator_uninstall.xml | 2 +- app/src/main/res/layout/simulator_item.xml | 2 +- app/src/main/res/values-night/colors.xml | 4 +-- 10 files changed, 58 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameActivity.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameActivity.kt index 97a2bdad5f..082f11c3ee 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameActivity.kt @@ -3,13 +3,23 @@ package com.gh.gamecenter.simulatorgame import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.R class SimulatorGameActivity : NormalActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle("模拟器游戏") + updateStatusBarColor(R.color.black, R.color.white) + } + + override fun isAutoResetViewBackgroundEnabled() = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt index f758a0b021..24fae637e8 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt @@ -3,13 +3,23 @@ package com.gh.gamecenter.simulatorgame import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.R class SimulatorManagementActivity : NormalActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle("模拟器管理") + updateStatusBarColor(R.color.black, R.color.white) + } + + override fun isAutoResetViewBackgroundEnabled() = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementAdapter.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementAdapter.kt index c9e1eeac84..1878c19823 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementAdapter.kt @@ -1,6 +1,7 @@ package com.gh.gamecenter.simulatorgame import android.content.Context +import android.util.Log import android.view.Gravity import android.view.View import android.view.ViewGroup @@ -52,10 +53,10 @@ class SimulatorManagementAdapter(context: Context, val versionFromInstalledApp = PackageUtils.getVersionNameByPackageName(simulator.apk?.packageName) shouldShowUpdate = Version(simulator.apk?.version).isHigherThan(versionFromInstalledApp) text = if (shouldShowUpdate) "更新" else "已安装" - setTextColor(if (shouldShowUpdate) R.color.theme.toColor() else R.color.text_subtitleDesc.toColor()) + setTextColor(if (shouldShowUpdate) R.color.theme.toColor(mContext) else R.color.text_subtitleDesc.toColor(mContext)) } else { text = "安装" - setTextColor(R.color.theme.toColor()) + setTextColor(R.color.theme.toColor(mContext)) } setOnClickListener { @@ -94,10 +95,10 @@ class SimulatorManagementAdapter(context: Context, } } - if (mSingleSelectFlag) { - holder.binding.container.setBackgroundResource(R.color.bg_F6FBFF) + if (mSingleSelectFlag && position == mSingleSelectedPosition) { + holder.binding.container.setBackgroundColor(R.color.bg_F6FBFF.toColor(mContext)) } else { - holder.binding.container.setBackgroundResource(R.color.white) + holder.binding.container.setBackgroundColor(R.color.background_white.toColor(mContext)) } holder.itemView.setOnClickListener { @@ -138,7 +139,7 @@ class SimulatorManagementAdapter(context: Context, "取消", confirmClickCallback = { unInstallSimulator() }, uiModificationCallback = { binding -> - binding.contentTv.setTextColor(R.color.text_title.toColor()) + binding.contentTv.setTextColor(R.color.text_title.toColor(mContext)) }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } @@ -172,12 +173,14 @@ class SimulatorManagementAdapter(context: Context, } - fun showUnInstallWindowAndSelectIv(show: Boolean) { + fun showUnInstallWindowAndSelectIv(show: Boolean, isFromUpdate: Boolean? = false) { mShowSelectFlag = show mSingleSelectFlag = false mSingleSelectedPosition = -1 - for (i in 0 until mSelectList.size) { - mSelectList[i] = false + if (isFromUpdate == false) { + for (i in 0 until mSelectList.size) { + mSelectList[i] = false + } } notifyDataSetChanged() dismissPopWindow(true) @@ -197,5 +200,17 @@ class SimulatorManagementAdapter(context: Context, } } + fun updatePopupWindow() { + if (mPopWindow != null && mPopWindow!!.isShowing) { + mPopWindow?.dismiss() + mPopWindow = null + if (mShowSelectFlag) { + showUnInstallWindowAndSelectIv(show = true, isFromUpdate = true) + } else { + showUnInstallWindow(mSingleSelectedPosition) + } + } + } + inner class SimulatorManagementViewHolder(val binding: SimulatorItemBinding) : BaseRecyclerViewHolder(binding.root) } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementFragment.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementFragment.kt index 642db6d12d..83364fb63c 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementFragment.kt @@ -77,4 +77,9 @@ class SimulatorManagementFragment : ListFragment() + + override fun onNightModeChange() { + super.onNightModeChange() + mAdapter?.updatePopupWindow() + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/dialog_app_updating_bg.xml b/app/src/main/res/drawable/dialog_app_updating_bg.xml index ac9845d098..acf9b061e9 100644 --- a/app/src/main/res/drawable/dialog_app_updating_bg.xml +++ b/app/src/main/res/drawable/dialog_app_updating_bg.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/layout/download_simulator_dialog.xml b/app/src/main/res/layout/download_simulator_dialog.xml index 23678f7002..edbaa177a0 100644 --- a/app/src/main/res/layout/download_simulator_dialog.xml +++ b/app/src/main/res/layout/download_simulator_dialog.xml @@ -13,7 +13,7 @@ android:layout_marginTop="48dp" android:layout_marginBottom="10dp" android:text="正在下载模拟器，请耐心等待" - android:textColor="@color/black" + android:textColor="@color/text_black" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -54,7 +54,7 @@ android:background="@drawable/app_updating_percent_bg" android:gravity="center_horizontal" android:paddingTop="2dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="13sp" app:layout_constraintBottom_toTopOf="@id/progress_anchor" app:layout_constraintLeft_toLeftOf="@id/progress_anchor" diff --git a/app/src/main/res/layout/fragment_simulator_game.xml b/app/src/main/res/layout/fragment_simulator_game.xml index 0999600d1f..0f35fbdb45 100644 --- a/app/src/main/res/layout/fragment_simulator_game.xml +++ b/app/src/main/res/layout/fragment_simulator_game.xml @@ -14,7 +14,7 @@ android:id="@+id/fragment_tab_container" android:layout_width="match_parent" android:layout_height="@dimen/tab_layout_height" - android:background="@color/white"> + android:background="@color/background_white"> diff --git a/app/src/main/res/layout/simulator_item.xml b/app/src/main/res/layout/simulator_item.xml index 383de5056a..7793a6d3e8 100644 --- a/app/src/main/res/layout/simulator_item.xml +++ b/app/src/main/res/layout/simulator_item.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@color/background_white" android:orientation="vertical"> @color/divider #FFC247 #FF9933 - #F4F5F6 + @color/background #CDF5F0 #80000000 #404040 @@ -191,7 +191,7 @@ #7CE7F8 #E6F8FA #91F0FD - #F6FBFF + #3AF6FBFF #50DCDC #81B5FF #20FFB5 From 2d651572d0a8fdc977213e4d0bb19524caae656b Mon Sep 17 00:00:00 2001 From: leafwai Date: Wed, 11 May 2022 17:55:52 +0800 Subject: [PATCH 19/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=A6=96=E9=A1=B5tab=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E5=88=87=E6=8D=A2=E5=8F=98=E8=89=B2=E5=BC=82=E5=B8=B8?= =?UTF-8?q?)=20https://git.shanqu.cc/halo/android/assistant-android/-/issu?= =?UTF-8?q?es/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/base/BaseActivity.java | 2 +- app/src/main/java/com/gh/gamecenter/MainActivity.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index 8945d5a1ff..cc4b8b9f37 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -570,7 +570,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy * * @param view 父 view */ - private void updateStaticViewBackground(View view) { + protected void updateStaticViewBackground(View view) { if (view instanceof ViewGroup) { for (int i = 0; i < ((ViewGroup) view).getChildCount(); i++) { View child = ((ViewGroup) view).getChildAt(i); diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 3e91730a04..dc51f116de 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -1036,4 +1036,10 @@ public class MainActivity extends BaseActivity { protected boolean isAutoResetViewBackgroundEnabled() { return true; } + + @Override + protected void updateStaticViewBackground(View view) { + if (mMainWrapperFragment.getCurrentItem() == MainWrapperFragment.INDEX_HOME) return; + super.updateStaticViewBackground(view); + } } From 1002e4b8080bf91faf221f11ae28e9fe2cbdc8e8 Mon Sep 17 00:00:00 2001 From: lyr Date: Wed, 11 May 2022 18:18:55 +0800 Subject: [PATCH 20/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E6=A8=A1=E6=8B=9F?= =?UTF-8?q?=E5=99=A8=E6=B8=B8=E6=88=8F=E9=A1=B5=E9=9D=A2)=20https://git.sh?= =?UTF-8?q?anqu.cc/halo/android/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/dialog_simulaor_game_guide.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/dialog_simulaor_game_guide.xml b/app/src/main/res/layout/dialog_simulaor_game_guide.xml index 019395e904..ed538b018a 100644 --- a/app/src/main/res/layout/dialog_simulaor_game_guide.xml +++ b/app/src/main/res/layout/dialog_simulaor_game_guide.xml @@ -10,6 +10,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="6dp" android:layout_marginRight="6dp" + app:cardBackgroundColor="@color/background_white" app:cardCornerRadius="12dp" app:cardElevation="0dp"> From f4f4807ce883e3a174acb3794d5d52fdaa4358c1 Mon Sep 17 00:00:00 2001 From: juntao Date: Thu, 12 May 2022 15:38:22 +0800 Subject: [PATCH 21/52] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8bbefb151d..62159d4ec2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,14 +43,8 @@ android { } defaultConfig { - vectorDrawables.useSupportLibrary = true multiDexEnabled true - javaCompileOptions { - annotationProcessorOptions { - arguments = [eventBusIndex: 'com.gh.EventBusIndex'] - } - } ndk { // 如果不添加 `arm64` 调用系统的 PackageManager 的方法读取安装包信息的时候会出现 native 层闪退，草 @@ -234,8 +228,6 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}" - kapt "org.greenrobot:eventbus-annotation-processor:${eventbusApt}" - implementation "com.google.android:flexbox:${flexbox}" implementation "pub.devrel:easypermissions:${easypermissions}" @@ -288,7 +280,9 @@ dependencies { compileOnly "com.github.axen1314.lancet:lancet-base:${lancet_version}" kapt "com.alibaba:arouter-compiler:$arouterVersion" - implementation project(':module_common') + implementation (project(':module_common')) { + exclude group: 'androidx.swiperefreshlayout' + } } File propFile = file('sign.properties') if (propFile.exists()) { @@ -544,4 +538,4 @@ project.afterEvaluate { } } } -} +} \ No newline at end of file From 96b92d9212439ab1b2cc0d36a1a332151171134e Mon Sep 17 00:00:00 2001 From: juntao Date: Thu, 12 May 2022 16:19:17 +0800 Subject: [PATCH 22/52] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/base/GHUmengNotificationService.kt | 229 ------------------ .../com/gh/common/LocalBroadcastReceiver.kt | 39 --- .../main/java/com/gh/common/PushManager.kt | 117 --------- .../java/com/gh/common/im/ImHintHelper.kt | 67 ----- .../main/java/com/gh/common/im/ImHintView.kt | 45 ---- .../main/java/com/gh/common/im/ImManager.kt | 145 ----------- .../main/java/com/gh/common/im/ImReceiver.kt | 68 ------ .../java/com/gh/common/util/AntiBotHelper.kt | 10 - .../java/com/gh/common/util/PushHelper.kt | 82 ------- .../gh/gamecenter/manager/UserManager.java | 5 - .../gh/gamecenter/user/UserRepository.java | 4 - 11 files changed, 811 deletions(-) delete mode 100644 app/src/main/java/com/gh/base/GHUmengNotificationService.kt delete mode 100644 app/src/main/java/com/gh/common/LocalBroadcastReceiver.kt delete mode 100644 app/src/main/java/com/gh/common/PushManager.kt delete mode 100644 app/src/main/java/com/gh/common/im/ImHintHelper.kt delete mode 100644 app/src/main/java/com/gh/common/im/ImHintView.kt delete mode 100644 app/src/main/java/com/gh/common/im/ImManager.kt delete mode 100644 app/src/main/java/com/gh/common/im/ImReceiver.kt delete mode 100644 app/src/main/java/com/gh/common/util/AntiBotHelper.kt delete mode 100644 app/src/main/java/com/gh/common/util/PushHelper.kt diff --git a/app/src/main/java/com/gh/base/GHUmengNotificationService.kt b/app/src/main/java/com/gh/base/GHUmengNotificationService.kt deleted file mode 100644 index a7a1e0ccd7..0000000000 --- a/app/src/main/java/com/gh/base/GHUmengNotificationService.kt +++ /dev/null @@ -1,229 +0,0 @@ -//package com.gh.base -// -//import android.app.Notification -//import android.app.NotificationChannel -//import android.app.NotificationManager -//import android.app.PendingIntent -//import android.content.Context -//import android.content.Intent -//import android.os.Build -//import android.os.Bundle -//import android.preference.PreferenceManager -//import android.text.TextUtils -//import android.view.View -//import androidx.core.app.NotificationCompat -//import androidx.core.text.htmlEncode -//import com.gh.common.notifier.Notifier -//import com.gh.common.util.* -//import com.gh.gamecenter.R -//import com.gh.gamecenter.entity.PushEntity -//import com.gh.gamecenter.entity.PushMessageEntity -//import com.gh.gamecenter.entity.PushMessageUnreadEntity -//import com.gh.gamecenter.entity.PushNotificationEntity -//import com.gh.gamecenter.manager.UserManager -//import com.gh.gamecenter.message.MessageUnreadRepository -//import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity -//import com.gh.gamecenter.receiver.UmengMessageReceiver -//import com.gh.gamecenter.receiver.UmengMessageReceiver.Companion.TYPE_CLICK -//import com.gh.gamecenter.receiver.UmengMessageReceiver.Companion.TYPE_REMOVE -//import com.gh.gamecenter.retrofit.Response -//import com.gh.gamecenter.retrofit.RetrofitManager -//import com.google.gson.Gson -//import com.umeng.message.UmengMessageService -//import io.reactivex.android.schedulers.AndroidSchedulers -//import io.reactivex.schedulers.Schedulers -//import okhttp3.MediaType -//import okhttp3.RequestBody -//import okhttp3.ResponseBody -//import org.android.agoo.common.AgooConstants -//import org.json.JSONObject -//import retrofit2.HttpException -//import java.util.* -// -//class GHUmengNotificationService : UmengMessageService() { -// -// companion object { -// const val ACTION_UMENG = "com.gh.gamecenter.UMENG" -// const val MESSAGE_FROM_SYSTEM = "message_from_system" -// const val HALO_MESSAGE_DIALOG = "HALO_MESSAGE_DIALOG" -// const val HALO_MESSAGE_CENTER = "HALO_MESSAGE_CENTER" -// const val ANSWER = "answer" -// const val FOLLOW_QUESTION = "follow_question" -// const val NOTIFICATION_ID = 2015 -// const val DISPLAY_TYPE_NOTIFICATION = "notification" -// const val DISPLAY_TYPE_CUSTOM = "custom" -// const val MESSAGE_ID = "message_id" -// const val NOTIFICATION_MESSAGE_ID = "notification_message_id" // 通知中心消息 ID -// const val PUSH_ID = "push_id" -// } -// -// val notificationTags = arrayOf("GH_UMENG_TAG_1", "GH_UMENG_TAG_2", "GH_UMENG_TAG_3") -// val gson = Gson() -// -// override fun onMessage(context: Context, intent: Intent) { -// val message = intent.getStringExtra(AgooConstants.MESSAGE_BODY) -// val isMessageFromSystem = intent.getBooleanExtra(MESSAGE_FROM_SYSTEM, false) -// -// try { -// val pushData = message.toObject() -// pushData?.let { handlePushData(context, it, message, isMessageFromSystem) } -// } catch (e: Exception) { -// e.printStackTrace() -// } -// } -// -// private fun handlePushData(context: Context, pushData: PushEntity, message: String, isMessageFromSystem: Boolean) { -// val notificationManager = context.applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager -// -// if (pushData.displayType == DISPLAY_TYPE_NOTIFICATION) { -// // 其它类型的透传信息 -// // 显示到通知栏 -// val msg = message.toObject() -// val data = msg?.extra?.data -// -// // 系统推送(非自定义信息)，直接处理跳转 -// if (isMessageFromSystem) { -// val intent = Intent() -// intent.setClass(context, UmengMessageReceiver::class.java) -// intent.putExtra(EntranceUtils.KEY_DATA, data?.link) -// intent.putExtra(EntranceUtils.KEY_TYPE, UmengMessageReceiver.DIRECT_ONLY) -// intent.putExtra(EntranceUtils.KEY_MESSAGE, message) -// intent.putExtra(NOTIFICATION_MESSAGE_ID, data?.messageId) -// context.sendBroadcast(intent) -// return -// } -// -// // 用户未登录的情况下不生成消息中心通知，避免用户掉登录了还收到跳转至消息中心的通知 -// if (data != null -// && data.link?.link == "system" -// && !UserManager.getInstance().isLoggedIn) { -// return -// } -// -// val clickIntent = Intent() -// val removeIntent = Intent() -// -// clickIntent.setClass(context, UmengMessageReceiver::class.java) -// clickIntent.putExtra(EntranceUtils.KEY_DATA, data?.link) -// clickIntent.putExtra(EntranceUtils.KEY_MESSAGE, message) -// clickIntent.putExtra(MESSAGE_ID, msg?.msgId) -// clickIntent.putExtra(PUSH_ID, data?.pushId) -// clickIntent.putExtra(NOTIFICATION_MESSAGE_ID, data?.messageId) -// clickIntent.putExtra(EntranceUtils.KEY_TYPE, TYPE_CLICK) -// -// removeIntent.setClass(context, UmengMessageReceiver::class.java) -// removeIntent.putExtra(EntranceUtils.KEY_TYPE, TYPE_REMOVE) -// removeIntent.putExtra(EntranceUtils.KEY_MESSAGE, message) -// -// val clickPendingIntent = PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt(), -// clickIntent, PendingIntent.FLAG_UPDATE_CURRENT) -// -// val deletePendingIntent = PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt() + 1, -// removeIntent, PendingIntent.FLAG_UPDATE_CURRENT) -// -// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { -// val channel = NotificationChannel("Halo_Push", "Halo_Push", NotificationManager.IMPORTANCE_DEFAULT) -// notificationManager.createNotificationChannel(channel) -// } -// -// val notification = NotificationCompat.Builder(context, "Halo_Push") -// .setSmallIcon(R.drawable.ic_notification) -// .setTicker(pushData.body?.ticker) -// .setContentTitle(pushData.body?.title) -// .setContentText(pushData.body?.text?.fromHtml()) -// .setContentIntent(clickPendingIntent) -// .setDeleteIntent(deletePendingIntent) -// .build() -// notification.flags = notification.flags or Notification.FLAG_AUTO_CANCEL -// -// notificationManager.notify(getNotificationTag(context), NOTIFICATION_ID, notification) -// } else { -// if (UserManager.getInstance().isLoggedIn && -// HALO_MESSAGE_DIALOG == pushData.body?.custom && -// MessageUnreadRepository.unreadLiveData.value != null) { -// // 回答了问题或者关注了问题的消息 -// val msg = gson.fromJson(message, PushMessageEntity::class.java) -// val data = msg?.extra?.data -// -// val type = if (ANSWER == data?.type) { -// "回答了你的问题" -// } else { -// "回答了你关注的问题" -// } -// -// val userName = StringUtils.shrinkStringWithDot(data?.userEntity?.name, 8) -// val displayText = userName + type -// -// if (Notifier.isActivityValid(CurrentActivityHolder.getCurrentActivity()) && -// Notifier.shouldShowNotifier(data?.answer?.id + displayText)) { -// Notifier.create(CurrentActivityHolder.getCurrentActivity()) -// .setText(displayText) -// .setDuration(5000) -// .setIcon(data?.userEntity?.icon) -// .setOnClickListener(View.OnClickListener { -// val bundle = Bundle() -// bundle.putString(EntranceUtils.KEY_ANSWER_ID, data?.answer?.id) -// bundle.putString(EntranceUtils.KEY_ENTRANCE, EntranceUtils.ENTRANCE_UMENG) -// bundle.putString(EntranceUtils.KEY_TO, AnswerDetailActivity::class.java.name) -// EntranceUtils.jumpActivity(context, bundle) -// -// MtaHelper.onEvent("消息弹窗", type, "Does not contains any parameter.") -// -// // 标记已读 -// val jsonObject = JSONObject() -// jsonObject.put("type", type) -// val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()) -// -// RetrofitManager.getInstance().api.postMessageRead(UserManager.getInstance().userId, data?.id, body) -// .subscribeOn(Schedulers.io()) -// .observeOn(AndroidSchedulers.mainThread()) -// .subscribe(object : Response() { -// override fun onResponse(response: ResponseBody?) { -// super.onResponse(response) -// MessageUnreadRepository.loadMessageUnreadData() -// } -// -// override fun onFailure(e: HttpException?) { -// e?.printStackTrace() -// } -// }) -// Notifier.hide() -// }) -// .show(false) -// Notifier.tagNotifierAsShowed(data?.answer?.id + displayText) -// } -// } else if (HALO_MESSAGE_CENTER == pushData.body?.custom) { -// // 消息中心逻辑 -// val msg = gson.fromJson(message, PushMessageUnreadEntity::class.java) -// val data = msg?.extra?.data -// data?.let { MessageUnreadRepository.loadMessageUnreadData() } -// } -// } -// } -// -// /** -// * 规则:最多三条消息,以旧换新 -// * -// * @return NotificationTag -// */ -// private fun getNotificationTag(context: Context): String { -// val sp = PreferenceManager.getDefaultSharedPreferences(context) -// val edit = sp.edit() -// -// val timeTagMap = HashMap() -// for (tag in notificationTags) { -// val time = sp.getLong(tag, 0) -// if (time == 0L) { -// edit.putLong(tag, System.currentTimeMillis()).apply() -// return tag -// } else { -// timeTagMap[time] = tag -// } -// } -// -// val minTime = Collections.min(timeTagMap.keys) -// val tag = timeTagMap[minTime] -// edit.putLong(tag, System.currentTimeMillis()).apply() -// return if (TextUtils.isEmpty(tag)) notificationTags[0] else tag!! -// } -//} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/LocalBroadcastReceiver.kt b/app/src/main/java/com/gh/common/LocalBroadcastReceiver.kt deleted file mode 100644 index b580dff689..0000000000 --- a/app/src/main/java/com/gh/common/LocalBroadcastReceiver.kt +++ /dev/null @@ -1,39 +0,0 @@ -//package com.gh.common -// -//import android.content.BroadcastReceiver -//import android.content.Context -//import android.content.Intent -//import com.gh.common.im.ImManager -//import com.gh.gamecenter.manager.UserManager -//import com.gh.gamecenter.retrofit.RetrofitManager -//import com.halo.assistant.HaloApp -//import com.m7.imkfsdk.chat.ChatActivity -//import io.reactivex.schedulers.Schedulers -// -///** -// * 可使用 [LocalBroadcastManager] 来进行简单的模块间消息通知 -// */ -// -//class LocalBroadcastReceiver : BroadcastReceiver() { -// -// override fun onReceive(context: Context?, intent: Intent?) { -// intent?.let { -// when (intent.action) { -// ChatActivity.ACTION_DISMISS_FLOATING_WINDOW -> { -// ImManager.dismissFloatingWindow() -// -// RetrofitManager.getInstance().api.postImEnding(UserManager.getInstance().userId) -// .subscribeOn(Schedulers.io()) -// .subscribe() -// } -// -// ChatActivity.ACTION_HIDE_UNREAD_DOT -> { -// ImManager.updateShouldShowFloatingWindowDot(false) -// } -// -// else -> return -// } -// } -// } -// -//} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/PushManager.kt b/app/src/main/java/com/gh/common/PushManager.kt deleted file mode 100644 index 1d62cff140..0000000000 --- a/app/src/main/java/com/gh/common/PushManager.kt +++ /dev/null @@ -1,117 +0,0 @@ -package com.gh.common - -import android.annotation.SuppressLint -import com.gh.gamecenter.entity.AliasEntity -import com.halo.assistant.HaloApp - -object PushManager { - - var deviceToken: String? = "" - - private var mPreviousAlias: AliasEntity? = null - private var mApplication = HaloApp.getInstance().application - - const val SP_PUSH_ALIAS = "push_alias" - - @JvmStatic - fun init(channel: String) { -// tryWithDefaultCatch { -// //初始化友盟推送 -// UMConfigure.init(mApplication, Config.UMENG_APPKEY, channel, UMConfigure.DEVICE_TYPE_PHONE, Config.UMENG_MESSAGE_SECRET) -// -// val pushAgent = PushAgent.getInstance(mApplication) -// -// runOnIoThread { registerDevice() } -// -// // 注册小米、华为和魅族通道 -// MiPushRegistar.register(mApplication, Config.MIPUSH_APPID, Config.MIPUSH_APPKEY) -// HuaWeiRegister.register(mApplication) -// MeizuRegister.register(mApplication, BuildConfig.MEIZUPUSH_APPID, BuildConfig.MEIZUPUSH_APPKEY) -// -// val aliasInSp = PreferenceManager.getDefaultSharedPreferences(mApplication).getString(SP_PUSH_ALIAS, "") -// mPreviousAlias = aliasInSp?.toObject() -// -// if (mPreviousAlias == null) { -// getAndSetAlias() -// } -// -// // 完全自定义处理（透传） -// pushAgent.setPushIntentServiceClass(GHUmengNotificationService::class.java) -// } - } - - private fun registerDevice() { -// PushAgent.getInstance(mApplication).register(object : IUmengRegisterCallback { -// override fun onSuccess(dToken: String) { -// //注册成功会返回device token -// deviceToken = dToken -// getAndSetAlias() -// Utils.log("deviceToken::$dToken") -// } -// -// override fun onFailure(s: String, s1: String) { -// Utils.log("deviceToken::" + "注册失败") -// } -// }) - } - - @SuppressLint("CheckResult") - @JvmStatic - fun getAndSetAlias() { -// if (deviceToken.isNullOrEmpty()) { -// registerDevice() -// return -// } -// -// val meta = MetaUtil.getMeta() -// -// val jsonObject = JSONObject() -// jsonObject.put("device_token", deviceToken) -// jsonObject.put("imei", meta.imei) -// jsonObject.put("android_id", meta.android_id) -// jsonObject.put("model", meta.model) -// jsonObject.put("manufacturer", meta.manufacturer) -// jsonObject.put("os", meta.os) -// jsonObject.put("os_version", meta.android_version) -// jsonObject.put("mac", meta.mac) -// jsonObject.put("gid", meta.gid) -// -// val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()) -// -// RetrofitManager.getInstance().api.getAlias(body) -// .subscribeOn(Schedulers.io()) -// .subscribe( -// { setAlias(it) }, -// { it.printStackTrace() } -// ) - } - - @JvmStatic - fun setAlias(alias: AliasEntity) { -// val pushAgent = PushAgent.getInstance(mApplication) -// -// mPreviousAlias = alias -// PreferenceManager.getDefaultSharedPreferences(mApplication).edit { -// putString(SP_PUSH_ALIAS, mPreviousAlias?.toJson()) -// } -// -// pushAgent.setAlias(alias.alias, alias.aliasType) { b, s -> -// Utils.log("注册别名 $b + $s") -// } - } - - @JvmStatic - fun deleteAlias() { -// val pushAgent = PushAgent.getInstance(mApplication) -// -// mPreviousAlias?.let { -// pushAgent.deleteAlias(it.alias, it.aliasType) { b, s -> -// Utils.log("删除别名 $b + $s") -// } -// } -// PreferenceManager.getDefaultSharedPreferences(mApplication).edit { -// putString(SP_PUSH_ALIAS, "") -// } -// mPreviousAlias = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/im/ImHintHelper.kt b/app/src/main/java/com/gh/common/im/ImHintHelper.kt deleted file mode 100644 index 0626ae338c..0000000000 --- a/app/src/main/java/com/gh/common/im/ImHintHelper.kt +++ /dev/null @@ -1,67 +0,0 @@ -//package com.gh.common.im -// -//import android.app.Activity -//import androidx.core.view.ViewCompat -//import android.view.View -//import android.view.ViewGroup -// -//object ImHintHelper { -// -// @JvmStatic -// fun show(activity: Activity?) { -// activity?.let { -// var hintView = retrieveHintViewFromActivity(it) -// if (hintView == null) { -// hintView = ImHintView(it) -// hintView.showDot(ImManager.shouldShowFloatingWindowDot) -// -// val decorView = it.window.decorView as ViewGroup -// it.runOnUiThread { -// decorView.addView(hintView) -// } -// } else { -// hintView.showDot(ImManager.shouldShowFloatingWindowDot) -// } -// } -// } -// -// @JvmStatic -// fun dismiss(activity: Activity?) { -// activity?.let { -// clearCurrent(it) -// } -// } -// -// private fun retrieveHintViewFromActivity(activity: Activity?) : ImHintView? { -// (activity?.window?.decorView as? ViewGroup)?.let { -// for (i in 0..it.childCount) { -// val childView = if (it.getChildAt(i) is ImHintView) it.getChildAt(i) as ImHintView else null -// if (childView != null && childView.windowToken != null) { -// return childView -// } -// } -// return null -// } -// return null -// } -// -// private fun clearCurrent(activity: Activity?) { -// (activity?.window?.decorView as? ViewGroup)?.let { -// for (i in 0..it.childCount) { -// val childView = if (it.getChildAt(i) is ImHintView) it.getChildAt(i) as ImHintView else null -// if (childView != null && childView.windowToken != null) { -// ViewCompat.animate(childView).alpha(0f).withEndAction(getRemoveViewRunnable(childView)) -// } -// } -// } -// } -// -// private fun getRemoveViewRunnable(childView: View?): Runnable { -// return Runnable { -// childView?.let { -// (childView.parent as? ViewGroup)?.removeView(childView) -// } -// } -// } -// -//} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/im/ImHintView.kt b/app/src/main/java/com/gh/common/im/ImHintView.kt deleted file mode 100644 index 4f98a73259..0000000000 --- a/app/src/main/java/com/gh/common/im/ImHintView.kt +++ /dev/null @@ -1,45 +0,0 @@ -//package com.gh.common.im -// -//import android.app.Activity -//import android.content.Context -//import android.util.AttributeSet -//import android.util.TypedValue -//import android.view.View -//import android.widget.RelativeLayout -//import androidx.core.view.ViewCompat -//import com.gh.gamecenter.core.utils.DisplayUtils -//import com.gh.gamecenter.R -//import kotlinx.android.synthetic.main.view_im_hint.view.* -// -//class ImHintView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) -// : RelativeLayout(context, attrs, defStyle) { -// -// init { -// inflate(context, R.layout.view_im_hint, this) -// -// ViewCompat.setTranslationZ(this, Integer.MAX_VALUE.toFloat() - 1) -// -// ivContainer.setOnClickListener { -// if (context is Activity) { -// ImManager.startChatActivity(context) -// ImManager.removeNotification() -// } -// } -// -// val lp = ivContainer.layoutParams as RelativeLayout.LayoutParams -// -// lp.setMargins(0, 0, dp2px(30f), dp2px(106f) + DisplayUtils.retrieveNavigationHeight(context)) -// } -// -// fun showDot(show: Boolean) { -// if (show) { -// unreadDot.visibility = View.VISIBLE -// } else { -// unreadDot.visibility = View.GONE -// } -// } -// -// private fun dp2px(dp: Float): Int { -// return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, context.applicationContext.resources.displayMetrics).toInt() -// } -//} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/im/ImManager.kt b/app/src/main/java/com/gh/common/im/ImManager.kt deleted file mode 100644 index 1569b5bf59..0000000000 --- a/app/src/main/java/com/gh/common/im/ImManager.kt +++ /dev/null @@ -1,145 +0,0 @@ -package com.gh.common.im - -import android.app.Activity -import com.gh.gamecenter.HelpAndFeedbackActivity -import com.gh.gamecenter.MainActivity -import com.gh.gamecenter.MessageActivity - -object ImManager { - - const val IM_KEY = "893be270-9c75-11e8-a344-212975ba32b9" - const val SP_FLOATING_WINDOW_KEY = "IM_FLOATING_WINDOW" - const val SP_FLOATING_WINDOW_DOT_KEY = "IM_FLOATING_WINDOW_DOT" - - var shouldShowFloatingWindow = false - var shouldShowFloatingWindowDot = false - - // 记录当前用户 ID 避免重复初始化 - var currentUserId = "" - - @JvmStatic - fun attachIm() { -// try { -// if (UserManager.getInstance().userInfoEntity != null && -// currentUserId != UserManager.getInstance().userId) { -// currentUserId = UserManager.getInstance().userId -// MoorUtils.init(HaloApp.getInstance().application) -// Utils.init(HaloApp.getInstance().application) -// IMChatManager.getInstance().init( -// HaloApp.getInstance().application, -// ImReceiver.UNIQUE_BROADCAST_ACTION, -// IM_KEY, -// UserManager.getInstance().userInfoEntity?.name + "(" + UserManager.getInstance().userId + ")", -// UserManager.getInstance().userId) -// -// shouldShowFloatingWindow = SPUtils.getBoolean(SP_FLOATING_WINDOW_KEY + UserManager.getInstance().userId) -// shouldShowFloatingWindowDot = SPUtils.getBoolean(SP_FLOATING_WINDOW_DOT_KEY + UserManager.getInstance().userId) -// updateFloatingWindow() -// } -// } catch (e: Exception) { -// e.printStackTrace() -// } - } - - @JvmStatic - fun detachIm() { -// try { -// IMChatManager.getInstance().quitSDk() -// shouldShowFloatingWindow = false -// updateFloatingWindow() -// removeNotification() -// } catch (e: Exception) { -// e.printStackTrace() -// } - } - - @JvmStatic - fun startChatActivity(activity: Activity, inputContent: String? = "", requestCode: Int? = null) { -// if (!UserManager.getInstance().userId.isNullOrEmpty()) { -// try { -// SPUtils.setBoolean(SP_FLOATING_WINDOW_DOT_KEY + UserManager.getInstance().userId, false) -// shouldShowFloatingWindowDot = false -// val chatHelper = KfStartHelper(activity, UserManager.getInstance().userInfoEntity?.icon, inputContent, requestCode) -// chatHelper.initSdkChat( -// ImReceiver.UNIQUE_BROADCAST_ACTION, -// IM_KEY, -// UserManager.getInstance().userInfoEntity?.name + "(" + UserManager.getInstance().userId + ")" -// + "[" + BuildConfig.VERSION_NAME + "]", -// UserManager.getInstance().userId) -// } catch (e: Exception) { -// e.printStackTrace() -// } -// } - } - - @JvmStatic - fun showFloatingWindow() { - updateShouldShowFloatingWindow(true) - updateShouldShowFloatingWindowDot(true) - updateFloatingWindow() - } - - @JvmStatic - fun dismissFloatingWindow() { - updateShouldShowFloatingWindow(false) - updateShouldShowFloatingWindowDot(false) - updateFloatingWindow() - } - - @JvmStatic - fun removeNotification() { -// val notificationManager = HaloApp.getInstance().application?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager -// notificationManager.cancel(ImReceiver.NOTIFICATION_ID) - } - - @JvmStatic - fun updateFloatingWindow() { -// try { -// CurrentActivityHolder.getCurrentActivity()?.let { -// if (isActivityValid(it)) { -// if (shouldShowFloatingWindow) { -// ImHintHelper.show(it) -// } else { -// ImHintHelper.dismiss(it) -// removeNotification() -// } -// } -// } -// } catch (e: Exception) { -// e.printStackTrace() -// } - } - - @JvmStatic - fun sendFeedbackMessage(message: String) { -// val fromToMessage = IMMessage.createTxtMessage(message) -// runOnIoThread { -// tryWithDefaultCatch { -// IMChat.getInstance().sendMessage(fromToMessage, object : ChatListener { -// override fun onProgress(p0: Int) {} -// override fun onSuccess() {} -// override fun onFailed() {} -// }) -// } -// } - } - - fun updateShouldShowFloatingWindow(show: Boolean) { -// SPUtils.setBoolean(SP_FLOATING_WINDOW_KEY + UserManager.getInstance().userId, show) -// shouldShowFloatingWindow = show - } - - fun updateShouldShowFloatingWindowDot(show: Boolean) { -// SPUtils.setBoolean(SP_FLOATING_WINDOW_DOT_KEY + UserManager.getInstance().userId, show) -// shouldShowFloatingWindowDot = show - } - - private fun isActivityValid(activity: Activity): Boolean { - return when (activity) { - is MainActivity -> true - is HelpAndFeedbackActivity -> true - is MessageActivity -> true - else -> false - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/im/ImReceiver.kt b/app/src/main/java/com/gh/common/im/ImReceiver.kt deleted file mode 100644 index e85974ed5c..0000000000 --- a/app/src/main/java/com/gh/common/im/ImReceiver.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.gh.common.im - -import android.app.NotificationManager -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent - -class ImReceiver : BroadcastReceiver() { - - companion object { - const val UNIQUE_BROADCAST_ACTION = "com.gh.im" - const val NOTIFICATION_ID: Int = 987321 - } - - var notificationManager: NotificationManager? = null - - override fun onReceive(context: Context?, intent: Intent?) { -// context?.doOnMainProcessOnly { -// intent?.let { -// if (intent.action == IMChatManager.NEW_MSG_ACTION) { -// notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager -// // 判断 ImActivity 是否在最顶端 -// if (CurrentActivityHolder.getCurrentActivity() is ChatActivity) { -// ImManager.showFloatingWindow() -// ImManager.updateShouldShowFloatingWindowDot(false) -// } else { -// val contentIntent = Intent(Utils.getApp(), ChatActivity::class.java) -// -// contentIntent.putExtra("PeerId", "") -// contentIntent.putExtra("type", "peedId") -// -// contentIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK -// val resultPendingIntent = PendingIntent.getActivity( -// Utils.getApp(), -// 0, -// contentIntent, -// PendingIntent.FLAG_UPDATE_CURRENT -// ) -// -// // 新的通知 -// val builder = NotificationCompat.Builder(Utils.getApp(), "Halo_IM") -// val notification = builder.setTicker("您有新的消息") -// .setDefaults(Notification.DEFAULT_ALL) -// .setSmallIcon(R.drawable.ic_notification) -// .setWhen(System.currentTimeMillis()) -// .setContentIntent(resultPendingIntent) -// .setContentTitle("光环助手客服回复") -// .setContentText("您有新的消息") -// .setAutoCancel(true) -// .build() -// -// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { -// val channel = NotificationChannel("Halo_IM", "Halo_IM", NotificationManager.IMPORTANCE_DEFAULT) -// notificationManager?.createNotificationChannel(channel) -// } -// -// if (notification != null) { -// notificationManager?.notify(NOTIFICATION_ID, notification) -// ImManager.showFloatingWindow() -// } -// } -// } else if (intent.action == IMChatManager.FINISH_ACTION) { -// ImManager.dismissFloatingWindow() -// } -// } -// } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/util/AntiBotHelper.kt b/app/src/main/java/com/gh/common/util/AntiBotHelper.kt deleted file mode 100644 index c7bfccd1c7..0000000000 --- a/app/src/main/java/com/gh/common/util/AntiBotHelper.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.gh.common.util - -object AntiBotHelper { -// @JvmStatic -// val manager by lazy { -// SecurityGuardManager.getInstance(HaloApp.getInstance().application).getInterface(IJAQAVMPSignComponent::class.java).apply { -// this.initialize() -// } -// } -} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/util/PushHelper.kt b/app/src/main/java/com/gh/common/util/PushHelper.kt deleted file mode 100644 index 486344701d..0000000000 --- a/app/src/main/java/com/gh/common/util/PushHelper.kt +++ /dev/null @@ -1,82 +0,0 @@ -//package com.gh.common.util -// -//import android.annotation.SuppressLint -//import android.content.Context -//import com.gh.gamecenter.manager.UserManager -//import com.gh.gamecenter.message.MessageUnreadRepository -//import com.gh.gamecenter.receiver.UmengMessageReceiver -//import com.gh.gamecenter.retrofit.BiResponse -//import com.gh.gamecenter.retrofit.Response -//import com.gh.gamecenter.retrofit.RetrofitManager -//import io.reactivex.schedulers.Schedulers -//import okhttp3.MediaType -//import okhttp3.RequestBody -//import okhttp3.ResponseBody -//import org.json.JSONObject -//import retrofit2.HttpException -// -//object PushHelper { -// -// /** -// * 提交推送点击事件，会尝试从 SP 读取之前失败的一并提交 -// */ -// @SuppressLint("CheckResult") -// @JvmStatic -// fun postPushClickAction(context: Context, clickEvent: UmengMessageReceiver.ClickEvent? = null) { -// val clickEventList = arrayListOf() -// -// clickEvent?.let { clickEventList.add(it) } -// -// val failedClickEventList = SPUtils.getString(UmengMessageReceiver.SP_CLICK_EVENT) -// .toObject>() -// -// failedClickEventList?.let { clickEventList.addAll(it) } -// -// // 没有要提交的事件 -// if (clickEventList.size == 0) return -// -// val body = RequestBody.create(MediaType.parse("application/json"), clickEventList.toJson()) -// -// RetrofitManager.getInstance() -// .api -// .postUmengReceiveInfo(body) -// .subscribeOn(Schedulers.io()) -// .subscribe(object : BiResponse() { -// override fun onSuccess(data: ResponseBody) { -// SPUtils.setString(UmengMessageReceiver.SP_CLICK_EVENT, "") -// } -// -// override fun onFailure(exception: Exception) { -// SPUtils.setString(UmengMessageReceiver.SP_CLICK_EVENT, clickEventList.toJson()) -// } -// }) -// } -// -// -// /** -// * 将消息中心的消息标记为已读 -// * [type] 跳转类型 -// * [notificationMessageId] 通知中心 ID -// */ -// fun setNotificationMessageRead(context: Context, type: String, notificationMessageId: String) { -// -// val jsonObject = JSONObject() -// jsonObject.put("type", type) -// val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()) -// -// RetrofitManager.getInstance() -// .api -// .postMessageRead(UserManager.getInstance().userId, notificationMessageId, body) -// .subscribeOn(Schedulers.io()) -// .subscribe(object : Response() { -// override fun onResponse(response: ResponseBody?) { -// super.onResponse(response) -// MessageUnreadRepository.loadMessageUnreadData() -// } -// -// override fun onFailure(e: HttpException?) { -// e?.printStackTrace() -// } -// }) -// } -//} \ No newline at end of file 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 dc53465cb4..7d88726b1e 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UserManager.java @@ -9,7 +9,6 @@ import android.text.TextUtils; import androidx.annotation.Nullable; import com.gh.base.BaseActivity; -import com.gh.common.PushManager; import com.gh.gamecenter.common.constant.Constants; import com.gh.gamecenter.common.exposure.meta.MetaUtil; import com.gh.common.repository.ReservationRepository; @@ -181,10 +180,6 @@ public class UserManager { refreshUserInfo(callBack); - // 更新 Access Token 后更新推送别名 - PushManager.getAndSetAlias(); -// ImManager.attachIm(); - // 更新用户预约的游戏列表 ReservationRepository.refreshReservations(); 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 fffd95bc6a..c346b2f8d5 100644 --- a/app/src/main/java/com/gh/gamecenter/user/UserRepository.java +++ b/app/src/main/java/com/gh/gamecenter/user/UserRepository.java @@ -12,7 +12,6 @@ import androidx.annotation.Nullable; import androidx.lifecycle.LiveData; import androidx.lifecycle.MediatorLiveData; -import com.gh.common.PushManager; import com.gh.gamecenter.common.constant.Constants; import com.gh.gamecenter.common.exposure.meta.MetaUtil; import com.gh.common.repository.ReservationRepository; @@ -140,8 +139,6 @@ public class UserRepository { SPUtils.setString(mPreferences, Constants.USER_INFO_KEY, null); SPUtils.setString(Constants.SP_REGULATION_TEST_PASS_STATUS, ""); -// ImManager.detachIm(); - PushManager.deleteAlias(); ReservationRepository.clearReservations(); GameSubstituteRepositoryHelper.updateSubstitutableGames(); @@ -239,7 +236,6 @@ public class UserRepository { userTokenHandle(response, loginTag); - PushManager.getAndSetAlias(); GameSubstituteRepositoryHelper.updateSubstitutableGames(); WechatBindHelper.getWechatConfig(null); From 8ae7ef421ce41b8854ddcca9f251af79c98b7bc9 Mon Sep 17 00:00:00 2001 From: lyr Date: Thu, 12 May 2022 16:56:09 +0800 Subject: [PATCH 23/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E9=A1=B5=E9=9D=A2)=20https://git.shanqu.cc/h?= =?UTF-8?q?alo/android/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/common/util/DownloadItemUtils.kt | 4 +- .../com/gh/gamecenter/ConcernActivity.java | 18 ++++++++ .../mygame/MyFollowedGameAdapter.kt | 43 ++++++++++++------- .../mygame/MyFollowedGameFragment.kt | 20 ++++++--- .../gh/gamecenter/mygame/MyGameActivity.kt | 9 ++++ .../gamecenter/mygame/MyPlayedGameFragment.kt | 11 ++--- .../gamecenter/mygame/MyReservationAdapter.kt | 41 ++++++++++++------ .../mygame/MyReservationFragment.kt | 16 ++++--- .../gh/gamecenter/mygame/PlayedGameAdapter.kt | 10 ++++- .../fragment/myconcern/MyConcernAdapter.java | 6 ++- .../fragment/myconcern/MyConcernFragment.java | 8 ++++ .../myconcern/MyConcernRecommendAdapter.java | 4 +- app/src/main/res/drawable/round_white_bg.xml | 2 +- .../layout/activity_tablayout_viewpager.xml | 41 +++++++++--------- app/src/main/res/layout/fragment_concern.xml | 9 ++-- .../res/layout/fragment_followed_game.xml | 6 +-- .../main/res/layout/item_followed_game.xml | 5 ++- .../res/layout/layout_played_game_remove.xml | 2 +- 18 files changed, 175 insertions(+), 80 deletions(-) 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 d4b3aff440..47f08c938f 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt @@ -117,8 +117,8 @@ object DownloadItemUtils { // 已预约 holder.gameDownloadBtn.visibility = View.VISIBLE holder.gameDownloadBtn.text = "已预约" - holder.gameDownloadBtn.setTextColor(ContextCompat.getColor(holder.gameDes.context, R.color.text_subtitleDesc)) - holder.gameDownloadBtn.setBackgroundResource(R.drawable.button_round_f5f5f5) + holder.gameDownloadBtn.setTextColor(R.color.text_subtitleDesc.toColor(holder.gameDownloadBtn.context)) + holder.gameDownloadBtn.background = R.drawable.button_round_f5f5f5.toDrawable(holder.gameDownloadBtn.context) updateItemViewStatus(holder, false, null, null) } } diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index f89ff3adb8..afc5050d5b 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -6,6 +6,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.utils.ExtensionsKt; import com.halo.assistant.fragment.myconcern.MyConcernFragment; /** @@ -13,6 +14,23 @@ import com.halo.assistant.fragment.myconcern.MyConcernFragment; */ public class ConcernActivity extends NormalActivity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + ExtensionsKt.updateStatusBarColor(this, R.color.black, R.color.white); + } + + @Override + protected boolean isAutoResetViewBackgroundEnabled() { + return true; + } + + @Override + protected void onNightModeChange() { + super.onNightModeChange(); + ExtensionsKt.updateStatusBarColor(this, R.color.black, R.color.white); + } + @NonNull public static Intent getIntent(Context context, String entrance) { Bundle args = new Bundle(); diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt index 67ebbce288..875a72edfd 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt @@ -4,7 +4,6 @@ import android.content.Context import android.util.SparseArray import android.view.View import android.view.ViewGroup -import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.databind.BindingAdapters @@ -60,6 +59,14 @@ class MyFollowedGameAdapter(context: Context, var mViewModel: MyFollowedGameView holder.run { binding.run { gameItemIncluded.run { + root.background = R.drawable.reuse_listview_item_style.toDrawable(root.context) + gameKaifuType.setBackgroundColor(R.color.theme.toColor(root.context)) + gameName.setTextColor(R.color.text_title.toColor(root.context)) + gameDes.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + downloadSpeed.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + downloadPercentage.setTextColor(R.color.theme_font.toColor(root.context)) + recommendStarPref.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + gameIconView.displayGameIcon(gameEntity) BindingAdapters.setGameName(gameName, gameEntity, false, null) BindingAdapters.setTextSize(gameRating, if (gameEntity.commentCount > 3) 12 else 10) @@ -69,11 +76,15 @@ class MyFollowedGameAdapter(context: Context, var mViewModel: MyFollowedGameView gameRating.text = if (gameEntity.commentCount > 3) { if (gameEntity.star == 10.0F) "10" else gameEntity.star.toString() } else "" - gameRating.setTextColor(if (gameEntity.commentCount > 3) R.color.theme_font.toColor() else R.color.theme.toColor()) + gameRating.setTextColor(if (gameEntity.commentCount > 3) R.color.theme_font.toColor(mContext) else R.color.theme.toColor(mContext)) gameDes.text = gameEntity.decoratedDes recommendStar.rating = gameEntity.recommendStar.toFloat() } + root.setBackgroundColor(R.color.background_white.toColor(mContext)) moreBtn.visibility = View.GONE + listOf(descTv, trendsTv, commentsTv).forEach { + it.setTextColor(R.color.text_subtitle.toColor(mContext)) + } initServerType(gameEntity) initShortcut(gameEntity, mEntrance, path, newPath) updateConcernButton(gameEntity, mViewModel) @@ -117,21 +128,23 @@ class MyFollowedGameAdapter(context: Context, var mViewModel: MyFollowedGameView class MyFollowedGameViewHolder(var binding: ItemFollowedGameBinding) : RecyclerView.ViewHolder(binding.root) { fun updateConcernButton(gameEntity: GameEntity, viewModel: MyFollowedGameViewModel) { - if (gameEntity.isRelated) { - binding.gameItemIncluded.downloadBtn.text = "关联关注" - binding.gameItemIncluded.downloadBtn.setTextColor(ContextCompat.getColor(binding.root.context, R.color.content)) - binding.gameItemIncluded.downloadBtn.setBackgroundResource(R.drawable.button_border_gray_oval) + binding.run { + if (gameEntity.isRelated) { + gameItemIncluded.downloadBtn.text = "关联关注" + gameItemIncluded.downloadBtn.setTextColor(R.color.content.toColor(root.context)) + gameItemIncluded.downloadBtn.background = R.drawable.button_border_gray_oval.toDrawable(root.context) - binding.gameItemIncluded.downloadBtn.setOnClickListener { } - } else { - binding.gameItemIncluded.downloadBtn.text = "已关注" - binding.gameItemIncluded.downloadBtn.setTextColor(ContextCompat.getColor(binding.root.context, R.color.text_subtitleDesc)) - binding.gameItemIncluded.downloadBtn.setBackgroundResource(R.drawable.bg_shape_f5_radius_999) + gameItemIncluded.downloadBtn.setOnClickListener { } + } else { + gameItemIncluded.downloadBtn.text = "已关注" + gameItemIncluded.downloadBtn.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + gameItemIncluded.downloadBtn.background = R.drawable.bg_shape_f5_radius_999.toDrawable(root.context) - binding.gameItemIncluded.downloadBtn.setOnClickListener { - DialogHelper.showCancelDialog(binding.root.context, { - viewModel.unfollowGame(gameEntity) - }) + gameItemIncluded.downloadBtn.setOnClickListener { + DialogHelper.showCancelDialog(root.context, { + viewModel.unfollowGame(gameEntity) + }) + } } } } diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt index 413a4efe35..c70b6a4a23 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt @@ -61,7 +61,7 @@ class MyFollowedGameFragment : ListFragment // 不需要分页 mListRv.clearOnScrollListeners() mListRv.addOnScrollListener(mExposureListener!!) - mCachedView.setBackgroundColor(R.color.white.toColor()) + mCachedView.setBackgroundColor(R.color.background_white.toColor(requireContext())) mBinding.concernRvRecommend.setHasFixedSize(true) mBinding.concernRvRecommend.layoutManager = GridLayoutManager(context, 4) @@ -158,14 +158,15 @@ class MyFollowedGameFragment : ListFragment } override fun getItemDecoration(): RecyclerView.ItemDecoration { - val itemDecoration = CustomDividerItemDecoration(requireContext(), + mItemDecoration = CustomDividerItemDecoration(requireContext(), onlyDecorateTheFirstItem = false, notDecorateTheFirstItem = false, notDecorateTheLastItem = true, notDecorateTheFirstTwoItems = false - ) - itemDecoration.setDrawable(R.drawable.divider_item_line_space_16.toDrawable()!!) - return itemDecoration + ).apply { + setDrawable(R.drawable.divider_item_line_space_16.toDrawable(requireContext())!!) + } + return mItemDecoration } @Subscribe(threadMode = ThreadMode.MAIN) @@ -220,4 +221,13 @@ class MyFollowedGameFragment : ListFragment } } + override fun onNightModeChange() { + super.onNightModeChange() + mBinding.run { + if (mRecommendAdapter?.recommendGameList?.isNotEmpty() == true) { + concernRvRecommend.recycledViewPool.clear() + mRecommendAdapter?.notifyItemRangeChanged(0, mRecommendAdapter!!.itemCount) + } + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt index d120a0f6fa..c11280ccdf 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt @@ -16,6 +16,7 @@ import com.gh.gamecenter.R import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.common.utils.showRegulationTestDialogIfNeeded import com.gh.gamecenter.common.utils.tryCatchInRelease +import com.gh.gamecenter.common.utils.updateStatusBarColor import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.PopupMyGameGuideBinding import com.gh.gamecenter.gamecollection.publish.GameCollectionEditActivity @@ -28,6 +29,7 @@ class MyGameActivity : BaseActivity_TabLayout() { setToolbarMenu(R.menu.menu_my_game) mDividerLineView?.visibility = View.VISIBLE showGuide() + updateStatusBarColor(R.color.black, R.color.white) } override fun initFragmentList(fragments: MutableList?) { @@ -57,6 +59,13 @@ class MyGameActivity : BaseActivity_TabLayout() { return super.onMenuItemClick(item) } + override fun isAutoResetViewBackgroundEnabled() = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + private fun showGuide() { AppExecutor.uiExecutor.executeWithDelay({ tryCatchInRelease { 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 dc5ecf7d50..8160a621a7 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameFragment.kt @@ -41,7 +41,7 @@ class MyPlayedGameFragment : PlayedGameFragment() { runOnIoThread { UsageStatsHelper.checkAndPostUsageStats() } - mCachedView.setBackgroundColor(R.color.white.toColor()) + mCachedView.setBackgroundColor(R.color.background_white.toColor(requireContext())) } override fun provideListAdapter(): ListAdapter { @@ -77,14 +77,15 @@ class MyPlayedGameFragment : PlayedGameFragment() { } fun getItemDecoration(notDecorateTheFirstItem: Boolean): RecyclerView.ItemDecoration { - val itemDecoration = CustomDividerItemDecoration( + mItemDecoration = CustomDividerItemDecoration( requireContext(), onlyDecorateTheFirstItem = false, notDecorateTheFirstItem = notDecorateTheFirstItem, notDecorateTheLastItem = true, notDecorateTheFirstTwoItems = false - ) - itemDecoration.setDrawable(R.drawable.divider_item_line_space_16.toDrawable()!!) - return itemDecoration + ).apply { + setDrawable(R.drawable.divider_item_line_space_16.toDrawable(requireContext())!!) + } + return mItemDecoration } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationAdapter.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationAdapter.kt index 6cb9da270e..3a215513fd 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationAdapter.kt @@ -60,20 +60,35 @@ class MyReservationAdapter(context: Context, var mViewModel: MyReservationViewMo val path = "预约Tab" val newPath = "预约Tab_新" - holder.binding.gameItemIncluded.run { - gameIconView.displayGameIcon(gameEntity) - BindingAdapters.setGameName(gameName, gameEntity, false, null) - BindingAdapters.setTextSize(gameRating, if (gameEntity.commentCount > 3) 12 else 10) - BindingAdapters.setGameTags(labelList, gameEntity) - gameRating.setCompoundDrawablesWithIntrinsicBounds(if (gameEntity.commentCount > 3) R.drawable.game_horizontal_rating.toDrawable() else null, null, null, null) - gameRating.setPadding(0, 0, if (gameEntity.commentCount > 3) 8F.dip2px() else 0, 0) - gameRating.text = if (gameEntity.commentCount > 3) { - if (gameEntity.star == 10.0F) "10" else gameEntity.star.toString() - } else "" - gameRating.setTextColor(if (gameEntity.commentCount > 3) R.color.theme_font.toColor() else R.color.theme.toColor()) - gameDes.text = gameEntity.decoratedDes - recommendStar.rating = gameEntity.recommendStar.toFloat() + holder.binding.run { + root.setBackgroundColor(R.color.background_white.toColor(mContext)) + listOf(descTv, trendsTv, commentsTv).forEach { + it.setTextColor(R.color.text_subtitle.toColor(mContext)) + } + gameItemIncluded.run { + root.background = R.drawable.reuse_listview_item_style.toDrawable(root.context) + gameKaifuType.setBackgroundColor(R.color.theme.toColor(root.context)) + gameName.setTextColor(R.color.text_title.toColor(root.context)) + gameDes.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + downloadSpeed.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + downloadPercentage.setTextColor(R.color.theme_font.toColor(root.context)) + recommendStarPref.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + + gameIconView.displayGameIcon(gameEntity) + BindingAdapters.setGameName(gameName, gameEntity, false, null) + BindingAdapters.setTextSize(gameRating, if (gameEntity.commentCount > 3) 12 else 10) + BindingAdapters.setGameTags(labelList, gameEntity) + gameRating.setCompoundDrawablesWithIntrinsicBounds(if (gameEntity.commentCount > 3) R.drawable.game_horizontal_rating.toDrawable(mContext) else null, null, null, null) + gameRating.setPadding(0, 0, if (gameEntity.commentCount > 3) 8F.dip2px() else 0, 0) + gameRating.text = if (gameEntity.commentCount > 3) { + if (gameEntity.star == 10.0F) "10" else gameEntity.star.toString() + } else "" + gameRating.setTextColor(if (gameEntity.commentCount > 3) R.color.theme_font.toColor(mContext) else R.color.theme.toColor(mContext)) + gameDes.text = gameEntity.decoratedDes + recommendStar.rating = gameEntity.recommendStar.toFloat() + } } + holder.initServerType(gameEntity) holder.initShortcut(gameEntity, mEntrance, path, newPath) 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 be79ff9de5..606d4d1307 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt @@ -56,7 +56,7 @@ class MyReservationFragment : ListFragment() mBinding.reuseNoneData.reuseTvNoneData.setOnClickListener(this) mListRv.addOnScrollListener(mExposureListener!!) - mListRv.setBackgroundColor(R.color.white.toColor()) + mListRv.setBackgroundColor(R.color.background_white.toColor(requireContext())) } override fun onStart() { @@ -105,14 +105,15 @@ class MyReservationFragment : ListFragment() } override fun getItemDecoration(): RecyclerView.ItemDecoration { - val itemDecoration = CustomDividerItemDecoration(requireContext(), + mItemDecoration = CustomDividerItemDecoration(requireContext(), onlyDecorateTheFirstItem = false, notDecorateTheFirstItem = false, notDecorateTheLastItem = true, notDecorateTheFirstTwoItems = false - ) - itemDecoration.setDrawable(R.drawable.divider_item_line_space_16.toDrawable()!!) - return itemDecoration + ).apply { + setDrawable(R.drawable.divider_item_line_space_16.toDrawable(requireContext())!!) + } + return mItemDecoration } @Subscribe(threadMode = ThreadMode.MAIN) @@ -137,4 +138,9 @@ class MyReservationFragment : ListFragment() mAdapter?.notifyItemAndRemoveDownload(status) } } + + override fun onNightModeChange() { + super.onNightModeChange() + mListRv.setBackgroundColor(R.color.background_white.toColor(requireContext())) + } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt index 9222690e9a..d9d5aa1a5b 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt @@ -104,6 +104,14 @@ open class PlayedGameAdapter( holder.initDownloadButtonOffset() } holder.binding.gameItemIncluded.run { + root.background = R.drawable.reuse_listview_item_style.toDrawable(root.context) + gameKaifuType.setBackgroundColor(R.color.theme.toColor(root.context)) + gameName.setTextColor(R.color.text_title.toColor(root.context)) + gameDes.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + downloadSpeed.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + downloadPercentage.setTextColor(R.color.theme_font.toColor(root.context)) + recommendStarPref.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + gameIconView.displayGameIcon(gameEntity) BindingAdapters.setGameName(gameName, gameEntity, false, null) BindingAdapters.setTextSize(gameRating, if (gameEntity.commentCount > 3) 12 else 10) @@ -209,7 +217,7 @@ open class PlayedGameAdapter( is FooterViewHolder -> { holder.initItemPadding() holder.initFooterViewHolder(mViewModel, mIsLoading, mIsNetworkError, mIsOver) - holder.hint.setTextColor(R.color.text_subtitleDesc.toColor()) + holder.hint.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) } } } 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 58453632a5..de76305013 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 @@ -107,15 +107,17 @@ class MyConcernAdapter extends BaseRecyclerAdapter { BindingAdapters.setGame(holder.binding.concernItemIcon, gameEntity); + holder.binding.getRoot().setBackground(ContextCompat.getDrawable(mContext, R.drawable.reuse_listview_item_style)); holder.binding.concernItemName.setText(gameEntity.getName()); + holder.binding.concernItemName.setTextColor(ContextCompat.getColor(mContext, R.color.text_title)); if (gameEntity.isRelated()) { holder.binding.concernItemConcern.setText("关联关注"); holder.binding.concernItemConcern.setTextColor(ContextCompat.getColor(mContext, R.color.content)); - holder.binding.concernItemConcern.setBackgroundResource(R.drawable.button_border_gray_oval); + holder.binding.concernItemConcern.setBackground(ContextCompat.getDrawable(mContext, R.drawable.button_border_gray_oval)); } else { holder.binding.concernItemConcern.setText(R.string.cancel_concern); holder.binding.concernItemConcern.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); - holder.binding.concernItemConcern.setBackgroundResource(R.drawable.button_border_blue_oval); + holder.binding.concernItemConcern.setBackground(ContextCompat.getDrawable(mContext, R.drawable.button_border_blue_oval)); } holder.binding.concernItemConcern.setOnClickListener(v -> { holder.binding.concernItemConcern.setClickable(false); diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java index ec7b6c74b2..aabbd498bb 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java @@ -144,4 +144,12 @@ public class MyConcernFragment extends NormalFragment implements OnRequestCallBa } } + @Override + protected void onNightModeChange() { + super.onNightModeChange(); + if (concernAdapter != null) { + mConcernRv.getRecycledViewPool().clear(); + concernAdapter.notifyItemRangeChanged(0, concernAdapter.getItemCount()); + } + } } 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 e72f7a5dfe..0c290d2a23 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 @@ -173,8 +173,8 @@ public class MyConcernRecommendAdapter extends BaseRecyclerAdapter CheckLoginUtils.checkLogin(mContext, "我的关注-热门游戏推荐-[关注]", () -> { holder.binding.concernItemConcern.setClickable(false); diff --git a/app/src/main/res/drawable/round_white_bg.xml b/app/src/main/res/drawable/round_white_bg.xml index ccdbda4cbb..d93a896e60 100644 --- a/app/src/main/res/drawable/round_white_bg.xml +++ b/app/src/main/res/drawable/round_white_bg.xml @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_tablayout_viewpager.xml b/app/src/main/res/layout/activity_tablayout_viewpager.xml index 2b3de0c9a9..90564023b4 100644 --- a/app/src/main/res/layout/activity_tablayout_viewpager.xml +++ b/app/src/main/res/layout/activity_tablayout_viewpager.xml @@ -1,28 +1,29 @@ - + - + + android:id="@+id/activity_tab_container" + android:layout_width="match_parent" + android:layout_height="@dimen/tab_layout_height" + android:background="@color/background_white"> + android:id="@+id/activity_tab_indicator" + android:layout_width="match_parent" + android:layout_height="@dimen/default_tab_indicator_height" + android:layout_alignParentBottom="true" /> + android:id="@+id/activity_tab_layout" + android:layout_width="match_parent" + android:layout_height="@dimen/tab_layout_height" + app:tabTextAppearance="@style/TabLayoutTextAppearance" /> + android:id="@+id/activity_view_pager" + android:layout_width="match_parent" + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_concern.xml b/app/src/main/res/layout/fragment_concern.xml index c97ff41b4d..ae7d68f085 100644 --- a/app/src/main/res/layout/fragment_concern.xml +++ b/app/src/main/res/layout/fragment_concern.xml @@ -2,7 +2,8 @@ + android:orientation="vertical" + android:background="@color/background"> + android:background="@color/background_white" /> @@ -36,7 +37,7 @@ android:layout_centerVertical="true" android:layout_marginLeft="5dp" android:text="@string/concern_recommend" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="15sp" android:textStyle="bold" /> @@ -57,7 +58,7 @@ android:id="@+id/concern_rv_recommend" android:layout_width="match_parent" android:layout_height="300dp" - android:background="@color/white" + android:background="@color/background_white" android:overScrollMode="never" android:visibility="gone" /> diff --git a/app/src/main/res/layout/fragment_followed_game.xml b/app/src/main/res/layout/fragment_followed_game.xml index 907c12ee65..2bbd613b06 100644 --- a/app/src/main/res/layout/fragment_followed_game.xml +++ b/app/src/main/res/layout/fragment_followed_game.xml @@ -35,7 +35,7 @@ android:layout_centerVertical="true" android:layout_marginLeft="5dp" android:text="@string/concern_recommend" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="15sp" android:textStyle="bold" /> @@ -56,7 +56,7 @@ android:id="@+id/concern_rv_recommend" android:layout_width="match_parent" android:layout_height="300dp" - android:background="@color/white" + android:background="@color/background_white" android:overScrollMode="never" android:visibility="gone" /> @@ -82,7 +82,7 @@ android:drawablePadding="4dp" android:textSize="12sp" android:drawableLeft="@drawable/ico_concern" - android:textColor="@color/white" + android:textColor="@color/text_white" android:text="管理关注 >" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_followed_game.xml b/app/src/main/res/layout/item_followed_game.xml index b786926826..486c01134b 100644 --- a/app/src/main/res/layout/item_followed_game.xml +++ b/app/src/main/res/layout/item_followed_game.xml @@ -2,7 +2,7 @@ + android:background="@color/text_black" /> Date: Fri, 13 May 2022 10:09:17 +0800 Subject: [PATCH 24/52] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8B5.10.0=E3=80=91=E8=AE=BA=E5=9D=9B=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E7=83=AD=E5=BA=A6=E5=80=BC=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20https://git.shanqu.cc/pm/halo-app-issues/-/issues/1856?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/forum/home/HorizontalForumsAdapter.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/HorizontalForumsAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/HorizontalForumsAdapter.kt index 03edf07150..8f98ceefc3 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/HorizontalForumsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/HorizontalForumsAdapter.kt @@ -6,6 +6,7 @@ import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.NumberUtils import com.gh.gamecenter.core.utils.ToastUtils import com.gh.gamecenter.databinding.HorizontalForumItemBinding import com.gh.gamecenter.entity.ForumEntity @@ -44,7 +45,7 @@ class HorizontalForumsAdapter( val forumEntity = list[position] gameNameTv.text = forumEntity.name - hotTv.text = if (forumEntity.hot > 10000) "10000+" else forumEntity.hot.toString() + hotTv.text = NumberUtils.transSimpleCount(forumEntity.hot) unreadHint.goneIf(!forumEntity.unread || mEntrance.contains("热门论坛")) followTv.goneIf(!mEntrance.contains("热门论坛")) From c627bfb994a9650566cdde764b2fd068a187a83d Mon Sep 17 00:00:00 2001 From: juntao Date: Fri, 13 May 2022 14:13:16 +0800 Subject: [PATCH 25/52] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/base/AppUncaughtHandler.java | 3 - .../base/GlobalActivityLifecycleObserver.kt | 9 +- .../gh/common/databind/BindingAdapters.java | 3 - .../java/com/gh/common/notifier/Notifier.kt | 170 ---------- .../com/gh/common/notifier/NotifierView.kt | 312 ------------------ .../notifier/SwipeDismissTouchListener.kt | 238 ------------- .../gh/common/util/CommentDraftContainer.kt | 1 + .../java/com/gh/common/util/DataUtils.java | 185 ----------- .../com/gh/common/util/DownloadItemUtils.kt | 4 - .../com/gh/common/util/DownloadObserver.kt | 2 - .../common/util/GameActivityDownloadHelper.kt | 3 - .../java/com/gh/common/util/IntentUtils.java | 1 - .../com/gh/common/view/SubCategoryView.kt | 1 - .../java/com/gh/download/PackageObserver.kt | 23 -- .../com/gh/gamecenter/GameDetailActivity.kt | 1 - .../com/gh/gamecenter/NewsDetailActivity.java | 11 - .../adapter/viewholder/DetailViewHolder.java | 7 - .../download/GameDownloadFragmentAdapter.java | 14 - .../download/GameUpdateFragmentAdapter.java | 9 - .../fragment/MainWrapperFragment.java | 18 - .../fragment/SearchToolbarFragment.java | 2 - .../gamedetail/GameDetailFragment.kt | 7 - .../gamedetail/GameDetailViewModel.kt | 3 - .../gamedetail/desc/GameRaidersAdapter.kt | 1 - .../gamedetail/fuli/FuLiFragment.kt | 5 - .../gamedetail/fuli/GameNewsAdapter.kt | 2 - .../fuli/tools/GameDetailToolsAdapter.java | 1 - .../gh/gamecenter/manager/UserManager.java | 43 --- .../mygame/MyFollowedGameViewModel.kt | 4 - .../newsdetail/NewsDetailAdapter.java | 12 - .../personal/NewPersonalFragment.kt | 76 ----- .../gamecenter/personal/PersonalFragment.kt | 76 ----- .../gamecenter/personal/PersonalViewModel.kt | 3 - .../qa/answer/detail/AnswerDetailFragment.kt | 8 - .../qa/answer/detail/AnswerDetailViewModel.kt | 1 - .../qa/subject/AskSubjectFragment.java | 9 - .../receiver/InstallAndUninstallReceiver.java | 3 - .../gh/gamecenter/user/UserRepository.java | 16 - .../fragment/myconcern/MyConcernAdapter.java | 4 - .../myconcern/MyConcernRecommendAdapter.java | 5 - app/src/main/res/layout/view_notifier.xml | 47 --- 41 files changed, 2 insertions(+), 1341 deletions(-) delete mode 100644 app/src/main/java/com/gh/common/notifier/Notifier.kt delete mode 100644 app/src/main/java/com/gh/common/notifier/NotifierView.kt delete mode 100644 app/src/main/java/com/gh/common/notifier/SwipeDismissTouchListener.kt delete mode 100644 app/src/main/res/layout/view_notifier.xml diff --git a/app/src/main/java/com/gh/base/AppUncaughtHandler.java b/app/src/main/java/com/gh/base/AppUncaughtHandler.java index 335b0d03bf..7e1fa54d76 100644 --- a/app/src/main/java/com/gh/base/AppUncaughtHandler.java +++ b/app/src/main/java/com/gh/base/AppUncaughtHandler.java @@ -12,7 +12,6 @@ import android.util.Log; import com.gh.common.constant.Config; import com.gh.common.util.DataCollectionUtils; -import com.gh.common.util.DataUtils; import com.gh.gamecenter.SplashScreenActivity; import com.lightgame.config.CommonDebug; import com.lightgame.download.FileUtils; @@ -127,8 +126,6 @@ public class AppUncaughtHandler implements UncaughtExceptionHandler { } catch (Exception e) { } - DataUtils.onError(context, throwable); - } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt b/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt index 20fb63b2a8..8514ce8de7 100644 --- a/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt +++ b/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt @@ -3,8 +3,6 @@ package com.gh.base import android.app.Activity import android.app.Application import android.os.Bundle -import com.gh.common.notifier.Notifier -import com.gh.common.util.DataUtils import com.gh.common.util.FloatingBackViewManager import com.gh.download.DownloadManager import com.gh.gamecenter.MainActivity @@ -48,7 +46,6 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks { } if (HaloApp.isUserAcceptPrivacyPolicy(activity)) { - DataUtils.onResume(activity) // FIXME 这里应该只是部分Activity需要 try { // 初始化gameMap @@ -74,17 +71,13 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks { CurrentActivityHolder.activitySet.remove(activity) FloatingBackViewManager.dismissBackView() - if (HaloApp.isUserAcceptPrivacyPolicy(activity)) { - DataUtils.onPause(activity) - } - if (activity.isFinishing) { AppManager.getInstance().finishActivity(activity) } } override fun onActivityStopped(activity: Activity) { - Notifier.hide() + } override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) { 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 47abfe4b73..532be0d389 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -428,7 +428,6 @@ public class BindingAdapters { } return; } - DataUtils.onGameLaunchEvent(v.getContext(), gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), location); PackageUtils.launchApplicationByPackageName(v.getContext(), gameEntity.getApk().get(0).getPackageName()); } else { DownloadDialog.showDownloadDialog( @@ -651,8 +650,6 @@ public class BindingAdapters { ApkEntity apkEntity = gameEntity.getApk().get(0); String msg = FileUtils.isCanDownload(progressBar.getContext(), apkEntity.getSize()); if (TextUtils.isEmpty(msg)) { - DataUtils.onGameDownloadEvent(progressBar.getContext(), gameEntity.getName(), apkEntity.getPlatform(), entrance, "下载开始", method); - DownloadManager.createDownload(progressBar.getContext(), apkEntity, gameEntity, diff --git a/app/src/main/java/com/gh/common/notifier/Notifier.kt b/app/src/main/java/com/gh/common/notifier/Notifier.kt deleted file mode 100644 index 3e6eed494c..0000000000 --- a/app/src/main/java/com/gh/common/notifier/Notifier.kt +++ /dev/null @@ -1,170 +0,0 @@ -package com.gh.common.notifier - -import android.app.Activity -import androidx.core.view.ViewCompat -import android.view.View -import android.view.ViewGroup -import com.gh.gamecenter.core.utils.SPUtils -import com.gh.gamecenter.* -import java.lang.ref.WeakReference - -@Suppress("DEPRECATION") -class Notifier private constructor() { - - companion object { - - private var activityWeakReference: WeakReference? = null - - private const val SP_VIEWED_NOTIFIER = "viewed_notifier" - - /** - * 根据内容决定是否显示 Notifier - */ - @JvmStatic - fun shouldShowNotifier(content: String): Boolean { - val viewedNotifierCollection = SPUtils.getString(SP_VIEWED_NOTIFIER) - return !viewedNotifierCollection.contains(content) - } - - /** - * 标记相应内容的 Notifier 已经显示过了 - */ - @JvmStatic - fun tagNotifierAsShowed(content: String) { - val viewedNotifierCollection = SPUtils.getString(SP_VIEWED_NOTIFIER) - if (viewedNotifierCollection.length > 3000) { - SPUtils.setString(SP_VIEWED_NOTIFIER, content) - } else { - SPUtils.setString(SP_VIEWED_NOTIFIER, viewedNotifierCollection + content) - } - } - - @JvmStatic - fun create(activity: Activity?): Notifier { - if (activity == null) { - throw IllegalArgumentException("Activity cannot be null!") - } - - val notifier = Notifier() - - // Hide current NotifierView, if one is active - clearCurrent(activity) - - notifier.setActivity(activity) - notifier.notifierView = NotifierView(activity) - - return notifier - } - - @JvmStatic - fun isActivityValid(activity: Activity?): Boolean { - if (activity == null) return false - - return when (activity) { - is MessageActivity -> false - is DownloadManagerActivity -> false - is CleanApkActivity -> false - is SplashScreenActivity -> false - else -> isNotExistInActivity(activity) - } - } - - @JvmStatic - fun isNotExistInActivity(activity: Activity?): Boolean { - if (activity == null) return false - - (activity.window?.decorView as? ViewGroup)?.let { - //Find all NotifierView Views in Parent layout - for (i in 0..it.childCount) { - val childView = if (it.getChildAt(i) is NotifierView) it.getChildAt(i) as NotifierView else null - if (childView != null && childView.windowToken != null) { - return false - } - } - } - return true - } - - /** - * Cleans up the currently showing notifierView view, if one is present - * - * @param activity The current Activity - */ - @JvmStatic - fun clearCurrent(activity: Activity?) { - (activity?.window?.decorView as? ViewGroup)?.let { - //Find all NotifierView Views in Parent layout - for (i in 0..it.childCount) { - val childView = if (it.getChildAt(i) is NotifierView) it.getChildAt(i) as NotifierView else null - if (childView != null && childView.windowToken != null) { - ViewCompat.animate(childView).alpha(0f).withEndAction(getRemoveViewRunnable(childView)) - } - } - } - } - - @JvmStatic - fun hide() { - activityWeakReference?.get()?.let { clearCurrent(it) } - } - - private fun getRemoveViewRunnable(childView: NotifierView?): Runnable { - return Runnable { - childView?.let { - (childView.parent as? ViewGroup)?.removeView(childView) - } - } - } - } - - private var notifierView: NotifierView? = null - - private val activityDecorView: ViewGroup? - get() { - var decorView: ViewGroup? = null - - activityWeakReference?.get()?.let { - decorView = it.window.decorView as ViewGroup - } - - return decorView - } - - fun show(showVerticalTranslateAnimation: Boolean, delay: Long? = 0): NotifierView? { - activityWeakReference?.get()?.let { - it.runOnUiThread { - activityDecorView?.postDelayed({ - notifierView?.showVerticalTranslateAnimation = showVerticalTranslateAnimation - activityDecorView?.addView(notifierView) - }, delay!!) - } - } - - return notifierView - } - - fun setIcon(url: String?): Notifier { - url?.let { notifierView?.setIcon(it) } - return this - } - - fun setText(text: String?): Notifier { - notifierView?.setText(text) - - return this - } - - fun setDuration(time: Long): Notifier { - notifierView?.duration = time - return this - } - - fun setOnClickListener(onClickListener: View.OnClickListener): Notifier { - notifierView?.findViewById(R.id.cardView)?.setOnClickListener(onClickListener) - return this - } - - private fun setActivity(activity: Activity) { - activityWeakReference = WeakReference(activity) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/notifier/NotifierView.kt b/app/src/main/java/com/gh/common/notifier/NotifierView.kt deleted file mode 100644 index e87c80a80d..0000000000 --- a/app/src/main/java/com/gh/common/notifier/NotifierView.kt +++ /dev/null @@ -1,312 +0,0 @@ -package com.gh.common.notifier - -import android.animation.* -import android.content.Context -import android.graphics.Path -import android.text.TextUtils -import android.util.AttributeSet -import android.util.Log -import android.util.TypedValue -import android.view.Gravity -import android.view.MotionEvent -import android.view.View -import android.view.ViewGroup -import android.widget.FrameLayout -import android.widget.TextView -import androidx.cardview.widget.CardView -import androidx.core.view.ViewCompat -import com.facebook.drawee.view.SimpleDraweeView -import com.gh.gamecenter.core.utils.DisplayUtils -import com.gh.gamecenter.common.utils.ImageUtils -import com.gh.gamecenter.core.utils.doOnEnd -import com.gh.gamecenter.core.utils.doOnStart -import com.gh.gamecenter.R - -class NotifierView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) - : FrameLayout(context, attrs, defStyle) { - - companion object { - const val SCALE_MINI = 0.2F - const val SCALE_DEFAULT = 1F - - const val DEFAULT_DURATION = 500L - } - - var onShowListener: OnShowNotificationListener? = null - var onHideListener: OnHideNotificationListener? = null - - lateinit var expandAnimator: ValueAnimator - lateinit var shrinkAnimator: ValueAnimator - - lateinit var translateUpAnimator: ObjectAnimator - lateinit var translateDownAnimator: ObjectAnimator - - lateinit var translateToLeftAnimator: ObjectAnimator - lateinit var translateToRightAnimator: ObjectAnimator - - lateinit var zoomInAnimator: ObjectAnimator - lateinit var zoomOutAnimator: ObjectAnimator - - var showAnimatorSet: AnimatorSet - var hideAnimatorSet: AnimatorSet - - var rightToLeftPath: Path - var leftToRightPath: Path - - var veryRight: Float = 0F - var veryBottom: Float = 0F - var centerX: Float = 0F - - var navigationHeight = 0 - - var textWidth: Int = 0 - var cardViewWidth: Int = 0 - var verticalAnimationOffset: Int = 0 - - var duration = DEFAULT_DURATION - - var showVerticalTranslateAnimation: Boolean = true - - private var mCardView: CardView - private var mContentTv: TextView - private var mIconIv: SimpleDraweeView - - init { - inflate(context, R.layout.view_notifier, this) - - ViewCompat.setTranslationZ(this, Integer.MAX_VALUE.toFloat()) - - mCardView = findViewById(R.id.cardView) - mContentTv = findViewById(R.id.tvText) - mIconIv = findViewById(R.id.ivIcon) - - mCardView.scaleX = SCALE_MINI - mCardView.scaleY = SCALE_MINI - - verticalAnimationOffset = dp2px(100F) - - navigationHeight = DisplayUtils.retrieveNavigationHeight(context) - - rightToLeftPath = Path() - leftToRightPath = Path() - - showAnimatorSet = AnimatorSet() - hideAnimatorSet = AnimatorSet() - } - - override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) { - super.onLayout(changed, left, top, right, bottom) - - centerX = (left + right - cardViewWidth) / 2F - - // TODO Provide method to change these absolute offset. - val r = right - dp2px(72F).toFloat() - val b = bottom - dp2px(145F).toFloat() - navigationHeight - - // Only set - if (veryRight != r || veryBottom != b) { - veryRight = r - veryBottom = b - - rightToLeftPath.moveTo(r, b) - rightToLeftPath.lineTo(centerX, b) - - leftToRightPath.moveTo(centerX, b) - leftToRightPath.lineTo(r, b) - - initAnimator() - } - } - - private fun initAnimator() { - expandAnimator = ValueAnimator.ofFloat(0F, 1F) - expandAnimator.duration = DEFAULT_DURATION - expandAnimator.addUpdateListener { a -> - val progress = a?.animatedValue as Float - mContentTv.width = (textWidth * progress).toInt() - } - expandAnimator.doOnEnd { - enableSwipeToDismiss() - shrinkAfterDelay() - } - - shrinkAnimator = ValueAnimator.ofFloat(1F, 0F) - shrinkAnimator.duration = DEFAULT_DURATION - shrinkAnimator.addUpdateListener { a -> - val progress = a?.animatedValue as Float - mContentTv.width = (textWidth * progress).toInt() - } - shrinkAnimator.doOnEnd { - val lp = FrameLayout.LayoutParams(mCardView.layoutParams) - lp.gravity = Gravity.NO_GRAVITY - mCardView.layoutParams = lp - - disableSwipeToDismiss() - } - - translateToLeftAnimator = ObjectAnimator.ofFloat(mCardView, "translationX", veryRight, centerX) - translateToLeftAnimator.duration = DEFAULT_DURATION - translateToLeftAnimator.doOnEnd { - onShowListener?.onShow() - - val lp = FrameLayout.LayoutParams(mCardView.layoutParams) - lp.gravity = Gravity.CENTER_HORIZONTAL - mCardView.layoutParams = lp - mCardView.translationX = 0f - - expandAnimator.start() - } - - translateToRightAnimator = ObjectAnimator.ofFloat(mCardView, "translationX", centerX, veryRight) - translateToRightAnimator.duration = DEFAULT_DURATION - - translateUpAnimator = ObjectAnimator.ofFloat(mCardView, "translationY", veryBottom + verticalAnimationOffset, veryBottom) - translateUpAnimator.duration = DEFAULT_DURATION - translateUpAnimator.doOnStart { mCardView.translationX = veryRight } - - translateDownAnimator = ObjectAnimator.ofFloat(mCardView, "translationY", veryBottom, veryBottom + verticalAnimationOffset) - translateDownAnimator.duration = DEFAULT_DURATION - - zoomInAnimator = ObjectAnimator.ofPropertyValuesHolder(mCardView, PropertyValuesHolder.ofFloat("scaleX", SCALE_DEFAULT), - PropertyValuesHolder.ofFloat("scaleY", SCALE_DEFAULT)) - zoomInAnimator.duration = DEFAULT_DURATION - zoomInAnimator.doOnStart { mCardView.translationX = veryRight } - zoomInAnimator.doOnStart { mCardView.translationY = veryBottom } - - zoomOutAnimator = ObjectAnimator.ofPropertyValuesHolder(mCardView, PropertyValuesHolder.ofFloat("scaleX", SCALE_MINI), - PropertyValuesHolder.ofFloat("scaleY", SCALE_MINI)) - zoomOutAnimator.duration = DEFAULT_DURATION - zoomOutAnimator.doOnEnd { removeFromParent() } - - if (showVerticalTranslateAnimation) { - showAnimatorSet.play(translateUpAnimator).with(zoomInAnimator).before(translateToLeftAnimator) - } else { - showAnimatorSet.play(zoomInAnimator).before(translateToLeftAnimator) - } - showAnimatorSet.start() - } - - private fun enableSwipeToDismiss() { - mCardView?.setOnTouchListener(SwipeDismissTouchListener(mCardView, object : SwipeDismissTouchListener.DismissCallbacks { - override fun canDismiss(): Boolean { - return true - } - - override fun onDismiss(view: View) { - removeFromParent() - } - - override fun onTouch(view: View, touch: Boolean) { - // Ignore. - } - })) - } - - private fun disableSwipeToDismiss() { - mCardView?.setOnTouchListener(null) - } - - override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - - showAnimatorSet.cancel() - hideAnimatorSet.cancel() - - try { - removeAllListeners(expandAnimator, - shrinkAnimator, - translateUpAnimator, - translateDownAnimator, - translateToLeftAnimator, - translateToRightAnimator) - } catch (e: Exception) { - e.printStackTrace() - } - } - - private fun removeAllListeners(vararg ts: Animator) { - for (a in ts) { - a.removeAllListeners() - if (a is ValueAnimator) { - a.removeAllUpdateListeners() - } - } - } - - override fun onTouchEvent(event: MotionEvent): Boolean { - performClick() - return super.onTouchEvent(event) - } - - private fun shrinkAfterDelay() { - postDelayed({ shrink() }, duration) - } - - private fun shrink() { - shrinkAnimator.doOnEnd { hide() } - shrinkAnimator.start() - } - - private fun removeFromParent() { - clearAnimation() - visibility = View.GONE - - postDelayed(object : Runnable { - override fun run() { - try { - if (parent == null) { - Log.e(javaClass.simpleName, "getParent() returning Null") - } else { - try { - (parent as ViewGroup).removeView(this@NotifierView) - - onHideListener?.onHide() - } catch (ex: Exception) { - Log.e(javaClass.simpleName, "Cannot remove from parent layout") - } - } - } catch (ex: Exception) { - Log.e(javaClass.simpleName, Log.getStackTraceString(ex)) - } - } - }, 100) - } - - fun setText(text: String?) { - if (!TextUtils.isEmpty(text)) { - mContentTv.text = text - mContentTv.measure(0, 0) - textWidth = mContentTv.measuredWidth - mContentTv.width = 0 - - mCardView.measure(0, 0) - cardViewWidth = mCardView.measuredWidth - } - } - - fun hide() { - if (showVerticalTranslateAnimation) { - hideAnimatorSet.play(translateDownAnimator).with(zoomOutAnimator).after(translateToRightAnimator) - } else { - hideAnimatorSet.play(zoomOutAnimator).after(translateToRightAnimator) - } - hideAnimatorSet.start() - } - - fun setIcon(url: String) { - ImageUtils.display(mIconIv, url) - } - - private fun dp2px(dp: Float): Int { - return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, context.applicationContext.resources.displayMetrics).toInt() - } - - interface OnShowNotificationListener { - fun onShow() - } - - interface OnHideNotificationListener { - fun onHide() - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/notifier/SwipeDismissTouchListener.kt b/app/src/main/java/com/gh/common/notifier/SwipeDismissTouchListener.kt deleted file mode 100644 index 5db53d7e29..0000000000 --- a/app/src/main/java/com/gh/common/notifier/SwipeDismissTouchListener.kt +++ /dev/null @@ -1,238 +0,0 @@ -package com.gh.common.notifier - -/* - * Copyright 2013 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Modifications Copyright (C) 2017 David Kwon - */ - -import android.animation.Animator -import android.animation.AnimatorListenerAdapter -import android.animation.ValueAnimator -import android.os.Build -import androidx.annotation.RequiresApi -import android.view.MotionEvent -import android.view.VelocityTracker -import android.view.View -import android.view.ViewConfiguration - -/** - * A [View.OnTouchListener] that makes any [View] dismissable when the - * user swipes (drags her finger) horizontally across the view. - * - * @param view The view to make dismissable. - * @param callbacks The callback to trigger when the user has indicated that she would like to - * dismiss this view. - */ -class SwipeDismissTouchListener( - private val mView: View, - private val mCallbacks: DismissCallbacks) : View.OnTouchListener { - - // Cached ViewConfiguration and system-wide constant values - private val mSlop: Int - private val mMinFlingVelocity: Int - private val mAnimationTime: Long - private var mViewWidth = 1 // 1 and not 0 to prevent dividing by zero - - // Transient properties - private var mDownX: Float = 0.toFloat() - private var mDownY: Float = 0.toFloat() - private var mSwiping: Boolean = false - private var mSwipingSlop: Int = 0 - private var mVelocityTracker: VelocityTracker? = null - private var mTranslationX: Float = 0.toFloat() - - init { - val vc = ViewConfiguration.get(mView.context) - mSlop = vc.scaledTouchSlop - mMinFlingVelocity = vc.scaledMinimumFlingVelocity * 16 - mAnimationTime = mView.context.resources.getInteger( - android.R.integer.config_shortAnimTime).toLong() - } - - @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB_MR1) - override fun onTouch(view: View, motionEvent: MotionEvent): Boolean { - // offset because the view is translated during swipe - motionEvent.offsetLocation(mTranslationX, 0f) - - if (mViewWidth < 2) { - mViewWidth = mView.width - } - - when (motionEvent.actionMasked) { - MotionEvent.ACTION_DOWN -> { - mDownX = motionEvent.rawX - mDownY = motionEvent.rawY - if (mCallbacks.canDismiss()) { - mVelocityTracker = VelocityTracker.obtain() - mVelocityTracker!!.addMovement(motionEvent) - } - mCallbacks.onTouch(view, true) - return false - } - MotionEvent.ACTION_UP -> { - mVelocityTracker?.run { - val deltaX = motionEvent.rawX - mDownX - this.addMovement(motionEvent) - this.computeCurrentVelocity(1000) - val velocityX = this.xVelocity - val absVelocityX = Math.abs(velocityX) - val absVelocityY = Math.abs(this.yVelocity) - var dismiss = false - var dismissRight = false - if (Math.abs(deltaX) > mViewWidth / 2 && mSwiping) { - dismiss = true - dismissRight = deltaX > 0 - } else if (mMinFlingVelocity <= absVelocityX && absVelocityY < absVelocityX && mSwiping) { - // dismiss only if flinging in the same direction as dragging - dismiss = velocityX < 0 == deltaX < 0 - dismissRight = this.xVelocity > 0 - } - if (dismiss) { - // dismiss - mView.animate() - .translationX((if (dismissRight) mViewWidth else -mViewWidth).toFloat()) - .alpha(0f) - .setDuration(mAnimationTime) - .setListener(object : AnimatorListenerAdapter() { - override fun onAnimationEnd(animation: Animator) { - performDismiss() - } - }) - } else if (mSwiping) { - // cancel - mView.animate() - .translationX(0f) - .alpha(1f) - .setDuration(mAnimationTime) - .setListener(null) - mCallbacks.onTouch(view, false) - } - this.recycle() - mVelocityTracker = null - mTranslationX = 0f - mDownX = 0f - mDownY = 0f - mSwiping = false - } - } - MotionEvent.ACTION_CANCEL -> { - mVelocityTracker?.run { - mView.animate() - .translationX(0f) - .alpha(1f) - .setDuration(mAnimationTime) - .setListener(null) - this.recycle() - mVelocityTracker = null - mTranslationX = 0f - mDownX = 0f - mDownY = 0f - mSwiping = false - } - } - MotionEvent.ACTION_MOVE -> { - mVelocityTracker?.run { - this.addMovement(motionEvent) - val deltaX = motionEvent.rawX - mDownX - val deltaY = motionEvent.rawY - mDownY - if (Math.abs(deltaX) > mSlop && Math.abs(deltaY) < Math.abs(deltaX) / 2) { - mSwiping = true - mSwipingSlop = if (deltaX > 0) mSlop else -mSlop - mView.parent.requestDisallowInterceptTouchEvent(true) - - // Cancel listview's touch - val cancelEvent = MotionEvent.obtain(motionEvent) - cancelEvent.action = MotionEvent.ACTION_CANCEL or (motionEvent.actionIndex shl MotionEvent.ACTION_POINTER_INDEX_SHIFT) - mView.onTouchEvent(cancelEvent) - cancelEvent.recycle() - } - - if (mSwiping) { - mTranslationX = deltaX - mView.translationX = deltaX - mSwipingSlop - // TODO: use an ease-out interpolator or such - mView.alpha = Math.max(0f, Math.min(1f, - 1f - 2f * Math.abs(deltaX) / mViewWidth)) - return true - } - } - } - else -> { - view.performClick() - return false - } - } - return false - } - - @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB) - private fun performDismiss() { - // Animate the dismissed view to zero-height and then fire the dismiss callback. - // This triggers layout on each animation frame; in the future we may want to do something - // smarter and more performant. - - val lp = mView.layoutParams - val originalHeight = mView.height - - val animator = ValueAnimator.ofInt(originalHeight, 1).setDuration(mAnimationTime) - - animator.addListener(object : AnimatorListenerAdapter() { - override fun onAnimationEnd(animation: Animator) { - mCallbacks.onDismiss(mView) - // Reset view presentation - mView.alpha = 1f - mView.translationX = 0f - lp.height = originalHeight - mView.layoutParams = lp - } - }) - - animator.addUpdateListener { valueAnimator -> - lp.height = valueAnimator.animatedValue as Int - mView.layoutParams = lp - } - - animator.start() - } - - /** - * The callback interface used by [SwipeDismissTouchListener] to inform its client - * about a successful dismissal of the view for which it was created. - */ - interface DismissCallbacks { - /** - * Called to determine whether the view can be dismissed. - * - * @return boolean The view can dismiss. - */ - fun canDismiss(): Boolean - - /** - * Called when the user has indicated they she would like to dismiss the view. - * - * @param view The originating [View] - */ - fun onDismiss(view: View) - - /** - * Called when the user touches the view or release the view. - * - * @param view The originating [View] - * @param touch The view is being touched. - */ - fun onTouch(view: View, touch: Boolean) - } -} \ No newline at end of file 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 587283888f..2deb4200f0 100644 --- a/app/src/main/java/com/gh/common/util/CommentDraftContainer.kt +++ b/app/src/main/java/com/gh/common/util/CommentDraftContainer.kt @@ -3,6 +3,7 @@ package com.gh.common.util import com.gh.gamecenter.room.AppDatabase import com.gh.gamecenter.room.dao.CommentDraftDao +// TODO 移除全局 Dao object CommentDraftContainer { 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/DataUtils.java b/app/src/main/java/com/gh/common/util/DataUtils.java index 41c9f0d5ec..e353e88c22 100644 --- a/app/src/main/java/com/gh/common/util/DataUtils.java +++ b/app/src/main/java/com/gh/common/util/DataUtils.java @@ -40,86 +40,14 @@ public class DataUtils { /** * 初始化各种统计工具，仅在release build（非debug）模式启用统计 - * - * @param context - * @param channel */ public static void init(final Application context, String channel) { - if (CommonDebug.IS_DEBUG) { return; } // 初始化 Sentry 约占用 90ms，这里切换到子线程初始化 AppExecutor.getIoExecutor().execute(() -> initSentry(context, channel)); - - //TalkingData -// try { -// TCAgent.LOG_ON = false; -// TCAgent.init(context, Config.TALKINGDATA_APPID, channel); -// /** -// * -// * 不要启用！！！！不要启用，全部由{@link com.gh.base.AppUncaughtHandler}处理 -// */ -// TCAgent.setReportUncaughtExceptions(false); -// } catch (Exception e) { -// e.printStackTrace(); -// } - - //MTA -// try { -// /** -// * -// * 不要启用！！！！全部由{@link com.gh.base.AppUncaughtHandler}处理 -// */ -// StatConfig.setAutoExceptionCaught(false); -// -// StatCrashReporter crashReporter = StatCrashReporter.getStatCrashReporter(context); -// crashReporter.setJavaCrashHandlerStatus(false); -//// crashReporter.setEnableInstantReporting(true); -// -// StatConfig.setDebugEnable(false); -// -// // 设置数据上报策略 -// // 测试渠道的时候即时上传，方便查看日志 -// if (Config.DEFAULT_CHANNEL.equals(HaloApp.getInstance().getChannel())) { -// StatConfig.setStatSendStrategy(StatReportStrategy.INSTANT); -// } else { -// StatConfig.setStatSendStrategy(StatReportStrategy.PERIOD); -// StatConfig.setSendPeriodMinutes(5); -// } -// -// // 设置启用Tlink -// StatConfig.setTLinkStatus(true); -// -// StatConfig.init(context); -// StatConfig.setInstallChannel(channel); -// StatConfig.setAntoActivityLifecycleStat(true); -// StatConfig.setAppVersion(PackageUtils.getVersionName()); -// -// // 开启收集服务 -// StatService.startStatService(context, Config.MTA_APPKEY, com.tencent.stat.common.StatConstants.VERSION); -// StatService.registerActivityLifecycleCallbacks(context); -// } catch (MtaSDkException e) { -// e.printStackTrace(); -// } - - // init bugly -// try { -// CrashReport.setIsDevelopmentDevice(context, Config.DEFAULT_CHANNEL.equals(channel)); -// -// CrashReport.UserStrategy strategy = new CrashReport.UserStrategy(context); -// strategy.setEnableANRCrashMonitor(false); -// strategy.setEnableNativeCrashMonitor(false); -// strategy.setAppChannel(channel); -// strategy.setAppVersion(PackageUtils.getVersionName()); -// -// CrashReport.initCrashReport(context, Config.BUGLY_APPID, false, strategy); -// -// } catch (Exception e) { -// e.printStackTrace(); -// } - } private static void initSentry(Context context, String channel) { @@ -157,14 +85,6 @@ public class DataUtils { }); } - // MTA ->【次数统计】Key-Value参数的事件 - public static void onMtaEvent(Context context, String eventId, String... kv) { -// if (CommonDebug.IS_DEBUG && (kv == null || kv.length % 2 != 0)) { -// throw new IllegalStateException("onEvent kv 必须不为空且数量为偶数"); -// } - MtaHelper.onEvent(eventId, kv); - } - public static void getGid() { GidHelper.getInstance().registerDevice(HaloApp.getInstance().getApplication(), new GidCallback() { @Override @@ -210,109 +130,4 @@ public class DataUtils { }); } - public static void onEvent(Context var0, String var1, String var2) { -// Properties prop = new Properties(); -// prop.setProperty(var1, var2); -// StatService.trackCustomKVEvent(var0, var1, prop); - } - - public static void onPause(Activity var0) { -// StatService.onPause(var0); - } - - public static void onResume(Activity var0) { -// StatService.onResume(var0); - } - - // 游戏启动 - public static void onGameLaunchEvent(Context context, String gameName, String platform, String page) { - Map kv = new HashMap<>(); - kv.put("版本", platform); - kv.put("页面", page); - onEvent(context, "游戏启动", gameName, kv); - } - - public static void onEvent(Context var0, String var1, String var2, Map var3) { -// Properties prop = new Properties(); -// prop.setProperty("label", var2); -// for (String key : var3.keySet()) { -// prop.setProperty(key, var3.get(key) + ""); -// } -// StatService.trackCustomKVEvent(var0, var1, prop); - } - - public static void trackTimeEvent(Context context, String eventId, int costTime, String... kv) { -// -// Properties prop = new Properties(); -// for (int i = 0; i < kv.length; i++) { -// if (i % 2 != 0 || i != 0) { -// String key = kv[i - 1]; -// String value = kv[i]; -// if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(value)) { -// prop.setProperty(key, value); -// } -// } -// } -// -// if (prop.size() == 0) return; -// -// StatService.trackCustomKVTimeIntervalEvent(context, costTime, eventId, prop); - } - - // 游戏下载 - public static void onGameDownloadEvent(Context context, String gameName, String platform, String entrance, String status, String method) { - Map kv = new HashMap<>(); - - platform = PlatformUtils.getInstance(HaloApp.getInstance().getApplication()).getPlatformName(platform); - - kv.put("版本", platform); - kv.put("用户机型", Build.MODEL); - kv.put("设备JNFJ", MetaUtil.getBase64EncodedIMEI()); - kv.put("网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication())); - kv.put("光环助手版本", BuildConfig.VERSION_NAME); - kv.put("位置", entrance); - kv.put("类型", method); - kv.put("厂商", Build.MANUFACTURER); - kv.put("Android版本", Build.VERSION.RELEASE); - onEvent(context, "游戏下载", gameName, kv); - - Map kv2 = new HashMap<>(); - kv2.put("状态", status); - kv2.put("位置", entrance); - - if (status.equals("开始")) { - kv2.put("版本", entrance + "-开始"); - kv2.put("游戏分平台", gameName + "-" + platform + "-开始"); - kv2.put("光环助手版本", BuildConfig.VERSION_NAME + "-开始"); - } else { - kv2.put("版本", platform); - kv2.put("游戏分平台", gameName + "-" + platform); - kv2.put("光环助手版本", BuildConfig.VERSION_NAME); - } - - onEvent(context, "游戏下载位置", gameName, kv2); - } - - // 游戏更新 - public static void onGameUpdateEvent(Context context, String gameName, String paltform, String status) { - Map kv = new HashMap<>(); - kv.put("版本", paltform); - kv.put("状态", status); - onEvent(context, "游戏更新", gameName, kv); - } - - public static void onError(Context context, Throwable throwable) { - //bugly 作为默认处理异常的类库，已经上报了，此处不重复上报 - try { -// CrashReport.postCatchedException(throwable); - } catch (Exception e) { - } - - //talkingdata - try { -// TCAgent.onError(context, throwable); - } catch (Exception e) { - } - } - } 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 47f08c938f..64e2c3ce45 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt @@ -791,7 +791,6 @@ object DownloadItemUtils { if (entrance.contains("我的游戏")) { MtaHelper.onEvent("我的游戏_启动", "启动", gameEntity.name) } - DataUtils.onGameLaunchEvent(context, gameEntity.name, gameEntity.getApk()[0].getPlatform(), location) PackageUtils.launchApplicationByPackageName(context, gameEntity.getApk()[0].packageName) EnergyTaskHelper.postEnergyTask("play_game", gameEntity.id, gameEntity.getApk()[0].packageName) } else if (str == context.getString(R.string.update)) { @@ -827,7 +826,6 @@ object DownloadItemUtils { ) { val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size) if (TextUtils.isEmpty(msg)) { - DataUtils.onGameDownloadEvent(context, gameEntity.name, gameEntity.getApk()[0].getPlatform(), entrance, "下载开始", "下载") DownloadManager.createDownload(context, gameEntity, context.getString(R.string.download), entrance, location, isSubscribe, traceEvent) Utils.toast(context, gameEntity.name + "已加入下载队列") downloadBtn.setText(R.string.downloading) @@ -846,7 +844,6 @@ object DownloadItemUtils { ) { val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size) if (TextUtils.isEmpty(msg)) { - DataUtils.onGameDownloadEvent(context, gameEntity.name, gameEntity.getApk()[0].getPlatform(), entrance, "下载开始", "插件化") DownloadManager.createDownload(context, gameEntity, "插件化", entrance, location, isSubscribe, traceEvent) Utils.toast(context, gameEntity.name + "已加入下载队列") downloadBtn.setText(R.string.downloading) @@ -894,7 +891,6 @@ object DownloadItemUtils { traceEvent: ExposureEvent? ) { val apkEntity = gameEntity.getApk()[0] - DataUtils.onGameUpdateEvent(context, gameEntity.name, apkEntity.getPlatform(), "下载开始") DownloadManager.createDownload(context, gameEntity, "更新", entrance, location, isSubscribe, traceEvent) } } \ No newline at end of file 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 5eb7dba93c..6a7c67eb17 100644 --- a/app/src/main/java/com/gh/common/util/DownloadObserver.kt +++ b/app/src/main/java/com/gh/common/util/DownloadObserver.kt @@ -294,7 +294,6 @@ object DownloadObserver { if (downloadEntity.isPlugin) { type = ExposureUtils.DownloadType.PLUGIN_UPDATE } - DataUtils.onEvent(mApplication, "游戏更新", downloadEntity.name, kv1) } else { type = ExposureUtils.DownloadType.DOWNLOAD } @@ -305,7 +304,6 @@ object DownloadObserver { kv3["版本"] = downloadEntity.platform kv3["位置"] = downloadEntity.entrance ?: "null" type = ExposureUtils.DownloadType.PLUGIN_DOWNLOAD - DataUtils.onEvent(mApplication, "插件化", downloadEntity.name, kv3) } val isPlatformRecommend = java.lang.Boolean.parseBoolean(downloadEntity.getMetaExtra(Constants.IS_PLATFORM_RECOMMEND)) ExposureUtils.logADownloadCompleteExposureEvent( diff --git a/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt b/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt index 72700046de..c2ad1d6d49 100644 --- a/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt +++ b/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt @@ -274,7 +274,6 @@ object GameActivityDownloadHelper { ) { val msg = FileUtils.isCanDownload(context, apk.size) if (TextUtils.isEmpty(msg)) { - DataUtils.onGameDownloadEvent(context, gameEntity.name, apk.getPlatform(), entrance, "下载开始", "下载") DownloadManager.createDownload( context, apk, gameEntity, context.getString( R.string.download @@ -298,7 +297,6 @@ object GameActivityDownloadHelper { ) { val msg = FileUtils.isCanDownload(context, apk.size) if (TextUtils.isEmpty(msg)) { - DataUtils.onGameDownloadEvent(context, gameEntity.name, apk.getPlatform(), entrance, "下载开始", "插件化") DownloadManager.createDownload(context, apk, gameEntity, "插件化", entrance, location, isSubscribe, traceEvent) ToastUtils.toast("${gameEntity.name}已加入下载队列") } else { @@ -316,7 +314,6 @@ object GameActivityDownloadHelper { isSubscribe: Boolean, traceEvent: ExposureEvent? ) { - DataUtils.onGameUpdateEvent(context, gameEntity.name, apk.getPlatform(), "下载开始") DownloadManager.createDownload(context, apk, gameEntity, "更新", entrance, location, isSubscribe, traceEvent) ToastUtils.toast("${gameEntity.name}已加入下载队列") } diff --git a/app/src/main/java/com/gh/common/util/IntentUtils.java b/app/src/main/java/com/gh/common/util/IntentUtils.java index 90f69d6005..b44f69e5db 100644 --- a/app/src/main/java/com/gh/common/util/IntentUtils.java +++ b/app/src/main/java/com/gh/common/util/IntentUtils.java @@ -63,7 +63,6 @@ public class IntentUtils { } public static void startCategoryListActivity(Context context, String categoryTitle, CategoryEntity category) { - DataUtils.onMtaEvent(context, "分类大全", categoryTitle, category.getName()); context.startActivity(CategoryListActivity.Companion.getIntent(context, categoryTitle, category, "全部")); } diff --git a/app/src/main/java/com/gh/common/view/SubCategoryView.kt b/app/src/main/java/com/gh/common/view/SubCategoryView.kt index c1009445e0..15cae94672 100644 --- a/app/src/main/java/com/gh/common/view/SubCategoryView.kt +++ b/app/src/main/java/com/gh/common/view/SubCategoryView.kt @@ -50,7 +50,6 @@ class SubCategoryView @JvmOverloads constructor(context: Context, attrs: Attribu private fun setCategory(tv: TextView, category: CategoryEntity) { tv.text = category.name tv.setOnClickListener { - DataUtils.onMtaEvent(context, "分类大全", categoryTitle, primeCategory?.name!! + "-" + category.name!!) tv.context.startActivity(CategoryListActivity.getIntent(tv.context, categoryTitle!!, primeCategory!!, category.name!!)) } } diff --git a/app/src/main/java/com/gh/download/PackageObserver.kt b/app/src/main/java/com/gh/download/PackageObserver.kt index af8ebb0d9a..6841a91d97 100644 --- a/app/src/main/java/com/gh/download/PackageObserver.kt +++ b/app/src/main/java/com/gh/download/PackageObserver.kt @@ -80,19 +80,6 @@ object PackageObserver { BrowserInstallHelper.onApkInstalled(mDownloadEntity?.path) if (mDownloadEntity != null) { - if (mDownloadEntity.isPluggable) { - val kv6: MutableMap = HashMap() - kv6["安装或卸载"] = "安装完成" - DataUtils.onEvent(application, "插件化", mDownloadEntity.name, kv6) - -// DataUtils.onMtaEvent(this, -// "插件化_新", -// "位置", mDownloadEntity.getEntrance(), -// "游戏", mDownloadEntity.getName() + "-" + mDownloadEntity.getPlatform(), -// "操作", "安装完成", -// "网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication())); - } - // 没有光环 ID 的都记录一下游戏 ID，供'我的游戏'区分同包名不同插件用 val gh_id = PackageUtils.getMetaData(application, mDownloadEntity.packageName, "gh_id") if (gh_id == null) { @@ -128,16 +115,6 @@ object PackageObserver { mPackageViewModel.addUninstalledGame(packageName) mDownloadEntity?.let { if (it.isPluggable || it.isUpdate) { - val kv6: MutableMap = HashMap() - kv6["安装或卸载"] = "卸载完成" - DataUtils.onEvent(application, "插件化", mDownloadEntity.name, kv6) - -// DataUtils.onMtaEvent(this, -// "插件化_新", -// "位置", mDownloadEntity.getEntrance(), -// "游戏", mDownloadEntity.getName() + "-" + mDownloadEntity.getPlatform(), -// "操作", "卸载完成", -// "网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication())); PackageInstaller.install(application, mDownloadEntity) } } diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt index 896c91becb..28acb5f8fa 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt @@ -103,7 +103,6 @@ class GameDetailActivity : NormalActivity() { scrollToServer: Boolean = false, traceEvent: ExposureEvent? = null ) { - DataUtils.onMtaEvent(context, "详情页面", "游戏详情", if (gameEntity != null) gameEntity.name else "") val bundle = Bundle() if (traceEvent != null) { diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 42ed368c95..34d83d3916 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -428,17 +428,6 @@ public class NewsDetailActivity extends ToolBarActivity implements OnClickListen } if (adapter.getNewsDetailEntity() != null) { - // 阅读报告 - Map kv = new HashMap<>(); - kv.put("用时", cost); - DataUtils.onEvent(NewsDetailActivity.this, "阅读文章", adapter.getNewsDetailEntity().getTitle(), kv); - - // 阅读报告 - Map kv1 = new HashMap<>(); - kv1.put(mEntrance, "阅读数"); - kv1.put(mEntrance, "用时:" + cost); - DataUtils.onEvent(NewsDetailActivity.this, "文章数据", adapter.getNewsDetailEntity().getTitle(), kv1); - if (seconds > 0) { DataCollectionUtils.uploadNews(this, adapter.getNewsDetailEntity(), gameEntity, seconds, mEntrance); } 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 20187f82e0..792fe96c0d 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 @@ -236,7 +236,6 @@ public class DetailViewHolder { return; } - DataUtils.onGameLaunchEvent(mViewHolder.context, mGameEntity.getName(), mGameEntity.getApk().get(0).getPlatform(), mName); PackageUtils.launchApplicationByPackageName(mViewHolder.context, mGameEntity.getApk().get(0).getPackageName()); } else { GamePermissionDialogFragment.show((AppCompatActivity) mViewHolder.context, mGameEntity, mGameEntity.getInfo(), () -> { @@ -371,12 +370,6 @@ public class DetailViewHolder { ApkEntity apkEntity = mGameEntity.getApk().get(0); String msg = FileUtils.isCanDownload(mViewHolder.context, apkEntity.getSize()); if (TextUtils.isEmpty(msg)) { - DataUtils.onGameDownloadEvent(mViewHolder.context, mGameEntity.getName(), - apkEntity.getPlatform(), - StringUtils.buildString(mEntrance, "+(", mName, "[", mTitle, "])"), - "下载开始", - method); - DownloadManager.createDownload(mViewHolder.context, apkEntity, mGameEntity, 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 3495614737..123dd4d8df 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -347,10 +347,6 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { Utils.toast(mContext, "最多只能同时启动3个下载任务"); break; case "启动": - Map kv = new HashMap<>(); - kv.put("版本", downloadEntity.getPlatform()); - DataUtils.onEvent(mContext, "游戏启动", downloadEntity.getName(), kv); - PackageUtils.launchApplicationByPackageName(mContext, downloadEntity.getPackageName()); break; case "失败": @@ -503,16 +499,6 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { // 显示插件化 void showPluginDialog(final String path) { DialogHelper.showPluginDialog(mContext, () -> { - for (DownloadEntity downloadEntity : DownloadManager.getInstance().getAllDownloadEntityExcludeSilentUpdate()) { - if (downloadEntity.isPluggable() - && downloadEntity.getPath().equals(path)) { - Map kv6 = new HashMap<>(); - kv6.put("操作", "点击插件化安装完成"); - DataUtils.onEvent(mContext, "插件化", downloadEntity.getName(), kv6); - break; - } - } - if (FileUtils.isEmptyFile(path)) { Utils.toast(mContext, R.string.install_failure_hint); } else { 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 6242c0a34e..ca1c59e948 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -374,10 +374,6 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter implemen }); }); } else if (mContext.getString(R.string.launch).equals(str)) { - Map kv = new HashMap<>(); - kv.put("版本", updateEntity.getPlatform()); - DataUtils.onEvent(mContext, "游戏启动", updateEntity.getName(), kv); - PackageUtils.launchApplicationByPackageName(mContext, updateEntity.getPackageName()); } else if (mContext.getString(R.string.downloading).equals(str)) { @@ -501,11 +497,6 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter implemen GameUpdateEntity updateEntity = updateList.get(position); ExposureUtils.DownloadType downloadType; - Map kv = new HashMap<>(); - kv.put("版本", updateEntity.getPlatform()); - kv.put("状态", "下载开始"); - DataUtils.onEvent(mContext, "游戏更新", updateEntity.getName(), kv); - String downloadId = PackageInstaller.createDownloadId(updateEntity.getName()); DownloadEntity downloadEntity = new DownloadEntity(); diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java index 9fb4bfcf80..9c969f252f 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java @@ -273,23 +273,6 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem @Override public void onDoubleTap() { EventBus.getDefault().post(new EBUISwitch(EB_MAIN_SCROLL_TOP, finalI)); - switch (finalI) { - case INDEX_HOME: - DataUtils.onMtaEvent(getContext(), "顶级页面", "BottomBar_双击", "首页"); - break; - case INDEX_GAME: - DataUtils.onMtaEvent(getContext(), "顶级页面", "BottomBar_双击", "游戏库"); - break; - case INDEX_VIDEO: - DataUtils.onMtaEvent(getContext(), "顶级页面", "BottomBar_双击", "视频"); - break; - case INDEX_BBS: - DataUtils.onMtaEvent(getContext(), "顶级页面", "BottomBar_双击", "问答"); - break; - case INDEX_PERSONAL: - DataUtils.onMtaEvent(getContext(), "顶级页面", "BottomBar_双击", "我的光环"); - break; - } } }); } @@ -482,7 +465,6 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem break; } - DataUtils.onMtaEvent(getContext(), "顶级页面", "BottomBar", tabText); TrackerLogger.logHomeTabSelected(index, tabText); if (index != INDEX_BBS) { 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 6c33f8b248..56dcda4bb3 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java @@ -287,7 +287,6 @@ public class SearchToolbarFragment extends BaseLazyFragment implements View.OnCl intent = SearchActivity.getIntent(requireContext(), true, mSearchHintTv.getHint().toString(), "(工具栏)"); startActivity(intent); } else if (id == R.id.actionbar_search_input || id == R.id.actionbar_search_rl || id == R.id.actionbar_search_right) { - DataUtils.onEvent(getActivity(), "主页", "搜索框"); MtaHelper.onEvent("首页_点击", "顶栏", "搜索"); DataCollectionUtils.uploadClick(getActivity(), "搜索框", "主页"); if ("首页".equals(mLocation) || "游戏库".equals(mLocation)) { @@ -297,7 +296,6 @@ public class SearchToolbarFragment extends BaseLazyFragment implements View.OnCl intent = SearchActivity.getIntent(requireContext(), false, mSearchHintTv.getHint().toString(), "(工具栏)"); startActivity(intent); } else if (id == R.id.actionbar_notification) { - DataUtils.onEvent(getActivity(), "主页", "消息图标"); MtaHelper.onEvent("首页_点击", "顶栏", "消息中心"); DataCollectionUtils.uploadClick(getActivity(), "消息图标", "主页"); 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 1695817e8f..a08b30cc76 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt @@ -484,9 +484,6 @@ class GameDetailFragment : NormalFragment() { mViewModel.concernLiveData.observeNonNull(this) { response -> if (response.isConcern) { if (response.isSuccess) { - val kv = HashMap() - kv["状态"] = R.string.concern - DataUtils.onEvent(context, "游戏关注", mGameEntity!!.name, kv) MtaHelper.onEvent("游戏详情_新", "关注", mGameEntity!!.name) DataCollectionUtils.uploadConcern( context, @@ -502,10 +499,6 @@ class GameDetailFragment : NormalFragment() { } } else { if (response.isSuccess) { - val kv = HashMap() - kv["状态"] = "取消关注" - DataUtils.onEvent(context, "游戏关注", mGameEntity!!.name, kv) - DataCollectionUtils.uploadConcern( context, mGameEntity!!.name, 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 7a968cedea..2a16b61198 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt @@ -89,9 +89,6 @@ class GameDetailViewModel(application: Application, .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : Response() { override fun onResponse(response: GameEntity?) { - val name = if (response != null) response.name else "" - DataUtils.onMtaEvent(getApplication(), "详情页面", "游戏详情", name) - game = response gameLiveData.postValue(Resource.success(game)) getGameDetailNew() diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRaidersAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRaidersAdapter.kt index 2104caafb4..770d0a4a87 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRaidersAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRaidersAdapter.kt @@ -77,7 +77,6 @@ class GameRaidersAdapter(val context: Context, val articles: ArrayList" + article.title) MtaHelper.onEvent("游戏详情_新", "新手攻略卡片", "${game?.name}+${article.title}") // 统计阅读量 diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt index ced50c0969..d4143fde73 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt @@ -167,11 +167,6 @@ class FuLiFragment : LazyFragment(), IScrollable { EventBus.getDefault().post(EBReuse("showKaifuHint")) } }, 200) - } else if (GameDetailFragment.SCROLL_TO_KAIFU == reuse.type && layoutManager != null) { - DataUtils.onMtaEvent(context, "游戏详情开服表按钮", mFuLiViewModel?.game?.name) - DataUtils.onMtaEvent(context, "游戏详情_新", "开服表", mFuLiViewModel?.game?.name) -// val position = getServerPosition() -// if (position > 0) layoutManager?.smoothScrollToPosition(mRecyclerView, null, position) } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/GameNewsAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/GameNewsAdapter.kt index df93c24e9d..1be9650c03 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/GameNewsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/GameNewsAdapter.kt @@ -44,8 +44,6 @@ class GameNewsAdapter(val context: Context, val article: ArrayList, DataCollectionUtils.uploadClick(context, "新手攻略", "游戏详情", newsEntity.title) - DataUtils.onMtaEvent(context, "游戏详情_新", "新手攻略", "${mFuLiViewModel?.game?.name}+${newsEntity.title}") - // 统计阅读量 NewsUtils.statNewsViews(newsEntity.id) NewsDetailActivity.startNewsDetailActivity(context, newsEntity, diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/tools/GameDetailToolsAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/tools/GameDetailToolsAdapter.java index 835dd93639..4e6d5fd12b 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/tools/GameDetailToolsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/tools/GameDetailToolsAdapter.java @@ -104,7 +104,6 @@ public class GameDetailToolsAdapter extends BaseRecyclerAdapter { viewHolder.itemView.setOnClickListener(v -> { String url = toolBoxEntity.getUrl(); - DataUtils.onMtaEvent(mContext, "游戏详情_新", "游戏工具", mGameName + "+" + toolBoxEntity.getName()); if (url != null && url.contains(Config.URL_ARTICLE)) { // 写个注释例子， http://www.ghzs666.com/article/${articleId}.html 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 7d88726b1e..9723d8eef4 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UserManager.java @@ -201,52 +201,12 @@ public class UserManager { } if (code == 400401) { // 自动注销 - - // 由于需要获取 userId 故放置于 logout() 前 - DataUtils.onMtaEvent(HaloApp.getInstance().getApplication(), - "登录异常_自动登录_新", - "用户ID", UserManager.getInstance().getUserId(), - "光环版本", BuildConfig.VERSION_NAME, - "网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication()), - "JNFJ", MetaUtil.getBase64EncodedIMEI(), - "机型", Build.MODEL, - "厂商", Build.MANUFACTURER, - "Android版本", Build.VERSION.RELEASE - ); - UserRepository.getInstance().logout(); - - DataUtils.onMtaEvent(HaloApp.getInstance().getApplication(), "登录异常统计_自动登录" - , "错误码_RefreshToken", code + "_" + refreshToken.getValue() - , "网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication()) - , "用户机型", Build.MODEL - , "设备JNFJ", MetaUtil.getBase64EncodedIMEI()); - - // 重复统计,产品就是要这种效果=.= - DataUtils.onMtaEvent(HaloApp.getInstance().getApplication(), "登录失效" - , "登录失效", Build.MODEL); - } else if (code == 400802) { - DataUtils.onMtaEvent(HaloApp.getInstance().getApplication(), - "帐号在其它设备登录", - "用户ID", UserManager.getInstance().getUserId(), - "光环版本", BuildConfig.VERSION_NAME, - "网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication()), - "JNFJ", MetaUtil.getBase64EncodedIMEI(), - "机型", Build.MODEL, - "厂商", Build.MANUFACTURER, - "Android版本", Build.VERSION.RELEASE); - UserRepository.getInstance().logout(); } } catch (Exception e1) { e1.printStackTrace(); - // 记录解析异常数据 - DataUtils.onMtaEvent(HaloApp.getInstance().getApplication(), "登录异常统计_自动登录" - , "错误码_RefreshToken", code + "_" + e.code() + errorMessage + "_" + e1.toString() - , "网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication()) - , "用户机型", Build.MODEL - , "设备JNFJ", MetaUtil.getBase64EncodedIMEI()); } } else { try { @@ -255,9 +215,6 @@ public class UserManager { errorMessage = e.response().errorBody().string(); errCode = "" + e.code(); } - DataUtils.onMtaEvent(HaloApp.getInstance().getApplication(), "登录异常统计_意料之外的错误" - , "错误码_RefreshToken", errCode + "_" + refreshToken.getValue() - , "错误信息", errorMessage); } catch (Exception ex) { ex.printStackTrace(); } 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 2d4adc7dd0..5185758d73 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameViewModel.kt @@ -43,10 +43,6 @@ class MyFollowedGameViewModel(application: Application) gameEntity.id, object : ConcernUtils.onConcernListener { override fun onSuccess() { - val kv = HashMap() - kv["状态"] = R.string.cancel_concern - DataUtils.onEvent(getApplication(), "游戏关注", gameEntity.name, kv) - DataCollectionUtils.uploadConcern(getApplication(), gameEntity.name, gameEntity.id, 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 b9bb0f28de..5c335d6704 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -352,10 +352,6 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { , new ConcernUtils.onConcernListener() { @Override public void onSuccess() { - Map kv = new HashMap<>(); - kv.put("状态", mContext.getString(R.string.concern)); - DataUtils.onEvent(mContext, "游戏关注", mGameEntity.getName(), kv); - DataCollectionUtils.uploadConcern(mContext, mGameEntity.getName(), mGameEntity.getId(), mContext.getString(R.string.concern)); concern.setText(R.string.cancel_concern); @@ -373,20 +369,12 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } }, false); } else { - Map kv = new HashMap<>(); - kv.put("状态", mContext.getString(R.string.cancel_concern)); - DataUtils.onEvent(mContext, "游戏关注", mGameEntity.getName(), kv); - DialogHelper.showCancelDialog(mContext, () -> { //取消关注 ConcernUtils.INSTANCE.deleteConcernData(mContext, mGameEntity.getId() , new ConcernUtils.onConcernListener() { @Override public void onSuccess() { - Map kv1 = new HashMap<>(); - kv1.put("状态", mContext.getString(R.string.cancel_concern)); - DataUtils.onEvent(mContext, "游戏关注", mGameEntity.getName(), kv1); - DataCollectionUtils.uploadConcern(mContext, mGameEntity.getName(), mGameEntity.getId(), mContext.getString(R.string.cancel_concern)); 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 76e0214530..d9fa029d15 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.kt @@ -12,10 +12,6 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import com.gh.gamecenter.common.base.fragment.BaseLazyFragment import com.gh.common.databind.BindingAdapters -import com.gh.common.notifier.Notifier.Companion.create -import com.gh.common.notifier.Notifier.Companion.hide -import com.gh.common.notifier.Notifier.Companion.shouldShowNotifier -import com.gh.common.notifier.Notifier.Companion.tagNotifierAsShowed import com.gh.common.util.* import com.gh.common.util.DirectUtils.directToBadgeDetail import com.gh.common.util.DirectUtils.directToBadgeWall @@ -631,78 +627,6 @@ class NewPersonalFragment : BaseLazyFragment() { loadMessageUnreadTotal(false) } }) - mUnreadViewModel.liveData.observe(this, { messageUnread: MessageUnreadEntity? -> - if (messageUnread != null && messageUnread.total > 0) { - // 第一次开启应用时检查消息中心看有没有未读消息确定需不需要弹 Notifier 通知 - showNotifier(messageUnread) - } - }) - } - - private fun showNotifier(messageUnread: MessageUnreadEntity) { - if (mUnreadViewModel.isFirstTimeInit) { - mUnreadViewModel.flagFirstTimeInit(false) - if (messageUnread.meta != null && messageUnread.meta?.user != null) { - if (messageUnread.meta != null) { - var displayText = StringUtils.shrinkStringWithDot( - messageUnread.meta?.user?.name, 8 - ) - val suffixText: String = if ("follow_question" == messageUnread.meta?.type) { - "回答了你关注的问题" - } else { - "回答了你的问题" - } - displayText += suffixText - val content = messageUnread.meta?.answerId + displayText - if (shouldShowNotifier(content)) { - create(activity) - .setText(displayText) - .setDuration(5000) - .setIcon(messageUnread.meta?.user?.icon) - .setOnClickListener { - val bundle = Bundle() - bundle.putString( - EntranceConsts.KEY_ANSWER_ID, - messageUnread.meta?.answerId - ) - bundle.putString( - EntranceConsts.KEY_ENTRANCE, - EntranceConsts.ENTRANCE_UMENG - ) - bundle.putString( - EntranceConsts.KEY_TO, - SimpleAnswerDetailActivity::class.java.name - ) - EntranceUtils.jumpActivity(activity, bundle) - onEvent("消息弹窗", suffixText, "Does not contains any parameter.") - - // 标记已读 - val jsonObject = JSONObject() - try { - jsonObject.put("type", messageUnread.meta?.type) - val body = RequestBody.create( - MediaType.parse("application/json"), - jsonObject.toString() - ) - messageUnread.meta?.messageId?.let { - mPersonalViewModel.postMessageRead( - it, - body - ) { - loadMessageUnreadData() - } - } - } catch (e: Exception) { - e.printStackTrace() - } - hide() - } - .show(true, 500L) - tagNotifierAsShowed(content) - } - } - } - } } // 连接上网络事件 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 d6a0257770..970ea7c911 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt @@ -15,10 +15,6 @@ import androidx.recyclerview.widget.RecyclerView import com.gh.base.BaseActivity import com.gh.gamecenter.common.base.fragment.BaseLazyFragment import com.gh.common.databind.BindingAdapters -import com.gh.common.notifier.Notifier.Companion.create -import com.gh.common.notifier.Notifier.Companion.hide -import com.gh.common.notifier.Notifier.Companion.shouldShowNotifier -import com.gh.common.notifier.Notifier.Companion.tagNotifierAsShowed import com.gh.common.util.* import com.gh.common.util.DirectUtils.directToBadgeDetail import com.gh.common.util.DirectUtils.directToBadgeWall @@ -686,78 +682,6 @@ class PersonalFragment : BaseLazyFragment() { loadMessageUnreadTotal(false) } }) - mUnreadViewModel.liveData.observe(this, { messageUnread: MessageUnreadEntity? -> - if (messageUnread != null && messageUnread.total > 0) { - // 第一次开启应用时检查消息中心看有没有未读消息确定需不需要弹 Notifier 通知 - showNotifier(messageUnread) - } - }) - } - - private fun showNotifier(messageUnread: MessageUnreadEntity) { - if (mUnreadViewModel.isFirstTimeInit) { - mUnreadViewModel.flagFirstTimeInit(false) - if (messageUnread.meta != null && messageUnread.meta?.user != null) { - if (messageUnread.meta != null) { - var displayText = StringUtils.shrinkStringWithDot( - messageUnread.meta?.user?.name, 8 - ) - val suffixText: String = if ("follow_question" == messageUnread.meta?.type) { - "回答了你关注的问题" - } else { - "回答了你的问题" - } - displayText += suffixText - val content = messageUnread.meta?.answerId + displayText - if (shouldShowNotifier(content)) { - create(activity) - .setText(displayText) - .setDuration(5000) - .setIcon(messageUnread.meta?.user?.icon) - .setOnClickListener { - val bundle = Bundle() - bundle.putString( - EntranceConsts.KEY_ANSWER_ID, - messageUnread.meta?.answerId - ) - bundle.putString( - EntranceConsts.KEY_ENTRANCE, - EntranceConsts.ENTRANCE_UMENG - ) - bundle.putString( - EntranceConsts.KEY_TO, - SimpleAnswerDetailActivity::class.java.name - ) - EntranceUtils.jumpActivity(activity, bundle) - onEvent("消息弹窗", suffixText, "Does not contains any parameter.") - - // 标记已读 - val jsonObject = JSONObject() - try { - jsonObject.put("type", messageUnread.meta?.type) - val body = RequestBody.create( - MediaType.parse("application/json"), - jsonObject.toString() - ) - messageUnread.meta?.messageId?.let { - mPersonalViewModel.postMessageRead( - it, - body - ) { - loadMessageUnreadData() - } - } - } catch (e: Exception) { - e.printStackTrace() - } - hide() - } - .show(true, 500L) - tagNotifierAsShowed(content) - } - } - } - } } // 连接上网络事件 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 8c88de04f5..98a14ecd7e 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalViewModel.kt @@ -215,15 +215,12 @@ class PersonalViewModel(application: Application) : AndroidViewModel(application } when (data.type) { "game" -> { - DataUtils.onMtaEvent(context, "我的光环_签到跳转", "游戏", signEntity.title) GameDetailActivity.startGameDetailActivity(context, data.link, entrance) } "news" -> { - DataUtils.onMtaEvent(context, "我的光环_签到跳转", "文章", signEntity.title) context.startActivity(NewsDetailActivity.getIntentById(context, data.link, entrance)) } "column" -> { - DataUtils.onMtaEvent(context, "我的光环_签到跳转", "专题", signEntity.title) SubjectActivity.startSubjectActivity( context, data.link, diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt index cfe6366c0b..8f028cb083 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt @@ -788,13 +788,6 @@ open class AnswerDetailFragment : NormalFragment() { if (EntranceConsts.ENTRANCE_WELCOME == mEntrance) { LogUtils.uploadLikeFromWelcomeDialog() } - - DataUtils.onMtaEvent( - context, - "答案点赞量_社区加位置", - mViewModel.answerDetail?.community?.name, - mPath - ) } else { mViewModel.cancelLike(mAnswerId) } @@ -808,7 +801,6 @@ open class AnswerDetailFragment : NormalFragment() { mBinding.bottomController.replyTv.setOnClickListener { mViewModel.answerDetail?.run { if (commentable) { - DataUtils.onMtaEvent(context, "详情页面", "答案评论详情", content.subStringIfPossible(30)) showCommentDialog(true) } else { toast("作者已关闭评论") 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 0d0a610aa3..463513d38c 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 @@ -66,7 +66,6 @@ class AnswerDetailViewModel(application: Application) : AndroidViewModel(applica mAnswerLiveData.postValue(apiResponse) val content = Html.fromHtml(response!!.content).toString() - DataUtils.onMtaEvent(getApplication(), "详情页面", "答案详情", StringUtils.combineTwoString(content, answerId)) } override fun onFailure(e: HttpException?) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectFragment.java b/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectFragment.java index 69176c1462..8abf7428dd 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectFragment.java @@ -91,15 +91,6 @@ public class AskSubjectFragment extends ListFragmentonFailure:: code:" + code + " content:" + content.toString()); - DataUtils.onMtaEvent(mContext, "登录异常统计_手动登录", "错误码", String.valueOf(code) - , "网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication()) - , "用户机型", Build.MODEL - , "设备JNFJ", MetaUtil.getBase64EncodedIMEI()); - - DataUtils.onMtaEvent(HaloApp.getInstance().getApplication(), - "登录异常_手动登录_新", - "光环版本", BuildConfig.VERSION_NAME, - "网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication()), - "JNFJ", MetaUtil.getBase64EncodedIMEI(), - "机型", Build.MODEL, - "厂商", Build.MANUFACTURER, - "登录方式", finalLoginTypeForHumanEyes, - "Android版本", Build.VERSION.RELEASE - ); - } else { Utils.toast(mContext, mContext.getString(R.string.login_failure_hint_code, httpException.code())); } 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 de76305013..cdfe4432d3 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 @@ -136,10 +136,6 @@ class MyConcernAdapter extends BaseRecyclerAdapter { // 更新界面->cancelConcern() cancelConcern(gameEntity.getId()); - Map kv = new HashMap<>(); - kv.put("状态", R.string.cancel_concern); - DataUtils.onEvent(mContext, "游戏关注", gameEntity.getName(), kv); - DataCollectionUtils.uploadConcern(mContext, gameEntity.getName(), gameEntity.getId(), 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 0c290d2a23..0ffe4be310 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 @@ -183,11 +183,6 @@ public class MyConcernRecommendAdapter extends BaseRecyclerAdapterconcernGame() - - Map kv = new HashMap<>(); - kv.put("状态", R.string.concern); - DataUtils.onEvent(mContext, "游戏关注", gameEntity.getName(), kv); - DataCollectionUtils.uploadConcern(mContext, gameEntity.getName(), gameEntity.getId(), mContext.getString(R.string.concern)); diff --git a/app/src/main/res/layout/view_notifier.xml b/app/src/main/res/layout/view_notifier.xml deleted file mode 100644 index 4c836b2b9a..0000000000 --- a/app/src/main/res/layout/view_notifier.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - From 44c22197532efb38689912f25f6e6252364e2a6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Fri, 13 May 2022 15:34:22 +0800 Subject: [PATCH 26/52] =?UTF-8?q?=E6=A8=A1=E5=9D=97/=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=8C=96=E5=89=8D=E6=9C=9F=E6=94=B9=E9=80=A0=20https://git.sha?= =?UTF-8?q?nqu.cc/halo/android/assistant-android/-/issues/64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/base/BaseActivity.java | 5 +++-- .../dialog/InstallPermissionDialogFragment.kt | 1 + .../dialog/NotificationHintDialogFragment.kt | 1 + .../java/com/gh/download/dialog/DownloadDialog.kt | 2 +- .../detail/GameCollectionShareDialog.kt | 2 +- .../gamedetail/dialog/GameDetailMoreDialog.kt | 2 +- .../gamecenter/gamedetail/dialog/GameTagsDialog.kt | 2 +- .../gamedetail/dialog/InviteCodeDialog.kt | 2 +- .../qa/dialog/MoreFunctionPanelDialog.kt | 2 +- app/src/main/res/values-night/styles.xml | 14 -------------- app/src/main/res/values/strings.xml | 3 --- app/src/main/res/values/styles.xml | 13 ------------- .../common}/base/CustomLayoutInflaterFactory.kt | 10 +++++----- .../base/fragment}/BaseDraggableDialogFragment.kt | 9 ++++----- .../base/fragment}/BaseTrackableDialogFragment.kt | 2 +- .../main/res/anim/community_publication_enter.xml | 0 .../main/res/anim/community_publication_exit.xml | 0 module_common/src/main/res/values-night/style.xml | 12 ++++++++++++ module_common/src/main/res/values/strings.xml | 3 +++ module_common/src/main/res/values/style.xml | 12 ++++++++++++ 20 files changed, 48 insertions(+), 49 deletions(-) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter/common}/base/CustomLayoutInflaterFactory.kt (83%) rename {app/src/main/java/com/gh/common/dialog => module_common/src/main/java/com/gh/gamecenter/common/base/fragment}/BaseDraggableDialogFragment.kt (92%) rename {app/src/main/java/com/gh/common/dialog => module_common/src/main/java/com/gh/gamecenter/common/base/fragment}/BaseTrackableDialogFragment.kt (98%) rename {app => module_common}/src/main/res/anim/community_publication_enter.xml (100%) rename {app => module_common}/src/main/res/anim/community_publication_exit.xml (100%) diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index 44162461e9..aa526c7798 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -31,6 +31,7 @@ import androidx.core.view.LayoutInflaterCompat; import androidx.fragment.app.Fragment; import androidx.lifecycle.Lifecycle; +import com.gh.gamecenter.common.base.CustomLayoutInflaterFactory; import com.gh.gamecenter.common.base.fragment.BaseFragment; import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.common.constant.Constants; @@ -578,8 +579,8 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy } } - String backgroundString = (String) view.getTag(CustomLayoutInflaterFactory.TAG_BACKGROUND_ID); - String textColorString = (String) view.getTag(CustomLayoutInflaterFactory.TAG_TEXT_COLOR_ID); + String backgroundString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_BACKGROUND_ID()); + String textColorString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_TEXT_COLOR_ID()); if (backgroundString != null) { if (backgroundString.startsWith("#")) return; int backgroundId = Integer.parseInt( diff --git a/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt index 2b867161f0..3a78c2839d 100644 --- a/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt @@ -17,6 +17,7 @@ import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.utils.PermissionHelper.INSTALL_PERMISSION_CODE import com.gh.common.xapk.XapkInstaller import com.gh.gamecenter.R +import com.gh.gamecenter.common.base.fragment.BaseTrackableDialogFragment import com.gh.gamecenter.common.utils.PermissionHelper import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.common.utils.getExtension diff --git a/app/src/main/java/com/gh/common/dialog/NotificationHintDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/NotificationHintDialogFragment.kt index 5168404bf7..15ba3c8897 100644 --- a/app/src/main/java/com/gh/common/dialog/NotificationHintDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/NotificationHintDialogFragment.kt @@ -16,6 +16,7 @@ import com.gh.gamecenter.common.utils.PermissionHelper import com.gh.gamecenter.common.utils.fromHtml import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.R +import com.gh.gamecenter.common.base.fragment.BaseTrackableDialogFragment import com.gh.gamecenter.databinding.DialogNotificationHintBinding import com.gh.gamecenter.entity.NotificationStyleEntity import com.gh.gamecenter.entity.NotificationUgc 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 44ec86a909..0e1ac9e5de 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialog.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialog.kt @@ -15,7 +15,7 @@ import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.* import androidx.recyclerview.widget.RecyclerView.SmoothScroller import com.gh.gamecenter.core.utils.TimeElapsedHelper -import com.gh.common.dialog.BaseDraggableDialogFragment +import com.gh.gamecenter.common.base.fragment.BaseDraggableDialogFragment import com.gh.common.exposure.ExposureEvent import com.gh.common.util.* import com.gh.download.DownloadManager diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionShareDialog.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionShareDialog.kt index 4a0900c14b..113ff7decb 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionShareDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionShareDialog.kt @@ -5,7 +5,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity -import com.gh.common.dialog.BaseDraggableDialogFragment +import com.gh.gamecenter.common.base.fragment.BaseDraggableDialogFragment import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.toColor diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt index ed0a9d3026..55efed24bb 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt @@ -5,7 +5,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity -import com.gh.common.dialog.BaseDraggableDialogFragment +import com.gh.gamecenter.common.base.fragment.BaseDraggableDialogFragment import com.gh.common.util.EnergyTaskHelper.postEnergyTask import com.gh.gamecenter.core.utils.MtaHelper import com.gh.common.util.ShareUtils diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt index d42b470af7..faa36b9b82 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt @@ -10,7 +10,7 @@ import androidx.core.content.ContextCompat import androidx.core.os.bundleOf import androidx.fragment.app.FragmentActivity import androidx.recyclerview.widget.LinearLayoutManager -import com.gh.common.dialog.BaseTrackableDialogFragment +import com.gh.gamecenter.common.base.fragment.BaseTrackableDialogFragment import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.core.utils.MtaHelper 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 d920ba0323..894001b424 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 @@ -4,7 +4,7 @@ import android.annotation.SuppressLint import android.os.Bundle import android.view.* import androidx.appcompat.app.AppCompatActivity -import com.gh.common.dialog.BaseDraggableDialogFragment +import com.gh.gamecenter.common.base.fragment.BaseDraggableDialogFragment import com.gh.common.util.EnergyTaskHelper import com.gh.gamecenter.core.utils.ToastUtils import com.gh.gamecenter.databinding.DialogInviteCodeBinding diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/MoreFunctionPanelDialog.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/MoreFunctionPanelDialog.kt index 4d9dac9621..6a7bf7bb5c 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/dialog/MoreFunctionPanelDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/MoreFunctionPanelDialog.kt @@ -11,7 +11,7 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat -import com.gh.common.dialog.BaseDraggableDialogFragment +import com.gh.gamecenter.common.base.fragment.BaseDraggableDialogFragment import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.common.constant.EntranceConsts diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index 0c179ed125..aa158c0734 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -138,11 +138,6 @@ @drawable/switchbuttom_back_color - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/module_common/src/main/res/values/strings.xml b/module_common/src/main/res/values/strings.xml index 145e9309d1..d15afdc6ec 100644 --- a/module_common/src/main/res/values/strings.xml +++ b/module_common/src/main/res/values/strings.xml @@ -7,4 +7,7 @@ 取消关注游戏后，您将无法及时收到游戏的攻略、资讯等最新动态提醒。]]> 检查更新中... + + background_id + text_color_id \ No newline at end of file diff --git a/module_common/src/main/res/values/style.xml b/module_common/src/main/res/values/style.xml index 6b2e6d785c..6ec35131b0 100644 --- a/module_common/src/main/res/values/style.xml +++ b/module_common/src/main/res/values/style.xml @@ -83,4 +83,16 @@ 0dp fixed + + + + \ No newline at end of file From d2f5d35403ab41bc0165f3dba4e931169d37a337 Mon Sep 17 00:00:00 2001 From: juntao Date: Fri, 13 May 2022 15:51:29 +0800 Subject: [PATCH 27/52] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/constant/Config.java | 15 +- .../dialog/GameOffServiceDialogFragment.kt | 12 +- .../dialog/InstallPermissionDialogFragment.kt | 11 +- .../dialog/NotificationHintDialogFragment.kt | 18 +- .../gh/common/dialog/PrivacyDialogFragment.kt | 157 ------- .../gh/common/dialog/ReserveDialogFragment.kt | 384 ------------------ .../com/gh/common/dialog/WelcomeDialog.kt | 152 ------- .../main/java/com/gh/common/util/AdHelper.kt | 15 - .../java/com/gh/common/util/GameUtils.java | 7 +- .../gh/gamecenter/entity/SettingsEntity.kt | 2 - .../gamedetail/dialog/GameTagsDialog.kt | 10 +- 11 files changed, 9 insertions(+), 774 deletions(-) delete mode 100644 app/src/main/java/com/gh/common/dialog/PrivacyDialogFragment.kt delete mode 100644 app/src/main/java/com/gh/common/dialog/ReserveDialogFragment.kt delete mode 100644 app/src/main/java/com/gh/common/dialog/WelcomeDialog.kt 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 b27534fee1..6ea570f0d4 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -1,7 +1,6 @@ package com.gh.common.constant; import android.annotation.SuppressLint; -import android.content.Context; import android.content.SharedPreferences; import android.os.Build; import android.preference.PreferenceManager; @@ -46,10 +45,6 @@ public class Config { public static final String API_HOST = EnvHelper.getHost(); public static final String NEW_API_HOST = EnvHelper.getNewHost(); - /** - * 需要配置的请使用{@link PreferenceManager#getDefaultSharedPreferences(Context)} - */ - // Third-Party confs public static final String WECHAT_APPID = BuildConfig.WECHAT_APPID; public static final String WECHAT_SECRET = BuildConfig.WECHAT_SECRET; @@ -60,8 +55,7 @@ public class Config { // http://www.ghzs666.com/article/${articleId}.html public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // ghzs/ghzs666 统一 - - private static String SETTINGS_KEY = "settingsKey"; + private static final String SETTINGS_KEY = "settingsKey"; private static SettingsEntity mSettingsEntity; private static NewSettingsEntity mNewSettingsEntity; @@ -269,13 +263,6 @@ public class Config { return false; } - public static boolean isGameDomeSwitchOpen() { - return getSettings() != null && getSettings().getGameDomeSwitch().equals("on"); - } - public static boolean isPermissionPopupSwitchOpen() { - return getSettings() != null && getSettings().getPermissionPopupSwitch().equals("on"); - } - public static void fixHideFunction() { SharedPreferences preferences = PreferenceManager. getDefaultSharedPreferences(HaloApp.getInstance().getApplication()); diff --git a/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt index d9feb109b2..fbbe148516 100644 --- a/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt @@ -19,9 +19,7 @@ import com.gh.gamecenter.databinding.DialogGameOffServiceBinding import com.gh.gamecenter.entity.GameEntity // 游戏关闭下载弹窗 -class GameOffServiceDialogFragment -// : BaseTrackableDialogFragment() - : BaseDialogFragment() { +class GameOffServiceDialogFragment : BaseDialogFragment() { private var mDialog: GameEntity.Dialog? = null private var mBinding: DialogGameOffServiceBinding? = null @@ -78,14 +76,6 @@ class GameOffServiceDialogFragment return super.onCreateDialog(savedInstanceState).apply { setCanceledOnTouchOutside(true) } } -// override fun getEvent(): String { -// return "游戏下载状态按钮" -// } -// -// override fun getKey(): String { -// return "查看详情弹窗" -// } - companion object { const val KEY_DIALOG = "dialog" diff --git a/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt index 3a78c2839d..354d2a7572 100644 --- a/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt @@ -17,7 +17,7 @@ import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.utils.PermissionHelper.INSTALL_PERMISSION_CODE import com.gh.common.xapk.XapkInstaller import com.gh.gamecenter.R -import com.gh.gamecenter.common.base.fragment.BaseTrackableDialogFragment +import com.gh.gamecenter.common.base.fragment.BaseDialogFragment import com.gh.gamecenter.common.utils.PermissionHelper import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.common.utils.getExtension @@ -26,7 +26,7 @@ import com.gh.gamecenter.core.utils.MtaHelper import com.lightgame.download.DownloadEntity import kotlin.random.Random -class InstallPermissionDialogFragment : BaseTrackableDialogFragment() { +class InstallPermissionDialogFragment : BaseDialogFragment() { lateinit var mView: View var isXapk = false @@ -59,18 +59,15 @@ class InstallPermissionDialogFragment : BaseTrackableDialogFragment() { } closeTv.setOnClickListener { - MtaHelper.onEvent(getEvent(), getKey(), "文案样式_点击以后再说") if (isXapk) { mCallBack?.invoke() } dismiss() } closeIv.setOnClickListener { - MtaHelper.onEvent(getEvent(), getKey(), "图标样式_点击关闭") dismiss() } activateTv.setOnClickListener { - MtaHelper.onEvent(getEvent(), getKey(), if (randomNumber == 0) "文案样式_点击立即开启" else "图标样式_点击立即开启") PermissionHelper.toInstallPermissionSetting(requireActivity()) if (isXapk) { SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, requireActivity().javaClass.name) @@ -89,10 +86,6 @@ class InstallPermissionDialogFragment : BaseTrackableDialogFragment() { } } - override fun getEvent(): String = "安装引导弹窗" - - override fun getKey(): String = "引导弹窗" - companion object { @JvmStatic fun show(activity: AppCompatActivity, downloadEntity: DownloadEntity, callBack: (() -> Unit)?) { diff --git a/app/src/main/java/com/gh/common/dialog/NotificationHintDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/NotificationHintDialogFragment.kt index 15ba3c8897..52b16e63a5 100644 --- a/app/src/main/java/com/gh/common/dialog/NotificationHintDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/NotificationHintDialogFragment.kt @@ -16,7 +16,7 @@ import com.gh.gamecenter.common.utils.PermissionHelper import com.gh.gamecenter.common.utils.fromHtml import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.R -import com.gh.gamecenter.common.base.fragment.BaseTrackableDialogFragment +import com.gh.gamecenter.common.base.fragment.BaseDialogFragment import com.gh.gamecenter.databinding.DialogNotificationHintBinding import com.gh.gamecenter.entity.NotificationStyleEntity import com.gh.gamecenter.entity.NotificationUgc @@ -28,7 +28,7 @@ import java.io.InputStreamReader import kotlin.random.Random // 通知权限弹窗 -class NotificationHintDialogFragment : BaseTrackableDialogFragment() { +class NotificationHintDialogFragment : BaseDialogFragment() { private var mNotificationUgc: NotificationUgc? = null private val mBinding: DialogNotificationHintBinding by lazy { DialogNotificationHintBinding.inflate(layoutInflater) } @@ -69,8 +69,6 @@ class NotificationHintDialogFragment : BaseTrackableDialogFragment() { } activateTv.setOnClickListener { - MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), "点击立即开启") - MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), "${styleEntity.scenes}_${styleEntity.styleNo}_点击立即开启") dismissAllowingStateLoss() if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { //这种方案适用于 API 26, 即8.0（含8.0）以上可以用 @@ -89,24 +87,12 @@ class NotificationHintDialogFragment : BaseTrackableDialogFragment() { closeIv.setOnClickListener { dismissAllowingStateLoss() - MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), "点击关闭") - MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), "${styleEntity.scenes}_${styleEntity.styleNo}_点击关闭") } } dialog?.setCanceledOnTouchOutside(true) } - override fun getEvent(): String { - return "推送引导弹窗" - } - - override fun getKey(): String { - return "引导弹窗" - } - - override fun trackWithBasicDeviceInfo() = true - private fun getJsonFromAssets(): String? { val stringBuilder = StringBuilder() var bufferedReader: BufferedReader? = null diff --git a/app/src/main/java/com/gh/common/dialog/PrivacyDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/PrivacyDialogFragment.kt deleted file mode 100644 index 2a91ffd3a2..0000000000 --- a/app/src/main/java/com/gh/common/dialog/PrivacyDialogFragment.kt +++ /dev/null @@ -1,157 +0,0 @@ -package com.gh.common.dialog - -import android.app.Dialog -import android.content.DialogInterface -import android.os.Bundle -import android.text.SpannableStringBuilder -import android.text.Spanned -import android.text.TextPaint -import android.text.method.ScrollingMovementMethod -import android.text.style.ClickableSpan -import android.view.* -import android.widget.TextView -import androidx.appcompat.app.AppCompatActivity -import androidx.core.content.ContextCompat -import androidx.fragment.app.FragmentTransaction -import com.gh.gamecenter.common.base.fragment.BaseDialogFragment -import com.gh.gamecenter.common.utils.dip2px -import com.gh.gamecenter.common.view.CustomLinkMovementMethod -import com.gh.gamecenter.R -import com.gh.gamecenter.WebActivity - -class PrivacyDialogFragment : BaseDialogFragment() { - -// private val mLocalPrivacyHtml = "file:///android_asset/privacy_policies.html" -// private val mLocalRegulationHtml = "file:///android_asset/user_regulation.html" - - var containerView: View? = null - var mCallBack: ((isSuccess: Boolean) -> Unit)? = null - - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - containerView = LayoutInflater.from(requireContext()).inflate(R.layout.dialog_privacy_protocol, null, false) - return containerView - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) -// val mWebViewPrivacy = containerView?.findViewById(R.id.webView) -// val mWebViewRegulation = containerView?.findViewById(R.id.webView2) -// -// mWebViewPrivacy?.isHorizontalScrollBarEnabled = false -// mWebViewRegulation?.isHorizontalScrollBarEnabled = false - - val contentTv = containerView?.findViewById(R.id.contentTv) - val descTv = containerView?.findViewById(R.id.descTv) - contentTv?.movementMethod = ScrollingMovementMethod() - - val skipText = SpannableStringBuilder("查看完整版的隐私政策和用户协议") - skipText.setSpan(object : ClickableSpan() { - override fun updateDrawState(ds: TextPaint) { - super.updateDrawState(ds) - ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font) - ds.isUnderlineText = false - } - - override fun onClick(widget: View) { - val intent = WebActivity.getIntent(requireContext(), context!!.getString(R.string.privacy_policy_url), true) - context?.startActivity(intent) - } - }, skipText.length - 9, skipText.length - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) - - skipText.setSpan(object : ClickableSpan() { - override fun updateDrawState(ds: TextPaint) { - super.updateDrawState(ds) - ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font) - ds.isUnderlineText = false - } - - override fun onClick(widget: View) { - val intent = WebActivity.getIntent(requireContext(), context!!.getString(R.string.disclaimer_url), true) - context?.startActivity(intent) - } - }, skipText.length - 4, skipText.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) - descTv?.movementMethod = CustomLinkMovementMethod() - descTv?.text = skipText - -// val mWebViewPrivacy = containerView?.findViewById(R.id.webView) -// -// mWebViewPrivacy?.isHorizontalScrollBarEnabled = false -// -// val settingsArrayList = arrayListOf(mWebViewPrivacy?.settings, mWebViewRegulation?.settings) -// -// for (settings in settingsArrayList) { -// settings?.javaScriptEnabled = true -// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { -// settings?.mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW -// } -// // 避免提示网页有害信息不能访问 -// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { -// settings?.safeBrowsingEnabled = false -// } -// -// // 适配大于屏幕宽度的页面 -// settings?.useWideViewPort = true -// settings?.loadWithOverviewMode = true -// settings?.domStorageEnabled = true -// -// // 自适应屏幕 -// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { -// settings?.layoutAlgorithm = WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING -// } -// } - -// mWebViewPrivacy?.webViewClient = client -// mWebViewRegulation?.webViewClient = client - - containerView?.findViewById(R.id.refuseTv)?.setOnClickListener { - mCallBack?.invoke(false) - dismissAllowingStateLoss() - } - containerView?.findViewById(R.id.agreeTv)?.setOnClickListener { - mCallBack?.invoke(true) - dismissAllowingStateLoss() - } - } - - override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val createDialog = super.onCreateDialog(savedInstanceState) - createDialog.setCanceledOnTouchOutside(false) - createDialog.setOnKeyListener(object : DialogInterface.OnKeyListener { - override fun onKey(dialog: DialogInterface?, keyCode: Int, event: KeyEvent?): Boolean { - if (keyCode == KeyEvent.KEYCODE_BACK) { - return true - } - return false - } - }) - - val window = createDialog.window - window?.setGravity(Gravity.CENTER) - return createDialog - } - - override fun onStart() { - super.onStart() - val width = requireContext().resources.displayMetrics.widthPixels - 60F.dip2px() - val height = ViewGroup.LayoutParams.WRAP_CONTENT - dialog?.window?.setLayout(width, height) - } - - companion object { - @JvmStatic - fun show(activity: AppCompatActivity, callBack: ((isSuccess: Boolean) -> Unit)?) { - var privacyDialogFragment = activity.supportFragmentManager.findFragmentByTag(PrivacyDialogFragment::class.java.simpleName) as? PrivacyDialogFragment - if (privacyDialogFragment != null) { - privacyDialogFragment.mCallBack = callBack - val transaction: FragmentTransaction = activity.supportFragmentManager.beginTransaction() - transaction.show(privacyDialogFragment) - transaction.commit() - } else { - privacyDialogFragment = PrivacyDialogFragment().apply { - mCallBack = callBack - } - privacyDialogFragment.show(activity.supportFragmentManager, PrivacyDialogFragment::class.java.simpleName) - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/dialog/ReserveDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/ReserveDialogFragment.kt deleted file mode 100644 index f479f61c51..0000000000 --- a/app/src/main/java/com/gh/common/dialog/ReserveDialogFragment.kt +++ /dev/null @@ -1,384 +0,0 @@ -//package com.gh.common.dialog -// -//import android.annotation.SuppressLint -//import android.app.Application -//import android.os.Bundle -//import android.text.Html -//import android.view.* -//import android.view.animation.AnimationUtils -//import android.widget.EditText -//import android.widget.TextView -//import androidx.lifecycle.AndroidViewModel -//import androidx.lifecycle.MutableLiveData -//import androidx.lifecycle.Observer -//import butterknife.BindView -//import butterknife.ButterKnife -//import butterknife.OnClick -//import com.gh.gamecenter.common.base.fragment.BaseDialogFragment -//import com.gh.common.AppExecutor -//import com.gh.common.constant.Config -//import com.gh.common.history.HistoryHelper -//import com.gh.common.repository.ReservationRepository -//import com.gh.common.util.* -//import com.gh.gamecenter.R -//import com.gh.gamecenter.entity.GameEntity -//import com.gh.gamecenter.entity.NotificationUgc -//import com.gh.gamecenter.manager.UserManager -//import com.gh.gamecenter.retrofit.BiResponse -//import com.gh.gamecenter.retrofit.RetrofitManager -//import com.halo.assistant.HaloApp -//import com.lightgame.utils.Utils -//import io.reactivex.android.schedulers.AndroidSchedulers -//import io.reactivex.schedulers.Schedulers -//import okhttp3.ResponseBody -//import org.json.JSONArray -//import org.json.JSONObject -// -//// 预约弹窗 -//@Deprecated("v5.6.0废弃") -//class ReserveDialogFragment -// : BaseDialogFragment(), KeyboardHeightObserver { -//// : BaseTrackableDialogFragment() { -// -// @BindView(R.id.reserve_hint_tv) -// lateinit var reserveHintTv: TextView -// -// @BindView(R.id.reserve_content_tv) -// lateinit var reserveContentTv: TextView -// -// @BindView(R.id.reserve_completed_content_tv) -// lateinit var reserveCompletedContentTv: TextView -// -// @BindView(R.id.mobile_et) -// lateinit var mobileEt: EditText -// -// @BindView(R.id.reserve_container) -// lateinit var reserveContainer: View -// -// @BindView(R.id.reserve_completed_container) -// lateinit var reserveCompletedContainer: View -// -// @BindView(R.id.customizable_btn) -// lateinit var customizableBtn: TextView -// -// @BindView(R.id.content_container) -// lateinit var contentContainer: View -// -// @BindView(R.id.mobile_index_container) -// lateinit var mobileIndexContainer: View -// -// @BindView(R.id.mobile_index_reserve) -// lateinit var mobileIndexReserve: TextView -// -// @BindView(R.id.mobile_index_user) -// lateinit var mobileIndexUser: TextView -// -// @BindView(R.id.mobile_et_delete) -// lateinit var mobileEtDelete: View -// -// @BindView(R.id.layout_container) -// lateinit var layoutContainer: View -// -// private lateinit var mViewModel: ReserveViewModel -// -// var successCallback: SuccessCallback? = null -// -// private var mGame: GameEntity? = null -// private var mGameId: String = "" -// private var mGameName: String = "" -// -// private var mKeyboardHeightProvider: KeyboardHeightProvider? = null -// -// override fun onCreate(savedInstanceState: Bundle?) { -// super.onCreate(savedInstanceState) -// -// mGame = requireArguments().getParcelable(EntranceUtils.KEY_GAME) -// mGameId = mGame?.id ?:"" -// mGameName = mGame?.name ?:"" -// -// mViewModel = viewModelProvider() -// mKeyboardHeightProvider = KeyboardHeightProvider(activity) -// mKeyboardHeightProvider?.start() -// } -// -// override fun onActivityCreated(savedInstanceState: Bundle?) { -// super.onActivityCreated(savedInstanceState) -// dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE) -// } -// -// override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { -// return inflater.inflate(R.layout.dialog_reserve_game, null) -// } -// -//// override fun getEvent(): String { -//// return "预约游戏" -//// } -//// -//// override fun getKey(): String { -//// return "预约功能操作" -//// } -// -// @Suppress("DEPRECATION") -// @SuppressLint("SetTextI18n") -// override fun onViewCreated(view: View, savedInstanceState: Bundle?) { -// super.onViewCreated(view, savedInstanceState) -// ButterKnife.bind(this, view) -// -// val reserveContent = "游戏上线，您将收到免费短信提醒" -// reserveContentTv.text = Html.fromHtml(reserveContent) -// -// -// mobileEt.setTextChangedListener { s, _, _, _ -> -// mobileIndexContainer.visibility = View.GONE -// mobileEtDelete.goneIf(s.trim().isEmpty()) -// } -// -// mViewModel.reservation.observeNonNull(this) { -// if (it.success) { -// showSuccessDialog(it.withMobile, it.boundWechat) -// successCallback?.onSuccess() -// HistoryHelper.insertGameEntity(mGame!!) -// } -// } -// -// mViewModel.reserveMobile.observe(viewLifecycleOwner, Observer { -// setMobileIndexHint(it) -// }) -// -// dialog?.setCanceledOnTouchOutside(true) -// } -// -// private fun showSuccessDialog(withMobile: Boolean, boundWechat: Boolean) { -// reserveHintTv.text = "游戏预约成功" -// reserveContainer.visibility = View.GONE -// reserveCompletedContainer.visibility = View.VISIBLE -// -// val reservation = Config.getSettings()?.appointment -// val dialogConfig = if (withMobile) reservation?.withMobile else reservation?.withoutMobile -// -// reserveCompletedContentTv.text = dialogConfig?.htmlContent?.fromHtml() -// if (dialogConfig?.text.isNullOrEmpty() -// || (dialogConfig?.type == "wechat_bind" && boundWechat)) { -// customizableBtn.visibility = View.GONE -// } else { -// customizableBtn.text = dialogConfig?.text -// customizableBtn.setOnClickListener { -//// MtaHelper.onEvent("预约游戏", "预约功能操作", "点击跳转按钮") -// DirectUtils.directToLinkPage( -// requireContext(), -// dialogConfig!!.toLinkEntity(), -// "(游戏预约)", -// "") -// dismissAllowingStateLoss() -// } -// } -// } -// -// private fun setMobileIndexHint(reserveMobile: String?) { -// var userMobile = UserManager.getInstance().userInfoEntity?.mobile -// if (reserveMobile == userMobile) userMobile = null -// -// if (!reserveMobile.isNullOrEmpty()) { -// mobileIndexReserve.visibility = View.VISIBLE -// mobileIndexReserve.text = reserveMobile -// } else { -// mobileIndexReserve.visibility = View.GONE -// } -// -// if (!userMobile.isNullOrEmpty()) { -// mobileIndexUser.visibility = View.VISIBLE -// mobileIndexUser.text = userMobile -// } else { -// mobileIndexUser.visibility = View.GONE -// } -// mobileIndexContainer.goneIf(mobileIndexUser.visibility == View.GONE && mobileIndexReserve.visibility == View.GONE) -// if (mobileIndexContainer.visibility ==View.VISIBLE) { -// mobileIndexContainer.animation = AnimationUtils.loadAnimation(requireContext(), R.anim.reserve_dialog_index_anim) -// } -// } -// -// @OnClick(R.id.reserve_with_mobile_btn, -// R.id.reserve_without_mobile_btn, -// R.id.content_container, -// R.id.close_btn, -// R.id.customizable_btn, -// R.id.mobile_index_reserve, -// R.id.mobile_index_user, -// R.id.mobile_et_delete, -// R.id.mobile_et, -// R.id.layout_container) -// fun onClick(view: View) { -// when (view.id) { -// R.id.reserve_without_mobile_btn -> { -//// MtaHelper.onEvent("预约游戏", "预约功能操作", "点击无手机号预约") -// if (mobileIndexContainer.visibility == View.VISIBLE) { -// mobileIndexContainer.visibility = View.GONE -// return -// } -// -// mViewModel.reserve(gameId = mGameId, gameName = mGameName) -// } -// -// R.id.reserve_with_mobile_btn -> { -// if (mobileIndexContainer.visibility == View.VISIBLE) { -// mobileIndexContainer.visibility = View.GONE -// return -// } -// -// val mobile = mobileEt.text.toString() -// if (mobile.length < 11 || !mobile.startsWith("1")) { -// Utils.toast(context, "手机号格式错误，请检查并重新输入") -// return -// } -// -//// MtaHelper.onEvent("预约游戏", "预约功能操作", "点击立即预约") -// mViewModel.reserve(gameId = mGameId, gameName = mGameName, mobile = mobile) -// } -// -// R.id.close_btn -> { -//// MtaHelper.onEvent("预约游戏", "预约功能操作", "点击关闭") -// dismissAllowingStateLoss() -// AppExecutor.uiExecutor.executeWithDelay(Runnable { -// NotificationHelper.showNotificationHintDialog(NotificationUgc.RESERVE_GAME) -// }, 1000) -// } -// R.id.content_container -> { -// mobileIndexContainer.visibility = View.GONE -// } -// R.id.mobile_index_reserve -> { -// mobileEt.setText(mobileIndexReserve.text.toString()) -// mobileEt.setSelection(mobileEt.text.length) -// mobileIndexContainer.visibility = View.GONE -// } -// R.id.mobile_index_user -> { -// mobileEt.setText(mobileIndexUser.text.toString()) -// mobileEt.setSelection(mobileEt.text.length) -// mobileIndexContainer.visibility = View.GONE -// } -// R.id.mobile_et_delete -> { -// mobileEt.setText("") -// } -// R.id.mobile_et -> { -// mobileIndexContainer.visibility = View.GONE -// } -// R.id.layout_container -> { -// dismissAllowingStateLoss() -// } -// } -// } -// -// override fun onResume() { -// super.onResume() -// if (HaloApp.getInstance().mCacheKeyboardHeight > 0) { -// val attributes = dialog?.window?.attributes -// val heightPixels = requireContext().resources.displayMetrics.heightPixels -// val mCacheKeyboardHeight = HaloApp.getInstance().mCacheKeyboardHeight -// val statusBarHeight = DisplayUtils.getStatusBarHeight(requireContext().resources) -// dialog?.window?.attributes?.height = heightPixels - mCacheKeyboardHeight - statusBarHeight -// attributes?.gravity = Gravity.TOP -// dialog?.window?.attributes = attributes -// } -// mKeyboardHeightProvider?.setKeyboardHeightObserver(this) -// } -// -// override fun onPause() { -// super.onPause() -// mKeyboardHeightProvider?.setKeyboardHeightObserver(null) -// } -// -// override fun onDestroy() { -// super.onDestroy() -// mKeyboardHeightProvider?.close() -// } -// -// override fun onKeyboardHeightChanged(height: Int, orientation: Int) { -// if (height > 0) { -// val attributes = dialog?.window?.attributes -// attributes?.gravity = Gravity.CENTER -// dialog?.window?.attributes = attributes -// HaloApp.getInstance().mCacheKeyboardHeight = height -// } -// } -// -// companion object { -// @JvmStatic -// fun getInstance(gameEntity: GameEntity, successCallback: SuccessCallback) = ReserveDialogFragment().apply { -// arguments = Bundle().apply { -// putParcelable(EntranceUtils.KEY_GAME, gameEntity) -// } -// this.successCallback = successCallback -// } -// } -// -// interface SuccessCallback { -// fun onSuccess() -// } -//} -// -//class ReserveViewModel(application: Application) : AndroidViewModel(application) { -// val reservation = MutableLiveData() -// -// val reserveMobile = MutableLiveData() -// -// init { -// getAppointmentMobile() -// } -// -// @SuppressLint("CheckResult") -// fun reserve(gameId: String, gameName: String, mobile: String = "") { -// -// val requestMap = hashMapOf() -// requestMap["game_id"] = gameId -// if (mobile.isNotEmpty()) { -// requestMap["mobile"] = mobile -// } -// -// RetrofitManager.getInstance().api -// .createNewGameReservation(requestMap.createRequestBody()) -// .subscribeOn(Schedulers.io()) -// .subscribe(object : BiResponse() { -// override fun onSuccess(data: ResponseBody) { -// var boundWechat = false -// tryWithDefaultCatch { -// boundWechat = JSONObject(data.string() ?: "").getBoolean("wechat_bind") -// } -// -// reservation.postValue(Reservation(success = true, withMobile = mobile.isNotEmpty(), boundWechat = boundWechat)) -// ReservationRepository.addReservationToMemoryAndRefresh(gameId) -// -//// MtaHelper.onEvent("预约游戏", "预约", gameName) -// } -// -// override fun onFailure(exception: Exception) { -// Utils.toast(getApplication(), exception.message) -// } -// }) -// } -// -// @SuppressLint("CheckResult") -// private fun getAppointmentMobile() { -// RetrofitManager.getInstance().api -// .getAppointmentMobile(UserManager.getInstance().userId) -// .subscribeOn(Schedulers.io()) -// .observeOn(AndroidSchedulers.mainThread()) -// .subscribe(object : BiResponse() { -// override fun onSuccess(data: ResponseBody) { -// var mobile: String? = null -// tryCatchInRelease { -// val jsonArray = JSONArray(data.string()) -// if (jsonArray.length() > 0) { -// mobile = jsonArray.get(0).toString() -// } -// } -// -// reserveMobile.postValue(mobile) -// } -// -// override fun onFailure(exception: Exception) { -// reserveMobile.postValue(null) -// } -// }) -// } -// -// class Reservation(var success: Boolean = false, var withMobile: Boolean = false, var boundWechat: Boolean = false) -//} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/dialog/WelcomeDialog.kt b/app/src/main/java/com/gh/common/dialog/WelcomeDialog.kt deleted file mode 100644 index cd15087337..0000000000 --- a/app/src/main/java/com/gh/common/dialog/WelcomeDialog.kt +++ /dev/null @@ -1,152 +0,0 @@ -package com.gh.common.dialog - -import android.os.Bundle -import android.preference.PreferenceManager -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import com.gh.gamecenter.common.base.fragment.BaseDialogFragment -import com.gh.gamecenter.core.utils.TimeElapsedHelper -import com.gh.gamecenter.common.constant.Constants -import com.gh.gamecenter.common.constant.Constants.SP_LAST_OPENING_ID -import com.gh.gamecenter.common.constant.Constants.SP_LAST_OPENING_TIME -import com.gh.common.util.* -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.common.utils.ImageUtils -import com.gh.gamecenter.common.view.WrapContentDraweeView -import com.gh.gamecenter.core.utils.MtaHelper -import com.gh.gamecenter.databinding.DialogWelcomeBinding -import com.gh.gamecenter.entity.CommunityEntity -import com.gh.gamecenter.entity.WelcomeDialogEntity -import com.halo.assistant.HaloApp - -class WelcomeDialog : BaseDialogFragment() { - - private var mWelcomeEntity: WelcomeDialogEntity? = null - private var mTimeHelper: TimeElapsedHelper? = null - - private var mDismissByClickImage = false - - lateinit var binding: DialogWelcomeBinding - - private var mDismissListener: (() -> Unit)? = null - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - mWelcomeEntity = arguments?.getParcelable(TAG) - mTimeHelper = TimeElapsedHelper(this) - } - - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { - binding = DialogWelcomeBinding.inflate(inflater, container, false) - binding.ivOpeningCover.setOnClickListener { - - HaloApp.put(Constants.WELCOME_DIALOG_ID, mWelcomeEntity?.id) - HaloApp.put(Constants.WELCOME_DIALOG_LINK_TITLE, mWelcomeEntity?.text) - LogUtils.uploadWelcomeDialog("click", mWelcomeEntity?.id, mWelcomeEntity?.text) - - when (mWelcomeEntity?.type) { - EntranceConsts.HOST_ARTICLE -> { - DirectUtils.directToArticle(requireContext(), mWelcomeEntity?.link!!, EntranceConsts.ENTRANCE_WELCOME) - } - EntranceConsts.HOST_GAME -> { - DirectUtils.directToGameDetail(requireContext(), mWelcomeEntity?.link!!, EntranceConsts.ENTRANCE_WELCOME) - } - EntranceConsts.HOST_COLUMN -> { - DirectUtils.directToSubject(requireContext(), mWelcomeEntity?.link!!, null, EntranceConsts.ENTRANCE_WELCOME) - } - EntranceConsts.HOST_QUESTION -> { - DirectUtils.directToQuestionDetail(requireContext(), mWelcomeEntity?.link!!, EntranceConsts.ENTRANCE_WELCOME) - } - EntranceConsts.HOST_ANSWER -> { - DirectUtils.directToAnswerDetail(requireContext(), mWelcomeEntity?.link!!, EntranceConsts.ENTRANCE_WELCOME) - } - EntranceConsts.HOST_WEB -> { - DirectUtils.directToWebView(requireContext(), mWelcomeEntity?.link!!, EntranceConsts.ENTRANCE_WELCOME) - } - EntranceConsts.HOST_QQ -> { - DirectUtils.directToQqConversation(requireContext(), mWelcomeEntity?.link!!) - } - EntranceConsts.HOST_COMMUNITY -> { - DirectUtils.directToCommunity(requireContext(), CommunityEntity(mWelcomeEntity?.link!!, mWelcomeEntity?.text!!)) - } -// else -> DialogUtils.showLowVersionDialog(context) - else -> DirectUtils.directToLinkPage(requireContext(), mWelcomeEntity - ?: WelcomeDialogEntity(), EntranceConsts.ENTRANCE_WELCOME, "") - } - - mDismissByClickImage = true - - dismissAllowingStateLoss() - } - - binding.ivOpeningCover.loadingCallback = object : WrapContentDraweeView.LoadingCallback { - override fun loaded() { - binding.root.post { - if (binding.ivOpeningCover.measuredHeight > binding.root.resources.displayMetrics.heightPixels * .8) { - binding.ivCloseBackup.visibility = View.VISIBLE - } else { - binding.ivClose.visibility = View.VISIBLE - } - } - } - } - - binding.ivCloseBackup.setOnClickListener { - dismissAllowingStateLoss() - } - binding.ivClose.setOnClickListener { - dismissAllowingStateLoss() - } - ImageUtils.displayWithoutMemoryCache(binding.ivOpeningCover, mWelcomeEntity?.icon) - return binding.root - } - - override fun dismissAllowingStateLoss() { - try { - mDismissByClickImage = false - super.dismissAllowingStateLoss() - } catch (e: Exception) { - e.printStackTrace() - } - } - - override fun dismiss() { - try { - mDismissByClickImage = false - super.dismiss() - } catch (e: Exception) { - e.printStackTrace() - } - } - - fun setOnDismissListener(dismissListener: () -> Unit) { - mDismissListener = dismissListener - } - - override fun onDestroy() { - val type = if (mDismissByClickImage) "点击图片" else "点击关闭" - - MtaHelper.onEventWithTime("启动弹窗", mTimeHelper?.elapsedTime!!, type, "No parameter.") - - PreferenceManager.getDefaultSharedPreferences(context?.applicationContext).edit { - putString(SP_LAST_OPENING_ID, mWelcomeEntity?.id) - putLong(SP_LAST_OPENING_TIME, mWelcomeEntity?.time!!) - } - - mDismissListener?.invoke() - super.onDestroy() - } - - companion object { - const val TAG = "welcome_dialog" - - @JvmStatic - fun getInstance(welcomeEntity: WelcomeDialogEntity?) = WelcomeDialog().apply { - arguments = Bundle() - arguments?.putParcelable(TAG, welcomeEntity) - LogUtils.uploadWelcomeDialog("show", welcomeEntity?.id, welcomeEntity?.text) - } - } - -} \ No newline at end of file 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 199c3bcd6d..e32120a066 100644 --- a/app/src/main/java/com/gh/common/util/AdHelper.kt +++ b/app/src/main/java/com/gh/common/util/AdHelper.kt @@ -17,7 +17,6 @@ object AdHelper { const val LOCATION_SEARCH_EMPTY = "search_empty" const val LOCATION_GAME_REQUEST_VERSION = "game_request_version" const val LOCATION_SUGGESTION_FUNCTION = "suggestion_function" - const val LOCATION_DISCOVER = "discover" const val LOCATION_SIMULATOR_GAME = "simulator_game" @JvmField @@ -51,20 +50,6 @@ object AdHelper { return null } - fun getDiscoverAds(): List { - val adList = Config.getSettings()?.adList ?: return listOf() - - val discoverAdList = arrayListOf() - - for (ad in adList) { - if (ad.location == LOCATION_DISCOVER) { - discoverAdList.add(ad) - } - } - - return discoverAdList - } - fun getAdForLocation(location: String): SettingsEntity.AD? { val adList = Config.getSettings()?.adList ?: return null 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 c5df50b715..0593b34e7c 100644 --- a/app/src/main/java/com/gh/common/util/GameUtils.java +++ b/app/src/main/java/com/gh/common/util/GameUtils.java @@ -157,12 +157,7 @@ public class GameUtils { return context.getString(R.string.update); } else if (installCount != 0) { return context.getString(R.string.launch); - } else if ( - "demo".equals(gameEntity.getDownloadStatus()) -// gameEntity.getVersionNumber().contains("无版号") -// && Config.isGameDomeSwitchOpen() -// && !SimulatorGameManager.isSimulatorGame(gameEntity) - ) { + } else if ("demo".equals(gameEntity.getDownloadStatus())) { return context.getString(R.string.attempt); } else { return context.getString(R.string.download); diff --git a/app/src/main/java/com/gh/gamecenter/entity/SettingsEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/SettingsEntity.kt index cca3a8ae6e..0195e44f3f 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/SettingsEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/SettingsEntity.kt @@ -29,8 +29,6 @@ data class SettingsEntity( private var articleEntrance: String = "", @SerializedName("video_advertisement") var videoAdvertisement: VideoAds? = null, //新增字段video_advertisement,可能为空，代表广告关闭 - @SerializedName("game_dome_switch") - var gameDomeSwitch: String = "",//试玩显示开关，on打开 @SerializedName("permission_popup_switch") var permissionPopupSwitch: String = "off",//权限引导弹窗开关，on/off @SerializedName("permission_popup_applied_versions") diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt index faa36b9b82..d005541ef7 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt @@ -10,7 +10,6 @@ import androidx.core.content.ContextCompat import androidx.core.os.bundleOf import androidx.fragment.app.FragmentActivity import androidx.recyclerview.widget.LinearLayoutManager -import com.gh.gamecenter.common.base.fragment.BaseTrackableDialogFragment import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.core.utils.MtaHelper @@ -18,12 +17,13 @@ import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration import com.gh.download.dialog.DownloadDialog import com.gh.gamecenter.R +import com.gh.gamecenter.common.base.fragment.BaseDialogFragment import com.gh.gamecenter.databinding.DialogGameTagsBinding import com.gh.gamecenter.entity.TagStyleEntity import com.gh.gamecenter.tag.TagsActivity import com.halo.assistant.HaloApp -class GameTagsDialog : BaseTrackableDialogFragment() { +class GameTagsDialog : BaseDialogFragment() { private lateinit var mTagStyles: ArrayList private lateinit var mGameId: String @@ -79,12 +79,6 @@ class GameTagsDialog : BaseTrackableDialogFragment() { } } - override fun getEvent(): String = "游戏标签弹窗" - - override fun getKey(): String = "弹窗" - - override fun getValue(): String = mGameName - companion object { fun showGameTagsDialog(context: FragmentActivity, tagStyles: ArrayList, gameId: String, gameName: String) { val dialog = GameTagsDialog().apply { From 202c5469229038b6c387976f040344a4ebc5b975 Mon Sep 17 00:00:00 2001 From: juntao Date: Fri, 13 May 2022 16:22:50 +0800 Subject: [PATCH 28/52] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/common/util/CommunityHelper.kt | 47 ---- .../java/com/gh/common/util/DataUtils.java | 6 - .../article/edit/ArticleSelectGameAdapter.kt | 60 ----- .../select/AskSelectGameItemViewHolder.java | 31 --- .../qa/select/CommunitiesSelectActivity.java | 26 -- .../CommunitiesSelectWrapperFragment.kt | 26 -- .../qa/select/CommunitySelectOpenItem.kt | 9 - .../gh/gamecenter/qa/select/OpenedAdapter.kt | 208 --------------- .../gh/gamecenter/qa/select/OpenedFragment.kt | 28 --- .../qa/select/OpenedNameTextView.kt | 79 ------ .../gamecenter/qa/select/OpenedViewHolder.kt | 8 - .../gamecenter/qa/select/OpenedViewModel.kt | 89 ------- .../qa/select/SelectGameDialogAdapter.java | 237 ------------------ .../gamecenter/qa/select/VotingAdapter.java | 153 ----------- .../gamecenter/qa/select/VotingFragment.java | 117 --------- .../qa/select/VotingSelectGameViewHolder.java | 14 -- .../gamecenter/qa/select/VotingViewModel.java | 121 --------- .../retrofit/service/ApiService.java | 6 - .../drawable-xhdpi/voting_game_selected.webp | Bin 858 -> 0 bytes .../drawable-xxhdpi/search_column_icon.webp | Bin 2026 -> 0 bytes .../search_special_column_icon.png | Bin 1490 -> 0 bytes .../main/res/layout/activity_ask_search.xml | 54 ---- .../main/res/layout/ask_search_actionbar.xml | 67 ----- app/src/main/res/layout/ask_search_item.xml | 109 -------- .../res/layout/ask_search_question_item.xml | 47 ---- .../main/res/layout/ask_selectgame_item.xml | 46 ---- .../res/layout/community_follow_tab_item.xml | 24 -- .../layout/community_search_columm_item.xml | 87 ------- .../community_search_special_columm_item.xml | 83 ------ .../community_select_opened_head_item.xml | 26 -- .../layout/community_select_opened_item.xml | 111 -------- .../layout/dialog_voting_select_game_item.xml | 39 --- 32 files changed, 1958 deletions(-) delete mode 100644 app/src/main/java/com/gh/common/util/CommunityHelper.kt delete mode 100644 app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleSelectGameAdapter.kt delete mode 100644 app/src/main/java/com/gh/gamecenter/qa/select/AskSelectGameItemViewHolder.java delete mode 100644 app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectActivity.java delete mode 100644 app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectWrapperFragment.kt delete mode 100644 app/src/main/java/com/gh/gamecenter/qa/select/CommunitySelectOpenItem.kt delete mode 100644 app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt delete mode 100644 app/src/main/java/com/gh/gamecenter/qa/select/OpenedFragment.kt delete mode 100644 app/src/main/java/com/gh/gamecenter/qa/select/OpenedNameTextView.kt delete mode 100644 app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewHolder.kt delete mode 100644 app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewModel.kt delete mode 100644 app/src/main/java/com/gh/gamecenter/qa/select/SelectGameDialogAdapter.java delete mode 100644 app/src/main/java/com/gh/gamecenter/qa/select/VotingAdapter.java delete mode 100644 app/src/main/java/com/gh/gamecenter/qa/select/VotingFragment.java delete mode 100644 app/src/main/java/com/gh/gamecenter/qa/select/VotingSelectGameViewHolder.java delete mode 100644 app/src/main/java/com/gh/gamecenter/qa/select/VotingViewModel.java delete mode 100644 app/src/main/res/drawable-xhdpi/voting_game_selected.webp delete mode 100644 app/src/main/res/drawable-xxhdpi/search_column_icon.webp delete mode 100644 app/src/main/res/drawable-xxhdpi/search_special_column_icon.png delete mode 100644 app/src/main/res/layout/activity_ask_search.xml delete mode 100644 app/src/main/res/layout/ask_search_actionbar.xml delete mode 100644 app/src/main/res/layout/ask_search_item.xml delete mode 100644 app/src/main/res/layout/ask_search_question_item.xml delete mode 100644 app/src/main/res/layout/ask_selectgame_item.xml delete mode 100644 app/src/main/res/layout/community_follow_tab_item.xml delete mode 100644 app/src/main/res/layout/community_search_columm_item.xml delete mode 100644 app/src/main/res/layout/community_search_special_columm_item.xml delete mode 100644 app/src/main/res/layout/community_select_opened_head_item.xml delete mode 100644 app/src/main/res/layout/community_select_opened_item.xml delete mode 100644 app/src/main/res/layout/dialog_voting_select_game_item.xml diff --git a/app/src/main/java/com/gh/common/util/CommunityHelper.kt b/app/src/main/java/com/gh/common/util/CommunityHelper.kt deleted file mode 100644 index 2e98e3e6f6..0000000000 --- a/app/src/main/java/com/gh/common/util/CommunityHelper.kt +++ /dev/null @@ -1,47 +0,0 @@ -package com.gh.common.util - -import com.gh.gamecenter.packagehelper.PackageRepository -import com.gh.gamecenter.qa.entity.CommunitySelectEntity - -object CommunityHelper { - - /** - * 为已开通的社区排序 - * 排序规则为将本地存在已安装游戏或已关联游戏的社区置顶 - */ - fun sortOpenedCommunity(rawList: List?): ArrayList { - val sortedList = ArrayList() - rawList?.let { - for (game in rawList) { - var thisGameIsInstalled = false - for (installGame in PackageRepository.gameInstalled) { - if (PackageHelper.downloadPackageNameBlackList.contains(installGame.packageName)) { - continue - } - - // 判断是否已安装 - if (installGame.id == game.game.id) { - thisGameIsInstalled = true - break - } - - // 判断是否关联了别游戏 - for (relatedGameId in game.game.relation) { - if (installGame.id == relatedGameId) { - thisGameIsInstalled = true - break - } - } - } - - // 将已安装的置顶 - if (thisGameIsInstalled) { - sortedList.add(0, game) - } else { - sortedList.add(game) - } - } - } - return sortedList - } -} \ No newline at end of file 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 e353e88c22..8f108c9119 100644 --- a/app/src/main/java/com/gh/common/util/DataUtils.java +++ b/app/src/main/java/com/gh/common/util/DataUtils.java @@ -1,10 +1,8 @@ package com.gh.common.util; import android.annotation.SuppressLint; -import android.app.Activity; import android.app.Application; import android.content.Context; -import android.os.Build; import android.preference.PreferenceManager; import android.text.TextUtils; @@ -12,7 +10,6 @@ import com.gh.gamecenter.core.AppExecutor; import com.gh.gamecenter.common.constant.Constants; import com.gh.gamecenter.common.exposure.meta.MetaUtil; import com.gh.gamecenter.BuildConfig; -import com.gh.gamecenter.common.utils.DeviceUtils; import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.core.utils.SPUtils; @@ -25,9 +22,6 @@ import com.halo.assistant.HaloApp; import com.lightgame.config.CommonDebug; import com.lightgame.utils.Utils; -import java.util.HashMap; -import java.util.Map; - import io.reactivex.schedulers.Schedulers; import io.sentry.Sentry; import io.sentry.android.core.SentryAndroid; 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 deleted file mode 100644 index ac07d99437..0000000000 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleSelectGameAdapter.kt +++ /dev/null @@ -1,60 +0,0 @@ -package com.gh.gamecenter.qa.article.edit - -import android.content.Context -import android.view.View -import android.view.ViewGroup -import android.widget.ProgressBar -import com.gh.common.util.CommunityHelper -import com.gh.gamecenter.core.utils.UrlFilterUtils -import com.gh.gamecenter.databinding.DialogSelectGameItemBinding -import com.gh.gamecenter.qa.entity.CommunitySelectEntity -import com.gh.gamecenter.retrofit.Response -import com.gh.gamecenter.retrofit.RetrofitManager -import com.gh.gamecenter.suggest.SelectGameViewHolder -import com.halo.assistant.HaloApp -import com.lightgame.adapter.BaseRecyclerAdapter -import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.schedulers.Schedulers - -class ArticleSelectGameAdapter(context: Context, loading: ProgressBar, - private val callback: (CommunitySelectEntity) -> Unit) : BaseRecyclerAdapter(context) { - - private val mList = ArrayList() - - init { - RetrofitManager.getInstance().api - .getAskGameSelect(HaloApp.getInstance().channel - , UrlFilterUtils.getFilterQuery("status", "opened"), 1, 1000) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Response>() { - override fun onResponse(response: List?) { - if (response != null) { - loading.visibility = View.GONE - - val sortedList = CommunityHelper.sortOpenedCommunity(response) - - mList.clear() - mList.addAll(sortedList) - notifyDataSetChanged() - } - } - }) - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SelectGameViewHolder { - return SelectGameViewHolder(DialogSelectGameItemBinding.inflate(mLayoutInflater, parent, false)) - } - - override fun getItemCount(): Int { - return mList.size - } - - override fun onBindViewHolder(holder: SelectGameViewHolder, position: Int) { - val entity = mList[position] - holder.binding.gameIcon.displayGameIcon(entity.game.getRawIconIfExisted(), entity.game.iconSubscript) - holder.binding.gameName.text = entity.name - holder.binding.root.setOnClickListener { callback.invoke(entity) } - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/AskSelectGameItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/qa/select/AskSelectGameItemViewHolder.java deleted file mode 100644 index c177073a93..0000000000 --- a/app/src/main/java/com/gh/gamecenter/qa/select/AskSelectGameItemViewHolder.java +++ /dev/null @@ -1,31 +0,0 @@ -//package com.gh.gamecenter.qa.select; -// -//import android.view.View; -//import android.widget.TextView; -// -//import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; -//import com.gh.gamecenter.common.callback.OnListClickListener; -//import com.gh.common.view.GameIconView; -//import com.gh.gamecenter.R; -//import com.gh.gamecenter.qa.entity.CommunitySelectEntity; -// -//import butterknife.BindView; -// -///** -// * Created by khy on 6/12/17. -// */ -// -//public class AskSelectGameItemViewHolder extends BaseRecyclerViewHolder { -// @BindView(R.id.ask_selectgame_item_icon) -// public GameIconView mIcon; -// @BindView(R.id.ask_selectgame_item_votecount) -// public TextView mVotecount; -// @BindView(R.id.ask_selectgame_item_name) -// public TextView mName; -// -// -// public AskSelectGameItemViewHolder(View itemView, OnListClickListener listClickListener) { -// super(itemView, listClickListener); -// itemView.setOnClickListener(this); -// } -//} diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectActivity.java b/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectActivity.java deleted file mode 100644 index 5bd93118c8..0000000000 --- a/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectActivity.java +++ /dev/null @@ -1,26 +0,0 @@ -//package com.gh.gamecenter.qa.select; -// -//import android.content.Context; -//import android.content.Intent; -//import android.os.Bundle; -// -//import com.gh.gamecenter.NormalActivity; -// -//import org.jetbrains.annotations.NotNull; -//import org.jetbrains.annotations.Nullable; -// -///** -// * Created by khy on 10/04/18. -// */ -// -//public class CommunitiesSelectActivity extends NormalActivity { -// -// public static Intent getIntent(Context context) { -// return getTargetIntent(context, CommunitiesSelectActivity.class, CommunitiesSelectWrapperFragment.class); -// } -// -// @Nullable -// public static Intent getIntent(@Nullable Context context, @NotNull Bundle bundle) { -// return getTargetIntent(context, CommunitiesSelectActivity.class, CommunitiesSelectWrapperFragment.class, bundle); -// } -//} diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectWrapperFragment.kt deleted file mode 100644 index 3218046dff..0000000000 --- a/app/src/main/java/com/gh/gamecenter/qa/select/CommunitiesSelectWrapperFragment.kt +++ /dev/null @@ -1,26 +0,0 @@ -//package com.gh.gamecenter.qa.select -// -//import android.os.Bundle -//import androidx.fragment.app.Fragment -//import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout -//import com.gh.gamecenter.R -// -//class CommunitiesSelectWrapperFragment : BaseFragment_TabLayout() { -// -// override fun initFragmentList(fragments: MutableList) { -// fragments.add(OpenedFragment()) -// val element = VotingFragment() -// element.arguments = arguments -// fragments.add(element) -// } -// -// override fun initTabTitleList(tabTitleList: MutableList) { -// tabTitleList.add("已开通") -// tabTitleList.add("投票中") -// } -// -// override fun onActivityCreated(savedInstanceState: Bundle?) { -// super.onActivityCreated(savedInstanceState) -// setNavigationTitle(getString(R.string.title_community_select)) -// } -//} diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/CommunitySelectOpenItem.kt b/app/src/main/java/com/gh/gamecenter/qa/select/CommunitySelectOpenItem.kt deleted file mode 100644 index 88d7475e5b..0000000000 --- a/app/src/main/java/com/gh/gamecenter/qa/select/CommunitySelectOpenItem.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.gh.gamecenter.qa.select - -import com.gh.gamecenter.qa.entity.CommunitySelectEntity -import com.google.gson.annotations.SerializedName - -data class CommunitySelectOpenItem(@SerializedName("cate_name") - val categoryName: String = "", - var leftData: CommunitySelectEntity? = null, - var rightData: CommunitySelectEntity? = null) \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt deleted file mode 100644 index ec8ffb8af3..0000000000 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt +++ /dev/null @@ -1,208 +0,0 @@ -//package com.gh.gamecenter.qa.select -// -//import android.app.Activity -//import android.content.Context -//import android.view.Gravity -//import android.view.View -//import android.view.ViewGroup -//import android.widget.LinearLayout -//import android.widget.TextView -//import androidx.constraintlayout.widget.ConstraintLayout -//import androidx.constraintlayout.widget.ConstraintSet -//import androidx.core.content.ContextCompat -//import com.gh.gamecenter.common.constant.ItemViewType -//import com.gh.gamecenter.common.utils.dip2px -//import com.gh.gamecenter.common.utils.toColor -//import com.gh.common.view.GameIconView -//import com.gh.gamecenter.R -//import com.gh.gamecenter.adapter.viewholder.FooterViewHolder -//import com.gh.gamecenter.baselist.ListAdapter -//import com.gh.gamecenter.baselist.LoadType -//import com.gh.gamecenter.databinding.CommunitySelectOpenedHeadItemBinding -//import com.gh.gamecenter.databinding.CommunitySelectOpenedItemBinding -//import com.gh.gamecenter.entity.CommunityEntity -//import com.gh.gamecenter.eventbus.EBReuse -//import com.gh.gamecenter.manager.UserManager -//import com.gh.gamecenter.qa.CommunityFragment -//import com.gh.gamecenter.qa.entity.CommunitySelectEntity -//import org.greenrobot.eventbus.EventBus -// -//class OpenedAdapter(context: Context, val mListViewModel: OpenedViewModel) : ListAdapter(context) { -// -// private val mCommunityId: String = UserManager.getInstance().community.id -// -// override fun areItemsTheSame(oldItem: CommunitySelectOpenItem?, newItem: CommunitySelectOpenItem?): Boolean { -// if (oldItem?.rightData != null && newItem?.rightData != null) { -// return oldItem.rightData == newItem.rightData -// } -// -// if (oldItem?.leftData != null && newItem?.leftData != null) { -// return oldItem.leftData == newItem.leftData -// } -// return oldItem == newItem -// } -// -// override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { -// val view: View -// return when (viewType) { -// ItemViewType.ITEM_HEADER -> { -// view = mLayoutInflater.inflate(R.layout.community_select_opened_head_item, parent, false) -// OpenedHeadViewHolder(CommunitySelectOpenedHeadItemBinding.bind(view)) -// } -// ItemViewType.ITEM_FOOTER -> { -// FooterViewHolder(mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false)) -// } -// else -> { -// view = mLayoutInflater.inflate(R.layout.community_select_opened_item, parent, false) -// OpenedViewHolder(CommunitySelectOpenedItemBinding.bind(view)) -// } -// } -// } -// -// override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { -// when (holder) { -// is OpenedViewHolder -> bindBodyItem(holder) -// is FooterViewHolder -> bindFooterItem(holder) -// is OpenedHeadViewHolder -> holder.bind.categoryName = mEntityList[position].categoryName -// } -// } -// -// override fun getItemViewType(position: Int): Int { -// if (itemCount - 1 == position) { -// return ItemViewType.ITEM_FOOTER -// } -// val itemData = mEntityList[position] -// if (itemData.leftData != null) { -// return ItemViewType.ITEM_BODY -// } -// return ItemViewType.ITEM_HEADER -// } -// -// override fun getItemCount(): Int { -// return if (mEntityList == null || mEntityList.isEmpty()) 0 else mEntityList.size + 1 -// } -// -// private fun bindFooterItem(holder: FooterViewHolder) { -// holder.itemView.setBackgroundColor(ContextCompat.getColor(mContext, R.color.background)) -// val item = holder.itemView as LinearLayout -// when { -// mIsNetworkError -> { -// holder.loading.visibility = View.GONE -// holder.hint.setText(R.string.loading_failed_retry) -// holder.hint.setCompoundDrawables(null, null, null, null) -// holder.hint.setPadding(0, 0, 0, 0) -// item.gravity = Gravity.CENTER -// } -// mIsLoading -> { -// holder.loading.visibility = View.VISIBLE -// holder.hint.setText(R.string.loading) -// holder.hint.setCompoundDrawables(null, null, null, null) -// holder.hint.setPadding(0, 0, 0, 0) -// item.gravity = Gravity.CENTER -// } -// else -> { -// holder.loading.visibility = View.GONE -// holder.hint.setText(R.string.loading_more_hint) -// holder.hint.setCompoundDrawables(null, null, null, null) -// holder.hint.setPadding(0, 0, 0, 0) -// item.gravity = Gravity.CENTER -// } -// } -// if (!mIsOver) { -// holder.itemView.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) -// } else { -// holder.itemView.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0) -// } -// -// holder.itemView.setOnClickListener { -// mListViewModel.load(LoadType.RETRY) -// } -// } -// -// private fun bindBodyItem(holder: OpenedViewHolder) { -// val position = holder.adapterPosition -// val entity = mEntityList[position] -// val isSelectLeft = mCommunityId == entity.leftData?.id -// val isSelectRight = mCommunityId == entity.rightData?.id -// -// holder.bind.data = entity -// holder.bind.isSelectLeft = isSelectLeft -// holder.bind.isSelectRight = isSelectRight -// -// holder.bind.gameIconLeft.displayGameIcon(entity.leftData?.game?.getRawIconIfExisted(), entity.leftData?.game?.iconSubscript) -// holder.bind.gameIconRight.displayGameIcon(entity.rightData?.game?.getRawIconIfExisted(), entity.rightData?.game?.iconSubscript) -// -// if (isSelectLeft) { -// holder.bind.communityNameLeft.setTextColor(R.color.theme_font.toColor()) -// } else { -// holder.bind.communityNameLeft.setTextColor(R.color.text_title.toColor()) -// } -// if (isSelectRight) { -// holder.bind.communityNameRight.setTextColor(R.color.theme_font.toColor()) -// } else { -// holder.bind.communityNameRight.setTextColor(R.color.text_title.toColor()) -// } -// -// holder.bind.communityNameLeft.setSelected(isSelectLeft, offsetCallback = { -// resetSelectStatus(holder.bind.leftContainer, holder.bind.communityStatusLeft, holder.bind.communityNameLeft, holder.bind.gameIconLeft, it) -// }) -// holder.bind.communityNameRight.setSelected(isSelectRight, offsetCallback = { -// resetSelectStatus(holder.bind.rightContainer, holder.bind.communityStatusRight, holder.bind.communityNameRight, holder.bind.gameIconRight, it) -// }) -// -// if (position + 1 >= mEntityList.size - 1 || mEntityList[position + 1].leftData == null) { -// holder.bind.root.setPadding(0, 12F.dip2px(), 0, 16F.dip2px()) -// } else { -// holder.bind.root.setPadding(0, 12F.dip2px(), 0, 12F.dip2px()) -// } -// -// holder.bind.leftContainer.setOnClickListener { -// handelClick(entity.leftData!!) -// } -// -// holder.bind.rightContainer.setOnClickListener { -// handelClick(entity.rightData!!) -// } -// } -// -// private fun resetSelectStatus(container: ConstraintLayout, -// status: TextView, -// name: TextView, -// icon: GameIconView, -// offset: Float) { -// if (offset == -1F && name.lineCount == 1) { -// val constraintSet = ConstraintSet() -// constraintSet.clone(container) -// constraintSet.clear(status.id, ConstraintSet.RIGHT) -// constraintSet.clear(status.id, ConstraintSet.BOTTOM) -// constraintSet.connect(name.id, ConstraintSet.BOTTOM, status.id, ConstraintSet.TOP) -// constraintSet.connect(status.id, ConstraintSet.LEFT, name.id, ConstraintSet.LEFT) -// constraintSet.connect(status.id, ConstraintSet.BOTTOM, icon.id, ConstraintSet.BOTTOM) -// constraintSet.connect(status.id, ConstraintSet.TOP, name.id, ConstraintSet.BOTTOM) -// constraintSet.applyTo(container) -// } else { -// status.visibility = View.GONE -// val constraintSet = ConstraintSet() -// constraintSet.clone(container) -// constraintSet.clear(status.id, ConstraintSet.BOTTOM) -// constraintSet.clear(status.id, ConstraintSet.TOP) -// constraintSet.connect(name.id, ConstraintSet.BOTTOM, icon.id, ConstraintSet.BOTTOM) -// constraintSet.connect(status.id, ConstraintSet.LEFT, name.id, ConstraintSet.LEFT, offset.toInt()) -// constraintSet.connect(status.id, ConstraintSet.BOTTOM, name.id, ConstraintSet.BOTTOM) -// constraintSet.applyTo(container) -// status.postDelayed({ -// status.visibility = View.VISIBLE -// }, 100) -// } -// } -// -// private fun handelClick(entity: CommunitySelectEntity) { -// UserManager.getInstance().setCommunityData(CommunityEntity(entity.id, entity.name, entity.refreshSort, entity.game.getRawIconIfExisted(), entity.game.iconSubscript)) -// if (mContext is CommunitiesSelectActivity && UserManager.getInstance().community.id.isNotEmpty()) { -// (mContext as Activity).setResult(Activity.RESULT_OK) -// (mContext as Activity).finish() -// } else { -// EventBus.getDefault().post(EBReuse(CommunityFragment.EB_SELECT_KEY)) -// } -// } -//} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedFragment.kt deleted file mode 100644 index 7ea6604513..0000000000 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedFragment.kt +++ /dev/null @@ -1,28 +0,0 @@ -//package com.gh.gamecenter.qa.select -// -//import android.os.Bundle -//import android.view.View -//import androidx.recyclerview.widget.RecyclerView -//import com.gh.gamecenter.baselist.ListFragment -// -//class OpenedFragment : ListFragment() { -// -// private var mAdapter: OpenedAdapter? = null -// -// override fun getItemDecoration(): RecyclerView.ItemDecoration? { -// return null -// } -// -// override fun onViewCreated(view: View, savedInstanceState: Bundle?) { -// super.onViewCreated(view, savedInstanceState) -// mLayoutManager.initialPrefetchItemCount = 20 -// mListRv.setItemViewCacheSize(20) -// } -// -// override fun provideListAdapter(): OpenedAdapter { -// if (mAdapter == null) { -// mAdapter = OpenedAdapter(requireContext(), mListViewModel) -// } -// return mAdapter!! -// } -//} diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedNameTextView.kt b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedNameTextView.kt deleted file mode 100644 index 12c7501e26..0000000000 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedNameTextView.kt +++ /dev/null @@ -1,79 +0,0 @@ -package com.gh.gamecenter.qa.select - - -import android.content.Context -import android.text.TextUtils -import android.util.AttributeSet - -import androidx.appcompat.widget.AppCompatTextView - -import com.gh.gamecenter.common.utils.dip2px - -class OpenedNameTextView : AppCompatTextView { - - private var mInitLayout: Boolean? = false - private var mSelected: Boolean? = false - - private var mOffsetCallback: ((Float) -> Unit)? = null - - constructor(context: Context) : super(context) - - constructor(context: Context, attrs: AttributeSet) : super(context, attrs) - - constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) - - override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) { - super.onLayout(changed, left, top, right, bottom) - if (mInitLayout!! && mSelected!!) { - mInitLayout = false - resetText() - } - } - - override fun setText(text: CharSequence?, type: BufferType?) { - mInitLayout = true - super.setText(text, type) - } - - private fun resetText() { - var lastLineRealOffset = -1F - if (lineCount >= 2) { - var content: CharSequence - val snapshotText = text - if (TextUtils.isEmpty(snapshotText)) return - val layout = layout - val start = layout.getLineStart(0) - val lastLineEnd = layout.getLineEnd(lineCount - 1) - val lastLineStart = layout.getLineStart(lineCount - 1) - val lastLineRight = layout.getLineRight(lineCount - 1) - val viewWidth = width - paddingRight - paddingLeft - - val paint = paint - val expendTextWidth = paint.measureText("当前选择") - content = snapshotText.subSequence(start, lastLineEnd) - if (viewWidth - lastLineRight - 8f.dip2px() > expendTextWidth) { - content = content.toString().trim { it <= ' ' } - lastLineRealOffset = lastLineRight + 8f.dip2px() - } else { - val lastText = snapshotText.subSequence(lastLineStart, lastLineEnd) - for (i in lastText.length - 1 downTo 1) { - val sequence = lastText.subSequence(0, i) - val w = paint.measureText(sequence.toString()) - if (viewWidth.toFloat() - w - 16f.dip2px() > expendTextWidth) { - content = snapshotText.subSequence(start, lastLineStart + i).toString() + "..." - lastLineRealOffset = w + 16f.dip2px() - break - } - } - } - super.setText(content, null) - } - mOffsetCallback?.invoke(lastLineRealOffset) - } - - fun setSelected(b: Boolean, offsetCallback: (Float) -> Unit) { - mSelected = b - mOffsetCallback = offsetCallback - } - -} diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewHolder.kt deleted file mode 100644 index 073a7db76b..0000000000 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewHolder.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.gh.gamecenter.qa.select - -import com.gh.gamecenter.common.base.BaseRecyclerViewHolder -import com.gh.gamecenter.databinding.CommunitySelectOpenedHeadItemBinding -import com.gh.gamecenter.databinding.CommunitySelectOpenedItemBinding - -class OpenedViewHolder(val bind: CommunitySelectOpenedItemBinding) : BaseRecyclerViewHolder(bind.root) -class OpenedHeadViewHolder(val bind: CommunitySelectOpenedHeadItemBinding) : BaseRecyclerViewHolder(bind.root) 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 deleted file mode 100644 index fa8ac89f22..0000000000 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewModel.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.gh.gamecenter.qa.select - -import android.app.Application -import com.gh.gamecenter.core.utils.UrlFilterUtils -import com.gh.gamecenter.baselist.ListViewModel -import com.gh.gamecenter.manager.PackagesManager -import com.gh.gamecenter.qa.entity.CommunitySelectEntity -import com.gh.gamecenter.qa.entity.CommunitySelectOpenEntity -import com.gh.gamecenter.retrofit.RetrofitManager -import com.halo.assistant.HaloApp -import io.reactivex.Observable - -class OpenedViewModel(application: Application) : ListViewModel(application) { - - override fun mergeResultLiveData() { - mResultLiveData.addSource(mListLiveData) { - transformationItemData(it) - } - } - - private fun transformationItemData(list: MutableList) { - val installedList = ArrayList() - val categoryMap = LinkedHashMap>() - for (entity in list) { - for (openEntity in entity.list) { - // 已安装分类 - if (PackagesManager.findInstallByIdExcludeBlackPackage(openEntity.game.id) != null) { - installedList.add(openEntity) - } else { - for (gameId in openEntity.game.relation) { - if (PackagesManager.findInstallByIdExcludeBlackPackage(gameId) != null) { - installedList.add(openEntity) - break - } - } - } - - // 其他分类 - val categoryValues = categoryMap[entity.categoryName] - if (categoryValues != null) { - categoryValues.add(openEntity) - } else { - categoryMap[entity.categoryName] = arrayListOf(openEntity) - } - } - } - - // 合成数据 - // 合并数据原则:我的游戏优先,其次按照后台给的顺序排序 - val itemList = ArrayList() - - // 我的游戏分类 - if (installedList.isNotEmpty()) { - itemList.add(CommunitySelectOpenItem(categoryName = "我的游戏")) - mergeToItemList(itemList, installedList, "我的游戏") - } - - // 其他游戏分类 - for (mutableEntry in categoryMap) { - itemList.add(CommunitySelectOpenItem(categoryName = mutableEntry.key)) - mergeToItemList(itemList, mutableEntry.value, mutableEntry.key) - } - - mResultLiveData.postValue(itemList) - } - - private fun mergeToItemList(itemList: ArrayList, - originalList: MutableList, - categoryName: String) { - for (entity in originalList) { - val openEntity = itemList[itemList.count() - 1] - if (openEntity.leftData != null && openEntity.rightData == null) { - if (openEntity.rightData == null) { - openEntity.rightData = entity - continue - } - itemList.add(CommunitySelectOpenItem(categoryName = categoryName, leftData = entity)) - } else { - itemList.add(CommunitySelectOpenItem(categoryName = categoryName, leftData = entity)) - } - } - } - - // 由于老板说要对可选择的游戏社区排序，将已安装的游戏的社区放到最前面，所以这里的 pageSize 放大到 100 - override fun provideDataObservable(page: Int): Observable> { - 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 deleted file mode 100644 index e7372b6367..0000000000 --- a/app/src/main/java/com/gh/gamecenter/qa/select/SelectGameDialogAdapter.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.gh.gamecenter.qa.select; - -import android.content.Context; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; -import android.graphics.drawable.Drawable; -import android.text.TextUtils; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ProgressBar; - -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.gh.gamecenter.common.utils.BitmapUtils; -import com.gh.common.util.PackageUtils; -import com.gh.gamecenter.core.utils.UrlFilterUtils; -import com.gh.gamecenter.R; -import com.gh.gamecenter.databinding.DialogVotingSelectGameItemBinding; -import com.gh.gamecenter.entity.GameInstall; -import com.gh.gamecenter.entity.InstallGameEntity; -import com.gh.gamecenter.manager.PackagesManager; -import com.gh.gamecenter.qa.entity.CommunitySelectEntity; -import com.gh.gamecenter.retrofit.Response; -import com.gh.gamecenter.retrofit.RetrofitManager; -import com.halo.assistant.HaloApp; -import com.lightgame.adapter.BaseRecyclerAdapter; -import com.lightgame.utils.Utils; - -import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; -import retrofit2.HttpException; - -/** - * Created by khy on 25/12/17. - */ - -public class SelectGameDialogAdapter extends BaseRecyclerAdapter { - private ProgressBar pb; - private RecyclerView mRecyclerView; - private List gameList; - private List appList; - private Map mSelectMap; - - public SelectGameDialogAdapter(Context context, ProgressBar pb, RecyclerView recyclerView) { - super(context); - this.pb = pb; - this.mRecyclerView = recyclerView; - mSelectMap = new HashMap<>(); - gameList = new ArrayList<>(); - appList = new ArrayList<>(); - - initData(); - } - - private void getCommunityOpenedData() { - RetrofitManager.getInstance().getApi(). - getAskGameSelect( - HaloApp.getInstance().getChannel(), - UrlFilterUtils.getFilterQuery("status", "opened"), - 1, 2000). - subscribeOn(Schedulers.io()). - observeOn(AndroidSchedulers.mainThread()). - subscribe(new Response>() { - @Override - public void onResponse(@Nullable List response) { - if (response == null) { - loadOver(); - return; - } - - for (CommunitySelectEntity entity : response) { - for (GameInstall game : gameList) { - if (!TextUtils.isEmpty(game.getId()) && - game.getId().equals(entity.getGame().getId())) { - game.setTag(entity.getName()); - } - } - } - - Collections.sort(gameList, (o1, o2) -> (o1.getTag() + "").compareTo(o2.getTag() + "")); - - loadOver(); - } - - @Override - public void onFailure(@Nullable HttpException e) { - loadOver(); - } - }); - } - - private void initData() { - Observable - .create(emitter -> { - PackageManager pm = mContext.getPackageManager(); - List installedPackages = PackageUtils.getInstalledPackages(mContext, 0); - - - for (PackageInfo installedPackage : installedPackages) { - if ((installedPackage.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) { - InstallGameEntity installGameEntity = new InstallGameEntity(); - installGameEntity.setGamePath(installedPackage.applicationInfo.sourceDir); - try { - Drawable drawable = installedPackage.applicationInfo.loadIcon(pm); - installGameEntity.setGameBm(BitmapUtils.drawableToBitmap(drawable, true)); - - installGameEntity.setGameVersion(installedPackage.versionName); - installGameEntity.setGameName(installedPackage.applicationInfo.loadLabel(pm).toString()); - installGameEntity.setPackageName(installedPackage.packageName); - - File file = new File(installedPackage.applicationInfo.sourceDir); - installGameEntity.setGameSize(file.length()); - - GameInstall installedData = PackagesManager.getInstalledData(installedPackage.packageName); - if (installedData != null) { - gameList.add(installedData); - } else { - appList.add(installGameEntity); - } - } catch (Exception ignore) { - - } - } - } - - emitter.onComplete(); - }) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Response() { - @Override - public void onComplete() { - super.onComplete(); - if (gameList.size() > 0) { - getCommunityOpenedData(); - } else { - loadOver(); - } - } - }); - } - - - private void loadOver() { - for (int i = 0; i < gameList.size() + appList.size(); i++) { - mSelectMap.put(i, false); - } - notifyDataSetChanged(); - pb.setVisibility(View.GONE); - mRecyclerView.setVisibility(View.VISIBLE); - } - - @Override - public VotingSelectGameViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = mLayoutInflater.inflate(R.layout.dialog_voting_select_game_item, parent, false); - return new VotingSelectGameViewHolder(DialogVotingSelectGameItemBinding.bind(view)); - } - - @Override - public void onBindViewHolder(VotingSelectGameViewHolder holder, int position) { - final boolean isGameData = gameList.size() > position; - - if (isGameData) { - GameInstall installInfo = gameList.get(position); - holder.binding.gameIcon.displayGameIcon(installInfo.getIcon(), installInfo.getIconSubScript()); - holder.binding.gameName.setText(installInfo.getName()); - } else { - InstallGameEntity appEntity = appList.get(position - gameList.size()); - holder.binding.gameIcon.getIconIv().setImageBitmap(appEntity.getGameBm()); - holder.binding.gameIcon.getIconDecoratorIv().setVisibility(View.GONE); - holder.binding.gameName.setText(appEntity.getGameName()); - } - - Boolean isSelect = mSelectMap.get(position); - if (isSelect == null || isSelect) { - if (isSelect == null) mSelectMap.put(position, false); - holder.binding.gameSelect.setVisibility(View.VISIBLE); - } else { - holder.binding.gameSelect.setVisibility(View.GONE); - } - - holder.itemView.setOnClickListener(v -> { - if (isGameData && gameList.get(position).getTag() != null) { - Utils.toast(mContext, gameList.get(position).getTag() + "问答专区已经开通了哦"); - return; - } - - int selectCount = 0; - for (Boolean aBoolean : mSelectMap.values()) { - if (aBoolean) selectCount++; - } - if (selectCount >= 10) { - Utils.toast(mContext, "最多只能选择10个游戏"); - } else { - mSelectMap.put(position, !mSelectMap.get(position)); - notifyItemChanged(position); - } - - }); - } - - @Override - public int getItemCount() { - return appList.size() + gameList.size(); - } - - - List getSelectApkList() { - List gameInstall = new ArrayList<>(); - for (Integer integer : mSelectMap.keySet()) { - if (integer >= gameList.size() && mSelectMap.get(integer)) { - gameInstall.add(appList.get(integer - gameList.size())); - } - } - return gameInstall; - } - - List getSelectGameList() { - List gameInstall = new ArrayList<>(); - for (Integer integer : mSelectMap.keySet()) { - if (integer < gameList.size() && mSelectMap.get(integer)) { - gameInstall.add(gameList.get(integer)); - } - } - return gameInstall; - } -} diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/VotingAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/select/VotingAdapter.java deleted file mode 100644 index 50f7d5c206..0000000000 --- a/app/src/main/java/com/gh/gamecenter/qa/select/VotingAdapter.java +++ /dev/null @@ -1,153 +0,0 @@ -//package com.gh.gamecenter.qa.select; -// -//import android.content.Context; -//import android.view.View; -//import android.view.ViewGroup; -// -//import androidx.recyclerview.widget.RecyclerView; -// -//import com.gh.gamecenter.common.callback.OnListClickListener; -//import com.gh.gamecenter.common.constant.ItemViewType; -//import com.gh.gamecenter.R; -//import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; -//import com.gh.gamecenter.adapter.viewholder.ReuseViewHolder; -//import com.gh.gamecenter.baselist.ListAdapter; -//import com.gh.gamecenter.entity.MeEntity; -//import com.gh.gamecenter.manager.UserManager; -//import com.gh.gamecenter.qa.entity.CommunitiesGameEntity; -//import com.gh.gamecenter.qa.entity.CommunitySelectEntity; -// -//import java.util.ArrayList; -//import java.util.List; -// -///** -// * Created by khy on 6/12/17. -// */ -// -//public class VotingAdapter extends ListAdapter { -// -// private OnListClickListener mListClickListener; -// -// private String mCommunityId; -// -// -// public VotingAdapter(Context context, OnListClickListener listClickListener) { -// super(context); -// mListClickListener = listClickListener; -// mCommunityId = UserManager.getInstance().getCommunity().getId(); -// } -// -// @Override -// protected void setListData(List updateData) { -// int oldSize = TOP_ITEM_COUNT; -// if (mEntityList != null && mEntityList.size() > 0) { -// oldSize += mEntityList.size(); -// } -// mEntityList = new ArrayList<>(updateData); -// if (oldSize == 0 || oldSize > updateData.size()) { -// notifyDataSetChanged(); -// } else { -// notifyItemRangeInserted(oldSize, updateData.size() + TOP_ITEM_COUNT - oldSize); -// } -// } -// -// @Override -// public int getItemViewType(int position) { -// if (position == 0) { -// return ItemViewType.ITEM_HEADER; -// } else if (position == getItemCount() - 1) { -// return ItemViewType.ITEM_FOOTER; -// } -// return ItemViewType.ITEM_BODY; -// } -// -// @Override -// public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { -// View view; -// switch (viewType) { -// case ItemViewType.ITEM_HEADER: -// view = mLayoutInflater.inflate(R.layout.voting_top_item, parent, false); -// return new ReuseViewHolder(view); -// case ItemViewType.ITEM_BODY: -// view = mLayoutInflater.inflate(R.layout.ask_selectgame_item, parent, false); -// return new AskSelectGameItemViewHolder(view, mListClickListener); -// case ItemViewType.ITEM_FOOTER: -// view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); -// return new FooterViewHolder(view, mListClickListener); -// } -// return null; -// } -// -// @Override -// public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { -// CommunitySelectEntity entity; -// switch (getItemViewType(position)) { -// case ItemViewType.ITEM_BODY: -// AskSelectGameItemViewHolder bodyHolder = (AskSelectGameItemViewHolder) holder; -// entity = mEntityList.get(position - TOP_ITEM_COUNT); -// CommunitiesGameEntity game = entity.getGame(); -// bodyHolder.mIcon.displayGameIcon(game.getRawIconIfExisted(), game.getIconSubscript()); -// bodyHolder.setClickData(entity); -// bodyHolder.mName.setText(game.getName()); -// bodyHolder.mVotecount.setText(entity.getVote() + "票"); -// break; -// case ItemViewType.ITEM_FOOTER: -// FooterViewHolder footerViewHolder = (FooterViewHolder) holder; -// if (mIsNetworkError) { -// footerViewHolder.loading.setVisibility(View.GONE); -// footerViewHolder.hint.setText(R.string.loading_failed_retry); -// } else if (mIsOver) { -// footerViewHolder.loading.setVisibility(View.GONE); -// footerViewHolder.hint.setText("光环小编会综合根据游戏投票数选择开放社区"); -// } else if (mIsLoading) { -// footerViewHolder.loading.setVisibility(View.VISIBLE); -// footerViewHolder.hint.setText(R.string.loading); -// } else { -// footerViewHolder.loading.setVisibility(View.GONE); -// footerViewHolder.hint.setText(R.string.loading_more_hint); -// } -// break; -// case ItemViewType.ITEM_HEADER: -// holder.itemView.findViewById(R.id.voting_top_btn).setOnClickListener(v -> -// mListClickListener.onListClick(v, -1, null)); -// break; -// } -// } -// -// @Override -// public int getItemCount() { -// return mEntityList == null || mEntityList.isEmpty() ? 0 : mEntityList.size() + FOOTER_ITEM_COUNT + TOP_ITEM_COUNT; -// } -// -// public boolean isOver() { -// return mIsOver; -// } -// -// public void resetCommunityId(String id) { -// mCommunityId = id; -// notifyDataSetChanged(); -// } -// -// public String getCommunityId() { -// return mCommunityId; -// } -// -// public void voteSuccess(String communityId) { -// for (CommunitySelectEntity entity : mEntityList) { -// if (communityId.equals(entity.getId())) { -// MeEntity me = entity.getMe(); -// if (me == null) me = new MeEntity(); -// me.setCommunityVoted(true); -// entity.setMe(me); -// entity.setVote(entity.getVote() + 1); -// notifyDataSetChanged(); -// break; -// } -// } -// } -// -// public void postCommunitiesSuccess(CommunitySelectEntity entity) { -// mEntityList.add(entity); -// notifyDataSetChanged(); -// } -//} diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/VotingFragment.java b/app/src/main/java/com/gh/gamecenter/qa/select/VotingFragment.java deleted file mode 100644 index 0cc2fb38ee..0000000000 --- a/app/src/main/java/com/gh/gamecenter/qa/select/VotingFragment.java +++ /dev/null @@ -1,117 +0,0 @@ -//package com.gh.gamecenter.qa.select; -// -//import android.app.Dialog; -//import android.os.Bundle; -// -//import androidx.annotation.NonNull; -//import androidx.annotation.Nullable; -//import androidx.recyclerview.widget.GridLayoutManager; -//import androidx.recyclerview.widget.RecyclerView; -// -//import android.view.View; -//import android.view.Window; -//import android.widget.ProgressBar; -//import android.widget.TextView; -// -//import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment; -//import com.gh.common.util.CheckLoginUtils; -//import com.gh.gamecenter.common.view.VerticalItemDecoration; -//import com.gh.gamecenter.GameDetailActivity; -//import com.gh.gamecenter.R; -//import com.gh.gamecenter.baselist.ListFragment; -//import com.gh.gamecenter.baselist.LoadType; -//import com.gh.gamecenter.entity.GameInstall; -//import com.gh.gamecenter.entity.InstallGameEntity; -//import com.gh.gamecenter.qa.entity.CommunitySelectEntity; -// -//import java.util.List; -// -///** -// * Created by khy on 11/12/17. -// */ -// -//public class VotingFragment extends ListFragment { -// -// private WaitingDialogFragment mLoadingDialog; -// private Dialog mSelectGameDialog; -// -// private VotingAdapter mAdapter; -// -// @Override -// protected VotingAdapter provideListAdapter() { -// return mAdapter == null ? mAdapter = new VotingAdapter(getContext(), this) : mAdapter; -// } -// -// @Override -// protected RecyclerView.ItemDecoration getItemDecoration() { -// return new VerticalItemDecoration(getContext(), false); -// } -// -// @Override -// public void onCreate(@Nullable Bundle savedInstanceState) { -// super.onCreate(savedInstanceState); -// mListViewModel.setOverLimitSize(1000); // 该页面不需要分页 -// mListViewModel.getPostLiveData().observe(this, aBoolean -> { -// if (mLoadingDialog != null) mLoadingDialog.dismiss(); -// if (mSelectGameDialog != null) mSelectGameDialog.dismiss(); -// }); -// } -// -// @Override -// public void onListClick(View view, int position, Object data) { -// super.onListClick(view, position, data); -// switch (view.getId()) { -// case R.id.footerview_item: -// if (mAdapter.isNetworkError()) { -// mListViewModel.load(LoadType.RETRY); -// } -// break; -// case R.id.voting_top_btn: -// CheckLoginUtils.checkLogin(getContext(), "问答-选择游戏-[我要投票]", this::showSelectDialog); -// break; -// case R.id.ask_selectgame_item_constraintlayout: -// if (data instanceof CommunitySelectEntity) { -// CommunitySelectEntity entity = (CommunitySelectEntity) data; -// GameDetailActivity.startGameDetailActivity(getContext(),entity.getGame().getId(), mEntrance,null); -// } -// break; -// } -// } -// -// private void showSelectDialog() { -// mSelectGameDialog = new Dialog(getContext()); -// -// View view = View.inflate(getContext(), R.layout.dialog_suggest_voting, null); -// RecyclerView recyclerView = view.findViewById(R.id.dialog_suggest_game_rv); -// TextView negative = view.findViewById(R.id.dialog_suggest_negative); -// TextView positive = view.findViewById(R.id.dialog_suggest_positive); -// ProgressBar pb = view.findViewById(R.id.dialog_suggest_game_load); -// recyclerView.setVisibility(View.GONE); -// recyclerView.setLayoutManager(new GridLayoutManager(getContext(), 4)); -// SelectGameDialogAdapter dialogAdapter = new SelectGameDialogAdapter(getContext(), pb, recyclerView); -// recyclerView.setAdapter(dialogAdapter); -// -// mSelectGameDialog.requestWindowFeature(Window.FEATURE_NO_TITLE); -// mSelectGameDialog.setCanceledOnTouchOutside(false); -// mSelectGameDialog.setContentView(view); -// mSelectGameDialog.show(); -// -// negative.setOnClickListener((v) -> mSelectGameDialog.cancel()); -// -// positive.setOnClickListener(v -> { -// List selectGameList = dialogAdapter.getSelectGameList(); -// List selectApkList = dialogAdapter.getSelectApkList(); -// if (selectApkList.size() + selectGameList.size() == 0) { -// toast("请先选择游戏"); -// return; -// } -// for (InstallGameEntity entity : selectApkList) { -// mListViewModel.sendSuggestion(entity); -// } -// -// mLoadingDialog = WaitingDialogFragment.newInstance(getString(R.string.vote_post)); -// mLoadingDialog.show(getChildFragmentManager(), null); -// mListViewModel.postCommunities(selectGameList); -// }); -// } -//} diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/VotingSelectGameViewHolder.java b/app/src/main/java/com/gh/gamecenter/qa/select/VotingSelectGameViewHolder.java deleted file mode 100644 index 30d819b4ff..0000000000 --- a/app/src/main/java/com/gh/gamecenter/qa/select/VotingSelectGameViewHolder.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.gh.gamecenter.qa.select; - -import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; -import com.gh.gamecenter.databinding.DialogVotingSelectGameItemBinding; - -public class VotingSelectGameViewHolder extends BaseRecyclerViewHolder { - - public DialogVotingSelectGameItemBinding binding; - - public VotingSelectGameViewHolder(DialogVotingSelectGameItemBinding binding) { - super(binding.getRoot()); - this.binding = binding; - } -} diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/VotingViewModel.java b/app/src/main/java/com/gh/gamecenter/qa/select/VotingViewModel.java deleted file mode 100644 index 79c3c1ae51..0000000000 --- a/app/src/main/java/com/gh/gamecenter/qa/select/VotingViewModel.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.gh.gamecenter.qa.select; - -import android.app.Application; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.lifecycle.MutableLiveData; - -import com.gh.gamecenter.common.exposure.meta.MetaUtil; -import com.gh.common.util.PackageUtils; -import com.gh.gamecenter.core.utils.UrlFilterUtils; -import com.gh.gamecenter.R; -import com.gh.gamecenter.baselist.ListViewModel; -import com.gh.gamecenter.baselist.LoadType; -import com.gh.gamecenter.entity.GameInstall; -import com.gh.gamecenter.entity.InstallGameEntity; -import com.gh.gamecenter.qa.entity.CommunitySelectEntity; -import com.gh.gamecenter.retrofit.Response; -import com.gh.gamecenter.retrofit.RetrofitManager; -import com.halo.assistant.HaloApp; -import com.lightgame.utils.Utils; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; -import okhttp3.MediaType; -import okhttp3.RequestBody; -import okhttp3.ResponseBody; -import retrofit2.HttpException; - -/** - * Created by khy on 20/03/18. - */ - -public class VotingViewModel extends ListViewModel { - - private MutableLiveData mPostLiveData = new MutableLiveData<>(); - - public VotingViewModel(@NonNull Application application) { - super(application); - } - - @Override - protected void mergeResultLiveData() { - mResultLiveData.addSource(mListLiveData, mResultLiveData::postValue); - } - - public MutableLiveData getPostLiveData() { - return mPostLiveData; - } - - @Override - public Observable> provideDataObservable(int page) { - return RetrofitManager.getInstance().getApi().getCommunityVoting(HaloApp.getInstance().getChannel() - , UrlFilterUtils.getFilterQuery("status", "voting")); - } - - void sendSuggestion(InstallGameEntity entity) { - Map params = new HashMap<>(); - params.put("message", "问答社区推荐收录：" + entity.getGameName() + "(" + entity.getPackageName() + ", " + entity.getGameVersion() + ")"); - params.put("from", ""); - params.put("ghversion", PackageUtils.getGhVersionName()); - params.put("channel", HaloApp.getInstance().getChannel()); - params.put("type", android.os.Build.MODEL); - params.put("sdk", String.valueOf(android.os.Build.VERSION.SDK_INT)); - params.put("version", android.os.Build.VERSION.RELEASE); - params.put("source", getApplication().getString(R.string.app_name)); - params.put("suggestion_type", "游戏收录"); - params.put("jnfj", MetaUtil.getBase64EncodedIMEI()); - - RequestBody body = RequestBody.create(MediaType.parse("application/json"), - new JSONObject(params).toString()); - - RetrofitManager.getInstance().getApi().postSuggestion(body) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Response() { - }); - - } - - void postCommunities(List gameList) { - List> sequences = new ArrayList<>(); - for (GameInstall gameInstall : gameList) { - JSONObject object = new JSONObject(); - try { - object.put("game_id", gameInstall.getId()); - } catch (JSONException e) { - e.printStackTrace(); - } - RequestBody body = RequestBody.create(MediaType.parse("application/json"), object.toString()); - sequences.add(RetrofitManager.getInstance().getApi().postCommunities(body)); - } - Observable.mergeDelayError(sequences) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Response() { - @Override - public void onFailure(@Nullable HttpException e) { - load(LoadType.REFRESH); - Utils.toast(getApplication(), "投票成功"); - mPostLiveData.postValue(false); - } - - @Override - public void onComplete() { - load(LoadType.REFRESH); - Utils.toast(getApplication(), "投票成功"); - mPostLiveData.postValue(true); - } - }); - } -} diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java index 72b490f45b..6a8c76fffb 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java @@ -635,12 +635,6 @@ public interface ApiService { /****** 问答（社区相关） *******/ - /** - * 社区列表 - */ - @GET("communities") - Observable> getAskGameSelect(@Query("channel") String channel, @Query("filter") String filter, @Query("page") int page, @Query("page_size") int pageSize); - /** * 社区列表已开通页面 */ diff --git a/app/src/main/res/drawable-xhdpi/voting_game_selected.webp b/app/src/main/res/drawable-xhdpi/voting_game_selected.webp deleted file mode 100644 index b00074be0227d71dc16e6662c01a6fe0cc83eec1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 858 zcmV-g1Eu^@Nk&Fe0{{S5MM6+kP&il$0000G0000d001Wd06|PpNFo6M00AfCwvi-3 zp?VhKzD54ILJ$#=ul)AjYF$s%`P!Z5tc$W1GL~76@P3ewjr>JM0>ntRO-U-W#NJ4`j_Ri%hC|m0ZqTlQvYH3xMR6qX35X6On9pt1sAqC)_~-QVHg8& z!mtMbk+!~i$bhuId6=K-+JmL zAOi%p0AMh@e*pY|*Y@WBh5xbN*|`q;QTs>ymtY6z2KW!^yx<#vKL9l{NHg=?1nxI0092*n-`O~BF%d}@QWd2S03{{?dDhS9kLLfBONR@>2D;exnKYO>7FsotB}f5To;jq z=6FV}PerGc0HFB%{x?4bl2|wRo?WetjLn?X>%4ELnvPGy#DYT$mCJNqGBOz*Sp8!! zwEo5KvPvS4k!u3Vs<86(9@9rGV6?(P7X#Cd@DlGsD?%|hiobI|U9@v$ZQ2NR7t}b$ zRE-i(R&e!#7Kq4>+Aoo$>P?~-u8X@5Mjz(Z2GwGR^1zm;YPo2Gx^L=DGGGxxxnIG_ z>kJLkhp2uCn+K@1SnLgYNbnz!{?vYL2zBoF(5Y{gBnVllhA;4&#Vr(%d1i5OL zs6yPHiY%b=mw=~l{9nOCA--npjU#ox23Elo&h7B&< k|L~B%_p(OS{o_-E@Bo6I<)BxWF7PwHy~=#?bL2(<0D4fZ4gdfE diff --git a/app/src/main/res/drawable-xxhdpi/search_column_icon.webp b/app/src/main/res/drawable-xxhdpi/search_column_icon.webp deleted file mode 100644 index 22e782e0676888b13831c9b6960b7cdebad9a878..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2026 zcmVNwu({U z8R=^QpiZJ*K|sR35sv|Yige%kwHfhSQJhtgI-gWeHVNcfz{$MSxE>>ZFD49Iz`cvK zhk(p`*$g4)2|0vW*}VgrjrgMk7&JNvlvt5A12Mtp)kX&)`@yKo20HB3ryxctPXTwE z~!7+DM0P6p6_{Ak3F&H_l@4p_Sk(9KjJ?_5K4xj^cs244OS(ycTg=TwFqLfV!I zc5e*bNhf3-O5h0TJIZ`x>0SoG?(%E~V4bplv-Bt%NWbOWf{<+u+gEC{g=iR2^Y~ z_mo00UKh}(UyG##pmbTakI==70nNM`VEIP{{J*X13Za(Q3}oK33JE0ukUfMf!o0Zv z3RyOjfF90Y@=fdgXB5NJs-H=OznmTdkm@mZ;*vUkDYKHW!|+@j+8Bp~gq9m+w-a_5 zZSYOl57N2r3l;w9Su(-<34SQ>f}-^b5M1^0KUfgA>3?VfUu{&j3DPPr8V@8d*pFhr z0Aac|FD%a`Amr4Z`!H;eLxh>lu_qpEv!kd}>POZtf4`}_TpNKUIaW|OARGk%05Bi` zodGH^05AYPF%pMDq9F`+X8;fZf?FAEkPqM(@P7dOZtep7ckzPs1NeXCrXvsT-=G?R zAJupynr9T48RI-AKAFZzayuN zp&+y1AB-P}9RA$|X1}0b%FYAK1N8Hx2bd4luV4Q_9)KU!f53WxdVqfb^#Jmm{c`vK z{h0l#|NrtE{3rYG{_D=4w^vR5^D?iH7y17n@CJ)N_J7HL8NP+TI{!=eN9-^1AMf74 zAIATg|F7#i`a$dg`e1DW#tl0aKgMo!REN%utg>-X!?=bhVX{55_3s$u!0W6ABvhF& zRZRc@{{Q|?UeM8b0l4j(GY(1JTICTJ$Gu|NJ%=fL;>|306xxBt&a`p0e9aGTfY+GResbh+G%(HRh_P}RF$oWnah zw)q5Y0>m9c$gm*3=JEPm1DOr#G9Fzki`FFx7QCc>T?b0#eTgSNcPpG{eFPMaaz8PS z#{hle>67MObh%%Jq4iNPPW*wD)scFujZPbN$LV^C%4hVL>y4UdlW?kWVlDSvkS~1h zE4$BPb9#dGjgF=X@L6xKIdhz;ANK!HHFJV%`kMzS<17L~>2bX5zhp8j{9S#s-u3$FKg) zYwqd>Qcvwnsxabnhd26bPO|^3(ah!9D~qDS&R9kF&rf*2j9>C6$qk5CtU1J%Qydpz zP4o8ql%~~j<2J@5FEPxD<-GsbUe;f8EHvHXs#^G{9{PY_4&L6Ak?W#Z{Qu`UQ>4F6 z`cSxKTvIao48D%>T>E#YV5>o?qzzW3x?qp1(8Y1z zSLI0se~d$i42&#*fqWro*-oTmVa~Be9KR542jYAb4m!ieq>& z#p=&dF`0THR&H3#fC@-af))5^tV|E@8$nmkm<2YhNz`3CgZ!`4n{5|JZ!XiM6>S#L z45fly&OK7rrxgI6j(O~4^ia>XiO>Bxi+!$=K%%wHLp2QFW|@S`wmJnQPzt4nVV~RJ z@B02u_g_nTG%3H4=XlDK5~kx@PI8JL%`Vj#L})xYymLM?Px# diff --git a/app/src/main/res/drawable-xxhdpi/search_special_column_icon.png b/app/src/main/res/drawable-xxhdpi/search_special_column_icon.png deleted file mode 100644 index 46ecfa10198f48ffcae7dc8ef7de479f156fc944..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1490 zcmV;@1ugoCP)Px)j7da6RA>d&T1{*lRSL_i>j-GYRx+C&wH1VIIdf*|77RETha6F)^r zSg2II$1i7Jr)Lc+Oqz6>FPE{j8>jV@eifZco`VBL?w!6Fb zt~cJT8?R(}_x;R#-+S|B=gnIX0bH@^OTFr!t4{%{#}P0ADB?oEfB@{*#Uqr2z{?1t z00@f+@|3*&=I@I~cdz25uXb1KuKK^PPDqebeA`r`-kE+$mw>07-UWEE@0}HY@G*(RQ zTWTe%C4pEv_b@8>=6a2~6F_4&@Nh9R^s`eNE|+eV1pawMnC~=r#>6^VH)C+a=r{x1 zQ7Q4cTjx&INhw~SnfRiazNQ3pv*D3Pys25IPM49ZT?4>_&CIER054cvt^DF{Hsm3s zct0#)razQ8o6}&U9a2LY?kZIl_iqUt7fQTAh7)pAw zs7Qb(i`nG7ld^WoW2yW>h4_OT33~A@Jo;er5wnZ6EMoTa?%)X;jeOAHnXoRCWV@5c z5d-73R`nUEzF`aQrXxgH%8`qiL-em@$km_H30n~^J{euQyf2uGeSYVm>>IWev932v@m@Y2?~ z4URH)$vdfSZ$_M@cCLmtP>ekcLOns#>ifd2_3xsooF@~aw&T7Pk^tVqhRH4M3qn}c zrjG?N7+&%4{#zOwaIal>vB z?DbH>R@F6+VPPbl?(mD)%?q&!1?71xI0-wg0px^|e*(svwWD5$u}e<(Sy*+^17jyQ z3X5HY*#ecZ(+tQ{meMYI(38ZRB^G+3H9+JbRw$E@i3qrlf0QoFl8%)CHPGuzlo@-N zQ{028b91yH#{4UQ1(4!I@0~qg7AE$to8+bA$1h}8|K5C#LXHWF--k_gZQjBhW7qcs zoZ_bVx-9|}|8EL_ujzN3_O_>;&{PSXr23Q5$=uuITBn@adMRhj+)gLJ`T4E?u9j#P zwzVr`Gm&BW!6hxRY*$Jf{sT196MDIg+%30;PL!@xd=P*VV`ka)tVDG3T#6#oj2(#m zd3kE6-p5`?W)jiOM2XjFFl?D@!@MG)$o$&odYbBAs`WR^9GuLx3~VSfkzSg5Aj|#r z8Q>c}T%g_lYpv2M+}3{W))oiVmU^|kvT=mss=Ms<#xstf5}&Q9wdU0xORH&>=~~|1 zGMce;{uQOvhpw_9lvvIt&U2f(nIJwx!`9>4&!tlKME3G_lmfoEYO&RnQXVO0k{{K? zSqOMcE&fiS^DF^=EEsP>c5EaB=m15Gxo`FxQ;QY?%*tDGx5mG7|4zx>hH#p*zaa52 zc^H4j8Xz~u!kFxtX;#rdfD1VfPx<(l`F(`x6>KM z*{}w<(0u8qH9Po_uO$H{vy+cm9ZkqQ3%q#vWQ2V%djoS_koPQ`b+E2x3$~dqPcvZd s*tMS;m`U(`*M96_C&JG+@^hR20g}3pee`Y1vj6}907*qoM6N<$f>PJp*Z=?k diff --git a/app/src/main/res/layout/activity_ask_search.xml b/app/src/main/res/layout/activity_ask_search.xml deleted file mode 100644 index 3770a436db..0000000000 --- a/app/src/main/res/layout/activity_ask_search.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/ask_search_actionbar.xml b/app/src/main/res/layout/ask_search_actionbar.xml deleted file mode 100644 index 752e853d7b..0000000000 --- a/app/src/main/res/layout/ask_search_actionbar.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/ask_search_item.xml b/app/src/main/res/layout/ask_search_item.xml deleted file mode 100644 index f2e9ab34c9..0000000000 --- a/app/src/main/res/layout/ask_search_item.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/ask_search_question_item.xml b/app/src/main/res/layout/ask_search_question_item.xml deleted file mode 100644 index cdc1657161..0000000000 --- a/app/src/main/res/layout/ask_search_question_item.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/ask_selectgame_item.xml b/app/src/main/res/layout/ask_selectgame_item.xml deleted file mode 100644 index 340e7c2152..0000000000 --- a/app/src/main/res/layout/ask_selectgame_item.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/community_follow_tab_item.xml b/app/src/main/res/layout/community_follow_tab_item.xml deleted file mode 100644 index 2968f956b7..0000000000 --- a/app/src/main/res/layout/community_follow_tab_item.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/community_search_columm_item.xml b/app/src/main/res/layout/community_search_columm_item.xml deleted file mode 100644 index 9aa7c2e7fd..0000000000 --- a/app/src/main/res/layout/community_search_columm_item.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/community_search_special_columm_item.xml b/app/src/main/res/layout/community_search_special_columm_item.xml deleted file mode 100644 index f11eeef598..0000000000 --- a/app/src/main/res/layout/community_search_special_columm_item.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/community_select_opened_head_item.xml b/app/src/main/res/layout/community_select_opened_head_item.xml deleted file mode 100644 index e0c1de271b..0000000000 --- a/app/src/main/res/layout/community_select_opened_head_item.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/community_select_opened_item.xml b/app/src/main/res/layout/community_select_opened_item.xml deleted file mode 100644 index a7f77c17a0..0000000000 --- a/app/src/main/res/layout/community_select_opened_item.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_voting_select_game_item.xml b/app/src/main/res/layout/dialog_voting_select_game_item.xml deleted file mode 100644 index 75e8baac9d..0000000000 --- a/app/src/main/res/layout/dialog_voting_select_game_item.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file From 1ae37710ca606af357335acb6db0ab56ad07dc4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Fri, 13 May 2022 18:14:14 +0800 Subject: [PATCH 29/52] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8B5.10.0=E3=80=91=E8=AE=BA=E5=9D=9B=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E7=83=AD=E5=BA=A6=E5=80=BC=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?= =?UTF-8?q?(5.13=E6=B5=8B=E8=AF=95=E5=8F=8D=E9=A6=88)=20https://git.shanqu?= =?UTF-8?q?.cc/pm/halo-app-issues/-/issues/1856?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/forum/home/OfficialForumAdapter.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/OfficialForumAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/OfficialForumAdapter.kt index d333d43177..90a920c03a 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/OfficialForumAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/OfficialForumAdapter.kt @@ -5,6 +5,7 @@ import android.view.ViewGroup import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.core.utils.NumberUtils import com.gh.gamecenter.databinding.OfficialForumItemBinding import com.gh.gamecenter.entity.ForumEntity import com.gh.gamecenter.forum.detail.ForumDetailActivity @@ -28,7 +29,7 @@ class OfficialForumAdapter( val forumEntity = mList[position] forumName.text = forumEntity.name forumIv.displayGameIcon(forumEntity.icon, null) - hotTv.text = if (forumEntity.hot > 10000) "10000+" else forumEntity.hot.toString() + hotTv.text = NumberUtils.transSimpleCount(forumEntity.hot) root.setOnClickListener { val bbsType = if (forumEntity.type == "official_bbs") "综合论坛" else "游戏论坛" From ccd6a866dce2ed07da2d254ec1d984e576acc380 Mon Sep 17 00:00:00 2001 From: lyr Date: Fri, 13 May 2022 19:07:06 +0800 Subject: [PATCH 30/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E5=BC=80=E6=9C=8D?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2)=20https://git.shanqu.cc/halo/andro?= =?UTF-8?q?id/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/databind/AddKaiFuBindingAdapter.kt | 4 +- .../java/com/gh/common/view/FilterView.kt | 52 +++++++--- .../servers/GameServerTestActivity.kt | 7 ++ .../gamecenter/servers/GameServersActivity.kt | 23 +++-- .../servers/GameServersContentAdapter.kt | 16 ++- .../servers/GameServersContentFragment.kt | 17 +++- .../servers/GameServersPublishFragment.kt | 28 +++--- .../servers/GameServersTestAdapter.kt | 5 +- .../servers/GameServersTestFragment.kt | 43 ++++++-- .../servers/add/AddKaiFuActivity.kt | 42 ++++++-- .../servers/patch/PatchKaifuActivity.kt | 16 +++ app/src/main/res/drawable/bg_add_kaifu.xml | 2 +- .../res/drawable/bg_add_kaifu_bottom_left.xml | 2 +- .../drawable/bg_add_kaifu_bottom_right.xml | 2 +- .../main/res/drawable/bg_add_kaifu_top.xml | 2 +- .../res/drawable/bg_add_kaifu_top_left.xml | 2 +- .../res/drawable/bg_add_kaifu_top_right.xml | 2 +- .../main/res/layout/activity_game_servers.xml | 9 +- .../main/res/layout/activity_kaifu_add.xml | 8 +- .../main/res/layout/activity_kaifu_patch.xml | 23 ++--- .../main/res/layout/fragment_game_servers.xml | 3 +- .../layout/fragment_game_servers_publish.xml | 4 +- app/src/main/res/layout/game_test_item.xml | 2 +- .../main/res/layout/kaifu_add_item_title.xml | 74 +++++++------- .../main/res/layout/popup_server_category.xml | 2 +- .../res/layout/popup_server_category_item.xml | 2 +- .../main/res/layout/popup_server_status.xml | 2 +- app/src/main/res/layout/popup_server_time.xml | 2 +- app/src/main/res/layout/popup_test_time.xml | 2 +- .../gh/gamecenter/common/view/DrawableView.kt | 98 +++++++++++++++---- 30 files changed, 356 insertions(+), 140 deletions(-) diff --git a/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt b/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt index 639f94f22e..b406e02e5c 100644 --- a/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt +++ b/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt @@ -87,8 +87,8 @@ object AddKaiFuBindingAdapter { }) if (i == list.size - 1) { - binding.kaifuAddTime.background = R.drawable.bg_add_kaifu_bottom_left.toDrawable() - binding.kaifuAddServerName.background = R.drawable.bg_add_kaifu_bottom_right.toDrawable() + binding.kaifuAddTime.background = R.drawable.bg_add_kaifu_bottom_left.toDrawable(view.context) + binding.kaifuAddServerName.background = R.drawable.bg_add_kaifu_bottom_right.toDrawable(view.context) } } } diff --git a/app/src/main/java/com/gh/common/view/FilterView.kt b/app/src/main/java/com/gh/common/view/FilterView.kt index 4438b20270..f7ea8c0d97 100644 --- a/app/src/main/java/com/gh/common/view/FilterView.kt +++ b/app/src/main/java/com/gh/common/view/FilterView.kt @@ -9,6 +9,7 @@ import android.view.ViewGroup import android.widget.LinearLayout import android.widget.PopupWindow import android.widget.TextView +import androidx.annotation.ColorInt import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager @@ -16,6 +17,7 @@ import androidx.recyclerview.widget.RecyclerView import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.toDrawable import com.gh.gamecenter.databinding.ItemFilterBinding import com.gh.gamecenter.databinding.LayoutFilterBinding import com.google.android.flexbox.FlexboxLayout @@ -34,6 +36,9 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet private var mHighlightSubFilterIfItsNotDefault: Boolean = false // 当次 filter 选中非默认的时候高亮显示 + private var mPopupWindow: PopupWindow? = null + private var mSubFilterSelectedCallback: ((String) -> Unit)? = null + init { mBinding = LayoutFilterBinding.inflate(LayoutInflater.from(context), this, true) } @@ -47,13 +52,14 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet highlightSubFilterIfNotDefault: Boolean = false) { mMainFilterList = mainFilterList mSubFilterList = subFilterList + mSubFilterSelectedCallback = subFilterSelectedCallback mHighlightSubFilterIfItsNotDefault = highlightSubFilterIfNotDefault mBinding?.subFilterTv?.text = subFilterText mBinding?.subFilterTv?.setOnClickListener { showSelectionPopupWindow(this, it as TextView, mSelectedSubFilter) { selectedText -> - subFilterSelectedCallback.invoke(selectedText) + mSubFilterSelectedCallback?.invoke(selectedText) } } @@ -76,9 +82,9 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet mSelectedSubFilter = filter mBinding?.subFilterTv?.text = filter if (filter != mSubFilterList.firstOrNull() && mHighlightSubFilterIfItsNotDefault) { - mBinding?.subFilterTv?.setTextColor(R.color.theme_font.toColor()) + mBinding?.subFilterTv?.setTextColor(R.color.theme_font.toColor(context)) } else { - mBinding?.subFilterTv?.setTextColor(R.color.text_757575.toColor()) + mBinding?.subFilterTv?.setTextColor(R.color.text_757575.toColor(context)) } } @@ -101,15 +107,16 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet drawableUp?.setBounds(0, 0, drawableUp.minimumWidth, drawableUp.minimumHeight) drawableDown?.setBounds(0, 0, drawableDown.minimumWidth, drawableDown.minimumHeight) - subFilterTv.setTextColor(R.color.theme_font.toColor()) + subFilterTv.setTextColor(R.color.theme_font.toColor(context)) subFilterTv.setCompoundDrawables(null, null, drawableUp, null) val inflater = LayoutInflater.from(subFilterTv.context) val layout = inflater.inflate(R.layout.layout_filter_size, null) val popupWindow = PopupWindow( - layout, - LinearLayout.LayoutParams.MATCH_PARENT, - LinearLayout.LayoutParams.WRAP_CONTENT) + layout, + LinearLayout.LayoutParams.MATCH_PARENT, + LinearLayout.LayoutParams.WRAP_CONTENT + ).apply { mPopupWindow = this } val flexboxLayout = layout.findViewById(R.id.flexbox) val backgroundView = layout.findViewById(R.id.background) @@ -118,6 +125,7 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet backgroundView.setOnClickListener { popupWindow.dismiss() + mPopupWindow = null } for (filter in mSubFilterList) { @@ -160,6 +168,28 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet popupWindow.showAsDropDown(containerView, 0, -6) } + fun setRootBackgroundColor(@ColorInt color: Int) { + mBinding?.root?.setBackgroundColor(color) + } + + fun updateFilterRecyclerView() { + mBinding?.filterRecyclerView?.adapter?.run { + mBinding?.filterRecyclerView?.recycledViewPool?.clear() + notifyItemRangeChanged(0, itemCount) + } + } + + fun updatePopupWindow() { + mBinding?.run { + if (mPopupWindow != null && mPopupWindow!!.isShowing) { + mPopupWindow?.dismiss() + showSelectionPopupWindow(this@FilterView, subFilterTv, subFilterTv.text.toString()) { selectedText -> + mSubFilterSelectedCallback?.invoke(selectedText) + } + } + } + } + class FilterAdapter(val context: Context, private val mFilterList: ArrayList, private val mDefaultSelectedFilter: String, @@ -180,11 +210,11 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet } if (mSelectedFilter == mFilterList[position]) { - holder.binding.titleTv.setBackgroundResource(R.drawable.bg_tag_text) - holder.binding.titleTv.setTextColor(R.color.white.toColor()) + holder.binding.titleTv.background = R.drawable.bg_tag_text.toDrawable(context) + holder.binding.titleTv.setTextColor(R.color.white.toColor(context)) } else { - holder.binding.titleTv.setBackgroundColor(R.color.background_white.toColor(holder.binding.root.context)) - holder.binding.titleTv.setTextColor(R.color.text_777777.toColor()) + holder.binding.titleTv.setBackgroundColor(R.color.background_white.toColor(context)) + holder.binding.titleTv.setTextColor(R.color.text_777777.toColor(context)) } holder.binding.titleTv.text = mFilterList[position] diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServerTestActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServerTestActivity.kt index 34e155ecaf..a4ee19b38f 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServerTestActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServerTestActivity.kt @@ -6,12 +6,14 @@ import android.os.Bundle import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.updateStatusBarColor class GameServerTestActivity : NormalActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setToolbarMenu(R.menu.menu_download) + updateStatusBarColor(R.color.black, R.color.white) } override fun showDownloadMenu() = true @@ -20,6 +22,11 @@ class GameServerTestActivity : NormalActivity() { return getTargetIntent(this, GameServerTestActivity::class.java, GameServersTestFragment::class.java) } + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { fun getIntent(context: Context, id: String, title: String, entrance: String): Intent { val bundle = Bundle() diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt index a852e46b1f..5e76edd054 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt @@ -18,6 +18,7 @@ import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.common.utils.viewModelProviderFromParent import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.updateStatusBarColor import com.halo.assistant.HaloApp import com.lightgame.view.NoScrollableViewPager @@ -46,6 +47,7 @@ class GameServersActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) mServersTest = findViewById(R.id.server_test) mServersPublish = findViewById(R.id.server_publish) mViewpager = findViewById(R.id.viewpager) @@ -75,8 +77,8 @@ class GameServersActivity : ToolBarActivity() { mToolbar.setNavigationOnClickListener { finish() } mServersPublish?.isChecked = true - mServersTest?.setTextColor(DrawableView.getSelectorColorStyle(R.color.black, R.color.theme_font)) - mServersPublish?.setTextColor(DrawableView.getSelectorColorStyle(R.color.black, R.color.theme_font)) + mServersTest?.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_black, R.color.theme_font, this)) + mServersPublish?.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_black, R.color.theme_font, this)) mServersTest?.setOnClickListener { mViewpager?.currentItem = mServersTestIndex } mServersPublish?.setOnClickListener { mViewpager?.currentItem = mServersPublishIndex } @@ -144,6 +146,19 @@ class GameServersActivity : ToolBarActivity() { return true } + override fun getActivityNameInChinese(): String { + return "开服表" + } + + override fun isAutoResetViewBackgroundEnabled() = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + mServersTest?.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_black, R.color.theme_font, this)) + mServersPublish?.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_black, R.color.theme_font, this)) + } + companion object { @JvmStatic fun getIntent(context: Context, entrance: String, path: String): Intent { @@ -152,8 +167,4 @@ class GameServersActivity : ToolBarActivity() { return intent } } - - override fun getActivityNameInChinese(): String { - return "开服表" - } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentAdapter.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentAdapter.kt index c3e21af8a2..af7c356415 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentAdapter.kt @@ -22,6 +22,7 @@ import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.core.utils.StringUtils import com.gh.gamecenter.common.utils.toBinding import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.entity.GameEntity import com.lightgame.adapter.BaseRecyclerAdapter @@ -174,6 +175,8 @@ class GameServersContentAdapter( val serverRemaining = gameEntity.serverRemaining if (serverRemaining != null) { holder.binding.extendContainer.visibility = View.VISIBLE + holder.binding.extendContainer.setBackgroundColor(R.color.background_white.toColor(mContext)) + holder.binding.extendContent.setTextColor(R.color.theme_font.toColor(mContext)) holder.binding.extendContent.text = "展开剩余" + serverRemaining.size + "条开服信息" holder.binding.extendContent.setOnClickListener { mViewModel.mergerRemainingData(gameEntity, position) @@ -203,6 +206,8 @@ class GameServersContentAdapter( } is GameServerTimeViewHolder -> { + holder.binding.root.setBackgroundColor(R.color.background_white.toColor(mContext)) + holder.binding.kaifuItemTimeTv.setTextColor(R.color.text_title.toColor(mContext)) if (mIsShowPullDownTip && position == 1) { holder.binding.emptyView.visibility = View.VISIBLE } else { @@ -221,7 +226,7 @@ class GameServersContentAdapter( is FooterViewHolder -> { holder.run { - itemView.setBackgroundColor(R.color.background.toColor()) + itemView.setBackgroundColor(R.color.background.toColor(mContext)) if (position == 0) { when { mPrevIsNetworkError -> { @@ -269,6 +274,14 @@ class GameServersContentAdapter( } private fun initGameTestViewHolder(gameEntity: GameEntity, viewHolder: GameTestViewHolder) { + viewHolder.run { + binding.contentContainer.background = R.drawable.reuse_listview_item_style.toDrawable(mContext) + gameName.setTextColor(R.color.text_title.toColor(mContext)) + gameDes.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + gameDownloadSpeed.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + gameDownloadPercentage.setTextColor(R.color.theme_font.toColor(mContext)) + } + viewHolder.gameName.text = gameEntity.name BindingAdapters.setGame(viewHolder.gameThumb, gameEntity) @@ -311,7 +324,6 @@ class GameServersContentAdapter( } } - gameEntity.getApk() if (gameEntity.getApk().isEmpty()) { viewHolder.gameDes.text = gameEntity.brief } else { 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 97d969d87b..83faf83ff1 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt @@ -58,12 +58,12 @@ class GameServersContentFragment : BaseFragment() { if (locationList != null && mIsRefreshDownload) { for (location in locationList) { mViewModel?.listLiveData?.value?.second?.safelyGetInRelease(location)?.let { gameEntity -> - DownloadItemUtils.processDate(gameEntity, downloadEntity, mAdapter, location) + DownloadItemUtils.processDate(gameEntity, downloadEntity, mAdapter, location + 1) } } if (XapkUnzipStatus.FAILURE.name == downloadEntity.meta[XapkInstaller.XAPK_UNZIP_STATUS]) { for (position in locationList) { - val targetView = mLayoutManager?.findViewByPosition(position) + val targetView = mLayoutManager?.findViewByPosition(position + 1) if (targetView != null) { DialogUtils.showUnzipFailureDialog(requireContext(), downloadEntity) break @@ -364,6 +364,7 @@ class GameServersContentFragment : BaseFragment() { // mBinding?.kaifuTimeContainer?.kaifuItemTime?.visibility = View.VISIBLE mSkeleton?.hide() mBinding?.run { + root.setBackgroundColor(Color.TRANSPARENT) recyclerView.visibility = View.VISIBLE noConnectionContainer.reuseNoConnection.visibility = View.GONE reuseNoneData.visibility = View.GONE @@ -379,6 +380,7 @@ class GameServersContentFragment : BaseFragment() { mBinding?.run { root.setBackgroundColor(Color.TRANSPARENT) mSkeleton?.hide() + recyclerView.visibility = View.GONE kaifuTimeContainer.kaifuItemTime.visibility = View.GONE noConnectionContainer.reuseNoConnection.visibility = View.VISIBLE reuseNoneData.visibility = View.GONE @@ -392,6 +394,7 @@ class GameServersContentFragment : BaseFragment() { mBinding?.run { root.setBackgroundColor(Color.TRANSPARENT) mSkeleton?.hide() + recyclerView.visibility = View.GONE kaifuTimeContainer.kaifuItemTime.visibility = View.GONE noConnectionContainer.reuseNoConnection.visibility = View.GONE reuseNoneData.visibility = View.VISIBLE @@ -407,4 +410,14 @@ class GameServersContentFragment : BaseFragment() { mBinding?.kaifuTimeContainer?.kaifuItemTime?.layoutParams = mLlParams }, 10) } + + override fun onNightModeChange() { + super.onNightModeChange() + mBinding?.recyclerView?.run { + recycledViewPool.clear() + adapter?.run { + notifyItemRangeChanged(0, itemCount) + } + } + } } \ No newline at end of file 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 6464b839b1..5914b7a710 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt @@ -96,7 +96,7 @@ class GameServersPublishFragment : LazyFragment() { MtaHelper.onEvent("开服表", "开服Tab-游戏分类", "点击游戏分类") v.isChecked = true - v.setTextColor(R.color.theme_font.toColor()) + v.setTextColor(R.color.theme_font.toColor(requireContext())) val inflater = LayoutInflater.from(context) val layout = inflater.inflate(R.layout.popup_server_category, null) @@ -110,8 +110,8 @@ class GameServersPublishFragment : LazyFragment() { val complete = layout.findViewById(R.id.complete) val contentContainer = layout.findViewById(R.id.content_container) - reset.background = DrawableView.getStrokeDrawable(R.color.text_body) - complete.background = DrawableView.getOvalDrawable(R.color.theme) + reset.background = DrawableView.getStrokeDrawable(R.color.text_body, context = requireContext()) + complete.background = DrawableView.getOvalDrawable(R.color.theme, context = requireContext()) contentContainer.removeAllViews() for (entity in mCategoryList) { @@ -126,8 +126,8 @@ class GameServersPublishFragment : LazyFragment() { label.gravity = Gravity.CENTER label.textSize = 13F label.text = name - label.background = DrawableView.getOvalSelectorStyle(R.color.background, R.color.text_e6f3ff) - label.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_title, R.color.theme_font)) + label.background = DrawableView.getOvalSelectorStyle(R.color.background, R.color.text_e6f3ff, requireContext()) + label.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_title, R.color.theme_font, requireContext())) label.isSingleLine = true labelsContainer.addView(label) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { @@ -192,7 +192,7 @@ class GameServersPublishFragment : LazyFragment() { popupWindow.setOnDismissListener { v.isChecked = false - if (mTags.isNullOrEmpty()) v.setTextColor(R.color.text_title.toColor()) + if (mTags.isNullOrEmpty()) v.setTextColor(R.color.text_title.toColor(requireContext())) } popupWindow.showAsDropDown(mBinding?.divider) } @@ -202,7 +202,7 @@ class GameServersPublishFragment : LazyFragment() { MtaHelper.onEvent("开服表", "开服Tab", "开服时间") v.isChecked = true - v.setTextColor(R.color.theme_font.toColor()) + v.setTextColor(R.color.theme_font.toColor(requireContext())) val inflater = LayoutInflater.from(v.context) val layout = inflater.inflate(R.layout.popup_server_time, null) @@ -240,7 +240,7 @@ class GameServersPublishFragment : LazyFragment() { // position = 0: all val hour = TextView(v.context) hour.textSize = 14F - hour.setTextColor(R.color.text_title.toColor()) + hour.setTextColor(R.color.text_title.toColor(requireContext())) hour.gravity = Gravity.CENTER_VERTICAL hour.setPadding(24F.dip2px(), 0, 0, 0) hourContainer.addView(hour, ViewGroup.LayoutParams.MATCH_PARENT, 43F.dip2px()) @@ -273,9 +273,9 @@ class GameServersPublishFragment : LazyFragment() { } } - today.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_title, R.color.theme_font)) - tomorrow.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_title, R.color.theme_font)) - after.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_title, R.color.theme_font)) + today.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_title, R.color.theme_font, requireContext())) + tomorrow.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_title, R.color.theme_font, requireContext())) + after.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_title, R.color.theme_font, requireContext())) layout.setOnClickListener { popupWindow.dismiss() @@ -306,7 +306,7 @@ class GameServersPublishFragment : LazyFragment() { popupWindow.setOnDismissListener { v.isChecked = false - if (mDay.isNullOrEmpty()) v.setTextColor(R.color.text_title.toColor()) + if (mDay.isNullOrEmpty()) v.setTextColor(R.color.text_title.toColor(requireContext())) } popupWindow.showAsDropDown(mBinding?.divider) } @@ -317,8 +317,8 @@ class GameServersPublishFragment : LazyFragment() { mTags = null mBinding?.run { serverTime.text = "开服时间" - serverTime.setTextColor(R.color.text_title.toColor()) - serverStatus.setTextColor(R.color.text_title.toColor()) + serverTime.setTextColor(R.color.text_title.toColor(requireContext())) + serverStatus.setTextColor(R.color.text_title.toColor(requireContext())) } mContentFragment.filterData(mDay, mHour, mType, mTags) } diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestAdapter.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestAdapter.kt index 3d0fd1e128..62e9fc8742 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestAdapter.kt @@ -18,6 +18,7 @@ import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.GameViewHolder +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.databinding.ItemTestServerTextBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.game.GameItemViewHolder @@ -98,7 +99,8 @@ class GameServersTestAdapter(context: Context, initViewHolder(gameEntity, holder) } is GameServerTimeViewHolder -> { -// holder.container.setPadding(0, 8F.dip2px(), 0, 4F.dip2px()) + holder.binding.root.setBackgroundColor(R.color.background_white.toColor(mContext)) + holder.binding.kaifuItemTimeTv.setTextColor(R.color.text_title.toColor(mContext)) holder.binding.kaifuItemHeader.setImageResource(R.drawable.kaifu_time_icon) holder.binding.kaifuItemTimeTv.text = mDataList[position].time } @@ -106,6 +108,7 @@ class GameServersTestAdapter(context: Context, initFooterViewHolder(holder) } is TextViewHolder -> { + holder.binding.root.setBackgroundColor(R.color.background_white.toColor(mContext)) holder.binding.contentTv.text = mDataList[position].text } } 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 92dbb41484..ddb99965ed 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt @@ -189,7 +189,7 @@ class GameServersTestFragment : LazyFragment() { mViewModel?.updateTimeFilter(filterDay) mBinding?.filterView?.updateSelectedMainFilter(filterDay) mBinding?.serverTime?.text = filterDay - mBinding?.serverTime?.setTextColor(R.color.theme_font.toColor()) + mBinding?.serverTime?.setTextColor(R.color.theme_font.toColor(requireContext())) } // 悬挂的文案 @@ -219,7 +219,7 @@ class GameServersTestFragment : LazyFragment() { mViewModel?.updateTimeFilter(mSupremeSelectedDay!!) mBinding?.filterView?.updateSelectedMainFilter(mSupremeSelectedDay!!) mBinding?.serverTime?.text = mSupremeSelectedDay - mBinding?.serverTime?.setTextColor(R.color.theme_font.toColor()) + mBinding?.serverTime?.setTextColor(R.color.theme_font.toColor(requireContext())) mSupremeSelectedDay = null } if (newState == RecyclerView.SCROLL_STATE_DRAGGING) { @@ -309,7 +309,7 @@ class GameServersTestFragment : LazyFragment() { MtaHelper.onEvent("开服表", "开测Tab", "测试状态") v.isChecked = true - v.setTextColor(R.color.theme_font.toColor()) + v.setTextColor(R.color.theme_font.toColor(requireContext())) val binding = PopupServerStatusBinding.inflate(LayoutInflater.from(context)) val layout = binding.root @@ -324,7 +324,7 @@ class GameServersTestFragment : LazyFragment() { for ((index, tv) in tvList.withIndex()) { tv.text = typeList[index] if (tv.text.toString() == mType) { - tv.setTextColor(R.color.theme_font.toColor()) + tv.setTextColor(R.color.theme_font.toColor(requireContext())) } tv.setOnClickListener { callback.invoke(tv.text.toString()) @@ -342,7 +342,7 @@ class GameServersTestFragment : LazyFragment() { popupWindow.setOnDismissListener { v.isChecked = false - if (mType == "全部") v.setTextColor(R.color.text_title.toColor()) + if (mType == "全部") v.setTextColor(R.color.text_title.toColor(requireContext())) } popupWindow.showAsDropDown(v) } @@ -351,7 +351,7 @@ class GameServersTestFragment : LazyFragment() { MtaHelper.onEvent("开服表", "开测Tab", "开测时间") v.isChecked = true - v.setTextColor(R.color.theme_font.toColor()) + v.setTextColor(R.color.theme_font.toColor(requireContext())) val binding = PopupTestTimeBinding.inflate(LayoutInflater.from(v.context)) val layout = binding.root @@ -363,7 +363,7 @@ class GameServersTestFragment : LazyFragment() { for ((index, tv) in tvList.withIndex()) { tv.text = dayList[index] - tv.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_title, R.color.theme_font)) + tv.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_title, R.color.theme_font, requireContext())) tv.isChecked = tv.text == v.text tv.setOnClickListener { callback.invoke(tv.text.toString()) @@ -382,7 +382,7 @@ class GameServersTestFragment : LazyFragment() { popupWindow.setOnDismissListener { v.isChecked = false - if (mDay.isNullOrEmpty()) v.setTextColor(R.color.text_title.toColor()) + if (mDay.isNullOrEmpty()) v.setTextColor(R.color.text_title.toColor(requireContext())) } popupWindow.showAsDropDown(v) } @@ -392,8 +392,8 @@ class GameServersTestFragment : LazyFragment() { // mBinding?.serverTime?.text = "开测时间" mBinding?.serverStatus?.text = "测试状态" mBinding?.filterView?.updateSelectedSubFilter(mViewModel!!.typeList.first()) - mBinding?.serverTime?.setTextColor(R.color.text_title.toColor()) - mBinding?.serverStatus?.setTextColor(R.color.text_title.toColor()) + mBinding?.serverTime?.setTextColor(R.color.text_title.toColor(requireContext())) + mBinding?.serverStatus?.setTextColor(R.color.text_title.toColor(requireContext())) mSubBinding?.run { reuseNoneData.visibility = View.GONE noConnectionContainer.root.visibility = View.GONE @@ -482,6 +482,29 @@ class GameServersTestFragment : LazyFragment() { LogUtils.logServerTestSelectTypeEvent(type, mViewModel!!.testTitle, mViewModel!!.testRemark) } + override fun onNightModeChange() { + super.onNightModeChange() + mBinding?.run { + root.setBackgroundColor(R.color.background.toColor(requireContext())) + filterView.run { + setRootBackgroundColor(R.color.background_white.toColor(requireContext())) + updateFilterRecyclerView() + updatePopupWindow() + } + } + + mSubBinding?.run { + kaifuTimeContainer.run { + root.setBackgroundColor(R.color.background_white.toColor(requireContext())) + kaifuItemTimeTv.setTextColor(R.color.text_title.toColor(requireContext())) + } + recyclerView.adapter?.run { + recyclerView.recycledViewPool.clear() + notifyItemRangeChanged(0, itemCount) + } + } + } + companion object { const val TEST_COLUMN_ID = "test_column_id" const val TEST_TITLE = "title" diff --git a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt index b8af18f3f1..bc591306bd 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt @@ -3,7 +3,6 @@ package com.gh.gamecenter.servers.add import android.app.Activity import android.content.Context import android.content.Intent -import android.graphics.Color import android.os.Bundle import android.text.SpannableString import android.text.Spanned @@ -12,9 +11,10 @@ import android.text.style.ClickableSpan import android.view.Gravity import android.view.View import android.view.ViewGroup +import android.widget.EditText import android.widget.FrameLayout +import android.widget.LinearLayout import android.widget.TextView -import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProviders import com.bigkoo.pickerview.builder.TimePickerBuilder import com.bigkoo.pickerview.listener.OnTimeSelectListener @@ -24,6 +24,9 @@ import com.gh.common.databind.AddKaiFuBindingAdapter import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.common.util.HaloWheelViewAdapter import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.safelyGetInRelease +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.updateStatusBarColor import com.gh.gamecenter.databinding.ActivityKaifuAddBinding import com.gh.gamecenter.entity.ServerCalendarEntity import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity @@ -49,6 +52,7 @@ class AddKaiFuActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) setNavigationTitle("新增开服") mSelectTime = intent.getLongExtra(EntranceConsts.KEY_KAIFU_SELECT_TIME, 0) @@ -148,10 +152,10 @@ class AddKaiFuActivity : ToolBarActivity() { .setTitleSize(15) .setOutSideCancelable(false) .isCyclic(false) - .setSubmitColor(ContextCompat.getColor(this, R.color.theme_font)) - .setCancelColor(ContextCompat.getColor(this, R.color.hint)) - .setTitleBgColor(Color.WHITE) - .setBgColor(Color.WHITE) + .setSubmitColor(R.color.theme_font.toColor(this)) + .setCancelColor(R.color.hint.toColor(this)) + .setTitleBgColor(R.color.background_white.toColor(this)) + .setBgColor(R.color.background_white.toColor(this)) .setDate(selectedDate) .setRangDate(startDate, endDate) .setLabel("年", "月", "日", "时", "分", "") @@ -194,6 +198,32 @@ class AddKaiFuActivity : ToolBarActivity() { } } + override fun isAutoResetViewBackgroundEnabled() = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + mBinding?.run { + root.setBackgroundColor(R.color.background.toColor(this@AddKaiFuActivity)) + container.setBackgroundColor(R.color.background_white.toColor(this@AddKaiFuActivity)) + kaifuAddContainer.run { + for (i in 1 until childCount) { + (getChildAt(i) as? LinearLayout)?.run { + for (j in 0 until childCount) { + (getChildAt(j) as? EditText)?.run { + AddKaiFuBindingAdapter.kaiFuTextColor( + this, + mViewModel?.calendarList?.safelyGetInRelease(i - 1)?.getDataMark() ?: 0, + i - 1 + ) + } + } + } + } + } + } + } + companion object { fun getIntent(context: Context, entity: ServerCalendarEntity, kaifuList: ArrayList, diff --git a/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuActivity.kt index 96646027e2..ff4dc6ef43 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuActivity.kt @@ -10,6 +10,8 @@ import com.gh.base.ToolBarActivity import com.gh.gamecenter.common.utils.DialogHelper import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.updateStatusBarColor import com.gh.gamecenter.databinding.ActivityKaifuPatchBinding import com.gh.gamecenter.entity.ServerCalendarEntity import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity @@ -27,6 +29,7 @@ class PatchKaifuActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) setNavigationTitle("修改开服") mViewModel = ViewModelProviders.of(this).get(PatchKaifuViewModel::class.java) @@ -99,6 +102,19 @@ class PatchKaifuActivity : ToolBarActivity() { } } + override fun isAutoResetViewBackgroundEnabled() = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + mBinding?.run { + root.setBackgroundColor(R.color.background.toColor(this@PatchKaifuActivity)) + kaifuAddItemTitle.root.setBackgroundColor(R.color.title.toColor(this@PatchKaifuActivity)) + patchName.setHintTextColor(R.color.title.toColor(this@PatchKaifuActivity)) + patchName.setTextColor(R.color.title.toColor(this@PatchKaifuActivity)) + } + } + companion object { fun getIntent(context: Context, serverEntity: ServerCalendarEntity, gameId: String): Intent { diff --git a/app/src/main/res/drawable/bg_add_kaifu.xml b/app/src/main/res/drawable/bg_add_kaifu.xml index 2c64b4a953..0170a909c1 100644 --- a/app/src/main/res/drawable/bg_add_kaifu.xml +++ b/app/src/main/res/drawable/bg_add_kaifu.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/bg_add_kaifu_bottom_left.xml b/app/src/main/res/drawable/bg_add_kaifu_bottom_left.xml index e7cd0a1b5e..d923589374 100644 --- a/app/src/main/res/drawable/bg_add_kaifu_bottom_left.xml +++ b/app/src/main/res/drawable/bg_add_kaifu_bottom_left.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/bg_add_kaifu_bottom_right.xml b/app/src/main/res/drawable/bg_add_kaifu_bottom_right.xml index d9bf33a3e4..97c6c3384c 100644 --- a/app/src/main/res/drawable/bg_add_kaifu_bottom_right.xml +++ b/app/src/main/res/drawable/bg_add_kaifu_bottom_right.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/bg_add_kaifu_top.xml b/app/src/main/res/drawable/bg_add_kaifu_top.xml index b76dc239f6..2526c3295d 100644 --- a/app/src/main/res/drawable/bg_add_kaifu_top.xml +++ b/app/src/main/res/drawable/bg_add_kaifu_top.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable/bg_add_kaifu_top_left.xml b/app/src/main/res/drawable/bg_add_kaifu_top_left.xml index 9c04800d0e..297b3ad4ad 100644 --- a/app/src/main/res/drawable/bg_add_kaifu_top_left.xml +++ b/app/src/main/res/drawable/bg_add_kaifu_top_left.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable/bg_add_kaifu_top_right.xml b/app/src/main/res/drawable/bg_add_kaifu_top_right.xml index e98756cb66..abf07a251b 100644 --- a/app/src/main/res/drawable/bg_add_kaifu_top_right.xml +++ b/app/src/main/res/drawable/bg_add_kaifu_top_right.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/layout/activity_game_servers.xml b/app/src/main/res/layout/activity_game_servers.xml index 52329ee667..6b60ce0dab 100644 --- a/app/src/main/res/layout/activity_game_servers.xml +++ b/app/src/main/res/layout/activity_game_servers.xml @@ -44,7 +44,7 @@ android:gravity="center" android:singleLine="true" android:text="开服" - android:textColor="@color/black" + android:textColor="@color/text_black" android:textSize="15sp" android:textStyle="bold" /> @@ -58,7 +58,7 @@ android:gravity="center" android:singleLine="true" android:text="开测" - android:textColor="@color/black" + android:textColor="@color/text_black" android:textSize="15sp" android:textStyle="bold" /> @@ -77,7 +77,7 @@ style="@style/toolbar_title" android:layout_width="100dp" android:layout_height="match_parent" - android:background="@color/white" + android:background="@color/background_white" android:text="开服表" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" /> @@ -86,6 +86,7 @@ + android:layout_height="match_parent" + android:background="@color/background" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_kaifu_add.xml b/app/src/main/res/layout/activity_kaifu_add.xml index 1db9ff7598..096eb21585 100644 --- a/app/src/main/res/layout/activity_kaifu_add.xml +++ b/app/src/main/res/layout/activity_kaifu_add.xml @@ -2,16 +2,18 @@ + android:orientation="vertical" + android:background="@color/background"> + android:background="@color/background_white"> + android:background="@color/background_white"> @@ -36,7 +37,7 @@ android:layout_height="50dp" android:layout_marginRight="1dp" android:layout_weight="15" - android:background="@color/white" + android:background="@color/background_white" android:gravity="center" android:maxLines="2" android:textColor="@color/title" @@ -49,7 +50,7 @@ android:layout_height="match_parent" android:layout_marginRight="1dp" android:layout_weight="29" - android:background="@color/white" + android:background="@color/background_white" android:gravity="center" android:maxLines="2" android:textColor="@color/title" @@ -61,7 +62,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="15" - android:background="@color/white" + android:background="@color/background_white" android:gravity="center" android:maxLines="2" android:textColor="@color/title" @@ -86,7 +87,7 @@ android:layout_height="50dp" android:layout_marginRight="1dp" android:layout_weight="15" - android:background="@color/white" + android:background="@color/background_white" android:gravity="center" android:orientation="horizontal"> @@ -108,7 +109,7 @@ android:layout_height="match_parent" android:layout_marginRight="1dp" android:layout_weight="29" - android:background="@color/white" + android:background="@color/background_white" android:gravity="center" android:hint="点击填写" android:singleLine="true" @@ -121,7 +122,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="15" - android:background="@color/white" + android:background="@color/background_white" android:enabled="false" android:gravity="center" android:maxLength="4" @@ -148,7 +149,7 @@ android:layout_height="50dp" android:layout_marginRight="1dp" android:layout_weight="15" - android:background="@color/white" + android:background="@color/background_white" android:gravity="center" android:orientation="horizontal"> @@ -170,7 +171,7 @@ android:layout_height="match_parent" android:layout_marginRight="1dp" android:layout_weight="29" - android:background="@color/white" + android:background="@color/background_white" android:gravity="center" android:maxLines="2" android:textColor="@color/hint" @@ -182,7 +183,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="15" - android:background="@color/white" + android:background="@color/background_white" android:gravity="center" android:maxLines="2" android:textColor="@color/hint" @@ -196,7 +197,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="1dp" - android:background="@color/white"> + android:background="@color/background_white"> + android:layout_height="match_parent" + android:background="@color/background"> - @@ -77,6 +78,7 @@ android:id="@+id/layout_fragment_content" android:layout_width="match_parent" android:layout_height="0dp" + android:background="@color/background" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/game_test_item.xml b/app/src/main/res/layout/game_test_item.xml index 1a044a6d6b..4a29ec6dc2 100644 --- a/app/src/main/res/layout/game_test_item.xml +++ b/app/src/main/res/layout/game_test_item.xml @@ -178,7 +178,7 @@ android:id="@+id/extend_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@color/background_white" android:visibility="gone"> - + + android:layout_width="0dp" + android:layout_height="30dp" + android:layout_marginRight="1dp" + android:layout_weight="15" + android:background="@color/background_white" + android:gravity="center" + android:maxLines="2" + android:text="时间" + android:textColor="@color/title" + android:textSize="12sp" /> + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_marginRight="1dp" + android:layout_weight="29" + android:background="@color/background_white" + android:gravity="center" + android:maxLines="2" + android:text="名字" + android:textColor="@color/title" + android:textSize="12sp" /> + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="15" + android:background="@color/background_white" + android:gravity="center" + android:maxLines="2" + android:text="备注" + android:textColor="@color/title" + android:textSize="12sp" /> diff --git a/app/src/main/res/layout/popup_server_category.xml b/app/src/main/res/layout/popup_server_category.xml index f0209c7aa2..f359d320c9 100644 --- a/app/src/main/res/layout/popup_server_category.xml +++ b/app/src/main/res/layout/popup_server_category.xml @@ -15,7 +15,7 @@ android:id="@+id/action_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@color/background_white" android:orientation="horizontal" android:paddingLeft="20dp" android:paddingTop="16dp" diff --git a/app/src/main/res/layout/popup_server_category_item.xml b/app/src/main/res/layout/popup_server_category_item.xml index 9e5fade8d1..5f588046ae 100644 --- a/app/src/main/res/layout/popup_server_category_item.xml +++ b/app/src/main/res/layout/popup_server_category_item.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@color/background_white" android:paddingLeft="20dp" android:paddingTop="16dp" android:paddingRight="20dp" diff --git a/app/src/main/res/layout/popup_server_status.xml b/app/src/main/res/layout/popup_server_status.xml index 69b06e56d9..03b6a918b8 100644 --- a/app/src/main/res/layout/popup_server_status.xml +++ b/app/src/main/res/layout/popup_server_status.xml @@ -9,7 +9,7 @@ android:id="@+id/content_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@color/background_white" android:orientation="vertical"> Date: Sat, 14 May 2022 22:17:27 +0800 Subject: [PATCH 31/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E3=80=81=E6=96=B0=E5=88=86=E7=B1=BB=E3=80=81?= =?UTF-8?q?=E6=96=B0=E5=88=86=E7=B1=BB2.0=E9=83=A8=E5=88=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8Item=E5=9C=A8=E6=97=A5=E5=A4=9C=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=97=B6=E6=9C=AA=E5=88=B7=E6=96=B0=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E9=97=AE=E9=A2=98)=20https://git.shanqu.cc/halo/andro?= =?UTF-8?q?id/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/catalog/SpecialCatalogAdapter.kt | 7 +++---- .../gh/gamecenter/catalog/SpecialCatalogFragment.kt | 10 ++++++++++ .../gamecenter/catalog/SpecialCatalogSubjectAdapter.kt | 2 ++ .../com/gh/gamecenter/catalog/SubCatalogAdapter.kt | 7 +++---- .../com/gh/gamecenter/catalog/SubCatalogFragment.kt | 8 ++++++++ .../gh/gamecenter/category/CategoryDirectoryAdapter.kt | 2 ++ .../gamecenter/category/CategoryDirectoryFragment.kt | 4 ++++ .../com/gh/gamecenter/category2/CategoryV2Fragment.kt | 2 ++ .../com/gh/gamecenter/category2/SubCategoryAdapter.kt | 4 ++-- ...g_shape_f2_radius_999.xml => bg_category_reset.xml} | 2 +- app/src/main/res/drawable/bg_category_unselect.xml | 6 ++++++ app/src/main/res/layout/fragment_category.xml | 2 +- app/src/main/res/layout/item_category.xml | 1 + app/src/main/res/layout/sub_category_item.xml | 2 +- module_common/src/main/res/values-night/colors.xml | 4 ++++ module_common/src/main/res/values/colors.xml | 4 ++++ 16 files changed, 54 insertions(+), 13 deletions(-) rename app/src/main/res/drawable/{bg_shape_f2_radius_999.xml => bg_category_reset.xml} (74%) create mode 100644 app/src/main/res/drawable/bg_category_unselect.xml diff --git a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogAdapter.kt b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogAdapter.kt index 0d771b91ca..c317aee1cb 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogAdapter.kt @@ -20,10 +20,7 @@ import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter -import com.gh.gamecenter.common.utils.dip2px -import com.gh.gamecenter.common.utils.doOnPageSelected -import com.gh.gamecenter.common.utils.toBinding -import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.PageSwitchDataHelper import com.gh.gamecenter.databinding.* import com.gh.gamecenter.entity.GameEntity @@ -169,6 +166,8 @@ class SpecialCatalogAdapter( val specialLink = entity.link holder.binding.run { headTitle.text = specialLink.text + headTitle.setTextColor(R.color.text_title.toColor(mContext)) + headMore.setTextColor(R.color.theme_font.toColor(mContext)) headMore.setOnClickListener { if (entity.type == "专题合集") { DirectUtils.directToColumnCollection( diff --git a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt index 7d9769a957..20093e678d 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt @@ -9,6 +9,7 @@ import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.databinding.FragmentListBaseSkeletonBinding class SpecialCatalogFragment : ListFragment() { @@ -92,4 +93,13 @@ class SpecialCatalogFragment : ListFragment { val category = mEntityList[position] holder.binding.run { + divider.setBackgroundColor(R.color.background.toColor(mContext)) containerPrimaryCategory.setOnClickListener { IntentUtils.startCategoryListActivity(root.context, categoryTitle, category) } diff --git a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt index ec9051ecd1..74e69f6c46 100644 --- a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt @@ -90,5 +90,9 @@ class CategoryDirectoryFragment : LazyListFragment { categoryEntity.selected = false selectedIv.visibility = View.GONE - container.setBackgroundResource(R.drawable.bg_shape_f8_radius_8) + container.setBackgroundResource(R.drawable.bg_category_unselect) name.setTextColor(R.color.text_title.toColor(mContext)) mViewModel.run { if (selectedCount > 0) { diff --git a/app/src/main/res/drawable/bg_shape_f2_radius_999.xml b/app/src/main/res/drawable/bg_category_reset.xml similarity index 74% rename from app/src/main/res/drawable/bg_shape_f2_radius_999.xml rename to app/src/main/res/drawable/bg_category_reset.xml index c910da78a2..9a4dfb90d9 100644 --- a/app/src/main/res/drawable/bg_shape_f2_radius_999.xml +++ b/app/src/main/res/drawable/bg_category_reset.xml @@ -1,6 +1,6 @@ + - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_category_unselect.xml b/app/src/main/res/drawable/bg_category_unselect.xml new file mode 100644 index 0000000000..bbf0367142 --- /dev/null +++ b/app/src/main/res/drawable/bg_category_unselect.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_category.xml b/app/src/main/res/layout/fragment_category.xml index fda43337dc..93b224e77e 100644 --- a/app/src/main/res/layout/fragment_category.xml +++ b/app/src/main/res/layout/fragment_category.xml @@ -88,7 +88,7 @@ android:layout_height="36dp" android:layout_weight="1" android:gravity="center" - android:background="@drawable/bg_shape_f2_radius_999" + android:background="@drawable/bg_category_reset" android:textColor="@color/text_title" android:textSize="14sp" android:text="重置" /> diff --git a/app/src/main/res/layout/item_category.xml b/app/src/main/res/layout/item_category.xml index c12219c9b8..952f9b4fb2 100644 --- a/app/src/main/res/layout/item_category.xml +++ b/app/src/main/res/layout/item_category.xml @@ -7,6 +7,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/sub_category_item.xml b/app/src/main/res/layout/sub_category_item.xml index 26986d676d..fd94f05837 100644 --- a/app/src/main/res/layout/sub_category_item.xml +++ b/app/src/main/res/layout/sub_category_item.xml @@ -4,7 +4,7 @@ android:id="@+id/container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/bg_shape_f8_radius_8"> + android:background="@drawable/bg_category_unselect"> #FA8850 #39B5FA + + @color/background + + @color/background @android:color/black diff --git a/module_common/src/main/res/values/colors.xml b/module_common/src/main/res/values/colors.xml index 7b35f09dc1..5b42e6f10f 100644 --- a/module_common/src/main/res/values/colors.xml +++ b/module_common/src/main/res/values/colors.xml @@ -128,6 +128,10 @@ #FA8850 #39B5FA + + #F8F8F8 + + #F2F2F2 @android:color/black From 44bed82f08f6b5850fa1b34d0137ac53ca20d6c9 Mon Sep 17 00:00:00 2001 From: juntao Date: Mon, 16 May 2022 10:23:54 +0800 Subject: [PATCH 32/52] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8Bv5.10.0=E3=80=91=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=B1=87=E6=80=BB5=E6=9C=88=E7=AC=AC3=E5=91=A8(4)=20https://gi?= =?UTF-8?q?t.shanqu.cc/pm/halo-app-issues/-/issues/1858?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/game/vertical/GameItemUi.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt b/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt index 688a1b1768..536872abb7 100644 --- a/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt +++ b/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt @@ -16,8 +16,8 @@ import androidx.constraintlayout.widget.Group import androidx.core.content.ContextCompat import com.facebook.drawee.view.SimpleDraweeView import com.gh.common.view.GameIconView -import com.gh.gamecenter.common.view.GameTagContainerView import com.gh.gamecenter.R +import com.gh.gamecenter.common.view.GameTagContainerView import splitties.dimensions.dip import splitties.views.* import splitties.views.dsl.constraintlayout.* @@ -240,12 +240,15 @@ class GameItemUi(override val ctx: Context) : Ui { bottomOfParent() startOfParent() }) - add(recommendTv, lParams(wrapContent, wrapContent) { + add(recommendTv, lParams(0, wrapContent) { bottomOfParent() endOfParent() topOfParent() startToEndOf(recommendIv) + horizontalBias = 0F + matchConstraintDefaultWidth = 1 + startMargin = dip(2) goneStartMargin = dip(4) }) @@ -257,6 +260,8 @@ class GameItemUi(override val ctx: Context) : Ui { includeFontPadding = false typeface = Typeface.DEFAULT_BOLD gravity = Gravity.START.and(Gravity.CENTER) + ellipsize = TextUtils.TruncateAt.END + setTextColor(ContextCompat.getColor(context, R.color.text_FF7C1F)) } From 6330e004ba7d4e829c98dcb8c2f97a3d3625507d Mon Sep 17 00:00:00 2001 From: lyr Date: Mon, 16 May 2022 11:33:34 +0800 Subject: [PATCH 33/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E5=85=89=E8=83=BD?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=A1=B5=E9=9D=A2)=20https://git.shanqu.cc/h?= =?UTF-8?q?alo/android/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/category2/SubCategoryAdapter.kt | 9 +++++---- .../java/com/gh/gamecenter/energy/CommodityFragment.kt | 2 ++ .../com/gh/gamecenter/energy/EnergyCenterFragment.kt | 8 ++++++++ .../java/com/gh/gamecenter/energy/EnergyHouseFragment.kt | 5 +++++ .../main/java/com/gh/gamecenter/energy/TaskAdapter.kt | 4 ++++ app/src/main/res/layout/daily_task_item.xml | 3 ++- app/src/main/res/layout/fragment_energy_center.xml | 5 +++-- app/src/main/res/layout/fragment_energy_house.xml | 2 +- app/src/main/res/layout/novice_task_item.xml | 4 ++-- 9 files changed, 32 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt index f45b8abff6..36c6f7d557 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt @@ -8,6 +8,7 @@ import com.gh.gamecenter.core.utils.ToastUtils import com.gh.gamecenter.common.utils.goneIf import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.toDrawable import com.gh.gamecenter.databinding.SubCategoryItemBinding import com.gh.gamecenter.entity.CategoryEntity import com.lightgame.adapter.BaseRecyclerAdapter @@ -32,11 +33,11 @@ class SubCategoryAdapter( if (categoryEntity.selected) { selectedIv.visibility = View.VISIBLE - container.setBackgroundResource(R.drawable.bg_category_selected) + container.background = R.drawable.bg_category_selected.toDrawable(mContext) name.setTextColor(R.color.theme_font.toColor(mContext)) } else { selectedIv.visibility = View.GONE - container.setBackgroundResource(R.drawable.bg_category_unselect) + container.background = R.drawable.bg_category_unselect.toDrawable(mContext) name.setTextColor(R.color.text_title.toColor(mContext)) } @@ -47,7 +48,7 @@ class SubCategoryAdapter( categoryEntity.selected -> { categoryEntity.selected = false selectedIv.visibility = View.GONE - container.setBackgroundResource(R.drawable.bg_category_unselect) + container.background = R.drawable.bg_category_unselect.toDrawable(mContext) name.setTextColor(R.color.text_title.toColor(mContext)) mViewModel.run { if (selectedCount > 0) { @@ -63,7 +64,7 @@ class SubCategoryAdapter( categoryEntity.selected = true categoryEntity.primaryIndex = mPrimaryIndex selectedIv.visibility = View.VISIBLE - container.setBackgroundResource(R.drawable.bg_category_selected) + container.background = R.drawable.bg_category_selected.toDrawable(mContext) name.setTextColor(R.color.theme_font.toColor(mContext)) mViewModel.run { if (selectedCount < 5) { diff --git a/app/src/main/java/com/gh/gamecenter/energy/CommodityFragment.kt b/app/src/main/java/com/gh/gamecenter/energy/CommodityFragment.kt index 0c48ed228d..e6a30c6cfc 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/CommodityFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/CommodityFragment.kt @@ -361,4 +361,6 @@ class CommodityFragment : ListFragment() { fun setNestedScrollingEnabled(enable: Boolean) { mListRv?.isNestedScrollingEnabled = enable } + + override fun onNightModeChange() {} } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt index cab94da5ca..81f2231a13 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt @@ -378,6 +378,14 @@ class EnergyCenterFragment : BaseLazyFragment() { } } + override fun onNightModeChange() { + super.onNightModeChange() + mBinding?.run { + root.setBackgroundColor(R.color.background_white.toColor(requireContext())) + contentContainer.setBackgroundColor(R.color.background_white.toColor(requireContext())) + } + } + companion object { const val LOCATION = "光能中心" var TAB_TEXT_COLOR: Int = R.color.text_00DBA4.toColor() diff --git a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt index aae27390bb..1cc4ff2f2b 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt @@ -445,6 +445,11 @@ class EnergyHouseFragment: BaseLazyFragment() { } } + override fun onNightModeChange() { + super.onNightModeChange() + mBinding?.root?.setBackgroundColor(R.color.background_white.toColor(requireContext())) + } + companion object { const val LOCATION = "光能屋" var TAB_TEXT_COLOR: Int = R.color.text_00DBA4.toColor() diff --git a/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt b/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt index 3692ae7f94..2c8f6df185 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt @@ -138,6 +138,10 @@ class TaskAdapter(context: Context) : ListAdapter(context) { is DailyTaskViewHolder -> { val task = mEntityList[position].dailyTask ?: return holder.binding.run { + container.background = R.drawable.background_shape_white_radius_5.toDrawable(mContext) + taskName.setTextColor(R.color.text_title.toColor(mContext)) + progress.setTextColor(R.color.text_subtitle.toColor(mContext)) + taskBtn.setTextColor(R.color.text_white.toColor(mContext)) ImageUtils.display(taskIcon, task.icon) taskName.text = task.name progress.goneIf(task.isFixed) diff --git a/app/src/main/res/layout/daily_task_item.xml b/app/src/main/res/layout/daily_task_item.xml index 01feafcf4d..78e4299c4d 100644 --- a/app/src/main/res/layout/daily_task_item.xml +++ b/app/src/main/res/layout/daily_task_item.xml @@ -9,6 +9,7 @@ android:background="#E9F3FF"> + android:background="@color/background_white"> diff --git a/app/src/main/res/layout/novice_task_item.xml b/app/src/main/res/layout/novice_task_item.xml index e31cb78919..df8a72bdbe 100644 --- a/app/src/main/res/layout/novice_task_item.xml +++ b/app/src/main/res/layout/novice_task_item.xml @@ -26,7 +26,7 @@ android:includeFontPadding="false" android:maxEms="5" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="#333333" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="@+id/taskIcon" app:layout_constraintRight_toLeftOf="@+id/taskNotice" @@ -53,7 +53,7 @@ android:layout_marginTop="8dp" android:background="@drawable/bg_energy_task_btn_normal" android:gravity="center" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" From 5ef4f1d14cb02942c594582827c0936e51a770d6 Mon Sep 17 00:00:00 2001 From: lyr Date: Mon, 16 May 2022 14:35:51 +0800 Subject: [PATCH 34/52] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8Bv5.10.0=E3=80=91=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=B1=87=E6=80=BB5=E6=9C=88=E7=AC=AC3=E5=91=A8(2)=20https://gi?= =?UTF-8?q?t.shanqu.cc/pm/halo-app-issues/-/issues/1858?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/fragment_user_publish.xml | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/app/src/main/res/layout/fragment_user_publish.xml b/app/src/main/res/layout/fragment_user_publish.xml index 7d3e7a5314..a5514be11b 100644 --- a/app/src/main/res/layout/fragment_user_publish.xml +++ b/app/src/main/res/layout/fragment_user_publish.xml @@ -3,6 +3,30 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + + + + + + + + + + - - - - - - - - - - - \ No newline at end of file From a1be8352f0123647d42b4efa080aea06576234dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Mon, 16 May 2022 15:09:03 +0800 Subject: [PATCH 35/52] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.10.0=E3=80=91=E6=B8=B8=E6=88=8F=E5=BA=93=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96=20https://git.shanqu.cc/pm/halo-app?= =?UTF-8?q?-issues/-/issues/1834?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fragment/MainWrapperFragment.java | 107 +++++++++++++++--- .../fragment/MainWrapperRepository.kt | 48 ++++++++ .../fragment/MainWrapperViewModel.kt | 42 +++---- .../fragment/SearchToolWrapperFragment.java | 2 + .../square/GameCollectionSquareFragment.kt | 4 +- .../retrofit/service/ApiService.java | 6 + .../main/java/com/halo/assistant/HaloApp.java | 10 +- 7 files changed, 170 insertions(+), 49 deletions(-) create mode 100644 app/src/main/java/com/gh/gamecenter/fragment/MainWrapperRepository.kt diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java index 9c969f252f..30f914263a 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java @@ -29,13 +29,14 @@ import com.facebook.imagepipeline.image.ImageInfo; import com.gh.common.constant.Config; import com.gh.common.dialog.PrivacyPolicyDialogFragment; import com.gh.common.dialog.ReserveDialog; +import com.gh.common.exposure.ExposureSource; import com.gh.common.tracker.TrackerLogger; -import com.gh.common.util.DataUtils; import com.gh.common.util.FloatingBackViewManager; import com.gh.common.util.HomeBottomBarHelper; import com.gh.common.util.IntegralLogHelper; import com.gh.common.util.LogUtils; import com.gh.gamecenter.R; +import com.gh.gamecenter.category2.CategoryV2Fragment; import com.gh.gamecenter.common.base.fragment.BaseFragment_ViewPager_Checkable; import com.gh.gamecenter.common.callback.BiCallback; import com.gh.gamecenter.common.callback.OnDoubleTapListener; @@ -47,6 +48,7 @@ import com.gh.gamecenter.common.utils.NightModeUtils; import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.databinding.FragmentMainBinding; import com.gh.gamecenter.entity.SettingsEntity; +import com.gh.gamecenter.entity.SubjectData; import com.gh.gamecenter.entity.SubjectRecommendEntity; import com.gh.gamecenter.entity.WelcomeDialogEntity; import com.gh.gamecenter.eventbus.EBReuse; @@ -54,11 +56,18 @@ import com.gh.gamecenter.eventbus.EBSkip; import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.forum.home.CommunityHomeFragment; import com.gh.gamecenter.game.GameFragment; +import com.gh.gamecenter.game.columncollection.detail.ColumnCollectionDetailFragment; +import com.gh.gamecenter.game.commoncollection.detail.CommonCollectionDetailFragment; +import com.gh.gamecenter.gamecollection.square.GameCollectionSquareFragment; import com.gh.gamecenter.message.MessageUnreadRepository; import com.gh.gamecenter.message.MessageUnreadViewModel; import com.gh.gamecenter.personal.PersonalFragment; +import com.gh.gamecenter.servers.GameServersPublishFragment; +import com.gh.gamecenter.servers.GameServersTestFragment; +import com.gh.gamecenter.subject.SubjectFragment; import com.gh.gamecenter.video.detail.HomeVideoFragment; import com.halo.assistant.HaloApp; +import com.halo.assistant.fragment.WebFragment; import com.lightgame.listeners.OnBackPressedListener; import com.lightgame.view.CheckableLinearLayout; import com.lightgame.view.NoScrollableViewPager; @@ -116,11 +125,7 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem mHomeFragment = new HomeSearchToolWrapperFragment(); fragments.add(mHomeFragment); - mGameWrapperFragment = new SearchToolWrapperFragment(); - Bundle homeArgs = new Bundle(); - homeArgs.putBoolean(EntranceConsts.KEY_IS_HOME, true); - homeArgs.putString(SearchToolWrapperFragment.WRAPPER_FRAGMENT_NAME, GameFragment.class.getName()); - mGameWrapperFragment.setArguments(homeArgs); + initGameWrapperFragment(); fragments.add(mGameWrapperFragment); mHomeVideoFragment = new HomeVideoFragment(); @@ -139,6 +144,80 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem fragments.add(new PersonalFragment()); } + private void initGameWrapperFragment() { + mGameWrapperFragment = new SearchToolWrapperFragment(); + Bundle homeArgs = new Bundle(); + String className = GameFragment.class.getName(); + SubjectRecommendEntity entity = mViewModel.getNavBar().getValue(); + if (entity == null) { + entity = HomeBottomBarHelper.getDefaultGameBarData(); + } + if (entity.getType() != null) { + switch (entity.getType()) { + case "block": + className = GameFragment.class.getName(); + break; + case "column": + className = SubjectFragment.class.getName(); + homeArgs.putString(EntranceConsts.KEY_ENTRANCE, "游戏库"); + homeArgs.putParcelable( + EntranceConsts.KEY_SUBJECT_DATA, + new SubjectData(entity.getLink(), entity.getText(), false, "", "", "", "", true, false) + ); + break; + case "column_collection": + className = ColumnCollectionDetailFragment.class.getName(); + homeArgs.putString(EntranceConsts.KEY_ENTRANCE, "游戏库"); + homeArgs.putString(EntranceConsts.KEY_COLLECTION_ID, entity.getLink()); + homeArgs.putInt(EntranceConsts.KEY_POSITION, 0); + homeArgs.putString(EntranceConsts.KEY_COLUMNNAME, entity.getText()); + homeArgs.putBoolean(EntranceConsts.KEY_IS_COLUMN_COLLECTION, true); + break; + case "server": + className = GameServersPublishFragment.class.getName(); + break; + case "column_test": + className = GameServersTestFragment.class.getName(); + homeArgs.putString(GameServersTestFragment.TEST_COLUMN_ID, entity.getLink()); + break; + case "category_v2": + className = CategoryV2Fragment.class.getName(); + homeArgs.putString(EntranceConsts.KEY_CATEGORY_ID, entity.getLink()); + homeArgs.putString(EntranceConsts.KEY_CATEGORY_TITLE, entity.getText()); + break; + case "common_collection": + className = CommonCollectionDetailFragment.class.getName(); + homeArgs.putString(EntranceConsts.KEY_ENTRANCE, "游戏库"); + homeArgs.putString(EntranceConsts.KEY_COLLECTION_ID, entity.getLink()); + homeArgs.putString(EntranceConsts.KEY_COLUMNNAME, entity.getText()); + break; + case "game_list": + className = GameCollectionSquareFragment.class.getName(); + homeArgs.putString(EntranceConsts.KEY_ENTRANCE, "游戏库"); + homeArgs.putInt(EntranceConsts.KEY_TAB_INDEX, 0); + homeArgs.putString(EntranceConsts.KEY_NAME, entity.getName()); + break; + case "web": + className = WebFragment.class.getName(); + homeArgs.putString(EntranceConsts.KEY_URL, entity.getLink()); + homeArgs.putBoolean(WebFragment.KEY_OPEN_NATIVE_PAGE, false); + homeArgs.putBoolean(WebFragment.KEY_ENABLE_HORIZONTAL_SCROLL_DISPATCH, true); + if (entity.getLink() != null && entity.getLink().contains("leave_web_page_handle_back_pressed=true")) { + homeArgs.putBoolean(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_BACK_PRESSED, true); + } + break; + } + } + + homeArgs.putString(SearchToolWrapperFragment.WRAPPER_FRAGMENT_NAME, className); + homeArgs.putBoolean(EntranceConsts.KEY_IS_HOME, true); + homeArgs.putParcelable( + EntranceConsts.KEY_EXPOSURE_SOURCE, + new ExposureSource("游戏库", "") + ); + mGameWrapperFragment.setArguments(homeArgs); + } + @Override public ArrayList restoreFragments() { ArrayList restoreFragments = super.restoreFragments(); @@ -158,7 +237,7 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem @Override public void onCreate(Bundle savedInstanceState) { - mViewModel = ViewModelProviders.of(this).get(MainWrapperViewModel.class); + mViewModel = ViewModelProviders.of(this, new MainWrapperViewModel.Factory(HaloApp.getInstance())).get(MainWrapperViewModel.class); super.onCreate(savedInstanceState); @@ -193,7 +272,7 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem .get(MessageUnreadViewModel.class) .getUnreadMessageTotalLiveData().observe(this, isShow -> ExtensionsKt.goneIf(mBinding.mainIvMessageHint, !isShow)); } - + public void getDialog() { mViewModel.requestOpeningData(); mViewModel.getPrivacyPolicyDialog().observe(this, it -> { @@ -207,7 +286,7 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem } }); } - + private void showWelcomeDialogIfNeeded(WelcomeDialogEntity welcomeDialogEntity) { // 判断启动本次应用是否已经弹窗，不是的话弹启动弹窗 if (welcomeDialogEntity != null && HaloApp.get(MainWrapperViewModel.SHOULD_SHOW_OPENING_DIALOG, false) == null) { @@ -217,7 +296,7 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem public void onFirst(Bitmap bitmap) { // 网络速度追不上用户操作的时候可能会出现要弹启动弹窗但用户已经不停留在 MainActivity 的情况 if (!isAdded()) return; - + WelcomeDialogFragment welcomeDialog = WelcomeDialogFragment.getInstance(welcomeDialogEntity); welcomeDialog.setOnDismissListener(() -> { mViewModel.requestReserveDialog(); @@ -225,7 +304,7 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem }); welcomeDialog.show(getChildFragmentManager(), "openingDialog"); } - + @Override public void onSecond(Boolean aBoolean) { mViewModel.requestReserveDialog(); @@ -242,7 +321,7 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem mBinding.mainTabGameName.setText(navBarEntity.getName()); ImageUtils.getPicasso() .load(Uri.parse(navBarEntity.getIconUnselect())) - .placeholder(R.drawable.ic_game_unselect) + //.placeholder(R.drawable.ic_game_unselect) .into(mBinding.mainTabGameIcon); if (navBarEntity.getDefault()) setCurrentItem(INDEX_GAME); } else { @@ -477,12 +556,12 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem if (index == INDEX_GAME) { ImageUtils.getPicasso() .load(Uri.parse(navBarEntity.getIconSelect())) - .placeholder(R.drawable.ic_game_select) + //.placeholder(R.drawable.ic_game_select) .into(mBinding.mainTabGameIcon); } else { ImageUtils.getPicasso() .load(Uri.parse(navBarEntity.getIconUnselect())) - .placeholder(R.drawable.ic_game_unselect) + //.placeholder(R.drawable.ic_game_unselect) .into(mBinding.mainTabGameIcon); } } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperRepository.kt b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperRepository.kt new file mode 100644 index 0000000000..515ac9aff4 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperRepository.kt @@ -0,0 +1,48 @@ +package com.gh.gamecenter.fragment + +import android.annotation.SuppressLint +import androidx.lifecycle.MutableLiveData +import com.gh.common.util.HomeBottomBarHelper +import com.gh.gamecenter.BuildConfig +import com.gh.gamecenter.core.utils.SingletonHolder +import com.gh.gamecenter.entity.SubjectRecommendEntity +import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.retrofit.RetrofitManager +import com.halo.assistant.HaloApp +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers +import retrofit2.HttpException + +class MainWrapperRepository { + + private val mSensitiveApi = RetrofitManager.getInstance().api + + private val mNavBar = MutableLiveData() + + fun getNavBarLiveData() = mNavBar + + @SuppressLint("CheckResult") + fun getHomeNavBar() { + mSensitiveApi.getHomeNavBarV2(HaloApp.getInstance().channel, BuildConfig.VERSION_NAME) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(object : BiResponse() { + override fun onSuccess(data: SubjectRecommendEntity) { + HomeBottomBarHelper.updateDefaultGameBarData(data) + mNavBar.postValue(data) + } + + override fun onFailure(exception: Exception) { + if (exception is HttpException && exception.code() == 404) { + mNavBar.postValue(null) + HomeBottomBarHelper.updateDefaultGameBarData(SubjectRecommendEntity()) + } else { + mNavBar.postValue(HomeBottomBarHelper.getDefaultGameBarData()) + } + } + }) + } + + + companion object : SingletonHolder({ MainWrapperRepository() }) +} \ No newline at end of file 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 4b0a185264..63f0130eab 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperViewModel.kt @@ -5,11 +5,13 @@ import android.app.Application import android.preference.PreferenceManager import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData -import com.gh.gamecenter.common.constant.Constants +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import com.gh.common.util.CheckLoginUtils import com.gh.common.util.HomeBottomBarHelper import com.gh.common.util.PackageUtils import com.gh.gamecenter.BuildConfig +import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.entity.DialogEntity import com.gh.gamecenter.entity.SimpleGameEntity @@ -23,43 +25,17 @@ import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers import retrofit2.HttpException -class MainWrapperViewModel(application: Application) : AndroidViewModel(application) { +class MainWrapperViewModel(application: Application, repository: MainWrapperRepository) : AndroidViewModel(application) { private val mApi = RetrofitManager.getInstance().api private val mSensitiveApi = RetrofitManager.getInstance().api - val navBar = MutableLiveData() + val navBar: MutableLiveData = repository.getNavBarLiveData() // 弹窗优先级: 隐私政策弹窗->启动弹窗->预约弹窗->消息弹窗 val openingDialog = MutableLiveData() val reserveDialog = MutableLiveData?>() val privacyPolicyDialog = MutableLiveData() - init { - getHomeNavBar() - } - - @SuppressLint("CheckResult") - private fun getHomeNavBar() { - mSensitiveApi.getHomeNavBar(HaloApp.getInstance().channel, BuildConfig.VERSION_NAME) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : BiResponse() { - override fun onSuccess(data: SubjectRecommendEntity) { - HomeBottomBarHelper.updateDefaultGameBarData(data) - navBar.postValue(data) - } - - override fun onFailure(exception: Exception) { - if (exception is HttpException && exception.code() == 404) { - navBar.postValue(null) - HomeBottomBarHelper.updateDefaultGameBarData(SubjectRecommendEntity()) - } else { - navBar.postValue(HomeBottomBarHelper.getDefaultGameBarData()) - } - } - }) - } - /** * 获取弹窗 */ @@ -149,6 +125,14 @@ class MainWrapperViewModel(application: Application) : AndroidViewModel(applicat return if (channelInInteger == null) false else channelInInteger in 1001..1050 } + class Factory( + private val mApplication: Application, + ) : ViewModelProvider.NewInstanceFactory() { + override fun create(modelClass: Class): T { + return MainWrapperViewModel(mApplication, MainWrapperRepository.getInstance()) as T + } + } + companion object { const val SHOULD_SHOW_OPENING_DIALOG = "show_opening_dialog" } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java index 45e365a17b..3d2b23891c 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java @@ -51,6 +51,8 @@ public class SearchToolWrapperFragment extends LazyFragment { bundle.putString(EntranceConsts.KEY_LOCATION, "游戏库"); } mSearchToolbarFragment.setArguments(bundle); + Bundle mContentBundle = (Bundle) requireArguments().clone(); + mContentFragment.setArguments(mContentBundle); } } catch (Exception e) { e.printStackTrace(); diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt index 8c20bbe358..364a936bd3 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt @@ -99,7 +99,7 @@ class GameCollectionSquareFragment : LazyListFragment(R.id.fab)?.visibility = View.GONE } else { if (mExposureEventList.isNotEmpty()) ExposureManager.log(mExposureEventList) @@ -109,7 +109,7 @@ class GameCollectionSquareFragment : LazyListFragment(R.id.fab)?.visibility = View.VISIBLE } } diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java index 6a8c76fffb..6fb5bfd1ee 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java @@ -2355,6 +2355,12 @@ public interface ApiService { @GET("home/navbar") Single getHomeNavBar(@Query("channel") String channel, @Query("version") String version); + /** + * 首页导航栏数据v2 + */ + @GET("home/navbar/v2") + Single getHomeNavBarV2(@Query("channel") String channel, @Query("version") String version); + /** * 获取我的光环功能列表 */ diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index f59ae830f7..3dd89feec0 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -28,31 +28,32 @@ import com.gh.base.GlobalActivityLifecycleObserver; import com.gh.common.FixedRateJobHelper; import com.gh.common.exposure.ExposureManager; import com.gh.common.filter.RegionSettingHelper; -import com.gh.gamecenter.common.image.EmptyDecoder; import com.gh.common.loghub.LoghubUtils; import com.gh.common.tracker.Tracker; import com.gh.common.util.DataUtils; import com.gh.common.util.DownloadNotificationHelper; import com.gh.common.util.DownloadObserver; -import com.gh.gamecenter.common.utils.EmulatorUtil; import com.gh.common.util.HomeBottomBarHelper; -import com.gh.gamecenter.common.utils.NightModeUtils; import com.gh.common.util.PackageHelper; import com.gh.common.util.PackageUtils; -import com.gh.gamecenter.common.utils.TimestampUtils; import com.gh.common.videolog.VideoRecordUtils; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.Injection; import com.gh.gamecenter.common.constant.Config; import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.image.EmptyDecoder; import com.gh.gamecenter.common.utils.DeviceUtils; +import com.gh.gamecenter.common.utils.EmulatorUtil; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.common.utils.NightModeUtils; import com.gh.gamecenter.common.utils.PackageFlavorHelper; +import com.gh.gamecenter.common.utils.TimestampUtils; import com.gh.gamecenter.core.AppExecutor; import com.gh.gamecenter.core.iinterface.IApplication; import com.gh.gamecenter.core.utils.SPUtils; import com.gh.gamecenter.entity.SubjectRecommendEntity; +import com.gh.gamecenter.fragment.MainWrapperRepository; import com.gh.gamecenter.packagehelper.PackageRepository; import com.gh.gamecenter.receiver.ActivitySkipReceiver; import com.gh.gamecenter.receiver.DownloadReceiver; @@ -207,6 +208,7 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid } // 异步初始化 SP SPUtils.getString(""); + MainWrapperRepository.Companion.getInstance().getHomeNavBar(); }); RxJavaPlugins.setIoSchedulerHandler(scheduler -> AppExecutor.INSTANCE.getCachedScheduler()); From 1bb240c96447e736ebb5d0202c35907e30db4c48 Mon Sep 17 00:00:00 2001 From: leafwai Date: Mon, 16 May 2022 16:38:21 +0800 Subject: [PATCH 36/52] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=87=E6=8D=A2(=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=92=E8=A1=8C=E6=A6=9Ctab=E3=80=81?= =?UTF-8?q?=E6=96=B0=E5=88=86=E7=B1=BB2.0tab=E6=97=A5=E5=A4=9C=E9=97=B4?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=88=87=E6=8D=A2=E6=B2=A1=E6=9C=89=E5=8F=98?= =?UTF-8?q?=E8=89=B2=E7=9A=84=E9=97=AE=E9=A2=98)=20https://git.shanqu.cc/h?= =?UTF-8?q?alo/android/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/gamecenter/MainActivity.java | 2 +- .../gamecenter/catalog/SpecialCatalogSubjectAdapter.kt | 3 +++ .../com/gh/gamecenter/category2/CategoryV2Fragment.kt | 4 ++-- .../gh/gamecenter/forum/home/CommunityHomeFragment.kt | 2 +- .../gh/gamecenter/subject/tab/SubjectTabFragment.kt | 10 ++++++++++ app/src/main/res/layout/game_image_item.xml | 4 ++-- 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index fc7c6712c4..fb4c22a2c6 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -1035,7 +1035,7 @@ public class MainActivity extends BaseActivity { @Override protected void updateStaticViewBackground(View view) { - if (mMainWrapperFragment.getCurrentItem() == MainWrapperFragment.INDEX_HOME) return; + if (view.getId() == R.id.tabLayout || view.getId() == R.id.appbar) return; super.updateStaticViewBackground(view); } } diff --git a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogSubjectAdapter.kt b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogSubjectAdapter.kt index 0f4635a35c..b1dd767394 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogSubjectAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogSubjectAdapter.kt @@ -3,9 +3,11 @@ package com.gh.gamecenter.catalog import android.content.Context import android.view.ViewGroup import com.gh.gamecenter.GameDetailActivity +import com.gh.gamecenter.R import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.databinding.CatalogSubjectGameItemBinding import com.gh.gamecenter.entity.GameEntity import com.lightgame.adapter.BaseRecyclerAdapter @@ -41,6 +43,7 @@ class SpecialCatalogSubjectAdapter( val entity = mList[position] gameIcon.displayGameIcon(entity) gameName.text = entity.name + gameName.setTextColor(R.color.text_title.toColor(mContext)) if (!gameName.isSelected) { gameName.postDelayed({ gameName.isSelected = true }, 500) diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt index 327ee0cae7..0412557a4b 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt @@ -106,10 +106,10 @@ class CategoryV2Fragment : LazyFragment() { // 嵌入在首页时特殊处理 if (arguments?.getBoolean(EntranceConsts.KEY_IS_HOME) == true) { - root.setBackgroundColor(Color.WHITE) + root.setBackgroundColor(R.color.background_white.toColor(requireContext())) root.setPadding(0, 8F.dip2px(), 0, 0) directoryRv.isNestedScrollingEnabled = false - categoryRv.setBackgroundColor(R.color.background.toColor()) + categoryRv.setBackgroundColor(R.color.background.toColor(requireContext())) } } diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt index 79f26c82c4..e171d7790e 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt @@ -500,7 +500,7 @@ class CommunityHomeFragment : LazyFragment() { override fun onNightModeChange() { super.onNightModeChange() - DisplayUtils.setLightStatusBar(requireActivity(), !mNightMode) + if (isSupportVisible) DisplayUtils.setLightStatusBar(requireActivity(), !mNightMode) mBinding?.tabLayout?.run { for (i in 0 until tabCount) { val tab: TabLayout.Tab? = getTabAt(i) diff --git a/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt index df845275a0..abdce5a9f9 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt @@ -14,6 +14,7 @@ import com.gh.gamecenter.R import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.toDrawable import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.databinding.FragmentSubjectTabBinding @@ -169,4 +170,13 @@ class SubjectTabFragment : BaseFragment() { } return view } + + override fun onNightModeChange() { + super.onNightModeChange() + for (i in 0 until mBinding.subjectTab.tabCount) { + val tab = mBinding.subjectTab.getTabAt(i) ?: continue + tab.customView?.background = if (tab.isSelected) R.drawable.border_round_theme_14.toDrawable(requireContext()) else R.drawable.border_round_eee_14.toDrawable(requireContext()) + tab.customView?.findViewById(R.id.tab_title)?.setTextColor(if (tab.isSelected) R.color.theme_font.toColor() else R.color.text_title.toColor()) + } + } } diff --git a/app/src/main/res/layout/game_image_item.xml b/app/src/main/res/layout/game_image_item.xml index 3336df74f8..729dc23871 100644 --- a/app/src/main/res/layout/game_image_item.xml +++ b/app/src/main/res/layout/game_image_item.xml @@ -68,11 +68,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/game_image_icon" - android:background="@color/white" + android:background="@color/background_white" android:paddingLeft="20dp" android:paddingTop="13dp" android:paddingBottom="13dp" - android:textColor="@color/black" + android:textColor="@color/text_black" android:textSize="12sp" android:visibility="gone" fresco:layout_constraintLeft_toLeftOf="parent" From 3db6d1288dc882bb245b13e8b8f2fed553ad281d Mon Sep 17 00:00:00 2001 From: juntao Date: Tue, 17 May 2022 10:25:31 +0800 Subject: [PATCH 37/52] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E5=A4=9C=E9=97=B4=E6=A8=A1=E5=BC=8F=E7=9A=84=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/build_with_simple_backup.sh | 4 ++++ scripts/jenkins_build.sh | 4 ++++ scripts/jenkins_flutter_build.sh | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/scripts/build_with_simple_backup.sh b/scripts/build_with_simple_backup.sh index f72d72ae2e..6bf764053b 100755 --- a/scripts/build_with_simple_backup.sh +++ b/scripts/build_with_simple_backup.sh @@ -23,6 +23,10 @@ fi # 移除夜间颜色资源 rm -r app/src/main/res/values-night rm -r app/src/main/res/drawable-night-xxxhdpi +rm -r module_core/src/main/res/drawable-night-xxxhdpi +rm -r module_common/src/main/res/drawable-night-xxxhdpi +rm -r module_core/src/main/res/values-night +rm -r module_common/src/main/res/values-night sed -i 's/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "true"/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "false"/g' app/build.gradle ./gradlew --stop diff --git a/scripts/jenkins_build.sh b/scripts/jenkins_build.sh index 8b6a3f5a65..30661249f5 100755 --- a/scripts/jenkins_build.sh +++ b/scripts/jenkins_build.sh @@ -30,6 +30,10 @@ do # 移除夜间颜色资源 rm -r app/src/main/res/values-night rm -r app/src/main/res/drawable-night-xxxhdpi + rm -r module_core/src/main/res/drawable-night-xxxhdpi + rm -r module_common/src/main/res/drawable-night-xxxhdpi + rm -r module_core/src/main/res/values-night + rm -r module_common/src/main/res/values-night sed -i 's/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "true"/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "false"/g' app/build.gradle ;; esac diff --git a/scripts/jenkins_flutter_build.sh b/scripts/jenkins_flutter_build.sh index af675ce2d2..b6e2bc85d8 100755 --- a/scripts/jenkins_flutter_build.sh +++ b/scripts/jenkins_flutter_build.sh @@ -30,6 +30,10 @@ do # 移除夜间颜色资源 rm -r app/src/main/res/values-night rm -r app/src/main/res/drawable-night-xxxhdpi + rm -r module_core/src/main/res/drawable-night-xxxhdpi + rm -r module_common/src/main/res/drawable-night-xxxhdpi + rm -r module_core/src/main/res/values-night + rm -r module_common/src/main/res/values-night sed -i 's/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "true"/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "false"/g' app/build.gradle ;; esac From 0d44d4e54a4e0942b2aa1cee0b234beb1b82dc60 Mon Sep 17 00:00:00 2001 From: juntao Date: Tue, 17 May 2022 11:40:30 +0800 Subject: [PATCH 38/52] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E7=AE=80=E5=8D=95=E7=9A=84=E5=A4=9C=E9=97=B4?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable/launcher_background.xml | 2 +- app/src/main/res/layout/dialog_privacy_policy.xml | 2 +- app/src/main/res/layout/dialog_privacy_protocol.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/drawable/launcher_background.xml b/app/src/main/res/drawable/launcher_background.xml index 5d74867a78..f010f0bfe7 100644 --- a/app/src/main/res/drawable/launcher_background.xml +++ b/app/src/main/res/drawable/launcher_background.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/layout/dialog_privacy_protocol.xml b/app/src/main/res/layout/dialog_privacy_protocol.xml index ebed4dd031..12086af979 100644 --- a/app/src/main/res/layout/dialog_privacy_protocol.xml +++ b/app/src/main/res/layout/dialog_privacy_protocol.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - app:cardBackgroundColor="@color/white" + app:cardBackgroundColor="@color/background_white" app:cardCornerRadius="8dp" app:cardElevation="0dp"> @@ -42,7 +42,7 @@ android:id="@+id/titleContainer" android:layout_width="match_parent" android:layout_height="64dp" - android:background="@color/white" + android:background="@color/background_white" android:gravity="center" android:orientation="horizontal" app:layout_constraintEnd_toEndOf="parent" From cb54a0e780f887ede99193d70dc3bb1108d2d27c Mon Sep 17 00:00:00 2001 From: juntao Date: Tue, 17 May 2022 11:41:12 +0800 Subject: [PATCH 39/52] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AE=80=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1=E5=BC=8F=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=B5=8B=E8=AF=95=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../personal/PersonalFunctionAdapter.kt | 28 +++++++++++++++---- .../gamecenter/personal/PersonalViewModel.kt | 10 +++++++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt index 7bb359ab78..1e84dcfd02 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt @@ -8,18 +8,17 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.app.AppCompatDelegate import androidx.recyclerview.widget.RecyclerView import com.facebook.drawee.view.SimpleDraweeView -import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* import com.gh.gamecenter.* -import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.EmptyCallback -import com.gh.gamecenter.common.utils.PermissionHelper -import com.gh.gamecenter.core.utils.SPUtils -import com.gh.gamecenter.common.utils.toColor -import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.db.GameTrendsDao import com.gh.gamecenter.entity.FunctionalGroupEntity import com.gh.gamecenter.entity.FunctionalLinkEntity @@ -308,6 +307,23 @@ class PersonalFunctionAdapter(val context: Context, val groupName: String, var m } } else -> { + if (PackageFlavorHelper.IS_TEST_FLAVOR) { + if (linkEntity.type == "night_mode") { + val isNightMode = NightModeUtils.getNightMode() + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { + NightModeUtils.setNightMode(!isNightMode) + if (isNightMode) { + (context as AppCompatActivity).delegate.localNightMode = + AppCompatDelegate.MODE_NIGHT_NO + } else { + (context as AppCompatActivity).delegate.localNightMode = + AppCompatDelegate.MODE_NIGHT_YES + } + } + return + } + } DirectUtils.directToLinkPage(context, linkEntity, "", "我的光环") } } 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 98a14ecd7e..1f726aeead 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalViewModel.kt @@ -11,6 +11,7 @@ import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.MainActivity import com.gh.gamecenter.NewsDetailActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.PackageFlavorHelper import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.core.utils.ToastUtils import com.gh.gamecenter.entity.* @@ -77,6 +78,15 @@ class PersonalViewModel(application: Application) : AndroidViewModel(application .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : BiResponse>() { override fun onSuccess(data: ArrayList) { + if (PackageFlavorHelper.IS_TEST_FLAVOR) { + data.firstOrNull()?.addons?.add( + FunctionalLinkEntity().apply { + icon = "https://dev-and-static.ghzs.com/image/game/icon/2022/05/17/6283180e5e90cb01b870b39e.gif" + name = "日夜切换" + type = "night_mode" + } + ) + } haloAddData.postValue(data) data.forEach loop@{ it.addons.forEach { link -> From 116702f7f09ac23b248ce99d19f54b6c91d4537a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Tue, 17 May 2022 17:34:21 +0800 Subject: [PATCH 40/52] =?UTF-8?q?=E6=A8=A1=E5=9D=97/=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=8C=96=E5=89=8D=E6=9C=9F=E6=94=B9=E9=80=A0=20https://git.sha?= =?UTF-8?q?nqu.cc/halo/android/assistant-android/-/issues/64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 10 +- .../com/gh/base/BaseRichEditorActivity.kt | 2 + .../com/gh/base/BaseRichEditorViewModel.kt | 2 +- .../java/com/gh/base/ToolBarActivity.java | 1 + .../main/java/com/gh/common/DefaultJsApi.kt | 5 +- .../java/com/gh/common/FixedRateJobHelper.kt | 4 +- .../java/com/gh/common/constant/Config.java | 4 +- .../dialog/PackageCheckDialogFragment.kt | 1 + .../gh/common/exposure/ExposureConverters.kt | 1 + .../com/gh/common/exposure/ExposureEvent.kt | 1 + .../com/gh/common/exposure/ExposureManager.kt | 2 +- .../gh/common/filter/RegionSettingHelper.kt | 2 +- .../com/gh/common/provider/AppProviderImpl.kt | 17 ++ .../gh/common/provider/ConfigProviderImpl.kt | 12 + .../provider/DialogUtilsProviderImpl.kt | 7 +- .../gh/common/provider/DirectProviderImpl.kt | 4 + .../provider/DownloadManagerProviderImpl.kt | 21 ++ .../common/provider/EnergyTaskProviderImpl.kt | 23 ++ .../provider/EntranceUtilsProviderImpl.kt | 23 ++ .../provider/PackageHelperProviderImpl.kt | 19 ++ .../provider/PackageInstallerProviderImpl.kt | 24 ++ .../provider/PackageUtilsProviderImpl.kt | 13 + .../common/provider/QuickLoginProviderImpl.kt | 19 ++ .../provider/UserManagerProviderImpl.kt | 16 ++ .../repository/ReservationRepository.kt | 2 +- .../simulator/SimulatorDownloadManager.kt | 1 + .../common/simulator/SimulatorGameManager.kt | 7 +- .../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 | 2 +- .../java/com/gh/common/util/CommentHelper.kt | 2 +- .../java/com/gh/common/util/CommentUtils.java | 4 +- .../java/com/gh/common/util/ConcernUtils.kt | 2 +- .../java/com/gh/common/util/DataLogUtils.java | 2 +- .../java/com/gh/common/util/DataUtils.java | 2 +- .../com/gh/common/util/DeviceTokenUtils.kt | 2 +- .../java/com/gh/common/util/DialogUtils.java | 131 +--------- .../java/com/gh/common/util/DirectUtils.kt | 10 +- .../java/com/gh/common/util/DownloadHelper.kt | 2 +- .../com/gh/common/util/DownloadObserver.kt | 27 +- .../com/gh/common/util/EnergyTaskHelper.kt | 2 +- .../common/util/GameActivityDownloadHelper.kt | 6 +- .../GameCollectionSquareBrowseTaskHelper.kt | 2 +- .../util/GameSubstituteRepositoryHelper.kt | 4 +- .../com/gh/common/util/IntegralLogHelper.kt | 6 +- .../java/com/gh/common/util/LibaoUtils.java | 4 +- .../java/com/gh/common/util/LogUtils.java | 99 +------- .../java/com/gh/common/util/LoginUtils.java | 4 +- .../com/gh/common/util/MessageShareUtils.java | 1 + .../java/com/gh/common/util/NewLogUtils.kt | 51 +--- .../java/com/gh/common/util/NewsUtils.java | 4 +- .../com/gh/common/util/PackageInstaller.kt | 10 +- .../com/gh/common/util/PlatformUtils.java | 2 +- .../com/gh/common/util/PostCommentUtils.java | 4 +- .../java/com/gh/common/util/QRCodeUtils.java | 2 +- .../com/gh/common/util/QuickLoginHelper.kt | 234 +++++++++--------- .../com/gh/common/util/ReservationHelper.kt | 19 +- .../com/gh/common/util/SimpleRequestHelper.kt | 2 +- .../java/com/gh/common/util/TagUtils.java | 2 +- .../com/gh/common/util/UploadImageUtils.kt | 6 +- .../com/gh/common/util/UsageStatsHelper.kt | 2 +- .../com/gh/common/util/WechatBindHelper.kt | 2 +- .../gh/common/videolog/VideoRecordUtils.kt | 2 +- .../com/gh/download/DownloadDataHelper.kt | 2 +- .../java/com/gh/download/PackageObserver.kt | 7 +- .../dialog/DownloadDialogItemViewHolder.kt | 3 +- .../download/server/BrowserInstallHelper.kt | 4 +- .../gh/flutter/FlutterLogHubServiceImplAop.kt | 4 +- .../gh/gamecenter/FullScreenWebActivity.kt | 2 +- .../com/gh/gamecenter/ImageViewerActivity.kt | 4 +- .../gh/gamecenter/LibaoDetailActivity.java | 2 +- .../java/com/gh/gamecenter/LoginActivity.java | 13 +- .../java/com/gh/gamecenter/MainActivity.java | 8 +- .../gh/gamecenter/NetworkDiagnosisActivity.kt | 2 +- .../com/gh/gamecenter/NewsDetailActivity.java | 8 +- .../java/com/gh/gamecenter/SearchActivity.kt | 2 +- .../gh/gamecenter/ShareCardPicActivity.java | 2 +- .../com/gh/gamecenter/ShareGhActivity.java | 2 +- .../java/com/gh/gamecenter/SkipActivity.java | 2 +- .../gh/gamecenter/SplashScreenActivity.java | 11 +- .../com/gh/gamecenter/SuggestionActivity.java | 4 +- .../java/com/gh/gamecenter/WebActivity.kt | 30 ++- .../com/gh/gamecenter/WeiBoShareActivity.java | 37 ++- .../gamecenter/adapter/CleanApkAdapter.java | 2 +- .../adapter/CommentDetailAdapter.java | 2 +- .../gamecenter/adapter/GameNewsAdapter.java | 2 +- .../gamecenter/adapter/ImagePagerAdapter.java | 2 +- .../adapter/LibaoDetailAdapter.java | 2 +- .../adapter/MessageDetailAdapter.java | 6 +- .../gamecenter/adapter/ToolBoxRvAdapter.java | 2 +- .../com/gh/gamecenter/amway/AmwayActivity.kt | 2 +- .../com/gh/gamecenter/amway/AmwayAdapter.kt | 1 + .../com/gh/gamecenter/amway/AmwayFragment.kt | 1 + .../com/gh/gamecenter/amway/AmwayViewModel.kt | 4 +- .../amway/search/AmwaySearchViewModel.kt | 4 +- .../baselist/ListHeadViewModel.java | 2 +- .../gh/gamecenter/baselist/ListViewModel.java | 4 +- .../gh/gamecenter/catalog/CatalogViewModel.kt | 2 +- .../catalog/NewCatalogListViewModel.kt | 2 +- .../catalog/SpecialCatalogViewModel.kt | 2 +- .../gamecenter/catalog/SubCatalogViewModel.kt | 2 +- .../category/CategoryDirectoryAdapter.kt | 10 +- .../category2/CategoryV2Fragment.kt | 1 + .../category2/CategoryV2ListFragment.kt | 1 + .../category2/CategoryV2ListViewModel.kt | 2 +- .../category2/CategoryV2ViewModel.kt | 2 +- .../gamecenter/collection/AnswerViewModel.kt | 2 +- .../gamecenter/collection/ArticleAdapter.java | 2 +- .../collection/CommunityArticleViewModel.kt | 4 +- .../collection/GamesCollectionAdapter.kt | 1 + .../collection/GamesCollectionViewModel.kt | 4 +- .../download/GameUpdateFragmentAdapter.java | 5 +- .../download/InstalledGameViewModel.kt | 2 +- .../download/UpdatableGameAdapter.kt | 1 + .../download/UpdatableGameViewModel.kt | 2 +- .../gamecenter/energy/EnergyCenterFragment.kt | 1 + .../energy/EnergyCenterViewModel.kt | 2 +- .../gamecenter/energy/EnergyHouseViewModel.kt | 3 +- .../com/gh/gamecenter/energy/TaskAdapter.kt | 1 + .../detail/ForumArticleAskListAdapter.kt | 3 +- .../detail/ForumArticleAskListFragment.kt | 1 + .../forum/detail/ForumDetailActivity.kt | 2 +- .../forum/detail/ForumDetailFragment.kt | 2 + .../forum/detail/ForumDetailViewModel.kt | 6 +- .../forum/home/ArticleItemVideoView.kt | 1 - .../forum/home/CommunityHomeFragment.kt | 1 + .../forum/home/CommunityHomeViewModel.kt | 2 +- .../forum/home/ForumActivityAdapter.kt | 1 + .../forum/home/ForumActivityViewModel.kt | 2 +- .../home/ForumArticleAskItemViewHolder.kt | 5 +- .../forum/home/ForumArticleListAdapter.kt | 4 +- .../forum/home/ForumArticleListViewModel.kt | 2 +- .../gh/gamecenter/forum/home/ForumFragment.kt | 1 + .../forum/home/ForumHomeViewModel.kt | 2 +- .../gamecenter/forum/home/ForumViewModel.kt | 4 +- .../forum/home/HorizontalForumsAdapter.kt | 1 + .../forum/list/ForumListVIewModel.kt | 2 +- .../moderator/ApplyModeratorViewModel.kt | 2 +- .../forum/moderator/ModeratorListAdapter.kt | 1 + .../forum/moderator/ModeratorListViewModel.kt | 4 +- .../search/ForumContentSearchListAdapter.kt | 3 +- .../ForumOrUserSearchDefaultViewModel.kt | 2 +- .../forum/search/UserSearchListViewModel.kt | 2 +- .../forum/select/ForumSelectViewModel.kt | 4 +- .../fragment/HomeSearchToolWrapperFragment.kt | 2 + .../HomeSearchToolWrapperViewModel.kt | 2 +- .../gh/gamecenter/fragment/LoginFragment.java | 39 ++- .../fragment/MainWrapperFragment.java | 2 +- .../fragment/MainWrapperRepository.kt | 2 +- .../fragment/MainWrapperViewModel.kt | 5 +- .../gh/gamecenter/game/GameFragmentAdapter.kt | 3 + .../gamecenter/game/GameNavigationAdapter.kt | 1 + .../com/gh/gamecenter/game/GameViewModel.kt | 6 +- .../detail/ColumnCollectionDetailViewModel.kt | 2 +- .../game/upload/GameSubmissionActivity.kt | 2 +- .../game/upload/GameUploadViewModel.kt | 6 +- .../detail/GameCollectionDetailAdapter.kt | 1 + .../detail/GameCollectionDetailFragment.kt | 16 +- .../detail/GameCollectionDetailViewModel.kt | 6 +- .../detail/GameCollectionPosterViewModel.kt | 2 +- .../detail/GameCollectionShareDialog.kt | 7 +- ...eCollectionCommentConversationViewModel.kt | 2 +- .../mine/MyGameCollectionViewModel.kt | 2 +- .../ChooseGameCollectionDefaultCoverDialog.kt | 1 + ...ooseGameCollectionDefaultCoverViewModel.kt | 2 +- .../GameCollectionActivityLabelViewModel.kt | 2 +- .../publish/GameCollectionEditActivity.kt | 4 +- .../publish/GameCollectionEditViewModel.kt | 4 +- .../square/GameCollectionBannerAdapter.kt | 1 + .../square/GameCollectionSquareActivity.kt | 2 +- .../square/GameCollectionSquareAdapter.kt | 4 +- .../square/GameCollectionSquareFragment.kt | 2 + .../square/GameCollectionSquareViewModel.kt | 2 +- .../tag/GameCollectionTagViewModel.kt | 2 +- .../gamedetail/GameDetailFragment.kt | 3 + .../gamedetail/GameDetailViewModel.kt | 4 +- .../gamecenter/gamedetail/desc/DescAdapter.kt | 3 + .../gamedetail/desc/DescCommentsAdapter.kt | 3 +- .../gamedetail/desc/DescViewModel.kt | 2 +- .../desc/GameDetailInfoItemAdapter.kt | 1 + .../gamedetail/desc/GameRaidersAdapter.kt | 1 + .../gamedetail/dialog/GameDetailMoreDialog.kt | 2 +- .../gamedetail/dialog/InviteCodeDialog.kt | 2 +- .../gamedetail/fuli/FuLiFragment.kt | 1 + .../fuli/kaifu/ServersCalendarViewModel.kt | 2 +- .../history/HistoryApkListActivity.kt | 2 +- .../history/HistoryApkListViewModel.kt | 2 +- .../gamedetail/myrating/MyRatingActivity.kt | 2 +- .../gamedetail/myrating/MyRatingViewModel.kt | 2 +- .../gamedetail/rating/RatingAdapter.kt | 2 + .../rating/RatingCommentItemViewHolder.kt | 5 +- .../gamedetail/rating/RatingReplyActivity.kt | 1 + .../gamedetail/rating/RatingReplyAdapter.kt | 4 +- .../gamedetail/rating/RatingReplyViewModel.kt | 2 +- .../gamedetail/rating/RatingViewModel.kt | 2 +- .../rating/edit/RatingEditActivity.kt | 35 +-- .../rating/edit/RatingEditViewModel.kt | 4 +- .../gh/gamecenter/geetest/GeetestUtils.java | 2 +- .../gamecenter/help/HelpContainerViewModel.kt | 2 +- .../help/HelpQaCategoryViewModel.kt | 2 +- .../gh/gamecenter/help/QaFeedbackViewModel.kt | 2 +- .../com/gh/gamecenter/home/HomeFragment.kt | 1 + .../com/gh/gamecenter/home/HomeViewModel.kt | 4 +- .../LegacyHomeFragmentAdapterAssistant.kt | 2 + .../HomeGameCollectionAdapter.kt | 2 +- .../home/skip/PackageSkipActivity.kt | 2 +- .../gh/gamecenter/info/ConcernAdapter.java | 6 +- .../gh/gamecenter/info/ConcernFragment.java | 2 +- .../com/gh/gamecenter/info/InfoAdapter.java | 2 +- .../gamecenter/info/NewsViewsRepository.java | 2 +- .../gh/gamecenter/info/OriginalAdapter.java | 2 +- .../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 | 4 +- .../manager/DataCollectionManager.java | 2 +- .../gh/gamecenter/manager/UpdateManager.java | 2 +- .../gh/gamecenter/manager/UserManager.java | 11 +- .../gh/gamecenter/manager/VisitManager.java | 4 +- .../gh/gamecenter/message/KeFuViewModel.kt | 2 +- .../message/MessageDetailFragment.java | 6 +- .../message/MessageItemViewHolder.java | 24 +- .../message/MessageNormalViewModel.kt | 2 +- .../message/MessageUnreadRepository.kt | 4 +- .../gh/gamecenter/message/MessageViewModel.kt | 2 +- .../gamecenter/mvvm/NetworkBoundResource.java | 2 +- .../mygame/MyReservationViewModel.kt | 2 +- .../gamecenter/mygame/PlayedGameActivity.kt | 2 +- .../gh/gamecenter/mygame/PlayedGameAdapter.kt | 10 +- .../gamecenter/mygame/PlayedGameViewModel.kt | 2 +- .../newsdetail/NewsDetailAdapter.java | 5 +- .../packagehelper/PackageFilterManager.kt | 2 +- .../packagehelper/PackageRepository.kt | 8 +- .../personal/NewPersonalFragment.kt | 9 +- .../gamecenter/personal/PersonalFragment.kt | 11 +- .../gamecenter/personal/PersonalViewModel.kt | 4 +- .../personalhome/FollowersOrFansViewModel.kt | 2 +- .../personalhome/InstalledGameDialog.kt | 2 +- .../personalhome/UserHomeActivity.kt | 2 +- .../personalhome/UserHomeFragment.kt | 2 +- .../personalhome/UserHomeViewModel.kt | 11 +- .../background/BackgroundClipActivity.kt | 2 +- .../background/BackgroundPreviewActivity.kt | 2 +- .../PersonalityBackgroundViewModel.kt | 2 +- .../border/AvatarBorderActivity.kt | 3 +- .../border/AvatarBorderViewModel.kt | 2 +- .../border/ChooseAvatarBorderViewModel.kt | 2 +- .../personalhome/fans/FansActivity.kt | 2 +- .../followers/FollowersActivity.kt | 2 +- .../personalhome/home/UserHistoryAdapter.kt | 1 + .../personalhome/home/UserHistoryViewModel.kt | 8 +- .../home/game/UserCommentHistoryViewModel.kt | 2 +- .../home/game/UserGameViewModel.kt | 5 +- .../personalhome/rating/RatingActivity.kt | 2 +- .../BaseAnswerOrArticleItemViewHolder.kt | 5 +- .../answer/CommunityAnswerItemViewHolder.kt | 1 + .../qa/answer/detail/AnswerDetailFragment.kt | 3 + .../qa/answer/detail/AnswerDetailViewModel.kt | 4 +- .../detail/SimpleAnswerDetailActivity.kt | 2 +- .../qa/answer/draft/AnswerDraftAdapter.java | 2 +- .../qa/answer/edit/AnswerEditActivity.kt | 1 + .../qa/answer/edit/AnswerEditViewModel.kt | 2 +- .../qa/article/MyArticleActivity.kt | 2 +- .../qa/article/SimpleArticleListActivity.kt | 2 +- .../detail/ArticleDetailContentViewHolder.kt | 3 + .../article/detail/ArticleDetailFragment.kt | 4 + .../article/detail/ArticleDetailViewModel.kt | 2 +- .../comment/ArticleDetailCommentViewModel.kt | 2 +- .../qa/article/draft/ArticleDraftFragment.kt | 2 +- .../qa/article/edit/ArticleEditActivity.kt | 10 +- .../qa/article/edit/ArticleEditViewModel.kt | 2 +- .../qa/column/AskColumnRepository.java | 4 +- .../gamecenter/qa/comment/CommentActivity.kt | 2 +- .../qa/comment/NewCommentFragment.kt | 1 + .../qa/comment/NewCommentViewModel.kt | 6 +- .../qa/comment/base/BaseCommentAdapter.kt | 2 + .../qa/comment/base/BaseCommentViewModel.kt | 2 +- .../CommentConversationViewModel.kt | 3 +- .../qa/dialog/ChooseForumActivity.kt | 2 +- .../qa/dialog/MoreFunctionPanelDialog.kt | 3 +- .../qa/editor/FullScreenVideoActivity.kt | 2 +- .../gh/gamecenter/qa/editor/GameFragment.kt | 2 +- .../qa/editor/OnLinkClickListener.kt | 2 +- .../qa/editor/PreviewVideoActivity.kt | 2 +- .../detail/QuestionsDetailFragment.kt | 2 +- .../detail/QuestionsDetailViewModel.kt | 2 +- .../questions/draft/QuestionDraftViewModel.kt | 4 +- .../qa/questions/edit/QuestionEditActivity.kt | 8 +- .../questions/edit/QuestionEditViewModel.kt | 4 +- .../qa/questions/edit/TagsSelectFragment.kt | 13 +- .../edit/tip/QuestionTitleTipAdapter.kt | 2 +- .../invite/QuestionsInviteViewModel.kt | 2 +- .../QuestionsInviteWrapperFragment.java | 2 +- .../newdetail/NewQuestionDetailFragment.kt | 4 + .../newdetail/NewQuestionDetailViewModel.kt | 4 +- .../QuestionDetailContentViewHolder.kt | 3 + .../AskRecommendSubjectViewModel.kt | 2 +- .../qa/tags/AskQuestionsNewRepository.java | 4 +- .../qa/video/detail/ForumTopVideoView.kt | 1 - .../video/detail/ForumVideoDetailActivity.kt | 2 +- .../video/detail/ForumVideoDetailFragment.kt | 3 + .../video/detail/ForumVideoDetailViewModel.kt | 4 +- .../detail/comment/VideoCommentFragment.kt | 1 + .../qa/video/detail/desc/VideoDescFragment.kt | 4 +- .../detail/desc/VideoDescTopViewHolder.kt | 2 + .../video/detail/desc/VideoDescViewModel.kt | 4 +- .../qa/video/publish/VideoPublishFragment.kt | 1 + .../qa/video/publish/VideoPublishViewModel.kt | 6 +- .../gamecenter/retrofit/RetrofitManager.java | 41 +-- .../search/SearchGameIndexAdapter.kt | 2 + .../search/SearchGameResultAdapter.kt | 2 + .../gamecenter/security/BindPhoneFragment.kt | 1 + .../gamecenter/security/BindPhoneViewModel.kt | 2 +- .../servers/GameServersContentFragment.kt | 1 + .../servers/GameServersContentViewModel.kt | 2 +- .../servers/GameServersPublishFragment.kt | 2 +- .../servers/GameServersTestViewModel.kt | 4 +- .../servers/add/AddKaiFuViewModel.kt | 2 +- .../servers/patch/PatchKaifuViewModel.kt | 2 +- .../simulatorgame/SimulatorGameListAdapter.kt | 1 + .../subject/SubjectListViewModel.kt | 2 +- .../gh/gamecenter/subject/SubjectViewModel.kt | 4 +- .../suggest/SuggestSelectFragment.java | 2 +- .../suggest/SuggestSelectGameAdapter.java | 2 +- .../com/gh/gamecenter/tag/TagsActivity.kt | 2 +- .../gh/gamecenter/tag/TagsListViewModel.kt | 2 +- .../teenagermode/TeenagerModeActivity.kt | 2 +- .../teenagermode/TeenagerModeViewModel.kt | 2 +- .../gh/gamecenter/toolbox/ToolBoxViewModel.kt | 3 +- .../gh/gamecenter/user/UserRepository.java | 8 +- .../com/gh/gamecenter/user/UserViewModel.java | 1 + .../video/data/VideoDataActivity.kt | 2 +- .../video/data/VideoDataViewModel.kt | 2 +- .../video/detail/DetailPlayerView.kt | 2 + .../gamecenter/video/detail/VideoAdapter.kt | 2 +- .../video/detail/VideoDetailActivity.kt | 2 +- .../detail/VideoDetailContainerFragment.kt | 2 + .../detail/VideoDetailContainerViewModel.kt | 10 +- .../video/game/GameVideoActivity.kt | 2 +- .../video/game/GameVideoViewModel.kt | 2 +- .../video/label/VideoLabelViewModel.kt | 2 +- .../gamecenter/video/upload/UploadManager.kt | 2 +- .../video/upload/view/UploadVideoActivity.kt | 17 +- .../video/upload/view/UploadVideoViewModel.kt | 4 +- .../video/videomanager/VideoDraftViewModel.kt | 2 +- .../videomanager/VideoManagerActivity.kt | 2 +- .../video/videomanager/VideoVerifyAdapter.kt | 1 + .../videomanager/VideoVerifyViewModel.kt | 2 +- .../gh/gamecenter/wxapi/WXEntryActivity.java | 20 +- .../main/java/com/halo/assistant/HaloApp.java | 4 +- .../assistant/fragment/SettingsFragment.kt | 10 +- .../halo/assistant/fragment/VoteFragment.java | 2 +- .../halo/assistant/fragment/WebFragment.kt | 9 +- .../fragment/game/GameNewsSearchFragment.java | 2 +- .../game/GameNewsSearchResultFragment.java | 2 +- .../fragment/myconcern/MyConcernAdapter.java | 5 +- .../myconcern/MyConcernRecommendAdapter.java | 5 +- .../user/ManuallyRealNameViewModel.kt | 2 +- .../fragment/user/RealNameInfoViewModel.kt | 2 +- .../fragment/user/SelectRegionFragment.java | 2 +- .../fragment/user/UserInfoEditFragment.kt | 4 +- .../fragment/user/UserInfoFragment.kt | 2 +- .../user/UserPortraitCropImageActivity.java | 2 +- app/src/main/res/values-night/styles.xml | 4 - app/src/main/res/values/strings.xml | 17 +- app/src/main/res/values/styles.xml | 3 - module_common/build.gradle | 9 + .../java/com/gh/gamecenter/Injection.java | 0 module_common/src/main/AndroidManifest.xml | 2 + .../gamecenter/common}/base/BaseActivity.java | 75 +++--- .../common/callback/CancelListener.kt | 5 + .../common/constant/EntranceConsts.java | 7 +- .../gamecenter/common/constant/RouteConsts.kt | 15 +- .../common/entity}/ExposureEntity.kt | 2 +- .../common}/entity/NormalShareEntity.kt | 4 +- .../gamecenter/common}/entity/ShareEntity.kt | 2 +- .../gamecenter/common}/eventbus/EBShare.java | 4 +- .../common}/eventbus/EBShowDialog.java | 2 +- .../common/loghub/LoghubDatabase.kt | 2 +- .../gamecenter}/common/loghub/LoghubEvent.kt | 2 +- .../common/loghub/LoghubEventDao.kt | 2 +- .../gamecenter}/common/loghub/LoghubHelper.kt | 6 +- .../gamecenter}/common/loghub/LoghubUtils.kt | 14 +- .../common/retrofit}/ApiResponse.java | 2 +- .../gamecenter/common/retrofit/ApiService.kt | 22 ++ .../common/retrofit/BaseRetrofitManager.java | 53 ++++ .../gamecenter/common}/retrofit/BiResponse.kt | 2 +- .../common}/retrofit/EmptyResponse.kt | 2 +- .../common}/retrofit/FileRequestBody.java | 2 +- .../common}/retrofit/JSONArrayResponse.java | 2 +- .../common}/retrofit/JSONObjectResponse.java | 2 +- .../common}/retrofit/ObservableUtil.java | 2 +- .../common}/retrofit/OkHttpCache.java | 2 +- .../retrofit/OkHttpCacheInterceptor.java | 52 ++-- .../retrofit/OkHttpNetworkInterceptor.java | 6 +- .../retrofit/OkHttpRetryInterceptor.kt | 66 ++--- .../gamecenter/common}/retrofit/Response.java | 5 +- .../common}/retrofit/RetrofitCallback.java | 2 +- .../common/retrofit/RetrofitManager.java | 41 +++ .../common}/retrofit/StringResponse.java | 2 +- .../tracker/ActivityLifecycleWatcher.kt | 2 +- .../common/tracker/AppLifecycleWatcher.kt | 2 +- .../gamecenter}/common/tracker/IBusiness.kt | 2 +- .../gh/gamecenter}/common/tracker/ITrack.kt | 2 +- .../gh/gamecenter}/common/tracker/Tracker.kt | 2 +- .../common/tracker/TrackerLogger.kt | 40 +-- .../gamecenter/common/utils/DialogUtils.java | 150 +++++++++++ .../gh/gamecenter/common/utils/LogUtils.java | 168 +++++++++++++ .../gh/gamecenter/common/utils/NewLogUtils.kt | 71 ++++++ .../gamecenter/common/utils}/ShareUtils.java | 76 +++--- .../src/main/res/anim/pophidden_anim.xml | 0 .../src/main/res/anim/popshow_anim.xml | 0 .../src/main/res/anim/popshow_anim_scale.xml | 0 .../res/drawable-hdpi/share_cancel_logo.webp | Bin .../drawable-hdpi/share_copyfont_logo.webp | Bin .../res/drawable-hdpi/share_email_logo.webp | Bin .../main/res/drawable-hdpi/share_qq_logo.webp | Bin .../res/drawable-hdpi/share_qzone_logo.webp | Bin .../main/res/drawable-hdpi/share_save.webp | Bin .../share_shortmessage_logo.webp | Bin .../drawable-hdpi/share_sinaweibo_logo.webp | Bin .../res/drawable-hdpi/share_wechat_logo.webp | Bin .../share_wechatmoments_logo.webp | Bin .../main/res/drawable-xxhdpi/share_qq.webp | Bin .../res/drawable-xxhdpi/share_qq_zone.webp | Bin .../res/drawable-xxhdpi/share_wechat.webp | Bin .../drawable-xxhdpi/share_wechat_moments.webp | Bin .../main/res/drawable-xxhdpi/share_weibo.webp | Bin .../src/main/res/drawable/bg_share_dialog.xml | 0 .../main/res/drawable/cardview_item_style.xml | 0 .../drawable/reuse_listview_item_style.xml | 0 .../src/main/res/layout/dialog_alert.xml | 6 +- .../main/res/layout/popup_share_dialog.xml | 0 .../src/main/res/layout/share_popup_item.xml | 0 .../main/res/layout/share_popup_layout.xml | 0 .../src/main/res/values-night/style.xml | 4 + module_common/src/main/res/values/strings.xml | 16 ++ module_common/src/main/res/values/style.xml | 4 + .../java/com/gh/gamecenter/Injection.java | 0 .../gamecenter/core/provider/IAppProvider.kt | 7 + .../core/provider/IConfigProvider.kt | 3 + .../core/provider/IDirectProvider.kt | 4 +- .../core/provider/IDownloadManagerProvider.kt | 8 + .../core/provider/IEnergyTaskProvider.kt | 10 + .../core/provider/IEntranceUtilsProvider.kt | 11 + .../core/provider/IPackageHelperProvider.kt | 8 + .../provider/IPackageInstallerProvider.kt | 13 + .../core/provider/IPackageUtilsProvider.kt | 9 + .../core/provider/IQuickLoginProvider.kt | 9 + .../core/provider/IUserManagerProvider.kt | 4 + .../gamecenter/core/utils}/IntentUtils.java | 32 +-- 457 files changed, 1903 insertions(+), 1239 deletions(-) create mode 100644 app/src/main/java/com/gh/common/provider/DownloadManagerProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/EnergyTaskProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/EntranceUtilsProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/PackageHelperProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/PackageInstallerProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/QuickLoginProviderImpl.kt rename {app => module_common}/src/debug/java/com/gh/gamecenter/Injection.java (100%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter/common}/base/BaseActivity.java (86%) create mode 100644 module_common/src/main/java/com/gh/gamecenter/common/callback/CancelListener.kt rename {app/src/main/java/com/gh/common/exposure => module_common/src/main/java/com/gh/gamecenter/common/entity}/ExposureEntity.kt (98%) rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/entity/NormalShareEntity.kt (89%) rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/entity/ShareEntity.kt (88%) rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/eventbus/EBShare.java (81%) rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/eventbus/EBShowDialog.java (92%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/loghub/LoghubDatabase.kt (94%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/loghub/LoghubEvent.kt (92%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/loghub/LoghubEventDao.kt (90%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/loghub/LoghubHelper.kt (95%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/loghub/LoghubUtils.kt (93%) rename {app/src/main/java/com/gh/gamecenter/user => module_common/src/main/java/com/gh/gamecenter/common/retrofit}/ApiResponse.java (94%) create mode 100644 module_common/src/main/java/com/gh/gamecenter/common/retrofit/ApiService.kt create mode 100644 module_common/src/main/java/com/gh/gamecenter/common/retrofit/BaseRetrofitManager.java rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/retrofit/BiResponse.kt (94%) rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/retrofit/EmptyResponse.kt (93%) rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/retrofit/FileRequestBody.java (98%) rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/retrofit/JSONArrayResponse.java (91%) rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/retrofit/JSONObjectResponse.java (91%) rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/retrofit/ObservableUtil.java (98%) rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/retrofit/OkHttpCache.java (98%) rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/retrofit/OkHttpCacheInterceptor.java (69%) rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/retrofit/OkHttpNetworkInterceptor.java (95%) rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/retrofit/OkHttpRetryInterceptor.kt (62%) rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/retrofit/Response.java (93%) rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/retrofit/RetrofitCallback.java (93%) create mode 100644 module_common/src/main/java/com/gh/gamecenter/common/retrofit/RetrofitManager.java rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/retrofit/StringResponse.java (90%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/tracker/ActivityLifecycleWatcher.kt (95%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/tracker/AppLifecycleWatcher.kt (98%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/tracker/IBusiness.kt (74%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/tracker/ITrack.kt (86%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/tracker/Tracker.kt (97%) rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter}/common/tracker/TrackerLogger.kt (84%) create mode 100644 module_common/src/main/java/com/gh/gamecenter/common/utils/DialogUtils.java create mode 100644 module_common/src/main/java/com/gh/gamecenter/common/utils/LogUtils.java create mode 100644 module_common/src/main/java/com/gh/gamecenter/common/utils/NewLogUtils.kt rename {app/src/main/java/com/gh/common/util => module_common/src/main/java/com/gh/gamecenter/common/utils}/ShareUtils.java (90%) rename {app => module_common}/src/main/res/anim/pophidden_anim.xml (100%) rename {app => module_common}/src/main/res/anim/popshow_anim.xml (100%) rename {app => module_common}/src/main/res/anim/popshow_anim_scale.xml (100%) rename {app => module_common}/src/main/res/drawable-hdpi/share_cancel_logo.webp (100%) rename {app => module_common}/src/main/res/drawable-hdpi/share_copyfont_logo.webp (100%) rename {app => module_common}/src/main/res/drawable-hdpi/share_email_logo.webp (100%) rename {app => module_common}/src/main/res/drawable-hdpi/share_qq_logo.webp (100%) rename {app => module_common}/src/main/res/drawable-hdpi/share_qzone_logo.webp (100%) rename {app => module_common}/src/main/res/drawable-hdpi/share_save.webp (100%) rename {app => module_common}/src/main/res/drawable-hdpi/share_shortmessage_logo.webp (100%) rename {app => module_common}/src/main/res/drawable-hdpi/share_sinaweibo_logo.webp (100%) rename {app => module_common}/src/main/res/drawable-hdpi/share_wechat_logo.webp (100%) rename {app => module_common}/src/main/res/drawable-hdpi/share_wechatmoments_logo.webp (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/share_qq.webp (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/share_qq_zone.webp (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/share_wechat.webp (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/share_wechat_moments.webp (100%) rename {app => module_common}/src/main/res/drawable-xxhdpi/share_weibo.webp (100%) rename {app => module_common}/src/main/res/drawable/bg_share_dialog.xml (100%) rename {app => module_common}/src/main/res/drawable/cardview_item_style.xml (100%) rename {app => module_common}/src/main/res/drawable/reuse_listview_item_style.xml (100%) rename {app => module_common}/src/main/res/layout/dialog_alert.xml (93%) rename {app => module_common}/src/main/res/layout/popup_share_dialog.xml (100%) rename {app => module_common}/src/main/res/layout/share_popup_item.xml (100%) rename {app => module_common}/src/main/res/layout/share_popup_layout.xml (100%) rename {app => module_common}/src/release/java/com/gh/gamecenter/Injection.java (100%) create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IDownloadManagerProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IEnergyTaskProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IEntranceUtilsProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IPackageHelperProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IPackageInstallerProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IQuickLoginProvider.kt rename {app/src/main/java/com/gh/common/util => module_core/src/main/java/com/gh/gamecenter/core/utils}/IntentUtils.java (59%) diff --git a/app/build.gradle b/app/build.gradle index 62159d4ec2..4e4402af4b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -203,7 +203,7 @@ dependencies { testImplementation 'junit:junit:4.12' debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakcanary}" - debugImplementation "com.squareup.okhttp3:logging-interceptor:${okHttp}" + // debugImplementation "com.gu.android:toolargetool:${toolargetool}" // 需要使用调试时才启用 debugImplementation "com.github.nichbar:WhatTheStack:${whatTheStack}" debugImplementation "io.github.didi.dokit:dokitx:${dokit}" @@ -214,8 +214,6 @@ dependencies { implementation "androidx.annotation:annotation:${annotation}" - implementation "androidx.room:room-runtime:${room}" - implementation "androidx.room:room-rxjava2:${room}" implementation "androidx.viewpager2:viewpager2:${viewpager2}" kapt "androidx.room:room-compiler:${room}" @@ -230,8 +228,6 @@ dependencies { implementation "com.google.android:flexbox:${flexbox}" - implementation "pub.devrel:easypermissions:${easypermissions}" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "com.contrarywind:Android-PickerView:${pickerView}" @@ -253,10 +249,7 @@ dependencies { implementation "com.llew.huawei:verifier:${verifier}" implementation "com.lg:skeleton:${skeleton}" - implementation "com.tencent.mm.opensdk:wechat-sdk-android-without-mta:${mta}" - debugImplementation "com.github.nichbar.chucker:library:${chucker}" - releaseImplementation "com.github.nichbar.chucker:library-no-op:${chucker}" teaImplementation "com.bytedance.applog:RangersAppLog-Lite-cn:${bytedanceApplog}" implementation "com.aliyun.dpa:oss-android-sdk:${oss}" @@ -266,7 +259,6 @@ dependencies { implementation "com.github.hsiafan:apk-parser:${apkParser}" implementation "org.nanohttpd:nanohttpd:${nanohttpd}" - implementation "com.aliyun.openservices:aliyun-log-android-sdk:${aliyunLog}" implementation "com.lg:easyfloat:${easyFloat}" implementation "io.github.florent37:shapeofview:${shapeOfView}" diff --git a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt index 407264e00f..bf67741269 100644 --- a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt +++ b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt @@ -15,6 +15,8 @@ import android.widget.FrameLayout import android.widget.TextView import androidx.lifecycle.Observer import com.gh.common.util.* +import com.gh.common.util.DialogUtils +import com.gh.common.util.NewLogUtils import com.gh.common.view.RichEditor import com.gh.gamecenter.CropImageActivity import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt b/app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt index ed11356911..c632d1db8b 100644 --- a/app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt +++ b/app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt @@ -19,7 +19,7 @@ import com.gh.gamecenter.entity.ErrorEntity import com.gh.gamecenter.entity.LocalVideoEntity import com.gh.gamecenter.entity.QuoteCountEntity import com.gh.gamecenter.qa.BbsType -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.retrofit.service.ApiService import com.gh.gamecenter.video.upload.OnUploadListener diff --git a/app/src/main/java/com/gh/base/ToolBarActivity.java b/app/src/main/java/com/gh/base/ToolBarActivity.java index cc19f8e0f4..1934a98abf 100644 --- a/app/src/main/java/com/gh/base/ToolBarActivity.java +++ b/app/src/main/java/com/gh/base/ToolBarActivity.java @@ -27,6 +27,7 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProviders; import com.facebook.drawee.view.SimpleDraweeView; +import com.gh.gamecenter.common.base.BaseActivity; import com.gh.gamecenter.common.constant.Constants; import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.common.utils.ImageUtils; diff --git a/app/src/main/java/com/gh/common/DefaultJsApi.kt b/app/src/main/java/com/gh/common/DefaultJsApi.kt index 3d965a8f6e..5456a8dc5c 100644 --- a/app/src/main/java/com/gh/common/DefaultJsApi.kt +++ b/app/src/main/java/com/gh/common/DefaultJsApi.kt @@ -10,9 +10,10 @@ import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.FragmentActivity import com.gh.gamecenter.core.utils.CurrentActivityHolder import com.gh.gamecenter.common.constant.Constants -import com.gh.common.loghub.LoghubUtils -import com.gh.common.tracker.Tracker +import com.gh.gamecenter.common.loghub.LoghubUtils +import com.gh.gamecenter.common.tracker.Tracker import com.gh.common.util.* +import com.gh.common.util.LogUtils import com.gh.gamecenter.common.view.dsbridge.CompletionHandler import com.gh.gamecenter.* import com.gh.gamecenter.BuildConfig diff --git a/app/src/main/java/com/gh/common/FixedRateJobHelper.kt b/app/src/main/java/com/gh/common/FixedRateJobHelper.kt index c832efebd4..4f39d60084 100644 --- a/app/src/main/java/com/gh/common/FixedRateJobHelper.kt +++ b/app/src/main/java/com/gh/common/FixedRateJobHelper.kt @@ -2,13 +2,13 @@ package com.gh.common import com.gh.common.exposure.ExposureManager import com.gh.common.filter.RegionSettingHelper -import com.gh.common.loghub.LoghubUtils +import com.gh.gamecenter.common.loghub.LoghubUtils import com.gh.gamecenter.common.utils.doOnMainProcessOnly import com.gh.gamecenter.common.utils.tryCatchInRelease import com.gh.common.videolog.VideoRecordUtils import com.gh.download.DownloadDataHelper import com.gh.gamecenter.entity.TimeEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.schedulers.Schedulers 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 6ea570f0d4..4cc5abb9b2 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -21,8 +21,8 @@ import com.gh.gamecenter.entity.NewSettingsEntity; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.entity.SettingsEntity; import com.gh.gamecenter.eventbus.EBReuse; -import com.gh.gamecenter.retrofit.BiResponse; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.BiResponse; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; import com.lightgame.utils.Utils; 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 9247fda040..1da047ca1c 100644 --- a/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt @@ -18,6 +18,7 @@ import androidx.recyclerview.widget.RecyclerView import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* +import com.gh.common.util.LogUtils import com.gh.gamecenter.common.view.CustomLinkMovementMethod import com.gh.download.DownloadManager import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/common/exposure/ExposureConverters.kt b/app/src/main/java/com/gh/common/exposure/ExposureConverters.kt index c0f3f1e47e..8b3392b110 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureConverters.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureConverters.kt @@ -1,6 +1,7 @@ package com.gh.common.exposure import androidx.room.TypeConverter +import com.gh.gamecenter.common.entity.ExposureEntity import com.gh.gamecenter.common.exposure.meta.Meta import com.gh.gamecenter.core.utils.GsonUtils import java.util.* diff --git a/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt b/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt index dbbb1f432a..9b5ff1cc4d 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt @@ -10,6 +10,7 @@ import com.gh.gamecenter.common.exposure.meta.MetaUtil import com.gh.common.exposure.time.TimeUtil import com.gh.gamecenter.common.utils.getFirstElementDividedByDivider import com.gh.download.server.BrowserInstallHelper +import com.gh.gamecenter.common.entity.ExposureEntity import com.gh.gamecenter.entity.GameEntity import com.lightgame.download.DownloadEntity import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/com/gh/common/exposure/ExposureManager.kt b/app/src/main/java/com/gh/common/exposure/ExposureManager.kt index efd3e8c359..2251c86967 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureManager.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureManager.kt @@ -1,7 +1,7 @@ package com.gh.common.exposure import com.aliyun.sls.android.producer.Log -import com.gh.common.loghub.LoghubHelper +import com.gh.gamecenter.common.loghub.LoghubHelper import com.gh.gamecenter.common.utils.toJson import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.BuildConfig 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 cc77e81de6..b5eae07f58 100644 --- a/app/src/main/java/com/gh/common/filter/RegionSettingHelper.kt +++ b/app/src/main/java/com/gh/common/filter/RegionSettingHelper.kt @@ -8,7 +8,7 @@ import com.gh.gamecenter.common.utils.toJson import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.R import com.gh.gamecenter.entity.GameEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.functions.Function diff --git a/app/src/main/java/com/gh/common/provider/AppProviderImpl.kt b/app/src/main/java/com/gh/common/provider/AppProviderImpl.kt index 8fcd73b563..c6b3069776 100644 --- a/app/src/main/java/com/gh/common/provider/AppProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/AppProviderImpl.kt @@ -2,6 +2,7 @@ package com.gh.common.provider import android.content.Context import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.gamecenter.R import com.gh.gamecenter.common.constant.RouteConsts import com.gh.gamecenter.core.provider.IAppProvider import com.halo.assistant.HaloApp @@ -12,6 +13,10 @@ class AppProviderImpl : IAppProvider { } + override fun getAppName(): String { + return HaloApp.getInstance().getString(R.string.app_name) + } + override fun getGid(): String { return HaloApp.getInstance().gid ?: "" } @@ -24,10 +29,22 @@ class AppProviderImpl : IAppProvider { return HaloApp.getInstance().channel ?: "" } + override fun getUserAgent(): String { + return HaloApp.getInstance().userAgent ?: "" + } + + override fun getServerUserMark(): String { + return HaloApp.getInstance().serverUserMark ?: "" + } + override fun getDeviceRamSize(): Long { return HaloApp.getInstance().deviceRamSize } + override fun getTemporaryLocalDeviceId(): String { + return HaloApp.getInstance().temporaryLocalDeviceId ?: "" + } + override fun isUserAcceptPrivacyPolicy(context: Context): Boolean { return HaloApp.isUserAcceptPrivacyPolicy(context) } diff --git a/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt b/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt index 80df61465e..50d5c1aaf1 100644 --- a/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt @@ -8,6 +8,14 @@ import com.gh.gamecenter.core.provider.IConfigProvider @Route(path = RouteConsts.provider.config, name = "Config暴露服务") class ConfigProviderImpl : IConfigProvider { + override fun getTencentAppId(): String { + return Config.TENCENT_APPID + } + + override fun getWechatAppId(): String { + return Config.WECHAT_APPID + } + override fun getUploadLimitSize(): Long { return Config.getSettings()?.image?.uploadLimitSize ?: 0L } @@ -44,6 +52,10 @@ class ConfigProviderImpl : IConfigProvider { return Config.getSettings()?.image?.oss?.gifWaterMark ?: "" } + override fun getQQ(): String { + return Config.getSettings()?.support?.qq ?: "" + } + override fun init(context: Context?) { } diff --git a/app/src/main/java/com/gh/common/provider/DialogUtilsProviderImpl.kt b/app/src/main/java/com/gh/common/provider/DialogUtilsProviderImpl.kt index 3810409211..4f52bcd881 100644 --- a/app/src/main/java/com/gh/common/provider/DialogUtilsProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/DialogUtilsProviderImpl.kt @@ -3,6 +3,7 @@ package com.gh.common.provider import android.content.Context import com.alibaba.android.arouter.facade.annotation.Route import com.gh.common.util.DialogUtils +import com.gh.gamecenter.common.callback.CancelListener import com.gh.gamecenter.common.callback.ConfirmListener import com.gh.gamecenter.common.constant.RouteConsts import com.gh.gamecenter.core.provider.IDialogUtilsProvider @@ -14,7 +15,11 @@ class DialogUtilsProviderImpl : IDialogUtilsProvider { override fun onConfirm() { confirm.invoke() } - }, cancel) + }, object :CancelListener{ + override fun onCancel() { + cancel.invoke() + } + }) } override fun init(context: Context?) { diff --git a/app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt b/app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt index be9f102e6e..b3016ccd36 100644 --- a/app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt @@ -17,6 +17,10 @@ class DirectProviderImpl : IDirectProvider { DirectUtils.directToRegulationTestPage(context) } + override fun directToQqConversation(context: Context, qq: String) { + DirectUtils.directToQqConversation(context, qq) + } + override fun init(context: Context?) { } diff --git a/app/src/main/java/com/gh/common/provider/DownloadManagerProviderImpl.kt b/app/src/main/java/com/gh/common/provider/DownloadManagerProviderImpl.kt new file mode 100644 index 0000000000..e2abd7407f --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/DownloadManagerProviderImpl.kt @@ -0,0 +1,21 @@ +package com.gh.common.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.download.DownloadManager +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IDownloadManagerProvider +import com.lightgame.download.DownloadEntity + +@Route(path = RouteConsts.provider.downloadManager, name = "DownloadManager暴露服务") +class DownloadManagerProviderImpl : IDownloadManagerProvider { + + override fun getDownloadEntityByUrl(url: String): DownloadEntity? { + return DownloadManager.getInstance().getDownloadEntityByUrl(url) + } + + override fun init(context: Context?) { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/EnergyTaskProviderImpl.kt b/app/src/main/java/com/gh/common/provider/EnergyTaskProviderImpl.kt new file mode 100644 index 0000000000..b78a5e072a --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/EnergyTaskProviderImpl.kt @@ -0,0 +1,23 @@ +package com.gh.common.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.common.util.EnergyTaskHelper +import com.gh.common.util.IntegralLogHelper +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IEnergyTaskProvider + +@Route(path = RouteConsts.provider.energyTask, name = "EnergyTask暴露服务") +class EnergyTaskProviderImpl : IEnergyTaskProvider { + override fun postEnergyTaskForShare(type: String, id: String, url: String) { + EnergyTaskHelper.postEnergyTaskForShare(type, id, url) + } + + override fun logInviteResult(result: String, type: String?) { + IntegralLogHelper.logInviteResult(result, type) + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/EntranceUtilsProviderImpl.kt b/app/src/main/java/com/gh/common/provider/EntranceUtilsProviderImpl.kt new file mode 100644 index 0000000000..a0513771e4 --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/EntranceUtilsProviderImpl.kt @@ -0,0 +1,23 @@ +package com.gh.common.provider + +import android.content.Context +import android.os.Bundle +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.common.util.EntranceUtils +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IEntranceUtilsProvider + +@Route(path = RouteConsts.provider.entranceUtils, name = "EntranceUtils暴露服务") +class EntranceUtilsProviderImpl: IEntranceUtilsProvider { + override fun jumpActivity(context: Context, bundle: Bundle) { + EntranceUtils.jumpActivity(context, bundle) + } + + override fun saveShortcut(activityName: String, bundle: Bundle?) { + EntranceUtils.saveShortcut(activityName, bundle) + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/PackageHelperProviderImpl.kt b/app/src/main/java/com/gh/common/provider/PackageHelperProviderImpl.kt new file mode 100644 index 0000000000..ccec3a5736 --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/PackageHelperProviderImpl.kt @@ -0,0 +1,19 @@ +package com.gh.common.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.common.util.PackageHelper +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IPackageHelperProvider + +@Route(path = RouteConsts.provider.packageHelper, name = "PackageHelper暴露服务") +class PackageHelperProviderImpl : IPackageHelperProvider { + + override fun getLocalPackageNameSet(): HashSet { + return PackageHelper.localPackageNameSet + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/PackageInstallerProviderImpl.kt b/app/src/main/java/com/gh/common/provider/PackageInstallerProviderImpl.kt new file mode 100644 index 0000000000..f12ce97d2e --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/PackageInstallerProviderImpl.kt @@ -0,0 +1,24 @@ +package com.gh.common.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.common.util.PackageInstaller +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IPackageInstallerProvider +import com.lightgame.download.DownloadEntity + +@Route(path = RouteConsts.provider.packageInstaller, name = "PackageInstaller暴露服务") +class PackageInstallerProviderImpl : IPackageInstallerProvider { + + override fun install(context: Context, downloadEntity: DownloadEntity, showUnzipToast: Boolean) { + PackageInstaller.install(context, downloadEntity, showUnzipToast) + } + + override fun uninstall(context: Context, path: String) { + PackageInstaller.uninstall(context, path) + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/PackageUtilsProviderImpl.kt b/app/src/main/java/com/gh/common/provider/PackageUtilsProviderImpl.kt index 4a94aa16b3..1d41e2fc21 100644 --- a/app/src/main/java/com/gh/common/provider/PackageUtilsProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/PackageUtilsProviderImpl.kt @@ -1,6 +1,7 @@ package com.gh.common.provider import android.content.Context +import android.content.pm.PackageInfo import com.alibaba.android.arouter.facade.annotation.Route import com.gh.common.util.PackageUtils import com.gh.gamecenter.common.constant.RouteConsts @@ -16,6 +17,18 @@ class PackageUtilsProviderImpl : IPackageUtilsProvider { return PackageUtils.getGhVersionName() } + override fun getInstalledPackages(context: Context, flag: Int): List { + return PackageUtils.getInstalledPackages(context, flag) + } + + override fun getApkSignatureByPackageName(context: Context, packageName: String): Array { + return PackageUtils.getApkSignatureByPackageName(context, packageName) + } + + override fun getSideLoadedInfo(): MutableMap? { + return PackageUtils.getSideLoadedInfo() + } + override fun init(context: Context?) { } diff --git a/app/src/main/java/com/gh/common/provider/QuickLoginProviderImpl.kt b/app/src/main/java/com/gh/common/provider/QuickLoginProviderImpl.kt new file mode 100644 index 0000000000..369322fd73 --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/QuickLoginProviderImpl.kt @@ -0,0 +1,19 @@ +package com.gh.common.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.common.util.QuickLoginHelper +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IQuickLoginProvider + +@Route(path = RouteConsts.provider.quickLogin, name = "一键登录暴露服务") +class QuickLoginProviderImpl : IQuickLoginProvider { + + override fun startLogin(context: Context, entrance: String) { + QuickLoginHelper.startLogin(context, entrance) + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt b/app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt index c208ca2030..e17e64cce9 100644 --- a/app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt @@ -16,6 +16,22 @@ class UserManagerProviderImpl: IUserManagerProvider { return UserManager.getInstance().userId } + override fun getToken(): String { + return UserManager.getInstance().token + } + + override fun refreshToken(accessToken: String, success: () -> Unit, fail: (String?) -> Unit) { + UserManager.getInstance().refreshToken(accessToken, object : UserManager.refreshCallBack { + override fun onLogin() { + success.invoke() + } + + override fun onLoginFailure(errorMessage: String?) { + fail.invoke(errorMessage) + } + }) + } + override fun init(context: Context?) { } 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 4f7d952763..68ba47ec06 100644 --- a/app/src/main/java/com/gh/common/repository/ReservationRepository.kt +++ b/app/src/main/java/com/gh/common/repository/ReservationRepository.kt @@ -3,7 +3,7 @@ package com.gh.common.repository import android.annotation.SuppressLint import com.gh.common.util.CheckLoginUtils import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Utils 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 c6ca6c3e99..1e380c5700 100644 --- a/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt +++ b/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt @@ -13,6 +13,7 @@ import com.gh.gamecenter.core.AppExecutor.uiExecutor import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.base.TrackableDialog import com.gh.common.util.* +import com.gh.common.util.LogUtils import com.gh.download.DownloadManager import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.* 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 3194cd20f3..dc2cb49cc8 100644 --- a/app/src/main/java/com/gh/common/simulator/SimulatorGameManager.kt +++ b/app/src/main/java/com/gh/common/simulator/SimulatorGameManager.kt @@ -9,6 +9,7 @@ import android.text.TextUtils import com.g00fy2.versioncompare.Version import com.gh.gamecenter.common.json.json import com.gh.common.util.* +import com.gh.common.util.LogUtils import com.gh.download.DownloadManager import com.gh.gamecenter.common.callback.BiCallback import com.gh.gamecenter.common.utils.* @@ -16,9 +17,9 @@ import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.SimulatorGameRecordEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.EmptyResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.EmptyResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.room.AppDatabase import com.halo.assistant.HaloApp 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 65560c0a90..ee77fd1d0b 100644 --- a/app/src/main/java/com/gh/common/util/ActivationHelper.kt +++ b/app/src/main/java/com/gh/common/util/ActivationHelper.kt @@ -1,7 +1,7 @@ package com.gh.common.util import com.gh.gamecenter.core.utils.SPUtils -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.schedulers.Schedulers import okhttp3.ResponseBody 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 e32120a066..3f77de2187 100644 --- a/app/src/main/java/com/gh/common/util/AdHelper.kt +++ b/app/src/main/java/com/gh/common/util/AdHelper.kt @@ -6,7 +6,7 @@ import com.gh.common.constant.Config import com.gh.gamecenter.common.utils.NetworkUtils import com.gh.gamecenter.entity.SettingsEntity import com.gh.gamecenter.entity.StartupAdEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.schedulers.Schedulers 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 293e921cea..d7dc7b0605 100644 --- a/app/src/main/java/com/gh/common/util/BbsReportHelper.kt +++ b/app/src/main/java/com/gh/common/util/BbsReportHelper.kt @@ -21,7 +21,7 @@ import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.common.utils.toRequestBody import com.gh.gamecenter.databinding.DialogReportReasonBinding import com.gh.gamecenter.entity.SettingsEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.android.schedulers.AndroidSchedulers 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 2500cd6018..b2185e4091 100644 --- a/app/src/main/java/com/gh/common/util/BbsStayTimeHelper.kt +++ b/app/src/main/java/com/gh/common/util/BbsStayTimeHelper.kt @@ -15,7 +15,7 @@ import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity import com.gh.gamecenter.qa.comment.CommentActivity import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.android.schedulers.AndroidSchedulers 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 691df5349c..3d62483ca4 100644 --- a/app/src/main/java/com/gh/common/util/CollectionUtils.kt +++ b/app/src/main/java/com/gh/common/util/CollectionUtils.kt @@ -3,7 +3,7 @@ package com.gh.common.util import android.content.Context import com.gh.gamecenter.eventbus.EBCollectionChanged import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers 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 171743f406..932d8b5536 100644 --- a/app/src/main/java/com/gh/common/util/CommentHelper.kt +++ b/app/src/main/java/com/gh/common/util/CommentHelper.kt @@ -19,7 +19,7 @@ import com.gh.gamecenter.entity.MeEntity import com.gh.gamecenter.entity.Permissions import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.comment.OnCommentOptionClickListener -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Utils 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 d43bf9ce9c..b6a583c01e 100644 --- a/app/src/main/java/com/gh/common/util/CommentUtils.java +++ b/app/src/main/java/com/gh/common/util/CommentUtils.java @@ -27,8 +27,8 @@ import com.gh.gamecenter.entity.CommentEntity; import com.gh.gamecenter.entity.MeEntity; import com.gh.gamecenter.entity.UserInfoEntity; import com.gh.gamecenter.manager.UserManager; -import com.gh.gamecenter.retrofit.BiResponse; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.BiResponse; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; import com.lightgame.utils.Utils; 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 058763efb3..a176f70bda 100644 --- a/app/src/main/java/com/gh/common/util/ConcernUtils.kt +++ b/app/src/main/java/com/gh/common/util/ConcernUtils.kt @@ -4,7 +4,7 @@ import android.content.Context import android.text.TextUtils import com.gh.gamecenter.eventbus.EBConcernChanged import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/gh/common/util/DataLogUtils.java b/app/src/main/java/com/gh/common/util/DataLogUtils.java index 28a2405e1a..9cf1452caa 100644 --- a/app/src/main/java/com/gh/common/util/DataLogUtils.java +++ b/app/src/main/java/com/gh/common/util/DataLogUtils.java @@ -3,7 +3,7 @@ package com.gh.common.util; import android.content.Context; import com.gh.gamecenter.common.exposure.meta.MetaUtil; -import com.gh.common.loghub.LoghubUtils; +import com.gh.gamecenter.common.loghub.LoghubUtils; import com.gh.gamecenter.common.utils.Installation; import com.halo.assistant.HaloApp; import com.lightgame.download.DownloadEntity; 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 8f108c9119..d0cab3d584 100644 --- a/app/src/main/java/com/gh/common/util/DataUtils.java +++ b/app/src/main/java/com/gh/common/util/DataUtils.java @@ -14,7 +14,7 @@ import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.core.utils.SPUtils; import com.gh.gamecenter.entity.UserInfoEntity; -import com.gh.gamecenter.retrofit.BiResponse; +import com.gh.gamecenter.common.retrofit.BiResponse; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gid.GidCallback; import com.gh.gid.GidHelper; 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 b282020620..03697ca8ed 100644 --- a/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt +++ b/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt @@ -6,7 +6,7 @@ import android.preference.PreferenceManager import com.gh.gamecenter.common.exposure.meta.MetaUtil import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.entity.TimeEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Utils diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index e3a369f27f..17f92ea226 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -50,26 +50,27 @@ import androidx.recyclerview.widget.RecyclerView; import com.facebook.drawee.generic.GenericDraweeHierarchy; import com.facebook.drawee.view.SimpleDraweeView; import com.gh.common.constant.Config; -import com.gh.gamecenter.common.view.DrawableView; -import com.gh.gamecenter.common.view.FixLinearLayoutManager; -import com.gh.gamecenter.common.view.LimitHeightLinearLayout; -import com.gh.gamecenter.common.view.MaxHeightNestedScrollView; -import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.adapter.ReportReasonAdapter; import com.gh.gamecenter.adapter.viewholder.PrivacyPolicyItemViewHolder; import com.gh.gamecenter.common.base.TrackableDialog; +import com.gh.gamecenter.common.callback.CancelListener; import com.gh.gamecenter.common.callback.ConfirmListener; import com.gh.gamecenter.common.callback.SimpleCallback; import com.gh.gamecenter.common.databinding.DialogAlertDefaultBinding; import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.gamecenter.common.utils.NetworkUtils; import com.gh.gamecenter.common.view.CustomLinkMovementMethod; +import com.gh.gamecenter.common.view.DrawableView; +import com.gh.gamecenter.common.view.FixLinearLayoutManager; +import com.gh.gamecenter.common.view.LimitHeightLinearLayout; +import com.gh.gamecenter.common.view.MaxHeightNestedScrollView; +import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.gamecenter.core.AppExecutor; import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.core.utils.EmptyCallback; -import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.core.utils.SpanBuilder; import com.gh.gamecenter.core.utils.StringUtils; @@ -208,30 +209,8 @@ public class DialogUtils { dialog.show(); } - public static void showWarningDialog(Context context, String title, CharSequence msg, final ConfirmListener listener) { - if (!(context instanceof Activity)) { - return; - } - showWarningDialog(context, title, msg, "取消", "确定", listener, null); - } - public static void showWarningDialog(Context context, String title, CharSequence msg, String cancel, String confirm, - final ConfirmListener cmListener, final CancelListener clListener) { - showAlertDialog(context, title, msg, confirm, cancel, cmListener, clListener); - } - - // 网络劫持时 打开QQ客户端，创建临时会话 - public static void showQqSessionDialog(final Context context) { - String qq = ""; - if (Config.getSettings() != null && Config.getSettings().getSupport() != null) { - qq = Config.getSettings().getSupport().getQq(); - } - String finalQq = qq; - showWarningDialog(context, "警告", "您当前网络环境异常，下载地址可能被运营商恶意替换（网络劫持）" + - "，如多次下载失败，请联系客服获取正确的下载地址（客服QQ：" + qq + "）" - , "取消", "前往QQ", () -> DirectUtils.directToQqConversation(context, finalQq), null); - } public static void checkDownload(Context context, String size, CheckDownloadCallBack callBack) { SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication()); @@ -285,7 +264,7 @@ public class DialogUtils { } public static void showNoConnectionDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) { - showWarningDialog(context, "下载提示", "网络异常，请检查手机网络状态", "连上WiFi后自动下载", "关闭", listener, cancelListener); + com.gh.gamecenter.common.utils.DialogUtils.showWarningDialog(context, "下载提示", "网络异常，请检查手机网络状态", "连上WiFi后自动下载", "关闭", listener, cancelListener); } public static void showDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) { @@ -334,11 +313,11 @@ public class DialogUtils { } public static void showResumeDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) { - showWarningDialog(context, "下载提示", "当前正在使用移动网络，继续下载会消耗手机流量", "连上WiFi后自动下载", "继续下载", listener, cancelListener); + com.gh.gamecenter.common.utils.DialogUtils.showWarningDialog(context, "下载提示", "当前正在使用移动网络，继续下载会消耗手机流量", "连上WiFi后自动下载", "继续下载", listener, cancelListener); } public static void showDownloadDialog(Context context, ConfirmListener listener) { - showWarningDialog(context, "下载提示", "您当前使用的网络为2G/3G/4G，开始下载将会消耗移动流量，确定下载？", listener); + com.gh.gamecenter.common.utils.DialogUtils.showWarningDialog(context, "下载提示", "您当前使用的网络为2G/3G/4G，开始下载将会消耗移动流量，确定下载？", listener); } public static void showCancelDialog(Context context, final ConfirmListener listener, CancelListener cancelListener) { @@ -432,93 +411,7 @@ public class DialogUtils { return showNewAlertDialog(context, title, message, negative, positive, null, gravity, shouldShowCloseBtn, clListener, cmListener); } - /** - * Material Design 风格弹窗 - * - * @param context - * @param title 标题 - * @param message 内容 - * @param positive 确认按钮文本 - * @param negative 取消按钮文本 - * @param cmListener 确认按钮监听 - * @param clListener 取消按钮监听 - */ - public static Dialog showAlertDialog(Context context, String title, CharSequence message - , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) { - context = checkDialogContext(context); - final Dialog dialog = new Dialog(context, R.style.GhAlertDialog); - - View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null); - TextView contentTv = contentView.findViewById(R.id.dialog_content); - TextView titleTv = contentView.findViewById(R.id.dialog_title); - TextView negativeTv = contentView.findViewById(R.id.dialog_negative); - TextView positiveTv = contentView.findViewById(R.id.dialog_positive); - if (message.toString().contains("红包奖励")) {//将红包奖励四个字标红 - String str = message.toString().substring(0, message.toString().indexOf("红包奖励")) + "红包奖励"; - contentTv.setText(Html.fromHtml(str)); - } else { - contentTv.setText(message); - } - titleTv.setText(title); - negativeTv.setText(negative); - positiveTv.setText(positive); - - negativeTv.setOnClickListener(view -> { - if (clListener != null) { - clListener.onCancel(); - } - dialog.dismiss(); - }); - - positiveTv.setOnClickListener(view -> { - if (cmListener != null) { - cmListener.onConfirm(); - } - dialog.dismiss(); - }); - - dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); - dialog.setContentView(contentView); - dialog.show(); - return dialog; - } - - public static Dialog showAlertDialog(Context context, String title, Spanned message - , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) { - context = checkDialogContext(context); - - final Dialog dialog = new Dialog(context, R.style.GhAlertDialog); - - View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null); - TextView contentTv = contentView.findViewById(R.id.dialog_content); - TextView titleTv = contentView.findViewById(R.id.dialog_title); - TextView negativeTv = contentView.findViewById(R.id.dialog_negative); - TextView positiveTv = contentView.findViewById(R.id.dialog_positive); - contentTv.setText(message); - titleTv.setText(title); - negativeTv.setText(negative); - positiveTv.setText(positive); - - negativeTv.setOnClickListener(view -> { - if (clListener != null) { - clListener.onCancel(); - } - dialog.dismiss(); - }); - - positiveTv.setOnClickListener(view -> { - if (cmListener != null) { - cmListener.onConfirm(); - } - dialog.dismiss(); - }); - - dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); - dialog.setContentView(contentView); - dialog.show(); - return dialog; - } public static Dialog showDialogWithHtmlContent(Context context, String title, String content , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) { @@ -2296,10 +2189,6 @@ public class DialogUtils { return AppManager.getInstance().currentActivity(); } - public interface CancelListener { - void onCancel(); - } - public interface OptionCallback { void onClicked(String text); } 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 a495ea9974..b351712304 100644 --- a/app/src/main/java/com/gh/common/util/DirectUtils.kt +++ b/app/src/main/java/com/gh/common/util/DirectUtils.kt @@ -9,7 +9,7 @@ import android.os.Build import android.os.Bundle import android.text.TextUtils import androidx.appcompat.app.AppCompatActivity -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.base.BaseActivity_TabLayout import com.gh.base.ToolBarActivity import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout @@ -19,7 +19,6 @@ import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureEvent.Companion.createEvent import com.gh.common.exposure.ExposureManager.log -import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.ExposureTraceUtils.appendTrace import com.gh.common.exposure.ExposureType import com.gh.gamecenter.common.constant.EntranceConsts.* @@ -30,11 +29,8 @@ import com.gh.gamecenter.catalog.CatalogActivity import com.gh.gamecenter.category.CategoryDirectoryActivity import com.gh.gamecenter.category2.CategoryV2Activity import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.RunningUtils -import com.gh.gamecenter.common.utils.copyTextAndToast -import com.gh.gamecenter.common.utils.isPublishEnv -import com.gh.gamecenter.common.utils.EnvHelper import com.gh.gamecenter.download.DownloadFragment.Companion.INDEX_UPDATE import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.EBSkip @@ -61,7 +57,7 @@ import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity import com.gh.gamecenter.qa.subject.CommunitySubjectActivity import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.security.BindPhoneActivity import com.gh.gamecenter.servers.GameServerTestActivity 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 ed46db9488..470dc32a87 100644 --- a/app/src/main/java/com/gh/common/util/DownloadHelper.kt +++ b/app/src/main/java/com/gh/common/util/DownloadHelper.kt @@ -4,7 +4,7 @@ import com.gh.common.filter.RegionSettingHelper import com.gh.download.DownloadManager import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.entity.GameEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.schedulers.Schedulers 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 6a7c67eb17..59b21dbce2 100644 --- a/app/src/main/java/com/gh/common/util/DownloadObserver.kt +++ b/app/src/main/java/com/gh/common/util/DownloadObserver.kt @@ -2,7 +2,7 @@ package com.gh.common.util import android.os.Build import android.preference.PreferenceManager -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureUtils import com.gh.gamecenter.common.exposure.meta.MetaUtil @@ -21,8 +21,8 @@ import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.SimpleGameEntity import com.gh.gamecenter.entity.SimulatorEntity import com.gh.gamecenter.eventbus.EBDownloadStatus -import com.gh.gamecenter.eventbus.EBShowDialog -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.eventbus.EBShowDialog +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.setting.GameDownloadSettingFragment import com.gh.gamecenter.suggest.SuggestType @@ -191,7 +191,12 @@ object DownloadObserver { when { // TODO 插件化传 path 从 apk 中获取 packageName 的形式有可能出现拿不到 packageName 的情况 downloadEntity.isPluggable -> // 弹出插件化提示框 - EventBus.getDefault().post(EBShowDialog(BaseActivity.PLUGGABLE, downloadEntity.path)) + EventBus.getDefault().post( + EBShowDialog( + BaseActivity.PLUGGABLE, + downloadEntity.path + ) + ) downloadEntity.isPlugin -> Utils.toast(mApplication, downloadEntity.name + " - " + platform + " - 下载完成") else -> Utils.toast(mApplication, downloadEntity.name + " - 下载完成") } @@ -235,9 +240,19 @@ object DownloadObserver { } else { // 弹出卸载提示框 if (downloadEntity.isPlugin) { - EventBus.getDefault().post(EBShowDialog(BaseActivity.PLUGGABLE, downloadEntity.path)) + EventBus.getDefault().post( + EBShowDialog( + BaseActivity.PLUGGABLE, + downloadEntity.path + ) + ) } else { - EventBus.getDefault().post(EBShowDialog(BaseActivity.SIGNATURE_CONFLICT, downloadEntity.path)) + EventBus.getDefault().post( + EBShowDialog( + BaseActivity.SIGNATURE_CONFLICT, + downloadEntity.path + ) + ) } } } 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 77d6da4c3d..92f2756906 100644 --- a/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt +++ b/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt @@ -17,7 +17,7 @@ import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.energy.EnergyCenterActivity import com.gh.gamecenter.entity.EnergyTaskCompleteEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.AppManager import com.lightgame.utils.Utils diff --git a/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt b/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt index c2ad1d6d49..16241082e4 100644 --- a/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt +++ b/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt @@ -29,11 +29,11 @@ import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.PluginLocation import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.EmptyResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.EmptyResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.teenagermode.TeenagerModeActivity -import com.gh.gamecenter.user.ApiResponse +import com.gh.gamecenter.common.retrofit.ApiResponse import com.lightgame.download.FileUtils /** diff --git a/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt b/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt index c8c66353aa..5b3ddbd3a4 100644 --- a/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt +++ b/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt @@ -18,7 +18,7 @@ import com.gh.gamecenter.common.utils.singleToMain import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity import com.gh.gamecenter.gamecollection.square.GameCollectionSquareActivity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lzf.easyfloat.EasyFloat 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 9e579c3201..10854b67e0 100644 --- a/app/src/main/java/com/gh/common/util/GameSubstituteRepositoryHelper.kt +++ b/app/src/main/java/com/gh/common/util/GameSubstituteRepositoryHelper.kt @@ -10,8 +10,8 @@ import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.SubjectEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Utils diff --git a/app/src/main/java/com/gh/common/util/IntegralLogHelper.kt b/app/src/main/java/com/gh/common/util/IntegralLogHelper.kt index 086f97de3d..352401c30f 100644 --- a/app/src/main/java/com/gh/common/util/IntegralLogHelper.kt +++ b/app/src/main/java/com/gh/common/util/IntegralLogHelper.kt @@ -1,8 +1,8 @@ package com.gh.common.util -import com.gh.common.loghub.LoghubUtils.log -import com.gh.common.tracker.Tracker.launchId -import com.gh.common.tracker.Tracker.sessionId +import com.gh.gamecenter.common.loghub.LoghubUtils.log +import com.gh.gamecenter.common.tracker.Tracker.launchId +import com.gh.gamecenter.common.tracker.Tracker.sessionId import com.gh.gamecenter.common.utils.debugOnly import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.lightgame.utils.Utils 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 148460330c..486482c8c3 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -30,8 +30,8 @@ import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.geetest.GeetestUtils; import com.gh.gamecenter.manager.UserManager; -import com.gh.gamecenter.retrofit.JSONObjectResponse; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.JSONObjectResponse; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; import com.lightgame.utils.Utils; 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 e4b588f67b..e4e3709c61 100644 --- a/app/src/main/java/com/gh/common/util/LogUtils.java +++ b/app/src/main/java/com/gh/common/util/LogUtils.java @@ -1,6 +1,5 @@ package com.gh.common.util; -import android.annotation.SuppressLint; import android.app.Application; import android.content.Context; import android.os.Build; @@ -8,29 +7,25 @@ import android.text.TextUtils; import androidx.annotation.Nullable; -import com.gh.common.exposure.ExposureEntity; import com.gh.common.exposure.ExposureEvent; import com.gh.common.exposure.ExposureSource; -import com.gh.common.loghub.LoghubUtils; -import com.gh.common.loghub.SimpleLogContainerEntity; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.entity.ExposureEntity; import com.gh.gamecenter.common.exposure.meta.Meta; import com.gh.gamecenter.common.exposure.meta.MetaUtil; +import com.gh.gamecenter.common.loghub.LoghubUtils; +import com.gh.gamecenter.common.loghub.SimpleLogContainerEntity; import com.gh.gamecenter.common.utils.DeviceUtils; -import com.gh.gamecenter.common.utils.EnvHelper; import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.entity.CommunityEntity; import com.gh.gamecenter.entity.DetectionObjectEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.PackageDialogEntity; -import com.gh.gamecenter.entity.ShareResultEntity; import com.gh.gamecenter.entity.SpecialColumn; import com.gh.gamecenter.entity.StartupAdEntity; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.qa.entity.Questions; -import com.gh.gamecenter.retrofit.EmptyResponse; -import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; import com.lightgame.utils.Utils; @@ -41,10 +36,6 @@ import org.json.JSONObject; import java.util.ArrayList; import java.util.List; -import io.reactivex.schedulers.Schedulers; -import okhttp3.MediaType; -import okhttp3.RequestBody; - /** * Created by khy on 2/01/18. */ @@ -526,90 +517,6 @@ public class LogUtils { LoghubUtils.log(object, "event", false); } - public static void uploadShareEnter(String entrance, String url, String title, String summary, String resourceId) { - JSONObject object = new JSONObject(); - JSONObject payloadObject = new JSONObject(); - try { - object.put("action", "entrance_source"); - payloadObject.put("entrance", entrance); - payloadObject.put("url", url); - payloadObject.put("title", title); - payloadObject.put("summary", summary); - payloadObject.put("resource_id", resourceId); - object.put("payload", payloadObject); - } catch (JSONException e) { - e.printStackTrace(); - } - uploadShare(object); - } - - public static void uploadShareType(String shareType, String entrance, String url, String title, String summary, String resourceId) { - JSONObject object = new JSONObject(); - JSONObject payloadObject = new JSONObject(); - try { - object.put("action", "share_type"); - payloadObject.put("share_type", shareType); - payloadObject.put("entrance", entrance); - payloadObject.put("url", url); - payloadObject.put("title", title); - payloadObject.put("summary", summary); - payloadObject.put("resource_id", resourceId); - object.put("payload", payloadObject); - } catch (JSONException e) { - e.printStackTrace(); - } - uploadShare(object); - } - - @SuppressLint("CheckResult") - public static void uploadShareResult(String shareType, String entrance, String shareResult, String url, String title, String summary, String resourceId) { - JSONObject object = new JSONObject(); - JSONObject payloadObject = new JSONObject(); - try { - object.put("action", "share_result"); - payloadObject.put("share_type", shareType); - payloadObject.put("entrance", entrance); - payloadObject.put("share_result", shareResult); - payloadObject.put("url", url); - payloadObject.put("title", title); - payloadObject.put("summary", summary); - payloadObject.put("resource_id", resourceId); - object.put("payload", payloadObject); - } catch (JSONException e) { - e.printStackTrace(); - } - uploadShare(object); - - 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().getApi() - .postShareResult(body) - .subscribeOn(Schedulers.io()) - .subscribe(new EmptyResponse<>()); - - // 判断是否上报游戏单活动的"转发活动"任务 - postGameCollectionRepostActivityTaskCheck(url, shareResult); - } - - @SuppressLint("CheckResult") - public static void postGameCollectionRepostActivityTaskCheck(String url, String shareResult) { - if (!TextUtils.isEmpty(url) && "success".equals(shareResult)) { - String gameCollectionActivityUrl; - if (EnvHelper.isDevEnv()) { - gameCollectionActivityUrl = Constants.GAME_COLLECTION_ACTIVITY_ADDRESS_DEV; - } else { - gameCollectionActivityUrl = Constants.GAME_COLLECTION_ACTIVITY_ADDRESS; - } - if (url.contains(gameCollectionActivityUrl)) { - RetrofitManager.getInstance().getNewApi() - .postGameCollectionTask("repost_activity", "0") - .subscribeOn(Schedulers.io()) - .subscribe(new EmptyResponse<>()); - } - } - } - public static JSONObject getMetaObject() { Meta meta = MetaUtil.INSTANCE.getMeta(); JSONObject metaObject = new JSONObject(); 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 c883d4558c..4f5bdcf7dc 100644 --- a/app/src/main/java/com/gh/common/util/LoginUtils.java +++ b/app/src/main/java/com/gh/common/util/LoginUtils.java @@ -3,8 +3,8 @@ package com.gh.common.util; import android.content.Context; import com.gh.gamecenter.common.utils.DeviceUtils; -import com.gh.gamecenter.retrofit.JSONObjectResponse; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.JSONObjectResponse; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.utils.Utils; diff --git a/app/src/main/java/com/gh/common/util/MessageShareUtils.java b/app/src/main/java/com/gh/common/util/MessageShareUtils.java index b99399daff..64c8d7f9fb 100644 --- a/app/src/main/java/com/gh/common/util/MessageShareUtils.java +++ b/app/src/main/java/com/gh/common/util/MessageShareUtils.java @@ -33,6 +33,7 @@ import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.R; import com.gh.gamecenter.WeiBoShareActivity; import com.gh.gamecenter.common.utils.BitmapUtils; +import com.gh.gamecenter.common.utils.ShareUtils; import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.common.utils.ImageUtils; import com.lightgame.utils.Utils; 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 abaa7bfab1..a2b8d9223b 100644 --- a/app/src/main/java/com/gh/common/util/NewLogUtils.kt +++ b/app/src/main/java/com/gh/common/util/NewLogUtils.kt @@ -3,15 +3,13 @@ package com.gh.common.util import android.annotation.SuppressLint import com.gh.gamecenter.common.json.JsonObjectBuilder import com.gh.gamecenter.common.json.json -import com.gh.common.loghub.LoghubUtils -import com.gh.common.tracker.Tracker -import com.gh.gamecenter.common.utils.createRequestBody +import com.gh.gamecenter.common.loghub.LoghubUtils +import com.gh.gamecenter.common.tracker.Tracker import com.gh.gamecenter.common.utils.toRequestBody -import com.gh.gamecenter.entity.AdditionalParamsEntity import com.gh.gamecenter.entity.LinkEntity import com.gh.gamecenter.entity.QuoteCountEntity import com.gh.gamecenter.entity.WechatConfigEntity -import com.gh.gamecenter.retrofit.EmptyResponse +import com.gh.gamecenter.common.retrofit.EmptyResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import io.reactivex.schedulers.Schedulers @@ -572,29 +570,6 @@ object NewLogUtils { log(json, "bbs_community", false) } - //分享结果 - @JvmStatic - fun logShareResult(additionalParams: AdditionalParamsEntity? = null, shareResult: Boolean) { - val json = json { - "location" to "分享面板" - "event" to "share_result" - "meta" to LogUtils.getMetaObject() - "share_success" to shareResult - - additionalParams?.let { - "content_type" to it.contentType - "content_id" to it.contentId - "bbs_id" to it.bbsId - "bbs_type" to it.bbsType - "ref_user_id" to it.refUserId - } - - "launch_id" to Tracker.launchId - "session_id" to Tracker.sessionId - "timestamp" to System.currentTimeMillis() / 1000 - } - log(json, "bbs_community", false) - } //分享面板点击 fun logSharePanelClick(event: String, userId: String, contentType: String, contentId: String, bbsId: String, bbsType: String) { @@ -1745,26 +1720,6 @@ object NewLogUtils { log(json, "event", false) } - //浏览游戏单/游戏单详情相关点击 - @JvmStatic - fun logViewOrClickGameCollectionDetail( - event: String, - title: String, - id: String, - shareType: String = "" - ) { - val json = json { - "event" to event - "game_collect_title" to title - "game_collect_id" to id - if (shareType.isNotEmpty()) { - "share_type" to shareType - } - "timestamp" to System.currentTimeMillis() / 1000 - parseAndPutMeta().invoke(this) - } - log(json, "event", false) - } //游戏单视频相关 @JvmStatic 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 c967eaece6..f370c9e146 100644 --- a/app/src/main/java/com/gh/common/util/NewsUtils.java +++ b/app/src/main/java/com/gh/common/util/NewsUtils.java @@ -1,6 +1,5 @@ package com.gh.common.util; -import android.content.Context; import android.graphics.Color; import android.widget.TextView; @@ -8,7 +7,7 @@ import androidx.annotation.Nullable; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.NewsEntity; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import java.text.ParseException; @@ -20,7 +19,6 @@ import java.util.Locale; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; -import okhttp3.ResponseBody; public class NewsUtils { 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 844d40393e..aafbde2651 100644 --- a/app/src/main/java/com/gh/common/util/PackageInstaller.kt +++ b/app/src/main/java/com/gh/common/util/PackageInstaller.kt @@ -8,19 +8,19 @@ import android.net.Uri import android.os.Build import androidx.appcompat.app.AppCompatActivity import androidx.core.content.FileProvider -import com.gh.gamecenter.core.utils.CurrentActivityHolder -import com.gh.gamecenter.common.constant.Constants import com.gh.common.dialog.InstallPermissionDialogFragment import com.gh.common.xapk.XapkInstaller import com.gh.download.server.BrowserInstallHelper import com.gh.gamecenter.BuildConfig +import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.utils.DialogHelper -import com.gh.gamecenter.core.utils.SPUtils -import com.gh.gamecenter.core.utils.ToastUtils import com.gh.gamecenter.common.utils.getExtension import com.gh.gamecenter.common.utils.toRequestBody +import com.gh.gamecenter.core.utils.CurrentActivityHolder import com.gh.gamecenter.core.utils.MD5Utils -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.download.DownloadEntity 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 3b73673f32..1d5ccc7f4b 100644 --- a/app/src/main/java/com/gh/common/util/PlatformUtils.java +++ b/app/src/main/java/com/gh/common/util/PlatformUtils.java @@ -10,7 +10,7 @@ import com.gh.gamecenter.core.AppExecutor; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.PlatformEntity; import com.gh.gamecenter.eventbus.EBReuse; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; import com.lightgame.download.FileUtils; 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 0484f050a8..e65cd1f0a5 100644 --- a/app/src/main/java/com/gh/common/util/PostCommentUtils.java +++ b/app/src/main/java/com/gh/common/util/PostCommentUtils.java @@ -6,8 +6,8 @@ import android.text.TextUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.CommentEntity; -import com.gh.gamecenter.retrofit.JSONObjectResponse; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.JSONObjectResponse; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.utils.Utils; import com.walkud.rom.checker.RomIdentifier; diff --git a/app/src/main/java/com/gh/common/util/QRCodeUtils.java b/app/src/main/java/com/gh/common/util/QRCodeUtils.java index 607de76cd2..256da6dda3 100644 --- a/app/src/main/java/com/gh/common/util/QRCodeUtils.java +++ b/app/src/main/java/com/gh/common/util/QRCodeUtils.java @@ -5,7 +5,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.widget.ImageView; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.google.zxing.BarcodeFormat; import com.google.zxing.EncodeHintType; import com.google.zxing.WriterException; 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 3a69700d8a..e3f2fd43b3 100644 --- a/app/src/main/java/com/gh/common/util/QuickLoginHelper.kt +++ b/app/src/main/java/com/gh/common/util/QuickLoginHelper.kt @@ -16,20 +16,23 @@ import com.cmic.sso.sdk.auth.AuthnHelper import com.cmic.sso.sdk.auth.LoginClickListener import com.cmic.sso.sdk.auth.TokenListener import com.gh.common.constant.Config -import com.gh.gamecenter.common.constant.Constants -import com.gh.gamecenter.common.utils.PermissionHelper.checkReadPhoneStatePermissionBeforeAction -import com.gh.gamecenter.core.utils.ToastUtils.toast import com.gh.gamecenter.LoginActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.callback.BiCallback +import com.gh.gamecenter.common.callback.CancelListener import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.databinding.SetWaitDialogBinding import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.common.utils.PermissionHelper.checkReadPhoneStatePermissionBeforeAction import com.gh.gamecenter.core.runOnUiThread -import com.gh.gamecenter.core.utils.* +import com.gh.gamecenter.core.utils.ClickUtils +import com.gh.gamecenter.core.utils.EmptyCallback +import com.gh.gamecenter.core.utils.SPUtils +import com.gh.gamecenter.core.utils.ToastUtils.toast import com.gh.gamecenter.databinding.DialogQuickLoginBinding import com.gh.gamecenter.entity.LoginTokenEntity -import com.gh.gamecenter.user.ApiResponse +import com.gh.gamecenter.common.retrofit.ApiResponse import com.gh.gamecenter.user.LoginTag import com.gh.gamecenter.user.UserRepository import com.lightgame.utils.AppManager @@ -56,6 +59,10 @@ object QuickLoginHelper { private const val ENTRANCE_DEFAULT = "一键登录" private const val ENTRANCE_PERMISSION_DIALOG = "一键登录权限弹窗" private const val AUTH_ACTIVITY_NAME = "com.cmic.sso.sdk.activity.LoginAuthActivity" + const val STATUS_DEFAULT = 0 // 默认(隐藏一键登录按钮) + const val STATUS_FROM_QUICK_LOGIN_PAGE = 1 // 从一键登录的授权页过来 + const val STATUS_FROM_QUICK_LOGIN_PERMISSION = 2 // 从一键登录的电话权限弹窗过来 + // 1.取号请求(可提前进行) @JvmStatic @@ -67,18 +74,18 @@ object QuickLoginHelper { } AuthnHelper.getInstance(context.applicationContext).getPhoneInfo( - Config.QUICK_LOGIN_APPID, - Config.QUICK_LOGIN_APPKEY, - { requestCode: Int, jsonObject: JSONObject -> - val code = jsonObject.optString("resultCode") - // “103000”为成功 - if (code == "103000") { - if (requestCode == REQUEST_GET_PHONE_INFO_CODE) { - SPUtils.setBoolean(Constants.SP_HAS_GET_PHONE_INFO, true) - } + Config.QUICK_LOGIN_APPID, + Config.QUICK_LOGIN_APPKEY, + { requestCode: Int, jsonObject: JSONObject -> + val code = jsonObject.optString("resultCode") + // “103000”为成功 + if (code == "103000") { + if (requestCode == REQUEST_GET_PHONE_INFO_CODE) { + SPUtils.setBoolean(Constants.SP_HAS_GET_PHONE_INFO, true) } - }, - REQUEST_GET_PHONE_INFO_CODE + } + }, + REQUEST_GET_PHONE_INFO_CODE ) } @@ -107,23 +114,24 @@ object QuickLoginHelper { loginAuth(context) } else { DialogUtils.showQuickLoginPermissionDialog( - context,object :ConfirmListener{ + context, object : ConfirmListener { override fun onConfirm() { - checkReadPhoneStatePermissionBeforeAction(context, object : EmptyCallback { + checkReadPhoneStatePermissionBeforeAction(context, object : EmptyCallback { override fun onCallback() { loginAuth(context) } }) } - }, - { + }, object : CancelListener { + override fun onCancel() { startCodeLoginPage( - context, - entrance = ENTRANCE_PERMISSION_DIALOG, - isFinishAuth = false, - isFromPermission = true + context, + entrance = ENTRANCE_PERMISSION_DIALOG, + isFinishAuth = false, + isFromPermission = true ) } + } ) } } @@ -186,101 +194,103 @@ object QuickLoginHelper { mAuthnHelper?.loginAuth(Config.QUICK_LOGIN_APPID, Config.QUICK_LOGIN_APPKEY, mTokenListener, REQUEST_LOGIN_AUTH_CODE) } - private fun getConfig(context: Context, entrance: String): AuthThemeConfig{ + private fun getConfig(context: Context, entrance: String): AuthThemeConfig { return AuthThemeConfig.Builder() - .setStatusBar(Color.WHITE, true) //状态栏颜色、是否高亮 - .setAuthContentView(getCustomView(context)) //自定义布局 - // 服务条款标题栏 - .setClauseLayoutResID(R.layout.layout_quick_login_navigation, "backIv") //服务条款标题栏 - .setNavTextColor(Color.BLACK) //服务条款标题颜色 - .setNavTextSize(18) //服务条款标题字体大小 - // 手机号码 - .setNumberSize(20, true) //手机号码字体大小 - .setNumberColor(R.color.text_title.toColor()) //手机号码字体颜色 - .setNumFieldOffsetY(95) //号码栏Y偏移量 - // 登录按钮 - .setLogBtnImgPath("login_btn_bg") //登录按钮背景 - .setLogBtnText("本机号码一键登录", Color.WHITE, 16, false) //登录按钮相关 - .setLogBtnOffsetY(170) //登录按钮Y偏移量 - .setLogBtn(1000, 44) //登录按钮相关宽高 - .setLogBtnMargin(20, 20) //登录按钮相对于屏幕左右边缘边距 - // 回调 - .setBackPressedListener {} //返回键回调 - .setLogBtnClickListener(object : LoginClickListener { - override fun onLoginClickStart(context: Context, jsonObj: JSONObject?) { - LogUtils.login("logging", "一键登录", entrance) - mDialog = Dialog(context, R.style.DialogWindowTransparent).apply { - val binding = SetWaitDialogBinding.inflate(LayoutInflater.from(context)).apply { - setWaitMessage.text = R.string.logging.toResString() - } - requestWindowFeature(Window.FEATURE_NO_TITLE) - setContentView(binding.root) - setCanceledOnTouchOutside(false) - show() + .setStatusBar(Color.WHITE, true) //状态栏颜色、是否高亮 + .setAuthContentView(getCustomView(context)) //自定义布局 + // 服务条款标题栏 + .setClauseLayoutResID(R.layout.layout_quick_login_navigation, "backIv") //服务条款标题栏 + .setNavTextColor(Color.BLACK) //服务条款标题颜色 + .setNavTextSize(18) //服务条款标题字体大小 + // 手机号码 + .setNumberSize(20, true) //手机号码字体大小 + .setNumberColor(R.color.text_title.toColor()) //手机号码字体颜色 + .setNumFieldOffsetY(95) //号码栏Y偏移量 + // 登录按钮 + .setLogBtnImgPath("login_btn_bg") //登录按钮背景 + .setLogBtnText("本机号码一键登录", Color.WHITE, 16, false) //登录按钮相关 + .setLogBtnOffsetY(170) //登录按钮Y偏移量 + .setLogBtn(1000, 44) //登录按钮相关宽高 + .setLogBtnMargin(20, 20) //登录按钮相对于屏幕左右边缘边距 + // 回调 + .setBackPressedListener {} //返回键回调 + .setLogBtnClickListener(object : LoginClickListener { + override fun onLoginClickStart(context: Context, jsonObj: JSONObject?) { + LogUtils.login("logging", "一键登录", entrance) + mDialog = Dialog(context, R.style.DialogWindowTransparent).apply { + val binding = SetWaitDialogBinding.inflate(LayoutInflater.from(context)).apply { + setWaitMessage.text = R.string.logging.toResString() } + requestWindowFeature(Window.FEATURE_NO_TITLE) + setContentView(binding.root) + setCanceledOnTouchOutside(false) + show() } + } - override fun onLoginClickComplete(context: Context, jsonObj: JSONObject?) { - if (mToken.isNotBlank()) { - val params = HashMap() - params["token"] = mToken + override fun onLoginClickComplete(context: Context, jsonObj: JSONObject?) { + if (mToken.isNotBlank()) { + val params = HashMap() + params["token"] = mToken - // 4.请求登录接口 - UserRepository.getInstance().login( - JSONObject(params as Map<*, *>), - LoginTag.oauth, - object : BiCallback> { - override fun onFirst(first: LoginTokenEntity) { - if (mDialog != null && mDialog!!.isShowing) { - mDialog?.dismiss() - } - - SPUtils.setBoolean(Constants.SP_HAS_GET_PHONE_INFO, false) - - LogUtils.login("success", "一键登录", entrance) - finishAuthActivity() - } - - override fun onSecond(second: ApiResponse) { - if (mDialog != null && mDialog!!.isShowing) { - mDialog?.dismiss() - } - } + // 4.请求登录接口 + UserRepository.getInstance().login( + JSONObject(params as Map<*, *>), + LoginTag.oauth, + object : BiCallback> { + override fun onFirst(first: LoginTokenEntity) { + if (mDialog != null && mDialog!!.isShowing) { + mDialog?.dismiss() } - ) - } else { - if (mDialog != null && mDialog!!.isShowing) { - mDialog?.dismiss() + + SPUtils.setBoolean(Constants.SP_HAS_GET_PHONE_INFO, false) + + LogUtils.login("success", "一键登录", entrance) + finishAuthActivity() + } + + override fun onSecond(second: ApiResponse) { + if (mDialog != null && mDialog!!.isShowing) { + mDialog?.dismiss() + } + } } + ) + } else { + if (mDialog != null && mDialog!!.isShowing) { + mDialog?.dismiss() } } - }) //登录按钮回调 - .setCheckBoxListener { _: Context?, _: JSONObject? -> - toast("请先勾选同意《${getOperatorType(context)}认证服务协议》《用户协议》《隐私政策》") - } //勾选回调 - // 勾选框 - .setCheckTipText("") //设置未勾选时弹出提示 - .setCheckBoxImgPath("ic_quick_login_check", "ic_quick_login_uncheck", 12, 12) //勾选图片 - // 服务条款、用户协议、隐私政策 - .setPrivacyState(false) //默认不勾选 - .setPrivacyAlignment("阅读并同意 " + AuthThemeConfig.PLACEHOLDER + " 用户协议 隐私政策", - "用户协议", R.string.disclaimer_url.toResString(), - "隐私政策", R.string.privacy_policy_url.toResString(), - "", "", "", "") //隐私条款的协议文本，自定义条款，自定义条款链接(支持四份条款) - .setPrivacyText(11, R.color.text_subtitleDesc.toColor(), R.color.theme_font.toColor(), true, false) //条款文本设置 - .setPrivacyMargin(30, 32) //隐私条款距离手机左右边缘的边距 - .setPrivacyOffsetY(280) //隐私条款Y偏移量 - // 语言 - .setAppLanguageType(0) //0.中文简体1.中文繁体2.英文 - // 转场动画 - .setAuthPageActIn("anim_auth_in","anim_auth_out") + } + }) //登录按钮回调 + .setCheckBoxListener { _: Context?, _: JSONObject? -> + toast("请先勾选同意《${getOperatorType(context)}认证服务协议》《用户协议》《隐私政策》") + } //勾选回调 + // 勾选框 + .setCheckTipText("") //设置未勾选时弹出提示 + .setCheckBoxImgPath("ic_quick_login_check", "ic_quick_login_uncheck", 12, 12) //勾选图片 + // 服务条款、用户协议、隐私政策 + .setPrivacyState(false) //默认不勾选 + .setPrivacyAlignment( + "阅读并同意 " + AuthThemeConfig.PLACEHOLDER + " 用户协议 隐私政策", + "用户协议", R.string.disclaimer_url.toResString(), + "隐私政策", R.string.privacy_policy_url.toResString(), + "", "", "", "" + ) //隐私条款的协议文本，自定义条款，自定义条款链接(支持四份条款) + .setPrivacyText(11, R.color.text_subtitleDesc.toColor(), R.color.theme_font.toColor(), true, false) //条款文本设置 + .setPrivacyMargin(30, 32) //隐私条款距离手机左右边缘的边距 + .setPrivacyOffsetY(280) //隐私条款Y偏移量 + // 语言 + .setAppLanguageType(0) //0.中文简体1.中文繁体2.英文 + // 转场动画 + .setAuthPageActIn("anim_auth_in", "anim_auth_out") // .setAuthPageActOut("anim_auth_in","anim_auth_out") - // 整体布局 - .setAuthPageWindowMode(WindowManager.LayoutParams.MATCH_PARENT, 360) //授权页窗口宽高比例 - .setWindowBottom(1) //授权页是否居于底部，0=居中;1=底部，设置为1Y轴的偏移 失效 - .setFitsSystemWindows(false) - .setThemeId(R.style.quickLoginDialog) //授权页弹窗主题 - .build() + // 整体布局 + .setAuthPageWindowMode(WindowManager.LayoutParams.MATCH_PARENT, 360) //授权页窗口宽高比例 + .setWindowBottom(1) //授权页是否居于底部，0=居中;1=底部，设置为1Y轴的偏移 失效 + .setFitsSystemWindows(false) + .setThemeId(R.style.quickLoginDialog) //授权页弹窗主题 + .build() } // 获取自定义布局View @@ -327,12 +337,12 @@ object QuickLoginHelper { } val status = when { - isFromPermission -> LoginActivity.STATUS_FROM_QUICK_LOGIN_PERMISSION + isFromPermission -> STATUS_FROM_QUICK_LOGIN_PERMISSION - mOpenAuthPageSuccess -> LoginActivity.STATUS_FROM_QUICK_LOGIN_PAGE + mOpenAuthPageSuccess -> STATUS_FROM_QUICK_LOGIN_PAGE - else -> LoginActivity.STATUS_DEFAULT + else -> STATUS_DEFAULT } context.startActivity(LoginActivity.getIntent(context, entrance, status)) 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 0c3ea1839b..9c6f11d3ef 100644 --- a/app/src/main/java/com/gh/common/util/ReservationHelper.kt +++ b/app/src/main/java/com/gh/common/util/ReservationHelper.kt @@ -5,6 +5,7 @@ import android.content.Context import com.gh.gamecenter.common.constant.Constants import com.gh.common.repository.ReservationRepository import com.gh.gamecenter.WebActivity +import com.gh.gamecenter.common.callback.CancelListener import com.gh.gamecenter.common.callback.ConfirmListener import com.gh.gamecenter.common.utils.createRequestBody import com.gh.gamecenter.common.utils.singleToMain @@ -12,7 +13,7 @@ import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.WechatConfigEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Utils @@ -84,14 +85,16 @@ object ReservationHelper { DialogUtils.showReserveSuccessDialog(context) } else { NewLogUtils.logReserveWechatRemindPopShow(wechatConfig) - DialogUtils.showReserveSuccess2WechatBindDialog(context,object :ConfirmListener{ + DialogUtils.showReserveSuccess2WechatBindDialog(context, object : ConfirmListener { override fun onConfirm() { - NewLogUtils.logReserveWechatRemindPopClick(wechatConfig,"开启微信提醒") + NewLogUtils.logReserveWechatRemindPopClick(wechatConfig, "开启微信提醒") context.startActivity(WebActivity.getBindWechatIntent(context)) } - }) { - NewLogUtils.logReserveWechatRemindPopClick(wechatConfig, "关闭弹窗") - } + }, object : CancelListener { + override fun onCancel() { + NewLogUtils.logReserveWechatRemindPopClick(wechatConfig, "关闭弹窗") + } + }) } } } @@ -109,7 +112,7 @@ object ReservationHelper { "删除预约", "游戏已上线，你可以删除此预约记录，确定删除吗？", "确定删除", - "暂不删除", object :ConfirmListener{ + "暂不删除", object : ConfirmListener { override fun onConfirm() { emptyCallback.onCallback() } @@ -124,7 +127,7 @@ object ReservationHelper { "取消预约", "取消之后你将无法收到游戏上线的通知，确定取消预约吗？", "确定取消", - "暂不取消", object :ConfirmListener{ + "暂不取消", object : ConfirmListener { override fun onConfirm() { emptyCallback.onCallback() } 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 b44902d342..3d2e52331d 100644 --- a/app/src/main/java/com/gh/common/util/SimpleRequestHelper.kt +++ b/app/src/main/java/com/gh/common/util/SimpleRequestHelper.kt @@ -1,7 +1,7 @@ package com.gh.common.util import com.gh.gamecenter.common.utils.createRequestBody -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Utils 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 c75bc3b639..d20aeeefcd 100644 --- a/app/src/main/java/com/gh/common/util/TagUtils.java +++ b/app/src/main/java/com/gh/common/util/TagUtils.java @@ -6,7 +6,7 @@ import android.content.SharedPreferences; import androidx.collection.ArrayMap; import com.gh.gamecenter.entity.TagEntity; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import java.util.HashSet; 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 b47f0d68e4..f599fb0cdd 100644 --- a/app/src/main/java/com/gh/common/util/UploadImageUtils.kt +++ b/app/src/main/java/com/gh/common/util/UploadImageUtils.kt @@ -3,9 +3,9 @@ package com.gh.common.util import android.annotation.SuppressLint import android.graphics.BitmapFactory import com.gh.gamecenter.common.utils.CompressImageUtils -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.FileRequestBody -import com.gh.gamecenter.retrofit.RetrofitCallback +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.FileRequestBody +import com.gh.gamecenter.common.retrofit.RetrofitCallback import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable import io.reactivex.ObservableOnSubscribe 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 b4420dbbcf..dc2172b034 100644 --- a/app/src/main/java/com/gh/common/util/UsageStatsHelper.kt +++ b/app/src/main/java/com/gh/common/util/UsageStatsHelper.kt @@ -22,7 +22,7 @@ import com.gh.common.util.UsageStatsHelper.getDataByUsageEvents import com.gh.common.util.UsageStatsHelper.getDataByUsageStats import com.gh.gamecenter.common.utils.debugOnly import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Utils diff --git a/app/src/main/java/com/gh/common/util/WechatBindHelper.kt b/app/src/main/java/com/gh/common/util/WechatBindHelper.kt index 634c41d527..5e8eb5bb25 100644 --- a/app/src/main/java/com/gh/common/util/WechatBindHelper.kt +++ b/app/src/main/java/com/gh/common/util/WechatBindHelper.kt @@ -9,7 +9,7 @@ import com.gh.gamecenter.common.utils.singleToMain import com.gh.gamecenter.common.utils.toJson import com.gh.gamecenter.entity.WechatConfigEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import okhttp3.ResponseBody 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 ae4f02ae76..1843cae83d 100644 --- a/app/src/main/java/com/gh/common/videolog/VideoRecordUtils.kt +++ b/app/src/main/java/com/gh/common/videolog/VideoRecordUtils.kt @@ -7,7 +7,7 @@ import com.gh.gamecenter.common.utils.toRequestBody import com.gh.gamecenter.common.utils.toastInInternalRelease import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.room.AppDatabase import com.halo.assistant.HaloApp diff --git a/app/src/main/java/com/gh/download/DownloadDataHelper.kt b/app/src/main/java/com/gh/download/DownloadDataHelper.kt index 78dd18c643..60680d9d6a 100644 --- a/app/src/main/java/com/gh/download/DownloadDataHelper.kt +++ b/app/src/main/java/com/gh/download/DownloadDataHelper.kt @@ -5,7 +5,7 @@ import android.text.TextUtils import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.exposure.meta.MetaUtil import com.gh.gamecenter.common.exposure.meta.MetaUtil.getMeta -import com.gh.common.loghub.LoghubUtils +import com.gh.gamecenter.common.loghub.LoghubUtils import com.gh.common.util.* import com.gh.common.xapk.XapkInstaller import com.gh.gamecenter.BuildConfig diff --git a/app/src/main/java/com/gh/download/PackageObserver.kt b/app/src/main/java/com/gh/download/PackageObserver.kt index 6841a91d97..cbed3f39c2 100644 --- a/app/src/main/java/com/gh/download/PackageObserver.kt +++ b/app/src/main/java/com/gh/download/PackageObserver.kt @@ -4,7 +4,7 @@ import android.annotation.SuppressLint import android.preference.PreferenceManager import android.text.TextUtils import com.gh.gamecenter.common.constant.Constants -import com.gh.common.loghub.LoghubUtils +import com.gh.gamecenter.common.loghub.LoghubUtils import com.gh.gamecenter.core.runOnIoThread import com.gh.common.util.* import com.gh.download.server.BrowserInstallHelper @@ -15,8 +15,8 @@ import com.gh.gamecenter.eventbus.EBPackage import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.packagehelper.PackageRepository import com.gh.gamecenter.packagehelper.PackageViewModel -import com.gh.gamecenter.retrofit.EmptyResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.EmptyResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.setting.GameDownloadSettingFragment.Companion.CONCERN_GAME_SP_KEY import com.halo.assistant.HaloApp @@ -28,7 +28,6 @@ import okhttp3.MediaType import okhttp3.RequestBody import org.json.JSONException import org.json.JSONObject -import java.util.* object PackageObserver { 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 20c832ffd8..6244ff2f71 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt @@ -6,7 +6,7 @@ import android.widget.RelativeLayout import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.constant.Config import com.gh.common.dialog.CertificationDialog @@ -14,6 +14,7 @@ import com.gh.common.dialog.DeviceRemindDialog import com.gh.common.dialog.PackageCheckDialogFragment import com.gh.common.exposure.ExposureEvent import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.common.util.DirectUtils.directToLinkPage import com.gh.download.DownloadManager import com.gh.download.server.BrowserInstallHelper diff --git a/app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt b/app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt index d5dc4cd2a5..6c601e92d6 100644 --- a/app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt +++ b/app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt @@ -5,9 +5,9 @@ import android.os.Build import android.util.Base64 import com.gh.common.constant.Config import com.gh.gamecenter.common.constant.Constants -import com.gh.common.exposure.ExposureEntity +import com.gh.gamecenter.common.entity.ExposureEntity import com.gh.common.exposure.ExposureEvent -import com.gh.common.loghub.LoghubUtils +import com.gh.gamecenter.common.loghub.LoghubUtils import com.gh.common.util.* import com.gh.gamecenter.ShellActivity import com.gh.gamecenter.common.utils.DialogHelper diff --git a/app/src/main/java/com/gh/flutter/FlutterLogHubServiceImplAop.kt b/app/src/main/java/com/gh/flutter/FlutterLogHubServiceImplAop.kt index 12198786ac..e3a7856ffa 100644 --- a/app/src/main/java/com/gh/flutter/FlutterLogHubServiceImplAop.kt +++ b/app/src/main/java/com/gh/flutter/FlutterLogHubServiceImplAop.kt @@ -1,8 +1,8 @@ package com.gh.flutter import com.gh.gamecenter.common.json.json -import com.gh.common.loghub.LoghubUtils -import com.gh.common.tracker.Tracker +import com.gh.gamecenter.common.loghub.LoghubUtils +import com.gh.gamecenter.common.tracker.Tracker import com.gh.common.util.LogUtils import com.lightgame.utils.Utils import me.ele.lancet.base.annotations.Insert diff --git a/app/src/main/java/com/gh/gamecenter/FullScreenWebActivity.kt b/app/src/main/java/com/gh/gamecenter/FullScreenWebActivity.kt index 44683dbc79..89800b7e67 100644 --- a/app/src/main/java/com/gh/gamecenter/FullScreenWebActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/FullScreenWebActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.common.constant.EntranceConsts import com.halo.assistant.fragment.WebFragment diff --git a/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt b/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt index c8cd0dc14b..b0c0a5ab5a 100644 --- a/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt @@ -38,7 +38,7 @@ import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView import com.facebook.drawee.backends.pipeline.Fresco import com.facebook.imagepipeline.core.ImagePipeline import com.facebook.imagepipeline.request.ImageRequest -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.common.Base64ImageHolder.image import com.gh.common.constant.Config import com.gh.gamecenter.core.runOnIoThread @@ -53,7 +53,7 @@ import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.ImageInfoEntity import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity import com.gh.gamecenter.qa.entity.AnswerEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.github.piasy.biv.view.BigImageView import com.github.piasy.biv.view.FrescoImageViewFactory diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index e284b15ba5..78204a23d5 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -45,7 +45,7 @@ import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBUISwitch; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; import com.lightgame.download.DataWatcher; diff --git a/app/src/main/java/com/gh/gamecenter/LoginActivity.java b/app/src/main/java/com/gh/gamecenter/LoginActivity.java index 543cca8244..564326b069 100644 --- a/app/src/main/java/com/gh/gamecenter/LoginActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LoginActivity.java @@ -6,20 +6,19 @@ import android.os.Bundle; import androidx.annotation.NonNull; -import com.gh.gamecenter.core.utils.DisplayUtils; +import com.alibaba.android.arouter.facade.annotation.Route; +import com.gh.common.util.QuickLoginHelper; import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.constant.RouteConsts; +import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.fragment.LoginFragment; /** * Created by khy on 14/08/17. */ - +@Route(path = RouteConsts.activity.loginActivity) public class LoginActivity extends NormalActivity { - public static final int STATUS_DEFAULT = 0; // 默认(隐藏一键登录按钮) - public static final int STATUS_FROM_QUICK_LOGIN_PAGE = 1; // 从一键登录的授权页过来 - public static final int STATUS_FROM_QUICK_LOGIN_PERMISSION = 2; // 从一键登录的电话权限弹窗过来 - @Override protected Intent provideNormalIntent() { return getTargetIntent(this, LoginActivity.class, LoginFragment.class); @@ -27,7 +26,7 @@ public class LoginActivity extends NormalActivity { @NonNull public static Intent getIntent(Context context, String entrance) { - return getIntent(context, entrance, STATUS_DEFAULT); + return getIntent(context, entrance, QuickLoginHelper.STATUS_DEFAULT); } @NonNull diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index fb4c22a2c6..43ada44c47 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -40,7 +40,7 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProviders; import com.gh.base.AppUncaughtHandler; -import com.gh.base.BaseActivity; +import com.gh.gamecenter.common.base.BaseActivity; import com.gh.gamecenter.common.base.fragment.BaseFragment_ViewPager; import com.gh.common.DefaultUrlHandler; import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager; @@ -66,7 +66,7 @@ import com.gh.common.util.PackageInstaller; import com.gh.common.util.PackageUtils; import com.gh.common.util.PlatformUtils; import com.gh.common.util.QuickLoginHelper; -import com.gh.common.util.ShareUtils; +import com.gh.gamecenter.common.utils.ShareUtils; import com.gh.common.util.WechatBindHelper; import com.gh.download.DownloadManager; import com.gh.gamecenter.common.constant.Constants; @@ -99,8 +99,8 @@ import com.gh.gamecenter.manager.UpdateManager; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.common.base.fragment.NormalFragment; import com.gh.gamecenter.packagehelper.PackageViewModel; -import com.gh.gamecenter.retrofit.BiResponse; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.BiResponse; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.room.AppDatabase; import com.gh.gamecenter.room.dao.SimulatorGameDao; diff --git a/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt b/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt index 594815236a..e3823158e7 100644 --- a/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt @@ -22,7 +22,7 @@ import com.gh.common.util.* import com.gh.gamecenter.common.utils.DialogHelper import com.gh.gamecenter.common.utils.tryCatchInRelease import com.gh.gamecenter.common.utils.DeviceUtils -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import io.reactivex.Observable import io.reactivex.ObservableOnSubscribe import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 34d83d3916..354cfce9f0 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -35,13 +35,12 @@ import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.core.utils.ClickUtils; import com.gh.common.util.CollectionUtils; import com.gh.common.util.DataCollectionUtils; -import com.gh.common.util.DataUtils; import com.gh.common.util.DetailDownloadUtils; import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.NewLogUtils; -import com.gh.common.util.ShareUtils; +import com.gh.gamecenter.common.utils.ShareUtils; import com.gh.gamecenter.common.view.FixLinearLayoutManager; import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.download.DownloadManager; @@ -56,7 +55,7 @@ import com.gh.gamecenter.eventbus.EBNetworkState; import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.newsdetail.NewsDetailAdapter; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.fragment.SettingsFragment; import com.lightgame.download.DataWatcher; @@ -65,11 +64,8 @@ import com.lightgame.utils.Utils; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; -import org.w3c.dom.Text; -import java.util.HashMap; import java.util.HashSet; -import java.util.Map; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt index 9027b233d2..c342b29c6c 100644 --- a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt @@ -13,7 +13,7 @@ import android.widget.RelativeLayout import android.widget.TextView import androidx.core.widget.doAfterTextChanged import androidx.core.widget.doOnTextChanged -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.common.util.* import com.gh.gamecenter.DisplayType.* import com.gh.gamecenter.common.constant.EntranceConsts diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java index 93ed8eb1ce..e3ae6148ac 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java @@ -33,7 +33,7 @@ import com.gh.common.util.MessageShareUtils; import com.gh.common.util.QRCodeUtils; import com.gh.gamecenter.core.utils.StringUtils; import com.gh.gamecenter.entity.ConcernEntity; -import com.gh.gamecenter.retrofit.ObservableUtil; +import com.gh.gamecenter.common.retrofit.ObservableUtil; import java.io.File; import java.io.IOException; diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java index 151ddeec6a..82e70f530b 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java @@ -16,7 +16,7 @@ import com.gh.common.util.MessageShareUtils; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.QRCodeUtils; -import com.gh.common.util.ShareUtils; +import com.gh.gamecenter.common.utils.ShareUtils; import com.tencent.tauth.Tencent; /** diff --git a/app/src/main/java/com/gh/gamecenter/SkipActivity.java b/app/src/main/java/com/gh/gamecenter/SkipActivity.java index 946c246e22..b220ac0b2a 100644 --- a/app/src/main/java/com/gh/gamecenter/SkipActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SkipActivity.java @@ -45,7 +45,7 @@ import android.os.Bundle; import android.text.TextUtils; import android.util.Base64; -import com.gh.base.BaseActivity; +import com.gh.gamecenter.common.base.BaseActivity; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DirectUtils; import com.gh.gamecenter.common.constant.EntranceConsts; diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index 1b456a475f..814141b852 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -20,11 +20,12 @@ import androidx.core.app.ActivityCompat; import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; +import com.alibaba.android.arouter.facade.annotation.Route; import com.g00fy2.versioncompare.Version; -import com.gh.base.BaseActivity; +import com.gh.gamecenter.common.base.BaseActivity; import com.gh.common.constant.Config; import com.gh.common.dialog.PrivacyPolicyDialogFragment; -import com.gh.common.tracker.TrackerLogger; +import com.gh.gamecenter.common.tracker.TrackerLogger; import com.gh.common.util.AdHelper; import com.gh.common.util.DeviceTokenUtils; import com.gh.common.util.DialogUtils; @@ -37,6 +38,7 @@ import com.gh.common.util.UsageStatsHelper; import com.gh.download.DownloadManager; import com.gh.gamecenter.common.callback.SimpleCallback; import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.constant.RouteConsts; import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.common.utils.PackageFlavorHelper; @@ -48,8 +50,8 @@ import com.gh.gamecenter.core.utils.SPUtils; import com.gh.gamecenter.entity.AuthDialogEntity; import com.gh.gamecenter.entity.DeviceDialogEntity; import com.gh.gamecenter.entity.PrivacyPolicyEntity; -import com.gh.gamecenter.retrofit.BiResponse; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.BiResponse; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; import com.lightgame.download.DownloadEntity; @@ -78,6 +80,7 @@ import pub.devrel.easypermissions.EasyPermissions; /** * 引导页面 */ +@Route(path = RouteConsts.activity.splashActivity) public class SplashScreenActivity extends BaseActivity { private SharedPreferences mSharedPreferences; diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 49b2afcb22..be9f1d2f07 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -41,7 +41,7 @@ import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DirectUtils; import com.gh.common.util.NotificationHelper; import com.gh.common.util.PackageUtils; -import com.gh.common.util.ShareUtils; +import com.gh.gamecenter.common.utils.ShareUtils; import com.gh.common.util.UploadImageUtils; import com.gh.gamecenter.common.base.TrackableDialog; import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment; @@ -71,7 +71,7 @@ import com.gh.gamecenter.entity.SettingsEntity; import com.gh.gamecenter.entity.SimpleGameEntity; import com.gh.gamecenter.entity.UserInfoEntity; import com.gh.gamecenter.manager.UserManager; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.suggest.SuggestGameCollectAdapter; import com.gh.gamecenter.suggest.SuggestPicAdapter; diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.kt b/app/src/main/java/com/gh/gamecenter/WebActivity.kt index 0a14403e94..2254e231b7 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.kt @@ -8,15 +8,12 @@ import android.os.Bundle import android.text.TextUtils import android.view.KeyEvent import android.view.View - import com.alibaba.android.arouter.facade.annotation.Route import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.common.utils.EnvHelper -import com.gh.common.util.IntentUtils import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.common.utils.EnvHelper import com.gh.gamecenter.common.utils.updateStatusBarColor - import com.gh.gamecenter.entity.ConcernEntity import com.gh.gamecenter.entity.NewsEntity import com.gh.gamecenter.entity.ToolBoxEntity @@ -90,7 +87,7 @@ open class WebActivity : NormalActivity() { bundle.putBoolean(EntranceConsts.KEY_WEB_SHARE, showWebShare) bundle.putString(EntranceConsts.KEY_URL, url) bundle.putBoolean(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_TITLE, true) - return IntentUtils.getWebTargetIntent(context, bundle, url) + return getWebTargetIntent(context, bundle, url) } // 获取通用页面 @@ -237,7 +234,7 @@ open class WebActivity : NormalActivity() { bundle.putString(EntranceConsts.KEY_URL, url) bundle.putBoolean(WebFragment.KEY_COMPLETION_TITLE, autoCompletionTitle) bundle.putBoolean(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_TITLE, false) - return IntentUtils.getWebTargetIntent(context, bundle, url) + return getWebTargetIntent(context, bundle, url) } @JvmStatic @@ -254,7 +251,7 @@ open class WebActivity : NormalActivity() { bundle.putBoolean(WebFragment.KEY_COMPLETION_TITLE, autoCompletionTitle) bundle.putBoolean(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_TITLE, false) bundle.putBoolean(WebFragment.KEY_OPEN_NATIVE_PAGE, isOpenNativePage) - return IntentUtils.getWebTargetIntent(context, bundle, url) + return getWebTargetIntent(context, bundle, url) } // 获取问答页 @@ -278,7 +275,7 @@ open class WebActivity : NormalActivity() { isWebPageHandleBackPressed ) bundle.putInt(WebFragment.KEY_QA_TYPE, qaType) - return IntentUtils.getWebTargetIntent(context, bundle, url) + return getWebTargetIntent(context, bundle, url) } // 获取H5游戏 @@ -299,7 +296,22 @@ open class WebActivity : NormalActivity() { bundle.putBoolean(WebFragment.KEY_REQUIRE_BACK_CONFIRMATION, true) bundle.putString(WebFragment.KEY_BACK_CONFIRMATION_CONTENT, "退出后将不保存当前游戏进度，确定退出吗？") } - return IntentUtils.getWebTargetIntent(context, bundle, url) + return getWebTargetIntent(context, bundle, url) + } + + private fun getWebTargetIntent(context: Context?, bundle: Bundle, url: String?): Intent { + val cls: Class = if (url?.contains("android_page_type=singleton") == true) { + SingletonWebActivity::class.java + } else { + WebActivity::class.java + } + if (url?.contains("leave_web_page_handle_back_pressed=true") == true) { + bundle.putBoolean(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_BACK_PRESSED, true) + } + val intent = Intent(context, cls) + intent.putExtra(NORMAL_FRAGMENT_NAME, WebFragment::class.java.canonicalName) + intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle) + return intent } } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java index 59b26daf48..1bcf05bf4c 100644 --- a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java @@ -1,5 +1,7 @@ package com.gh.gamecenter; +import static com.gh.gamecenter.common.constant.EntranceConsts.*; + import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -12,17 +14,19 @@ import android.util.Base64; import androidx.annotation.NonNull; +import com.alibaba.android.arouter.facade.annotation.Route; import com.gh.common.Base64ImageHolder; import com.gh.common.constant.Config; -import com.gh.gamecenter.common.callback.BiCallback; -import com.gh.gamecenter.common.utils.BitmapUtils; import com.gh.common.util.EnergyTaskHelper; -import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.common.util.IntegralLogHelper; import com.gh.common.util.LogUtils; import com.gh.common.util.NewLogUtils; -import com.gh.common.util.ShareUtils; -import com.gh.gamecenter.eventbus.EBShare; +import com.gh.gamecenter.common.callback.BiCallback; +import com.gh.gamecenter.common.constant.RouteConsts; +import com.gh.gamecenter.common.eventbus.EBShare; +import com.gh.gamecenter.common.utils.BitmapUtils; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.common.utils.ShareUtils; import com.lightgame.utils.Utils; import com.sina.weibo.sdk.api.ImageObject; import com.sina.weibo.sdk.api.TextObject; @@ -42,16 +46,9 @@ import java.io.ByteArrayOutputStream; *

* 微博分享 */ +@Route(path = RouteConsts.activity.weiBoShareActivity) public class WeiBoShareActivity extends Activity implements WbShareCallback { - - private static final String KET_SHARE_STYLE = "shareStyle"; - private static final String KET_SHAREICON = "shareIcon"; - private static final String KET_SHAREURL = "shareUrl"; - private static final String KET_TITLE = "KET_TITLE"; - private static final String KET_TYPE = "KET_TYPE"; - private static final String KET_SUMMARY = "KET_SUMMARY"; - private static final String WEIBO_SCOPE = ( "email,direct_messages_read,direct_messages_write," + "friendships_groups_read,friendships_groups_write,statuses_to_me_read," @@ -258,7 +255,7 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback { public void onComplete() { Utils.toast(this, R.string.share_success_hint); if ("NORMAL".equals(mShareStyle)) { - LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "success", + com.gh.gamecenter.common.utils.LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "success", ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId); EventBus.getDefault().post(new EBShare(ShareUtils.shareEntrance)); EnergyTaskHelper.postEnergyTaskForShare(ShareUtils.shareEntrance.getName(), ShareUtils.resourceId, ShareUtils.shareEntity.getShareUrl()); @@ -268,9 +265,9 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback { if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.communityArticle || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video) { - NewLogUtils.logShareResult(ShareUtils.additionalParams, true); + com.gh.gamecenter.common.utils.NewLogUtils.logShareResult(ShareUtils.additionalParams, true); } else if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.gameCollection) { - NewLogUtils.logViewOrClickGameCollectionDetail( + com.gh.gamecenter.common.utils.NewLogUtils.logViewOrClickGameCollectionDetail( "click_game_collect_detail_favorite_success", ShareUtils.shareEntity.getShareTitle(), ShareUtils.resourceId, @@ -287,7 +284,7 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback { public void onError(UiError uiError) { Utils.toast(this, R.string.share_fail_hint); if ("NORMAL".equals(mShareStyle)) { - LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "fail", + com.gh.gamecenter.common.utils.LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "fail", ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId); if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.inviteFriends) { IntegralLogHelper.INSTANCE.logInviteResult("失败", "微博"); @@ -295,7 +292,7 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback { if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.communityArticle || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video) { - NewLogUtils.logShareResult(ShareUtils.additionalParams, false); + com.gh.gamecenter.common.utils.NewLogUtils.logShareResult(ShareUtils.additionalParams, false); } } else { IntegralLogHelper.INSTANCE.logInviteResult("失败", "微博"); @@ -307,7 +304,7 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback { public void onCancel() { Utils.toast(this, R.string.share_cancel_hint); if ("NORMAL".equals(mShareStyle)) { - LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "cancel", + com.gh.gamecenter.common.utils.LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "cancel", ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId); if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.inviteFriends) { IntegralLogHelper.INSTANCE.logInviteResult("取消", "微博"); @@ -315,7 +312,7 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback { if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.communityArticle || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video) { - NewLogUtils.logShareResult(ShareUtils.additionalParams, false); + com.gh.gamecenter.common.utils.NewLogUtils.logShareResult(ShareUtils.additionalParams, false); } } else { IntegralLogHelper.INSTANCE.logInviteResult("取消", "微博"); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java index 7a66a37f53..5e8c922082 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java @@ -24,7 +24,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.KcSelectGameViewHolder; import com.gh.gamecenter.databinding.KcGameSelectItemBinding; import com.gh.gamecenter.entity.InstallGameEntity; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.lightgame.adapter.BaseRecyclerAdapter; import com.lightgame.utils.RuntimeUtils; 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 2c14a8f33d..edc67d0f5a 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java @@ -21,7 +21,7 @@ import com.gh.gamecenter.adapter.viewholder.CommentViewHolder; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.entity.ArticleCommentParent; import com.gh.gamecenter.entity.CommentEntity; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.adapter.BaseRecyclerAdapter; import com.lightgame.utils.Utils; 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 e502b1e6e2..67e847a527 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java @@ -30,7 +30,7 @@ import com.gh.gamecenter.databinding.GameNewsSearchItemBinding; import com.gh.gamecenter.databinding.GameNewsTypeItemBinding; import com.gh.gamecenter.databinding.NewsTextItemBinding; import com.gh.gamecenter.entity.NewsEntity; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.adapter.BaseRecyclerAdapter; import com.lightgame.utils.Utils; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java index 1bbbd9f9ec..b23b0e7985 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java @@ -12,7 +12,7 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.common.exposure.ExposureEntity; +import com.gh.gamecenter.common.entity.ExposureEntity; import com.gh.common.exposure.ExposureEvent; import com.gh.common.exposure.ExposureSource; import com.gh.common.exposure.ExposureType; 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 d587509563..3728115e5b 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -41,7 +41,7 @@ import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.entity.LibaoStatusEntity; import com.gh.gamecenter.entity.MeEntity; import com.gh.gamecenter.entity.UserDataLibaoEntity; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.suggest.SuggestType; import com.lightgame.adapter.BaseRecyclerAdapter; 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 44bff3b3a5..20135677ed 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -42,9 +42,9 @@ import com.gh.gamecenter.entity.ArticleCommentParent; import com.gh.gamecenter.entity.CommentEntity; import com.gh.gamecenter.entity.ConcernEntity; import com.gh.gamecenter.manager.VisitManager; -import com.gh.gamecenter.retrofit.JSONObjectResponse; -import com.gh.gamecenter.retrofit.OkHttpCache; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.JSONObjectResponse; +import com.gh.gamecenter.common.retrofit.OkHttpCache; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.adapter.BaseRecyclerAdapter; import com.lightgame.utils.Utils; 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 e3e19f74d4..6f50c533cc 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java @@ -18,7 +18,7 @@ import com.gh.gamecenter.adapter.viewholder.ReuseViewHolder; import com.gh.gamecenter.adapter.viewholder.ToolBoxViewHolder; import com.gh.gamecenter.databinding.ToolboxItemBinding; import com.gh.gamecenter.entity.ToolBoxEntity; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.suggest.SuggestType; import com.lightgame.adapter.BaseRecyclerAdapter; diff --git a/app/src/main/java/com/gh/gamecenter/amway/AmwayActivity.kt b/app/src/main/java/com/gh/gamecenter/amway/AmwayActivity.kt index 0e9137afde..63272ce88e 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwayActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayActivity.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.amway import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt b/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt index 171a491a72..7d4b23cecb 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt @@ -12,6 +12,7 @@ import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder 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 ca90b35d87..3f900aea7c 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt @@ -13,6 +13,7 @@ import com.gh.gamecenter.core.utils.TimeElapsedHelper import com.gh.common.exposure.ExposureListener import com.gh.common.exposure.ExposureSource import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.gamecenter.common.view.VerticalItemDecoration import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus 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 17ded3d6ef..faa97c4101 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwayViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayViewModel.kt @@ -14,8 +14,8 @@ import com.gh.gamecenter.entity.RatingComment import com.gh.gamecenter.entity.SubjectEntity import com.gh.gamecenter.home.LegacyHomeItemData import com.gh.gamecenter.home.LegacyHomeSubjectTransformer -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import io.reactivex.Observable diff --git a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchViewModel.kt b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchViewModel.kt index 89156978b3..c9872ca2cf 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchViewModel.kt @@ -11,8 +11,8 @@ import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Utils diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListHeadViewModel.java b/app/src/main/java/com/gh/gamecenter/baselist/ListHeadViewModel.java index 0d833aa76a..90cd88ebed 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListHeadViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListHeadViewModel.java @@ -6,7 +6,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.gh.gamecenter.mvvm.Resource; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.retrofit.service.ApiService; diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListViewModel.java b/app/src/main/java/com/gh/gamecenter/baselist/ListViewModel.java index e1bbc77661..b42829b648 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListViewModel.java @@ -12,8 +12,8 @@ import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.download.DownloadManager; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.entity.GameEntity; -import com.gh.gamecenter.retrofit.BiResponse; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.BiResponse; +import com.gh.gamecenter.common.retrofit.Response; import org.jetbrains.annotations.NotNull; 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 154b97e34e..2d64321288 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/CatalogViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/CatalogViewModel.kt @@ -8,7 +8,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.common.util.LogUtils import com.gh.gamecenter.entity.CatalogEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.android.schedulers.AndroidSchedulers 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 6a8d8fdde5..08b3ab6212 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListViewModel.kt @@ -2,7 +2,7 @@ package com.gh.gamecenter.catalog import android.app.Application import androidx.lifecycle.MutableLiveData -import com.gh.common.exposure.ExposureEntity +import com.gh.gamecenter.common.entity.ExposureEntity import com.gh.common.exposure.ExposureUtils import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.common.view.CatalogFilterView 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 2e46a2a964..ca190b11fe 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogViewModel.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.catalog import android.app.Application import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.gh.common.exposure.ExposureEntity +import com.gh.gamecenter.common.entity.ExposureEntity import com.gh.common.exposure.ExposureSource import com.gh.common.util.LogUtils import com.gh.gamecenter.baselist.ListViewModel 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 51a036708d..6a2c31205f 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/SubCatalogViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/SubCatalogViewModel.kt @@ -7,7 +7,7 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.entity.CatalogEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryAdapter.kt index 04ba926836..21a866b1d7 100644 --- a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryAdapter.kt @@ -5,14 +5,14 @@ import android.view.View import android.view.ViewGroup import android.widget.LinearLayout import androidx.recyclerview.widget.RecyclerView -import com.gh.gamecenter.core.utils.DisplayUtils -import com.gh.gamecenter.common.utils.ImageUtils -import com.gh.common.util.IntentUtils -import com.gh.gamecenter.common.utils.toBinding import com.gh.common.view.SubCategoryView import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.category.CategoryListActivity.Companion.getIntent +import com.gh.gamecenter.common.utils.ImageUtils +import com.gh.gamecenter.common.utils.toBinding import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.databinding.ItemCategoryBinding import com.gh.gamecenter.entity.CategoryEntity import net.cachapa.expandablelayout.ExpandableLayout @@ -41,7 +41,7 @@ class CategoryDirectoryAdapter(context: Context, var categoryTitle: String) holder.binding.run { divider.setBackgroundColor(R.color.background.toColor(mContext)) containerPrimaryCategory.setOnClickListener { - IntentUtils.startCategoryListActivity(root.context, categoryTitle, category) + root.context.startActivity(getIntent(root.context, categoryTitle, category, "全部")) } ImageUtils.display(iconIv, category.icon) categoryName.text = category.name diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt index 0412557a4b..c7cd8414e9 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt @@ -13,6 +13,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.gh.gamecenter.common.base.fragment.LazyFragment import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* +import com.gh.common.util.LogUtils import com.gh.gamecenter.common.view.FixLinearLayoutManager import com.gh.gamecenter.R import com.gh.gamecenter.SearchActivity 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 9bc04627c6..c0ba61b88f 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt @@ -7,6 +7,7 @@ import com.ethanhua.skeleton.Skeleton import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureListener import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.common.view.CategoryFilterView import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus 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 6102637618..10c19a6b3b 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListViewModel.kt @@ -4,7 +4,7 @@ import android.app.Application import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.gh.common.exposure.ExposureEntity +import com.gh.gamecenter.common.entity.ExposureEntity import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.ExposureUtils import com.gh.gamecenter.core.utils.UrlFilterUtils 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 3196a24d62..881a957e73 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ViewModel.kt @@ -9,7 +9,7 @@ import androidx.lifecycle.ViewModelProvider import com.gh.common.util.LogUtils import com.gh.gamecenter.entity.CategoryEntity import com.gh.gamecenter.entity.SidebarsEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.android.schedulers.AndroidSchedulers 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 b4532b7e0f..ecd336bc1d 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/AnswerViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerViewModel.kt @@ -9,7 +9,7 @@ import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.entity.AnswerEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable import io.reactivex.Single 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 2d80242edf..e24f38d357 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java @@ -33,7 +33,7 @@ import com.gh.gamecenter.databinding.PopupHistoryOptionBinding; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.history.ManageOption; import com.gh.gamecenter.manager.VisitManager; -import com.gh.gamecenter.retrofit.JSONObjectResponse; +import com.gh.gamecenter.common.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.RetrofitManager; import org.json.JSONException; 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 8b44cc6376..5e2daac106 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleViewModel.kt @@ -11,8 +11,8 @@ import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.entity.AnswerEntity import com.gh.gamecenter.qa.entity.ArticleEntity -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import io.reactivex.Observable diff --git a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt index 5726948fcb..1b561e5960 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt @@ -16,6 +16,7 @@ import androidx.recyclerview.widget.RecyclerView import com.gh.gamecenter.common.constant.ItemViewType import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler import com.gh.common.util.* +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder diff --git a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionViewModel.kt b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionViewModel.kt index bece267cb0..1730b6dd71 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionViewModel.kt @@ -17,8 +17,8 @@ import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.collection.GamesCollectionFragment.Companion.TYPE_COLLECT import com.gh.gamecenter.collection.GamesCollectionFragment.Companion.TYPE_HISTORY import com.gh.gamecenter.entity.GamesCollectionEntity -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.Single 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 ca1c59e948..6cfc417712 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -24,7 +24,6 @@ import com.gh.common.exposure.IExposable; import com.gh.common.history.HistoryHelper; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.DataCollectionUtils; -import com.gh.common.util.DataUtils; import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.common.util.DialogUtils; import com.gh.gamecenter.core.utils.GsonUtils; @@ -51,7 +50,7 @@ import com.gh.gamecenter.entity.PluginLocation; import com.gh.gamecenter.eventbus.EBDownloadChanged; import com.gh.gamecenter.eventbus.EBSkip; import com.gh.gamecenter.manager.PackagesManager; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.adapter.BaseRecyclerAdapter; import com.lightgame.download.DownloadEntity; @@ -63,9 +62,7 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.HashMap; import java.util.List; -import java.util.Map; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/gh/gamecenter/download/InstalledGameViewModel.kt b/app/src/main/java/com/gh/gamecenter/download/InstalledGameViewModel.kt index 2959f3c6d6..48a52632df 100644 --- a/app/src/main/java/com/gh/gamecenter/download/InstalledGameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/download/InstalledGameViewModel.kt @@ -14,7 +14,7 @@ import com.gh.download.DownloadManager import com.gh.gamecenter.entity.ApkEntity import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.GameInstall -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers 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 d3904e4be2..f3a9b5551d 100644 --- a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt @@ -17,6 +17,7 @@ import com.gh.common.exposure.ExposureEvent.Companion.createEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.gamecenter.common.view.BugFixedPopupWindow import com.gh.download.DownloadManager import com.gh.download.dialog.DownloadDialog 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 e923b3e17d..b82a313e66 100644 --- a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameViewModel.kt @@ -23,7 +23,7 @@ import com.gh.gamecenter.entity.GameUpdateEntity import com.gh.gamecenter.entity.PluginLocation import com.gh.gamecenter.eventbus.EBDownloadChanged import com.gh.gamecenter.manager.PackagesManager -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.download.DownloadEntity diff --git a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt index 81f2231a13..3bdf7643fe 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt @@ -11,6 +11,7 @@ import androidx.fragment.app.Fragment import com.gh.gamecenter.common.base.adapter.FragmentAdapter import com.gh.gamecenter.common.base.fragment.BaseLazyFragment import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.gamecenter.R import com.gh.gamecenter.common.callback.ConfirmListener import com.gh.gamecenter.common.constant.EntranceConsts 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 5f8b5c8509..d3568bac52 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterViewModel.kt @@ -5,7 +5,7 @@ import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import com.gh.gamecenter.entity.CommodityCategoryEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers 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 ef906e18b5..506eaa9481 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseViewModel.kt @@ -6,8 +6,7 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import com.gh.gamecenter.entity.CommodityCategoryEntity import com.gh.gamecenter.entity.RollNoticeEntity -import com.gh.gamecenter.entity.TaskEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt b/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt index 2c8f6df185..22e0aa15db 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt @@ -9,6 +9,7 @@ import androidx.recyclerview.widget.RecyclerView import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt index 5f6287d5c1..81d58cc664 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt @@ -6,12 +6,11 @@ import android.view.ViewGroup import android.widget.LinearLayout import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.ItemViewType import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler import com.gh.gamecenter.core.utils.MtaHelper import com.gh.common.util.NewLogUtils -import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt index b89fe71339..3ca7155de2 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt @@ -9,6 +9,7 @@ import com.ethanhua.skeleton.Skeleton import com.gh.gamecenter.core.AppExecutor import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.LazyListFragment diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailActivity.kt index ca2bd76cbf..289e77f732 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailActivity.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import androidx.fragment.app.Fragment -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt index 73c7629fe3..32fdf548d8 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt @@ -31,6 +31,8 @@ import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.base.TrackableDialog import com.gh.gamecenter.core.runOnUiThread import com.gh.common.util.* +import com.gh.common.util.LogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.NewsDetailActivity import com.gh.gamecenter.R 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 b01b6c2c09..bf3ac16ae3 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 @@ -14,9 +14,9 @@ import com.gh.gamecenter.entity.UserEntity import com.gh.gamecenter.eventbus.EBForumRecordChange import com.gh.gamecenter.mvvm.Resource import com.gh.gamecenter.qa.entity.* -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.EmptyResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.EmptyResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.room.AppDatabase import com.halo.assistant.HaloApp diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt index 52adfa0b5b..76d8a84e33 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt @@ -11,7 +11,6 @@ import android.widget.SeekBar import android.widget.TextView import androidx.core.content.ContextCompat import com.facebook.drawee.view.SimpleDraweeView -import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.MD5Utils diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt index e171d7790e..ae0d1d8cef 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt @@ -18,6 +18,7 @@ import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager import com.gh.common.util.* +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.R import com.gh.gamecenter.common.base.TrackableDialog import com.gh.gamecenter.common.base.adapter.FragmentAdapter 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 d3c976fd15..4fa40e2284 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 @@ -11,7 +11,7 @@ import com.gh.gamecenter.qa.entity.ArticleDetailEntity import com.gh.gamecenter.qa.entity.ArticleEntity import com.gh.gamecenter.qa.entity.QuestionsDetailEntity import com.gh.gamecenter.qa.entity.TimeEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager class CommunityHomeViewModel(application: Application) : AndroidViewModel(application) { diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt index e02727982b..c4faac3812 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt @@ -8,6 +8,7 @@ import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.exposure.time.TimeUtil import com.gh.common.util.* +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter 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 081383d70f..8c1bf97640 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 @@ -7,7 +7,7 @@ import com.gh.gamecenter.common.utils.singleToMain import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.ForumActivityCategoryEntity import com.gh.gamecenter.entity.ForumActivityEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Single diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt index f5d08fe153..203100175c 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt @@ -6,8 +6,11 @@ import android.graphics.Color import android.graphics.drawable.GradientDrawable import android.text.SpannableStringBuilder import android.view.View -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.common.util.* +import com.gh.common.util.DialogUtils +import com.gh.common.util.LogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.R import com.gh.gamecenter.common.callback.ConfirmListener import com.gh.gamecenter.common.utils.* diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt index 9ef6db0285..ced9640898 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt @@ -4,17 +4,15 @@ import android.content.Context import android.graphics.Color import android.view.View import android.view.ViewGroup -import android.widget.LinearLayout import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.ItemViewType import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler import com.gh.gamecenter.core.utils.MtaHelper import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.common.utils.goneIf -import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter 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 78b0c2afdf..26ef01deee 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 @@ -12,7 +12,7 @@ import com.gh.gamecenter.entity.ForumUnreadEntity import com.gh.gamecenter.entity.ForumVideoEntity import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.entity.ArticleEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.room.AppDatabase import io.reactivex.Observable diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumFragment.kt index 63f5b5e7fc..ac002cef8e 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumFragment.kt @@ -18,6 +18,7 @@ import com.ethanhua.skeleton.ViewSkeletonScreen import com.gh.gamecenter.common.base.fragment.LazyFragment import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.view.GridSpacingItemColorDecoration import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.* diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumHomeViewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumHomeViewModel.kt index a6b88271d8..a92a8c5d36 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumHomeViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumHomeViewModel.kt @@ -9,7 +9,7 @@ import com.gh.gamecenter.entity.ForumEntity import com.gh.gamecenter.entity.LinkEntity import com.gh.gamecenter.manager.PackagesManager import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers 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 b7a7994cf2..02eef20134 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 @@ -10,8 +10,8 @@ import com.gh.gamecenter.entity.ForumBannerEntity import com.gh.gamecenter.entity.ForumEntity import com.gh.gamecenter.entity.ForumUnreadEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/HorizontalForumsAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/HorizontalForumsAdapter.kt index 8f98ceefc3..17dc0acdbe 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/HorizontalForumsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/HorizontalForumsAdapter.kt @@ -4,6 +4,7 @@ import android.content.Context import android.view.ViewGroup import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.util.* +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.NumberUtils 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 8addc80180..55b47d8fca 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 @@ -5,7 +5,7 @@ import android.app.Application import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.ForumEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers 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 1ee994a1c1..9d5ad22fb8 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 @@ -6,7 +6,7 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.entity.ApplyModeratorStatusEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListAdapter.kt index 01cedafa38..2076b7c78b 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListAdapter.kt @@ -6,6 +6,7 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.util.* +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.common.utils.ImageUtils 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 925e0167fe..07819763b8 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 @@ -10,8 +10,8 @@ import com.gh.gamecenter.R import com.gh.gamecenter.entity.ApplyModeratorStatusEntity import com.gh.gamecenter.entity.PersonalEntity import com.gh.gamecenter.eventbus.EBUserFollow -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.google.gson.JsonObject import com.halo.assistant.HaloApp diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt index 02c44c53a3..e45d7e7420 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt @@ -10,11 +10,12 @@ import android.view.ViewGroup import android.widget.LinearLayout import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.common.constant.ItemViewType import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler import com.gh.common.util.* +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter 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 e3a13cf606..4d175c1d03 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 @@ -5,7 +5,7 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import com.gh.gamecenter.common.utils.observableToMain import com.gh.gamecenter.entity.SettingsEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager class ForumOrUserSearchDefaultViewModel(application: Application) : AndroidViewModel(application) { 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 9c8d6f2915..2462eebc35 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 @@ -6,7 +6,7 @@ import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.entity.FollowersOrFansEntity import com.gh.gamecenter.eventbus.EBUserFollow -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import io.reactivex.Observable 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 743c2be651..1b55f7aeb0 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 @@ -8,8 +8,8 @@ import com.gh.gamecenter.entity.ForumCategoryEntity import com.gh.gamecenter.entity.ForumEntity import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.mvvm.Resource -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt index 32006fb206..906ef46b5c 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt @@ -14,6 +14,8 @@ import androidx.viewpager.widget.ViewPager import com.gh.gamecenter.common.base.adapter.FragmentAdapter import com.gh.common.exposure.ExposureSource import com.gh.common.util.* +import com.gh.common.util.LogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.R import com.gh.gamecenter.amway.AmwayFragment import com.gh.gamecenter.catalog.CatalogFragment 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 0ca3b1dc03..93c5a61b13 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperViewModel.kt @@ -8,7 +8,7 @@ import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.R import com.gh.gamecenter.entity.SubjectRecommendEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java index de4d37a3ce..5073cf75a6 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java @@ -29,34 +29,33 @@ import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProviders; -import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment; -import com.gh.gamecenter.common.constant.Constants; import com.gh.common.util.CheckLoginUtils; -import com.gh.gamecenter.common.utils.ExtensionsKt; -import com.gh.gamecenter.core.utils.ClickUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.EnergyTaskHelper; -import com.gh.gamecenter.common.constant.EntranceConsts; -import com.gh.gamecenter.common.utils.PackageFlavorHelper; import com.gh.common.util.LogUtils; import com.gh.common.util.LoginHelper; import com.gh.common.util.LoginUtils; -import com.gh.gamecenter.core.utils.MtaHelper; -import com.gh.gamecenter.core.utils.PatternUtils; -import com.gh.gamecenter.common.utils.PermissionHelper; import com.gh.common.util.QuickLoginHelper; -import com.gh.gamecenter.core.utils.SPUtils; -import com.gh.gamecenter.LoginActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.WebActivity; +import com.gh.gamecenter.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment; +import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.common.utils.PackageFlavorHelper; +import com.gh.gamecenter.common.utils.PermissionHelper; +import com.gh.gamecenter.core.utils.ClickUtils; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.core.utils.PatternUtils; +import com.gh.gamecenter.core.utils.SPUtils; import com.gh.gamecenter.databinding.FragmentLoginBinding; import com.gh.gamecenter.entity.LoginTokenEntity; import com.gh.gamecenter.entity.UserInfoEntity; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.manager.UserManager; -import com.gh.gamecenter.common.base.fragment.NormalFragment; import com.gh.gamecenter.security.BindPhoneActivity; -import com.gh.gamecenter.user.ApiResponse; +import com.gh.gamecenter.common.retrofit.ApiResponse; import com.gh.gamecenter.user.LoginTag; import com.gh.gamecenter.user.UserViewModel; import com.halo.assistant.HaloApp; @@ -91,7 +90,7 @@ public class LoginFragment private String mServiceId; private Animation mShakeAnim; - private int mStatus = LoginActivity.STATUS_DEFAULT; + private int mStatus = QuickLoginHelper.STATUS_DEFAULT; @Override protected void handleMessage(Message msg) { @@ -138,9 +137,9 @@ public class LoginFragment super.onCreate(savedInstanceState); if (getArguments() != null) { - mStatus = getArguments().getInt(EntranceConsts.KEY_SHOW_QUICK_LOGIN, LoginActivity.STATUS_DEFAULT); + mStatus = getArguments().getInt(EntranceConsts.KEY_SHOW_QUICK_LOGIN, QuickLoginHelper.STATUS_DEFAULT); } else { - mStatus = LoginActivity.STATUS_DEFAULT; + mStatus = QuickLoginHelper.STATUS_DEFAULT; } final UserViewModel.Factory factory = new UserViewModel.Factory(HaloApp.getInstance().getApplication()); @@ -189,7 +188,7 @@ public class LoginFragment params.topMargin = screenHeight * 80 / 640; mBinding.loginPhoneContainer.setLayoutParams(params); - if (mStatus == LoginActivity.STATUS_DEFAULT) { + if (mStatus == QuickLoginHelper.STATUS_DEFAULT) { mBinding.quickLoginTv.setVisibility(View.GONE); } else { mBinding.quickLoginTv.setVisibility(View.VISIBLE); @@ -240,9 +239,9 @@ public class LoginFragment super.onClick(v); int id = v.getId(); if (id == R.id.quickLoginTv) { - if (mStatus == LoginActivity.STATUS_FROM_QUICK_LOGIN_PAGE) { + if (mStatus == QuickLoginHelper.STATUS_FROM_QUICK_LOGIN_PAGE) { requireActivity().finish(); - } else if (mStatus == LoginActivity.STATUS_FROM_QUICK_LOGIN_PERMISSION) { + } else if (mStatus == QuickLoginHelper.STATUS_FROM_QUICK_LOGIN_PERMISSION) { showPermissionDialog(); } } else if (id == R.id.checkIv || id == R.id.checkClickView1 || id == R.id.checkClickView2) { @@ -429,7 +428,7 @@ public class LoginFragment if (getActivity() != null && CheckLoginUtils.isLogin()) { getActivity().finish(); // 如果是从一键登录页跳转过来的，登录成功后也要finish一键登录页 - if (mStatus == LoginActivity.STATUS_FROM_QUICK_LOGIN_PAGE) { + if (mStatus == QuickLoginHelper.STATUS_FROM_QUICK_LOGIN_PAGE) { QuickLoginHelper.finishAuthActivity(); } } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java index 30f914263a..fd0558c665 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java @@ -30,7 +30,7 @@ import com.gh.common.constant.Config; import com.gh.common.dialog.PrivacyPolicyDialogFragment; import com.gh.common.dialog.ReserveDialog; import com.gh.common.exposure.ExposureSource; -import com.gh.common.tracker.TrackerLogger; +import com.gh.gamecenter.common.tracker.TrackerLogger; import com.gh.common.util.FloatingBackViewManager; import com.gh.common.util.HomeBottomBarHelper; import com.gh.common.util.IntegralLogHelper; diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperRepository.kt b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperRepository.kt index 515ac9aff4..a25ddaecec 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperRepository.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperRepository.kt @@ -6,7 +6,7 @@ import com.gh.common.util.HomeBottomBarHelper import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.core.utils.SingletonHolder import com.gh.gamecenter.entity.SubjectRecommendEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.android.schedulers.AndroidSchedulers 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 63f0130eab..07921862c6 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperViewModel.kt @@ -8,9 +8,7 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.common.util.CheckLoginUtils -import com.gh.common.util.HomeBottomBarHelper import com.gh.common.util.PackageUtils -import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.entity.DialogEntity @@ -18,12 +16,11 @@ import com.gh.gamecenter.entity.SimpleGameEntity import com.gh.gamecenter.entity.SubjectRecommendEntity import com.gh.gamecenter.entity.WelcomeDialogEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers -import retrofit2.HttpException class MainWrapperViewModel(application: Application, repository: MainWrapperRepository) : AndroidViewModel(application) { private val mApi = RetrofitManager.getInstance().api diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt index e40098afdd..2b33fe21b6 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt @@ -17,6 +17,8 @@ import com.gh.common.databind.BindingAdapters import com.gh.common.exposure.* import com.gh.gamecenter.core.runOnIoThread import com.gh.common.util.* +import com.gh.common.util.LogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.BlockActivity import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.MainActivity @@ -26,6 +28,7 @@ import com.gh.gamecenter.adapter.viewholder.* import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.category.CategoryDirectoryActivity import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.entity.ExposureEntity import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.common.view.FixGridLayoutManager import com.gh.gamecenter.common.view.GridSpacingItemDecoration diff --git a/app/src/main/java/com/gh/gamecenter/game/GameNavigationAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameNavigationAdapter.kt index 5b031919b3..00199e2fe9 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameNavigationAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameNavigationAdapter.kt @@ -10,6 +10,7 @@ import com.gh.common.util.* import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.entity.ExposureEntity import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.common.utils.goneIf import com.gh.gamecenter.common.utils.safelyGetInRelease 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 dc125a4447..a74ac8df51 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameViewModel.kt @@ -5,7 +5,7 @@ import android.app.Application import android.text.TextUtils import androidx.collection.ArrayMap import androidx.lifecycle.* -import com.gh.common.exposure.ExposureEntity +import com.gh.gamecenter.common.entity.ExposureEntity import com.gh.common.filter.RegionSettingHelper import com.gh.gamecenter.core.iinterface.IOffsetable import com.gh.common.util.* @@ -24,8 +24,8 @@ import com.gh.gamecenter.game.data.GameSubjectData import com.gh.gamecenter.game.rank.RankCollectionAdapter import com.gh.gamecenter.gamecollection.square.GameCollectionListItemData import com.gh.gamecenter.home.BlankDividerViewHolder -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.fragment.SettingsFragment import com.lightgame.utils.Utils 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 10d11f059d..e6403fa293 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 @@ -10,7 +10,7 @@ import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.entity.GameColumnCollection import com.gh.gamecenter.entity.LinkEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.Observable diff --git a/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt b/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt index 537c362dec..67db15b363 100644 --- a/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.game.upload import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R 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 de9c039121..badf0f9cb9 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 @@ -7,10 +7,10 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager -import com.gh.gamecenter.user.ApiResponse +import com.gh.gamecenter.common.retrofit.ApiResponse import com.google.gson.JsonObject import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt index ae233063d4..479383593b 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt @@ -20,6 +20,7 @@ import com.gh.gamecenter.common.syncpage.SyncDataEntity import com.gh.gamecenter.common.syncpage.SyncFieldConstants import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.common.view.GridSpacingItemColorDecoration import com.gh.gamecenter.GameDetailActivity 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 cc17f78364..85e87ec594 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 @@ -20,7 +20,9 @@ import com.gh.common.history.HistoryHelper import com.gh.gamecenter.common.syncpage.SyncDataEntity import com.gh.gamecenter.common.syncpage.SyncFieldConstants import com.gh.gamecenter.common.syncpage.SyncPageRepository -import com.gh.common.util.* +import com.gh.common.util.DialogUtils +import com.gh.common.util.DirectUtils +import com.gh.common.util.NewLogUtils import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus import com.gh.download.DownloadManager @@ -28,16 +30,18 @@ import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.common.view.SegmentedFilterView -import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentGameCollectionDetailBinding import com.gh.gamecenter.databinding.LayoutGameCollectionTagBinding import com.gh.gamecenter.entity.GamesCollectionDetailEntity -import com.gh.gamecenter.entity.NormalShareEntity +import com.gh.gamecenter.common.entity.NormalShareEntity import com.gh.gamecenter.eventbus.EBDownloadStatus import com.gh.gamecenter.eventbus.EBPackage -import com.gh.gamecenter.eventbus.EBShare +import com.gh.gamecenter.common.eventbus.EBShare +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.core.utils.MD5Utils +import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.eventbus.EBUserFollow import com.gh.gamecenter.gamedetail.GameDetailFragment import com.gh.gamecenter.home.video.ScrollCalculatorHelper @@ -1019,7 +1023,7 @@ class GameCollectionDetailFragment : } fun logEvent(event: String, shareType: String = "") { - NewLogUtils.logViewOrClickGameCollectionDetail( + com.gh.gamecenter.common.utils.NewLogUtils.logViewOrClickGameCollectionDetail( event, mGameCollectionTitle, mGameCollectionId, 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 67fc2887ca..b91d92061d 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 @@ -25,9 +25,9 @@ import com.gh.gamecenter.eventbus.EBUserFollow import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.article.detail.CommentItemData import com.gh.gamecenter.qa.comment.base.BaseCommentViewModel -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.EmptyResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.EmptyResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Utils 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 e5c93a1b28..48c00474c4 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 @@ -5,7 +5,7 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import com.gh.gamecenter.R import com.gh.gamecenter.eventbus.EBUserFollow -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionShareDialog.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionShareDialog.kt index 113ff7decb..65d7698247 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionShareDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionShareDialog.kt @@ -6,13 +6,14 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import com.gh.gamecenter.common.base.fragment.BaseDraggableDialogFragment -import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.ShareUtils import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.common.utils.toDrawable import com.gh.gamecenter.databinding.DialogGameCollectionShareBinding -import com.gh.gamecenter.entity.NormalShareEntity -import com.gh.gamecenter.eventbus.EBShare +import com.gh.gamecenter.common.entity.NormalShareEntity +import com.gh.gamecenter.common.eventbus.EBShare +import com.gh.gamecenter.common.utils.NewLogUtils import org.greenrobot.eventbus.EventBus class GameCollectionShareDialog : BaseDraggableDialogFragment() { diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationViewModel.kt index 411eaf376f..131883d36d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationViewModel.kt @@ -7,7 +7,7 @@ import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailViewModel import com.gh.gamecenter.qa.article.detail.CommentItemData -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import io.reactivex.Single import io.reactivex.schedulers.Schedulers import retrofit2.HttpException 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 1ee431c191..fee5277cb5 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 @@ -7,7 +7,7 @@ import com.gh.gamecenter.common.utils.observableToMain import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.GamesCollectionEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable import okhttp3.ResponseBody diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/ChooseGameCollectionDefaultCoverDialog.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/ChooseGameCollectionDefaultCoverDialog.kt index c24d9e8a39..2947859bfb 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/ChooseGameCollectionDefaultCoverDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/ChooseGameCollectionDefaultCoverDialog.kt @@ -16,6 +16,7 @@ import androidx.recyclerview.widget.GridLayoutManager import com.gh.gamecenter.common.base.fragment.BaseDialogFragment import androidx.recyclerview.widget.RecyclerView import com.gh.common.util.* +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.view.GridSpacingItemColorDecoration import com.gh.gamecenter.R import com.gh.gamecenter.common.constant.EntranceConsts diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/ChooseGameCollectionDefaultCoverViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/ChooseGameCollectionDefaultCoverViewModel.kt index 1d3dac4063..e36e0ea0d2 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/ChooseGameCollectionDefaultCoverViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/ChooseGameCollectionDefaultCoverViewModel.kt @@ -8,7 +8,7 @@ import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.core.utils.ToastUtils import com.gh.gamecenter.common.utils.observableToMain import com.gh.gamecenter.entity.GameCollectionCoverEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import retrofit2.HttpException diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelViewModel.kt index 79c65f6f3f..6c0b86956c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelViewModel.kt @@ -5,7 +5,7 @@ import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import com.gh.gamecenter.entity.ActivityLabelEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt index 7ec941067b..f299e2f0ba 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt @@ -10,15 +10,15 @@ import android.view.View import android.widget.TextView import androidx.core.widget.doOnTextChanged import com.gh.base.ToolBarActivity +import com.gh.common.util.ErrorHelper +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.gamecenter.common.constant.Constants -import com.gh.common.util.* import com.gh.gamecenter.CropImageActivity import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.* -import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.core.utils.PatternUtils import com.gh.gamecenter.databinding.ActivityGameCollectionEditBinding import com.gh.gamecenter.databinding.ItemGameCollectionFlexTagBinding 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 7f113ff4f9..c8fca51e69 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 @@ -17,8 +17,8 @@ import com.gh.gamecenter.entity.GameCollectionDraft import com.gh.gamecenter.entity.GamesCollectionEntity import com.gh.gamecenter.entity.TagInfoEntity import com.gh.gamecenter.mvvm.Resource -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.room.AppDatabase import okhttp3.ResponseBody diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionBannerAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionBannerAdapter.kt index 91e38ccee2..91ad2ace3f 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionBannerAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionBannerAdapter.kt @@ -6,6 +6,7 @@ import androidx.recyclerview.widget.RecyclerView import com.gh.common.exposure.* import com.gh.common.util.DirectUtils import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.entity.ExposureEntity import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.common.utils.safelyGetInRelease import com.gh.gamecenter.common.utils.toBinding diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareActivity.kt index 5c45108156..38e65b49bb 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareActivity.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.gamecollection.square import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.common.util.GameCollectionSquareBrowseTaskHelper import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareAdapter.kt index cbb6f4e9c0..7359c113ff 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareAdapter.kt @@ -16,7 +16,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.PagerSnapHelper import androidx.recyclerview.widget.RecyclerView import androidx.viewpager2.widget.ViewPager2 -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource @@ -24,11 +24,13 @@ import com.gh.common.exposure.IExposable import com.gh.common.util.* import com.gh.gamecenter.common.utils.ImageUtils.display import com.gh.common.exposure.* +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.LoadStatus +import com.gh.gamecenter.common.entity.ExposureEntity import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.common.view.ScrollEventListener import com.gh.gamecenter.core.utils.DisplayUtils diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt index 364a936bd3..22c6b64df3 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt @@ -24,6 +24,7 @@ import com.ethanhua.skeleton.Skeleton import com.gh.common.exposure.* import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.view.SegmentedFilterView import com.gh.gamecenter.common.view.VerticalItemDecoration import com.gh.gamecenter.R @@ -31,6 +32,7 @@ import com.gh.gamecenter.baselist.LazyListFragment import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.entity.ExposureEntity import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.common.view.ScrollEventListener import com.gh.gamecenter.core.utils.* 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 a6c65468fe..72bcfe8195 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 @@ -8,7 +8,7 @@ import com.gh.gamecenter.baselist.LoadParams import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.entity.* -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable import io.reactivex.Single 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 57079de6bf..6a9363e402 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 @@ -5,7 +5,7 @@ import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import com.gh.gamecenter.entity.GameCollectionTagEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers 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 a08b30cc76..eff990c309 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt @@ -28,6 +28,9 @@ import com.gh.gamecenter.core.iinterface.IScrollable import com.gh.common.repository.ReservationRepository import com.gh.common.simulator.SimulatorGameManager import com.gh.common.util.* +import com.gh.common.util.DialogUtils +import com.gh.common.util.LogUtils +import com.gh.common.util.NewLogUtils import com.gh.common.view.FlexLinearLayout import com.gh.gamecenter.common.view.WrapContentDraweeView import com.gh.common.xapk.XapkInstaller 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 2a16b61198..a86ba4a5fd 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt @@ -26,8 +26,8 @@ import com.gh.gamecenter.gamedetail.entity.DetailEntity import com.gh.gamecenter.gamedetail.entity.NewGameDetailEntity import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.mvvm.Resource -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt index c0ade48de2..8d89732d40 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt @@ -26,6 +26,9 @@ import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureManager import com.gh.common.exposure.ExposureSource import com.gh.common.util.* +import com.gh.common.util.DialogUtils +import com.gh.common.util.LogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.view.GridSpacingItemColorDecoration import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration import com.gh.gamecenter.GameNewsActivity diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt index 8ddea93572..ce4a0d33aa 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt @@ -10,10 +10,11 @@ import android.widget.PopupWindow import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.common.callback.ConfirmListener 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 3c64c4a63f..4381d820e7 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 @@ -22,7 +22,7 @@ import com.gh.gamecenter.entity.SubjectEntity import com.gh.gamecenter.gamedetail.entity.CustomColumn import com.gh.gamecenter.gamedetail.entity.DetailEntity import com.gh.gamecenter.gamedetail.entity.GameInfo -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Utils diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailInfoItemAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailInfoItemAdapter.kt index 462ca79baa..9ac3575560 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailInfoItemAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailInfoItemAdapter.kt @@ -11,6 +11,7 @@ import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.utils.ShareUtils import com.gh.gamecenter.core.utils.TimeUtils import com.gh.gamecenter.common.utils.copyTextAndToast import com.gh.gamecenter.common.utils.toBinding diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRaidersAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRaidersAdapter.kt index 770d0a4a87..1dabfb6ede 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRaidersAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRaidersAdapter.kt @@ -6,6 +6,7 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.gh.common.DefaultUrlHandler import com.gh.common.util.* +import com.gh.common.util.LogUtils import com.gh.gamecenter.NewsDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.* diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt index 55efed24bb..716e429e0b 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt @@ -8,7 +8,7 @@ import androidx.appcompat.app.AppCompatActivity import com.gh.gamecenter.common.base.fragment.BaseDraggableDialogFragment import com.gh.common.util.EnergyTaskHelper.postEnergyTask import com.gh.gamecenter.core.utils.MtaHelper -import com.gh.common.util.ShareUtils +import com.gh.gamecenter.common.utils.ShareUtils import com.gh.gamecenter.common.utils.isPublishEnv import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity 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 894001b424..e1804977af 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 @@ -10,7 +10,7 @@ import com.gh.gamecenter.core.utils.ToastUtils import com.gh.gamecenter.databinding.DialogInviteCodeBinding import com.gh.gamecenter.eventbus.EBTask import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.security.BindPhoneActivity import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt index d4143fde73..44b3cdf686 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt @@ -11,6 +11,7 @@ import com.ethanhua.skeleton.ViewSkeletonScreen import com.gh.gamecenter.common.base.fragment.LazyFragment import com.gh.gamecenter.core.iinterface.IScrollable import com.gh.common.util.* +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.R import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.* 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 8d4a4ca246..443e0ab83a 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 @@ -8,7 +8,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.common.utils.throwExceptionInDebug import com.gh.gamecenter.entity.* -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Single import io.reactivex.SingleEmitter diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt index 1ede9cadf3..ebf4ccf958 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.gamedetail.history import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R 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 70bdaf5f8e..f11a0fdff2 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 @@ -9,7 +9,7 @@ import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.entity.ApkEntity import com.gh.gamecenter.entity.GameEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.download.DownloadEntity import io.reactivex.Single diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingActivity.kt index edb2f5f7fd..6df435d0aa 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.gamedetail.myrating import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R 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 7e3bfe5433..24a5777741 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 @@ -8,7 +8,7 @@ import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.ErrorEntity import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.personalhome.rating.MyRating -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import io.reactivex.Observable diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt index e1c21bfcbd..42ef1c0c75 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt @@ -11,6 +11,8 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* +import com.gh.common.util.DialogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt index 762e82dba8..4e61de6656 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt @@ -18,10 +18,12 @@ import android.widget.LinearLayout import android.widget.PopupWindow import android.widget.TextView import androidx.core.content.ContextCompat -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* +import com.gh.common.util.DialogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.view.CustomLinkMovementMethod import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.R @@ -40,7 +42,6 @@ import com.squareup.picasso.Picasso import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers -import splitties.views.setCompoundDrawables import java.util.regex.Pattern class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseRecyclerViewHolder(binding.root) { 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 a5cfc0a4b1..f63f389be9 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 @@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.common.exposure.ExposureManager import com.gh.common.util.* +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.view.VerticalItemDecoration import com.gh.download.DownloadManager import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt index 344be86179..41cce85646 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt @@ -13,7 +13,7 @@ import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.constant.ItemViewType @@ -21,6 +21,8 @@ import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable import com.gh.common.util.* +import com.gh.common.util.DialogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.view.CustomLinkMovementMethod import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.GameDetailActivity diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyViewModel.kt index 74f1b02a05..bb3204b6a5 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyViewModel.kt @@ -20,7 +20,7 @@ import com.gh.gamecenter.entity.ErrorEntity import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.RatingComment import com.gh.gamecenter.entity.RatingReplyEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Utils 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 db3bd819e5..fe8f32044b 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 @@ -18,7 +18,7 @@ import com.gh.gamecenter.entity.ErrorEntity import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.Rating import com.gh.gamecenter.entity.RatingComment -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import io.reactivex.Observable diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt index 4f6cc46bc2..35ba8ec316 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt @@ -19,12 +19,15 @@ import com.gh.gamecenter.core.AppExecutor import com.gh.common.DefaultJsApi import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* +import com.gh.common.util.DialogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.view.dsbridge.DWebView import com.gh.gamecenter.common.view.dsbridge.OnReturnValue import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.R import com.gh.gamecenter.ShellActivity import com.gh.gamecenter.WebActivity +import com.gh.gamecenter.common.callback.CancelListener import com.gh.gamecenter.common.callback.ConfirmListener import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.* @@ -302,15 +305,16 @@ class RatingEditActivity : ToolBarActivity(), KeyboardHeightObserver { this@RatingEditActivity, true, "提示", "检测到您评论的内容中含有反映游戏问题相关内容，可选择点击下方联系客服按钮，将问题反馈给客服，以便更优解决！", "联系客服", "继续提交", - object :ConfirmListener{ - override fun onConfirm() { - DirectUtils.directToWebView(this@RatingEditActivity, Constants.TENCENT_QIDIAN_ADDRESS, mEntrance) - MtaHelper.onEvent("游戏评论跳转", "联系客服弹窗", "点击联系客服") - } - }, - { - postGameComment(again = true) - MtaHelper.onEvent("游戏评论跳转", "联系客服弹窗", "点击继续提交") + object : ConfirmListener { + override fun onConfirm() { + DirectUtils.directToWebView(this@RatingEditActivity, Constants.TENCENT_QIDIAN_ADDRESS, mEntrance) + MtaHelper.onEvent("游戏评论跳转", "联系客服弹窗", "点击联系客服") + } + }, object : CancelListener { + override fun onCancel() { + postGameComment(again = true) + MtaHelper.onEvent("游戏评论跳转", "联系客服弹窗", "点击继续提交") + } }, TrackableEntity(event = "游戏评论跳转", key = "联系客服弹窗") ) } @@ -321,7 +325,7 @@ class RatingEditActivity : ToolBarActivity(), KeyboardHeightObserver { this@RatingEditActivity, "提示", "检测到您评论的内容中含有反映游戏问题相关内容，可选择点击下方问题反馈按钮，将问题反馈给后台客服，以便更优解决！", "问题反馈", "继续提交", - object :ConfirmListener{ + object : ConfirmListener { override fun onConfirm() { MtaHelper.onEvent("游戏评论跳转", "意见反馈弹窗", "点击问题反馈") mBinding.mWebView.callHandler("getComment", OnReturnValue { content -> @@ -335,10 +339,11 @@ class RatingEditActivity : ToolBarActivity(), KeyboardHeightObserver { finish() }) } - }, - { - MtaHelper.onEvent("游戏评论跳转", "意见反馈弹窗", "点击继续提交") - postGameComment(again = true) + }, object : CancelListener { + override fun onCancel() { + MtaHelper.onEvent("游戏评论跳转", "意见反馈弹窗", "点击继续提交") + postGameComment(again = true) + } }, TrackableEntity(event = "游戏评论跳转", key = "意见反馈弹窗") ) } @@ -487,7 +492,7 @@ class RatingEditActivity : ToolBarActivity(), KeyboardHeightObserver { override fun onNightModeChange() { super.onNightModeChange() - updateStatusBarColor( R.color.black, R.color.white) + updateStatusBarColor(R.color.black, R.color.white) mBinding.mWebView.enableForceDark(NightModeUtils.isNightMode(this)) } 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 57db61389a..0d8f76888d 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 @@ -14,8 +14,8 @@ import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.RatingComment import com.gh.gamecenter.mvvm.Resource -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import io.reactivex.android.schedulers.AndroidSchedulers 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 1712bd2202..2b0c2bb822 100644 --- a/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java +++ b/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java @@ -5,7 +5,7 @@ import android.content.Context; import android.content.DialogInterface; import com.gh.gamecenter.core.utils.AppDebugConfig; -import com.gh.gamecenter.retrofit.JSONObjectResponse; +import com.gh.gamecenter.common.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.utils.RuntimeUtils; import com.lightgame.utils.Utils; 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 71fec2a466..1798a1a37e 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpContainerViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpContainerViewModel.kt @@ -8,7 +8,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.entity.HelpCategoryEntity import com.gh.gamecenter.mvvm.Resource -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryViewModel.kt b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryViewModel.kt index ce51e8f8e3..c305add261 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryViewModel.kt @@ -8,7 +8,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.entity.HelpCategoryEntity import com.gh.gamecenter.mvvm.Resource -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.android.schedulers.AndroidSchedulers 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 2f1b9f5791..02c96870f0 100644 --- a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackViewModel.kt @@ -12,7 +12,7 @@ import com.gh.common.util.PackageUtils import com.gh.gamecenter.common.utils.singleToMain import com.gh.gamecenter.common.utils.toRequestBody import com.gh.gamecenter.R -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.walkud.rom.checker.RomIdentifier 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 67a54dafaa..2dab8bb5bf 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt @@ -12,6 +12,7 @@ import com.gh.gamecenter.common.constant.Constants import com.gh.common.databind.BindingAdapters import com.gh.common.exposure.ExposureListener import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.gamecenter.common.view.OffsetLinearLayoutManager import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus 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 b13721f08a..663d76eaa4 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt @@ -18,8 +18,8 @@ import com.gh.gamecenter.entity.* import com.gh.gamecenter.game.rank.RankCollectionAdapter import com.gh.gamecenter.gamecollection.square.GameCollectionListItemData import com.gh.gamecenter.packagehelper.PackageRepository -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.halo.assistant.fragment.SettingsFragment diff --git a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt index ee520dca66..de0097f2f0 100644 --- a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt +++ b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt @@ -15,6 +15,8 @@ import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.gamecenter.core.iinterface.IOffsetable import com.gh.common.util.* +import com.gh.common.util.LogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.MainActivity import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionAdapter.kt index 3688f52f7e..c561c58a8e 100644 --- a/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionAdapter.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.home.gamecollection import android.content.Context import android.view.View import android.view.ViewGroup -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.util.* import com.gh.common.view.AsyncCell diff --git a/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipActivity.kt b/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipActivity.kt index 85ac31e5fa..1000f1a127 100644 --- a/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.home.skip import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.R import com.gh.gamecenter.entity.GameEntity 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 c7420185e0..092ea6bb1a 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java @@ -34,9 +34,9 @@ import com.gh.gamecenter.entity.ViewsEntity; import com.gh.gamecenter.manager.CommentManager; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.manager.VisitManager; -import com.gh.gamecenter.retrofit.JSONObjectResponse; -import com.gh.gamecenter.retrofit.ObservableUtil; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.JSONObjectResponse; +import com.gh.gamecenter.common.retrofit.ObservableUtil; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.adapter.BaseRecyclerAdapter; import com.lightgame.utils.Utils; 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 28f6f11057..e439c6f1e5 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java @@ -47,7 +47,7 @@ import com.gh.gamecenter.eventbus.EBNetworkState; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.common.base.fragment.NormalFragment; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.fragment.myconcern.MyConcernRecommendAdapter; 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 42acd9a3ad..c19d5644c2 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java @@ -27,7 +27,7 @@ import com.gh.gamecenter.databinding.NewsImage2ItemBinding; import com.gh.gamecenter.databinding.NewsImage3ItemBinding; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.manager.VisitManager; -import com.gh.gamecenter.retrofit.JSONObjectResponse; +import com.gh.gamecenter.common.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.RetrofitManager; import org.json.JSONException; diff --git a/app/src/main/java/com/gh/gamecenter/info/NewsViewsRepository.java b/app/src/main/java/com/gh/gamecenter/info/NewsViewsRepository.java index a4e21091be..a8be2b4f0f 100644 --- a/app/src/main/java/com/gh/gamecenter/info/NewsViewsRepository.java +++ b/app/src/main/java/com/gh/gamecenter/info/NewsViewsRepository.java @@ -3,7 +3,7 @@ package com.gh.gamecenter.info; import androidx.lifecycle.LiveData; import androidx.lifecycle.MediatorLiveData; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import java.util.List; 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 086aaa6595..7273792c7f 100644 --- a/app/src/main/java/com/gh/gamecenter/info/OriginalAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/OriginalAdapter.java @@ -26,7 +26,7 @@ import com.gh.gamecenter.databinding.NewsImage2ItemBinding; import com.gh.gamecenter.databinding.NewsImage3ItemBinding; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.manager.VisitManager; -import com.gh.gamecenter.retrofit.JSONObjectResponse; +import com.gh.gamecenter.common.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.RetrofitManager; import org.json.JSONException; 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 f51947f745..b0673de621 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java @@ -20,7 +20,7 @@ import com.gh.gamecenter.adapter.viewholder.NewsTextViewHolder; import com.gh.gamecenter.databinding.NewsFooterItemBinding; import com.gh.gamecenter.databinding.NewsTextItemBinding; import com.gh.gamecenter.entity.NewsEntity; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.adapter.BaseRecyclerAdapter; 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 a89f9fe433..4a6d68b316 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java @@ -35,7 +35,7 @@ import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.personal.PersonalFragment; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.jakewharton.rxbinding2.view.RxView; 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 beb3cedb3d..b6cfce3a6e 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -25,7 +25,7 @@ import com.gh.gamecenter.databinding.LibaoItemBinding; import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.entity.LibaoStatusEntity; import com.gh.gamecenter.manager.UserManager; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.adapter.BaseRecyclerAdapter; 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 857bd127ce..a464f4bf36 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java @@ -29,7 +29,7 @@ import com.gh.gamecenter.entity.LibaoStatusEntity; import com.gh.gamecenter.entity.MeEntity; import com.gh.gamecenter.entity.UserDataLibaoEntity; import com.gh.gamecenter.manager.UserManager; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.adapter.BaseRecyclerAdapter; import com.lightgame.utils.Utils; 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 faf8d520ad..f5972e6abc 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java @@ -23,7 +23,7 @@ import com.gh.gamecenter.databinding.LibaoItemBinding; import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.entity.MeEntity; import com.gh.gamecenter.entity.UserDataLibaoEntity; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.adapter.BaseRecyclerAdapter; 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 78370cd736..0c08f3d64b 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt @@ -17,7 +17,7 @@ import com.gh.gamecenter.common.utils.setRootBackgroundColor import com.gh.gamecenter.databinding.LibaoItemBinding import com.gh.gamecenter.entity.LibaoEntity import com.gh.gamecenter.entity.LibaoStatusEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.adapter.BaseRecyclerAdapter import io.reactivex.android.schedulers.AndroidSchedulers 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 41bc0c5c3b..c589fbf38c 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt @@ -17,7 +17,7 @@ import com.gh.gamecenter.common.utils.setRootBackgroundColor import com.gh.gamecenter.databinding.LibaoItemBinding import com.gh.gamecenter.entity.LibaoEntity import com.gh.gamecenter.entity.LibaoStatusEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.adapter.BaseRecyclerAdapter import io.reactivex.android.schedulers.AndroidSchedulers 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 bb11a2f8ce..d90f5f7d60 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/CommentManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/CommentManager.java @@ -5,8 +5,8 @@ import android.content.Context; import com.gh.common.constant.Config; import com.gh.gamecenter.core.utils.StringUtils; import com.gh.gamecenter.common.utils.TimestampUtils; -import com.gh.gamecenter.retrofit.ObservableUtil; -import com.gh.gamecenter.retrofit.OkHttpCache; +import com.gh.gamecenter.common.retrofit.ObservableUtil; +import com.gh.gamecenter.common.retrofit.OkHttpCache; import org.json.JSONArray; import org.json.JSONException; 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 b68b958f76..d9fef20e7c 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java @@ -4,7 +4,7 @@ import android.content.Context; import com.gh.gamecenter.core.AppExecutor; import com.gh.gamecenter.common.exposure.meta.MetaUtil; -import com.gh.common.loghub.LoghubUtils; +import com.gh.gamecenter.common.loghub.LoghubUtils; import com.gh.gamecenter.common.utils.Installation; import com.gh.common.util.LogUtils; import com.gh.common.util.PackageUtils; 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 f4af051c2a..d0ed701545 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java @@ -45,7 +45,7 @@ import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.AppEntity; import com.gh.gamecenter.entity.GameEntity; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; import com.lightgame.download.DataChanger; 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 9723d8eef4..1fba64987b 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UserManager.java @@ -2,29 +2,26 @@ package com.gh.gamecenter.manager; import android.annotation.SuppressLint; import android.content.SharedPreferences; -import android.os.Build; import android.preference.PreferenceManager; import android.text.TextUtils; import androidx.annotation.Nullable; -import com.gh.base.BaseActivity; +import com.gh.gamecenter.common.base.BaseActivity; import com.gh.gamecenter.common.constant.Constants; import com.gh.gamecenter.common.exposure.meta.MetaUtil; import com.gh.common.repository.ReservationRepository; -import com.gh.common.util.DataUtils; import com.gh.gamecenter.common.utils.DeviceUtils; import com.gh.gamecenter.common.utils.EnvHelper; import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.core.utils.SPUtils; -import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.entity.CommunityEntity; import com.gh.gamecenter.entity.LoginTokenEntity; import com.gh.gamecenter.entity.TokenEntity; import com.gh.gamecenter.entity.UserInfoEntity; -import com.gh.gamecenter.eventbus.EBShowDialog; -import com.gh.gamecenter.retrofit.BiResponse; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.eventbus.EBShowDialog; +import com.gh.gamecenter.common.retrofit.BiResponse; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.retrofit.service.ApiService; import com.gh.gamecenter.user.UserRepository; 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 77bf1c46a8..2e7c7ac421 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/VisitManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/VisitManager.java @@ -6,8 +6,8 @@ import com.gh.common.constant.Config; import com.gh.gamecenter.core.utils.StringUtils; import com.gh.gamecenter.common.utils.TimestampUtils; import com.gh.gamecenter.core.utils.UrlFilterUtils; -import com.gh.gamecenter.retrofit.ObservableUtil; -import com.gh.gamecenter.retrofit.OkHttpCache; +import com.gh.gamecenter.common.retrofit.ObservableUtil; +import com.gh.gamecenter.common.retrofit.OkHttpCache; import org.json.JSONArray; import org.json.JSONException; 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 ccdaea0558..f2ac7e3576 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuViewModel.kt @@ -4,7 +4,7 @@ import android.app.Application import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.MessageKeFuEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java index 00510055e4..896de77638 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java @@ -45,8 +45,8 @@ import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.manager.CommentManager; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.common.base.fragment.NormalFragment; -import com.gh.gamecenter.retrofit.OkHttpCache; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.OkHttpCache; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; import com.lightgame.listeners.OnBackPressedListener; @@ -204,7 +204,7 @@ public class MessageDetailFragment extends NormalFragment implements OnCommentCa .getNewsCommentnum(newsId, Utils.getTime(getContext())) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new com.gh.gamecenter.retrofit.Response>() { + .subscribe(new Response>() { @Override public void onResponse(List response) { 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 3c54522dff..667e2cab95 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java @@ -5,15 +5,13 @@ import android.content.Intent; import android.view.View; import android.widget.RelativeLayout; -import com.gh.base.BaseActivity; -import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; -import com.gh.gamecenter.common.callback.OnListClickListener; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.FragmentActivity; + +import com.gh.gamecenter.common.base.BaseActivity; import com.gh.common.databind.BindingAdapters; -import com.gh.gamecenter.core.utils.ClickUtils; import com.gh.common.util.DirectUtils; -import com.gh.gamecenter.core.utils.DisplayUtils; -import com.gh.gamecenter.common.utils.ImageUtils; -import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.NewsUtils; import com.gh.gamecenter.CommentDetailActivity; import com.gh.gamecenter.GameDetailActivity; @@ -21,6 +19,13 @@ import com.gh.gamecenter.MessageDetailActivity; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.WebActivity; +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.common.callback.OnListClickListener; +import com.gh.gamecenter.common.retrofit.Response; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.core.utils.ClickUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.databinding.MessageItemBinding; import com.gh.gamecenter.entity.CommunityEntity; import com.gh.gamecenter.entity.LinkEntity; @@ -36,7 +41,6 @@ import com.gh.gamecenter.qa.comment.CommentActivity; import com.gh.gamecenter.qa.entity.Questions; import com.gh.gamecenter.qa.follow.AskFollowMoreDialog; import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity; -import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel; import com.lightgame.utils.Utils; @@ -44,10 +48,6 @@ import com.lightgame.utils.Utils; import java.util.ArrayList; import java.util.List; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.fragment.app.FragmentActivity; - import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; import retrofit2.HttpException; 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 24685c584d..a67b2a0563 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageNormalViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/message/MessageNormalViewModel.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.MessageEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import io.reactivex.Observable 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 39a6e00043..a1174f4c20 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageUnreadRepository.kt +++ b/app/src/main/java/com/gh/gamecenter/message/MessageUnreadRepository.kt @@ -15,8 +15,8 @@ import com.gh.gamecenter.entity.ConcernEntity import com.gh.gamecenter.entity.FunctionalGroupEntity import com.gh.gamecenter.entity.MessageUnreadEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.retrofit.service.ApiService import com.google.gson.reflect.TypeToken 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 3f1d373979..1670aad208 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/message/MessageViewModel.kt @@ -4,7 +4,7 @@ import android.app.Application import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.MessageEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import io.reactivex.Observable diff --git a/app/src/main/java/com/gh/gamecenter/mvvm/NetworkBoundResource.java b/app/src/main/java/com/gh/gamecenter/mvvm/NetworkBoundResource.java index eb7324a525..bfd61586e0 100644 --- a/app/src/main/java/com/gh/gamecenter/mvvm/NetworkBoundResource.java +++ b/app/src/main/java/com/gh/gamecenter/mvvm/NetworkBoundResource.java @@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MediatorLiveData; import androidx.annotation.Nullable; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; 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 f9ed0363e3..3ce9d7d9c9 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationViewModel.kt @@ -10,7 +10,7 @@ import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import io.reactivex.Observable diff --git a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameActivity.kt b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameActivity.kt index 45563bad61..8e966afcc7 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.mygame import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity diff --git a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt index d9d5aa1a5b..12e7f57d00 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt @@ -18,6 +18,7 @@ import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.gamecenter.common.view.BugFixedPopupWindow import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.GameDetailActivity @@ -25,6 +26,7 @@ import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.GameViewHolder import com.gh.gamecenter.baselist.ListAdapter +import com.gh.gamecenter.common.callback.CancelListener import com.gh.gamecenter.common.callback.ConfirmListener import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.* @@ -205,11 +207,15 @@ open class PlayedGameAdapter( holder.binding.switchIv.setOnClickListener { if (!UsageStatsHelper.checkForPermission()) { DialogUtils.showUsageStatsDialog( - mContext, object :ConfirmListener{ + mContext, object : ConfirmListener { override fun onConfirm() { UsageStatsHelper.skipToUsageStats(mContext, UsageStatsHelper.USAGE_STATUS_REQUEST_CODE) } - }) {} + }, object : CancelListener { + override fun onCancel() { + + } + }) } } } 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 d62dbe169c..51501b5fb5 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameViewModel.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.GameEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Utils 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 5c335d6704..4fe543793b 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -30,7 +30,6 @@ import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.CommentUtils; import com.gh.common.util.ConcernUtils; import com.gh.common.util.DataCollectionUtils; -import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DirectUtils; import com.gh.common.util.NewsUtils; @@ -70,17 +69,15 @@ import com.gh.gamecenter.entity.MtaEvent; import com.gh.gamecenter.entity.NewsDetailEntity; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.qa.editor.OnLinkClickListener; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.fragment.SettingsFragment; import com.lightgame.adapter.BaseRecyclerAdapter; import com.lightgame.utils.Utils; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageFilterManager.kt b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageFilterManager.kt index 97b150716a..b4605856d7 100644 --- a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageFilterManager.kt +++ b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageFilterManager.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.packagehelper import android.annotation.SuppressLint import com.gh.gamecenter.common.utils.toRequestBody import com.gh.gamecenter.entity.PackageFilter -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.room.AppDatabase import io.reactivex.schedulers.Schedulers 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 e6adb9f766..61ca65d860 100644 --- a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt +++ b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt @@ -5,7 +5,7 @@ import android.text.TextUtils import androidx.lifecycle.MutableLiveData import com.gh.gamecenter.common.exposure.meta.MetaUtil import com.gh.common.filter.RegionSettingHelper -import com.gh.common.loghub.LoghubUtils +import com.gh.gamecenter.common.loghub.LoghubUtils import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.core.runOnIoThread @@ -17,9 +17,9 @@ import com.gh.gamecenter.manager.PackagesManager import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.packagehelper.PackageRepository.gameInstalled import com.gh.gamecenter.packagehelper.PackageRepository.gameUpdate -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.ObservableUtil -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.ObservableUtil +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Utils 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 d9fa029d15..42b01971c3 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.kt @@ -31,9 +31,7 @@ import com.gh.gamecenter.common.view.SpacingItemDecoration import com.gh.gamecenter.MessageActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.callback.ConfirmListener -import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.NetworkUtils -import com.gh.gamecenter.core.utils.StringUtils import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.common.utils.tryCatchInRelease @@ -47,23 +45,18 @@ import com.gh.gamecenter.eventbus.EBConcernChanged import com.gh.gamecenter.eventbus.EBNetworkState import com.gh.gamecenter.eventbus.EBReuse import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.message.MessageUnreadRepository.loadMessageUnreadData import com.gh.gamecenter.message.MessageUnreadRepository.loadMessageUnreadTotal import com.gh.gamecenter.message.MessageUnreadViewModel import com.gh.gamecenter.personalhome.UserHomeViewModel -import com.gh.gamecenter.qa.answer.detail.SimpleAnswerDetailActivity import com.gh.gamecenter.room.AppDatabase -import com.gh.gamecenter.user.ApiResponse +import com.gh.gamecenter.common.retrofit.ApiResponse import com.gh.gamecenter.user.UserViewModel import com.google.android.material.appbar.AppBarLayout import com.halo.assistant.HaloApp import com.tencent.connect.common.Constants -import okhttp3.MediaType -import okhttp3.RequestBody import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode -import org.json.JSONObject import kotlin.math.abs class NewPersonalFragment : BaseLazyFragment() { 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 970ea7c911..f25b30ef00 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt @@ -12,7 +12,7 @@ import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.base.fragment.BaseLazyFragment import com.gh.common.databind.BindingAdapters import com.gh.common.util.* @@ -32,9 +32,7 @@ import com.gh.gamecenter.common.view.VerticalItemDecoration import com.gh.gamecenter.MessageActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.callback.ConfirmListener -import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.NetworkUtils -import com.gh.gamecenter.core.utils.StringUtils import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.common.utils.tryCatchInRelease import com.gh.gamecenter.common.utils.PackageFlavorHelper @@ -47,25 +45,20 @@ import com.gh.gamecenter.eventbus.EBNetworkState import com.gh.gamecenter.eventbus.EBReuse import com.gh.gamecenter.fragment.MainWrapperFragment import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.message.MessageUnreadRepository.loadMessageUnreadData import com.gh.gamecenter.message.MessageUnreadRepository.loadMessageUnreadTotal import com.gh.gamecenter.message.MessageUnreadViewModel import com.gh.gamecenter.personal.NewPersonalActivity.Companion.getIntent import com.gh.gamecenter.personalhome.UserHomeViewModel -import com.gh.gamecenter.qa.answer.detail.SimpleAnswerDetailActivity import com.gh.gamecenter.room.AppDatabase -import com.gh.gamecenter.user.ApiResponse +import com.gh.gamecenter.common.retrofit.ApiResponse import com.gh.gamecenter.user.UserViewModel import com.google.android.material.appbar.AppBarLayout import com.halo.assistant.HaloApp import com.jakewharton.rxbinding2.view.RxView import com.tencent.connect.common.Constants -import okhttp3.MediaType -import okhttp3.RequestBody import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode -import org.json.JSONObject import java.util.concurrent.TimeUnit import kotlin.math.abs 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 98a14ecd7e..28b9bad513 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalViewModel.kt @@ -17,8 +17,8 @@ import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.EBSkip import com.gh.gamecenter.fragment.MainWrapperFragment import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.subject.SubjectActivity import com.halo.assistant.HaloApp 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 77de7a3152..d14365c26f 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansViewModel.kt @@ -9,7 +9,7 @@ import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.FollowersOrFansEntity import com.gh.gamecenter.eventbus.EBUserFollow import com.gh.gamecenter.personalhome.fans.FansActivity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Utils 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 3360f35036..994ded30f1 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/InstalledGameDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/InstalledGameDialog.kt @@ -16,7 +16,7 @@ import com.gh.gamecenter.R import com.gh.gamecenter.databinding.DialogInstalledGameBinding import com.gh.gamecenter.entity.GameInstall import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeActivity.kt index e2b5fa04e6..25c8c98471 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.personalhome import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt index e040082e33..4e11d921de 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt @@ -1,7 +1,6 @@ package com.gh.gamecenter.personalhome import android.graphics.Bitmap -import android.graphics.Canvas import android.graphics.drawable.BitmapDrawable import android.os.Build import android.os.Bundle @@ -20,6 +19,7 @@ import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout import com.gh.gamecenter.common.constant.Constants import com.gh.common.databind.BindingAdapters import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.common.util.DirectUtils.directToBadgeWall import com.gh.gamecenter.* import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeViewModel.kt b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeViewModel.kt index 12e1477215..995623a62b 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeViewModel.kt @@ -14,8 +14,7 @@ import com.gh.gamecenter.common.utils.createRequestBody import com.gh.gamecenter.R import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.EBUserFollow -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.google.gson.JsonObject import com.halo.assistant.HaloApp @@ -44,7 +43,7 @@ class UserHomeViewModel(application: Application, var userId: String) : AndroidV .api.getPersonalData(userId, HaloApp.getInstance().channel, Utils.getTime(getApplication())) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Response() { + .subscribe(object : com.gh.gamecenter.common.retrofit.Response() { override fun onResponse(response: PersonalEntity?) { userInfo.value = response } @@ -87,7 +86,7 @@ class UserHomeViewModel(application: Application, var userId: String) : AndroidV observable .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Response() { + .subscribe(object : com.gh.gamecenter.common.retrofit.Response() { override fun onResponse(response: ResponseBody?) { super.onResponse(response) if (isFollow) { @@ -115,7 +114,7 @@ class UserHomeViewModel(application: Application, var userId: String) : AndroidV .api.getBadges(userId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Response>() { + .subscribe(object : com.gh.gamecenter.common.retrofit.Response>() { override fun onResponse(response: List?) { super.onResponse(response) badges.postValue(response) @@ -128,7 +127,7 @@ class UserHomeViewModel(application: Application, var userId: String) : AndroidV .api.availableBadges(userId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Response>() { + .subscribe(object : com.gh.gamecenter.common.retrofit.Response>() { override fun onResponse(response: List?) { super.onResponse(response) availableBadge.postValue(if (response.isNullOrEmpty()) null else response[0]) diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundClipActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundClipActivity.kt index 7eaacec3fd..def34d0805 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundClipActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundClipActivity.kt @@ -6,7 +6,7 @@ import android.content.Intent import android.graphics.Bitmap import android.os.Bundle import android.widget.ImageView -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.gamecenter.common.utils.BitmapUtils import com.gh.gamecenter.core.utils.DisplayUtils diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundPreviewActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundPreviewActivity.kt index 15f1ff6bfc..a4677e66b3 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundPreviewActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundPreviewActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.personalhome.background import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.R 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 8c2349b6bc..aade0b39cb 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 @@ -11,7 +11,7 @@ import com.gh.gamecenter.common.callback.BiCallback import com.gh.gamecenter.common.utils.BitmapUtils import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.entity.BackgroundImageEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderActivity.kt index b43fca2542..682a568c5a 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderActivity.kt @@ -3,10 +3,9 @@ package com.gh.gamecenter.personalhome.border import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.common.util.EntranceUtils import com.gh.gamecenter.R class AvatarBorderActivity : BaseActivity() { 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 c1ff556289..800f814027 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 @@ -5,7 +5,7 @@ import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import com.gh.gamecenter.entity.AvatarBorderCategoryEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers 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 335b3a0ee8..90dc0c7419 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 @@ -8,7 +8,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.entity.AvatarBorderEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt index a50f62997c..00b8904e70 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.personalhome.fans import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt index 4bfe6e6c8e..bef58b6c1b 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.personalhome.followers import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryAdapter.kt index 44a78cb229..bbd8b88ea8 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryAdapter.kt @@ -9,6 +9,7 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.PersonalHomeRatingViewHolder 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 845d0274b2..c3d3c4dc37 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 @@ -16,8 +16,8 @@ import com.gh.gamecenter.common.utils.singleToMain import com.gh.gamecenter.entity.ErrorEntity import com.gh.gamecenter.entity.ForumVideoEntity import com.gh.gamecenter.entity.PersonalHistoryEntity -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Utils @@ -68,7 +68,7 @@ class UserHistoryViewModel(application: Application, mApi.voteGameComment(gameId, commentId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Response() { + .subscribe(object : com.gh.gamecenter.common.retrofit.Response() { override fun onResponse(response: ResponseBody?) { Utils.toast(getApplication(), "点赞成功") callback.invoke() @@ -92,7 +92,7 @@ class UserHistoryViewModel(application: Application, mApi.unvoteGameComment(gameId, commentId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Response() { + .subscribe(object : com.gh.gamecenter.common.retrofit.Response() { override fun onResponse(response: ResponseBody?) { super.onResponse(response) Utils.toast(getApplication(), "取消点赞") 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 12f391e51b..0f8f64c8ed 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 @@ -10,7 +10,7 @@ import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.entity.ErrorEntity import com.gh.gamecenter.personalhome.rating.MyRating -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import io.reactivex.Observable 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 9a66175526..66cb420070 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 @@ -7,13 +7,14 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Utils import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers import okhttp3.ResponseBody +import retrofit2.Response class UserGameViewModel(application: Application, private val mUserId: String) : AndroidViewModel(application) { @@ -30,7 +31,7 @@ class UserGameViewModel(application: Application, private val mUserId: String) .api.getPlayedGamesCount(mUserId, Utils.getTime(getApplication())) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : BiResponse>() { + .subscribe(object : BiResponse>() { override fun onSuccess(data: retrofit2.Response) { val countContent = data.headers().get("Total") playedGameCount.postValue(if (TextUtils.isEmpty(countContent)) 0 else countContent?.toInt() ?: 0) 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 75824da763..d4a5c1e969 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 @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import androidx.lifecycle.ViewModelProviders -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListActivity 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 aa483b16c9..42c5ff3e9d 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 @@ -11,7 +11,6 @@ import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.debounceActionWithInterval import com.gh.gamecenter.common.utils.doOnAnimationEnd import com.gh.gamecenter.common.utils.toColor -import com.gh.gamecenter.common.utils.toDrawable import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.VoteEntity @@ -25,8 +24,8 @@ import com.gh.gamecenter.qa.entity.QuestionsDetailEntity import com.gh.gamecenter.qa.questions.invite.QuestionsInviteActivity import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import com.lightgame.view.CheckableImageView diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/CommunityAnswerItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/CommunityAnswerItemViewHolder.kt index d2b2d7feae..f6dcc6c183 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/CommunityAnswerItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/CommunityAnswerItemViewHolder.kt @@ -9,6 +9,7 @@ import android.widget.LinearLayout import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.gamecenter.CollectionActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.callback.ConfirmListener diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt index 8f028cb083..21e566a4ee 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt @@ -27,6 +27,8 @@ import com.gh.gamecenter.core.utils.TimeElapsedHelper import com.gh.gamecenter.common.constant.Constants.GAME_DETAIL_COME_IN import com.gh.common.history.HistoryHelper import com.gh.common.util.* +import com.gh.common.util.DialogUtils +import com.gh.common.util.LogUtils import com.gh.gamecenter.common.view.DrawableView import com.gh.common.view.RichEditor import com.gh.gamecenter.ImageViewerActivity @@ -43,6 +45,7 @@ import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.EBReuse import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.entity.NormalShareEntity import com.gh.gamecenter.personal.PersonalFragment import com.gh.gamecenter.qa.answer.edit.AnswerEditActivity import com.gh.gamecenter.qa.comment.CommentActivity 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 463513d38c..e0a4ac93f6 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 @@ -17,9 +17,9 @@ import com.gh.gamecenter.entity.SpecialColumn import com.gh.gamecenter.entity.VoteEntity import com.gh.gamecenter.eventbus.EBUserFollow import com.gh.gamecenter.qa.entity.AnswerDetailEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager -import com.gh.gamecenter.user.ApiResponse +import com.gh.gamecenter.common.retrofit.ApiResponse import com.lightgame.utils.Utils import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt index e0c7f39b2e..a1e627139e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.qa.answer.detail import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R 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 a2947a1608..1f59afbc0b 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 @@ -24,7 +24,7 @@ import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.qa.answer.edit.AnswerEditActivity; import com.gh.gamecenter.qa.entity.AnswerEntity; import com.gh.gamecenter.qa.myqa.AnswerDraftViewHolder; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.utils.Utils; diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt index 21ac795f49..a256b17c84 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt @@ -24,6 +24,7 @@ import com.gh.gamecenter.R import com.gh.gamecenter.common.callback.ConfirmListener import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.common.utils.DialogUtils import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentAnswerEditBinding import com.gh.gamecenter.entity.NotificationUgc diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditViewModel.kt index 2f20897f40..d249b4a3ac 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditViewModel.kt @@ -18,7 +18,7 @@ import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.qa.entity.AnswerDraftEntity import com.gh.gamecenter.qa.entity.Questions -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.lightgame.utils.Utils import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleActivity.kt index e4ea7d728b..9ab5b46999 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.qa.article import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.NormalActivity diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListActivity.kt index 880a3b2834..bd1e9fc3c3 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListActivity.kt @@ -3,7 +3,7 @@ //import android.content.Context //import android.content.Intent //import android.os.Bundle -//import com.gh.base.BaseActivity +//import com.gh.gamecenter.common.base.BaseActivity //import com.gh.common.util.EntranceUtils //import com.gh.gamecenter.NormalActivity // diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt index 1145887be2..ad06c7134a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt @@ -11,6 +11,9 @@ import androidx.recyclerview.widget.RecyclerView import com.gh.common.DefaultUrlHandler import com.gh.gamecenter.core.runOnUiThread import com.gh.common.util.* +import com.gh.common.util.DialogUtils +import com.gh.common.util.LogUtils +import com.gh.common.util.NewLogUtils import com.gh.common.view.RichEditor import com.gh.gamecenter.ImageViewerActivity import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt index 9f45d43603..ce6db26907 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt @@ -23,11 +23,15 @@ import com.gh.gamecenter.common.syncpage.SyncDataEntity import com.gh.gamecenter.common.syncpage.SyncFieldConstants import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* +import com.gh.common.util.LogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.ImageViewerActivity import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.entity.AdditionalParamsEntity +import com.gh.gamecenter.common.entity.NormalShareEntity import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentArticleDetailBinding 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 af5b34b4a4..65fcbc4f52 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 @@ -19,7 +19,7 @@ import com.gh.gamecenter.eventbus.EBUserFollow import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.comment.base.BaseCommentViewModel import com.gh.gamecenter.qa.entity.ArticleDetailEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import io.reactivex.Observable 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 810ee373f2..48ef8cd317 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 @@ -7,7 +7,7 @@ import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.qa.comment.base.BaseCommentViewModel import com.gh.gamecenter.qa.article.detail.CommentItemData -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable import io.reactivex.Single 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 1a2da0fd77..1666d9b1cd 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 @@ -19,7 +19,7 @@ import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.article.edit.ArticleEditActivity import com.gh.gamecenter.qa.draft.CommunityDraftWrapperActivity import com.gh.gamecenter.qa.entity.ArticleDraftEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.Observable diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt index 990886c044..c784489c61 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt @@ -15,19 +15,15 @@ import androidx.core.widget.doOnTextChanged import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders import com.gh.base.BaseRichEditorActivity +import com.gh.common.util.ErrorHelper +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.gamecenter.core.AppExecutor import com.gh.gamecenter.common.constant.Constants -import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.common.callback.ConfirmListener import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.common.utils.debounceActionWithInterval -import com.gh.gamecenter.common.utils.ifLogin -import com.gh.gamecenter.common.utils.observeNonNull -import com.gh.gamecenter.common.utils.toColor -import com.gh.gamecenter.common.utils.DialogHelper -import com.gh.gamecenter.common.utils.TextHelper +import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ActivityCommunityArticleEditBinding import com.gh.gamecenter.entity.ActivityLabelEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt index 8915367f3a..6a7ecc131e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt @@ -22,7 +22,7 @@ import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.qa.entity.ArticleDetailEntity import com.gh.gamecenter.qa.entity.ArticleDraftEntity import com.gh.gamecenter.qa.questions.edit.QuestionEditViewModel -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.lightgame.utils.Utils import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers 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 c427aaa622..a350eeb5fb 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 @@ -8,9 +8,9 @@ import com.gh.common.util.ErrorHelper; import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.qa.entity.AskTagGroupsEntity; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; -import com.gh.gamecenter.user.ApiResponse; +import com.gh.gamecenter.common.retrofit.ApiResponse; import com.halo.assistant.HaloApp; import java.util.ArrayList; diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentActivity.kt index f3823594c3..7d3e170b7a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentActivity.kt @@ -6,7 +6,7 @@ import android.content.Intent import android.content.pm.ActivityInfo import android.os.Build import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.constant.EntranceConsts.KEY_COMMENT_ID diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt index 3c64c2deae..d3cbd952f8 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt @@ -21,6 +21,7 @@ import com.gh.gamecenter.common.syncpage.SyncDataEntity import com.gh.gamecenter.common.syncpage.SyncFieldConstants import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.gamecenter.common.constant.EntranceConsts.KEY_COMMENT_ID import com.gh.gamecenter.common.view.VerticalItemDecoration import com.gh.gamecenter.CommentDetailActivity 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 ce3eba7b93..885538806e 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 @@ -16,11 +16,11 @@ import com.gh.gamecenter.common.utils.tryCatchInRelease import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.entity.CommentDraft import com.gh.gamecenter.entity.CommentEntity -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.room.dao.CommentDraftDao -import com.gh.gamecenter.user.ApiResponse +import com.gh.gamecenter.common.retrofit.ApiResponse import com.lightgame.utils.Utils import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt index bfd09446b5..02d0bc797a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt @@ -16,6 +16,8 @@ import com.gh.gamecenter.common.syncpage.SyncDataEntity import com.gh.gamecenter.common.syncpage.SyncFieldConstants import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* +import com.gh.common.util.DialogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.view.GridSpacingItemColorDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter 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 ac0f2ed1ad..306e82a9f3 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 @@ -20,7 +20,7 @@ import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.entity.MeEntity import com.gh.gamecenter.entity.Permissions import com.gh.gamecenter.qa.article.detail.CommentItemData -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.retrofit.service.ApiService import com.lightgame.utils.Utils diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationViewModel.kt index 295911820a..f864270ffd 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationViewModel.kt @@ -7,8 +7,7 @@ import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.qa.comment.base.BaseCommentViewModel import com.gh.gamecenter.qa.article.detail.CommentItemData -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.RetrofitManager +import com.gh.gamecenter.common.retrofit.BiResponse import io.reactivex.Observable import io.reactivex.Single import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt index a50179975d..837d15eb9b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt @@ -10,7 +10,7 @@ import android.view.MotionEvent import android.view.View import androidx.core.widget.doOnTextChanged import androidx.fragment.app.Fragment -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.base.adapter.FragmentAdapter import com.gh.common.util.* import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/MoreFunctionPanelDialog.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/MoreFunctionPanelDialog.kt index 6a7bf7bb5c..f49a5ef0bc 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/dialog/MoreFunctionPanelDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/MoreFunctionPanelDialog.kt @@ -15,10 +15,11 @@ import com.gh.gamecenter.common.base.fragment.BaseDraggableDialogFragment import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.utils.ShareUtils import com.gh.gamecenter.common.utils.debounceActionWithInterval import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.databinding.DialogGameDetailMoreBinding -import com.gh.gamecenter.entity.NormalShareEntity +import com.gh.gamecenter.common.entity.NormalShareEntity import com.gh.gamecenter.entity.MenuItemEntity class MoreFunctionPanelDialog : BaseDraggableDialogFragment() { diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoActivity.kt index 78d5209617..7e42a2aa68 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoActivity.kt @@ -5,7 +5,7 @@ import android.content.Intent import android.content.pm.ActivityInfo import android.os.Build import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.core.utils.MD5Utils 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 f0839eb097..fe4511fa48 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 @@ -21,7 +21,7 @@ import com.gh.gamecenter.baselist.NormalListViewModel import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.entity.EditorInsertDefaultEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Util_System_Keyboard diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/OnLinkClickListener.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/OnLinkClickListener.kt index 2e45bfe995..da5e78b7d7 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/OnLinkClickListener.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/OnLinkClickListener.kt @@ -2,7 +2,7 @@ package com.gh.gamecenter.qa.editor import android.content.Context import android.webkit.JavascriptInterface -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.core.AppExecutor import com.gh.common.util.* import com.gh.gamecenter.GameDetailActivity diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoActivity.kt index e610919c59..c4f44e954e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.qa.editor import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.R 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 100aa1a19a..d52e1c0e53 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 @@ -34,7 +34,7 @@ //import com.gh.gamecenter.baselist.ListAdapter //import com.gh.gamecenter.baselist.ListFragment //import com.gh.gamecenter.baselist.LoadType -//import com.gh.gamecenter.entity.NormalShareEntity +//import com.gh.gamecenter.common.entity.NormalShareEntity //import com.gh.gamecenter.entity.MenuItemEntity //import com.gh.gamecenter.entity.Permissions //import com.gh.gamecenter.entity.SpecialColumn 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 e81a6b99cb..c25869a1f9 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 @@ -17,7 +17,7 @@ //import com.gh.gamecenter.mvvm.Resource //import com.gh.gamecenter.qa.entity.AnswerEntity //import com.gh.gamecenter.qa.entity.QuestionsDetailEntity -//import com.gh.gamecenter.retrofit.BiResponse +//import com.gh.gamecenter.common.retrofit.BiResponse //import com.gh.gamecenter.retrofit.Response //import com.gh.gamecenter.retrofit.RetrofitManager //import com.halo.assistant.HaloApp 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 10181651f7..69d6e49aa2 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 @@ -7,7 +7,7 @@ import com.gh.gamecenter.common.utils.observableToMain import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.entity.QuestionDraftEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable import okhttp3.ResponseBody @@ -29,7 +29,7 @@ class QuestionDraftViewModel(application: Application) : ListViewModel(){ + .subscribe(object : Response(){ override fun onResponse(response: ResponseBody?) { super.onResponse(response) deleteDraftSuccess.postValue(Pair(draftId, true)) diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt index 86a539135c..3bf078aebc 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt @@ -19,18 +19,16 @@ import androidx.core.widget.addTextChangedListener import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders import com.gh.base.BaseRichEditorActivity +import com.gh.common.util.NewLogUtils +import com.gh.common.util.NotificationHelper import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.gamecenter.core.AppExecutor import com.gh.gamecenter.common.constant.Constants -import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.common.callback.ConfirmListener import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.common.utils.DialogHelper +import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.ToastUtils -import com.gh.gamecenter.common.utils.debounceActionWithInterval -import com.gh.gamecenter.common.utils.toColor -import com.gh.gamecenter.common.utils.TextHelper import com.gh.gamecenter.core.utils.KeyboardHeightObserver import com.gh.gamecenter.core.utils.PatternUtils import com.gh.gamecenter.databinding.ActivityQuestionsEditBinding diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditViewModel.kt index 5706763e75..e48ebf0568 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditViewModel.kt @@ -25,8 +25,8 @@ import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.mvvm.Resource import com.gh.gamecenter.qa.entity.QuestionDraftEntity import com.gh.gamecenter.qa.entity.QuestionsDetailEntity -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.lightgame.utils.Utils import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt index aa2f21dd64..a171c76976 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt @@ -19,6 +19,7 @@ import com.gh.gamecenter.common.base.fragment.BaseFragment import com.gh.gamecenter.core.AppExecutor import com.gh.common.util.* import com.gh.gamecenter.R +import com.gh.gamecenter.common.callback.CancelListener import com.gh.gamecenter.common.callback.ConfirmListener import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.DialogHelper @@ -153,10 +154,12 @@ class TagsSelectFragment : BaseFragment() { data?.questionTitle, data?.getFollowCount().toString() + " 关注 · " + data?.answerCount + " 回答", "继续提交", "去看看", - { - mViewModel?.uploadPicAndPostQuestion(true) - MtaHelper.onEvent("提交相似问题弹窗", UserManager.getInstance().community.name, "问题相似-继续提交") - },object :ConfirmListener{ + object : CancelListener { + override fun onCancel() { + mViewModel?.uploadPicAndPostQuestion(true) + MtaHelper.onEvent("提交相似问题弹窗", UserManager.getInstance().community.name, "问题相似-继续提交") + } + }, object : ConfirmListener { override fun onConfirm() { MtaHelper.onEvent("提交相似问题弹窗", UserManager.getInstance().community.name, "问题相似-去看看") val intent = NewQuestionDetailActivity.getIntent(requireContext(), data?.questionId ?: "", mEntrance, "相似问题") @@ -171,7 +174,7 @@ class TagsSelectFragment : BaseFragment() { data?.questionTitle, data?.getFollowCount().toString() + " 关注 · " + data?.answerCount + " 回答", null, "去看看", null, - object :ConfirmListener{ + object : ConfirmListener { override fun onConfirm() { MtaHelper.onEvent("提交重复问题弹窗", UserManager.getInstance().community.name, "问题重复-去看看") val intent = NewQuestionDetailActivity.getIntent(requireContext(), data?.questionId ?: "", mEntrance, "重复问题") 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 150e6b3d7e..3896ddf85e 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 @@ -14,7 +14,7 @@ import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.databinding.QuestionEditTitleSearchItemBinding import com.gh.gamecenter.qa.entity.QuestionsIndexEntity import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager 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 35775d9771..5a08ce875e 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 @@ -8,7 +8,7 @@ import androidx.lifecycle.ViewModelProvider import com.gh.common.util.ErrorHelper import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.qa.entity.InviteEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.Observable diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteWrapperFragment.java index 3ffb3076c2..1cabed8d15 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteWrapperFragment.java @@ -14,7 +14,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import com.gh.gamecenter.common.constant.EntranceConsts; -import com.gh.common.util.ShareUtils; +import com.gh.gamecenter.common.utils.ShareUtils; import com.gh.gamecenter.common.utils.TextHelper; import com.gh.gamecenter.R; import com.gh.gamecenter.databinding.FragmentInviteBinding; diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt index 0256629e3d..61ca8df7ae 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt @@ -17,11 +17,15 @@ import androidx.recyclerview.widget.RecyclerView import com.ethanhua.skeleton.Skeleton import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* +import com.gh.common.util.LogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.ImageViewerActivity import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.entity.AdditionalParamsEntity +import com.gh.gamecenter.common.entity.NormalShareEntity import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.databinding.FragmentArticleDetailBinding diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailViewModel.kt index d4f9dcd2a8..8305205e9d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailViewModel.kt @@ -23,8 +23,8 @@ import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.article.detail.CommentItemData import com.gh.gamecenter.qa.comment.base.BaseCommentViewModel import com.gh.gamecenter.qa.entity.QuestionsDetailEntity -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.lightgame.utils.Utils import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt index 0b38d25d4a..3d1d55a073 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt @@ -11,6 +11,9 @@ import androidx.recyclerview.widget.RecyclerView import com.gh.common.DefaultUrlHandler import com.gh.gamecenter.core.runOnUiThread import com.gh.common.util.* +import com.gh.common.util.DialogUtils +import com.gh.common.util.LogUtils +import com.gh.common.util.NewLogUtils import com.gh.common.view.RichEditor import com.gh.gamecenter.ImageViewerActivity import com.gh.gamecenter.R 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 de5a63c108..8a3753c6ef 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 @@ -7,7 +7,7 @@ package com.gh.gamecenter.qa.recommends //import androidx.lifecycle.MutableLiveData //import com.gh.gamecenter.entity.LinkEntity //import com.gh.gamecenter.manager.UserManager -//import com.gh.gamecenter.retrofit.BiResponse +//import com.gh.gamecenter.common.retrofit.BiResponse //import com.gh.gamecenter.retrofit.Response //import com.gh.gamecenter.retrofit.RetrofitManager //import io.reactivex.android.schedulers.AndroidSchedulers 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 b4d75a7223..ec4c42f1cd 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 @@ -9,9 +9,9 @@ import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.qa.entity.AskTagGroupsEntity; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; -import com.gh.gamecenter.user.ApiResponse; +import com.gh.gamecenter.common.retrofit.ApiResponse; import com.halo.assistant.HaloApp; import java.util.ArrayList; diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumTopVideoView.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumTopVideoView.kt index 0d7dd5843d..9ae59a6f8b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumTopVideoView.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumTopVideoView.kt @@ -15,7 +15,6 @@ import androidx.fragment.app.FragmentManager import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.observer.MuteCallback import com.gh.gamecenter.common.observer.VolumeObserver -import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.SPUtils diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt index c5d3a56524..d008ab03b2 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import androidx.fragment.app.Fragment -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout.PAGE_INDEX import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.common.constant.EntranceConsts 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 dfbb72fb17..c05a150197 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 @@ -25,10 +25,13 @@ import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout import com.gh.gamecenter.common.constant.Constants import com.gh.common.databind.BindingAdapters import com.gh.common.util.* +import com.gh.common.util.NewLogUtils import com.gh.download.DownloadManager import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.entity.AdditionalParamsEntity +import com.gh.gamecenter.common.entity.NormalShareEntity import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentForumVideoDetailBinding 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 e46f1f74ea..dd739ed0d5 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 @@ -16,8 +16,8 @@ import com.gh.gamecenter.common.utils.tryCatchInRelease import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.* import com.gh.gamecenter.mvvm.Resource -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.google.gson.JsonObject import com.halo.assistant.HaloApp diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt index 3692d822aa..e3ff0727fd 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt @@ -10,6 +10,7 @@ import com.gh.gamecenter.common.syncpage.SyncDataEntity import com.gh.gamecenter.common.syncpage.SyncFieldConstants import com.gh.gamecenter.common.syncpage.SyncPageRepository import com.gh.common.util.* +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.view.CustomDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.LazyListFragment diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescFragment.kt index a7df7da58b..a8e8f094b4 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescFragment.kt @@ -4,7 +4,7 @@ import android.view.View import androidx.lifecycle.Observer import androidx.recyclerview.widget.RecyclerView import com.gh.common.util.NewLogUtils -import com.gh.common.util.ShareUtils +import com.gh.gamecenter.common.utils.ShareUtils import com.gh.gamecenter.common.utils.observeNonNull import com.gh.gamecenter.common.utils.viewModelProviderFromParent import com.gh.gamecenter.R @@ -12,7 +12,7 @@ import com.gh.gamecenter.baselist.LazyListFragment import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.entity.ForumVideoEntity import com.gh.gamecenter.entity.VideoDescItemEntity -import com.gh.gamecenter.eventbus.EBShare +import com.gh.gamecenter.common.eventbus.EBShare import com.gh.gamecenter.mvvm.Status import com.gh.gamecenter.qa.video.detail.ForumVideoDetailViewModel import org.greenrobot.eventbus.Subscribe diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescTopViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescTopViewHolder.kt index c02a9023d0..6d391e4606 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescTopViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescTopViewHolder.kt @@ -11,6 +11,8 @@ import androidx.core.animation.doOnStart import androidx.core.view.marginTop import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.common.util.* +import com.gh.common.util.DialogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.R import com.gh.gamecenter.common.callback.ConfirmListener import com.gh.gamecenter.common.utils.* 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 a7a97f0311..bb13e6cbed 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 @@ -16,8 +16,8 @@ import com.gh.gamecenter.entity.ForumVideoEntity import com.gh.gamecenter.entity.VideoDescItemEntity import com.gh.gamecenter.eventbus.EBUserFollow import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lightgame.utils.Utils diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishFragment.kt index 799d71554e..9a211757a3 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishFragment.kt @@ -18,6 +18,7 @@ import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.gamecenter.core.AppExecutor import com.gh.gamecenter.core.runOnUiThread import com.gh.common.util.* +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.CropImageActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.constant.EntranceConsts 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 458048c19b..a50f1b5220 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 @@ -20,9 +20,9 @@ import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.* import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.mvvm.Resource -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.ObservableUtil -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.ObservableUtil +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.google.gson.JsonObject import com.halo.assistant.HaloApp 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 f23231c936..09ece6f138 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java @@ -2,44 +2,23 @@ package com.gh.gamecenter.retrofit; import android.content.Context; -import com.chuckerteam.chucker.api.ChuckerCollector; -import com.chuckerteam.chucker.api.ChuckerInterceptor; -import com.chuckerteam.chucker.api.RetentionManager; import com.gh.common.constant.Config; -import com.gh.gamecenter.Injection; +import com.gh.gamecenter.common.retrofit.BaseRetrofitManager; import com.gh.gamecenter.retrofit.service.ApiService; import com.halo.assistant.HaloApp; -import java.io.File; -import java.util.concurrent.TimeUnit; - -import okhttp3.Cache; import okhttp3.OkHttpClient; -import retrofit2.Retrofit; -import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; -import retrofit2.converter.gson.GsonConverterFactory; /** * Created by LGT on 2016/11/7. * Retrofit 管理工具 */ -public class RetrofitManager { +public class RetrofitManager extends BaseRetrofitManager { - 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; // 图片上传超时时间 private final ApiService mApiService; private final ApiService mNewApiService; private final ApiService mUploadApiService; - public static T provideService(OkHttpClient client, String url, Class serviceCls) { - return new Retrofit.Builder() - .client(client) - .addConverterFactory(GsonConverterFactory.create()) - .addCallAdapterFactory(RxJava2CallAdapterFactory.create()) - .baseUrl(url).build().create(serviceCls); - } - private RetrofitManager() { Context context = HaloApp.getInstance().getApplicationContext(); OkHttpClient okHttpNormalConfig = getOkHttpConfig(context, 0, 2); @@ -48,22 +27,6 @@ public class RetrofitManager { mUploadApiService = provideService(getOkHttpConfig(context, UPLOAD_CALL_TIME_OUT, 1), Config.API_HOST, ApiService.class); } - private OkHttpClient getOkHttpConfig(Context context, int callTimeout, int maxRetryCount) { - final Cache cache = new Cache(new File(OkHttpCache.getCachePath(context)), 10 * 1024 * 1024); // 10Mb - - return Injection.provideRetrofitBuilder() - .addInterceptor(new OkHttpCacheInterceptor(context)) - .addInterceptor(new OkHttpRetryInterceptor(context, maxRetryCount)) - .addInterceptor(new ChuckerInterceptor(context, new ChuckerCollector(context, true, RetentionManager.Period.ONE_DAY))) - .addNetworkInterceptor(new OkHttpNetworkInterceptor(context)) - .connectTimeout(NORMAL_CONN_TIME_OUT, TimeUnit.SECONDS) - .readTimeout(NORMAL_READ_TIME_OUT, TimeUnit.SECONDS) - .callTimeout(callTimeout, TimeUnit.SECONDS) - .pingInterval(30, TimeUnit.SECONDS) // 加入间隔为30秒的心跳包，用于解决闲置 Http/2 连接关闭时间与服务器不一造成 Connection Timeout 的问题 (https://github.com/square/okhttp/issues/3261) - .cache(cache) - .build(); - } - public static RetrofitManager getInstance() { return SingletonHolder.INSTANCE; } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt index db8622eaa2..6bbf54501b 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt @@ -17,6 +17,8 @@ import com.gh.common.exposure.ExposureType import com.gh.common.exposure.IExposable import com.gh.common.filter.RegionSettingHelper import com.gh.common.util.* +import com.gh.common.util.LogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.SearchType diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt index 73501d4581..66a39616b6 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt @@ -16,6 +16,8 @@ import com.gh.common.exposure.ExposureType import com.gh.common.exposure.IExposable import com.gh.common.filter.RegionSettingHelper import com.gh.common.util.* +import com.gh.common.util.LogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.SearchType diff --git a/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt b/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt index e0c8d4fd5e..d87b76a305 100644 --- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt @@ -8,6 +8,7 @@ import android.view.View import androidx.lifecycle.Observer import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.common.util.EnergyTaskHelper.postInviteCodeTask import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.R 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 9f985c994b..ab588eddf2 100644 --- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneViewModel.kt @@ -10,7 +10,7 @@ import com.gh.gamecenter.core.utils.GsonUtils import com.gh.common.util.LoginUtils import com.gh.gamecenter.core.utils.ToastUtils import com.gh.gamecenter.entity.ConflictUserEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import io.reactivex.android.schedulers.AndroidSchedulers 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 83faf83ff1..7c7dadb4a1 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt @@ -16,6 +16,7 @@ import com.gh.gamecenter.common.base.fragment.BaseFragment import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureListener import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.gamecenter.core.utils.MtaHelper.onEvent import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus 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 a773919903..6b10881b18 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentViewModel.kt @@ -15,7 +15,7 @@ import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.ServerCalendarEntity import com.gh.gamecenter.entity.ServerPublishEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers 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 5914b7a710..17e29657c0 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt @@ -20,7 +20,7 @@ import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentGameServersPublishBinding import com.gh.gamecenter.entity.ServersGameCategory import com.gh.gamecenter.eventbus.EBNetworkState -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers 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 8254de9d16..3658adf18e 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestViewModel.kt @@ -9,13 +9,13 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.gh.common.exposure.ExposureEntity +import com.gh.gamecenter.common.entity.ExposureEntity import com.gh.common.util.ApkActiveUtils import com.gh.gamecenter.core.utils.TimeUtils import com.gh.gamecenter.common.utils.safelyGetInRelease import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.ServerTestEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.schedulers.Schedulers import java.text.SimpleDateFormat 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 9734c528df..b6c318852b 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 @@ -10,7 +10,7 @@ import androidx.lifecycle.MutableLiveData import com.gh.gamecenter.common.utils.DialogHelper import com.gh.gamecenter.core.utils.GsonUtils import com.gh.gamecenter.entity.ServerCalendarEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils.toast import io.reactivex.android.schedulers.AndroidSchedulers 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 4c72183a42..9244eea4e6 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 @@ -5,7 +5,7 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import com.gh.gamecenter.R import com.gh.gamecenter.entity.ServerCalendarEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import io.reactivex.android.schedulers.AndroidSchedulers 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 298b54baae..98ed37b32f 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt @@ -25,6 +25,7 @@ import com.gh.common.databind.BindingAdapters import com.gh.common.simulator.SimulatorDownloadManager import com.gh.common.simulator.SimulatorGameManager import com.gh.common.util.* +import com.gh.common.util.DialogUtils import com.gh.gamecenter.common.view.BugFixedPopupWindow import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.MainActivity 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 dc3d27f69b..9016c9b951 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt @@ -13,7 +13,7 @@ import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.SubjectData import com.gh.gamecenter.entity.SubjectSettingEntity import com.gh.gamecenter.entity.TagStyleEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable import io.reactivex.Single 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 c96d685e59..b18ea8c702 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt @@ -9,8 +9,8 @@ import androidx.lifecycle.ViewModelProvider import com.gh.common.constant.Config import com.gh.gamecenter.entity.SubjectData import com.gh.gamecenter.entity.SubjectSettingEntity -import com.gh.gamecenter.retrofit.JSONObjectResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.JSONObjectResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectFragment.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectFragment.java index 55af2081c3..5b35aa488c 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectFragment.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectFragment.java @@ -11,7 +11,7 @@ import com.gh.gamecenter.common.base.fragment.BaseFragment; import com.gh.common.constant.Config; import com.gh.common.util.DirectUtils; import com.gh.gamecenter.core.utils.MtaHelper; -import com.gh.common.util.ShareUtils; +import com.gh.gamecenter.common.utils.ShareUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.databinding.FragmentSuggestSelectBinding; import com.gh.gamecenter.entity.SettingsEntity; diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java index 372deefe09..fe1ff43e13 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java @@ -16,7 +16,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.databinding.DialogSelectGameItemBinding; import com.gh.gamecenter.entity.InstallGameEntity; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.lightgame.adapter.BaseRecyclerAdapter; import java.io.File; diff --git a/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt b/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt index c300237609..3e7998b728 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.tag import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R 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 8584798121..230e55a970 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsListViewModel.kt @@ -11,7 +11,7 @@ import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.SubjectSettingEntity import com.gh.gamecenter.entity.TagEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable import io.reactivex.Single diff --git a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt index 807fc28c7a..893f919144 100644 --- a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import androidx.fragment.app.Fragment -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.R import com.gh.gamecenter.core.utils.DisplayUtils diff --git a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeViewModel.kt b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeViewModel.kt index 3ee2d01867..113fdf048a 100644 --- a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeViewModel.kt @@ -4,7 +4,7 @@ import android.annotation.SuppressLint import android.app.Application import androidx.lifecycle.AndroidViewModel import com.gh.gamecenter.common.utils.createRequestBody -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxViewModel.kt b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxViewModel.kt index de29569258..fc0a53b7b6 100644 --- a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxViewModel.kt @@ -4,7 +4,6 @@ import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import com.gh.gamecenter.common.constant.Constants -import com.gh.common.util.* import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.core.utils.GsonUtils import com.gh.gamecenter.core.utils.SPUtils @@ -13,7 +12,7 @@ import com.gh.gamecenter.common.utils.toJson import com.gh.gamecenter.core.utils.UrlFilterUtils import com.gh.gamecenter.entity.ToolBoxBlockEntity import com.gh.gamecenter.entity.ToolBoxEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.google.gson.reflect.TypeToken import io.reactivex.android.schedulers.AndroidSchedulers 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 49a3f75b5c..40f255019a 100644 --- a/app/src/main/java/com/gh/gamecenter/user/UserRepository.java +++ b/app/src/main/java/com/gh/gamecenter/user/UserRepository.java @@ -3,7 +3,6 @@ package com.gh.gamecenter.user; import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; -import android.os.Build; import android.preference.PreferenceManager; import android.text.TextUtils; @@ -13,10 +12,10 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MediatorLiveData; import com.gh.gamecenter.common.constant.Constants; -import com.gh.gamecenter.common.exposure.meta.MetaUtil; import com.gh.common.repository.ReservationRepository; import com.gh.gamecenter.common.callback.BiCallback; import com.gh.common.util.DataUtils; +import com.gh.gamecenter.common.retrofit.ApiResponse; import com.gh.gamecenter.common.utils.DeviceUtils; import com.gh.common.util.EnergyTaskHelper; import com.gh.gamecenter.common.utils.EnvHelper; @@ -29,7 +28,6 @@ import com.gh.common.util.NewLogUtils; import com.gh.gamecenter.core.utils.SPUtils; import com.gh.common.util.WechatBindHelper; import com.gh.download.DownloadManager; -import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.AvatarBorderEntity; import com.gh.gamecenter.entity.BackgroundImageEntity; @@ -41,8 +39,8 @@ import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.message.MessageUnreadRepository; import com.gh.gamecenter.personal.PersonalFragment; -import com.gh.gamecenter.retrofit.BiResponse; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.BiResponse; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.retrofit.service.ApiService; import com.halo.assistant.HaloApp; 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 0acc792451..0f5dc8ef97 100644 --- a/app/src/main/java/com/gh/gamecenter/user/UserViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/user/UserViewModel.java @@ -2,6 +2,7 @@ package com.gh.gamecenter.user; import android.app.Application; +import com.gh.gamecenter.common.retrofit.ApiResponse; import com.gh.gamecenter.entity.UserInfoEntity; import org.json.JSONObject; diff --git a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataActivity.kt b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataActivity.kt index db145ca0c6..197e83aa42 100644 --- a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataActivity.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.video.data import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.R 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 289cfe4883..d329d2a5a9 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 @@ -8,7 +8,7 @@ import com.gh.gamecenter.entity.VideoDataItem import com.gh.gamecenter.entity.VideoDataOverViewEntity import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.mvvm.Resource -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt b/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt index 0d6ff5dbf2..097c98a6cf 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt @@ -26,6 +26,8 @@ import com.gh.gamecenter.common.observer.VolumeObserver import com.gh.gamecenter.core.runOnIoThread import com.gh.gamecenter.core.runOnUiThread import com.gh.common.util.* +import com.gh.common.util.DialogUtils +import com.gh.common.util.LogUtils import com.gh.download.cache.ExoCacheManager import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt index f917f52ad4..53e03abe8c 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt @@ -8,7 +8,7 @@ import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.RecyclerView import androidx.swiperefreshlayout.widget.SwipeRefreshLayout -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailActivity.kt index 93eada488e..9b62029a6f 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailActivity.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.video.detail import android.os.Bundle -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.R import java.util.* 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 7e3239d2f5..fcae4209b4 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 @@ -18,6 +18,7 @@ import androidx.recyclerview.widget.RecyclerView import com.gh.gamecenter.common.base.fragment.BaseLazyFragment import com.gh.common.exposure.ExposureListener import com.gh.common.util.* +import com.gh.common.util.LogUtils import com.gh.common.videolog.VideoRecordUtils import com.gh.gamecenter.common.view.vertical_recycler.OnPagerListener import com.gh.gamecenter.common.view.vertical_recycler.PagerLayoutManager @@ -25,6 +26,7 @@ import com.gh.download.DownloadManager import com.gh.download.cache.ExoCacheManager import com.gh.gamecenter.R import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.eventbus.EBShare import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentVideoDetailContainerBinding 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 0b5fbdd15c..2fae37a16a 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 @@ -20,8 +20,8 @@ import com.gh.gamecenter.entity.User import com.gh.gamecenter.entity.VideoEntity import com.gh.gamecenter.eventbus.EBUserFollow import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.google.gson.JsonObject import com.lightgame.utils.Utils @@ -231,8 +231,8 @@ class VideoDetailContainerViewModel(application: Application) : AndroidViewModel } } .compose(singleToMain()) - .subscribe(object : BiResponse>>() { - override fun onSuccess(data: retrofit2.Response>) { + .subscribe(object : BiResponse>>() { + override fun onSuccess(data: retrofit2.Response>) { val headers = data.headers() total = headers.get("total")?.toInt() ?: 0 @@ -560,7 +560,7 @@ class VideoDetailContainerViewModel(application: Application) : AndroidViewModel RetrofitManager.getInstance() .api.postFollowing(videoEntity!!.user.id) .subscribeOn(Schedulers.io()) - .subscribe(object : Response() { + .subscribe(object : com.gh.gamecenter.common.retrofit.Response() { override fun onResponse(response: ResponseBody?) { super.onResponse(response) videoEntity.me.isFollower = true diff --git a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt index 359037fcf1..308ff4cfbd 100644 --- a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt @@ -8,7 +8,7 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProviders -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.base.ToolBarActivity import com.gh.gamecenter.common.base.adapter.FragmentAdapter import com.gh.gamecenter.GameDetailActivity 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 96e13e4975..4a29c2ef13 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 @@ -8,7 +8,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.entity.GameVideoInfo import com.gh.gamecenter.mvvm.Resource -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers 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 420db3edcf..6906da1fc9 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 @@ -6,7 +6,7 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.entity.ActivityLabelEntity -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.android.schedulers.AndroidSchedulers 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 916c14ba86..cf551fdd29 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 @@ -6,7 +6,7 @@ import com.gh.gamecenter.core.utils.MD5Utils import com.gh.gamecenter.common.utils.tryCatchInRelease import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.entity.OssEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.room.AppDatabase import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt index bf02bcd662..e6f91d3216 100644 --- a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt @@ -29,12 +29,15 @@ import com.gh.base.ToolBarActivity import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.gamecenter.core.AppExecutor import com.gh.common.util.* +import com.gh.common.util.DialogUtils +import com.gh.common.util.LogUtils import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.CropImageActivity import com.gh.gamecenter.NewsDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.common.* +import com.gh.gamecenter.common.callback.CancelListener import com.gh.gamecenter.common.callback.ConfirmListener import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.* @@ -467,13 +470,15 @@ class UploadVideoActivity : ToolBarActivity() { handleFileNotFound() } else { DialogUtils.showUploadDraftDialog(this@UploadVideoActivity, - { - if (!File(mVideoFileEntity?.path).exists()) { - toast("上传失败，视频文件不存在") - handleFileNotFound() + object :CancelListener{ + override fun onCancel() { + if (!File(mVideoFileEntity?.path).exists()) { + toast("上传失败，视频文件不存在") + handleFileNotFound() + } + MtaHelper.onEvent("上传视频", "上传视频-存草稿", "继续上传") + LogUtils.logVideoStreamingUpload("存草稿-取消", mPath, mEntranceLink, "") } - MtaHelper.onEvent("上传视频", "上传视频-存草稿", "继续上传") - LogUtils.logVideoStreamingUpload("存草稿-取消", mPath, mEntranceLink, "") }, object : ConfirmListener { override fun onConfirm() { verifyData(true) 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 531dc1bcd5..3bd6d84176 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 @@ -16,8 +16,8 @@ import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.entity.* import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.mvvm.Resource -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.google.gson.JsonObject import com.lightgame.utils.Utils 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 5a9807a048..36638bcb81 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 @@ -6,7 +6,7 @@ import com.gh.common.util.ErrorHelper import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.VideoDraftEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt index 6dc2fbade8..98796f6cef 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt @@ -7,7 +7,7 @@ import android.view.MenuItem import android.view.View import android.widget.TextView import androidx.fragment.app.Fragment -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.base.BaseActivity_TabLayout import com.gh.common.util.* import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt index 8e8dcf947d..c86fa55d56 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt @@ -10,6 +10,7 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* +import com.gh.common.util.LogUtils import com.gh.gamecenter.common.view.BugFixedPopupWindow import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder 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 799cdee1ac..eaf712209f 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 @@ -6,7 +6,7 @@ import com.gh.common.util.ErrorHelper import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.VideoEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import io.reactivex.Observable diff --git a/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java b/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java index 337983c843..3812e36d51 100644 --- a/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java +++ b/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java @@ -9,12 +9,10 @@ import android.widget.TextView; import com.gh.common.DefaultUrlHandler; import com.gh.common.constant.Config; import com.gh.common.util.EnergyTaskHelper; -import com.gh.common.util.LogUtils; import com.gh.common.util.LoginHelper; -import com.gh.common.util.NewLogUtils; -import com.gh.common.util.ShareUtils; import com.gh.gamecenter.R; -import com.gh.gamecenter.eventbus.EBShare; +import com.gh.gamecenter.common.eventbus.EBShare; +import com.gh.gamecenter.common.utils.ShareUtils; import com.lightgame.utils.Utils; import com.tencent.mm.opensdk.modelbase.BaseReq; import com.tencent.mm.opensdk.modelbase.BaseResp; @@ -74,13 +72,13 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler, WeC resultString = "分享成功"; Utils.toast(this, resultString); EventBus.getDefault().post(new EBShare(ShareUtils.shareEntrance)); - LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "success", + com.gh.gamecenter.common.utils.LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "success", ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId); EnergyTaskHelper.postEnergyTaskForShare(ShareUtils.shareEntrance.getName(), ShareUtils.resourceId, ShareUtils.shareEntity.getShareUrl()); if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.communityArticle || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video) { - NewLogUtils.logShareResult(ShareUtils.additionalParams, true); + com.gh.gamecenter.common.utils.NewLogUtils.logShareResult(ShareUtils.additionalParams, true); } else if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.gameCollection) { String shareType; if ("wechat_friend".equals(ShareUtils.shareType)) { @@ -88,7 +86,7 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler, WeC } else { shareType = "朋友圈"; } - NewLogUtils.logViewOrClickGameCollectionDetail( + com.gh.gamecenter.common.utils.NewLogUtils.logViewOrClickGameCollectionDetail( "click_game_collect_detail_favorite_success", ShareUtils.shareEntity.getShareTitle(), ShareUtils.resourceId, @@ -110,12 +108,12 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler, WeC case BaseResp.ErrCode.ERR_USER_CANCEL: if (RETURN_MSG_TYPE_SHARE == baseResp.getType()) { resultString = getString(R.string.share_cancel_hint); - LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "cancel", + com.gh.gamecenter.common.utils.LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "cancel", ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId); if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.communityArticle || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video) { - NewLogUtils.logShareResult(ShareUtils.additionalParams, false); + com.gh.gamecenter.common.utils.NewLogUtils.logShareResult(ShareUtils.additionalParams, false); } } else { resultString = "登录已取消"; @@ -133,12 +131,12 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler, WeC default: if (RETURN_MSG_TYPE_SHARE == baseResp.getType()) { resultString = "分享错误"; - LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "fail", + com.gh.gamecenter.common.utils.LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "fail", ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId); if (ShareUtils.shareEntrance == ShareUtils.ShareEntrance.askNormal || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.communityArticle || ShareUtils.shareEntrance == ShareUtils.ShareEntrance.video) { - NewLogUtils.logShareResult(ShareUtils.additionalParams, false); + com.gh.gamecenter.common.utils.NewLogUtils.logShareResult(ShareUtils.additionalParams, false); } } else { resultString = "登录错误"; diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index 3dd89feec0..dd3b901850 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -28,8 +28,8 @@ import com.gh.base.GlobalActivityLifecycleObserver; import com.gh.common.FixedRateJobHelper; import com.gh.common.exposure.ExposureManager; import com.gh.common.filter.RegionSettingHelper; -import com.gh.common.loghub.LoghubUtils; -import com.gh.common.tracker.Tracker; +import com.gh.gamecenter.common.loghub.LoghubUtils; +import com.gh.gamecenter.common.tracker.Tracker; import com.gh.common.util.DataUtils; import com.gh.common.util.DownloadNotificationHelper; import com.gh.common.util.DownloadObserver; diff --git a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt index 343bde2835..7660bfe715 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt @@ -16,6 +16,8 @@ import com.gh.common.history.HistoryHelper import com.gh.gamecenter.core.runOnIoThread import com.gh.gamecenter.core.runOnUiThread import com.gh.common.util.* +import com.gh.common.util.DialogUtils +import com.gh.common.util.NewLogUtils import com.gh.download.server.BrowserInstallHelper import com.gh.gamecenter.* import com.gh.gamecenter.common.callback.ConfirmListener @@ -29,11 +31,12 @@ import com.gh.gamecenter.fragment.MainWrapperFragment import com.gh.gamecenter.game.upload.GameSubmissionActivity import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.callback.CancelListener import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.security.SecurityActivity import com.gh.gamecenter.setting.GameDownloadSettingActivity import com.gh.gamecenter.setting.VideoSettingActivity -import com.gh.gamecenter.user.ApiResponse +import com.gh.gamecenter.common.retrofit.ApiResponse import com.gh.gamecenter.user.UserRepository import com.gh.gamecenter.user.UserViewModel import com.lightgame.download.FileUtils @@ -237,7 +240,10 @@ class SettingsFragment : NormalFragment() { override fun onConfirm() { UsageStatsHelper.skipToUsageStats(requireContext(), UsageStatsHelper.USAGE_STATUS_REQUEST_CODE) } - }) {} + },object :CancelListener{ + override fun onCancel() { + } + }) } } } 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 cec3da1d75..b0f455f1df 100644 --- a/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java @@ -29,7 +29,7 @@ import com.gh.gamecenter.baselist.NormalListViewModel; import com.gh.gamecenter.entity.MeEntity; import com.gh.gamecenter.entity.SettingsEntity; import com.gh.gamecenter.entity.VersionVoteEntity; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.utils.Util_System_Keyboard; 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 b1732f3bf3..9bdc5ab603 100644 --- a/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt @@ -16,7 +16,7 @@ import android.view.View import android.webkit.* import androidx.annotation.RequiresApi import androidx.webkit.WebViewCompat -import com.gh.base.BaseActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.base.fragment.LazyFragment import com.gh.gamecenter.core.AppExecutor.uiExecutor import com.gh.common.DefaultJsApi @@ -37,11 +37,8 @@ import com.gh.gamecenter.MessageDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.common.utils.NightModeUtils +import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.EmptyCallback -import com.gh.gamecenter.common.utils.tryWithDefaultCatch -import com.gh.gamecenter.common.utils.PackageFlavorHelper -import com.gh.gamecenter.common.utils.enableForceDark import com.gh.gamecenter.databinding.FragmentWebBinding import com.gh.gamecenter.entity.CommentnumEntity import com.gh.gamecenter.entity.MeEntity @@ -52,7 +49,7 @@ import com.gh.gamecenter.eventbus.EBTypeChange import com.gh.gamecenter.gamedetail.GameDetailFragment import com.gh.gamecenter.message.MessageDetailFragment import com.gh.gamecenter.personal.PersonalFragment -import com.gh.gamecenter.retrofit.Response +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import com.zhihu.matisse.Matisse 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 ba1d6ec289..5054504957 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 @@ -25,7 +25,7 @@ import com.gh.gamecenter.adapter.GameNewsAdapter; import com.gh.gamecenter.adapter.GameNewsTypeListAdapter; import com.gh.gamecenter.eventbus.EBTypeChange; import com.gh.gamecenter.common.base.fragment.NormalFragment; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import org.greenrobot.eventbus.Subscribe; 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 742972f576..9c44f19059 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 @@ -29,7 +29,7 @@ import com.gh.gamecenter.adapter.viewholder.NewsTextViewHolder; import com.gh.gamecenter.databinding.NewsTextItemBinding; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.common.base.fragment.NormalFragment; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.utils.Util_System_Keyboard; 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 cdfe4432d3..c83416a7cd 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 @@ -12,7 +12,6 @@ import com.gh.common.filter.RegionSettingHelper; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.ConcernUtils; import com.gh.common.util.DataCollectionUtils; -import com.gh.common.util.DataUtils; import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.core.utils.StringUtils; import com.gh.gamecenter.GameDetailActivity; @@ -21,15 +20,13 @@ import com.gh.gamecenter.adapter.viewholder.ConcernViewHolder; import com.gh.gamecenter.databinding.ConcernItemBinding; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.manager.UserManager; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.adapter.BaseRecyclerAdapter; import com.lightgame.utils.Utils; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; 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 0ffe4be310..d58a922560 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 @@ -15,7 +15,6 @@ import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.ConcernUtils; import com.gh.common.util.DataCollectionUtils; -import com.gh.common.util.DataUtils; import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.core.utils.StringUtils; import com.gh.gamecenter.GameDetailActivity; @@ -25,16 +24,14 @@ import com.gh.gamecenter.databinding.ConcernItemBinding; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.GameInstall; import com.gh.gamecenter.manager.PackagesManager; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.adapter.BaseRecyclerAdapter; import com.lightgame.utils.Utils; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameViewModel.kt b/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameViewModel.kt index 4fbad108f1..c5b33519c9 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameViewModel.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameViewModel.kt @@ -9,7 +9,7 @@ import com.gh.gamecenter.core.utils.GsonUtils import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.entity.IdCardEntity import com.gh.gamecenter.entity.UserInfoEntity -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import io.reactivex.android.schedulers.AndroidSchedulers 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 28951b2a80..62a3a5cf0d 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 @@ -17,7 +17,7 @@ import com.gh.gamecenter.common.utils.tryWithDefaultCatch import com.gh.gamecenter.entity.IdCardEntity import com.gh.gamecenter.entity.UserInfoEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.user.UserRepository import com.halo.assistant.HaloApp diff --git a/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java index e105f649d2..8a0d778f37 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java @@ -17,7 +17,7 @@ import com.gh.common.util.DialogUtils; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.UserInfoEntity; -import com.gh.gamecenter.user.ApiResponse; +import com.gh.gamecenter.common.retrofit.ApiResponse; import com.gh.gamecenter.user.UserViewModel; import com.gh.gamecenter.common.base.fragment.NormalFragment; import com.halo.assistant.fragment.user.region.OnRegionSelectListener; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.kt b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.kt index 713a8dec57..22673e1d63 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.kt @@ -26,9 +26,9 @@ import com.gh.gamecenter.databinding.FragmentUserinfoEditBinding import com.gh.gamecenter.entity.UserInfoEntity import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.common.base.fragment.NormalFragment -import com.gh.gamecenter.retrofit.JSONObjectResponse +import com.gh.gamecenter.common.retrofit.JSONObjectResponse import com.gh.gamecenter.retrofit.RetrofitManager -import com.gh.gamecenter.user.ApiResponse +import com.gh.gamecenter.common.retrofit.ApiResponse import com.gh.gamecenter.user.UserViewModel import com.halo.assistant.HaloApp import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.kt b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.kt index 234ca31c9a..af9f890285 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.kt @@ -11,7 +11,7 @@ import com.gh.gamecenter.* import com.gh.gamecenter.databinding.FragmentUserinfoBinding import com.gh.gamecenter.entity.UserInfoEntity import com.gh.gamecenter.common.base.fragment.NormalFragment -import com.gh.gamecenter.user.ApiResponse +import com.gh.gamecenter.common.retrofit.ApiResponse import com.gh.gamecenter.user.UserViewModel class UserInfoFragment : NormalFragment() { diff --git a/app/src/main/java/com/halo/assistant/fragment/user/UserPortraitCropImageActivity.java b/app/src/main/java/com/halo/assistant/fragment/user/UserPortraitCropImageActivity.java index 8305221bd7..6f828713ee 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/UserPortraitCropImageActivity.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/UserPortraitCropImageActivity.java @@ -17,7 +17,7 @@ import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.common.util.UploadImageUtils; import com.gh.gamecenter.CropImageActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.retrofit.Response; +import com.gh.gamecenter.common.retrofit.Response; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index aa158c0734..3a94a4e102 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -106,10 +106,6 @@ - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 409c0ae198..ec423508d7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -291,10 +291,7 @@ 原创 正在反馈... 下载管理 - 分享跳转中... - 分享成功 - 分享已取消 - 分享失败 + 输入手机号码 输入验证码 获取验证码 @@ -427,7 +424,6 @@ 最新评论 全部暂停 全部开始 - 解析包出错（可能被误删了），请重新下载 未开抢 领取 @@ -507,9 +503,7 @@ 女 图片不能大于%1$dMB，请重新选择 安装包不能大于%1$dGB，请重新选择 - https://www.ghzs.com/link?source=appshare100 - https://www.ghzs.com/link?source=appshare300 - https://and-static.ghzs.com/app-logo.png + 我的收藏 别话痨哦~休息一会再来评论吧~ 账号异常，暂时无法发表内容 @@ -776,12 +770,7 @@ 更换背景 安利墙 精彩评论 - 分享到 - 微信好友 - 朋友圈 - QQ好友 - QQ空间 - 微博 + 优秀评论 查看更多 祝贺！童鞋\n你已通过礼仪测试～ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index cdde3b90e4..b8a11fe275 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -108,9 +108,6 @@ - + + \ No newline at end of file diff --git a/module_common/src/main/res/values/strings.xml b/module_common/src/main/res/values/strings.xml index d15afdc6ec..ff69e4e34c 100644 --- a/module_common/src/main/res/values/strings.xml +++ b/module_common/src/main/res/values/strings.xml @@ -8,6 +8,22 @@ 检查更新中... + 分享跳转中... + 分享成功 + 分享已取消 + 分享失败 + 分享到 + 微信好友 + 朋友圈 + QQ好友 + QQ空间 + 微博 + 解析包出错（可能被误删了），请重新下载 + + https://www.ghzs.com/link?source=appshare100 + https://www.ghzs.com/link?source=appshare300 + https://and-static.ghzs.com/app-logo.png + background_id text_color_id \ No newline at end of file diff --git a/module_common/src/main/res/values/style.xml b/module_common/src/main/res/values/style.xml index 6ec35131b0..4e5eada3a1 100644 --- a/module_common/src/main/res/values/style.xml +++ b/module_common/src/main/res/values/style.xml @@ -95,4 +95,8 @@ + + \ No newline at end of file diff --git a/app/src/release/java/com/gh/gamecenter/Injection.java b/module_common/src/release/java/com/gh/gamecenter/Injection.java similarity index 100% rename from app/src/release/java/com/gh/gamecenter/Injection.java rename to module_common/src/release/java/com/gh/gamecenter/Injection.java diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IAppProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IAppProvider.kt index 48640e9536..ff25eb4c4d 100644 --- a/module_core/src/main/java/com/gh/gamecenter/core/provider/IAppProvider.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IAppProvider.kt @@ -4,6 +4,7 @@ import android.content.Context import com.alibaba.android.arouter.facade.template.IProvider interface IAppProvider : IProvider { + fun getAppName():String fun getGid():String @@ -11,7 +12,13 @@ interface IAppProvider : IProvider { fun getChannel():String + fun getUserAgent():String + + fun getServerUserMark():String + fun getDeviceRamSize():Long + fun getTemporaryLocalDeviceId():String + fun isUserAcceptPrivacyPolicy(context: Context):Boolean } \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IConfigProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IConfigProvider.kt index b10c6ed687..fc10323e93 100644 --- a/module_core/src/main/java/com/gh/gamecenter/core/provider/IConfigProvider.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IConfigProvider.kt @@ -3,6 +3,8 @@ package com.gh.gamecenter.core.provider import com.alibaba.android.arouter.facade.template.IProvider interface IConfigProvider : IProvider { + fun getTencentAppId():String + fun getWechatAppId():String fun getUploadLimitSize(): Long fun getSize(): Int fun getQuality(): Int @@ -12,4 +14,5 @@ interface IConfigProvider : IProvider { fun getWebp(): String fun getGitThumb(): String fun getGifWaterMark(): String + fun getQQ(): String } \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IDirectProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IDirectProvider.kt index 01631dff65..04ae7aaf3a 100644 --- a/module_core/src/main/java/com/gh/gamecenter/core/provider/IDirectProvider.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IDirectProvider.kt @@ -3,8 +3,10 @@ package com.gh.gamecenter.core.provider import android.content.Context import com.alibaba.android.arouter.facade.template.IProvider -interface IDirectProvider: IProvider { +interface IDirectProvider : IProvider { fun directToWebView(context: Context, url: String, entrance: String? = null) fun directToRegulationTestPage(context: Context) + + fun directToQqConversation(context: Context, qq: String) } \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IDownloadManagerProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IDownloadManagerProvider.kt new file mode 100644 index 0000000000..c3046128a6 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IDownloadManagerProvider.kt @@ -0,0 +1,8 @@ +package com.gh.gamecenter.core.provider + +import com.alibaba.android.arouter.facade.template.IProvider +import com.lightgame.download.DownloadEntity + +interface IDownloadManagerProvider : IProvider { + fun getDownloadEntityByUrl(url: String): DownloadEntity? +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IEnergyTaskProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IEnergyTaskProvider.kt new file mode 100644 index 0000000000..03163909be --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IEnergyTaskProvider.kt @@ -0,0 +1,10 @@ +package com.gh.gamecenter.core.provider + +import com.alibaba.android.arouter.facade.template.IProvider + +interface IEnergyTaskProvider : IProvider { + + fun postEnergyTaskForShare(type: String, id: String, url: String) + + fun logInviteResult(result: String, type: String? = null) +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IEntranceUtilsProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IEntranceUtilsProvider.kt new file mode 100644 index 0000000000..85e039c512 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IEntranceUtilsProvider.kt @@ -0,0 +1,11 @@ +package com.gh.gamecenter.core.provider + +import android.content.Context +import android.os.Bundle +import com.alibaba.android.arouter.facade.template.IProvider + +interface IEntranceUtilsProvider:IProvider { + fun saveShortcut(activityName:String , bundle: Bundle?) + + fun jumpActivity(context: Context , bundle: Bundle) +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IPackageHelperProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IPackageHelperProvider.kt new file mode 100644 index 0000000000..a450b154c0 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IPackageHelperProvider.kt @@ -0,0 +1,8 @@ +package com.gh.gamecenter.core.provider + +import com.alibaba.android.arouter.facade.template.IProvider + +interface IPackageHelperProvider : IProvider { + + fun getLocalPackageNameSet(): HashSet +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IPackageInstallerProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IPackageInstallerProvider.kt new file mode 100644 index 0000000000..510f71c1f2 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IPackageInstallerProvider.kt @@ -0,0 +1,13 @@ +package com.gh.gamecenter.core.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.template.IProvider +import com.lightgame.download.DownloadEntity + +interface IPackageInstallerProvider : IProvider { + + fun install(context: Context, downloadEntity: DownloadEntity, showUnzipToast: Boolean) + + fun uninstall(context: Context, path: String) + +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IPackageUtilsProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IPackageUtilsProvider.kt index 73a1748e98..6e7cd7639e 100644 --- a/module_core/src/main/java/com/gh/gamecenter/core/provider/IPackageUtilsProvider.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IPackageUtilsProvider.kt @@ -1,9 +1,18 @@ package com.gh.gamecenter.core.provider import android.content.Context +import android.content.pm.PackageInfo import com.alibaba.android.arouter.facade.template.IProvider interface IPackageUtilsProvider : IProvider { + fun obtainProcessName(context: Context): String + fun getGhVersionName(): String + + fun getInstalledPackages(context: Context, flag: Int): List + + fun getApkSignatureByPackageName(context: Context, packageName: String): Array + + fun getSideLoadedInfo(): MutableMap? } \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IQuickLoginProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IQuickLoginProvider.kt new file mode 100644 index 0000000000..ef9a7883f2 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IQuickLoginProvider.kt @@ -0,0 +1,9 @@ +package com.gh.gamecenter.core.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.template.IProvider + +interface IQuickLoginProvider : IProvider { + + fun startLogin(context: Context, entrance: String) +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IUserManagerProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IUserManagerProvider.kt index 6b939353ac..a6cf599ebc 100644 --- a/module_core/src/main/java/com/gh/gamecenter/core/provider/IUserManagerProvider.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IUserManagerProvider.kt @@ -7,4 +7,8 @@ interface IUserManagerProvider : IProvider { fun userShouldTakeRegulationBaseOnLastRemind(): Boolean fun getUserId(): String + + fun getToken(): String + + fun refreshToken(accessToken: String, success: () -> Unit, fail: (String?) -> Unit) } \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/util/IntentUtils.java b/module_core/src/main/java/com/gh/gamecenter/core/utils/IntentUtils.java similarity index 59% rename from app/src/main/java/com/gh/common/util/IntentUtils.java rename to module_core/src/main/java/com/gh/gamecenter/core/utils/IntentUtils.java index b44f69e5db..76b067e31b 100644 --- a/app/src/main/java/com/gh/common/util/IntentUtils.java +++ b/module_core/src/main/java/com/gh/gamecenter/core/utils/IntentUtils.java @@ -1,20 +1,12 @@ -package com.gh.common.util; +package com.gh.gamecenter.core.utils; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.os.Bundle; import androidx.annotation.NonNull; -import com.gh.gamecenter.NormalActivity; -import com.gh.gamecenter.SingletonWebActivity; -import com.gh.gamecenter.WebActivity; -import com.gh.gamecenter.category.CategoryListActivity; -import com.gh.gamecenter.entity.CategoryEntity; -import com.halo.assistant.fragment.WebFragment; - /** * @author CsHeng * @Date 17/05/2017 @@ -61,26 +53,4 @@ public class IntentUtils { "https://www.ghzs.com/link?source=appshare333"); return data; } - - public static void startCategoryListActivity(Context context, String categoryTitle, CategoryEntity category) { - context.startActivity(CategoryListActivity.Companion.getIntent(context, categoryTitle, category, "全部")); - } - - public static Intent getWebTargetIntent(Context context, Bundle bundle, String url) { - Class cls; - - if (url.contains("android_page_type=singleton")) { - cls = SingletonWebActivity.class; - } else { - cls = WebActivity.class; - } - if (url.contains("leave_web_page_handle_back_pressed=true")) { - bundle.putBoolean(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_BACK_PRESSED, true); - } - - Intent intent = new Intent(context, cls); - intent.putExtra(NormalActivity.NORMAL_FRAGMENT_NAME, WebFragment.class.getCanonicalName()); - intent.putExtra(NormalActivity.NORMAL_FRAGMENT_BUNDLE, bundle); - return intent; - } } From d73e246538d33b09dceaffa5143d24fa2d955fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Wed, 18 May 2022 16:44:56 +0800 Subject: [PATCH 41/52] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=8C=96=E5=AF=BC=E8=87=B4=E7=9A=84=E4=B8=80=E4=BA=9B=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/common/provider/UserManagerProviderImpl.kt | 6 +++--- app/src/main/java/com/halo/assistant/HaloApp.java | 13 +++++++++++-- .../release/java/com/gh/gamecenter/Injection.java | 6 +++--- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt b/app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt index e17e64cce9..70f69d7e96 100644 --- a/app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt @@ -7,17 +7,17 @@ import com.gh.gamecenter.core.provider.IUserManagerProvider import com.gh.gamecenter.manager.UserManager @Route(path = RouteConsts.provider.userManager, name = "UserManager暴露服务") -class UserManagerProviderImpl: IUserManagerProvider { +class UserManagerProviderImpl : IUserManagerProvider { override fun userShouldTakeRegulationBaseOnLastRemind(): Boolean { return UserManager.getInstance().userShouldTakeRegulationBaseOnLastRemind() } override fun getUserId(): String { - return UserManager.getInstance().userId + return UserManager.getInstance().userId ?: "" } override fun getToken(): String { - return UserManager.getInstance().token + return UserManager.getInstance().token ?: "" } override fun refreshToken(accessToken: String, success: () -> Unit, fail: (String?) -> Unit) { diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index dd3b901850..283e2e0741 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -24,12 +24,11 @@ import com.facebook.imagepipeline.core.ImagePipelineConfig; import com.facebook.imagepipeline.core.ImageTranscoderType; import com.facebook.imagepipeline.core.MemoryChunkType; import com.facebook.imagepipeline.decoder.ImageDecoderConfig; +import com.gh.base.AppUncaughtHandler; import com.gh.base.GlobalActivityLifecycleObserver; import com.gh.common.FixedRateJobHelper; import com.gh.common.exposure.ExposureManager; import com.gh.common.filter.RegionSettingHelper; -import com.gh.gamecenter.common.loghub.LoghubUtils; -import com.gh.gamecenter.common.tracker.Tracker; import com.gh.common.util.DataUtils; import com.gh.common.util.DownloadNotificationHelper; import com.gh.common.util.DownloadObserver; @@ -42,6 +41,8 @@ import com.gh.gamecenter.Injection; import com.gh.gamecenter.common.constant.Config; import com.gh.gamecenter.common.constant.Constants; import com.gh.gamecenter.common.image.EmptyDecoder; +import com.gh.gamecenter.common.loghub.LoghubUtils; +import com.gh.gamecenter.common.tracker.Tracker; import com.gh.gamecenter.common.utils.DeviceUtils; import com.gh.gamecenter.common.utils.EmulatorUtil; import com.gh.gamecenter.common.utils.ExtensionsKt; @@ -178,6 +179,7 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid if (!Injection.appInit(this)) { return; } + initAppUncaughtHandler(); mInstance = this; @@ -241,6 +243,13 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid NightModeUtils.INSTANCE.initNightMode(); } + private void initAppUncaughtHandler(){ + if (!BuildConfig.DEBUG) { + AppUncaughtHandler appUncaughtHandler = new AppUncaughtHandler(this); + Thread.setDefaultUncaughtExceptionHandler(appUncaughtHandler); + } + } + /** * 需要延迟初始化的东西，以下代码调用都放置到用户同意了隐私政策之后 */ diff --git a/module_common/src/release/java/com/gh/gamecenter/Injection.java b/module_common/src/release/java/com/gh/gamecenter/Injection.java index c25c7dbe4d..104ed9a42a 100644 --- a/module_common/src/release/java/com/gh/gamecenter/Injection.java +++ b/module_common/src/release/java/com/gh/gamecenter/Injection.java @@ -2,7 +2,7 @@ package com.gh.gamecenter; import android.app.Application; -import com.gh.base.AppUncaughtHandler; +//import com.gh.base.AppUncaughtHandler; import okhttp3.OkHttpClient; @@ -15,8 +15,8 @@ import okhttp3.OkHttpClient; public class Injection { public static boolean appInit(Application application) { - AppUncaughtHandler appUncaughtHandler = new AppUncaughtHandler(application); - Thread.setDefaultUncaughtExceptionHandler(appUncaughtHandler); +// AppUncaughtHandler appUncaughtHandler = new AppUncaughtHandler(application); +// Thread.setDefaultUncaughtExceptionHandler(appUncaughtHandler); return true; } From b661337133e8e4df0abfa91b0446cf1e0bdf4805 Mon Sep 17 00:00:00 2001 From: leafwai Date: Wed, 18 May 2022 17:49:37 +0800 Subject: [PATCH 42/52] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.10.0=E3=80=91=E6=B8=B8=E6=88=8F=E5=8D=95=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=EF=BC=9A=E6=B8=B8=E6=88=8F=E5=8D=95=E5=BE=81=E9=9B=86?= =?UTF-8?q?=E8=AE=A1=E5=88=92vol.1=EF=BC=88=E5=AE=9E=E7=8E=B0=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=88=9B=E5=BB=BA=E6=B8=B8=E6=88=8F=E5=8D=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=87=AA=E5=8A=A8=E6=B7=BB=E5=8A=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E3=80=81=E5=8A=A0=E5=85=A5=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=EF=BC=89https://git.shanqu.cc/pm/halo-app-is?= =?UTF-8?q?sues/-/issues/1779?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/DefaultUrlHandler.kt | 5 ++- .../publish/GameCollectionEditActivity.kt | 45 +++++++++++++++++-- .../publish/GameCollectionEditViewModel.kt | 23 ++++++++-- .../common/constant/EntranceConsts.java | 1 + 4 files changed, 65 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/gh/common/DefaultUrlHandler.kt b/app/src/main/java/com/gh/common/DefaultUrlHandler.kt index 4a92091cbc..043ab07daa 100644 --- a/app/src/main/java/com/gh/common/DefaultUrlHandler.kt +++ b/app/src/main/java/com/gh/common/DefaultUrlHandler.kt @@ -432,7 +432,10 @@ object DefaultUrlHandler { } EntranceConsts.HOST_GAME_COLLECTION_EDIT -> { - context.startActivity(GameCollectionEditActivity.getIntent(context, entrance)) + val activityId = uri.getQueryParameter("activity_id") ?: "" + val activityName = uri.getQueryParameter("activity_name") ?: "" + val gameId = uri.getQueryParameter("game_id") ?: "" + context.startActivity(GameCollectionEditActivity.getIntent(context, activityId, activityName, gameId, entrance)) } else -> { diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt index f299e2f0ba..dd6d739f6b 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt @@ -41,6 +41,8 @@ class GameCollectionEditActivity : ToolBarActivity() { private lateinit var mChooseGamesViewModel: ChooseGamesViewModel private var mProcessingDialog: WaitingDialogFragment? = null private var mPatchCommitCount = 0 + private var mActivityId = "" + private var mActivityName = "" override fun getLayoutId(): Int = R.layout.activity_game_collection_edit @@ -59,6 +61,26 @@ class GameCollectionEditActivity : ToolBarActivity() { if (path.isNotEmpty()) { NewLogUtils.logEnterGameCollectionEdit(path) } + mActivityId = intent.getStringExtra(EntranceConsts.KEY_ACTIVITY_ID) ?: "" + mActivityName = intent.getStringExtra(EntranceConsts.KEY_ACTIVITY_NAME) ?: "" + if (mActivityId.isNotEmpty() && mActivityName.isNotEmpty()) { + mViewModel.selectActivityTag = ActivityLabelEntity(id = mActivityId, name = mActivityName) + mBinding.activityTipTv.text = mActivityName + } + val gameId = intent.getStringExtra(EntranceConsts.KEY_GAMEID) ?: "" + if (gameId.isNotEmpty()) { + mViewModel.getGameDigest(gameId) { + mChooseGamesViewModel.chooseGamesLiveData.run { + if (it != null) { + val gamesList = ArrayList() + if (!value.isNullOrEmpty()) { + gamesList.addAll(value!!) + } + postValue(gamesList.apply { add(it) }) + } + } + } + } initData() observeData() @@ -148,8 +170,10 @@ class GameCollectionEditActivity : ToolBarActivity() { mViewModel.gameCollectionPatch?.run { if (!activityTags.isNullOrEmpty()) { - mViewModel.selectActivityTag = activityTags!![0] - mBinding.activityTipTv.text = activityTags!![0].name + if (mActivityId.isEmpty() && mActivityName.isEmpty()) { + mViewModel.selectActivityTag = activityTags!![0] + mBinding.activityTipTv.text = activityTags!![0].name + } } mViewModel.imageUrl = cover if (status != "draft" && !isLocalDraft) { @@ -227,8 +251,10 @@ class GameCollectionEditActivity : ToolBarActivity() { mChooseGamesViewModel.chooseGamesLiveData.postValue(ArrayList(simpleGames)) } if (!it.activityTags.isNullOrEmpty()) { - mViewModel.selectActivityTag = it.activityTags!![0] - mBinding.activityTipTv.text = it.activityTags!![0].name + if (mActivityId.isEmpty() && mActivityName.isEmpty()) { + mViewModel.selectActivityTag = it.activityTags!![0] + mBinding.activityTipTv.text = it.activityTags!![0].name + } } } } @@ -515,5 +541,16 @@ class GameCollectionEditActivity : ToolBarActivity() { intent.putExtra(EntranceConsts.KEY_PATH, path) return intent } + + @JvmStatic + fun getIntent(context: Context, activityId: String = "", activityName: String = "", gameId: String = "", entrance: String = "", path: String = ""): Intent { + val intent = Intent(context, GameCollectionEditActivity::class.java) + intent.putExtra(EntranceConsts.KEY_ACTIVITY_ID, activityId) + intent.putExtra(EntranceConsts.KEY_ACTIVITY_NAME, activityName) + intent.putExtra(EntranceConsts.KEY_GAMEID, gameId) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_PATH, path) + return intent + } } } \ No newline at end of file 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 c8fca51e69..17474018e1 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 @@ -12,15 +12,14 @@ import com.gh.gamecenter.core.utils.ToastUtils import com.gh.gamecenter.common.utils.observableToMain import com.gh.gamecenter.common.utils.singleToMain import com.gh.gamecenter.common.utils.toRequestBody -import com.gh.gamecenter.entity.ActivityLabelEntity -import com.gh.gamecenter.entity.GameCollectionDraft -import com.gh.gamecenter.entity.GamesCollectionEntity -import com.gh.gamecenter.entity.TagInfoEntity +import com.gh.gamecenter.entity.* import com.gh.gamecenter.mvvm.Resource import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.room.AppDatabase +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers import okhttp3.ResponseBody import org.json.JSONObject import retrofit2.HttpException @@ -39,6 +38,22 @@ class GameCollectionEditViewModel(application: Application) : AndroidViewModel(a private val mApi = RetrofitManager.getInstance().api private val mDraftDao = AppDatabase.getInstance().gameCollectionDraftDao() + fun getGameDigest(gameId: String, callback: (gameEntity: GameEntity?) -> Unit) { + mApi.getGameDigest(gameId) + .map(ApkActiveUtils.filterMapper) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(object : Response() { + override fun onResponse(response: GameEntity?) { + response?.let { callback.invoke(it) } + } + + override fun onFailure(e: HttpException?) { + callback.invoke(null) + } + }) + } + fun uploadPoster() { if (imagePath.isEmpty()) return UploadImageUtils.uploadImage(UploadImageUtils.UploadType.poster, imagePath, object : UploadImageUtils.OnUploadImageListener { diff --git a/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java b/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java index 05d87780a1..ff6ed0e26d 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java @@ -244,4 +244,5 @@ public class EntranceConsts { public static final String KET_TITLE = "KET_TITLE"; public static final String KET_TYPE = "KET_TYPE"; public static final String KET_SUMMARY = "KET_SUMMARY"; + public static final String KEY_ACTIVITY_ID = "activity_id"; } From f9ebb5342c38a564c080d1c4fea1b67baf92536a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Thu, 19 May 2022 16:07:26 +0800 Subject: [PATCH 43/52] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.10.0=E3=80=91=E6=95=B0=E6=8D=AE=E5=9F=8B=E7=82=B9?= =?UTF-8?q?=E9=9C=80=E6=B1=82=20https://git.shanqu.cc/pm/halo-app-issues/-?= =?UTF-8?q?/issues/1835?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/util/NewLogUtils.kt | 512 +++++++++++++++++- .../com/gh/gamecenter/amway/AmwayAdapter.kt | 4 + .../fragment/MainWrapperFragment.java | 10 + .../gh/gamecenter/game/GameFragmentAdapter.kt | 129 ++++- .../detail/ColumnCollectionDetailAdapter.kt | 13 +- .../detail/CommonCollectionDetailAdapter.kt | 7 + .../game/horizontal/GameHorizontalAdapter.kt | 3 + .../gamedetail/GameDetailFragment.kt | 20 +- .../gamecenter/gamedetail/desc/DescAdapter.kt | 21 +- .../gamedetail/desc/DescCommentsAdapter.kt | 4 + .../gamedetail/desc/GameLibaoAdapter.kt | 14 +- .../gamedetail/dialog/GameBigEventDialog.kt | 20 +- .../fuli/kaifu/ServersCalendarActivity.kt | 52 +- .../history/HistoryApkListFragment.kt | 7 + .../gh/gamecenter/home/HomeFragmentAdapter.kt | 18 +- .../home/HomeRecommendItemViewHolder.kt | 20 +- .../LegacyHomeFragmentAdapterAssistant.kt | 49 +- .../gamecenter/home/amway/HomeAmwayAdapter.kt | 1 + .../home/slide/HomeSlideListAdapter.kt | 45 +- .../personal/PersonalFunctionAdapter.kt | 12 +- .../common/entity/ExposureEntity.kt | 14 +- 21 files changed, 889 insertions(+), 86 deletions(-) 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 a2b8d9223b..9ea798ede8 100644 --- a/app/src/main/java/com/gh/common/util/NewLogUtils.kt +++ b/app/src/main/java/com/gh/common/util/NewLogUtils.kt @@ -33,23 +33,6 @@ object NewLogUtils { } } - // 专题右上角的点击事件 - fun logSubjectTopTabClick(buttonName: String?, subjectName: String?, linkEntity: LinkEntity?) { - val json = json { - "event" to "column_list_click_button" - "button_type" to buttonName - "column_name" to subjectName - "meta" to LogUtils.getMetaObject() - if (linkEntity != null) { - "link_type" to linkEntity.type - "link_title" to linkEntity.text - } - "timestamp" to System.currentTimeMillis() / 1000 - } - - log(json, "event", false) - } - @SuppressLint("CheckResult") fun logForumContentBrowser(contentId: String, contentType: String, recommendId: String) { val requestMap = hashMapOf() @@ -1875,4 +1858,499 @@ object NewLogUtils { } log(json, "event", false) } + + //点击专题列表右上角按钮 + @JvmStatic + fun logColumnListClickButton( + buttonType: String, + columnName: String, + columnId: String, + linkType: String, + linkTitle: String, + location: String, + blockName: String + ) { + val json = json { + "event" to "column_list_click_button" + "button_type" to buttonType + "column_name" to columnName + "column_id" to columnId + if (linkType.isNotEmpty()) { + "link_type" to linkType + } + if (linkTitle.isNotEmpty()) { + "link_title" to linkTitle + } + "location" to location + if (blockName.isNotEmpty()) { + "block_name" to blockName + } + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //点击游戏专题图片 + @JvmStatic + fun logColumnPictureClick( + displayType: String, + columnName: String, + columnId: String, + linkType: String, + linkTitle: String, + location: String, + blockName: String + ) { + val json = json { + "event" to "column_picture_click" + "display_type" to displayType + "column_name" to columnName + "column_id" to columnId + if (linkType.isNotEmpty()) { + "link_type" to linkType + } + if (linkTitle.isNotEmpty()) { + "link_title" to linkTitle + } + "location" to location + if (blockName.isNotEmpty()) { + "block_name" to blockName + } + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //点击专题合集右上角 + @JvmStatic + fun logColumnCategoryHomeButtonClick( + buttonType: String, + categoryName: String, + categoryId: String, + location: String, + blockName: String + ) { + val json = json { + "event" to "column_category_home_button_click" + "button_type" to buttonType + "category_name" to categoryName + "category_id" to categoryId + "location" to location + if (blockName.isNotEmpty()) { + "block_name" to blockName + } + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //点击专题合集首页内容 + fun logColumnCategoryHomeContentClick( + columnName: String, + columnId: String, + categoryName: String, + categoryId: String, + location: String, + blockName: String = "" + ) { + val json = json { + "event" to "column_category_home_content_click" + "column_name" to columnName + "column_id" to columnId + "category_name" to categoryName + "category_id" to categoryId + "location" to location + if (blockName.isNotEmpty()) { + "block_name" to blockName + } + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //点击专题合集详情内容 + fun logColumnCategoryDetailContentClick( + columnName: String, + columnId: String, + categoryName: String, + categoryId: String, + ) { + val json = json { + "event" to "column_category_detail_content_click" + "column_name" to columnName + "column_id" to columnId + "category_name" to categoryName + "category_id" to categoryId + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //点击通用内容合集右上角 + @JvmStatic + fun logCommonCategoryHomeButtonClick( + buttonType: String, + categoryName: String, + categoryId: String, + location: String, + blockName: String = "" + ) { + val json = json { + "event" to "common_category_home_button_click" + "button_type" to buttonType + "category_name" to categoryName + "category_id" to categoryId + "location" to location + if (blockName.isNotEmpty()) { + "block_name" to blockName + } + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //点击通用内容合集首页内容 + @JvmStatic + fun logCommonCategoryHomeContentClick( + title: String, + linkType: String, + linkTitle: String, + categoryName: String, + categoryId: String, + location: String, + blockName: String = "" + ) { + val json = json { + "event" to "common_category_home_content_click" + "title" to title + "link_type" to linkType + "link_title" to linkTitle + "category_name" to categoryName + "category_id" to categoryId + "location" to location + if (blockName.isNotEmpty()) { + "block_name" to blockName + } + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //点击通用内容合集详情内容 + @JvmStatic + fun logCommonCategoryDetailContentClick( + title: String, + linkType: String, + linkTitle: String, + categoryName: String, + categoryId: String, + ) { + val json = json { + "event" to "common_category_detail_content_click" + "title" to title + "link_type" to linkType + "link_title" to linkTitle + "category_name" to categoryName + "category_id" to categoryId + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //点击首页安利墙的全部 + @JvmStatic + fun logHomeShareWallButtonClick(entrance: String) { + val json = json { + "event" to "home_share_wall_button_click" + "entrance" to entrance + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //点击首页安利墙的卡片 + @JvmStatic + fun logHomeShareWallCardClick(gameName: String, gameId: String, entrance: String) { + val json = json { + "event" to "home_share_wall_card_click" + "game_name" to gameName + "game_id" to gameId + "entrance" to entrance + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //点击安利墙广场的卡片 + @JvmStatic + fun logShareWallSquareCardClick(gameName: String, gameId: String, entrance: String) { + val json = json { + "event" to "share_wall_square_card_click" + "game_name" to gameName + "game_id" to gameId + "entrance" to entrance + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //点击底部导航栏 + @JvmStatic + fun logBottomNavigationClick(navigationName: String, linkType: String, linkTitle: String) { + val json = json { + "event" to "bottom_navigation_click" + "navigation_name" to navigationName + if (linkType.isNotEmpty()) { + "link_type" to linkType + } + if (linkTitle.isNotEmpty()) { + "link_title" to linkTitle + } + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //游戏详情点击tab + @JvmStatic + fun logGameDetailTabClick(gameName: String, gameId: String, tabName: String) { + val json = json { + "event" to "game_detail_tab_click" + "game_name" to gameName + "game_id" to gameId + "tab_name" to tabName + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //游戏详情点击大事件 + @JvmStatic + fun logGameDetailMajorEventClick(gameName: String, gameId: String) { + val json = json { + "event" to "game_detail_major_event_click" + "game_name" to gameName + "game_id" to gameId + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //游戏详情浏览大事件 + @JvmStatic + fun logGameDetailMajorEventView(gameName: String, gameId: String) { + val json = json { + "event" to "game_detail_major_event_view" + "game_name" to gameName + "game_id" to gameId + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //游戏详情浏览更新内容 + @JvmStatic + fun logGameDetailUpdatedView(gameName: String, gameId: String) { + val json = json { + "event" to "game_detail_updated_view" + "game_name" to gameName + "game_id" to gameId + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //游戏详情浏览历史版本 + @JvmStatic + fun logGameDetailHistoryVersionView(gameName: String, gameId: String) { + val json = json { + "event" to "game_detail_history_version_view" + "game_name" to gameName + "game_id" to gameId + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //游戏详情点击更新内容 + @JvmStatic + fun logGameDetailUpdatedClick(gameName: String, gameId: String, entrance: String) { + val json = json { + "event" to "game_detail_updated_click" + "game_name" to gameName + "game_id" to gameId + "entrance" to entrance + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //游戏详情浏览开服表 + @JvmStatic + fun logGameDetailOpenListView(gameName: String, gameId: String) { + val json = json { + "event" to "game_detail_open_list_view" + "game_name" to gameName + "game_id" to gameId + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //游戏详情点击开服表 + @JvmStatic + fun logGameDetailOpenListClick(gameName: String, gameId: String, entrance: String) { + val json = json { + "event" to "game_detail_open_list_click" + "game_name" to gameName + "game_id" to gameId + "entrance" to entrance + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //游戏详情浏览开服日历 + @JvmStatic + fun logGameDetailOpenCalendarView(gameName: String, gameId: String) { + val json = json { + "event" to "game_detail_open_calendar_view" + "game_name" to gameName + "game_id" to gameId + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //游戏详情点击开服日历 + @JvmStatic + fun logGameDetailOpenCalendarClick(gameName: String, gameId: String) { + val json = json { + "event" to "game_detail_open_calendar_click" + "game_name" to gameName + "game_id" to gameId + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //游戏详情浏览游戏礼包 + @JvmStatic + fun logGameDetailGiftView(gameName: String, gameId: String) { + val json = json { + "event" to "game_detail_gift_view" + "game_name" to gameName + "game_id" to gameId + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //游戏详情点击游戏礼包 + @JvmStatic + fun logGameDetailGiftClick(gameName: String, gameId: String, entrance: String) { + val json = json { + "event" to "game_detail_gift_click" + "game_name" to gameName + "game_id" to gameId + "entrance" to entrance + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //游戏详情浏览玩家评论 + @JvmStatic + fun logGameDetailCommentView(gameName: String, gameId: String) { + val json = json { + "event" to "game_detail_comment_view" + "game_name" to gameName + "game_id" to gameId + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //游戏详情点击玩家评论 + @JvmStatic + fun logGameDetailCommentClick(gameName: String, gameId: String, entrance: String) { + val json = json { + "event" to "game_detail_comment_click" + "game_name" to gameName + "game_id" to gameId + "entrance" to entrance + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //游戏详情浏览大家都在玩 + @JvmStatic + fun logGameDetailPopularView(gameName: String, gameId: String) { + val json = json { + "event" to "game_detail_popular_view" + "game_name" to gameName + "game_id" to gameId + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //游戏详情点击大家都在玩 + @JvmStatic + fun logGameDetailPopularClick(gameName: String, gameId: String, linkType: String, linkTitle: String, linkDesc: String) { + val json = json { + "event" to "game_detail_popular_click" + "game_name" to gameName + "game_id" to gameId + "link_type" to linkType + "link_title" to linkTitle + "link_desc" to linkDesc + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } + + //我的光环点击事件 + @JvmStatic + fun logHaloSelfClick(profile: String, entrance: String, linkType: String, linkDesc: String) { + val json = json { + "event" to "halo_self_click" + "profile" to profile + "entrance" to entrance + "link_type" to linkType + "link_desc" to linkDesc + "timestamp" to System.currentTimeMillis() / 1000 + parseAndPutMeta().invoke(this) + } + log(json, "event", false) + } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt b/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt index 7d4b23cecb..6f9a566314 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt @@ -13,6 +13,7 @@ import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable import com.gh.common.util.* import com.gh.common.util.DialogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder @@ -213,6 +214,7 @@ class AmwayAdapter( binding.gameContainer.setOnClickListener { GameDetailActivity.startGameDetailActivity(binding.root.context, amway.game.id, "${viewModel.entrance}+(安利墙)", itemData.exposureEvent) MtaHelper.onEvent("安利墙", "点击", "评论${blockPosition}_${amway.game.name}_游戏") + NewLogUtils.logShareWallSquareCardClick(amway.game.name ?: "", amway.game.id, "游戏信息") } binding.gameIconView.displayGameIcon( @@ -237,10 +239,12 @@ class AmwayAdapter( ) SyncDataBetweenPageHelper.startActivityForResult(binding.root.context, intent, RatingFragment.RATING_REPLAY_REQUEST, adapterPosition) MtaHelper.onEvent("安利墙", "点击", "评论${blockPosition}_${amway.game.name}_评论") + NewLogUtils.logShareWallSquareCardClick(amway.game.name ?: "", amway.game.id, "评论内容") } binding.userClickableView.setOnClickListener { DirectUtils.directToHomeActivity(context, amway.comment.user.id, viewModel.entrance, EntranceConsts.ENTRANCE_AMWAY) + NewLogUtils.logShareWallSquareCardClick(amway.game.name ?: "", amway.game.id, "用户信息") } if (amway.comment.me.isVoted) { diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java index fd0558c665..d52e7eb661 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java @@ -30,6 +30,7 @@ import com.gh.common.constant.Config; import com.gh.common.dialog.PrivacyPolicyDialogFragment; import com.gh.common.dialog.ReserveDialog; import com.gh.common.exposure.ExposureSource; +import com.gh.common.util.NewLogUtils; import com.gh.gamecenter.common.tracker.TrackerLogger; import com.gh.common.util.FloatingBackViewManager; import com.gh.common.util.HomeBottomBarHelper; @@ -526,21 +527,30 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem switch (index) { case INDEX_HOME: tabText = "首页"; + NewLogUtils.logBottomNavigationClick("首页", "", ""); break; case INDEX_GAME: tabText = "游戏库"; + SubjectRecommendEntity entity = mViewModel.getNavBar().getValue(); + if (entity == null) { + entity = HomeBottomBarHelper.getDefaultGameBarData(); + } + NewLogUtils.logBottomNavigationClick("游戏库", entity.getType() != null ? entity.getType() : "", entity.getText() != null ? entity.getText() : ""); break; case INDEX_BBS: tabText = "论坛"; LogUtils.uploadAccessBbsTab(); + NewLogUtils.logBottomNavigationClick("社区", "", ""); break; case INDEX_VIDEO: tabText = "视频"; DisplayUtils.setLightStatusBar(requireActivity(), false); + NewLogUtils.logBottomNavigationClick("视频", "", ""); break; case INDEX_PERSONAL: tabText = "我的光环"; IntegralLogHelper.INSTANCE.log("view_me", "我的光环"); + NewLogUtils.logBottomNavigationClick("我的光环", "", ""); break; } diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt index 2b33fe21b6..4c2d96f95c 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt @@ -10,12 +10,12 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.gamecenter.common.callback.OnViewClickListener import com.gh.common.constant.Config -import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.databind.BindingAdapters -import com.gh.common.exposure.* -import com.gh.gamecenter.core.runOnIoThread +import com.gh.common.exposure.ExposureEvent +import com.gh.common.exposure.ExposureSource +import com.gh.common.exposure.ExposureType +import com.gh.common.exposure.IExposable import com.gh.common.util.* import com.gh.common.util.LogUtils import com.gh.common.util.NewLogUtils @@ -27,12 +27,18 @@ import com.gh.gamecenter.adapter.ImagePagerAdapter import com.gh.gamecenter.adapter.viewholder.* import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.category.CategoryDirectoryActivity +import com.gh.gamecenter.common.callback.OnViewClickListener import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.gamecenter.common.entity.ExposureEntity import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.common.view.FixGridLayoutManager import com.gh.gamecenter.common.view.GridSpacingItemDecoration -import com.gh.gamecenter.core.utils.* +import com.gh.gamecenter.core.runOnIoThread +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.core.utils.MtaHelper +import com.gh.gamecenter.core.utils.PageSwitchDataHelper +import com.gh.gamecenter.core.utils.StringUtils import com.gh.gamecenter.databinding.* import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.EBDownloadStatus @@ -72,6 +78,8 @@ class GameFragmentAdapter( var isAutoScroll: Boolean = true + private var mTopViewExposureEventList: ArrayList? = null + fun setItemDataList(itemDataList: MutableList) { val currentSize = mItemDataList.size mItemDataList = itemDataList.toMutableList() @@ -235,16 +243,21 @@ class GameFragmentAdapter( val itemData = mItemDataList[position] itemData.exposureEventList = arrayListOf() - holder.bindView(itemData.gallery!!, mBasicExposureSource) { + val gallery = itemData.gallery + holder.bindView(gallery!!, mBasicExposureSource) { itemData.exposureEventList?.add(it) } holder.binding.root.setOnClickListener { - MtaHelper.onEvent("游戏专题", "全部", itemData.gallery?.name) + MtaHelper.onEvent("游戏专题", "全部", gallery.name) setPageSwitchData() DirectUtils.directToSubject( - holder.binding.root.context, itemData.gallery?.id - ?: "", itemData.gallery?.name, "(游戏-专题)" + holder.binding.root.context, gallery.id + ?: "", gallery.name, "(游戏-专题)" + ) + NewLogUtils.logColumnPictureClick( + "显示图集", gallery.name ?: "", gallery.id ?: "", "游戏专题", + gallery.name ?: "", "板块", mViewModel.blockData?.name ?: "" ) } } @@ -274,6 +287,11 @@ class GameFragmentAdapter( setPageSwitchData() DirectUtils.directToLinkPage(mContext, LinkEntity(link = gameEntity.link, type = gameEntity.type), "(首页游戏)", "游戏-专题") } + NewLogUtils.logColumnCategoryHomeContentClick( + gameEntity.name ?: "", gameEntity.link ?: "", + columnCollection.name ?: "", columnCollection.id ?: "", "板块", + mViewModel.blockData?.name ?: "" + ) } holder.bindColumnCollection(columnCollection, clickClosure) @@ -328,6 +346,15 @@ class GameFragmentAdapter( linkEntity.text ?: "", sequence + 1 ) + NewLogUtils.logCommonCategoryHomeContentClick( + contentEntity.title, + linkEntity.type ?: "", + linkEntity.text ?: "", + commonLinkCollection.name ?: "", + commonLinkCollection.id ?: "", + "板块", + blockData?.name ?: "" + ) } holder.bindCommonLinkCollection( @@ -473,6 +500,10 @@ class GameFragmentAdapter( ) ) DirectUtils.directToLinkPage(mContext, linkEntity, "(游戏-专题:" + entity?.name + "-大图)", "首页游戏", entity?.exposureEvent) + NewLogUtils.logColumnPictureClick( + "大图", entity?.name ?: "", entity?.id ?: "", "游戏专题", + entity?.name ?: "", "板块", mViewModel.blockData?.name ?: "" + ) } holder.bindImageSlide(entity!!, imageClickListener, "游戏-专题", mViewModel) @@ -573,6 +604,10 @@ class GameFragmentAdapter( mContext, linkEntity, "(游戏-专题:$name-大图)", mViewModel.blockData?.name ?: "", mItemDataList[position].exposureEvent ) + NewLogUtils.logColumnPictureClick( + "大图", entity.name ?: "", entity.id, "游戏专题", + entity.name ?: "", "板块", mViewModel.blockData?.name ?: "" + ) } } @@ -614,7 +649,12 @@ class GameFragmentAdapter( ) when { - entity.type == "column_collection" -> DirectUtils.directToColumnCollection(mContext, entity.link!!, -1, "(推荐入口)") + entity.type == "column_collection" -> DirectUtils.directToColumnCollection( + mContext, + entity.link!!, + -1, + "(推荐入口)" + ) entity.type == "block" -> mContext.startActivity(BlockActivity.getIntent(mContext, entity, "(推荐入口)")) entity.type == "category" -> mContext.startActivity( CategoryDirectoryActivity.getIntent( @@ -661,7 +701,7 @@ class GameFragmentAdapter( blockData?.name ?: "" ) } - entity.type == "game_list" -> { + entity.type == "game_list_square" -> { DirectUtils.directToGameCollectionSquare( mContext, "版块推荐入口", @@ -686,8 +726,52 @@ class GameFragmentAdapter( mViewModel.getTopData(false) } } - binding.run { + if (mTopViewExposureEventList == null) { + mTopViewExposureEventList = arrayListOf() + + subjectDigestList?.forEachIndexed { index, entity -> + val event = ExposureEvent.createEventWithSourceConcat( + gameEntity = GameEntity( + containerId = blockData?.link ?: "", + containerType = ExposureEntity.BLOCK_ID + ).also { + it.sequence = index + it.outerSequence = position + }, + basicSource = mBasicExposureSource, + source = listOf() + ) + event.payload.controlType = "推荐入口" + event.payload.controlName = if (Config.isShowPlugin()) entity.name else entity.nameNormal + event.payload.controlLinkType = entity.type + event.payload.controlLinkName = entity.text + mTopViewExposureEventList?.add(event) + } + val slideList = mItemDataList[position].slideList + slideList?.forEachIndexed { index, entity -> + val event = ExposureEvent.createEventWithSourceConcat( + gameEntity = GameEntity( + containerId = blockData?.link ?: "", + containerType = ExposureEntity.BLOCK_ID + ).also { + it.sequence = index + it.outerSequence = position + }, + basicSource = mBasicExposureSource, + source = listOf() + ) + event.payload.controlType = "轮播图" + event.payload.controlName = entity.name + event.payload.controlLinkType = entity.type + event.payload.controlLinkName = entity.text + mTopViewExposureEventList?.add(event) + } + mItemDataList[position].exposureEventList = mTopViewExposureEventList + } else { + mItemDataList[position].exposureEventList = mTopViewExposureEventList + } + viewpagerTvFailure.goneIf(subjectDigestList != null) viewpagerTvFailure.setOnClickListener { clickListener.onClick(it, null) @@ -809,7 +893,7 @@ class GameFragmentAdapter( addItemDecoration(GridSpacingItemDecoration(4, 8f.dip2px(), false, 16f.dip2px())) } if (navigationAdapter == null) { - navigationAdapter = GameNavigationAdapter(mContext,blockData?.link ?: "",blockData?.text ?: "") + navigationAdapter = GameNavigationAdapter(mContext, blockData?.link ?: "", blockData?.text ?: "") } val exposureEventList = arrayListOf() @@ -900,7 +984,11 @@ class GameFragmentAdapter( holder.bindHead(column!!) holder.binding.headMore.setOnClickListener { - it as TextView + val buttonType = when (column.home) { + "change" -> "换一批" + "more" -> "更多" + else -> "全部" + } when (column.home) { "change" -> { MtaHelper.onEvent("游戏专题", "换一批", column.name) @@ -919,6 +1007,9 @@ class GameFragmentAdapter( "column_collection" -> { MtaHelper.onEvent("游戏专题合集", "全部", column.name) DirectUtils.directToColumnCollection(mContext, column.id!!, -1, "(推荐入口)") + NewLogUtils.logColumnCategoryHomeButtonClick( + buttonType, column.name ?: "", column.id ?: "", "板块", "" + ) } "common_collection" -> { val blockData = mViewModel.blockData @@ -938,6 +1029,7 @@ class GameFragmentAdapter( blockData?.link ?: "", blockData?.name ?: "" ) + NewLogUtils.logCommonCategoryHomeButtonClick(buttonType, column.name ?: "", column.id ?: "", "板块", blockData?.name ?: "") } "game_list_collection" -> { DirectUtils.directToGameCollectionSquare( @@ -967,11 +1059,15 @@ class GameFragmentAdapter( ) } MtaHelper.onEvent("游戏专题", "全部", column.name) + val moreLink = column.moreLink + NewLogUtils.logColumnListClickButton( + buttonType, column.name ?: "", column.id ?: "", moreLink?.type ?: "", + moreLink?.name ?: "", "版块", mViewModel.blockData?.name ?: "" + ) } } } } - NewLogUtils.logSubjectTopTabClick(it.text.toString(), column.name, column.moreLink) } } @@ -1127,6 +1223,9 @@ class GameFragmentAdapter( } override fun getEventListByPosition(pos: Int): List? { + if (mViewModel.blockData?.display?.slide == true || mViewModel.blockData?.display?.recommend == true) { + return if (pos == 0) mTopViewExposureEventList else mItemDataList[pos].exposureEventList + } return mItemDataList[pos].exposureEventList } diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailAdapter.kt index 76fc1cf1ff..54bd008f7c 100644 --- a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailAdapter.kt @@ -7,6 +7,7 @@ import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.StaggeredGridLayoutManager import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.DirectUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.core.utils.PageSwitchDataHelper @@ -17,9 +18,11 @@ import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.databinding.GameColumnCollectionItemBinding import com.gh.gamecenter.entity.LinkEntity -class ColumnCollectionDetailAdapter(context: Context, - private val mViewModel: ColumnCollectionDetailViewModel, - private val mEntrance: String) : ListAdapter(context) { +class ColumnCollectionDetailAdapter( + context: Context, + private val mViewModel: ColumnCollectionDetailViewModel, + private val mEntrance: String, +) : ListAdapter(context) { override fun areItemsTheSame(oldItem: LinkEntity?, newItem: LinkEntity?): Boolean { return oldItem == newItem @@ -64,6 +67,10 @@ class ColumnCollectionDetailAdapter(context: Context, ) ) DirectUtils.directToLinkPage(mContext, data, mEntrance, "专题合集") + NewLogUtils.logColumnCategoryDetailContentClick( + data.name ?: "", data?.link ?: "", + mViewModel.columnCollection.value?.name ?: "", mViewModel.collectionId + ) } } else if (holder is FooterViewHolder) { holder.initFooterViewHolder(mViewModel, mIsLoading, mIsNetworkError, mIsOver) diff --git a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailAdapter.kt index 924c5eaffa..3c8f59cda3 100644 --- a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailAdapter.kt @@ -63,6 +63,13 @@ class CommonCollectionDetailAdapter( linkEntity.text ?: "", position + 1 ) + NewLogUtils.logCommonCategoryDetailContentClick( + contentEntity?.title ?: "", + linkEntity.type ?: "", + linkEntity.text ?: "", + commonLinkCollection?.name ?: "", + commonLinkCollection?.id ?: "" + ) } if (linkEntity.type == "game") { diff --git a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt index 31aa743351..0512356e2a 100644 --- a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt @@ -5,6 +5,7 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.gh.common.exposure.ExposureEvent import com.gh.common.util.DataCollectionUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.core.utils.StringUtils import com.gh.gamecenter.common.utils.toBinding @@ -19,6 +20,7 @@ class GameHorizontalAdapter( ) : BaseRecyclerAdapter(context) { var gameName = "" + var gameId = "" var entrance = "" var exposureEventList: ArrayList? = null @@ -84,6 +86,7 @@ class GameHorizontalAdapter( traceEvent = exposureEventList!![position] ) } + NewLogUtils.logGameDetailPopularClick(gameName, gameId, "游戏", gameEntity.name ?: "", gameEntity.id) } } 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 eff990c309..16bbf74704 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt @@ -523,7 +523,7 @@ class GameDetailFragment : NormalFragment() { mViewModel.bigEventLiveData.observeNonNull(this) { GameBigEventDialog.showGameBigEventDialog( - requireContext(), mGameEntity?.name ?: "", it, mEntrance + requireContext(), mGameEntity?.name ?: "",mGameEntity?.id ?: "", it, mEntrance ) } mViewModel.recommendPopupLiveData.observe(this, Observer { @@ -820,6 +820,7 @@ class GameDetailFragment : NormalFragment() { } mBodyBinding.gameBigEvent.setOnClickListener { MtaHelper.onEvent("游戏详情_新", "游戏大事件", mViewModel.game?.name ?: "") + NewLogUtils.logGameDetailMajorEventClick(mViewModel.game?.name ?: "", mViewModel.game?.id ?: "") mViewModel.getBigEvent() } } @@ -1184,9 +1185,20 @@ class GameDetailFragment : NormalFragment() { val entrance = if (mEntrance.contains("论坛详情")) "论坛" else "游戏" mGameEntity?.run { when (position) { - INDEX_TRENDES -> NewLogUtils.logGameDetailTabClick("view_game_detail_special_area_tab", entrance, id, gameType, bbsId) - - INDEX_RATING -> NewLogUtils.logGameDetailTabClick("view_game_detail_comment_tab", entrance, id, gameType, bbsId) + INDEX_DESC -> { + NewLogUtils.logGameDetailTabClick(name ?: "", id, "详情") + } + INDEX_TRENDES -> { + NewLogUtils.logGameDetailTabClick("view_game_detail_special_area_tab", entrance, id, gameType, bbsId) + NewLogUtils.logGameDetailTabClick(name ?: "", id, "专区") + } + INDEX_RATING -> { + NewLogUtils.logGameDetailTabClick("view_game_detail_comment_tab", entrance, id, gameType, bbsId) + NewLogUtils.logGameDetailTabClick(name ?: "", id, "评论") + } + INDEX_BBS -> { + NewLogUtils.logGameDetailTabClick(name ?: "", id, "论坛") + } } } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt index 8d89732d40..9e2f16731f 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt @@ -247,6 +247,7 @@ class DescAdapter( galleryRv.layoutManager = GridLayoutManager(mContext, 4) subjectAdapter = GameHorizontalAdapter(mContext, subjectEntity) subjectAdapter.gameName = mGameName + subjectAdapter.gameId = mViewModel.gameId ?: "" subjectAdapter.entrance = mEntrance subjectAdapter.exposureEventList = exposureEventList (galleryRv.itemAnimator as DefaultItemAnimator).supportsChangeAnimations = false @@ -258,6 +259,9 @@ class DescAdapter( } titleTv.text = "大家都在玩" moreTv.visibility = View.GONE + mViewModel.game?.let { + NewLogUtils.logGameDetailPopularView(it.name ?: "", it.id) + } } } @@ -287,6 +291,9 @@ class DescAdapter( MtaHelper.onEvent(MTA_KEY_GAME_NEW, "玩家评论_点击全部", mGameName) MtaHelper.onEvent(MTA_KEY_GAME_NEW, "玩家评论_更多按钮", mGameName) } + mViewModel.game?.let { + NewLogUtils.logGameDetailCommentView(it.name ?: "", it.id) + } } commentsAdapter.comments = comments @@ -446,6 +453,7 @@ class DescAdapter( contentTv.setExpandCallback { mExpandableTextExpandStatusSparseBooleanArray.put(holder.bindingAdapterPosition, true) MtaHelper.onEvent(MTA_KEY_GAME_NEW, "展开更新内容", mGameName) + NewLogUtils.logGameDetailUpdatedClick(mViewModel.game?.name ?: "", mViewModel.game?.id ?: "", "全部") } historyVersionTv.setOnClickListener { MtaHelper.onEvent("历史版本", "进入", mGameName) @@ -457,12 +465,14 @@ class DescAdapter( "游戏详情[${mGameName}]:更新内容" ) mContext.startActivity(intent) + NewLogUtils.logGameDetailUpdatedClick(mViewModel.game?.name ?: "", mViewModel.game?.id ?: "", "历史版本") } historyVersionTv.visibility = if (updateContent.historyApkStatus == "on" && updateContent.historyApkCount >= 1) View.VISIBLE else View.GONE contentTv.setExpandCallback { MtaHelper.onEvent(MTA_KEY_GAME_NEW, "展开更新内容", mGameName) } + NewLogUtils.logGameDetailUpdatedView(mViewModel.game?.name ?: "", mViewModel.game?.id ?: "") } } @@ -502,6 +512,9 @@ class DescAdapter( mNewGameDetailEntity?.me ) mContext.startActivity(intent) + mViewModel.game?.let { + NewLogUtils.logGameDetailOpenListClick(it.name ?: "", it.id, "更多") + } } if (server.showDes && server.des.isNotEmpty()) { tipsIv.visibility = View.VISIBLE @@ -510,6 +523,9 @@ class DescAdapter( DialogUtils.showKaifuRemindDialog(mContext, server.des, mGameName) } } + mViewModel.game?.let { + NewLogUtils.logGameDetailOpenListView(it.name ?: "", it.id) + } } } @@ -574,7 +590,7 @@ class DescAdapter( galleryRv.apply { background = R.drawable.background_shape_white_radius_5.toDrawable(mContext) layoutManager = LinearLayoutManager(mContext) - adapter = adapter ?: GameLibaoAdapter(mContext, libao, mGameName, mListListener) + adapter = adapter ?: GameLibaoAdapter(mContext, libao, mGameName, mViewModel.game?.id ?: "", mListListener) if (itemDecorationCount == 0) { val itemDecoration = HorizontalDividerItemDecoration.Builder(mContext) .size(0.5F.dip2px()) @@ -586,6 +602,9 @@ class DescAdapter( } titleTv.text = "游戏礼包" moreTv.visibility = View.GONE + mViewModel.game?.let { + NewLogUtils.logGameDetailGiftView(it.name ?: "", it.id) + } } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt index ce4a0d33aa..9cf2eb776b 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt @@ -15,6 +15,7 @@ import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.util.* import com.gh.common.util.DialogUtils +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.common.callback.ConfirmListener @@ -130,6 +131,7 @@ class DescCommentsAdapter( userIcon.setOnClickListener { DirectUtils.directToHomeActivity(mContext, commentData.user.id, mEntrance, "游戏详情-玩家评论") MtaHelper.onEvent("游戏详情_新", "玩家评论_点击用户头像", mViewModel.game?.name) + NewLogUtils.logGameDetailCommentClick(mViewModel.game?.name ?: "", mViewModel.game?.id?:"","个人主页") } userName.setOnClickListener { userIcon.performClick() @@ -146,6 +148,7 @@ class DescCommentsAdapter( val intent = RatingReplyActivity.getIntent(mContext, mViewModel.game!!, commentData, mEntrance, path) SyncDataBetweenPageHelper.startActivityForResult(mContext, intent, RATING_REPLY_REQUEST, position) MtaHelper.onEvent("游戏详情_新", "玩家评论_点击评论", mViewModel.game?.name) + NewLogUtils.logGameDetailCommentClick(mViewModel.game?.name ?: "", mViewModel.game?.id?:"","评论内容") } content.setExpandCallback { MtaHelper.onEvent("游戏详情_新", "玩家评论_点击全文", mViewModel.game?.name) @@ -205,6 +208,7 @@ class DescCommentsAdapter( holder.itemView.setOnClickListener { EventBus.getDefault().post(EBReuse(GameDetailFragment.SKIP_RATING)) MtaHelper.onEvent("游戏详情_新", "玩家评论_查看全部评论", gameName) + NewLogUtils.logGameDetailCommentClick(mViewModel.game?.name ?: "", mViewModel.game?.id?:"","查看全部评论") } } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt index 46e0867cba..8ea0d83c6b 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt @@ -18,7 +18,14 @@ import com.gh.gamecenter.databinding.ItemGameLibaoBinding import com.gh.gamecenter.entity.LibaoEntity import com.gh.gamecenter.manager.UserManager -class GameLibaoAdapter(val context: Context, val libaos: ArrayList, val gameName: String, val listListener: OnListClickListener?) : RecyclerView.Adapter() { +class GameLibaoAdapter( + val context: Context, + val libaos: ArrayList, + val gameName: String, + val gameId: String, + val listListener: OnListClickListener? +) : + RecyclerView.Adapter() { var mIsExpand = false private val mShowItemCount: Int = 3//最多展示多少个礼包 override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { @@ -125,7 +132,7 @@ class GameLibaoAdapter(val context: Context, val libaos: ArrayList, } // LibaoUtils.setLiBaoBtnStatusRound(holder.binding.receiveTv, libaoEntity,true, context) - LibaoUtils.initLibaoBtn(context, holder.binding.receiveTv, libaoEntity, false, null, true, "游戏详情"){ + LibaoUtils.initLibaoBtn(context, holder.binding.receiveTv, libaoEntity, false, null, true, "游戏详情") { notifyItemChanged(position) } if (!libaoEntity.packageName.isNullOrEmpty()) { @@ -135,6 +142,7 @@ class GameLibaoAdapter(val context: Context, val libaos: ArrayList, } holder.itemView.setOnClickListener { listListener?.onListClick(it, position, libaoEntity) + NewLogUtils.logGameDetailGiftClick(gameName, gameId, "礼包详情") } } is MoreViewHolder -> { @@ -143,7 +151,7 @@ class GameLibaoAdapter(val context: Context, val libaos: ArrayList, if (!mIsExpand) MtaHelper.onEvent("游戏详情_新", "游戏礼包_展开", gameName) mIsExpand = !mIsExpand notifyDataSetChanged() - + NewLogUtils.logGameDetailGiftClick(gameName, gameId, "更多") } } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventDialog.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventDialog.kt index 6cfa29d858..ebb64d8af8 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventDialog.kt @@ -4,11 +4,14 @@ import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle +import android.os.Handler +import android.os.Looper import android.view.LayoutInflater import android.view.Window import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.base.TrackableDialog import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.common.view.VerticalItemDecoration @@ -18,12 +21,18 @@ import com.gh.gamecenter.gamedetail.entity.BigEvent class GameBigEventDialog( context: Context, val gameName: String, + val gameId: String, val bigEvents: List, val mEntrance: String, mEvent: String, mKey: String, mValue: String ) : TrackableDialog(context, R.style.GhAlertDialog, mEvent, mKey, mValue) { + + private val mDelayLogRunnable = Runnable { + NewLogUtils.logGameDetailMajorEventView(gameName, gameId) + } + override fun onStart() { super.onStart() if (window != null) { @@ -50,11 +59,18 @@ class GameBigEventDialog( closeTv.setOnClickListener { dismiss() } + setOnCancelListener { + mHandler.removeCallbacks(mDelayLogRunnable) + } + + mHandler.postDelayed(mDelayLogRunnable, 3000) } companion object { - fun showGameBigEventDialog(context: Context, gameName: String, bigEvents: List, mEntrance: String) { - val dialog = GameBigEventDialog(context, gameName, bigEvents, mEntrance, "游戏大事件", "弹窗", gameName) + private val mHandler = Handler(Looper.getMainLooper()) + + fun showGameBigEventDialog(context: Context, gameName: String, gameId: String, bigEvents: List, mEntrance: String) { + val dialog = GameBigEventDialog(context, gameName, gameId, bigEvents, mEntrance, "游戏大事件", "弹窗", gameName) dialog.show() } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt index 2f8271af9e..c1915226ed 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt @@ -15,6 +15,7 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.gh.base.ToolBarActivity +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity import com.gh.gamecenter.common.utils.* @@ -33,6 +34,10 @@ class ServersCalendarActivity : ToolBarActivity() { private lateinit var mBinding: ActivityServersCalendarBinding private lateinit var mViewModel: ServersCalendarViewModel + private val mDelayLogRunnable = Runnable { + NewLogUtils.logGameDetailOpenCalendarView(mViewModel.game.name ?: "", mViewModel.game.id) + } + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) val serverCalendars = mViewModel.serverCalendarLiveData.value ?: return @@ -106,8 +111,9 @@ class ServersCalendarActivity : ToolBarActivity() { }) mViewModel.serversDetailLiveData.observeNonNull(this, callback = { showServersDetailDialog(it) + NewLogUtils.logGameDetailOpenCalendarClick(mViewModel.game.name ?: "", mViewModel.game.id) }) - mViewModel.serverCalendarLiveData.observe(this, androidx.lifecycle.Observer { + mViewModel.serverCalendarLiveData.observe(this) { if (it != null) { mViewModel.initDate() initView() @@ -115,17 +121,25 @@ class ServersCalendarActivity : ToolBarActivity() { mBinding.includeLoading.root.visibility = View.GONE mBinding.includeNoConnection.root.visibility = View.VISIBLE } - }) + } + mBaseHandler.postDelayed(mDelayLogRunnable, 3000) + } + + override fun onPause() { + super.onPause() + mBaseHandler.removeCallbacks(mDelayLogRunnable) } override fun onMenuItemClick(item: MenuItem?): Boolean { if (item?.itemId == R.id.menu_post) { MtaHelper.onEvent("开服日历表", "反馈", mViewModel.game.name) - SuggestionActivity.startSuggestionActivity(this, - SuggestType.normal, - "service", - StringUtils.buildString(mViewModel.game.name, "，", "开服信息问题反馈："), - SimpleGameEntity(id = mViewModel.game.id, name = mViewModel.game.name ?: "")) + SuggestionActivity.startSuggestionActivity( + this, + SuggestType.normal, + "service", + StringUtils.buildString(mViewModel.game.name, "，", "开服信息问题反馈："), + SimpleGameEntity(id = mViewModel.game.id, name = mViewModel.game.name ?: "") + ) } return super.onMenuItemClick(item) } @@ -304,10 +318,14 @@ class ServersCalendarActivity : ToolBarActivity() { feedback.setOnClickListener { if (mViewModel.meEntity?.isPartTime == true) { - startActivityForResult(AddKaiFuActivity.getIntent(this, + startActivityForResult( + AddKaiFuActivity.getIntent( + this, mViewModel.serverCalendarLiveData.value!!.last(), mViewModel.serverCalendarLiveData.value as ArrayList, - mViewModel.game.id, calendarEntity.server.first().getTime() * 1000), GAME_DETAIL_ADD_KAIFU_REQUEST) + mViewModel.game.id, calendarEntity.server.first().getTime() * 1000 + ), GAME_DETAIL_ADD_KAIFU_REQUEST + ) } else { val feedbackTime = if (calendarEntity.server.isNotEmpty()) { calendarEntity.server[0].getFormatTime("yyyy年M月d日") @@ -315,8 +333,9 @@ class ServersCalendarActivity : ToolBarActivity() { throwExceptionInDebug("server data is null") "" } - SuggestionActivity.startSuggestionActivity(this, SuggestType.normal, "service" - , StringUtils.buildString(mViewModel.game.name, "，", feedbackTime, "开服信息有误：")) + SuggestionActivity.startSuggestionActivity( + this, SuggestType.normal, "service", StringUtils.buildString(mViewModel.game.name, "，", feedbackTime, "开服信息有误：") + ) } } @@ -346,12 +365,15 @@ class ServersCalendarActivity : ToolBarActivity() { holder.binding.add.visibility = View.GONE } holder.binding.add.setOnClickListener { - startActivityForResult(AddKaiFuActivity.getIntent(this@ServersCalendarActivity, + startActivityForResult( + AddKaiFuActivity.getIntent( + this@ServersCalendarActivity, data, mViewModel.serverCalendarLiveData.value as ArrayList, mViewModel.game.id, - mViewModel.getSelectTime(calendarEntity.day, calendarEntity.month, calendarEntity.year)) - , ServersCalendarActivity.GAME_DETAIL_ADD_KAIFU_REQUEST) + mViewModel.getSelectTime(calendarEntity.day, calendarEntity.month, calendarEntity.year) + ), ServersCalendarActivity.GAME_DETAIL_ADD_KAIFU_REQUEST + ) } if (itemCount == position + 1) { holder.itemView.setPadding(0, 5F.dip2px(), 0, 19F.dip2px()) @@ -373,7 +395,7 @@ class ServersCalendarActivity : ToolBarActivity() { mBinding.dividerLine2.setBackgroundColor(R.color.background.toColor(this)) mBinding.year.setTextColor(R.color.text_title.toColor(this)) mBinding.recyclerView.recycledViewPool.clear() - mBinding.recyclerView.adapter?.notifyItemRangeChanged(0,mBinding.recyclerView.adapter?.itemCount?:0) + mBinding.recyclerView.adapter?.notifyItemRangeChanged(0, mBinding.recyclerView.adapter?.itemCount ?: 0) } companion object { 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 2d44076847..e6d1b846fe 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 @@ -6,6 +6,7 @@ import android.view.View import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.common.exposure.ExposureListener +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.view.CustomDividerItemDecoration import com.gh.download.DownloadManager import com.gh.gamecenter.R @@ -34,6 +35,10 @@ class HistoryApkListFragment : ListFragment private val mBinding by lazy { FragmentHistoryApkListBinding.inflate(layoutInflater) } + private val mDelayLogRunnable = Runnable { + NewLogUtils.logGameDetailHistoryVersionView(mViewModel?.game?.name ?: "", mViewModel?.game?.id ?: "") + } + private val dataWatcher = object : DataWatcher() { override fun onDataChanged(downloadEntity: DownloadEntity) { mAdapter?.notifyItemByDownload(downloadEntity) @@ -54,6 +59,7 @@ class HistoryApkListFragment : ListFragment mExposureListener = ExposureListener(this, mAdapter!!) mListRv.addOnScrollListener(mExposureListener) + mBaseHandler.postDelayed(mDelayLogRunnable, 3000) } override fun onResume() { @@ -65,6 +71,7 @@ class HistoryApkListFragment : ListFragment override fun onPause() { super.onPause() DownloadManager.getInstance().removeObserver(dataWatcher) + mBaseHandler.removeCallbacks(mDelayLogRunnable) } override fun getItemDecoration(): RecyclerView.ItemDecoration { diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.kt index 428ea948ff..17dc67595e 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.kt @@ -12,6 +12,7 @@ import com.gh.common.exposure.ExposureSource import com.gh.common.exposure.IExposable import com.gh.gamecenter.core.runOnIoThread import com.gh.common.util.* +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.AboutActivity import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R @@ -161,7 +162,7 @@ class HomeFragmentAdapter( .setMargins(0, marginTop, 0, 0) holder.bindSlideList(mDataList[position], mBasicExposureSource) } - is HomeRecommendItemViewHolder -> holder.bindRecommend(mDataList[position].recommends!!) + is HomeRecommendItemViewHolder -> holder.bindRecommend(mDataList[position], mBasicExposureSource) is HomeAmwayListViewHolder -> bindAmway(holder, position) is HomeGameItemViewHolder -> bindAttachGame(holder, position) is FooterViewHolder -> bindFooterView(holder) @@ -217,6 +218,7 @@ class HomeFragmentAdapter( "" ) mContext.startActivity(intent) + NewLogUtils.logHomeShareWallCardClick(amway.game.name ?: "", amway.game.id, "评论内容") } else { GameDetailActivity.startGameDetailActivity( mContext, @@ -224,7 +226,9 @@ class HomeFragmentAdapter( path, homeItemData.exposureEventList?.safelyGetInRelease(itemPosition) ) + NewLogUtils.logHomeShareWallCardClick(amway.game.name ?: "", amway.game.id, "游戏信息") } + } holder.bindAmwayList(amwayList, clickClosure) @@ -232,7 +236,7 @@ class HomeFragmentAdapter( private fun bindGameCollection(holder: HomeGameCollectionViewHolder, position: Int) { val homeItemData = mDataList[position] - val gameCollectionItemDataList = homeItemData.gameCollection?: listOf() + val gameCollectionItemDataList = homeItemData.gameCollection ?: listOf() val exposureList = arrayListOf() for (gameCollectionItemData in gameCollectionItemDataList) { @@ -241,11 +245,15 @@ class HomeFragmentAdapter( val gameCollectionSource = listOf(ExposureSource("游戏单", "${gameCollection?.title} + ${gameCollection?.id}")) val gameExposureList = arrayListOf() gameCollection?.games?.take(3)?.forEachIndexed { index, game -> - gameExposureList.add(ExposureEvent.createEventWithSourceConcat( - gameEntity = game.toGameEntity().apply { outerSequence = homeItemData.blockPosition; sequence = gameCollectionItemData.gameStartPosition + index + 1 }, + gameExposureList.add( + ExposureEvent.createEventWithSourceConcat( + gameEntity = game.toGameEntity().apply { + outerSequence = homeItemData.blockPosition; sequence = gameCollectionItemData.gameStartPosition + index + 1 + }, basicSource = mBasicExposureSource, source = gameCollectionSource - )) + ) + ) } gameCollectionItemData.exposureEventList = gameExposureList exposureList.addAll(gameExposureList) diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeRecommendItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/HomeRecommendItemViewHolder.kt index df96014b7a..057e41aaf2 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeRecommendItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeRecommendItemViewHolder.kt @@ -1,4 +1,7 @@ package com.gh.gamecenter.home + +import com.gh.common.exposure.ExposureEvent +import com.gh.common.exposure.ExposureSource import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.common.callback.OnViewClickListener import com.gh.common.util.* @@ -9,11 +12,13 @@ import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.core.utils.PageSwitchDataHelper import com.gh.gamecenter.databinding.HomeRecommendItemBinding +import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.HomeRecommend class HomeRecommendItemViewHolder(val binding: HomeRecommendItemBinding) : BaseRecyclerViewHolder(binding.root) { - fun bindRecommend(recommends: List) { + fun bindRecommend(itemData: HomeItemData, basicExposureSource: List) { + val recommends = itemData.recommends!! val clickListener = OnViewClickListener { _, position -> // 很奇怪这里居然抛出 IndexOutOfBoundsException 异常(有可能数据改变了,页面还没刷新导致) if (position >= recommends.size) return@OnViewClickListener @@ -37,6 +42,19 @@ class HomeRecommendItemViewHolder(val binding: HomeRecommendItemBinding) : BaseR "新首页-推荐入口", ) } + recommends.forEachIndexed { index, homeRecommend -> + val exposureEvent = ExposureEvent.createEventWithSourceConcat( + gameEntity = GameEntity().also { it.sequence = index }, + basicSource = basicExposureSource, + source = listOf() + ) + exposureEvent.payload.controlType = "推荐入口" + exposureEvent.payload.controlName = homeRecommend.name + exposureEvent.payload.controlLinkName = homeRecommend.linkText + exposureEvent.payload.controlLinkType = homeRecommend.linkType + itemData.exposureEventList?.add(exposureEvent) + } + binding.run { containerOne.goneIf(recommends.isEmpty()) containerTwo.goneIf(recommends.size < 2) diff --git a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt index de0097f2f0..5c5aa5b708 100644 --- a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt +++ b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt @@ -48,6 +48,7 @@ import com.gh.gamecenter.game.vertical.OnPagerSnapScrollListener import com.gh.gamecenter.subject.SubjectActivity import com.halo.assistant.fragment.game.GamePluginAdapter import com.halo.assistant.fragment.game.GamePluginViewHolder +import org.w3c.dom.Text import java.util.* // 产品没定义的数据统计会用[首页]作为默认值，不管了 bite me @@ -217,6 +218,11 @@ class LegacyHomeFragmentAdapterAssistant( } else { DirectUtils.directToLinkPage(mContext, LinkEntity(link = gameEntity.link, type = gameEntity.type), "(首页游戏)", "游戏-专题") } + NewLogUtils.logColumnCategoryHomeContentClick( + gameEntity.name ?: "", gameEntity.link ?: "", + columnCollection.name ?: "", columnCollection.id ?: "", "新首页", + "" + ) } holder.bindColumnCollection(columnCollection, clickClosure) @@ -239,6 +245,10 @@ class LegacyHomeFragmentAdapterAssistant( } else { DirectUtils.directToLinkPage(mContext, LinkEntity(link = data.link, type = data.type), "(首页游戏)", "游戏-专题") } + NewLogUtils.logColumnPictureClick( + "大图", columnCollection.name ?: "", columnCollection.id ?: "", "游戏专题", + columnCollection.name ?: "", "新首页", "" + ) } } else { holder.binding.columnCollectionList.doOnScrolledSpecificDistance(distanceX = DisplayUtils.dip2px(24f), singleTimeEvent = true) { @@ -465,6 +475,10 @@ class LegacyHomeFragmentAdapterAssistant( linkEntity.text = entity.text setPageSwitchData() DirectUtils.directToLinkPage(mContext, linkEntity, "(游戏-专题:$name-大图)", "首页游戏") + NewLogUtils.logColumnPictureClick( + "大图", entity.name ?: "", entity.id ?: "", "游戏专题", + entity.name ?: "", "新首页", "" + ) } val padding = mContext.resources.getDimensionPixelSize(R.dimen.home_item_padding) @@ -536,8 +550,10 @@ class LegacyHomeFragmentAdapterAssistant( ) } else { GameDetailActivity.startGameDetailActivity( - mContext, gameEntity, - StringUtils.buildString("(游戏-专题:", subjectData.name, "-列表[", (subjectData.position).toString(), "])"), traceEvent = gameEntity.exposureEvent + mContext, + gameEntity, + StringUtils.buildString("(游戏-专题:", subjectData.name, "-列表[", (subjectData.position).toString(), "])"), + traceEvent = gameEntity.exposureEvent ) } } @@ -552,7 +568,11 @@ class LegacyHomeFragmentAdapterAssistant( holder.bindHead(column!!) holder.binding.headMore.setOnClickListener { - it as TextView + val buttonType = when (column.home) { + "change" -> "换一批" + "more" -> "更多" + else -> "全部" + } if ("change" == column.home) { MtaHelper.onEvent("游戏专题", "新首页专题点击", "内容" + item.blockPosition + "_换一批") holder.binding.headPb.visibility = View.VISIBLE @@ -570,9 +590,13 @@ class LegacyHomeFragmentAdapterAssistant( if (column.type == "column_collection") { MtaHelper.onEvent("游戏专题合集", "新首页合辑点击", "内容" + item.blockPosition + "_全部") DirectUtils.directToColumnCollection(mContext, column.id!!, -1, "(游戏-专题:" + column.name + "-全部)") + NewLogUtils.logColumnCategoryHomeButtonClick( + buttonType, column.name ?: "", column.id ?: "", "首页", "" + ) } else if (column.type == "top_game_comment") { MtaHelper.onEvent("安利墙", "进入", "首页查看全部") DirectUtils.directToAmway(mContext, null, "(游戏-专题:" + column.name + "-全部)", "") + NewLogUtils.logHomeShareWallButtonClick("右上角") } else if (column.type == "common_collection") { mContext.startActivity( CommonCollectionDetailActivity.getIntent( @@ -584,6 +608,7 @@ class LegacyHomeFragmentAdapterAssistant( ) ) NewLogUtils.logAccessToCommonCollectionDetail(column.id ?: "", column.name ?: "", "首页内容列表") + NewLogUtils.logCommonCategoryHomeButtonClick(buttonType, column.name ?: "", column.id ?: "", "新首页") } else if (column.type == "game_list_collection") { DirectUtils.directToGameCollectionSquare(mContext, "首页内容列表", column.name ?: "") } else { @@ -608,9 +633,13 @@ class LegacyHomeFragmentAdapterAssistant( ) } MtaHelper.onEvent("游戏专题", "新首页专题点击", "内容" + item.blockPosition + "_全部") + val moreLink = column.moreLink + NewLogUtils.logColumnListClickButton( + buttonType, column.name ?: "", column.id ?: "", moreLink?.type ?: "", + moreLink?.name ?: "", "新首页", "" + ) } } - NewLogUtils.logSubjectTopTabClick(it.text.toString(), column.name, column.moreLink) } } @@ -720,6 +749,10 @@ class LegacyHomeFragmentAdapterAssistant( holder.binding.root.context, item.gallery?.id ?: "", item.gallery?.name, "(游戏-专题)" ) + NewLogUtils.logColumnPictureClick( + "图集", item.gallery?.name ?: "", item.gallery?.id ?: "", "游戏专题", + item.gallery?.name ?: "", "新首页", "" + ) } } @@ -742,6 +775,14 @@ class LegacyHomeFragmentAdapterAssistant( linkEntity.text ?: "", sequence + 1 ) + NewLogUtils.logCommonCategoryHomeContentClick( + contentEntity.title, + linkEntity.type ?: "", + linkEntity.text ?: "", + commonCollection?.name ?: "", + commonCollection?.id ?: "", + "新首页" + ) } holder.bindCommonLinkCollection( diff --git a/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayAdapter.kt index 22b39a3283..22a82e9b25 100644 --- a/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayAdapter.kt @@ -70,6 +70,7 @@ class HomeAmwayAdapter( all.setOnClickListener { DirectUtils.directToAmway(mContext, null, "(游戏-专题:安利墙-全部)", "") + NewLogUtils.logHomeShareWallButtonClick("卡片末尾") } amwayBackground.setOnClickListener { itemClick.invoke(it, position, amway) diff --git a/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListAdapter.kt index 8e9261e6f5..bbc49e1612 100644 --- a/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListAdapter.kt @@ -25,12 +25,14 @@ import com.lightgame.adapter.BaseRecyclerAdapter import com.lightgame.download.DownloadEntity import java.lang.ref.WeakReference -class HomeSlideListAdapter(context: Context, - var itemData: HomeItemData, - val layoutManager: LinearLayoutManager, - val snapHelper: PagerSnapHelper, - val recyclerView: RecyclerView, - val basicExposureSource: List) : BaseRecyclerAdapter(context) { +class HomeSlideListAdapter( + context: Context, + var itemData: HomeItemData, + val layoutManager: LinearLayoutManager, + val snapHelper: PagerSnapHelper, + val recyclerView: RecyclerView, + val basicExposureSource: List +) : BaseRecyclerAdapter(context) { private var mSlideList: List = itemData.slides ?: arrayListOf() private val mLooperHandle = LooperHandle(this) @@ -71,6 +73,17 @@ class HomeSlideListAdapter(context: Context, ) itemData.exposureEventList?.add(exposureEvent!!) } + } else { + exposureEvent = ExposureEvent.createEventWithSourceConcat( + gameEntity = homeSlide.linkGame?.apply { sequence = actualPosition }, + basicSource = basicExposureSource, + source = listOf() + ) + exposureEvent?.payload?.controlType = "轮播图" + exposureEvent?.payload?.controlName = homeSlide.title + exposureEvent?.payload?.controlLinkName = homeSlide.linkText + exposureEvent?.payload?.controlLinkType = homeSlide.linkType + itemData.exposureEventList?.add(exposureEvent!!) } holder.bindSlideListItem(homeSlide) @@ -89,11 +102,14 @@ class HomeSlideListAdapter(context: Context, ) DataLogUtils.uploadLunbotuLog(mContext, homeSlide.linkType, homeSlide.linkText, homeSlide.title, actualPositionString, "新首页") - DirectUtils.directToLinkPage(mContext, homeSlide.transformLinkEntity(), "", "新首页-轮播图[${homeSlide.linkText}<-||->${homeSlide.title}=${homeSlide.linkType}=$actualPositionString]", - exposureEvent, - unknownCallback = { - mContext.startActivity(AboutActivity.getIntent(mContext, true)) - }) + DirectUtils.directToLinkPage(mContext, + homeSlide.transformLinkEntity(), + "", + "新首页-轮播图[${homeSlide.linkText}<-||->${homeSlide.title}=${homeSlide.linkType}=$actualPositionString]", + exposureEvent, + unknownCallback = { + mContext.startActivity(AboutActivity.getIntent(mContext, true)) + }) } holder.binding.includeGame.root.setOnClickListener { @@ -101,7 +117,12 @@ class HomeSlideListAdapter(context: Context, val linkGame = homeSlide.linkGame DataLogUtils.uploadLunbotuLog(mContext, homeSlide.linkType, homeSlide.linkText, homeSlide.title, actualPositionString, "新首页") if (linkGame != null) { - GameDetailActivity.startGameDetailActivity(mContext, linkGame.id, "(新首页-轮播图[${homeSlide.linkText}<-||->${homeSlide.title}=${homeSlide.linkType}=$actualPositionString])", exposureEvent) + GameDetailActivity.startGameDetailActivity( + mContext, + linkGame.id, + "(新首页-轮播图[${homeSlide.linkText}<-||->${homeSlide.title}=${homeSlide.linkType}=$actualPositionString])", + exposureEvent + ) } } BindingAdapters.setGameTags(holder.binding.includeGame.gameTags, homeSlide.linkGame?.tagStyle, 3) diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt index 1e84dcfd02..23a4a35fcf 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt @@ -13,6 +13,7 @@ import androidx.appcompat.app.AppCompatDelegate import androidx.recyclerview.widget.RecyclerView import com.facebook.drawee.view.SimpleDraweeView import com.gh.common.util.* +import com.gh.common.util.NewLogUtils import com.gh.gamecenter.* import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.utils.* @@ -123,6 +124,7 @@ class PersonalFunctionAdapter(val context: Context, val groupName: String, var m } MtaHelper.onEvent("我的光环_新", "功能入口", "$groupName+${linkEntity.name}") + NewLogUtils.logHaloSelfClick(groupName, linkEntity.name ?: "", linkEntity.type ?: "", linkEntity.link ?: "") when (linkEntity.type) { "我的游戏" -> { if (UserManager.getInstance().isLoggedIn) { @@ -160,8 +162,10 @@ class PersonalFunctionAdapter(val context: Context, val groupName: String, var m if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH || BuildConfig.DEBUG) { context.startActivity(VideoManagerActivity.getIntent(context, "", "我的光环-视频投稿")) } else { - DialogHelper.showDialog(context, "提示", - "抱歉，您当前系统版本过低，暂不支持视频功能", "我知道了", "") + DialogHelper.showDialog( + context, "提示", + "抱歉，您当前系统版本过低，暂不支持视频功能", "我知道了", "" + ) } MtaHelper.onEvent("我的光环", "视频投稿") } else { @@ -227,7 +231,9 @@ class PersonalFunctionAdapter(val context: Context, val groupName: String, var m if (!checkPrivacyIsSame()) { SPUtils.setString( Constants.SP_PRIVACY_SETTING_MD5, SPUtils.getString( - Constants.SP_PRIVACY_CURRENT_MD5)) + Constants.SP_PRIVACY_CURRENT_MD5 + ) + ) notifyDataSetChanged() } MtaHelper.onEvent("我的光环", "设置图标") diff --git a/module_common/src/main/java/com/gh/gamecenter/common/entity/ExposureEntity.kt b/module_common/src/main/java/com/gh/gamecenter/common/entity/ExposureEntity.kt index 1876d78574..20545fba69 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/entity/ExposureEntity.kt +++ b/module_common/src/main/java/com/gh/gamecenter/common/entity/ExposureEntity.kt @@ -64,7 +64,19 @@ data class ExposureEntity( @SerializedName("dialog_id") var welcomeDialogId: String? = null, @SerializedName("link_title") - var welcomeDialogLinkTitle: String? = null + var welcomeDialogLinkTitle: String? = null, + + //v5.10 补充 + @SerializedName("control_type") + var controlType: String? = null, + @SerializedName("control_name") + var controlName: String? = null, + //跳转链接类型 如：游戏专题 + @SerializedName("control_link_type") + var controlLinkType: String? = null, + //跳转链接标题 如：热门好游 + @SerializedName("control_link_name") + var controlLinkName: String? = null, ) : Parcelable { fun setContainerInfo(id: String?, type: String?) { From 375b1e4b4ae2b40fc3054aff55d853507d58bbc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Thu, 19 May 2022 16:37:03 +0800 Subject: [PATCH 44/52] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.10.0=E3=80=91=E6=9B=B4=E6=96=B0=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20https://git.shanqu.cc/pm/halo-app-issues/-?= =?UTF-8?q?/issues/1838?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/common/util/DirectUtils.kt | 6 +++--- .../com/gh/gamecenter/fragment/MainWrapperFragment.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 b351712304..da338ec8c7 100644 --- a/app/src/main/java/com/gh/common/util/DirectUtils.kt +++ b/app/src/main/java/com/gh/common/util/DirectUtils.kt @@ -153,7 +153,7 @@ object DirectUtils { "category_v2", "common_collection", "game_list", - "game_list_detail" + "game_list_square" ) fun directToLinkPage( @@ -364,9 +364,9 @@ object DirectUtils { //"h5_game_center" -> directLetoGameCenter(context) - "game_list" -> directToGameCollectionSquare(context, entrance, "", "", "") + "game_list_square" -> directToGameCollectionSquare(context, entrance, "", "", "") - "game_list_detail" -> directToGameCollectionDetail(context, linkEntity.link ?: "", entrance) + "game_list" -> directToGameCollectionDetail(context, linkEntity.link ?: "", entrance) "" -> { // do nothing diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java index d52e7eb661..7592e7c68c 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java @@ -192,7 +192,7 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem homeArgs.putString(EntranceConsts.KEY_COLLECTION_ID, entity.getLink()); homeArgs.putString(EntranceConsts.KEY_COLUMNNAME, entity.getText()); break; - case "game_list": + case "game_list_square": className = GameCollectionSquareFragment.class.getName(); homeArgs.putString(EntranceConsts.KEY_ENTRANCE, "游戏库"); homeArgs.putInt(EntranceConsts.KEY_TAB_INDEX, 0); From aa580c27cc5e5dfd5b9a509ef6393275aed21e6c Mon Sep 17 00:00:00 2001 From: leafwai Date: Thu, 19 May 2022 18:10:00 +0800 Subject: [PATCH 45/52] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.10.0=E3=80=91=E6=B8=B8=E6=88=8F=E5=8D=95=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=EF=BC=9A=E6=B8=B8=E6=88=8F=E5=8D=95=E5=BE=81=E9=9B=86?= =?UTF-8?q?=E8=AE=A1=E5=88=92vol.1=EF=BC=88=E5=A2=9E=E5=8A=A0=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=88=9B=E5=BB=BA=E6=B8=B8=E6=88=8F=E5=8D=95=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E9=87=8D=E5=A4=8D=E6=B8=B8=E6=88=8F=E7=9A=84=E5=88=A4?= =?UTF-8?q?=E6=96=AD=EF=BC=89https://git.shanqu.cc/pm/halo-app-issues/-/is?= =?UTF-8?q?sues/1779?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../publish/GameCollectionEditActivity.kt | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt index dd6d739f6b..8e24c80a07 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt @@ -43,6 +43,7 @@ class GameCollectionEditActivity : ToolBarActivity() { private var mPatchCommitCount = 0 private var mActivityId = "" private var mActivityName = "" + private var mGameEntity: GameEntity? = null override fun getLayoutId(): Int = R.layout.activity_game_collection_edit @@ -70,14 +71,17 @@ class GameCollectionEditActivity : ToolBarActivity() { val gameId = intent.getStringExtra(EntranceConsts.KEY_GAMEID) ?: "" if (gameId.isNotEmpty()) { mViewModel.getGameDigest(gameId) { - mChooseGamesViewModel.chooseGamesLiveData.run { - if (it != null) { - val gamesList = ArrayList() - if (!value.isNullOrEmpty()) { - gamesList.addAll(value!!) + if (it != null) { + val gamesList = ArrayList() + val simpleGames = mViewModel.gameCollectionPatch?.games?.map { game -> game.toGameEntity() } + if (!simpleGames.isNullOrEmpty()) { + simpleGames.map { gameEntity -> + if (gameEntity.id == gameId) return@getGameDigest } - postValue(gamesList.apply { add(it) }) + gamesList.addAll(simpleGames) } + mGameEntity = it + mChooseGamesViewModel.chooseGamesLiveData.postValue(gamesList.apply { add(it) }) } } } @@ -248,7 +252,11 @@ class GameCollectionEditActivity : ToolBarActivity() { mViewModel.tags = tags ?: arrayListOf() initTagsUI(mViewModel.tags) val simpleGames = games?.map { game -> game.toGameEntity() } - mChooseGamesViewModel.chooseGamesLiveData.postValue(ArrayList(simpleGames)) + mChooseGamesViewModel.chooseGamesLiveData.postValue(ArrayList(simpleGames).apply { + if (mGameEntity != null) { + add(mGameEntity) + } + }) } if (!it.activityTags.isNullOrEmpty()) { if (mActivityId.isEmpty() && mActivityName.isEmpty()) { From dec1deada91369372a6e8d3d1d78217b55b414da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Thu, 19 May 2022 18:27:47 +0800 Subject: [PATCH 46/52] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.10.0=E3=80=91=E6=95=B0=E6=8D=AE=E5=9F=8B=E7=82=B9?= =?UTF-8?q?=E9=9C=80=E6=B1=82=20https://git.shanqu.cc/pm/halo-app-issues/-?= =?UTF-8?q?/issues/1835?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/util/NewLogUtils.kt | 33 +++++++++++-------- .../fragment/MainWrapperFragment.java | 11 ++++--- .../gh/gamecenter/game/GameFragmentAdapter.kt | 3 +- .../detail/CommonCollectionDetailAdapter.kt | 1 + .../game/horizontal/GameHorizontalAdapter.kt | 2 +- .../LegacyHomeFragmentAdapterAssistant.kt | 5 +-- .../personal/PersonalFunctionAdapter.kt | 2 +- 7 files changed, 34 insertions(+), 23 deletions(-) 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 9ea798ede8..12b4f2e320 100644 --- a/app/src/main/java/com/gh/common/util/NewLogUtils.kt +++ b/app/src/main/java/com/gh/common/util/NewLogUtils.kt @@ -1898,7 +1898,7 @@ object NewLogUtils { columnName: String, columnId: String, linkType: String, - linkTitle: String, + linkText: String, location: String, blockName: String ) { @@ -1907,11 +1907,12 @@ object NewLogUtils { "display_type" to displayType "column_name" to columnName "column_id" to columnId + "link_id" to columnId if (linkType.isNotEmpty()) { "link_type" to linkType } - if (linkTitle.isNotEmpty()) { - "link_title" to linkTitle + if (linkText.isNotEmpty()) { + "link_text" to linkText } "location" to location if (blockName.isNotEmpty()) { @@ -2020,7 +2021,8 @@ object NewLogUtils { fun logCommonCategoryHomeContentClick( title: String, linkType: String, - linkTitle: String, + linkId: String, + linkText: String, categoryName: String, categoryId: String, location: String, @@ -2030,7 +2032,8 @@ object NewLogUtils { "event" to "common_category_home_content_click" "title" to title "link_type" to linkType - "link_title" to linkTitle + "link_text" to linkText + "link_id" to linkId "category_name" to categoryName "category_id" to categoryId "location" to location @@ -2048,6 +2051,7 @@ object NewLogUtils { fun logCommonCategoryDetailContentClick( title: String, linkType: String, + linkId: String, linkTitle: String, categoryName: String, categoryId: String, @@ -2057,6 +2061,7 @@ object NewLogUtils { "title" to title "link_type" to linkType "link_title" to linkTitle + "link_id" to linkId "category_name" to categoryName "category_id" to categoryId "timestamp" to System.currentTimeMillis() / 1000 @@ -2107,16 +2112,17 @@ object NewLogUtils { //点击底部导航栏 @JvmStatic - fun logBottomNavigationClick(navigationName: String, linkType: String, linkTitle: String) { + fun logBottomNavigationClick(navigationName: String, linkType: String, linkText: String, linkId: String = "") { val json = json { "event" to "bottom_navigation_click" "navigation_name" to navigationName if (linkType.isNotEmpty()) { "link_type" to linkType } - if (linkTitle.isNotEmpty()) { - "link_title" to linkTitle + if (linkText.isNotEmpty()) { + "link_text" to linkText } + "link_id" to linkId "timestamp" to System.currentTimeMillis() / 1000 parseAndPutMeta().invoke(this) } @@ -2325,14 +2331,14 @@ object NewLogUtils { //游戏详情点击大家都在玩 @JvmStatic - fun logGameDetailPopularClick(gameName: String, gameId: String, linkType: String, linkTitle: String, linkDesc: String) { + fun logGameDetailPopularClick(gameName: String, gameId: String, linkType: String, linkText: String) { val json = json { "event" to "game_detail_popular_click" "game_name" to gameName "game_id" to gameId + "link_id" to gameId "link_type" to linkType - "link_title" to linkTitle - "link_desc" to linkDesc + "link_text" to linkText "timestamp" to System.currentTimeMillis() / 1000 parseAndPutMeta().invoke(this) } @@ -2341,13 +2347,14 @@ object NewLogUtils { //我的光环点击事件 @JvmStatic - fun logHaloSelfClick(profile: String, entrance: String, linkType: String, linkDesc: String) { + fun logHaloSelfClick(profile: String, entrance: String, linkType: String, linkId: String, linkText: String) { val json = json { "event" to "halo_self_click" "profile" to profile "entrance" to entrance "link_type" to linkType - "link_desc" to linkDesc + "link_id" to linkId + "link_text" to linkText "timestamp" to System.currentTimeMillis() / 1000 parseAndPutMeta().invoke(this) } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java index 7592e7c68c..fad1421102 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java @@ -527,7 +527,7 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem switch (index) { case INDEX_HOME: tabText = "首页"; - NewLogUtils.logBottomNavigationClick("首页", "", ""); + NewLogUtils.logBottomNavigationClick("首页", "", "", ""); break; case INDEX_GAME: tabText = "游戏库"; @@ -535,22 +535,23 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem if (entity == null) { entity = HomeBottomBarHelper.getDefaultGameBarData(); } - NewLogUtils.logBottomNavigationClick("游戏库", entity.getType() != null ? entity.getType() : "", entity.getText() != null ? entity.getText() : ""); + NewLogUtils.logBottomNavigationClick("游戏库", entity.getType() != null ? entity.getType() : "", + entity.getText() != null ? entity.getText() : "", entity.getLink() != null ? entity.getLink() : ""); break; case INDEX_BBS: tabText = "论坛"; LogUtils.uploadAccessBbsTab(); - NewLogUtils.logBottomNavigationClick("社区", "", ""); + NewLogUtils.logBottomNavigationClick("社区", "", "", ""); break; case INDEX_VIDEO: tabText = "视频"; DisplayUtils.setLightStatusBar(requireActivity(), false); - NewLogUtils.logBottomNavigationClick("视频", "", ""); + NewLogUtils.logBottomNavigationClick("视频", "", "", ""); break; case INDEX_PERSONAL: tabText = "我的光环"; IntegralLogHelper.INSTANCE.log("view_me", "我的光环"); - NewLogUtils.logBottomNavigationClick("我的光环", "", ""); + NewLogUtils.logBottomNavigationClick("我的光环", "", "", ""); break; } diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt index 4c2d96f95c..9fecaa1372 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt @@ -256,7 +256,7 @@ class GameFragmentAdapter( ?: "", gallery.name, "(游戏-专题)" ) NewLogUtils.logColumnPictureClick( - "显示图集", gallery.name ?: "", gallery.id ?: "", "游戏专题", + "显示图集", gallery.name ?: "", gallery.id ?: "", "column", gallery.name ?: "", "板块", mViewModel.blockData?.name ?: "" ) } @@ -349,6 +349,7 @@ class GameFragmentAdapter( NewLogUtils.logCommonCategoryHomeContentClick( contentEntity.title, linkEntity.type ?: "", + linkEntity.link ?: "", linkEntity.text ?: "", commonLinkCollection.name ?: "", commonLinkCollection.id ?: "", diff --git a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailAdapter.kt index 3c8f59cda3..4fbead6f6a 100644 --- a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailAdapter.kt @@ -66,6 +66,7 @@ class CommonCollectionDetailAdapter( NewLogUtils.logCommonCategoryDetailContentClick( contentEntity?.title ?: "", linkEntity.type ?: "", + linkEntity.link ?: "", linkEntity.text ?: "", commonLinkCollection?.name ?: "", commonLinkCollection?.id ?: "" diff --git a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt index 0512356e2a..8b46636ea6 100644 --- a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt @@ -86,7 +86,7 @@ class GameHorizontalAdapter( traceEvent = exposureEventList!![position] ) } - NewLogUtils.logGameDetailPopularClick(gameName, gameId, "游戏", gameEntity.name ?: "", gameEntity.id) + NewLogUtils.logGameDetailPopularClick(gameName, gameId, "game", gameEntity.name ?: "") } } diff --git a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt index 5c5aa5b708..6d45c4d850 100644 --- a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt +++ b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt @@ -246,7 +246,7 @@ class LegacyHomeFragmentAdapterAssistant( DirectUtils.directToLinkPage(mContext, LinkEntity(link = data.link, type = data.type), "(首页游戏)", "游戏-专题") } NewLogUtils.logColumnPictureClick( - "大图", columnCollection.name ?: "", columnCollection.id ?: "", "游戏专题", + "大图", columnCollection.name ?: "", columnCollection.id ?: "","游戏专题", columnCollection.name ?: "", "新首页", "" ) } @@ -476,7 +476,7 @@ class LegacyHomeFragmentAdapterAssistant( setPageSwitchData() DirectUtils.directToLinkPage(mContext, linkEntity, "(游戏-专题:$name-大图)", "首页游戏") NewLogUtils.logColumnPictureClick( - "大图", entity.name ?: "", entity.id ?: "", "游戏专题", + "大图", entity.name ?: "", entity.id, "游戏专题", entity.name ?: "", "新首页", "" ) } @@ -778,6 +778,7 @@ class LegacyHomeFragmentAdapterAssistant( NewLogUtils.logCommonCategoryHomeContentClick( contentEntity.title, linkEntity.type ?: "", + linkEntity.link ?: "", linkEntity.text ?: "", commonCollection?.name ?: "", commonCollection?.id ?: "", diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt index 23a4a35fcf..593bd0a49b 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt @@ -124,7 +124,7 @@ class PersonalFunctionAdapter(val context: Context, val groupName: String, var m } MtaHelper.onEvent("我的光环_新", "功能入口", "$groupName+${linkEntity.name}") - NewLogUtils.logHaloSelfClick(groupName, linkEntity.name ?: "", linkEntity.type ?: "", linkEntity.link ?: "") + NewLogUtils.logHaloSelfClick(groupName, linkEntity.name ?: "", linkEntity.type ?: "", linkEntity.link ?: "",linkEntity.text?:"") when (linkEntity.type) { "我的游戏" -> { if (UserManager.getInstance().isLoggedIn) { From b815a177475b6ca5a2dad5437ecb279eacb4f5d9 Mon Sep 17 00:00:00 2001 From: lyr Date: Thu, 19 May 2022 18:49:50 +0800 Subject: [PATCH 47/52] =?UTF-8?q?1.=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8Bv5.10.0=E3=80=91=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96(=E5=AE=8C=E6=88=90UI?= =?UTF-8?q?=E5=92=8C=E9=83=A8=E5=88=86=E8=B7=B3=E8=BD=AC)=20https://git.sh?= =?UTF-8?q?anqu.cc/pm/halo-app-issues/-/issues/1830=202.=E3=80=90=E5=85=89?= =?UTF-8?q?=E7=8E=AF=E5=8A=A9=E6=89=8Bv5.10.0=E3=80=91=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=B8=AD=E5=BF=83-=E6=96=B0=E5=A2=9E=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5(=E5=A4=A7=E8=87=B4=E5=AE=8C?= =?UTF-8?q?=E6=88=90)=20https://git.shanqu.cc/pm/halo-app-issues/-/issues/?= =?UTF-8?q?1829?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 + .../java/com/gh/base/ToolBarActivity.java | 4 + .../java/com/gh/common/util/CommentHelper.kt | 31 ++- .../java/com/gh/common/util/DirectUtils.kt | 3 +- .../java/com/gh/gamecenter/SkipActivity.java | 2 +- .../category2/SubCategoryAdapter.kt | 4 +- .../com/gh/gamecenter/entity/CommentEntity.kt | 4 +- .../detail/GameCollectionDetailViewModel.kt | 8 +- ...eCollectionCommentConversationViewModel.kt | 6 +- .../gh/gamecenter/message/MessageAdapter.java | 6 - .../gamecenter/message/MessageFragment.java | 11 ++ .../message/MessageItemViewHolder.java | 151 +++++++++------ .../article/detail/ArticleDetailActivity.kt | 22 +++ .../article/detail/ArticleDetailFragment.kt | 3 +- .../article/detail/ArticleDetailViewModel.kt | 19 +- .../comment/ArticleDetailCommentViewModel.kt | 2 +- .../qa/comment/NewCommentDetailActivity.kt | 45 +++++ .../qa/comment/NewCommentFragment.kt | 2 +- .../qa/comment/NewCommentViewModel.kt | 2 +- .../qa/comment/base/BaseCommentAdapter.kt | 59 ++++-- .../qa/comment/base/BaseCommentFragment.kt | 11 +- .../qa/comment/base/BaseCommentViewModel.kt | 21 +- .../CommentConversationAdapter.kt | 74 +++++++- .../CommentConversationFragment.kt | 179 ++++++++++++------ .../CommentConversationViewModel.kt | 106 ++++++----- .../newdetail/NewQuestionDetailActivity.kt | 18 ++ .../newdetail/NewQuestionDetailFragment.kt | 3 +- .../newdetail/NewQuestionDetailViewModel.kt | 10 +- .../video/detail/ForumVideoDetailActivity.kt | 20 +- .../video/detail/ForumVideoDetailFragment.kt | 8 +- .../detail/comment/VideoCommentFragment.kt | 8 +- .../detail/comment/VideoCommentViewModel.kt | 27 ++- .../retrofit/service/ApiService.java | 23 ++- .../ic_comment_original_arrow.webp | Bin 0 -> 708 bytes .../res/drawable/bg_category_unselect.xml | 6 - ...y_reset.xml => bg_shape_f2_radius_999.xml} | 2 +- .../res/drawable/bg_shape_f8_radius_8.xml | 2 +- .../drawable/shape_message_unread_hint.xml | 11 ++ .../fragment_article_detail_comment.xml | 8 +- app/src/main/res/layout/fragment_category.xml | 2 +- .../layout/item_article_detail_comment.xml | 140 ++++++++++---- app/src/main/res/layout/message_item.xml | 136 ++++++------- app/src/main/res/layout/message_item_top.xml | 29 ++- .../piece_article_detail_comment_filter.xml | 2 +- app/src/main/res/layout/sub_category_item.xml | 2 +- app/src/main/res/menu/menu_comment_detail.xml | 17 ++ .../common/constant/EntranceConsts.java | 1 + .../src/main/res/values-night/colors.xml | 9 +- module_common/src/main/res/values/colors.xml | 10 +- 49 files changed, 885 insertions(+), 388 deletions(-) create mode 100644 app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentDetailActivity.kt create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_comment_original_arrow.webp delete mode 100644 app/src/main/res/drawable/bg_category_unselect.xml rename app/src/main/res/drawable/{bg_category_reset.xml => bg_shape_f2_radius_999.xml} (74%) create mode 100644 app/src/main/res/drawable/shape_message_unread_hint.xml create mode 100644 app/src/main/res/menu/menu_comment_detail.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 09456e3115..47a1f41388 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -735,6 +735,10 @@ android:name="com.gh.gamecenter.qa.subject.CommunitySubjectActivity" android:screenOrientation="portrait" /> + + Permissions.GUEST && !commentEntity.choiceness ) { dialogOptions.add("加精选") } - if (questionId != null && + if (!isOnlyShowCopyAndReport && questionId != null && commentEntity.me?.isModerator == true && (commentEntity.me?.moderatorPermissions?.cancelChoicenessAnswer ?: Permissions.GUEST) > Permissions.GUEST && @@ -173,11 +196,11 @@ object CommentHelper { ) { dialogOptions.add("取消精选") } - if (commentEntity.user.id == UserManager.getInstance().userId || commentEntity.me?.isModerator == true || commentEntity.me?.isContentAuthor == true) { + if (!isOnlyShowCopyAndReport && commentEntity.user.id == UserManager.getInstance().userId || commentEntity.me?.isModerator == true || commentEntity.me?.isContentAuthor == true) { dialogOptions.add("删除评论") } - if (commentEntity.parentUser != null && showConversation) { + if (!isOnlyShowCopyAndReport && commentEntity.parentUser != null && showConversation) { dialogOptions.add("查看对话") } 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 da338ec8c7..1d53932cad 100644 --- a/app/src/main/java/com/gh/common/util/DirectUtils.kt +++ b/app/src/main/java/com/gh/common/util/DirectUtils.kt @@ -1708,10 +1708,11 @@ object DirectUtils { * 跳转至游戏单详情 */ @JvmStatic - fun directToGameCollectionDetail(context: Context, id: String, entrance: String? = null) { + fun directToGameCollectionDetail(context: Context, id: String, entrance: String? = null, path: String? = null) { if (id.isEmpty()) return val bundle = Bundle() bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER) + bundle.putString(KEY_PATH, path) bundle.putString(KEY_TO, GameCollectionDetailActivity::class.java.name) bundle.putString(KEY_GAME_COLLECTION_ID, id) jumpActivity(context, bundle) diff --git a/app/src/main/java/com/gh/gamecenter/SkipActivity.java b/app/src/main/java/com/gh/gamecenter/SkipActivity.java index b220ac0b2a..cbb7e0cd67 100644 --- a/app/src/main/java/com/gh/gamecenter/SkipActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SkipActivity.java @@ -394,7 +394,7 @@ public class SkipActivity extends BaseActivity { DirectUtils.directToHelpAndFeedback(this, TextUtils.isEmpty(position) ? 0 : Integer.parseInt(position)); break; case HOST_GAME_COLLECTION_DETAIL: - DirectUtils.directToGameCollectionDetail(this, path, ENTRANCE_BROWSER); + DirectUtils.directToGameCollectionDetail(this, path, ENTRANCE_BROWSER, ""); break; case HOST_GAME_COLLECTION_SQUARE: DirectUtils.directToGameCollectionSquare(this, ENTRANCE_BROWSER, "", "", ""); diff --git a/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt index 36c6f7d557..c135fe7cd4 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt @@ -37,7 +37,7 @@ class SubCategoryAdapter( name.setTextColor(R.color.theme_font.toColor(mContext)) } else { selectedIv.visibility = View.GONE - container.background = R.drawable.bg_category_unselect.toDrawable(mContext) + container.background = R.drawable.bg_shape_f8_radius_8.toDrawable(mContext) name.setTextColor(R.color.text_title.toColor(mContext)) } @@ -48,7 +48,7 @@ class SubCategoryAdapter( categoryEntity.selected -> { categoryEntity.selected = false selectedIv.visibility = View.GONE - container.background = R.drawable.bg_category_unselect.toDrawable(mContext) + container.background = R.drawable.bg_shape_f8_radius_8.toDrawable(mContext) name.setTextColor(R.color.text_title.toColor(mContext)) mViewModel.run { if (selectedCount > 0) { diff --git a/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt index b258c49336..470985fb90 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt @@ -34,7 +34,9 @@ data class CommentEntity( var floor: Int = 0, var isExpand: Boolean = false, @SerializedName("attached") // 楼中楼 - var subCommentList: ArrayList? = null + var subCommentList: ArrayList? = null, + var isHighlight: Boolean = false, // 是否高亮处理 + var isForceExpand: Boolean = false // 是否强制展开，即显示时就是展开状态 ) : Parcelable { fun clone(): CommentEntity { 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 b91d92061d..4a45c9d018 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 @@ -126,8 +126,12 @@ open class GameCollectionDetailViewModel(application: Application, } else if (list.isNullOrEmpty() && mLoadStatusLiveData.value == LoadStatus.INIT_FAILED) { add(CommentItemData(errorConnection = true)) } else { - list?.forEach { - add(CommentItemData(commentNormal = it)) + list?.forEachIndexed { index, commentEntity -> + if (topCommentId.isNotBlank() && index == 0) { + commentEntity.isHighlight = true + commentEntity.isForceExpand = true + } + add(CommentItemData(commentNormal = commentEntity)) } add(CommentItemData(footer = true)) } diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationViewModel.kt index 131883d36d..5c968c4393 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationViewModel.kt @@ -22,7 +22,11 @@ class GameCollectionCommentConversationViewModel(application: Application, override fun provideDataObservable(page: Int) = null override fun provideDataSingle(page: Int): Single> { - return mApi.getGameCollectionCommentReply(gameCollectionId, commentId, page) + val map = hashMapOf() + if (topCommentId.isNotEmpty()) { + map["top_comment_id"] = topCommentId + } + return mApi.getGameCollectionCommentReply(gameCollectionId, commentId, page, map) } @SuppressLint("CheckResult") diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageAdapter.java b/app/src/main/java/com/gh/gamecenter/message/MessageAdapter.java index 7d827d9989..6f79abc5b4 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageAdapter.java @@ -127,12 +127,6 @@ public class MessageAdapter extends ListAdapter { FooterViewHolder footerViewHolder = (FooterViewHolder) holder; footerViewHolder.initFooterViewHolder(mIsLoading, mIsNetworkError, mIsOver); footerViewHolder.initItemPadding(); - - if (mIsOver && (mEntityList == null || mEntityList.isEmpty())) { - footerViewHolder.itemView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0)); - } else { - footerViewHolder.itemView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); - } break; } } diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java index 2ca26c1ff3..2cd3191a0d 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java @@ -4,8 +4,11 @@ import android.os.Bundle; import android.view.View; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProviders; +import androidx.recyclerview.widget.RecyclerView; +import com.gh.gamecenter.common.view.CustomDividerItemDecoration; import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.MessageInviteActivity; import com.gh.gamecenter.MessageKeFuActivity; @@ -51,6 +54,14 @@ public class MessageFragment extends ListFragment public void setMessageItem(MessageEntity messageEntity, Context context, String entrance) { mBinding.messageItem.setBackground(ContextCompat.getDrawable(mBinding.getRoot().getContext(), R.drawable.reuse_listview_item_style)); - mBinding.messageOriginal.setBackgroundColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.background)); - mBinding.messageUserName.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_black)); + mBinding.messageOriginal.setBackground(ContextCompat.getDrawable(mBinding.getRoot().getContext(), R.drawable.bg_shape_f8_radius_8)); + mBinding.messageUserName.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_title)); mBinding.messageUserMore.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.theme_font)); - mBinding.messageCommand.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.title)); - mBinding.messageTime.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.hint)); - mBinding.messageContent.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_black)); - mBinding.messageOriginalTitle.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.title)); + mBinding.messageCommand.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_title)); + mBinding.messageTime.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_subtitleDesc)); + mBinding.messageContent.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_subtitle)); + mBinding.messageOriginalTitle.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_subtitleDesc)); setClickData(messageEntity); - ImageUtils.display(mBinding.messageUserIcon, messageEntity.getUserEntity().getIcon()); if (messageEntity.getUserEntity().getAuth() != null) { - ImageUtils.display(mBinding.messageUserBadge, messageEntity.getUserEntity().getAuth().getIcon()); + mBinding.messageUserIcon.display(messageEntity.getUserEntity().getBorder(), messageEntity.getUserEntity().getIcon(), messageEntity.getUserEntity().getAuth().getIcon()); + } else { + mBinding.messageUserIcon.display(messageEntity.getUserEntity().getBorder(), messageEntity.getUserEntity().getIcon(), null); } - BindingAdapters.showHide(mBinding.messageUserBadge, messageEntity.getUserEntity().getAuth() != null); BindingAdapters.showHide(mBinding.messageUnread, !messageEntity.getRead()); mBinding.messageUserName.setText(messageEntity.getUserEntity().getName()); @@ -100,7 +102,6 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder case "answer": mBinding.messageCommand.setText("回答了你的问题"); mBinding.messageContent.setVisibility(View.VISIBLE); - mBinding.messageContent.setMaxLines(3); mBinding.messageContent.setText(messageEntity.getAnswer().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getAnswer().getImages(); @@ -115,7 +116,6 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder case "reply": mBinding.messageCommand.setText("回复了你"); mBinding.messageContent.setVisibility(View.VISIBLE); - mBinding.messageContent.setMaxLines(Integer.MAX_VALUE); mBinding.messageContent.setText(messageEntity.getDialogue().getFrom().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getArticle().getTitle()); targetUrl = messageEntity.getArticle().getThumb(); @@ -127,7 +127,6 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder case "follow_question": mBinding.messageCommand.setText("回答了你关注的问题"); mBinding.messageContent.setVisibility(View.VISIBLE); - mBinding.messageContent.setMaxLines(3); mBinding.messageContent.setText(messageEntity.getAnswer().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getAnswer().getImages(); @@ -140,9 +139,8 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder voteMoreUser(messageEntity); break; case "reply_answer_comment": - mBinding.messageCommand.setText("回复了你"); + mBinding.messageCommand.setText("回复了你的回答"); mBinding.messageContent.setVisibility(View.VISIBLE); - mBinding.messageContent.setMaxLines(Integer.MAX_VALUE); mBinding.messageContent.setText(messageEntity.getDialogue().getFrom().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getAnswer().getImages(); @@ -157,7 +155,6 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder case "answer_comment": mBinding.messageCommand.setText("评论了你"); mBinding.messageContent.setVisibility(View.VISIBLE); - mBinding.messageContent.setMaxLines(Integer.MAX_VALUE); mBinding.messageContent.setText(messageEntity.getComment().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getAnswer().getImages(); @@ -245,9 +242,8 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder voteMoreUser(messageEntity); break; case "community_article_comment": - mBinding.messageCommand.setText("评论了你"); + mBinding.messageCommand.setText("评论了你的帖子"); mBinding.messageContent.setVisibility(View.VISIBLE); - mBinding.messageContent.setMaxLines(Integer.MAX_VALUE); mBinding.messageContent.setText(messageEntity.getComment().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getArticle().getTitle()); images = messageEntity.getArticle().getImages(); @@ -286,9 +282,8 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder voteMoreUser(messageEntity); break; case "reply_community_article_comment": - mBinding.messageCommand.setText("回复了你"); + mBinding.messageCommand.setText("回复了你的评论"); mBinding.messageContent.setVisibility(View.VISIBLE); - mBinding.messageContent.setMaxLines(Integer.MAX_VALUE); mBinding.messageContent.setText(messageEntity.getDialogue().getFrom().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getArticle().getTitle()); images = messageEntity.getArticle().getImages(); @@ -313,7 +308,6 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder case "update-answer": mBinding.messageCommand.setText("更新了回答"); mBinding.messageContent.setVisibility(View.VISIBLE); - mBinding.messageContent.setMaxLines(3); mBinding.messageContent.setText(messageEntity.getAnswer().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getAnswer().getImages(); @@ -336,9 +330,8 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder voteMoreUser(messageEntity); break; case "game_comment_reply": - mBinding.messageCommand.setText("回复了你"); + mBinding.messageCommand.setText("回复了你的评价"); mBinding.messageContent.setVisibility(View.VISIBLE); - mBinding.messageContent.setMaxLines(Integer.MAX_VALUE); mBinding.messageContent.setText(messageEntity.getReply().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getGame().getName()); targetUrl = messageEntity.getGame().getDefaultIcon(); @@ -348,9 +341,8 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder voteMoreUser(messageEntity); break; case "video_comment": - mBinding.messageCommand.setText("评论了你"); + mBinding.messageCommand.setText("评论了你的帖子"); mBinding.messageContent.setVisibility(View.VISIBLE); - mBinding.messageContent.setMaxLines(Integer.MAX_VALUE); mBinding.messageContent.setText(messageEntity.getComment().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getVideo().getTitle()); targetUrl = messageEntity.getVideo().getPoster(); @@ -360,9 +352,8 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder voteMoreUser(messageEntity); break; case "video_comment_reply": - mBinding.messageCommand.setText("回复了你"); + mBinding.messageCommand.setText("回复了你的评论"); mBinding.messageContent.setVisibility(View.VISIBLE); - mBinding.messageContent.setMaxLines(Integer.MAX_VALUE); mBinding.messageContent.setText(messageEntity.getDialogue().getFrom().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getVideo().getTitle()); targetUrl = messageEntity.getVideo().getPoster(); @@ -404,7 +395,6 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder case "reply_activity_comment": mBinding.messageCommand.setText("回复了你"); mBinding.messageContent.setVisibility(View.VISIBLE); - mBinding.messageContent.setMaxLines(Integer.MAX_VALUE); mBinding.messageContent.setText(messageEntity.getDialogue().getFrom().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getActivity().getTitle()); targetUrl = messageEntity.getActivity().getImageUrl(); @@ -444,9 +434,8 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder voteMoreUser(messageEntity); break; case "game_list_comment": - mBinding.messageCommand.setText("评论了你"); + mBinding.messageCommand.setText("评价了你的游戏单"); mBinding.messageContent.setVisibility(View.VISIBLE); - mBinding.messageContent.setMaxLines(Integer.MAX_VALUE); mBinding.messageContent.setText(messageEntity.getComment().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getGameList().getTitle()); targetUrl = messageEntity.getGameList().getCover(); @@ -456,9 +445,8 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder voteMoreUser(messageEntity); break; case "game_list_comment_reply": - mBinding.messageCommand.setText("回复了你"); + mBinding.messageCommand.setText("回复了你的游戏单评价"); mBinding.messageContent.setVisibility(View.VISIBLE); - mBinding.messageContent.setMaxLines(Integer.MAX_VALUE); mBinding.messageContent.setText(messageEntity.getComment().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getGameList().getTitle()); targetUrl = messageEntity.getGameList().getCover(); @@ -564,23 +552,24 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder MtaHelper.onEvent("消息中心", outerInfo, "点击卡片"); } + Intent intent; switch (entity.getType()) { case "comment_vote": if (view.getId() == R.id.message_original) { - Intent intent = NewsDetailActivity.getIntentById(context, entity.getArticle().getId(), BaseActivity.mergeEntranceAndPath(entrance, path)); + intent = NewsDetailActivity.getIntentById(context, entity.getArticle().getId(), BaseActivity.mergeEntranceAndPath(entrance, path)); context.startActivity(intent); } else if (view.getId() == R.id.message_item) { - Intent intent = MessageDetailActivity.getIntentById(context, + intent = MessageDetailActivity.getIntentById(context, entity.getArticle().getId(), -1, false, BaseActivity.mergeEntranceAndPath(entrance, path)); context.startActivity(intent); } break; case "reply": if (view.getId() == R.id.message_original) { - Intent intent = NewsDetailActivity.getIntentById(context, entity.getArticle().getId(), BaseActivity.mergeEntranceAndPath(entrance, path)); + intent = NewsDetailActivity.getIntentById(context, entity.getArticle().getId(), BaseActivity.mergeEntranceAndPath(entrance, path)); context.startActivity(intent); } else if (view.getId() == R.id.message_item) { - Intent intent = CommentDetailActivity.getIntent(context, entity.getDialogue().getFrom().getId(), entity.getArticle()); + intent = CommentDetailActivity.getIntent(context, entity.getDialogue().getFrom().getId(), entity.getArticle()); context.startActivity(intent); } break; @@ -596,15 +585,20 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder } break; case "answer": + intent = NewQuestionDetailActivity.getSpecifiedCommentIntent( + context, + entity.getQuestion().getId(), + entity.getAnswer().getId(), + entrance, + path + ); + context.startActivity(intent); + break; case "update-answer": case "follow_question": if (view.getId() == R.id.message_original) { MessageEntity.Question question = entity.getQuestion(); context.startActivity(NewQuestionDetailActivity.getCommentIntent(context, question.getId(), entity.getAnswer().getId(), entrance, path)); - - Questions questions = new Questions(); - questions.setId(question.getId()); - questions.setTitle(question.getTitle()); } else if (view.getId() == R.id.message_item) { context.startActivity(SimpleAnswerDetailActivity.getIntent(context, entity.getAnswer().getId(), entrance, path)); } @@ -624,7 +618,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder linkEntity.setType("answer"); linkEntity.setLink(entity.getAnswer().getId()); linkEntity.setTitle(entity.getQuestion().getTitle()); - Intent intent = CommentDetailActivity.getAnswerCommentIntent(context, + intent = CommentDetailActivity.getAnswerCommentIntent(context, entity.getDialogue().getFrom().getId(), entity.getAnswer().getId(), linkEntity); @@ -653,11 +647,14 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder break; case "community_article_comment": community = new CommunityEntity(entity.getArticle().getCommunityId(), ""); - if (view.getId() == R.id.message_original) { - context.startActivity(ArticleDetailActivity.getIntent(context, community, entity.getArticle().getId(), entrance, path, null)); - } else if (view.getId() == R.id.message_item) { // 打开评论管理 - context.startActivity(ArticleDetailActivity.getCommentIntent(context, community, entity.getArticle().getId(), entrance, path)); - } + intent = ArticleDetailActivity.getSpecifiedCommentIntent( + context, + community, + entity.getArticle().getId(), + entity.getComment().getId(), + entrance, + path); + context.startActivity(intent); break; case "community_article_vote": if (view.getId() == R.id.message_original || view.getId() == R.id.message_item) { @@ -666,9 +663,19 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder } break; case "reply_community_article_comment": - if (view.getId() == R.id.message_original || view.getId() == R.id.message_item) { - context.startActivity(CommentActivity.getCommentDetailIntent(context, entity.getDialogue().getTo().getTopId(), entity.getArticle().getCommunityId(), entity.getArticle().getId(), "", "", false, 1, entrance, path)); - } + intent = NewCommentDetailActivity.Companion.getIntent( + context, + entity.getDialogue().getTo().getTopId(), + entity.getArticle().getCommunityId(), + entity.getArticle().getId(), + "", + "", + "", + entity.getDialogue().getFrom().getId(), + entrance, + path + ); + context.startActivity(intent); break; case "game_comment_vote": if (view.getId() == R.id.message_original || view.getId() == R.id.message_item) { @@ -678,7 +685,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder case "game_comment_reply": case "game_comment_reply_vote": if (view.getId() == R.id.message_original || view.getId() == R.id.message_item) { - Intent intent = RatingReplyActivity.getIntent(context, entity.getGame().getId(), entity.getReply().getCommentId(), entrance, path); + intent = RatingReplyActivity.getIntent(context, entity.getGame().getId(), entity.getReply().getCommentId(), entrance, path); context.startActivity(intent); } break; @@ -697,8 +704,30 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder } break; case "video_comment": - case "video_comment_vote": + intent = ForumVideoDetailActivity.Companion.getSpecifiedCommentIntent( + context, + entity.getVideo().getId(), + "", + entity.getComment().getId() + ); + context.startActivity(intent); + break; case "video_comment_reply": + intent = NewCommentDetailActivity.Companion.getIntent( + context, + entity.getDialogue().getTo().getId(), + "", + "", + entity.getVideo().getId(), + "", + "", + entity.getDialogue().getFrom().getId(), + entrance, + path + ); + context.startActivity(intent); + break; + case "video_comment_vote": case "video_comment_reply_vote": boolean showComment = false; @@ -734,6 +763,20 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder } break; case "game_list_comment_reply": + intent = NewCommentDetailActivity.Companion.getIntent( + context, + entity.getComment().getTopId(), + "", + "", + "", + "", + entity.getGameList().getId(), + entity.getComment().getId(), + entrance, + path + ); + context.startActivity(intent); + break; case "game_list_comment_vote": if (view.getId() == R.id.message_original) { context.startActivity(GameCollectionDetailActivity.getIntent(context, entity.getGameList().getId(), false)); diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt index 60d31bbd87..c19d9b80df 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt @@ -101,5 +101,27 @@ class ArticleDetailActivity : NormalActivity() { intent.putExtra(EntranceConsts.KEY_PATH, path) return intent } + + /** + * 定位到指定的评论并置顶 + */ + @JvmStatic + fun getSpecifiedCommentIntent( + context: Context, + community: CommunityEntity, + articleId: String, + topCommentId: String, + entrance: String, + path: String + ): Intent { + val intent = Intent(context, ArticleDetailActivity::class.java) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_COMMUNITY_ARTICLE_ID, articleId) + intent.putExtra(EntranceConsts.KEY_COMMUNITY_DATA, community) + intent.putExtra(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, true) + intent.putExtra(EntranceConsts.KEY_TOP_COMMENT_ID, topCommentId) + intent.putExtra(EntranceConsts.KEY_PATH, path) + return intent + } } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt index ce6db26907..8c678a9301 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt @@ -191,7 +191,8 @@ class ArticleDetailFragment : BaseCommentFragment(EntranceConsts.KEY_COMMUNITY_DATA)?.id ?: "", - arguments?.getString(EntranceConsts.KEY_RECOMMEND_ID) ?: "" + arguments?.getString(EntranceConsts.KEY_RECOMMEND_ID) ?: "", + arguments?.getString(EntranceConsts.KEY_TOP_COMMENT_ID) ?: "" ) ) } 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 65fcbc4f52..18c3c54da1 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 @@ -33,13 +33,15 @@ class ArticleDetailViewModel( application: Application, articleId: String = "", communityId: String = "", - val recommendId: String = "" + val recommendId: String = "", + topCommentId: String ) : BaseCommentViewModel( application, articleId = articleId, communityId = communityId, videoId = "", - questionId = "" + questionId = "", + topCommentId = topCommentId ) { var detailEntity: ArticleDetailEntity? = null @@ -60,11 +62,16 @@ class ArticleDetailViewModel( var articlePageFinishedLiveData = MutableLiveData() override fun provideDataObservable(page: Int): Observable> { + val map = hashMapOf() + if (topCommentId.isNotEmpty()) { + map["top_comment_id"] = topCommentId + } return RetrofitManager.getInstance().api.getCommunityArticleCommentList( communityId, articleId, currentSortType.value, - page + page, + map ) } @@ -408,7 +415,8 @@ class ArticleDetailViewModel( private val application: Application, private val articleId: String = "", private val communityId: String = "", - private val recommendId: String = "" + private val recommendId: String = "", + private val topCommentId: String = "" ) : ViewModelProvider.NewInstanceFactory() { override fun create(modelClass: Class): T { @@ -416,7 +424,8 @@ class ArticleDetailViewModel( application = application, articleId = articleId, communityId = communityId, - recommendId = recommendId + recommendId = recommendId, + topCommentId = topCommentId ) as T } } 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 48ef8cd317..e8e920496d 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,7 +31,7 @@ class ArticleDetailCommentViewModel(application: Application, } override fun provideDataSingle(page: Int): Single> { - return RetrofitManager.getInstance().api.getCommunityArticleCommentReply(communityId, articleId, commentId, currentSortType.value, page) + return RetrofitManager.getInstance().api.getCommunityArticleCommentReply(communityId, articleId, commentId, currentSortType.value, page, mapOf()) } @SuppressLint("CheckResult") diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentDetailActivity.kt new file mode 100644 index 0000000000..bb82be1375 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentDetailActivity.kt @@ -0,0 +1,45 @@ +package com.gh.gamecenter.qa.comment + +import android.content.Context +import android.content.Intent +import android.os.Bundle +import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.qa.comment.conversation.CommentConversationFragment + +class NewCommentDetailActivity: NormalActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setNavigationTitle("评论详情") + } + + companion object { + @JvmStatic + fun getIntent( + context: Context, + commentId: String, + communityId: String, + articleId: String, + videoId: String, + questionId: String, + gameCollectionId: String, + topCommentId: String, + entrance: String, + path: String + ): Intent { + val bundle = Bundle() + bundle.putString(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + bundle.putInt(EntranceConsts.KEY_POSITION, 1) + bundle.putString(EntranceConsts.KEY_COMMENT_ID, commentId) + bundle.putString(EntranceConsts.KEY_COMMUNITY_ID, communityId) + bundle.putString(EntranceConsts.KEY_COMMUNITY_ARTICLE_ID, articleId) + bundle.putString(CommentActivity.VIDEO_ID, videoId) + bundle.putString(CommentActivity.QUESTION_ID, questionId) + bundle.putString(CommentActivity.GAME_COLLECTION_ID, gameCollectionId) + bundle.putString(EntranceConsts.KEY_TOP_COMMENT_ID, topCommentId) + bundle.putString(EntranceConsts.KEY_PATH, path) + return getTargetIntent(context, NewCommentDetailActivity::class.java, CommentConversationFragment::class.java, bundle) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt index d3cbd952f8..c765106154 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt @@ -237,7 +237,7 @@ open class NewCommentFragment : ListFragment if (mShowInputOnly) { if (mCommentEntity != null) { - commentEt.hint = "回复：${mCommentEntity?.user?.name}" + commentEt.hint = "回复 @${mCommentEntity?.user?.name}" } commentContainer?.visibility = View.GONE commentEt.requestFocus() 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 885538806e..7da5eda265 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 @@ -65,7 +65,7 @@ open class NewCommentViewModel( CommentType.ANSWER -> api.getAnswerCommentList(answerId, page) CommentType.ANSWER_CONVERSATION -> api.getAnswerCommentConversationList(answerId, commentId, page) - CommentType.COMMUNITY_ARTICLE -> api.getCommunityArticleCommentList(communityId, articleId, "time.create:1", page) + CommentType.COMMUNITY_ARTICLE -> api.getCommunityArticleCommentList(communityId, articleId, "time.create:1", page, mapOf()) CommentType.COMMUNITY_ARTICLE_CONVERSATION -> api.getCommunityArticleCommentConversation(communityId, articleId, commentId, page) CommentType.VIDEO -> api.getVideoCommentList(videoId, page, mapOf()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt index 02d0bc797a..27dc21a0ca 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt @@ -203,6 +203,7 @@ abstract class BaseCommentAdapter( } is CommentFooterViewHolder -> { + holder.itemView.setBackgroundColor(R.color.background_white.toColor(mContext)) holder.bindView(mIsLoading, mIsNetworkError, mIsOver) } @@ -251,7 +252,8 @@ abstract class BaseCommentAdapter( article: ArticleDetailEntity? = null, questions: QuestionsDetailEntity? = null, comment: CommentEntity? = null, - gameCollection: Boolean? = null + gameCollection: Boolean? = null, + commentDetail: Boolean? = null ) { binding.run { filterView.setBackgroundColor(R.color.background_white.toColor(mContext)) @@ -278,6 +280,9 @@ abstract class BaseCommentAdapter( gameCollection != null -> { "玩家评论" } + commentDetail != null -> { + "全部讨论" + } else -> { "" } @@ -289,7 +294,7 @@ abstract class BaseCommentAdapter( commentCount.toSimpleCount() } - divider.goneIf(gameCollection == true) + divider.goneIf(gameCollection == true || commentDetail == true) if (orderSfv.getItemList().isEmpty()) { orderSfv.setItemList(listOf("正序", "倒序"), 0) } @@ -327,14 +332,6 @@ abstract class BaseCommentAdapter( var type: AdapterType ) : RecyclerView.ViewHolder(binding.root) { - init { - if (type == AdapterType.SUB_COMMENT) { - binding.userNameTv.textSize = 12F - binding.contentTv.textSize = 14F - binding.timeTv.visibility = View.GONE - } - } - @SuppressLint("SetTextI18n") fun bindComment( comment: CommentEntity, @@ -431,9 +428,9 @@ abstract class BaseCommentAdapter( binding.commentCountTv.text = viewModel.getCommentText(comment.reply, "回复") } else { // 评论详情用的样式 - binding.floorHintTv.text = CommentUtils.getCommentTime(comment.time) + binding.floorHintTv.visibility = View.GONE binding.commentCountTv.setOnClickListener { commentClosure?.invoke(comment) } - binding.commentCountTv.setCompoundDrawables(null, null, null, null) +// binding.commentCountTv.setCompoundDrawables(null, null, null, null) binding.commentCountTv.text = "回复" binding.likeCountTv.text = viewModel.getLikeText(comment.vote, "") binding.root.setOnClickListener { binding.commentCountTv.performClick() } @@ -441,17 +438,16 @@ abstract class BaseCommentAdapter( if (comment.parentUser != null) { val prefix = "回复" val colon = " ：" - val parentUserName = " ${comment.parentUser?.name} " + val parentUserName = " @${comment.parentUser?.name} " val prefixSpan = SpanBuilder(prefix).color( binding.root.context, 0, prefix.length, - R.color.text_subtitleDesc + R.color.text_4D4D4D ).build() val parentUserNameSpan = SpanBuilder(parentUserName) - .bold(0, parentUserName.length) - .click(0, parentUserName.length, R.color.text_subtitle) { + .click(0, parentUserName.length, R.color.text_subtitleDesc) { DirectUtils.directToHomeActivity( binding.root.context, comment.user.id, @@ -465,7 +461,7 @@ abstract class BaseCommentAdapter( binding.root.context, 0, colon.length, - R.color.text_subtitleDesc + R.color.text_4D4D4D ).build() val authorSpan = if (comment.parentUser?.me?.isCommentOwner == true) { SpanBuilder("作者").image(0, "作者".length, R.drawable.ic_hint_author).build() @@ -596,6 +592,18 @@ abstract class BaseCommentAdapter( } val mtaKey = if (viewModel is ArticleDetailViewModel) "全部评论" else "评论详情-全部回复" + if (comment.isHighlight) { + comment.isHighlight = false + binding.highlightBg.run { + visibility = View.VISIBLE + postDelayed({ + tryWithDefaultCatch { + visibility = View.GONE + } + }, 3000) + } + } + if (!comment.images.isNullOrEmpty()) { if (binding.commentPictureRv.adapter == null) { binding.commentPictureRv.apply { @@ -613,9 +621,18 @@ abstract class BaseCommentAdapter( binding.commentPictureRv.visibility = View.GONE } bindView(binding, comment) - binding.contentTv.setExpandMaxLines(if (comment.isExpand) Int.MAX_VALUE else 4) - binding.contentTv.setIsExpanded(comment.isExpand) - binding.collapseTv.goneIf(!comment.isExpand) + if (comment.isForceExpand) { + comment.isForceExpand = false + binding.contentTv.setExpandMaxLines(Int.MAX_VALUE) + binding.contentTv.setIsExpanded(true) + binding.contentTv.post { + binding.collapseTv.goneIf(binding.contentTv.lineCount <= 4) + } + } else { + binding.contentTv.setExpandMaxLines(if (comment.isExpand) Int.MAX_VALUE else 4) + binding.contentTv.setIsExpanded(comment.isExpand) + binding.collapseTv.goneIf(!comment.isExpand) + } binding.contentTv.setExpandCallback { comment.isExpand = true binding.collapseTv.visibility = View.VISIBLE @@ -664,7 +681,7 @@ abstract class BaseCommentAdapter( ) } - binding.likeCountTv.text = viewModel.getLikeText(comment.vote) + binding.likeCountTv.text = viewModel.getLikeText(comment.vote, if (viewModel is CommentConversationViewModel) "" else "赞同") if (comment.me?.isCommentVoted == true) { binding.likeCountTv.setCompoundDrawablesWithIntrinsicBounds( diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentFragment.kt index 9cc756ec82..5104ae73c5 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentFragment.kt @@ -98,10 +98,13 @@ abstract class BaseCommentFragment : ListFragment< override fun getItemDecoration(): RecyclerView.ItemDecoration { val drawable = ContextCompat.getDrawable(requireContext(), R.drawable.divider_article_detail_comment) - val itemDecoration = if (this !is CommentConversationFragment) { - CustomDividerItemDecoration(requireContext(), notDecorateTheFirstTwoItems = true, notDecorateTheLastItem = true) - } else { - CustomDividerItemDecoration(requireContext(), notDecorateTheFirstItem = true, notDecorateTheLastItem = true) + val itemDecoration = when { + this !is CommentConversationFragment || mListViewModel.topCommentId.isNotBlank() -> { + CustomDividerItemDecoration(requireContext(), notDecorateTheFirstTwoItems = true, notDecorateTheLastItem = true) + } + else -> { + CustomDividerItemDecoration(requireContext(), notDecorateTheFirstItem = true, notDecorateTheLastItem = true) + } } itemDecoration.setDrawable(drawable!!) 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 306e82a9f3..46cca1293f 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 @@ -35,7 +35,8 @@ abstract class BaseCommentViewModel( var articleId: String, var videoId: String, var questionId: String, - var communityId: String + var communityId: String, + var topCommentId: String = "" ) : ListViewModel(application) { protected val mApi: ApiService = RetrofitManager.getInstance().api var currentSortType: SortType = SortType.OLDEST @@ -46,6 +47,8 @@ abstract class BaseCommentViewModel( var commentCount = 0 + var isHandleTopComment = false + override fun loadStatusControl(size: Int) { if (mCurLoadParams.loadOffset == LoadParams.DEFAULT_OFFSET) { // 初始化列表 when { @@ -89,7 +92,7 @@ abstract class BaseCommentViewModel( fun mergeListData( commentList: List?, displayFloor: Boolean = false, - hasFilter: Boolean = true + hasFilter: Boolean = true, ) { topItemData?.let { val mergedList = arrayListOf().apply { @@ -112,15 +115,19 @@ abstract class BaseCommentViewModel( } else { //从第二楼开始 var floor = 2 - commentList?.forEach { + commentList?.forEachIndexed { index, commentEntity -> if (displayFloor) { - it.floor = floor + commentEntity.floor = floor } // 没有 me 会导致不能跨页面更新点赞 - if (it.me == null) { - it.me = MeEntity() + if (commentEntity.me == null) { + commentEntity.me = MeEntity() } - add(CommentItemData(commentNormal = it)) + if (topCommentId.isNotBlank() && index == 0) { + commentEntity.isHighlight = true + commentEntity.isForceExpand = true + } + add(CommentItemData(commentNormal = commentEntity)) if (displayFloor) { floor++ } diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationAdapter.kt index b2b0bb1046..6219851c05 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationAdapter.kt @@ -6,7 +6,10 @@ import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet import androidx.recyclerview.widget.RecyclerView +import com.gh.common.util.CommentUtils +import com.gh.common.util.DirectUtils import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.goneIf import com.gh.gamecenter.databinding.ItemArticleDetailCommentBinding import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.qa.comment.base.BaseCommentAdapter @@ -39,6 +42,10 @@ class CommentConversationAdapter( holder.bindView(mEntityList[position].commentTop!!) } + is CommentFilterViewHolder -> { + holder.bindView(commentDetail = true) + } + else -> super.onBindViewHolder(holder, position) } } @@ -54,8 +61,8 @@ class CommentConversationAdapter( clear(binding.commentPictureRv.id, ConstraintSet.START) connect(binding.commentPictureRv.id, ConstraintSet.START, binding.userIconIv.id, ConstraintSet.START) - clear(binding.timeTv.id, ConstraintSet.START) - connect(binding.timeTv.id, ConstraintSet.START, binding.userIconIv.id, ConstraintSet.START) + clear(binding.bottomContainer.id, ConstraintSet.START) + connect(binding.bottomContainer.id, ConstraintSet.START, binding.userIconIv.id, ConstraintSet.START) applyTo(binding.contentTv.parent as ConstraintLayout) } @@ -70,17 +77,64 @@ class CommentConversationAdapter( binding.commentPictureRv.layoutParams = this } - (binding.timeTv.layoutParams as ConstraintLayout.LayoutParams).apply { + (binding.bottomContainer.layoutParams as ConstraintLayout.LayoutParams).apply { leftMargin = 9F.dip2px() - binding.timeTv.layoutParams = this + binding.bottomContainer.layoutParams = this } - binding.moreIv.visibility = View.GONE - binding.divider.visibility = View.VISIBLE - binding.commentCountTv.visibility = View.GONE - binding.floorHintTv.text = if (comment.floor != 0) "${comment.floor}楼" else "" - binding.contentTv.text = comment.content - binding.contentTv.maxLines = Int.MAX_VALUE + binding.run { + moreIv.visibility = View.GONE + divider.visibility = View.VISIBLE + commentCountTv.visibility = View.GONE + floorHintTv.text = if (comment.floor != 0) "${comment.floor}楼" else "" + contentTv.text = comment.content + contentTv.maxLines = Int.MAX_VALUE + commentTopTimeTv.goneIf(mViewModelCommunity.topCommentId.isBlank()) + commentTopTimeTv.text = CommentUtils.getCommentTime(comment.time) + timeTv.goneIf(mViewModelCommunity.topCommentId.isNotBlank()) + originalTv.goneIf(mViewModelCommunity.topCommentId.isBlank()) + originalTv.text = if (mViewModelCommunity.gameCollectionId.isNotEmpty()) "查看游戏单" else "查看原文" + originalTv.setOnClickListener { + mViewModelCommunity.run { + val path = if (gameCollectionId.isNotEmpty()) "评论详情-查看游戏单" else "评论详情-查看原文" + when { + articleId.isNotEmpty() -> { + DirectUtils.directToCommunityArticle( + mContext, + articleId, + communityId, + mEntrance, + path + ) + } + videoId.isNotEmpty() -> { + DirectUtils.directToVideoDetail( + mContext, + videoId, + mEntrance, + path + ) + } + questionId.isNotEmpty() -> { + DirectUtils.directToQuestionDetail( + mContext, + questionId, + mEntrance, + path + ) + } + gameCollectionId.isNotEmpty() -> { + DirectUtils.directToGameCollectionDetail( + mContext, + gameCollectionId, + mEntrance, + path + ) + } + } + } + } + } CommentItemViewHolder.bindComment(binding, mViewModelCommunity, comment, mEntrance, null) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationFragment.kt index 8122f97097..d954f71549 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationFragment.kt @@ -5,8 +5,12 @@ import android.app.Activity import android.content.Intent import android.os.Bundle import android.view.LayoutInflater +import android.view.MenuItem import android.view.View +import android.view.ViewGroup import com.ethanhua.skeleton.Skeleton +import com.gh.base.ToolBarActivity +import com.gh.common.util.CommentHelper import com.gh.gamecenter.core.AppExecutor import com.gh.gamecenter.common.syncpage.SyncDataEntity import com.gh.gamecenter.common.syncpage.SyncFieldConstants @@ -26,19 +30,20 @@ import com.gh.gamecenter.qa.article.detail.CommentItemData import com.gh.gamecenter.qa.comment.CommentActivity import com.halo.assistant.HaloApp -class CommentConversationFragment : BaseCommentFragment() { +class CommentConversationFragment : + BaseCommentFragment() { private lateinit var mViewModel: CommentConversationViewModel private lateinit var mBinding: FragmentArticleDetailCommentBinding private var mAdapterCommunity: CommentConversationAdapter? = null - override fun getLayoutId() = R.layout.fragment_article_detail_comment + override fun getLayoutId() = 0 override fun onCreate(savedInstanceState: Bundle?) { mViewModel = provideListViewModel() super.onCreate(savedInstanceState) mViewModel.getComment() mViewModel.positionInOriginList = arguments?.getInt(EntranceConsts.KEY_POSITION) - ?: -1 + ?: -1 } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -48,20 +53,29 @@ class CommentConversationFragment : BaseCommentFragment { return mAdapterCommunity - ?: CommentConversationAdapter(requireContext(), mViewModel, BaseCommentAdapter.AdapterType.SUB_COMMENT, mEntrance) { - if (it.user.id == UserManager.getInstance().userId) { - toast("不能回复自己") - } else { - startCommentActivity(it) - } - }.apply { - mAdapterCommunity = this + ?: CommentConversationAdapter( + requireContext(), + mViewModel, + BaseCommentAdapter.AdapterType.SUB_COMMENT, + mEntrance + ) { + if (it.user.id == UserManager.getInstance().userId) { + toast("不能回复自己") + } else { + startCommentActivity(it) } + }.apply { + mAdapterCommunity = this + } } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { @@ -72,27 +86,67 @@ class CommentConversationFragment : BaseCommentFragment 2) { mListRv.smoothScrollToPosition(1) @@ -143,14 +200,17 @@ class CommentConversationFragment : BaseCommentFragment>? = null override fun provideDataSingle(page: Int): Single>? { + val map = hashMapOf() + if (topCommentId.isNotEmpty()) { + map["top_comment_id"] = topCommentId + } return when { articleId.isNotEmpty() -> { - mApi.getCommunityArticleCommentReply(communityId, articleId, commentId, currentSortType.value, page) + mApi.getCommunityArticleCommentReply( + communityId, + articleId, + commentId, + currentSortType.value, + page, + map + ) } videoId.isNotEmpty() -> { - mApi.getVideoCommentReply(videoId, commentId, currentSortType.value, page) + mApi.getVideoCommentReply(videoId, commentId, currentSortType.value, page, map) } questionId.isNotEmpty() -> { - mApi.getQuestionCommentReply(questionId, commentId, currentSortType.value, page) + mApi.getQuestionCommentReply(questionId, commentId, currentSortType.value, page, map) } gameCollectionId.isNotEmpty() -> { - mApi.getGameCollectionCommentReply(gameCollectionId, commentId, page) + mApi.getGameCollectionCommentReply(gameCollectionId, commentId, page, map) } else -> null } @@ -62,49 +75,54 @@ class CommentConversationViewModel(application: Application, else -> null } ?: return single.subscribeOn(Schedulers.io()) - .subscribe(object : BiResponse() { - @SuppressLint("CheckResult") - override fun onSuccess(data: CommentEntity) { - commentDetail = data - commentDetail?.floor = positionInOriginList - commentCount = data.reply - topItemData = CommentItemData(commentTop = data) - loadResultLiveData.postValue(LoadResult.SUCCESS) - mergeListData(mListLiveData.value, hasFilter = false) - } + .subscribe(object : BiResponse() { + @SuppressLint("CheckResult") + override fun onSuccess(data: CommentEntity) { + commentDetail = data + commentDetail?.floor = positionInOriginList + commentCount = data.reply + topItemData = CommentItemData(commentTop = data) + loadResultLiveData.postValue(LoadResult.SUCCESS) + mergeListData(mListLiveData.value, hasFilter = topCommentId.isNotBlank()) + } - override fun onFailure(exception: Exception) { - if (exception is HttpException && exception.code().toString().contains("404")) { - loadResultLiveData.postValue(LoadResult.DELETED) - } else { - loadResultLiveData.postValue(LoadResult.NETWORK_ERROR) - } + override fun onFailure(exception: Exception) { + if (exception is HttpException && exception.code().toString().contains("404")) { + loadResultLiveData.postValue(LoadResult.DELETED) + } else { + loadResultLiveData.postValue(LoadResult.NETWORK_ERROR) } - }) + } + }) } override fun mergeResultLiveData() { - mResultLiveData.addSource(mListLiveData) { mergeListData(it, hasFilter = false) } + mResultLiveData.addSource(mListLiveData) { mergeListData(it, hasFilter = topCommentId.isNotBlank()) } } - class Factory(private val application: Application, - private val articleId: String = "", - private val videoId: String = "", - private val questionId: String = "", - private val communityId: String = "", - private val gameCollectionId: String = "", - private val commentId: String) : ViewModelProvider.NewInstanceFactory() { + class Factory( + private val application: Application, + private val articleId: String = "", + private val videoId: String = "", + private val questionId: String = "", + private val communityId: String = "", + private val gameCollectionId: String = "", + private val commentId: String, + private val topCommentId: String + ) : ViewModelProvider.NewInstanceFactory() { override fun create(modelClass: Class): T { return CommentConversationViewModel( - application = application, - articleId = articleId, - videoId = videoId, - questionId = questionId, - communityId = communityId, - gameCollectionId = gameCollectionId, - commentId = commentId) as T + application = application, + articleId = articleId, + videoId = videoId, + questionId = questionId, + communityId = communityId, + gameCollectionId = gameCollectionId, + commentId = commentId, + topCommentId = topCommentId + ) as T } } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt index 6f4c50b07a..34ea8415d2 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt @@ -111,5 +111,23 @@ class NewQuestionDetailActivity : NormalActivity() { intent.putExtra(EntranceConsts.KEY_PATH, path) return intent } + + @JvmStatic + fun getSpecifiedCommentIntent( + context: Context, + questionId: String, + answerId: String, + entrance: String, + path: String + ): Intent { + val intent = Intent(context, NewQuestionDetailActivity::class.java) + intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) + intent.putExtra(EntranceConsts.KEY_QUESTIONS_ID, questionId) + intent.putExtra(EntranceConsts.KEY_ANSWER_ID, answerId) + intent.putExtra(EntranceConsts.KEY_TOP_COMMENT_ID, answerId) + intent.putExtra(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, true) + intent.putExtra(EntranceConsts.KEY_PATH, path) + return intent + } } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt index 61ca8df7ae..1545bf1a74 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt @@ -452,7 +452,8 @@ class NewQuestionDetailFragment : arguments?.getString(EntranceConsts.KEY_QUESTIONS_ID) ?: "", arguments?.getParcelable(EntranceConsts.KEY_COMMUNITY_DATA)?.id ?: "", arguments?.getString(EntranceConsts.KEY_ANSWER_ID) ?: "", - arguments?.getString(EntranceConsts.KEY_RECOMMEND_ID) ?: "" + arguments?.getString(EntranceConsts.KEY_RECOMMEND_ID) ?: "", + arguments?.getString(EntranceConsts.KEY_RECOMMEND_ID) ?: "", ) ) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailViewModel.kt index 8305205e9d..8f050ed9e3 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailViewModel.kt @@ -40,13 +40,15 @@ class NewQuestionDetailViewModel( communityId: String = "", val answerId: String = "", val recommendId: String = "", + topCommentId: String = "", ) : BaseCommentViewModel( application, articleId = "", communityId = communityId, videoId = "", - questionId = questionId + questionId = questionId, + topCommentId = topCommentId ) { var questionRenderedLiveData = MutableLiveData() var questionPageFinishedLiveData = MutableLiveData() @@ -221,7 +223,8 @@ class NewQuestionDetailViewModel( private val questionId: String = "", private val communityId: String = "", private val answerId: String = "", - private val recommendId: String = "" + private val recommendId: String = "", + private val topCommentId: String = "" ) : ViewModelProvider.NewInstanceFactory() { override fun create(modelClass: Class): T { @@ -230,7 +233,8 @@ class NewQuestionDetailViewModel( questionId = questionId, communityId = communityId, answerId = answerId, - recommendId = recommendId + recommendId = recommendId, + topCommentId = topCommentId ) as T } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt index d008ab03b2..accb866dd3 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt @@ -45,9 +45,10 @@ class ForumVideoDetailActivity : BaseActivity() { fun getIntent( context: Context, - videoId: String, bbsId: String + videoId: String, + bbsId: String ): Intent { - return getIntent(context, videoId, bbsId, "", false) + return getIntent(context, videoId, bbsId, "", "", false) } fun getIntent( @@ -56,7 +57,7 @@ class ForumVideoDetailActivity : BaseActivity() { bbsId: String, scrollToComment: Boolean = false ): Intent { - return getIntent(context, videoId, bbsId, "", scrollToComment) + return getIntent(context, videoId, bbsId, "", "", scrollToComment) } fun getRecommendIntent( @@ -65,7 +66,16 @@ class ForumVideoDetailActivity : BaseActivity() { bbsId: String, recommendId: String ): Intent { - return getIntent(context, videoId, bbsId, recommendId, false) + return getIntent(context, videoId, bbsId, recommendId, "", false) + } + + fun getSpecifiedCommentIntent( + context: Context, + videoId: String, + bbsId: String, + topCommentId: String + ): Intent { + return getIntent(context, videoId, bbsId, "", topCommentId, true) } fun getIntent( @@ -73,12 +83,14 @@ class ForumVideoDetailActivity : BaseActivity() { videoId: String, bbsId: String, recommendId: String = "", + topCommentId: String = "", scrollToComment: Boolean = false ): Intent { val intent = Intent(context, ForumVideoDetailActivity::class.java) intent.putExtra(EntranceConsts.KEY_VIDEO_ID, videoId) intent.putExtra(EntranceConsts.KEY_BBS_ID, bbsId) intent.putExtra(EntranceConsts.KEY_RECOMMEND_ID, recommendId) + intent.putExtra(EntranceConsts.KEY_TOP_COMMENT_ID, topCommentId) if (scrollToComment) { intent.putExtra(PAGE_INDEX, 1) } 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 c05a150197..0d43f39974 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 @@ -70,6 +70,7 @@ class ForumVideoDetailFragment : BaseFragment_TabLayout() { private var mForumVideoEntity: ForumVideoEntity? = null private var mVideoId = "" private var mBbsId = "" + private var mTopCommentId = "" private var mVideoDescFragment: VideoDescFragment? = null private var mVideoCommentFragment: VideoCommentFragment? = null private var mIsPortrait = false @@ -100,7 +101,11 @@ class ForumVideoDetailFragment : BaseFragment_TabLayout() { }) fragments.add(VideoCommentFragment().apply { arguments = - bundleOf(EntranceConsts.KEY_VIDEO_ID to mVideoId, EntranceConsts.KEY_BBS_ID to mBbsId) + bundleOf( + EntranceConsts.KEY_VIDEO_ID to mVideoId, + EntranceConsts.KEY_BBS_ID to mBbsId, + EntranceConsts.KEY_TOP_COMMENT_ID to mTopCommentId + ) mVideoCommentFragment = this }) } @@ -113,6 +118,7 @@ class ForumVideoDetailFragment : BaseFragment_TabLayout() { override fun onCreate(savedInstanceState: Bundle?) { mVideoId = arguments?.getString(EntranceConsts.KEY_VIDEO_ID) ?: "" mBbsId = arguments?.getString(EntranceConsts.KEY_BBS_ID) ?: "" + mTopCommentId = arguments?.getString(EntranceConsts.KEY_TOP_COMMENT_ID) ?: "" super.onCreate(savedInstanceState) NewLogUtils.logVideoDetailClick("view_video_detail") } diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt index e3ff0727fd..3a1f29195a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt @@ -53,7 +53,13 @@ class VideoCommentFragment : LazyListFragment() override fun provideDataObservable(page: Int): Observable>? { + val map = hashMapOf() + map["sort"] = currentSortType.value + if (topCommentId.isNotEmpty()) { + map["top_comment_id"] = topCommentId + } return mApi.getVideoCommentList(videoId, page, mapOf("sort" to currentSortType.value)) } @@ -30,9 +39,13 @@ class VideoCommentViewModel(application: Application, videoId: String, bbsId: St itemDataList.add(CommentItemData(errorConnection = true)) } else { var floor = 1 - list.forEach { - it.floor = floor - itemDataList.add(CommentItemData(commentNormal = it)) + list.forEachIndexed { index, commentEntity -> + commentEntity.floor = floor + if (topCommentId.isNotBlank() && index == 0) { + commentEntity.isHighlight = true + commentEntity.isForceExpand = true + } + itemDataList.add(CommentItemData(commentNormal = commentEntity)) floor++ } itemDataList.add(CommentItemData(footer = true)) @@ -46,10 +59,10 @@ class VideoCommentViewModel(application: Application, videoId: String, bbsId: St deleteCommentLiveData.postValue(true) } - class Factory(private val videoId: String, private val bbsId: String) : + class Factory(private val videoId: String, private val bbsId: String, private val topCommentId: String) : ViewModelProvider.NewInstanceFactory() { override fun create(modelClass: Class): T { - return VideoCommentViewModel(HaloApp.getInstance().application, videoId, bbsId) as T + return VideoCommentViewModel(HaloApp.getInstance().application, videoId, bbsId, topCommentId) as T } } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java index 6fb5bfd1ee..6b4b237027 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java @@ -1489,7 +1489,8 @@ public interface ApiService { Observable> getCommunityArticleCommentList(@Path("community_id") String communityId, @Path("article_id") String articleId, @Query("sort") String type, - @Query("page") int page); + @Query("page") int page, + @QueryMap Map params); /** * 获取社区文章评论的对话列表． @@ -1516,7 +1517,8 @@ public interface ApiService { @Path("article_id") String articleId, @Path("comment_id") String commentId, @Query("sort") String sort, - @Query("page") int page); + @Query("page") int page, + @QueryMap Map params); /** * 评论社区文章评论 @@ -3118,7 +3120,11 @@ public interface ApiService { * 获取问题评论（回答）的回复（评论）列表 */ @GET("bbses/questions/{question_id}/comments/{comment_id}/replies") - Single> getQuestionCommentReply(@Path("question_id") String questionId, @Path("comment_id") String commentId, @Query("sort") String sort, @Query("page") int page); + Single> getQuestionCommentReply(@Path("question_id") String questionId, + @Path("comment_id") String commentId, + @Query("sort") String sort, + @Query("page") int page, + @QueryMap Map params); /** * 点赞问题评论（回答） @@ -3172,7 +3178,11 @@ public interface ApiService { * 获取视频评论回复 */ @GET("videos/{video_id}/comments/{comment_id}/replies") - Single> getVideoCommentReply(@Path("video_id") String videoId, @Path("comment_id") String commentId, @Query("sort") String sort, @Query("page") int page); + Single> getVideoCommentReply(@Path("video_id") String videoId, + @Path("comment_id") String commentId, + @Query("sort") String sort, + @Query("page") int page, + @QueryMap Map params); /** * 加精视频贴 @@ -3399,7 +3409,10 @@ public interface ApiService { * 获取游戏单评论的回复列表 */ @GET("api_go/game_list/{game_list_id}/comment/{comment_id}/reply") - Single> getGameCollectionCommentReply(@Path("game_list_id") String gameCollectionId, @Path("comment_id") String commentId, @Query("page") int page); + Single> getGameCollectionCommentReply(@Path("game_list_id") String gameCollectionId, + @Path("comment_id") String commentId, + @Query("page") int page, + @QueryMap Map params); /** * 游戏单添加评论 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_comment_original_arrow.webp b/app/src/main/res/drawable-xxxhdpi/ic_comment_original_arrow.webp new file mode 100644 index 0000000000000000000000000000000000000000..1eb1172c610e2b2207e86c12c40e8cfea86b1804 GIT binary patch literal 708 zcmWIYbaUIo#J~{l>J$(bU=hK^z`$St#KH^=@(c`~&dvc6Kv@O`CJ7M90+h7*2N-ENQg5fwKy55=mQX!6ag(~U|>uE zvPIG%>m$qafxmJu+K7&4dvQ;bh7P@%r?0d@g*2Zc=K^Z)MD^ETzo z?tA!ejk>^sj{m{A0*wkTaupd}uNimc&YQEkPFo;iLvK#>$wsair|B~~CV6NctjtxG z*H>8dKkf3i!dq4T`@!yAP#WTPQACYXq$*JK)cdO%B|-An1vEpu|LJSnt`Dn@TN{wd KQ1ITBfdK%lPJ9&r literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/bg_category_unselect.xml b/app/src/main/res/drawable/bg_category_unselect.xml deleted file mode 100644 index bbf0367142..0000000000 --- a/app/src/main/res/drawable/bg_category_unselect.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_category_reset.xml b/app/src/main/res/drawable/bg_shape_f2_radius_999.xml similarity index 74% rename from app/src/main/res/drawable/bg_category_reset.xml rename to app/src/main/res/drawable/bg_shape_f2_radius_999.xml index 9a4dfb90d9..2832d2730f 100644 --- a/app/src/main/res/drawable/bg_category_reset.xml +++ b/app/src/main/res/drawable/bg_shape_f2_radius_999.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_f8_radius_8.xml b/app/src/main/res/drawable/bg_shape_f8_radius_8.xml index a49afdae08..89ae3c0093 100644 --- a/app/src/main/res/drawable/bg_shape_f8_radius_8.xml +++ b/app/src/main/res/drawable/bg_shape_f8_radius_8.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_message_unread_hint.xml b/app/src/main/res/drawable/shape_message_unread_hint.xml new file mode 100644 index 0000000000..0b59aa8717 --- /dev/null +++ b/app/src/main/res/drawable/shape_message_unread_hint.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_article_detail_comment.xml b/app/src/main/res/layout/fragment_article_detail_comment.xml index 1a278644bc..2e6b5fb9be 100644 --- a/app/src/main/res/layout/fragment_article_detail_comment.xml +++ b/app/src/main/res/layout/fragment_article_detail_comment.xml @@ -8,15 +8,15 @@ + android:layout_height="@dimen/dialog_panel_titlebar_height" /> diff --git a/app/src/main/res/layout/item_article_detail_comment.xml b/app/src/main/res/layout/item_article_detail_comment.xml index 871cea24f0..0dc086e03f 100644 --- a/app/src/main/res/layout/item_article_detail_comment.xml +++ b/app/src/main/res/layout/item_article_detail_comment.xml @@ -6,6 +6,17 @@ android:layout_height="wrap_content" android:background="@color/background_white"> + + + + - + app:layout_constraintEnd_toEndOf="parent"> + - + + + + + + - + android:paddingRight="16dp" + android:paddingBottom="16dp"> - - - - - - - + app:layout_constraintTop_toTopOf="parent" /> @@ -47,10 +36,12 @@ android:id="@+id/message_user_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="12dp" - android:textColor="@color/text_black" - android:textSize="12sp" - app:layout_constraintLeft_toRightOf="@id/message_icon_container" + android:layout_marginTop="18dp" + android:layout_marginLeft="3dp" + android:includeFontPadding="false" + android:textColor="@color/text_title" + android:textSize="14sp" + app:layout_constraintLeft_toRightOf="@id/message_user_icon" app:layout_constraintTop_toTopOf="parent" tools:text="欢喜哥" /> @@ -58,86 +49,92 @@ android:id="@+id/message_user_more" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:includeFontPadding="false" android:textColor="@color/theme_font" - android:textSize="12sp" + android:textSize="14sp" android:visibility="visible" app:layout_constraintLeft_toRightOf="@id/message_user_name" - app:layout_constraintTop_toTopOf="parent" + app:layout_constraintTop_toTopOf="@id/message_user_name" tools:text="等2人" /> - + tools:text="这是一个神奇的饿回答这是一个神奇的饿回答这是一个神奇的饿回答这是一个神奇的饿回答这是一个神奇的饿回答这是一个神奇的饿回答这是一个神奇的饿回答这是一个神奇的饿回答这是一个神奇的饿回答" /> - + android:layout_height="wrap_content" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintRight_toRightOf="parent"> @@ -155,14 +152,19 @@ android:id="@+id/message_original_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_marginLeft="10dp" - android:layout_marginRight="10dp" - android:layout_toRightOf="@+id/message_data_icon_container" + android:layout_marginLeft="12dp" + android:layout_marginRight="12dp" android:ellipsize="end" android:maxLines="2" - android:textColor="@color/title" - android:textSize="12sp" /> - + android:textColor="@color/text_subtitleDesc" + android:textSize="12sp" + tools:text="我是内容我是内容我是内容" + app:layout_constrainedWidth="true" + app:layout_constraintHorizontal_bias="0" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toLeftOf="@+id/message_data_icon_container" /> + diff --git a/app/src/main/res/layout/message_item_top.xml b/app/src/main/res/layout/message_item_top.xml index 1b4f21f76e..ac576968a0 100644 --- a/app/src/main/res/layout/message_item_top.xml +++ b/app/src/main/res/layout/message_item_top.xml @@ -1,15 +1,19 @@ - + android:layout_height="wrap_content" + android:paddingBottom="8dp"> + android:background="@drawable/reuse_listview_item_style" + app:layout_constraintHorizontal_weight="1" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toLeftOf="@+id/message_invite" + app:layout_constraintTop_toTopOf="parent"> + android:background="@drawable/reuse_listview_item_style" + app:layout_constraintHorizontal_weight="1" + app:layout_constraintLeft_toRightOf="@+id/message_vote" + app:layout_constraintRight_toLeftOf="@+id/message_service" + app:layout_constraintTop_toTopOf="parent"> + android:background="@drawable/reuse_listview_item_style" + app:layout_constraintHorizontal_weight="1" + app:layout_constraintLeft_toRightOf="@+id/message_invite" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent"> - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/piece_article_detail_comment_filter.xml b/app/src/main/res/layout/piece_article_detail_comment_filter.xml index 1ec497cc9b..211ed47be8 100644 --- a/app/src/main/res/layout/piece_article_detail_comment_filter.xml +++ b/app/src/main/res/layout/piece_article_detail_comment_filter.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/filterView" android:layout_width="match_parent" - android:layout_height="44dp" + android:layout_height="48dp" android:background="@color/background_white" android:clickable="false" tools:showIn="@layout/fragment_article_detail"> diff --git a/app/src/main/res/layout/sub_category_item.xml b/app/src/main/res/layout/sub_category_item.xml index fd94f05837..26986d676d 100644 --- a/app/src/main/res/layout/sub_category_item.xml +++ b/app/src/main/res/layout/sub_category_item.xml @@ -4,7 +4,7 @@ android:id="@+id/container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/bg_category_unselect"> + android:background="@drawable/bg_shape_f8_radius_8"> +

+ + + + + + \ No newline at end of file diff --git a/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java b/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java index ff6ed0e26d..2b607b8691 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java @@ -100,6 +100,7 @@ public class EntranceConsts { public static final String KEY_CURRENTITEM = "currentItem"; public static final String KEY_COMMENTID = "commentId"; public static final String KEY_COMMENT_ID = "comment_id"; + public static final String KEY_TOP_COMMENT_ID = "top_comment_id"; public static final String KEY_SHOW_KEYBOARD_IF_NEEDED = "show_key_board_if_needed"; public static final String KEY_PATH = "path"; public static final String KEY_LOCAL_PATH = "local_path"; diff --git a/module_common/src/main/res/values-night/colors.xml b/module_common/src/main/res/values-night/colors.xml index 191456ed62..1c4942c5ef 100644 --- a/module_common/src/main/res/values-night/colors.xml +++ b/module_common/src/main/res/values-night/colors.xml @@ -127,10 +127,8 @@ #FA8850 #39B5FA - - @color/background - - @color/background + + #0A2496FF @android:color/black @@ -198,6 +196,8 @@ #EDF5FC #F2F7FC #EBFAF7 + @color/background + @color/background #b2b2b2 @color/text_subtitleDesc @color/text_title @@ -301,6 +301,7 @@ #07B896 #279BFE #C4C4C4 + #4D4D4D #99666666 #6621282E diff --git a/module_common/src/main/res/values/colors.xml b/module_common/src/main/res/values/colors.xml index 5b42e6f10f..37bd64e09b 100644 --- a/module_common/src/main/res/values/colors.xml +++ b/module_common/src/main/res/values/colors.xml @@ -128,11 +128,8 @@ #FA8850 #39B5FA - - #F8F8F8 - - #F2F2F2 - + + #0A2496FF @android:color/black #08000000 @@ -200,6 +197,8 @@ #EDF5FC #F2F7FC #EBFAF7 + #F2F2F2 + #F8F8F8 #b2b2b2 #9a9a9a #3a3a3a @@ -309,6 +308,7 @@ #FA8850 #A2ADB8 #CCFF5269 + #4D4D4D #99666666 #6621282E From 6401711f7e6bcb8930d1eacf0f40e5049ee1016a Mon Sep 17 00:00:00 2001 From: juntao Date: Fri, 20 May 2022 16:56:04 +0800 Subject: [PATCH 48/52] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E5=92=8C?= =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/halo/assistant/HaloApp.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index 283e2e0741..70be32861c 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -210,7 +210,6 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid } // 异步初始化 SP SPUtils.getString(""); - MainWrapperRepository.Companion.getInstance().getHomeNavBar(); }); RxJavaPlugins.setIoSchedulerHandler(scheduler -> AppExecutor.INSTANCE.getCachedScheduler()); @@ -277,7 +276,9 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid // 刷新内存中的用户信息，避免应用进程重建时因没有用户信息数据而显示为掉登录状态 // 必须放在外面，否则不能及时刷新用户数据 UserRepository.getInstance().getLoginUserInfo(); - + + MainWrapperRepository.Companion.getInstance().getHomeNavBar(); + AppExecutor.getUiExecutor().executeWithDelay(() -> { initThirdPartySdk(); From c05dfebf1b2a7ca04dd03d5db3683cd595432db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Fri, 20 May 2022 17:00:50 +0800 Subject: [PATCH 49/52] =?UTF-8?q?=E6=A8=A1=E5=9D=97/=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=8C=96=E5=89=8D=E6=9C=9F=E6=94=B9=E9=80=A0(=E8=A7=A3?= =?UTF-8?q?=E8=80=A6ToolBarActivity)=20https://git.shanqu.cc/halo/android/?= =?UTF-8?q?assistant-android/-/issues/64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/base/BaseActivity_TabLayout.java | 1 + .../com/gh/base/BaseRichEditorActivity.kt | 2 +- .../com/gh/base/DownloadToolbarActivity.kt | 115 ++++++++++ .../java/com/gh/common/util/DirectUtils.kt | 2 +- .../com/gh/common/util/EntranceUtils.java | 16 +- .../GameCollectionSquareBrowseTaskHelper.kt | 12 +- .../java/com/gh/gamecenter/AboutActivity.java | 3 +- .../java/com/gh/gamecenter/BlockActivity.kt | 3 +- .../com/gh/gamecenter/CleanApkActivity.java | 3 +- .../com/gh/gamecenter/CollectionActivity.java | 5 +- .../gh/gamecenter/CommentDetailActivity.java | 5 +- .../com/gh/gamecenter/ConcernActivity.java | 4 +- .../gh/gamecenter/ConcernInfoActivity.java | 3 +- .../com/gh/gamecenter/CropImageActivity.java | 2 +- .../gamecenter/DownloadManagerActivity.java | 3 +- .../com/gh/gamecenter/GameDetailActivity.kt | 4 +- .../com/gh/gamecenter/GameNewsActivity.java | 3 +- .../java/com/gh/gamecenter/InfoActivity.java | 3 +- .../java/com/gh/gamecenter/LibaoActivity.java | 4 +- .../gh/gamecenter/LibaoDetailActivity.java | 2 +- .../java/com/gh/gamecenter/LoginActivity.java | 3 +- .../java/com/gh/gamecenter/MainActivity.java | 23 +- .../com/gh/gamecenter/MessageActivity.java | 3 +- .../gh/gamecenter/MessageDetailActivity.java | 5 +- .../gh/gamecenter/MessageInviteActivity.java | 3 +- .../gh/gamecenter/MessageKeFuActivity.java | 3 +- .../gh/gamecenter/MessageVoteActivity.java | 3 +- .../gh/gamecenter/NetworkDiagnosisActivity.kt | 2 +- .../com/gh/gamecenter/NewsDetailActivity.java | 26 +-- .../com/gh/gamecenter/NewsSearchActivity.java | 4 +- .../com/gh/gamecenter/NormalActivity.java | 136 ------------ .../main/java/com/gh/gamecenter/QaActivity.kt | 3 +- .../gh/gamecenter/SelectUserIconActivity.java | 4 +- .../java/com/gh/gamecenter/SettingActivity.kt | 3 +- .../com/gh/gamecenter/ShareCardActivity.java | 2 +- .../gh/gamecenter/ShareCardPicActivity.java | 2 +- .../com/gh/gamecenter/ShareGhActivity.java | 2 +- .../java/com/gh/gamecenter/ShellActivity.kt | 2 +- .../com/gh/gamecenter/SuggestionActivity.java | 2 +- .../com/gh/gamecenter/ToolBoxActivity.java | 2 +- .../com/gh/gamecenter/UserInfoActivity.kt | 3 +- .../com/gh/gamecenter/UserInfoEditActivity.kt | 3 +- .../com/gh/gamecenter/UserRegionActivity.java | 3 +- .../java/com/gh/gamecenter/VoteActivity.java | 4 +- .../java/com/gh/gamecenter/WebActivity.kt | 5 +- .../gamecenter/amway/AmwaySuccessFragment.kt | 4 +- .../amway/search/AmwaySearchListFragment.kt | 4 +- .../gh/gamecenter/baselist/ListActivity.java | 2 +- .../gh/gamecenter/baselist/ListFragment.java | 4 +- .../gh/gamecenter/catalog/CatalogActivity.kt | 6 +- .../catalog/NewCatalogListActivity.kt | 6 +- .../gamecenter/catalog/SubCatalogFragment.kt | 4 +- .../category/CategoryDirectoryActivity.kt | 6 +- .../category/CategoryListActivity.kt | 6 +- .../category2/CategoryV2Activity.kt | 6 +- .../download/NewInstalledGameFragment.kt | 4 +- .../gamecenter/energy/EnergyCenterActivity.kt | 6 +- .../gamecenter/energy/EnergyHouseActivity.kt | 6 +- .../forum/list/ForumListActivity.kt | 6 +- .../forum/moderator/ApplyModeratorActivity.kt | 8 +- .../forum/moderator/ApplyModeratorFragment.kt | 4 +- .../forum/moderator/ModeratorListActivity.kt | 6 +- .../forum/moderator/ModeratorListFragment.kt | 4 +- .../forum/select/ForumSelectActivity.kt | 4 +- .../forum/select/ForumSelectFragment.kt | 4 +- .../gh/gamecenter/fragment/LoginFragment.java | 4 +- .../detail/ColumnCollectionDetailActivity.kt | 10 +- .../detail/CommonCollectionDetailActivity.kt | 6 +- .../game/upload/GameSubmissionActivity.kt | 6 +- .../game/upload/GameUploadFragment.kt | 4 +- .../gamecollection/choose/AddGamesActivity.kt | 4 +- .../choose/ChooseGamesActivity.kt | 4 +- .../choose/ChooseGamesFragment.kt | 4 +- .../detail/GameCollectionDetailActivity.kt | 8 +- .../detail/GameCollectionPosterActivity.kt | 8 +- .../detail/GameCollectionPosterFragment.kt | 4 +- .../mine/MyGameCollectionActivity.kt | 4 +- .../mine/MyGameCollectionFragment.kt | 2 +- .../GameCollectionActivityLabelFragment.kt | 4 +- .../publish/GameCollectionEditActivity.kt | 2 +- .../tag/GameCollectionTagSelectActivity.kt | 4 +- .../tag/GameCollectionTagSelectFragment.kt | 4 +- .../gamedetail/GameDetailFragment.kt | 4 +- .../fuli/kaifu/ServersCalendarActivity.kt | 2 +- .../history/HistoryApkListActivity.kt | 6 +- .../gamedetail/myrating/MyRatingActivity.kt | 6 +- .../gamedetail/rating/RatingFoldActivity.kt | 4 +- .../gamedetail/rating/RatingReplyActivity.kt | 5 +- .../rating/edit/RatingEditActivity.kt | 2 +- .../gamecenter/help/HelpContainerFragment.kt | 4 +- .../gh/gamecenter/help/HelpDetailActivity.kt | 2 +- .../gamecenter/help/HelpQaCategoryFragment.kt | 4 +- .../gh/gamecenter/history/HistoryActivity.kt | 8 +- .../gh/gamecenter/info/ConcernFragment.java | 6 +- .../message/MessageDetailFragment.java | 4 +- .../gamecenter/mygame/PlayedGameActivity.kt | 4 +- .../personal/DeliveryInfoActivity.kt | 4 +- .../personal/DeliveryInfoFragment.kt | 4 +- .../personal/NewPersonalActivity.kt | 4 +- .../personalhome/UserHomeActivity.kt | 10 +- .../personalhome/UserHomeFragment.kt | 4 +- .../background/BackgroundPreviewFragment.kt | 4 +- .../PersonalityBackgroundActivity.kt | 4 +- .../PersonalityBackgroundFragment.kt | 4 +- .../border/AvatarBorderFragment.kt | 4 +- .../border/ChooseAvatarBorderFragment.kt | 4 +- .../personalhome/fans/FansActivity.kt | 6 +- .../followers/FollowersActivity.kt | 6 +- .../home/game/UserGameFragment.kt | 4 +- .../answer/detail/AnswerDetailActivity.java | 14 +- .../detail/AnswerDetailContainerFragment.kt | 4 +- .../qa/answer/detail/AnswerDetailFragment.kt | 22 +- .../detail/SimpleAnswerDetailActivity.kt | 6 +- .../qa/answer/draft/AnswerDraftActivity.kt | 4 +- .../qa/answer/fold/AnswerFoldActivity.java | 4 +- .../qa/article/MyArticleActivity.kt | 4 +- .../article/detail/ArticleDetailActivity.kt | 6 +- .../comment/ArticleDetailCommentActivity.kt | 8 +- .../qa/article/draft/ArticleDraftActivity.kt | 6 +- .../column/detail/AskColumnDetailActivity.kt | 2 +- .../gamecenter/qa/comment/CommentActivity.kt | 10 +- .../qa/comment/NewCommentDetailActivity.kt | 4 +- .../CommentConversationFragment.kt | 2 +- .../gh/gamecenter/qa/editor/GameActivity.kt | 6 +- .../qa/editor/LocalMediaActivity.kt | 2 +- .../gh/gamecenter/qa/myqa/MyAskActivity.java | 4 +- .../questions/draft/QuestionDraftActivity.kt | 4 +- .../invite/QuestionsInviteActivity.java | 4 +- .../QuestionsInviteWrapperFragment.java | 4 +- .../newdetail/NewQuestionDetailActivity.kt | 8 +- .../qa/search/AskSearchActivity.java | 2 +- .../qa/subject/CommunitySubjectActivity.java | 4 +- .../video/detail/ForumVideoDetailActivity.kt | 8 +- .../qa/video/publish/VideoPublishActivity.kt | 7 +- .../qa/video/publish/VideoPublishFragment.kt | 4 +- .../gamecenter/security/BindPhoneActivity.kt | 6 +- .../security/BindPhoneConflictFragment.kt | 4 +- .../gamecenter/security/BindPhoneFragment.kt | 4 +- .../gamecenter/security/SecurityActivity.kt | 6 +- .../gamecenter/security/SecurityFragment.kt | 4 +- .../servers/GameServerTestActivity.kt | 6 +- .../gamecenter/servers/GameServersActivity.kt | 12 +- .../servers/add/AddKaiFuActivity.kt | 2 +- .../servers/patch/PatchKaifuActivity.kt | 2 +- .../setting/GameDownloadSettingActivity.kt | 6 +- .../setting/GameDownloadSettingFragment.kt | 4 +- .../setting/VideoSettingActivity.kt | 6 +- .../setting/VideoSettingFragment.kt | 4 +- .../simulatorgame/SimulatorGameActivity.kt | 4 +- .../simulatorgame/SimulatorGameFragment.kt | 4 +- .../SimulatorManagementActivity.kt | 4 +- .../gh/gamecenter/subject/SubjectActivity.kt | 9 +- .../com/gh/gamecenter/tag/TagsActivity.kt | 6 +- .../teenagermode/PasswordSettingFragment.kt | 4 +- .../teenagermode/TeenagerModeFragment.kt | 4 +- .../toolbox/ToolBoxBlockActivity.kt | 2 +- .../video/game/GameVideoActivity.kt | 2 +- .../video/label/VideoLabelActivity.kt | 4 +- .../video/label/VideoLabelFragment.kt | 4 +- .../video/poster/PosterClipActivity.kt | 2 +- .../video/upload/view/UploadVideoActivity.kt | 2 +- .../video/videomanager/VideoDraftActivity.kt | 4 +- .../halo/assistant/fragment/AboutFragment.kt | 4 +- .../fragment/ApkCleanerFragment.java | 4 +- .../assistant/fragment/SettingsFragment.kt | 4 +- .../fragment/SwitchInstallMethodFragment.kt | 4 +- .../comment/CommentDetailFragment.java | 4 +- .../fragment/game/GameNewsSearchFragment.java | 4 +- .../game/GameNewsSearchResultFragment.java | 4 +- .../fragment/myconcern/MyConcernFragment.java | 4 +- .../fragment/user/ManuallyRealNameFragment.kt | 4 +- .../fragment/user/RealNameInfoFragment.kt | 4 +- .../fragment/user/SelectPortraitFragment.java | 4 +- .../fragment/user/SelectRegionFragment.java | 4 +- .../fragment/user/UserInfoEditFragment.kt | 4 +- .../fragment/user/UserInfoFragment.kt | 4 +- .../common}/base/ToolBarActivity.java | 206 ++++++++++-------- .../base/fragment/BaseFragment_TabLayout.java | 2 +- .../base/fragment/BaseFragment_ViewPager.java | 2 +- .../common/base/fragment/BaseLazyFragment.kt | 2 +- ...rmalFragment.java => ToolbarFragment.java} | 2 +- .../src/main/res/layout/activity_normal.xml | 0 .../src/main/res/layout/reuse_toolbar.xml | 4 +- 183 files changed, 665 insertions(+), 634 deletions(-) create mode 100644 app/src/main/java/com/gh/base/DownloadToolbarActivity.kt delete mode 100644 app/src/main/java/com/gh/gamecenter/NormalActivity.java rename {app/src/main/java/com/gh => module_common/src/main/java/com/gh/gamecenter/common}/base/ToolBarActivity.java (66%) rename module_common/src/main/java/com/gh/gamecenter/common/base/fragment/{NormalFragment.java => ToolbarFragment.java} (96%) rename {app => module_common}/src/main/res/layout/activity_normal.xml (100%) rename {app => module_common}/src/main/res/layout/reuse_toolbar.xml (97%) diff --git a/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java b/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java index 43ba7b4423..80143d005a 100644 --- a/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java +++ b/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java @@ -10,6 +10,7 @@ import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; import com.gh.gamecenter.R; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.base.adapter.FragmentAdapter; import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout; import com.gh.gamecenter.common.view.TabIndicatorView; diff --git a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt index bf67741269..329545b7a0 100644 --- a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt +++ b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt @@ -14,12 +14,12 @@ import android.widget.CheckBox import android.widget.FrameLayout import android.widget.TextView import androidx.lifecycle.Observer -import com.gh.common.util.* import com.gh.common.util.DialogUtils import com.gh.common.util.NewLogUtils import com.gh.common.view.RichEditor import com.gh.gamecenter.CropImageActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.AppExecutor import com.gh.gamecenter.core.runOnIoThread diff --git a/app/src/main/java/com/gh/base/DownloadToolbarActivity.kt b/app/src/main/java/com/gh/base/DownloadToolbarActivity.kt new file mode 100644 index 0000000000..350a7a5bb1 --- /dev/null +++ b/app/src/main/java/com/gh/base/DownloadToolbarActivity.kt @@ -0,0 +1,115 @@ +package com.gh.base + +import android.os.Bundle +import android.text.TextUtils +import android.view.MenuItem +import android.view.View +import android.widget.ImageView +import android.widget.TextView +import androidx.core.content.ContextCompat +import androidx.lifecycle.ViewModelProviders +import com.gh.download.DownloadManager +import com.gh.gamecenter.DownloadManagerActivity +import com.gh.gamecenter.R +import com.gh.gamecenter.common.base.ToolBarActivity +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.core.utils.SPUtils.getBoolean +import com.gh.gamecenter.entity.GameUpdateEntity +import com.gh.gamecenter.eventbus.EBDownloadStatus +import com.gh.gamecenter.packagehelper.PackageViewModel +import org.greenrobot.eventbus.Subscribe +import org.greenrobot.eventbus.ThreadMode + +// TODO:移动到module_download模块中 +abstract class DownloadToolbarActivity : ToolBarActivity() { + + private var mDownloadCountHint: TextView? = null + private var mPackageViewModel: PackageViewModel? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + if (!getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu()) { + mPackageViewModel = ViewModelProviders.of(this, PackageViewModel.Factory())[PackageViewModel::class.java] + mPackageViewModel = viewModelProvider(PackageViewModel.Factory()) + mPackageViewModel?.filterSameUpdateLiveData?.observe(this) { updateList: List -> + updateDownloadCountHint(updateList) + } + } + } + + override fun setToolbarMenu(res: Int) { + // 青少年模式下要隐藏下载按钮 + if (getBoolean(Constants.SP_TEENAGER_MODE) && res == R.menu.menu_download) return + super.setToolbarMenu(res) + } + + override fun inflateMenu(res: Int) { + super.inflateMenu(res) + if (showDownloadMenu()) { + createDownloadMenu(res) + } + } + + private fun createDownloadMenu(res: Int) { + if (res != R.menu.menu_download) { + menuInflater.inflate(R.menu.menu_download, mActionMenuView.menu) + } + if (mPackageViewModel != null) { + updateDownloadCountHint(mPackageViewModel?.filterSameUpdateLiveData?.value) + } + val downloadMenuView = mActionMenuView.menu.findItem(R.id.menu_download).actionView + mDownloadCountHint = downloadMenuView.findViewById(R.id.menu_download_count_hint) + } + + override fun onMenuItemClick(item: MenuItem?): Boolean { + if (item!!.itemId == R.id.menu_download) { +// MtaHelper.onEvent("下载管理", "下载管理入口", getActivityNameInChinese()); + val intent = DownloadManagerActivity.getDownloadMangerIntent(this, mEntrance) + startActivity(intent) + return true + } + return super.onMenuItemClick(item) + } + + private fun updateDownloadCountHint(updateList: List?) { + if (mDownloadCountHint == null || updateList.isNullOrEmpty()) return + val count = DownloadManager.getInstance().getDownloadOrUpdateCount(updateList) + if (count != null) { + mDownloadCountHint!!.visibility = View.VISIBLE + mDownloadCountHint!!.text = count + val params = mDownloadCountHint!!.layoutParams + if (TextUtils.isEmpty(count)) { + params.width = DisplayUtils.dip2px(6f) + params.height = DisplayUtils.dip2px(6f) + } else { + params.width = DisplayUtils.dip2px(12f) + params.height = DisplayUtils.dip2px(12f) + } + mDownloadCountHint!!.layoutParams = params + } else { + mDownloadCountHint!!.visibility = View.GONE + } + } + + protected open fun showDownloadMenu(): Boolean { + return false + } + + @Subscribe(threadMode = ThreadMode.MAIN) + fun onEventMainThread(status: EBDownloadStatus?) { + if (!getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu() && mPackageViewModel != null) { + updateDownloadCountHint(mPackageViewModel?.filterSameUpdateLiveData?.value) + } + } + + override fun onNightModeChange() { + super.onNightModeChange() + if (showDownloadMenu() && getMenuItem(R.id.menu_download) != null) { + (getMenuItem(R.id.menu_download).actionView.findViewById(R.id.menu_download_iv) as ImageView).setImageDrawable( + ContextCompat.getDrawable(this, R.drawable.toolbar_download) + ) + } + } +} \ No newline at end of file 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 1d53932cad..317193830b 100644 --- a/app/src/main/java/com/gh/common/util/DirectUtils.kt +++ b/app/src/main/java/com/gh/common/util/DirectUtils.kt @@ -11,7 +11,7 @@ import android.text.TextUtils import androidx.appcompat.app.AppCompatActivity import com.gh.gamecenter.common.base.BaseActivity import com.gh.base.BaseActivity_TabLayout -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout import com.gh.gamecenter.core.AppExecutor import com.gh.common.constant.Config diff --git a/app/src/main/java/com/gh/common/util/EntranceUtils.java b/app/src/main/java/com/gh/common/util/EntranceUtils.java index ef2f050a81..79f2ab79ea 100644 --- a/app/src/main/java/com/gh/common/util/EntranceUtils.java +++ b/app/src/main/java/com/gh/common/util/EntranceUtils.java @@ -15,18 +15,18 @@ import android.text.TextUtils; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager; -import com.gh.gamecenter.common.avoidcallback.Callback; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.MainActivity; -import com.gh.gamecenter.NormalActivity; import com.gh.gamecenter.SplashScreenActivity; +import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager; +import com.gh.gamecenter.common.avoidcallback.Callback; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.core.utils.ClassUtils; import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.core.utils.RunningUtils; import com.gh.gamecenter.core.utils.SPUtils; -import com.gh.gamecenter.common.base.fragment.NormalFragment; import com.halo.assistant.HaloApp; import com.lightgame.utils.Utils; @@ -48,8 +48,8 @@ public class EntranceUtils { String to = bundle.getString(KEY_TO); Class clazz = ClassUtils.forName(to); if (clazz == null) clazz = MainActivity.class; - if (NormalFragment.class.isAssignableFrom(clazz)) { // 兼容NormalFragment - NormalActivity.startFragmentNewTask(context, (Class) clazz, bundle); + if (ToolbarFragment.class.isAssignableFrom(clazz)) { // 兼容ToolbarFragment + ToolBarActivity.startFragmentNewTask(context, (Class) clazz, bundle); } else { Intent intent1 = new Intent(context, clazz); intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -76,8 +76,8 @@ public class EntranceUtils { String to = bundle.getString(KEY_TO); Class clazz = ClassUtils.forName(to); if (clazz == null) clazz = MainActivity.class; - if (NormalFragment.class.isAssignableFrom(clazz)) { // 兼容NormalFragment - NormalActivity.startFragmentNewTask(context, (Class) clazz, bundle); + if (ToolbarFragment.class.isAssignableFrom(clazz)) { // 兼容ToolbarFragment + ToolBarActivity.startFragmentNewTask(context, (Class) clazz, bundle); } else { Intent intent1 = new Intent(context, clazz); //TODO:添加FLAG_ACTIVITY_NEW_TASK会导致一跳转页面callback就被调用 diff --git a/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt b/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt index 5b3ddbd3a4..b32d165686 100644 --- a/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt +++ b/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt @@ -9,16 +9,16 @@ import android.view.Gravity import android.view.View import android.widget.ImageView import android.widget.ProgressBar -import com.gh.gamecenter.core.utils.CurrentActivityHolder -import com.gh.gamecenter.core.GHThreadFactory -import com.gh.gamecenter.core.runOnUiThread -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.common.utils.singleToMain import com.gh.gamecenter.common.utils.tryWithDefaultCatch +import com.gh.gamecenter.core.GHThreadFactory +import com.gh.gamecenter.core.runOnUiThread +import com.gh.gamecenter.core.utils.CurrentActivityHolder import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity import com.gh.gamecenter.gamecollection.square.GameCollectionSquareActivity -import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lzf.easyfloat.EasyFloat @@ -161,7 +161,7 @@ object GameCollectionSquareBrowseTaskHelper { private fun isTopActivityGameCollectionRelated(activity: Activity): Boolean { return isGameCollectionSquare(activity) || (activity is GameCollectionDetailActivity - && activity.intent.getBundleExtra(NormalActivity.NORMAL_FRAGMENT_BUNDLE)?.getBoolean(KEY_IS_FORM_BROWSE_TASK) == true) + && activity.intent.getBundleExtra(ToolBarActivity.NORMAL_FRAGMENT_BUNDLE)?.getBoolean(KEY_IS_FORM_BROWSE_TASK) == true) } private fun isGameCollectionSquare(activity: Activity, checkIsFromTask: Boolean = true): Boolean { diff --git a/app/src/main/java/com/gh/gamecenter/AboutActivity.java b/app/src/main/java/com/gh/gamecenter/AboutActivity.java index a06f3a1e84..a3d607b144 100644 --- a/app/src/main/java/com/gh/gamecenter/AboutActivity.java +++ b/app/src/main/java/com/gh/gamecenter/AboutActivity.java @@ -7,6 +7,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import com.alibaba.android.arouter.facade.annotation.Route; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.constant.RouteConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; @@ -16,7 +17,7 @@ import com.halo.assistant.fragment.AboutFragment; * Created by khy on 2017/2/28. */ @Route(path = RouteConsts.activity.aboutActivity) -public class AboutActivity extends NormalActivity { +public class AboutActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/gh/gamecenter/BlockActivity.kt b/app/src/main/java/com/gh/gamecenter/BlockActivity.kt index 2cb2b31069..3c4412923d 100644 --- a/app/src/main/java/com/gh/gamecenter/BlockActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/BlockActivity.kt @@ -3,11 +3,12 @@ package com.gh.gamecenter import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.entity.SubjectRecommendEntity import com.gh.gamecenter.game.GameFragment -class BlockActivity : NormalActivity() { +class BlockActivity : DownloadToolbarActivity() { companion object { fun getIntent(context: Context, blockData: SubjectRecommendEntity, entrance: String): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java index ca7d564ddb..dc5235211d 100644 --- a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java @@ -6,13 +6,14 @@ import android.os.Bundle; import androidx.annotation.NonNull; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.halo.assistant.fragment.ApkCleanerFragment; /** * Created by khy on 2017/1/24. */ -public class CleanApkActivity extends NormalActivity { +public class CleanApkActivity extends ToolBarActivity { @NonNull public static Intent getIntent(Context context) { diff --git a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java index bcf6b0b51b..652b58474b 100644 --- a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java @@ -3,7 +3,10 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; + import androidx.annotation.NonNull; + +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.collection.CollectionWrapperFragment; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; @@ -11,7 +14,7 @@ import com.gh.gamecenter.common.utils.ExtensionsKt; /** * Created by khy on 18/07/17. */ -public class CollectionActivity extends NormalActivity { +public class CollectionActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java index b1ee6dc541..f894eefba6 100644 --- a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java @@ -6,8 +6,9 @@ import android.os.Bundle; import android.view.View; import android.view.ViewGroup; -import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.entity.LinkEntity; import com.gh.gamecenter.entity.MessageEntity; import com.gh.gamecenter.qa.comment.CommentActivity; @@ -17,7 +18,7 @@ import com.halo.assistant.fragment.comment.CommentDetailFragment; /** * Created by khy on 2017/3/22. */ -public class CommentDetailActivity extends NormalActivity { +public class CommentDetailActivity extends ToolBarActivity { private View mShadowView; diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index afc5050d5b..b563e71c67 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -3,8 +3,10 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; + import androidx.annotation.NonNull; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.halo.assistant.fragment.myconcern.MyConcernFragment; @@ -12,7 +14,7 @@ import com.halo.assistant.fragment.myconcern.MyConcernFragment; /** * 我的关注页面 */ -public class ConcernActivity extends NormalActivity { +public class ConcernActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java index 1398ca5f01..b87d242508 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.info.ConcernFragment; @@ -11,7 +12,7 @@ import com.gh.gamecenter.info.ConcernFragment; * Created by khy on 10/04/18. */ -public class ConcernInfoActivity extends NormalActivity { +public class ConcernInfoActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java index 23399f6d15..5b16cdf55a 100644 --- a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java @@ -11,7 +11,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.gh.base.ToolBarActivity; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.utils.BitmapUtils; import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.common.constant.EntranceConsts; diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java index 806499b0de..35d67303df 100644 --- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java +++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; @@ -14,7 +15,7 @@ import com.gh.gamecenter.download.DownloadFragment; * * @author 黄壮华 */ -public class DownloadManagerActivity extends NormalActivity { +public class DownloadManagerActivity extends ToolBarActivity { public static final int INDEX_DOWNLOAD = 0; public static final int INDEX_UPDATE = 1; diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt index 28acb5f8fa..dc31127417 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt @@ -4,13 +4,13 @@ import android.content.Context import android.content.ContextWrapper import android.content.Intent import android.os.Bundle +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureEvent.Companion.createEvent import com.gh.common.exposure.ExposureManager.log import com.gh.common.exposure.ExposureTraceUtils.appendTrace import com.gh.common.exposure.ExposureType -import com.gh.common.util.DataUtils import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.entity.GameEntity @@ -21,7 +21,7 @@ import com.halo.assistant.HaloApp * Created by khy on 2017/3/24. * 游戏详情适配器 */ -class GameDetailActivity : NormalActivity() { +class GameDetailActivity : DownloadToolbarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java index cd78071061..1f2e81451f 100644 --- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java @@ -6,6 +6,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.halo.assistant.fragment.game.GameNewsSearchFragment; @@ -14,7 +15,7 @@ import com.halo.assistant.fragment.game.GameNewsSearchFragment; * 游戏新闻界面，由于MTA界面统计未重新记录的原因，暂留此傀儡，连名字都不能改，真是可怕 */ @Deprecated -public class GameNewsActivity extends NormalActivity { +public class GameNewsActivity extends ToolBarActivity { @NonNull public static Intent getIntent(Context context, String gameName, String gameId, String entrance) { diff --git a/app/src/main/java/com/gh/gamecenter/InfoActivity.java b/app/src/main/java/com/gh/gamecenter/InfoActivity.java index afef0c40c1..b4b8aeacfe 100644 --- a/app/src/main/java/com/gh/gamecenter/InfoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/InfoActivity.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.info.InfoWrapperFragment; @@ -11,7 +12,7 @@ import com.gh.gamecenter.info.InfoWrapperFragment; * Created by khy on 10/04/18. */ -public class InfoActivity extends NormalActivity { +public class InfoActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java index f6845bf82c..2585cf95f4 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java @@ -3,8 +3,10 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; + import androidx.annotation.NonNull; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.libao.LibaoFragment; @@ -12,7 +14,7 @@ import com.gh.gamecenter.libao.LibaoFragment; * Created by khy on 2016/12/12. */ @Deprecated -public class LibaoActivity extends NormalActivity { +public class LibaoActivity extends ToolBarActivity { @NonNull public static Intent getIntent(Context context, String entrance) { diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index 78204a23d5..675e124b01 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -20,7 +20,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.ethanhua.skeleton.Skeleton; import com.ethanhua.skeleton.ViewSkeletonScreen; -import com.gh.base.ToolBarActivity; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.common.filter.RegionSettingHelper; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; diff --git a/app/src/main/java/com/gh/gamecenter/LoginActivity.java b/app/src/main/java/com/gh/gamecenter/LoginActivity.java index 564326b069..4cffee4aac 100644 --- a/app/src/main/java/com/gh/gamecenter/LoginActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LoginActivity.java @@ -7,6 +7,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import com.alibaba.android.arouter.facade.annotation.Route; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.common.util.QuickLoginHelper; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.constant.RouteConsts; @@ -17,7 +18,7 @@ import com.gh.gamecenter.fragment.LoginFragment; * Created by khy on 14/08/17. */ @Route(path = RouteConsts.activity.loginActivity) -public class LoginActivity extends NormalActivity { +public class LoginActivity extends ToolBarActivity { @Override protected Intent provideNormalIntent() { diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 43ada44c47..ca84968c3f 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -1,5 +1,6 @@ package com.gh.gamecenter; +import static com.gh.common.util.LoginHelper.WEIBO_SCOPE; import static com.gh.gamecenter.common.constant.EntranceConsts.ENTRANCE_BROWSER; import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_LAUNCH_SIMULATOR_GAME; import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_QQ; @@ -10,7 +11,6 @@ import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_MARKET_DETAIL import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_NEXT_TO; import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_TO; import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_TYPE; -import static com.gh.common.util.LoginHelper.WEIBO_SCOPE; import static com.gh.gamecenter.common.utils.ExtensionsKt.observableToMain; import static com.gh.gamecenter.fragment.MainWrapperFragment.INDEX_PERSONAL; import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; @@ -40,10 +40,8 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProviders; import com.gh.base.AppUncaughtHandler; -import com.gh.gamecenter.common.base.BaseActivity; -import com.gh.gamecenter.common.base.fragment.BaseFragment_ViewPager; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.common.DefaultUrlHandler; -import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager; import com.gh.common.constant.Config; import com.gh.common.history.HistoryDatabase; import com.gh.common.history.HistoryHelper; @@ -55,7 +53,6 @@ import com.gh.common.util.DataUtils; import com.gh.common.util.DeviceTokenUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DirectUtils; -import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.common.util.EntranceUtils; import com.gh.common.util.ErrorHelper; import com.gh.common.util.HomePluggableHelper; @@ -66,14 +63,21 @@ import com.gh.common.util.PackageInstaller; import com.gh.common.util.PackageUtils; import com.gh.common.util.PlatformUtils; import com.gh.common.util.QuickLoginHelper; -import com.gh.gamecenter.common.utils.ShareUtils; import com.gh.common.util.WechatBindHelper; import com.gh.download.DownloadManager; +import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager; +import com.gh.gamecenter.common.base.BaseActivity; +import com.gh.gamecenter.common.base.fragment.BaseFragment_ViewPager; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.exposure.meta.MetaUtil; +import com.gh.gamecenter.common.retrofit.BiResponse; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.common.utils.DeviceUtils; import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.common.utils.ShareUtils; import com.gh.gamecenter.core.AppExecutor; import com.gh.gamecenter.core.utils.ClassUtils; import com.gh.gamecenter.core.utils.DisplayUtils; @@ -97,10 +101,7 @@ import com.gh.gamecenter.home.skip.PackageSkipActivity; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.UpdateManager; import com.gh.gamecenter.manager.UserManager; -import com.gh.gamecenter.common.base.fragment.NormalFragment; import com.gh.gamecenter.packagehelper.PackageViewModel; -import com.gh.gamecenter.common.retrofit.BiResponse; -import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.room.AppDatabase; import com.gh.gamecenter.room.dao.SimulatorGameDao; @@ -571,8 +572,8 @@ public class MainActivity extends BaseActivity { bundle.putInt(BaseFragment_ViewPager.ARGS_INDEX, 1); } - if (NormalFragment.class.isAssignableFrom(clazz)) { - NormalActivity.startFragment(MainActivity.this, (Class) clazz, bundle); + if (ToolbarFragment.class.isAssignableFrom(clazz)) { + ToolBarActivity.startFragment(MainActivity.this, (Class) clazz, bundle); } else { Intent skipIntent = new Intent(MainActivity.this, clazz); skipIntent.putExtras(bundle); diff --git a/app/src/main/java/com/gh/gamecenter/MessageActivity.java b/app/src/main/java/com/gh/gamecenter/MessageActivity.java index 9ad1e87334..03f3e39a34 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageActivity.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.message.MessageFragment; @@ -12,7 +13,7 @@ import com.gh.gamecenter.message.MessageFragment; * Created by khy on 21/07/17. */ @Deprecated -public class MessageActivity extends NormalActivity { +public class MessageActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index f8de33fd7e..7aabeb0583 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -6,8 +6,9 @@ import android.os.Bundle; import android.view.View; import android.view.ViewGroup; -import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.entity.CommentEntity; import com.gh.gamecenter.entity.ConcernEntity; import com.gh.gamecenter.message.MessageDetailFragment; @@ -18,7 +19,7 @@ import com.halo.assistant.HaloApp; * 消息详情界面(评论详情） */ @Deprecated -public class MessageDetailActivity extends NormalActivity { +public class MessageDetailActivity extends ToolBarActivity { private View mShadowView; diff --git a/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java b/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java index 212c986a81..bef06e760d 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.message.MessageNormalFragment; @@ -12,7 +13,7 @@ import com.gh.gamecenter.message.MessageNormalFragment; * Created by khy on 10/04/18. */ -public class MessageInviteActivity extends NormalActivity { +public class MessageInviteActivity extends ToolBarActivity { public static Intent getIntent(Context context, String messageType, String outerInfo, String entrance) { Bundle bundle = new Bundle(); diff --git a/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java b/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java index 7f977d3edf..c1482e746d 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.message.KeFuFragment; @@ -12,7 +13,7 @@ import com.gh.gamecenter.message.KeFuFragment; * Created by khy on 10/04/18. */ -public class MessageKeFuActivity extends NormalActivity { +public class MessageKeFuActivity extends ToolBarActivity { @Override protected Intent provideNormalIntent() { diff --git a/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java b/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java index 35c0e4409a..1fb3388a30 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.message.MessageNormalFragment; @@ -12,7 +13,7 @@ import com.gh.gamecenter.message.MessageNormalFragment; * Created by khy on 10/04/18. */ -public class MessageVoteActivity extends NormalActivity { +public class MessageVoteActivity extends ToolBarActivity { public static Intent getIntent(Context context, String messageType, String outerInfo, String entrance) { Bundle bundle = new Bundle(); diff --git a/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt b/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt index e3823158e7..3dd0eec4a3 100644 --- a/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt @@ -17,7 +17,7 @@ import android.webkit.WebView import android.webkit.WebViewClient import android.widget.ScrollView import android.widget.TextView -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.common.util.* import com.gh.gamecenter.common.utils.DialogHelper import com.gh.gamecenter.common.utils.tryCatchInRelease diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 354cfce9f0..64461f2772 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -1,5 +1,7 @@ package com.gh.gamecenter; +import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; + import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -25,26 +27,27 @@ import androidx.recyclerview.widget.RecyclerView; import com.ethanhua.skeleton.Skeleton; import com.ethanhua.skeleton.ViewSkeletonScreen; -import com.gh.gamecenter.common.callback.OnRequestCallBackListener; -import com.gh.base.ToolBarActivity; +import com.gh.base.DownloadToolbarActivity; import com.gh.common.filter.RegionSettingHelper; import com.gh.common.history.HistoryHelper; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; -import com.gh.gamecenter.common.utils.ExtensionsKt; -import com.gh.gamecenter.core.utils.ClickUtils; import com.gh.common.util.CollectionUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DetailDownloadUtils; -import com.gh.gamecenter.core.utils.DisplayUtils; -import com.gh.gamecenter.common.constant.EntranceConsts; -import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.NewLogUtils; +import com.gh.download.DownloadManager; +import com.gh.gamecenter.adapter.viewholder.DetailViewHolder; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.retrofit.Response; +import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.common.utils.ShareUtils; import com.gh.gamecenter.common.view.FixLinearLayoutManager; import com.gh.gamecenter.common.view.VerticalItemDecoration; -import com.gh.download.DownloadManager; -import com.gh.gamecenter.adapter.viewholder.DetailViewHolder; +import com.gh.gamecenter.core.utils.ClickUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.MeEntity; import com.gh.gamecenter.entity.NewsDetailEntity; @@ -55,7 +58,6 @@ import com.gh.gamecenter.eventbus.EBNetworkState; import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.newsdetail.NewsDetailAdapter; -import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.fragment.SettingsFragment; import com.lightgame.download.DataWatcher; @@ -71,15 +73,13 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; import retrofit2.HttpException; -import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; - /** * 文章详情页面 要启动该页面 需要传入一下参数 放入 EssayEntity中传过来 文章 id 文章标题 title 文章发表时间 time * * @author 黄壮华 */ -public class NewsDetailActivity extends ToolBarActivity implements OnClickListener, OnRequestCallBackListener { +public class NewsDetailActivity extends DownloadToolbarActivity implements OnClickListener, OnRequestCallBackListener { RecyclerView mDetailRv; LinearLayout mDetailBottomLl; diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index 04eaff4f3a..3fcd9dddbd 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -3,8 +3,10 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; + import androidx.annotation.NonNull; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.halo.assistant.fragment.game.GameNewsSearchResultFragment; @@ -13,7 +15,7 @@ import com.halo.assistant.fragment.game.GameNewsSearchResultFragment; * 新闻搜索界面 */ @Deprecated -public class NewsSearchActivity extends NormalActivity { +public class NewsSearchActivity extends ToolBarActivity { @NonNull public static Intent getIntent(Context context, String gameName, String searchKey, String gameId, String entrance) { diff --git a/app/src/main/java/com/gh/gamecenter/NormalActivity.java b/app/src/main/java/com/gh/gamecenter/NormalActivity.java deleted file mode 100644 index 8287306d47..0000000000 --- a/app/src/main/java/com/gh/gamecenter/NormalActivity.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.gh.gamecenter; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.text.TextUtils; -import android.view.MenuItem; -import android.view.MotionEvent; - -import com.gh.base.ToolBarActivity; -import com.gh.gamecenter.common.base.fragment.NormalFragment; - -import androidx.fragment.app.Fragment; - -/** - * Created by khy on 17/10/17. - */ - -public abstract class NormalActivity extends ToolBarActivity { - - private Fragment mTargetFragment; - - public static final String NORMAL_FRAGMENT_NAME = "normalFragmentName"; - public static final String NORMAL_FRAGMENT_BUNDLE = "normalFragmentBundle"; - - // 针对部分跳转不符合NormalActivity规则的额外处理，主要绑定NormalFragment - protected Intent provideNormalIntent() { - return null; - } - - protected static Intent getTargetIntent(Context context, Class cls, Class t, Bundle bundle) { - Intent intent = new Intent(context, cls); - intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); - intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle); - return intent; - } - - protected static Intent getTargetIntent(Context context, Class cls, Class t) { - Intent intent = new Intent(context, cls); - intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); - return intent; - } - - - public static void startFragmentNewTask(Context context, Class t, Bundle bundle) { - Intent intent = new Intent(context, NormalActivity.class); - intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); - intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); - } - - public static void startFragment(Context context, Class t, Bundle bundle) { - Intent intent = new Intent(context, NormalActivity.class); - intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); - intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle); - context.startActivity(intent); - } - - - @Override - protected int getLayoutId() { - return R.layout.activity_normal; - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (getIntent() != null) { - if (savedInstanceState == null) { - handleIntent(getIntent()); - } else { - for (Fragment fragment : getSupportFragmentManager().getFragments()) { - if (fragment instanceof NormalFragment) mTargetFragment = fragment; - } - } - } - } - - @Override - protected void onNewIntent(Intent intent) { - super.onNewIntent(intent); - if (getIntent() != null) handleIntent(intent); - } - - private void handleIntent(Intent intent) { - String fraName = intent.getStringExtra(NORMAL_FRAGMENT_NAME); - Bundle bundle = intent.getBundleExtra(NORMAL_FRAGMENT_BUNDLE); - if (TextUtils.isEmpty(fraName)) { - if (provideNormalIntent() == null) { - return; - } - fraName = provideNormalIntent().getStringExtra(NORMAL_FRAGMENT_NAME); - if (bundle == null) bundle = getIntent().getExtras(); - if (TextUtils.isEmpty(fraName)) return; - } - mTargetFragment = getSupportFragmentManager().findFragmentByTag(fraName); - if (mTargetFragment == null) { - mTargetFragment = Fragment.instantiate(this, fraName, bundle); - } - getSupportFragmentManager().beginTransaction().replace(getFragmentPlaceholderId(), mTargetFragment, fraName).commitNowAllowingStateLoss(); - } - - @Override - public boolean onMenuItemClick(MenuItem item) { - if (mTargetFragment instanceof NormalFragment) { - ((NormalFragment) mTargetFragment).onMenuItemClick(item); - } - return super.onMenuItemClick(item); - } - - @Override - public void onBackPressed() { - if (mTargetFragment instanceof NormalFragment - && mTargetFragment.isAdded() - && !((NormalFragment) mTargetFragment).onBackPressed()) { - super.onBackPressed(); - } - } - - @Override - public boolean dispatchTouchEvent(MotionEvent ev) { - if (mTargetFragment instanceof NormalFragment) { - ((NormalFragment) mTargetFragment).onTouchEvent(ev); - } - return super.dispatchTouchEvent(ev); - } - - public Fragment getTargetFragment() { - return mTargetFragment; - } - - public int getFragmentPlaceholderId() { - return R.id.normal_content; - } -} diff --git a/app/src/main/java/com/gh/gamecenter/QaActivity.kt b/app/src/main/java/com/gh/gamecenter/QaActivity.kt index e38a02773b..4d5bfe170f 100644 --- a/app/src/main/java/com/gh/gamecenter/QaActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/QaActivity.kt @@ -3,11 +3,12 @@ package com.gh.gamecenter import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor import com.gh.gamecenter.help.HelpContainerFragment -class QaActivity : NormalActivity() { +class QaActivity : ToolBarActivity() { companion object { /** diff --git a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java index 95da8d82d4..9020c73de5 100644 --- a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java @@ -2,14 +2,16 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; + import androidx.annotation.NonNull; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.halo.assistant.fragment.user.SelectPortraitFragment; /** * Created by khy on 2017/2/10. */ -public class SelectUserIconActivity extends NormalActivity { +public class SelectUserIconActivity extends ToolBarActivity { @NonNull public static Intent getIntent(Context context) { diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.kt b/app/src/main/java/com/gh/gamecenter/SettingActivity.kt index b52eaf3277..4e112e51f7 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.kt @@ -3,11 +3,12 @@ package com.gh.gamecenter import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor import com.halo.assistant.fragment.SettingsFragment -class SettingActivity : NormalActivity() { +class SettingActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) updateStatusBarColor(R.color.black, R.color.white) diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java index bf345dda3b..5168bf767e 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java @@ -18,7 +18,7 @@ import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.ToolBarActivity; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.common.util.MessageShareUtils; diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java index e3ae6148ac..40b2bb3b6b 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java @@ -26,7 +26,7 @@ import com.facebook.drawee.controller.ControllerListener; import com.facebook.drawee.interfaces.DraweeController; import com.facebook.drawee.view.SimpleDraweeView; import com.facebook.imagepipeline.image.ImageInfo; -import com.gh.base.ToolBarActivity; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.common.util.MessageShareUtils; diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java index 82e70f530b..501a46fe57 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java @@ -11,7 +11,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; -import com.gh.base.ToolBarActivity; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.common.util.MessageShareUtils; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.core.utils.MtaHelper; diff --git a/app/src/main/java/com/gh/gamecenter/ShellActivity.kt b/app/src/main/java/com/gh/gamecenter/ShellActivity.kt index a31e0db3a7..1cdfb007bf 100644 --- a/app/src/main/java/com/gh/gamecenter/ShellActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/ShellActivity.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.os.Parcelable -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.base.fragment.BaseFragment import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.amway.AmwaySuccessFragment diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index be9f1d2f07..b4fbe6b207 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -33,7 +33,7 @@ import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.gh.base.ToolBarActivity; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.common.filter.RegionSettingHelper; import com.gh.common.util.AdHelper; import com.gh.common.util.ApkActiveUtils; diff --git a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java index 0eb0f604af..533ed575a7 100644 --- a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java @@ -11,7 +11,7 @@ //import android.widget.TextView; // //import com.gh.gamecenter.common.callback.OnRequestCallBackListener; -//import com.gh.base.ToolBarActivity; +//import com.gh.gamecenter.common.base.ToolBarActivity; //import com.gh.common.util.EntranceUtils; //import com.gh.gamecenter.core.utils.MtaHelper; //import com.gh.gamecenter.common.utils.TextHelper; diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt index 52ea77d14e..9af8e858a9 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt @@ -2,10 +2,11 @@ package com.gh.gamecenter import android.content.Context import android.content.Intent +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.utils.updateStatusBarColor import com.halo.assistant.fragment.user.UserInfoFragment -class UserInfoActivity : NormalActivity() { +class UserInfoActivity : ToolBarActivity() { companion object { fun getIntent(context: Context?): Intent? { return getTargetIntent( diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt index 5bc2706519..cfd8d88f54 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt @@ -3,11 +3,12 @@ package com.gh.gamecenter import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.user.UserViewModel import com.halo.assistant.fragment.user.UserInfoEditFragment -class UserInfoEditActivity : NormalActivity() { +class UserInfoEditActivity : ToolBarActivity() { companion object { fun getIntent(context: Context, editType: String): Intent { return getIntent(context, editType, false) diff --git a/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java b/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java index 28bea7553c..b6c83d5c66 100644 --- a/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java @@ -3,12 +3,13 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.halo.assistant.fragment.user.SelectRegionFragment; /** * Created by khy on 25/09/17. */ -public class UserRegionActivity extends NormalActivity { +public class UserRegionActivity extends ToolBarActivity { public static Intent getIntent(Context context) { return getTargetIntent(context, UserRegionActivity.class, SelectRegionFragment.class); diff --git a/app/src/main/java/com/gh/gamecenter/VoteActivity.java b/app/src/main/java/com/gh/gamecenter/VoteActivity.java index 2b8c16dd40..1095ca5bf4 100644 --- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java @@ -3,8 +3,10 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; + import androidx.annotation.NonNull; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.halo.assistant.fragment.VoteFragment; @@ -13,7 +15,7 @@ import com.halo.assistant.fragment.VoteFragment; * 求版本投票页面 */ @Deprecated -public class VoteActivity extends NormalActivity { +public class VoteActivity extends ToolBarActivity { @NonNull public static Intent getIntent(Context context, String gameName, String gameId) { diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.kt b/app/src/main/java/com/gh/gamecenter/WebActivity.kt index 2254e231b7..12a88b7c21 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.kt @@ -9,6 +9,7 @@ import android.text.TextUtils import android.view.KeyEvent import android.view.View import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.constant.RouteConsts @@ -20,7 +21,7 @@ import com.gh.gamecenter.entity.ToolBoxEntity import com.halo.assistant.fragment.WebFragment @Route(path = RouteConsts.activity.webActivity) -open class WebActivity : NormalActivity() { +open class WebActivity : ToolBarActivity() { private var mIsFullScreen = false override fun onCreate(savedInstanceState: Bundle?) { @@ -300,7 +301,7 @@ open class WebActivity : NormalActivity() { } private fun getWebTargetIntent(context: Context?, bundle: Bundle, url: String?): Intent { - val cls: Class = if (url?.contains("android_page_type=singleton") == true) { + val cls: Class = if (url?.contains("android_page_type=singleton") == true) { SingletonWebActivity::class.java } else { WebActivity::class.java diff --git a/app/src/main/java/com/gh/gamecenter/amway/AmwaySuccessFragment.kt b/app/src/main/java/com/gh/gamecenter/amway/AmwaySuccessFragment.kt index 6b528e9fb8..32661a3dd7 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwaySuccessFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwaySuccessFragment.kt @@ -8,9 +8,9 @@ import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.databinding.FragmentAmwaySuccessBinding import com.gh.gamecenter.entity.GameEntity -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment -class AmwaySuccessFragment : NormalFragment() { +class AmwaySuccessFragment : ToolbarFragment() { private var mGameEntity: GameEntity? = null private val mBinding: FragmentAmwaySuccessBinding by lazy { FragmentAmwaySuccessBinding.inflate(layoutInflater) } diff --git a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchListFragment.kt b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchListFragment.kt index 3d6bac9e98..47f3a78370 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchListFragment.kt @@ -8,10 +8,10 @@ import com.gh.gamecenter.common.utils.viewModelProviderFromParent import com.gh.gamecenter.SuggestionActivity import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.databinding.FragmentAmwaySearchBinding -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.suggest.SuggestType -class AmwaySearchListFragment : NormalFragment() { +class AmwaySearchListFragment : ToolbarFragment() { private lateinit var mAdapter: AmwaySearchAdapter private lateinit var mViewModel: AmwaySearchViewModel diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java b/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java index 4c54dda238..9f6e955957 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java @@ -14,7 +14,7 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.StaggeredGridLayoutManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.gh.base.ToolBarActivity; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.core.utils.NumberUtils; import com.gh.gamecenter.common.view.FixLinearLayoutManager; import com.gh.gamecenter.common.view.VerticalItemDecoration; diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java b/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java index cc1b7edda5..1651b827b8 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java @@ -20,7 +20,7 @@ import com.gh.gamecenter.core.utils.NumberUtils; import com.gh.gamecenter.common.view.FixLinearLayoutManager; import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.gamecenter.R; -import com.gh.gamecenter.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.halo.assistant.HaloApp; import java.lang.reflect.ParameterizedType; @@ -34,7 +34,7 @@ import io.reactivex.Single; * Created by khy on 2/12/17. */ -public abstract class ListFragment extends NormalFragment implements +public abstract class ListFragment extends ToolbarFragment implements Observer>, SwipeRefreshLayout.OnRefreshListener, OnDataObservable { diff --git a/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt b/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt index 111adc259b..6d23b4ae2d 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt @@ -3,12 +3,12 @@ package com.gh.gamecenter.catalog import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor -class CatalogActivity : NormalActivity() { +class CatalogActivity : DownloadToolbarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt index af4557c7ea..a18c525148 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt @@ -3,13 +3,13 @@ package com.gh.gamecenter.catalog import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor import com.gh.gamecenter.entity.CatalogEntity -class NewCatalogListActivity : NormalActivity() { +class NewCatalogListActivity : DownloadToolbarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/catalog/SubCatalogFragment.kt b/app/src/main/java/com/gh/gamecenter/catalog/SubCatalogFragment.kt index 35455f54f9..333e40499b 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/SubCatalogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/SubCatalogFragment.kt @@ -9,9 +9,9 @@ import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.common.utils.viewModelProviderFromParent import com.gh.gamecenter.databinding.FragmentSubCatalogBinding import com.gh.gamecenter.entity.CatalogEntity -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment -class SubCatalogFragment : NormalFragment() { +class SubCatalogFragment : ToolbarFragment() { private var mBinding: FragmentSubCatalogBinding? = null private var mViewModel: SubCatalogViewModel? = null diff --git a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt index e34d8bfdbc..8a6cf7f12f 100644 --- a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt @@ -3,12 +3,12 @@ package com.gh.gamecenter.category import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor -class CategoryDirectoryActivity : NormalActivity() { +class CategoryDirectoryActivity : DownloadToolbarActivity() { companion object { fun getIntent(context: Context, categoryId: String, categoryTitle: String): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/category/CategoryListActivity.kt b/app/src/main/java/com/gh/gamecenter/category/CategoryListActivity.kt index 11ad692bfc..b35c755c29 100644 --- a/app/src/main/java/com/gh/gamecenter/category/CategoryListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/category/CategoryListActivity.kt @@ -3,13 +3,13 @@ package com.gh.gamecenter.category import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor import com.gh.gamecenter.entity.CategoryEntity -class CategoryListActivity : NormalActivity() { +class CategoryListActivity : DownloadToolbarActivity() { companion object { fun getIntent(context: Context, categoryTitle: String, category: CategoryEntity, initTitle: String): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt index c7538d630e..07b011a66c 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt @@ -3,12 +3,12 @@ package com.gh.gamecenter.category2 import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor -class CategoryV2Activity : NormalActivity() { +class CategoryV2Activity : DownloadToolbarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) 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 f8999f527c..e8ed7612c1 100644 --- a/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt @@ -23,7 +23,7 @@ import com.gh.gamecenter.eventbus.EBDownloadStatus import com.gh.gamecenter.eventbus.EBReuse import com.gh.gamecenter.fragment.MainWrapperFragment import com.gh.gamecenter.manager.PackagesManager -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.packagehelper.PackageViewModel import com.lightgame.download.DataWatcher import com.lightgame.download.DownloadEntity @@ -31,7 +31,7 @@ import com.lightgame.download.DownloadStatus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode -class NewInstalledGameFragment : NormalFragment() { +class NewInstalledGameFragment : ToolbarFragment() { private lateinit var mBinding: FragmentMyGameBinding private var mPackageViewModel: PackageViewModel? = null diff --git a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterActivity.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterActivity.kt index 317351c499..d3b0ed2258 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterActivity.kt @@ -4,11 +4,11 @@ import android.content.Context import android.content.Intent import android.os.Build import android.os.Bundle -import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.core.utils.DisplayUtils -class EnergyCenterActivity : NormalActivity() { +class EnergyCenterActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseActivity.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseActivity.kt index 55586c0ba3..768a66e913 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseActivity.kt @@ -3,11 +3,11 @@ package com.gh.gamecenter.energy import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.core.utils.DisplayUtils -class EnergyHouseActivity : NormalActivity() { +class EnergyHouseActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt index 24f23502e9..69a472a554 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt @@ -3,12 +3,12 @@ package com.gh.gamecenter.forum.list import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor -class ForumListActivity : NormalActivity() { +class ForumListActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled(): Boolean = true diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt index 4a5a66f729..2f90567f03 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt @@ -5,14 +5,14 @@ import android.content.Intent import android.os.Build import android.os.Bundle import android.view.View -import com.gh.gamecenter.core.utils.DisplayUtils -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.entity.ApplyModeratorStatusEntity -class ApplyModeratorActivity : NormalActivity() { +class ApplyModeratorActivity : ToolBarActivity() { companion object { fun getIntent(context: Context, bbsId: String, status: ApplyModeratorStatusEntity): Intent { val bundle = Bundle() diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorFragment.kt index 9495e2ed3b..1fb0761a1a 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorFragment.kt @@ -23,12 +23,12 @@ import com.gh.gamecenter.entity.ApplyModeratorStatusEntity import com.gh.gamecenter.entity.ApplyModeratorTaskEntity import com.gh.gamecenter.forum.detail.ForumDetailActivity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.lightgame.utils.AppManager import com.lightgame.utils.Utils -class ApplyModeratorFragment : NormalFragment() { +class ApplyModeratorFragment : ToolbarFragment() { private var mBinding: FragmentApplyModeratorBinding? = null private var mViewModel: ApplyModeratorViewModel? = null diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt index f10b978e82..91d70c4b98 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt @@ -3,12 +3,12 @@ package com.gh.gamecenter.forum.moderator import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor -class ModeratorListActivity : NormalActivity() { +class ModeratorListActivity : ToolBarActivity() { companion object { fun getIntent(context: Context, bbsId: String, bbsName: String, bbsType: String, entrance: String, path: String): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListFragment.kt index b9cb8196cd..3a940390ef 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListFragment.kt @@ -17,11 +17,11 @@ import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentModeratorListBinding import com.gh.gamecenter.entity.ApplyModeratorStatusEntity import com.gh.gamecenter.eventbus.EBUserFollow -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode -class ModeratorListFragment : NormalFragment() { +class ModeratorListFragment : ToolbarFragment() { private lateinit var mBinding: FragmentModeratorListBinding private var mViewModel: ModeratorListViewModel? = null private var mAdapter: ModeratorListAdapter? = null diff --git a/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectActivity.kt index dc3fb8520d..921b070728 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectActivity.kt @@ -3,9 +3,9 @@ package com.gh.gamecenter.forum.select import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity -class ForumSelectActivity : NormalActivity() { +class ForumSelectActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectFragment.kt index ca6aae18bc..919934232a 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectFragment.kt @@ -11,11 +11,11 @@ import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.ForumCategoryEntity import com.gh.gamecenter.eventbus.EBForumFollowChange import com.gh.gamecenter.mvvm.Status -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode -class ForumSelectFragment : NormalFragment() { +class ForumSelectFragment : ToolbarFragment() { private lateinit var mBinding: FragmentForumSelectBinding private var mForumCategoryAdapter: ForumCategoryAdapter? = null diff --git a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java index 5073cf75a6..c8e314bef4 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java @@ -38,7 +38,7 @@ import com.gh.common.util.LoginUtils; import com.gh.common.util.QuickLoginHelper; import com.gh.gamecenter.R; import com.gh.gamecenter.WebActivity; -import com.gh.gamecenter.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment; import com.gh.gamecenter.common.constant.Constants; import com.gh.gamecenter.common.constant.EntranceConsts; @@ -76,7 +76,7 @@ import kotlin.collections.CollectionsKt; */ public class LoginFragment - extends NormalFragment + extends ToolbarFragment implements LoginUtils.onCaptchaCallBackListener, LoginHelper.LoginCallback, View.OnClickListener, diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt index 431fb149fe..3fd8cb05e0 100644 --- a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt @@ -3,16 +3,16 @@ package com.gh.gamecenter.game.columncollection.detail import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R import com.gh.gamecenter.catalog.CatalogActivity +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor -class ColumnCollectionDetailActivity : NormalActivity() { +class ColumnCollectionDetailActivity : ToolBarActivity() { override fun provideNormalIntent(): Intent { - return NormalActivity.getTargetIntent(this, ColumnCollectionDetailActivity::class.java, ColumnCollectionDetailFragment::class.java) + return getTargetIntent(this, ColumnCollectionDetailActivity::class.java, ColumnCollectionDetailFragment::class.java) } override fun isAutoResetViewBackgroundEnabled(): Boolean = true @@ -33,7 +33,7 @@ class ColumnCollectionDetailActivity : NormalActivity() { bundle.putString(EntranceConsts.KEY_COLLECTION_ID, collectionId) bundle.putInt(EntranceConsts.KEY_POSITION, position) bundle.putString(EntranceConsts.KEY_COLUMNNAME, columnName) - return NormalActivity.getTargetIntent(context, CatalogActivity::class.java, ColumnCollectionDetailFragment::class.java, bundle) + return getTargetIntent(context, CatalogActivity::class.java, ColumnCollectionDetailFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt index fde52aee1a..1c8efe891e 100644 --- a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt @@ -3,12 +3,12 @@ package com.gh.gamecenter.game.commoncollection.detail import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor -class CommonCollectionDetailActivity : NormalActivity() { +class CommonCollectionDetailActivity : ToolBarActivity() { override fun provideNormalIntent(): Intent { return getTargetIntent(this, CommonCollectionDetailActivity::class.java, CommonCollectionDetailFragment::class.java) diff --git a/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt b/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt index 67db15b363..d394a5d5df 100644 --- a/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt @@ -3,16 +3,16 @@ package com.gh.gamecenter.game.upload import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.gamecenter.common.base.ToolBarActivity +import com.gh.gamecenter.R import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity -import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.updateStatusBarColor /** * 游戏投稿 */ -class GameSubmissionActivity : NormalActivity() { +class GameSubmissionActivity : ToolBarActivity() { companion object { @JvmStatic fun getIntent(context: Context, entrance: String, path: String): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt b/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt index 8384d59b94..00f8e833cd 100644 --- a/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt @@ -32,7 +32,7 @@ import com.gh.gamecenter.common.utils.TextHelper import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentGameUploadBinding import com.gh.gamecenter.entity.InstallGameEntity -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.suggest.SuggestPicAdapter import com.gh.gamecenter.suggest.SuggestSelectGameAdapter import com.halo.assistant.HaloApp @@ -49,7 +49,7 @@ import kotlin.collections.component1 import kotlin.collections.component2 import kotlin.collections.set -class GameUploadFragment : NormalFragment() { +class GameUploadFragment : ToolbarFragment() { private var mAdapter: SuggestPicAdapter? = null private var mIconAdapter: SuggestPicAdapter? = null diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt index cf6639179e..cbb2c3f6e6 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt @@ -3,11 +3,11 @@ package com.gh.gamecenter.gamecollection.choose import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.updateStatusBarColor -class AddGamesActivity : NormalActivity() { +class AddGamesActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt index dd46c7b1c3..fa4b5fe015 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt @@ -3,11 +3,11 @@ package com.gh.gamecenter.gamecollection.choose import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.updateStatusBarColor -class ChooseGamesActivity : NormalActivity() { +class ChooseGamesActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle("选择游戏") diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt index 36cff0b9d7..d4e01ff6d0 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt @@ -12,12 +12,12 @@ import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentChooseGamesBinding import com.gh.gamecenter.entity.GameEntity -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.utils.toColor import java.lang.ref.WeakReference import java.util.* -class ChooseGamesFragment : NormalFragment(), ChooseGamesAdapter.ItemDragListener { +class ChooseGamesFragment : ToolbarFragment(), ChooseGamesAdapter.ItemDragListener { private lateinit var mBinding: FragmentChooseGamesBinding private lateinit var mViewModel: ChooseGamesViewModel diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt index ce17d2c3ac..91f28ba12c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt @@ -3,14 +3,14 @@ package com.gh.gamecenter.gamecollection.detail import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.core.utils.DisplayUtils -import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.common.util.GameCollectionSquareBrowseTaskHelper -import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.gamecollection.square.GameCollectionSquareActivity -class GameCollectionDetailActivity : NormalActivity() { +class GameCollectionDetailActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterActivity.kt index 01dd09ab69..1f71bad2ab 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterActivity.kt @@ -3,13 +3,13 @@ package com.gh.gamecenter.gamecollection.detail import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.core.utils.DisplayUtils -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.entity.GamesCollectionDetailEntity -class GameCollectionPosterActivity : NormalActivity() { +class GameCollectionPosterActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterFragment.kt index 50fb47f647..86f2f2cabc 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterFragment.kt @@ -17,9 +17,9 @@ import com.gh.gamecenter.databinding.FragmentGameCollectionPosterBinding import com.gh.gamecenter.databinding.LayoutGameCollectionTagBinding import com.gh.gamecenter.entity.GamesCollectionDetailEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment -class GameCollectionPosterFragment : NormalFragment() { +class GameCollectionPosterFragment : ToolbarFragment() { private val mBinding by lazy { FragmentGameCollectionPosterBinding.inflate(layoutInflater) } private var mViewModel: GameCollectionPosterViewModel? = null diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt index 1a08861357..8300e15d80 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt @@ -3,11 +3,11 @@ package com.gh.gamecenter.gamecollection.mine import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.updateStatusBarColor -class MyGameCollectionActivity : NormalActivity() { +class MyGameCollectionActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionFragment.kt index 7d89a19708..eb7a80b852 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionFragment.kt @@ -12,7 +12,7 @@ import com.gh.common.util.DirectUtils import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.utils.showRegulationTestDialogIfNeeded import com.gh.gamecenter.common.view.VerticalItemDecoration -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.baselist.ListAdapter diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelFragment.kt index 68957c527c..7f27833828 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelFragment.kt @@ -6,7 +6,7 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.LinearLayoutManager import com.gh.gamecenter.R -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration @@ -15,7 +15,7 @@ import com.gh.gamecenter.entity.ActivityLabelEntity import com.gh.gamecenter.video.label.VideoLabelActivity import com.gh.gamecenter.video.label.VideoLabelAdapter -class GameCollectionActivityLabelFragment : NormalFragment() { +class GameCollectionActivityLabelFragment : ToolbarFragment() { private lateinit var mBinding: FragmentListBaseBinding private var mAdapter: VideoLabelAdapter? = null private lateinit var mViewModel: GameCollectionActivityLabelViewModel diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt index 8e24c80a07..77fd9b7083 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt @@ -9,7 +9,7 @@ import android.view.MenuItem import android.view.View import android.widget.TextView import androidx.core.widget.doOnTextChanged -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.common.util.ErrorHelper import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt index 96335bd317..11d28158ec 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt @@ -3,12 +3,12 @@ package com.gh.gamecenter.gamecollection.tag import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.updateStatusBarColor import com.gh.gamecenter.entity.TagInfoEntity -class GameCollectionTagSelectActivity : NormalActivity() { +class GameCollectionTagSelectActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt index bc4ab6ceff..2581bf77b0 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt @@ -14,10 +14,10 @@ import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentGameCollectionTagSelectBinding import com.gh.gamecenter.databinding.ItemGameCollectionSelectedTagBinding import com.gh.gamecenter.entity.TagInfoEntity -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.utils.toColor -class GameCollectionTagSelectFragment : NormalFragment() { +class GameCollectionTagSelectFragment : ToolbarFragment() { private var mSingleChoice = false private var mMaxSelectCount = 1 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 16bbf74704..522a6e066d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt @@ -55,7 +55,7 @@ import com.gh.gamecenter.gamedetail.rating.RatingFragment import com.gh.gamecenter.gamedetail.video.TopVideoView import com.gh.gamecenter.home.video.ScrollCalculatorHelper import com.gh.gamecenter.mvvm.Status -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.packagehelper.PackageViewModel import com.gh.gamecenter.setting.VideoSettingFragment import com.gh.gamecenter.simulatorgame.SimulatorGameActivity @@ -80,7 +80,7 @@ import retrofit2.HttpException import java.util.* import kotlin.math.abs -class GameDetailFragment : NormalFragment() { +class GameDetailFragment : ToolbarFragment() { private var mDownloadMenuIcon: ImageView? = null private var mDownloadCountHint: TextView? = null diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt index c1915226ed..d5b19545c2 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt @@ -14,7 +14,7 @@ import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.common.util.NewLogUtils import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt index ebf4ccf958..736ffd0477 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt @@ -3,13 +3,13 @@ package com.gh.gamecenter.gamedetail.history import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.gamecenter.common.base.ToolBarActivity +import com.gh.gamecenter.R import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity -import com.gh.gamecenter.R import com.gh.gamecenter.entity.GameEntity -class HistoryApkListActivity : NormalActivity() { +class HistoryApkListActivity : ToolBarActivity() { companion object { fun getIntent(context: Context, gameEntity: GameEntity, entrance: String, path: String): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingActivity.kt index 6df435d0aa..2e6373cd8c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingActivity.kt @@ -3,15 +3,15 @@ package com.gh.gamecenter.gamedetail.myrating import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.gamecenter.common.base.ToolBarActivity +import com.gh.gamecenter.R import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity -import com.gh.gamecenter.R /** * 我的游戏评论 */ -class MyRatingActivity : NormalActivity() { +class MyRatingActivity : ToolBarActivity() { companion object { fun getIntent(context: Context, entrance: String, path: String): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFoldActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFoldActivity.kt index 5c45e62b58..4db4e4dd97 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFoldActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFoldActivity.kt @@ -3,11 +3,11 @@ package com.gh.gamecenter.gamedetail.rating import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.entity.GameEntity -class RatingFoldActivity : NormalActivity() { +class RatingFoldActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) 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 f63f389be9..3f387b8e27 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 @@ -240,9 +240,8 @@ class RatingReplyActivity : ListActivity() diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt index 627a8ad2b6..31ae443ca1 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt @@ -3,11 +3,11 @@ package com.gh.gamecenter.simulatorgame import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.updateStatusBarColor -class SimulatorManagementActivity : NormalActivity() { +class SimulatorManagementActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt index 1604a12c86..651317633f 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt @@ -4,16 +4,15 @@ import android.content.Context import android.content.Intent import android.os.Bundle import androidx.lifecycle.ViewModelProviders - -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.core.utils.MtaHelper -import com.gh.gamecenter.NormalActivity +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.entity.SubjectData import com.halo.assistant.HaloApp -class SubjectActivity : NormalActivity() { +class SubjectActivity : DownloadToolbarActivity() { private var mViewModel: SubjectViewModel? = null diff --git a/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt b/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt index 3e7998b728..3ace315c98 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt @@ -3,15 +3,15 @@ package com.gh.gamecenter.tag import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.base.BaseActivity +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.GameDetailActivity -import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R import com.gh.gamecenter.SearchActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor -class TagsActivity : NormalActivity() { +class TagsActivity : DownloadToolbarActivity() { companion object { diff --git a/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt b/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt index f8af79901f..3b6af3a752 100644 --- a/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt @@ -13,11 +13,11 @@ import com.gh.gamecenter.MainActivity import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.databinding.FragmentPasswordSettingBinding -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.utils.toDrawable import com.lightgame.utils.AppManager -class PasswordSettingFragment : NormalFragment() { +class PasswordSettingFragment : ToolbarFragment() { private var mBinding: FragmentPasswordSettingBinding? = null private var mViewModel: TeenagerModeViewModel? = null diff --git a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt index 7ae3c3b08b..5dc8ab77bc 100644 --- a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt @@ -12,12 +12,12 @@ import com.gh.gamecenter.common.view.CustomLinkMovementMethod import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.databinding.FragmentTeenagerModeBinding -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.common.utils.toDrawable import com.gh.gamecenter.core.utils.ClickUtils -class TeenagerModeFragment : NormalFragment() { +class TeenagerModeFragment : ToolbarFragment() { private var mBinding: FragmentTeenagerModeBinding? = null diff --git a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt index 2b5481d320..1b3eafce23 100644 --- a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt @@ -14,7 +14,7 @@ import android.widget.TextView import androidx.activity.viewModels import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.SimpleItemAnimator -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.view.CustomLinkMovementMethod import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity diff --git a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt index 308ff4cfbd..c83766c452 100644 --- a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt @@ -9,7 +9,7 @@ import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProviders import com.gh.gamecenter.common.base.BaseActivity -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.base.adapter.FragmentAdapter import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelActivity.kt b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelActivity.kt index c2f1c2bde5..3a9226578a 100644 --- a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelActivity.kt @@ -3,10 +3,10 @@ package com.gh.gamecenter.video.label import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity @Deprecated("v5.0.0废弃") -class VideoLabelActivity : NormalActivity() { +class VideoLabelActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt index 82baa966d3..69314d48b3 100644 --- a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt @@ -13,10 +13,10 @@ import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentListBaseBinding import com.gh.gamecenter.entity.ActivityLabelEntity -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.qa.dialog.ChooseActivityDialogFragment -class VideoLabelFragment : NormalFragment() { +class VideoLabelFragment : ToolbarFragment() { private lateinit var mBinding: FragmentListBaseBinding private var mAdapter: VideoLabelAdapter? = null private lateinit var mViewModel: VideoLabelViewModel diff --git a/app/src/main/java/com/gh/gamecenter/video/poster/PosterClipActivity.kt b/app/src/main/java/com/gh/gamecenter/video/poster/PosterClipActivity.kt index 9939775538..c5d13521af 100644 --- a/app/src/main/java/com/gh/gamecenter/video/poster/PosterClipActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/poster/PosterClipActivity.kt @@ -5,7 +5,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.view.View -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.utils.DialogHelper import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.common.constant.EntranceConsts diff --git a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt index e6f91d3216..2a0aca3adc 100644 --- a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt @@ -25,7 +25,7 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.gamecenter.core.AppExecutor import com.gh.common.util.* diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt index a133d63b04..a86461233d 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt @@ -3,11 +3,11 @@ package com.gh.gamecenter.video.videomanager import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.updateStatusBarColor -class VideoDraftActivity : NormalActivity() { +class VideoDraftActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.kt b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.kt index f20c917920..ca1341c523 100644 --- a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.kt @@ -19,12 +19,12 @@ import com.gh.gamecenter.core.utils.StringUtils import com.gh.gamecenter.core.utils.ToastUtils import com.gh.gamecenter.databinding.FragmentAboutBinding import com.gh.gamecenter.manager.UpdateManager -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.utils.* import com.halo.assistant.HaloApp import java.util.* -class AboutFragment : NormalFragment() { +class AboutFragment : ToolbarFragment() { private lateinit var mBinding: FragmentAboutBinding 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 0a9006daf9..2a84552216 100644 --- a/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java @@ -28,7 +28,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.CleanApkAdapter; import com.gh.gamecenter.entity.InstallGameEntity; import com.gh.gamecenter.fragment.MainWrapperFragment; -import com.gh.gamecenter.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.lightgame.utils.Utils; import java.io.File; @@ -40,7 +40,7 @@ import java.util.List; *

* 扫描并删除apk */ -public class ApkCleanerFragment extends NormalFragment implements CleanApkAdapter.OnScanListener { +public class ApkCleanerFragment extends ToolbarFragment implements CleanApkAdapter.OnScanListener { private TextView mApkCount; private TextView mApkDeleteBtn; diff --git a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt index 7660bfe715..9349451a05 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt @@ -30,7 +30,7 @@ import com.gh.gamecenter.eventbus.EBReuse import com.gh.gamecenter.fragment.MainWrapperFragment import com.gh.gamecenter.game.upload.GameSubmissionActivity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.callback.CancelListener import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.security.SecurityActivity @@ -50,7 +50,7 @@ import io.reactivex.schedulers.Schedulers import org.greenrobot.eventbus.EventBus import java.io.File -class SettingsFragment : NormalFragment() { +class SettingsFragment : ToolbarFragment() { private lateinit var mBinding: FragmentSettingBinding private var checkSizeIndex = 0 diff --git a/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt b/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt index f43b282b30..4be91395d1 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt @@ -13,13 +13,13 @@ import com.gh.download.server.BrowserInstallHelper import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.databinding.FragmentSwitchInstallMethodBinding -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import java.util.* /** * 切换安装方式 */ -class SwitchInstallMethodFragment : NormalFragment() { +class SwitchInstallMethodFragment : ToolbarFragment() { private var mBinding: FragmentSwitchInstallMethodBinding? = null diff --git a/app/src/main/java/com/halo/assistant/fragment/comment/CommentDetailFragment.java b/app/src/main/java/com/halo/assistant/fragment/comment/CommentDetailFragment.java index 9fd039c5e8..58134c4189 100644 --- a/app/src/main/java/com/halo/assistant/fragment/comment/CommentDetailFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/comment/CommentDetailFragment.java @@ -34,7 +34,7 @@ import com.gh.gamecenter.adapter.CommentDetailAdapter; import com.gh.gamecenter.adapter.OnCommentCallBackListener; import com.gh.gamecenter.entity.CommentEntity; import com.gh.gamecenter.entity.MessageEntity; -import com.gh.gamecenter.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.lightgame.utils.Util_System_Keyboard; import org.json.JSONException; @@ -47,7 +47,7 @@ import retrofit2.HttpException; *

* 评论详情页面-查看对话详情 */ -public class CommentDetailFragment extends NormalFragment implements OnCommentCallBackListener, KeyboardHeightObserver { +public class CommentDetailFragment extends ToolbarFragment implements OnCommentCallBackListener, KeyboardHeightObserver { private EditText mCommentDetailCommentEt; private TextView mCommentSend; 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 5054504957..bc629402e2 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 @@ -24,7 +24,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.GameNewsAdapter; import com.gh.gamecenter.adapter.GameNewsTypeListAdapter; import com.gh.gamecenter.eventbus.EBTypeChange; -import com.gh.gamecenter.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -43,7 +43,7 @@ import retrofit2.HttpException; *

* Created by CsHeng on 14/12/2017. */ -public class GameNewsSearchFragment extends NormalFragment { +public class GameNewsSearchFragment extends ToolbarFragment { private RecyclerView mGameNewsRv; private RecyclerView mGameNewsTypeRv; 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 9c44f19059..f6e025e43a 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 @@ -28,7 +28,7 @@ import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsTextViewHolder; import com.gh.gamecenter.databinding.NewsTextItemBinding; import com.gh.gamecenter.entity.NewsEntity; -import com.gh.gamecenter.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.utils.Util_System_Keyboard; @@ -44,7 +44,7 @@ import retrofit2.HttpException; * Created by CsHeng on 14/12/2017. * 游戏新闻搜索结果界面 */ -public class GameNewsSearchResultFragment extends NormalFragment { +public class GameNewsSearchResultFragment extends ToolbarFragment { private LinearLayout mNoneData; private EditText mNewsSearchEt; diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java index aabbd498bb..f8e8eefb4e 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java @@ -12,7 +12,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBConcernChanged; import com.gh.gamecenter.eventbus.EBReuse; -import com.gh.gamecenter.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -30,7 +30,7 @@ import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; *

* 我的关注grid页面 */ -public class MyConcernFragment extends NormalFragment implements OnRequestCallBackListener { +public class MyConcernFragment extends ToolbarFragment implements OnRequestCallBackListener { private RecyclerView mConcernRv; private LinearLayout mNoneData; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameFragment.kt b/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameFragment.kt index 96d959f5ea..194a8d5405 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameFragment.kt @@ -20,11 +20,11 @@ import com.gh.gamecenter.common.utils.enlargeTouchArea import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.databinding.FragmentManuallyRealNameBinding import com.gh.gamecenter.entity.IdCardEntity -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.squareup.picasso.MemoryPolicy import io.reactivex.disposables.Disposable -class ManuallyRealNameFragment : NormalFragment() { +class ManuallyRealNameFragment : ToolbarFragment() { private var mDialog: WaitingDialogFragment? = null private var mDisposable: Disposable? = null 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 693e0abdd2..4217787f8d 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 @@ -25,10 +25,10 @@ import com.gh.gamecenter.common.utils.TextHelper import com.gh.gamecenter.common.utils.visibleIf import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentRealNameBinding -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import org.json.JSONObject -class RealNameInfoFragment : NormalFragment() { +class RealNameInfoFragment : ToolbarFragment() { private var mHasBackdoor: Boolean = false // 是否留有不实名完成也自动开始下载的后门 private var mIsForcedToCertificate: Boolean = false diff --git a/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java index c8b4821ca1..3f429cfcf4 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java @@ -21,7 +21,7 @@ import com.gh.gamecenter.common.utils.PermissionHelper; import com.gh.gamecenter.core.utils.RandomUtils; import com.gh.gamecenter.common.utils.UserIconUtils; import com.gh.gamecenter.R; -import com.gh.gamecenter.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.gh.gamecenter.user.UserViewModel; import com.lightgame.utils.Utils; import com.zhihu.matisse.internal.utils.PathUtils; @@ -38,7 +38,7 @@ import java.util.Locale; *

* 选择用户头像 */ -public class SelectPortraitFragment extends NormalFragment { +public class SelectPortraitFragment extends ToolbarFragment { public final static int REQUEST_CROP_ICON = 12; public final static int REQUEST_MEDIA_ICON = 13; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java index 8a0d778f37..24ea8c9a64 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java @@ -19,7 +19,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.entity.UserInfoEntity; import com.gh.gamecenter.common.retrofit.ApiResponse; import com.gh.gamecenter.user.UserViewModel; -import com.gh.gamecenter.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.halo.assistant.fragment.user.region.OnRegionSelectListener; import com.halo.assistant.fragment.user.region.RegionCountFragment; import com.halo.assistant.fragment.user.region.RegionProvFragment; @@ -33,7 +33,7 @@ import java.util.List; *

* 修改用户归属地 */ -public class SelectRegionFragment extends NormalFragment implements OnBackPressedListener, OnRegionSelectListener { +public class SelectRegionFragment extends ToolbarFragment implements OnBackPressedListener, OnRegionSelectListener { private String mProvinceName; private RegionProvFragment mProvFragment; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.kt b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.kt index 22673e1d63..48432487ac 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.kt @@ -25,7 +25,7 @@ import com.gh.gamecenter.common.utils.TextHelper import com.gh.gamecenter.databinding.FragmentUserinfoEditBinding import com.gh.gamecenter.entity.UserInfoEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.retrofit.JSONObjectResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.common.retrofit.ApiResponse @@ -38,7 +38,7 @@ import org.json.JSONObject import java.lang.StringBuilder import java.util.* -class UserInfoEditFragment : NormalFragment() { +class UserInfoEditFragment : ToolbarFragment() { private lateinit var mBinding: FragmentUserinfoEditBinding private var mSaveMenuItem: MenuItem? = null diff --git a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.kt b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.kt index af9f890285..b7c78490a8 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.kt @@ -10,11 +10,11 @@ import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.* import com.gh.gamecenter.databinding.FragmentUserinfoBinding import com.gh.gamecenter.entity.UserInfoEntity -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.retrofit.ApiResponse import com.gh.gamecenter.user.UserViewModel -class UserInfoFragment : NormalFragment() { +class UserInfoFragment : ToolbarFragment() { private lateinit var mBinding: FragmentUserinfoBinding diff --git a/app/src/main/java/com/gh/base/ToolBarActivity.java b/module_common/src/main/java/com/gh/gamecenter/common/base/ToolBarActivity.java similarity index 66% rename from app/src/main/java/com/gh/base/ToolBarActivity.java rename to module_common/src/main/java/com/gh/gamecenter/common/base/ToolBarActivity.java index 9a625592cc..eb7c71998b 100644 --- a/app/src/main/java/com/gh/base/ToolBarActivity.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/ToolBarActivity.java @@ -1,16 +1,16 @@ -package com.gh.base; +package com.gh.gamecenter.common.base; import android.annotation.SuppressLint; import android.app.Activity; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; import android.text.TextUtils; import android.view.Menu; -import android.view.MenuInflater; import android.view.MenuItem; +import android.view.MotionEvent; import android.view.View; -import android.view.ViewGroup; import android.view.Window; import android.widget.FrameLayout; import android.widget.ImageView; @@ -18,33 +18,19 @@ import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.DrawableRes; -import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.appcompat.widget.ActionMenuView; import androidx.appcompat.widget.Toolbar; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; -import androidx.lifecycle.ViewModelProviders; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.gamecenter.common.base.BaseActivity; -import com.gh.gamecenter.common.constant.Constants; -import com.gh.gamecenter.core.utils.DisplayUtils; -import com.gh.gamecenter.common.utils.ImageUtils; -import com.gh.gamecenter.core.utils.SPUtils; -import com.gh.common.view.GameIconView; -import com.gh.download.DownloadManager; -import com.gh.gamecenter.DownloadManagerActivity; -import com.gh.gamecenter.R; -import com.gh.gamecenter.entity.GameUpdateEntity; -import com.gh.gamecenter.eventbus.EBDownloadStatus; +import com.gh.gamecenter.common.R; import com.gh.gamecenter.common.base.fragment.ToolbarController; -import com.gh.gamecenter.packagehelper.PackageViewModel; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; +import com.gh.gamecenter.common.utils.ImageUtils; import com.lightgame.OnTitleClickListener; -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; - import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.List; @@ -57,8 +43,10 @@ import java.util.List; public abstract class ToolBarActivity extends BaseActivity implements ToolbarController, ActionMenuView.OnMenuItemClickListener { - @Nullable - private PackageViewModel mPackageViewModel; + public static final String NORMAL_FRAGMENT_NAME = "normalFragmentName"; + public static final String NORMAL_FRAGMENT_BUNDLE = "normalFragmentBundle"; + + private Fragment mTargetFragment; protected View mToolbarContainer; @@ -76,14 +64,16 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon protected View mBackBtn; - protected GameIconView mGameIconView; +// protected GameIconView mGameIconView; protected SimpleDraweeView mUserAvatarIv; protected TextView mIconTitle; - @Nullable - private TextView mDownloadCountHint; + @Override + protected int getLayoutId() { + return R.layout.activity_normal; + } @Override protected void onCreate(Bundle savedInstanceState) { @@ -91,12 +81,41 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon setStatusBarDarkMode(true, this); initToolbar(); - if (!SPUtils.getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu()) { - mPackageViewModel = ViewModelProviders.of(this, new PackageViewModel.Factory()).get(PackageViewModel.class); - mPackageViewModel.getFilterSameUpdateLiveData().observe(this, this::updateDownloadCountHint); + if (getIntent() != null) { + if (savedInstanceState == null) { + handleIntent(getIntent()); + } else { + for (Fragment fragment : getSupportFragmentManager().getFragments()) { + if (fragment instanceof ToolbarFragment) mTargetFragment = fragment; + } + } } } + @Override + protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); + if (getIntent() != null) handleIntent(intent); + } + + private void handleIntent(Intent intent) { + String fraName = intent.getStringExtra(NORMAL_FRAGMENT_NAME); + Bundle bundle = intent.getBundleExtra(NORMAL_FRAGMENT_BUNDLE); + if (TextUtils.isEmpty(fraName)) { + if (provideNormalIntent() == null) { + return; + } + fraName = provideNormalIntent().getStringExtra(NORMAL_FRAGMENT_NAME); + if (bundle == null) bundle = getIntent().getExtras(); + if (TextUtils.isEmpty(fraName)) return; + } + mTargetFragment = getSupportFragmentManager().findFragmentByTag(fraName); + if (mTargetFragment == null) { + mTargetFragment = Fragment.instantiate(this, fraName, bundle); + } + getSupportFragmentManager().beginTransaction().replace(getFragmentPlaceholderId(), mTargetFragment, fraName).commitNowAllowingStateLoss(); + } + // 小米沉浸式黑色字体 @SuppressLint("PrivateApi") public void setStatusBarDarkMode(boolean darkmode, Activity activity) { @@ -121,7 +140,7 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon mIconTitleContainer = findViewById(R.id.iconTitleContainer); mBackContainer = findViewById(R.id.backContainer); mBackBtn = findViewById(R.id.backBtn); - mGameIconView = findViewById(R.id.gameIv); +// mGameIconView = findViewById(R.id.gameIv); mUserAvatarIv = findViewById(R.id.userAvatar); mIconTitle = findViewById(R.id.iconTitle); if (mToolbar != null) { @@ -169,18 +188,10 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon @Override public void setToolbarMenu(int res) { if (mActionMenuView == null) return; - // 青少年模式下要隐藏下载按钮 - if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE) && res == R.menu.menu_download) return; // mToolbar.inflateMenu(res); // mToolbar.setOnMenuItemClickListener(this); - - getMenuInflater().inflate(res, mActionMenuView.getMenu()); + inflateMenu(res); mActionMenuView.setOnMenuItemClickListener(this); - - if (showDownloadMenu()) { - createDownloadMenu(res); - } - Menu menu = mActionMenuView.getMenu(); for (int i = 0; i < menu.size(); i++) { MenuItem menuItem = menu.getItem(i); @@ -198,6 +209,10 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon setTitleCenter(); } + public void inflateMenu(int res){ + getMenuInflater().inflate(res, mActionMenuView.getMenu()); + } + @Override protected void onResume() { super.onResume(); @@ -215,12 +230,12 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon } } - public void setGameIconToolbar(String icon, String iconSubscript) { + /*public void setGameIconToolbar(String icon, String iconSubscript) { mTitleContainer.setVisibility(View.GONE); mGameIconView.displayGameIcon(icon, iconSubscript); mGameIconView.setVisibility(View.VISIBLE); mIconTitleContainer.setVisibility(View.VISIBLE); - } + }*/ public void setUserAvatarIconToolbar(String icon) { mTitleContainer.setVisibility(View.GONE); @@ -229,49 +244,6 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon mIconTitleContainer.setVisibility(View.VISIBLE); } - private void createDownloadMenu(int res) { - if (res != R.menu.menu_download) { - MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.menu_download, mActionMenuView.getMenu()); - } - - if (mPackageViewModel != null) { - updateDownloadCountHint(mPackageViewModel.getFilterSameUpdateLiveData().getValue()); - } - - View downloadMenuView = mActionMenuView.getMenu().findItem(R.id.menu_download).getActionView(); - mDownloadCountHint = downloadMenuView.findViewById(R.id.menu_download_count_hint); - } - - private void updateDownloadCountHint(List updateList) { - if (mDownloadCountHint == null) return; - - String count = DownloadManager.getInstance().getDownloadOrUpdateCount(updateList); - if (count != null) { - mDownloadCountHint.setVisibility(View.VISIBLE); - mDownloadCountHint.setText(count); - - ViewGroup.LayoutParams params = mDownloadCountHint.getLayoutParams(); - if (TextUtils.isEmpty(count)) { - params.width = DisplayUtils.dip2px(6); - params.height = DisplayUtils.dip2px(6); - } else { - params.width = DisplayUtils.dip2px(12); - params.height = DisplayUtils.dip2px(12); - } - mDownloadCountHint.setLayoutParams(params); - } else { - mDownloadCountHint.setVisibility(View.GONE); - } - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onEventMainThread(EBDownloadStatus status) { - if (!SPUtils.getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu() && mPackageViewModel != null) { - updateDownloadCountHint(mPackageViewModel.getFilterSameUpdateLiveData().getValue()); - } - } - @Override public MenuItem getMenuItem(int res) { if (mToolbar == null) return null; //后续页面做好判断 @@ -295,10 +267,8 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon @Override public boolean onMenuItemClick(MenuItem item) { - if (item.getItemId() == R.id.menu_download) { -// MtaHelper.onEvent("下载管理", "下载管理入口", getActivityNameInChinese()); - Intent intent = DownloadManagerActivity.getDownloadMangerIntent(this, mEntrance); - startActivity(intent); + if (mTargetFragment instanceof ToolbarFragment) { + ((ToolbarFragment) mTargetFragment).onMenuItemClick(item); } return false; } @@ -307,8 +277,29 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon return view -> onBackPressed(); } - protected boolean showDownloadMenu() { - return false; + @Override + public void onBackPressed() { + if (mTargetFragment instanceof ToolbarFragment + && mTargetFragment.isAdded() + && !((ToolbarFragment) mTargetFragment).onBackPressed()) { + super.onBackPressed(); + } + } + + @Override + public boolean dispatchTouchEvent(MotionEvent ev) { + if (mTargetFragment instanceof ToolbarFragment) { + ((ToolbarFragment) mTargetFragment).onTouchEvent(ev); + } + return super.dispatchTouchEvent(ev); + } + + public Fragment getTargetFragment() { + return mTargetFragment; + } + + public int getFragmentPlaceholderId() { + return R.id.normal_content; } @Override @@ -318,6 +309,40 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon } } + // 针对部分跳转不符合ToolbarActivity规则的额外处理，主要绑定ToolbarFragment + protected Intent provideNormalIntent() { + return null; + } + + protected static Intent getTargetIntent(Context context, Class cls, Class t, Bundle bundle) { + Intent intent = new Intent(context, cls); + intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); + intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle); + return intent; + } + + protected static Intent getTargetIntent(Context context, Class cls, Class t) { + Intent intent = new Intent(context, cls); + intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); + return intent; + } + + + public static void startFragmentNewTask(Context context, Class t, Bundle bundle) { + Intent intent = new Intent(context, ToolBarActivity.class); + intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); + intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(intent); + } + + public static void startFragment(Context context, Class t, Bundle bundle) { + Intent intent = new Intent(context, ToolBarActivity.class); + intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); + intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle); + context.startActivity(intent); + } + @Override protected void onNightModeChange() { super.onNightModeChange(); @@ -334,8 +359,5 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon if (mTitleTv != null) { mTitleTv.setTextColor(ContextCompat.getColor(this, R.color.text_black)); } - if (showDownloadMenu() && getMenuItem(R.id.menu_download) != null) { - ((ImageView) getMenuItem(R.id.menu_download).getActionView().findViewById(R.id.menu_download_iv)).setImageDrawable(ContextCompat.getDrawable(this, R.drawable.toolbar_download)); - } } } diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_TabLayout.java b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_TabLayout.java index 570adda100..ab1500996d 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_TabLayout.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_TabLayout.java @@ -29,7 +29,7 @@ import java.util.List; * Created by khy on 15/03/18. */ -public abstract class BaseFragment_TabLayout extends NormalFragment implements ViewPager.OnPageChangeListener { +public abstract class BaseFragment_TabLayout extends ToolbarFragment implements ViewPager.OnPageChangeListener { public static final String PAGE_INDEX = "PAGE_INDEX"; diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_ViewPager.java b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_ViewPager.java index 6ce117b710..264030a677 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_ViewPager.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_ViewPager.java @@ -34,7 +34,7 @@ import java.util.List; * @author CsHeng * @date 2013-3-6 */ -public abstract class BaseFragment_ViewPager extends NormalFragment implements DoubleTapTextView.OnDoubleTapListener { +public abstract class BaseFragment_ViewPager extends ToolbarFragment implements DoubleTapTextView.OnDoubleTapListener { public static final String ARGS_INDEX = "index"; protected int mCheckedIndex = 0; diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseLazyFragment.kt b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseLazyFragment.kt index 03d01f442f..489e6578b6 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseLazyFragment.kt +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseLazyFragment.kt @@ -5,7 +5,7 @@ import android.os.Bundle /** * 懒加载（支持多层嵌套） */ -abstract class BaseLazyFragment : NormalFragment() { +abstract class BaseLazyFragment : ToolbarFragment() { private var mIsFirstVisible = true diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/NormalFragment.java b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/ToolbarFragment.java similarity index 96% rename from module_common/src/main/java/com/gh/gamecenter/common/base/fragment/NormalFragment.java rename to module_common/src/main/java/com/gh/gamecenter/common/base/fragment/ToolbarFragment.java index df739c1a6a..9392151c3d 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/NormalFragment.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/ToolbarFragment.java @@ -16,7 +16,7 @@ import com.gh.gamecenter.common.constant.EntranceConsts; * Created by khy on 17/10/17. */ -public abstract class NormalFragment extends BaseFragment { +public abstract class ToolbarFragment extends BaseFragment { @Override public void onCreate(@Nullable Bundle savedInstanceState) { diff --git a/app/src/main/res/layout/activity_normal.xml b/module_common/src/main/res/layout/activity_normal.xml similarity index 100% rename from app/src/main/res/layout/activity_normal.xml rename to module_common/src/main/res/layout/activity_normal.xml diff --git a/app/src/main/res/layout/reuse_toolbar.xml b/module_common/src/main/res/layout/reuse_toolbar.xml similarity index 97% rename from app/src/main/res/layout/reuse_toolbar.xml rename to module_common/src/main/res/layout/reuse_toolbar.xml index b93500986b..563d31c440 100644 --- a/app/src/main/res/layout/reuse_toolbar.xml +++ b/module_common/src/main/res/layout/reuse_toolbar.xml @@ -67,14 +67,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - + tools:visibility="visible" />--> Date: Fri, 20 May 2022 18:50:55 +0800 Subject: [PATCH 50/52] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8Bv5.10.0=E3=80=91=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96(=E5=A4=A7=E8=87=B4?= =?UTF-8?q?=E5=AE=8C=E6=88=90)=20https://git.shanqu.cc/pm/halo-app-issues/?= =?UTF-8?q?-/issues/1830?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/entity/CommentEntity.kt | 2 +- .../com/gh/gamecenter/entity/MessageEntity.kt | 8 + .../gh/gamecenter/entity/RatingReplyEntity.kt | 21 +- .../detail/GameCollectionDetailActivity.kt | 53 ++- .../detail/GameCollectionDetailAdapter.kt | 12 + .../detail/GameCollectionDetailFragment.kt | 7 +- .../detail/GameCollectionDetailViewModel.kt | 47 +- ...ameCollectionCommentConversationAdapter.kt | 7 + .../gamedetail/rating/RatingReplyActivity.kt | 47 +- .../gamedetail/rating/RatingReplyAdapter.kt | 11 + .../gamedetail/rating/RatingReplyViewModel.kt | 300 +++++++------ .../message/MessageItemViewHolder.java | 415 ++++++++++-------- .../qa/comment/NewCommentDetailActivity.kt | 101 ++++- .../qa/comment/base/BaseCommentAdapter.kt | 3 +- .../qa/comment/base/BaseCommentViewModel.kt | 23 +- .../newdetail/NewQuestionDetailFragment.kt | 2 +- .../detail/comment/VideoCommentViewModel.kt | 11 +- .../retrofit/service/ApiService.java | 3 +- app/src/main/res/layout/message_item.xml | 53 +-- app/src/main/res/layout/rating_reply_item.xml | 22 +- .../gh/gamecenter/common/utils/TextHelper.kt | 1 + 21 files changed, 738 insertions(+), 411 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt index 470985fb90..b335f02903 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt @@ -12,7 +12,7 @@ data class CommentEntity( var id: String? = null, var user: UserEntity = UserEntity(), var parent: ArticleCommentParent? = null, - @SerializedName("parent_user") + @SerializedName("parent_user", alternate = ["parent"]) var parentUser: CommentParentEntity? = null, var content: String? = null, @SyncPage(syncNames = [SyncFieldConstants.ARTICLE_COMMENT_VOTE_COUNT]) diff --git a/app/src/main/java/com/gh/gamecenter/entity/MessageEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/MessageEntity.kt index d1f03036fb..6bb952e6c4 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/MessageEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/MessageEntity.kt @@ -177,6 +177,9 @@ class MessageEntity { var topId: String? = null var content: String? = null + + @SerializedName("parent_content") + var parentContent: String? = null } class Video { @@ -203,6 +206,11 @@ class MessageEntity { @SerializedName("comment_id") var commentId: String? = null + + var comment: String? = null + + @SerializedName("parent_content") + var parentContent: String? = null } class Activity { diff --git a/app/src/main/java/com/gh/gamecenter/entity/RatingReplyEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/RatingReplyEntity.kt index b87d99ffb9..6c64c840fb 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/RatingReplyEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/RatingReplyEntity.kt @@ -5,15 +5,18 @@ import com.google.gson.annotations.SerializedName import kotlinx.parcelize.Parcelize @Parcelize -class RatingReplyEntity(@SerializedName("_id") - val id: String = "", - val content: String = "", - val time: Long = 0, - val me: MeEntity = MeEntity(), - val user: UserEntity = UserEntity(), - var vote: Int = 0, - val weight: Int = 0, - val parent: Parent? = null) : Parcelable { +class RatingReplyEntity( + @SerializedName("_id") + val id: String = "", + val content: String = "", + val time: Long = 0, + val me: MeEntity = MeEntity(), + val user: UserEntity = UserEntity(), + var vote: Int = 0, + val weight: Int = 0, + val parent: Parent? = null, + var isHighlight: Boolean = false, +) : Parcelable { @Parcelize class Parent(val user: UserEntity) : Parcelable } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt index 91f28ba12c..620ae3235e 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt @@ -19,26 +19,65 @@ class GameCollectionDetailActivity : ToolBarActivity() { } override fun provideNormalIntent(): Intent { - return getTargetIntent(this, GameCollectionDetailActivity::class.java, GameCollectionDetailFragment::class.java) + return getTargetIntent( + this, + GameCollectionDetailActivity::class.java, + GameCollectionDetailFragment::class.java + ) } companion object { @JvmStatic - fun getIntent(context: Context, gameCollectionId: String, isFromSquare: Boolean = false): Intent { - return getIntent(context, gameCollectionId, isFromSquare, false) + fun getIntent( + context: Context, + gameCollectionId: String, + isFromSquare: Boolean = false + ): Intent { + return getIntent(context, gameCollectionId, "", isFromSquare, false) } @JvmStatic - fun getIntent(context: Context, gameCollectionId: String, isFromSquare: Boolean = false, isScrollToCommentArea: Boolean = false): Intent { + fun getSpecifiedCommentIntent( + context: Context, + gameCollectionId: String, + topCommentId: String + ): Intent { + return getIntent( + context, gameCollectionId, topCommentId, + isFromSquare = false, + isScrollToCommentArea = true + ) + } + + @JvmStatic + fun getIntent( + context: Context, + gameCollectionId: String, + topCommentId: String = "", + isFromSquare: Boolean = false, + isScrollToCommentArea: Boolean = false + ): Intent { val bundle = Bundle() bundle.putString(EntranceConsts.KEY_GAME_COLLECTION_ID, gameCollectionId) + bundle.putString(EntranceConsts.KEY_TOP_COMMENT_ID, topCommentId) bundle.putBoolean(EntranceConsts.KEY_IS_FROM_SQUARE, isFromSquare) bundle.putBoolean(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, isScrollToCommentArea) if (context is GameCollectionSquareActivity) { - val isFromBrowseTask = context.intent.getBooleanExtra(GameCollectionSquareBrowseTaskHelper.KEY_IS_FORM_BROWSE_TASK, false) - bundle.putBoolean(GameCollectionSquareBrowseTaskHelper.KEY_IS_FORM_BROWSE_TASK, isFromBrowseTask) + val isFromBrowseTask = context.intent.getBooleanExtra( + GameCollectionSquareBrowseTaskHelper.KEY_IS_FORM_BROWSE_TASK, + false + ) + bundle.putBoolean( + GameCollectionSquareBrowseTaskHelper.KEY_IS_FORM_BROWSE_TASK, + isFromBrowseTask + ) } - return getTargetIntent(context, GameCollectionDetailActivity::class.java, GameCollectionDetailFragment::class.java, bundle) + return getTargetIntent( + context, + GameCollectionDetailActivity::class.java, + GameCollectionDetailFragment::class.java, + bundle + ) } } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt index 479383593b..98e1404b10 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt @@ -195,6 +195,18 @@ open class GameCollectionDetailAdapter( // 游戏单详情页面用的样式 updateSubComment(this, comment) + if (comment.isHighlight) { + comment.isHighlight = false + binding.highlightBg.run { + visibility = View.VISIBLE + postDelayed({ + tryWithDefaultCatch { + visibility = View.GONE + } + }, 3000) + } + } + floorHintTv.visibility = View.INVISIBLE bottomDivider.visibility = View.GONE 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 85e87ec594..17de04b538 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 @@ -97,7 +97,12 @@ class GameCollectionDetailFragment : FragmentGameCollectionDetailBinding.inflate(layoutInflater).apply { mBinding = this }.root override fun provideListViewModel() = - viewModelProvider(GameCollectionDetailViewModel.Factory(mGameCollectionId)) + viewModelProvider( + GameCollectionDetailViewModel.Factory( + mGameCollectionId, + arguments?.getString(EntranceConsts.KEY_TOP_COMMENT_ID) ?: "" + ) + ) override fun provideListAdapter() = mAdapter ?: GameCollectionDetailAdapter( 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 4a45c9d018..c8e0628b65 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 @@ -40,9 +40,12 @@ import org.json.JSONObject import retrofit2.HttpException import tv.danmaku.ijk.media.exo2.ExoSourceManager -open class GameCollectionDetailViewModel(application: Application, - var gameCollectionId: String) : - BaseCommentViewModel(application, "", "", "", "") { +open class GameCollectionDetailViewModel( + application: Application, + var gameCollectionId: String, + topCommentId: String = "" +) : + BaseCommentViewModel(application, "", "", "", "", topCommentId) { var firstItemInitOverLiveData = MutableLiveData() var followLiveData = MutableLiveData() @@ -107,7 +110,8 @@ open class GameCollectionDetailViewModel(application: Application, } else { val gameLastIndex = games!!.size - 1 if (mResultLiveData.value?.get(0)?.game != null - && mResultLiveData.value?.get(gameLastIndex)?.game != null) { + && mResultLiveData.value?.get(gameLastIndex)?.game != null + ) { for (i in 0..gameLastIndex) { add(mResultLiveData.value!![i]) } @@ -126,12 +130,9 @@ open class GameCollectionDetailViewModel(application: Application, } else if (list.isNullOrEmpty() && mLoadStatusLiveData.value == LoadStatus.INIT_FAILED) { add(CommentItemData(errorConnection = true)) } else { - list?.forEachIndexed { index, commentEntity -> - if (topCommentId.isNotBlank() && index == 0) { - commentEntity.isHighlight = true - commentEntity.isForceExpand = true - } - add(CommentItemData(commentNormal = commentEntity)) + list?.forEachIndexed { index, entity -> + handleTopComment(index, entity) + add(CommentItemData(commentNormal = entity)) } add(CommentItemData(footer = true)) } @@ -141,6 +142,14 @@ open class GameCollectionDetailViewModel(application: Application, } } + override fun handleTopComment(index: Int, entity: CommentEntity) { + if (!isHandleTopComment && gameCollectionDetail != null && topCommentId.isNotBlank() && index == 0) { + isHandleTopComment = true + entity.isHighlight = true + entity.isForceExpand = true + } + } + fun followingCommand(userId: String, isFollow: Boolean) { val observable = if (isFollow) { RetrofitManager.getInstance().api.postFollowing(userId) @@ -288,7 +297,7 @@ open class GameCollectionDetailViewModel(application: Application, ) } } - }) + }) } @@ -383,7 +392,7 @@ open class GameCollectionDetailViewModel(application: Application, fun getStarText(): String { val favoriteCount = gameCollectionDetail?.count?.favorite ?: 0 - return when { + return when { favoriteCount == 0 -> "收藏" favoriteCount > 10000 -> "10000+" else -> favoriteCount.toString() @@ -392,7 +401,7 @@ open class GameCollectionDetailViewModel(application: Application, fun getShareText(): String { val shareCount = gameCollectionDetail?.count?.share ?: 0 - return when { + return when { shareCount == 0 -> "分享" shareCount > 10000 -> "10000+" else -> shareCount.toString() @@ -429,10 +438,18 @@ open class GameCollectionDetailViewModel(application: Application, } } - class Factory(private val gameCollectionId: String) : ViewModelProvider.NewInstanceFactory() { + class Factory( + private val gameCollectionId: String, + private val topCommentId: String + ) : + ViewModelProvider.NewInstanceFactory() { override fun create(modelClass: Class): T { - return GameCollectionDetailViewModel(HaloApp.getInstance().application, gameCollectionId) as T + return GameCollectionDetailViewModel( + HaloApp.getInstance().application, + gameCollectionId, + topCommentId + ) as T } } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationAdapter.kt index 94b86b39d2..79b290c1e7 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationAdapter.kt @@ -6,7 +6,9 @@ import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet import androidx.recyclerview.widget.RecyclerView +import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.dip2px +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.databinding.ItemArticleDetailCommentBinding import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailAdapter @@ -40,6 +42,11 @@ class GameCollectionCommentConversationAdapter( holder.bindView(mEntityList[position].commentTop!!) } + is CommentFooterViewHolder -> { + holder.itemView.setBackgroundColor(R.color.background_white.toColor(mContext)) + holder.bindView(mIsLoading, mIsNetworkError, mIsOver) + } + else -> super.onBindViewHolder(holder, position) } } 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 3f387b8e27..1e6f8a393a 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 @@ -170,7 +170,8 @@ class RatingReplyActivity : ListActivity(application) { +class RatingReplyViewModel( + application: Application, + private val gameId: String?, + var game: GameEntity?, + val commentId: String?, + var comment: RatingComment?, + var showKeyboardIfReplyIsEmpty: Boolean, + val topCommentId: String +) : ListViewModel(application) { private val mApi = RetrofitManager.getInstance().api private val mSensitiveApi = RetrofitManager.getInstance().api @@ -45,6 +45,7 @@ class RatingReplyViewModel(application: Application, val processDialog = MediatorLiveData() private var mSortValue = SORT_POSITIVE + private var isHandleTopComment = false init { mRealLoadStatusLiveData.addSource(mLoadStatusLiveData) { @@ -76,7 +77,11 @@ class RatingReplyViewModel(application: Application, } override fun provideDataObservable(page: Int): Observable> { - return mApi.getCommentReply(game?.id, comment?.id, mSortValue, page) + val map = hashMapOf() + if (topCommentId.isNotEmpty()) { + map["top_comment_id"] = topCommentId + } + return mApi.getCommentReply(game?.id, comment?.id, mSortValue, page, map) } override fun mergeResultLiveData() { @@ -102,67 +107,73 @@ class RatingReplyViewModel(application: Application, } } - list?.let { - for (entity in list) { - val replyItem = RatingReplyItem() - replyItem.reply = entity - itemList.add(replyItem) - } + list?.forEachIndexed { index, entity -> + val replyItem = RatingReplyItem() + replyItem.reply = entity + handleTopComment(index, entity) + itemList.add(replyItem) } mResultLiveData.postValue(itemList) } } + private fun handleTopComment(index: Int, entity: RatingReplyEntity) { + if (!isHandleTopComment && game != null && comment != null && topCommentId.isNotBlank() && index == 0) { + isHandleTopComment = true + entity.isHighlight = true + } + } + // 获取游戏摘要 private fun getGameDigest() { mSensitiveApi.getGameDigest(gameId) - .map(ApkActiveUtils.filterMapper) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Response() { - override fun onResponse(response: GameEntity?) { - game = response - if (comment == null) { - getCommentDigest() - } else { - load(LoadType.REFRESH) - headDataLiveData.postValue(true) - } + .map(ApkActiveUtils.filterMapper) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(object : Response() { + override fun onResponse(response: GameEntity?) { + game = response + if (comment == null) { + getCommentDigest() + } else { + load(LoadType.REFRESH) + headDataLiveData.postValue(true) } + } - override fun onFailure(e: HttpException?) { - if (e?.code() == 404) { - mRealLoadStatusLiveData.postValue(LoadStatus.INIT_EMPTY) - Utils.toast(getApplication(), R.string.comment_failed_unable) - } else { - mRealLoadStatusLiveData.postValue(LoadStatus.INIT_FAILED) - } + override fun onFailure(e: HttpException?) { + if (e?.code() == 404) { + mRealLoadStatusLiveData.postValue(LoadStatus.INIT_EMPTY) + Utils.toast(getApplication(), R.string.comment_failed_unable) + } else { + mRealLoadStatusLiveData.postValue(LoadStatus.INIT_FAILED) } - }) + } + }) } private fun getCommentDigest() { mApi.getGameComment(gameId, commentId) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Response() { - override fun onResponse(response: RatingComment?) { - response?.replyData = null - comment = response - load(LoadType.REFRESH) - headDataLiveData.postValue(true) - } + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(object : Response() { + override fun onResponse(response: RatingComment?) { + response?.replyData = null + comment = response + load(LoadType.REFRESH) + headDataLiveData.postValue(true) + } - override fun onFailure(e: HttpException?) { - if (e?.code() == 404) { - mRealLoadStatusLiveData.postValue(LoadStatus.INIT_EMPTY) - Utils.toast(getApplication(), R.string.comment_failed_unable) - } else { - mRealLoadStatusLiveData.postValue(LoadStatus.INIT_FAILED) - } - headDataLiveData.postValue(false) + override fun onFailure(e: HttpException?) { + if (e?.code() == 404) { + mRealLoadStatusLiveData.postValue(LoadStatus.INIT_EMPTY) + Utils.toast(getApplication(), R.string.comment_failed_unable) + } else { + mRealLoadStatusLiveData.postValue(LoadStatus.INIT_FAILED) } - }) + headDataLiveData.postValue(false) + } + }) } fun replyComment(replyId: String?, content: String, successCallback: () -> Unit) { @@ -182,30 +193,40 @@ class RatingReplyViewModel(application: Application, } val body = json.toRequestBody() val observable = - if (replyId.isNullOrEmpty()) { - mApi.postCommentReply(game?.id, comment?.id, body) - } else { - mApi.postReplyToReply(game?.id, comment?.id, replyId, body) - } + if (replyId.isNullOrEmpty()) { + mApi.postCommentReply(game?.id, comment?.id, body) + } else { + mApi.postReplyToReply(game?.id, comment?.id, replyId, body) + } observable - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Response() { - override fun onResponse(response: ResponseBody?) { - super.onResponse(response) - processDialog.postValue(WaitingDialogFragment.WaitingDialogData("提交中...", false)) - Utils.toast(getApplication(), "发表成功") - successCallback.invoke() - comment!!.reply = comment!!.reply + 1 - load(LoadType.REFRESH) - } + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(object : Response() { + override fun onResponse(response: ResponseBody?) { + super.onResponse(response) + processDialog.postValue( + WaitingDialogFragment.WaitingDialogData( + "提交中...", + false + ) + ) + Utils.toast(getApplication(), "发表成功") + successCallback.invoke() + comment!!.reply = comment!!.reply + 1 + load(LoadType.REFRESH) + } - override fun onFailure(e: HttpException?) { - super.onFailure(e) - processDialog.postValue(WaitingDialogFragment.WaitingDialogData("提交中...", false)) - ErrorHelper.handleError(getApplication(), e?.response()?.errorBody()?.string()) - } - }) + override fun onFailure(e: HttpException?) { + super.onFailure(e) + processDialog.postValue( + WaitingDialogFragment.WaitingDialogData( + "提交中...", + false + ) + ) + ErrorHelper.handleError(getApplication(), e?.response()?.errorBody()?.string()) + } + }) } fun voteReply(replyId: String, isVote: Boolean = true, callback: () -> Unit) { @@ -215,75 +236,75 @@ class RatingReplyViewModel(application: Application, mApi.postReplyUnvote(game?.id, comment?.id, replyId) } observable - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Response() { - override fun onResponse(response: ResponseBody?) { - Utils.toast(getApplication(), if (isVote) "点赞成功" else "取消点赞") + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(object : Response() { + override fun onResponse(response: ResponseBody?) { + Utils.toast(getApplication(), if (isVote) "点赞成功" else "取消点赞") - val list = mListLiveData.value - if (list != null) { - for (entity in list) { - if (entity.id == replyId) { - entity.me.isVoted = isVote - entity.vote = if (isVote) entity.vote + 1 else entity.vote - 1 - } + val list = mListLiveData.value + if (list != null) { + for (entity in list) { + if (entity.id == replyId) { + entity.me.isVoted = isVote + entity.vote = if (isVote) entity.vote + 1 else entity.vote - 1 } } - callback.invoke() } + callback.invoke() + } - override fun onFailure(e: HttpException?) { - val string = e?.response()?.errorBody()?.string() - val errorEntity = string?.toObject() - if (errorEntity?.code == 403008) { - onResponse(null) - return - } - ErrorHelper.handleError(getApplication(), e?.response()?.errorBody()?.string()) + override fun onFailure(e: HttpException?) { + val string = e?.response()?.errorBody()?.string() + val errorEntity = string?.toObject() + if (errorEntity?.code == 403008) { + onResponse(null) + return } - }) + ErrorHelper.handleError(getApplication(), e?.response()?.errorBody()?.string()) + } + }) } fun voteComment(callback: () -> Unit) { mApi.voteGameComment(game?.id, comment?.id) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Response() { - override fun onResponse(response: ResponseBody?) { - Utils.toast(getApplication(), "点赞成功") - callback.invoke() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(object : Response() { + override fun onResponse(response: ResponseBody?) { + Utils.toast(getApplication(), "点赞成功") + callback.invoke() - EnergyTaskHelper.postEnergyTask("vote_game_comment", commentId) - } + EnergyTaskHelper.postEnergyTask("vote_game_comment", commentId) + } - override fun onFailure(e: HttpException?) { - val string = e?.response()?.errorBody()?.string() - val errorEntity = string?.toObject() - if (errorEntity?.code == 403008) { - onResponse(null) - return - } - ErrorHelper.handleError(getApplication(), e?.response()?.errorBody()?.string()) + override fun onFailure(e: HttpException?) { + val string = e?.response()?.errorBody()?.string() + val errorEntity = string?.toObject() + if (errorEntity?.code == 403008) { + onResponse(null) + return } - }) + ErrorHelper.handleError(getApplication(), e?.response()?.errorBody()?.string()) + } + }) } fun unvoteComment(callback: () -> Unit) { mApi.unvoteGameComment(game?.id, comment?.id) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Response() { - override fun onResponse(response: ResponseBody?) { - Utils.toast(getApplication(), "取消点赞") - callback.invoke() - } + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(object : Response() { + override fun onResponse(response: ResponseBody?) { + Utils.toast(getApplication(), "取消点赞") + callback.invoke() + } - override fun onFailure(e: HttpException?) { - val string = e?.response()?.errorBody()?.string() - ErrorHelper.handleError(getApplication(), string) - } - }) + override fun onFailure(e: HttpException?) { + val string = e?.response()?.errorBody()?.string() + ErrorHelper.handleError(getApplication(), string) + } + }) } fun sortList(sortValue: String) { @@ -291,15 +312,26 @@ class RatingReplyViewModel(application: Application, load(LoadType.REFRESH) } - class Factory(private val gameId: String?, - private val game: GameEntity?, - private val commentId: String?, - private val comment: RatingComment?, - private val showKeyboardIfReplyIsEmpty: Boolean) : ViewModelProvider.NewInstanceFactory() { + class Factory( + private val gameId: String?, + private val game: GameEntity?, + private val commentId: String?, + private val comment: RatingComment?, + private val showKeyboardIfReplyIsEmpty: Boolean, + private val topCommentId: String + ) : ViewModelProvider.NewInstanceFactory() { override fun create(modelClass: Class): T { comment?.replyData = null // 不需要显示回复引用区域 - return RatingReplyViewModel(HaloApp.getInstance().application, gameId, game, commentId, comment, showKeyboardIfReplyIsEmpty) as T + return RatingReplyViewModel( + HaloApp.getInstance().application, + gameId, + game, + commentId, + comment, + showKeyboardIfReplyIsEmpty, + topCommentId + ) as T } } 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 b75f7ab87f..ce1318933e 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java @@ -2,6 +2,8 @@ package com.gh.gamecenter.message; import android.content.Context; import android.content.Intent; +import android.text.SpannableStringBuilder; +import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -11,9 +13,11 @@ import androidx.fragment.app.FragmentActivity; import com.gh.gamecenter.common.base.BaseActivity; import com.gh.common.databind.BindingAdapters; +import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.common.utils.TextHelper; import com.gh.gamecenter.core.utils.ClickUtils; import com.gh.common.util.DirectUtils; -import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.NewsUtils; @@ -49,11 +53,15 @@ import com.lightgame.utils.Utils; import java.util.ArrayList; import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; import retrofit2.HttpException; +import static com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity.LABEL_REGEX; + /** * Created by khy on 23/03/18. */ @@ -106,11 +114,11 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getAnswer().getImages(); if (images.size() > 0) { - targetUrl = images.get(0); + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0)); + } else { + mBinding.messageOriginalIcon.setVisibility(View.GONE); } - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); voteMoreUser(messageEntity); break; case "reply": @@ -119,9 +127,12 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setText(messageEntity.getDialogue().getFrom().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getArticle().getTitle()); targetUrl = messageEntity.getArticle().getThumb(); - ImageUtils.display(mBinding.messageArticleIcon, targetUrl); - mBinding.messageArticleIcon.setVisibility(View.VISIBLE); - mBinding.messageAskIcon.setVisibility(View.GONE); + if (TextUtils.isEmpty(targetUrl)) { + mBinding.messageOriginalIcon.setVisibility(View.GONE); + } else { + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.display(mBinding.messageOriginalIcon, targetUrl); + } voteMoreUser(messageEntity); break; case "follow_question": @@ -131,39 +142,39 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getAnswer().getImages(); if (images.size() > 0) { - targetUrl = images.get(0); + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0)); + } else { + mBinding.messageOriginalIcon.setVisibility(View.GONE); } - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); voteMoreUser(messageEntity); break; case "reply_answer_comment": - mBinding.messageCommand.setText("回复了你的回答"); + mBinding.messageCommand.setText("回复了你"); mBinding.messageContent.setVisibility(View.VISIBLE); mBinding.messageContent.setText(messageEntity.getDialogue().getFrom().getContent()); - mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); + mBinding.messageOriginalTitle.setText(messageEntity.getDialogue().getTo().getContent()); images = messageEntity.getAnswer().getImages(); if (images.size() > 0) { - targetUrl = images.get(0); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0)); + } else { + mBinding.messageOriginalIcon.setVisibility(View.GONE); } - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); voteMoreUser(messageEntity); break; case "answer_comment": - mBinding.messageCommand.setText("评论了你"); + mBinding.messageCommand.setText("回复了你的回答"); mBinding.messageContent.setVisibility(View.VISIBLE); mBinding.messageContent.setText(messageEntity.getComment().getContent()); - mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); + mBinding.messageOriginalTitle.setText(messageEntity.getAnswer().getContent()); images = messageEntity.getAnswer().getImages(); if (images.size() > 0) { - targetUrl = images.get(0); + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0)); + } else { + mBinding.messageOriginalIcon.setVisibility(View.GONE); } - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); voteMoreUser(messageEntity); break; case "answer_vote": @@ -172,11 +183,11 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getAnswer().getImages(); if (images.size() > 0) { - targetUrl = images.get(0); + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0)); + } else { + mBinding.messageOriginalIcon.setVisibility(View.GONE); } - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); voteMoreUser(messageEntity); break; case "comment_vote": @@ -184,9 +195,12 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setVisibility(View.GONE); mBinding.messageOriginalTitle.setText(messageEntity.getArticle().getTitle()); targetUrl = messageEntity.getArticle().getThumb(); - ImageUtils.display(mBinding.messageArticleIcon, targetUrl); - mBinding.messageArticleIcon.setVisibility(View.VISIBLE); - mBinding.messageAskIcon.setVisibility(View.GONE); + if (TextUtils.isEmpty(targetUrl)) { + mBinding.messageOriginalIcon.setVisibility(View.GONE); + } else { + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.display(mBinding.messageOriginalIcon, targetUrl); + } voteMoreUser(messageEntity); break; case "answer_comment_vote": @@ -195,11 +209,11 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getAnswer().getImages(); if (images.size() > 0) { - targetUrl = images.get(0); + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0)); + } else { + mBinding.messageOriginalIcon.setVisibility(View.GONE); } - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); voteMoreUser(messageEntity); break; case "invited": @@ -208,11 +222,11 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getQuestion().getImages(); if (images.size() > 0) { - targetUrl = images.get(0); + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0)); + } else { + mBinding.messageOriginalIcon.setVisibility(View.GONE); } - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); voteMoreUser(messageEntity); break; case "system_invited": @@ -221,24 +235,24 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getQuestion().getImages(); if (images.size() > 0) { - targetUrl = images.get(0); + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0)); + } else { + mBinding.messageOriginalIcon.setVisibility(View.GONE); } - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); voteMoreUser(messageEntity); break; case "community_article_vote": mBinding.messageCommand.setText("赞同你的帖子"); mBinding.messageContent.setVisibility(View.GONE); mBinding.messageOriginalTitle.setText(messageEntity.getArticle().getTitle()); - mBinding.messageArticleIcon.setVisibility(View.GONE); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); images = messageEntity.getArticle().getImages(); if (images.size() > 0) { - targetUrl = images.get(0); + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0)); + } else { + mBinding.messageOriginalIcon.setVisibility(View.GONE); } - ImageUtils.display(mBinding.messageAskIcon, targetUrl); voteMoreUser(messageEntity); break; case "community_article_comment": @@ -248,11 +262,11 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageOriginalTitle.setText(messageEntity.getArticle().getTitle()); images = messageEntity.getArticle().getImages(); if (images.size() > 0) { - targetUrl = images.get(0); + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0)); + } else { + mBinding.messageOriginalIcon.setVisibility(View.GONE); } - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); voteMoreUser(messageEntity); break; case "community_article_comment_vote": @@ -261,11 +275,11 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageOriginalTitle.setText(messageEntity.getArticle().getTitle()); images = messageEntity.getArticle().getImages(); if (images.size() > 0) { - targetUrl = images.get(0); + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0)); + } else { + mBinding.messageOriginalIcon.setVisibility(View.GONE); } - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); voteMoreUser(messageEntity); break; case "community_article_comment_reply_vote": @@ -274,25 +288,25 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageOriginalTitle.setText(messageEntity.getArticle().getTitle()); images = messageEntity.getArticle().getImages(); if (images.size() > 0) { - targetUrl = images.get(0); + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0)); + } else { + mBinding.messageOriginalIcon.setVisibility(View.GONE); } - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); voteMoreUser(messageEntity); break; case "reply_community_article_comment": mBinding.messageCommand.setText("回复了你的评论"); mBinding.messageContent.setVisibility(View.VISIBLE); mBinding.messageContent.setText(messageEntity.getDialogue().getFrom().getContent()); - mBinding.messageOriginalTitle.setText(messageEntity.getArticle().getTitle()); + mBinding.messageOriginalTitle.setText(messageEntity.getDialogue().getTo().getContent()); images = messageEntity.getArticle().getImages(); if (images.size() > 0) { - targetUrl = images.get(0); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0)); + } else { + mBinding.messageOriginalIcon.setVisibility(View.GONE); } - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); voteMoreUser(messageEntity); break; case "game_comment_vote": @@ -300,9 +314,12 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setVisibility(View.GONE); mBinding.messageOriginalTitle.setText(messageEntity.getGame().getName()); targetUrl = messageEntity.getGame().getDefaultIcon(); - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); + if (TextUtils.isEmpty(targetUrl)) { + mBinding.messageOriginalIcon.setVisibility(View.GONE); + } else { + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.display(mBinding.messageOriginalIcon, targetUrl); + } voteMoreUser(messageEntity); break; case "update-answer": @@ -312,11 +329,11 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getAnswer().getImages(); if (images.size() > 0) { - targetUrl = images.get(0); + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0)); + } else { + mBinding.messageOriginalIcon.setVisibility(View.GONE); } - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); voteMoreUser(messageEntity); break; case "game_comment_reply_vote": @@ -324,20 +341,57 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setVisibility(View.GONE); mBinding.messageOriginalTitle.setText(messageEntity.getGame().getName()); targetUrl = messageEntity.getGame().getDefaultIcon(); - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); + if (TextUtils.isEmpty(targetUrl)) { + mBinding.messageOriginalIcon.setVisibility(View.GONE); + } else { + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.display(mBinding.messageOriginalIcon, targetUrl); + } voteMoreUser(messageEntity); break; case "game_comment_reply": mBinding.messageCommand.setText("回复了你的评价"); mBinding.messageContent.setVisibility(View.VISIBLE); mBinding.messageContent.setText(messageEntity.getReply().getContent()); - mBinding.messageOriginalTitle.setText(messageEntity.getGame().getName()); + String parentContent = messageEntity.getReply().getParentContent(); + // parentContent为空代表是回复评价中的回复，否则是回复游戏评价 + if (!TextUtils.isEmpty(parentContent)) { + mBinding.messageOriginalTitle.setText(messageEntity.getReply().getParentContent()); + } else { + String comment = messageEntity.getReply().getComment(); + if (comment != null) { + comment = comment.replaceAll("\n", ""); + Pattern p = Pattern.compile(LABEL_REGEX); + Matcher m = p.matcher(comment); + if (m.find()) { + SpannableStringBuilder contents = TextHelper.getCommentLabelSpannableStringBuilder(comment, R.color.text_subtitleDesc); + ExtensionsKt.setTextWithHighlightedTextWrappedInsideWrapper( + mBinding.messageOriginalTitle, + contents, + Constants.DEFAULT_TEXT_WRAPPER, + R.color.text_subtitleDesc, + false, + null + ); + } else { + ExtensionsKt.setTextWithHighlightedTextWrappedInsideWrapper( + mBinding.messageOriginalTitle, + comment, + Constants.DEFAULT_TEXT_WRAPPER, + R.color.text_subtitleDesc, + false, + null + ); + } + } + } targetUrl = messageEntity.getGame().getDefaultIcon(); - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); + if (TextUtils.isEmpty(targetUrl)) { + mBinding.messageOriginalIcon.setVisibility(View.GONE); + } else { + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.display(mBinding.messageOriginalIcon, targetUrl); + } voteMoreUser(messageEntity); break; case "video_comment": @@ -346,20 +400,26 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setText(messageEntity.getComment().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getVideo().getTitle()); targetUrl = messageEntity.getVideo().getPoster(); - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); + if (TextUtils.isEmpty(targetUrl)) { + mBinding.messageOriginalIcon.setVisibility(View.GONE); + } else { + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.display(mBinding.messageOriginalIcon, targetUrl); + } voteMoreUser(messageEntity); break; case "video_comment_reply": mBinding.messageCommand.setText("回复了你的评论"); mBinding.messageContent.setVisibility(View.VISIBLE); mBinding.messageContent.setText(messageEntity.getDialogue().getFrom().getContent()); - mBinding.messageOriginalTitle.setText(messageEntity.getVideo().getTitle()); + mBinding.messageOriginalTitle.setText(messageEntity.getDialogue().getTo().getContent()); targetUrl = messageEntity.getVideo().getPoster(); - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); + if (TextUtils.isEmpty(targetUrl)) { + mBinding.messageOriginalIcon.setVisibility(View.GONE); + } else { + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.display(mBinding.messageOriginalIcon, targetUrl); + } voteMoreUser(messageEntity); break; case "video_comment_vote": @@ -367,9 +427,12 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setVisibility(View.GONE); mBinding.messageOriginalTitle.setText(messageEntity.getVideo().getTitle()); targetUrl = messageEntity.getVideo().getPoster(); - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); + if (TextUtils.isEmpty(targetUrl)) { + mBinding.messageOriginalIcon.setVisibility(View.GONE); + } else { + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.display(mBinding.messageOriginalIcon, targetUrl); + } voteMoreUser(messageEntity); break; case "video_vote": @@ -377,9 +440,12 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setVisibility(View.GONE); mBinding.messageOriginalTitle.setText(messageEntity.getVideo().getTitle()); targetUrl = messageEntity.getVideo().getPoster(); - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); + if (TextUtils.isEmpty(targetUrl)) { + mBinding.messageOriginalIcon.setVisibility(View.GONE); + } else { + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.display(mBinding.messageOriginalIcon, targetUrl); + } voteMoreUser(messageEntity); break; case "video_comment_reply_vote": @@ -387,9 +453,12 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setVisibility(View.GONE); mBinding.messageOriginalTitle.setText(messageEntity.getVideo().getTitle()); targetUrl = messageEntity.getVideo().getPoster(); - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); + if (TextUtils.isEmpty(targetUrl)) { + mBinding.messageOriginalIcon.setVisibility(View.GONE); + } else { + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.display(mBinding.messageOriginalIcon, targetUrl); + } voteMoreUser(messageEntity); break; case "reply_activity_comment": @@ -398,9 +467,12 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setText(messageEntity.getDialogue().getFrom().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getActivity().getTitle()); targetUrl = messageEntity.getActivity().getImageUrl(); - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); + if (TextUtils.isEmpty(targetUrl)) { + mBinding.messageOriginalIcon.setVisibility(View.GONE); + } else { + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.display(mBinding.messageOriginalIcon, targetUrl); + } voteMoreUser(messageEntity); break; case "activity_comment_vote": @@ -408,9 +480,12 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setVisibility(View.GONE); mBinding.messageOriginalTitle.setText(messageEntity.getActivity().getTitle()); targetUrl = messageEntity.getActivity().getImageUrl(); - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); + if (TextUtils.isEmpty(targetUrl)) { + mBinding.messageOriginalIcon.setVisibility(View.GONE); + } else { + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.display(mBinding.messageOriginalIcon, targetUrl); + } voteMoreUser(messageEntity); break; case "activity_comment_reply_vote": @@ -418,9 +493,12 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setVisibility(View.GONE); mBinding.messageOriginalTitle.setText(messageEntity.getActivity().getTitle()); targetUrl = messageEntity.getActivity().getImageUrl(); - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); + if (TextUtils.isEmpty(targetUrl)) { + mBinding.messageOriginalIcon.setVisibility(View.GONE); + } else { + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.display(mBinding.messageOriginalIcon, targetUrl); + } voteMoreUser(messageEntity); break; case "game_list_vote": @@ -428,9 +506,12 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setVisibility(View.GONE); mBinding.messageOriginalTitle.setText(messageEntity.getGameList().getTitle()); targetUrl = messageEntity.getGameList().getCover(); - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); + if (TextUtils.isEmpty(targetUrl)) { + mBinding.messageOriginalIcon.setVisibility(View.GONE); + } else { + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.display(mBinding.messageOriginalIcon, targetUrl); + } voteMoreUser(messageEntity); break; case "game_list_comment": @@ -439,20 +520,26 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setText(messageEntity.getComment().getContent()); mBinding.messageOriginalTitle.setText(messageEntity.getGameList().getTitle()); targetUrl = messageEntity.getGameList().getCover(); - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); + if (TextUtils.isEmpty(targetUrl)) { + mBinding.messageOriginalIcon.setVisibility(View.GONE); + } else { + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.display(mBinding.messageOriginalIcon, targetUrl); + } voteMoreUser(messageEntity); break; case "game_list_comment_reply": mBinding.messageCommand.setText("回复了你的游戏单评价"); mBinding.messageContent.setVisibility(View.VISIBLE); mBinding.messageContent.setText(messageEntity.getComment().getContent()); - mBinding.messageOriginalTitle.setText(messageEntity.getGameList().getTitle()); + mBinding.messageOriginalTitle.setText(messageEntity.getComment().getParentContent()); targetUrl = messageEntity.getGameList().getCover(); - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); + if (TextUtils.isEmpty(targetUrl)) { + mBinding.messageOriginalIcon.setVisibility(View.GONE); + } else { + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.display(mBinding.messageOriginalIcon, targetUrl); + } voteMoreUser(messageEntity); break; case "game_list_comment_vote": @@ -460,28 +547,15 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageContent.setVisibility(View.GONE); mBinding.messageOriginalTitle.setText(messageEntity.getGameList().getTitle()); targetUrl = messageEntity.getGameList().getCover(); - ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); - mBinding.messageAskIcon.setVisibility(View.VISIBLE); - mBinding.messageArticleIcon.setVisibility(View.GONE); + if (TextUtils.isEmpty(targetUrl)) { + mBinding.messageOriginalIcon.setVisibility(View.GONE); + } else { + mBinding.messageOriginalIcon.setVisibility(View.VISIBLE); + ImageUtils.display(mBinding.messageOriginalIcon, targetUrl); + } voteMoreUser(messageEntity); break; } - switch (messageEntity.getType()) { - case "video_comment": - case "video_comment_reply": - case "video_comment_vote": - case "video_vote": - case "video_comment_reply_vote": - params = new RelativeLayout.LayoutParams(DisplayUtils.dip2px(34f), DisplayUtils.dip2px(34f)); - mBinding.messageAskIcon.setLayoutParams(params); - mBinding.ivVideoPlay.setVisibility(View.VISIBLE); - break; - default: - params = new RelativeLayout.LayoutParams(DisplayUtils.dip2px(51f), DisplayUtils.dip2px(34f)); - mBinding.messageAskIcon.setLayoutParams(params); - mBinding.ivVideoPlay.setVisibility(View.GONE); - break; - } mBinding.messageUserMore.setOnClickListener(v -> { MessageEntity.Fold fold = messageEntity.getFold(); @@ -611,27 +685,27 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder } break; case "reply_answer_comment": - if (view.getId() == R.id.message_original) { - context.startActivity(SimpleAnswerDetailActivity.getIntent(context, entity.getAnswer().getId(), entrance, path)); - } else if (view.getId() == R.id.message_item) { - linkEntity = new LinkEntity(); - linkEntity.setType("answer"); - linkEntity.setLink(entity.getAnswer().getId()); - linkEntity.setTitle(entity.getQuestion().getTitle()); - intent = CommentDetailActivity.getAnswerCommentIntent(context, - entity.getDialogue().getFrom().getId(), - entity.getAnswer().getId(), - linkEntity); - context.startActivity(intent); - } + intent = NewCommentDetailActivity.Companion.getAnswerCommentIntent( + context, + entity.getAnswer().getId(), + entity.getQuestion().getId(), + entity.getDialogue().getFrom().getId(), + entrance, + path + ); + context.startActivity(intent); break; case "answer_comment_vote": case "answer_comment": - if (view.getId() == R.id.message_original) { - context.startActivity(SimpleAnswerDetailActivity.getIntent(context, entity.getAnswer().getId(), entrance, path)); - } else if (view.getId() == R.id.message_item) { // 打开评论管理 - context.startActivity(SimpleAnswerDetailActivity.getIntent(context, entity.getAnswer().getId(), entrance, path)); - } + intent = NewCommentDetailActivity.Companion.getAnswerCommentIntent( + context, + entity.getAnswer().getId(), + entity.getQuestion().getId(), + entity.getComment().getId(), + entrance, + path + ); + context.startActivity(intent); break; case "community_article_comment_vote": community = new CommunityEntity(entity.getArticle().getCommunityId(), ""); @@ -663,14 +737,11 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder } break; case "reply_community_article_comment": - intent = NewCommentDetailActivity.Companion.getIntent( + intent = NewCommentDetailActivity.Companion.getArticleCommentIntent( context, entity.getDialogue().getTo().getTopId(), entity.getArticle().getCommunityId(), entity.getArticle().getId(), - "", - "", - "", entity.getDialogue().getFrom().getId(), entrance, path @@ -684,10 +755,15 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder break; case "game_comment_reply": case "game_comment_reply_vote": - if (view.getId() == R.id.message_original || view.getId() == R.id.message_item) { - intent = RatingReplyActivity.getIntent(context, entity.getGame().getId(), entity.getReply().getCommentId(), entrance, path); - context.startActivity(intent); - } + intent = RatingReplyActivity.getSpecifiedCommentIntent( + context, + entity.getGame().getId(), + entity.getReply().getCommentId(), + entity.getReply().getId(), + entrance, + path + ); + context.startActivity(intent); break; case "video_vote": if (view.getId() == R.id.message_original || view.getId() == R.id.message_item) { @@ -713,14 +789,10 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder context.startActivity(intent); break; case "video_comment_reply": - intent = NewCommentDetailActivity.Companion.getIntent( + intent = NewCommentDetailActivity.Companion.getVideoCommentIntent( context, entity.getDialogue().getTo().getId(), - "", - "", entity.getVideo().getId(), - "", - "", entity.getDialogue().getFrom().getId(), entrance, path @@ -756,20 +828,17 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder break; case "game_list_comment": - if (view.getId() == R.id.message_original) { - context.startActivity(GameCollectionDetailActivity.getIntent(context, entity.getGameList().getId(), false)); - } else if (view.getId() == R.id.message_item) { - context.startActivity(GameCollectionDetailActivity.getIntent(context, entity.getGameList().getId(), false, true)); - } + intent = GameCollectionDetailActivity.Companion.getSpecifiedCommentIntent( + context, + entity.getGameList().getId(), + entity.getComment().getId() + ); + context.startActivity(intent); break; case "game_list_comment_reply": - intent = NewCommentDetailActivity.Companion.getIntent( + intent = NewCommentDetailActivity.Companion.getGameCollectionCommentIntent( context, entity.getComment().getTopId(), - "", - "", - "", - "", entity.getGameList().getId(), entity.getComment().getId(), entrance, diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentDetailActivity.kt index 4a8f9b78c9..28362f7445 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentDetailActivity.kt @@ -15,6 +15,100 @@ class NewCommentDetailActivity: ToolBarActivity() { } companion object { + + @JvmStatic + fun getArticleCommentIntent( + context: Context, + commentId: String, + communityId: String, + articleId: String, + topCommentId: String, + entrance: String, + path: String + ): Intent { + return getIntent( + context, + commentId, + communityId, + articleId, + "", + "", + "", + topCommentId, + entrance, + path + ) + } + + @JvmStatic + fun getAnswerCommentIntent( + context: Context, + commentId: String, + questionId: String, + topCommentId: String, + entrance: String, + path: String + ): Intent { + return getIntent( + context, + commentId, + "", + "", + "", + questionId, + "", + topCommentId, + entrance, + path + ) + } + + @JvmStatic + fun getVideoCommentIntent( + context: Context, + commentId: String, + videoId: String, + topCommentId: String, + entrance: String, + path: String + ): Intent { + return getIntent( + context, + commentId, + "", + "", + videoId, + "", + "", + topCommentId, + entrance, + path + ) + } + + @JvmStatic + fun getGameCollectionCommentIntent( + context: Context, + commentId: String, + gameCollectionId: String, + topCommentId: String, + entrance: String, + path: String + ): Intent { + return getIntent( + context, + commentId, + "", + "", + "", + "", + gameCollectionId, + topCommentId, + entrance, + path + ) + } + @JvmStatic fun getIntent( context: Context, @@ -39,7 +133,12 @@ class NewCommentDetailActivity: ToolBarActivity() { bundle.putString(CommentActivity.GAME_COLLECTION_ID, gameCollectionId) bundle.putString(EntranceConsts.KEY_TOP_COMMENT_ID, topCommentId) bundle.putString(EntranceConsts.KEY_PATH, path) - return getTargetIntent(context, NewCommentDetailActivity::class.java, CommentConversationFragment::class.java, bundle) + return getTargetIntent( + context, + NewCommentDetailActivity::class.java, + CommentConversationFragment::class.java, + bundle + ) } } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt index 27dc21a0ca..18bbb98458 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt @@ -3,6 +3,7 @@ package com.gh.gamecenter.qa.comment.base import android.annotation.SuppressLint import android.content.Context import android.text.SpannableStringBuilder +import android.text.TextUtils import android.view.View import android.view.ViewGroup import androidx.annotation.StringRes @@ -435,7 +436,7 @@ abstract class BaseCommentAdapter( binding.likeCountTv.text = viewModel.getLikeText(comment.vote, "") binding.root.setOnClickListener { binding.commentCountTv.performClick() } - if (comment.parentUser != null) { + if (comment.parentUser != null && !TextUtils.isEmpty(comment.parentUser!!.id)) { val prefix = "回复" val colon = " ：" val parentUserName = " @${comment.parentUser?.name} " 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 46cca1293f..6d16d77393 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 @@ -115,19 +115,16 @@ abstract class BaseCommentViewModel( } else { //从第二楼开始 var floor = 2 - commentList?.forEachIndexed { index, commentEntity -> + commentList?.forEachIndexed { index, entity -> if (displayFloor) { - commentEntity.floor = floor + entity.floor = floor } // 没有 me 会导致不能跨页面更新点赞 - if (commentEntity.me == null) { - commentEntity.me = MeEntity() + if (entity.me == null) { + entity.me = MeEntity() } - if (topCommentId.isNotBlank() && index == 0) { - commentEntity.isHighlight = true - commentEntity.isForceExpand = true - } - add(CommentItemData(commentNormal = commentEntity)) + handleTopComment(index, entity) + add(CommentItemData(commentNormal = entity)) if (displayFloor) { floor++ } @@ -139,6 +136,14 @@ abstract class BaseCommentViewModel( } } + open fun handleTopComment(index: Int, entity: CommentEntity) { + if (!isHandleTopComment && topItemData != null && topCommentId.isNotBlank() && index == 0) { + isHandleTopComment = true + entity.isHighlight = true + entity.isForceExpand = true + } + } + fun getCommentDraft(id: String): CommentDraft? { return CommentDraftContainer.commentDraftDao.getDraftById(id) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt index 1545bf1a74..0117a31281 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt @@ -453,7 +453,7 @@ class NewQuestionDetailFragment : arguments?.getParcelable(EntranceConsts.KEY_COMMUNITY_DATA)?.id ?: "", arguments?.getString(EntranceConsts.KEY_ANSWER_ID) ?: "", arguments?.getString(EntranceConsts.KEY_RECOMMEND_ID) ?: "", - arguments?.getString(EntranceConsts.KEY_RECOMMEND_ID) ?: "", + arguments?.getString(EntranceConsts.KEY_TOP_COMMENT_ID) ?: "", ) ) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentViewModel.kt index e9e5ecd3e9..0811d0bc26 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentViewModel.kt @@ -39,13 +39,10 @@ class VideoCommentViewModel( itemDataList.add(CommentItemData(errorConnection = true)) } else { var floor = 1 - list.forEachIndexed { index, commentEntity -> - commentEntity.floor = floor - if (topCommentId.isNotBlank() && index == 0) { - commentEntity.isHighlight = true - commentEntity.isForceExpand = true - } - itemDataList.add(CommentItemData(commentNormal = commentEntity)) + list.forEachIndexed { index, entity -> + entity.floor = floor + handleTopComment(index, entity) + itemDataList.add(CommentItemData(commentNormal = entity)) floor++ } itemDataList.add(CommentItemData(footer = true)) diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java index 6b4b237027..46ae741600 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java @@ -1812,7 +1812,8 @@ public interface ApiService { Observable> getCommentReply(@Path("game_id") String gameId, @Path("comment_id") String commitId, @Query("sort") String sort, - @Query("page") int page); + @Query("page") int page, + @QueryMap Map params); /** * 回复评论 diff --git a/app/src/main/res/layout/message_item.xml b/app/src/main/res/layout/message_item.xml index 37ee8c40d5..a50288d39e 100644 --- a/app/src/main/res/layout/message_item.xml +++ b/app/src/main/res/layout/message_item.xml @@ -101,52 +101,21 @@ android:layout_height="52dp" android:layout_marginTop="8dp" android:background="@drawable/bg_shape_f8_radius_8" - android:paddingLeft="10dp" - android:paddingTop="8dp" - android:paddingRight="10dp" - android:paddingBottom="8dp" app:layout_constraintLeft_toLeftOf="@id/message_user_name" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/message_content"> - - - - - - - - - + app:layout_constraintRight_toRightOf="parent" /> + app:layout_constraintRight_toLeftOf="@+id/message_original_icon" /> diff --git a/app/src/main/res/layout/rating_reply_item.xml b/app/src/main/res/layout/rating_reply_item.xml index cf02252301..2578be3bd8 100644 --- a/app/src/main/res/layout/rating_reply_item.xml +++ b/app/src/main/res/layout/rating_reply_item.xml @@ -11,14 +11,24 @@ android:id="@+id/comment_item" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" - android:paddingLeft="11dp" - android:paddingRight="20dp"> + android:background="@color/background_white"> + + @@ -125,6 +136,7 @@ android:id="@+id/vote" android:layout_width="wrap_content" android:layout_height="48dp" + android:layout_marginRight="20dp" android:drawableLeft="@drawable/comment_vote_selector" android:drawablePadding="4dp" android:gravity="center_vertical" diff --git a/module_common/src/main/java/com/gh/gamecenter/common/utils/TextHelper.kt b/module_common/src/main/java/com/gh/gamecenter/common/utils/TextHelper.kt index fa06d2124e..e842ad92be 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/utils/TextHelper.kt +++ b/module_common/src/main/java/com/gh/gamecenter/common/utils/TextHelper.kt @@ -267,6 +267,7 @@ object TextHelper { return contents } + @JvmStatic fun getCommentLabelSpannableStringBuilder(comment: CharSequence, colorRes: Int): SpannableStringBuilder { val contents = SpannableStringBuilder() var count = 0 From 7f68763047be78f735b77733ac5c1f4adcdda094 Mon Sep 17 00:00:00 2001 From: lyr Date: Fri, 20 May 2022 19:00:15 +0800 Subject: [PATCH 51/52] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8Bv5.10.0=E3=80=91=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96(=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=AD=97=E6=AE=B5=E5=86=B2=E7=AA=81)=20https?= =?UTF-8?q?://git.shanqu.cc/pm/halo-app-issues/-/issues/1830?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt index b335f02903..470985fb90 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/CommentEntity.kt @@ -12,7 +12,7 @@ data class CommentEntity( var id: String? = null, var user: UserEntity = UserEntity(), var parent: ArticleCommentParent? = null, - @SerializedName("parent_user", alternate = ["parent"]) + @SerializedName("parent_user") var parentUser: CommentParentEntity? = null, var content: String? = null, @SyncPage(syncNames = [SyncFieldConstants.ARTICLE_COMMENT_VOTE_COUNT]) From c99b5d9940545499ac8c14c704e0016b9b771d3f Mon Sep 17 00:00:00 2001 From: juntao Date: Mon, 23 May 2022 10:35:22 +0800 Subject: [PATCH 52/52] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.10.0=E3=80=91=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=B1=87=E6=80=BB5=E6=9C=88=E7=AC=AC2=E5=91=A8(2)=20https://gi?= =?UTF-8?q?t.shanqu.cc/pm/halo-app-issues/-/issues/1845?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/home/HomeViewModel.kt | 20 +++++++++---------- .../home/LegacyHomeSubjectTransformer.kt | 7 ++++++- 2 files changed, 16 insertions(+), 11 deletions(-) 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 663d76eaa4..62a7f52a9b 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt @@ -8,18 +8,21 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData import com.gh.common.filter.RegionSettingHelper -import com.gh.common.util.* +import com.gh.common.util.ApkActiveUtils +import com.gh.common.util.GameSubstituteRepositoryHelper +import com.gh.common.util.GameUtils +import com.gh.common.util.HomePluggableHelper import com.gh.download.DownloadManager import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.baselist.LoadStatus +import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.core.utils.RandomUtils import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.entity.* import com.gh.gamecenter.game.rank.RankCollectionAdapter import com.gh.gamecenter.gamecollection.square.GameCollectionListItemData import com.gh.gamecenter.packagehelper.PackageRepository -import com.gh.gamecenter.common.retrofit.BiResponse -import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.halo.assistant.fragment.SettingsFragment @@ -27,8 +30,6 @@ import com.lightgame.utils.Utils import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers import retrofit2.HttpException -import java.util.* -import kotlin.collections.ArrayList import kotlin.collections.set class HomeViewModel(application: Application) : AndroidViewModel(application) { @@ -276,7 +277,7 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) { // 是否使用带特别高的带分割线的 item var useUltraHeightDivider = false - var hasDivider = false + var shouldShowDivider = false val iterator = mHomeContents.iterator() while (iterator.hasNext()) { @@ -302,7 +303,6 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) { mSmartSubject = null // 防止重复插入 } - if (mHomeSlides.isNotEmpty()) { val slideItem = HomeItemData() slideItem.slides = mHomeSlides @@ -333,7 +333,7 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) { if (i + 1 < mHomeContents.size) { val nextItem = mHomeContents[i + 1] - hasDivider = nextItem.linkType == "game" || nextItem.linkType == "video" + shouldShowDivider = nextItem.linkType == "game" || nextItem.linkType == "video" } if (linkType == "game" || linkType == "video") { @@ -441,14 +441,14 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) { mSnapshotItemList.add(unknown) } - if (i != 0 && hasDivider) { + if (i != 0 && shouldShowDivider) { if (useUltraHeightDivider) { useUltraHeightDivider = false mSnapshotItemList.add(HomeItemData(lineDivider = ULTRA_HEIGHT_DIVIDER)) } else { mSnapshotItemList.add(HomeItemData(lineDivider = DEFAULT_DIVIDER)) } - hasDivider = false + shouldShowDivider = false } } itemDataList.postValue(mSnapshotItemList) diff --git a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeSubjectTransformer.kt b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeSubjectTransformer.kt index 9fdb453a6c..19dc63aa7e 100644 --- a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeSubjectTransformer.kt +++ b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeSubjectTransformer.kt @@ -68,7 +68,7 @@ object LegacyHomeSubjectTransformer { if (subjectEntity.type == "image" || subjectEntity.type == "image_slide") return } - if (subjectEntity.type != "gallery") { + if (subjectEntity.type != "gallery" && subjectEntity.showName) { val itemDataHead = newItemInstance() itemDataHead.blockPosition = blockPosition + 1 itemDataHead.columnHead = subjectEntity @@ -79,6 +79,11 @@ object LegacyHomeSubjectTransformer { } itemList.add(itemDataHead) + } else { + // 标题隐藏的情况下移除默认添加到空白间距 + if (itemList.lastOrNull()?.blankDivider != null) { + itemList.removeLastOrNull() + } } if (subjectEntity.type == "game_vertical_slide") {