Fix bug - 第二个宝箱开启后,倒计时没有重置
This commit is contained in:
parent
2028831590
commit
28eed14ab4
|
|
@ -103,6 +103,7 @@ class BenefitActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnT
|
||||||
private fun updateUI() {
|
private fun updateUI() {
|
||||||
updateSubTasksUI()
|
updateSubTasksUI()
|
||||||
updateTopBoxesUI()
|
updateTopBoxesUI()
|
||||||
|
binding.counterdownTv.restartTimer()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun initAddSubTaskViews() {
|
private fun initAddSubTaskViews() {
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,13 @@ class CounterDownTimerView @JvmOverloads constructor(
|
||||||
}.start()
|
}.start()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun restartTimer() {
|
||||||
|
if (mTimer != null) {
|
||||||
|
mTimer.cancel()
|
||||||
|
}
|
||||||
|
startTimer()
|
||||||
|
}
|
||||||
|
|
||||||
override fun onDetachedFromWindow() {
|
override fun onDetachedFromWindow() {
|
||||||
super.onDetachedFromWindow()
|
super.onDetachedFromWindow()
|
||||||
if (mTimer != null) {
|
if (mTimer != null) {
|
||||||
|
|
|
||||||
|
|
@ -100,6 +100,28 @@ class HomeFragment : AppViewsFragment<ViewBinding, UiState, ViewModel>(), 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) {
|
for (index in 0..3) {
|
||||||
var textStr = ""
|
var textStr = ""
|
||||||
when (index) {
|
when (index) {
|
||||||
|
|
@ -120,22 +142,8 @@ class HomeFragment : AppViewsFragment<ViewBinding, UiState, ViewModel>(), 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)
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -306,14 +306,18 @@ class TasksFragment : AppViewsFragment<ViewBinding, UiState, ViewModel>(), OnTab
|
||||||
updateNewBieFirstWithdrawUI()
|
updateNewBieFirstWithdrawUI()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
VididinEvents.EVENT_BOX_TASK_STATE_CHANGED -> {
|
||||||
|
update4TaskTextInfo()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}, VididinEvents.Event_Sign_State_Changed, VididinEvents.Event_Account_Cash_Changed,
|
}, VididinEvents.Event_Sign_State_Changed, VididinEvents.Event_Account_Cash_Changed,
|
||||||
VididinEvents.Event_Account_Gold_Changed, VididinEvents.EVENT_DAILY_WATCHED_VIDEO_NUM_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_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_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() {
|
private fun scroll2FirstWithdraw() {
|
||||||
binding?.newbieContainer?.let { binding?.scrollView?.scroll2ChildView(it) }
|
binding?.newbieContainer?.let { binding?.scrollView?.scroll2ChildView(it) }
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -61,6 +61,7 @@
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
||||||
<com.gamedog.vididin.features.benefit.widget.CounterDownTimerView
|
<com.gamedog.vididin.features.benefit.widget.CounterDownTimerView
|
||||||
|
android:id="@+id/counterdownTv"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="10dp"
|
android:layout_marginTop="10dp"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue