From fcc23ddfc28615726a4120d40a3ffc7aa4303b77 Mon Sep 17 00:00:00 2001 From: leafwai Date: Tue, 28 Sep 2021 18:51:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E4=B8=BA=E5=B1=85=E4=B8=AD=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/base/BaseActivity.java | 4 ++-- .../java/com/gh/common/util/CommentHelper.kt | 12 ++++++++---- .../java/com/gh/common/util/DialogHelper.kt | 2 +- .../main/java/com/gh/common/util/ErrorHelper.kt | 6 ++++-- .../java/com/gh/common/util/LibaoUtils.java | 10 +++++----- .../java/com/gh/gamecenter/MainActivity.java | 6 +++--- .../com/gh/gamecenter/SuggestionActivity.java | 4 ++-- .../gamecenter/collection/ArticleAdapter.java | 5 ++--- .../gamecenter/collection/ArticleFragment.java | 1 - .../download/GameDownloadFragmentAdapter.java | 4 ++-- .../qa/answer/detail/AnswerDetailFragment.kt | 17 +++++++++++------ .../qa/article/detail/ArticleDetailFragment.kt | 3 ++- .../qa/column/order/AskTabOrderFragment.java | 5 ++--- .../questions/detail/QuestionsDetailFragment.kt | 8 +++++--- .../qa/questions/edit/QuestionEditActivity.kt | 6 ++++-- .../qa/questions/edit/TagsSelectFragment.kt | 4 ++-- .../newdetail/NewQuestionDetailFragment.kt | 5 +++-- .../AskQuestionsRecommendsAdapter.java | 4 ++-- .../qa/video/detail/ForumVideoDetailFragment.kt | 3 ++- .../gamecenter/servers/add/AddKaiFuViewModel.kt | 2 +- 20 files changed, 63 insertions(+), 48 deletions(-) diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index befe09718e..cca0245273 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -278,7 +278,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy JSONObject object = new JSONObject(showDialog.getPath()); JSONObject device = object.getJSONObject("device"); String model = device.getString("model"); - DialogHelper.showDialog(this, "你的账号已在另外一台设备登录" + DialogHelper.showCenterDialog(this, "你的账号已在另外一台设备登录" , StringUtils.buildString("（", model, "）") , "知道了", "重新登录" , () -> {} @@ -289,7 +289,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy startActivity(LoginActivity.getIntent(BaseActivity.this, "你的账号已在另外一台设备登录多设备-重新登录")); } - }, false, "", "" + } ); mBaseHandler.postDelayed(() -> mIsExistLogoutDialog = false, 5000); } catch (Exception e) { 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 0be2cea4ec..9c08dbc093 100644 --- a/app/src/main/java/com/gh/common/util/CommentHelper.kt +++ b/app/src/main/java/com/gh/common/util/CommentHelper.kt @@ -408,7 +408,8 @@ object CommentHelper { .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) .subscribe(highlightObserver) - }, null + }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) ) } else { DialogHelper.showDialog( @@ -423,7 +424,8 @@ object CommentHelper { .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) .subscribe(highlightObserver) - } + }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) ) } } @@ -468,7 +470,8 @@ object CommentHelper { .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) .subscribe(hideObserver) - }, null + }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) ) } else { DialogHelper.showDialog( @@ -479,7 +482,8 @@ object CommentHelper { .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) .subscribe(hideObserver) - } + }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) ) } } diff --git a/app/src/main/java/com/gh/common/util/DialogHelper.kt b/app/src/main/java/com/gh/common/util/DialogHelper.kt index f1e68560c3..ef992d3326 100644 --- a/app/src/main/java/com/gh/common/util/DialogHelper.kt +++ b/app/src/main/java/com/gh/common/util/DialogHelper.kt @@ -284,7 +284,7 @@ object DialogHelper { @JvmStatic fun showDownloadDialog(context: Context, listener: ConfirmListener) { - showWarningDialog( + showCenterWarningDialog( context, "下载提示", "您当前使用的网络为2G/3G/4G，开始下载将会消耗移动流量，确定下载？", 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 25273ee797..5eb6d4e9ba 100644 --- a/app/src/main/java/com/gh/common/util/ErrorHelper.kt +++ b/app/src/main/java/com/gh/common/util/ErrorHelper.kt @@ -173,7 +173,8 @@ object ErrorHelper { "你因违反《光环助手评论规则》，已被禁言$bannedType，如有疑问，请联系客服（QQ：${Config.getSettings()?.support?.qq}）", "去看看", "关闭", { dialogContext.startActivity(WebActivity.getWebIntent(dialogContext, dialogContext.getString(R.string.comment_rules_title), dialogContext.getString(R.string.comment_rules_url))) - }, null + }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) ) } @@ -190,7 +191,8 @@ object ErrorHelper { "你因违反《问答版块规则》，已被禁言$bannedType，如有疑问，请联系客服（QQ：1562479331）", "去看看", "关闭", { dialogContext.startActivity(WebActivity.getWebIntent(dialogContext, dialogContext.getString(R.string.community_rule_title), dialogContext.getString(R.string.community_rule_url))) - }, null + }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) ) } 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 1eb4524f0c..a9241cf8ea 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -330,7 +330,7 @@ public class LibaoUtils { String dialogContent = context.getString(R.string.ling_rules_dialog, libaoEntity.getGame().getName(), platform); boolean finalIsExistPlatform = isExistPlatform; - DialogHelper.showWarningDialog(context, "条件不符", + DialogHelper.showCenterWarningDialog(context, "条件不符", Html.fromHtml(dialogContent), isExistPlatform ? "关闭" : "", isExistPlatform ? "立即安装" : "关闭", () -> { @@ -338,7 +338,7 @@ public class LibaoUtils { adapter.openDownload(libaoEntity.getPlatform()); } return null; - }, null); + }, () -> null); return; } } @@ -349,7 +349,7 @@ public class LibaoUtils { break; case "查看": if (!TextUtils.isEmpty(libaoEntity.getDes())) { - DialogHelper.showDialog(v.getContext(), "使用说明", Html.fromHtml(libaoEntity.getDes()), "关闭", "", () -> {}, () -> {}, false, "", ""); + DialogHelper.showCenterDialog(v.getContext(), "使用说明", Html.fromHtml(libaoEntity.getDes()), "关闭", "", () -> {}, () -> {}); } break; case "再领": @@ -659,7 +659,7 @@ public class LibaoUtils { } public static void lunningAppDialog(final Context context, Spanned msg, final LibaoEntity libaoEntity) { - DialogHelper.showWarningDialog(context, "复制成功", msg + DialogHelper.showCenterWarningDialog(context, "复制成功", msg , "关闭", "启动游戏" , () -> { if (LibaoUtils.isAppInstalled(context, libaoEntity.getPackageName())) { @@ -669,7 +669,7 @@ public class LibaoUtils { + PlatformUtils.getInstance(context).getPlatformName(libaoEntity.getPlatform()) + "版"); } return null; - }, null); + }, () -> null); } //复制文字 diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 24a3ee6631..b896b4d1a2 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -235,7 +235,7 @@ public class MainActivity extends BaseActivity { if (!TextUtils.isEmpty(message)) { Config.setExceptionMsg(null); AppUncaughtHandler.reportException(this, new Throwable(message)); - DialogHelper.showWarningDialog(this, "发生闪退", "光环助手刚刚发生了闪退，马上反馈以帮助我们更好地修复问题？（只需简单描述你刚才的操作）" + DialogHelper.showCenterWarningDialog(this, "发生闪退", "光环助手刚刚发生了闪退，马上反馈以帮助我们更好地修复问题？（只需简单描述你刚才的操作）" , "暂不", "马上反馈", () -> { startActivityForResult(SuggestionActivity.getIntent(MainActivity.this, SuggestType.crash, "APP闪退："), 100); @@ -401,7 +401,7 @@ public class MainActivity extends BaseActivity { private void showKefuReportDialog() { // 只有是APP闪退反馈成功后弹出联系客服的弹窗 String str = "您也可以联系客服进一步描述闪退的情况，如果您反馈的是新问题，即有机会获得红包奖励"; - DialogHelper.showWarningDialog(MainActivity.this, "反馈成功", Html.fromHtml(str.substring(0, str.indexOf("红包奖励")) + "红包奖励"), "暂不", "联系客服", + DialogHelper.showCenterWarningDialog(MainActivity.this, "反馈成功", Html.fromHtml(str.substring(0, str.indexOf("红包奖励")) + "红包奖励"), "暂不", "联系客服", () -> { if (ShareUtils.isQQClientAvailable(this)) { DirectUtils.directToQqConversation(this, null); @@ -409,7 +409,7 @@ public class MainActivity extends BaseActivity { toast("本机未安装QQ应用"); } return null; - }, null); + }, () -> null); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index b4bb1b2dce..d6de19b373 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -1295,7 +1295,7 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall }, () -> { }); return; } else if (error.getCode() == 403062) { - DialogHelper.showDialog(SuggestionActivity.this, + DialogHelper.showCenterDialog(SuggestionActivity.this, "提示", "光环助手已收录游戏：" + error.getData().getGameName(), "退出并查看游戏", "仍然提交", () -> { GameDetailActivity.startGameDetailActivity(SuggestionActivity.this, @@ -1310,7 +1310,7 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall postDialog = WaitingDialogFragment.newInstance(getString(R.string.dialog_feedback_doing)); postDialog.show(getSupportFragmentManager(), null); sendSuggestion(jsonObject); - }, false, "", ""); + }); return; } } diff --git a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java index e9468f0723..bd9456a0ff 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java @@ -127,7 +127,7 @@ public class ArticleAdapter extends ListAdapter { private void addLongClickListenerIfNeed(RecyclerView.ViewHolder holder, NewsEntity newsEntity) { if (ArticleFragment.HISTORY.equals(mViewModel.type)) { holder.itemView.setOnLongClickListener(v -> { - DialogHelper.showDialog(holder.itemView.getContext(), + DialogHelper.showCenterDialog(holder.itemView.getContext(), "删除记录", "删除浏览记录将不可恢复，确定删除吗？", "确定", @@ -136,8 +136,7 @@ public class ArticleAdapter extends ListAdapter { mViewModel.removeHistory(newsEntity); }, () -> { - }, - false, "", ""); + }); return false; }); } diff --git a/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java b/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java index f3cfacf992..6c37c7a451 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java @@ -6,7 +6,6 @@ import android.view.View; import com.gh.common.util.CollectionUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DialogHelper; -import com.gh.common.util.DialogUtils; import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java index ba66b5fd1f..bd8f00018c 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -346,10 +346,10 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { PackageUtils.launchApplicationByPackageName(mContext, downloadEntity.getPackageName()); break; case "失败": - DialogHelper.showDialog(mContext + DialogHelper.showCenterDialog(mContext , "下载失败" , "安装包数据校验失败，无法完成下载，建议删除任务重新下载" - , "知道了", "", () -> { }, () -> { }, false, "", ""); + , "知道了", "", () -> { }, () -> { }); break; case "取消": XapkInstaller.cancelUnzipTask(downloadEntity); 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 507489ede3..34f097df97 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 @@ -305,7 +305,8 @@ open class AnswerDetailFragment : NormalFragment() { "很抱歉，内容可能已被删除", "关闭", "", - { activity.finish() }) + { activity.finish() }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } } else { Utils.toast(context, R.string.content_delete_toast) @@ -672,16 +673,18 @@ open class AnswerDetailFragment : NormalFragment() { "关闭评论", "恢复评论" -> { if (mViewModel.answerDetail?.commentable!!) { DialogHelper.showDialog(requireContext(), "提示", "关闭评论之后，该回答将无法查看和发表评论，确定关闭吗？", - "确定", "取消", { mViewModel.toggleComment(mAnswerId, false) }) + "确定", "取消", { mViewModel.toggleComment(mAnswerId, false) }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } else { DialogHelper.showDialog(requireContext(), "提示", "确定恢复评论吗？", - "确定", "取消", { mViewModel.toggleComment(mAnswerId, true) }) + "确定", "取消", { mViewModel.toggleComment(mAnswerId, true) }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } } "删除" -> { DialogHelper.showDialog(requireContext(), "提示", "删除回答后，其中的所有回复都将被删除", "删除", "取消", { mViewModel.doHideThisAnswer(mAnswerId) - }) + }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } } } @@ -698,7 +701,8 @@ open class AnswerDetailFragment : NormalFragment() { "加精回答", if (answer.me.moderatorPermissions.highlightAnswer == Permissions.REPORTER) reporterHint else adminHint, "确定", "取消", - { mViewModel.doHighlightThisAnswer(mAnswerId) }) + { mViewModel.doHighlightThisAnswer(mAnswerId) }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } } @@ -713,7 +717,8 @@ open class AnswerDetailFragment : NormalFragment() { "折叠回答", if (answer.me.moderatorPermissions.foldAnswer == Permissions.REPORTER) reporterHint else adminHint, "确定", "取消", - { mViewModel.doFoldThisAnswer(mAnswerId) }) + { mViewModel.doFoldThisAnswer(mAnswerId) }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } } 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 d5204298c9..95fc172639 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 @@ -318,7 +318,8 @@ class ArticleDetailFragment : BaseCommentFragment { mPostDialog = WaitingDialogFragment.newInstance(getString(R.string.ask_tags_reseting)); mPostDialog.show(getChildFragmentManager(), null); isReset = true; mViewModel.reset(); - }, () -> {}, false, "", ""); + }, () -> {}); } 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 e84bf924cb..48952b1d49 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 @@ -484,7 +484,7 @@ class QuestionsDetailFragment : "删除" -> { DialogHelper.showDialog(requireContext(), "提示", "删除问题后，其中的所有回答都将被删除", "删除", "取消", { mListViewModel.moderatorsHideQuestion() - }) + }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } } } @@ -570,7 +570,8 @@ class QuestionsDetailFragment : else "你的操作将立即生效，确定提交吗？（你的管理权限为：高级）", "确定", "取消", - { mListViewModel.moderatorsHideQuestion() }) + { mListViewModel.moderatorsHideQuestion() }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) historyVersion -> { startActivityForResult( HistoryActivity.getIntent(requireContext(), mQuestionsDetailEntity?.id!!), @@ -655,7 +656,8 @@ class QuestionsDetailFragment : if (activity != null && activity?.isFinishing == false) { activity?.finish() } - }) + }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } // 登录事件 diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt index 83d9ffd054..69b2967801 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 @@ -369,7 +369,8 @@ class QuestionEditActivity : BaseRichEditorActivity(), "确定", "", { setResult(Activity.RESULT_CANCELED) finish() - } + }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) ) return@Observer } @@ -606,7 +607,8 @@ class QuestionEditActivity : BaseRichEditorActivity(), if (checkSameFromQuestionData()) { return false } - DialogHelper.showDialog(this, "提示", "确定退出修改？已编辑的内容将丢失", "继续编辑", " 退出", null, { finish() }) + DialogHelper.showDialog(this, "提示", "确定退出修改？已编辑的内容将丢失", "继续编辑", " 退出", cancelClickCallback = { finish() }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) return true } 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 f975d0b49d..8ec3bfe11a 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 @@ -109,7 +109,7 @@ class TagsSelectFragment : BaseFragment() { mModeratorPatchTagsCallback?.onPermissionError() val fragment = parentFragment (fragment as? BaseDialogWrapperFragment)?.dismissAllowingStateLoss() - }) + }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) return@Observer } } @@ -214,7 +214,7 @@ class TagsSelectFragment : BaseFragment() { "你的操作将提交给小编审核，确定提交吗？" else "你的操作将立即生效，确定提交吗？（你的管理权限为：高级）", "确定", "取消", { mViewModel?.uploadPicAndPatchQuestion(true) - },) + }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } } else { mViewModel?.uploadPicAndPostQuestion(false) 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 0c12110267..fab6b3078d 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 @@ -245,7 +245,8 @@ class NewQuestionDetailFragment : "很抱歉，内容可能已被删除", "关闭", "", - { requireActivity().finish() } + { requireActivity().finish() }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) ) } else { toast(R.string.content_delete_toast) @@ -598,7 +599,7 @@ class NewQuestionDetailFragment : if (!questionEntity.finish) "该问题确定标记已解决？" else "该问题确定标记未解决？" DialogHelper.showDialog(requireContext(), "提示", content, "确定", "取消", { mListViewModel.postSolveQuestion(!questionEntity.finish) - }) + }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) NewLogUtils.logSharePanelClick( if (!questionEntity.finish) "click_solve" else "click_resolved", mViewModel.questionDetail?.user?.id 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 abd602b21c..a7d9aa86a2 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 @@ -172,10 +172,10 @@ public class AskQuestionsRecommendsAdapter extends ListAdapter mListViewModel.deleteFollowList(), () -> {}, false, "", ""); + "确定", "再看看", () -> mListViewModel.deleteFollowList(), () -> {}); }); break; } 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 8ae49d6dee..40fbc51ab1 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 @@ -576,7 +576,8 @@ class ForumVideoDetailFragment : BaseFragment_TabLayout() { "${it.text}视频后，其中的所有评论及回复都将被${it.text}", it.text, "取消", - { mViewModel.deleteVideo(mForumVideoEntity?.id ?: "") }) + { mViewModel.deleteVideo(mForumVideoEntity?.id ?: "") }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) NewLogUtils.logSharePanelClick( "click_delete", mForumVideoEntity?.user?.id ?: "", "视频帖", mForumVideoEntity?.id diff --git a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuViewModel.kt b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuViewModel.kt index 3b88ad1bea..38947ed52b 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuViewModel.kt @@ -225,7 +225,7 @@ class AddKaiFuViewModel(application: Application) : AndroidViewModel(application } if (i == calendarList.size - 1 && !isSuccess) { DialogHelper.showDialog(activity, "提示", "当前开服表中已经存在相同的内容，请检查修改" - , "返回修改", "") + , "返回修改", "", extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) return } }