张玉久
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
..
2022-04-09 19:48:45 +08:00
2022-05-05 10:24:37 +08:00
2022-04-09 19:48:45 +08:00