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
This commit is contained in:
张玉久
@ -2126,7 +2126,7 @@ public class DialogUtils {
|
||||
dialog.show();
|
||||
}
|
||||
|
||||
public static void showBindPhoneDialog(Context context, ConfirmListener listener) {
|
||||
public static Dialog showBindPhoneDialog(Context context, ConfirmListener listener) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
|
||||
@ -2144,6 +2144,7 @@ public class DialogUtils {
|
||||
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
|
||||
dialog.setContentView(binding.getRoot());
|
||||
dialog.show();
|
||||
return dialog;
|
||||
}
|
||||
|
||||
public static void showReceiveLibaoSuccessDialog(Context context, String title, String des, String libaoCode, ConfirmListener listener) {
|
||||
|
||||
Reference in New Issue
Block a user