diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt index 0bccc49..0298069 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt @@ -21,6 +21,7 @@ import com.ama.core.architecture.highlightpro.parameter.HighlightParameter import com.ama.core.architecture.highlightpro.parameter.MarginOffset import com.ama.core.architecture.highlightpro.shape.OvalShape import com.ama.core.architecture.util.AndroidUtil +import com.ama.core.architecture.util.ResUtil import com.ama.core.architecture.util.ResUtil.dp import com.ama.core.architecture.util.SpUtil import com.ama.core.architecture.util.setStatusBarDarkFont @@ -34,6 +35,7 @@ import com.gamedog.vididin.main.fragments.home.HomeFragmentStateAdapter import com.gamedog.vididin.main.fragments.home.fragment.HomeItemFragment import com.gamedog.vididin.main.interfaces.OnSwitchTabListener import com.gamedog.vididin.main.interfaces.OnTabStyleListener +import com.gamedog.vididin.manager.TaskManager import com.gamedog.vididin.router.Router import com.gamedog.vididin.youtubestatistic.RewardConst import com.gamedog.vididin.youtubestatistic.RewardConst.Companion.Check_Interval_MS @@ -95,6 +97,30 @@ class HomeFragment : AppViewsFragment(), OnSwit } )) + for (index in 0..3) { + var textStr = "" + when (index) { + 0 -> { + val boxLeftDays = TaskManager.instance().boxTaskStatus().getLeftValidBoxTotalDurationMs() / (24*3600000) + textStr = "" + boxLeftDays + ResUtil.getString(R.string.day) + } + + 1 -> { + textStr = VidiConst.WATCH_AD_REWARD_GOLD.toString() + } + + 2 -> { + textStr = ResUtil.getString(R.string.game_discord) + } + + 3 -> { + textStr = ResUtil.getString(R.string.zero_buy_tag) + } + } + + popMenu.setMenuText(index, textStr) + } + registerEvents({ data-> when (data?.mEventType) { VididinEvents.Event_HOME_WATCH_Time_TICK -> { 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 e38a399..f98526e 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 @@ -240,11 +240,11 @@ class TasksFragment : AppViewsFragment(), OnTab private fun update4TaskTextInfo() { with(binding!!) { - val boxLeftDays = TaskManager.instance().boxTaskStatus().getLeftValidBoxTotalDurationMs() / 24*3600000 - tvBoxTaskState.text = boxLeftDays.toString() + ResUtil.getString(R.string.day) + val boxLeftDays = TaskManager.instance().boxTaskStatus().getLeftValidBoxTotalDurationMs() / (24*3600000) + tvBoxTaskState.text = "" + boxLeftDays + ResUtil.getString(R.string.day) tvAdWatchRewardNum.text = VidiConst.WATCH_AD_REWARD_GOLD.toString() - tvGameTaskState.text = "xxx" - tvZeroBuyState.text = "xxx" + tvGameTaskState.text = ResUtil.getString(R.string.game_discord) + tvZeroBuyState.text = ResUtil.getString(R.string.zero_buy_tag) } } diff --git a/core/common/src/main/java/com/ama/core/common/widget/PopMenuIconView.kt b/core/common/src/main/java/com/ama/core/common/widget/PopMenuIconView.kt index ac72a4f..dedc21c 100644 --- a/core/common/src/main/java/com/ama/core/common/widget/PopMenuIconView.kt +++ b/core/common/src/main/java/com/ama/core/common/widget/PopMenuIconView.kt @@ -5,7 +5,9 @@ import android.animation.Animator import android.animation.AnimatorSet import android.animation.ValueAnimator import android.content.Context +import android.graphics.Color import android.util.AttributeSet +import android.view.Gravity import android.view.LayoutInflater import android.view.View import android.view.animation.AccelerateInterpolator @@ -13,6 +15,7 @@ import android.view.animation.OvershootInterpolator import android.widget.FrameLayout import android.widget.ImageView import android.widget.LinearLayout +import android.widget.TextView import com.ama.core.common.R import com.ama.core.common.databinding.LayoutPopIconMenuViewBinding import com.ama.core.common.util.dp @@ -29,6 +32,7 @@ class PopMenuIconView @JvmOverloads constructor( val onClick: (View) -> Unit ) + private val mTvViewList = mutableListOf() private val mMenuItemList = mutableListOf() private var isMenuShowing = false private var itemSpacing = 0 @@ -58,23 +62,42 @@ class PopMenuIconView @JvmOverloads constructor( mBinding!!.llMenuContainer.removeAllViews() mMenuItemList.asReversed().forEachIndexed { index, menuItem -> - ImageView(context).apply { - setImageResource(menuItem.iconResId) - - layoutParams = LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT).apply { - bottomMargin = itemSpacing - } - + val subContainer = FrameLayout(context).apply { setOnClickListener { menuItem.onClick(this) //dismissMenu() } - mBinding!!.llMenuContainer.addView(this, 0) + ImageView(context).apply { + setImageResource(menuItem.iconResId) + layoutParams = FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT).apply { + bottomMargin = itemSpacing + } + addView(this) + } + + val textView = TextView(context) + mTvViewList.add(textView) + textView.apply { + setTextSize(10F) + setTextColor(Color.WHITE) + layoutParams = FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT).apply { + bottomMargin = itemSpacing + gravity = Gravity.CENTER_HORIZONTAL + topMargin = 90 + } + addView(this) + } + } + mBinding!!.llMenuContainer.addView(subContainer, 0) } } + fun setMenuText(menuIndex: Int, textContent: String) { + mTvViewList.get(menuIndex).setText(textContent) + } + fun toggleMenu() { if (isMenuShowing) dismissMenu() else showMenu() }