bug修复 - 宝箱剩余时间格式化

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<ViewBinding, UiState, ViewModel>(), OnSwit
             var textStr = ""
             when (index) {
                 0 -> {
-                    val boxLeftDays = TaskManager.instance().boxTaskStatus().getLeftValidBoxTotalDurationMs() / (24*3600000)
+                    textStr = TaskManager.instance().boxTaskStatus().getLeftValidBoxTotalDurationStr()
-                    textStr = boxLeftDays.toString() + " " +  ResUtil.getString(R.string.day)
                 }
 
                 1 -> {

app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt

@@ -240,8 +240,7 @@ class TasksFragment : AppViewsFragment<ViewBinding, UiState, ViewModel>(), OnTab
 
     private fun update4TaskTextInfo() {
         with(binding!!) {
-            val boxLeftDays = TaskManager.instance().boxTaskStatus().getLeftValidBoxTotalDurationMs() / (24*3600000)
+            tvBoxTaskState.text = TaskManager.instance().boxTaskStatus().getLeftValidBoxTotalDurationStr()
-            tvBoxTaskState.text = boxLeftDays.toString() + " " +  ResUtil.getString(R.string.day)
             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)

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<TaskStateBoxRoot, BoxTaskRoot>() {
         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
     }

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) {
+        mBinding.progressContainer.setOnClickListener {
-            when (this) {
+            AndroidUtil.showTopToast(R.string.gold_not_ready_hint)
-                mBinding.progressBar -> {
-                    AndroidUtil.showTopToast(R.string.gold_not_ready_hint)
-                }
-            }
         }
     }
 

app/src/main/res/layout/layout_drag_icon_view.xml

@@ -42,17 +42,23 @@
                 />
         </LinearLayout>
 
-        <com.ama.core.architecture.widget.CircleProgressBar
+        <FrameLayout
-            android:id="@+id/progress_bar"
+            android:id="@+id/progress_container"
-            android:layout_width="50dp"
+            android:clickable="true"
-            android:layout_height="50dp"
+            android:layout_width="wrap_content"
-            app:progressColor="@color/progress_green"
+            android:layout_height="wrap_content">
-            app:backgroundColor="@color/progress_background"
+            <com.ama.core.architecture.widget.CircleProgressBar
-            app:progressWidth="2dp"
+                android:id="@+id/progress_bar"
-            app:centerIcon="@mipmap/home_envelope"
+                android:layout_width="50dp"
-            app:currentProgress="0"
+                android:layout_height="50dp"
-            app:maxProgress="100"
+                app:progressColor="@color/progress_green"
-            />
+                app:backgroundColor="@color/progress_background"
+                app:progressWidth="2dp"
+                app:centerIcon="@mipmap/home_envelope"
+                app:currentProgress="0"
+                app:maxProgress="100"
+                />
+        </FrameLayout>
 
     </LinearLayout>
 

app/src/main/res/values/strings.xml

@@ -17,6 +17,7 @@
     <string name="resgatar">Resgatar</string>
     <string name="assistir">Assistir</string>
     <string name="day">Dia</string>
+    <string name="days">Dias</string>
     <string name="progress">Progresso:</string>
     <string name="termina">Termina em</string>
     <string name="watch_video_hint">Parabéns! Você ganhou a recompensa por assistir ao vídeo!</string>
@@ -157,5 +158,7 @@
     <string name="game_discord">Jogo</string>
     <string name="zero_buy_tag">Em Alta</string>
     <string name="gold_not_ready_hint">As recompensas ainda não estão prontas.</string>
+    <string name="day_simple">d</string>
+    <string name="hour_simple">h</string>
 
 </resources>