moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改提现金币输入逻辑，首页游戏房引导图标显示

Browse Source
This commit is contained in:
wushaocheng
2022-11-25 15:08:28 +08:00
parent 8029921c2b
commit 760b61b8ea
11 changed files with 137 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
app/src/main/java/com/yizhuan/erban/earn/activity/BindWithdrawMsgActivity.kt
View File

@@ -26,7 +26,7 @@ class BindWithdrawMsgActivity : BaseViewBindingActivity<ActivityBindWithdrawMsgB
const val BEAN = "bean"
@JvmStatic
fun start(context: Context, withdrawAccount: WithdrawAccount) {
fun start(context: Context, withdrawAccount: WithdrawAccount?) {
val starter = Intent(context, BindWithdrawMsgActivity::class.java)
starter.putExtra(BEAN, withdrawAccount)
context.startActivity(starter)
@@ -35,18 +35,9 @@ class BindWithdrawMsgActivity : BaseViewBindingActivity<ActivityBindWithdrawMsgB
override fun init() {
initTitleBar(getString(R.string.bind_withdraw_message))
initListener()
val bean = intent.getSerializableExtra(BEAN) as? WithdrawAccount
bean?.let {
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)
binding.edSwiftCode.setText(it.swift)
binding.edBankName.setText(it.bankName)
binding.edAccountNumber.setText(it.accountNumber)
@@ -55,39 +46,49 @@ class BindWithdrawMsgActivity : BaseViewBindingActivity<ActivityBindWithdrawMsgB
binding.edCity.setText(it.city)
binding.edProvince.setText(it.province)
binding.edPostCode.setText(it.postCode)
}
}
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
)
}
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()
}
}

4
app/src/main/java/com/yizhuan/erban/earn/activity/EarnRecordActivity.kt
View File

@@ -47,9 +47,11 @@ class EarnRecordActivity : BaseViewBindingActivity<ActivityEarnRecordBinding>(),
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
}
}

26
app/src/main/java/com/yizhuan/erban/earn/activity/EarnWithdrawActivity.kt
View File

@@ -50,15 +50,13 @@ class EarnWithdrawActivity : BaseViewBindingActivity<ActivityEarnWithdrawBinding
val bean = intent.getSerializableExtra(BEAN) as? ConfigWithdrawInfo
bean?.let {
binding.tvMyGold.text = getString(R.string.my_gold, it.golds.toString())
binding.edGold.hint = it.minGolds.toString()
binding.tvWithdrawNum.text =
getString(R.string.number_of_withdrawals_in_remaining_weeks, it.remainTimes)
if (it.account.uid != 0L) {
binding.tvWithdrawNum.text = it.remainTimes.toString()
it.account?.let { account ->
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<ActivityEarnWithdrawBinding
override fun afterTextChanged(p0: Editable?) {
binding.tvWithdraw.isEnabled =
it.account.uid != 0L && p0.toString().isNotEmpty() && it.remainTimes > 0
it.account != null && p0.toString().isNotEmpty() && it.remainTimes > 0
}
})
@@ -98,6 +96,10 @@ class EarnWithdrawActivity : BaseViewBindingActivity<ActivityEarnWithdrawBinding
CommonWebViewActivity.start(context, UriProvider.getWithdrawRecord())
}
binding.tvAll.setOnClickListener { view ->
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<ActivityEarnWithdrawBinding
} else {
GiveGoldPassWordFragment.newInstance(
supportFragmentManager,
"1000",
"哈哈",
"",
"",
""
)
.apply {
@@ -151,7 +153,9 @@ class EarnWithdrawActivity : BaseViewBindingActivity<ActivityEarnWithdrawBinding
override fun onTextChanged(psw: String?) {
val password = passWordFragment?.password?.password ?: ""
if (password.length == 6) {
earnRecordModel.exchange(binding.edGold.text.toString().toLong(), DESAndBase64(password))
earnRecordModel.exchange(
binding.edGold.text.toString().toLong(), DESAndBase64(password)
)
}
}

2
app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.kt
View File

@@ -64,7 +64,7 @@ class RecommendFragment : BaseViewBindingFragment<FragmentRecommendBinding>() {
}
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

2
app/src/main/res/layout/activity_convert_diamond.xml
View File

@@ -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"

88
app/src/main/res/layout/activity_earn_withdraw.xml
View File

@@ -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" />
<TextView
@@ -60,16 +60,16 @@
android:textColor="@color/color_white"
android:textSize="@dimen/sp_14"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvSwift"/>
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvSwift" />
<androidx.constraintlayout.widget.Group
android:id="@+id/groupBind"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="tvSwift,tvBankName"/>
android:visibility="gone"
app:constraint_referenced_ids="tvSwift,tvBankName" />
<ImageView
android:layout_width="wrap_content"
@@ -132,57 +132,89 @@
android:background="@drawable/bg_gradient_dce6fd_d8e3fe_r8"
app:layout_constraintTop_toBottomOf="@+id/tvMyGold">
<View
android:id="@+id/viewGold"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="@dimen/dp_10"
android:background="@drawable/bg_ffffff_r360"
<ImageView
android:id="@+id/ivGoldIcon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="@dimen/dp_16"
android:src="@drawable/ic_gold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_gold"
app:layout_constraintBottom_toBottomOf="@+id/viewGold"
app:layout_constraintEnd_toEndOf="@+id/viewGold"
app:layout_constraintStart_toStartOf="@+id/viewGold"
app:layout_constraintTop_toTopOf="@+id/viewGold" />
<EditText
android:id="@+id/edGold"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_12"
android:background="@null"
android:digits="1234567890"
android:digits="1234567890."
android:focusable="true"
android:gravity="center_vertical|end"
android:hint="1000"
android:gravity="center_vertical"
android:hint="@string/please_input_withdraw_gold"
android:inputType="number"
android:textColor="@color/color_1F1A4E"
android:textColorHint="@color/color_ACB8D9"
android:textColorHint="@color/color_ADB9D9"
android:textSize="@dimen/sp_16"
app:layout_constraintEnd_toStartOf="@+id/tvAll"
app:layout_constraintStart_toEndOf="@+id/ivGoldIcon" />
<TextView
android:id="@+id/tvAll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_16"
android:text="@string/all"
android:textColor="@color/color_9168FA"
android:textSize="@dimen/sp_16"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/viewGold" />
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tvWithdrawNum"
android:id="@+id/tvWithdrawMsg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_14"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_28"
android:layout_marginBottom="@dimen/dp_20"
android:includeFontPadding="false"
android:text="@string/number_of_withdrawals_in_remaining_weeks"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_13"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/csMyGold" />
<TextView
android:id="@+id/tvWithdrawNum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginBottom="@dimen/dp_20"
android:includeFontPadding="false"
android:textColor="@color/color_9168FA"
android:textSize="@dimen/sp_13"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/tvWithdrawMsg"
app:layout_constraintTop_toBottomOf="@+id/csMyGold"
tools:text="0" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginBottom="@dimen/dp_20"
android:includeFontPadding="false"
android:text="@string/time"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_13"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/tvWithdrawNum"
app:layout_constraintTop_toBottomOf="@+id/csMyGold" />
</androidx.constraintlayout.widget.ConstraintLayout>

3
app/src/main/res/values/colors.xml
View File

@@ -633,8 +633,9 @@
<color name="color_572714">#572714</color>
<color name="color_582815">#582815</color>
<color name="color_ECC36A">#ECC36A</color>
<color name="color_ACB8D9">#ACB8D9</color>
<color name="color_ADB9D9">#ADB9D9</color>
<color name="color_CBB788">#CBB788</color>
<color name="color_F4F0FE">#F4F0FE</color>
<color name="color_ACB8D9">#ACB8D9</color>
</resources>

5
app/src/main/res/values/strings.xml
View File

@@ -4973,7 +4973,7 @@
<string name="my_diamond">我的鉆石:%s</string>
<string name="confirm_exchange">確定兌換</string>
<string name="no_withdrawal_account_is_attached">未綁定提現賬戶</string>
<string name="number_of_withdrawals_in_remaining_weeks">剩餘周提現次數：%d次</string>
<string name="number_of_withdrawals_in_remaining_weeks">剩餘周提現次數：</string>
<string name="immediate_cash_withdrawal">立即提現</string>
<string name="select_game">選擇游戲</string>
<string name="exchange_success">兌換成功</string>
@@ -4990,5 +4990,8 @@
<string name="belong_room">所屬房間</string>
<string name="have_exchange_gold">已兌換金幣</string>
<string name="settleable_gold_coin">可結算金幣</string>
<string name="please_input_withdraw_gold">請輸入提現金幣</string>
<string name="all">全部</string>
<string name="time">次</string>
</resources>

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ConfigWithdrawInfo.kt
View File

@@ -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,//手续费

3
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/EarnRecordInfo.kt
View File

@@ -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
)

7
core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java
View File

@@ -284,6 +284,13 @@ public class UserInfo implements Serializable {
@Setter
private boolean banAccount;
/**
* "用户自己的房间是否牌照房"
*/
@Getter
@Setter
private boolean hasPermitRoom;
public UserInfo() {
}