diff --git a/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt b/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt index b8154eb..5e44712 100644 --- a/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt @@ -103,6 +103,7 @@ class BenefitActivity : AppViewsActivity(), OnT private fun updateUI() { updateSubTasksUI() updateTopBoxesUI() + binding.counterdownTv.restartTimer() } private fun initAddSubTaskViews() { diff --git a/app/src/main/java/com/gamedog/vididin/features/benefit/widget/CounterDownTimerView.kt b/app/src/main/java/com/gamedog/vididin/features/benefit/widget/CounterDownTimerView.kt index de0d659..c0712f3 100644 --- a/app/src/main/java/com/gamedog/vididin/features/benefit/widget/CounterDownTimerView.kt +++ b/app/src/main/java/com/gamedog/vididin/features/benefit/widget/CounterDownTimerView.kt @@ -47,6 +47,13 @@ class CounterDownTimerView @JvmOverloads constructor( }.start() } + fun restartTimer() { + if (mTimer != null) { + mTimer.cancel() + } + startTimer() + } + override fun onDetachedFromWindow() { super.onDetachedFromWindow() if (mTimer != null) { 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 a536327..d013196 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 @@ -100,6 +100,28 @@ class HomeFragment : AppViewsFragment(), OnSwit } )) + updatePopMenuTexts() + + registerEvents({ data-> + when (data?.mEventType) { + VididinEvents.Event_HOME_WATCH_Time_TICK -> { + handleWatchTimeTick() + } + + VididinEvents.Event_Finish_One_Video -> { + handleEventOneVideoWatched() + } + + VididinEvents.EVENT_BOX_TASK_STATE_CHANGED -> { + updatePopMenuTexts() + } + } + + }, VididinEvents.Event_HOME_WATCH_Time_TICK, VididinEvents.Event_Finish_One_Video, VididinEvents.EVENT_BOX_TASK_STATE_CHANGED) + + } + + private fun updatePopMenuTexts() { for (index in 0..3) { var textStr = "" when (index) { @@ -120,22 +142,8 @@ class HomeFragment : AppViewsFragment(), OnSwit } } - popMenu.setMenuText(index, textStr) + binding?.popMenu?.setMenuText(index, textStr) } - - registerEvents({ data-> - when (data?.mEventType) { - VididinEvents.Event_HOME_WATCH_Time_TICK -> { - handleWatchTimeTick() - } - - VididinEvents.Event_Finish_One_Video -> { - handleEventOneVideoWatched() - } - } - - }, VididinEvents.Event_HOME_WATCH_Time_TICK, VididinEvents.Event_Finish_One_Video) - } 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 e171b8a..44c5dab 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 @@ -306,14 +306,18 @@ class TasksFragment : AppViewsFragment(), OnTab updateNewBieFirstWithdrawUI() } + VididinEvents.EVENT_BOX_TASK_STATE_CHANGED -> { + update4TaskTextInfo() + } } }, VididinEvents.Event_Sign_State_Changed, VididinEvents.Event_Account_Cash_Changed, VididinEvents.Event_Account_Gold_Changed, VididinEvents.EVENT_DAILY_WATCHED_VIDEO_NUM_CHANGED, VididinEvents.EVENT_DAILY_WATCHED_AD_NUM_CHANGED, VididinEvents.EVENT_JUMP_2_FIRST_WITHDRAW, VididinEvents.EVENT_NEWBIE_DISCORD_TASK_CHANGED, VididinEvents.EVENT_NEWBIE_NOTIFY_TASK_CHANGED, - VididinEvents.EVENT_NEWBIE_FIRST_WITHDRAW_TASK_CHANGED) + VididinEvents.EVENT_NEWBIE_FIRST_WITHDRAW_TASK_CHANGED, VididinEvents.EVENT_BOX_TASK_STATE_CHANGED) } + private fun scroll2FirstWithdraw() { binding?.newbieContainer?.let { binding?.scrollView?.scroll2ChildView(it) } } diff --git a/app/src/main/res/layout/activity_benefit.xml b/app/src/main/res/layout/activity_benefit.xml index 865f82f..16b8ab4 100644 --- a/app/src/main/res/layout/activity_benefit.xml +++ b/app/src/main/res/layout/activity_benefit.xml @@ -61,6 +61,7 @@