diff --git a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java index b0390aba12..6ed9d7726a 100644 --- a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java +++ b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java @@ -53,7 +53,7 @@ public class DetailDownloadUtils { if (viewHolder.gameEntity.isSpecialDownload()) { viewHolder.mDownloadPb.setText("查看下载资源"); - viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.SPECIAL_DOWNLOAD); + viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.SPECIAL_DOWNLOAD); return; } @@ -75,7 +75,7 @@ public class DetailDownloadUtils { final RegionSetting.GameH5Download gameH5Download = RegionSettingHelper.getGameH5DownloadByGameId(viewHolder.gameEntity.getId()); if (gameH5Download != null) { viewHolder.mDownloadPb.setText(TextUtils.isEmpty(viewHolder.gameEntity.getDownloadOffText()) ? "查看详情" : viewHolder.gameEntity.getDownloadOffText()); - viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.NORMAL); + viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.NORMAL); return; } diff --git a/app/src/main/java/com/gh/common/view/DownloadButton.kt b/app/src/main/java/com/gh/common/view/DownloadButton.kt index 7c2bd944e2..4210ee75aa 100644 --- a/app/src/main/java/com/gh/common/view/DownloadButton.kt +++ b/app/src/main/java/com/gh/common/view/DownloadButton.kt @@ -153,6 +153,7 @@ class DownloadButton @JvmOverloads constructor( ButtonStyle.INSTALL_NORMAL, ButtonStyle.NONE_WITH_HINT, ButtonStyle.H5_GAME, + ButtonStyle.SPECIAL_DOWNLOAD, ButtonStyle.TEENAGER_MODE -> { progressDrawable = null background = if (mDownloadStyle == DOWNLOAD_IMAGE_STYLE) R.drawable.text_white_background.toDrawable(context) else R.drawable.download_button_normal_style.toDrawable(context) @@ -263,6 +264,7 @@ class DownloadButton @JvmOverloads constructor( H5_GAME, UPDATING, TEENAGER_MODE, + SPECIAL_DOWNLOAD, WAITING, PAUSE, FAILURE, diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java index 24e5939f94..1afd0c9343 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java @@ -32,10 +32,13 @@ import com.gh.common.history.HistoryHelper; import com.gh.common.simulator.SimulatorDownloadManager; import com.gh.common.simulator.SimulatorGameManager; import com.gh.common.util.CheckLoginUtils; +import com.gh.common.util.DirectUtils; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.DataLogUtils; import com.gh.common.util.DetailDownloadUtils; import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.common.util.DialogUtils; +import com.gh.gamecenter.core.utils.PageSwitchDataHelper; import com.gh.gamecenter.energy.utils.EnergyTaskHelper; import com.gh.common.util.LogUtils; import com.gh.gamecenter.core.utils.MtaHelper; @@ -50,10 +53,6 @@ import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.WebActivity; import com.gh.gamecenter.common.constant.Constants; -import com.gh.gamecenter.common.utils.DataLogUtils; -import com.gh.gamecenter.common.utils.DialogHelper; -import com.gh.gamecenter.common.utils.PermissionHelper; -import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.core.utils.StringUtils; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; diff --git a/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt b/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt index 4f3f8fb433..e1137dad92 100644 --- a/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt +++ b/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt @@ -8,7 +8,6 @@ import android.util.AttributeSet import android.view.Gravity import android.view.View import android.widget.LinearLayout -import android.widget.ProgressBar import android.widget.Space import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout @@ -50,7 +49,7 @@ class GameItemUi(override val ctx: Context) : Ui { var recommendTv: TextView var downloadSpeedTv: TextView var downloadPercentageTv: TextView - var downloadProgressBar: ProgressBar + var downloadButton: DownloadButton var gameTagContainer: GameTagContainerView var recommendConstraintLayout: ConstraintLayout var gameInfoGroup: Group @@ -71,7 +70,7 @@ class GameItemUi(override val ctx: Context) : Ui { recommendTv = initRecommendTv() downloadSpeedTv = initDownloadSpeedTv() downloadPercentageTv = initDownloadPercentageTv() - downloadProgressBar = initDownloadProgressBar() + downloadButton = initDownloadButton() gameTagContainer = GameTagContainerView(ctx).apply { id = R.id.label_list } mGameDesSpace = space { }.apply { id = R.id.gameDesSpace } recommendConstraintLayout = initRecommendConstraintLayout() @@ -137,7 +136,7 @@ class GameItemUi(override val ctx: Context) : Ui { }) add(downloadSpeedTv, lParams(0, wrapContent) { topToTopOf(mGameDesSpace) - bottomToTopOf(downloadProgressBar) + bottomToTopOf(downloadButton) startToStartOf(mGameDesSpace) endToStartOf(downloadPercentageTv) @@ -146,14 +145,14 @@ class GameItemUi(override val ctx: Context) : Ui { }) add(downloadPercentageTv, lParams(0, wrapContent) { topToTopOf(mGameDesSpace) - bottomToTopOf(downloadProgressBar) + bottomToTopOf(downloadButton) startToEndOf(downloadSpeedTv) endToEndOf(mGameDesSpace) horizontalWeight = 1F topMargin = dip(2) }) - add(downloadProgressBar, lParams(0, dip(3)) { + add(downloadButton, lParams(0, dip(3)) { topToBottomOf(downloadSpeedTv) startToStartOf(mGameDesSpace) endToEndOf(mGameDesSpace) @@ -186,17 +185,6 @@ class GameItemUi(override val ctx: Context) : Ui { } } - private fun initOrderTv() = textView { - id = R.id.gameOrder - centerText() - minWidth = dip(24) - minHeight = dip(24) - setTextColor(ContextCompat.getColor(context, R.color.title)) - textSize = 12F - visibility = View.GONE - text = "1" - } - private fun initGameNameTv() = textView { id = R.id.game_name setSingleLine() @@ -314,8 +302,8 @@ class GameItemUi(override val ctx: Context) : Ui { setTextColor(ContextCompat.getColor(context, R.color.text_subtitleDesc)) } - private fun initDownloadProgressBar(): ProgressBar { - return ProgressBar(ctx, null, android.R.attr.progressBarStyleHorizontal).apply { + private fun initDownloadButton(): DownloadButton { + return DownloadButton(ctx, null, android.R.attr.progressBarStyleHorizontal).apply { id = R.id.game_progressbar max = 1000 progress = 500 diff --git a/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt index 5589eb9a8e..3efa71a4d2 100644 --- a/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt @@ -159,7 +159,7 @@ class GameVerticalAdapter( tempViewHolder.gameDownloadPercentage = downloadPercentageTv tempViewHolder.gameDownloadSpeed = downloadSpeedTv tempViewHolder.gameLabelList = gameTagContainer - tempViewHolder.gameProgressbar = downloadProgressBar + tempViewHolder.gameProgressbar = downloadButton tempViewHolder.recommendIv = recommendIv tempViewHolder.recommendTv = recommendTv tempViewHolder.recommendContainer = recommendConstraintLayout