diff --git a/app/src/main/java/com/gamedog/vididin/main/WatchVideoDialog.kt b/app/src/main/java/com/gamedog/vididin/main/WatchVideoDialog.kt index 66b5769..559516f 100644 --- a/app/src/main/java/com/gamedog/vididin/main/WatchVideoDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/main/WatchVideoDialog.kt @@ -4,11 +4,11 @@ import android.content.Context import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog import com.gamedog.vididin.databinding.DialogWatchVideoBinding -import com.gamedog.vididin.main.fragments.task.DailySignBean +import com.gamedog.vididin.main.fragments.task.RewardDetail class WatchVideoDialog(context: Context) : BindingDialog(context, DialogWatchVideoBinding::inflate) { - private lateinit var mDataList: List + private lateinit var mDataList: List init { build() 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 a948b05..b947ecf 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 @@ -55,7 +55,7 @@ class TasksFragment : AppViewsFragment(), OnTab setOnClickBatch(ivGotoDailySign, llTaskBenefit, llTaskWatchVideo, llTaskGame, llTaskZerobuy, tvWatchVideo, tvWithdraw) { when(this) { ivGotoDailySign->{ - DailySignDialog(context).build().show() + DailySignDialog(context).show() } llTaskBenefit->{ diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignBean.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignBean.kt deleted file mode 100644 index db414e5..0000000 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignBean.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.gamedog.vididin.main.fragments.task - -data class DailySignBean( - val dayIndex: Int, - val rewardGold: Int, -) \ No newline at end of file diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt index c9f783f..0bb6255 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt @@ -4,12 +4,19 @@ import android.content.Context import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog import com.gamedog.vididin.databinding.DialogDailySignBinding +import com.gamedog.vididin.manager.TaskManager class DailySignDialog(context: Context) : BindingDialog(context, DialogDailySignBinding::inflate) { - private lateinit var mDataList: List + private var mDataList: List? = emptyList() - fun build(): DailySignDialog { + init { + build() + mDataList = TaskManager.instance().getDailyCheckInTask()?.reward_details + initDailySignItems() + } + + private fun build() { with() setCenter() setCanCancel(false) @@ -29,45 +36,26 @@ class DailySignDialog(context: Context) : BindingDialog( } } } - - initDailySignItems() } - - show() - return this - } - - - - init { - mDataList = listOf( - DailySignBean(1, 100), - DailySignBean(2, 150), - DailySignBean(3, 250), - DailySignBean(4, 300), - DailySignBean(5, 400), - DailySignBean(6, 450), - DailySignBean(7, 700), - ) } private fun initDailySignItems() { - with(mBinding) { - if (mDataList.size >= 7) { - signItem1.setData(mDataList.get(0)) - signItem2.setData(mDataList.get(1)) - signItem3.setData(mDataList.get(2)) - signItem4.setData(mDataList.get(3)) - signItem5.setData(mDataList.get(4)) - signItem6.setData(mDataList.get(5)) - signItem7.setData(mDataList.get(6)) + mDataList?.size?.let { + if (it >= 7) { + signItem1.setData(mDataList!![0]) + signItem2.setData(mDataList!![1]) + signItem3.setData(mDataList!![2]) + signItem4.setData(mDataList!![3]) + signItem5.setData(mDataList!![4]) + signItem6.setData(mDataList!![5]) + signItem7.setData(mDataList!![6]) + } } signItem7.setLargeWidthMode() } - } private fun handleRightButClicked() { diff --git a/app/src/main/java/com/gamedog/vididin/widget/DailySignItemView.kt b/app/src/main/java/com/gamedog/vididin/widget/DailySignItemView.kt index 787a815..16dfa7d 100644 --- a/app/src/main/java/com/gamedog/vididin/widget/DailySignItemView.kt +++ b/app/src/main/java/com/gamedog/vididin/widget/DailySignItemView.kt @@ -7,7 +7,7 @@ import android.view.LayoutInflater import android.widget.LinearLayout import com.gamedog.vididin.R import com.gamedog.vididin.databinding.DailySignItemBinding -import com.gamedog.vididin.main.fragments.task.DailySignBean +import com.gamedog.vididin.main.fragments.task.RewardDetail import kotlin.run class DailySignItemView @JvmOverloads constructor( @@ -16,7 +16,7 @@ class DailySignItemView @JvmOverloads constructor( defStyleAttr: Int = 0 ) : LinearLayout(context, attrs, defStyleAttr) { - private lateinit var mData: DailySignBean + private lateinit var mData: RewardDetail private lateinit var mBinding: DailySignItemBinding @@ -29,10 +29,10 @@ class DailySignItemView @JvmOverloads constructor( - fun setData(data: DailySignBean) { + fun setData(data: RewardDetail) { mData = data - mBinding.tvGoldNum.text = "" + mData.rewardGold - mBinding.tvDayNum.text = context.getString(R.string.day) + " "+ mData.dayIndex + mBinding.tvGoldNum.text = "" + mData.value + mBinding.tvDayNum.text = context.getString(R.string.day) + " "+ mData.day } fun setLargeWidthMode() { diff --git a/app/src/main/res/layout/dialog_daily_sign.xml b/app/src/main/res/layout/dialog_daily_sign.xml index e94d2e9..fd02d7c 100644 --- a/app/src/main/res/layout/dialog_daily_sign.xml +++ b/app/src/main/res/layout/dialog_daily_sign.xml @@ -166,20 +166,21 @@ + android:background="@mipmap/zero_bg_but"/> @@ -206,7 +207,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_gravity="top|right" - android:layout_marginTop="-25dp" + android:layout_marginTop="-20dp" android:layout_marginRight="3dp" android:src="@mipmap/icon_x2"/>