diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt index 072c823f9..c67eca820 100644 --- a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt @@ -827,8 +827,8 @@ open class BaseRoomFragment?> : KeyBoardUtils.hideKeyBoard(activity, inputEdit) SelectPayTypeDialog.newInstance( money.toString(), - false, - money.toDouble() + money, + false ).apply { setOnDiamondChargeClick { headlineViewModel.sendHeadline(message) diff --git a/app/src/main/java/com/chwl/app/vip/dialog/SelectPayTypeDialog.kt b/app/src/main/java/com/chwl/app/vip/dialog/SelectPayTypeDialog.kt index c1f73568c..d63c3ebbd 100644 --- a/app/src/main/java/com/chwl/app/vip/dialog/SelectPayTypeDialog.kt +++ b/app/src/main/java/com/chwl/app/vip/dialog/SelectPayTypeDialog.kt @@ -27,7 +27,7 @@ import com.chwl.library.utils.SingleToastUtil class SelectPayTypeDialog : BaseDialog() { private val descText by lazy { requireArguments().getString("descText", "") } - private val money by lazy { requireArguments().getDouble("money", 0.0) } + private val coins by lazy { requireArguments().getLong("coins", 0) } private val showGoogleCharge by lazy { requireArguments().getBoolean( "showGoogleCharge", @@ -44,17 +44,33 @@ class SelectPayTypeDialog : BaseDialog() { private var walletInfo: WalletInfo? = null companion object { + /** + * @param money 真实货币(目前比例1:1000) + */ @JvmStatic fun newInstance( descText: String, showGoogleCharge: Boolean = false, money: Double = 0.0 + ): SelectPayTypeDialog { + return newInstance(descText, (money * 1000).toLong(), showGoogleCharge) + } + + + /** + * @param coins 虚拟货币:金币 + */ + @JvmStatic + fun newInstance( + descText: String, + coins: Long, + showGoogleCharge: Boolean = false, ): SelectPayTypeDialog { return SelectPayTypeDialog().apply { arguments = Bundle().apply { putString("descText", descText) putBoolean("showGoogleCharge", showGoogleCharge) - putDouble("money", money) + putLong("coins", coins) } } } @@ -117,7 +133,7 @@ class SelectPayTypeDialog : BaseDialog() { binding?.rbGoogle?.visibility = View.VISIBLE binding?.rg?.setOnCheckedChangeListener { _, _ -> if (binding?.rbDiamond?.isChecked == true) { - binding?.tvDiamondNum?.text = (money * 1000).toInt().toString() + binding?.tvDiamondNum?.text = coins.toString() binding?.tvDiamond?.visibility = View.VISIBLE } else { binding?.tvDiamondNum?.text = descText @@ -151,12 +167,13 @@ class SelectPayTypeDialog : BaseDialog() { ) ) .build() - val defaultDiamond = money != 0.0 && money * 1000 <= walletInfo.diamondNum + var defaultDiamond = coins <= walletInfo.diamondNum if (showGoogleCharge) { binding?.rbGoogle?.visibility = View.VISIBLE binding?.rbGoogle?.isChecked = !defaultDiamond } else { binding?.rbGoogle?.visibility = View.GONE + defaultDiamond = true } binding?.rbDiamond?.isChecked = defaultDiamond } diff --git a/app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/headline/HeadlineSendDialog.kt b/app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/headline/HeadlineSendDialog.kt index 3d8da8548..af7c39508 100644 --- a/app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/headline/HeadlineSendDialog.kt +++ b/app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/headline/HeadlineSendDialog.kt @@ -71,8 +71,8 @@ class HeadlineSendDialog : BaseDialog() { private fun showPayDialog(money: Long) { SelectPayTypeDialog.newInstance( money.toString(), - false, - money.toDouble() + money, + false ).apply { setOnDiamondChargeClick { val message = getInputContent()