|
|
dc4e345ea8
|
fix: 多线程上报日志导致的闪退
|
2022-09-02 11:12:58 +08:00 |
|
|
|
6f5f72194a
|
feat: 移除 log 线程，取消本地 log 数据库（由 loghub sdk 实现）
|
2022-08-03 16:15:16 +08:00 |
|
|
|
8ff396e05b
|
feat: 调整主 IO 线程池的核心数和最大数
|
2022-08-03 15:16:00 +08:00 |
|
|
|
c34e5f0a3d
|
Merge remote-tracking branch 'origin/dev' into feature-issues1801-v5.12.0
# Conflicts:
# app/src/main/java/com/gh/common/util/NewFlatLogUtils.kt
# app/src/main/java/com/gh/gamecenter/gamedetail/entity/NewGameDetailEntity.kt
# app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.kt
# app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt
# app/src/main/res/layout/fragment_forum_home.xml
# libraries/LGLibrary
|
2022-08-01 14:50:48 +08:00 |
|
|
|
0cfce764ff
|
Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
# dependencies.gradle
# libraries/LGLibrary
|
2022-07-29 11:19:32 +08:00 |
|
|
|
5609a95382
|
feat:【光环助手V5.12.0】游戏详情新增“内容卡片”功能 https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/1953
|
2022-07-26 14:05:31 +08:00 |
|
|
|
e8b00cc87f
|
Merge remote-tracking branch 'origin/release' into feature-issues1801
# Conflicts:
# app/src/main/java/com/gh/common/util/NewFlatLogUtils.kt
# libraries/LGLibrary
|
2022-07-22 14:19:53 +08:00 |
|
|
|
c0b561cb78
|
fix: 修复首页弹窗重复弹出的问题
|
2022-07-22 11:53:55 +08:00 |
|
|
|
74fda1fc17
|
feat: ToastUtils 的 toast 默认切换到主线程执行
|
2022-07-21 16:18:43 +08:00 |
|
|
|
2f35e6ac56
|
rebase to 5.10.0 分支
|
2022-07-06 17:45:56 +08:00 |
|
|
|
d95519252d
|
fix: 修改sentry上的闪退问题
|
2022-06-14 10:51:35 +08:00 |
|
|
|
90e802c03b
|
处理 SonarQube 问题
|
2022-06-02 15:08:11 +08:00 |
|
|
|
0afefdffb6
|
将BUILD_TIME、IS_NIGHT_MODE_ON移动到module_common/build.gradle中
|
2022-06-01 11:56:42 +08:00 |
|
|
|
0b56e19da6
|
【光环助手V5.10.0】游戏副标题相关需求 https://git.shanqu.cc/pm/halo-app-issues/-/issues/1839
|
2022-05-27 18:34:14 +08:00 |
|
|
|
44e5b218e3
|
模块/组件化前期改造 https://git.shanqu.cc/halo/android/assistant-android/-/issues/64
|
2022-05-23 16:07:46 +08:00 |
|
|
|
116702f7f0
|
模块/组件化前期改造 https://git.shanqu.cc/halo/android/assistant-android/-/issues/64
|
2022-05-17 17:34:21 +08:00 |
|
|
|
f1d52fdc80
|
Merge branch 'dev-5.10.0' into feature-modular
# Conflicts:
# app/src/main/java/com/gh/common/util/QuickLoginHelper.kt
# app/src/main/java/com/gh/common/view/ConfigFilterView.kt
# app/src/main/java/com/gh/gamecenter/AboutActivity.java
# app/src/main/java/com/gh/gamecenter/CollectionActivity.java
# app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java
# app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java
# app/src/main/java/com/gh/gamecenter/HelpAndFeedbackActivity.kt
# app/src/main/java/com/gh/gamecenter/InfoActivity.java
# app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java
# app/src/main/java/com/gh/gamecenter/MessageActivity.java
# app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java
# app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java
# app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java
# app/src/main/java/com/gh/gamecenter/QaActivity.kt
# app/src/main/java/com/gh/gamecenter/SettingActivity.kt
# app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
# app/src/main/java/com/gh/gamecenter/SuggestionActivity.java
# app/src/main/java/com/gh/gamecenter/WebActivity.kt
# app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt
# app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt
# app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt
# app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogSubjectAdapter.kt
# app/src/main/java/com/gh/gamecenter/catalog/SubCatalogAdapter.kt
# app/src/main/java/com/gh/gamecenter/catalog/SubCatalogFragment.kt
# app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt
# app/src/main/java/com/gh/gamecenter/category/CategoryListActivity.kt
# app/src/main/java/com/gh/gamecenter/category/NewCategoryHorizontalAdapter.kt
# app/src/main/java/com/gh/gamecenter/category2/CategoryDirectoryAdapter.kt
# app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt
# app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt
# app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt
# app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt
# app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt
# app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt
# app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt
# app/src/main/java/com/gh/gamecenter/fragment/MainWrapperViewModel.kt
# app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt
# app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt
# app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchGameFragment.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddUserPlayedGameFragment.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesAdapter.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionFragment.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/publish/ChooseGameCollectionCoverTypeDialog.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/publish/ChooseGameCollectionDefaultCoverDialog.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagAdapter.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt
# app/src/main/java/com/gh/gamecenter/help/HelpContainerFragment.kt
# app/src/main/java/com/gh/gamecenter/help/HelpQaAdapter.kt
# app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt
# app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt
# app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt
# app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java
# app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java
# app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoActivity.kt
# app/src/main/java/com/gh/gamecenter/personalhome/PersonalItemViewHolder.kt
# app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundPreviewActivity.kt
# app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundFragment.kt
# app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderActivity.kt
# app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt
# app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt
# app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryAdapter.kt
# app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserGameFragment.kt
# app/src/main/java/com/gh/gamecenter/personalhome/rating/RatingActivity.kt
# app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt
# app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt
# app/src/main/java/com/gh/gamecenter/qa/article/detail/comment/ArticleDetailCommentFragment.kt
# app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftActivity.kt
# app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt
# app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentFragment.kt
# app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt
# app/src/main/java/com/gh/gamecenter/qa/editor/InsertGameCollectionWrapperActivity.kt
# app/src/main/java/com/gh/gamecenter/qa/editor/InsertVideoWrapperActivity.kt
# app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaActivity.kt
# app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskActivity.java
# app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftActivity.kt
# app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteActivity.java
# app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt
# app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt
# app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt
# app/src/main/java/com/gh/gamecenter/security/BindPhoneActivity.kt
# app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt
# app/src/main/java/com/gh/gamecenter/security/SecurityActivity.kt
# app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingActivity.kt
# app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingFragment.kt
# app/src/main/java/com/gh/gamecenter/setting/VideoSettingActivity.kt
# app/src/main/java/com/gh/gamecenter/setting/VideoSettingFragment.kt
# app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt
# app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt
# app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt
# app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxItemAdapter.kt
# app/src/main/java/com/gh/gamecenter/video/VideoItemViewHolder.kt
# app/src/main/java/com/gh/gamecenter/video/data/VideoDataFragment.kt
# app/src/main/java/com/gh/gamecenter/video/game/GameVideoFragment.kt
# app/src/main/java/com/gh/gamecenter/video/label/VideoLabelAdapter.kt
# app/src/main/res/layout/activity_background_clip.xml
# app/src/main/res/layout/community_answer_item.xml
# app/src/main/res/layout/user_history_item.xml
# app/src/main/res/values-night/colors.xml
# app/src/main/res/values/colors.xml
# app/src/main/res/values/strings.xml
# module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseDialogFragment.java
# module_common/src/main/java/com/gh/gamecenter/common/utils/NightModeUtils.kt
# module_core/src/main/java/com/gh/gamecenter/core/AppExecutor.kt
|
2022-05-12 11:10:46 +08:00 |
|
|
|
963e8da89c
|
Merge branch 'dev-5.9.0' into feature-modular
# Conflicts:
# app/src/main/java/com/gh/base/BaseActivity_TabLayout.java
# app/src/main/java/com/gh/common/dialog/PrivacyDialogFragment.kt
# app/src/main/java/com/gh/common/dialog/WelcomeDialog.kt
# app/src/main/java/com/gh/common/util/EntranceUtils.java
# app/src/main/java/com/gh/common/view/FlexLinearLayout.kt
# app/src/main/java/com/gh/common/view/WelcomeDialog.kt
# app/src/main/java/com/gh/gamecenter/AboutActivity.java
# app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java
# app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java
# app/src/main/java/com/gh/gamecenter/MessageActivity.java
# app/src/main/java/com/gh/gamecenter/SettingActivity.kt
# app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
# app/src/main/java/com/gh/gamecenter/SuggestionActivity.java
# app/src/main/java/com/gh/gamecenter/catalog/BannerAdapter.kt
# app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt
# app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt
# app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt
# app/src/main/java/com/gh/gamecenter/download/UpdatableGameFragment.kt
# app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java
# app/src/main/java/com/gh/gamecenter/fragment/WelcomeDialogFragment.kt
# app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt
# app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiAdapter.kt
# app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListFragment.kt
# app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFragment.kt
# app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt
# app/src/main/java/com/gh/gamecenter/gamedetail/rating/logs/CommentLogsActivity.kt
# app/src/main/java/com/gh/gamecenter/home/HomeRecommendItemViewHolder.kt
# app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java
# app/src/main/java/com/gh/gamecenter/info/StrategyDialogAdapter.java
# app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java
# app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java
# app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java
# app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java
# app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java
# app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java
# app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java
# app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt
# app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt
# app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java
# app/src/main/java/com/gh/gamecenter/personal/NewPersonalFunctionGroupAdapter.kt
# app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryViewModel.kt
# app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingFragment.kt
# app/src/main/java/com/gh/gamecenter/setting/VideoSettingFragment.kt
# app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java
# app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt
# app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt
# app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt
# app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockAdapter.kt
# app/src/main/res/layout/fragment_forum.xml
# app/src/main/res/values-night/colors.xml
# app/src/main/res/values-night/styles.xml
# app/src/main/res/values/colors.xml
# app/src/main/res/values/styles.xml
# module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_TabLayout.java
# module_core/src/main/java/com/gh/gamecenter/core/utils/DisplayUtils.java
|
2022-05-05 10:24:37 +08:00 |
|
|
|
e9ac9aab7f
|
模块/组件化前期改造 https://git.shanqu.cc/halo/android/assistant-android/-/issues/64
|
2022-04-09 19:48:45 +08:00 |
|
