diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt index 03a783d..3da2013 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt @@ -24,7 +24,6 @@ import com.ama.core.architecture.util.AndroidUtil import com.ama.core.architecture.util.ResUtil import com.ama.core.architecture.util.ResUtil.dp import com.ama.core.architecture.util.SpUtil -import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.util.setStatusBarDarkFont import com.ama.core.common.util.asSafe import com.ama.core.common.widget.PopMenuIconView @@ -102,8 +101,7 @@ class HomeFragment : AppViewsFragment(), OnSwit var textStr = "" when (index) { 0 -> { - val boxLeftDays = TaskManager.instance().boxTaskStatus().getLeftValidBoxTotalDurationMs() / (24*3600000) - textStr = boxLeftDays.toString() + " " + ResUtil.getString(R.string.day) + textStr = TaskManager.instance().boxTaskStatus().getLeftValidBoxTotalDurationStr() } 1 -> { diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt index e99d8f9..56e7c44 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt @@ -240,8 +240,7 @@ class TasksFragment : AppViewsFragment(), OnTab private fun update4TaskTextInfo() { with(binding!!) { - val boxLeftDays = TaskManager.instance().boxTaskStatus().getLeftValidBoxTotalDurationMs() / (24*3600000) - tvBoxTaskState.text = boxLeftDays.toString() + " " + ResUtil.getString(R.string.day) + tvBoxTaskState.text = TaskManager.instance().boxTaskStatus().getLeftValidBoxTotalDurationStr() tvAdWatchRewardNum.text = VidiConst.WATCH_AD_REWARD_GOLD.toString() tvGameTaskState.text = ResUtil.getString(R.string.game_discord) tvZeroBuyState.text = ResUtil.getString(R.string.zero_buy_tag) diff --git a/app/src/main/java/com/gamedog/vididin/manager/helpers/BoxTaskHelper.kt b/app/src/main/java/com/gamedog/vididin/manager/helpers/BoxTaskHelper.kt index 5747da5..a1f5b8c 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/helpers/BoxTaskHelper.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/helpers/BoxTaskHelper.kt @@ -1,12 +1,14 @@ package com.gamedog.vididin.manager.helpers import com.ama.core.architecture.util.DateUtil +import com.ama.core.architecture.util.ResUtil import com.ama.core.architecture.util.SpUtil import com.ama.core.architecture.util.eventbus.NotifyMan import com.vididin.real.money.game.R import com.gamedog.vididin.VididinEvents import com.gamedog.vididin.core.login.login.AccountManager import com.gamedog.vididin.main.fragments.task.BoxTaskRoot +import com.gamedog.vididin.manager.TaskManager import com.gamedog.vididin.manager.TaskManager.Companion.BOX_SUB_TASK_TYPE_ZERO_BUY import com.gamedog.vididin.manager.TaskManager.Companion.BOX_SUB_TASK_TYPE_SIGN import com.gamedog.vididin.manager.TaskManager.Companion.BOX_SUB_TASK_TYPE_AD @@ -179,6 +181,13 @@ class BoxTaskHelper: BaseTaskHelper() { return totalLeftMs } + fun getLeftValidBoxTotalDurationStr(): String { + val leftMs = TaskManager.instance().boxTaskStatus().getLeftValidBoxTotalDurationMs() + val boxLeftDays = leftMs / (24*3600000) + val boxLeftHours = (leftMs - boxLeftDays * 24 * 3600000) / 3600000 + return boxLeftDays.toString() + ResUtil.getString(R.string.day_simple) + " " + boxLeftHours.toString( ) + ResUtil.getString(R.string.hour_simple) + } + fun getCurrentBoxStartTimeMs(): Long { return mStateBean.boxList[mStateBean.currentBoxIndex].boxStartMs } diff --git a/app/src/main/java/com/gamedog/vididin/widget/HomeDragIconView.kt b/app/src/main/java/com/gamedog/vididin/widget/HomeDragIconView.kt index 16bc60e..d002bc5 100644 --- a/app/src/main/java/com/gamedog/vididin/widget/HomeDragIconView.kt +++ b/app/src/main/java/com/gamedog/vididin/widget/HomeDragIconView.kt @@ -10,7 +10,6 @@ import android.view.LayoutInflater import android.widget.LinearLayout import androidx.core.view.isVisible import com.ama.core.architecture.util.AndroidUtil -import com.ama.core.architecture.util.setOnClickBatch import com.vididin.real.money.game.R import com.vididin.real.money.game.databinding.LayoutDragIconViewBinding @@ -25,12 +24,8 @@ class HomeDragIconView @JvmOverloads constructor( init { mBinding = LayoutDragIconViewBinding.inflate(LayoutInflater.from(context), this, true) - setOnClickBatch(mBinding.progressBar) { - when (this) { - mBinding.progressBar -> { - AndroidUtil.showTopToast(R.string.gold_not_ready_hint) - } - } + mBinding.progressContainer.setOnClickListener { + AndroidUtil.showTopToast(R.string.gold_not_ready_hint) } } diff --git a/app/src/main/res/layout/layout_drag_icon_view.xml b/app/src/main/res/layout/layout_drag_icon_view.xml index d0485e3..29e0601 100644 --- a/app/src/main/res/layout/layout_drag_icon_view.xml +++ b/app/src/main/res/layout/layout_drag_icon_view.xml @@ -42,17 +42,23 @@ /> - + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 62fce8d..ec5eb6d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,6 +17,7 @@ Resgatar Assistir Dia + Dias Progresso: Termina em Parabéns! Você ganhou a recompensa por assistir ao vídeo! @@ -157,5 +158,7 @@ Jogo Em Alta As recompensas ainda não estão prontas. + d + h \ No newline at end of file