From e3f6d64fa964ef3c5642414fabec5b6524472973 Mon Sep 17 00:00:00 2001 From: liuyirong Date: Thu, 4 Aug 2022 11:28:24 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=84=E4=BB=B6=E5=8C=96?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD=20https://git.shanqu.cc/ha?= =?UTF-8?q?lo/android/assistant-android/-/issues/73?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 7 +- app/proguard-rules.txt | 2 + app/src/main/AndroidManifest.xml | 21 --- .../main/java/com/gh/common/DefaultJsApi.kt | 11 +- .../java/com/gh/common/constant/Config.java | 2 +- .../gh/common/databind/BindingAdapters.java | 2 +- .../gh/common/dialog/CertificationDialog.kt | 2 +- .../gh/common/provider/ConfigProviderImpl.kt | 16 +++ .../common/provider/DataUtilsProviderImpl.kt | 20 +++ .../provider/DefaultUrlHandlerProviderImpl.kt | 9 +- .../provider/DownloadManagerProviderImpl.kt | 4 + .../common/provider/EnergyTaskProviderImpl.kt | 8 ++ .../provider/ErrorHelperProviderImpl.kt | 28 ++++ .../GameSubstituteRepositoryProviderImpl.kt | 19 +++ .../common/provider/LogUtilsProviderImpl.kt | 19 +++ .../MessageUnreadRepositoryProviderImpl.kt | 19 +++ .../common/provider/QuickLoginProviderImpl.kt | 19 --- .../ReservationRepositoryProviderImpl.kt | 23 ++++ .../com/gh/common/provider/WebProviderImpl.kt | 4 + .../provider/WechatHelperProviderImpl.kt | 18 +++ .../repository/ReservationRepository.kt | 2 +- .../common/simulator/SimulatorGameManager.kt | 2 +- .../com/gh/common/util/CheckLoginUtils.java | 5 +- .../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/DataUtils.java | 4 +- .../java/com/gh/common/util/DialogUtils.java | 24 +--- .../java/com/gh/common/util/DirectUtils.kt | 2 +- .../com/gh/common/util/EnergyTaskHelper.kt | 2 +- .../java/com/gh/common/util/ErrorHelper.kt | 4 +- .../common/util/GameActivityDownloadHelper.kt | 2 +- .../util/GameSubstituteRepositoryHelper.kt | 2 +- .../java/com/gh/common/util/LibaoUtils.java | 4 +- .../java/com/gh/common/util/LogUtils.java | 9 +- .../com/gh/common/util/PlatformUtils.java | 2 +- .../com/gh/common/util/UsageStatsHelper.kt | 2 +- .../com/gh/common/util/WechatBindHelper.kt | 2 +- .../gh/common/videolog/VideoRecordUtils.kt | 2 +- .../com/gh/common/view/ImageContainerView.kt | 2 +- .../java/com/gh/download/DownloadManager.java | 2 +- .../java/com/gh/download/PackageObserver.kt | 2 +- .../gh/flutter/FlutterUserServiceImplAop.java | 4 +- .../gh/gamecenter/LibaoDetailActivity.java | 4 +- .../java/com/gh/gamecenter/MainActivity.java | 16 +-- .../com/gh/gamecenter/NewsDetailActivity.java | 4 +- .../java/com/gh/gamecenter/SkipActivity.java | 5 +- .../com/gh/gamecenter/SuggestionActivity.java | 4 +- .../com/gh/gamecenter/UserInfoEditActivity.kt | 2 +- .../adapter/viewholder/DetailViewHolder.java | 2 +- .../com/gh/gamecenter/amway/AmwayFragment.kt | 5 +- .../amway/search/AmwaySearchViewModel.kt | 2 +- .../gamecenter/collection/AnswerViewModel.kt | 2 +- .../collection/ArticleViewModel.java | 2 +- .../collection/CollectionWrapperFragment.java | 2 +- .../collection/CommunityArticleViewModel.kt | 2 +- .../collection/GamesCollectionAdapter.kt | 2 +- .../collection/GamesCollectionFragment.kt | 2 +- .../gamecenter/collection/ToolsFragment.java | 2 +- .../gamecenter/collection/VideoViewModel.kt | 2 +- .../douyinapi/DouYinEntryActivity.java | 2 +- .../download/GameUpdateFragment.java | 2 +- .../download/InstalledGameFragment.kt | 2 +- .../download/NewInstalledGameFragment.kt | 2 +- .../download/UpdatableGameFragment.kt | 2 +- .../gamecenter/energy/EnergyCenterFragment.kt | 6 +- .../gamecenter/energy/EnergyHouseFragment.kt | 6 +- .../energy/HorizontalTaskAdapter.kt | 2 +- .../com/gh/gamecenter/energy/TaskAdapter.kt | 2 +- .../gamecenter/entity/ArticleCommentParent.kt | 1 + .../com/gh/gamecenter/entity/BadgeEntity.kt | 1 + .../gamecenter/entity/CommentParentEntity.kt | 1 + .../entity/FollowersOrFansEntity.kt | 2 + .../gh/gamecenter/entity/MessageKeFuEntity.kt | 1 + .../gh/gamecenter/entity/PersonalEntity.kt | 18 +-- .../entity/PersonalHistoryEntity.kt | 2 +- .../com/gh/gamecenter/entity/UserEntity.kt | 2 + .../forum/detail/ForumDetailFragment.kt | 9 +- .../forum/home/CommunityHomeFragment.kt | 6 +- .../home/ForumArticleAskItemViewHolder.kt | 7 +- .../forum/home/ForumArticleListFragment.kt | 2 +- .../forum/home/ForumArticleListViewModel.kt | 2 +- .../gh/gamecenter/forum/home/ForumFragment.kt | 2 +- .../forum/home/ForumHomeViewModel.kt | 2 +- .../gamecenter/forum/home/ForumViewModel.kt | 2 +- .../forum/list/ForumListVIewModel.kt | 2 +- .../forum/moderator/ApplyModeratorFragment.kt | 2 +- .../forum/moderator/ModeratorListAdapter.kt | 2 +- .../forum/moderator/ModeratorTaskAdapter.kt | 2 +- .../search/ForumContentSearchListAdapter.kt | 2 +- .../forum/search/UserSearchListAdapter.kt | 2 +- .../forum/select/ForumSelectViewModel.kt | 2 +- .../fragment/MainWrapperFragment.java | 2 +- .../fragment/MainWrapperViewModel.kt | 2 +- .../fragment/SearchToolWrapperFragment.java | 2 +- .../fragment/SearchToolbarFragment.java | 2 +- .../com/gh/gamecenter/game/GameFragment.kt | 2 +- .../game/upload/GameUploadViewModel.kt | 2 +- .../choose/AddUserPlayedGameFragment.kt | 2 +- .../detail/GameCollectionDetailFragment.kt | 4 +- .../detail/GameCollectionDetailViewModel.kt | 2 +- .../detail/GameCollectionPosterFragment.kt | 2 +- ...meCollectionCommentConversationFragment.kt | 2 +- .../mine/MyGameCollectionFragment.kt | 2 +- .../mine/MyGameCollectionViewModel.kt | 2 +- .../publish/GameCollectionEditActivity.kt | 2 +- .../square/GameCollectionSquareFragment.kt | 4 +- .../gamedetail/GameDetailFragment.kt | 3 +- .../gamedetail/GameDetailViewModel.kt | 2 +- .../gamecenter/gamedetail/desc/DescAdapter.kt | 2 +- .../gamedetail/desc/DescCommentsAdapter.kt | 4 +- .../gamedetail/desc/DescFragment.kt | 2 +- .../gamedetail/desc/GameLibaoAdapter.kt | 2 +- .../gamedetail/dialog/InviteCodeDialog.kt | 2 +- .../gamedetail/fuli/FuLiFragment.kt | 2 +- .../gamedetail/myrating/MyRatingViewModel.kt | 2 +- .../rating/RatingCommentItemViewHolder.kt | 2 +- .../gamedetail/rating/RatingFragment.kt | 5 +- .../gamedetail/rating/RatingReplyAdapter.kt | 2 +- .../rating/edit/RatingEditActivity.kt | 2 +- .../help/QaFeedbackDialogFragment.kt | 2 +- .../history/HistoryWrapperFragment.kt | 2 +- .../com/gh/gamecenter/home/HomeFragment.kt | 2 +- .../gh/gamecenter/info/ConcernAdapter.java | 2 +- .../gh/gamecenter/info/ConcernFragment.java | 6 +- .../gh/gamecenter/info/StrategyFragment.java | 8 +- .../gh/gamecenter/libao/Libao1Fragment.java | 2 +- .../gh/gamecenter/libao/Libao2Fragment.java | 4 +- .../libao/Libao2FragmentAdapter.java | 2 +- .../gh/gamecenter/libao/Libao3Fragment.java | 4 +- .../libao/Libao3FragmentAdapter.java | 2 +- .../gh/gamecenter/libao/LibaoFragment.java | 2 +- .../gh/gamecenter/libao/LibaoNewFragment.java | 2 +- .../gamecenter/libao/LibaoSearchFragment.java | 2 +- .../gamecenter/manager/CommunityManager.java | 45 +++++++ .../message/KeFuFragmentAdapter.java | 2 +- .../gh/gamecenter/message/KeFuViewModel.kt | 2 +- .../message/MessageDetailFragment.java | 8 +- .../message/MessageItemViewHolder.java | 2 +- .../message/MessageNormalViewModel.kt | 2 +- .../message/MessageUnreadRepository.kt | 2 +- .../mygame/MyFollowedGameFragment.kt | 7 +- .../mygame/MyFollowedGameViewModel.kt | 2 +- .../mygame/MyReservationFragment.kt | 7 +- .../mygame/MyReservationViewModel.kt | 2 +- .../gamecenter/mygame/PlayedGameFragment.kt | 7 +- .../packagehelper/PackageRepository.kt | 2 +- .../personal/NewPersonalFragment.kt | 15 +-- .../gamecenter/personal/PersonalFragment.kt | 15 +-- .../personal/PersonalFunctionAdapter.kt | 5 +- .../gamecenter/personal/PersonalViewModel.kt | 2 +- .../personalhome/FollowersOrFansAdapter.kt | 2 +- .../personalhome/FollowersOrFansFragment.kt | 2 +- .../personalhome/InstalledGameDialog.kt | 2 +- .../personalhome/UserHomeFragment.kt | 5 +- .../background/BackgroundPreviewActivity.kt | 2 +- .../background/BackgroundPreviewFragment.kt | 6 +- .../PersonalityBackgroundAdapter.kt | 4 +- .../PersonalityBackgroundFragment.kt | 2 +- .../PersonalityBackgroundViewModel.kt | 2 +- .../border/AvatarBorderFragment.kt | 6 +- .../border/ChooseAvatarBorderAdapter.kt | 4 +- .../border/ChooseAvatarBorderViewModel.kt | 2 +- .../home/game/UserPlayedGameFragment.kt | 2 +- .../personalhome/rating/RatingActivity.kt | 2 +- .../gamecenter/provider/GhContentProvider.kt | 4 +- .../com/gh/gamecenter/qa/CommunityFragment.kt | 30 ++--- .../gh/gamecenter/qa/CommunityViewModel.kt | 10 +- .../gh/gamecenter/qa/all/AskAllFragment.kt | 6 +- .../BaseAnswerOrArticleItemViewHolder.kt | 5 +- .../answer/CommunityAnswerItemViewHolder.kt | 2 +- .../qa/answer/detail/AnswerDetailFragment.kt | 7 +- .../qa/answer/draft/AnswerDraftAdapter.java | 2 +- .../qa/answer/draft/AnswerDraftFragment.java | 4 +- .../qa/answer/edit/AnswerEditActivity.kt | 2 +- .../qa/answer/edit/AnswerEditViewModel.kt | 4 +- .../qa/article/MyArticleFragment.kt | 2 +- .../qa/article/SimpleArticleListAdapter.kt | 4 +- .../qa/article/SimpleArticleListFragment.kt | 10 +- .../qa/article/SimpleArticleListViewModel.kt | 4 +- .../detail/ArticleDetailContentViewHolder.kt | 2 +- .../article/detail/ArticleDetailFragment.kt | 6 +- .../article/detail/ArticleDetailViewModel.kt | 2 +- .../comment/ArticleDetailCommentFragment.kt | 2 +- .../qa/article/draft/ArticleDraftFragment.kt | 4 +- .../qa/article/edit/ArticleEditActivity.kt | 9 +- .../qa/article/edit/ArticleEditViewModel.kt | 9 +- .../gamecenter/qa/column/AskColumnAdapter.kt | 8 +- .../qa/column/AskColumnRepository.java | 11 +- .../qa/column/AskColumnViewModel.kt | 4 +- .../detail/recommends/RecommendsAdapter.kt | 6 +- .../qa/comment/NewCommentFragment.kt | 2 +- .../qa/comment/StairsCommentViewHolder.kt | 2 +- .../CommentConversationFragment.kt | 2 +- .../dialog/ChooseForumContainerViewModel.kt | 2 +- .../gamecenter/qa/editor/AnswerViewModel.kt | 2 +- .../gamecenter/qa/editor/ArticleViewModel.kt | 2 +- .../gh/gamecenter/qa/editor/GameFragment.kt | 2 +- .../InsertGameCollectionWrapperActivity.kt | 2 +- .../qa/editor/OnlineVideoViewModel.kt | 2 +- .../gh/gamecenter/qa/entity/AnswerEntity.kt | 2 +- .../gh/gamecenter/qa/entity/ArticleEntity.kt | 2 +- .../gamecenter/qa/entity/AskSubjectEntity.kt | 2 +- .../gh/gamecenter/qa/entity/InviteEntity.kt | 4 +- .../qa/entity/SuggestedFollowEntity.kt | 2 +- .../gamecenter/qa/follow/AskFollowFragment.kt | 8 +- .../qa/follow/AskFollowViewModel.kt | 6 +- .../qa/myqa/ConcernQuestionsFragment.java | 2 +- .../gamecenter/qa/myqa/MyAnswerFragment.java | 2 +- .../qa/myqa/MyAskWrapperFragment.java | 2 +- .../qa/myqa/MyQuestionsFragment.java | 2 +- .../newest/AskQuestionsNewBodyFragment.java | 12 +- .../qa/newest/AskQuestionsNewFragment.java | 4 +- .../questions/CommunityQuestionViewHolder.kt | 4 +- .../detail/QuestionsDetailFragment.kt | 6 +- .../detail/QuestionsDetailViewModel.kt | 2 +- .../questions/draft/QuestionDraftFragment.kt | 2 +- .../questions/draft/QuestionDraftViewModel.kt | 2 +- .../qa/questions/edit/QuestionEditActivity.kt | 4 +- .../questions/edit/QuestionEditViewModel.kt | 8 +- .../qa/questions/edit/TagsSelectFragment.kt | 12 +- .../QuestionsInviteWrapperFragment.java | 2 +- .../newdetail/NewQuestionDetailFragment.kt | 2 +- .../newdetail/NewQuestionDetailViewModel.kt | 2 +- .../QuestionDetailContentViewHolder.kt | 2 +- .../AskQuestionsRecommendsAdapter.java | 8 +- .../AskQuestionsRecommendsFragment.java | 8 +- .../AskQuestionsRecommendsViewModel.java | 24 ++-- .../AskRecommendSubjectViewModel.kt | 10 +- .../recommends/AskRecommendWrapperFragment.kt | 14 +- .../AskRecommendsSubjectPageAdapter.java | 4 +- .../qa/recommends/RecommendConcernAdapter.kt | 4 +- .../newest/RecommendNewestAdapter.kt | 6 +- .../newest/RecommendNewestFragment.kt | 4 +- .../qa/search/AskSearchActivity.java | 14 +- .../qa/search/artilce/ArticleFragment.kt | 8 +- .../qa/search/base/BaseAskSearchAdapter.kt | 10 +- .../search/history/HistoryFragmentAdapter.kt | 8 +- .../qa/search/history/HistoryViewModel.kt | 4 +- .../qa/search/history/HotFragmentAdapter.kt | 6 +- .../qa/search/hottest/HottestFragment.kt | 8 +- .../qa/search/newest/NewestFragment.kt | 8 +- .../qa/search/question/QuestionFragment.kt | 8 +- .../gamecenter/qa/search/user/UserAdapter.kt | 2 +- .../gamecenter/qa/search/user/UserFragment.kt | 8 +- .../qa/tags/AskQuestionsNewRepository.java | 11 +- .../video/detail/ForumVideoDetailFragment.kt | 2 +- .../detail/comment/VideoCommentFragment.kt | 2 +- .../detail/desc/VideoDescTopViewHolder.kt | 2 +- .../video/detail/desc/VideoDescViewModel.kt | 2 +- .../qa/video/publish/VideoPublishFragment.kt | 2 +- .../qa/video/publish/VideoPublishViewModel.kt | 2 +- .../retrofit/service/ApiService.java | 111 +-------------- .../gamecenter/security/BindPhoneActivity.kt | 8 +- .../security/BindPhoneConflictFragment.kt | 2 +- .../gamecenter/security/BindPhoneFragment.kt | 5 +- .../gamecenter/security/BindPhoneViewModel.kt | 2 +- .../gamecenter/security/SecurityFragment.kt | 6 +- .../subject/tile/SubjectTileFragment.kt | 2 +- .../video/data/VideoDataViewModel.kt | 2 +- .../video/detail/DetailPlayerView.kt | 2 +- .../detail/VideoDetailContainerFragment.kt | 5 +- .../detail/VideoDetailContainerViewModel.kt | 2 +- .../video/upload/view/UploadVideoViewModel.kt | 2 +- .../video/videomanager/VideoDraftViewModel.kt | 2 +- .../videomanager/VideoVerifyViewModel.kt | 2 +- .../main/java/com/halo/assistant/HaloApp.java | 2 +- .../assistant/fragment/SettingsFragment.kt | 12 +- .../halo/assistant/fragment/WebFragment.kt | 4 +- .../fragment/myconcern/MyConcernAdapter.java | 2 +- .../fragment/myconcern/MyConcernFragment.java | 4 +- .../fragment/user/ManuallyRealNameFragment.kt | 2 +- .../user/ManuallyRealNameViewModel.kt | 4 +- .../fragment/user/RealNameInfoViewModel.kt | 10 +- .../fragment/user/SelectPortraitFragment.java | 2 +- .../fragment/user/SelectRegionFragment.java | 4 +- .../fragment/user/UserInfoEditFragment.kt | 6 +- .../fragment/user/UserInfoFragment.kt | 4 +- .../user/region/RegionCounAdapter.java | 2 +- .../user/region/RegionProvAdapter.java | 2 +- app/src/main/res/drawable/login_btn_bg.xml | 12 -- app/src/main/res/values/strings.xml | 26 ---- app/src/main/res/values/styles.xml | 6 - module_common/build.gradle | 1 + .../gamecenter/common/constant/Constants.java | 6 + .../gamecenter/common/constant/RouteConsts.kt | 14 +- .../gamecenter/common}/eventbus/EBReuse.java | 2 +- .../gamecenter/common/utils/DialogUtils.java | 2 +- .../gamecenter/common/utils/NetworkUtils.java | 19 +-- .../res/drawable/bg_shape_white_radius_8.xml | 0 .../src/main/res/drawable/cursor_color.xml | 0 .../drawable/download_button_normal_style.xml | 0 module_common/src/main/res/values/strings.xml | 6 + module_common/src/main/res/values/style.xml | 6 + .../core/provider/IConfigProvider.kt | 4 + .../core/provider/IDataUtilsProvider.kt | 9 ++ .../provider/IDefaultUrlHandlerProvider.kt | 2 +- .../core/provider/IDownloadManagerProvider.kt | 2 + .../core/provider/IEnergyTaskProvider.kt | 4 + .../core/provider/IErrorHelperProvider.kt | 13 ++ .../IGameSubstituteRepositoryProvider.kt | 9 ++ .../core/provider/ILogUtilsProvider.kt | 9 ++ .../IMessageUnreadRepositoryProvider.kt | 9 ++ .../core/provider/IQuickLoginProvider.kt | 2 + .../IReservationRepositoryProvider.kt | 11 ++ .../gamecenter/core/provider/IWebProvider.kt | 2 + .../provider/IWechatBindHelperProvider.kt | 7 + module_login/.gitignore | 1 + module_login/build.gradle | 57 ++++++++ .../libs/quick_login_android_5.8.1.aar | Bin module_login/proguard-rules.pro | 21 +++ .../login/ExampleInstrumentedTest.kt | 24 ++++ module_login/src/main/AndroidManifest.xml | 39 ++++++ .../java/com/gh/gamecenter/login/HaloApp.kt | 44 ++++++ .../gh/gamecenter/login}/entity/AuthEntity.kt | 2 +- .../login}/entity/AvatarBorderEntity.kt | 2 +- .../login}/entity/BackgroundImageEntity.kt | 2 +- .../com/gh/gamecenter/login/entity/Badge.kt | 16 +++ .../gamecenter/login}/entity/IdCardEntity.kt | 2 +- .../login/entity/LoginTokenEntity.java | 67 +++++++++ .../gamecenter/login/entity/TokenEntity.java | 27 ++++ .../login}/entity/UserInfoEntity.kt | 2 +- .../login/entity/WechatConfigEntity.kt | 11 ++ .../login/provider/QuickLoginProviderImpl.kt | 34 +++++ .../provider/UserManagerProviderImpl.kt | 4 +- .../gamecenter/login/retrofit/ApiService.java | 127 ++++++++++++++++++ .../login/retrofit/RetrofitManager.java | 32 +++++ .../gh/gamecenter/login}/user/LoginTag.java | 2 +- .../gamecenter/login/user}/UserManager.java | 62 +++------ .../login}/user/UserRepository.java | 117 +++++++++------- .../gamecenter/login}/user/UserViewModel.java | 12 +- .../login/utils}/AccessTokenKeeper.java | 2 +- .../gh/gamecenter/login/utils}/LoginHelper.kt | 31 +++-- .../gamecenter/login/utils}/LoginUtils.java | 4 +- .../gh/gamecenter/login/utils/NewLogUtils.kt | 41 ++++++ .../login/utils}/QuickLoginHelper.kt | 103 +++++++++----- .../gamecenter/login/view}/LoginActivity.java | 6 +- .../gamecenter/login/view}/LoginFragment.java | 76 ++++++----- .../gh/gamecenter/wxapi/WXEntryActivity.java | 21 +-- .../wxapi/WeChatUserInfoThread.java | 9 +- .../src/main/res/anim/anim_auth_in.xml | 0 .../src/main/res/anim/anim_auth_out.xml | 0 .../src/main/res/anim/cycle_interpolator.xml | 0 .../src/main/res/anim/login_policy_shake.xml | 0 .../bg_quick_login_permission_dialog.webp | Bin .../res/drawable-xxhdpi/ic_login_close.webp | Bin .../main/res/drawable-xxhdpi/ic_login_qq.webp | Bin .../res/drawable-xxhdpi/ic_login_wechat.webp | Bin .../res/drawable-xxhdpi/ic_login_weibo.webp | Bin .../drawable-xxhdpi/ic_quick_login_check.webp | Bin .../drawable-xxhdpi/ic_quick_login_close.webp | Bin .../ic_quick_login_dialog_phone.webp | Bin .../ic_quick_login_uncheck.webp | Bin .../bg_quick_login_dialog.webp | Bin .../bg_quick_login_permission_dialog.webp | Bin .../ic_quick_login_dialog_phone.webp | Bin .../main/res/drawable/bg_invite_dialog.xml | 0 .../src/main/res/drawable/bg_login_edit.xml | 0 .../res/drawable/bg_shape_fa_radius_8.xml | 0 .../drawable/selector_ic_login_checkbox.xml | 0 .../main/res/layout/dialog_quick_login.xml | 0 .../layout/dialog_quick_login_permission.xml | 0 .../src/main/res/layout/fragment_login.xml | 6 +- .../layout/layout_quick_login_navigation.xml | 0 module_login/src/main/res/values/strings.xml | 29 ++++ module_login/src/main/res/values/styles.xml | 10 ++ .../main/res/xml/network_security_config.xml | 0 .../gh/gamecenter/login/ExampleUnitTest.kt | 17 +++ settings.gradle | 1 + 370 files changed, 1755 insertions(+), 949 deletions(-) create mode 100644 app/src/main/java/com/gh/common/provider/DataUtilsProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/ErrorHelperProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/GameSubstituteRepositoryProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/LogUtilsProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/MessageUnreadRepositoryProviderImpl.kt delete mode 100644 app/src/main/java/com/gh/common/provider/QuickLoginProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/ReservationRepositoryProviderImpl.kt create mode 100644 app/src/main/java/com/gh/common/provider/WechatHelperProviderImpl.kt create mode 100644 app/src/main/java/com/gh/gamecenter/manager/CommunityManager.java delete mode 100644 app/src/main/res/drawable/login_btn_bg.xml rename {app/src/main/java/com/gh/gamecenter => module_common/src/main/java/com/gh/gamecenter/common}/eventbus/EBReuse.java (83%) rename {app => module_common}/src/main/res/drawable/bg_shape_white_radius_8.xml (100%) rename {app => module_common}/src/main/res/drawable/cursor_color.xml (100%) rename {app => module_common}/src/main/res/drawable/download_button_normal_style.xml (100%) create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IDataUtilsProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IErrorHelperProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IGameSubstituteRepositoryProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/ILogUtilsProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IMessageUnreadRepositoryProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IReservationRepositoryProvider.kt create mode 100644 module_core/src/main/java/com/gh/gamecenter/core/provider/IWechatBindHelperProvider.kt create mode 100644 module_login/.gitignore create mode 100644 module_login/build.gradle rename {module_common => module_login}/libs/quick_login_android_5.8.1.aar (100%) create mode 100644 module_login/proguard-rules.pro create mode 100644 module_login/src/androidTest/java/com/gh/gamecenter/login/ExampleInstrumentedTest.kt create mode 100644 module_login/src/main/AndroidManifest.xml create mode 100644 module_login/src/main/java/com/gh/gamecenter/login/HaloApp.kt rename {app/src/main/java/com/gh/gamecenter => module_login/src/main/java/com/gh/gamecenter/login}/entity/AuthEntity.kt (89%) rename {app/src/main/java/com/gh/gamecenter => module_login/src/main/java/com/gh/gamecenter/login}/entity/AvatarBorderEntity.kt (93%) rename {app/src/main/java/com/gh/gamecenter => module_login/src/main/java/com/gh/gamecenter/login}/entity/BackgroundImageEntity.kt (90%) create mode 100644 module_login/src/main/java/com/gh/gamecenter/login/entity/Badge.kt rename {app/src/main/java/com/gh/gamecenter => module_login/src/main/java/com/gh/gamecenter/login}/entity/IdCardEntity.kt (90%) create mode 100644 module_login/src/main/java/com/gh/gamecenter/login/entity/LoginTokenEntity.java create mode 100644 module_login/src/main/java/com/gh/gamecenter/login/entity/TokenEntity.java rename {app/src/main/java/com/gh/gamecenter => module_login/src/main/java/com/gh/gamecenter/login}/entity/UserInfoEntity.kt (95%) create mode 100644 module_login/src/main/java/com/gh/gamecenter/login/entity/WechatConfigEntity.kt create mode 100644 module_login/src/main/java/com/gh/gamecenter/login/provider/QuickLoginProviderImpl.kt rename {app/src/main/java/com/gh/common => module_login/src/main/java/com/gh/gamecenter/login}/provider/UserManagerProviderImpl.kt (92%) create mode 100644 module_login/src/main/java/com/gh/gamecenter/login/retrofit/ApiService.java create mode 100644 module_login/src/main/java/com/gh/gamecenter/login/retrofit/RetrofitManager.java rename {app/src/main/java/com/gh/gamecenter => module_login/src/main/java/com/gh/gamecenter/login}/user/LoginTag.java (89%) rename {app/src/main/java/com/gh/gamecenter/manager => module_login/src/main/java/com/gh/gamecenter/login/user}/UserManager.java (87%) rename {app/src/main/java/com/gh/gamecenter => module_login/src/main/java/com/gh/gamecenter/login}/user/UserRepository.java (83%) rename {app/src/main/java/com/gh/gamecenter => module_login/src/main/java/com/gh/gamecenter/login}/user/UserViewModel.java (97%) rename {app/src/main/java/com/gh/common/util => module_login/src/main/java/com/gh/gamecenter/login/utils}/AccessTokenKeeper.java (98%) rename {app/src/main/java/com/gh/common/util => module_login/src/main/java/com/gh/gamecenter/login/utils}/LoginHelper.kt (87%) rename {app/src/main/java/com/gh/common/util => module_login/src/main/java/com/gh/gamecenter/login/utils}/LoginUtils.java (99%) create mode 100644 module_login/src/main/java/com/gh/gamecenter/login/utils/NewLogUtils.kt rename {app/src/main/java/com/gh/common/util => module_login/src/main/java/com/gh/gamecenter/login/utils}/QuickLoginHelper.kt (81%) rename {app/src/main/java/com/gh/gamecenter => module_login/src/main/java/com/gh/gamecenter/login/view}/LoginActivity.java (93%) rename {app/src/main/java/com/gh/gamecenter/fragment => module_login/src/main/java/com/gh/gamecenter/login/view}/LoginFragment.java (87%) rename {app => module_login}/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java (86%) rename {app => module_login}/src/main/java/com/gh/gamecenter/wxapi/WeChatUserInfoThread.java (90%) rename {app => module_login}/src/main/res/anim/anim_auth_in.xml (100%) rename {app => module_login}/src/main/res/anim/anim_auth_out.xml (100%) rename {app => module_login}/src/main/res/anim/cycle_interpolator.xml (100%) rename {app => module_login}/src/main/res/anim/login_policy_shake.xml (100%) rename {app => module_login}/src/main/res/drawable-xxhdpi/bg_quick_login_permission_dialog.webp (100%) rename {app => module_login}/src/main/res/drawable-xxhdpi/ic_login_close.webp (100%) rename {app => module_login}/src/main/res/drawable-xxhdpi/ic_login_qq.webp (100%) rename {app => module_login}/src/main/res/drawable-xxhdpi/ic_login_wechat.webp (100%) rename {app => module_login}/src/main/res/drawable-xxhdpi/ic_login_weibo.webp (100%) rename {app => module_login}/src/main/res/drawable-xxhdpi/ic_quick_login_check.webp (100%) rename {app => module_login}/src/main/res/drawable-xxhdpi/ic_quick_login_close.webp (100%) rename {app => module_login}/src/main/res/drawable-xxhdpi/ic_quick_login_dialog_phone.webp (100%) rename {app => module_login}/src/main/res/drawable-xxhdpi/ic_quick_login_uncheck.webp (100%) rename {app => module_login}/src/main/res/drawable-xxxhdpi/bg_quick_login_dialog.webp (100%) rename {app => module_login}/src/main/res/drawable-xxxhdpi/bg_quick_login_permission_dialog.webp (100%) rename {app => module_login}/src/main/res/drawable-xxxhdpi/ic_quick_login_dialog_phone.webp (100%) rename {app => module_login}/src/main/res/drawable/bg_invite_dialog.xml (100%) rename {app => module_login}/src/main/res/drawable/bg_login_edit.xml (100%) rename {app => module_login}/src/main/res/drawable/bg_shape_fa_radius_8.xml (100%) rename {app => module_login}/src/main/res/drawable/selector_ic_login_checkbox.xml (100%) rename {app => module_login}/src/main/res/layout/dialog_quick_login.xml (100%) rename {app => module_login}/src/main/res/layout/dialog_quick_login_permission.xml (100%) rename {app => module_login}/src/main/res/layout/fragment_login.xml (99%) rename {app => module_login}/src/main/res/layout/layout_quick_login_navigation.xml (100%) create mode 100644 module_login/src/main/res/values/strings.xml create mode 100644 module_login/src/main/res/values/styles.xml rename {app => module_login}/src/main/res/xml/network_security_config.xml (100%) create mode 100644 module_login/src/test/java/com/gh/gamecenter/login/ExampleUnitTest.kt diff --git a/app/build.gradle b/app/build.gradle index 732c8e0c22..4bae6780c9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -255,8 +255,6 @@ dependencies { implementation "io.github.florent37:shapeofview:${shapeOfView}" - implementation "io.github.sinaweibosdk:core:${weiboSDK}" - implementation "com.lg:apksig:${apksig}" implementation "com.lg:gid:${gid}" @@ -267,6 +265,9 @@ dependencies { implementation(project(':module_common')) { exclude group: 'androidx.swiperefreshlayout' } + implementation(project(':module_login')) { + exclude group: 'androidx.swiperefreshlayout' + } } File propFile = file('sign.properties') if (propFile.exists()) { @@ -382,7 +383,7 @@ andResGuard { "R.drawable.ic_recommend_function", "R.drawable.ic_recommend_gift", "R.drawable.ic_recommend_role", - "R.drawable.login_btn_bg", + "R.drawable.download_button_normal_style", "R.drawable.ic_quick_login_check", "R.drawable.ic_quick_login_uncheck", "R.anim.anim_auth_in", diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt index 5338165eaf..4522ad9ef5 100644 --- a/app/proguard-rules.txt +++ b/app/proguard-rules.txt @@ -70,8 +70,10 @@ -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.login.entity.* {*;} -keep class com.gh.gamecenter.retrofit.* {*;} -keep class com.gh.gamecenter.eventbus.* {*;} +-keep class com.gh.gamecenter.common.eventbus.* {*;} -keep class com.gh.gamecenter.video.detail.* {*;} -keep class com.gh.gamecenter.home.gamecollection.* {*;} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 74faeb16ad..c832a14c36 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -70,7 +70,6 @@ android:icon="@mipmap/logo" android:label="@string/app_name" android:largeHeap="true" - android:networkSecurityConfig="@xml/network_security_config" android:resizeableActivity="true" android:theme="@style/AppCompatTheme.APP" tools:replace="android:name,android:allowBackup" @@ -257,11 +256,6 @@ android:name=".category.CategoryListActivity" android:screenOrientation="portrait" /> - - @@ -651,14 +645,6 @@ android:name=".gamecollection.detail.GameCollectionPosterActivity" android:screenOrientation="portrait" /> - - - @@ -740,13 +726,6 @@ android:name=".qa.comment.NewCommentDetailActivity" android:screenOrientation="portrait" /> - - diff --git a/app/src/main/java/com/gh/common/DefaultJsApi.kt b/app/src/main/java/com/gh/common/DefaultJsApi.kt index be6ddb6adc..3b913d1ebd 100644 --- a/app/src/main/java/com/gh/common/DefaultJsApi.kt +++ b/app/src/main/java/com/gh/common/DefaultJsApi.kt @@ -27,14 +27,17 @@ import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.energy.EnergyCenterActivity import com.gh.gamecenter.energy.EnergyHouseActivity -import com.gh.gamecenter.entity.Badge import com.gh.gamecenter.entity.MtaEvent import com.gh.gamecenter.help.QaFeedbackDialogFragment -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.entity.Badge +import com.gh.gamecenter.login.user.LoginTag +import com.gh.gamecenter.login.view.LoginActivity +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.personalhome.border.AvatarBorderActivity import com.gh.gamecenter.security.BindPhoneActivity -import com.gh.gamecenter.user.LoginTag -import com.gh.gamecenter.user.UserRepository +import com.gh.gamecenter.login.user.UserRepository +import com.gh.gamecenter.login.utils.LoginHelper +import com.gh.gamecenter.login.utils.QuickLoginHelper import com.halo.assistant.HaloApp import com.lightgame.utils.Utils import org.json.JSONObject 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 c0f7371ed5..92c74a552f 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -20,7 +20,7 @@ import com.gh.gamecenter.entity.GameGuidePopupEntity; 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.common.eventbus.EBReuse; import com.gh.gamecenter.common.retrofit.BiResponse; import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; 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 a306ceecd8..f2b881713b 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -64,7 +64,7 @@ import com.gh.gamecenter.entity.PluginLocation; import com.gh.gamecenter.entity.ServerCalendarEntity; import com.gh.gamecenter.entity.TagStyleEntity; import com.gh.gamecenter.entity.TestEntity; -import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.common.eventbus.EBReuse; import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment; import com.gh.gamecenter.manager.PackagesManager; import com.gh.gamecenter.qa.entity.CommunityVideoEntity; 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 9b18db28a3..c4076a9a87 100644 --- a/app/src/main/java/com/gh/common/dialog/CertificationDialog.kt +++ b/app/src/main/java/com/gh/common/dialog/CertificationDialog.kt @@ -27,7 +27,7 @@ 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 -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.google.gson.reflect.TypeToken import com.halo.assistant.fragment.user.UserInfoEditFragment import com.lightgame.utils.AppManager 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 50d5c1aaf1..df023e652b 100644 --- a/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt @@ -16,6 +16,10 @@ class ConfigProviderImpl : IConfigProvider { return Config.WECHAT_APPID } + override fun getWechatSecret(): String { + return Config.WECHAT_SECRET + } + override fun getUploadLimitSize(): Long { return Config.getSettings()?.image?.uploadLimitSize ?: 0L } @@ -56,6 +60,18 @@ class ConfigProviderImpl : IConfigProvider { return Config.getSettings()?.support?.qq ?: "" } + override fun getQuickLoginAppId(): String { + return Config.QUICK_LOGIN_APPID + } + + override fun getQuickLoginAppKey(): String { + return Config.QUICK_LOGIN_APPKEY + } + + override fun getWeiboAppKey(): String { + return Config.WEIBO_APPKEY + } + override fun init(context: Context?) { } diff --git a/app/src/main/java/com/gh/common/provider/DataUtilsProviderImpl.kt b/app/src/main/java/com/gh/common/provider/DataUtilsProviderImpl.kt new file mode 100644 index 0000000000..7fa1ff9207 --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/DataUtilsProviderImpl.kt @@ -0,0 +1,20 @@ +package com.gh.common.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.common.util.DataUtils +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IDataUtilsProvider +import com.halo.assistant.HaloApp + +@Route(path = RouteConsts.provider.dataUtils, name = "DataUtils暴露服务") +class DataUtilsProviderImpl : IDataUtilsProvider { + + override fun getDeviceCertification() { + DataUtils.getDeviceCertification(HaloApp.getInstance().gid) + } + + 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 index d7b1da9fb2..c35c25d854 100644 --- a/app/src/main/java/com/gh/common/provider/DefaultUrlHandlerProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/DefaultUrlHandlerProviderImpl.kt @@ -9,8 +9,13 @@ 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 interceptUrl( + context: Context, + url: String, + entrance: String, + bringAppToFront: Boolean + ): Boolean { + return DefaultUrlHandler.interceptUrl(context, url, entrance, bringAppToFront) } 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 index e2abd7407f..08e1cbcf58 100644 --- a/app/src/main/java/com/gh/common/provider/DownloadManagerProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/DownloadManagerProviderImpl.kt @@ -14,6 +14,10 @@ class DownloadManagerProviderImpl : IDownloadManagerProvider { return DownloadManager.getInstance().getDownloadEntityByUrl(url) } + override fun resumeAllInvisiblePendingTask() { + DownloadManager.getInstance().resumeAllInvisiblePendingTask() + } + override fun init(context: Context?) { } diff --git a/app/src/main/java/com/gh/common/provider/EnergyTaskProviderImpl.kt b/app/src/main/java/com/gh/common/provider/EnergyTaskProviderImpl.kt index b78a5e072a..c26b6c2cc3 100644 --- a/app/src/main/java/com/gh/common/provider/EnergyTaskProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/EnergyTaskProviderImpl.kt @@ -17,6 +17,14 @@ class EnergyTaskProviderImpl : IEnergyTaskProvider { IntegralLogHelper.logInviteResult(result, type) } + override fun postEnergyTask(action: String) { + EnergyTaskHelper.postEnergyTask(action) + } + + override fun postInviteCodeTask(code: String, from: String, callback: (() -> Unit)?) { + EnergyTaskHelper.postInviteCodeTask(code, from, callback) + } + override fun init(context: Context?) { } diff --git a/app/src/main/java/com/gh/common/provider/ErrorHelperProviderImpl.kt b/app/src/main/java/com/gh/common/provider/ErrorHelperProviderImpl.kt new file mode 100644 index 0000000000..4cb9cedeb0 --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/ErrorHelperProviderImpl.kt @@ -0,0 +1,28 @@ +package com.gh.common.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.common.util.ErrorHelper +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IErrorHelperProvider +import retrofit2.HttpException + +@Route(path = RouteConsts.provider.errorHelper, name = "ErrorHelper暴露服务") +class ErrorHelperProviderImpl : IErrorHelperProvider { + + override fun handleError( + context: Context, + errorString: String?, + showHighPriorityHint: Boolean + ) { + ErrorHelper.handleError(context, errorString, showHighPriorityHint) + } + + override fun handleLoginError(context: Context, httpException: HttpException?) { + ErrorHelper.handleLoginError(context, httpException) + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/GameSubstituteRepositoryProviderImpl.kt b/app/src/main/java/com/gh/common/provider/GameSubstituteRepositoryProviderImpl.kt new file mode 100644 index 0000000000..1ce6a109b5 --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/GameSubstituteRepositoryProviderImpl.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.GameSubstituteRepositoryHelper +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IGameSubstituteRepositoryProvider + +@Route(path = RouteConsts.provider.gameSubstituteRepository, name = "GameSubstituteRepositoryHelper暴露服务") +class GameSubstituteRepositoryProviderImpl : IGameSubstituteRepositoryProvider { + + override fun updateSubstitutableGames() { + GameSubstituteRepositoryHelper.updateSubstitutableGames() + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/LogUtilsProviderImpl.kt b/app/src/main/java/com/gh/common/provider/LogUtilsProviderImpl.kt new file mode 100644 index 0000000000..1966c98b84 --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/LogUtilsProviderImpl.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.* +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.* + +@Route(path = RouteConsts.provider.logUtils, name = "LogUtils暴露服务") +class LogUtilsProviderImpl : ILogUtilsProvider { + + override fun login(loginStep: String, loginType: String, entrance: String) { + LogUtils.login(loginStep, loginType, entrance) + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/MessageUnreadRepositoryProviderImpl.kt b/app/src/main/java/com/gh/common/provider/MessageUnreadRepositoryProviderImpl.kt new file mode 100644 index 0000000000..8bbc2bd8af --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/MessageUnreadRepositoryProviderImpl.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.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IMessageUnreadRepositoryProvider +import com.gh.gamecenter.message.MessageUnreadRepository + +@Route(path = RouteConsts.provider.messageUnreadRepository, name = "MessageUnreadRepository暴露服务") +class MessageUnreadRepositoryProviderImpl : IMessageUnreadRepositoryProvider { + + override fun loadMessageUnreadData() { + MessageUnreadRepository.loadMessageUnreadData() + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/QuickLoginProviderImpl.kt b/app/src/main/java/com/gh/common/provider/QuickLoginProviderImpl.kt deleted file mode 100644 index 369322fd73..0000000000 --- a/app/src/main/java/com/gh/common/provider/QuickLoginProviderImpl.kt +++ /dev/null @@ -1,19 +0,0 @@ -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/ReservationRepositoryProviderImpl.kt b/app/src/main/java/com/gh/common/provider/ReservationRepositoryProviderImpl.kt new file mode 100644 index 0000000000..90e119436e --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/ReservationRepositoryProviderImpl.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.repository.ReservationRepository +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IReservationRepositoryProvider + +@Route(path = RouteConsts.provider.reservationRepository, name = "ReservationRepository暴露服务") +class ReservationRepositoryProviderImpl : IReservationRepositoryProvider { + + override fun refreshReservations() { + ReservationRepository.refreshReservations() + } + + override fun clearReservations() { + ReservationRepository.clearReservations() + } + + 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 index 9676f2a62a..5c1664b7cc 100644 --- a/app/src/main/java/com/gh/common/provider/WebProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/WebProviderImpl.kt @@ -13,6 +13,10 @@ class WebProviderImpl : IWebProvider { return WebActivity.getIntent(context, url, autoCompletionTitle) } + override fun getWebIntent(context: Context, title: String, url: String): Intent { + return WebActivity.getWebIntent(context, title, url) + } + override fun init(context: Context?) { } diff --git a/app/src/main/java/com/gh/common/provider/WechatHelperProviderImpl.kt b/app/src/main/java/com/gh/common/provider/WechatHelperProviderImpl.kt new file mode 100644 index 0000000000..c584670fa4 --- /dev/null +++ b/app/src/main/java/com/gh/common/provider/WechatHelperProviderImpl.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.WechatBindHelper +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IWechatBindHelperProvider + +@Route(path = RouteConsts.provider.wechatHelper, name = "WechatHelper暴露服务") +class WechatHelperProviderImpl : IWechatBindHelperProvider { + override fun getWechatConfig() { + WechatBindHelper.getWechatConfig() + } + + override fun init(context: Context?) { + + } +} \ No newline at end of file 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 68ba47ec06..f05609b54c 100644 --- a/app/src/main/java/com/gh/common/repository/ReservationRepository.kt +++ b/app/src/main/java/com/gh/common/repository/ReservationRepository.kt @@ -2,7 +2,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.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp 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 dc2cb49cc8..109da235b1 100644 --- a/app/src/main/java/com/gh/common/simulator/SimulatorGameManager.kt +++ b/app/src/main/java/com/gh/common/simulator/SimulatorGameManager.kt @@ -16,7 +16,7 @@ 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 +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.common.retrofit.EmptyResponse import com.gh.gamecenter.common.retrofit.Response 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 0c88426412..d3e3649b4e 100644 --- a/app/src/main/java/com/gh/common/util/CheckLoginUtils.java +++ b/app/src/main/java/com/gh/common/util/CheckLoginUtils.java @@ -8,10 +8,11 @@ import android.text.TextUtils; 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.login.utils.QuickLoginHelper; +import com.gh.gamecenter.login.view.LoginActivity; import com.gh.gamecenter.common.utils.NetworkUtils; import com.gh.gamecenter.core.utils.SPUtils; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; import com.lightgame.utils.Utils; 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 3d62483ca4..b80d55a22e 100644 --- a/app/src/main/java/com/gh/common/util/CollectionUtils.kt +++ b/app/src/main/java/com/gh/common/util/CollectionUtils.kt @@ -2,7 +2,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.login.user.UserManager import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable 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 0a9f2b2f1b..a36cab697c 100644 --- a/app/src/main/java/com/gh/common/util/CommentHelper.kt +++ b/app/src/main/java/com/gh/common/util/CommentHelper.kt @@ -17,7 +17,7 @@ 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 -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.comment.OnCommentOptionClickListener import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager 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 6fdfe9e954..6c0afc7cab 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.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; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.entity.UserInfoEntity; +import com.gh.gamecenter.login.user.UserManager; 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 a176f70bda..6b3e0676f8 100644 --- a/app/src/main/java/com/gh/common/util/ConcernUtils.kt +++ b/app/src/main/java/com/gh/common/util/ConcernUtils.kt @@ -3,7 +3,7 @@ package com.gh.common.util import android.content.Context import android.text.TextUtils import com.gh.gamecenter.eventbus.EBConcernChanged -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.android.schedulers.AndroidSchedulers 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 065b1bb468..447666e46d 100644 --- a/app/src/main/java/com/gh/common/util/DataUtils.java +++ b/app/src/main/java/com/gh/common/util/DataUtils.java @@ -23,8 +23,8 @@ import com.gh.gamecenter.core.AppExecutor; 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.IdCardEntity; -import com.gh.gamecenter.entity.UserInfoEntity; +import com.gh.gamecenter.login.entity.IdCardEntity; +import com.gh.gamecenter.login.entity.UserInfoEntity; import com.gh.gamecenter.provider.GhContentProvider; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gid.GidCallback; 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 1f53aa1a23..9be6665ebc 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -81,14 +81,12 @@ import com.gh.gamecenter.databinding.DialogBindPhoneBinding; import com.gh.gamecenter.databinding.DialogEnergySignBinding; import com.gh.gamecenter.databinding.DialogOverseaConfirmationBinding; import com.gh.gamecenter.databinding.DialogPackageParseErrorBinding; -import com.gh.gamecenter.databinding.DialogQuickLoginPermissionBinding; import com.gh.gamecenter.databinding.DialogReceiveLibaoSuccessBinding; import com.gh.gamecenter.databinding.DialogReportReasonBinding; import com.gh.gamecenter.databinding.DialogWechatReserveSuccessBinding; import com.gh.gamecenter.databinding.ImprintContentItemBinding; import com.gh.gamecenter.databinding.PrivacyItemBinding; import com.gh.gamecenter.entity.ApkEntity; -import com.gh.gamecenter.entity.Badge; import com.gh.gamecenter.entity.BadgeEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.PermissionsEntity; @@ -96,6 +94,7 @@ import com.gh.gamecenter.entity.PrivacyPolicyEntity; import com.gh.gamecenter.entity.SettingsEntity; import com.gh.gamecenter.entity.SimpleGameEntity; import com.gh.gamecenter.entity.TrackableEntity; +import com.gh.gamecenter.login.entity.Badge; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.setting.GameDownloadSettingFragment; import com.gh.gamecenter.suggest.SuggestType; @@ -2096,27 +2095,6 @@ public class DialogUtils { } } - public static void showQuickLoginPermissionDialog(Context context, ConfirmListener confirmListener, CancelListener cancelListener) { - context = checkDialogContext(context); - - final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent); - DialogQuickLoginPermissionBinding binding = DialogQuickLoginPermissionBinding.inflate(LayoutInflater.from(context)); - - binding.confirmBtn.setOnClickListener(v -> { - dialog.dismiss(); - confirmListener.onConfirm(); - }); - - binding.cancelBtn.setOnClickListener(v -> { - dialog.dismiss(); - cancelListener.onCancel(); - }); - - dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); - dialog.setContentView(binding.getRoot()); - dialog.show(); - } - public static void showEnergySignDialog(Context context, int sevenDaySerialSign) { context = checkDialogContext(context); 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 a64044aa6b..f919567d52 100644 --- a/app/src/main/java/com/gh/common/util/DirectUtils.kt +++ b/app/src/main/java/com/gh/common/util/DirectUtils.kt @@ -46,7 +46,7 @@ import com.gh.gamecenter.gamedetail.GameDetailFragment import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity import com.gh.gamecenter.gamedetail.history.HistoryApkListActivity import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.mygame.PlayedGameActivity import com.gh.gamecenter.personalhome.UserHomeActivity import com.gh.gamecenter.personalhome.background.PersonalityBackgroundActivity 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 92f2756906..9284b5df39 100644 --- a/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt +++ b/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt @@ -16,7 +16,7 @@ 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 +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.AppManager 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 9349cded95..078b6d04b7 100644 --- a/app/src/main/java/com/gh/common/util/ErrorHelper.kt +++ b/app/src/main/java/com/gh/common/util/ErrorHelper.kt @@ -306,7 +306,9 @@ object ErrorHelper { errorEntity?.toast?.isNotEmpty() == true -> { Utils.toast(context, errorEntity.toast) } - else -> Utils.toast(context, R.string.login_failure) + else -> { + Utils.toast(context, R.string.login_failure) + } } } catch (e: Exception) { e.printStackTrace() 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 ff45a0a046..8d7a7802a3 100644 --- a/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt +++ b/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt @@ -28,7 +28,7 @@ import com.gh.gamecenter.entity.ApkEntity 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.login.user.UserManager import com.gh.gamecenter.common.retrofit.EmptyResponse import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager 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 10854b67e0..ab21897b20 100644 --- a/app/src/main/java/com/gh/common/util/GameSubstituteRepositoryHelper.kt +++ b/app/src/main/java/com/gh/common/util/GameSubstituteRepositoryHelper.kt @@ -9,7 +9,7 @@ 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 +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager 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 899c3e0f7f..0ad37a6f8c 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -27,10 +27,10 @@ import com.gh.gamecenter.entity.LibaoStatusEntity; import com.gh.gamecenter.entity.MeEntity; import com.gh.gamecenter.common.entity.NotificationUgc; import com.gh.gamecenter.entity.UserDataLibaoEntity; -import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.common.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.geetest.GeetestUtils; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.common.retrofit.JSONObjectResponse; import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; 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 97c380cfca..79229a9dbf 100644 --- a/app/src/main/java/com/gh/common/util/LogUtils.java +++ b/app/src/main/java/com/gh/common/util/LogUtils.java @@ -24,7 +24,8 @@ import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.PackageDialogEntity; import com.gh.gamecenter.entity.SpecialColumn; import com.gh.gamecenter.entity.StartupAdEntity; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; +import com.gh.gamecenter.manager.CommunityManager; import com.gh.gamecenter.qa.entity.Questions; import com.halo.assistant.HaloApp; import com.lightgame.utils.Utils; @@ -163,8 +164,8 @@ public class LogUtils { JSONObject object = new JSONObject(); try { - object.put("community_id", UserManager.getInstance().getCommunity().getId()); - object.put("community_name", UserManager.getInstance().getCommunity().getName()); + object.put("community_id", CommunityManager.getInstance().getCommunity().getId()); + object.put("community_name", CommunityManager.getInstance().getCommunity().getName()); object.put("keyword", searchKey); object.put("subject", "search"); } catch (JSONException e) { @@ -178,7 +179,7 @@ public class LogUtils { JSONObject object = new JSONObject(); try { object.put("subject", "community_refresh"); - object.put("community_id", UserManager.getInstance().getCommunity().getId()); + object.put("community_id", CommunityManager.getInstance().getCommunity().getId()); object.put("refresh_type", "recommend"); object.put("refresh_way", manualRefresh ? "manual" : "auto"); object.put("data_count", dataCount); 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 1d5ccc7f4b..e285c1b0cf 100644 --- a/app/src/main/java/com/gh/common/util/PlatformUtils.java +++ b/app/src/main/java/com/gh/common/util/PlatformUtils.java @@ -9,7 +9,7 @@ import android.text.TextUtils; 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.common.eventbus.EBReuse; import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; 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 dc2172b034..57fc86e676 100644 --- a/app/src/main/java/com/gh/common/util/UsageStatsHelper.kt +++ b/app/src/main/java/com/gh/common/util/UsageStatsHelper.kt @@ -21,7 +21,7 @@ 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.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp 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 5e8eb5bb25..faa02f1d40 100644 --- a/app/src/main/java/com/gh/common/util/WechatBindHelper.kt +++ b/app/src/main/java/com/gh/common/util/WechatBindHelper.kt @@ -8,7 +8,7 @@ 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.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp 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 1843cae83d..0e91ae5f2d 100644 --- a/app/src/main/java/com/gh/common/videolog/VideoRecordUtils.kt +++ b/app/src/main/java/com/gh/common/videolog/VideoRecordUtils.kt @@ -6,7 +6,7 @@ import android.database.sqlite.SQLiteFullException 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.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.room.AppDatabase 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 81c7150ebc..9017c2c0ba 100644 --- a/app/src/main/java/com/gh/common/view/ImageContainerView.kt +++ b/app/src/main/java/com/gh/common/view/ImageContainerView.kt @@ -18,7 +18,7 @@ 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.login.user.UserManager import com.gh.gamecenter.qa.entity.AnswerEntity import com.gh.gamecenter.qa.entity.CommunityVideoEntity import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel diff --git a/app/src/main/java/com/gh/download/DownloadManager.java b/app/src/main/java/com/gh/download/DownloadManager.java index 875166a613..075a77d7fb 100644 --- a/app/src/main/java/com/gh/download/DownloadManager.java +++ b/app/src/main/java/com/gh/download/DownloadManager.java @@ -42,7 +42,7 @@ import com.gh.gamecenter.entity.HomePluggableFilterEntity; import com.gh.gamecenter.entity.PluginLocation; import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.manager.PackagesManager; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.packagehelper.PackageRepository; import com.halo.assistant.HaloApp; import com.lightgame.download.ConnectionUtils; diff --git a/app/src/main/java/com/gh/download/PackageObserver.kt b/app/src/main/java/com/gh/download/PackageObserver.kt index cbed3f39c2..5843c571f9 100644 --- a/app/src/main/java/com/gh/download/PackageObserver.kt +++ b/app/src/main/java/com/gh/download/PackageObserver.kt @@ -12,7 +12,7 @@ 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 +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.packagehelper.PackageRepository import com.gh.gamecenter.packagehelper.PackageViewModel import com.gh.gamecenter.common.retrofit.EmptyResponse diff --git a/app/src/main/java/com/gh/flutter/FlutterUserServiceImplAop.java b/app/src/main/java/com/gh/flutter/FlutterUserServiceImplAop.java index 4aec684dfb..18e2503b41 100644 --- a/app/src/main/java/com/gh/flutter/FlutterUserServiceImplAop.java +++ b/app/src/main/java/com/gh/flutter/FlutterUserServiceImplAop.java @@ -1,7 +1,7 @@ package com.gh.flutter; -import com.gh.gamecenter.entity.UserInfoEntity; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.entity.UserInfoEntity; +import com.gh.gamecenter.login.user.UserManager; import me.ele.lancet.base.annotations.Insert; import me.ele.lancet.base.annotations.TargetClass; diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index 12650cb58e..a65915794d 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -1,6 +1,6 @@ package com.gh.gamecenter; -import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; +import static com.gh.gamecenter.common.constant.Constants.LOGIN_TAG; import android.app.Activity; import android.content.Context; @@ -43,7 +43,7 @@ import com.gh.gamecenter.entity.MeEntity; import com.gh.gamecenter.entity.UserDataLibaoEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.eventbus.EBPackage; -import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.common.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 1f8a847f65..756b4d2ba2 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -1,6 +1,7 @@ package com.gh.gamecenter; -import static com.gh.common.util.LoginHelper.WEIBO_SCOPE; +import static com.gh.gamecenter.common.constant.Constants.LOGOUT_TAG; +import static com.gh.gamecenter.login.utils.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; @@ -13,8 +14,7 @@ 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.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; +import static com.gh.gamecenter.common.constant.Constants.LOGIN_TAG; import android.annotation.SuppressLint; import android.app.Activity; @@ -32,7 +32,6 @@ import android.text.Html; import android.text.TextUtils; import android.view.KeyEvent; import android.view.View; -import android.view.ViewGroup; import android.widget.TextView; import androidx.annotation.NonNull; @@ -58,11 +57,11 @@ import com.gh.common.util.ErrorHelper; import com.gh.common.util.HomePluggableHelper; import com.gh.common.util.LogUtils; import com.gh.common.util.LunchType; +import com.gh.gamecenter.common.eventbus.EBReuse; import com.gh.gamecenter.common.utils.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.WechatBindHelper; import com.gh.download.DownloadManager; import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager; @@ -95,13 +94,14 @@ import com.gh.gamecenter.entity.InnerMetaInfoEntity; import com.gh.gamecenter.common.entity.NotificationUgc; import com.gh.gamecenter.entity.StartupAdEntity; import com.gh.gamecenter.eventbus.EBNetworkState; -import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBSkip; import com.gh.gamecenter.fragment.MainWrapperFragment; import com.gh.gamecenter.home.skip.PackageSkipActivity; +import com.gh.gamecenter.login.utils.QuickLoginHelper; +import com.gh.gamecenter.manager.CommunityManager; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.UpdateManager; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.packagehelper.PackageViewModel; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.room.AppDatabase; @@ -926,7 +926,7 @@ public class MainActivity extends BaseActivity { InnerMetaInfoEntity info = GsonUtils.getGson().fromJson(reader, InnerMetaInfoEntity.class); if (info != null) { if (EntranceConsts.HOST_COMMUNITY.equals(info.getType())) { - UserManager.getInstance().setCommunityData(new CommunityEntity(info.getLink(), info.getText())); + CommunityManager.getInstance().setCommunityData(new CommunityEntity(info.getLink(), info.getText())); runOnUiThread(() -> mMainWrapperFragment.setCurrentItem(MainWrapperFragment.INDEX_BBS)); } else { DirectUtils.directToSpecificPage(this, diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 6d1ec9dcd3..ff2cd9bb4b 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -1,6 +1,6 @@ package com.gh.gamecenter; -import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; +import static com.gh.gamecenter.common.constant.Constants.LOGIN_TAG; import android.app.Activity; import android.content.Context; @@ -56,7 +56,7 @@ import com.gh.gamecenter.eventbus.EBConcernChanged; import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.eventbus.EBNetworkState; import com.gh.gamecenter.eventbus.EBPackage; -import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.common.eventbus.EBReuse; import com.gh.gamecenter.newsdetail.NewsDetailAdapter; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.fragment.SettingsFragment; diff --git a/app/src/main/java/com/gh/gamecenter/SkipActivity.java b/app/src/main/java/com/gh/gamecenter/SkipActivity.java index c98d7e6b82..7c34c36bec 100644 --- a/app/src/main/java/com/gh/gamecenter/SkipActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SkipActivity.java @@ -59,7 +59,8 @@ import com.gh.gamecenter.entity.LinkEntity; import com.gh.gamecenter.entity.SimpleGameEntity; import com.gh.gamecenter.entity.SubjectRecommendEntity; import com.gh.gamecenter.entity.VideoLinkEntity; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; +import com.gh.gamecenter.manager.CommunityManager; import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel; import com.gh.gamecenter.video.videomanager.VideoManagerActivity; import com.lightgame.config.CommonDebug; @@ -152,7 +153,7 @@ public class SkipActivity extends BaseActivity { DirectUtils.directToToolbox(this, uri.getQueryParameter("gameId"), uri.getQueryParameter("toolboxUrl"), ENTRANCE_BROWSER); break; case HOST_COMMUNITY: - UserManager.getInstance().setCommunityData(new CommunityEntity(path, name)); + CommunityManager.getInstance().setCommunityData(new CommunityEntity(path, name)); // 把切换放到 MainActivity 处理 if (RunningUtils.isRunning(this) && MainActivity.class.getName().equals(RunningUtils.getBaseActivity(this))) { diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 9a61e7c236..2a8f69c4eb 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -70,8 +70,8 @@ import com.gh.gamecenter.entity.InstallGameEntity; import com.gh.gamecenter.common.entity.NotificationUgc; 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.login.entity.UserInfoEntity; +import com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.suggest.SuggestGameCollectAdapter; diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt index d0aa1574a6..8cfec02b92 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt @@ -5,7 +5,7 @@ import android.content.Intent import android.os.Bundle import com.gh.gamecenter.common.base.activity.ToolBarActivity import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.user.UserViewModel +import com.gh.gamecenter.login.user.UserViewModel import com.halo.assistant.fragment.user.UserInfoEditFragment class UserInfoEditActivity : ToolBarActivity() { 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 3eca397f7b..7558c4fdf1 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 @@ -44,7 +44,7 @@ import com.gh.gamecenter.WebActivity; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.LinkEntity; -import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.common.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBScroll; import com.gh.gamecenter.gamedetail.GameDetailFragment; import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment; 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 cc7ac99b15..c33d566f9e 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt @@ -22,6 +22,7 @@ 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.Constants import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.* @@ -30,7 +31,7 @@ import com.gh.gamecenter.databinding.FragmentAmwayBinding import com.gh.gamecenter.entity.RatingComment import com.gh.gamecenter.eventbus.EBDownloadStatus import com.gh.gamecenter.eventbus.EBPackage -import com.gh.gamecenter.eventbus.EBReuse +import com.gh.gamecenter.common.eventbus.EBReuse import com.gh.gamecenter.fragment.HomeSearchToolWrapperFragment import com.gh.gamecenter.gamedetail.rating.RatingFragment import com.gh.gamecenter.personal.PersonalFragment @@ -285,7 +286,7 @@ class AmwayFragment : LazyListFragment() { fun onEventMainThread(reuse: EBReuse) { if ("Refresh" == reuse.type) { mAdapter?.notifyDataSetChanged() - } else if (reuse.type == PersonalFragment.LOGIN_TAG) { // 登入 + } else if (reuse.type == Constants.LOGIN_TAG) { // 登入 scrollToTop() mViewModel.initData(false) } 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 6ad48969f8..756b9d7ff7 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 @@ -10,7 +10,7 @@ import com.gh.common.util.PackageHelper 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.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager 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 ecd336bc1d..a0e565fa85 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/AnswerViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerViewModel.kt @@ -7,7 +7,7 @@ import com.gh.common.history.HistoryDatabase import com.gh.common.history.HistoryHelper import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadType -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.entity.AnswerEntity import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager 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 2ccd953e6a..a412c36e79 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleViewModel.java @@ -11,7 +11,7 @@ import com.gh.gamecenter.baselist.LoadType; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.entity.ViewsEntity; import com.gh.gamecenter.info.NewsViewsRepository; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.retrofit.RetrofitManager; import java.util.ArrayList; 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 368a5cae60..68580fbb07 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CollectionWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/CollectionWrapperFragment.java @@ -7,7 +7,7 @@ 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 com.gh.gamecenter.login.user.UserManager; import java.util.List; 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 d3a958dda0..753cd33e76 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleViewModel.kt @@ -8,7 +8,7 @@ import com.gh.common.history.HistoryHelper import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadType -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.entity.AnswerEntity import com.gh.gamecenter.qa.entity.ArticleEntity import com.gh.gamecenter.common.retrofit.BiResponse 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 b1eef762d2..b684d7e78e 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt @@ -32,7 +32,7 @@ import com.gh.gamecenter.entity.TagInfoEntity import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity import com.gh.gamecenter.gamecollection.publish.GameCollectionEditActivity import com.gh.gamecenter.history.ManageOption -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.google.android.flexbox.FlexboxLayout class GamesCollectionAdapter( 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 afc5c8f322..e908226f69 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionFragment.kt @@ -12,7 +12,7 @@ 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.entity.GamesCollectionEntity -import com.gh.gamecenter.eventbus.EBReuse +import com.gh.gamecenter.common.eventbus.EBReuse import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import com.gh.gamecenter.history.IBatchDelete 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 38d0911482..a1dadc6c4b 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ToolsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ToolsFragment.java @@ -21,7 +21,7 @@ import com.gh.gamecenter.baselist.LoadType; import com.gh.gamecenter.baselist.NormalListViewModel; import com.gh.gamecenter.entity.ToolBoxEntity; import com.gh.gamecenter.eventbus.EBCollectionChanged; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.retrofit.RetrofitManager; import org.greenrobot.eventbus.Subscribe; 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 b897744744..757cbff00e 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/VideoViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/VideoViewModel.kt @@ -11,7 +11,7 @@ import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.entity.MyVideoEntity import com.gh.gamecenter.entity.PersonalHistoryEntity import com.gh.gamecenter.entity.User -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager 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/douyinapi/DouYinEntryActivity.java b/app/src/main/java/com/gh/gamecenter/douyinapi/DouYinEntryActivity.java index 70584ff83a..d246111aae 100644 --- a/app/src/main/java/com/gh/gamecenter/douyinapi/DouYinEntryActivity.java +++ b/app/src/main/java/com/gh/gamecenter/douyinapi/DouYinEntryActivity.java @@ -12,7 +12,7 @@ //import com.bytedance.sdk.open.aweme.common.model.BaseResp; //import com.bytedance.sdk.open.douyin.DouYinOpenApiFactory; //import com.bytedance.sdk.open.douyin.api.DouYinOpenApi; -//import com.gh.common.util.LoginHelper; +//import com.gh.gamecenter.login.utils.LoginHelper; // //import org.json.JSONObject; // 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 93bbad16fa..21434ad5ca 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java @@ -15,7 +15,7 @@ import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.databinding.GameupdateBinding; import com.gh.gamecenter.eventbus.EBDownloadStatus; -import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.common.eventbus.EBReuse; import com.gh.gamecenter.fragment.MainWrapperFragment; import com.gh.gamecenter.packagehelper.PackageViewModel; 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 ee4cb48dd5..268110c4f3 100644 --- a/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/InstalledGameFragment.kt @@ -24,7 +24,7 @@ //import com.gh.gamecenter.entity.GameEntity //import com.gh.gamecenter.entity.GameInstall //import com.gh.gamecenter.eventbus.EBDownloadStatus -//import com.gh.gamecenter.eventbus.EBReuse +//import com.gh.gamecenter.common.eventbus.EBReuse //import com.gh.gamecenter.fragment.MainWrapperFragment //import com.gh.gamecenter.manager.PackagesManager //import com.gh.gamecenter.common.base.fragment.NormalFragment 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 e8ed7612c1..e4668acb79 100644 --- a/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt @@ -20,7 +20,7 @@ import com.gh.gamecenter.databinding.FragmentMyGameBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.GameInstall import com.gh.gamecenter.eventbus.EBDownloadStatus -import com.gh.gamecenter.eventbus.EBReuse +import com.gh.gamecenter.common.eventbus.EBReuse import com.gh.gamecenter.fragment.MainWrapperFragment import com.gh.gamecenter.manager.PackagesManager import com.gh.gamecenter.common.base.fragment.ToolbarFragment 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 c3f37b23a5..bf0a8b6d67 100644 --- a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameFragment.kt @@ -13,7 +13,7 @@ import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.databinding.FragmentGameUpdatableBinding import com.gh.gamecenter.eventbus.EBDownloadStatus -import com.gh.gamecenter.eventbus.EBReuse +import com.gh.gamecenter.common.eventbus.EBReuse import com.gh.gamecenter.fragment.MainWrapperFragment import com.gh.gamecenter.packagehelper.PackageViewModel import org.greenrobot.eventbus.Subscribe 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 3bdf7643fe..bb19ceb624 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt @@ -21,10 +21,10 @@ import com.gh.gamecenter.databinding.FragmentEnergyCenterBinding import com.gh.gamecenter.databinding.TabItemMainBinding import com.gh.gamecenter.entity.CommodityCategoryEntity import com.gh.gamecenter.entity.SignStatusEntity -import com.gh.gamecenter.entity.UserInfoEntity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.entity.UserInfoEntity +import com.gh.gamecenter.login.user.UserManager +import com.gh.gamecenter.login.user.UserViewModel import com.gh.gamecenter.personalhome.UserHomeViewModel -import com.gh.gamecenter.user.UserViewModel import com.google.android.material.bottomsheet.BottomSheetBehavior import com.halo.assistant.HaloApp import kotlin.math.abs 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 1cc4ff2f2b..de28d8ea87 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt @@ -20,10 +20,10 @@ import com.gh.gamecenter.databinding.FragmentEnergyHouseBinding import com.gh.gamecenter.databinding.TabItemCommodityBinding import com.gh.gamecenter.entity.CommodityCategoryEntity import com.gh.gamecenter.entity.SubjectSettingEntity -import com.gh.gamecenter.entity.UserInfoEntity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.entity.UserInfoEntity +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.personalhome.UserHomeViewModel -import com.gh.gamecenter.user.UserViewModel +import com.gh.gamecenter.login.user.UserViewModel import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.tabs.TabLayout import com.halo.assistant.HaloApp 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 fc8749953c..2fe89a2317 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/HorizontalTaskAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/HorizontalTaskAdapter.kt @@ -14,7 +14,7 @@ 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 -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.lightgame.adapter.BaseRecyclerAdapter class HorizontalTaskAdapter( 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 22e0aa15db..8eecd0703c 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt @@ -21,7 +21,7 @@ import com.gh.gamecenter.databinding.NoviceTasksItemBinding import com.gh.gamecenter.databinding.TaskBottomItemBinding import com.gh.gamecenter.databinding.TaskTitleItemBinding import com.gh.gamecenter.gamedetail.dialog.InviteCodeDialog -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager class TaskAdapter(context: Context) : ListAdapter(context) { diff --git a/app/src/main/java/com/gh/gamecenter/entity/ArticleCommentParent.kt b/app/src/main/java/com/gh/gamecenter/entity/ArticleCommentParent.kt index c391153869..9843333ab1 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/ArticleCommentParent.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/ArticleCommentParent.kt @@ -1,6 +1,7 @@ package com.gh.gamecenter.entity import android.os.Parcelable +import com.gh.gamecenter.login.entity.Badge import com.google.gson.annotations.SerializedName import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/com/gh/gamecenter/entity/BadgeEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/BadgeEntity.kt index e73b336d5c..80ed53c4de 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/BadgeEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/BadgeEntity.kt @@ -1,5 +1,6 @@ package com.gh.gamecenter.entity +import com.gh.gamecenter.login.entity.BadgeAction import com.google.gson.annotations.SerializedName data class BadgeEntity( diff --git a/app/src/main/java/com/gh/gamecenter/entity/CommentParentEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/CommentParentEntity.kt index 1120bc9811..317d345621 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/CommentParentEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/CommentParentEntity.kt @@ -1,6 +1,7 @@ package com.gh.gamecenter.entity import android.os.Parcelable +import com.gh.gamecenter.login.entity.Badge import com.google.gson.annotations.SerializedName import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/com/gh/gamecenter/entity/FollowersOrFansEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/FollowersOrFansEntity.kt index 17bb46ef11..bb9d13a11e 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/FollowersOrFansEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/FollowersOrFansEntity.kt @@ -1,5 +1,7 @@ package com.gh.gamecenter.entity +import com.gh.gamecenter.login.entity.Auth +import com.gh.gamecenter.login.entity.Badge import com.google.gson.annotations.SerializedName data class FollowersOrFansEntity( diff --git a/app/src/main/java/com/gh/gamecenter/entity/MessageKeFuEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/MessageKeFuEntity.kt index 57609ff724..f5304de4e6 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/MessageKeFuEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/MessageKeFuEntity.kt @@ -1,5 +1,6 @@ package com.gh.gamecenter.entity +import com.gh.gamecenter.login.entity.Auth import com.google.gson.annotations.SerializedName /** diff --git a/app/src/main/java/com/gh/gamecenter/entity/PersonalEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/PersonalEntity.kt index 4b2cf44135..20ab48dffc 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/PersonalEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/PersonalEntity.kt @@ -1,6 +1,10 @@ package com.gh.gamecenter.entity import android.os.Parcelable +import com.gh.gamecenter.login.entity.Auth +import com.gh.gamecenter.login.entity.AvatarBorderEntity +import com.gh.gamecenter.login.entity.BackgroundImageEntity +import com.gh.gamecenter.login.entity.Badge import com.google.gson.annotations.SerializedName import kotlinx.parcelize.Parcelize @@ -61,16 +65,4 @@ data class LastVisitor( @SerializedName("_id") var id: String = "", var name: String = "", - var icon: String = "") : Parcelable - -// 徽章 -@Parcelize -data class Badge( - var name: String = "", - var icon: String = "", - var actions: List? = null) : Parcelable - -// 徽章领取条件 -@Parcelize -data class BadgeAction( - var text: String = "") : Parcelable + var icon: String = "") : Parcelable \ No newline at end of file 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 b6f99ffd10..c09e04fe6e 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/PersonalHistoryEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/PersonalHistoryEntity.kt @@ -7,7 +7,7 @@ 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.login.user.UserManager import com.gh.gamecenter.qa.entity.AnswerEntity import com.gh.gamecenter.qa.entity.CommunityVideoEntity import com.gh.gamecenter.qa.entity.ImageInfo diff --git a/app/src/main/java/com/gh/gamecenter/entity/UserEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/UserEntity.kt index eb7732b10f..ce3f883871 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/UserEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/UserEntity.kt @@ -1,6 +1,8 @@ package com.gh.gamecenter.entity import android.os.Parcelable +import com.gh.gamecenter.login.entity.Auth +import com.gh.gamecenter.login.entity.Badge import com.google.gson.annotations.SerializedName import kotlinx.parcelize.Parcelize 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 230214d725..f212271f4e 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 @@ -50,7 +50,8 @@ import com.gh.gamecenter.forum.moderator.ApplyModeratorActivity import com.gh.gamecenter.forum.moderator.ModeratorListActivity import com.gh.gamecenter.forum.search.ForumOrUserSearchActivity import com.gh.gamecenter.gamedetail.GameDetailFragment -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager +import com.gh.gamecenter.manager.CommunityManager import com.gh.gamecenter.mvvm.Status import com.gh.gamecenter.qa.article.edit.ArticleEditActivity import com.gh.gamecenter.qa.entity.AnswerEntity @@ -378,7 +379,7 @@ class ForumDetailFragment : BaseLazyTabFragment(), IScrollable { } mBinding.followTv.setTextColor(ContextCompat.getColor(requireContext(), if (me.isFollower) R.color.text_subtitleDesc else R.color.white)) mBinding.followTv.background = - ContextCompat.getDrawable(requireContext(), if (me.isFollower) R.drawable.bg_shape_f5_radius_999 else R.drawable.login_btn_bg) + ContextCompat.getDrawable(requireContext(), if (me.isFollower) R.drawable.bg_shape_f5_radius_999 else R.drawable.download_button_normal_style) mBinding.allOrderSfv.setItemList(mAllOrderList, 0) mBinding.videoOrderSfv.setItemList(mVideoOrderList, 0) @@ -648,7 +649,7 @@ class ForumDetailFragment : BaseLazyTabFragment(), IScrollable { requireContext(), R.style.DialogWindowTransparent, "论坛详情", - UserManager.getInstance().community.name, + CommunityManager.getInstance().community.name, null, "发布-空白", "发布-返回", @@ -727,7 +728,7 @@ class ForumDetailFragment : BaseLazyTabFragment(), IScrollable { }) } contentView.findViewById(R.id.community_edit_close).setOnClickListener { - MtaHelper.onEvent("论坛详情", UserManager.getInstance().community.name, "发布-关闭") + MtaHelper.onEvent("论坛详情", CommunityManager.getInstance().community.name, "发布-关闭") NewLogUtils.logBbsPostPanelCloseClick() dialog.dismiss() } 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 20ce0dc489..6cdce029f4 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 @@ -5,13 +5,11 @@ import android.content.Intent import android.content.res.ColorStateList import android.graphics.Bitmap import android.graphics.Typeface -import android.graphics.drawable.ColorDrawable import android.os.Build import android.os.Bundle import android.view.* import android.view.animation.AnimationUtils import android.widget.TextView -import androidx.annotation.ColorInt import androidx.core.graphics.ColorUtils import androidx.core.os.bundleOf import androidx.fragment.app.Fragment @@ -34,7 +32,7 @@ import com.gh.gamecenter.eventbus.EBTypeChange import com.gh.gamecenter.eventbus.EBUISwitch import com.gh.gamecenter.forum.search.ForumOrUserSearchActivity import com.gh.gamecenter.fragment.MainWrapperFragment -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.manager.CommunityManager import com.gh.gamecenter.qa.article.edit.ArticleEditActivity import com.gh.gamecenter.qa.entity.ArticleEntity import com.gh.gamecenter.qa.questions.edit.QuestionEditActivity @@ -383,7 +381,7 @@ class CommunityHomeFragment : LazyFragment() { requireContext(), R.style.DialogWindowTransparent, "社区", - UserManager.getInstance().community.name, + CommunityManager.getInstance().community.name, null, "发布-空白", "发布-返回", 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 8e7a21c13d..384c71ea50 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 @@ -20,7 +20,8 @@ import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.ForumVideoEntity import com.gh.gamecenter.eventbus.EBUserFollow import com.gh.gamecenter.forum.detail.ForumDetailActivity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager +import com.gh.gamecenter.manager.CommunityManager import com.gh.gamecenter.qa.answer.BaseAnswerOrArticleItemViewHolder import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity import com.gh.gamecenter.qa.entity.AnswerEntity @@ -363,7 +364,7 @@ class ForumArticleAskItemViewHolder(val binding: CommunityAnswerItemBinding) : B } when (entity.type) { "community_article" -> { - val communityId = if (entity.bbs.id.isNotEmpty()) entity.bbs.id else UserManager.getInstance().community.id + val communityId = if (entity.bbs.id.isNotEmpty()) entity.bbs.id else CommunityManager.getInstance().community.id val intent = ArticleDetailActivity.getCommentIntent( itemView.context, CommunityEntity(communityId, entity.communityName ?: ""), @@ -374,7 +375,7 @@ class ForumArticleAskItemViewHolder(val binding: CommunityAnswerItemBinding) : B MtaHelper.onEvent(getEventId(entrance), getKey(entrance), "评论图标") } "video" -> { - val communityId = if (entity.bbs.id.isNotEmpty()) entity.bbs.id else UserManager.getInstance().community.id + val communityId = if (entity.bbs.id.isNotEmpty()) entity.bbs.id else CommunityManager.getInstance().community.id itemView.context.startActivity( ForumVideoDetailActivity.getIntent( itemView.context, entity.id 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 cd8ef1dfcb..e99f45d199 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 @@ -25,7 +25,7 @@ import com.gh.gamecenter.eventbus.EBUserFollow import com.gh.gamecenter.forum.home.ForumScrollCalculatorHelper.Companion.getPlaySchedule import com.gh.gamecenter.forum.home.ForumScrollCalculatorHelper.Companion.savePlaySchedule import com.gh.gamecenter.qa.entity.ArticleEntity -import com.gh.gamecenter.user.UserViewModel +import com.gh.gamecenter.login.user.UserViewModel import com.gh.gamecenter.video.detail.CustomManager import com.google.android.material.appbar.AppBarLayout import com.shuyu.gsyvideoplayer.video.base.GSYVideoView 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 26ef01deee..b42e343dbe 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 @@ -10,7 +10,7 @@ import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.ForumEntity import com.gh.gamecenter.entity.ForumUnreadEntity import com.gh.gamecenter.entity.ForumVideoEntity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.entity.ArticleEntity import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager 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 788c5c03be..5584969e49 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 @@ -30,7 +30,7 @@ import com.gh.gamecenter.entity.ForumEntity import com.gh.gamecenter.eventbus.EBForumFollowChange import com.gh.gamecenter.eventbus.EBForumRecordChange import com.gh.gamecenter.forum.list.ForumListActivity -import com.gh.gamecenter.user.UserViewModel +import com.gh.gamecenter.login.user.UserViewModel import com.halo.assistant.HaloApp import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode 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 a92a8c5d36..a1811c0c31 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 @@ -8,7 +8,7 @@ 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 -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable 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 02eef20134..85b5b3da04 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 @@ -9,7 +9,7 @@ import com.gh.gamecenter.common.utils.singleToMain 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.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager 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 55b47d8fca..04e29ef802 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 @@ -4,7 +4,7 @@ import android.annotation.SuppressLint 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.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable 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 f0c46ff8ca..f2744f05f9 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 @@ -22,7 +22,7 @@ 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.login.user.UserManager import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.core.utils.ToastUtils import com.lightgame.utils.AppManager 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 2076b7c78b..aa230c19cf 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 @@ -12,7 +12,7 @@ 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.login.user.UserManager 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/ModeratorTaskAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorTaskAdapter.kt index 29cbace40b..1cafad099b 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 @@ -39,7 +39,7 @@ class ModeratorTaskAdapter(context: Context) : taskNameTv.text = taskEntity.taskName taskIconIv.setImageDrawable(taskEntity.taskIcon.toDrawable()) finishTv.background = - if (taskEntity.finishedTask) R.drawable.bg_moderator_task_disabled.toDrawable() else R.drawable.login_btn_bg.toDrawable() + if (taskEntity.finishedTask) R.drawable.bg_moderator_task_disabled.toDrawable() else R.drawable.download_button_normal_style.toDrawable() finishTv.text = if (taskEntity.finishedTask) "已完成" else "去完成" finishTv.setTextColor(if (taskEntity.finishedTask) R.color.text_subtitleDesc.toColor() else R.color.white.toColor()) finishTv.setOnClickListener(taskEntity.taskAction) 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 bcca9352cf..30f3973033 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 @@ -25,7 +25,7 @@ import com.gh.gamecenter.databinding.CommunityAnswerItemBinding import com.gh.gamecenter.databinding.ForumSearchContentListBinding import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.forum.home.ForumArticleAskItemViewHolder -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity import com.gh.gamecenter.qa.entity.AnswerEntity import com.gh.gamecenter.qa.entity.Questions diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/UserSearchListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/search/UserSearchListAdapter.kt index e284d66789..7c03c52f6e 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/search/UserSearchListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/search/UserSearchListAdapter.kt @@ -19,7 +19,7 @@ import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.UserSearchListItemBinding import com.gh.gamecenter.entity.FollowersOrFansEntity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager class UserSearchListAdapter(context: Context, val mEntrance: String, val mViewModel: UserSearchListViewModel) : ListAdapter(context) { 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 1b55f7aeb0..c421685fa5 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 @@ -6,7 +6,7 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import com.gh.gamecenter.entity.ForumCategoryEntity import com.gh.gamecenter.entity.ForumEntity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.mvvm.Resource import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.common.retrofit.Response 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 eafdf8e81d..106965714d 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java @@ -52,7 +52,7 @@ 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; +import com.gh.gamecenter.common.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBSkip; import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.forum.home.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 07921862c6..a3c8b46db9 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperViewModel.kt @@ -15,7 +15,7 @@ import com.gh.gamecenter.entity.DialogEntity 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.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp 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 0a169f3eaf..9c03a955eb 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java @@ -12,7 +12,7 @@ import com.gh.gamecenter.common.base.fragment.LazyFragment; import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.core.utils.DisplayUtils; -import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.common.eventbus.EBReuse; import com.gh.gamecenter.game.GameFragment; import org.greenrobot.eventbus.Subscribe; 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 51b80c0a97..b82dc0faa7 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java @@ -43,7 +43,7 @@ import com.gh.gamecenter.SearchActivity; import com.gh.gamecenter.energy.EnergyCenterActivity; import com.gh.gamecenter.entity.GameUpdateEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; -import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.common.eventbus.EBReuse; import com.gh.gamecenter.message.MessageUnreadViewModel; import com.gh.gamecenter.packagehelper.PackageViewModel; import com.gh.gamecenter.teenagermode.TeenagerModeActivity; 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 488be43ddd..7b4598ab27 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt @@ -29,7 +29,7 @@ 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 -import com.gh.gamecenter.eventbus.EBReuse +import com.gh.gamecenter.common.eventbus.EBReuse import com.gh.gamecenter.eventbus.EBUISwitch import com.gh.gamecenter.fragment.MainWrapperFragment import com.gh.gamecenter.game.data.GameItemData 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 badf0f9cb9..796bf1e04e 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 @@ -6,7 +6,7 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager 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 2a4b2e913b..f153d8a666 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 @@ -11,7 +11,7 @@ import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.common.utils.setRootBackgroundColor import com.gh.gamecenter.entity.GameEntity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.mygame.PlayedGameViewModel import com.gh.gamecenter.qa.editor.GameAdapter 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 ecf8a068aa..f18a3d43c3 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 @@ -43,13 +43,13 @@ import com.gh.gamecenter.eventbus.EBPackage import com.gh.gamecenter.eventbus.EBUserFollow import com.gh.gamecenter.gamedetail.GameDetailFragment import com.gh.gamecenter.home.video.ScrollCalculatorHelper -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.article.detail.CommentItemData import com.gh.gamecenter.qa.comment.CommentActivity import com.gh.gamecenter.qa.comment.base.BaseCommentAdapter import com.gh.gamecenter.qa.comment.base.BaseCommentViewModel import com.gh.gamecenter.setting.VideoSettingFragment -import com.gh.gamecenter.user.UserViewModel +import com.gh.gamecenter.login.user.UserViewModel import com.gh.gamecenter.video.detail.CustomManager import com.google.android.material.appbar.AppBarLayout import com.halo.assistant.HaloApp 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 1ac8915def..6713413de4 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 @@ -22,7 +22,7 @@ import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.entity.GamesCollectionDetailEntity import com.gh.gamecenter.eventbus.EBUserFollow -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.article.detail.CommentItemData import com.gh.gamecenter.qa.comment.base.BaseCommentViewModel import com.gh.gamecenter.common.retrofit.BiResponse 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 86f2f2cabc..f840b6c65b 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 @@ -16,7 +16,7 @@ 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.login.user.UserManager import com.gh.gamecenter.common.base.fragment.ToolbarFragment class GameCollectionPosterFragment : ToolbarFragment() { 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 4cf9cc0d2e..7d40523be4 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 @@ -23,7 +23,7 @@ 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 +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.comment.base.BaseCommentAdapter import com.gh.gamecenter.qa.comment.base.BaseCommentFragment import com.gh.gamecenter.qa.comment.base.BaseCommentViewModel 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 f17b51fef9..f24c664dba 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 @@ -20,7 +20,7 @@ import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.databinding.FragmentMyGameCollectionListBinding import com.gh.gamecenter.entity.GamesCollectionEntity -import com.gh.gamecenter.eventbus.EBReuse +import com.gh.gamecenter.common.eventbus.EBReuse import com.gh.gamecenter.gamecollection.publish.GameCollectionEditActivity import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode 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 fee5277cb5..28ebe0a037 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 @@ -6,7 +6,7 @@ import com.gh.gamecenter.core.utils.ToastUtils 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.login.user.UserManager import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable 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 d09138edf5..4ae5afa1a9 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 @@ -24,7 +24,7 @@ import com.gh.gamecenter.core.utils.PatternUtils import com.gh.gamecenter.databinding.ActivityGameCollectionEditBinding import com.gh.gamecenter.databinding.ItemGameCollectionFlexTagBinding import com.gh.gamecenter.entity.* -import com.gh.gamecenter.eventbus.EBReuse +import com.gh.gamecenter.common.eventbus.EBReuse import com.gh.gamecenter.gamecollection.choose.ChooseGamesActivity import com.gh.gamecenter.gamecollection.choose.ChooseGamesViewModel import com.gh.gamecenter.gamecollection.tag.GameCollectionTagSelectActivity 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 e982211152..2176918ffb 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 @@ -42,7 +42,7 @@ import com.gh.gamecenter.databinding.FragmentGameCollectionSquareAlBinding import com.gh.gamecenter.databinding.FragmentGameCollectionSquareBinding import com.gh.gamecenter.entity.GamesCollectionEntity import com.gh.gamecenter.entity.TagInfoEntity -import com.gh.gamecenter.eventbus.EBReuse +import com.gh.gamecenter.common.eventbus.EBReuse import com.gh.gamecenter.fragment.HomeSearchToolWrapperFragment import com.gh.gamecenter.gamecollection.publish.GameCollectionEditActivity import com.gh.gamecenter.gamecollection.tag.GameCollectionTagSelectActivity @@ -548,7 +548,7 @@ class GameCollectionSquareFragment : LazyListFragment(), IScro @Subscribe(threadMode = ThreadMode.MAIN) fun onEventMainThread(changed: EBReuse) { - if (PersonalFragment.LOGIN_TAG == changed.type) { // 登入 + if (Constants.LOGIN_TAG == changed.type) { // 登入 onLoadRefresh() } } 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 ad39d1eea3..895296867b 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 @@ -43,7 +43,7 @@ import com.gh.gamecenter.entity.RatingComment import com.gh.gamecenter.entity.RatingReplyEntity import com.gh.gamecenter.entity.UserEntity import com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.lightgame.utils.Utils import com.squareup.picasso.Picasso import io.reactivex.Single 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 1a2676c9cb..7cc2de7994 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 @@ -35,7 +35,7 @@ import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ActivityRatingEditBinding import com.gh.gamecenter.entity.* -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.mvvm.Status import com.gh.gamecenter.suggest.SuggestType import com.halo.assistant.HaloApp 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 63e5763bca..dbf829e46a 100644 --- a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt @@ -25,7 +25,7 @@ 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.common.eventbus.EBReuse import com.gh.gamecenter.suggest.SuggestType import com.halo.assistant.HaloApp import com.lightgame.dialog.BaseDialogFragment 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 36b71706c4..c25011341d 100644 --- a/app/src/main/java/com/gh/gamecenter/history/HistoryWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/history/HistoryWrapperFragment.kt @@ -11,7 +11,7 @@ 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 +import com.gh.gamecenter.login.user.UserManager class HistoryWrapperFragment : BaseFragment_TabLayout() { 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 ba0b06ea67..73da3702fa 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt @@ -25,7 +25,7 @@ import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.databinding.FragmentMainHomeBinding import com.gh.gamecenter.eventbus.EBDownloadStatus import com.gh.gamecenter.eventbus.EBPackage -import com.gh.gamecenter.eventbus.EBReuse +import com.gh.gamecenter.common.eventbus.EBReuse import com.gh.gamecenter.eventbus.EBUISwitch import com.gh.gamecenter.fragment.HomeSearchToolWrapperFragment import com.gh.gamecenter.fragment.HomeSearchToolWrapperViewModel 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 092ea6bb1a..7155dc588e 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java @@ -32,7 +32,7 @@ import com.gh.gamecenter.entity.MeEntity; import com.gh.gamecenter.entity.UserDataLibaoEntity; import com.gh.gamecenter.entity.ViewsEntity; import com.gh.gamecenter.manager.CommentManager; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.manager.VisitManager; import com.gh.gamecenter.common.retrofit.JSONObjectResponse; import com.gh.gamecenter.common.retrofit.ObservableUtil; 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 997a1a0841..5193aa1bec 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.info; -import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; +import static com.gh.gamecenter.common.constant.Constants.LOGIN_TAG; import android.app.Activity; import android.content.Intent; @@ -44,8 +44,8 @@ import com.gh.gamecenter.entity.MeEntity; import com.gh.gamecenter.entity.UserDataLibaoEntity; 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.common.eventbus.EBReuse; +import com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; 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 4a6d68b316..a7633b2330 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java @@ -18,6 +18,7 @@ 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.gamecenter.common.constant.Constants; import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.common.util.NewsUtils; import com.gh.gamecenter.core.utils.StringUtils; @@ -30,11 +31,10 @@ import com.gh.gamecenter.databinding.FragmentInfoStrategyBinding; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.eventbus.EBConcernChanged; -import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.common.eventbus.EBReuse; 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.login.user.UserManager; import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.jakewharton.rxbinding2.view.RxView; @@ -260,7 +260,7 @@ public class StrategyFragment extends BaseFragment implements SwipeRefreshLayout @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBReuse reuse) { - if (PersonalFragment.LOGIN_TAG.equals(reuse.getType()) || PersonalFragment.LOGOUT_TAG.equals(reuse.getType())) { + if (Constants.LOGIN_TAG.equals(reuse.getType()) || Constants.LOGOUT_TAG.equals(reuse.getType())) { getConcernGame(); } } 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 9ba6c5ab04..0c5b2e4fc7 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java @@ -19,7 +19,7 @@ import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.common.utils.TextHelper; import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.databinding.FragmentLibao1Binding; -import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.common.eventbus.EBReuse; import com.lightgame.utils.Util_System_Keyboard; import com.lightgame.utils.Utils; 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 9c10a7fd30..6c2ba380b3 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.libao; -import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; +import static com.gh.gamecenter.common.constant.Constants.LOGIN_TAG; import android.content.Intent; import android.graphics.drawable.Drawable; @@ -23,7 +23,7 @@ import com.gh.gamecenter.common.view.CustomDividerItemDecoration; import com.gh.gamecenter.databinding.FragmentLibao2Binding; import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.eventbus.EBConcernChanged; -import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.common.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBUISwitch; import org.greenrobot.eventbus.Subscribe; 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 b6cfce3a6e..bb42577ed5 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -24,7 +24,7 @@ import com.gh.gamecenter.common.utils.ExtensionsKt; 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.login.user.UserManager; 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/Libao3Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java index 85b46ca449..be442b6d92 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.libao; -import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; +import static com.gh.gamecenter.common.constant.Constants.LOGIN_TAG; import android.graphics.drawable.Drawable; import android.os.Bundle; @@ -18,7 +18,7 @@ import com.gh.gamecenter.common.base.fragment.BaseFragment; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.common.view.CustomDividerItemDecoration; import com.gh.gamecenter.databinding.FragmentLibao3Binding; -import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.common.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBUISwitch; import org.greenrobot.eventbus.Subscribe; 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 a464f4bf36..232d619966 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java @@ -28,7 +28,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.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; 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/LibaoFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java index 1148c38031..592a966916 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java @@ -22,7 +22,7 @@ import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.databinding.FragmentLibaoWrapperBinding; -import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.common.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBUISwitch; import com.google.android.material.tabs.TabLayout; 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 200dd14802..252659e49d 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java @@ -23,7 +23,7 @@ import com.gh.gamecenter.LibaoDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.databinding.FragmentLibaoNewBinding; import com.gh.gamecenter.entity.LibaoEntity; -import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.common.eventbus.EBReuse; import org.greenrobot.eventbus.EventBus; 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 3176110e76..0ee0b883ec 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java @@ -19,7 +19,7 @@ import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.common.view.CustomDividerItemDecoration; import com.gh.gamecenter.databinding.FragmentLibaoSerachBinding; import com.gh.gamecenter.entity.LibaoEntity; -import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.common.eventbus.EBReuse; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/gh/gamecenter/manager/CommunityManager.java b/app/src/main/java/com/gh/gamecenter/manager/CommunityManager.java new file mode 100644 index 0000000000..a37b811764 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/manager/CommunityManager.java @@ -0,0 +1,45 @@ +package com.gh.gamecenter.manager; + +import android.content.SharedPreferences; +import android.preference.PreferenceManager; +import android.text.TextUtils; + +import com.gh.gamecenter.core.utils.GsonUtils; +import com.gh.gamecenter.core.utils.SPUtils; +import com.gh.gamecenter.entity.CommunityEntity; +import com.halo.assistant.HaloApp; + +public class CommunityManager { + + private final String COMMUNITY_KEY = "CommunityKey"; + private final SharedPreferences mSp; + private CommunityEntity mCommunityData; + + public static CommunityManager getInstance() { + return SingletonHolder.INSTANCE; + } + + private CommunityManager() { + mSp = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication()); + } + + public void setCommunityData(CommunityEntity community) { + if (community != null) { + SPUtils.setString(mSp, COMMUNITY_KEY, GsonUtils.toJson(community)); + this.mCommunityData = community; + } + } + + public CommunityEntity getCommunity() { + if (mCommunityData == null || TextUtils.isEmpty(mCommunityData.getId())) { + String communityJson = mSp.getString(COMMUNITY_KEY, null); + mCommunityData = TextUtils.isEmpty(communityJson) ? new CommunityEntity() + : GsonUtils.fromJson(communityJson, CommunityEntity.class); + } + return mCommunityData == null ? new CommunityEntity() : mCommunityData; + } + + private static class SingletonHolder { + private static final CommunityManager INSTANCE = new CommunityManager(); + } +} 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 b4318a5a75..c5f379edf0 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java @@ -38,7 +38,7 @@ import com.gh.gamecenter.energy.EnergyCenterActivity; import com.gh.gamecenter.entity.LinkEntity; import com.gh.gamecenter.entity.MessageKeFuEntity; import com.gh.gamecenter.entity.MessageLinkEntity; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity; import com.gh.gamecenter.subject.SubjectActivity; import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel; 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 f2ac7e3576..631b50aca7 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuViewModel.kt @@ -3,7 +3,7 @@ package com.gh.gamecenter.message 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.login.user.UserManager import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable 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 cba0cf2ac1..017ea5aaa5 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java @@ -1,6 +1,6 @@ package com.gh.gamecenter.message; -import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; +import static com.gh.gamecenter.common.constant.Constants.LOGIN_TAG; import android.app.Activity; import android.app.Dialog; @@ -40,11 +40,11 @@ import com.gh.gamecenter.databinding.FragmentMessageDetailBinding; import com.gh.gamecenter.entity.CommentEntity; import com.gh.gamecenter.entity.CommentnumEntity; import com.gh.gamecenter.entity.ConcernEntity; -import com.gh.gamecenter.entity.UserInfoEntity; +import com.gh.gamecenter.login.entity.UserInfoEntity; import com.gh.gamecenter.entity.ViewsEntity; -import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.common.eventbus.EBReuse; import com.gh.gamecenter.manager.CommentManager; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.gh.gamecenter.common.retrofit.OkHttpCache; import com.gh.gamecenter.common.retrofit.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 655d226c49..4e896d772e 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java @@ -39,7 +39,7 @@ import com.gh.gamecenter.entity.MessageFold; import com.gh.gamecenter.entity.UserEntity; import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity; import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.qa.answer.detail.SimpleAnswerDetailActivity; import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity; import com.gh.gamecenter.qa.comment.NewCommentDetailActivity; 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 8bd9ad5b75..92d560b3fa 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageNormalViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/message/MessageNormalViewModel.kt @@ -5,7 +5,7 @@ import androidx.lifecycle.ViewModel 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.login.user.UserManager 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/message/MessageUnreadRepository.kt b/app/src/main/java/com/gh/gamecenter/message/MessageUnreadRepository.kt index a1174f4c20..0873235871 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageUnreadRepository.kt +++ b/app/src/main/java/com/gh/gamecenter/message/MessageUnreadRepository.kt @@ -14,7 +14,7 @@ import com.gh.gamecenter.entity.AddonsUnreadEntity 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.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager 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 c70b6a4a23..c4a7bf0a1b 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt @@ -12,12 +12,13 @@ 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.constant.Constants import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.databinding.FragmentFollowedGameBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.eventbus.EBConcernChanged -import com.gh.gamecenter.eventbus.EBReuse -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.common.eventbus.EBReuse +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.personal.PersonalFragment import com.halo.assistant.fragment.myconcern.MyConcernRecommendAdapter import org.greenrobot.eventbus.Subscribe @@ -171,7 +172,7 @@ class MyFollowedGameFragment : ListFragment @Subscribe(threadMode = ThreadMode.MAIN) fun onEventMainThread(changed: EBReuse) { - if (PersonalFragment.LOGIN_TAG == changed.type) { // 登入 + if (Constants.LOGIN_TAG == changed.type) { // 登入 onLoadRefresh() } } 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 5185758d73..fbd0b99b9b 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameViewModel.kt @@ -10,7 +10,7 @@ import com.gh.gamecenter.R 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.login.user.UserManager 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/mygame/MyReservationFragment.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt index 606d4d1307..4c09818b55 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt @@ -15,12 +15,13 @@ 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.Constants import com.gh.gamecenter.databinding.FragmentListBaseBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.eventbus.EBDownloadStatus import com.gh.gamecenter.eventbus.EBPackage -import com.gh.gamecenter.eventbus.EBReuse -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.common.eventbus.EBReuse +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.personal.PersonalFragment import com.lightgame.download.DataWatcher import com.lightgame.download.DownloadEntity @@ -118,7 +119,7 @@ class MyReservationFragment : ListFragment() @Subscribe(threadMode = ThreadMode.MAIN) fun onEventMainThread(changed: EBReuse) { - if (PersonalFragment.LOGIN_TAG == changed.type) { // 登入 + if (Constants.LOGIN_TAG == changed.type) { // 登入 onLoadRefresh() } } 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 3ce9d7d9c9..6907d5e3b7 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationViewModel.kt @@ -9,7 +9,7 @@ import com.gh.download.DownloadManager 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.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils 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 75fa380046..6d974a93c7 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameFragment.kt @@ -8,11 +8,12 @@ import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.download.DownloadManager import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.baselist.ListFragment +import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.eventbus.EBDownloadStatus import com.gh.gamecenter.eventbus.EBPackage -import com.gh.gamecenter.eventbus.EBReuse -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.common.eventbus.EBReuse +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.personal.PersonalFragment import com.lightgame.download.DataWatcher import com.lightgame.download.DownloadEntity @@ -65,7 +66,7 @@ open class PlayedGameFragment : ListFragment() @Subscribe(threadMode = ThreadMode.MAIN) fun onEventMainThread(changed: EBReuse) { - if (PersonalFragment.LOGIN_TAG == changed.type) { // 登入 + if (Constants.LOGIN_TAG == changed.type) { // 登入 onLoadRefresh() } } 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 61ca65d860..67a77c2fac 100644 --- a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt +++ b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt @@ -14,7 +14,7 @@ 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 +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.packagehelper.PackageRepository.gameInstalled import com.gh.gamecenter.packagehelper.PackageRepository.gameUpdate import com.gh.gamecenter.common.retrofit.BiResponse 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 a4d5870858..eef8ae5c42 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.kt @@ -20,8 +20,8 @@ import com.gh.common.util.DirectUtils.directToHomeActivity 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.gamecenter.login.utils.LoginHelper.onQQLoginCallback +import com.gh.gamecenter.login.utils.LoginHelper.onWeiboLoginCallback import com.gh.gamecenter.core.utils.MtaHelper.onEvent import com.gh.gamecenter.core.utils.SPUtils.getLong import com.gh.gamecenter.core.utils.SPUtils.setLong @@ -43,14 +43,16 @@ import com.gh.gamecenter.energy.EnergyHouseActivity import com.gh.gamecenter.entity.* 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.common.eventbus.EBReuse +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.message.MessageUnreadRepository.loadMessageUnreadTotal import com.gh.gamecenter.message.MessageUnreadViewModel import com.gh.gamecenter.personalhome.UserHomeViewModel import com.gh.gamecenter.room.AppDatabase import com.gh.gamecenter.common.retrofit.ApiResponse -import com.gh.gamecenter.user.UserViewModel +import com.gh.gamecenter.login.entity.Badge +import com.gh.gamecenter.login.entity.UserInfoEntity +import com.gh.gamecenter.login.user.UserViewModel import com.google.android.material.appbar.AppBarLayout import com.halo.assistant.HaloApp import com.tencent.connect.common.Constants @@ -663,9 +665,6 @@ class NewPersonalFragment : BaseLazyFragment() { } companion object { - const val LOGIN_TAG = "login_tag" //登入标识 - const val LOGOUT_TAG = "logout_tag" // 登出标识 - private const val MESSAGE_READ_OVER = "MESSAGE_READ_OVER" private const val SP_BADGE_RECORD_SEVEN_DAY = "badgeRecordSevenDay" private const val REQUEST_MESSAGE = 199 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 a69555868c..ecc407595c 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt @@ -21,8 +21,8 @@ import com.gh.common.util.DirectUtils.directToBadgeWall import com.gh.common.util.DirectUtils.directToHomeActivity 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.gamecenter.login.utils.LoginHelper.onQQLoginCallback +import com.gh.gamecenter.login.utils.LoginHelper.onWeiboLoginCallback import com.gh.gamecenter.core.utils.MtaHelper.onEvent import com.gh.gamecenter.core.utils.SPUtils.getLong import com.gh.gamecenter.core.utils.SPUtils.setLong @@ -42,16 +42,18 @@ import com.gh.gamecenter.databinding.FragmentPersonalStubBinding import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.EBConcernChanged import com.gh.gamecenter.eventbus.EBNetworkState -import com.gh.gamecenter.eventbus.EBReuse +import com.gh.gamecenter.common.eventbus.EBReuse import com.gh.gamecenter.fragment.MainWrapperFragment -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager 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.room.AppDatabase import com.gh.gamecenter.common.retrofit.ApiResponse -import com.gh.gamecenter.user.UserViewModel +import com.gh.gamecenter.login.entity.Badge +import com.gh.gamecenter.login.entity.UserInfoEntity +import com.gh.gamecenter.login.user.UserViewModel import com.google.android.material.appbar.AppBarLayout import com.halo.assistant.HaloApp import com.jakewharton.rxbinding2.view.RxView @@ -723,9 +725,6 @@ class PersonalFragment : BaseLazyFragment() { } companion object { - const val LOGIN_TAG = "login_tag" //登入标识 - const val LOGOUT_TAG = "logout_tag" // 登出标识 - private const val MESSAGE_READ_OVER = "MESSAGE_READ_OVER" private const val SP_BADGE_RECORD_SEVEN_DAY = "badgeRecordSevenDay" private const val REQUEST_MESSAGE = 199 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 44ca6953e5..f83b611194 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt @@ -9,6 +9,7 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView +import com.alibaba.android.arouter.launcher.ARouter import com.facebook.drawee.view.SimpleDraweeView import com.gh.common.util.CheckLoginUtils import com.gh.common.util.DataCollectionUtils @@ -16,6 +17,8 @@ import com.gh.common.util.DirectUtils import com.gh.common.util.NewLogUtils import com.gh.gamecenter.* import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.constant.RouteConsts import com.gh.gamecenter.common.utils.DialogHelper import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.common.utils.PermissionHelper @@ -31,7 +34,7 @@ import com.gh.gamecenter.game.upload.GameSubmissionActivity import com.gh.gamecenter.gamecollection.mine.MyGameCollectionActivity import com.gh.gamecenter.gamedetail.myrating.MyRatingActivity import com.gh.gamecenter.history.HistoryActivity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.message.MessageUnreadRepository import com.gh.gamecenter.mygame.MyGameActivity import com.gh.gamecenter.qa.myqa.MyAskActivity 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 a17ea29c00..e67d968819 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalViewModel.kt @@ -16,7 +16,7 @@ import com.gh.gamecenter.core.utils.ToastUtils 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.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager 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 f1b2326f3b..10cba0d617 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt @@ -18,7 +18,7 @@ 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 +import com.gh.gamecenter.login.user.UserManager class FollowersOrFansAdapter(context: Context, val mViewModel: FollowersOrFansViewModel, val entrance: String) : ListAdapter(context) { 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 0cd01ac675..0d8f77823e 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansFragment.kt @@ -10,7 +10,7 @@ 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 +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.message.MessageUnreadViewModel import com.gh.gamecenter.personalhome.fans.FansActivity import com.halo.assistant.HaloApp 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 994ded30f1..8775a03194 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/InstalledGameDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/InstalledGameDialog.kt @@ -15,7 +15,7 @@ import com.gh.gamecenter.common.view.SpacingItemDecoration 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.login.user.UserManager import com.gh.gamecenter.common.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/UserHomeFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt index a20dc06167..e3bfe54b07 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt @@ -32,16 +32,17 @@ 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.login.user.UserManager import com.gh.gamecenter.message.MessageUnreadViewModel import com.gh.gamecenter.common.base.fragment.ToolbarFragment +import com.gh.gamecenter.login.entity.Badge import com.gh.gamecenter.personalhome.background.PersonalityBackgroundActivity import com.gh.gamecenter.personalhome.border.AvatarBorderActivity import com.gh.gamecenter.personalhome.fans.FansActivity import com.gh.gamecenter.personalhome.followers.FollowersActivity import com.gh.gamecenter.personalhome.home.* import com.gh.gamecenter.personalhome.home.game.UserGameFragment -import com.gh.gamecenter.user.UserViewModel +import com.gh.gamecenter.login.user.UserViewModel import com.google.android.material.appbar.AppBarLayout import com.google.android.material.appbar.AppBarLayout.OnOffsetChangedListener import com.halo.assistant.HaloApp 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 6184a2ee40..8a1ec047ee 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 @@ -7,7 +7,7 @@ import com.gh.gamecenter.common.base.activity.BaseActivity import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.R -import com.gh.gamecenter.entity.BackgroundImageEntity +import com.gh.gamecenter.login.entity.BackgroundImageEntity class BackgroundPreviewActivity : BaseActivity() { 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 1096c623ec..9b6384c585 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 @@ -19,11 +19,11 @@ 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.login.user.UserManager import com.gh.gamecenter.common.base.fragment.ToolbarFragment -import com.gh.gamecenter.user.UserViewModel +import com.gh.gamecenter.login.entity.BackgroundImageEntity +import com.gh.gamecenter.login.user.UserViewModel import com.halo.assistant.HaloApp import com.zhihu.matisse.Matisse import com.zhihu.matisse.MimeType 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 55884688dc..f23b0e999b 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 @@ -8,8 +8,8 @@ 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 -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.entity.BackgroundImageEntity +import com.gh.gamecenter.login.user.UserManager import com.lightgame.adapter.BaseRecyclerAdapter import java.util.ArrayList 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 03fdf39643..6e84b19c38 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 @@ -19,7 +19,7 @@ import com.gh.gamecenter.CropImageActivity import com.gh.gamecenter.R import com.gh.gamecenter.databinding.PersonalityBackgroundFragmentBinding import com.gh.gamecenter.common.base.fragment.ToolbarFragment -import com.gh.gamecenter.user.UserViewModel +import com.gh.gamecenter.login.user.UserViewModel import com.halo.assistant.HaloApp import com.zhihu.matisse.Matisse import com.zhihu.matisse.MimeType 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 aade0b39cb..67f9c55806 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 @@ -10,8 +10,8 @@ import androidx.lifecycle.MutableLiveData 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.common.retrofit.Response +import com.gh.gamecenter.login.entity.BackgroundImageEntity 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/AvatarBorderFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderFragment.kt index 3fedd40c96..4c225db0b8 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 @@ -25,10 +25,10 @@ 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.login.user.UserManager import com.gh.gamecenter.common.base.fragment.ToolbarFragment -import com.gh.gamecenter.user.UserViewModel +import com.gh.gamecenter.login.entity.AvatarBorderEntity +import com.gh.gamecenter.login.user.UserViewModel import com.google.android.material.tabs.TabLayout import com.halo.assistant.HaloApp import org.json.JSONObject 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 60a428b0b5..2b97d4aaa7 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 @@ -13,8 +13,8 @@ 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 -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.entity.AvatarBorderEntity +import com.gh.gamecenter.login.user.UserManager import com.lightgame.adapter.BaseRecyclerAdapter class ChooseAvatarBorderAdapter(context: Context, 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 90dc0c7419..2edb1f74f3 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 @@ -7,8 +7,8 @@ import androidx.lifecycle.MutableLiveData 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.common.retrofit.BiResponse +import com.gh.gamecenter.login.entity.AvatarBorderEntity 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/home/game/UserPlayedGameFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameFragment.kt index be1a462caf..19ca6f170c 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 @@ -18,7 +18,7 @@ import com.gh.gamecenter.entity.GameInstall import com.gh.gamecenter.eventbus.EBDownloadStatus import com.gh.gamecenter.eventbus.EBPackage import com.gh.gamecenter.manager.PackagesManager -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.mygame.PlayedGameViewModel import com.gh.gamecenter.personalhome.InstalledGameDialog import com.lightgame.download.DataWatcher 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 1261aef6b2..572f517115 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 @@ -10,7 +10,7 @@ import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListActivity import com.gh.gamecenter.baselist.NormalListViewModel import com.gh.gamecenter.common.utils.updateStatusBarColor -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager 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/provider/GhContentProvider.kt b/app/src/main/java/com/gh/gamecenter/provider/GhContentProvider.kt index 91129dcc8b..869ba86e8f 100644 --- a/app/src/main/java/com/gh/gamecenter/provider/GhContentProvider.kt +++ b/app/src/main/java/com/gh/gamecenter/provider/GhContentProvider.kt @@ -13,8 +13,8 @@ import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.core.utils.GsonUtils import com.gh.gamecenter.core.utils.SPUtils -import com.gh.gamecenter.entity.UserInfoEntity -import com.gh.gamecenter.user.UserRepository +import com.gh.gamecenter.login.entity.UserInfoEntity +import com.gh.gamecenter.login.user.UserRepository import com.lightgame.utils.Utils class GhContentProvider : ContentProvider() { 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 8d281598c3..ff6a27ba81 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/CommunityFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/CommunityFragment.kt @@ -26,11 +26,11 @@ //import com.gh.common.view.GameIconView //import com.gh.gamecenter.R //import com.gh.gamecenter.entity.ResultEntity -//import com.gh.gamecenter.eventbus.EBReuse +//import com.gh.gamecenter.common.eventbus.EBReuse //import com.gh.gamecenter.eventbus.EBTypeChange //import com.gh.gamecenter.eventbus.EBUISwitch //import com.gh.gamecenter.fragment.MainWrapperFragment -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.personal.PersonalFragment //import com.gh.gamecenter.qa.all.AskAllFragment //import com.gh.gamecenter.qa.article.edit.ArticleEditActivity @@ -126,11 +126,11 @@ // status?.let { // val channel = HaloApp.getInstance().channel // // MARK:只要是测试社区都忽略隐藏判断 -// if (TextUtils.isEmpty(UserManager.getInstance().community.id) +// if (TextUtils.isEmpty(CommunityManager.getInstance().community.id) // || (!status.isActive && !channel.contains("TEST"))) { // showCommunitySelectFragment() // } else { -// mAskSelectCommunity.displayGameIcon(UserManager.getInstance().community.icon, UserManager.getInstance().community.iconSubscript) +// mAskSelectCommunity.displayGameIcon(CommunityManager.getInstance().community.icon, CommunityManager.getInstance().community.iconSubscript) // showAvailableInfo() // mViewPager.currentItem = INDEX_RECOMMEND // @@ -196,7 +196,7 @@ // } // // if (tab.text == TAB_TITLE_ALL) mViewPager.currentItem = INDEX_ALL -// MtaHelper.onEvent("问答页面", UserManager.getInstance().community.name, tab.text.toString() + "Tab") +// MtaHelper.onEvent("问答页面", CommunityManager.getInstance().community.name, tab.text.toString() + "Tab") // } // // override fun onTabUnselected(tab: TabLayout.Tab) {} @@ -278,7 +278,7 @@ // // override fun onResume() { // super.onResume() -// if (!TextUtils.isEmpty(UserManager.getInstance().community.id)) { +// if (!TextUtils.isEmpty(CommunityManager.getInstance().community.id)) { // mSelectGameHint.visibility = if (!mHasClickedSelectGame) View.VISIBLE else View.GONE // } // DisplayUtils.setLightStatusBar(requireActivity(), true) @@ -312,11 +312,11 @@ // sp.edit().putBoolean(SP_KEY_CLICKED_SELECT_GAME, mHasClickedSelectGame).apply() // } // -// MtaHelper.onEvent("问答页面", UserManager.getInstance().community.name, "选择游戏") +// MtaHelper.onEvent("问答页面", CommunityManager.getInstance().community.name, "选择游戏") // startActivityForResult(CommunitiesSelectActivity.getIntent(context), COMMUNITIES_SELECT_REQUEST) // } // R.id.community_search_container -> { -// MtaHelper.onEvent("问答页面", UserManager.getInstance().community.name, "搜索") +// MtaHelper.onEvent("问答页面", CommunityManager.getInstance().community.name, "搜索") // startActivity(AskSearchActivity.getIntent(context, "(首页-问答)")) // } // R.id.reuse_no_connection -> { @@ -330,7 +330,7 @@ // else -> "推荐-发布" // } // MtaHelper.onEvent("问答页面", "问答页面", positionType) -// MtaHelper.onEvent("问答页面", UserManager.getInstance().community.name, positionType) +// MtaHelper.onEvent("问答页面", CommunityManager.getInstance().community.name, positionType) // // showCommunityEditWindow() // } @@ -365,7 +365,7 @@ // } // } // -// PersonalFragment.LOGIN_TAG -> { +// Constants.LOGIN_TAG -> { // mAskFollowFragment?.onRefresh() // } // @@ -456,7 +456,7 @@ // requireContext(), // R.style.DialogWindowTransparent, // "问答页面", -// UserManager.getInstance().community.name, +// CommunityManager.getInstance().community.name, // null, // "发布-空白", // "发布-返回", @@ -469,8 +469,8 @@ // contentView.findViewById(R.id.community_edit_article).setOnClickListener { // context?.ifLogin("(首页-问答)", action = { // checkStoragePermissionBeforeAction { -// MtaHelper.onEvent("问答页面", UserManager.getInstance().community.name, "发布-发文章") -// startActivity(ArticleEditActivity.getIntent(requireContext(), UserManager.getInstance().community)) +// MtaHelper.onEvent("问答页面", CommunityManager.getInstance().community.name, "发布-发文章") +// startActivity(ArticleEditActivity.getIntent(requireContext(), CommunityManager.getInstance().community)) // dialog.dismiss() // } // }) @@ -478,14 +478,14 @@ // contentView.findViewById(R.id.community_edit_question).setOnClickListener { // context?.ifLogin("(首页-问答)", action = { // checkStoragePermissionBeforeAction { -// MtaHelper.onEvent("问答页面", UserManager.getInstance().community.name, "发布-提问题") +// MtaHelper.onEvent("问答页面", CommunityManager.getInstance().community.name, "发布-提问题") // startActivity(QuestionEditActivity.getIntent(requireContext())) // dialog.dismiss() // } // }) // } // contentView.findViewById(R.id.community_edit_close).setOnClickListener { -// MtaHelper.onEvent("问答页面", UserManager.getInstance().community.name, "发布-关闭") +// MtaHelper.onEvent("问答页面", CommunityManager.getInstance().community.name, "发布-关闭") // dialog.dismiss() // } // } diff --git a/app/src/main/java/com/gh/gamecenter/qa/CommunityViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/CommunityViewModel.kt index 351e4d82d1..4590afa639 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/CommunityViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/CommunityViewModel.kt @@ -5,7 +5,7 @@ //import androidx.lifecycle.MutableLiveData //import android.text.TextUtils //import com.gh.gamecenter.entity.ResultEntity -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.entity.CommunitySelectEntity //import com.gh.gamecenter.qa.entity.CommunityStatusEntity //import com.gh.gamecenter.retrofit.Response @@ -36,7 +36,7 @@ // mTimer = fixedRateTimer("checkUnreadFollowTimeline", false, 0, 2 * 60 * 1000L) { // RetrofitManager.getInstance() // .api -// .getUnreadCommunityTimeline(UserManager.getInstance().community.id, UserManager.getInstance().userId) +// .getUnreadCommunityTimeline(CommunityManager.getInstance().community.id, UserManager.getInstance().userId) // .subscribeOn(Schedulers.io()) // .subscribe(object : Response() { // override fun onResponse(response: ResponseBody?) { @@ -59,7 +59,7 @@ // fun checkCommunity(data: ResultEntity?) { // getCommunityDefaultSearch() // -// val id = UserManager.getInstance().community.id +// val id = CommunityManager.getInstance().community.id // if (TextUtils.isEmpty(id)) { // communityStatus.postValue(CommunityStatusEntity(false, data)) // return @@ -71,7 +71,7 @@ // .observeOn(AndroidSchedulers.mainThread()) // .subscribe(object : Response() { // override fun onResponse(response: CommunitySelectEntity?) { -// val community = UserManager.getInstance().community +// val community = CommunityManager.getInstance().community // if (community.icon.isNullOrEmpty()) { // community.icon = response?.game?.getRawIconIfExisted() // community.iconSubscript = response?.game?.iconSubscript @@ -93,7 +93,7 @@ // // private fun getCommunityDefaultSearch() { // RetrofitManager.getInstance() -// .api.getCommunityDefaultSearch(UserManager.getInstance().community.id) +// .api.getCommunityDefaultSearch(CommunityManager.getInstance().community.id) // .subscribeOn(Schedulers.io()) // .observeOn(AndroidSchedulers.mainThread()) // .subscribe(object : Response() { 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 4d5049a723..f4981f01ac 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 @@ -11,7 +11,7 @@ //import com.gh.gamecenter.common.view.DrawableView //import com.gh.gamecenter.R //import com.gh.gamecenter.databinding.FragmentAskAllBinding -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.article.SimpleArticleListFragment //import com.gh.gamecenter.qa.newest.AskQuestionsNewBodyFragment // @@ -64,9 +64,9 @@ // mBinding.articleButton.isChecked = !mBinding.questionButton.isChecked // // if (position == 0) { -// MtaHelper.onEvent("问答页面", UserManager.getInstance().community.name, "全部-问题") +// MtaHelper.onEvent("问答页面", CommunityManager.getInstance().community.name, "全部-问题") // } else { -// MtaHelper.onEvent("问答页面", UserManager.getInstance().community.name, "全部-文章") +// MtaHelper.onEvent("问答页面", CommunityManager.getInstance().community.name, "全部-文章") // } // } // }) 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 2e84e8ca0d..71277b64af 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 @@ -15,7 +15,7 @@ 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 -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity import com.gh.gamecenter.qa.comment.CommentActivity import com.gh.gamecenter.qa.entity.AnswerEntity @@ -26,6 +26,7 @@ import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.common.retrofit.Response +import com.gh.gamecenter.manager.CommunityManager import com.gh.gamecenter.retrofit.RetrofitManager import com.lightgame.utils.Utils import com.lightgame.view.CheckableImageView @@ -215,7 +216,7 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH } else -> { val communityId = if (entity.community.id.isNotEmpty()) entity.community.id - else UserManager.getInstance().community.id + else CommunityManager.getInstance().community.id val intent = ArticleDetailActivity.getCommentIntent( itemView.context, CommunityEntity(communityId, entity.community.name), 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 ad4ffe3e56..6831ba4eb1 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 @@ -19,7 +19,7 @@ import com.gh.gamecenter.core.utils.SpanBuilder import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.CommunityAnswerItemBinding -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.entity.AnswerEntity import com.gh.gamecenter.qa.entity.ArticleEntity 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 9b7fb9d457..276bff661d 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 @@ -32,6 +32,7 @@ import com.gh.gamecenter.SuggestionActivity import com.gh.gamecenter.common.base.fragment.BaseFragment import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.callback.ConfirmListener +import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.constant.Constants.GAME_DETAIL_COME_IN import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.entity.NormalShareEntity @@ -42,8 +43,8 @@ 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.common.eventbus.EBReuse +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.personal.PersonalFragment import com.gh.gamecenter.qa.answer.edit.AnswerEditActivity import com.gh.gamecenter.qa.comment.CommentActivity @@ -1224,7 +1225,7 @@ open class AnswerDetailFragment : ToolbarFragment() { @Subscribe(threadMode = ThreadMode.MAIN) fun onEventMainThread(reuse: EBReuse) { - if (reuse.type == PersonalFragment.LOGIN_TAG && !TextUtils.isEmpty(mAnswerId)) { // 登入 + if (reuse.type == Constants.LOGIN_TAG && !TextUtils.isEmpty(mAnswerId)) { // 登入 mViewModel.getAnswerDetail(mAnswerId) } } 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 1f59afbc0b..ed0092db14 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 @@ -20,7 +20,7 @@ import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListViewModel; import com.gh.gamecenter.baselist.LoadType; import com.gh.gamecenter.databinding.AnswerDraftItemBinding; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.qa.answer.edit.AnswerEditActivity; import com.gh.gamecenter.qa.entity.AnswerEntity; import com.gh.gamecenter.qa.myqa.AnswerDraftViewHolder; 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 eda0dc33e8..ea229d1c3e 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 @@ -13,8 +13,8 @@ import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListFragment; import com.gh.gamecenter.baselist.LoadType; import com.gh.gamecenter.baselist.NormalListViewModel; -import com.gh.gamecenter.eventbus.EBReuse; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.common.eventbus.EBReuse; +import com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.qa.answer.edit.AnswerEditActivity; import com.gh.gamecenter.qa.entity.AnswerEntity; import com.gh.gamecenter.retrofit.RetrofitManager; 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 e75f5de0ec..91ad82a4d3 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 @@ -28,7 +28,7 @@ import com.gh.gamecenter.common.utils.DialogUtils import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentAnswerEditBinding import com.gh.gamecenter.common.entity.NotificationUgc -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.mvvm.Status import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity import com.gh.gamecenter.qa.answer.draft.AnswerDraftActivity 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 d249b4a3ac..2b241eeea7 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 @@ -9,8 +9,8 @@ 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 -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.common.eventbus.EBReuse +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.mvvm.Resource import com.gh.base.BaseRichEditorViewModel import com.gh.base.RichType 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 1a7e820916..9c1bc13ea1 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 @@ -17,7 +17,7 @@ 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.view.CustomDividerItemDecoration -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.article.edit.ArticleEditActivity import com.gh.gamecenter.qa.entity.ArticleEntity import com.gh.gamecenter.retrofit.RetrofitManager diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListAdapter.kt index 31c1041d39..1ba309c38d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListAdapter.kt @@ -10,7 +10,7 @@ //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.login.user.UserManager //import com.gh.gamecenter.qa.answer.CommunityAnswerItemViewHolder //import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity //import com.gh.gamecenter.qa.entity.ArticleEntity @@ -54,7 +54,7 @@ // questions.title = articleEntity.title // viewHolder.bindArticleItem(articleEntity, "", getPath()) // viewHolder.itemView.setOnClickListener { -// mContext.startActivity(ArticleDetailActivity.getIntent(mContext, UserManager.getInstance().community, articleEntity.id, "", getPath())) +// mContext.startActivity(ArticleDetailActivity.getIntent(mContext, CommunityManager.getInstance().community, articleEntity.id, "", getPath())) // } // } // ItemViewType.ITEM_FOOTER -> { diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListFragment.kt index 24867d07b6..af18a7b58c 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListFragment.kt @@ -11,10 +11,10 @@ //import com.gh.gamecenter.baselist.ListFragment //import com.gh.gamecenter.baselist.LoadStatus //import com.gh.gamecenter.baselist.LoadType -//import com.gh.gamecenter.eventbus.EBReuse +//import com.gh.gamecenter.common.eventbus.EBReuse //import com.gh.gamecenter.eventbus.EBTypeChange //import com.gh.gamecenter.forum.home.CommunityHomeFragment -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.CommunityFragment //import com.gh.gamecenter.qa.article.edit.ArticleEditActivity //import com.gh.gamecenter.qa.entity.ArticleEntity @@ -31,14 +31,14 @@ // // override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { // super.onActivityResult(requestCode, resultCode, data) -// if (UserManager.getInstance().community.id != mCommunityId) { -// mCommunityId = UserManager.getInstance().community.id +// if (CommunityManager.getInstance().community.id != mCommunityId) { +// mCommunityId = CommunityManager.getInstance().community.id // onRefresh() // } // } // // override fun onCreate(savedInstanceState: Bundle?) { -// mCommunityId = UserManager.getInstance().community.id +// mCommunityId = CommunityManager.getInstance().community.id // mViewModel = provideListViewModel() // mViewModel.sortType = arguments?.getString(EntranceUtils.KEY_TYPE) ?: "" // diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListViewModel.kt index df3737f789..58a54dd114 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListViewModel.kt @@ -2,7 +2,7 @@ // //import android.app.Application //import com.gh.gamecenter.baselist.ListViewModel -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.entity.ArticleEntity //import com.gh.gamecenter.retrofit.RetrofitManager //import com.lightgame.utils.Utils @@ -29,7 +29,7 @@ // } // return RetrofitManager.getInstance() // .api -// .getAllCommunityArticles(UserManager.getInstance().community.id, mSortType.value, page, Utils.getTime(getApplication())) +// .getAllCommunityArticles(CommunityManager.getInstance().community.id, mSortType.value, page, Utils.getTime(getApplication())) // } // // override fun mergeResultLiveData() { 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 9b1a978a7f..4325e0c36d 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 @@ -21,7 +21,7 @@ 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.login.user.UserManager import com.gh.gamecenter.qa.editor.OnLinkClickListener import com.gh.gamecenter.qa.entity.ArticleDetailEntity import java.util.* 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 e2672d90ef..81b12005c6 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 @@ -38,8 +38,8 @@ import com.gh.gamecenter.databinding.FragmentArticleDetailBinding import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.EBDeleteCommentDetail import com.gh.gamecenter.eventbus.EBDeleteDetail -import com.gh.gamecenter.eventbus.EBReuse -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.common.eventbus.EBReuse +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.personal.PersonalFragment import com.gh.gamecenter.qa.article.edit.ArticleEditActivity import com.gh.gamecenter.qa.comment.CommentActivity @@ -903,7 +903,7 @@ class ArticleDetailFragment : BaseCommentFragment(), Keyb onBackPressed() } mBinding.articleGameName.setOnClickListener { - MtaHelper.onEvent("发表文章", "指定游戏", UserManager.getInstance().community.name) + MtaHelper.onEvent("发表文章", "指定游戏", CommunityManager.getInstance().community.name) showSelectGameDialog() } mBinding.chooseActivityContainer.setOnClickListener { @@ -576,7 +577,7 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb } } } else if (item?.itemId == R.id.menu_draft) { - MtaHelper.onEvent("发表文章", "文章草稿", UserManager.getInstance().community.name) + MtaHelper.onEvent("发表文章", "文章草稿", CommunityManager.getInstance().community.name) if (checkDraft(SaveDraftType.SKIP)) { NewLogUtils.logArticleDraftClick() val intent = ArticleDraftActivity.getIntent( 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 6a7ecc131e..91cac1ca9b 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 @@ -9,8 +9,8 @@ import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.entity.CommunityEntity -import com.gh.gamecenter.eventbus.EBReuse -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.common.eventbus.EBReuse +import com.gh.gamecenter.login.user.UserManager import com.gh.base.BaseRichEditorViewModel import com.gh.base.RichType import com.gh.gamecenter.core.utils.ToastUtils @@ -23,6 +23,7 @@ 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.common.retrofit.Response +import com.gh.gamecenter.manager.CommunityManager import com.lightgame.utils.Utils import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers @@ -162,7 +163,7 @@ class ArticleEditViewModel(application: Application) : BaseRichEditorViewModel(a detailEntity?.time?.edit = Utils.getTime(getApplication()) } processDialog.postValue(WaitingDialogFragment.WaitingDialogData("上传中...", false)) - MtaHelper.onEvent("发表文章", "发布成功", UserManager.getInstance().community.name) + MtaHelper.onEvent("发表文章", "发布成功", CommunityManager.getInstance().community.name) val data = response?.string() postArticle.postValue(data) @@ -187,7 +188,7 @@ class ArticleEditViewModel(application: Application) : BaseRichEditorViewModel(a e1.printStackTrace() } error.postValue(errorString) - MtaHelper.onEvent("发表文章", "发布失败", UserManager.getInstance().community.name) + MtaHelper.onEvent("发表文章", "发布失败", CommunityManager.getInstance().community.name) } }) } 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 7fcdb734a9..cccba1b17d 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 @@ -6,7 +6,7 @@ //import com.gh.common.util.DataUtils //import com.gh.gamecenter.R //import com.gh.gamecenter.databinding.AskColumnTagItemBinding -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.column.detail.AskColumnDetailActivity //import com.gh.gamecenter.qa.column.order.AskTabOrderActivity //import com.gh.gamecenter.qa.entity.AskTagGroupsEntity @@ -39,12 +39,12 @@ // holder.itemView.setOnClickListener { // if (position == itemCount - 1) { // DataUtils.onMtaEvent(mContext, "问答页面", -// UserManager.getInstance().community.name, "专栏-调整排序") +// CommunityManager.getInstance().community.name, "专栏-调整排序") // mContext.startActivity(AskTabOrderActivity.getIntent(mContext)) // } else { // DataUtils.onMtaEvent(mContext, "问答页面", -// UserManager.getInstance().community.name, "专栏-" + entity?.name) -// mContext.startActivity(AskColumnDetailActivity.getIntentByColumn(mContext, entity!!, UserManager.getInstance().community, "", "问答-专栏")) +// CommunityManager.getInstance().community.name, "专栏-" + entity?.name) +// mContext.startActivity(AskColumnDetailActivity.getIntentByColumn(mContext, entity!!, CommunityManager.getInstance().community, "", "问答-专栏")) // } // } // } 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 70e2f83131..b61988b1d5 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 @@ -6,7 +6,8 @@ import android.text.TextUtils; import com.gh.common.util.ErrorHelper; import com.gh.gamecenter.core.utils.GsonUtils; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; +import com.gh.gamecenter.manager.CommunityManager; import com.gh.gamecenter.qa.entity.AskTagGroupsEntity; import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -49,7 +50,7 @@ public class AskColumnRepository { private void loadUserTagGroups() { mCurCommunityId = UserManager.getInstance().getUserId(); RetrofitManager.getInstance().getApi() - .getUserAskColumnsTags(UserManager.getInstance().getUserId(), UserManager.getInstance().getCommunity().getId()) + .getUserAskColumnsTags(UserManager.getInstance().getUserId(), CommunityManager.getInstance().getCommunity().getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -69,7 +70,7 @@ public class AskColumnRepository { private void loadDefaultTagGroups(List userEntity) { RetrofitManager.getInstance().getApi() - .getAskColumnsTags(UserManager.getInstance().getCommunity().getId()) + .getAskColumnsTags(CommunityManager.getInstance().getCommunity().getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -108,7 +109,7 @@ public class AskColumnRepository { RequestBody body = RequestBody.create(MediaType.parse("application/json"), GsonUtils.toJson(entity)); RetrofitManager.getInstance().getApi() - .patchUserAskColumnsTags(body, UserManager.getInstance().getUserId(), UserManager.getInstance().getCommunity().getId()) + .patchUserAskColumnsTags(body, UserManager.getInstance().getUserId(), CommunityManager.getInstance().getCommunity().getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -135,7 +136,7 @@ public class AskColumnRepository { private void deleteUserAskTagGroups() { RetrofitManager.getInstance() .getApi() - .deleteUserAskColumnsTags(UserManager.getInstance().getUserId(), UserManager.getInstance().getCommunity().getId()) + .deleteUserAskColumnsTags(UserManager.getInstance().getUserId(), CommunityManager.getInstance().getCommunity().getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnViewModel.kt index 7068c39742..9436cf12b0 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/AskColumnViewModel.kt @@ -3,7 +3,7 @@ //import android.app.Application //import androidx.lifecycle.* //import android.text.TextUtils -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.entity.AskTagGroupsEntity // //class AskColumnViewModel(application: Application, private val mRepository: AskColumnRepository) : AndroidViewModel(application) { @@ -16,7 +16,7 @@ // init { // mObservableTagGroupsList = mRepository.tagGroupsObservable // if (TextUtils.isEmpty(mRepository.curCommunityId) || -// mRepository.curCommunityId == UserManager.getInstance().community.id) { +// mRepository.curCommunityId == CommunityManager.getInstance().community.id) { // retry() // } // } 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 888350cacd..9087f2a033 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 @@ -10,7 +10,7 @@ import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.databinding.CommunityAnswerItemBinding import com.gh.gamecenter.entity.SpecialColumn -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.manager.CommunityManager import com.gh.gamecenter.qa.answer.CommunityAnswerItemViewHolder import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity @@ -55,7 +55,7 @@ class RecommendsAdapter(context: Context, if ("community_article" == answerEntity.type) { mContext.startActivity( ArticleDetailActivity.getIntent(mContext, - UserManager.getInstance().community, + CommunityManager.getInstance().community, answerEntity.id!!, mEntrance, mPath, @@ -68,7 +68,7 @@ class RecommendsAdapter(context: Context, if ("community_article" == answerEntity.type) { mContext.startActivity( ArticleDetailActivity.getIntent(mContext, - UserManager.getInstance().community, + CommunityManager.getInstance().community, answerEntity.id!!, mEntrance, mPath, 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 577d747583..87ce30ed37 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 @@ -36,7 +36,7 @@ import com.gh.gamecenter.databinding.ItemCommentEditImageBinding import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.eventbus.EBCommentSuccess import com.gh.gamecenter.eventbus.EBDeleteComment -import com.gh.gamecenter.eventbus.EBReuse +import com.gh.gamecenter.common.eventbus.EBReuse import com.gh.gamecenter.qa.answer.detail.AnswerDetailFragment import com.gh.gamecenter.qa.comment.CommentActivity.Companion.GAME_COLLECTION_ID import com.gh.gamecenter.qa.comment.CommentActivity.Companion.QUESTION_ID 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 350b6cb3d9..1f5b8e7180 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 @@ -23,7 +23,7 @@ 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 +import com.gh.gamecenter.login.user.UserManager import com.halo.assistant.HaloApp class StairsCommentViewHolder( 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 22f2bae12c..c1a41a4735 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 @@ -21,7 +21,7 @@ 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 +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.comment.base.BaseCommentAdapter import com.gh.gamecenter.qa.comment.base.BaseCommentFragment import com.gh.gamecenter.qa.comment.base.BaseCommentViewModel diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerViewModel.kt index 1715d307d3..7f0872ea54 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerViewModel.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.entity.ForumEntity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager 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/qa/editor/AnswerViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerViewModel.kt index f091f632ca..8caedb93e7 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerViewModel.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.UserEntity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.entity.AnswerEntity import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleViewModel.kt index b3320bc847..a7cfe1effa 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleViewModel.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.entity.UserEntity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.entity.ArticleEntity import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp 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 fe4511fa48..5acca91461 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 @@ -19,7 +19,7 @@ import com.gh.gamecenter.R import com.gh.gamecenter.baselist.ListFragment import com.gh.gamecenter.baselist.NormalListViewModel import com.gh.gamecenter.entity.GameEntity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.entity.EditorInsertDefaultEntity import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager 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 f645632665..31acf4a99b 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 @@ -10,7 +10,7 @@ import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.R import com.gh.gamecenter.collection.GamesCollectionFragment import com.gh.gamecenter.common.utils.updateStatusBarColor -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager class InsertGameCollectionWrapperActivity : BaseActivity_TabLayout() { diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/OnlineVideoViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/OnlineVideoViewModel.kt index 74bb0f2b1b..0689398a76 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/OnlineVideoViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/OnlineVideoViewModel.kt @@ -6,7 +6,7 @@ import com.gh.gamecenter.baselist.BaseListViewModel import com.gh.gamecenter.baselist.ListViewModel import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.entity.MyVideoEntity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable 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 bee277b9c9..93a15009e2 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 @@ -14,7 +14,7 @@ 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.login.user.UserManager import com.gh.gamecenter.room.converter.* import com.google.gson.annotations.SerializedName 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 a5474ec9ad..c206931f11 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 @@ -13,7 +13,7 @@ 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.login.user.UserManager import com.gh.gamecenter.room.converter.* import com.google.gson.annotations.SerializedName import kotlinx.parcelize.Parceler diff --git a/app/src/main/java/com/gh/gamecenter/qa/entity/AskSubjectEntity.kt b/app/src/main/java/com/gh/gamecenter/qa/entity/AskSubjectEntity.kt index 1abacfb3d8..344a3daa2f 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/entity/AskSubjectEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/entity/AskSubjectEntity.kt @@ -1,7 +1,7 @@ package com.gh.gamecenter.qa.entity import android.os.Parcelable -import com.gh.gamecenter.entity.Auth +import com.gh.gamecenter.login.entity.Auth import com.google.gson.annotations.SerializedName import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/com/gh/gamecenter/qa/entity/InviteEntity.kt b/app/src/main/java/com/gh/gamecenter/qa/entity/InviteEntity.kt index 669f1953b5..6cf4538944 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/entity/InviteEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/entity/InviteEntity.kt @@ -1,8 +1,8 @@ package com.gh.gamecenter.qa.entity -import com.gh.gamecenter.entity.Auth -import com.gh.gamecenter.entity.Badge import com.gh.gamecenter.entity.MeEntity +import com.gh.gamecenter.login.entity.Auth +import com.gh.gamecenter.login.entity.Badge import com.google.gson.annotations.SerializedName /** diff --git a/app/src/main/java/com/gh/gamecenter/qa/entity/SuggestedFollowEntity.kt b/app/src/main/java/com/gh/gamecenter/qa/entity/SuggestedFollowEntity.kt index 6abe49fb39..6a04ae626a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/entity/SuggestedFollowEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/entity/SuggestedFollowEntity.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.qa.entity -import com.gh.gamecenter.entity.Auth +import com.gh.gamecenter.login.entity.Auth import com.google.gson.annotations.SerializedName data class SuggestedFollowEntity(@SerializedName("_id") 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 f20aa4bf9a..e1d7443a70 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 @@ -19,10 +19,10 @@ package com.gh.gamecenter.qa.follow //import com.gh.gamecenter.baselist.ListFragment //import com.gh.gamecenter.entity.PersonalEntity //import com.gh.gamecenter.entity.PersonalHistoryEntity -//import com.gh.gamecenter.eventbus.EBReuse +//import com.gh.gamecenter.common.eventbus.EBReuse //import com.gh.gamecenter.eventbus.EBTypeChange //import com.gh.gamecenter.forum.home.CommunityHomeFragment -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.CommunityFragment //import org.greenrobot.eventbus.EventBus //import org.greenrobot.eventbus.Subscribe @@ -103,9 +103,9 @@ package com.gh.gamecenter.qa.follow // * 返回值标识为是否执行了刷新操作 // */ // fun load(): Boolean { -// return if (mCurrentCommunity != UserManager.getInstance().community.id) { +// return if (mCurrentCommunity != CommunityManager.getInstance().community.id) { // onRefresh() -// mCurrentCommunity = UserManager.getInstance().community.id +// mCurrentCommunity = CommunityManager.getInstance().community.id // true // } else { // false diff --git a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowViewModel.kt index 78478ed1f4..908b506e73 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowViewModel.kt @@ -6,7 +6,7 @@ //import com.gh.gamecenter.baselist.ListViewModel //import com.gh.gamecenter.entity.PersonalEntity //import com.gh.gamecenter.entity.PersonalHistoryEntity -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.retrofit.Response //import com.gh.gamecenter.retrofit.RetrofitManager //import com.lightgame.utils.Utils @@ -27,7 +27,7 @@ // override fun provideDataObservable(page: Int): Observable> { // return RetrofitManager.getInstance() // .api -// .getAskFollow(UserManager.getInstance().community.id, UserManager.getInstance().userId, page, Utils.getTime(getApplication())) +// .getAskFollow(CommunityManager.getInstance().community.id, UserManager.getInstance().userId, page, Utils.getTime(getApplication())) // } // // override fun mergeResultLiveData() { @@ -39,7 +39,7 @@ // fun getRecommendUser() { // RetrofitManager.getInstance() // .api -// .getRecommendUsers(UserManager.getInstance().community.id, UserManager.getInstance().userId) +// .getRecommendUsers(CommunityManager.getInstance().community.id, UserManager.getInstance().userId) // .subscribeOn(Schedulers.io()) // .subscribe(object : Response>() { // override fun onResponse(response: List?) { 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 218cffbc82..92c09ec810 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 @@ -14,7 +14,7 @@ import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListFragment; import com.gh.gamecenter.baselist.LoadType; import com.gh.gamecenter.baselist.NormalListViewModel; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.qa.entity.Questions; import com.gh.gamecenter.retrofit.RetrofitManager; 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 cb2a2a2579..68e427b646 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 @@ -13,7 +13,7 @@ import com.gh.gamecenter.baselist.LoadType; import com.gh.gamecenter.baselist.NormalListViewModel; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.view.CustomDividerItemDecoration; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.qa.entity.AnswerEntity; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskWrapperFragment.java index 0d8b35b179..0e3bdc3c2a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskWrapperFragment.java @@ -8,7 +8,7 @@ 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 com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.qa.article.MyArticleFragment; import com.gh.gamecenter.qa.draft.CommunityDraftWrapperActivity; 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 823097350b..e07caa1526 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 @@ -12,7 +12,7 @@ import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListFragment; import com.gh.gamecenter.baselist.LoadType; import com.gh.gamecenter.baselist.NormalListViewModel; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.qa.entity.Questions; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; diff --git a/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewBodyFragment.java b/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewBodyFragment.java index b6d254fbcc..58e1acb775 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewBodyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewBodyFragment.java @@ -17,9 +17,9 @@ //import com.gh.gamecenter.baselist.LoadStatus; //import com.gh.gamecenter.baselist.LoadType; //import com.gh.gamecenter.baselist.NormalListViewModel; -//import com.gh.gamecenter.eventbus.EBReuse; +//import com.gh.gamecenter.common.eventbus.EBReuse; //import com.gh.gamecenter.eventbus.EBTypeChange; -//import com.gh.gamecenter.manager.UserManager; +//import com.gh.gamecenter.login.user.UserManager; //import com.gh.gamecenter.qa.BbsType; //import com.gh.gamecenter.qa.CommunityFragment; //import com.gh.gamecenter.qa.entity.Questions; @@ -51,8 +51,8 @@ // @Override // public void onActivityResult(int requestCode, int resultCode, Intent data) { // super.onActivityResult(requestCode, resultCode, data); -// if (!UserManager.getInstance().getCommunity().getId().equals(mCommunityId)) { -// mCommunityId = UserManager.getInstance().getCommunity().getId(); +// if (!CommunityManager.getInstance().getCommunity().getId().equals(mCommunityId)) { +// mCommunityId = CommunityManager.getInstance().getCommunity().getId(); // if (getArguments() != null) { // mType = getArguments().getString(mCommunityId); // } @@ -67,7 +67,7 @@ // // @Override // public void onCreate(@Nullable Bundle savedInstanceState) { -// mCommunityId = UserManager.getInstance().getCommunity().getId(); +// mCommunityId = CommunityManager.getInstance().getCommunity().getId(); // if (getArguments() != null) { // mType = getArguments().getString(mCommunityId); // } @@ -128,7 +128,7 @@ // public static Fragment newInstance(String s) { // AskQuestionsNewBodyFragment questionsBodyFragment = new AskQuestionsNewBodyFragment(); // Bundle args = new Bundle(); -// args.putString(UserManager.getInstance().getCommunity().getId(), s); +// args.putString(CommunityManager.getInstance().getCommunity().getId(), s); // questionsBodyFragment.setArguments(args); // return questionsBodyFragment; // } diff --git a/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewFragment.java b/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewFragment.java index b2643099b6..6d5fd52201 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/newest/AskQuestionsNewFragment.java @@ -19,7 +19,7 @@ //import com.gh.gamecenter.common.utils.ImageUtils; //import com.gh.gamecenter.common.view.TabIndicatorView; //import com.gh.gamecenter.R; -//import com.gh.gamecenter.manager.UserManager; +//import com.gh.gamecenter.login.user.UserManager; //import com.gh.gamecenter.qa.entity.AskTagGroupsEntity; //import com.gh.gamecenter.qa.tags.AskQuestionsNewViewModel; //import com.gh.gamecenter.qa.tags.AskTagPagerFragmentAdapter; @@ -93,7 +93,7 @@ // public void onPageSelected(int position) { // if (mTagGroupsList != null && mTagGroupsList.size() > position) { // DataUtils.onMtaEvent(getContext(), "问答页面", -// UserManager.getInstance().getCommunity().getName(), "问题-" + mTagGroupsList.get(position).getName()); +// CommunityManager.getInstance().getCommunity().getName(), "问题-" + mTagGroupsList.get(position).getName()); // } // } // diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/CommunityQuestionViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/CommunityQuestionViewHolder.kt index 28476fa84b..e4fbfd1371 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/CommunityQuestionViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/CommunityQuestionViewHolder.kt @@ -11,7 +11,7 @@ import com.gh.gamecenter.core.utils.NumberUtils import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.R import com.gh.gamecenter.databinding.CommunityQuestionItemBinding -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.manager.CommunityManager import com.gh.gamecenter.qa.answer.edit.AnswerEditActivity import com.gh.gamecenter.qa.entity.Questions @@ -63,7 +63,7 @@ class CommunityQuestionViewHolder(val binding: CommunityQuestionItemBinding) : B answerCountContainer.setOnClickListener { CheckLoginUtils.checkLogin(it.context, entrance) { - val communityName = if (questions.communityName.isNullOrEmpty()) UserManager.getInstance().community.name + val communityName = if (questions.communityName.isNullOrEmpty()) CommunityManager.getInstance().community.name else questions.communityName it.context.startActivity(AnswerEditActivity.getIntent(it.context, questions, communityName)) } 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 d52e1c0e53..f59796cdf9 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 @@ -39,8 +39,8 @@ //import com.gh.gamecenter.entity.Permissions //import com.gh.gamecenter.entity.SpecialColumn //import com.gh.gamecenter.eventbus.EBDeleteDetail -//import com.gh.gamecenter.eventbus.EBReuse -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.common.eventbus.EBReuse +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.mvvm.Status //import com.gh.gamecenter.personal.PersonalFragment //import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity @@ -663,7 +663,7 @@ // // 登录事件 // @Subscribe(threadMode = ThreadMode.MAIN) // fun onEventMainThread(reuse: EBReuse) { -// if (reuse.type == PersonalFragment.LOGIN_TAG) { // 登入 +// if (reuse.type == Constants.LOGIN_TAG) { // 登入 // onRefresh() // } // } 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 c25869a1f9..f682d55065 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 @@ -13,7 +13,7 @@ //import com.gh.gamecenter.baselist.LoadType //import com.gh.gamecenter.entity.MeEntity //import com.gh.gamecenter.entity.Permissions -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.mvvm.Resource //import com.gh.gamecenter.qa.entity.AnswerEntity //import com.gh.gamecenter.qa.entity.QuestionsDetailEntity 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 623929298e..cf2e0ba5cd 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 @@ -14,7 +14,7 @@ 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.eventbus.EBReuse +import com.gh.gamecenter.common.eventbus.EBReuse import com.gh.gamecenter.qa.draft.CommunityDraftWrapperActivity import com.gh.gamecenter.qa.entity.QuestionDraftEntity import com.gh.gamecenter.qa.questions.edit.QuestionEditActivity 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 69d6e49aa2..f0352810f2 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 @@ -5,7 +5,7 @@ import android.app.Application import androidx.lifecycle.MutableLiveData import com.gh.gamecenter.common.utils.observableToMain import com.gh.gamecenter.baselist.ListViewModel -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.entity.QuestionDraftEntity 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/edit/QuestionEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt index f5f5efef63..46f3c21c4e 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 @@ -35,8 +35,8 @@ import com.gh.gamecenter.core.utils.KeyboardHeightObserver import com.gh.gamecenter.core.utils.PatternUtils import com.gh.gamecenter.databinding.ActivityQuestionsEditBinding import com.gh.gamecenter.entity.* -import com.gh.gamecenter.eventbus.EBReuse -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.common.eventbus.EBReuse +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.mvvm.Status import com.gh.gamecenter.qa.BbsType import com.gh.gamecenter.qa.answer.edit.AnswerEditActivity 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 e48ebf0568..4f902612f7 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 @@ -20,8 +20,8 @@ import com.gh.gamecenter.entity.ActivityLabelEntity import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.entity.Permissions -import com.gh.gamecenter.eventbus.EBReuse -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.common.eventbus.EBReuse +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.mvvm.Resource import com.gh.gamecenter.qa.entity.QuestionDraftEntity import com.gh.gamecenter.qa.entity.QuestionsDetailEntity @@ -69,8 +69,8 @@ class QuestionEditViewModel(application: Application) : BaseRichEditorViewModel( if (questionEntity != null) { communityEntity = questionEntity?.community }/* else { - communityId = UserManager.getInstance().community.id - communityName = UserManager.getInstance().community.name + communityId = CommunityManager.getInstance().community.id + communityName = CommunityManager.getInstance().community.name if (!isFromSearch) checkQuestionDraft() }*/ } 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 5557163fc8..13091b339a 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 @@ -29,7 +29,7 @@ import com.gh.gamecenter.entity.ErrorEntity import com.gh.gamecenter.common.entity.NotificationUgc import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.entity.Permissions -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.manager.CommunityManager import com.gh.gamecenter.mvvm.Status import com.gh.gamecenter.qa.entity.QuestionsDetailEntity import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity @@ -145,7 +145,7 @@ class TagsSelectFragment : BaseFragment() { val data = errorEntity?.data when { errorEntity?.code == 403066 -> { - MtaHelper.onEvent("提交相似问题弹窗", UserManager.getInstance().community.name, "问题相似-出现弹窗提示") + MtaHelper.onEvent("提交相似问题弹窗", CommunityManager.getInstance().community.name, "问题相似-出现弹窗提示") DialogUtils.showCommunityDialog(context, "已有相似问题，去看看？", data?.questionTitle, @@ -154,18 +154,18 @@ class TagsSelectFragment : BaseFragment() { object : CancelListener { override fun onCancel() { mViewModel?.uploadPicAndPostQuestion(true) - MtaHelper.onEvent("提交相似问题弹窗", UserManager.getInstance().community.name, "问题相似-继续提交") + MtaHelper.onEvent("提交相似问题弹窗", CommunityManager.getInstance().community.name, "问题相似-继续提交") } }, object : ConfirmListener { override fun onConfirm() { - MtaHelper.onEvent("提交相似问题弹窗", UserManager.getInstance().community.name, "问题相似-去看看") + MtaHelper.onEvent("提交相似问题弹窗", CommunityManager.getInstance().community.name, "问题相似-去看看") val intent = NewQuestionDetailActivity.getIntent(requireContext(), data?.questionId ?: "", mEntrance, "相似问题") context?.startActivity(intent) } }) } errorEntity?.code == 403067 -> { - MtaHelper.onEvent("提交重复问题弹窗", UserManager.getInstance().community.name, "问题重复-出现弹窗提示") + MtaHelper.onEvent("提交重复问题弹窗", CommunityManager.getInstance().community.name, "问题重复-出现弹窗提示") DialogUtils.showCommunityDialog(context, "已有重复问题，无法提问", data?.questionTitle, @@ -173,7 +173,7 @@ class TagsSelectFragment : BaseFragment() { null, "去看看", null, object : ConfirmListener { override fun onConfirm() { - MtaHelper.onEvent("提交重复问题弹窗", UserManager.getInstance().community.name, "问题重复-去看看") + MtaHelper.onEvent("提交重复问题弹窗", CommunityManager.getInstance().community.name, "问题重复-去看看") val intent = NewQuestionDetailActivity.getIntent(requireContext(), data?.questionId ?: "", mEntrance, "重复问题") context?.startActivity(intent) } 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 70be8b293b..c8c13192d8 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 @@ -18,7 +18,7 @@ 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; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.gh.gamecenter.qa.entity.QuestionsDetailEntity; import com.lightgame.utils.Util_System_Keyboard; 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 1bb5773235..bda760f95c 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 @@ -31,7 +31,7 @@ import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.databinding.FragmentArticleDetailBinding import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.EBDeleteDetail -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.article.detail.CommentItemData import com.gh.gamecenter.qa.comment.CommentActivity import com.gh.gamecenter.qa.comment.base.BaseCommentAdapter 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 78b8dfd901..8915395f96 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 @@ -19,7 +19,7 @@ import com.gh.gamecenter.common.utils.singleToMain import com.gh.gamecenter.common.utils.toRequestBody import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.eventbus.EBUserFollow -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.article.detail.CommentItemData import com.gh.gamecenter.qa.comment.base.BaseCommentViewModel import com.gh.gamecenter.qa.entity.QuestionsDetailEntity 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 2c1b65e314..3bb3efd2cf 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 @@ -21,7 +21,7 @@ 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.login.user.UserManager import com.gh.gamecenter.qa.editor.OnLinkClickListener import com.gh.gamecenter.qa.entity.QuestionsDetailEntity import java.util.* 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 a6c7d624e1..99ee4f6314 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 @@ -21,7 +21,7 @@ //import com.gh.gamecenter.baselist.ListAdapter; //import com.gh.gamecenter.databinding.AskRecommendsItemConcernBinding; //import com.gh.gamecenter.databinding.CommunityAnswerItemBinding; -//import com.gh.gamecenter.manager.UserManager; +//import com.gh.gamecenter.login.user.UserManager; //import com.gh.gamecenter.qa.answer.CommunityAnswerItemViewHolder; //import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity; //import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity; @@ -110,7 +110,7 @@ // if ("community_article".equals(answer.getType())) { // if (mContext instanceof Activity) { // ((Activity) mContext).startActivityForResult(ArticleDetailActivity.getRecommendsIntent(mContext, -// UserManager.getInstance().getCommunity(), answer.getId(), "", +// CommunityManager.getInstance().getCommunity(), answer.getId(), "", // AskQuestionsRecommendsFragment.QUESTION_RECOMMEND_PATH), // AskQuestionsRecommendsFragment.RECOMMENDS_REQUEST_CODE); // } @@ -129,7 +129,7 @@ // if ("community_article".equals(answer.getType())) { // if (mContext instanceof Activity) { // ((Activity) mContext).startActivityForResult(ArticleDetailActivity.getRecommendsIntent(mContext, -// UserManager.getInstance().getCommunity(), answer.getId(), "", +// CommunityManager.getInstance().getCommunity(), answer.getId(), "", // AskQuestionsRecommendsFragment.QUESTION_RECOMMEND_PATH), // AskQuestionsRecommendsFragment.RECOMMENDS_REQUEST_CODE); // @@ -163,7 +163,7 @@ // } // // concernBind.concernDelete.setOnClickListener(v -> { -// MtaHelper.onEvent("问答页面", UserManager.getInstance().getCommunity().getName(), "推荐关注-关闭"); +// MtaHelper.onEvent("问答页面", CommunityManager.getInstance().getCommunity().getName(), "推荐关注-关闭"); // // RecyclerView.Adapter adapter = concernBind.concernList.getAdapter(); // if (adapter instanceof RecommendConcernAdapter) { 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 3c6409e16f..9ef53fe18e 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 @@ -1,7 +1,7 @@ //package com.gh.gamecenter.qa.recommends; // //import static com.gh.gamecenter.fragment.MainWrapperFragment.INDEX_BBS; -//import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; +//import static com.gh.gamecenter.common.constant.Constants.LOGIN_TAG; //import static com.gh.gamecenter.personal.PersonalFragment.LOGOUT_TAG; //import static com.gh.gamecenter.qa.CommunityFragment.COMMUNITIES_SELECT_REQUEST; // @@ -29,12 +29,12 @@ //import com.gh.gamecenter.baselist.ListFragment; //import com.gh.gamecenter.baselist.LoadStatus; //import com.gh.gamecenter.baselist.LoadType; -//import com.gh.gamecenter.eventbus.EBReuse; +//import com.gh.gamecenter.common.eventbus.EBReuse; //import com.gh.gamecenter.eventbus.EBTypeChange; //import com.gh.gamecenter.eventbus.EBUserFollow; //import com.gh.gamecenter.forum.home.CommunityHomeFragment; //import com.gh.gamecenter.fragment.MainWrapperFragment; -//import com.gh.gamecenter.manager.UserManager; +//import com.gh.gamecenter.login.user.UserManager; //import com.gh.gamecenter.qa.BbsType; //import com.gh.gamecenter.qa.CommunityFragment; //import com.gh.gamecenter.qa.entity.AnswerEntity; @@ -90,7 +90,7 @@ // // 当前在屏幕上的 fragment 为 AskQuestionRecommendsFragment 时才弹 toast // if (mParentFragment instanceof MainWrapperFragment // && ((MainWrapperFragment) mParentFragment).getCurrentItem() == INDEX_BBS -// && !TextUtils.isEmpty(UserManager.getInstance().getCommunity().getId())) { +// && !TextUtils.isEmpty(CommunityManager.getInstance().getCommunity().getId())) { // toast("获取失败，请检查网络设置"); // getDumbRefreshLayout().finishRefresh(false); // } else { 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 58587944dd..02ec184e18 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 @@ -17,8 +17,8 @@ //import com.gh.gamecenter.baselist.BaseListViewModel; //import com.gh.gamecenter.baselist.LoadStatus; //import com.gh.gamecenter.baselist.LoadType; -//import com.gh.gamecenter.eventbus.EBReuse; -//import com.gh.gamecenter.manager.UserManager; +//import com.gh.gamecenter.common.eventbus.EBReuse; +//import com.gh.gamecenter.login.user.UserManager; //import com.gh.gamecenter.qa.entity.AnswerEntity; //import com.gh.gamecenter.qa.entity.SuggestedFollowEntity; //import com.gh.gamecenter.qa.follow.AskFollowFragment; @@ -74,15 +74,15 @@ // } // // private String getFollowBindKey() { -// return "SUGGESTED_FOLLOWS_BIND" + UserManager.getInstance().getCommunity().getId(); +// return "SUGGESTED_FOLLOWS_BIND" + CommunityManager.getInstance().getCommunity().getId(); // } // // private String getDeleteFollowKey() { -// return "SUGGESTED_FOLLOWS_DELETE" + UserManager.getInstance().getCommunity().getId(); +// return "SUGGESTED_FOLLOWS_DELETE" + CommunityManager.getInstance().getCommunity().getId(); // } // // private String getFollowDayKey() { -// return "SUGGESTED_FOLLOWS_DAY_KEY" + UserManager.getInstance().getCommunity().getId(); +// return "SUGGESTED_FOLLOWS_DAY_KEY" + CommunityManager.getInstance().getCommunity().getId(); // } // // private String getCurDayFormat() { @@ -94,7 +94,7 @@ // if (TextUtils.isEmpty(UserManager.getInstance().getToken())) return; // // String showUpdateTime = mPreference.getString(getFollowDayKey(), null); -// String today = getCurDayFormat() + UserManager.getInstance().getCommunity().getId(); +// String today = getCurDayFormat() + CommunityManager.getInstance().getCommunity().getId(); // String deleteTime = mPreference.getString(getDeleteFollowKey(), null); // // boolean isNewData; @@ -107,7 +107,7 @@ // } // // RetrofitManager.getInstance().getApi() -// .getSuggestedFollows(UserManager.getInstance().getCommunity().getId()) +// .getSuggestedFollows(CommunityManager.getInstance().getCommunity().getId()) // .subscribeOn(Schedulers.io()) // .observeOn(AndroidSchedulers.mainThread()) // .subscribe(new Response>() { @@ -265,7 +265,7 @@ // } // mIsLoading = true; // String filter; -// String communityId = UserManager.getInstance().getCommunity().getId(); +// String communityId = CommunityManager.getInstance().getCommunity().getId(); // if (TextUtils.isEmpty(sequenceId)) { // filter = ""; // } else if (isUp) { @@ -367,11 +367,11 @@ // // private void deleteDB() { // mPreference.edit().putBoolean(getCheckIsHasCommunityDataKey(), false).apply(); -// mAnswerDao.deleteData(UserManager.getInstance().getCommunity().getId() + UserManager.getInstance().getUserId()); +// mAnswerDao.deleteData(CommunityManager.getInstance().getCommunity().getId() + UserManager.getInstance().getUserId()); // } // // private void insertDB(List entityList) { -// String communityId = UserManager.getInstance().getCommunity().getId(); +// String communityId = CommunityManager.getInstance().getCommunity().getId(); // String userId = UserManager.getInstance().getUserId(); // long orderTag = System.currentTimeMillis(); // if (!TextUtils.isEmpty(communityId)) { @@ -448,7 +448,7 @@ // mCacheFollowList.clear(); // mLiveData.postValue(null); // 清空数据 // -// String communityId = UserManager.getInstance().getCommunity().getId(); +// String communityId = CommunityManager.getInstance().getCommunity().getId(); // String userId = UserManager.getInstance().getUserId(); // LiveData> dbData = mAnswerDao.getAnswerEntityById(communityId + userId); // mLiveData.addSource(dbData, entityList -> { @@ -511,6 +511,6 @@ // } // // public static String getCheckIsHasCommunityDataKey() { -// return "CheckCommunityDataKey" + UserManager.getInstance().getCommunity().getId() + UserManager.getInstance().getUserId(); +// return "CheckCommunityDataKey" + CommunityManager.getInstance().getCommunity().getId() + UserManager.getInstance().getUserId(); // } //} 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 8a3753c6ef..f964fbb9f6 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 @@ -6,7 +6,7 @@ package com.gh.gamecenter.qa.recommends //import androidx.lifecycle.MediatorLiveData //import androidx.lifecycle.MutableLiveData //import com.gh.gamecenter.entity.LinkEntity -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.common.retrofit.BiResponse //import com.gh.gamecenter.retrofit.Response //import com.gh.gamecenter.retrofit.RetrofitManager @@ -24,17 +24,17 @@ package com.gh.gamecenter.qa.recommends // } // // fun loadAskSlideColumn() { -// val communityId = UserManager.getInstance().community.id +// val communityId = CommunityManager.getInstance().community.id // // RetrofitManager.getInstance().api -// .getAskSlide(UserManager.getInstance().community.id) +// .getAskSlide(CommunityManager.getInstance().community.id) // .subscribeOn(Schedulers.io()) // .observeOn(AndroidSchedulers.mainThread()) // .subscribe(object : Response>() { // override fun onResponse(response: List?) { // super.onResponse(response) // -// if (communityId == UserManager.getInstance().community.id) { +// if (communityId == CommunityManager.getInstance().community.id) { // slideLiveData.postValue(response) // } // } @@ -49,7 +49,7 @@ package com.gh.gamecenter.qa.recommends // @SuppressLint("CheckResult") // fun loadRecommendedEntrance() { // RetrofitManager.getInstance().api -// .getCommunityRecommendedEntrances(UserManager.getInstance().community.id) +// .getCommunityRecommendedEntrances(CommunityManager.getInstance().community.id) // .subscribeOn(Schedulers.io()) // .observeOn(AndroidSchedulers.mainThread()) // .subscribe(object : BiResponse>() { 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 8aedac4c6e..0bd2bdcaf2 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 @@ -23,7 +23,7 @@ //import com.gh.gamecenter.R //import com.gh.gamecenter.entity.CommunityEntity //import com.gh.gamecenter.entity.LinkEntity -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.CommunityFragment.Companion.COMMUNITIES_SELECT_REQUEST //import com.gh.gamecenter.qa.recommends.newest.RecommendNewestFragment //import com.google.android.material.appbar.AppBarLayout @@ -89,7 +89,7 @@ // override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { // super.onActivityResult(requestCode, resultCode, data) // if (requestCode == COMMUNITIES_SELECT_REQUEST && resultCode == Activity.RESULT_OK) { -// if (CommunityEntity.SORT_TIME == UserManager.getInstance().community.refreshSort) { +// if (CommunityEntity.SORT_TIME == CommunityManager.getInstance().community.refreshSort) { // changeFragment(true) // } else { // changeFragment(false) @@ -126,14 +126,14 @@ // super.onViewCreated(view, savedInstanceState) // setViewPagerHeight() // -// if (CommunityEntity.SORT_TIME == UserManager.getInstance().community.refreshSort) { +// if (CommunityEntity.SORT_TIME == CommunityManager.getInstance().community.refreshSort) { // changeFragment(true) // } else { // changeFragment(false) // } // // mChangeBtn.setOnClickListener { -// MtaHelper.onEvent("问答页面", UserManager.getInstance().community.name, "推荐-切换排序") +// MtaHelper.onEvent("问答页面", CommunityManager.getInstance().community.name, "推荐-切换排序") // showMoreItemDialog() // } // @@ -187,14 +187,14 @@ // timeSelect.visibility = View.INVISIBLE // popupWindow.dismiss() // changeFragment(false) -// MtaHelper.onEvent("问答页面", UserManager.getInstance().community.name, "推荐-按精选排序") +// MtaHelper.onEvent("问答页面", CommunityManager.getInstance().community.name, "推荐-按精选排序") // } // itemTime.setOnClickListener { // recommendSelect.visibility = View.INVISIBLE // timeSelect.visibility = View.VISIBLE // popupWindow.dismiss() // changeFragment(true) -// MtaHelper.onEvent("问答页面", UserManager.getInstance().community.name, "推荐-按时间排序") +// MtaHelper.onEvent("问答页面", CommunityManager.getInstance().community.name, "推荐-按时间排序") // } // // val recommendFragmentIsVisible = mRecommendsFragment != null && mRecommendsFragment!!.isVisible @@ -233,7 +233,7 @@ // ImageUtils.display(entranceViewIv, link.image) // // entranceViewItem.setOnClickListener { -// MtaHelper.onEvent("社区推荐入口", UserManager.getInstance().community.name, link.name) +// MtaHelper.onEvent("社区推荐入口", CommunityManager.getInstance().community.name, link.name) // DirectUtils.directToLinkPage(entranceViewTv.context, link, "", "推荐入口") // } // 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 e957557f3e..f18a6fe041 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 @@ -14,7 +14,7 @@ //import com.gh.gamecenter.adapter.RecyclingPagerAdapter; //import com.gh.gamecenter.databinding.AskRecommendsSubjectItemBinding; //import com.gh.gamecenter.entity.LinkEntity; -//import com.gh.gamecenter.manager.UserManager; +//import com.gh.gamecenter.login.user.UserManager; // //import java.util.List; // @@ -51,7 +51,7 @@ // LinkEntity entity = mEntityList.get(position % mEntityList.size()); // ImageUtils.display(binding.subjectIcon, entity.getImage()); // binding.getRoot().setOnClickListener(v -> { -// MtaHelper.onEvent("社区轮播图", UserManager.getInstance().getCommunity().getName(), String.valueOf(position + 1)); +// MtaHelper.onEvent("社区轮播图", CommunityManager.getInstance().getCommunity().getName(), String.valueOf(position + 1)); // DirectUtils.directToLinkPage(mContext, entity, "", "轮播图"); // }); // 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 16a1467d2f..7f7654e92c 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 @@ -8,7 +8,7 @@ //import com.gh.gamecenter.common.utils.toColor //import com.gh.gamecenter.R //import com.gh.gamecenter.databinding.AskRecommendsConcernListItemBinding -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.entity.SuggestedFollowEntity //import com.lightgame.adapter.BaseRecyclerAdapter // @@ -38,7 +38,7 @@ // v.setTextColor(R.color.theme_font.toColor()) // v.text = "关注" // v.setOnClickListener { -// MtaHelper.onEvent("问答页面", UserManager.getInstance().community.name, "推荐关注-关注") +// MtaHelper.onEvent("问答页面", CommunityManager.getInstance().community.name, "推荐关注-关注") // listViewModel.followUser(entity.id, object : OnFollowCallback { // override fun onFollowSuccess() { // isFollowed = true 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 8b2a8fccfb..bb9ac04d45 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 @@ -10,7 +10,7 @@ //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.login.user.UserManager //import com.gh.gamecenter.qa.answer.CommunityAnswerItemViewHolder //import com.gh.gamecenter.qa.answer.detail.SimpleAnswerDetailActivity //import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity @@ -62,7 +62,7 @@ // answerViewHolder.bindAnswerItem(answer, "", getPath()) // binding.title.setOnClickListener { // if ("community_article" == answer.type) { -// mContext.startActivity(ArticleDetailActivity.getIntent(mContext, UserManager.getInstance().community, answer.id!!, "", getPath())) +// mContext.startActivity(ArticleDetailActivity.getIntent(mContext, CommunityManager.getInstance().community, answer.id!!, "", getPath())) // } else { // val questions = answer.questions // mContext.startActivity(NewQuestionDetailActivity.getIntent(mContext, questions.id, "", getPath())) @@ -71,7 +71,7 @@ // // answerViewHolder.itemView.setOnClickListener { // if ("community_article" == answer.type) { -// mContext.startActivity(ArticleDetailActivity.getIntent(mContext, UserManager.getInstance().community, answer.id!!, "", getPath())) +// mContext.startActivity(ArticleDetailActivity.getIntent(mContext, CommunityManager.getInstance().community, answer.id!!, "", getPath())) // } else { // mContext.startActivity(SimpleAnswerDetailActivity.getIntent(mContext, answer.id // ?: "", "", getPath())) 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 d1e50dcf47..745620b1f6 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 @@ -14,7 +14,7 @@ //import com.gh.gamecenter.baselist.NormalListViewModel //import com.gh.gamecenter.eventbus.EBTypeChange //import com.gh.gamecenter.forum.home.CommunityHomeFragment -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.CommunityFragment //import com.gh.gamecenter.qa.CommunityFragment.Companion.COMMUNITIES_SELECT_REQUEST //import com.gh.gamecenter.qa.entity.AnswerEntity @@ -40,7 +40,7 @@ // } // // override fun provideDataObservable(page: Int): Observable> { -// return RetrofitManager.getInstance().api.getCommunitiesRecommendNewest(UserManager.getInstance().community.id, page) +// return RetrofitManager.getInstance().api.getCommunitiesRecommendNewest(CommunityManager.getInstance().community.id, page) // } // // override fun provideListViewModel(): NormalListViewModel { diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchActivity.java b/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchActivity.java index 991fecdf8d..86f9136424 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 @@ -30,7 +30,7 @@ //import com.gh.gamecenter.R; //import com.gh.gamecenter.db.AskSearchHistoryDao; //import com.gh.gamecenter.eventbus.EBSearch; -//import com.gh.gamecenter.manager.UserManager; +//import com.gh.gamecenter.login.user.UserManager; //import com.gh.gamecenter.qa.questions.edit.QuestionEditActivity; //import com.gh.gamecenter.qa.search.history.HistoryFragment; //import com.gh.gamecenter.retrofit.Response; @@ -147,7 +147,7 @@ // if (actionId == EditorInfo.IME_ACTION_SEARCH) { // Util_System_Keyboard.hideSoftKeyboard(this, mSearchEt); // search(); -// mDao.add(mSearchKey, UserManager.getInstance().getCommunity().getId()); +// mDao.add(mSearchKey, CommunityManager.getInstance().getCommunity().getId()); // } // return false; // }); @@ -205,15 +205,15 @@ // if (!TextUtils.isEmpty(mDefaultSearchKey)) { // mSearchEt.setText(mDefaultSearchKey); // mSearchEt.setSelection(mSearchEt.getText().length()); -// mDao.add(mDefaultSearchKey, UserManager.getInstance().getCommunity().getId()); +// mDao.add(mDefaultSearchKey, CommunityManager.getInstance().getCommunity().getId()); // Util_System_Keyboard.hideSoftKeyboard(this, mSearchEt); // -// MtaHelper.onEvent("社区搜索", "默认搜索", UserManager.getInstance().getCommunity().getName() + "-" + mDefaultSearchKey); +// MtaHelper.onEvent("社区搜索", "默认搜索", CommunityManager.getInstance().getCommunity().getName() + "-" + mDefaultSearchKey); // } // } else { // Util_System_Keyboard.hideSoftKeyboard(this, mSearchEt); -// mDao.add(mSearchKey, UserManager.getInstance().getCommunity().getId()); -// MtaHelper.onEvent("社区搜索", "主动搜索", UserManager.getInstance().getCommunity().getName() + "-" + mSearchKey); +// mDao.add(mSearchKey, CommunityManager.getInstance().getCommunity().getId()); +// MtaHelper.onEvent("社区搜索", "主动搜索", CommunityManager.getInstance().getCommunity().getName() + "-" + mSearchKey); // } // } else if (v.getId() == R.id.bar_back) { // onBackPressed(); @@ -224,7 +224,7 @@ // RetrofitManager // .getInstance() // .getApi() -// .getCommunityDefaultSearch(UserManager.getInstance().getCommunity().getId()) +// .getCommunityDefaultSearch(CommunityManager.getInstance().getCommunity().getId()) // .subscribeOn(Schedulers.io()) // .observeOn(AndroidSchedulers.mainThread()) // .subscribe(new Response() { 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 a1291b304c..b7f244020e 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 @@ -5,7 +5,7 @@ //import com.gh.common.util.EntranceUtils //import com.gh.gamecenter.core.utils.UrlFilterUtils //import com.gh.gamecenter.baselist.NormalListViewModel -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.entity.ArticleEntity //import com.gh.gamecenter.qa.search.base.BaseAskSearchFragment //import com.gh.gamecenter.retrofit.RetrofitManager @@ -41,12 +41,12 @@ // val api = RetrofitManager.getInstance().api // return if (TextUtils.isEmpty(mSearchKey)) null // else if (!questionTag.isNullOrEmpty()) { -// api.getAskSearchArticle(UserManager.getInstance().community.id, mSearchKey, +// api.getAskSearchArticle(CommunityManager.getInstance().community.id, mSearchKey, // UrlFilterUtils.getFilterQuery("question_tag", questionTag, "type", "community_article"), "community_article_vote:-1", page) // } else if (!columnId.isNullOrEmpty()) { -// api.getAskSearchArticle(UserManager.getInstance().community.id, mSearchKey, +// api.getAskSearchArticle(CommunityManager.getInstance().community.id, mSearchKey, // UrlFilterUtils.getFilterQuery("column_id", columnId, "type", "community_article"), "community_article_vote:-1", page) -// } else api.getAskSearchArticle(UserManager.getInstance().community.id, mSearchKey, +// } else api.getAskSearchArticle(CommunityManager.getInstance().community.id, mSearchKey, // UrlFilterUtils.getFilterQuery("type", "community_article"), "community_article_vote:-1", page) // } //} \ No newline at end of file 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 e9154c9d1c..e9cc26f39c 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 @@ -12,7 +12,7 @@ //import com.gh.gamecenter.baselist.ListAdapter //import com.gh.gamecenter.baselist.ListViewModel //import com.gh.gamecenter.db.AskSearchHistoryDao -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.answer.detail.SimpleAnswerDetailActivity //import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity //import com.gh.gamecenter.qa.column.detail.AskColumnDetailActivity @@ -109,7 +109,7 @@ // // protected fun skipArticleDetail(id: String) { // mContext.startActivity(ArticleDetailActivity.getIntent(mContext, -// UserManager.getInstance().community, id, mEntrance, mPath)) +// CommunityManager.getInstance().community, id, mEntrance, mPath)) // postSearchLogAndSearchHistory() // } // @@ -120,13 +120,13 @@ // // protected fun skipColumn(id: String) { //// mContext.startActivity(CommunitySubjectActivity.getIntent(mContext, -//// UserManager.getInstance().community, id, mEntrance, mPath)) +//// CommunityManager.getInstance().community, id, mEntrance, mPath)) //// postSearchLogAndSearchHistory() // } // // protected fun skipSpecialColumn(id: String) { // mContext.startActivity(AskColumnDetailActivity.getIntentByColumnId(mContext, -// id, UserManager.getInstance().community, mEntrance, mPath)) +// id, CommunityManager.getInstance().community, mEntrance, mPath)) // postSearchLogAndSearchHistory() // } // @@ -134,7 +134,7 @@ // if (mContext is AskSearchActivity) { // (mContext as AskSearchActivity).postLog(false) // } -// mDao.add(mSearchKey, UserManager.getInstance().community.id) +// mDao.add(mSearchKey, CommunityManager.getInstance().community.id) // } // //} 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 a5104736b1..452e842c14 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 @@ -8,7 +8,7 @@ //import com.gh.gamecenter.databinding.CommunitySearchHistoryItemBinding //import com.gh.gamecenter.db.AskSearchHistoryDao //import com.gh.gamecenter.eventbus.EBSearch -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.search.AskSearchActivity //import com.lightgame.adapter.BaseRecyclerAdapter //import com.lightgame.utils.Util_System_Keyboard @@ -19,7 +19,7 @@ // // private val mDao: AskSearchHistoryDao = dao // -// private val mHistoryList: MutableList = dao.getAll(UserManager.getInstance().community.id) +// private val mHistoryList: MutableList = dao.getAll(CommunityManager.getInstance().community.id) // // init { // if (mHistoryList.isEmpty()) { @@ -41,11 +41,11 @@ // val key = mHistoryList[position] // holder.binding.key = key // holder.itemView.setOnClickListener { v -> -// mDao.add(key, UserManager.getInstance().community.id) +// mDao.add(key, CommunityManager.getInstance().community.id) // EventBus.getDefault().post(EBSearch(AskSearchActivity.ASK_SEARCH_EB_TYPE, key)) // Util_System_Keyboard.hideSoftKeyboardByIBinder(mContext, v.windowToken) // -// MtaHelper.onEvent("社区搜索", "历史搜索", UserManager.getInstance().community.name + "-" + key) +// MtaHelper.onEvent("社区搜索", "历史搜索", CommunityManager.getInstance().community.name + "-" + key) // } // } // diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryViewModel.kt index 20e2d064c1..2a3bc406a6 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/history/HistoryViewModel.kt @@ -3,7 +3,7 @@ //import android.app.Application //import androidx.lifecycle.AndroidViewModel //import androidx.lifecycle.MutableLiveData -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.entity.CommunityHotSearch //import com.gh.gamecenter.retrofit.Response //import com.gh.gamecenter.retrofit.RetrofitManager @@ -16,7 +16,7 @@ // // fun getHotSearch() { // RetrofitManager.getInstance().api -// .getCommunityHotSearch(UserManager.getInstance().community.id) +// .getCommunityHotSearch(CommunityManager.getInstance().community.id) // .subscribeOn(Schedulers.io()) // .observeOn(AndroidSchedulers.mainThread()) // .subscribe(object : Response>() { 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 64023749b1..0c29565e10 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 @@ -8,7 +8,7 @@ //import com.gh.gamecenter.databinding.CommunitySearchHotItemBinding //import com.gh.gamecenter.db.AskSearchHistoryDao //import com.gh.gamecenter.eventbus.EBSearch -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.entity.CommunityHotSearch //import com.gh.gamecenter.qa.search.AskSearchActivity //import com.lightgame.adapter.BaseRecyclerAdapter @@ -35,11 +35,11 @@ // holder.binding.setPosition(position + 1) // holder.binding.data = data // holder.itemView.setOnClickListener { v -> -// mDao.add(data.keyword, UserManager.getInstance().community.id) +// mDao.add(data.keyword, CommunityManager.getInstance().community.id) // EventBus.getDefault().post(EBSearch(AskSearchActivity.ASK_SEARCH_EB_TYPE, data.keyword)) // Util_System_Keyboard.hideSoftKeyboardByIBinder(mContext, v.windowToken) // -// MtaHelper.onEvent("社区搜索", "热门搜索", UserManager.getInstance().community.name + "-" + data.keyword) +// MtaHelper.onEvent("社区搜索", "热门搜索", CommunityManager.getInstance().community.name + "-" + data.keyword) // } // } // 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 3017fe0729..afede66033 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 @@ -4,7 +4,7 @@ //import androidx.lifecycle.ViewModelProviders //import com.gh.gamecenter.core.utils.UrlFilterUtils //import com.gh.gamecenter.baselist.NormalListViewModel -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.entity.SearchHottestEntity //import com.gh.gamecenter.qa.search.base.BaseAskSearchFragment //import com.gh.gamecenter.retrofit.RetrofitManager @@ -38,13 +38,13 @@ // val api = RetrofitManager.getInstance().api // return if (TextUtils.isEmpty(mSearchKey)) null // else if (!questionTag.isNullOrEmpty()) { -// api.getAskSearch(UserManager.getInstance().community.id, mSearchKey, +// api.getAskSearch(CommunityManager.getInstance().community.id, mSearchKey, // UrlFilterUtils.getFilterQuery("question_tag", questionTag), "answer_vote:-1", page) // } else if (!columnId.isNullOrEmpty()) { -// api.getAskSearch(UserManager.getInstance().community.id, mSearchKey, +// api.getAskSearch(CommunityManager.getInstance().community.id, mSearchKey, // UrlFilterUtils.getFilterQuery("column_id", columnId), "answer_vote:-1", page) // } else { -// api.getAskSearch(UserManager.getInstance().community.id, mSearchKey, +// api.getAskSearch(CommunityManager.getInstance().community.id, mSearchKey, // UrlFilterUtils.getFilterQuery("", ""), "answer_vote:-1", page) // } // } 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 0d2da831c6..c147da9821 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 @@ -4,7 +4,7 @@ //import androidx.lifecycle.ViewModelProviders //import com.gh.gamecenter.core.utils.UrlFilterUtils //import com.gh.gamecenter.baselist.NormalListViewModel -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.entity.SearchNewestEntity //import com.gh.gamecenter.qa.search.base.BaseAskSearchFragment //import com.gh.gamecenter.retrofit.RetrofitManager @@ -38,12 +38,12 @@ // val api = RetrofitManager.getInstance().api // return if (TextUtils.isEmpty(mSearchKey)) null // else if (!questionTag.isNullOrEmpty()) { -// api.getAskSearchNewest(UserManager.getInstance().community.id, mSearchKey, +// api.getAskSearchNewest(CommunityManager.getInstance().community.id, mSearchKey, // UrlFilterUtils.getFilterQuery("question_tag", questionTag), "answer_time:-1", page) // } else if (!columnId.isNullOrEmpty()) { -// api.getAskSearchNewest(UserManager.getInstance().community.id, mSearchKey, +// api.getAskSearchNewest(CommunityManager.getInstance().community.id, mSearchKey, // UrlFilterUtils.getFilterQuery("column_id", columnId), "answer_time:-1", page) -// } else api.getAskSearchNewest(UserManager.getInstance().community.id, mSearchKey, +// } else api.getAskSearchNewest(CommunityManager.getInstance().community.id, mSearchKey, // UrlFilterUtils.getFilterQuery("", ""), "answer_time:-1", page) // } //} 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 2c8d39b086..e68e126a11 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 @@ -4,7 +4,7 @@ //import androidx.lifecycle.ViewModelProviders //import com.gh.gamecenter.core.utils.UrlFilterUtils //import com.gh.gamecenter.baselist.NormalListViewModel -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.entity.Questions //import com.gh.gamecenter.qa.search.base.BaseAskSearchFragment //import com.gh.gamecenter.retrofit.RetrofitManager @@ -38,13 +38,13 @@ // val api = RetrofitManager.getInstance().api // return if (TextUtils.isEmpty(mSearchKey)) null // else if (!questionTag.isNullOrEmpty()) { -// api.getAskSearchQuestion(UserManager.getInstance().community.id, mSearchKey, +// api.getAskSearchQuestion(CommunityManager.getInstance().community.id, mSearchKey, // UrlFilterUtils.getFilterQuery("question_tag", questionTag, "type", "question"), "question_time:-1", page) // } else if (!columnId.isNullOrEmpty()) { -// api.getAskSearchQuestion(UserManager.getInstance().community.id, mSearchKey, +// api.getAskSearchQuestion(CommunityManager.getInstance().community.id, mSearchKey, // UrlFilterUtils.getFilterQuery("column_id", columnId, "type", "question"), "question_time:-1", page) // } else -// api.getAskSearchQuestion(UserManager.getInstance().community.id, mSearchKey, +// api.getAskSearchQuestion(CommunityManager.getInstance().community.id, mSearchKey, // UrlFilterUtils.getFilterQuery("type", "question"), "question_time:-1", page) // } // diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/user/UserAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/user/UserAdapter.kt index 9fe2a920d3..d3170d350f 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/user/UserAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/user/UserAdapter.kt @@ -8,7 +8,7 @@ //import com.gh.gamecenter.R //import com.gh.gamecenter.databinding.FollowersOrFansItemBinding //import com.gh.gamecenter.entity.FollowersOrFansEntity -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.personalhome.FollowersOrFansViewHolder //import com.gh.gamecenter.qa.search.base.BaseAskSearchAdapter // 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 7c172d4c11..cb70bcd81f 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 @@ -6,7 +6,7 @@ //import androidx.lifecycle.ViewModelProviders //import com.gh.gamecenter.core.utils.UrlFilterUtils //import com.gh.gamecenter.entity.FollowersOrFansEntity -//import com.gh.gamecenter.manager.UserManager +//import com.gh.gamecenter.login.user.UserManager //import com.gh.gamecenter.qa.search.base.BaseAskSearchFragment //import com.gh.gamecenter.retrofit.RetrofitManager //import com.halo.assistant.HaloApp @@ -49,13 +49,13 @@ // val api = RetrofitManager.getInstance().api // return if (TextUtils.isEmpty(mSearchKey)) null // else if (!questionTag.isNullOrEmpty()) { -// api.getAskSearchUser(UserManager.getInstance().community.id, mSearchKey, +// api.getAskSearchUser(CommunityManager.getInstance().community.id, mSearchKey, // UrlFilterUtils.getFilterQuery("question_tag", questionTag, "type", "user"), page) // } else if (!columnId.isNullOrEmpty()) { -// api.getAskSearchUser(UserManager.getInstance().community.id, mSearchKey, +// api.getAskSearchUser(CommunityManager.getInstance().community.id, mSearchKey, // UrlFilterUtils.getFilterQuery("column_id", columnId, "type", "user"), page) // } else -// api.getAskSearchUser(UserManager.getInstance().community.id, mSearchKey, +// api.getAskSearchUser(CommunityManager.getInstance().community.id, mSearchKey, // UrlFilterUtils.getFilterQuery("type", "user"), page) // } // 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 f16af22f09..b4daf28c38 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 @@ -7,7 +7,8 @@ import android.text.TextUtils; import com.gh.common.util.ErrorHelper; import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.R; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; +import com.gh.gamecenter.manager.CommunityManager; import com.gh.gamecenter.qa.entity.AskTagGroupsEntity; import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -47,7 +48,7 @@ public class AskQuestionsNewRepository { private void loadUserTagGroups() { RetrofitManager.getInstance().getApi() - .getUserAskTagGroups(UserManager.getInstance().getUserId(), UserManager.getInstance().getCommunity().getId()) + .getUserAskTagGroups(UserManager.getInstance().getUserId(), CommunityManager.getInstance().getCommunity().getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -67,7 +68,7 @@ public class AskQuestionsNewRepository { private void loadDefaultTagGroups(List userEntity) { RetrofitManager.getInstance().getApi() - .getDefaultAskTagGroups(UserManager.getInstance().getCommunity().getId()) + .getDefaultAskTagGroups(CommunityManager.getInstance().getCommunity().getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { @@ -114,7 +115,7 @@ public class AskQuestionsNewRepository { RequestBody body = RequestBody.create(MediaType.parse("application/json"), GsonUtils.toJson(entity)); RetrofitManager.getInstance().getApi() - .postUserAskTagGroups(body, UserManager.getInstance().getUserId(), UserManager.getInstance().getCommunity().getId()) + .postUserAskTagGroups(body, UserManager.getInstance().getUserId(), CommunityManager.getInstance().getCommunity().getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { @@ -141,7 +142,7 @@ public class AskQuestionsNewRepository { private void deleteUserAskTagGroups() { RetrofitManager.getInstance() .getApi() - .deleteUserAskTagGroups(UserManager.getInstance().getUserId(), UserManager.getInstance().getCommunity().getId()) + .deleteUserAskTagGroups(UserManager.getInstance().getUserId(), CommunityManager.getInstance().getCommunity().getId()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response() { 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 b8b614ac3b..b3653993e5 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 @@ -41,7 +41,7 @@ import com.gh.gamecenter.eventbus.EBDownloadStatus import com.gh.gamecenter.eventbus.EBPackage import com.gh.gamecenter.forum.home.ForumScrollCalculatorHelper import com.gh.gamecenter.gamedetail.GameDetailFragment -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.mvvm.Status import com.gh.gamecenter.qa.dialog.ChooseActivityDialogFragment import com.gh.gamecenter.qa.dialog.MoreFunctionPanelDialog 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 3a1f29195a..f9edfd3df7 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 @@ -21,7 +21,7 @@ import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.common.view.SegmentedFilterView import com.gh.gamecenter.databinding.FragmentVideoCommentListBinding import com.gh.gamecenter.entity.ForumVideoEntity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.mvvm.Status import com.gh.gamecenter.qa.article.detail.CommentItemData import com.gh.gamecenter.qa.comment.CommentActivity 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 47b74f26ee..2f00936a91 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 @@ -19,7 +19,7 @@ import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ItemVideoDescTopBinding import com.gh.gamecenter.entity.ForumVideoEntity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.video.detail.ForumVideoDetailViewModel import kotlin.math.max 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 bb13e6cbed..6fe580ae5c 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 @@ -15,7 +15,7 @@ import com.gh.gamecenter.common.utils.singleToMain 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.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager 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 34f94fd356..f20e7c344d 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 @@ -26,7 +26,7 @@ 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.login.user.UserManager import com.gh.gamecenter.mvvm.Status import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.callback.ConfirmListener 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 039b7dc9df..ba832dab85 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 @@ -13,7 +13,7 @@ import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.gamecenter.core.runOnIoThread import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.entity.* -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.mvvm.Resource import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.common.retrofit.ObservableUtil 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 7f2c419d3e..5a0eda69f4 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 @@ -6,6 +6,9 @@ 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; +import com.gh.gamecenter.login.entity.AvatarBorderEntity; +import com.gh.gamecenter.login.entity.BackgroundImageEntity; +import com.gh.gamecenter.login.entity.UserInfoEntity; import com.gh.gamecenter.personalhome.rating.MyRating; import com.gh.gamecenter.qa.entity.AnswerDetailEntity; import com.gh.gamecenter.qa.entity.AnswerDraftEntity; @@ -161,12 +164,6 @@ public interface ApiService { @GET("certification") Single getCertification(); - /** - * 更新实名认证 - */ - @POST("certification") - Single postCertification(@Body RequestBody body); - /** * 检查实名认证接口 */ @@ -421,23 +418,6 @@ public interface ApiService { @POST("devices:find") Observable checkDevice(@Body RequestBody body); - /** - * 将老用户的数据同步到 3.0 版本的数据中 - */ - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("users:sync") - Observable syncUserData(@Body RequestBody body); - - /** - * 获取用户信息（头像/用户名） - */ - @POST - Observable getUserInfo(@Url String url); - - // Header作为区分 userinfo 的唯一标识 - @POST() - Observable getRetryUserInfo(@Url String url, @Header("retry") String tag); // 在OkHttpRetryInterceptor使用主要是不允许这个接口重试 - /** * 添加关注 */ @@ -1015,79 +995,6 @@ public interface ApiService { @GET("users/{user_id}:sign-in") Observable postSign(@Path("user_id") String userId); - - //----------------用户登录相关---------------// - - /** - * 手机登录获取验证码 - */ - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("login/mobile?step=1") - Observable loginByCaptcha(@Body RequestBody body); - - /** - * 手机登录 - */ - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("login/mobile?step=2") - Observable loginByMobile(@Body RequestBody body); - - /** - * QQ登录 - */ - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("login/qq") - Observable loginByQQ(@Body RequestBody body); - - /** - * 微博登录 - */ - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("login/weibo") - Observable loginByWeibo(@Body RequestBody body); - - /** - * 微信登录 - */ - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("login/wechat") - Observable loginByWechat(@Body RequestBody body); - - /** - * 抖音登录 - */ - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("login/douyin") - Observable loginByDouYin(@Body RequestBody body); - - /** - * 一键登录 - */ - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("login/mobile_oauth") - Observable loginByOauth(@Body RequestBody body); - - /** - * 刷新accessToken - */ - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST() - Observable refreshToken(@Url String url, @Body RequestBody body); - - /** - * 修改用户信息 - */ - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @PUT("users/{user_id}") - Observable changeUserInfo(@Body RequestBody body, @Path("user_id") String userId); - - /** - * 注销登录 - */ - @Headers({"Content-Type: application/json", "Accept: application/json"}) - @POST("logout") - Observable logout(); - /** * 绑定手机 */ @@ -2250,12 +2157,6 @@ public interface ApiService { @GET("exam/etiquette/switch_status") Single getRegulationTestStatus(); - /** - * 获取用户礼仪考试状态 - */ - @GET("users/{user_id}/exam/etiquette") - Single getUserRegulationTestStatus(@Path("user_id") String userId); - /** * 获取安利墙列表 */ @@ -3537,12 +3438,6 @@ public interface ApiService { @GET("games/{game_id}/third_party_address") Observable getThirdPartyAddress(@Path("game_id") String gameId); - /** - * 同步从其他游戏传过来的实名认证 - */ - @POST("./certification:sync") - Observable postSyncCertification(@Body RequestBody body); - /** * 整合首页接口 */ 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 3472ddd864..34a4a89d42 100644 --- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneActivity.kt @@ -3,17 +3,19 @@ package com.gh.gamecenter.security import android.content.Context import android.content.Intent import android.os.Bundle +import com.alibaba.android.arouter.facade.annotation.Route import com.gh.gamecenter.common.base.activity.ToolBarActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.constant.RouteConsts import com.gh.gamecenter.common.utils.updateStatusBarColor import com.gh.gamecenter.entity.ConflictUserEntity +@Route(path = RouteConsts.activity.bindPhoneActivity) class BindPhoneActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - hideToolbar(intent.extras?.getBundle(NORMAL_FRAGMENT_BUNDLE)?.getBoolean(EntranceConsts.KEY_FROM_LOGIN) == true) updateStatusBarColor(R.color.background_white, R.color.background_white) } @@ -25,6 +27,10 @@ class BindPhoneActivity : ToolBarActivity() { updateStatusBarColor(R.color.background_white, R.color.background_white) } + override fun provideNormalIntent(): Intent { + return getTargetIntent(this, BindPhoneActivity::class.java, BindPhoneFragment::class.java) + } + companion object { const val RESULT_FINISH_CODE = 411 diff --git a/app/src/main/java/com/gh/gamecenter/security/BindPhoneConflictFragment.kt b/app/src/main/java/com/gh/gamecenter/security/BindPhoneConflictFragment.kt index 5a37400a47..b166ba9946 100644 --- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneConflictFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneConflictFragment.kt @@ -11,7 +11,7 @@ import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.databinding.FragmentBindPhoneConflictBinding import com.gh.gamecenter.entity.ConflictUserEntity -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.common.base.fragment.ToolbarFragment class BindPhoneConflictFragment : ToolbarFragment() { 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 4a5cacf96c..16d8008218 100644 --- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt @@ -12,12 +12,13 @@ import com.gh.common.util.DialogUtils import com.gh.common.util.EnergyTaskHelper.postInviteCodeTask import com.gh.gamecenter.R import com.gh.gamecenter.common.BuildConfig +import com.gh.gamecenter.common.base.activity.ToolBarActivity 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.FragmentBindPhoneBinding -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.lightgame.utils.Utils @@ -59,6 +60,8 @@ class BindPhoneFragment : ToolbarFragment() { mFromLogin = requireArguments().getBoolean(EntranceConsts.KEY_FROM_LOGIN) mChangePhone = requireArguments().getBoolean(EntranceConsts.KEY_CHANGE_PHONE) + (requireActivity() as? ToolBarActivity)?.hideToolbar(mFromLogin) + mViewModel = viewModelProvider() } 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 ab588eddf2..68e45a60fd 100644 --- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneViewModel.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import com.gh.gamecenter.common.utils.DeviceUtils 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.common.retrofit.BiResponse +import com.gh.gamecenter.login.utils.LoginUtils 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/security/SecurityFragment.kt b/app/src/main/java/com/gh/gamecenter/security/SecurityFragment.kt index b4aa5da41e..472c210537 100644 --- a/app/src/main/java/com/gh/gamecenter/security/SecurityFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/security/SecurityFragment.kt @@ -8,8 +8,8 @@ import com.gh.common.util.DirectUtils 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.common.eventbus.EBReuse +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.personal.PersonalFragment import org.greenrobot.eventbus.Subscribe @@ -101,7 +101,7 @@ class SecurityFragment : ToolbarFragment() { // 登录事件 @Subscribe(threadMode = ThreadMode.MAIN) fun onEventMainThread(reuse: EBReuse) { - if (reuse.type == PersonalFragment.LOGOUT_TAG) { + if (reuse.type == Constants.LOGOUT_TAG) { activity?.finish() } } 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 462a52ed8b..1b8b4b9f89 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 @@ -13,7 +13,7 @@ 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.common.eventbus.EBReuse import com.gh.gamecenter.common.base.fragment.ToolbarController import com.gh.gamecenter.subject.SubjectListFragment import com.google.android.material.appbar.AppBarLayout 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 d329d2a5a9..2e3a72a9f5 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 @@ -6,7 +6,7 @@ import androidx.lifecycle.MutableLiveData 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 +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.mvvm.Resource import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager 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 5550c2a9c5..a25362302d 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 @@ -38,7 +38,7 @@ import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.LayoutVideoDetailSurfaceBinding import com.gh.gamecenter.entity.VideoEntity import com.gh.gamecenter.eventbus.EBRecommed -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.comment.CommentActivity import com.gh.gamecenter.video.game.GameVideoActivity import com.halo.assistant.HaloApp 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 76888e690b..b796abe5db 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 @@ -26,16 +26,17 @@ 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.EBReuse 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 import com.gh.gamecenter.entity.VideoEntity import com.gh.gamecenter.eventbus.* -import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.qa.comment.CommentActivity import com.gh.gamecenter.qa.comment.NewCommentFragment -import com.gh.gamecenter.user.UserViewModel +import com.gh.gamecenter.login.user.UserViewModel import com.halo.assistant.HaloApp import com.lightgame.download.DataWatcher import com.lightgame.download.DownloadEntity 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 2647fa6c4d..4fcc782d2b 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 @@ -19,7 +19,7 @@ import com.gh.gamecenter.entity.MyVideoEntity 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.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager 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 d6abc1d74a..5aa77dbf3b 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 @@ -14,7 +14,7 @@ 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.login.user.UserManager import com.gh.gamecenter.mvvm.Resource import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.common.retrofit.Response 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 36638bcb81..df12f5b482 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 @@ -5,7 +5,7 @@ import com.gh.common.constant.Config 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.login.user.UserManager import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import io.reactivex.Observable 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 eaf712209f..dd9a5b6200 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 @@ -5,7 +5,7 @@ import com.gh.common.constant.Config 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.login.user.UserManager 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/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index deef8cae70..7d18890d4a 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -62,7 +62,7 @@ import com.gh.gamecenter.receiver.DownloadReceiver; import com.gh.gamecenter.receiver.InstallAndUninstallReceiver; import com.gh.gamecenter.receiver.InstallReceiver; import com.gh.gamecenter.receiver.NetworkStateReceiver; -import com.gh.gamecenter.user.UserRepository; +import com.gh.gamecenter.login.user.UserRepository; import com.github.piasy.biv.BigImageViewer; import com.github.piasy.biv.loader.fresco.FrescoImageLoader; import com.lightgame.utils.Utils; 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 84059104ac..77d9ce4ee0 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt @@ -18,7 +18,6 @@ import android.widget.TextView import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModelProvider -import com.airbnb.lottie.LottieAnimationView import com.gh.common.constant.Config import com.gh.gamecenter.common.constant.Constants import com.gh.common.history.HistoryHelper @@ -38,18 +37,19 @@ 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.databinding.FragmentSettingBinding -import com.gh.gamecenter.entity.UserInfoEntity +import com.gh.gamecenter.login.entity.UserInfoEntity import com.gh.gamecenter.entity.WechatConfigEntity -import com.gh.gamecenter.eventbus.EBReuse +import com.gh.gamecenter.common.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.login.user.UserManager import com.gh.gamecenter.security.SecurityActivity import com.gh.gamecenter.setting.GameDownloadSettingActivity import com.gh.gamecenter.setting.VideoSettingActivity import com.gh.gamecenter.core.utils.DisplayUtils -import com.gh.gamecenter.user.UserRepository -import com.gh.gamecenter.user.UserViewModel +import com.gh.gamecenter.login.user.UserRepository +import com.gh.gamecenter.login.user.UserViewModel +import com.gh.gamecenter.login.utils.LoginUtils import com.halo.assistant.HaloApp import com.lightgame.download.FileUtils import com.lightgame.utils.Utils 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 3158e03941..c6e191b8e0 100644 --- a/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt @@ -45,7 +45,7 @@ import com.gh.gamecenter.entity.CommentnumEntity import com.gh.gamecenter.entity.MeEntity import com.gh.gamecenter.entity.ToolBoxEntity import com.gh.gamecenter.entity.WebShareEntity -import com.gh.gamecenter.eventbus.EBReuse +import com.gh.gamecenter.common.eventbus.EBReuse import com.gh.gamecenter.eventbus.EBTypeChange import com.gh.gamecenter.gamedetail.GameDetailFragment import com.gh.gamecenter.message.MessageDetailFragment @@ -643,7 +643,7 @@ class WebFragment : LazyFragment(), IScrollable { } else { // 是绑定微信页面时，登录后刷新页面 if (mIsBindWechat) { // 登录 - if (bean.type == PersonalFragment.LOGIN_TAG || (bean.type == Constants.EB_QUIT_LOGIN)) { + if (bean.type == Constants.LOGIN_TAG || (bean.type == Constants.EB_QUIT_LOGIN)) { newsWebview.reload() } } else { 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 c83416a7cd..538a4fe5da 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 @@ -19,7 +19,7 @@ import com.gh.gamecenter.R; 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.login.user.UserManager; 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/halo/assistant/fragment/myconcern/MyConcernFragment.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java index f8e8eefb4e..332cda224a 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 @@ -11,7 +11,7 @@ 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.common.eventbus.EBReuse; import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import org.greenrobot.eventbus.Subscribe; @@ -23,7 +23,7 @@ import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; +import static com.gh.gamecenter.common.constant.Constants.LOGIN_TAG; /** * Created by CsHeng on 14/12/2017. 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 07aad10203..3cee59f971 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 @@ -19,7 +19,7 @@ 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.login.entity.IdCardEntity import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.utils.UploadImageUtils import com.squareup.picasso.MemoryPolicy 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 c5b33519c9..9806fdc0a8 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 @@ -7,9 +7,9 @@ import androidx.lifecycle.MutableLiveData import com.gh.common.util.ErrorHelper 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.login.entity.UserInfoEntity import com.gh.gamecenter.common.retrofit.BiResponse +import com.gh.gamecenter.login.entity.IdCardEntity 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 62a3a5cf0d..c6d86d277f 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 @@ -14,12 +14,12 @@ 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 +import com.gh.gamecenter.login.entity.IdCardEntity +import com.gh.gamecenter.login.entity.UserInfoEntity +import com.gh.gamecenter.login.user.UserManager import com.gh.gamecenter.common.retrofit.BiResponse -import com.gh.gamecenter.retrofit.RetrofitManager -import com.gh.gamecenter.user.UserRepository +import com.gh.gamecenter.login.retrofit.RetrofitManager +import com.gh.gamecenter.login.user.UserRepository import com.halo.assistant.HaloApp import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers 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 3f429cfcf4..3ad94d023f 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 @@ -22,7 +22,7 @@ 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.ToolbarFragment; -import com.gh.gamecenter.user.UserViewModel; +import com.gh.gamecenter.login.user.UserViewModel; import com.lightgame.utils.Utils; import com.zhihu.matisse.internal.utils.PathUtils; 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 24ea8c9a64..9763ba4ac2 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 @@ -16,9 +16,9 @@ import android.text.TextUtils; 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.login.entity.UserInfoEntity; import com.gh.gamecenter.common.retrofit.ApiResponse; -import com.gh.gamecenter.user.UserViewModel; +import com.gh.gamecenter.login.user.UserViewModel; import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.halo.assistant.fragment.user.region.OnRegionSelectListener; import com.halo.assistant.fragment.user.region.RegionCountFragment; 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 48432487ac..984debdc3d 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 @@ -23,13 +23,13 @@ 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.login.entity.UserInfoEntity +import com.gh.gamecenter.login.user.UserManager 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 -import com.gh.gamecenter.user.UserViewModel +import com.gh.gamecenter.login.user.UserViewModel import com.halo.assistant.HaloApp import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers 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 b7c78490a8..9f82c68d43 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 @@ -9,10 +9,10 @@ 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.login.entity.UserInfoEntity import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.retrofit.ApiResponse -import com.gh.gamecenter.user.UserViewModel +import com.gh.gamecenter.login.user.UserViewModel class UserInfoFragment : ToolbarFragment() { 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 c24900df55..390a5424da 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 @@ -12,7 +12,7 @@ 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.gh.gamecenter.login.user.UserManager; import com.google.gson.reflect.TypeToken; import com.lightgame.adapter.BaseRecyclerAdapter; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/region/RegionProvAdapter.java b/app/src/main/java/com/halo/assistant/fragment/user/region/RegionProvAdapter.java index 54eb1ace85..42061c357a 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/region/RegionProvAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/region/RegionProvAdapter.java @@ -9,7 +9,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.gh.gamecenter.adapter.viewholder.AreaViewHolder; import com.gh.gamecenter.databinding.AreaItemBinding; -import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.login.user.UserManager; import com.lightgame.adapter.BaseRecyclerAdapter; import java.util.List; diff --git a/app/src/main/res/drawable/login_btn_bg.xml b/app/src/main/res/drawable/login_btn_bg.xml deleted file mode 100644 index 87ce80d428..0000000000 --- a/app/src/main/res/drawable/login_btn_bg.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2c42aa51a3..b6a163b33d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -293,17 +293,6 @@ 正在反馈... 下载管理 - 输入手机号码 - 输入验证码 - 获取验证码 - 输入邀请码（选填） - +86 - 登录 - 一键登录 > - QQ - 微信 - 新浪微博 - 第三方账号快捷登录 版本更新 个人中心 一键删除（%1$d个，释放%2$s） @@ -323,8 +312,6 @@ 替换素材 起一个难忘的名字吧 - 登录异常，请稍后重试 - 登录异常(%1$d)，请稍后重试 选择地区 退出账号 分享 @@ -476,8 +463,6 @@ 已取消 查看更多 发送（%1$d） - 用户协议与免责声明 - http://api.ghzs666.com/v2d6/disclaimer 光环助手接入第三方SDK目录 https://resource.ghzs.com/page/third_party_sdk/index.html 光环助手评论规则 @@ -527,7 +512,6 @@ 未选择 未填写 请输入正确的链接 - 登录成功 问答 社区 推荐 @@ -632,7 +616,6 @@ 最多只能选择5个标签 至多上传20张 至多上传20个 - 登录中... 提问 至少输入6个字 @@ -693,9 +676,7 @@ %1$s 在 %2$s]]> 发表了评论 - 隐私政策 游戏服务上传准则 - https://resource.ghzs.com/page/privacy_policies/privacy_policies.html https://resource.ghzs.com/page/game_rule/game_rule.html https://resource.ghzs.com/page/user_protocol/disclaimer.html @@ -832,13 +813,6 @@ 虚拟奖品领取方式 活动奖金领取方式 - 权限申请 - 完成一键登录，需向你申请授权以下权限： - 电话权限 - 识别具体运营商，方便对应运营商完成一键\n登录服务 - 马上授权 - 暂不授权，验证码登录 - 审核中...请耐心等待 审核不通过 内容审核中 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 2fdbf793dc..5d2153177f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -336,12 +336,6 @@ 12sp - - + + + \ 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 fc10323e93..e1c952ae65 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 @@ -5,6 +5,7 @@ import com.alibaba.android.arouter.facade.template.IProvider interface IConfigProvider : IProvider { fun getTencentAppId():String fun getWechatAppId():String + fun getWechatSecret():String fun getUploadLimitSize(): Long fun getSize(): Int fun getQuality(): Int @@ -15,4 +16,7 @@ interface IConfigProvider : IProvider { fun getGitThumb(): String fun getGifWaterMark(): String fun getQQ(): String + fun getQuickLoginAppId(): String + fun getQuickLoginAppKey(): String + fun getWeiboAppKey(): String } \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IDataUtilsProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IDataUtilsProvider.kt new file mode 100644 index 0000000000..b93e26729b --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IDataUtilsProvider.kt @@ -0,0 +1,9 @@ +package com.gh.gamecenter.core.provider + +import com.alibaba.android.arouter.facade.template.IProvider + +interface IDataUtilsProvider : IProvider { + + fun getDeviceCertification() + +} \ 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 index b588635285..eda835d30d 100644 --- 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 @@ -5,5 +5,5 @@ import com.alibaba.android.arouter.facade.template.IProvider interface IDefaultUrlHandlerProvider : IProvider { - fun interceptUrl(context: Context, url: String, entrance: String):Boolean + fun interceptUrl(context: Context, url: String, entrance: String, bringAppToFront: Boolean = false): Boolean } \ 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 index c3046128a6..82b25ef669 100644 --- 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 @@ -5,4 +5,6 @@ import com.lightgame.download.DownloadEntity interface IDownloadManagerProvider : IProvider { fun getDownloadEntityByUrl(url: String): DownloadEntity? + + fun resumeAllInvisiblePendingTask() } \ 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 index 03163909be..1aa863ddf9 100644 --- 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 @@ -7,4 +7,8 @@ interface IEnergyTaskProvider : IProvider { fun postEnergyTaskForShare(type: String, id: String, url: String) fun logInviteResult(result: String, type: String? = null) + + fun postEnergyTask(action: String) + + fun postInviteCodeTask(code: String, from: String, callback: (() -> Unit)?) } \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IErrorHelperProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IErrorHelperProvider.kt new file mode 100644 index 0000000000..5d5fb61c09 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IErrorHelperProvider.kt @@ -0,0 +1,13 @@ +package com.gh.gamecenter.core.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.template.IProvider +import retrofit2.HttpException + +interface IErrorHelperProvider : IProvider { + + fun handleError(context: Context, errorString: String?, showHighPriorityHint: Boolean = false) + + fun handleLoginError(context: Context, httpException: HttpException?) + +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IGameSubstituteRepositoryProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IGameSubstituteRepositoryProvider.kt new file mode 100644 index 0000000000..9b56e63df5 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IGameSubstituteRepositoryProvider.kt @@ -0,0 +1,9 @@ +package com.gh.gamecenter.core.provider + +import com.alibaba.android.arouter.facade.template.IProvider + +interface IGameSubstituteRepositoryProvider : IProvider { + + fun updateSubstitutableGames() + +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/ILogUtilsProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/ILogUtilsProvider.kt new file mode 100644 index 0000000000..a958a50711 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/ILogUtilsProvider.kt @@ -0,0 +1,9 @@ +package com.gh.gamecenter.core.provider + +import com.alibaba.android.arouter.facade.template.IProvider + +interface ILogUtilsProvider : IProvider { + + fun login(loginStep: String, loginType: String, entrance: String) + +} \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IMessageUnreadRepositoryProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IMessageUnreadRepositoryProvider.kt new file mode 100644 index 0000000000..22cff43e8c --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IMessageUnreadRepositoryProvider.kt @@ -0,0 +1,9 @@ +package com.gh.gamecenter.core.provider + +import com.alibaba.android.arouter.facade.template.IProvider + +interface IMessageUnreadRepositoryProvider : IProvider { + + fun loadMessageUnreadData() + +} \ 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 index ef9a7883f2..e0a6281753 100644 --- 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 @@ -6,4 +6,6 @@ import com.alibaba.android.arouter.facade.template.IProvider interface IQuickLoginProvider : IProvider { fun startLogin(context: Context, entrance: String) + + fun isOpenMobileData(context: Context): Boolean } \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IReservationRepositoryProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IReservationRepositoryProvider.kt new file mode 100644 index 0000000000..c88b0b77ed --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IReservationRepositoryProvider.kt @@ -0,0 +1,11 @@ +package com.gh.gamecenter.core.provider + +import com.alibaba.android.arouter.facade.template.IProvider + +interface IReservationRepositoryProvider : IProvider { + + fun refreshReservations() + + fun clearReservations() + +} \ 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 index 3a34869316..43641c93ec 100644 --- 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 @@ -6,4 +6,6 @@ import com.alibaba.android.arouter.facade.template.IProvider interface IWebProvider : IProvider { fun getIntent(context: Context, url: String, autoCompletionTitle: Boolean): Intent + + fun getWebIntent(context: Context, title: String, url: String): Intent } \ No newline at end of file diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IWechatBindHelperProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IWechatBindHelperProvider.kt new file mode 100644 index 0000000000..f6db0e06d3 --- /dev/null +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IWechatBindHelperProvider.kt @@ -0,0 +1,7 @@ +package com.gh.gamecenter.core.provider + +import com.alibaba.android.arouter.facade.template.IProvider + +interface IWechatBindHelperProvider : IProvider { + fun getWechatConfig() +} \ No newline at end of file diff --git a/module_login/.gitignore b/module_login/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/module_login/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/module_login/build.gradle b/module_login/build.gradle new file mode 100644 index 0000000000..48be39432d --- /dev/null +++ b/module_login/build.gradle @@ -0,0 +1,57 @@ +plugins { + id 'com.android.library' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'kotlin-parcelize' +} + +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" + } + + buildFeatures { + viewBinding true + } + + kapt { + arguments { + arg("AROUTER_MODULE_NAME", project.name) + } + } + + 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 { + implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs') + + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + + kapt "com.alibaba:arouter-compiler:$arouterVersion" + + implementation(project(path: ":module_common")) +} \ No newline at end of file diff --git a/module_common/libs/quick_login_android_5.8.1.aar b/module_login/libs/quick_login_android_5.8.1.aar similarity index 100% rename from module_common/libs/quick_login_android_5.8.1.aar rename to module_login/libs/quick_login_android_5.8.1.aar diff --git a/module_login/proguard-rules.pro b/module_login/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/module_login/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_login/src/androidTest/java/com/gh/gamecenter/login/ExampleInstrumentedTest.kt b/module_login/src/androidTest/java/com/gh/gamecenter/login/ExampleInstrumentedTest.kt new file mode 100644 index 0000000000..bad9634c3b --- /dev/null +++ b/module_login/src/androidTest/java/com/gh/gamecenter/login/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.gh.gamecenter.login + +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.login.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/module_login/src/main/AndroidManifest.xml b/module_login/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..1e885c7244 --- /dev/null +++ b/module_login/src/main/AndroidManifest.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module_login/src/main/java/com/gh/gamecenter/login/HaloApp.kt b/module_login/src/main/java/com/gh/gamecenter/login/HaloApp.kt new file mode 100644 index 0000000000..9f4aa26ff6 --- /dev/null +++ b/module_login/src/main/java/com/gh/gamecenter/login/HaloApp.kt @@ -0,0 +1,44 @@ +package com.gh.gamecenter.login + +import android.app.Application +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/app/src/main/java/com/gh/gamecenter/entity/AuthEntity.kt b/module_login/src/main/java/com/gh/gamecenter/login/entity/AuthEntity.kt similarity index 89% rename from app/src/main/java/com/gh/gamecenter/entity/AuthEntity.kt rename to module_login/src/main/java/com/gh/gamecenter/login/entity/AuthEntity.kt index cd30e5e7dc..447e88d496 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/AuthEntity.kt +++ b/module_login/src/main/java/com/gh/gamecenter/login/entity/AuthEntity.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.entity +package com.gh.gamecenter.login.entity import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/gh/gamecenter/entity/AvatarBorderEntity.kt b/module_login/src/main/java/com/gh/gamecenter/login/entity/AvatarBorderEntity.kt similarity index 93% rename from app/src/main/java/com/gh/gamecenter/entity/AvatarBorderEntity.kt rename to module_login/src/main/java/com/gh/gamecenter/login/entity/AvatarBorderEntity.kt index 911fdd551b..c08319ccf8 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/AvatarBorderEntity.kt +++ b/module_login/src/main/java/com/gh/gamecenter/login/entity/AvatarBorderEntity.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.entity +package com.gh.gamecenter.login.entity import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/gh/gamecenter/entity/BackgroundImageEntity.kt b/module_login/src/main/java/com/gh/gamecenter/login/entity/BackgroundImageEntity.kt similarity index 90% rename from app/src/main/java/com/gh/gamecenter/entity/BackgroundImageEntity.kt rename to module_login/src/main/java/com/gh/gamecenter/login/entity/BackgroundImageEntity.kt index 4214f24c61..7367b23772 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/BackgroundImageEntity.kt +++ b/module_login/src/main/java/com/gh/gamecenter/login/entity/BackgroundImageEntity.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.entity +package com.gh.gamecenter.login.entity import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/module_login/src/main/java/com/gh/gamecenter/login/entity/Badge.kt b/module_login/src/main/java/com/gh/gamecenter/login/entity/Badge.kt new file mode 100644 index 0000000000..b877e1ce80 --- /dev/null +++ b/module_login/src/main/java/com/gh/gamecenter/login/entity/Badge.kt @@ -0,0 +1,16 @@ +package com.gh.gamecenter.login.entity + +import android.os.Parcelable +import kotlinx.parcelize.Parcelize + +// 徽章 +@Parcelize +data class Badge( + var name: String = "", + var icon: String = "", + var actions: List? = null) : Parcelable + +// 徽章领取条件 +@Parcelize +data class BadgeAction( + var text: String = "") : Parcelable \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/entity/IdCardEntity.kt b/module_login/src/main/java/com/gh/gamecenter/login/entity/IdCardEntity.kt similarity index 90% rename from app/src/main/java/com/gh/gamecenter/entity/IdCardEntity.kt rename to module_login/src/main/java/com/gh/gamecenter/login/entity/IdCardEntity.kt index 870c556a81..82a942a4de 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/IdCardEntity.kt +++ b/module_login/src/main/java/com/gh/gamecenter/login/entity/IdCardEntity.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.entity +package com.gh.gamecenter.login.entity import androidx.room.Entity import com.google.gson.annotations.SerializedName diff --git a/module_login/src/main/java/com/gh/gamecenter/login/entity/LoginTokenEntity.java b/module_login/src/main/java/com/gh/gamecenter/login/entity/LoginTokenEntity.java new file mode 100644 index 0000000000..ce667f26eb --- /dev/null +++ b/module_login/src/main/java/com/gh/gamecenter/login/entity/LoginTokenEntity.java @@ -0,0 +1,67 @@ +package com.gh.gamecenter.login.entity; + +import androidx.annotation.NonNull; + +import com.google.gson.annotations.SerializedName; + +/** + * Created by khy on 29/11/17. + */ +public class LoginTokenEntity { + + @NonNull + private String id; + + @SerializedName("access_token") + @NonNull + private TokenEntity accessToken; + + @SerializedName("refresh_token") + @NonNull + private TokenEntity refreshToken; + + private String loginType; + + @SerializedName("first_login") + private boolean firstLogin; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public TokenEntity getAccessToken() { + return accessToken; + } + + public void setAccessToken(TokenEntity accessToken) { + this.accessToken = accessToken; + } + + public TokenEntity getRefreshToken() { + return refreshToken; + } + + public void setRefreshToken(TokenEntity refreshToken) { + this.refreshToken = refreshToken; + } + + public String getLoginType() { + return loginType; + } + + public void setLoginType(String loginType) { + this.loginType = loginType; + } + + public boolean isFirstLogin() { + return firstLogin; + } + + public void setFirstLogin(boolean firstLogin) { + this.firstLogin = firstLogin; + } +} diff --git a/module_login/src/main/java/com/gh/gamecenter/login/entity/TokenEntity.java b/module_login/src/main/java/com/gh/gamecenter/login/entity/TokenEntity.java new file mode 100644 index 0000000000..548eb82231 --- /dev/null +++ b/module_login/src/main/java/com/gh/gamecenter/login/entity/TokenEntity.java @@ -0,0 +1,27 @@ +package com.gh.gamecenter.login.entity; + +/** + * Created by khy on 29/11/17. + */ +public class TokenEntity { + + private String value; + + private long expire; + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public long getExpire() { + return expire; + } + + public void setExpire(long expire) { + this.expire = expire; + } +} diff --git a/app/src/main/java/com/gh/gamecenter/entity/UserInfoEntity.kt b/module_login/src/main/java/com/gh/gamecenter/login/entity/UserInfoEntity.kt similarity index 95% rename from app/src/main/java/com/gh/gamecenter/entity/UserInfoEntity.kt rename to module_login/src/main/java/com/gh/gamecenter/login/entity/UserInfoEntity.kt index 1d2ec0e924..457bcd1531 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/UserInfoEntity.kt +++ b/module_login/src/main/java/com/gh/gamecenter/login/entity/UserInfoEntity.kt @@ -1,4 +1,4 @@ -package com.gh.gamecenter.entity +package com.gh.gamecenter.login.entity import com.google.gson.annotations.SerializedName diff --git a/module_login/src/main/java/com/gh/gamecenter/login/entity/WechatConfigEntity.kt b/module_login/src/main/java/com/gh/gamecenter/login/entity/WechatConfigEntity.kt new file mode 100644 index 0000000000..163d70a918 --- /dev/null +++ b/module_login/src/main/java/com/gh/gamecenter/login/entity/WechatConfigEntity.kt @@ -0,0 +1,11 @@ +package com.gh.gamecenter.login.entity + +import com.google.gson.annotations.SerializedName + +data class WechatConfigEntity( + var bind: Boolean = false,//用户是否绑定微信 + var follow: Boolean = false,//绑定的微信是否关注光环助手 + var notice: Boolean = false,//是否打开微信通知开关 + @SerializedName("nickname") + var nickName: String = "", +) diff --git a/module_login/src/main/java/com/gh/gamecenter/login/provider/QuickLoginProviderImpl.kt b/module_login/src/main/java/com/gh/gamecenter/login/provider/QuickLoginProviderImpl.kt new file mode 100644 index 0000000000..7672676eb4 --- /dev/null +++ b/module_login/src/main/java/com/gh/gamecenter/login/provider/QuickLoginProviderImpl.kt @@ -0,0 +1,34 @@ +package com.gh.gamecenter.login.provider + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.cmic.sso.sdk.auth.AuthnHelper +import com.gh.gamecenter.common.constant.RouteConsts +import com.gh.gamecenter.core.provider.IQuickLoginProvider +import com.gh.gamecenter.login.utils.QuickLoginHelper +import org.json.JSONException + +@Route(path = RouteConsts.provider.quickLogin, name = "一键登录暴露服务") +class QuickLoginProviderImpl : IQuickLoginProvider { + + override fun startLogin(context: Context, entrance: String) { + QuickLoginHelper.startLogin(context, entrance) + } + + override fun isOpenMobileData(context: Context): Boolean { + val helper = AuthnHelper.getInstance(context) + val jsonObject = helper.getNetworkType(context) + val net: Int + try { + net = jsonObject.getString("networkType").toInt() + if (net == 1 || net == 3) return true + } catch (e: JSONException) { + e.printStackTrace() + } + return false + } + + 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/module_login/src/main/java/com/gh/gamecenter/login/provider/UserManagerProviderImpl.kt similarity index 92% rename from app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt rename to module_login/src/main/java/com/gh/gamecenter/login/provider/UserManagerProviderImpl.kt index 70f69d7e96..2fcd261649 100644 --- a/app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt +++ b/module_login/src/main/java/com/gh/gamecenter/login/provider/UserManagerProviderImpl.kt @@ -1,10 +1,10 @@ -package com.gh.common.provider +package com.gh.gamecenter.login.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 +import com.gh.gamecenter.login.user.UserManager @Route(path = RouteConsts.provider.userManager, name = "UserManager暴露服务") class UserManagerProviderImpl : IUserManagerProvider { diff --git a/module_login/src/main/java/com/gh/gamecenter/login/retrofit/ApiService.java b/module_login/src/main/java/com/gh/gamecenter/login/retrofit/ApiService.java new file mode 100644 index 0000000000..3bc3ca2f56 --- /dev/null +++ b/module_login/src/main/java/com/gh/gamecenter/login/retrofit/ApiService.java @@ -0,0 +1,127 @@ +package com.gh.gamecenter.login.retrofit; + +import com.gh.gamecenter.login.entity.LoginTokenEntity; +import com.gh.gamecenter.login.entity.UserInfoEntity; + +import io.reactivex.Observable; +import io.reactivex.Single; +import okhttp3.RequestBody; +import okhttp3.ResponseBody; +import retrofit2.http.Body; +import retrofit2.http.GET; +import retrofit2.http.Header; +import retrofit2.http.Headers; +import retrofit2.http.POST; +import retrofit2.http.PUT; +import retrofit2.http.Path; +import retrofit2.http.Url; + +public interface ApiService { + + /** + * 刷新accessToken + */ + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST() + Observable refreshToken(@Url String url, @Body RequestBody body); + + /** + * 修改用户信息 + */ + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @PUT("users/{user_id}") + Observable changeUserInfo(@Body RequestBody body, @Path("user_id") String userId); + + /** + * 注销登录 + */ + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("logout") + Observable logout(); + + /** + * 将老用户的数据同步到 3.0 版本的数据中 + */ + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("users:sync") + Observable syncUserData(@Body RequestBody body); + + /** + * 获取用户信息（头像/用户名） + */ + @POST + Observable getUserInfo(@Url String url); + + // Header作为区分 userinfo 的唯一标识 + @POST() + Observable getRetryUserInfo(@Url String url, @Header("retry") String tag); // 在OkHttpRetryInterceptor使用主要是不允许这个接口重试 + + /** + * 获取用户礼仪考试状态 + */ + @GET("users/{user_id}/exam/etiquette") + Single getUserRegulationTestStatus(@Path("user_id") String userId); + + /** + * 手机登录获取验证码 + */ + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("login/mobile?step=1") + Observable loginByCaptcha(@Body RequestBody body); + + /** + * 手机登录 + */ + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("login/mobile?step=2") + Observable loginByMobile(@Body RequestBody body); + + /** + * QQ登录 + */ + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("login/qq") + Observable loginByQQ(@Body RequestBody body); + + /** + * 微博登录 + */ + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("login/weibo") + Observable loginByWeibo(@Body RequestBody body); + + /** + * 微信登录 + */ + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("login/wechat") + Observable loginByWechat(@Body RequestBody body); + + /** + * 抖音登录 + */ + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("login/douyin") + Observable loginByDouYin(@Body RequestBody body); + + /** + * 一键登录 + */ + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @POST("login/mobile_oauth") + Observable loginByOauth(@Body RequestBody body); + + /** + * 更新实名认证 + */ + @POST("certification") + Single postCertification(@Body RequestBody body); + + /** + * 同步从其他游戏传过来的实名认证 + */ + @POST("./certification:sync") + Observable postSyncCertification(@Body RequestBody body); + + +} diff --git a/module_login/src/main/java/com/gh/gamecenter/login/retrofit/RetrofitManager.java b/module_login/src/main/java/com/gh/gamecenter/login/retrofit/RetrofitManager.java new file mode 100644 index 0000000000..7493b20988 --- /dev/null +++ b/module_login/src/main/java/com/gh/gamecenter/login/retrofit/RetrofitManager.java @@ -0,0 +1,32 @@ +package com.gh.gamecenter.login.retrofit; + +import android.content.Context; + +import com.gh.gamecenter.common.retrofit.BaseRetrofitManager; +import com.gh.gamecenter.common.utils.EnvHelper; +import com.gh.gamecenter.login.HaloApp; + +import okhttp3.OkHttpClient; + +public class RetrofitManager extends BaseRetrofitManager { + + private final ApiService mApiService; + + private RetrofitManager() { + Context context = HaloApp.getInstance().getApplicationContext(); + OkHttpClient okHttpNormalConfig = getOkHttpConfig(context, 0, 2); + mApiService = provideService(okHttpNormalConfig, EnvHelper.getHost(), ApiService.class); + } + + public static RetrofitManager getInstance() { + return SingletonHolder.INSTANCE; + } + + public ApiService getApi() { + return mApiService; + } + + private static class SingletonHolder { + private static final RetrofitManager INSTANCE = new RetrofitManager(); + } +} diff --git a/app/src/main/java/com/gh/gamecenter/user/LoginTag.java b/module_login/src/main/java/com/gh/gamecenter/login/user/LoginTag.java similarity index 89% rename from app/src/main/java/com/gh/gamecenter/user/LoginTag.java rename to module_login/src/main/java/com/gh/gamecenter/login/user/LoginTag.java index df5cfec861..371d3d88b4 100644 --- a/app/src/main/java/com/gh/gamecenter/user/LoginTag.java +++ b/module_login/src/main/java/com/gh/gamecenter/login/user/LoginTag.java @@ -1,4 +1,4 @@ -package com.gh.gamecenter.user; +package com.gh.gamecenter.login.user; /** * Created by khy on 29/11/17. diff --git a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java b/module_login/src/main/java/com/gh/gamecenter/login/user/UserManager.java similarity index 87% rename from app/src/main/java/com/gh/gamecenter/manager/UserManager.java rename to module_login/src/main/java/com/gh/gamecenter/login/user/UserManager.java index 051a08c94e..6d27234d52 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java +++ b/module_login/src/main/java/com/gh/gamecenter/login/user/UserManager.java @@ -1,4 +1,4 @@ -package com.gh.gamecenter.manager; +package com.gh.gamecenter.login.user; import android.annotation.SuppressLint; import android.content.SharedPreferences; @@ -7,25 +7,25 @@ import android.text.TextUtils; import androidx.annotation.Nullable; +import com.alibaba.android.arouter.launcher.ARouter; import com.gh.gamecenter.common.base.activity.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.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.entity.CommunityEntity; -import com.gh.gamecenter.entity.LoginTokenEntity; -import com.gh.gamecenter.entity.TokenEntity; -import com.gh.gamecenter.entity.UserInfoEntity; +import com.gh.gamecenter.common.constant.RouteConsts; import com.gh.gamecenter.common.eventbus.EBShowDialog; +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.retrofit.RetrofitManager; -import com.gh.gamecenter.retrofit.service.ApiService; -import com.gh.gamecenter.user.UserRepository; -import com.halo.assistant.HaloApp; +import com.gh.gamecenter.common.utils.DeviceUtils; +import com.gh.gamecenter.common.utils.EnvHelper; +import com.gh.gamecenter.core.provider.IReservationRepositoryProvider; +import com.gh.gamecenter.core.utils.GsonUtils; +import com.gh.gamecenter.core.utils.SPUtils; +import com.gh.gamecenter.login.HaloApp; +import com.gh.gamecenter.login.entity.LoginTokenEntity; +import com.gh.gamecenter.login.entity.TokenEntity; +import com.gh.gamecenter.login.entity.UserInfoEntity; +import com.gh.gamecenter.login.retrofit.ApiService; +import com.gh.gamecenter.login.retrofit.RetrofitManager; import com.lightgame.utils.Utils; import org.greenrobot.eventbus.EventBus; @@ -44,14 +44,11 @@ import retrofit2.HttpException; public class UserManager { - private final String COMMUNITY_KEY = "CommunityKey"; - private SharedPreferences mSp; @Nullable private UserInfoEntity mUserInfoEntity; private LoginTokenEntity mLoginTokenEntity; - private CommunityEntity mCommunityData; private String deviceId; @@ -60,7 +57,7 @@ public class UserManager { } private UserManager() { - mSp = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication()); + mSp = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance()); deviceId = mSp.getString(Constants.DEVICE_KEY, ""); } @@ -83,7 +80,7 @@ public class UserManager { } public String getToken() { - if (mLoginTokenEntity != null) { + if (mLoginTokenEntity != null && mLoginTokenEntity.getAccessToken() != null) { return mLoginTokenEntity.getAccessToken().getValue(); } return null; @@ -111,22 +108,6 @@ public class UserManager { return deviceId; } - public void setCommunityData(CommunityEntity community) { - if (community != null) { - SPUtils.setString(mSp, COMMUNITY_KEY, GsonUtils.toJson(community)); - this.mCommunityData = community; - } - } - - public CommunityEntity getCommunity() { - if (mCommunityData == null || TextUtils.isEmpty(mCommunityData.getId())) { - String communityJson = mSp.getString(COMMUNITY_KEY, null); - mCommunityData = TextUtils.isEmpty(communityJson) ? new CommunityEntity() - : GsonUtils.fromJson(communityJson, CommunityEntity.class); - } - return mCommunityData == null ? new CommunityEntity() : mCommunityData; - } - public void logout() { mUserInfoEntity = null; mLoginTokenEntity = null; @@ -149,8 +130,8 @@ public class UserManager { // 判断RefreshToken是否过期 TokenEntity refreshToken = tokenEntity.getRefreshToken(); - if (refreshToken.getExpire() < Utils.getTime(HaloApp.getInstance().getApplication())) { - Utils.toast(HaloApp.getInstance().getApplication(), "账号过期，请重新登录!"); + if (refreshToken.getExpire() < Utils.getTime(HaloApp.getInstance())) { + Utils.toast(HaloApp.getInstance(), "账号过期，请重新登录!"); UserRepository.getInstance().logout(); callBack.onLoginFailure(null); return; @@ -158,7 +139,7 @@ public class UserManager { RequestBody body = null; try { - JSONObject device = DeviceUtils.getLoginDevice(HaloApp.getInstance().getApplication()); + JSONObject device = DeviceUtils.getLoginDevice(HaloApp.getInstance()); JSONObject content = new JSONObject(); content.put("refresh_token", refreshToken.getValue()); content.put("device", device); @@ -178,7 +159,8 @@ public class UserManager { refreshUserInfo(callBack); // 更新用户预约的游戏列表 - ReservationRepository.refreshReservations(); + IReservationRepositoryProvider reservationRepository = (IReservationRepositoryProvider) ARouter.getInstance().build(RouteConsts.provider.reservationRepository).navigation(); + reservationRepository.refreshReservations(); refreshUserRegulationTestStatus(); } diff --git a/app/src/main/java/com/gh/gamecenter/user/UserRepository.java b/module_login/src/main/java/com/gh/gamecenter/login/user/UserRepository.java similarity index 83% rename from app/src/main/java/com/gh/gamecenter/user/UserRepository.java rename to module_login/src/main/java/com/gh/gamecenter/login/user/UserRepository.java index a44ae48eea..82e15f5645 100644 --- a/app/src/main/java/com/gh/gamecenter/user/UserRepository.java +++ b/module_login/src/main/java/com/gh/gamecenter/login/user/UserRepository.java @@ -1,4 +1,4 @@ -package com.gh.gamecenter.user; +package com.gh.gamecenter.login.user; import android.annotation.SuppressLint; import android.content.Context; @@ -11,39 +11,39 @@ import androidx.annotation.Nullable; import androidx.lifecycle.LiveData; import androidx.lifecycle.MediatorLiveData; -import com.gh.gamecenter.common.constant.Constants; -import com.gh.common.repository.ReservationRepository; +import com.alibaba.android.arouter.launcher.ARouter; +import com.gh.gamecenter.core.provider.IWechatBindHelperProvider; +import com.gh.gamecenter.login.HaloApp; +import com.gh.gamecenter.login.utils.LoginHelper; import com.gh.gamecenter.common.callback.BiCallback; -import com.gh.common.util.DataUtils; +import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.constant.RouteConsts; +import com.gh.gamecenter.common.eventbus.EBReuse; 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; -import com.gh.common.util.ErrorHelper; -import com.gh.common.util.GameSubstituteRepositoryHelper; -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.gamecenter.core.utils.SPUtils; -import com.gh.common.util.WechatBindHelper; -import com.gh.download.DownloadManager; -import com.gh.gamecenter.R; -import com.gh.gamecenter.entity.AvatarBorderEntity; -import com.gh.gamecenter.entity.BackgroundImageEntity; -import com.gh.gamecenter.entity.IdCardEntity; -import com.gh.gamecenter.entity.LoginTokenEntity; -import com.gh.gamecenter.entity.TokenEntity; -import com.gh.gamecenter.entity.UserInfoEntity; -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.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; +import com.gh.gamecenter.common.utils.DeviceUtils; +import com.gh.gamecenter.common.utils.EnvHelper; +import com.gh.gamecenter.core.provider.IDataUtilsProvider; +import com.gh.gamecenter.core.provider.IDownloadManagerProvider; +import com.gh.gamecenter.core.provider.IEnergyTaskProvider; +import com.gh.gamecenter.core.provider.IErrorHelperProvider; +import com.gh.gamecenter.core.provider.IGameSubstituteRepositoryProvider; +import com.gh.gamecenter.core.provider.IMessageUnreadRepositoryProvider; +import com.gh.gamecenter.core.provider.IReservationRepositoryProvider; +import com.gh.gamecenter.core.utils.GsonUtils; +import com.gh.gamecenter.core.utils.SPUtils; +import com.gh.gamecenter.login.R; +import com.gh.gamecenter.login.utils.NewLogUtils; +import com.gh.gamecenter.login.retrofit.ApiService; +import com.gh.gamecenter.login.retrofit.RetrofitManager; +import com.gh.gamecenter.login.entity.AvatarBorderEntity; +import com.gh.gamecenter.login.entity.BackgroundImageEntity; +import com.gh.gamecenter.login.entity.IdCardEntity; +import com.gh.gamecenter.login.entity.LoginTokenEntity; +import com.gh.gamecenter.login.entity.TokenEntity; +import com.gh.gamecenter.login.entity.UserInfoEntity; +import com.gh.gamecenter.login.utils.LoginUtils; import com.lightgame.config.CommonDebug; import com.lightgame.utils.Utils; @@ -62,6 +62,9 @@ import okhttp3.RequestBody; import okhttp3.ResponseBody; import retrofit2.HttpException; +import static com.gh.gamecenter.common.constant.Constants.LOGIN_TAG; +import static com.gh.gamecenter.common.constant.Constants.LOGOUT_TAG; + /** * Created by khy on 28/11/17. */ @@ -138,13 +141,17 @@ public class UserRepository { SPUtils.setString(mPreferences, Constants.USER_INFO_KEY, null); SPUtils.setString(Constants.SP_REGULATION_TEST_PASS_STATUS, ""); - ReservationRepository.clearReservations(); - GameSubstituteRepositoryHelper.updateSubstitutableGames(); + IReservationRepositoryProvider reservationRepository = (IReservationRepositoryProvider) ARouter.getInstance().build(RouteConsts.provider.reservationRepository).navigation(); + reservationRepository.clearReservations(); + + IGameSubstituteRepositoryProvider gameSubstituteRepository = (IGameSubstituteRepositoryProvider) ARouter.getInstance().build(RouteConsts.provider.gameSubstituteRepository).navigation(); + gameSubstituteRepository.updateSubstitutableGames(); // 通知页面更新 - EventBus.getDefault().post(new EBReuse(PersonalFragment.LOGOUT_TAG)); + EventBus.getDefault().post(new EBReuse(LOGOUT_TAG)); - DataUtils.getDeviceCertification(HaloApp.getInstance().getGid()); + IDataUtilsProvider dataUtils = (IDataUtilsProvider) ARouter.getInstance().build(RouteConsts.provider.dataUtils).navigation(); + dataUtils.getDeviceCertification(); } public LiveData> getLoginUserInfo() { @@ -226,8 +233,10 @@ public class UserRepository { userTokenHandle(response, loginTag); - GameSubstituteRepositoryHelper.updateSubstitutableGames(); - WechatBindHelper.getWechatConfig(null); + IGameSubstituteRepositoryProvider gameSubstituteRepository = (IGameSubstituteRepositoryProvider) ARouter.getInstance().build(RouteConsts.provider.gameSubstituteRepository).navigation(); + gameSubstituteRepository.updateSubstitutableGames(); + IWechatBindHelperProvider wechatBindHelper = (IWechatBindHelperProvider) ARouter.getInstance().build(RouteConsts.provider.wechatHelper).navigation(); + wechatBindHelper.getWechatConfig(); if (callback != null) { callback.onFirst(response); @@ -339,7 +348,8 @@ public class UserRepository { mCacheUserInfoEntity.setIcon(content); break; case UserViewModel.TYPE_ID_CARD: - EnergyTaskHelper.postEnergyTask("authentication"); + IEnergyTaskProvider energyTaskHelper = (IEnergyTaskProvider) ARouter.getInstance().build(RouteConsts.provider.energyTask).navigation(); + energyTaskHelper.postEnergyTask("authentication"); mCacheUserInfoEntity.setIdCard(GsonUtils.fromJson(content, IdCardEntity.class)); break; case UserViewModel.TYPE_INTRODUCE: @@ -460,13 +470,15 @@ public class UserRepository { } // 重启因为实名认证而处于等待中的任务 - DownloadManager.getInstance().resumeAllInvisiblePendingTask(); + IDownloadManagerProvider downloadManager = (IDownloadManagerProvider) ARouter.getInstance().build(RouteConsts.provider.downloadManager).navigation(); + downloadManager.resumeAllInvisiblePendingTask(); } @Override public void onFailure(@NonNull Exception exception) { mEditObsResponseUserInfo.postValue(null); - ErrorHelper.handleLoginError(HaloApp.getInstance(), (HttpException) exception); + IErrorHelperProvider errorHelper = (IErrorHelperProvider) ARouter.getInstance().build(RouteConsts.provider.errorHelper).navigation(); + errorHelper.handleLoginError(HaloApp.getInstance(), (HttpException) exception); NewLogUtils.INSTANCE.logCertificationResult(isForcedToCertificate, 0); } }); @@ -492,7 +504,8 @@ public class UserRepository { @Override public void onResponse(@Nullable ResponseBody response) { super.onResponse(response); - DataUtils.getDeviceCertification(HaloApp.getInstance().getGid()); + IDataUtilsProvider dataUtils = (IDataUtilsProvider) ARouter.getInstance().build(RouteConsts.provider.dataUtils).navigation(); + dataUtils.getDeviceCertification(); } @Override @@ -512,22 +525,26 @@ public class UserRepository { // 绑定客服 IM // ImManager.attachIm(); - ReservationRepository.refreshReservations(); + IReservationRepositoryProvider reservationRepository = (IReservationRepositoryProvider) ARouter.getInstance().build(RouteConsts.provider.reservationRepository).navigation(); + reservationRepository.refreshReservations(); UserManager.getInstance().refreshUserRegulationTestStatus(); if (loginTag != null) { Utils.toast(mContext, R.string.login_success); - EventBus.getDefault().post(new EBReuse(PersonalFragment.LOGIN_TAG)); + EventBus.getDefault().post(new EBReuse(LOGIN_TAG)); - MessageUnreadRepository.INSTANCE.loadMessageUnreadData(); + + IMessageUnreadRepositoryProvider messageUnreadRepository = (IMessageUnreadRepositoryProvider) ARouter.getInstance().build(RouteConsts.provider.messageUnreadRepository).navigation(); + messageUnreadRepository.loadMessageUnreadData(); } if (UserManager.getInstance().getLoginTokenEntity() != null) { + IEnergyTaskProvider energyTaskHelper = (IEnergyTaskProvider) ARouter.getInstance().build(RouteConsts.provider.energyTask).navigation(); if (UserManager.getInstance().getLoginTokenEntity().isFirstLogin()) { - EnergyTaskHelper.postEnergyTask("register"); + energyTaskHelper.postEnergyTask("register"); } else { - EnergyTaskHelper.postEnergyTask("login"); + energyTaskHelper.postEnergyTask("login"); } } dispatchOnLoginToFlutter(); @@ -538,11 +555,12 @@ public class UserRepository { super.onApiFailure(e); mLoginObsResponseUserInfo.postValue(e); if (loginTag != null) { - ErrorHelper.handleLoginError(mContext, e.getHttpException()); + IErrorHelperProvider errorHelper = (IErrorHelperProvider) ARouter.getInstance().build(RouteConsts.provider.errorHelper).navigation(); + errorHelper.handleLoginError(mContext, e.getHttpException()); logout(); } - if (CommonDebug.IS_DEBUG) { +// if (CommonDebug.IS_DEBUG) { try { HttpException httpException = e.getHttpException(); ResponseBody responseBody = httpException.response().errorBody(); @@ -550,7 +568,7 @@ public class UserRepository { } catch (Exception e1) { e1.printStackTrace(); } - } +// } } }; } @@ -585,7 +603,8 @@ public class UserRepository { if (isEditUserInfo) { mEditObsResponseUserInfo.postValue(new ApiResponse<>(userInfoEntity)); } else { - DataUtils.getDeviceCertification(HaloApp.getInstance().getGid()); + IDataUtilsProvider dataUtils = (IDataUtilsProvider) ARouter.getInstance().build(RouteConsts.provider.dataUtils).navigation(); + dataUtils.getDeviceCertification(); } } diff --git a/app/src/main/java/com/gh/gamecenter/user/UserViewModel.java b/module_login/src/main/java/com/gh/gamecenter/login/user/UserViewModel.java similarity index 97% rename from app/src/main/java/com/gh/gamecenter/user/UserViewModel.java rename to module_login/src/main/java/com/gh/gamecenter/login/user/UserViewModel.java index 0f5dc8ef97..3deda23ef6 100644 --- a/app/src/main/java/com/gh/gamecenter/user/UserViewModel.java +++ b/module_login/src/main/java/com/gh/gamecenter/login/user/UserViewModel.java @@ -1,12 +1,7 @@ -package com.gh.gamecenter.user; +package com.gh.gamecenter.login.user; import android.app.Application; -import com.gh.gamecenter.common.retrofit.ApiResponse; -import com.gh.gamecenter.entity.UserInfoEntity; - -import org.json.JSONObject; - import androidx.annotation.NonNull; import androidx.lifecycle.AndroidViewModel; import androidx.lifecycle.LiveData; @@ -14,6 +9,11 @@ import androidx.lifecycle.MediatorLiveData; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; +import com.gh.gamecenter.common.retrofit.ApiResponse; +import com.gh.gamecenter.login.entity.UserInfoEntity; + +import org.json.JSONObject; + /** * Created by khy on 28/11/17. */ diff --git a/app/src/main/java/com/gh/common/util/AccessTokenKeeper.java b/module_login/src/main/java/com/gh/gamecenter/login/utils/AccessTokenKeeper.java similarity index 98% rename from app/src/main/java/com/gh/common/util/AccessTokenKeeper.java rename to module_login/src/main/java/com/gh/gamecenter/login/utils/AccessTokenKeeper.java index e296f72462..187bea7f6f 100644 --- a/app/src/main/java/com/gh/common/util/AccessTokenKeeper.java +++ b/module_login/src/main/java/com/gh/gamecenter/login/utils/AccessTokenKeeper.java @@ -1,4 +1,4 @@ -package com.gh.common.util; +package com.gh.gamecenter.login.utils; import android.content.Context; import android.content.SharedPreferences; diff --git a/app/src/main/java/com/gh/common/util/LoginHelper.kt b/module_login/src/main/java/com/gh/gamecenter/login/utils/LoginHelper.kt similarity index 87% rename from app/src/main/java/com/gh/common/util/LoginHelper.kt rename to module_login/src/main/java/com/gh/gamecenter/login/utils/LoginHelper.kt index 8270127af1..d6e20d4fa4 100644 --- a/app/src/main/java/com/gh/common/util/LoginHelper.kt +++ b/module_login/src/main/java/com/gh/gamecenter/login/utils/LoginHelper.kt @@ -1,15 +1,17 @@ -package com.gh.common.util +package com.gh.gamecenter.login.utils import android.app.Activity import android.content.Intent -import com.gh.common.constant.Config +import com.alibaba.android.arouter.launcher.ARouter import com.gh.gamecenter.common.constant.Constants -import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.RouteConsts import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.common.utils.tryWithDefaultCatch +import com.gh.gamecenter.core.provider.IConfigProvider import com.gh.gamecenter.core.utils.SentryHelper -import com.gh.gamecenter.user.LoginTag -import com.halo.assistant.HaloApp +import com.gh.gamecenter.login.HaloApp +import com.gh.gamecenter.login.R +import com.gh.gamecenter.login.user.LoginTag import com.lightgame.utils.RuntimeUtils import com.lightgame.utils.Utils import com.sina.weibo.sdk.auth.AuthInfo @@ -46,9 +48,10 @@ object LoginHelper { private var mLoginCallback: LoginCallback? = null init { - val context = HaloApp.getInstance().application.applicationContext - mTencent = Tencent.createInstance(Config.TENCENT_APPID, context) //初始化QQ分享 - mIWXAPI = WXAPIFactory.createWXAPI(context, Config.WECHAT_APPID, true) //初始化微信分享 + val context = HaloApp.getInstance().applicationContext + val config = ARouter.getInstance().build(RouteConsts.provider.config).navigation() as IConfigProvider + mTencent = Tencent.createInstance(config.getTencentAppId(), context) //初始化QQ分享 + mIWXAPI = WXAPIFactory.createWXAPI(context, config.getWechatAppId(), true) //初始化微信分享 mQqLoginListener = object : IUiListener { override fun onComplete(o: Any?) { @@ -147,7 +150,7 @@ object LoginHelper { @JvmStatic fun logoutWithQQ() { if (mTencent.isSessionValid) { - mTencent.logout(HaloApp.getInstance().application.applicationContext) + mTencent.logout(HaloApp.getInstance().applicationContext) } } @@ -155,16 +158,17 @@ object LoginHelper { @JvmStatic fun loginWithWechat(loginCallback: LoginCallback) { mLoginCallback = loginCallback - val register = mIWXAPI.registerApp(Config.WECHAT_APPID) + val config = ARouter.getInstance().build(RouteConsts.provider.config).navigation() as IConfigProvider + val register = mIWXAPI.registerApp(config.getWechatAppId()) val req = SendAuth.Req() req.scope = "snsapi_userinfo" - req.state = HaloApp.getInstance().application.getString(R.string.app_name) + req.state = HaloApp.getInstance().getString(R.string.app_name) val b = mIWXAPI.sendReq(req) Utils.log("微信注册状态：：$register\n 发送状态：：$b") if (!register || !b) { loginCallback.onLoginFailure(LoginTag.wechat, "请检查是否安装微信客户端") - Utils.toast(HaloApp.getInstance().application, "请检查是否安装微信客户端") + Utils.toast(HaloApp.getInstance(), "请检查是否安装微信客户端") } } @@ -182,9 +186,10 @@ object LoginHelper { mWBAPI = WBAPIFactory.createWBAPI(context) //初始化微博分享 mLoginCallback = loginCallback + val config = ARouter.getInstance().build(RouteConsts.provider.config).navigation() as IConfigProvider mWBAPI.registerApp( context, - AuthInfo(context, Config.WEIBO_APPKEY, "http://www.sina.com", WEIBO_SCOPE) + AuthInfo(context, config.getWeiboAppKey(), "http://www.sina.com", WEIBO_SCOPE) ) mWBAPI.authorizeClient(object : WbAuthListener { override fun onComplete(token: Oauth2AccessToken?) { diff --git a/app/src/main/java/com/gh/common/util/LoginUtils.java b/module_login/src/main/java/com/gh/gamecenter/login/utils/LoginUtils.java similarity index 99% rename from app/src/main/java/com/gh/common/util/LoginUtils.java rename to module_login/src/main/java/com/gh/gamecenter/login/utils/LoginUtils.java index 4f5bdcf7dc..9431ddc6d8 100644 --- a/app/src/main/java/com/gh/common/util/LoginUtils.java +++ b/module_login/src/main/java/com/gh/gamecenter/login/utils/LoginUtils.java @@ -1,11 +1,11 @@ -package com.gh.common.util; +package com.gh.gamecenter.login.utils; import android.content.Context; import com.gh.gamecenter.common.utils.DeviceUtils; import com.gh.gamecenter.common.retrofit.JSONObjectResponse; import com.gh.gamecenter.common.retrofit.Response; -import com.gh.gamecenter.retrofit.RetrofitManager; +import com.gh.gamecenter.login.retrofit.RetrofitManager; import com.lightgame.utils.Utils; import org.json.JSONException; diff --git a/module_login/src/main/java/com/gh/gamecenter/login/utils/NewLogUtils.kt b/module_login/src/main/java/com/gh/gamecenter/login/utils/NewLogUtils.kt new file mode 100644 index 0000000000..75d91fb350 --- /dev/null +++ b/module_login/src/main/java/com/gh/gamecenter/login/utils/NewLogUtils.kt @@ -0,0 +1,41 @@ +package com.gh.gamecenter.login.utils + +import com.gh.gamecenter.common.json.JsonObjectBuilder +import com.gh.gamecenter.common.json.json +import com.gh.gamecenter.common.loghub.LoghubUtils +import com.gh.gamecenter.common.utils.LogUtils +import com.lightgame.utils.Utils +import org.json.JSONObject + +object NewLogUtils { + + private fun log(jsonObject: JSONObject, logStore: String, uploadImmediately: Boolean) { + Utils.log("NewLogUtils", jsonObject.toString(4)) + LoghubUtils.log(jsonObject, logStore, uploadImmediately) + } + + fun parseAndPutMeta(): JsonObjectBuilder.() -> Unit = { + val meta = LogUtils.getMetaObject() + val metaKeys = meta.keys() + while (metaKeys.hasNext()) { + val key: String = metaKeys.next().toString() + val value = meta.getString(key) + key to value + } + } + + /** + * 记录实名认证结果 + * @param result 0 失败, 1 成功但未成年 2 成功且成年 3 认证中 + */ + fun logCertificationResult(isForced: Boolean, result: Int) { + val json = json { + "event" to "verification_finished" + "trigger" to if (isForced) "实名认证流程" else "" + "result" to result + "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/common/util/QuickLoginHelper.kt b/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt similarity index 81% rename from app/src/main/java/com/gh/common/util/QuickLoginHelper.kt rename to module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt index e3f2fd43b3..1b1ccdbe25 100644 --- a/app/src/main/java/com/gh/common/util/QuickLoginHelper.kt +++ b/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt @@ -1,4 +1,4 @@ -package com.gh.common.util +package com.gh.gamecenter.login.utils import android.Manifest import android.annotation.SuppressLint @@ -11,30 +11,33 @@ import android.view.LayoutInflater import android.view.View import android.view.Window import android.view.WindowManager +import com.alibaba.android.arouter.launcher.ARouter import com.cmic.sso.sdk.AuthThemeConfig 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.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.constant.RouteConsts import com.gh.gamecenter.common.databinding.SetWaitDialogBinding +import com.gh.gamecenter.common.retrofit.ApiResponse import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.common.utils.DialogUtils.checkDialogContext import com.gh.gamecenter.common.utils.PermissionHelper.checkReadPhoneStatePermissionBeforeAction +import com.gh.gamecenter.core.provider.IConfigProvider +import com.gh.gamecenter.core.provider.ILogUtilsProvider import com.gh.gamecenter.core.runOnUiThread 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.common.retrofit.ApiResponse -import com.gh.gamecenter.user.LoginTag -import com.gh.gamecenter.user.UserRepository +import com.gh.gamecenter.login.R +import com.gh.gamecenter.login.databinding.DialogQuickLoginBinding +import com.gh.gamecenter.login.databinding.DialogQuickLoginPermissionBinding +import com.gh.gamecenter.login.entity.LoginTokenEntity +import com.gh.gamecenter.login.user.LoginTag +import com.gh.gamecenter.login.user.UserRepository +import com.gh.gamecenter.login.view.LoginActivity import com.lightgame.utils.AppManager import com.lightgame.utils.Utils import org.json.JSONObject @@ -45,6 +48,8 @@ import org.json.JSONObject * 2.授权请求 * 3.获取token * 4.请求登录接口 + * + * 一键登录SDK对接文档：http://dev.10086.cn/docInside?contentId=10000067541479 */ object QuickLoginHelper { @@ -73,9 +78,11 @@ object QuickLoginHelper { AuthnHelper.setDebugMode(true) } + + val config = ARouter.getInstance().build(RouteConsts.provider.config).navigation() as IConfigProvider AuthnHelper.getInstance(context.applicationContext).getPhoneInfo( - Config.QUICK_LOGIN_APPID, - Config.QUICK_LOGIN_APPKEY, + config.getQuickLoginAppId(), + config.getQuickLoginAppKey(), { requestCode: Int, jsonObject: JSONObject -> val code = jsonObject.optString("resultCode") // “103000”为成功 @@ -113,29 +120,50 @@ object QuickLoginHelper { if (context.checkCallingOrSelfPermission(Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) { loginAuth(context) } else { - DialogUtils.showQuickLoginPermissionDialog( - context, object : ConfirmListener { - override fun onConfirm() { - checkReadPhoneStatePermissionBeforeAction(context, object : EmptyCallback { - override fun onCallback() { - loginAuth(context) - } - }) - } - }, object : CancelListener { - override fun onCancel() { - startCodeLoginPage( - context, - entrance = ENTRANCE_PERMISSION_DIALOG, - isFinishAuth = false, - isFromPermission = true - ) - } + showQuickLoginPermissionDialog( + context, + { + checkReadPhoneStatePermissionBeforeAction(context, object : EmptyCallback { + override fun onCallback() { + loginAuth(context) + } + }) + }, + { + startCodeLoginPage( + context, + entrance = ENTRANCE_PERMISSION_DIALOG, + isFinishAuth = false, + isFromPermission = true + ) } ) } } + @JvmStatic + fun showQuickLoginPermissionDialog(context: Context, confirm: () -> Unit, cancel: () -> Unit) { + val solidContext = checkDialogContext(context) + + val dialog = Dialog(solidContext, R.style.DialogWindowTransparent) + val binding: DialogQuickLoginPermissionBinding = + DialogQuickLoginPermissionBinding.inflate(LayoutInflater.from(solidContext)) + + binding.confirmBtn.setOnClickListener { + dialog.dismiss() + confirm.invoke() + } + + binding.cancelBtn.setOnClickListener { + dialog.dismiss() + cancel.invoke() + } + + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE) + dialog.setContentView(binding.root) + dialog.show() + } + private fun initSDK(context: Context, entrance: String) { mAuthnHelper = AuthnHelper.getInstance(context.applicationContext) mAuthnHelper?.run { @@ -153,7 +181,7 @@ object QuickLoginHelper { mOpenAuthPageSuccess = true } else { // 不成功就调起验证码登录页 toastCode(code) - startCodeLoginPage(context, true) +// startCodeLoginPage(context, true) } } } @@ -191,7 +219,8 @@ object QuickLoginHelper { } } // 2.授权请求 - mAuthnHelper?.loginAuth(Config.QUICK_LOGIN_APPID, Config.QUICK_LOGIN_APPKEY, mTokenListener, REQUEST_LOGIN_AUTH_CODE) + val config = ARouter.getInstance().build(RouteConsts.provider.config).navigation() as IConfigProvider + mAuthnHelper?.loginAuth(config.getQuickLoginAppId(), config.getQuickLoginAppKey(), mTokenListener, REQUEST_LOGIN_AUTH_CODE) } private fun getConfig(context: Context, entrance: String): AuthThemeConfig { @@ -207,7 +236,7 @@ object QuickLoginHelper { .setNumberColor(R.color.text_title.toColor()) //手机号码字体颜色 .setNumFieldOffsetY(95) //号码栏Y偏移量 // 登录按钮 - .setLogBtnImgPath("login_btn_bg") //登录按钮背景 + .setLogBtnImgPath("download_button_normal_style") //登录按钮背景 .setLogBtnText("本机号码一键登录", Color.WHITE, 16, false) //登录按钮相关 .setLogBtnOffsetY(170) //登录按钮Y偏移量 .setLogBtn(1000, 44) //登录按钮相关宽高 @@ -216,7 +245,8 @@ object QuickLoginHelper { .setBackPressedListener {} //返回键回调 .setLogBtnClickListener(object : LoginClickListener { override fun onLoginClickStart(context: Context, jsonObj: JSONObject?) { - LogUtils.login("logging", "一键登录", entrance) + val logUtils = ARouter.getInstance().build(RouteConsts.provider.logUtils).navigation() as ILogUtilsProvider + 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() @@ -245,7 +275,8 @@ object QuickLoginHelper { SPUtils.setBoolean(Constants.SP_HAS_GET_PHONE_INFO, false) - LogUtils.login("success", "一键登录", entrance) + val logUtils = ARouter.getInstance().build(RouteConsts.provider.logUtils).navigation() as ILogUtilsProvider + logUtils.login("success", "一键登录", entrance) finishAuthActivity() } diff --git a/app/src/main/java/com/gh/gamecenter/LoginActivity.java b/module_login/src/main/java/com/gh/gamecenter/login/view/LoginActivity.java similarity index 93% rename from app/src/main/java/com/gh/gamecenter/LoginActivity.java rename to module_login/src/main/java/com/gh/gamecenter/login/view/LoginActivity.java index a653b68c31..7d9b17e44b 100644 --- a/app/src/main/java/com/gh/gamecenter/LoginActivity.java +++ b/module_login/src/main/java/com/gh/gamecenter/login/view/LoginActivity.java @@ -1,4 +1,4 @@ -package com.gh.gamecenter; +package com.gh.gamecenter.login.view; import android.content.Context; import android.content.Intent; @@ -8,12 +8,12 @@ import androidx.annotation.NonNull; import com.alibaba.android.arouter.facade.annotation.Route; import com.gh.gamecenter.common.base.activity.ToolBarActivity; -import com.gh.common.util.QuickLoginHelper; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.constant.RouteConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.core.utils.DisplayUtils; -import com.gh.gamecenter.fragment.LoginFragment; +import com.gh.gamecenter.login.R; +import com.gh.gamecenter.login.utils.QuickLoginHelper; /** * Created by khy on 14/08/17. diff --git a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java b/module_login/src/main/java/com/gh/gamecenter/login/view/LoginFragment.java similarity index 87% rename from app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java rename to module_login/src/main/java/com/gh/gamecenter/login/view/LoginFragment.java index c8e314bef4..e16aec40b8 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java +++ b/module_login/src/main/java/com/gh/gamecenter/login/view/LoginFragment.java @@ -1,4 +1,4 @@ -package com.gh.gamecenter.fragment; +package com.gh.gamecenter.login.view; import android.Manifest; import android.app.Activity; @@ -29,36 +29,35 @@ import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProviders; -import com.gh.common.util.CheckLoginUtils; -import com.gh.common.util.DialogUtils; -import com.gh.common.util.EnergyTaskHelper; -import com.gh.common.util.LogUtils; -import com.gh.common.util.LoginHelper; -import com.gh.common.util.LoginUtils; -import com.gh.common.util.QuickLoginHelper; -import com.gh.gamecenter.R; -import com.gh.gamecenter.WebActivity; +import com.alibaba.android.arouter.launcher.ARouter; +import com.gh.gamecenter.login.utils.LoginHelper; 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; +import com.gh.gamecenter.common.constant.RouteConsts; +import com.gh.gamecenter.common.eventbus.EBReuse; +import com.gh.gamecenter.common.retrofit.ApiResponse; 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.provider.IEnergyTaskProvider; +import com.gh.gamecenter.core.provider.ILogUtilsProvider; +import com.gh.gamecenter.core.provider.IWebProvider; 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.security.BindPhoneActivity; -import com.gh.gamecenter.common.retrofit.ApiResponse; -import com.gh.gamecenter.user.LoginTag; -import com.gh.gamecenter.user.UserViewModel; -import com.halo.assistant.HaloApp; +import com.gh.gamecenter.login.HaloApp; +import com.gh.gamecenter.login.R; +import com.gh.gamecenter.login.databinding.FragmentLoginBinding; +import com.gh.gamecenter.login.entity.LoginTokenEntity; +import com.gh.gamecenter.login.entity.UserInfoEntity; +import com.gh.gamecenter.login.user.LoginTag; +import com.gh.gamecenter.login.user.UserManager; +import com.gh.gamecenter.login.user.UserViewModel; +import com.gh.gamecenter.login.utils.LoginUtils; +import com.gh.gamecenter.login.utils.QuickLoginHelper; import com.lightgame.utils.AppManager; import org.greenrobot.eventbus.EventBus; @@ -142,7 +141,7 @@ public class LoginFragment mStatus = QuickLoginHelper.STATUS_DEFAULT; } - final UserViewModel.Factory factory = new UserViewModel.Factory(HaloApp.getInstance().getApplication()); + final UserViewModel.Factory factory = new UserViewModel.Factory(HaloApp.getInstance()); mUserViewModel = ViewModelProviders.of(this, factory).get(UserViewModel.class); mUserViewModel.getLoginObsUserinfo().observe(this, this); @@ -210,7 +209,8 @@ public class LoginFragment @Override public void onClick(@NonNull View widget) { MtaHelper.onEvent("我的光环_新", "登录页面", "隐私政策"); - Intent intent = WebActivity.getWebIntent(requireContext(), requireContext().getString(R.string.privacy_policy_title), requireContext().getString(R.string.privacy_policy_url)); + IWebProvider webActivity = (IWebProvider) ARouter.getInstance().build(RouteConsts.provider.webActivity).navigation(); + Intent intent = webActivity.getWebIntent(requireContext(), requireContext().getString(R.string.privacy_policy_title), requireContext().getString(R.string.privacy_policy_url)); startActivity(intent); } }, privacyContent.length() - 6, privacyContent.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); @@ -227,7 +227,8 @@ public class LoginFragment @Override public void onClick(@NonNull View widget) { MtaHelper.onEvent("我的光环_新", "登录页面", "用户协议"); - startActivity(WebActivity.getWebIntent(requireContext(), requireContext().getString(R.string.disclaimer_title), requireContext().getString(R.string.disclaimer_url))); + IWebProvider webActivity = (IWebProvider) ARouter.getInstance().build(RouteConsts.provider.webActivity).navigation(); + startActivity(webActivity.getWebIntent(requireContext(), requireContext().getString(R.string.disclaimer_title), requireContext().getString(R.string.disclaimer_url))); } }, privacyContent.length() - 13, privacyContent.length() - 7, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); @@ -247,6 +248,7 @@ public class LoginFragment } else if (id == R.id.checkIv || id == R.id.checkClickView1 || id == R.id.checkClickView2) { updatePolicyCheckedStatus(); } else if (id == R.id.login_captcha) { + QuickLoginHelper.showQuickLoginPermissionDialog(requireContext(), () -> null, () -> null); MtaHelper.onEvent("我的光环_新", "登录页面", "获取验证码"); final String phoneNum = mBinding.loginPhoneEt.getText().toString().trim().replaceAll(" ", ""); if (PatternUtils.isPhoneNum(phoneNum) && phoneNum.length() == 11) { @@ -285,11 +287,13 @@ public class LoginFragment if (requireContext().checkCallingOrSelfPermission(Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) { startQuickLogin(); } else { - DialogUtils.showQuickLoginPermissionDialog( + QuickLoginHelper.showQuickLoginPermissionDialog( requireContext(), - () -> PermissionHelper.checkReadPhoneStatePermissionBeforeAction(requireContext(), this::startQuickLogin), () -> { - } + PermissionHelper.checkReadPhoneStatePermissionBeforeAction(requireContext(), this::startQuickLogin); + return null; + }, + () -> null ); } } @@ -388,18 +392,20 @@ public class LoginFragment String inviteCode = mBinding.loginInviteEt.getText().toString().trim().replaceAll(" ", ""); if (!TextUtils.isEmpty(inviteCode)) { SPUtils.setBoolean(Constants.SP_HAS_COMPLETE_INVITE_CODE, true); - EnergyTaskHelper.postInviteCodeTask(inviteCode, "mobile_login", null); + IEnergyTaskProvider energyTaskHelper = (IEnergyTaskProvider) ARouter.getInstance().build(RouteConsts.provider.energyTask).navigation(); + energyTaskHelper.postInviteCodeTask(inviteCode, "mobile_login", null); } String loginType = loginTokenEntity.getLoginType(); + ILogUtilsProvider logUtils = (ILogUtilsProvider) ARouter.getInstance().build(RouteConsts.provider.logUtils).navigation(); if (LoginTag.qq.name().equals(loginType) || LoginTag.wechat.name().equals(loginType) || LoginTag.weibo.name().equals(loginType) || LoginTag.douyin.name().equals(loginType) || LoginTag.oauth.name().equals(loginType)) { - LogUtils.login("success", loginType, mEntrance); + logUtils.login("success", loginType, mEntrance); } else { - LogUtils.login("success", "mobile", mEntrance); + logUtils.login("success", "mobile", mEntrance); } // 第三方登录方式登录后跳转绑定手机页面（https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1206） @@ -409,7 +415,10 @@ public class LoginFragment || LoginTag.douyin.name().equals(loginType); if (isThirdPartyLogin && TextUtils.isEmpty(response.getData().getLoginMobile())) { - startActivity(BindPhoneActivity.getLoginSuccessIntent(requireContext())); + ARouter.getInstance().build(RouteConsts.activity.bindPhoneActivity) + .withBoolean(EntranceConsts.KEY_FROM_LOGIN, true) + .withBoolean(EntranceConsts.KEY_CHANGE_PHONE, false) + .navigation(); } } // 防止UserManager数据丢失后重复登录 @@ -425,7 +434,7 @@ public class LoginFragment EntranceUtils.ENTRANCE_BROWSER, "")); }*/ - if (getActivity() != null && CheckLoginUtils.isLogin()) { + if (getActivity() != null && UserManager.getInstance().isLoggedIn()) { getActivity().finish(); // 如果是从一键登录页跳转过来的，登录成功后也要finish一键登录页 if (mStatus == QuickLoginHelper.STATUS_FROM_QUICK_LOGIN_PAGE) { @@ -451,10 +460,11 @@ public class LoginFragment } private void login(JSONObject content, LoginTag loginTag) { + ILogUtilsProvider logUtils = (ILogUtilsProvider) ARouter.getInstance().build(RouteConsts.provider.logUtils).navigation(); if (loginTag.equals(LoginTag.phone)) { - LogUtils.login("logging", "mobile", mEntrance); + logUtils.login("logging", "mobile", mEntrance); } else { - LogUtils.login("logging", loginTag.name(), mEntrance); + logUtils.login("logging", loginTag.name(), mEntrance); } if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) { mLoginDialog = WaitingDialogFragment.newInstance(getString(R.string.logging)); diff --git a/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java b/module_login/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java similarity index 86% rename from app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java rename to module_login/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java index 3812e36d51..703dc01c1c 100644 --- a/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java +++ b/module_login/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java @@ -6,13 +6,15 @@ import android.os.Bundle; import android.text.TextUtils; 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.LoginHelper; -import com.gh.gamecenter.R; +import com.alibaba.android.arouter.launcher.ARouter; +import com.gh.gamecenter.login.utils.LoginHelper; +import com.gh.gamecenter.common.constant.RouteConsts; import com.gh.gamecenter.common.eventbus.EBShare; import com.gh.gamecenter.common.utils.ShareUtils; +import com.gh.gamecenter.core.provider.IConfigProvider; +import com.gh.gamecenter.core.provider.IDefaultUrlHandlerProvider; +import com.gh.gamecenter.core.provider.IEnergyTaskProvider; +import com.gh.gamecenter.login.R; import com.lightgame.utils.Utils; import com.tencent.mm.opensdk.modelbase.BaseReq; import com.tencent.mm.opensdk.modelbase.BaseResp; @@ -39,7 +41,8 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler, WeC @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mWxApi = WXAPIFactory.createWXAPI(this, Config.WECHAT_APPID, false); + IConfigProvider config = (IConfigProvider) ARouter.getInstance().build(RouteConsts.provider.config).navigation(); + mWxApi = WXAPIFactory.createWXAPI(this, config.getWechatAppId(), false); mWxApi.handleIntent(getIntent(), this); TextView textView = new TextView(this); textView.setSingleLine(true); @@ -57,7 +60,8 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler, WeC if (baseReq instanceof ShowMessageFromWX.Req) { String messageExt = ((ShowMessageFromWX.Req) baseReq).message.messageExt; if (!TextUtils.isEmpty(messageExt)) { - DefaultUrlHandler.interceptUrl(this, messageExt, "浏览器", true); + IDefaultUrlHandlerProvider defaultUrlHandler = (IDefaultUrlHandlerProvider) ARouter.getInstance().build(RouteConsts.provider.defaultUrlHandler).navigation(); + defaultUrlHandler.interceptUrl(this, messageExt, "浏览器", true); finishActivity(); } } @@ -74,7 +78,8 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler, WeC EventBus.getDefault().post(new EBShare(ShareUtils.shareEntrance)); 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()); + IEnergyTaskProvider energyTaskProvider = (IEnergyTaskProvider) ARouter.getInstance().build(RouteConsts.provider.energyTask).navigation(); + energyTaskProvider.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) { diff --git a/app/src/main/java/com/gh/gamecenter/wxapi/WeChatUserInfoThread.java b/module_login/src/main/java/com/gh/gamecenter/wxapi/WeChatUserInfoThread.java similarity index 90% rename from app/src/main/java/com/gh/gamecenter/wxapi/WeChatUserInfoThread.java rename to module_login/src/main/java/com/gh/gamecenter/wxapi/WeChatUserInfoThread.java index 5ab0b73572..f20d800567 100644 --- a/app/src/main/java/com/gh/gamecenter/wxapi/WeChatUserInfoThread.java +++ b/module_login/src/main/java/com/gh/gamecenter/wxapi/WeChatUserInfoThread.java @@ -3,7 +3,9 @@ package com.gh.gamecenter.wxapi; import android.content.Context; import android.text.TextUtils; -import com.gh.common.constant.Config; +import com.alibaba.android.arouter.launcher.ARouter; +import com.gh.gamecenter.common.constant.RouteConsts; +import com.gh.gamecenter.core.provider.IConfigProvider; import com.lightgame.utils.Utils; import org.json.JSONObject; @@ -38,9 +40,10 @@ public class WeChatUserInfoThread extends Thread { public void run() { super.run(); try { + IConfigProvider config = (IConfigProvider) ARouter.getInstance().build(RouteConsts.provider.config).navigation(); String tokenUrl = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + - Config.WECHAT_APPID + "&secret=" + - Config.WECHAT_SECRET + "&code=" + + config.getWechatAppId() + "&secret=" + + config.getWechatSecret() + "&code=" + mCode + "&grant_type=authorization_code"; String jsonResult = getJsonResultByUrlPath(tokenUrl); JSONObject jsonObject = new JSONObject(jsonResult); diff --git a/app/src/main/res/anim/anim_auth_in.xml b/module_login/src/main/res/anim/anim_auth_in.xml similarity index 100% rename from app/src/main/res/anim/anim_auth_in.xml rename to module_login/src/main/res/anim/anim_auth_in.xml diff --git a/app/src/main/res/anim/anim_auth_out.xml b/module_login/src/main/res/anim/anim_auth_out.xml similarity index 100% rename from app/src/main/res/anim/anim_auth_out.xml rename to module_login/src/main/res/anim/anim_auth_out.xml diff --git a/app/src/main/res/anim/cycle_interpolator.xml b/module_login/src/main/res/anim/cycle_interpolator.xml similarity index 100% rename from app/src/main/res/anim/cycle_interpolator.xml rename to module_login/src/main/res/anim/cycle_interpolator.xml diff --git a/app/src/main/res/anim/login_policy_shake.xml b/module_login/src/main/res/anim/login_policy_shake.xml similarity index 100% rename from app/src/main/res/anim/login_policy_shake.xml rename to module_login/src/main/res/anim/login_policy_shake.xml diff --git a/app/src/main/res/drawable-xxhdpi/bg_quick_login_permission_dialog.webp b/module_login/src/main/res/drawable-xxhdpi/bg_quick_login_permission_dialog.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/bg_quick_login_permission_dialog.webp rename to module_login/src/main/res/drawable-xxhdpi/bg_quick_login_permission_dialog.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_login_close.webp b/module_login/src/main/res/drawable-xxhdpi/ic_login_close.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_login_close.webp rename to module_login/src/main/res/drawable-xxhdpi/ic_login_close.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_login_qq.webp b/module_login/src/main/res/drawable-xxhdpi/ic_login_qq.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_login_qq.webp rename to module_login/src/main/res/drawable-xxhdpi/ic_login_qq.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_login_wechat.webp b/module_login/src/main/res/drawable-xxhdpi/ic_login_wechat.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_login_wechat.webp rename to module_login/src/main/res/drawable-xxhdpi/ic_login_wechat.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_login_weibo.webp b/module_login/src/main/res/drawable-xxhdpi/ic_login_weibo.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_login_weibo.webp rename to module_login/src/main/res/drawable-xxhdpi/ic_login_weibo.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_quick_login_check.webp b/module_login/src/main/res/drawable-xxhdpi/ic_quick_login_check.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_quick_login_check.webp rename to module_login/src/main/res/drawable-xxhdpi/ic_quick_login_check.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_quick_login_close.webp b/module_login/src/main/res/drawable-xxhdpi/ic_quick_login_close.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_quick_login_close.webp rename to module_login/src/main/res/drawable-xxhdpi/ic_quick_login_close.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_quick_login_dialog_phone.webp b/module_login/src/main/res/drawable-xxhdpi/ic_quick_login_dialog_phone.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_quick_login_dialog_phone.webp rename to module_login/src/main/res/drawable-xxhdpi/ic_quick_login_dialog_phone.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_quick_login_uncheck.webp b/module_login/src/main/res/drawable-xxhdpi/ic_quick_login_uncheck.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_quick_login_uncheck.webp rename to module_login/src/main/res/drawable-xxhdpi/ic_quick_login_uncheck.webp diff --git a/app/src/main/res/drawable-xxxhdpi/bg_quick_login_dialog.webp b/module_login/src/main/res/drawable-xxxhdpi/bg_quick_login_dialog.webp similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/bg_quick_login_dialog.webp rename to module_login/src/main/res/drawable-xxxhdpi/bg_quick_login_dialog.webp diff --git a/app/src/main/res/drawable-xxxhdpi/bg_quick_login_permission_dialog.webp b/module_login/src/main/res/drawable-xxxhdpi/bg_quick_login_permission_dialog.webp similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/bg_quick_login_permission_dialog.webp rename to module_login/src/main/res/drawable-xxxhdpi/bg_quick_login_permission_dialog.webp diff --git a/app/src/main/res/drawable-xxxhdpi/ic_quick_login_dialog_phone.webp b/module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_dialog_phone.webp similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_quick_login_dialog_phone.webp rename to module_login/src/main/res/drawable-xxxhdpi/ic_quick_login_dialog_phone.webp diff --git a/app/src/main/res/drawable/bg_invite_dialog.xml b/module_login/src/main/res/drawable/bg_invite_dialog.xml similarity index 100% rename from app/src/main/res/drawable/bg_invite_dialog.xml rename to module_login/src/main/res/drawable/bg_invite_dialog.xml diff --git a/app/src/main/res/drawable/bg_login_edit.xml b/module_login/src/main/res/drawable/bg_login_edit.xml similarity index 100% rename from app/src/main/res/drawable/bg_login_edit.xml rename to module_login/src/main/res/drawable/bg_login_edit.xml diff --git a/app/src/main/res/drawable/bg_shape_fa_radius_8.xml b/module_login/src/main/res/drawable/bg_shape_fa_radius_8.xml similarity index 100% rename from app/src/main/res/drawable/bg_shape_fa_radius_8.xml rename to module_login/src/main/res/drawable/bg_shape_fa_radius_8.xml diff --git a/app/src/main/res/drawable/selector_ic_login_checkbox.xml b/module_login/src/main/res/drawable/selector_ic_login_checkbox.xml similarity index 100% rename from app/src/main/res/drawable/selector_ic_login_checkbox.xml rename to module_login/src/main/res/drawable/selector_ic_login_checkbox.xml diff --git a/app/src/main/res/layout/dialog_quick_login.xml b/module_login/src/main/res/layout/dialog_quick_login.xml similarity index 100% rename from app/src/main/res/layout/dialog_quick_login.xml rename to module_login/src/main/res/layout/dialog_quick_login.xml diff --git a/app/src/main/res/layout/dialog_quick_login_permission.xml b/module_login/src/main/res/layout/dialog_quick_login_permission.xml similarity index 100% rename from app/src/main/res/layout/dialog_quick_login_permission.xml rename to module_login/src/main/res/layout/dialog_quick_login_permission.xml diff --git a/app/src/main/res/layout/fragment_login.xml b/module_login/src/main/res/layout/fragment_login.xml similarity index 99% rename from app/src/main/res/layout/fragment_login.xml rename to module_login/src/main/res/layout/fragment_login.xml index 61e84029cf..abcb244515 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/module_login/src/main/res/layout/fragment_login.xml @@ -83,12 +83,12 @@ android:layout_width="wrap_content" android:layout_height="25dp" android:layout_alignParentRight="true" - android:layout_marginRight="16dp" android:layout_centerVertical="true" + android:layout_marginRight="16dp" android:gravity="center" android:text="@string/login_get_captcha" android:textColor="@color/text_subtitleDesc" - android:textSize="14sp"/> + android:textSize="14sp" /> + + + module_login + 光环助手 + 登录异常，请稍后重试 + 登录异常(%1$d)，请稍后重试 + 登录成功 + 登录中... + 输入手机号码 + 输入验证码 + 获取验证码 + 输入邀请码（选填） + +86 + 登录 + 一键登录 > + QQ + 微信 + 新浪微博 + 第三方账号快捷登录 + + 权限申请 + 完成一键登录，需向你申请授权以下权限： + 电话权限 + 识别具体运营商，方便对应运营商完成一键\n登录服务 + 马上授权 + 暂不授权，验证码登录 + + \ No newline at end of file diff --git a/module_login/src/main/res/values/styles.xml b/module_login/src/main/res/values/styles.xml new file mode 100644 index 0000000000..94e2612f84 --- /dev/null +++ b/module_login/src/main/res/values/styles.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/network_security_config.xml b/module_login/src/main/res/xml/network_security_config.xml similarity index 100% rename from app/src/main/res/xml/network_security_config.xml rename to module_login/src/main/res/xml/network_security_config.xml diff --git a/module_login/src/test/java/com/gh/gamecenter/login/ExampleUnitTest.kt b/module_login/src/test/java/com/gh/gamecenter/login/ExampleUnitTest.kt new file mode 100644 index 0000000000..2d61d82c3d --- /dev/null +++ b/module_login/src/test/java/com/gh/gamecenter/login/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.gh.gamecenter.login + +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 e0cf03553b..90eee1d4ed 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,3 +11,4 @@ include ':libraries:Matisse' //evaluate(new File(settingsDir, "assistant_flutter/.android/include_flutter.groovy")) include ':module_core' include ':module_common' +include ':module_login'