钱包的静态页面完成

cpt_ewallet/src/main/AndroidManifest.xml

@@ -4,25 +4,6 @@
 
     <application android:allowBackup="true">
 
-        <activity
-            android:name=".ui.EWalletWithdrawalActivity"
-            android:launchMode="singleTask" />
-
-        <activity android:name=".ui.WithdrawalVerifyActivity" />
-
-        <activity android:name=".ui.WithdrawalSuccessActivity" />
-
-        <activity android:name=".ui.EWalletHistoryActivity" />
-
-        <activity android:name=".ui.EWalletSalaryCardActivity" />
-
-        <activity
-            android:name=".ui.SalaryCardAddStepOneActivity"
-            android:launchMode="singleTask" />
-
-        <activity android:name=".ui.SalaryCardAddStepTwoActivity" />
-
-        <activity android:name=".ui.SalaryCardAddStepThreeActivity" />
 
     </application>
 

cpt_ewallet/src/main/java/com/hongyegroup/cpt_ewallet/bean/BankCardBean.java

@@ -1,8 +0,0 @@
-package com.hongyegroup.cpt_ewallet.bean;
-
-public class BankCardBean {
-    public String id;
-    public String name;
-    public String code;
-    public String money;
-}

cpt_ewallet/src/main/java/com/hongyegroup/cpt_ewallet/bean/WalletHistoryBean.java

@@ -1,10 +0,0 @@
-package com.hongyegroup.cpt_ewallet.bean;
-
-public class WalletHistoryBean {
-    public String id;
-    public String title;
-    public String content;
-    public String createAt;
-
-    public String groupDate;
-}

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

@@ -1,136 +0,0 @@
-package com.hongyegroup.cpt_ewallet.mvvm
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.view.View
-import android.widget.TextView
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.SavedStateHandle
-import com.bigkoo.pickerview.builder.TimePickerBuilder
-import com.guadou.cs_cptservices.binding.BaseDataBindingAdapter
-import com.guadou.lib_baselib.base.vm.BaseViewModel
-import com.guadou.lib_baselib.ext.checkEmpty
-import com.guadou.lib_baselib.utils.CommUtils
-import com.hongyegroup.cpt_ewallet.BR
-import com.hongyegroup.cpt_ewallet.R
-import com.hongyegroup.cpt_ewallet.bean.WalletHistoryBean
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.withContext
-import java.util.*
-import javax.inject.Inject
-
-@HiltViewModel
-class EWalletHistoryViewModel @Inject constructor(
-    private val savedStateHandle: SavedStateHandle
-) : BaseViewModel() {
-
-    val mKeywordLiveData = MutableLiveData<String>()  //搜索Key值
-
-    var mCurPage = 1
-    private var isNeedPlaceHolder = true
-    var isNeedCleanAllData = true
-    var mDatas = mutableListOf<WalletHistoryBean>()
-    val mAdapter by lazy { BaseDataBindingAdapter(R.layout.item_ewallet_history, BR.item, mDatas) }
-
-    private val startCalendar = Calendar.getInstance()
-    private val endCalendar = Calendar.getInstance()
-    private var mSelectTimeStamp: Long = System.currentTimeMillis()
-
-    init {
-        //当前页面时间设置区间
-        startCalendar.add(Calendar.YEAR, -3)
-    }
-
-    /**
-     * 获取兼职工作列表
-     */
-    fun requestHistoryList(): LiveData<Boolean> {
-        val liveData = MutableLiveData<Boolean>()
-
-        launchOnUI {
-            //开始Loading
-            if (isNeedPlaceHolder) loadStartLoading()
-            val result = withContext(Dispatchers.IO) {
-                delay(1000)
-
-                val list = mutableListOf<WalletHistoryBean>()
-                for (i in 1..10) {
-                    list.add(WalletHistoryBean().apply {
-                        groupDate = "2022-03-$mCurPage 星期二"
-                    })
-                }
-                return@withContext list
-            }
-
-            loadSuccess()
-            handleData(result)
-            liveData.postValue(true)
-        }
-
-        return liveData
-    }
-
-    //处理数据-添加或刷新
-    @SuppressLint("NotifyDataSetChanged")
-    private fun handleData(list: List<WalletHistoryBean>?) {
-        if (!list.checkEmpty()) {
-            //有数据，判断是刷新还是加载更多的数据
-            if (isNeedCleanAllData) {
-                //刷新的方式
-                mDatas.clear()
-                mDatas.addAll(list!!)
-                mAdapter.notifyDataSetChanged()
-            } else {
-                //加载更多
-                mDatas.addAll(list!!)
-                mAdapter.notifyItemRangeInserted(mDatas.size - list.size, list.size)
-                mAdapter.loadMoreModule.loadMoreComplete()
-            }
-        } else {
-            //展示无数据
-            if (isNeedCleanAllData && mCurPage == 1) {
-                mDatas.clear()
-                mAdapter.notifyDataSetChanged()
-                //展示无数据的布局
-                val emptyView: View = CommUtils.inflate(R.layout.item_empty_layout)
-                emptyView.findViewById<TextView>(R.id.tv_empty_msg).text = "你没有任何记录"
-                mAdapter.setEmptyView(emptyView)
-            } else {
-                //如果是加载更多,展示加载完成，没有更多数据了
-                mAdapter.loadMoreModule.loadMoreEnd()
-            }
-        }
-        isNeedPlaceHolder = false
-        isNeedCleanAllData = false
-    }
-
-    /**
-     * 选择日期筛选
-     */
-    fun selectDateMonth(activity: Activity): LiveData<String> {
-        val liveData = MutableLiveData<String>()
-
-        //时间选择器
-        val pickerBuilder = TimePickerBuilder(activity) { date, _ ->
-            mSelectTimeStamp = date.time
-            liveData.value = mSelectTimeStamp.toString()
-        }
-            .isDialog(true)
-            .setRangDate(startCalendar, endCalendar)
-            .setTitleText("选择月份")
-            .setType(booleanArrayOf(true, true, false, false, false, false))
-
-        //默认选中现在时间
-        val calendar = Calendar.getInstance()
-        calendar.timeInMillis = mSelectTimeStamp
-        pickerBuilder.setDate(calendar)
-
-        pickerBuilder.build().show()
-
-        return liveData
-    }
-
-}

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

@@ -1,7 +1,11 @@
 package com.hongyegroup.cpt_ewallet.mvvm
 
+import android.annotation.SuppressLint
 import androidx.lifecycle.SavedStateHandle
+import com.guadou.cs_cptservices.binding.BaseDataBindingAdapter
 import com.guadou.lib_baselib.base.vm.BaseViewModel
+import com.hongyegroup.cpt_ewallet.R
+import com.hongyegroup.cpt_ewallet.BR
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
@@ -10,4 +14,18 @@ class EWalletMainViewModel @Inject constructor(
     private val savedStateHandle: SavedStateHandle
 ) : BaseViewModel() {
 
+    var mHistoryDatas = mutableListOf<String>()
+    val mAdapter by lazy { BaseDataBindingAdapter(R.layout.item_ewallet_history, BR.item, mHistoryDatas) }
+
+
+    @SuppressLint("NotifyDataSetChanged")
+    fun setupDataes() {
+        mHistoryDatas.clear()
+        mHistoryDatas.add("1")
+        mHistoryDatas.add("1")
+        mHistoryDatas.add("1")
+
+        mAdapter.notifyDataSetChanged()
+    }
+
 }

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

@@ -1,89 +0,0 @@
-package com.hongyegroup.cpt_ewallet.mvvm
-
-import android.annotation.SuppressLint
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.SavedStateHandle
-import com.guadou.cs_cptservices.binding.BaseDataBindingAdapter
-import com.guadou.lib_baselib.base.vm.BaseViewModel
-import com.guadou.lib_baselib.ext.checkEmpty
-import com.hongyegroup.cpt_ewallet.BR
-import com.hongyegroup.cpt_ewallet.R
-import com.hongyegroup.cpt_ewallet.bean.BankCardBean
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.withContext
-import javax.inject.Inject
-
-@HiltViewModel
-class EWalletSalaryCardViewModel @Inject constructor(
-    private val savedStateHandle: SavedStateHandle
-) : BaseViewModel() {
-
-    var mCurPage = 1
-    private var isNeedPlaceHolder = true
-    var isNeedCleanAllData = true
-    var mDatas = mutableListOf<BankCardBean>()
-    val mAdapter by lazy { BaseDataBindingAdapter(R.layout.item_my_salary_card, BR.item, mDatas) }
-
-
-    /**
-     * 获取通知列表
-     */
-    fun getAllBankCards(): LiveData<Boolean> {
-        val liveData = MutableLiveData<Boolean>()
-
-        launchOnUI {
-            //开始Loading
-            if (isNeedPlaceHolder) loadStartLoading()
-            val result = withContext(Dispatchers.IO) {
-                delay(1000)
-
-                val list = mutableListOf<BankCardBean>()
-                for (i in 1..10) {
-                    list.add(BankCardBean())
-                }
-                return@withContext list
-            }
-
-            loadSuccess()
-            handleData(result)
-            liveData.postValue(true)
-
-        }
-
-        return liveData
-    }
-
-    //处理数据-添加或刷新
-    @SuppressLint("NotifyDataSetChanged")
-    private fun handleData(list: List<BankCardBean>?) {
-        if (!list.checkEmpty()) {
-            //有数据，判断是刷新还是加载更多的数据
-            if (isNeedCleanAllData) {
-                //刷新的方式
-                mDatas.clear()
-                mDatas.addAll(list!!)
-                mAdapter.notifyDataSetChanged()
-            } else {
-                //加载更多
-                mDatas.addAll(list!!)
-                mAdapter.notifyItemRangeInserted(mDatas.size + mAdapter.headerLayoutCount - list.size, list.size)
-                mAdapter.loadMoreModule.loadMoreComplete()
-            }
-        } else {
-            //展示无数据
-            if (isNeedCleanAllData && mCurPage == 1) {
-                mDatas.clear()
-                mAdapter.notifyDataSetChanged()
-            } else {
-                //如果是加载更多,展示加载完成，没有更多数据了
-                mAdapter.loadMoreModule.loadMoreEnd()
-            }
-        }
-        isNeedPlaceHolder = false
-        isNeedCleanAllData = false
-    }
-
-}

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

@@ -1,16 +0,0 @@
-package com.hongyegroup.cpt_ewallet.mvvm
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.SavedStateHandle
-import com.guadou.lib_baselib.base.vm.BaseViewModel
-import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
-
-@HiltViewModel
-class EWalletWithdrawalViewModel @Inject constructor(
-    private val savedStateHandle: SavedStateHandle
-) : BaseViewModel() {
-
-    var mMoneyLD = MutableLiveData<String>()  //输入的提现金额
-
-}

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

@@ -1,16 +0,0 @@
-package com.hongyegroup.cpt_ewallet.mvvm
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.SavedStateHandle
-import com.guadou.lib_baselib.base.vm.BaseViewModel
-import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
-
-@HiltViewModel
-class SalaryAddOneViewModel @Inject constructor(
-    private val savedStateHandle: SavedStateHandle
-) : BaseViewModel() {
-
-    val mBankCodeLd = MutableLiveData<String>()  //银行卡号
-
-}

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

@@ -1,16 +0,0 @@
-package com.hongyegroup.cpt_ewallet.mvvm
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.SavedStateHandle
-import com.guadou.lib_baselib.base.vm.BaseViewModel
-import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
-
-@HiltViewModel
-class SalaryAddThreeViewModel @Inject constructor(
-    private val savedStateHandle: SavedStateHandle
-) : BaseViewModel() {
-
-    var mCodeLD = MutableLiveData<String>()  //输入的验证码
-
-}

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

@@ -1,16 +0,0 @@
-package com.hongyegroup.cpt_ewallet.mvvm
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.SavedStateHandle
-import com.guadou.lib_baselib.base.vm.BaseViewModel
-import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
-
-@HiltViewModel
-class SalaryAddTwoViewModel @Inject constructor(
-    private val savedStateHandle: SavedStateHandle
-) : BaseViewModel() {
-
-    val mBankMobileLd = MutableLiveData<String>()  //银行电话号码
-
-}

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

@@ -1,13 +0,0 @@
-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 javax.inject.Inject
-
-@HiltViewModel
-class WithdrawalSuccessViewModel @Inject constructor(
-    private val savedStateHandle: SavedStateHandle
-) : BaseViewModel() {
-
-}

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

@@ -1,16 +0,0 @@
-package com.hongyegroup.cpt_ewallet.mvvm
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.SavedStateHandle
-import com.guadou.lib_baselib.base.vm.BaseViewModel
-import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
-
-@HiltViewModel
-class WithdrawalVerifyViewModel @Inject constructor(
-    private val savedStateHandle: SavedStateHandle
-) : BaseViewModel() {
-
-    var mCodeLD = MutableLiveData<String>()  //输入的验证码
-
-}

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

@@ -1,181 +0,0 @@
-package com.hongyegroup.cpt_ewallet.ui
-
-import android.content.Intent
-import android.graphics.Color
-import android.os.Bundle
-import android.view.View
-import android.widget.TextView
-import com.chad.library.adapter.base.listener.OnLoadMoreListener
-import com.gavin.com.library.PowerfulStickyDecoration
-import com.gavin.com.library.listener.PowerGroupListener
-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.dp2px
-import com.guadou.lib_baselib.ext.vertical
-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.ActivityEwalletHistoryBinding
-import com.hongyegroup.cpt_ewallet.mvvm.EWalletHistoryViewModel
-import com.scwang.smart.refresh.layout.api.RefreshLayout
-import com.scwang.smart.refresh.layout.listener.OnRefreshListener
-import dagger.hilt.android.AndroidEntryPoint
-
-/**
- * 电子钱包的历史记录列表
- */
-@AndroidEntryPoint
-class EWalletHistoryActivity : YYBaseVDBActivity<EWalletHistoryViewModel, ActivityEwalletHistoryBinding>(), OnRefreshListener,
-    OnLoadMoreListener {
-
-    private var mTopDecoration: PowerfulStickyDecoration? = null
-    private val mClickProxy by lazy { ClickProxy() }
-
-    companion object {
-        fun startInstance() {
-            val context = CommUtils.getContext()
-            val intent = Intent(context, EWalletHistoryActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            context.startActivity(intent)
-        }
-    }
-
-    override fun getDataBindingConfig(): DataBindingConfig {
-        return DataBindingConfig(R.layout.activity_ewallet_history, BR.viewModel, mViewModel)
-            .addBindingParams(BR.click, mClickProxy)
-    }
-
-    override fun init(savedInstanceState: Bundle?) {
-        setStatusBarBlackText()
-
-        initRV()
-        initData()
-        initListener()
-    }
-
-    private fun initData() {
-        mViewModel.requestHistoryList().observe(this) {
-            mBinding.refreshLayout.finishRefresh()
-            mViewModel.mAdapter.loadMoreModule.isEnableLoadMore = true
-
-            //清楚悬停头缓存
-            if (mViewModel.isNeedCleanAllData) {
-                mTopDecoration?.clearCache()
-            }
-        }
-    }
-
-    private fun initRV() {
-
-        //悬停头的定义
-        val listener: PowerGroupListener = object : PowerGroupListener {
-            override fun getGroupName(position: Int): String? {
-                //获取组名，用于判断是否是同一组
-                return if (mViewModel.mDatas.size > position) {
-                    mViewModel.mDatas[position].groupDate
-                } else null
-            }
-
-            override fun getGroupView(position: Int): View {
-                //获取自定定义的组View
-                return if (mViewModel.mDatas.size > position) {
-                    layoutInflater.inflate(R.layout.item_history_income_header, null, false).apply {
-                        findViewById<TextView>(R.id.tv_head_job_date).text = mViewModel.mDatas[position].groupDate
-                    }
-                } else {
-                    View(mActivity).apply { setBackgroundColor(Color.WHITE) }
-                }
-            }
-        }
-        mTopDecoration = PowerfulStickyDecoration.Builder
-            .init(listener)
-            .setGroupHeight(dp2px(40f))
-            .setCacheEnable(true)
-            .setHeaderCount(0) //是否有头布局->头布局的数量
-            .setOnClickListener { _, _ -> //Head点击事件
-                toast("查询当前月份的月度清单")
-            }
-            .build()
-
-        //设置悬停头和Adapter
-        mBinding.recyclerView.vertical()
-            .apply {
-                addItemDecoration(mTopDecoration!!)
-                adapter = mViewModel.mAdapter
-            }
-    }
-
-    private fun initListener() {
-        //Adapter的滑动监听，监听加载更多
-        mViewModel.mAdapter.loadMoreModule.isEnableLoadMore = false
-        mViewModel.mAdapter.loadMoreModule.preLoadNumber = 4
-        mViewModel.mAdapter.loadMoreModule.setOnLoadMoreListener(this)
-
-        //刷新控件初始化
-        mBinding.refreshLayout.setEnableNestedScroll(true)
-        mBinding.refreshLayout.setEnableLoadMore(false)
-        mBinding.refreshLayout.setEnableRefresh(true)
-        mBinding.refreshLayout.setOnRefreshListener(this)
-
-        //Item点击
-        mViewModel.mAdapter.addChildClickViewIds(R.id.ll_content_root)
-        mViewModel.mAdapter.setOnItemChildClickListener { _, _, position ->
-            val item = mViewModel.mDatas[position]
-            toast("去历史详情页面")
-        }
-
-        //右上角时间筛选
-        mBinding.easyTitle.addRightImg(R.drawable.title_red_date_icon) {
-            mViewModel.selectDateMonth(mActivity).observe(this) {
-                scrollTopRefresh()
-            }
-        }
-    }
-
-    override fun onRefresh(refreshLayout: RefreshLayout) {
-        mViewModel.isNeedCleanAllData = true
-        mViewModel.mAdapter.loadMoreModule.loadMoreComplete()
-        mViewModel.mAdapter.loadMoreModule.isEnableLoadMore = false
-        mViewModel.mCurPage = 1
-        initData()
-    }
-
-    override fun onLoadMore() {
-        mViewModel.isNeedCleanAllData = false
-        mViewModel.mCurPage++
-        initData()
-    }
-
-    //自动刷新
-    private fun scrollTopRefresh() {
-        if (mViewModel.mDatas.size > 1) {
-            mBinding.recyclerView.scrollToPosition(0)
-        }
-        mBinding.refreshLayout.autoRefresh()
-    }
-
-    override fun startObserve() {
-
-    }
-
-    /**
-     * DataBinding事件处理
-     */
-    inner class ClickProxy {
-
-        //执行搜索
-        fun doSearch() {
-            KeyboardUtils.hideSoftInput(mActivity)
-            scrollTopRefresh()
-        }
-
-        //搜索的删除
-        fun searchDel() {
-            mViewModel.mKeywordLiveData.value = ""
-            doSearch()
-        }
-
-    }
-}

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

@@ -5,15 +5,21 @@ import com.guadou.cs_cptservices.base.fragment.YYBaseVDBFragment
 import com.guadou.cs_cptservices.interfaces.IFragmentRefresh
 import com.guadou.lib_baselib.bean.DataBindingConfig
 import com.guadou.lib_baselib.engine.toast
+import com.guadou.lib_baselib.ext.vertical
+import com.guadou.lib_baselib.utils.CommUtils
 import com.hongyegroup.cpt_ewallet.BR
 import com.hongyegroup.cpt_ewallet.R
 import com.hongyegroup.cpt_ewallet.databinding.FragmentEwalletMainBinding
 import com.hongyegroup.cpt_ewallet.mvvm.EWalletMainViewModel
+import com.scwang.smart.refresh.layout.api.RefreshLayout
+import com.scwang.smart.refresh.layout.listener.OnRefreshListener
 
 /**
- * 首页5页面之一 钱包的页面
+ * 用于MainActivity的子Fragment
+ * 钱包的主页
  */
-class EWalletMainFragment : YYBaseVDBFragment<EWalletMainViewModel, FragmentEwalletMainBinding>(), IFragmentRefresh {
+class EWalletMainFragment : YYBaseVDBFragment<EWalletMainViewModel, FragmentEwalletMainBinding>(), IFragmentRefresh,
+    OnRefreshListener {
 
     override fun getDataBindingConfig(): DataBindingConfig {
         return DataBindingConfig(R.layout.fragment_ewallet_main, BR.viewModel, mViewModel)
@@ -24,32 +30,64 @@ class EWalletMainFragment : YYBaseVDBFragment<EWalletMainViewModel, FragmentEwal
     }
 
     override fun init(savedInstanceState: Bundle?) {
-        setStatusBarBlackText()
+
+        initRV()
+        initData()
+        initListener()
     }
 
-    override fun scrollTopRefresh() {
-        toast("EWalletMainFragment - scrollTopRefresh")
+    private fun initData() {
+        showStateLoading()
+
+        //获取首页的数据
+        //requestData()
+
+        CommUtils.getHandler().postDelayed({
+            mBinding.refreshLayout.finishRefresh()
+            showStateSuccess()
+            popopData()
+        }, 1500)
+    }
+
+    override fun onRefresh(refreshLayout: RefreshLayout) {
+        CommUtils.getHandler().postDelayed({
+            mBinding.refreshLayout.finishRefresh()
+            popopData()
+        }, 1500)
     }
 
     /**
-     * DataBinding事件处理
+     * 模拟数据
      */
-    inner class ClickProxy {
+    private fun popopData() {
+        mViewModel.setupDataes()
+    }
 
-        //去提现
-        fun gotoWithdrawal() {
-            EWalletWithdrawalActivity.startInstance()
-        }
+    private fun initRV() {
+        mBinding.rvHistory.vertical().adapter = mViewModel.mAdapter
+    }
 
-        //去工资卡
-        fun gotoSalaryCard() {
-            EWalletSalaryCardActivity.startInstance()
-        }
+    private fun initListener() {
+        mBinding.refreshLayout.setEnableNestedScroll(true)
+        mBinding.refreshLayout.setEnableLoadMore(false)
+        mBinding.refreshLayout.setEnableRefresh(true)
+        mBinding.refreshLayout.setOnRefreshListener(this)
 
-        //去历史页面
-        fun gotoHistory() {
-            EWalletHistoryActivity.startInstance()
+        mViewModel.mAdapter.setOnItemClickListener { adapter, view, position ->
+            toast("点击进入发票详情")
         }
     }
 
+    override fun scrollTopRefresh() {
+        mBinding.scrollView.smoothScrollTo(0, 0)
+        mBinding.refreshLayout.autoRefresh()
+    }
+
+    /**
+     * DataBinding事件处理
+     */
+    inner class ClickProxy {
+
+    }
+
 }

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

@@ -1,139 +0,0 @@
-package com.hongyegroup.cpt_ewallet.ui
-
-import android.content.Intent
-import android.os.Bundle
-import androidx.databinding.DataBindingUtil
-import com.chad.library.adapter.base.listener.OnLoadMoreListener
-import com.guadou.cs_cptservices.base.activity.YYBaseVDBActivity
-import com.guadou.cs_cptservices.popup.CustomNormalPopup
-import com.guadou.lib_baselib.bean.DataBindingConfig
-import com.guadou.lib_baselib.engine.toast
-import com.guadou.lib_baselib.ext.vertical
-import com.guadou.lib_baselib.utils.CommUtils
-import com.hongyegroup.cpt_ewallet.BR
-import com.hongyegroup.cpt_ewallet.R
-import com.hongyegroup.cpt_ewallet.bean.BankCardBean
-import com.hongyegroup.cpt_ewallet.databinding.ActivityEwalletSalarycardBinding
-import com.hongyegroup.cpt_ewallet.databinding.ItemSalaryBankCardHeaderBinding
-import com.hongyegroup.cpt_ewallet.mvvm.EWalletSalaryCardViewModel
-import com.lxj.xpopup.XPopup
-import com.scwang.smart.refresh.layout.api.RefreshLayout
-import com.scwang.smart.refresh.layout.listener.OnRefreshListener
-import dagger.hilt.android.AndroidEntryPoint
-
-/**
- * 电子钱包工资卡列表
- */
-@AndroidEntryPoint
-class EWalletSalaryCardActivity : YYBaseVDBActivity<EWalletSalaryCardViewModel, ActivityEwalletSalarycardBinding>(), OnRefreshListener,
-    OnLoadMoreListener {
-
-    companion object {
-        fun startInstance() {
-            val context = CommUtils.getContext()
-            val intent = Intent(context, EWalletSalaryCardActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            context.startActivity(intent)
-        }
-    }
-
-    override fun getDataBindingConfig(): DataBindingConfig {
-        return DataBindingConfig(R.layout.activity_ewallet_salarycard)
-    }
-
-    override fun init(savedInstanceState: Bundle?) {
-        setStatusBarBlackText()
-
-        initRV()
-        initData()
-        initListener()
-    }
-
-    private fun initData() {
-        mViewModel.getAllBankCards().observe(this) {
-            mBinding.refreshLayout.finishRefresh()
-            mViewModel.mAdapter.loadMoreModule.isEnableLoadMore = true
-        }
-    }
-
-    private fun initRV() {
-        //获取到头部局
-        val headerView = CommUtils.inflate(R.layout.item_salary_bank_card_header)
-        //绑定DataBinding 并赋值自定义的数据
-        DataBindingUtil.bind<ItemSalaryBankCardHeaderBinding>(headerView)?.apply {
-            setVariable(BR.click, ClickProxy())
-        }
-        mViewModel.mAdapter.addHeaderView(headerView)
-
-        mBinding.recyclerView.vertical().adapter = mViewModel.mAdapter
-    }
-
-    private fun initListener() {
-        //Adapter的滑动监听，监听加载更多
-        mViewModel.mAdapter.loadMoreModule.isEnableLoadMore = false
-        mViewModel.mAdapter.loadMoreModule.preLoadNumber = 4
-        mViewModel.mAdapter.loadMoreModule.setOnLoadMoreListener(this)
-
-        //刷新控件初始化
-        mBinding.refreshLayout.setEnableNestedScroll(true)
-        mBinding.refreshLayout.setEnableLoadMore(false)
-        mBinding.refreshLayout.setEnableRefresh(true)
-        mBinding.refreshLayout.setOnRefreshListener(this)
-
-        //Item点击
-        mViewModel.mAdapter.addChildClickViewIds(R.id.ll_content_root, R.id.tv_bank_unbind)
-        mViewModel.mAdapter.setOnItemChildClickListener { _, view, position ->
-            val item = mViewModel.mDatas[position]
-            when (view.id) {
-                R.id.tv_bank_unbind -> {
-                    unbindCardPopup(item)
-                }
-                else -> {
-                    toast("进入我的银行卡:$position")
-                }
-            }
-
-        }
-    }
-
-    //解绑银行卡弹窗
-    private fun unbindCardPopup(cardBean: BankCardBean) {
-        XPopup.Builder(mActivity)
-            .asCustom(
-                CustomNormalPopup(mActivity, null, "确认解绑银行卡？", "确认解绑", "放弃解绑") {
-                    toast("执行解绑操作")
-                }
-            )
-            .show()
-    }
-
-    override fun onRefresh(refreshLayout: RefreshLayout) {
-        mViewModel.isNeedCleanAllData = true
-        mViewModel.mAdapter.loadMoreModule.loadMoreComplete()
-        mViewModel.mAdapter.loadMoreModule.isEnableLoadMore = false
-        //直接调用，参数从成员变量中获取
-        mViewModel.mCurPage = 1
-        initData()
-    }
-
-    override fun onLoadMore() {
-        mViewModel.isNeedCleanAllData = false
-        mViewModel.mCurPage++
-        initData()
-    }
-
-    override fun startObserve() {
-
-    }
-
-    /**
-     * DataBinding事件处理
-     */
-    inner class ClickProxy {
-
-        //添加新的银行卡
-        fun addBankCard() {
-            SalaryCardAddStepOneActivity.startInstance()
-        }
-    }
-}

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

@@ -1,85 +0,0 @@
-package com.hongyegroup.cpt_ewallet.ui
-
-import android.content.Intent
-import android.os.Bundle
-import android.text.Html
-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.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.ActivityEwalletWithdrawalBinding
-import com.hongyegroup.cpt_ewallet.mvvm.EWalletWithdrawalViewModel
-import com.hongyegroup.cpt_ewallet.widget.ChooseBankCardPopup
-import com.lxj.xpopup.XPopup
-import dagger.hilt.android.AndroidEntryPoint
-
-@AndroidEntryPoint
-class EWalletWithdrawalActivity : YYBaseVDBActivity<EWalletWithdrawalViewModel, ActivityEwalletWithdrawalBinding>() {
-
-    companion object {
-        fun startInstance() {
-            val context = CommUtils.getContext()
-            val intent = Intent(context, EWalletWithdrawalActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            context.startActivity(intent)
-        }
-    }
-
-    override fun getDataBindingConfig(): DataBindingConfig {
-        return DataBindingConfig(R.layout.activity_ewallet_withdrawal, BR.viewModel, mViewModel)
-            .addBindingParams(BR.click, ClickProxy())
-    }
-
-    override fun init(savedInstanceState: Bundle?) {
-        setStatusBarBlackText()
-
-        initData()
-
-    }
-
-    private fun initData() {
-        mBinding.tvMoneyAvailable.text = Html.fromHtml(getString(R.string.ewallet_balance_available, "980.5"))
-    }
-
-    override fun startObserve() {
-
-    }
-
-    /**
-     * DataBinding事件处理
-     */
-    inner class ClickProxy {
-
-        //选择银行卡
-        fun selectBankCard() {
-            KeyboardUtils.hideSoftInput(mActivity)
-            chooseBankCard()
-        }
-
-        //选择银行卡Popup
-        private fun chooseBankCard() {
-            XPopup.Builder(mActivity)
-                .moveUpToKeyboard(false)
-                .hasShadowBg(true)
-                .asCustom(ChooseBankCardPopup(mActivity,
-                    addNewCardAction = {
-                        //去添加新的银行卡
-                        SalaryCardAddStepOneActivity.startInstance()
-                    }, chooseCardAction = { pos ->
-                        toast("选择了第 $pos 个索引")
-                    })
-                )
-                .show()
-        }
-
-        //去下一步
-        fun gotoNext() {
-            KeyboardUtils.hideSoftInput(mActivity)
-            WithdrawalVerifyActivity.startInstance()
-        }
-
-    }
-}

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

@@ -1,77 +0,0 @@
-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.cs_cptservices.popup.CustomNormalPopup
-import com.guadou.lib_baselib.bean.DataBindingConfig
-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.ActivitySalaryCardAddOneBinding
-import com.hongyegroup.cpt_ewallet.mvvm.SalaryAddOneViewModel
-import com.lxj.xpopup.XPopup
-import dagger.hilt.android.AndroidEntryPoint
-
-/**
- * 添加银行卡的第一步
- */
-@AndroidEntryPoint
-class SalaryCardAddStepOneActivity : YYBaseVDBActivity<SalaryAddOneViewModel, ActivitySalaryCardAddOneBinding>() {
-
-    companion object {
-        fun startInstance() {
-            val context = CommUtils.getContext()
-            val intent = Intent(context, SalaryCardAddStepOneActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            context.startActivity(intent)
-        }
-    }
-
-    override fun onNewIntent(intent: Intent?) {
-        super.onNewIntent(intent)
-        //当重新启动此页面关闭此页面
-        finish()
-    }
-
-    override fun getDataBindingConfig(): DataBindingConfig {
-        return DataBindingConfig(R.layout.activity_salary_card_add_one, BR.viewModel, mViewModel)
-            .addBindingParams(BR.click, ClickProxy())
-    }
-
-    override fun init(savedInstanceState: Bundle?) {
-        setStatusBarBlackText()
-    }
-
-    override fun startObserve() {
-
-    }
-
-    /**
-     * DataBinding事件处理
-     */
-    inner class ClickProxy {
-
-        //展示提示弹窗
-        fun showTips() {
-            KeyboardUtils.hideSoftInput(mActivity)
-
-            XPopup.Builder(mActivity)
-                .asCustom(
-                    CustomNormalPopup(
-                        mActivity, "持卡人说明",
-                        "为了您的账户资金安全，\n只能绑定持卡人本人的银行卡。", "知道了"
-                    )
-                )
-                .show()
-        }
-
-        //下一步
-        fun gotoNext() {
-            KeyboardUtils.hideSoftInput(mActivity)
-            SalaryCardAddStepTwoActivity.startInstance()
-        }
-
-    }
-}

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

@@ -1,99 +0,0 @@
-package com.hongyegroup.cpt_ewallet.ui
-
-import android.annotation.SuppressLint
-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.countDown
-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.ActivitySalaryCardAddThreeBinding
-import com.hongyegroup.cpt_ewallet.mvvm.SalaryAddThreeViewModel
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.cancel
-
-/**
- * 添加银行卡的第三步
- */
-@AndroidEntryPoint
-class SalaryCardAddStepThreeActivity : YYBaseVDBActivity<SalaryAddThreeViewModel, ActivitySalaryCardAddThreeBinding>() {
-
-    private var mCountDownScope: CoroutineScope? = null
-
-    companion object {
-        fun startInstance() {
-            val context = CommUtils.getContext()
-            val intent = Intent(context, SalaryCardAddStepThreeActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            context.startActivity(intent)
-        }
-    }
-
-    override fun getDataBindingConfig(): DataBindingConfig {
-        return DataBindingConfig(R.layout.activity_salary_card_add_three, BR.viewModel, mViewModel)
-            .addBindingParams(BR.click, ClickProxy())
-    }
-
-    override fun init(savedInstanceState: Bundle?) {
-        setStatusBarBlackText()
-    }
-
-    override fun startObserve() {
-
-    }
-
-    //开始倒计时
-    @ExperimentalCoroutinesApi
-    @SuppressLint("SetTextI18n")
-    private fun startCountDown() {
-
-        countDown(59, start = {
-            mCountDownScope = it
-        }, end = {
-            mBinding.tvGetCode.apply {
-                isEnabled = true
-                text = "获取验证码"
-            }
-        }, next = {
-            mBinding.tvGetCode.apply {
-                isEnabled = false
-                text = "重新获取($it)"
-            }
-        })
-    }
-
-    override fun onDestroy() {
-        mCountDownScope?.cancel()
-        super.onDestroy()
-    }
-
-    /**
-     * DataBinding事件处理
-     */
-    inner class ClickProxy {
-
-        fun gotoNext() {
-            KeyboardUtils.hideSoftInput(mActivity)
-
-            //发出消息通知 添加银行卡完成
-            //1.我的工资卡列表刷新  2.提现页面刷新
-
-            SalaryCardAddStepOneActivity.startInstance()
-        }
-
-        //获取短信验证码
-        @ExperimentalCoroutinesApi
-        fun getVerityCode() {
-            KeyboardUtils.hideSoftInput(mActivity)
-            toast("获取短信验证码")
-            startCountDown()
-        }
-
-    }
-}

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

@@ -1,71 +0,0 @@
-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.cs_cptservices.popup.CustomNormalPopup
-import com.guadou.lib_baselib.bean.DataBindingConfig
-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.ActivitySalaryCardAddTwoBinding
-import com.hongyegroup.cpt_ewallet.mvvm.SalaryAddTwoViewModel
-import com.lxj.xpopup.XPopup
-import dagger.hilt.android.AndroidEntryPoint
-
-/**
- * 添加银行卡的第二步
- */
-@AndroidEntryPoint
-class SalaryCardAddStepTwoActivity : YYBaseVDBActivity<SalaryAddTwoViewModel, ActivitySalaryCardAddTwoBinding>() {
-
-    companion object {
-        fun startInstance() {
-            val context = CommUtils.getContext()
-            val intent = Intent(context, SalaryCardAddStepTwoActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            context.startActivity(intent)
-        }
-    }
-
-    override fun getDataBindingConfig(): DataBindingConfig {
-        return DataBindingConfig(R.layout.activity_salary_card_add_two, BR.viewModel, mViewModel)
-            .addBindingParams(BR.click, ClickProxy())
-    }
-
-    override fun init(savedInstanceState: Bundle?) {
-        setStatusBarBlackText()
-    }
-
-    override fun startObserve() {
-
-    }
-
-    /**
-     * DataBinding事件处理
-     */
-    inner class ClickProxy {
-
-        //展示提示弹窗
-        fun showTips() {
-            KeyboardUtils.hideSoftInput(mActivity)
-
-            XPopup.Builder(mActivity)
-                .asCustom(
-                    CustomNormalPopup(
-                        mActivity, "手机号说明",
-                        "银行预留的手机号是办理该银行\n卡时所填写的手机号码。\n没有预留、手机号忘记或者已停\n用，请联系银行客服更新处理", "知道了"
-                    )
-                )
-                .show()
-        }
-
-        //下一步
-        fun gotoNext() {
-            KeyboardUtils.hideSoftInput(mActivity)
-            SalaryCardAddStepThreeActivity.startInstance()
-        }
-
-    }
-}

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

@@ -1,51 +0,0 @@
-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.utils.CommUtils
-import com.hongyegroup.cpt_ewallet.BR
-import com.hongyegroup.cpt_ewallet.R
-import com.hongyegroup.cpt_ewallet.databinding.ActivityWithdrawalSuccessBinding
-import com.hongyegroup.cpt_ewallet.mvvm.WithdrawalSuccessViewModel
-import dagger.hilt.android.AndroidEntryPoint
-
-@AndroidEntryPoint
-class WithdrawalSuccessActivity : YYBaseVDBActivity<WithdrawalSuccessViewModel, ActivityWithdrawalSuccessBinding>() {
-
-    companion object {
-        fun startInstance() {
-            val context = CommUtils.getContext()
-            val intent = Intent(context, WithdrawalSuccessActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            context.startActivity(intent)
-        }
-    }
-
-    override fun getDataBindingConfig(): DataBindingConfig {
-        return DataBindingConfig(R.layout.activity_withdrawal_success, BR.viewModel, mViewModel)
-            .addBindingParams(BR.click, ClickProxy())
-    }
-
-    override fun init(savedInstanceState: Bundle?) {
-        setStatusBarBlackText()
-    }
-
-    override fun startObserve() {
-
-    }
-
-
-    /**
-     * DataBinding事件处理
-     */
-    inner class ClickProxy {
-
-        //点击完成
-        fun withdrawFinish() {
-            EWalletWithdrawalActivity.startInstance()
-        }
-
-    }
-}

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

@@ -1,94 +0,0 @@
-package com.hongyegroup.cpt_ewallet.ui
-
-import android.annotation.SuppressLint
-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.countDown
-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.ActivityWithdrawalVerifyBinding
-import com.hongyegroup.cpt_ewallet.mvvm.WithdrawalVerifyViewModel
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.cancel
-
-@AndroidEntryPoint
-class WithdrawalVerifyActivity : YYBaseVDBActivity<WithdrawalVerifyViewModel, ActivityWithdrawalVerifyBinding>() {
-
-    private var mCountDownScope: CoroutineScope? = null
-
-    companion object {
-        fun startInstance() {
-            val context = CommUtils.getContext()
-            val intent = Intent(context, WithdrawalVerifyActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            context.startActivity(intent)
-        }
-    }
-
-    override fun getDataBindingConfig(): DataBindingConfig {
-        return DataBindingConfig(R.layout.activity_withdrawal_verify, BR.viewModel, mViewModel)
-            .addBindingParams(BR.click, ClickProxy())
-    }
-
-    override fun init(savedInstanceState: Bundle?) {
-        setStatusBarBlackText()
-    }
-
-    override fun startObserve() {
-
-    }
-
-    //开始倒计时
-    @ExperimentalCoroutinesApi
-    @SuppressLint("SetTextI18n")
-    private fun startCountDown() {
-
-        countDown(59, start = {
-            mCountDownScope = it
-        }, end = {
-            mBinding.tvGetCode.apply {
-                isEnabled = true
-                text = "获取验证码"
-            }
-        }, next = {
-            mBinding.tvGetCode.apply {
-                isEnabled = false
-                text = "重新获取($it)"
-            }
-        })
-    }
-
-    override fun onDestroy() {
-        mCountDownScope?.cancel()
-        super.onDestroy()
-    }
-
-    /**
-     * DataBinding事件处理
-     */
-    inner class ClickProxy {
-
-        fun gotoNext() {
-            KeyboardUtils.hideSoftInput(mActivity)
-            WithdrawalSuccessActivity.startInstance()
-            finish()
-        }
-
-        //获取短信验证码
-        @ExperimentalCoroutinesApi
-        fun getVerityCode() {
-            KeyboardUtils.hideSoftInput(mActivity)
-            toast("获取短信验证码")
-            startCountDown()
-        }
-
-    }
-
-}

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

@@ -1,94 +0,0 @@
-package com.hongyegroup.cpt_ewallet.widget
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.view.View
-import android.widget.ImageView
-import androidx.recyclerview.widget.RecyclerView
-import com.guadou.lib_baselib.ext.click
-import com.guadou.lib_baselib.ext.vertical
-import com.hongyegroup.cpt_ewallet.R
-import com.hongyegroup.cpt_ewallet.bean.BankCardBean
-import com.lxj.easyadapter.EasyAdapter
-import com.lxj.easyadapter.MultiItemTypeAdapter
-import com.lxj.easyadapter.ViewHolder
-import com.lxj.xpopup.core.CenterPopupView
-import com.lxj.xpopup.util.XPopupUtils
-
-/**
- * MC提交错误提示弹窗
- */
-@SuppressLint("ViewConstructor")
-class ChooseBankCardPopup(
-    context: Context,
-    private val addNewCardAction: (() -> Unit)? = null,
-    private val chooseCardAction: ((pos: Int) -> Unit)? = null,
-) : CenterPopupView(context) {
-
-    private lateinit var rvBankCard: RecyclerView
-    private val mDatas = mutableListOf<BankCardBean>()
-
-    override fun getImplLayoutId(): Int = R.layout.popup_choose_bank_card
-
-    override fun onCreate() {
-        super.onCreate()
-
-        findViewById<View>(R.id.ll_add_card).click {
-            //添加银行卡
-            addNewCardAction?.invoke()
-            dismiss()
-        }
-        findViewById<View>(R.id.iv_popup_close).click {
-            dismiss()
-        }
-
-        initData()
-
-        rvBankCard = findViewById(R.id.rv_bank_card)
-        initRV()
-    }
-
-    private fun initData() {
-        mDatas.add(BankCardBean().apply {
-            name = "平安银行 储蓄卡(尾号 5788)"
-        })
-        mDatas.add(BankCardBean().apply {
-            name = "建设银行卡 储蓄卡(尾号 5788)"
-        })
-        mDatas.add(BankCardBean().apply {
-            name = "招商银行 储蓄卡(尾号 5788)"
-        })
-        mDatas.add(BankCardBean().apply {
-            name = "平安银行 储蓄卡(尾号 5788)"
-        })
-        mDatas.add(BankCardBean().apply {
-            name = "中信银行 储蓄卡(尾号 5788)"
-        })
-    }
-
-    private fun initRV() {
-        val mAdapter: EasyAdapter<BankCardBean> = object : EasyAdapter<BankCardBean>(mDatas, R.layout.item_chosoe_bank_card) {
-            override fun bind(holder: ViewHolder, item: BankCardBean, position: Int) {
-                holder.setText(R.id.tv_bank_name, item.name)
-                holder.getView<ImageView>(R.id.iv_bank_logo).setImageResource(R.drawable.jsyh)
-            }
-        }
-        mAdapter.setOnItemClickListener(object : MultiItemTypeAdapter.SimpleOnItemClickListener() {
-            override fun onItemClick(view: View, holder: RecyclerView.ViewHolder, position: Int) {
-                chooseCardAction?.invoke(position)
-                dismiss()
-
-            }
-        })
-
-        rvBankCard.vertical().apply {
-            adapter = mAdapter
-        }
-    }
-
-    //如果不设置可能出现xml的背景圆角无法正常显示
-    override fun getMaxWidth(): Int {
-        return if (popupInfo.maxWidth == 0) (XPopupUtils.getWindowWidth(context) * 0.99f).toInt() else popupInfo.maxWidth
-    }
-
-}

cpt_ewallet/src/main/res/drawable/shape_blance_top_item_bg.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="#2597FB"/>
+    <corners android:radius="@dimen/d_50dp"/>
+     <stroke android:width="1px" android:color="#4fadff"/>
+
+</shape>

cpt_ewallet/src/main/res/drawable/shape_salary_card_top_yellow.xml

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

cpt_ewallet/src/main/res/drawable/shape_salary_card_unbind_border.xml

@@ -1,10 +0,0 @@
-<?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="#C9C9C9" android:width="@dimen/d_0.7dp"/>
-
-    <corners android:radius="@dimen/d_3dp"/>
-
-</shape>

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

@@ -1,110 +0,0 @@
-<?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.EWalletHistoryViewModel" />
-
-        <variable
-            name="click"
-            type="com.hongyegroup.cpt_ewallet.ui.EWalletHistoryActivity.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"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:Easy_menuImgSize="@dimen/d_17dp"
-            app:Easy_title="交易记录" />
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="32dp"
-            android:layout_marginLeft="@dimen/d_15dp"
-            android:layout_marginTop="@dimen/d_11dp"
-            android:layout_marginRight="@dimen/d_15dp"
-            android:layout_marginBottom="@dimen/d_11dp"
-            android:background="@drawable/shape_search_gray_bg_corners20"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="@dimen/d_16dp"
-                android:layout_height="@dimen/d_16dp"
-                android:layout_marginLeft="@dimen/d_12dp"
-                android:src="@drawable/search_icon"
-                binding:clicks="@{click.doSearch}" />
-
-            <EditText
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/d_12dp"
-                android:layout_weight="1"
-                android:background="@color/transparent"
-                android:hint="搜索"
-                android:imeOptions="actionSearch"
-                android:singleLine="true"
-                android:text="@={viewModel.mKeywordLiveData}"
-                android:textColor="@color/black"
-                android:textColorHint="@color/gray_99"
-                android:textSize="@dimen/d_14sp"
-                binding:onKeyEnter="@{click.doSearch}"
-                binding:typefaceMedium="@{true}" />
-
-            <ImageView
-                android:layout_width="@dimen/d_16dp"
-                android:layout_height="@dimen/d_16dp"
-                android:layout_marginRight="@dimen/d_10dp"
-                android:src="@drawable/search_delete"
-                android:visibility="gone"
-                binding:clicks="@{click.searchDel}"
-                binding:isVisibleGone="@{!TextUtils.isEmpty(viewModel.MKeywordLiveData)}" />
-
-        </LinearLayout>
-
-        <!--   刷新+列表   -->
-        <com.scwang.smart.refresh.layout.SmartRefreshLayout
-            android:id="@+id/refresh_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            app:srlEnablePreviewInEditMode="true"
-            app:srlPrimaryColor="@color/white">
-
-            <com.scwang.smart.refresh.header.ClassicsHeader
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:overScrollMode="never"
-                android:scrollbars="vertical">
-
-            </androidx.recyclerview.widget.RecyclerView>
-
-        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
-
-    </LinearLayout>
-
-</layout>

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

@@ -1,53 +0,0 @@
-<?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>
-
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/page_bg"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:orientation="vertical">
-
-        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
-            android:id="@+id/easy_title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:Easy_title="我的工资卡" />
-
-
-        <!--   刷新+列表   -->
-        <com.scwang.smart.refresh.layout.SmartRefreshLayout
-            android:id="@+id/refresh_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            app:srlEnablePreviewInEditMode="true"
-            app:srlPrimaryColor="@color/white">
-
-            <com.scwang.smart.refresh.header.ClassicsHeader
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:overScrollMode="never"
-                android:scrollbars="none" />
-
-        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
-
-    </LinearLayout>
-
-</layout>

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

@@ -1,161 +0,0 @@
-<?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.EWalletWithdrawalViewModel" />
-
-        <variable
-            name="click"
-            type="com.hongyegroup.cpt_ewallet.ui.EWalletWithdrawalActivity.ClickProxy" />
-
-        <import type="android.text.TextUtils" />
-
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/page_bg"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:orientation="vertical">
-
-        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:Easy_title="提现" />
-
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/selector_btn_white_gray_bg"
-            android:orientation="horizontal"
-            android:paddingLeft="@dimen/d_15dp"
-            android:paddingTop="@dimen/d_15dp"
-            android:paddingRight="@dimen/d_15dp"
-            android:paddingBottom="@dimen/d_11dp"
-            binding:clicks="@{click.selectBankCard}">
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:id="@+id/tv_card_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="储蓄卡"
-                android:textColor="@color/black_33"
-                android:textSize="@dimen/d_15sp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:id="@+id/tv_card_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="68dp"
-                android:text="平安银行（尾号5788）"
-                android:textColor="@color/black_33"
-                android:textSize="@dimen/d_15sp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/d_8dp"
-                android:text="预计2小时内到账"
-                android:textColor="@color/gray_88"
-                android:textSize="@dimen/d_12sp"
-                app:layout_constraintLeft_toLeftOf="@id/tv_card_name"
-                app:layout_constraintTop_toBottomOf="@id/tv_card_name" />
-
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/more_gray_icon"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:layout_marginLeft="@dimen/d_15dp"
-            android:background="@color/divider_gray_c5" />
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_48dp"
-            android:background="@color/white"
-            android:paddingLeft="@dimen/d_15dp"
-            android:paddingRight="@dimen/d_15dp">
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="金额"
-                android:textColor="@color/black_33"
-                android:textSize="@dimen/d_15sp" />
-
-            <EditText
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="68dp"
-                android:layout_weight="1"
-                android:background="@color/transparent"
-                android:inputType="numberDecimal"
-                android:singleLine="true"
-                android:text="@={viewModel.mMoneyLD}"
-                android:textColor="@color/black"
-                android:textColorHint="@color/gray_99"
-                android:textSize="@dimen/d_14sp"
-                binding:setDecimalPoints="@{2}"
-                binding:typefaceMedium="@{true}" />
-
-        </FrameLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:background="@color/divider_gray_c5" />
-
-
-        <com.guadou.lib_baselib.font_text_view.TextViewMedium
-            android:id="@+id/tv_money_available"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/d_16dp"
-            android:layout_marginTop="@dimen/d_13dp"
-            android:layout_marginRight="@dimen/d_16dp"
-            android:text="当前可提现980.00元，单笔提现限额10000.00元"
-            android:textColor="@color/gray_88"
-            android:textSize="@dimen/d_14sp" />
-
-
-        <Button
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_45dp"
-            android:layout_marginLeft="@dimen/d_28dp"
-            android:layout_marginTop="@dimen/d_20dp"
-            android:layout_marginRight="@dimen/d_28dp"
-            android:background="@drawable/selector_blue_btn_bg_round5"
-            android:text="下一步"
-            android:textColor="@color/white"
-            android:textSize="@dimen/d_17sp"
-            binding:clicks="@{click.gotoNext}"
-            binding:typefaceBold="@{true}" />
-
-    </LinearLayout>
-
-</layout>

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

@@ -1,189 +0,0 @@
-<?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.SalaryAddOneViewModel" />
-
-        <variable
-            name="click"
-            type="com.hongyegroup.cpt_ewallet.ui.SalaryCardAddStepOneActivity.ClickProxy" />
-
-        <import type="android.text.TextUtils" />
-
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/page_bg"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:orientation="vertical">
-
-        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:Easy_title="添加银行卡" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:scaleType="fitStart"
-                android:src="@drawable/step_selected_icon" />
-
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/d_6dp"
-                android:layout_marginRight="@dimen/d_6dp"
-                android:layout_weight="1"
-                android:src="@drawable/step_unselected_icon" />
-
-
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:scaleType="fitEnd"
-                android:src="@drawable/step_unselected_icon" />
-
-        </LinearLayout>
-
-
-        <com.guadou.lib_baselib.font_text_view.TextViewMedium
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/d_16dp"
-            android:layout_marginTop="@dimen/d_15dp"
-            android:layout_marginRight="@dimen/d_16dp"
-            android:layout_marginBottom="@dimen/d_13dp"
-            android:text="请添加持卡人本人的银行卡"
-            android:textColor="@color/gray_88"
-            android:textSize="@dimen/d_14sp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:background="@color/divider_gray_c5" />
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_48dp"
-            android:background="@color/white"
-            android:paddingLeft="@dimen/d_15dp"
-            android:paddingRight="@dimen/d_15dp">
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="持卡人"
-                android:textColor="@color/black_33"
-                android:textSize="@dimen/d_15sp" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="68dp"
-                android:layout_weight="1"
-                android:text="田晓霞"
-                android:textColor="@color/black_33"
-                android:textSize="@dimen/d_15sp" />
-
-            <ImageView
-                binding:clicks="@{click.showTips}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|right"
-                android:padding="@dimen/d_5dp"
-                android:src="@drawable/gray_yips_icon" />
-
-        </FrameLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:layout_marginLeft="@dimen/d_15dp"
-            android:background="@color/divider_gray_c5" />
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_48dp"
-            android:background="@color/white"
-            android:paddingLeft="@dimen/d_15dp"
-            android:paddingRight="@dimen/d_15dp">
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="卡号"
-                android:textColor="@color/black_33"
-                android:textSize="@dimen/d_15sp" />
-
-            <EditText
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="68dp"
-                android:layout_weight="1"
-                android:background="@color/transparent"
-                android:hint="输入银行卡卡号"
-                android:inputType="number"
-                android:singleLine="true"
-                android:text="@={viewModel.mBankCodeLd}"
-                android:textColor="@color/black_33"
-                android:textColorHint="@color/gray_99"
-                android:textSize="@dimen/d_15sp"
-                binding:typefaceMedium="@{true}" />
-
-        </FrameLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:background="@color/divider_gray_c5" />
-
-        <com.guadou.lib_baselib.font_text_view.TextViewMedium
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/d_16dp"
-            android:layout_marginTop="@dimen/d_13dp"
-            android:layout_marginRight="@dimen/d_16dp"
-            android:drawableLeft="@drawable/gray_password_icon"
-            android:drawablePadding="@dimen/d_7dp"
-            android:text="信息加密处理，仅用于银行验证"
-            android:textColor="@color/gray_88"
-            android:textSize="@dimen/d_14sp" />
-
-
-        <Button
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_45dp"
-            android:layout_marginLeft="@dimen/d_28dp"
-            android:layout_marginTop="@dimen/d_20dp"
-            android:layout_marginRight="@dimen/d_28dp"
-            android:background="@drawable/selector_blue_btn_bg_round5"
-            android:text="下一步"
-            android:textColor="@color/white"
-            android:textSize="@dimen/d_17sp"
-            binding:clicks="@{click.gotoNext}"
-            binding:typefaceBold="@{true}" />
-
-    </LinearLayout>
-
-</layout>

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

@@ -1,144 +0,0 @@
-<?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.SalaryAddThreeViewModel" />
-
-        <variable
-            name="click"
-            type="com.hongyegroup.cpt_ewallet.ui.SalaryCardAddStepThreeActivity.ClickProxy" />
-
-        <import type="android.text.TextUtils" />
-
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/page_bg"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:orientation="vertical">
-
-        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:Easy_title="填写验证码" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:scaleType="fitStart"
-                android:src="@drawable/step_selected_icon" />
-
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/d_6dp"
-                android:layout_marginRight="@dimen/d_6dp"
-                android:layout_weight="1"
-                android:src="@drawable/step_selected_icon" />
-
-
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:scaleType="fitEnd"
-                android:src="@drawable/step_selected_icon" />
-
-        </LinearLayout>
-
-
-        <com.guadou.lib_baselib.font_text_view.TextViewMedium
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/d_16dp"
-            android:layout_marginTop="@dimen/d_25dp"
-            android:layout_marginRight="@dimen/d_16dp"
-            android:layout_marginBottom="@dimen/d_25dp"
-            android:text="绑定银行卡需要短信确认\n验证码已发送至手机号：133****5888"
-            android:textColor="@color/gray_88"
-            android:textSize="@dimen/d_14sp" />
-
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:background="@color/divider_gray_c5" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_48dp"
-            android:background="@color/white"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <EditText
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="@dimen/d_15dp"
-                android:layout_marginRight="@dimen/d_15dp"
-                android:layout_weight="1"
-                android:background="@color/transparent"
-                android:hint="请输入短信验证码"
-                android:inputType="number"
-                android:singleLine="true"
-                android:text="@={viewModel.MCodeLD}"
-                android:textColor="@color/black"
-                android:textColorHint="@color/gray_99"
-                android:textSize="@dimen/d_15sp"
-                binding:typefaceMedium="@{true}" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:id="@+id/tv_get_code"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/d_15dp"
-                android:background="@drawable/shape_blue_round3_border"
-                android:paddingLeft="@dimen/d_25dp"
-                android:paddingTop="@dimen/d_8dp"
-                android:paddingRight="@dimen/d_25dp"
-                android:paddingBottom="@dimen/d_8dp"
-                android:text="获取验证码"
-                android:textColor="@color/app_blue"
-                android:textSize="@dimen/d_13sp"
-                binding:clicks="@{click.getVerityCode}" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:background="@color/divider_gray_c5" />
-
-        <Button
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_45dp"
-            android:layout_marginLeft="@dimen/d_28dp"
-            android:layout_marginTop="@dimen/d_35dp"
-            android:layout_marginRight="@dimen/d_28dp"
-            android:background="@drawable/selector_blue_btn_bg_round5"
-            android:text="完成"
-            android:textColor="@color/white"
-            android:textSize="@dimen/d_17sp"
-            binding:clicks="@{click.gotoNext}"
-            binding:typefaceBold="@{true}" />
-
-    </LinearLayout>
-
-</layout>

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

@@ -1,190 +0,0 @@
-<?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.SalaryAddTwoViewModel" />
-
-        <variable
-            name="click"
-            type="com.hongyegroup.cpt_ewallet.ui.SalaryCardAddStepTwoActivity.ClickProxy" />
-
-        <import type="android.text.TextUtils" />
-
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/page_bg"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:orientation="vertical">
-
-        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:Easy_title="添加银行卡" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:scaleType="fitStart"
-                android:src="@drawable/step_selected_icon" />
-
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/d_6dp"
-                android:layout_marginRight="@dimen/d_6dp"
-                android:layout_weight="1"
-                android:src="@drawable/step_selected_icon" />
-
-
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:scaleType="fitEnd"
-                android:src="@drawable/step_unselected_icon" />
-
-        </LinearLayout>
-
-
-        <com.guadou.lib_baselib.font_text_view.TextViewMedium
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/d_16dp"
-            android:layout_marginTop="@dimen/d_15dp"
-            android:layout_marginRight="@dimen/d_16dp"
-            android:layout_marginBottom="@dimen/d_13dp"
-            android:text="请添加持卡人本人的银行卡"
-            android:textColor="@color/gray_88"
-            android:textSize="@dimen/d_14sp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:background="@color/divider_gray_c5" />
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_48dp"
-            android:background="@color/white"
-            android:paddingLeft="@dimen/d_15dp"
-            android:paddingRight="@dimen/d_15dp">
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="卡类型"
-                android:textColor="@color/black_33"
-                android:textSize="@dimen/d_15sp" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="68dp"
-                android:layout_weight="1"
-                android:text="平安银行 储蓄卡"
-                android:textColor="@color/black_33"
-                android:textSize="@dimen/d_15sp" />
-
-        </FrameLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:layout_marginLeft="@dimen/d_15dp"
-            android:background="@color/divider_gray_c5" />
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_48dp"
-            android:background="@color/white"
-            android:paddingLeft="@dimen/d_15dp"
-            android:paddingRight="@dimen/d_15dp">
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="手机号"
-                android:textColor="@color/black_33"
-                android:textSize="@dimen/d_15sp" />
-
-            <EditText
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="68dp"
-                android:layout_weight="1"
-                android:background="@color/transparent"
-                android:hint="请输入银行预留手机号码"
-                android:inputType="phone"
-                android:singleLine="true"
-                android:text="@={viewModel.mBankMobileLd}"
-                android:textColor="@color/black_33"
-                android:textColorHint="@color/gray_99"
-                android:textSize="@dimen/d_15sp"
-                binding:typefaceMedium="@{true}" />
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|right"
-                android:padding="@dimen/d_5dp"
-                android:src="@drawable/gray_yips_icon"
-                binding:clicks="@{click.showTips}" />
-
-        </FrameLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:background="@color/divider_gray_c5" />
-
-
-        <com.guadou.lib_baselib.font_text_view.TextViewMedium
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/d_16dp"
-            android:layout_marginTop="@dimen/d_13dp"
-            android:layout_marginRight="@dimen/d_16dp"
-            android:drawableLeft="@drawable/gray_password_icon"
-            android:drawablePadding="@dimen/d_7dp"
-            android:text="信息加密处理，仅用于银行验证"
-            android:textColor="@color/gray_88"
-            android:textSize="@dimen/d_14sp" />
-
-
-        <Button
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_45dp"
-            android:layout_marginLeft="@dimen/d_28dp"
-            android:layout_marginTop="@dimen/d_20dp"
-            android:layout_marginRight="@dimen/d_28dp"
-            android:background="@drawable/selector_blue_btn_bg_round5"
-            android:text="下一步"
-            android:textColor="@color/white"
-            android:textSize="@dimen/d_17sp"
-            binding:clicks="@{click.gotoNext}"
-            binding:typefaceBold="@{true}" />
-
-    </LinearLayout>
-
-</layout>

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

@@ -1,157 +0,0 @@
-<?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.WithdrawalSuccessViewModel" />
-
-        <variable
-            name="click"
-            type="com.hongyegroup.cpt_ewallet.ui.WithdrawalSuccessActivity.ClickProxy" />
-
-        <import type="android.text.TextUtils" />
-
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/page_bg"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:orientation="vertical">
-
-        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:Easy_title="提现结果" />
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="185dp">
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:drawableTop="@drawable/wallet_withdrawal_success"
-                android:drawablePadding="@dimen/d_17dp"
-                android:text="已提交银行处理"
-                android:textColor="@color/withdrawal_success_text"
-                android:textSize="@dimen/d_16sp" />
-
-        </FrameLayout>
-
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_48dp"
-            android:background="@drawable/selector_btn_white_gray_bg"
-            android:paddingLeft="@dimen/d_15dp"
-            android:paddingRight="@dimen/d_17dp">
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="预计到账时间"
-                android:textColor="@color/gray_66"
-                android:textSize="@dimen/d_14sp" />
-
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|right"
-                android:text="预计 2022-01-14 16:55:18前到账"
-                android:textColor="@color/black_33"
-                android:textSize="@dimen/d_14sp" />
-
-        </FrameLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:background="@color/divider_color_ee" />
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_48dp"
-            android:background="@drawable/selector_btn_white_gray_bg"
-            android:paddingLeft="@dimen/d_15dp"
-            android:paddingRight="@dimen/d_17dp">
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="提现到"
-                android:textColor="@color/gray_66"
-                android:textSize="@dimen/d_14sp" />
-
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|right"
-                android:text="平安银行 储蓄卡 (5788)"
-                android:textColor="@color/black_33"
-                android:textSize="@dimen/d_14sp" />
-
-        </FrameLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:background="@color/divider_color_ee" />
-
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_48dp"
-            android:background="@drawable/selector_btn_white_gray_bg"
-            android:paddingLeft="@dimen/d_15dp"
-            android:paddingRight="@dimen/d_17dp">
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="提现金额"
-                android:textColor="@color/gray_66"
-                android:textSize="@dimen/d_14sp" />
-
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|right"
-                android:text="980.00元"
-                android:textColor="@color/black_33"
-                android:textSize="@dimen/d_14sp" />
-
-        </FrameLayout>
-
-
-        <Button
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_45dp"
-            android:layout_marginLeft="@dimen/d_28dp"
-            android:layout_marginTop="@dimen/d_45dp"
-            android:layout_marginRight="@dimen/d_28dp"
-            android:background="@drawable/selector_blue_btn_bg_round5"
-            android:text="完成"
-            android:textColor="@color/white"
-            android:textSize="@dimen/d_17sp"
-            binding:clicks="@{click.withdrawFinish}"
-            binding:typefaceBold="@{true}" />
-
-    </LinearLayout>
-
-</layout>

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

@@ -1,167 +0,0 @@
-<?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.WithdrawalVerifyViewModel" />
-
-        <variable
-            name="click"
-            type="com.hongyegroup.cpt_ewallet.ui.WithdrawalVerifyActivity.ClickProxy" />
-
-        <import type="android.text.TextUtils" />
-
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/page_bg"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:orientation="vertical">
-
-        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:Easy_title="提现验证" />
-
-
-        <com.guadou.lib_baselib.font_text_view.TextViewBold
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="@dimen/d_40dp"
-            android:text="提现金额（元）"
-            android:textColor="@color/gray_66"
-            android:textSize="@dimen/d_14sp" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="@dimen/d_12dp"
-            android:orientation="horizontal">
-
-            <com.guadou.lib_baselib.font_text_view.TextViewBold
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="¥"
-                android:textColor="@color/black"
-                android:textSize="@dimen/d_20sp" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewBold
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="980.00"
-                android:textColor="@color/black"
-                android:textSize="34sp" />
-
-        </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_50dp"
-            android:text="提现需要短信确认"
-            android:textColor="@color/gray_88"
-            android:textSize="@dimen/d_14sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/d_4dp">
-
-            <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:text="验证码已发送至手机号："
-                android:textColor="@color/gray_88"
-                android:textSize="@dimen/d_14sp" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="185****9080"
-                android:textColor="@color/gray_88"
-                android:textSize="@dimen/d_14sp" />
-
-        </LinearLayout>
-
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:layout_marginTop="@dimen/d_26dp"
-            android:background="@color/divider_gray_c5" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_48dp"
-            android:background="@color/white"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <EditText
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="@dimen/d_15dp"
-                android:layout_marginRight="@dimen/d_15dp"
-                android:layout_weight="1"
-                android:background="@color/transparent"
-                android:hint="请输入短信验证码"
-                android:inputType="number"
-                android:singleLine="true"
-                android:text="@={viewModel.MCodeLD}"
-                android:textColor="@color/black"
-                android:textColorHint="@color/gray_99"
-                android:textSize="@dimen/d_15sp"
-                binding:typefaceMedium="@{true}" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:id="@+id/tv_get_code"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/d_15dp"
-                android:background="@drawable/shape_blue_round3_border"
-                android:paddingLeft="@dimen/d_25dp"
-                android:paddingTop="@dimen/d_8dp"
-                android:paddingRight="@dimen/d_25dp"
-                android:paddingBottom="@dimen/d_8dp"
-                android:text="获取验证码"
-                android:textColor="@color/app_blue"
-                android:textSize="@dimen/d_13sp"
-                binding:clicks="@{click.getVerityCode}" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:background="@color/divider_gray_c5" />
-
-        <Button
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_45dp"
-            android:layout_marginLeft="@dimen/d_28dp"
-            android:layout_marginTop="@dimen/d_35dp"
-            android:layout_marginRight="@dimen/d_28dp"
-            android:background="@drawable/selector_blue_btn_bg_round5"
-            android:text="完成"
-            android:textColor="@color/white"
-            android:textSize="@dimen/d_17sp"
-            binding:clicks="@{click.gotoNext}"
-            binding:typefaceBold="@{true}" />
-
-    </LinearLayout>
-
-</layout>

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

@@ -17,167 +17,382 @@
 
     </data>
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white"
         android:orientation="vertical">
 
-        <com.guadou.lib_baselib.view.titlebar.StatusbarGrayView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
+            android:id="@+id/easy_title_bar"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/d_46dp"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:text="我的钱包"
-            android:textColor="@color/black"
-            android:textSize="@dimen/d_18sp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:background="@color/divider_color_ee" />
-
-
-        <LinearLayout
+            android:layout_height="wrap_content"
+            app:Easy_backLayoutState="gone"
+            app:Easy_hasStatusPadding="true"
+            app:Easy_lineState="gone"
+            app:Easy_title="电子钱包"
+            app:Easy_titleBarBackground="@color/app_blue"
+            app:Easy_titleColor="@color/white" />
+
+        <com.scwang.smart.refresh.layout.SmartRefreshLayout
+            android:id="@+id/refreshLayout"
             android:layout_width="match_parent"
-            android:layout_height="218dp"
-            android:gravity="center_horizontal"
-            android:orientation="vertical">
-
-            <com.guadou.lib_baselib.font_text_view.TextViewBold
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/d_40dp"
-                android:text="余额（元）"
-                android:textColor="@color/gray_66"
-                android:textSize="@dimen/d_16sp" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/d_12dp"
-                android:orientation="horizontal">
-
-                <com.guadou.lib_baselib.font_text_view.TextViewBold
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="¥"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/d_20sp" />
-
-                <com.guadou.lib_baselib.font_text_view.TextViewBold
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="980.00"
-                    android:textColor="@color/black"
-                    android:textSize="34sp" />
-
-            </LinearLayout>
+            android:layout_height="match_parent"
+            app:srlAccentColor="@android:color/white"
+            app:srlEnablePreviewInEditMode="false"
+            app:srlPrimaryColor="@color/app_blue">
 
-            <Button
+            <com.scwang.smart.refresh.header.ClassicsHeader
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/d_45dp"
-                android:layout_marginLeft="@dimen/d_28dp"
-                android:layout_marginTop="@dimen/d_28dp"
-                android:layout_marginRight="@dimen/d_28dp"
-                android:background="@drawable/selector_blue_btn_bg_round5"
-                android:text="提现"
-                android:textColor="@color/white"
-                android:textSize="@dimen/d_17sp"
-                binding:clicks="@{click.gotoWithdrawal}"
-                binding:typefaceBold="@{true}" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="7.5dp"
-            android:background="@color/page_bg" />
-
+                android:layout_height="wrap_content" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_48dp"
-            android:background="@drawable/selector_btn_white_gray_bg"
-            android:gravity="center_vertical"
-            android:paddingLeft="@dimen/d_15dp"
-            android:paddingRight="@dimen/d_17dp"
-            binding:clicks="@{click.gotoSalaryCard}">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/wallet_salary_card_icon" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewBold
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/d_16dp"
-                android:layout_weight="1"
-                android:text="我的工资卡"
-                android:textColor="@color/black_33"
-                android:textSize="@dimen/d_16sp" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/d_16dp"
-                android:text="5（张）"
-                android:textColor="@color/black_33"
-                android:textSize="@dimen/d_14sp" />
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/more_gray_icon" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:background="@color/divider_color_ee" />
+            <androidx.core.widget.NestedScrollView
+                android:id="@+id/scrollView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:overScrollMode="never"
+                android:scrollbars="none">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_48dp"
-            android:background="@drawable/selector_btn_white_gray_bg"
-            android:gravity="center_vertical"
-            android:paddingLeft="@dimen/d_15dp"
-            android:paddingRight="@dimen/d_17dp"
-            binding:clicks="@{click.gotoHistory}">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/wallet_transtion_history_icon" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewBold
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/d_16dp"
-                android:layout_weight="1"
-                android:text="交易记录"
-                android:textColor="@color/black_33"
-                android:textSize="@dimen/d_16sp" />
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/more_gray_icon" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_0.7dp"
-            android:background="@color/divider_color_ee" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <FrameLayout
+                            android:layout_width="0dp"
+                            android:layout_height="0dp"
+                            android:background="@color/app_blue"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintDimensionRatio="H,750:360"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintRight_toRightOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:layout_marginRight="@dimen/d_8dp"
+                            android:text=""
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/d_12sp"
+                            app:layout_constraintRight_toLeftOf="@+id/tv_money"
+                            app:layout_constraintTop_toTopOf="@+id/tv_money" />
+
+                        <TextView
+                            android:id="@+id/tv_money"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="@dimen/d_10dp"
+                            android:text="￥93,026"
+                            android:textColor="@color/white"
+                            android:textSize="35sp"
+                            app:layout_constraintBottom_toTopOf="@+id/ll_available"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintRight_toRightOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintVertical_chainStyle="packed" />
+
+                        <!--银行卡可提现的-->
+                        <LinearLayout
+                            android:id="@+id/ll_giro"
+                            android:layout_width="wrap_content"
+                            android:layout_height="@dimen/d_30dp"
+                            android:background="@drawable/shape_blance_top_item_bg"
+                            android:gravity="center"
+                            android:minWidth="135dp"
+                            android:orientation="horizontal"
+                            android:paddingLeft="@dimen/d_20dp"
+                            android:paddingRight="@dimen/d_20dp"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintRight_toLeftOf="@+id/ll_available"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_money"
+                            app:layout_constraintTop_toTopOf="@+id/ll_available">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="提现金额:"
+                                android:textColor="@color/white"
+                                android:textSize="@dimen/d_13sp" />
+
+                            <TextView
+                                android:id="@+id/tv_giro"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_5dp"
+                                android:ellipsize="end"
+                                android:singleLine="true"
+                                android:text="0.0"
+                                android:textColor="#f3d774"
+                                android:textSize="@dimen/d_15sp" />
+
+                        </LinearLayout>
+
+                        <!--可用的-->
+                        <LinearLayout
+                            android:id="@+id/ll_available"
+                            android:layout_width="wrap_content"
+                            android:layout_height="@dimen/d_30dp"
+                            android:background="@drawable/shape_blance_top_item_bg"
+                            android:gravity="center"
+                            android:minWidth="135dp"
+                            android:orientation="horizontal"
+                            android:paddingLeft="@dimen/d_20dp"
+                            android:paddingRight="@dimen/d_20dp"
+                            app:layout_constraintBottom_toTopOf="@+id/iv_bolang"
+                            app:layout_constraintLeft_toRightOf="@+id/ll_giro"
+                            app:layout_constraintRight_toRightOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_money">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="可用余额:"
+                                android:textColor="@color/white"
+                                android:textSize="@dimen/d_13sp" />
+
+                            <TextView
+                                android:id="@+id/tv_available"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_5dp"
+                                android:ellipsize="end"
+                                android:singleLine="true"
+                                android:text="0.0"
+                                android:textColor="#f3d774"
+                                android:textSize="@dimen/d_15sp" />
+
+                        </LinearLayout>
+
+
+                        <ImageView
+                            android:id="@+id/iv_bolang"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:scaleType="centerCrop"
+                            android:src="@drawable/iv_balance_bo_lang"
+                            app:layout_constraintBottom_toBottomOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+
+                        <LinearLayout
+                            style="@style/SelectableItemBackground"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <ImageView
+                                android:layout_width="@dimen/d_35dp"
+                                android:layout_height="@dimen/d_35dp"
+                                android:src="@drawable/wallet_withdrawn_icon" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/d_5dp"
+                                android:text="提现"
+                                android:textColor="@color/gray_76"
+                                android:textSize="@dimen/d_13sp" />
+
+                        </LinearLayout>
+
+                        <View
+                            android:layout_width="@dimen/d_1dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginTop="@dimen/d_5dp"
+                            android:layout_marginBottom="@dimen/d_5dp"
+                            android:background="@color/divider_color" />
+
+                        <LinearLayout
+                            style="@style/SelectableItemBackground"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <ImageView
+                                android:layout_width="@dimen/d_35dp"
+                                android:layout_height="@dimen/d_35dp"
+                                android:src="@drawable/wallet_appointments_icon" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/d_5dp"
+                                android:text="提现预约记录"
+                                android:textColor="@color/gray_76"
+                                android:textSize="@dimen/d_13sp" />
+
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_10dp"
+                        android:layout_marginTop="@dimen/d_13dp"
+                        android:background="@color/page_bg" />
+
+
+                    <LinearLayout
+                        style="@style/SelectableItemBackground"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_60dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingLeft="@dimen/d_18dp"
+                        android:paddingRight="@dimen/d_18dp">
+
+                        <ImageView
+                            android:layout_width="@dimen/d_26dp"
+                            android:layout_height="@dimen/d_26dp"
+                            android:src="@drawable/wallet_password_icon" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_8dp"
+                            android:text="支付密码设置"
+                            android:textColor="@color/gray_76"
+                            android:textSize="@dimen/d_15sp" />
+
+                        <View
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1" />
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:src="@drawable/more_gray_icon" />
+
+                    </LinearLayout>
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="0.7dp"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:src="@color/page_bg" />
+
+
+                    <LinearLayout
+                        style="@style/SelectableItemBackground"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_60dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingLeft="@dimen/d_18dp"
+                        android:paddingRight="@dimen/d_18dp">
+
+                        <ImageView
+                            android:layout_width="@dimen/d_25dp"
+                            android:layout_height="@dimen/d_25dp"
+                            android:src="@drawable/wallet_history_icon" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_8dp"
+                            android:text="电子钱包交易记录"
+                            android:textColor="@color/gray_76"
+                            android:textSize="@dimen/d_15sp" />
+
+                        <View
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1" />
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:src="@drawable/more_gray_icon" />
+
+                    </LinearLayout>
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="0.7dp"
+                        android:layout_marginLeft="@dimen/d_15dp"
+                        android:layout_marginRight="@dimen/d_15dp"
+                        android:src="@color/page_bg" />
+
+                    <LinearLayout
+                        style="@style/SelectableItemBackground"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/d_60dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingLeft="@dimen/d_18dp"
+                        android:paddingRight="@dimen/d_18dp">
+
+                        <ImageView
+                            android:layout_width="@dimen/d_25dp"
+                            android:layout_height="@dimen/d_25dp"
+                            android:src="@drawable/wallet_invoice_icon" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_8dp"
+                            android:text="我的工作发票"
+                            android:textColor="@color/gray_76"
+                            android:textSize="@dimen/d_15sp" />
+
+                        <View
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1" />
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:src="@drawable/more_gray_icon" />
+
+                    </LinearLayout>
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d_10dp"
+                        android:drawableRight="@drawable/wallet_recent_more"
+                        android:paddingLeft="@dimen/d_16dp"
+                        android:paddingRight="@dimen/d_16dp"
+                        android:text="最近交易记录"
+                        android:textColor="@color/notify_dark_blue"
+                        android:textSize="@dimen/d_18sp" />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rv_history"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:overScrollMode="never"
+                        android:scrollbars="none" />
+
+                </LinearLayout>
+
+            </androidx.core.widget.NestedScrollView>
+
+        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
     </LinearLayout>
 
+
 </layout>

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

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/d_45dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/iv_bank_logo"
-            android:layout_width="@dimen/d_35dp"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="@dimen/d_15dp"
-            android:scaleType="center"
-            android:src="@drawable/add_icon" />
-
-        <com.guadou.lib_baselib.font_text_view.TextViewMedium
-            android:id="@+id/tv_bank_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/d_14dp"
-            android:layout_weight="1"
-            android:text="添加储蓄卡"
-            android:textColor="@color/black_33"
-            android:textSize="@dimen/d_14sp" />
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="@dimen/d_19dp"
-            android:src="@drawable/more_gray_icon" />
-
-    </LinearLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/d_0.7dp"
-        android:background="@color/divider_gray_c5" />
-
-</LinearLayout>

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

@@ -8,57 +8,71 @@
 
         <variable
             name="item"
-            type="com.hongyegroup.cpt_ewallet.bean.WalletHistoryBean" />
+            type="String" />
+
+        <import type="android.text.TextUtils" />
 
     </data>
 
     <LinearLayout
-        android:id="@+id/ll_content_root"
+        style="@style/SelectableItemBackground"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingLeft="13.5dp"
-            android:paddingTop="@dimen/d_20dp"
-            android:paddingRight="13.5dp"
-            android:paddingBottom="@dimen/d_20dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
+            android:layout_height="104dp"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/iv_icon"
+                android:layout_width="93.5dp"
+                android:layout_height="68dp"
+                android:layout_marginLeft="@dimen/d_14dp"
+                android:layout_marginTop="@dimen/d_16dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/plachholder_img_job_img" />
+
+            <TextView
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <com.guadou.lib_baselib.font_text_view.TextViewBold
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="斗鱼教学主播招聘待遇优厚"
-                    android:textColor="@color/black_33"
-                    android:textSize="@dimen/d_16sp" />
-
-                <com.guadou.lib_baselib.font_text_view.TextViewBold
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="+100元"
-                    android:textColor="@color/text_orange"
-                    android:textSize="@dimen/d_16sp" />
-
-            </LinearLayout>
-
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                android:layout_marginLeft="@dimen/d_12dp"
+                android:layout_marginTop="@dimen/d_16dp"
+                android:layout_marginRight="@dimen/d_12dp"
+                android:layout_toLeftOf="@id/tv_change"
+                android:layout_toRightOf="@id/iv_icon"
+                android:ellipsize="end"
+                android:lineHeight="16dp"
+                android:maxLines="2"
+                android:text="清洁服务"
+                android:textColor="@color/text_yellow_ff9300"
+                android:textSize="@dimen/d_17sp" />
+
+            <TextView
+                android:id="@+id/tv_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_marginLeft="@dimen/d_12dp"
+                android:layout_marginBottom="@dimen/d_22dp"
+                android:layout_toRightOf="@id/iv_icon"
+                android:text="2022/01/22 15:30"
+                android:textColor="@color/gray_76"
+                android:textSize="@dimen/d_13sp" />
+
+            <TextView
+                android:id="@+id/tv_change"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/d_22dp"
-                android:text="2022.1.16 06:00"
-                android:textColor="@color/gray_66"
-                android:textSize="@dimen/d_14sp" />
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="@dimen/d_17dp"
+                android:text="+30.25"
+                android:textColor="@color/profile_red"
+                android:textSize="@dimen/d_24sp" />
+        </RelativeLayout>
 
-        </LinearLayout>
 
         <View
             android:layout_width="match_parent"
@@ -67,5 +81,5 @@
 
     </LinearLayout>
 
+</layout>
 
-</layout>

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

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/d_40dp"
-    android:background="@color/page_bg"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:paddingLeft="@dimen/d_15dp"
-    android:paddingRight="@dimen/d_15dp">
-
-    <com.guadou.lib_baselib.font_text_view.TextViewBold
-        android:id="@+id/tv_head_job_date"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:text="2022年1月"
-        android:textColor="@color/notify_dark_blue"
-        android:textSize="@dimen/d_15sp" />
-
-
-    <com.guadou.lib_baselib.font_text_view.TextViewBold
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="收入："
-        android:textColor="@color/black_33"
-        android:textSize="@dimen/d_15sp" />
-
-    <com.guadou.lib_baselib.font_text_view.TextViewBold
-        android:id="@+id/tv_income"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="400"
-        android:textColor="@color/notify_dark_blue"
-        android:textSize="@dimen/d_15sp" />
-
-</LinearLayout>

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

@@ -1,104 +0,0 @@
-<?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">
-
-    <data>
-
-        <variable
-            name="item"
-            type="com.hongyegroup.cpt_ewallet.bean.BankCardBean" />
-
-    </data>
-
-    <LinearLayout
-        android:id="@+id/ll_content_root"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/d_120dp"
-        android:layout_marginLeft="@dimen/d_15dp"
-        android:layout_marginTop="@dimen/d_10dp"
-        android:layout_marginRight="@dimen/d_15dp"
-        android:background="@drawable/shape_white_round5"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_45dp"
-            android:background="@drawable/shape_salary_card_top_yellow"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:id="@+id/tv_bank_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/d_21dp"
-                android:text="平安银行"
-                android:textColor="@color/white"
-                android:textSize="@dimen/d_14sp" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:id="@+id/tv_bank_type"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/d_15dp"
-                android:text="储蓄卡"
-                android:textColor="@color/white"
-                android:textSize="@dimen/d_14sp" />
-
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/d_45dp"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/iv_bank_logo"
-                    android:layout_width="@dimen/d_35dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="@dimen/d_15dp"
-                    android:scaleType="center"
-                    android:src="@drawable/jsyh" />
-
-                <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                    android:id="@+id/tv_bank_code"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/d_25dp"
-                    android:layout_weight="1"
-                    android:text="**** **** **** 8872"
-                    android:textColor="@color/black_33"
-                    android:textSize="@dimen/d_14sp" />
-
-                <com.guadou.lib_baselib.font_text_view.TextViewBold
-                    android:id="@+id/tv_bank_unbind"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="@dimen/d_22dp"
-                    android:background="@drawable/shape_salary_card_unbind_border"
-                    android:paddingLeft="@dimen/d_22dp"
-                    android:paddingTop="6.5dp"
-                    android:paddingRight="@dimen/d_22dp"
-                    android:paddingBottom="6.5dp"
-                    android:text="解绑"
-                    android:textColor="@color/gray_66"
-                    android:textSize="@dimen/d_13sp" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-
-</layout>

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

@@ -1,59 +0,0 @@
-<?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="click"
-            type="com.hongyegroup.cpt_ewallet.ui.EWalletSalaryCardActivity.ClickProxy" />
-
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/d_100dp"
-            android:layout_marginLeft="@dimen/d_15dp"
-            android:layout_marginTop="@dimen/d_15d5dp"
-            android:layout_marginRight="@dimen/d_15dp"
-            android:background="@drawable/shape_white_round5"
-            android:gravity="center"
-            android:orientation="horizontal"
-            binding:clicks="@{click.addBankCard}">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/wallet_salary_card_add_icon" />
-
-            <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:text="添加银行卡"
-                android:textColor="@color/gray_66"
-                android:textSize="@dimen/d_14sp" />
-
-        </LinearLayout>
-
-        <com.guadou.lib_baselib.font_text_view.TextViewMedium
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/d_15d5dp"
-            android:layout_marginTop="@dimen/d_20dp"
-            android:text="我的工资卡"
-            android:textColor="@color/black_33"
-            android:textSize="@dimen/d_14sp" />
-
-    </LinearLayout>
-
-</layout>
-

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

@@ -1,64 +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="333dp"
-    android:background="@drawable/shape_white_round5"
-    android:orientation="vertical">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="56dp">
-
-        <com.guadou.lib_baselib.font_text_view.TextViewBold
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="请选择银行卡"
-            android:textColor="@color/black"
-            android:textSize="@dimen/d_15sp" />
-
-
-        <ImageView
-            android:id="@+id/iv_popup_close"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|right"
-            android:layout_marginRight="@dimen/d_7dp"
-            android:src="@drawable/popup_cancel_blue" />
-
-    </FrameLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/d_0.7dp"
-        android:background="@color/divider_color" />
-
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:overScrollMode="never"
-        android:scrollbars="none">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <include
-                android:id="@+id/ll_add_card"
-                layout="@layout/item_chosoe_bank_card" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/rv_bank_card"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:overScrollMode="never"
-                android:scrollbars="none" />
-
-        </LinearLayout>
-
-
-    </androidx.core.widget.NestedScrollView>
-
-</LinearLayout>

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

@@ -48,20 +48,6 @@ class HomeFragment : YYBaseVDBLoadingFragment<HomeViewModel, FragmentHomeBinding
         initListener()
     }
 
-    private fun initRV() {
-        mBinding.rvHotJob.horizontal().adapter = mViewModel.mHotJobAdapter
-
-        mBinding.rvCityJob.horizontal().adapter = mViewModel.mCityJobAdapter
-
-        mBinding.rvAreaJob.horizontal().adapter = mViewModel.mAreaJobAdapter
-
-        mBinding.rvJobTips.vertical(2).adapter = mViewModel.mJobTipsAdapter
-
-        mBinding.banner.addBannerLifecycleObserver(this)
-        mBinding.banner.indicator = BannerRectangleCircleIndicator(mActivity)
-        mBinding.banner.adapter = mViewModel.mBannerAdapter
-    }
-
     private fun initData() {
         showStateLoading()
 
@@ -79,6 +65,21 @@ class HomeFragment : YYBaseVDBLoadingFragment<HomeViewModel, FragmentHomeBinding
         initData()
     }
 
+    private fun initRV() {
+        mBinding.rvHotJob.horizontal().adapter = mViewModel.mHotJobAdapter
+
+        mBinding.rvCityJob.horizontal().adapter = mViewModel.mCityJobAdapter
+
+        mBinding.rvAreaJob.horizontal().adapter = mViewModel.mAreaJobAdapter
+
+        mBinding.rvJobTips.vertical(2).adapter = mViewModel.mJobTipsAdapter
+
+        mBinding.banner.addBannerLifecycleObserver(this)
+        mBinding.banner.indicator = BannerRectangleCircleIndicator(mActivity)
+        mBinding.banner.adapter = mViewModel.mBannerAdapter
+    }
+
+
     private fun initListener() {
         mBinding.refreshLayout.setEnableNestedScroll(true)
         mBinding.refreshLayout.setEnableLoadMore(false)

cpt_main/src/main/res/layout/activity_main.xml

@@ -20,7 +20,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/page_bg"
+        android:background="@color/white"
         android:orientation="vertical">
 
         <FrameLayout
@@ -33,7 +33,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/d_0.7dp"
             android:layout_gravity="bottom"
-            android:background="@color/gray" />
+            android:background="@color/divider_color" />
 
         <!-- 底部的Tab -->
         <LinearLayout

cs_baselib/src/main/res/layout/layout_placeholder_parttime_job.xml

@@ -0,0 +1,465 @@
+<?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:id="@+id/ll_placeholder"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:orientation="vertical">
+
+<!--    <androidx.constraintlayout.widget.ConstraintLayout-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="wrap_content">-->
+
+<!--        <LinearLayout-->
+<!--            android:id="@+id/ll_view_home_banner"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="0dp"-->
+<!--            android:background="@drawable/item_merchants_bg"-->
+<!--            android:orientation="horizontal"-->
+<!--            app:layout_constraintDimensionRatio="H,750:320"-->
+<!--            tools:ignore="MissingConstraints">-->
+
+<!--        </LinearLayout>-->
+
+<!--    </androidx.constraintlayout.widget.ConstraintLayout>-->
+
+<!--    <View-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="@dimen/d_10dp"-->
+<!--        android:background="@color/shimmer_background_color"-->
+<!--        app:layout_constraintTop_toBottomOf="@id/ll_view_home_banner" />-->
+
+<!--    <com.android.basiclib.view.shimmer.ShimmerLayout-->
+<!--        android:id="@+id/shimmer_layout"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:tag="shimmer_layout">-->
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d_10dp"
+                android:layout_marginTop="@dimen/d_10dp"
+                android:layout_marginRight="@dimen/d_10dp"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_40dp"
+                    android:background="@color/shimmer_background_color" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="@dimen/d_90dp"
+                        android:layout_height="@dimen/d_60dp"
+                        android:background="@color/shimmer_background_color" />
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                    </LinearLayout>
+
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginLeft="@dimen/d_20dp"
+                        android:layout_marginRight="@dimen/d_10dp"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                    </LinearLayout>
+
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_20dp"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:layout_marginRight="@dimen/d_80dp"
+                    android:background="@color/shimmer_background_color" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d_10dp"
+                android:layout_marginTop="@dimen/d_20dp"
+                android:layout_marginRight="@dimen/d_10dp"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_40dp"
+                    android:background="@color/shimmer_background_color" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="@dimen/d_90dp"
+                        android:layout_height="@dimen/d_60dp"
+                        android:background="@color/shimmer_background_color" />
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                    </LinearLayout>
+
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginLeft="@dimen/d_20dp"
+                        android:layout_marginRight="@dimen/d_10dp"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                    </LinearLayout>
+
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_20dp"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:layout_marginRight="@dimen/d_80dp"
+                    android:background="@color/shimmer_background_color" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d_10dp"
+                android:layout_marginTop="@dimen/d_20dp"
+                android:layout_marginRight="@dimen/d_10dp"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_40dp"
+                    android:background="@color/shimmer_background_color" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="@dimen/d_90dp"
+                        android:layout_height="@dimen/d_60dp"
+                        android:background="@color/shimmer_background_color" />
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                    </LinearLayout>
+
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginLeft="@dimen/d_20dp"
+                        android:layout_marginRight="@dimen/d_10dp"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                    </LinearLayout>
+
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_20dp"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:layout_marginRight="@dimen/d_80dp"
+                    android:background="@color/shimmer_background_color" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d_10dp"
+                android:layout_marginTop="@dimen/d_20dp"
+                android:layout_marginRight="@dimen/d_10dp"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_40dp"
+                    android:background="@color/shimmer_background_color" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="@dimen/d_90dp"
+                        android:layout_height="@dimen/d_60dp"
+                        android:background="@color/shimmer_background_color" />
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                    </LinearLayout>
+
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginLeft="@dimen/d_20dp"
+                        android:layout_marginRight="@dimen/d_10dp"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                    </LinearLayout>
+
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_20dp"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:layout_marginRight="@dimen/d_80dp"
+                    android:background="@color/shimmer_background_color" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d_10dp"
+                android:layout_marginTop="@dimen/d_20dp"
+                android:layout_marginRight="@dimen/d_10dp"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_40dp"
+                    android:background="@color/shimmer_background_color" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="@dimen/d_90dp"
+                        android:layout_height="@dimen/d_60dp"
+                        android:background="@color/shimmer_background_color" />
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                    </LinearLayout>
+
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginLeft="@dimen/d_20dp"
+                        android:layout_marginRight="@dimen/d_10dp"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                        <View
+                            android:layout_width="100dp"
+                            android:layout_height="@dimen/d_20dp"
+                            android:layout_marginLeft="@dimen/d_10dp"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:background="@color/shimmer_background_color" />
+
+                    </LinearLayout>
+
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d_20dp"
+                    android:layout_marginTop="@dimen/d_10dp"
+                    android:layout_marginRight="@dimen/d_80dp"
+                    android:background="@color/shimmer_background_color" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+<!--    </com.android.basiclib.view.shimmer.ShimmerLayout>-->
+
+
+</LinearLayout>

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

@@ -19,12 +19,12 @@
     <color name="dark_blue">#175285</color>
     <color name="divider_color_ee">#eeeeee</color>
     <color name="notify_dark_blue">#2956B7</color>
-
     <color name="white_pressed">#33888888</color>
     <color name="divider_gray_c5">#C5C5C5</color>
     <color name="withdrawal_success_text">#00B820</color>
     <color name="custom_dialog_yes_text">#313B68</color>
     <color name="light_gray_divider">#EDF0F3</color>
     <color name="text_black_37">#373737</color>
+    <color name="text_yellow_ff9300">#FF9300</color>
 
 </resources>

standalone/ewalletrunalone/src/main/java/com/guadou/ewalletrunalone/EWalletMainActivity.kt

@@ -7,7 +7,6 @@ import com.guadou.lib_baselib.base.activity.BaseVMActivity
 import com.guadou.lib_baselib.base.vm.EmptyViewModel
 import com.guadou.lib_baselib.utils.CommUtils
 import com.guadou.lib_baselib.utils.StatusBarUtils
-import com.hongyegroup.cpt_ewallet.ui.EWalletMainFragment
 
 /**
  * 独立运行模块的兼职Fragment的页面载体