renhaoting
/
VidiDin-Android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: renhaoting:93f1cf9921fd9bcb115953bc224252942b8a0ba1
Branches Tags
renhaoting:main
renhaoting:develop_withdraw17_debug
renhaoting:develop_withdraw17
renhaoting:develop_notify
renhaoting:develop_bill
renhaoting:develop_request
renhaoting:develop
..
compare: renhaoting:b374519bb94e26db3054dc22a8070e20d0d73cb5
Branches Tags
renhaoting:develop_withdraw17_debug
renhaoting:develop_withdraw17
renhaoting:develop_notify
renhaoting:develop_bill
renhaoting:develop_request
renhaoting:develop
renhaoting:main

No commits in common. "93f1cf9921fd9bcb115953bc224252942b8a0ba1" and "b374519bb94e26db3054dc22a8070e20d0d73cb5" have entirely different histories.
93f1cf9921 ... b374519bb9

3 changed files with 8 additions and 20 deletions
Show Stats Expand all files Collapse all files

1
app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt
View File

@ -13,6 +13,7 @@ import com.ama.core.architecture.highlightpro.parameter.MarginOffset
import com.ama.core.architecture.highlightpro.shape.RectShape
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.setOnClickBatch
import com.gamedog.statisticreporter.StatisticUtil
import com.gamedog.vididin.VidiConst

17
app/src/main/java/com/gamedog/vididin/features/withdraw/dialogs/WithdrawBindBankDialog.kt
View File

@ -13,9 +13,6 @@ import com.gamedog.statisticreporter.StatisticUtil
import com.viddin.videos.free.R
import com.gamedog.vididin.core.login.login.AccountManager
import com.gamedog.vididin.features.withdraw.BankUtil
import com.gamedog.vididin.manager.WithdrawManager
import com.gamedog.vididin.manager.WithdrawManager.Companion.STATE_COULD_WITHDRAW
import com.gamedog.vididin.manager.WithdrawManager.Companion.STATE_NEED_WATCH_AD
import com.viddin.videos.free.databinding.DialogWithdrawBindingBankBinding as ViewBinding
@ -45,17 +42,13 @@ class WithdrawBindBankDialog(activity: Activity, private val onConfirmedWithdraw
tvConfirm -> {
saveBankAccount(mBinding.tvCpfEdit.text.toString().trim())
if (onConfirmedWithdraw != null) {
if (mWithdrawCashNum == 0.1 && WithdrawManager.instance().getItemState(0, 0) == STATE_NEED_WATCH_AD) {
WithdrawWatchAdDialog(mActivity, mWithdrawCashNum, onConfirmedWithdraw).show()
val dialogBuilder = WithdrawInfoConfirmDialog(mActivity, onConfirmedWithdraw!!)
if (mWithdrawCashNum > 0F) {
dialogBuilder.setWithDrawCashNum(mWithdrawCashNum)
} else {
val dialogBuilder = WithdrawInfoConfirmDialog(mActivity, onConfirmedWithdraw)
if (mWithdrawCashNum > 0F) {
dialogBuilder.setWithDrawCashNum(mWithdrawCashNum)
} else {
dialogBuilder.setWithDrawCashNumStr(mWithdrawCashNumStr)
}
dialogBuilder.show()
dialogBuilder.setWithDrawCashNumStr(mWithdrawCashNumStr)
}
dialogBuilder.show()
}
dismiss()

10
app/src/main/java/com/gamedog/vididin/features/withdraw/widget/WithDrawItemView.kt
View File

@ -5,7 +5,6 @@ import android.util.AttributeSet
import android.view.LayoutInflater
import android.widget.LinearLayout
import com.ama.core.architecture.util.ResUtil
import com.ama.core.architecture.util.setOnClickBatch
import com.gamedog.vididin.manager.WithdrawManager
import com.gamedog.vididin.manager.WithdrawManager.Companion.STATE_WITHDRAWING
import com.viddin.videos.free.R
@ -35,13 +34,8 @@ class WithDrawItemView @JvmOverloads constructor(
mCashNum = cashNum
mBinding.tvWithdrawNum.text = ResUtil.getString(R.string.cash) + " " +
if (cashNum.toString().endsWith(".0")) cashNum.toString().substring(0, cashNum.toString().indexOf(".0")) else cashNum.toString()
setOnClickBatch(mBinding.tvSacar) {
when (this) {
mBinding.tvSacar-> {
clickAction.invoke(mItemIndex)
}
}
mBinding.tvSacar.setOnClickListener {
clickAction.invoke(mItemIndex)
}
updateProgressAndButUI()