diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt index e038c8e..5501dcb 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt @@ -53,6 +53,7 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity() { titlebar.setTitleText(R.string.sacar) mItemViewList.add(withdraw01) + mItemViewList.add(withdraw1) mItemViewList.add(withdraw10) mItemViewList.add(withdraw20) mItemViewList.add(withdraw50) @@ -64,27 +65,32 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity() { handleGotoWithdraw(itemIndex) }) - withdraw10.setNumAndAction(1, 10.0, + withdraw1.setNumAndAction(1, 1.0, { itemIndex-> handleGotoWithdraw(itemIndex) }) - withdraw20.setNumAndAction(2, 20.0, + withdraw10.setNumAndAction(2, 10.0, { itemIndex-> handleGotoWithdraw(itemIndex) }) - withdraw50.setNumAndAction(3, 50.0, + withdraw20.setNumAndAction(3, 20.0, { itemIndex-> handleGotoWithdraw(itemIndex) }) - withdraw100.setNumAndAction(4, 100.0, + withdraw50.setNumAndAction(4, 50.0, { itemIndex-> handleGotoWithdraw(itemIndex) }) - withdraw300.setNumAndAction(5, 300.0, + withdraw100.setNumAndAction(5, 100.0, + { itemIndex-> + handleGotoWithdraw(itemIndex) + }) + + withdraw300.setNumAndAction(6, 300.0, { itemIndex-> handleGotoWithdraw(itemIndex) }) @@ -115,7 +121,7 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity() { private fun handleGotoWithdraw(itemIndex: Int) { val cashNum = mItemViewList.get(itemIndex).getCashNum() - if (cashNum > 1.0) { + if (cashNum >= 1.0) { WithdrawManager.instance().setItemStarted(itemIndex) gotoWithdrawSubActivity(itemIndex) } else { diff --git a/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt b/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt index 1c644d9..1352514 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt @@ -116,11 +116,12 @@ class WithdrawManager private constructor() { private fun generateItemList(): MutableList { val itemList = mutableListOf() itemList.add(WithdrawItem(0, 0.1, isBigWithDraw = false)) - itemList.add(WithdrawItem(1, 10.0, AndroidUtil.randomInt(50, 70), generateSubItemList(10.0))) - itemList.add(WithdrawItem(2, 20.0, AndroidUtil.randomInt(50, 70), generateSubItemList(20.0))) - itemList.add(WithdrawItem(3, 50.0, AndroidUtil.randomInt(50, 70), generateSubItemList(50.0))) - itemList.add(WithdrawItem(4, 100.0, AndroidUtil.randomInt(50, 70), generateSubItemList(100.0))) - itemList.add(WithdrawItem(5, 300.0, AndroidUtil.randomInt(50, 70), generateSubItemList(300.0))) + itemList.add(WithdrawItem(1, 1.0, AndroidUtil.randomInt(50, 70), generateSubItemList(1.0))) + itemList.add(WithdrawItem(2, 10.0, AndroidUtil.randomInt(50, 70), generateSubItemList(10.0))) + itemList.add(WithdrawItem(3, 20.0, AndroidUtil.randomInt(50, 70), generateSubItemList(20.0))) + itemList.add(WithdrawItem(4, 50.0, AndroidUtil.randomInt(50, 70), generateSubItemList(50.0))) + itemList.add(WithdrawItem(5, 100.0, AndroidUtil.randomInt(50, 70), generateSubItemList(100.0))) + itemList.add(WithdrawItem(6, 300.0, AndroidUtil.randomInt(50, 70), generateSubItemList(300.0))) return itemList } diff --git a/app/src/main/res/layout/activity_withdraw.xml b/app/src/main/res/layout/activity_withdraw.xml index bbf66bf..47076f6 100644 --- a/app/src/main/res/layout/activity_withdraw.xml +++ b/app/src/main/res/layout/activity_withdraw.xml @@ -188,6 +188,12 @@ android:layout_height="wrap_content" /> + +