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 b7a4fa9..3a18c0a 100644 --- a/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt +++ b/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt @@ -69,11 +69,14 @@ object AccountManager { return mAccount.rvTimesGold } - fun adjustGold(adjustNum: Long, recordBean: RecordGold): Boolean { + fun adjustGold(adjustNum: Long, recordBean: RecordGold, isEarnByRv: Boolean = false): Boolean { if (adjustNum < 0L && Math.abs(adjustNum) > getGold()) { return false } mAccount.goldCount += adjustNum + if (isEarnByRv) { + mAccount.rvTimesGold++ + } saveAccountInfo() NotifyMan.instance().sendEvent(VididinEvents.Event_Account_Gold_Changed, null) RecordsManager.instance().appendGoldRecord(recordBean) @@ -95,11 +98,14 @@ object AccountManager { } @Synchronized - fun adjustCash(adjustNum: Double, recordBean: RecordCash? = null): Boolean { + fun adjustCash(adjustNum: Double, recordBean: RecordCash? = null, isEarnByRv: Boolean = false): Boolean { if (adjustNum < 0L && Math.abs(adjustNum) > getCash()) { return false } mAccount.cashCount += adjustNum + if (isEarnByRv) { + mAccount.rvTimesCash++ + } saveAccountInfo() NotifyMan.instance().sendEvent(VididinEvents.Event_Account_Cash_Changed, null) recordBean?.let { @@ -159,7 +165,7 @@ object AccountManager { if (getGold() >= costGoldNum) { adjustGold(-1L * costGoldNum.toInt(), RecordGold(RECORD_GOLD_MINUS_CONVERT_2_CASH, -1L * costGoldNum.toInt())) val adjustCashNum = couldCovertCashTotal * 0.1 - adjustCash(adjustCashNum, RecordCash(RECORD_CASH_PLUS_GOLD_CONVERT, adjustCashNum.toDouble())) + adjustCash(adjustCashNum, RecordCash(RECORD_CASH_PLUS_GOLD_CONVERT, adjustCashNum.toDouble()), true) AndroidUtil.showCustomToast(String.format(ResUtil.getString(R.string.has_claim_box_cash_hint), adjustCashNum)) return true } diff --git a/app/src/main/java/com/gamedog/vididin/manager/TaskManager.kt b/app/src/main/java/com/gamedog/vididin/manager/TaskManager.kt index 7c0515c..edffe1a 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/TaskManager.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/TaskManager.kt @@ -116,7 +116,7 @@ class TaskManager private constructor() { VididinEvents.EVENT_AD_WATCHED_FOR_EARN_GOLD -> { val goldNum = VidiConst.WATCH_AD_REWARD_GOLD.toLong() - AccountManager.adjustGold(goldNum, RecordGold(RECORD_GOLD_PLUS_WATCH_REWARD_AD, goldNum)) + AccountManager.adjustGold(goldNum, RecordGold(RECORD_GOLD_PLUS_WATCH_REWARD_AD, goldNum), true) } } } diff --git a/app/src/main/java/com/gamedog/vididin/manager/helpers/DailySignTaskHelper.kt b/app/src/main/java/com/gamedog/vididin/manager/helpers/DailySignTaskHelper.kt index 79a0296..727c66d 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/helpers/DailySignTaskHelper.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/helpers/DailySignTaskHelper.kt @@ -62,7 +62,7 @@ class DailySignTaskHelper : BaseTaskHelper() { daySignState.hasWatchedAd = isByAd saveState2Sp() val goldNum = finalReward.toLong() - AccountManager.adjustGold(goldNum, RecordGold(RECORD_GOLD_PLUS_TASK_SIGN, goldNum)) + AccountManager.adjustGold(goldNum, RecordGold(RECORD_GOLD_PLUS_TASK_SIGN, goldNum), true) notifySignStateChanged(Pair(dayIndex, daySignState)) StatisticUtil.reportEvents(StatisticUtil.KEY_Daily_Sign, mapOf(