diff --git a/app/src/main/java/com/gamedog/vididin/Constants.kt b/app/src/main/java/com/gamedog/vididin/Constants.kt index a752b7c..1188148 100644 --- a/app/src/main/java/com/gamedog/vididin/Constants.kt +++ b/app/src/main/java/com/gamedog/vididin/Constants.kt @@ -1,6 +1,7 @@ package com.gamedog.vididin object VidiConst { + const val URL_DISCORD: String = "https://www.baidu.com" /** @@ -18,6 +19,8 @@ object VidiConst { */ const val YOUTUBE_API_KEY = "AIzaSyBm9k2lS_j7Fdd43NEPkcfikJRotup5DMY" + const val GOLD_IN_CONFIG: String = "金币" + 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 293fc37..bb62e17 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 @@ -95,23 +95,33 @@ class TasksFragment : AppViewsFragment(), OnTab - beginnerTaskWithdraw.initUI(R.mipmap.icon_cash_s, R.string.beginner_withdraw_title, R.string.beginner_withdraw_desc,R.string.resgatar) - beginnerTaskWithdraw.setRewardIcon(R.mipmap.icon_cash_s) - beginnerTaskWithdraw.setRewardTextStyle(21, R.color.green_39) - beginnerTaskWithdraw.setActionFun { - gotoWithDraw() + with(beginnerTaskWithdraw) { + initUI(R.mipmap.icon_cash_s, R.string.beginner_withdraw_title, R.string.beginner_withdraw_desc,R.string.resgatar) + //setRewardTextStyle(21, R.color.green_39) + setActionFun { + gotoWithDraw() + } + setRewardInfo(TaskManager.instance().getNewbieFirstWithdrawTask()!!) } - beginnerTaskDiscord.initUI(R.mipmap.icon_dicord, R.string.beginner_discord_title, R.string.beginner_discord_desc,R.string.resgatar) - beginnerTaskDiscord.setActionFun { - gotoDiscord() + + with(beginnerTaskDiscord) { + initUI(R.mipmap.icon_dicord, R.string.beginner_discord_title, R.string.beginner_discord_desc,R.string.resgatar) + setActionFun { + gotoDiscord() + } + setRewardInfo(TaskManager.instance().getNewbieJoinDiscordTask()!!) } - beginnerTaskEnableNotify.initUI(R.mipmap.icon_notify, R.string.beginner_notify_title, R.string.beginner_notify_desc,R.string.Resgatado) - beginnerTaskEnableNotify.setActionFun { - gotoNotification() + with(beginnerTaskEnableNotify) { + initUI(R.mipmap.icon_notify, R.string.beginner_notify_title, R.string.beginner_notify_desc,R.string.Resgatado) + beginnerTaskEnableNotify.setActionFun { + gotoNotification() + } + setRewardInfo(TaskManager.instance().getNewbieEnableNotifyTask()!!) } + dailyTaskWatch1.initUI(R.mipmap.icon_video_task, R.string.daily_video_task_title, 1, R.string.resgatar) dailyTaskWatch1.setActionFun { gotoWithVideo() diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/task/widget/BeginnerTaskItemView.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/task/widget/BeginnerTaskItemView.kt index 8e8b016..e705d1f 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/task/widget/BeginnerTaskItemView.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/task/widget/BeginnerTaskItemView.kt @@ -5,7 +5,11 @@ import android.util.AttributeSet import android.view.LayoutInflater import android.widget.LinearLayout import com.ama.core.architecture.util.setOnClickBatch +import com.gamedog.vididin.R +import com.gamedog.vididin.VidiConst import com.gamedog.vididin.databinding.BeginnerTaskItemViewBinding +import com.gamedog.vididin.main.fragments.task.Task +import com.gamedog.vididin.manager.TaskManager class BeginnerTaskItemView @JvmOverloads constructor( @@ -39,12 +43,10 @@ class BeginnerTaskItemView @JvmOverloads constructor( } - fun setRewardNum(rewardNum: String) { - mBinding.tvRewardNum.text = rewardNum - } - - fun setRewardIcon(iconRes: Int) { - mBinding.ivRewardIcon.setImageResource(iconRes) + fun setRewardInfo(taskReward: Task) { + val isRewardGold = VidiConst.GOLD_IN_CONFIG == taskReward.reward_type; + mBinding.ivRewardIcon.setImageResource(if (isRewardGold) R.mipmap.icon_glod_small else R.mipmap.icon_cash_s) + mBinding.tvRewardNum.text = taskReward.reward_value.toString() }