银行卡提现的逻辑

cpt_ewallet/src/main/AndroidManifest.xml

@@ -6,6 +6,10 @@
 
         <activity android:name=".ui.EWalletHistoryActivity"/>
 
+        <activity android:name=".ui.EWalletWithdrawActivity"/>
+
+        <activity android:name=".ui.BankWithdrawActivity"/>
+
     </application>
 
 </manifest>

cpt_ewallet/src/main/java/com/hongyegroup/cpt_ewallet/mvvm/BankWithdrawViewModel.kt

@@ -0,0 +1,17 @@
+package com.hongyegroup.cpt_ewallet.mvvm
+
+import androidx.lifecycle.SavedStateHandle
+import com.guadou.lib_baselib.base.vm.BaseViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import javax.inject.Inject
+
+
+@HiltViewModel
+class BankWithdrawViewModel @Inject constructor(
+    private val savedStateHandle: SavedStateHandle
+) : BaseViewModel() {
+
+    var mWithdrawMoney = MutableStateFlow("")
+
+}

cpt_ewallet/src/main/java/com/hongyegroup/cpt_ewallet/mvvm/EWalletWithdrawViewModel.kt

@@ -0,0 +1,18 @@
+package com.hongyegroup.cpt_ewallet.mvvm
+
+import androidx.lifecycle.SavedStateHandle
+import com.guadou.lib_baselib.base.vm.BaseViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import javax.inject.Inject
+
+
+@HiltViewModel
+class EWalletWithdrawViewModel @Inject constructor(
+    private val savedStateHandle: SavedStateHandle
+) : BaseViewModel() {
+
+    var mAllMoney = MutableStateFlow("")
+    var mWithdrawMoney = MutableStateFlow("")
+
+}

cpt_ewallet/src/main/java/com/hongyegroup/cpt_ewallet/ui/BankWithdrawActivity.kt

@@ -0,0 +1,59 @@
+package com.hongyegroup.cpt_ewallet.ui
+
+import android.content.Intent
+import android.os.Bundle
+import com.guadou.cs_cptservices.base.activity.YYBaseVDBActivity
+import com.guadou.lib_baselib.bean.DataBindingConfig
+import com.guadou.lib_baselib.engine.toast
+import com.guadou.lib_baselib.ext.commContext
+import com.guadou.lib_baselib.ext.gotoActivity
+import com.guadou.lib_baselib.utils.KeyboardUtils
+import com.hongyegroup.cpt_ewallet.BR
+import com.hongyegroup.cpt_ewallet.R
+import com.hongyegroup.cpt_ewallet.databinding.ActivityBankWithdrawBinding
+import com.hongyegroup.cpt_ewallet.mvvm.BankWithdrawViewModel
+
+/**
+ * 银行卡提现页面，输入银行卡信息
+ */
+class BankWithdrawActivity : YYBaseVDBActivity<BankWithdrawViewModel, ActivityBankWithdrawBinding>() {
+
+    var withDrawMoney: String? = null
+
+    companion object {
+        fun startInstance(withdrawMoney: String) {
+            commContext().gotoActivity<BankWithdrawActivity>(bundle = arrayOf(Pair("money", withdrawMoney)))
+        }
+    }
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+        return DataBindingConfig(R.layout.activity_bank_withdraw, BR.viewModel, mViewModel)
+            .addBindingParams(BR.click, ClickProxy())
+    }
+
+    override fun getDataFromIntent(intent: Intent) {
+        withDrawMoney = intent.getStringExtra("money")
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+        setStatusBarBlackText()
+        mViewModel.mWithdrawMoney.value = withDrawMoney ?: ""
+    }
+
+    override fun startObserve() {
+
+    }
+
+    /**
+     * DataBinding事件处理
+     */
+    inner class ClickProxy {
+
+        fun submitForm() {
+            KeyboardUtils.hideSoftInput(mActivity)
+
+            toast("调用接口提交提现申请")
+        }
+
+    }
+}

cpt_ewallet/src/main/java/com/hongyegroup/cpt_ewallet/ui/EWalletMainFragment.kt

@@ -112,7 +112,7 @@ class EWalletMainFragment : YYBaseVDBFragment<EWalletMainViewModel, FragmentEwal
 
         //去提现页面
         fun gotoWithdrawalPage() {
-            toast("去提现页面")
+            EWalletWithdrawActivity.startInstance()
         }
 
         //去提现预约页面

cpt_ewallet/src/main/java/com/hongyegroup/cpt_ewallet/ui/EWalletWithdrawActivity.kt

@@ -0,0 +1,125 @@
+package com.hongyegroup.cpt_ewallet.ui
+
+import android.os.Bundle
+import com.guadou.cs_cptservices.base.activity.YYBaseVDBActivity
+import com.guadou.lib_baselib.bean.DataBindingConfig
+import com.guadou.lib_baselib.ext.checkNumberPoint
+import com.guadou.lib_baselib.ext.commContext
+import com.guadou.lib_baselib.ext.gotoActivity
+import com.guadou.lib_baselib.utils.CommUtils
+import com.guadou.lib_baselib.utils.KeyboardUtils
+import com.hongyegroup.cpt_ewallet.BR
+import com.hongyegroup.cpt_ewallet.R
+import com.hongyegroup.cpt_ewallet.databinding.ActivityEwalletWithdrawBinding
+import com.hongyegroup.cpt_ewallet.mvvm.EWalletWithdrawViewModel
+import com.hongyegroup.cpt_ewallet.widget.WithdrawDisclaimersPopup
+import com.lxj.xpopup.XPopup
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * 申请提现的页面
+ */
+class EWalletWithdrawActivity : YYBaseVDBActivity<EWalletWithdrawViewModel, ActivityEwalletWithdrawBinding>() {
+
+    private var allMoney = "92400"   //全部的金额
+
+    companion object {
+        fun startInstance() {
+            commContext().gotoActivity<EWalletWithdrawActivity>()
+        }
+    }
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+        return DataBindingConfig(R.layout.activity_ewallet_withdraw, BR.viewModel, mViewModel)
+            .addBindingParams(BR.click, ClickProxy())
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+        setStatusBarBlackText()
+
+        mViewModel.mAllMoney.value = allMoney
+
+    }
+
+    override fun startObserve() {
+
+    }
+
+    /**
+     * DataBinding事件处理
+     */
+    inner class ClickProxy {
+
+        val withdrawMethod = MutableStateFlow(0)
+        var isSelectAll = MutableStateFlow(false)
+
+        //金额的监听回调
+        val onMoneyChanged: (String) -> Unit = { str ->
+            var s1 = str
+            if (!isSelectAll.value) {
+                if (s1.startsWith(".")) s1 = "0$s1"
+                //如果输入的值大于全部金额，那么就选全部金额
+                if (s1.checkNumberPoint() &&
+                    mViewModel.mAllMoney.value.checkNumberPoint() &&
+                    s1.toDouble() > mViewModel.mAllMoney.value.toDouble()
+                ) {
+                    s1 = mViewModel.mAllMoney.value
+                    //如果大于全部金额，那么ET也要展示最大金额，ET内容不能超过最大金额
+                    CommUtils.getHandler().removeCallbacksAndMessages(null)
+                    CommUtils.getHandler().postDelayed({
+                        mBinding.etWithdrawalValue.setText(s1)
+                        mBinding.etWithdrawalValue.setSelection(s1.length)
+                    }, 1000)
+                }
+            } else {
+                //已经勾选了All,并且值与AllValue不同,说明改值了，需要设置为非全选
+                if (str != mViewModel.mAllMoney.value) {
+                    isSelectAll.value = false
+                }
+            }
+        }
+
+        //选中银行卡提现
+        fun chooseGrioMethod() {
+            withdrawMethod.value = 1
+        }
+
+        fun selectCheckBox() {
+            if (isSelectAll.value) {
+                isSelectAll.value = false
+            } else {
+                isSelectAll.value = true
+                mViewModel.mWithdrawMoney.value = mViewModel.mAllMoney.value
+                CommUtils.getHandler().postDelayed({
+                    mBinding.etWithdrawalValue.setSelection(mViewModel.mAllMoney.value.length)
+                }, 50)
+            }
+        }
+
+        //提交提现申请
+        fun submitWithdraw() {
+            KeyboardUtils.hideSoftkeyboard(mActivity)
+
+            showDisclaimersDialog()
+        }
+
+        //提现的免责条例对话框
+        private fun showDisclaimersDialog() {
+            XPopup.Builder(mActivity)
+                .moveUpToKeyboard(false)
+                .hasShadowBg(true)
+                .dismissOnBackPressed(false)
+                .dismissOnTouchOutside(false)
+                .asCustom(WithdrawDisclaimersPopup(mActivity) {
+                    gotoBankWithdrawPage()
+                })
+                .show()
+        }
+
+        //跳转到银行卡的信息填写页面
+        private fun gotoBankWithdrawPage() {
+            BankWithdrawActivity.startInstance(mViewModel.mWithdrawMoney.value)
+        }
+
+    }
+}

cpt_ewallet/src/main/java/com/hongyegroup/cpt_ewallet/widget/WithdrawDisclaimersPopup.kt

@@ -0,0 +1,49 @@
+package com.hongyegroup.cpt_ewallet.widget
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.view.View
+import com.guadou.lib_baselib.ext.click
+import com.hongyegroup.cpt_ewallet.R
+import com.lxj.xpopup.core.CenterPopupView
+import com.lxj.xpopup.util.XPopupUtils
+
+/**
+ * 提现的免责声明弹窗
+ */
+@SuppressLint("ViewConstructor")
+class WithdrawDisclaimersPopup(
+    context: Context,
+    private val action: (() -> Unit)? = null,
+) : CenterPopupView(context) {
+
+    override fun getImplLayoutId(): Int = R.layout.popup_withdraw_disclanimers
+
+    override fun onCreate() {
+        super.onCreate()
+
+        findViewById<View>(R.id.btn_yes).click {
+            dismiss()
+            action?.invoke()
+        }
+
+        findViewById<View>(R.id.btn_no).click {
+            dismiss()
+        }
+
+        findViewById<View>(R.id.iv_delete).click {
+            dismiss()
+        }
+
+    }
+
+    //如果不设置可能出现xml的背景圆角无法正常显示
+    override fun getMaxWidth(): Int {
+        return if (popupInfo.maxWidth == 0) (XPopupUtils.getWindowWidth(context) * 0.99f).toInt() else popupInfo.maxWidth
+    }
+
+//    override fun getMaxHeight(): Int {
+//        return dp2px(500f)
+//    }
+
+}

cpt_ewallet/src/main/res/layout/activity_bank_withdraw.xml

@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:binding="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="RtlHardcoded">
+
+    <data>
+
+        <variable
+            name="viewModel"
+            type="com.hongyegroup.cpt_ewallet.mvvm.BankWithdrawViewModel" />
+
+        <variable
+            name="click"
+            type="com.hongyegroup.cpt_ewallet.ui.BankWithdrawActivity.ClickProxy" />
+
+        <import type="android.text.TextUtils" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical">
+
+        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
+            android:id="@+id/easy_title_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:Easy_title="银行卡提现" />
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true"
+            android:scrollbars="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <!--提现金额-->
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d_30dp"
+                    android:layout_marginTop="@dimen/dp_10"
+                    android:paddingTop="@dimen/dp_10"
+                    android:paddingBottom="@dimen/d_10dp"
+                    android:text="提现金额"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/d_15sp" />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d_30dp"
+                    android:layout_marginRight="@dimen/d_30dp"
+                    android:background="@color/page_bg"
+                    android:paddingTop="@dimen/d_10dp"
+                    android:paddingBottom="@dimen/d_10dp">
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                        android:id="@+id/tv_giro_withdrawal_value"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d_20dp"
+                        android:text="@{viewModel.mWithdrawMoney}"
+                        android:textColor="@color/app_blue"
+                        android:textSize="@dimen/d_16sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="@dimen/d_20dp"
+                        android:text="(人民币)"
+                        android:textColor="@color/app_blue"
+                        android:textSize="@dimen/d_15sp" />
+
+                </RelativeLayout>
+
+                <!--下次提现日期-->
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d_30dp"
+                    android:layout_marginTop="@dimen/d_18dp"
+                    android:paddingTop="@dimen/dp_10"
+                    android:paddingBottom="@dimen/d_10dp"
+                    android:text="下次提现日期"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/d_15sp" />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d_30dp"
+                    android:layout_marginRight="@dimen/d_30dp"
+                    android:background="@color/page_bg"
+                    android:paddingTop="@dimen/d_10dp"
+                    android:paddingBottom="@dimen/d_10dp">
+
+                    <TextView
+                        android:id="@+id/tv_next_giro_date"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/d_20dp"
+                        android:text="-"
+                        android:textColor="@color/app_blue"
+                        android:textSize="@dimen/d_16sp" />
+
+                </RelativeLayout>
+
+
+                <!--银行卡号-->
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d_30dp"
+                    android:layout_marginTop="@dimen/d_18dp"
+                    android:paddingTop="@dimen/dp_10"
+                    android:paddingBottom="@dimen/d_10dp"
+                    android:text="银行卡卡号"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/d_15sp" />
+
+                <EditText
+                    android:id="@+id/et_giro_withdraw_bank_account"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="@dimen/d_30dp"
+                    android:layout_marginRight="@dimen/d_30dp"
+                    android:background="@drawable/shape_white_border"
+                    android:inputType="number"
+                    android:paddingLeft="@dimen/d_20dp"
+                    android:paddingTop="@dimen/d_10dp"
+                    android:paddingRight="@dimen/d_20dp"
+                    android:paddingBottom="@dimen/d_10dp"
+                    android:singleLine="true"
+                    android:text="-"
+                    android:textColor="@color/app_blue"
+                    android:textSize="@dimen/d_16sp" />
+
+
+                <!--                <com.guadou.componentservice.font_text_view.TextViewRegular-->
+                <!--                    android:layout_width="match_parent"-->
+                <!--                    android:layout_height="wrap_content"-->
+                <!--                    android:layout_marginTop="@dimen/d_5dp"-->
+                <!--                    android:layout_marginBottom="@dimen/d_5dp"-->
+                <!--                    android:layout_marginLeft="@dimen/d_30dp"-->
+                <!--                    android:layout_marginRight="@dimen/d_30dp"-->
+                <!--                    android:paddingTop="@dimen/d_19dp"-->
+                <!--                    android:paddingBottom="@dimen/d_19dp"-->
+                <!--                    android:paddingLeft="@dimen/d_16dp"-->
+                <!--                    android:paddingRight="@dimen/d_16dp"-->
+                <!--                    android:drawablePadding="@dimen/d_16dp"-->
+                <!--                    android:drawableLeft="@drawable/notice_bank_name_icon"-->
+                <!--                    android:lineHeight="20.5dp"-->
+                <!--                    android:text="Please confirm this is the bank account number. Kindly ensure this is NOT Credit card number."-->
+                <!--                    android:textColor="#BB480A"-->
+                <!--                    android:background="#FFECD2"-->
+                <!--                    android:textSize="@dimen/d_15sp" />-->
+
+                <!--银行-->
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d_30dp"
+                    android:layout_marginTop="@dimen/d_18dp"
+                    android:paddingTop="@dimen/dp_10"
+                    android:paddingBottom="@dimen/d_10dp"
+                    android:text="银行名称"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/d_15sp" />
+
+                <LinearLayout
+                    android:id="@+id/ll_bank_box"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d_30dp"
+                    android:layout_marginRight="@dimen/d_30dp"
+                    android:background="@drawable/shape_white_border"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:padding="@dimen/d_1dp">
+
+                    <TextView
+                        android:id="@+id/tv_giro_withdraw_bank"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginRight="@dimen/d_10dp"
+                        android:layout_weight="1"
+                        android:background="@color/white"
+                        android:paddingLeft="@dimen/d_20dp"
+                        android:paddingTop="@dimen/d_10dp"
+                        android:paddingRight="@dimen/d_20dp"
+                        android:paddingBottom="@dimen/d_10dp"
+                        android:singleLine="true"
+                        android:text=""
+                        android:textColor="@color/app_blue"
+                        android:textSize="@dimen/d_16sp" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:src="@drawable/drop_down" />
+
+                </LinearLayout>
+
+                <!--银行卡持有人-->
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d_30dp"
+                    android:layout_marginTop="@dimen/d_18dp"
+                    android:paddingTop="@dimen/dp_10"
+                    android:paddingBottom="@dimen/d_10dp"
+                    android:text="持卡人姓名"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/d_15sp" />
+
+                <EditText
+                    android:id="@+id/et_giro_withdraw_bank_account_holder"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="@dimen/d_30dp"
+                    android:layout_marginRight="@dimen/d_30dp"
+                    android:background="@drawable/shape_white_border"
+                    android:paddingLeft="@dimen/d_20dp"
+                    android:paddingTop="@dimen/d_10dp"
+                    android:paddingRight="@dimen/d_20dp"
+                    android:paddingBottom="@dimen/d_10dp"
+                    android:singleLine="true"
+                    android:text="-"
+                    android:textColor="@color/app_blue"
+                    android:textSize="@dimen/d_16sp" />
+
+
+                <!--Appoint Now-->
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_45dp"
+                    android:layout_marginLeft="@dimen/d_30dp"
+                    android:layout_marginTop="@dimen/d_50dp"
+                    android:layout_marginRight="@dimen/d_30dp"
+                    android:layout_marginBottom="@dimen/dp_40"
+                    android:background="@drawable/selector_app_blue_button_round2_bg"
+                    android:gravity="center"
+                    android:text="提现"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/d_16sp"
+                    android:visibility="visible"
+                    binding:clicks="@{click.submitForm}" />
+
+
+            </LinearLayout>
+
+        </ScrollView>
+
+    </LinearLayout>
+
+
+</layout>

cpt_ewallet/src/main/res/layout/activity_ewallet_withdraw.xml

@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:binding="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="RtlHardcoded">
+
+    <data>
+
+        <variable
+            name="viewModel"
+            type="com.hongyegroup.cpt_ewallet.mvvm.EWalletWithdrawViewModel" />
+
+        <variable
+            name="click"
+            type="com.hongyegroup.cpt_ewallet.ui.EWalletWithdrawActivity.ClickProxy" />
+
+        <import type="android.text.TextUtils" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical">
+
+        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
+            android:id="@+id/easy_title_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:Easy_title="余额提现" />
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true"
+            android:overScrollMode="never">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingBottom="@dimen/d_20dp">
+
+                <com.guadou.lib_baselib.font_text_view.TextViewBold
+                    android:id="@+id/tv_withdrawal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d_24dp"
+                    android:layout_marginTop="@dimen/d_17dp"
+                    android:text="选择提现金额（人民币）"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/d_15sp" />
+
+                <EditText
+                    android:id="@+id/et_withdrawal_value"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d_24dp"
+                    android:layout_marginTop="@dimen/d_17dp"
+                    android:layout_marginRight="@dimen/d_24dp"
+                    android:background="@drawable/shape_white_border"
+                    android:hint="输入提现金额"
+                    android:inputType="numberDecimal"
+                    android:maxLength="10"
+                    android:paddingLeft="@dimen/d_18dp"
+                    android:paddingTop="@dimen/d_13dp"
+                    android:paddingBottom="@dimen/d_13dp"
+                    android:singleLine="true"
+                    android:text="@={viewModel.mWithdrawMoney}"
+                    android:textColor="@color/profile_red"
+                    android:textCursorDrawable="@null"
+                    android:textSize="@dimen/d_16sp"
+                    binding:onTextChanged="@{click.onMoneyChanged}"
+                    binding:setDecimalPoints="@{2}"
+                    binding:typefaceMedium="@{true}" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_5dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                        android:id="@+id/balance"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_24dp"
+                        android:text="余额:"
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_15sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                        android:id="@+id/tv_all_value"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@{@string/renmingbi + viewModel.mAllMoney}"
+                        android:textColor="@color/gray_76"
+                        android:textSize="@dimen/d_15sp"
+                        tools:text="¥ 7890" />
+
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        binding:clicks="@{click.selectCheckBox}">
+
+                        <ImageView
+                            android:id="@+id/iv_select"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:padding="5dp"
+                            android:src="@{click.isSelectAll?@drawable/withdrawal_all:@drawable/withdrawal_noall}"
+                            tools:src="@drawable/withdrawal_noall" />
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                            android:id="@+id/all"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="@dimen/d_24dp"
+                            android:text="全部"
+                            android:textColor="@color/gray_76"
+                            android:textSize="@dimen/d_15sp" />
+
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_10dp"
+                    android:layout_marginTop="@dimen/d_22dp"
+                    android:background="@color/page_bg" />
+
+                <com.guadou.lib_baselib.font_text_view.TextViewBold
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d_24dp"
+                    android:layout_marginTop="@dimen/d_19dp"
+                    android:text="选择提现方式"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/d_15sp" />
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_45dp"
+                    android:layout_marginLeft="@dimen/d_24dp"
+                    android:layout_marginTop="@dimen/d_12dp"
+                    android:layout_marginRight="@dimen/d_24dp"
+                    android:background="@color/page_bg"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    binding:clicks="@{click.chooseGrioMethod}">
+
+                    <ImageView
+                        android:id="@+id/giro"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_14dp"
+                        android:layout_marginRight="@dimen/d_14dp"
+                        android:src="@drawable/giro_method" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:singleLine="true"
+                        android:text="银行卡提现"
+                        android:textColor="@color/app_blue"
+                        android:textSize="@dimen/d_15sp" />
+
+                    <ImageView
+                        android:id="@+id/iv_giro_checked"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:src="@drawable/pay_method_checked"
+                        android:visibility="gone"
+                        binding:isVisibleGone="@{click.withdrawMethod == 1}" />
+
+                </LinearLayout>
+
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_42dp"
+                    android:layout_marginLeft="@dimen/d_24dp"
+                    android:layout_marginTop="@dimen/d_20dp"
+                    android:layout_marginRight="@dimen/d_24dp"
+                    android:background="@{(click.withdrawMethod!=0 &amp;&amp; !TextUtils.isEmpty(viewModel.mWithdrawMoney))? @drawable/selector_app_blue_button_round2_bg : @drawable/shape_center_gray_3round}"
+                    android:gravity="center"
+                    android:text="提交"
+                    android:textColor="@color/white_text_fe"
+                    android:textSize="@dimen/d_16sp"
+                    binding:clicks="@{click.submitWithdraw}"
+                    binding:setEnable="@{click.withdrawMethod!=0 &amp;&amp; !TextUtils.isEmpty(viewModel.mWithdrawMoney)}"
+                    tools:background="@drawable/shape_center_gray_3round" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/d_24dp"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:layout_marginRight="@dimen/d_24dp"
+                    android:background="@drawable/shape_white_border"
+                    android:orientation="vertical"
+                    android:paddingLeft="@dimen/d_15dp"
+                    android:paddingTop="@dimen/d_12dp"
+                    android:paddingRight="@dimen/d_15dp"
+                    android:paddingBottom="@dimen/d_12dp">
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="备注:"
+                        android:textColor="@color/gray_82"
+                        android:textSize="@dimen/d_13sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d_9dp"
+                        android:text="- 中国所有银行均可选择转账方式。"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_12sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d_9dp"
+                        android:text="- 所有新的转帐申请将于下一个工作天内处理。"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_12sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d_9dp"
+                        android:text="- 一旦转账申请被处理，您的余额将被更新。"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_12sp" />
+
+                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d_9dp"
+                        android:text="- 您可以进入“交易历史”页面查看过去的交易。"
+                        android:textColor="@color/gray_text"
+                        android:textSize="@dimen/d_12sp" />
+
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </ScrollView>
+
+    </LinearLayout>
+
+
+</layout>

cpt_ewallet/src/main/res/layout/popup_withdraw_disclanimers.xml

@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="@dimen/d_300dp"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/d_70dp"
+        android:background="@drawable/shape_blue_top_round10">
+
+        <com.guadou.lib_baselib.font_text_view.TextViewBold
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="免责声明"
+            android:textColor="@color/white"
+            android:textSize="@dimen/d_25sp" />
+
+        <ImageView
+            android:id="@+id/iv_delete"
+            android:layout_width="@dimen/d_35dp"
+            android:layout_height="@dimen/d_35dp"
+            android:layout_alignParentRight="true"
+            android:layout_marginTop="@dimen/d_10dp"
+            android:layout_marginRight="@dimen/d_10dp"
+            android:padding="@dimen/d_5dp"
+            android:src="@drawable/disclaimers_delete" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@drawable/shape_white_bottom_round10"
+        android:orientation="vertical">
+
+        <com.guadou.lib_baselib.font_text_view.TextViewBold
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/d_15dp"
+            android:layout_marginTop="@dimen/d_20dp"
+            android:layout_marginRight="@dimen/d_15dp"
+            android:text="请说明您是接受还是拒绝以下免责声明："
+            android:textColor="@color/black"
+            android:textSize="@dimen/d_14sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/d_15dp"
+            android:layout_marginTop="@dimen/d_20dp"
+            android:layout_marginRight="@dimen/d_15dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/dis_one" />
+
+            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d_8dp"
+                android:layout_marginBottom="1.5dp"
+                android:lineHeight="@dimen/d_14dp"
+                android:text="Giro 选项适用于中国的所有银行。"
+                android:textColor="@color/black"
+                android:textSize="@dimen/d_12sp" />
+        </LinearLayout>
+
+        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/d_15dp"
+            android:layout_marginTop="@dimen/d_20dp"
+            android:layout_marginRight="@dimen/d_15dp"
+            android:drawableLeft="@drawable/dis_two"
+            android:drawablePadding="@dimen/d_8dp"
+            android:lineHeight="@dimen/d_14dp"
+            android:text="将处理所有新的转帐请求下一个工作日内。 如果它落在PH，转帐请求将是处理下一个 工作日期。 转帐完成后，您的余额将相应更新。"
+            android:textColor="@color/black"
+            android:textSize="@dimen/d_12dp" />
+
+        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+            android:id="@+id/tv_dis_three"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/d_15dp"
+            android:layout_marginTop="@dimen/d_20dp"
+            android:layout_marginRight="@dimen/d_15dp"
+            android:drawableLeft="@drawable/dis_three"
+            android:drawablePadding="@dimen/d_8dp"
+            android:lineHeight="@dimen/d_14dp"
+            android:text="所有付款将在处理后的 7-14 个工作日内 记入您的银行帐户。"
+            android:textColor="@color/app_blue"
+            android:textSize="@dimen/d_12sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/d_15dp"
+            android:layout_marginTop="@dimen/d_20dp"
+            android:layout_marginRight="@dimen/d_15dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/dis_four" />
+
+            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d_8dp"
+                android:layout_marginBottom="1.5dp"
+                android:lineHeight="@dimen/d_14dp"
+                android:text="您使用电子支付是为了您自己个人使用。 你不要授权他人使用您的身份或用户状态。"
+                android:textColor="@color/black"
+                android:textSize="@dimen/d_12sp" />
+        </LinearLayout>
+
+
+        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/d_15dp"
+            android:layout_marginTop="@dimen/d_20dp"
+            android:layout_marginRight="@dimen/d_15dp"
+            android:drawableLeft="@drawable/dis_five"
+            android:drawablePadding="@dimen/d_8dp"
+            android:lineHeight="@dimen/d_14dp"
+            android:text="YY圈不承担任何如果您的信息的责任提供给我们的是不正确的。请请在您之前检查您的详细信息提交请求。"
+            android:textColor="@color/black"
+            android:textSize="@dimen/d_12sp" />
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/d_15dp"
+            android:layout_marginTop="@dimen/d_22dp"
+            android:layout_marginRight="@dimen/d_15dp"
+            android:layout_marginBottom="@dimen/d_22dp"
+            android:gravity="center">
+
+            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                android:id="@+id/btn_yes"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/selector_app_blue_button_round2_bg"
+                android:gravity="center"
+                android:padding="@dimen/d_8dp"
+                android:text="接受"
+                android:textColor="@color/white"
+                android:textSize="@dimen/d_16sp" />
+
+            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                android:id="@+id/btn_no"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d_20dp"
+                android:layout_weight="1"
+                android:background="@drawable/ios_dialog_custom_yes_selector"
+                android:gravity="center"
+                android:padding="@dimen/d_8dp"
+                android:text="拒绝"
+                android:textColor="@color/white"
+                android:textSize="@dimen/d_16sp" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>

cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/HomeFragment.kt

@@ -136,7 +136,9 @@ class HomeFragment : YYBaseVDBLoadingFragment<HomeViewModel, FragmentHomeBinding
     inner class ClickProxy {
 
         fun gotoWalletPage() {
-            toast("去钱包页面")
+            if (requireActivity() is MainActivity) {
+                (requireActivity() as MainActivity).switchFragment(1)
+            }
         }
 
         fun gotoRewardsPage() {

cs_cptServices/src/main/java/com/guadou/cs_cptservices/binding/BindingView.kt

@@ -22,6 +22,11 @@ fun setSelected(view: View, isSelected: Boolean) {
     view.isSelected = isSelected
 }
 
+@BindingAdapter("setEnable")
+fun setEnable(view: View, isEnabled: Boolean) {
+    view.isEnabled = isEnabled
+}
+
 /**
  * 点击事件防抖动的点击
  */

cs_cptServices/src/main/java/com/guadou/cs_cptservices/popup/CustomNormalPopup.kt

@@ -1,98 +0,0 @@
-package com.guadou.cs_cptservices.popup
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.view.View
-import android.widget.TextView
-import com.guadou.cs_cptservices.R
-import com.guadou.lib_baselib.ext.checkEmpty
-import com.guadou.lib_baselib.ext.click
-import com.guadou.lib_baselib.ext.dp2px
-import com.lxj.xpopup.core.CenterPopupView
-import com.lxj.xpopup.util.XPopupUtils
-
-/**
- * 默认的取消 确定弹窗
- */
-@SuppressLint("ViewConstructor")
-class CustomNormalPopup(
-    context: Context, private val title: String?, private val content: CharSequence,
-    private val yes: String? = null, private val no: String? = null,
-    private val action: (() -> Unit)? = null,
-) : CenterPopupView(context) {
-
-    override fun getImplLayoutId(): Int = R.layout.popup_custom_normal
-
-    override fun onCreate() {
-        super.onCreate()
-
-        val tvTitle = findViewById<TextView>(R.id.tv_title)
-        val tvContent = findViewById<TextView>(R.id.tv_content)
-        val tvYes = findViewById<TextView>(R.id.tv_yes)
-        val tvNo = findViewById<TextView>(R.id.tv_no)
-        val tvOk = findViewById<TextView>(R.id.tv_ok)
-
-        if (!title.checkEmpty()) {
-            tvTitle.text = title
-        } else {
-            tvTitle.text = "提示"
-        }
-
-        tvContent.text = content
-
-        if (!yes.checkEmpty() && !no.checkEmpty()) {
-            tvYes.visibility = View.VISIBLE
-            tvNo.visibility = View.VISIBLE
-            tvOk.visibility = View.GONE
-            tvYes.text = yes
-            tvNo.text = no
-
-            tvYes.click {
-                action?.invoke()
-                dismiss()
-            }
-            tvNo.click {
-                dismiss()
-            }
-
-        } else if (!yes.checkEmpty()) {
-            tvYes.visibility = View.GONE
-            tvNo.visibility = View.GONE
-            tvOk.visibility = View.VISIBLE
-            tvOk.text = yes
-            tvOk.click {
-                action?.invoke()
-                dismiss()
-            }
-        } else if (!no.checkEmpty()) {
-            tvYes.visibility = View.GONE
-            tvNo.visibility = View.GONE
-            tvOk.visibility = View.VISIBLE
-            tvOk.text = no
-            tvOk.click {
-                action?.invoke()
-                dismiss()
-            }
-        } else {
-            tvYes.visibility = View.GONE
-            tvNo.visibility = View.GONE
-            tvOk.visibility = View.VISIBLE
-            tvOk.text = "知道了"
-            tvOk.click {
-                action?.invoke()
-                dismiss()
-            }
-        }
-
-    }
-
-    //如果不设置可能出现xml的背景圆角无法正常显示
-    override fun getMaxWidth(): Int {
-        return if (popupInfo.maxWidth == 0) (XPopupUtils.getWindowWidth(context) * 0.99f).toInt() else popupInfo.maxWidth
-    }
-
-    override fun getMaxHeight(): Int {
-        return dp2px(500f)
-    }
-
-}

cs_cptServices/src/main/res/drawable/shape_blue_top_round10.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners
+        android:topLeftRadius="@dimen/d_10dp"
+        android:topRightRadius="@dimen/d_10dp" />
+
+    <solid android:color="@color/app_blue" />
+
+</shape>

cs_cptServices/src/main/res/drawable/shape_center_gray_3round.xml

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

cs_cptServices/src/main/res/drawable/shape_white_border.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white"/>
+    <stroke android:color="@color/gray" android:width="@dimen/d_0.5dp"/>
+    <!--<corners android:radius="5dp"/>-->
+</shape>

cs_cptServices/src/main/res/drawable/shape_white_bottom_round10.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/white" />
+
+    <corners android:bottomRightRadius="@dimen/d_10dp" android:bottomLeftRadius="@dimen/d_10dp" />
+
+</shape>

cs_cptServices/src/main/res/layout/popup_custom_normal.xml

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/d_300dp"
-    android:layout_height="wrap_content"
-    android:background="@drawable/shape_white_round5"
-    android:orientation="vertical">
-
-    <com.guadou.lib_baselib.font_text_view.TextViewBold
-        android:id="@+id/tv_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginLeft="@dimen/d_15dp"
-        android:layout_marginTop="@dimen/d_24dp"
-        android:layout_marginRight="@dimen/d_15dp"
-        android:text="提示"
-        android:textColor="@color/black_33"
-        android:textSize="@dimen/d_15sp" />
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginLeft="@dimen/d_35dp"
-        android:layout_marginTop="@dimen/d_24dp"
-        android:layout_marginRight="@dimen/d_35dp"
-        android:layout_weight="1"
-        android:overScrollMode="never"
-        android:scrollbars="none">
-
-        <com.guadou.lib_baselib.font_text_view.TextViewMedium
-            android:id="@+id/tv_content"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:lineHeight="@dimen/d_26dp"
-            android:text="确认解绑银行卡？"
-            android:textColor="@color/black_33"
-            android:textSize="@dimen/d_14sp" />
-
-    </ScrollView>
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/d_15dp"
-        android:layout_marginTop="@dimen/d_24dp"
-        android:layout_marginRight="@dimen/d_15dp"
-        android:layout_marginBottom="@dimen/d_18dp"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal">
-
-
-        <com.guadou.lib_baselib.font_text_view.TextViewMedium
-            android:id="@+id/tv_yes"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/d_40dp"
-            android:layout_marginRight="@dimen/d_13dp"
-            android:layout_weight="1"
-            android:background="@drawable/shape_custom_popup_border5"
-            android:gravity="center"
-            android:text="确认解绑"
-            android:textColor="@color/custom_dialog_yes_text"
-            android:textSize="@dimen/d_14sp" />
-
-
-        <com.guadou.lib_baselib.font_text_view.TextViewMedium
-            android:id="@+id/tv_no"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/d_40dp"
-            android:layout_weight="1"
-            android:background="@drawable/shape_custom_popup_round5"
-            android:gravity="center"
-            android:text="放弃解绑"
-            android:textColor="@color/white"
-            android:textSize="@dimen/d_14sp" />
-
-
-        <com.guadou.lib_baselib.font_text_view.TextViewMedium
-            android:id="@+id/tv_ok"
-            android:layout_width="130dp"
-            android:layout_height="@dimen/d_40dp"
-            android:background="@drawable/shape_custom_popup_round5"
-            android:gravity="center"
-            android:text="放弃解绑"
-            android:textColor="@color/white"
-            android:textSize="@dimen/d_14sp"
-            android:visibility="gone" />
-
-    </LinearLayout>
-
-</LinearLayout>

cs_cptServices/src/main/res/values/colors.xml

@@ -47,5 +47,6 @@
     <color name="status_text_bg_success">#FF5E75</color>
     <color name="main_topitem_enable">#330689FB</color>
     <color name="gray_82">#828282</color>
+    <color name="white_text_fe">#fefefe</color>
 
 </resources>

cs_cptServices/src/main/res/values/strings.xml

@@ -6,5 +6,6 @@
 
     <string name="normal_empty">-</string>
     <string name="null_data">-</string>
+    <string name="renmingbi">¥</string>
 
 </resources>