diff --git a/app/src/main/java/com/gamedog/vididin/VidiConst.kt b/app/src/main/java/com/gamedog/vididin/VidiConst.kt index 7e3709c..8b7874c 100644 --- a/app/src/main/java/com/gamedog/vididin/VidiConst.kt +++ b/app/src/main/java/com/gamedog/vididin/VidiConst.kt @@ -52,7 +52,7 @@ object VidiConst { const val GOLD_IN_CONFIG: String = "金币" - const val PER_CASH_COST_GOLD_NUM = 1000 + const val PER_01CASH_COST_GOLD_NUM = 100 const val WATCH_AD_REWARD_GOLD = 200 const val ZEROBUY_SECRET: String = "1f04c57a" diff --git a/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt b/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt index 81e5277..bb48320 100644 --- a/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt +++ b/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt @@ -111,13 +111,13 @@ object AccountManager { @Synchronized fun convertGold2Cash(): Boolean { try { - val couldCovertCashTotal = mAccount?.goldCount?.div(VidiConst.PER_CASH_COST_GOLD_NUM) ?: 0L + val couldCovertCashTotal = mAccount?.goldCount?.div(VidiConst.PER_01CASH_COST_GOLD_NUM) ?: 0 if (couldCovertCashTotal > 0) { - val costGoldNum = couldCovertCashTotal * VidiConst.PER_CASH_COST_GOLD_NUM + val costGoldNum = couldCovertCashTotal * VidiConst.PER_01CASH_COST_GOLD_NUM mAccount?.goldCount?.let { if (it > costGoldNum) { addGold(-1 * costGoldNum.toInt()) - adjustAccountCash(couldCovertCashTotal.toFloat()) + adjustAccountCash(couldCovertCashTotal * 0.1F) AndroidUtil.showToast("Has convert $costGoldNum gold to $couldCovertCashTotal cash.") return true } diff --git a/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt b/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt index 1f093fa..438c421 100644 --- a/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt @@ -1,6 +1,7 @@ package com.gamedog.vididin.main import android.app.Activity +import com.ama.core.architecture.util.SpUtil import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog import com.gamedog.vididin.core.login.login.AccountManager @@ -27,8 +28,11 @@ class BeginnerGiftDialog(activity: Activity) : BindingDialog(), OnTab } if (needShowZerobuyGuide() < 5) { - binding?.llTaskGame?.postDelayed({ + llTaskGame.postDelayed({ + ivAdIndi.isVisible = false showGuide1() }, 5) } @@ -458,7 +460,7 @@ class TasksFragment : AppViewsFragment(), OnTab .setHighlightParameter { HighlightParameter.Builder() .setHighlightView(binding!!.goldContainer, { - val temp = 111 + delayConvertGold2Cash() }) .setTipsViewId(R.layout.guide_step_gold) .setHighlightShape(RectShape(10.dp, 10.dp, 10.dp)) @@ -484,6 +486,7 @@ class TasksFragment : AppViewsFragment(), OnTab } .setOnDismissCallback { + binding?.ivAdIndi?.isVisible = true gotoWithDraw() } .interceptBackPressed(true) @@ -492,6 +495,12 @@ class TasksFragment : AppViewsFragment(), OnTab } + private fun delayConvertGold2Cash() { + binding?.tvCashTotal?.postDelayed({ + AccountManager.convertGold2Cash() + }, 200) + } + private fun showGuide2() { HighlightPro.with(this@TasksFragment) .setHighlightParameter { diff --git a/app/src/main/res/layout/vididinapp_feature_message_fragment_message.xml b/app/src/main/res/layout/vididinapp_feature_message_fragment_message.xml index 4a1d1ef..61cae59 100644 --- a/app/src/main/res/layout/vididinapp_feature_message_fragment_message.xml +++ b/app/src/main/res/layout/vididinapp_feature_message_fragment_message.xml @@ -82,20 +82,36 @@ - + android:layout_marginStart="8dp" + android:layout_marginTop="12dp"> + + + + + diff --git a/core/architecture/src/main/java/com/ama/core/architecture/highlightpro/HighlightProImpl.kt b/core/architecture/src/main/java/com/ama/core/architecture/highlightpro/HighlightProImpl.kt index 11ef751..83176dc 100644 --- a/core/architecture/src/main/java/com/ama/core/architecture/highlightpro/HighlightProImpl.kt +++ b/core/architecture/src/main/java/com/ama/core/architecture/highlightpro/HighlightProImpl.kt @@ -79,9 +79,11 @@ internal class HighlightProImpl : HighlightViewInteractiveAction { maskContainer.setOnTouchListener { v, event -> when (event?.action) { MotionEvent.ACTION_DOWN -> { - val highlightRect: RectF? = maskContainer.highLightViewParameters[0].rect + val curParam = maskContainer.highLightViewParameters[0] + val highlightRect: RectF? = curParam.rect highlightRect?.let { if (it.contains(event.x, event.y)) { + curParam.onHighViewClicked?.invoke() showNextHighLightView() } } diff --git a/core/architecture/src/main/java/com/ama/core/architecture/highlightpro/parameter/HighlightParameter.kt b/core/architecture/src/main/java/com/ama/core/architecture/highlightpro/parameter/HighlightParameter.kt index 20c2cf6..aa195f2 100644 --- a/core/architecture/src/main/java/com/ama/core/architecture/highlightpro/parameter/HighlightParameter.kt +++ b/core/architecture/src/main/java/com/ama/core/architecture/highlightpro/parameter/HighlightParameter.kt @@ -11,6 +11,7 @@ class HighlightParameter { internal var highLightViewId: Int = -1 internal var highLightView: View? = null + internal var onHighViewClicked: (()->Unit)? = null internal var tipsViewId: Int = -1 @@ -64,9 +65,7 @@ class HighlightParameter { */ fun setHighlightView(highLightView: View, onHighViewClicked: ()->Unit): Builder { highlightParameter.highLightView = highLightView - highlightParameter.highLightView?.setOnClickListener { - onHighViewClicked.invoke() - } + highlightParameter.onHighViewClicked = onHighViewClicked return this } diff --git a/core/architecture/src/main/java/com/ama/core/architecture/util/SpUtil.kt b/core/architecture/src/main/java/com/ama/core/architecture/util/SpUtil.kt index 68d8435..172ba29 100644 --- a/core/architecture/src/main/java/com/ama/core/architecture/util/SpUtil.kt +++ b/core/architecture/src/main/java/com/ama/core/architecture/util/SpUtil.kt @@ -39,6 +39,7 @@ class SpUtil private constructor(spFileName: String) { const val KEY_WITHDRAW_ITEM_LIST = "KEY_WITHDRAW_ITEM_LIST" + const val KEY_GUIDE_HAS_GOT_NEWBIE_GOLD = "KEY_GUIDE_HAS_GOT_NEWBIE_GOLD" const val KEY_GUIDE_HAS_SHOW = "KEY_GUIDE_STATE" // 1,2,3,4,5 5 stands for finish