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-23 18:02:25 +08:00
parent 4bd00098f7
commit f54e22697a
14 changed files with 575 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/AndroidManifest.xml
View File

@@ -1016,6 +1016,11 @@
android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name=".earn.activity.BindWithdrawMsgActivity"
android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
android:exported="false"
android:screenOrientation="portrait" />
</application>
</manifest>

3
app/src/main/java/com/yizhuan/erban/association/AssociationViewModel.kt
View File

@@ -6,6 +6,7 @@ import com.yizhuan.xchat_android_core.association.AssociationModel
import com.yizhuan.xchat_android_core.association.HallListInfo
import com.yizhuan.xchat_android_core.association.ClanListInfo
import com.yizhuan.xchat_android_core.bean.response.ListResult
import com.yizhuan.xchat_android_core.utils.toast
class AssociationViewModel : BaseViewModel() {
@@ -23,6 +24,7 @@ class AssociationViewModel : BaseViewModel() {
_clanListLiveData.value = AssociationModel.getClanList()
},
onError = {
it.message.toast()
_clanListLiveData.value = null
}
)
@@ -34,6 +36,7 @@ class AssociationViewModel : BaseViewModel() {
_hallListLiveData.value = AssociationModel.getHallList()
},
onError = {
it.message.toast()
_hallListLiveData.value = null
}
)

42
app/src/main/java/com/yizhuan/erban/earn/EarnRecordViewModel.kt
View File

@@ -30,15 +30,16 @@ class EarnRecordViewModel : BaseViewModel() {
private val _exchangeLiveData = MutableLiveData<String?>()
val exchangeLiveData: MutableLiveData<String?> = _exchangeLiveData
//绑定提现账号
private val _boundLiveData = MutableLiveData<String?>()
val boundLiveData: MutableLiveData<String?> = _boundLiveData
/**
* 收益记录
*/
fun getEarnRecordInfo() {
safeLaunch(
true,
onError = {
_earnRecordLiveData.value = null
},
block = {
_earnRecordLiveData.value = EarnModel.getEarnRecord()
}
@@ -51,9 +52,6 @@ class EarnRecordViewModel : BaseViewModel() {
fun getGoldToDiamondInfo() {
safeLaunch(
true,
onError = {
_goldToDiamondLiveData.value = null
},
block = {
_goldToDiamondLiveData.value = EarnModel.getGoldToDiamond()
}
@@ -105,4 +103,36 @@ class EarnRecordViewModel : BaseViewModel() {
)
}
/**
* 绑定提现账号
*/
fun bound(
uid: Long,
swift: String,
bankName: String,
accountNumber: String,
accountName: String,
address: String,
city: String,
province: String,
postCode: String
) {
safeLaunch(
true,
block = {
_boundLiveData.value = EarnModel.bound(
uid,
swift,
bankName,
accountNumber,
accountName,
address,
city,
province,
postCode
)
}
)
}
}

122
app/src/main/java/com/yizhuan/erban/earn/activity/BindWithdrawMsgActivity.kt Normal file
View File

@@ -0,0 +1,122 @@
package com.yizhuan.erban.earn.activity
import android.content.Context
import android.content.Intent
import android.text.Editable
import android.text.TextWatcher
import androidx.activity.viewModels
import com.netease.nim.uikit.StatusBarUtil
import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseViewBindingActivity
import com.yizhuan.erban.databinding.ActivityBindWithdrawMsgBinding
import com.yizhuan.erban.earn.EarnRecordViewModel
import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.earn.bean.WithdrawAccount
/**
* 绑定提现信息
*/
class BindWithdrawMsgActivity : BaseViewBindingActivity<ActivityBindWithdrawMsgBinding>(),
TextWatcher {
private val earnRecordModel: EarnRecordViewModel by viewModels()
companion object {
const val BEAN = "bean"
@JvmStatic
fun start(context: Context, withdrawAccount: WithdrawAccount) {
val starter = Intent(context, BindWithdrawMsgActivity::class.java)
starter.putExtra(BEAN, withdrawAccount)
context.startActivity(starter)
}
}
override fun init() {
initTitleBar(getString(R.string.bind_withdraw_message))
val bean = intent.getSerializableExtra(BEAN) as? WithdrawAccount
bean?.let {
binding.edSwiftCode.setText(it.swift)
binding.edBankName.setText(it.bankName)
binding.edAccountNumber.setText(it.accountNumber)
binding.edAccountName.setText(it.accountName)
binding.edAddress.setText(it.address)
binding.edCity.setText(it.city)
binding.edProvince.setText(it.province)
binding.edPostCode.setText(it.postCode)
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.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.loadingLiveData.observe(this) { loading ->
if (loading) dialogManager.showProgressDialog(this)
else dialogManager.dismissDialog()
}
earnRecordModel.exchangeLiveData.observe(this) {
toast(getString(R.string.update_success))
finish()
}
}
}
override fun needSteepStateBar() = true
override fun setStatusBar() {
super.setStatusBar()
StatusBarUtil.transparencyBar(this)
StatusBarUtil.StatusBarLightMode(this)
}
override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
}
override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
}
override fun afterTextChanged(p0: Editable?) {
binding.tvSave.isEnabled =
!(binding.edSwiftCode.text.toString().isEmpty() || binding.edBankName.text.toString()
.isEmpty()
|| binding.edAccountNumber.text.toString()
.isEmpty() || binding.edAccountName.text.toString().isEmpty()
|| binding.edAddress.text.toString().isEmpty() || binding.edCity.text.toString()
.isEmpty()
|| binding.edProvince.text.toString()
.isEmpty() || binding.edPostCode.text.toString()
.isEmpty())
}
}

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

@@ -64,6 +64,10 @@ class EarnRecordActivity : BaseViewBindingActivity<ActivityEarnRecordBinding>(),
}
}
}
override fun onResume() {
super.onResume()
earnRecordModel.getEarnRecordInfo()
}
@@ -81,16 +85,13 @@ class EarnRecordActivity : BaseViewBindingActivity<ActivityEarnRecordBinding>(),
ChargeActivity.start(this)
}
R.id.tvDiamondDetail -> {//钻石明细
CommonWebViewActivity.start(
context,
UriProvider.JAVA_WEB_URL + "peko/modules/myincome/index.html#/DiamondLog"
)
CommonWebViewActivity.start(context, UriProvider.getDiamondDetail())
}
R.id.tvGoldDetail -> {//金币明细
CommonWebViewActivity.start(
context,
UriProvider.JAVA_WEB_URL + "peko/modules/myincome/index.html#/DiamondLog"
)
// CommonWebViewActivity.start(
// context,
// UriProvider.JAVA_WEB_URL + "peko/modules/myincome/index.html#/DiamondLog"
// )
}
R.id.tvConvertDiamond -> {//兑换钻石
earnRecordModel.getGoldToDiamondInfo()

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

@@ -14,13 +14,12 @@ import com.yizhuan.erban.databinding.ActivityEarnWithdrawBinding
import com.yizhuan.erban.earn.EarnRecordViewModel
import com.yizhuan.erban.pay.password.GiveGoldPassWordFragment
import com.yizhuan.erban.ui.setting.ModifyPwdActivity
import com.yizhuan.erban.ui.webview.CommonWebViewActivity
import com.yizhuan.erban.ui.widget.dialog.CommonTipDialog
import com.yizhuan.erban.ui.widget.password.PassWordFragment
import com.yizhuan.xchat_android_core.UriProvider
import com.yizhuan.xchat_android_core.earn.bean.ConfigWithdrawInfo
import com.yizhuan.xchat_android_core.pay.PayModel
import com.yizhuan.xchat_android_core.user.UserModel
import com.yizhuan.xchat_android_library.utils.ResUtil
import kotlinx.android.synthetic.main.activity_give_gold_to_user.*
/**
* author: wushaocheng
@@ -95,6 +94,14 @@ class EarnWithdrawActivity : BaseViewBindingActivity<ActivityEarnWithdrawBinding
}
}
binding.csWithdrawAccount.setOnClickListener { view ->
BindWithdrawMsgActivity.start(this, it.account)
}
binding.tvWithdrawRecord.setOnClickListener {
CommonWebViewActivity.start(context, UriProvider.getWithdrawRecord())
}
binding.tvWithdraw.setOnClickListener { view ->
UserModel.get().cacheLoginUserInfo?.let { userInfo ->
if (!userInfo.isBindPaymentPwd) {

8
app/src/main/java/com/yizhuan/erban/pay/GiveGoldModel.kt
View File

@@ -39,10 +39,6 @@ class GiveGoldModel : BaseViewModel() {
fun getSearchUserInfo(erbanNo: Long) {
safeLaunch(
true,
onError = {
it.message.toast()
_searchUserLiveData.value = null
},
block = {
_searchUserLiveData.value = HomeModel.getSearchUser(erbanNo)
}
@@ -52,10 +48,6 @@ class GiveGoldModel : BaseViewModel() {
fun giveGift(toUid: Long, giftId: Int, giftNum: Int) {
safeLaunch(
true,
onError = {
it.message.toast()
_giveGiftLiveData.value = null
},
block = {
_giveGiftLiveData.value = HomeModel.giveGift(toUid, giftId, giftNum)
}

8
app/src/main/res/drawable/shape_f0f5f6_5dp_round.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_F0F5F6" />
<corners android:radius="5dp" />
</shape>

322
app/src/main/res/layout/activity_bind_withdraw_msg.xml Normal file
View File

@@ -0,0 +1,322 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/color_F3F5FA"
tools:context=".earn.activity.BindWithdrawMsgActivity">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_30"
android:background="@color/color_white"
app:layout_constraintTop_toTopOf="parent" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:background="@drawable/shape_white_10dp_round"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tvSwiftCode"
android:text="Swift code/BIC:"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_1F1A4E"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12"
app:layout_constraintTop_toTopOf="@+id/edSwiftCode"
app:layout_constraintBottom_toBottomOf="@+id/edSwiftCode"
app:layout_constraintStart_toStartOf="parent"/>
<EditText
android:id="@+id/edSwiftCode"
android:layout_width="0dp"
android:layout_height="44dp"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_14"
android:background="@drawable/shape_f0f5f6_5dp_round"
android:focusable="true"
android:gravity="center_vertical"
android:textColor="@color/color_1F1A4E"
android:textColorHint="@color/color_ACB8D9"
android:textSize="@dimen/sp_12"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="0dp"
android:layout_marginStart="6dp"
app:layout_constraintStart_toEndOf="@+id/barrier"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvBankName"
android:text="bank name:"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_1F1A4E"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12"
app:layout_constraintTop_toTopOf="@+id/edBankName"
app:layout_constraintBottom_toBottomOf="@+id/edBankName"
app:layout_constraintStart_toStartOf="parent"/>
<EditText
android:id="@+id/edBankName"
android:layout_width="0dp"
android:layout_height="44dp"
android:layout_marginTop="@dimen/dp_14"
android:layout_marginEnd="@dimen/dp_14"
android:background="@drawable/shape_f0f5f6_5dp_round"
android:focusable="true"
android:gravity="center_vertical"
android:textColor="@color/color_1F1A4E"
android:textColorHint="@color/color_ACB8D9"
android:textSize="@dimen/sp_12"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="0dp"
android:layout_marginStart="6dp"
app:layout_constraintStart_toEndOf="@+id/barrier"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/edSwiftCode" />
<TextView
android:id="@+id/tvAccountNumber"
android:text="account number:"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_1F1A4E"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12"
app:layout_constraintTop_toTopOf="@+id/edAccountNumber"
app:layout_constraintBottom_toBottomOf="@+id/edAccountNumber"
app:layout_constraintStart_toStartOf="parent"/>
<EditText
android:id="@+id/edAccountNumber"
android:layout_width="0dp"
android:layout_height="44dp"
android:layout_marginTop="@dimen/dp_14"
android:layout_marginEnd="@dimen/dp_14"
android:background="@drawable/shape_f0f5f6_5dp_round"
android:focusable="true"
android:gravity="center_vertical"
android:textColor="@color/color_1F1A4E"
android:textColorHint="@color/color_ACB8D9"
android:textSize="@dimen/sp_12"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="0dp"
android:layout_marginStart="6dp"
app:layout_constraintStart_toEndOf="@+id/barrier"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/edBankName" />
<TextView
android:id="@+id/tvAccountName"
android:text="account name:"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_1F1A4E"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12"
app:layout_constraintTop_toTopOf="@+id/edAccountName"
app:layout_constraintBottom_toBottomOf="@+id/edAccountName"
app:layout_constraintStart_toStartOf="parent"/>
<EditText
android:id="@+id/edAccountName"
android:layout_width="0dp"
android:layout_height="44dp"
android:layout_marginTop="@dimen/dp_14"
android:layout_marginEnd="@dimen/dp_14"
android:background="@drawable/shape_f0f5f6_5dp_round"
android:focusable="true"
android:gravity="center_vertical"
android:textColor="@color/color_1F1A4E"
android:textColorHint="@color/color_ACB8D9"
android:textSize="@dimen/sp_12"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="0dp"
android:layout_marginStart="6dp"
app:layout_constraintStart_toEndOf="@+id/barrier"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/edAccountNumber" />
<TextView
android:id="@+id/tvAddress"
android:text="address:"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_1F1A4E"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12"
app:layout_constraintTop_toTopOf="@+id/edAddress"
app:layout_constraintBottom_toBottomOf="@+id/edAddress"
app:layout_constraintStart_toStartOf="parent"/>
<EditText
android:id="@+id/edAddress"
android:layout_width="0dp"
android:layout_height="44dp"
android:layout_marginTop="@dimen/dp_14"
android:layout_marginEnd="@dimen/dp_14"
android:background="@drawable/shape_f0f5f6_5dp_round"
android:focusable="true"
android:gravity="center_vertical"
android:textColor="@color/color_1F1A4E"
android:textColorHint="@color/color_ACB8D9"
android:textSize="@dimen/sp_12"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="0dp"
android:layout_marginStart="6dp"
app:layout_constraintStart_toEndOf="@+id/barrier"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/edAccountName" />
<TextView
android:id="@+id/tvCity"
android:text="city:"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_1F1A4E"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12"
app:layout_constraintTop_toTopOf="@+id/edCity"
app:layout_constraintBottom_toBottomOf="@+id/edCity"
app:layout_constraintStart_toStartOf="parent"/>
<EditText
android:id="@+id/edCity"
android:layout_width="0dp"
android:layout_height="44dp"
android:layout_marginTop="@dimen/dp_14"
android:layout_marginEnd="@dimen/dp_14"
android:background="@drawable/shape_f0f5f6_5dp_round"
android:focusable="true"
android:gravity="center_vertical"
android:textColor="@color/color_1F1A4E"
android:textColorHint="@color/color_ACB8D9"
android:textSize="@dimen/sp_12"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="0dp"
android:layout_marginStart="6dp"
app:layout_constraintStart_toEndOf="@+id/barrier"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/edAddress" />
<TextView
android:id="@+id/tvProvince"
android:text="province:"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_1F1A4E"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12"
app:layout_constraintTop_toTopOf="@+id/edProvince"
app:layout_constraintBottom_toBottomOf="@+id/edProvince"
app:layout_constraintStart_toStartOf="parent"/>
<EditText
android:id="@+id/edProvince"
android:layout_width="0dp"
android:layout_height="44dp"
android:layout_marginTop="@dimen/dp_14"
android:layout_marginEnd="@dimen/dp_14"
android:background="@drawable/shape_f0f5f6_5dp_round"
android:focusable="true"
android:gravity="center_vertical"
android:textColor="@color/color_1F1A4E"
android:textColorHint="@color/color_ACB8D9"
android:textSize="@dimen/sp_12"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="0dp"
android:layout_marginStart="6dp"
app:layout_constraintStart_toEndOf="@+id/barrier"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/edCity" />
<TextView
android:id="@+id/tvPostCode"
android:text="post code:"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_1F1A4E"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12"
app:layout_constraintTop_toTopOf="@+id/edPostCode"
app:layout_constraintBottom_toBottomOf="@+id/edPostCode"
app:layout_constraintStart_toStartOf="parent"/>
<EditText
android:id="@+id/edPostCode"
android:layout_width="0dp"
android:layout_height="44dp"
android:layout_marginTop="@dimen/dp_14"
android:layout_marginEnd="@dimen/dp_14"
android:background="@drawable/shape_f0f5f6_5dp_round"
android:focusable="true"
android:gravity="center_vertical"
android:textColor="@color/color_1F1A4E"
android:textColorHint="@color/color_ACB8D9"
android:textSize="@dimen/sp_12"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="0dp"
android:layout_marginStart="6dp"
android:layout_marginBottom="@dimen/dp_20"
app:layout_constraintStart_toEndOf="@+id/barrier"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/edProvince"
app:layout_constraintBottom_toBottomOf="parent"/>
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier"
app:barrierDirection="right"
app:constraint_referenced_ids="tvSwiftCode,tvBankName,tvAccountNumber,tvAccountName,tvAddress,tvCity,tvProvince,tvPostCode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tvSave"
android:layout_width="match_parent"
android:layout_height="46dp"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_50"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/bg_common_confirm"
android:enabled="false"
android:gravity="center"
android:text="@string/save"
android:textColor="@color/color_selector_white_false_b3b3c3"
android:textSize="@dimen/sp_16"
app:layout_constraintTop_toBottomOf="@+id/csConvertDetail" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>

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

@@ -109,6 +109,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvWithdrawRecord"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_14"

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

@@ -4976,9 +4976,10 @@
<string name="number_of_withdrawals_in_remaining_weeks">剩餘周提現次數：%d次</string>
<string name="immediate_cash_withdrawal">立即提現</string>
<string name="select_game">選擇游戲</string>
<string name="exchange_success">兑换成功</string>
<string name="exchange_success">兌換成功</string>
<string name="swift_code">swift code/BIC：%s</string>
<string name="bank_name">bank name：%s</string>
<string name="withdraw_success">提現成功</string>
<string name="bind_withdraw_message">綁定提現信息</string>
</resources>

14
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java
View File

@@ -512,4 +512,18 @@ public class UriProvider {
return JAVA_WEB_URL.concat("/peko/modules/pay/index.html?channelType=" + type + "&deviceId=" + deviceId);
}
/**
* 钻石明细
*/
public static String getDiamondDetail() {
return JAVA_WEB_URL.concat("peko/modules/myincome/index.html#/DiamondLog");
}
/**
* 提现记录
*/
public static String getWithdrawRecord() {
return JAVA_WEB_URL.concat("peko/modules/myincome/index.html#/GoldLog");
}
}

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

@@ -10,4 +10,6 @@ data class GoldToDiamondInfo(
val minDiamonds: Long,
val maxGolds: Long,
val minGolds: Long,
val hasPaymentPwd: Boolean,
val isClan: Boolean
) : Serializable

41
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/model/EarnModel.kt
View File

@@ -45,6 +45,31 @@ object EarnModel : BaseModel() {
api.exchange(goldNum, payPwd)
}
suspend fun bound(
uid: Long,
swift: String,
bankName: String,
accountNumber: String,
accountName: String,
address: String,
city: String,
province: String,
postCode: String
): String? =
launchRequest {
api.bound(
uid,
swift,
bankName,
accountNumber,
accountName,
address,
city,
province,
postCode
)
}
private interface Api {
/**
@@ -84,6 +109,22 @@ object EarnModel : BaseModel() {
@Query("payPwd") payPwd: String
): ServiceResult<String>
/**
* @return
*/
@POST("/withdraw/bound")
suspend fun bound(
@Query("uid") uid: Long,
@Query("swift") swift: String,
@Query("bankName") bankName: String,
@Query("accountNumber") accountNumber: String,
@Query("accountName") accountName: String,
@Query("address") address: String,
@Query("city") city: String,
@Query("province") province: String,
@Query("postCode") postCode: String
): ServiceResult<String>
}
}