diff --git a/app/src/main/java/com/gh/common/util/DownloadDialogHelper.kt b/app/src/main/java/com/gh/common/util/DownloadDialogHelper.kt index d0df1a0f21..292b0937d8 100644 --- a/app/src/main/java/com/gh/common/util/DownloadDialogHelper.kt +++ b/app/src/main/java/com/gh/common/util/DownloadDialogHelper.kt @@ -2,10 +2,9 @@ package com.gh.common.util import android.content.Context import android.os.Build -import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.DialogHelper import com.gh.gamecenter.common.utils.SensorsBridge -import com.gh.gamecenter.common.utils.toResString +import com.gh.gamecenter.common.utils.replaceLineBreakWithBr import com.gh.gamecenter.core.utils.EmptyCallback import com.gh.gamecenter.feature.entity.ApkEntity import com.gh.gamecenter.feature.entity.GameEntity @@ -32,7 +31,7 @@ object DownloadDialogHelper { DialogHelper.showDialogWithHtmlContent( context, dialog.title, - dialog.content, + dialog.content.replaceLineBreakWithBr(), "继续下载", "取消", confirmClickCallback = { @@ -59,7 +58,8 @@ object DownloadDialogHelper { gameName = gameEntity.name ?: "", gameType = gameEntity.categoryChinese ) - } + }, + extraConfig = DialogHelper.Config(centerTitle = true) ) } else { callback.onCallback() diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailWrapperFragment.kt index 8378761e36..ce0b15975d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailWrapperFragment.kt @@ -635,7 +635,7 @@ class GameDetailWrapperFragment : BaseLazyFragment(), IScrollable { DialogHelper.showDialogWithHtmlContent( requireContext(), dialog.title, - dialog.content, + dialog.content.replaceLineBreakWithBr(), dialog.confirmButton.text.toString(), dialog.closeButtonText, { @@ -669,7 +669,8 @@ class GameDetailWrapperFragment : BaseLazyFragment(), IScrollable { "game_type", gameEntity?.categoryChinese ?: "", "button_name", "关闭弹窗" ) - } + }, + extraConfig = DialogHelper.Config(centerTitle = true) ) } diff --git a/module_common/src/main/java/com/gh/gamecenter/common/utils/DialogHelper.kt b/module_common/src/main/java/com/gh/gamecenter/common/utils/DialogHelper.kt index ccf4ce58a4..aac5ca51e5 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/utils/DialogHelper.kt +++ b/module_common/src/main/java/com/gh/gamecenter/common/utils/DialogHelper.kt @@ -8,7 +8,6 @@ import android.graphics.Color import android.graphics.Paint import android.graphics.Typeface import android.graphics.drawable.ColorDrawable -import android.os.Build import android.text.Html import android.text.Spannable import android.text.SpannableStringBuilder @@ -23,11 +22,9 @@ import androidx.constraintlayout.widget.ConstraintSet import androidx.core.content.ContextCompat import androidx.fragment.app.FragmentActivity import androidx.viewbinding.ViewBinding -import com.therouter.TheRouter import com.gh.gamecenter.common.R import com.gh.gamecenter.common.base.TrackableDialog import com.gh.gamecenter.common.callback.ConfirmListener -import com.gh.gamecenter.common.constant.RouteConsts import com.gh.gamecenter.common.databinding.DialogAlertDefaultBinding import com.gh.gamecenter.common.databinding.DialogGuideBinding import com.gh.gamecenter.common.databinding.DialogProgressBinding @@ -41,6 +38,7 @@ import com.google.android.material.imageview.ShapeableImageView import com.lightgame.download.DownloadEntity import com.lightgame.utils.AppManager import com.lightgame.view.CheckableLinearLayout +import com.therouter.TheRouter import splitties.systemservices.layoutInflater object DialogHelper { @@ -642,7 +640,8 @@ object DialogHelper { cancelText: String, confirmClickCallback: (() -> Unit)? = null, cancelClickCallback: (() -> Unit)? = null, - touchOutsideCallback: (() -> Unit)? = null + touchOutsideCallback: (() -> Unit)? = null, + extraConfig: Config? = null ) { val webContent = Html.fromHtml(content) showDialog( @@ -653,7 +652,8 @@ object DialogHelper { cancelText, confirmClickCallback, cancelClickCallback, - touchOutsideCallback = touchOutsideCallback + touchOutsideCallback = touchOutsideCallback, + extraConfig = extraConfig ) } diff --git a/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt b/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt index e80126a86d..55b776237f 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt +++ b/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt @@ -1840,4 +1840,7 @@ fun ViewPager.setRestoredCurItem(defaultPosition: Int) { // RGBA转换为ARGB格式颜色字符串 fun String.RGBAToARGB(): String = if (length == 9) { substring(0, 1) + substring(7, 9) + substring(1, 7) -} else this \ No newline at end of file +} else this + +// 换行符替换为Html的
换行 +fun String.replaceLineBreakWithBr(): String = replace("\n", "
") \ No newline at end of file