diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 25ce6dd2a..449929dc6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1021,6 +1021,11 @@ android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection" android:exported="false" android:screenOrientation="portrait" /> + \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/earn/EarnRecordViewModel.kt b/app/src/main/java/com/yizhuan/erban/earn/EarnRecordViewModel.kt index 15030de86..c6b01affa 100644 --- a/app/src/main/java/com/yizhuan/erban/earn/EarnRecordViewModel.kt +++ b/app/src/main/java/com/yizhuan/erban/earn/EarnRecordViewModel.kt @@ -27,8 +27,8 @@ class EarnRecordViewModel : BaseViewModel() { val getConfigWithdrawLiveData: MutableLiveData = _getConfigWithdrawLiveData //提现 - private val _exchangeLiveData = MutableLiveData() - val exchangeLiveData: MutableLiveData = _exchangeLiveData + private val _exchangeLiveData = MutableLiveData() + val exchangeLiveData: MutableLiveData = _exchangeLiveData //绑定提现账号 private val _boundLiveData = MutableLiveData() @@ -93,10 +93,6 @@ class EarnRecordViewModel : BaseViewModel() { fun exchange(goldNum: Long, payPwd: String) { safeLaunch( true, - onError = { - it.message.toast() - _exchangeLiveData.value = null - }, block = { _exchangeLiveData.value = EarnModel.exchange(goldNum, payPwd) } diff --git a/app/src/main/java/com/yizhuan/erban/earn/activity/EarnWithdrawActivity.kt b/app/src/main/java/com/yizhuan/erban/earn/activity/EarnWithdrawActivity.kt index dde5a8a5c..d70508bf3 100644 --- a/app/src/main/java/com/yizhuan/erban/earn/activity/EarnWithdrawActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/earn/activity/EarnWithdrawActivity.kt @@ -85,13 +85,9 @@ class EarnWithdrawActivity : BaseViewBindingActivity - exchange?.let { - passWordFragment?.dismissAllowingStateLoss() - toast(getString(R.string.withdraw_success)) - finish() - } ?: run { - passWordFragment?.dismissAllowingStateLoss() - } + passWordFragment?.dismissAllowingStateLoss() + toast(getString(R.string.withdraw_success)) + finish() } binding.csWithdrawAccount.setOnClickListener { view -> @@ -120,7 +116,7 @@ class EarnWithdrawActivity : BaseViewBindingActivity it.maxGolds) { toast("提現不能超過${it.maxGolds}金幣") } else { @@ -155,7 +151,7 @@ class EarnWithdrawActivity : BaseViewBindingActivity() { + + override fun init() { + initTitleBar(getString(R.string.gold_detail)) + } + + override fun needSteepStateBar() = true + + override fun setStatusBar() { + super.setStatusBar() + StatusBarUtil.transparencyBar(this) + StatusBarUtil.StatusBarLightMode(this) + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/bg_gold_detail.webp b/app/src/main/res/drawable-xhdpi/bg_gold_detail.webp new file mode 100644 index 000000000..431e31ff4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_gold_detail.webp differ diff --git a/app/src/main/res/drawable-xhdpi/ic_gold_detail_date_left.webp b/app/src/main/res/drawable-xhdpi/ic_gold_detail_date_left.webp new file mode 100644 index 000000000..cc0dc08f1 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_gold_detail_date_left.webp differ diff --git a/app/src/main/res/drawable-xhdpi/ic_gold_detail_date_right.webp b/app/src/main/res/drawable-xhdpi/ic_gold_detail_date_right.webp new file mode 100644 index 000000000..cb5ec51c4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_gold_detail_date_right.webp differ diff --git a/app/src/main/res/layout/activity_gold_detail.xml b/app/src/main/res/layout/activity_gold_detail.xml new file mode 100644 index 000000000..f75484be3 --- /dev/null +++ b/app/src/main/res/layout/activity_gold_detail.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 88eacefa2..ed58ff0c5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -635,5 +635,6 @@ #ECC36A #ACB8D9 #CBB788 + #F4F0FE diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2fa7926bd..787d8b986 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4984,5 +4984,11 @@ 兌換金幣獲得鉆石 消耗金幣 %s金幣 + 金幣明細 + 成員總結算金幣 + 成員 + 所屬房間 + 已兌換金幣 + 可結算金幣 \ No newline at end of file diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/model/EarnModel.kt b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/model/EarnModel.kt index 626d90783..e8fef7cc6 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/model/EarnModel.kt +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/model/EarnModel.kt @@ -40,7 +40,7 @@ object EarnModel : BaseModel() { api.getConfigWithdrawInfo() } - suspend fun exchange(goldNum: Long, payPwd: String): String? = + suspend fun exchange(goldNum: Long, payPwd: String): Any? = launchRequest { api.exchange(goldNum, payPwd) } @@ -107,7 +107,7 @@ object EarnModel : BaseModel() { suspend fun exchange( @Query("goldNum") goldNum: Long, @Query("payPwd") payPwd: String - ): ServiceResult + ): ServiceResult /** * @return