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 0930527..6fa0c59 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 @@ -92,22 +92,25 @@ class BenefitActivity : AppViewsActivity(), OnT private fun initAddSubTaskViews() { val taskStateHelper = TaskManager.instance().boxTaskStatus() - val currentBoxState = taskStateHelper.getStatusBean().tasks[taskStateHelper.getCurrentBoxIndex()] + var subTaskIndex = taskStateHelper.getCurrentBoxIndex() + if (subTaskIndex >= 0) { + val currentBoxState = taskStateHelper.getStatusBean().tasks[subTaskIndex] + currentBoxState.tasks.forEachIndexed { index, subTask -> + val separateLine = View(this@BenefitActivity) + separateLine.setBackgroundResource(R.color.gray_f2) + binding.llSubTaskContainer.addView(separateLine, ViewGroup.LayoutParams.MATCH_PARENT, ResUtil.getPixelSize(R.dimen.dp1)) - currentBoxState.tasks.forEachIndexed { index, subTask -> - val separateLine = View(this@BenefitActivity) - separateLine.setBackgroundResource(R.color.gray_f2) - 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) + binding.llSubTaskContainer.addView(subTaskView, subViewParam) - 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) - binding.llSubTaskContainer.addView(subTaskView, subViewParam) - - mSubTaskViewList.add(subTaskView) + mSubTaskViewList.add(subTaskView) + } } + } private fun handleActionButClicked(taskType: Int) { diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt index 33cce3e..898eab3 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt @@ -74,7 +74,7 @@ class HomeItemFragment : AppViewsEmptyViewModelFragment() { AndroidUtil.openUrl(VidiConst.URL_GAME) }, PopMenuIconView.MenuItem(R.mipmap.home_menu_4) { - Router.Benefit.startActivity(requireActivity()) + Router.ZeroBuy.startActivity(requireActivity()) } )) 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 282f239..dd2f107 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 @@ -136,7 +136,7 @@ class BoxTaskHelper: BaseTaskHelper() { return index } } - return -1 + return 0 } fun getCurrentBoxState(): TaskStateBox? {