From 760b61b8ea72d2fe82be0bbcd7179d951500f491 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Fri, 25 Nov 2022 15:08:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=8E=B0=E9=87=91?= =?UTF-8?q?=E5=B8=81=E8=BE=93=E5=85=A5=E9=80=BB=E8=BE=91=EF=BC=8C=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=B8=B8=E6=88=8F=E6=88=BF=E5=BC=95=E5=AF=BC=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../earn/activity/BindWithdrawMsgActivity.kt | 81 ++++++++--------- .../erban/earn/activity/EarnRecordActivity.kt | 4 +- .../earn/activity/EarnWithdrawActivity.kt | 26 +++--- .../erban/home/fragment/RecommendFragment.kt | 2 +- .../res/layout/activity_convert_diamond.xml | 2 +- .../res/layout/activity_earn_withdraw.xml | 88 +++++++++++++------ app/src/main/res/values/colors.xml | 3 +- app/src/main/res/values/strings.xml | 5 +- .../earn/bean/ConfigWithdrawInfo.kt | 2 +- .../earn/bean/EarnRecordInfo.kt | 3 +- .../user/bean/UserInfo.java | 7 ++ 11 files changed, 137 insertions(+), 86 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/earn/activity/BindWithdrawMsgActivity.kt b/app/src/main/java/com/yizhuan/erban/earn/activity/BindWithdrawMsgActivity.kt index 313d2dfb3..f9d73db37 100644 --- a/app/src/main/java/com/yizhuan/erban/earn/activity/BindWithdrawMsgActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/earn/activity/BindWithdrawMsgActivity.kt @@ -26,7 +26,7 @@ class BindWithdrawMsgActivity : BaseViewBindingActivity - val edSwiftCode = binding.edSwiftCode.text.toString() - val edBankName = binding.edBankName.text.toString() - val edAccountNumber = binding.edAccountNumber.text.toString() - val edAccountName = binding.edAccountName.text.toString() - val edAddress = binding.edAddress.text.toString() - val edCity = binding.edCity.text.toString() - val edProvince = binding.edProvince.text.toString() - val edPostCode = binding.edPostCode.text.toString() - earnRecordModel.bound( - AuthModel.get().currentUid, - edSwiftCode, - edBankName, - edAccountNumber, - edAccountName, - edAddress, - edCity, - edProvince, - edPostCode - ) - } + private fun initListener() { + binding.edSwiftCode.addTextChangedListener(this) + binding.edBankName.addTextChangedListener(this) + binding.edAccountNumber.addTextChangedListener(this) + binding.edAccountName.addTextChangedListener(this) + binding.edAddress.addTextChangedListener(this) + binding.edCity.addTextChangedListener(this) + binding.edProvince.addTextChangedListener(this) + binding.edPostCode.addTextChangedListener(this) - earnRecordModel.loadingLiveData.observe(this) { loading -> - if (loading) dialogManager.showProgressDialog(this) - else dialogManager.dismissDialog() - } + binding.tvSave.setOnClickListener { view -> + val edSwiftCode = binding.edSwiftCode.text.toString() + val edBankName = binding.edBankName.text.toString() + val edAccountNumber = binding.edAccountNumber.text.toString() + val edAccountName = binding.edAccountName.text.toString() + val edAddress = binding.edAddress.text.toString() + val edCity = binding.edCity.text.toString() + val edProvince = binding.edProvince.text.toString() + val edPostCode = binding.edPostCode.text.toString() + earnRecordModel.bound( + AuthModel.get().currentUid, + edSwiftCode, + edBankName, + edAccountNumber, + edAccountName, + edAddress, + edCity, + edProvince, + edPostCode + ) + } - earnRecordModel.boundLiveData.observe(this) { - toast(getString(R.string.update_success)) - finish() - } + earnRecordModel.loadingLiveData.observe(this) { loading -> + if (loading) dialogManager.showProgressDialog(this) + else dialogManager.dismissDialog() + } + earnRecordModel.boundLiveData.observe(this) { + toast(getString(R.string.update_success)) + finish() } } diff --git a/app/src/main/java/com/yizhuan/erban/earn/activity/EarnRecordActivity.kt b/app/src/main/java/com/yizhuan/erban/earn/activity/EarnRecordActivity.kt index 3c80818d4..42863d9a6 100644 --- a/app/src/main/java/com/yizhuan/erban/earn/activity/EarnRecordActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/earn/activity/EarnRecordActivity.kt @@ -47,9 +47,11 @@ class EarnRecordActivity : BaseViewBindingActivity(), it?.let { binding.tvDiamondNum.text = it.diamonds.toString() binding.tvGoldNum.text = it.golds.toString() - if (it.isClan) { + if (it.isClanElder) { + binding.tvGoldDetail.visibility = View.VISIBLE binding.tvConvertWithdraw.visibility = View.VISIBLE } else { + binding.tvGoldDetail.visibility = View.GONE binding.tvConvertWithdraw.visibility = View.GONE } } 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 d70508bf3..4412d6ef1 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 @@ -50,15 +50,13 @@ class EarnWithdrawActivity : BaseViewBindingActivity binding.groupBind.visibility = View.VISIBLE binding.tvNoWithdraw.visibility = View.GONE - binding.tvSwift.text = getString(R.string.swift_code, it.account.swift) - binding.tvBankName.text = getString(R.string.bank_name, it.account.bankName) - } else { + binding.tvSwift.text = getString(R.string.swift_code, account.swift) + binding.tvBankName.text = getString(R.string.bank_name, account.bankName) + } ?: run { binding.groupBind.visibility = View.GONE binding.tvNoWithdraw.visibility = View.VISIBLE } @@ -74,7 +72,7 @@ class EarnWithdrawActivity : BaseViewBindingActivity 0 + it.account != null && p0.toString().isNotEmpty() && it.remainTimes > 0 } }) @@ -98,6 +96,10 @@ class EarnWithdrawActivity : BaseViewBindingActivity + binding.edGold.setText(it.golds.toString()) + } + binding.tvWithdraw.setOnClickListener { view -> UserModel.get().cacheLoginUserInfo?.let { userInfo -> if (!userInfo.isBindPaymentPwd) { @@ -122,8 +124,8 @@ class EarnWithdrawActivity : BaseViewBindingActivity() { } val userInfo = UserModel.get().cacheLoginUserInfo - if ((userInfo?.hallId ?: 0L) > 0L) { + if (userInfo?.isHasPermitRoom == true) { binding.ivGameGuide.visibility = View.GONE } else { binding.ivGameGuide.visibility = View.VISIBLE diff --git a/app/src/main/res/layout/activity_convert_diamond.xml b/app/src/main/res/layout/activity_convert_diamond.xml index 174fce227..4f38972a7 100644 --- a/app/src/main/res/layout/activity_convert_diamond.xml +++ b/app/src/main/res/layout/activity_convert_diamond.xml @@ -168,7 +168,7 @@ android:id="@+id/tvConvert" android:text="@string/confirm_exchange" android:textSize="16sp" - android:textColor="@color/white" + android:textColor="@color/color_selector_white_false_b3b3c3" android:layout_width="match_parent" android:layout_height="46dp" android:gravity="center" diff --git a/app/src/main/res/layout/activity_earn_withdraw.xml b/app/src/main/res/layout/activity_earn_withdraw.xml index 0014b1f67..8d7c6c9a4 100644 --- a/app/src/main/res/layout/activity_earn_withdraw.xml +++ b/app/src/main/res/layout/activity_earn_withdraw.xml @@ -47,8 +47,8 @@ android:textColor="@color/color_white" android:textSize="@dimen/sp_14" android:textStyle="bold" - app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toTopOf="@+id/tvBankName" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvSwift" /> + android:visibility="gone" + app:constraint_referenced_ids="tvSwift,tvBankName" /> - - - + + + app:layout_constraintTop_toTopOf="parent" /> + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ed58ff0c5..10327c373 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -633,8 +633,9 @@ #572714 #582815 #ECC36A - #ACB8D9 + #ADB9D9 #CBB788 #F4F0FE + #ACB8D9 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 787d8b986..a6c9cfe9d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4973,7 +4973,7 @@ 我的鉆石:%s 確定兌換 未綁定提現賬戶 - 剩餘周提現次數：%d次 + 剩餘周提現次數： 立即提現 選擇游戲 兌換成功 @@ -4990,5 +4990,8 @@ 所屬房間 已兌換金幣 可結算金幣 + 請輸入提現金幣 + 全部 + 次 \ No newline at end of file diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ConfigWithdrawInfo.kt b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ConfigWithdrawInfo.kt index 8c3f76e78..f9cf471d1 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ConfigWithdrawInfo.kt +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ConfigWithdrawInfo.kt @@ -3,7 +3,7 @@ package com.yizhuan.xchat_android_core.earn.bean import java.io.Serializable data class ConfigWithdrawInfo( - val account: WithdrawAccount, + val account: WithdrawAccount? = null, val golds: Double,//钱包当前金币数 val remainTimes: Int,//周剩余次数 val fee: Double,//手续费 diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/EarnRecordInfo.kt b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/EarnRecordInfo.kt index e7f918151..ba8546f8d 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/EarnRecordInfo.kt +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/EarnRecordInfo.kt @@ -5,5 +5,6 @@ data class EarnRecordInfo( val diamonds: Double, val crystals: Double, val golds: Double, - val isClan: Boolean + val isClan: Boolean, + val isClanElder: Boolean ) \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java index 0f45ab7d4..01285f3d1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java @@ -284,6 +284,13 @@ public class UserInfo implements Serializable { @Setter private boolean banAccount; + /** + * "用户自己的房间是否牌照房" + */ + @Getter + @Setter + private boolean hasPermitRoom; + public UserInfo() { }