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 436bbdd..dac60e1 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 @@ -5,7 +5,9 @@ import android.content.Intent import android.view.LayoutInflater import androidx.activity.viewModels import com.ama.core.architecture.appBase.AppViewsActivity +import com.gamedog.vididin.R import com.gamedog.vididin.main.interfaces.OnTabStyleListener +import com.gamedog.vididin.manager.TaskManager import dagger.hilt.android.AndroidEntryPoint import kotlin.getValue import com.gamedog.vididin.databinding.ActivityBenefitBinding as ViewBinding @@ -26,17 +28,9 @@ class BenefitActivity : AppViewsActivity(), OnT override fun ViewBinding.initViews() { - - taskItem1.setActionFun { - gotoWatchVideo() - } - taskItem2.setActionFun { - gotoWatchVideo() - } - taskItem3.setActionFun { - gotoWatchVideo() - } - + titlebar.setTitleText(R.string.benefit) + loadTaskState() + initAddSubTaskViews() } override fun ViewBinding.initListeners() { @@ -55,6 +49,52 @@ class BenefitActivity : AppViewsActivity(), OnT } + private fun loadTaskState() { + val boxStatusBean = TaskManager.instance().boxTaskStatus() + } + + private fun initAddSubTaskViews() { + val boxStatusBean = TaskManager.instance().boxTaskStatus() + + + /* + + + + + + + + + */ + } private fun gotoWatchVideo() { //TODO("Not yet implemented") diff --git a/app/src/main/java/com/gamedog/vididin/manager/TaskManager.kt b/app/src/main/java/com/gamedog/vididin/manager/TaskManager.kt index 26af8e3..a07342f 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/TaskManager.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/TaskManager.kt @@ -8,7 +8,7 @@ import com.gamedog.vididin.VididinEvents import com.gamedog.vididin.core.login.login.AccountManager import com.gamedog.vididin.main.fragments.task.Task import com.gamedog.vididin.main.fragments.task.TaskBean -import com.gamedog.vididin.manager.helpers.DailyBoxHelper +import com.gamedog.vididin.manager.helpers.BoxTaskHelper import com.gamedog.vididin.manager.helpers.DailySignTaskHelper import com.gamedog.vididin.manager.helpers.DailyWatchAdTaskHelper import com.gamedog.vididin.manager.helpers.DailyWatchVideoTaskHelper @@ -81,7 +81,7 @@ class TaskManager private constructor() { private val mDailySignTaskHelper by lazy { DailySignTaskHelper() } private val mDailyWatchVideoTaskHelper by lazy { DailyWatchVideoTaskHelper() } private val mDailyWatchAdTaskHelper by lazy { DailyWatchAdTaskHelper() } - private val mDailyBoxHelper by lazy { DailyBoxHelper() } + private val mBoxHelper by lazy { BoxTaskHelper() } private val mNewbieJoinDiscordHelper by lazy { NewbieJoinDiscordHelper() } private val mNewbieEnableNotifyHelper by lazy { NewbieEnableNotifyHelper() } private val mNewbieFirstWithdrawHelper by lazy { NewbieFirstWithdrawHelper() } @@ -143,20 +143,21 @@ class TaskManager private constructor() { } private suspend fun initHelpers() { - mDailySignTaskHelper.initDatas(getDailyCheckInTask()!!) - mDailyWatchVideoTaskHelper.initDatas(getDailyVideoTask()!!) - mDailyWatchAdTaskHelper.initDatas(getDailyAdTask()!!) - mDailyBoxHelper.initDatas(getDailyVideoTask()!!) // TODO - get right box task config - mNewbieJoinDiscordHelper.initDatas(getNewbieJoinDiscordTask()!!) - mNewbieEnableNotifyHelper.initDatas(getNewbieEnableNotifyTask()!!) - mNewbieFirstWithdrawHelper.initDatas(getNewbieFirstWithdrawTask()!!) + mDailySignTaskHelper.setConfigDatas(getDailyCheckInTask()!!) + mDailyWatchVideoTaskHelper.setConfigDatas(getDailyVideoTask()!!) + mDailyWatchAdTaskHelper.setConfigDatas(getDailyAdTask()!!) + mNewbieJoinDiscordHelper.setConfigDatas(getNewbieJoinDiscordTask()!!) + mNewbieEnableNotifyHelper.setConfigDatas(getNewbieEnableNotifyTask()!!) + mNewbieFirstWithdrawHelper.setConfigDatas(getNewbieFirstWithdrawTask()!!) + + mBoxHelper.setConfigDatas(getDailyVideoTask()!!) } fun onDateChanged() { mDailySignTaskHelper.onDateChanged() mDailyWatchVideoTaskHelper.onDateChanged() mDailyWatchAdTaskHelper.onDateChanged() - mDailyBoxHelper.onDateChanged() + mBoxHelper.onDateChanged() mNewbieJoinDiscordHelper.onDateChanged() mNewbieEnableNotifyHelper.onDateChanged() mNewbieFirstWithdrawHelper.onDateChanged() @@ -176,8 +177,8 @@ class TaskManager private constructor() { return mDailyWatchAdTaskHelper } - fun dailyBoxStatus(): DailyBoxHelper { - return mDailyBoxHelper + fun boxTaskStatus(): BoxTaskHelper { + return mBoxHelper } fun newbieJoinDiscordStatus(): NewbieJoinDiscordHelper { diff --git a/app/src/main/java/com/gamedog/vididin/manager/helpers/BaseTaskHelper.kt b/app/src/main/java/com/gamedog/vididin/manager/helpers/BaseTaskHelper.kt index 7fb7bf4..f680ae7 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/helpers/BaseTaskHelper.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/helpers/BaseTaskHelper.kt @@ -3,7 +3,6 @@ package com.gamedog.vididin.manager.helpers import com.ama.core.architecture.util.SpUtil import com.ama.core.architecture.util.eventbus.NotifyMan import com.gamedog.vididin.main.fragments.task.Task -import com.gamedog.vididin.manager.taskbeans.BaseTaskState import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext @@ -15,7 +14,7 @@ abstract class BaseTaskHelper { abstract fun loadTaskFromSp() - suspend fun initDatas(taskConfig: Task) { + suspend fun setConfigDatas(taskConfig: Task) { mTaskConfig = taskConfig return withContext(Dispatchers.IO) { 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 new file mode 100644 index 0000000..f0a8447 --- /dev/null +++ b/app/src/main/java/com/gamedog/vididin/manager/helpers/BoxTaskHelper.kt @@ -0,0 +1,25 @@ +package com.gamedog.vididin.manager.helpers + +import com.ama.core.architecture.util.SpUtil +import com.gamedog.vididin.manager.taskbeans.TaskStateBoxRoot + +class BoxTaskHelper: BaseTaskHelper() { + + override val mSpKey = SpUtil.KEY_TASK_BOX + + override fun loadTaskFromSp() { + val taskStateBeanInSp = SpUtil.instance().getObject(mSpKey) + if (taskStateBeanInSp == null) { + //mStateBean = generateStateBeanFromConfig() + //saveState2Sp() + } else { + mStateBean = taskStateBeanInSp + } + } + + private fun generateStateBeanFromConfig(): TaskStateBoxRoot? { + return null + } + + +} \ No newline at end of file diff --git a/app/src/main/java/com/gamedog/vididin/manager/helpers/DailyBoxHelper.kt b/app/src/main/java/com/gamedog/vididin/manager/helpers/DailyBoxHelper.kt deleted file mode 100644 index 7989a43..0000000 --- a/app/src/main/java/com/gamedog/vididin/manager/helpers/DailyBoxHelper.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.gamedog.vididin.manager.helpers - -import com.ama.core.architecture.util.SpUtil -import com.gamedog.vididin.manager.taskbeans.TaskStateBoxRoot - -class DailyBoxHelper: BaseTaskHelper() { - - override val mSpKey = SpUtil.KEY_TASK_BOX - - override fun loadTaskFromSp() { - - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/gamedog/vididin/manager/helpers/DailySignTaskHelper.kt b/app/src/main/java/com/gamedog/vididin/manager/helpers/DailySignTaskHelper.kt index 921b1f2..7970cba 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/helpers/DailySignTaskHelper.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/helpers/DailySignTaskHelper.kt @@ -17,6 +17,7 @@ class DailySignTaskHelper : BaseTaskHelper() { override fun loadTaskFromSp() { val taskStateBeanInSp = SpUtil.instance().getObject(mSpKey) if (taskStateBeanInSp == null) { + mStateBean = TaskDailySignBean() saveState2Sp() } else { mStateBean = taskStateBeanInSp diff --git a/app/src/main/res/layout/activity_benefit.xml b/app/src/main/res/layout/activity_benefit.xml index 6e96fc1..da0c3c7 100644 --- a/app/src/main/res/layout/activity_benefit.xml +++ b/app/src/main/res/layout/activity_benefit.xml @@ -107,17 +107,22 @@ android:layout_height="wrap_content" android:src="@mipmap/benefit_item_expired"/> + android:text="@string/cash" + android:drawableStart="@mipmap/icon_cash_s" + android:drawablePadding="3dp" + android:gravity="center_vertical" + /> - + android:textSize="12sp" + android:textColor="@color/white" + android:drawableStart="@mipmap/icon_check_mark" + android:gravity="center_vertical" + /> + + android:text="@string/cash" + android:drawableStart="@mipmap/icon_cash_s" + android:drawablePadding="3dp" + android:gravity="center_vertical" + /> - + android:orientation="horizontal"> + + + + - - - - - - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/icon_cash_s.webp b/app/src/main/res/mipmap-xxhdpi/icon_cash_s.webp index f789aaa..f0dac12 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_cash_s.webp and b/app/src/main/res/mipmap-xxhdpi/icon_cash_s.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_cash_s_disable.webp b/app/src/main/res/mipmap-xxhdpi/icon_cash_s_disable.webp new file mode 100644 index 0000000..17dfac2 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_cash_s_disable.webp differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7abb536..d8a3962 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -46,7 +46,7 @@ Expirado Concluído Em andamento - Conclua todas as tarefas para retirar R$ 1.0 + Conclua todas as tarefas para retirar Assista a notícias ou vídeos curtos por 800 min Ir para Regras para Ganhar @@ -92,6 +92,7 @@ Falha no saque Done\n + Benefícios \ No newline at end of file