diff --git a/app/src/main/java/com/gamedog/vididin/VididinEvents.kt b/app/src/main/java/com/gamedog/vididin/VididinEvents.kt index 1062cb5..7b74c07 100644 --- a/app/src/main/java/com/gamedog/vididin/VididinEvents.kt +++ b/app/src/main/java/com/gamedog/vididin/VididinEvents.kt @@ -21,5 +21,6 @@ object VididinEvents { const val Event_AD_TASK_TYPE_Watch_Ad_Daily = 802 const val Event_AD_TASK_TYPE_Withdraw = 803 const val Event_AD_TASK_TYPE_Complement = 804 + const val Event_AD_TASK_TYPE_BOX_TASK = 805 } \ No newline at end of file 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 b2b6a41..1e0782d 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 @@ -10,14 +10,20 @@ import androidx.activity.viewModels import com.ama.core.architecture.appBase.AppViewsActivity import com.ama.core.architecture.util.ResUtil import com.gamedog.vididin.R +import com.gamedog.vididin.VididinEvents import com.gamedog.vididin.features.benefit.widget.BenefitTaskItemView import com.gamedog.vididin.main.interfaces.OnTabStyleListener import com.gamedog.vididin.manager.TaskManager +import com.gamedog.vididin.manager.TaskManager.Companion.BOX_SUB_TASK_TYPE_AD +import com.gamedog.vididin.manager.TaskManager.Companion.BOX_SUB_TASK_TYPE_VIDEO +import com.gamedog.vididin.manager.TaskManager.Companion.BOX_SUB_TASK_TYPE_SIGN +import com.gamedog.vididin.manager.TaskManager.Companion.BOX_SUB_TASK_TYPE_ZERO_BUY import dagger.hilt.android.AndroidEntryPoint import kotlin.getValue import com.gamedog.vididin.manager.taskbeans.BaseTaskState.Companion.STATE_FINISH import com.gamedog.vididin.manager.taskbeans.BaseTaskState.Companion.STATE_CLAIMED import com.gamedog.vididin.manager.taskbeans.BaseTaskState.Companion.STATE_EXPIRED +import com.gamedog.vididin.router.Router import com.gamedog.vididin.databinding.ActivityBenefitBinding as ViewBinding import com.gamedog.vididin.main.MainUiState as UiState import com.gamedog.vididin.main.MainViewModel as ViewModel @@ -75,6 +81,7 @@ class BenefitActivity : AppViewsActivity(), OnT binding.llSubTaskContainer.addView(separateLine, ViewGroup.LayoutParams.MATCH_PARENT, ResUtil.getPixelSize(R.dimen.dp1)) val subTaskView = BenefitTaskItemView(this@BenefitActivity) + subTaskView.setActionFun { handleActionButClicked(subTask.task_type) } val subViewParam = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) subViewParam.topMargin = ResUtil.getPixelSize(R.dimen.dp10) subViewParam.bottomMargin = ResUtil.getPixelSize(R.dimen.dp10) @@ -84,6 +91,28 @@ class BenefitActivity : AppViewsActivity(), OnT } } + private fun handleActionButClicked(taskType: Int) { + when (taskType) { + BOX_SUB_TASK_TYPE_AD -> { + Router.WatchAd.startActivity(this@BenefitActivity, VididinEvents.Event_AD_TASK_TYPE_BOX_TASK, null) + } + + BOX_SUB_TASK_TYPE_SIGN -> { + // TODO - + } + + BOX_SUB_TASK_TYPE_VIDEO -> { + + } + + BOX_SUB_TASK_TYPE_ZERO_BUY -> { + + } + } + + finish() + } + private fun updateSubTasksUI() { val taskStateHelper = TaskManager.instance().boxTaskStatus() val currentBoxIndex = taskStateHelper.getCurrentBoxIndex() 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 fa62a4f..780a919 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 @@ -119,49 +119,49 @@ class BoxTaskHelper: BaseTaskHelper() { fun getSubTaskHintStrRes(boxIndex: Int, subTaskIndex: Int): Int { when (boxIndex) { 0-> { - when (boxIndex) { + when (subTaskIndex) { 0-> { return R.string.box_subtask_hint_1_1 } 1-> { - return R.string.box_subtask_hint_1_1 + return R.string.box_subtask_hint_1_2 } 2-> { - return R.string.box_subtask_hint_1_1 + return R.string.box_subtask_hint_1_3 } } } 1-> { - when (boxIndex) { + when (subTaskIndex) { 0-> { return R.string.box_subtask_hint_2_1 } 1-> { - return R.string.box_subtask_hint_2_1 + return R.string.box_subtask_hint_2_2 } 2-> { - return R.string.box_subtask_hint_2_1 + return R.string.box_subtask_hint_2_3 } } } 2-> { - when (boxIndex) { + when (subTaskIndex) { 0-> { return R.string.box_subtask_hint_3_1 } 1-> { - return R.string.box_subtask_hint_3_1 + return R.string.box_subtask_hint_3_2 } 2-> { - return R.string.box_subtask_hint_3_1 + return R.string.box_subtask_hint_3_3 } } }