1.UI搭建

app/src/main/AndroidManifest.xml

@@ -79,6 +79,15 @@
         <activity android:name="com.zswc.creativity.activity.TestMainActivity"/>
         <activity android:name="com.zswc.creativity.activity.SettingActivity"/>
         <activity android:name="com.zswc.creativity.activity.SpreadActivity"/>
+        <activity android:name="com.zswc.creativity.activity.MyInfoActivity"/>
+        <activity android:name="com.zswc.creativity.activity.AccountSafeActivity"/>
+        <activity android:name="com.zswc.creativity.activity.ChangePasswordActivity"/>
+        <activity android:name="com.zswc.creativity.activity.BindBankActivity"/>
+        <activity android:name="com.zswc.creativity.activity.MyWalletActivity"/>
+        <activity android:name="com.zswc.creativity.activity.WithdrawActivity"/>
+
+
+
 
 
 

app/src/main/java/com/zswc/creativity/activity/AccountSafeActivity.kt

@@ -0,0 +1,36 @@
+package com.zswc.creativity.activity
+
+import android.os.Bundle
+import com.zswc.creativity.base.MBActivity
+import com.zswc.creativity.databinding.ActivityAccountSafeBinding
+import com.zswc.creativity.databinding.ActivityMyInfoBinding
+import com.zswc.creativity.databinding.ActivitySpreadBinding
+import com.zswc.creativity.vmodel.AccountSafeVModel
+import com.zswc.creativity.vmodel.MyInfoVModel
+import com.zswc.creativity.vmodel.SpreadVModel
+
+/**
+ * 我的账户信息
+ *Created by shihuiyun
+ */
+class AccountSafeActivity : MBActivity<AccountSafeVModel, ActivityAccountSafeBinding>() {
+
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+
+    }
+
+    override fun binding(): ActivityAccountSafeBinding {
+       return ActivityAccountSafeBinding.inflate(layoutInflater)
+    }
+
+    override fun vmClass(): Class<AccountSafeVModel> {
+        return AccountSafeVModel::class.java
+    }
+
+    override fun title(): String? {
+        return "账户安全"
+    }
+
+
+}

app/src/main/java/com/zswc/creativity/activity/BindBankActivity.kt

@@ -0,0 +1,32 @@
+package com.zswc.creativity.activity
+
+import android.os.Bundle
+import com.zswc.creativity.base.MBActivity
+import com.zswc.creativity.databinding.*
+import com.zswc.creativity.vmodel.*
+
+/**
+ * 绑定银行卡
+ *Created by shihuiyun
+ */
+class BindBankActivity : MBActivity<BindBankVModel, ActivityBindBankBinding>() {
+
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+
+    }
+
+    override fun binding(): ActivityBindBankBinding {
+       return ActivityBindBankBinding.inflate(layoutInflater)
+    }
+
+    override fun vmClass(): Class<BindBankVModel> {
+        return BindBankVModel::class.java
+    }
+
+    override fun title(): String? {
+        return "绑定银行卡"
+    }
+
+
+}

app/src/main/java/com/zswc/creativity/activity/ChangePasswordActivity.kt

@@ -0,0 +1,38 @@
+package com.zswc.creativity.activity
+
+import android.os.Bundle
+import com.zswc.creativity.base.MBActivity
+import com.zswc.creativity.databinding.ActivityAccountSafeBinding
+import com.zswc.creativity.databinding.ActivityChangePasswordBinding
+import com.zswc.creativity.databinding.ActivityMyInfoBinding
+import com.zswc.creativity.databinding.ActivitySpreadBinding
+import com.zswc.creativity.vmodel.AccountSafeVModel
+import com.zswc.creativity.vmodel.ChangePageVModel
+import com.zswc.creativity.vmodel.MyInfoVModel
+import com.zswc.creativity.vmodel.SpreadVModel
+
+/**
+ * 修改密码
+ *Created by shihuiyun
+ */
+class ChangePasswordActivity : MBActivity<ChangePageVModel, ActivityChangePasswordBinding>() {
+
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+
+    }
+
+    override fun binding(): ActivityChangePasswordBinding {
+       return ActivityChangePasswordBinding.inflate(layoutInflater)
+    }
+
+    override fun vmClass(): Class<ChangePageVModel> {
+        return ChangePageVModel::class.java
+    }
+
+    override fun title(): String? {
+        return "修改支付密码"
+    }
+
+
+}

app/src/main/java/com/zswc/creativity/activity/MyInfoActivity.kt

@@ -0,0 +1,34 @@
+package com.zswc.creativity.activity
+
+import android.os.Bundle
+import com.zswc.creativity.base.MBActivity
+import com.zswc.creativity.databinding.ActivityMyInfoBinding
+import com.zswc.creativity.databinding.ActivitySpreadBinding
+import com.zswc.creativity.vmodel.MyInfoVModel
+import com.zswc.creativity.vmodel.SpreadVModel
+
+/**
+ * 我的账户信息
+ *Created by shihuiyun
+ */
+class MyInfoActivity : MBActivity<MyInfoVModel, ActivityMyInfoBinding>() {
+
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+
+    }
+
+    override fun binding(): ActivityMyInfoBinding {
+       return ActivityMyInfoBinding.inflate(layoutInflater)
+    }
+
+    override fun vmClass(): Class<MyInfoVModel> {
+        return MyInfoVModel::class.java
+    }
+
+    override fun title(): String? {
+        return "账户信息"
+    }
+
+
+}

app/src/main/java/com/zswc/creativity/activity/MyWalletActivity.kt

@@ -0,0 +1,30 @@
+package com.zswc.creativity.activity
+import com.zswc.creativity.adapter.MyWalletAdapter
+import com.zswc.creativity.base.MBRActivity
+import com.zswc.creativity.databinding.ActivityMyWalletBinding
+import com.zswc.creativity.vmodel.MyWalletVModel
+
+class MyWalletActivity : MBRActivity<MyWalletVModel, MyWalletAdapter, ActivityMyWalletBinding>() {
+
+
+
+    override fun vmClass(): Class<MyWalletVModel> {
+        return MyWalletVModel::class.java
+    }
+    override fun binding(): ActivityMyWalletBinding {
+        return ActivityMyWalletBinding.inflate(layoutInflater)
+    }
+
+    override fun initAdapter(): MyWalletAdapter {
+        return MyWalletAdapter(vm)
+    }
+
+
+    override fun title(): String? {
+        return null
+    }
+
+    override val isRxbus: Boolean
+        get() = true
+
+}

app/src/main/java/com/zswc/creativity/activity/WithdrawActivity.kt

@@ -0,0 +1,36 @@
+package com.zswc.creativity.activity
+
+import android.os.Bundle
+import com.zswc.creativity.base.MBActivity
+import com.zswc.creativity.databinding.ActivityMyInfoBinding
+import com.zswc.creativity.databinding.ActivitySpreadBinding
+import com.zswc.creativity.databinding.ActivityWithdrawBinding
+import com.zswc.creativity.vmodel.MyInfoVModel
+import com.zswc.creativity.vmodel.SpreadVModel
+import com.zswc.creativity.vmodel.WithdrawVModel
+
+/**
+ * 提现
+ *Created by shihuiyun
+ */
+class WithdrawActivity : MBActivity<WithdrawVModel, ActivityWithdrawBinding>() {
+
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+
+    }
+
+    override fun binding(): ActivityWithdrawBinding {
+       return ActivityWithdrawBinding.inflate(layoutInflater)
+    }
+
+    override fun vmClass(): Class<WithdrawVModel> {
+        return WithdrawVModel::class.java
+    }
+
+    override fun title(): String? {
+        return "账户信息"
+    }
+
+
+}

app/src/main/java/com/zswc/creativity/adapter/MyWalletAdapter.kt

@@ -0,0 +1,26 @@
+package com.zswc.creativity.adapter
+
+import android.os.Bundle
+import android.text.TextUtils
+import android.view.View
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.qmuiteam.qmui.kotlin.onClick
+import com.zswc.creativity.R
+import com.zswc.creativity.activity.ArticleDetailActivity
+import com.zswc.creativity.databinding.ItemMsgBinding
+import com.zswc.creativity.model.MsgList
+import com.zswc.creativity.utils.VerifyUtils
+import com.zswc.creativity.vmodel.MsgVModel
+import com.ysnows.base.base.BAdapter
+import com.ysnows.base.utils.UiSwitch
+import com.zswc.creativity.databinding.ItemMyWalletBinding
+import com.zswc.creativity.vmodel.MyWalletVModel
+
+class MyWalletAdapter(var vm: MyWalletVModel) : BAdapter<MsgList, BaseDataBindingHolder<ItemMyWalletBinding>>(R.layout.item_my_wallet) {
+
+    override fun convert(holder: BaseDataBindingHolder<ItemMyWalletBinding>, item: MsgList) {
+        holder.dataBinding?.vm=vm
+        holder.dataBinding?.item = item
+
+    }
+}

app/src/main/java/com/zswc/creativity/fragment/BlindBoxFragment.kt

@@ -0,0 +1,90 @@
+package com.zswc.creativity.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.zswc.creativity.adapter.RecommedAdapter
+import com.zswc.creativity.base.MBFragment
+import com.zswc.creativity.databinding.FragmentRecommendBinding
+import com.zswc.creativity.model.CollectionList
+import com.zswc.creativity.vmodel.RecommendVModel
+import com.tencent.mmkv.MMKV
+import com.zswc.creativity.databinding.FragmentBlidboxBinding
+import com.zswc.creativity.vmodel.BlindBoxVModel
+
+/**
+ * 全部
+ *Created by shihuiyun
+ *on 2020/9/11
+ */
+class BlindBoxFragment : MBFragment<BlindBoxVModel, FragmentBlidboxBinding>(){
+
+
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+        //禁止下拉刷新和下拉加载
+         binding.recyclerView.overScrollMode= View.OVER_SCROLL_NEVER
+
+          vm.toGetCollectionList()
+
+          vm.list.observe(this, androidx.lifecycle.Observer {
+            if (null == it) {
+                return@Observer
+            }
+
+            setAdapter(it)
+
+        })
+
+
+    }
+
+    fun setAdapter(list:List<CollectionList>){
+
+        var adapter=RecommedAdapter()
+        binding.recyclerView.adapter=adapter
+         adapter.addData(list)
+
+        adapter.setOnItemClickListener { adapter, view, position ->
+            var isEnable= MMKV.defaultMMKV().getBoolean("Enable",false)
+            if(isEnable) {
+                //拨打电话
+//                launch {
+//                    val requestPermissions = PermissionManager.requestPermissions(
+//                            this@SpaceDetailActivity, 1000, Manifest.permission.CALL_PHONE
+//                    )
+//                    if (requestPermissions is PermissionResult.PermissionGranted) {
+//                        //拨打电话
+//                        vm.bean.value?.fishpond_tel?.let {
+//
+//                            PopuCallPhoneUtils.show(context(), it, binding.imgCallPhone)
+//
+//                        }
+//                    }
+//                }
+            }else{
+                //  toast("抱歉，您未同意用户隐私协议，无法获得相应权限，无法应用该功能")
+
+            }
+        }
+
+
+    }
+
+
+    override val isRxbus: Boolean
+        get() = true
+
+    override fun vmClass(): Class<BlindBoxVModel> {
+        return BlindBoxVModel::class.java
+    }
+
+    override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentBlidboxBinding {
+       return  FragmentBlidboxBinding.inflate(layoutInflater)
+    }
+
+    override fun title(): String? {
+        return null
+    }
+}

app/src/main/java/com/zswc/creativity/fragment/HomeMyFragment.kt

@@ -3,10 +3,15 @@ package com.zswc.creativity.fragment
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
 import com.zswc.creativity.base.MBFragment
 import com.zswc.creativity.databinding.FragmentHomeMyBinding
 import com.zswc.creativity.vmodel.HomeMyVModel
 import com.tencent.mmkv.MMKV
+import com.ysnows.base.utils.UiUtils
+import com.zswc.creativity.R
+import com.zswc.creativity.utils.GridSpaceItemToDecoration
 
 /**
  * 我的
@@ -14,6 +19,7 @@ import com.tencent.mmkv.MMKV
  *on 2020/9/11
  */
 class HomeMyFragment : MBFragment<HomeMyVModel, FragmentHomeMyBinding>(){
+//    var fragments = emptyArray<Fragment>()
 
 
     override fun init(savedInstanceState: Bundle?) {
@@ -24,13 +30,52 @@ class HomeMyFragment : MBFragment<HomeMyVModel, FragmentHomeMyBinding>(){
         if(token.equals("")){
             vm.isLogin.value=false
         }
+//        initFragments()
+//        switchContent(0)//默认第一个
 
 
-
+        binding.recyclerView.addItemDecoration(GridSpaceItemToDecoration(2,
+                UiUtils.dp2Px(context(), 15f),
+                UiUtils.dp2Px(context(), 12f)))
 
 
     }
 
+
+//    private fun initFragments() {
+//        val oneFragment = BlindBoxFragment()
+//        val twoFragment = BlindBoxFragment()
+//
+//        fragments = arrayOf(
+//                oneFragment,
+//                twoFragment
+//        )
+//    }
+//    private fun switchContent(index: Int) {
+//
+//        val childFragmentManager: FragmentManager = childFragmentManager
+//        val transaction = childFragmentManager.beginTransaction()
+//        var fragment = childFragmentManager.findFragmentByTag("tab_$index")
+//        if (fragment == null) {//还未加载
+//
+//            fragment = fragments[index]
+//            if (fragment != null) {
+//                transaction.add(R.id.my_container, fragment, "tab_$index")
+//            }
+//        } else {
+//            transaction.show(fragment)
+//        }
+//        for (i in fragments.indices) {
+//            fragment = childFragmentManager.findFragmentByTag("tab_$i")
+//            if (fragment == null || index == i) {
+//                continue
+//            }
+//            transaction.hide(fragment)
+//        }
+//        transaction.commitAllowingStateLoss()
+//    }
+
+
     override fun vmClass(): Class<HomeMyVModel> {
         return HomeMyVModel::class.java
     }

app/src/main/java/com/zswc/creativity/utils/GridSpaceItemToDecoration.java

@@ -0,0 +1,58 @@
+package com.zswc.creativity.utils;
+
+import android.graphics.Rect;
+import android.util.Log;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ *
+ * on 2020/9/17
+ */
+public class GridSpaceItemToDecoration extends RecyclerView.ItemDecoration{
+    private final String TAG = "GridSpaceItemDecoration";
+
+    private int mSpanCount;//横条目数量
+    private int mRowSpacing;//行间距
+    private int mColumnSpacing;// 列间距
+
+    /**
+     * @param spanCount     列数
+     * @param rowSpacing    行间距
+     * @param columnSpacing 列间距
+     */
+    public GridSpaceItemToDecoration(int spanCount, int rowSpacing, int columnSpacing) {
+        this.mSpanCount = spanCount;
+        this.mRowSpacing = rowSpacing;
+        this.mColumnSpacing = columnSpacing;
+    }
+
+    @Override
+    public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
+        int position = parent.getChildAdapterPosition(view); // 获取view 在adapter中的位置。
+        int column = position % mSpanCount; // view 所在的列
+
+        Log.e("-zz-", "position=: "+position );
+        Log.e("-zz-", "column=: "+column );
+        if(position==0){
+           return;
+        }
+
+        outRect.left = column * mColumnSpacing / mSpanCount; // column * (列间距 * (1f / 列数))
+        if(column==1) {
+            outRect.right = mColumnSpacing - (column) * mColumnSpacing / mSpanCount; // 列间距 - (column + 1) * (列间距 * (1f /列数))
+        }else{
+            outRect.right = mColumnSpacing - (column+1) * mColumnSpacing / mSpanCount; // 列间距 - (column + 1) * (列间距 * (1f /列数))
+        }
+        Log.e("-zz-", "position:" + position
+                + "    columnIndex: " + column
+                + "    left,right ->" + outRect.left + "," + outRect.right);
+
+        // 如果position > 行数，说明不是在第一行，则不指定行高，其他行的上间距为 top=mRowSpacing
+        if (position+1 >= mSpanCount) {
+            outRect.top = mRowSpacing; // item top
+        }
+    }
+}

app/src/main/java/com/zswc/creativity/vmodel/AccountSafeVModel.kt

@@ -0,0 +1,23 @@
+package com.zswc.creativity.vmodel
+
+import android.app.Application
+import com.zswc.creativity.activity.LoginActivity
+import com.tencent.mmkv.MMKV
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+import com.ysnows.base.utils.UiSwitch
+
+class AccountSafeVModel(application: Application) : BViewModel<BRepository>(application)  {
+
+    //退出登录
+    fun  toExitLogin(){
+        //只清空token
+        MMKV.defaultMMKV().putString("token", "")
+        UiSwitch.single_new_task_with_clear_task(repository().context, LoginActivity::class.java)
+    }
+
+
+
+
+
+}

app/src/main/java/com/zswc/creativity/vmodel/BindBankVModel.kt

@@ -0,0 +1,58 @@
+package com.zswc.creativity.vmodel
+
+import android.app.Application
+import androidx.databinding.Bindable
+import androidx.lifecycle.MutableLiveData
+import com.zswc.creativity.activity.LoginActivity
+import com.tencent.mmkv.MMKV
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+import com.ysnows.base.utils.UiSwitch
+import com.zswc.creativity.BR
+import com.zswc.creativity.R
+
+class BindBankVModel(application: Application) : BViewModel<BRepository>(application)  {
+
+    var codeTip: MutableLiveData<String> = MutableLiveData(RegisterVModel.getCodeStr)
+
+    @Bindable
+    open var phone: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.phone)
+        }
+
+
+    companion object {
+        const val time = 60
+        var timeStart: Long = 1
+        const val getCodeStr = "获取验证码"
+
+        const val getShow = false
+
+
+    }
+
+
+    fun getSmsCode(start: Long = 1) {
+        if (codeTip.value != getCodeStr) {
+            return
+        }
+
+        if (phone.isNullOrEmpty()) {
+            toast(R.string.please_input_user_phone)
+            return
+        }
+
+//        repository().rxLreq(NetEngine.service.getRegisterSms(phone))
+//                .doOnNext() { res ->
+//                    if (res.ok(true)) {
+//                        startTimer(start)
+//                    }
+//                }
+//                .subscribe()
+    }
+
+
+
+}

app/src/main/java/com/zswc/creativity/vmodel/BlindBoxVModel.kt

@@ -0,0 +1,48 @@
+package com.zswc.creativity.vmodel
+
+import android.app.Application
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.zswc.creativity.model.CollectionList
+import com.zswc.creativity.utils.net.NetEngine
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+import kotlinx.coroutines.launch
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/23
+ */
+open class BlindBoxVModel(application: Application) : BViewModel<BRepository>(application) {
+
+    var list = MutableLiveData<List<CollectionList>>()//钓位配置
+
+
+    fun toGetCollectionList() {
+
+        viewModelScope.launch {
+            var it = repository().lreq { NetEngine.service.getCollectionList() }
+            if(it.ok()){
+               list.value=it.data
+            }
+        }
+    }
+
+
+
+
+
+    fun getSeatInfo() {//获取数据
+//        viewModelScope.launch {
+//            var it = repository().lreq { NetEngine.service.activityseat(k_id) }
+//            if (it.ok()) {
+//                if (null != it.datas) {
+//                    list.value = (it.datas as java.util.ArrayList<FishpondSeat>?)!!
+//                }
+//
+//            }
+//        }
+    }
+
+
+}

app/src/main/java/com/zswc/creativity/vmodel/ChangePageVModel.kt

@@ -0,0 +1,58 @@
+package com.zswc.creativity.vmodel
+
+import android.app.Application
+import androidx.databinding.Bindable
+import androidx.lifecycle.MutableLiveData
+import com.zswc.creativity.activity.LoginActivity
+import com.tencent.mmkv.MMKV
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+import com.ysnows.base.utils.UiSwitch
+import com.zswc.creativity.BR
+import com.zswc.creativity.R
+
+class ChangePageVModel(application: Application) : BViewModel<BRepository>(application)  {
+
+    var codeTip: MutableLiveData<String> = MutableLiveData(RegisterVModel.getCodeStr)
+
+    @Bindable
+    open var phone: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.phone)
+        }
+
+
+    companion object {
+        const val time = 60
+        var timeStart: Long = 1
+        const val getCodeStr = "获取验证码"
+
+        const val getShow = false
+
+
+    }
+
+
+    fun getSmsCode(start: Long = 1) {
+        if (codeTip.value != getCodeStr) {
+            return
+        }
+
+        if (phone.isNullOrEmpty()) {
+            toast(R.string.please_input_user_phone)
+            return
+        }
+
+//        repository().rxLreq(NetEngine.service.getRegisterSms(phone))
+//                .doOnNext() { res ->
+//                    if (res.ok(true)) {
+//                        startTimer(start)
+//                    }
+//                }
+//                .subscribe()
+    }
+
+
+
+}

app/src/main/java/com/zswc/creativity/vmodel/HomeMyVModel.kt

@@ -67,6 +67,15 @@ open class HomeMyVModel(application: Application) : BViewModel<BRepository>(appl
       }
       UiSwitch.single(repository().context, SpreadActivity::class.java)
   }
+    fun toMyWallet(){
+        if(!isLogin.value!!){
+            toast("请登录")
+            return
+        }
+        UiSwitch.single(repository().context, MyWalletActivity::class.java)
+
+    }
+
 
 
 

app/src/main/java/com/zswc/creativity/vmodel/MyInfoVModel.kt

@@ -0,0 +1,23 @@
+package com.zswc.creativity.vmodel
+
+import android.app.Application
+import com.zswc.creativity.activity.LoginActivity
+import com.tencent.mmkv.MMKV
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+import com.ysnows.base.utils.UiSwitch
+
+class MyInfoVModel(application: Application) : BViewModel<BRepository>(application)  {
+
+    //退出登录
+    fun  toExitLogin(){
+        //只清空token
+        MMKV.defaultMMKV().putString("token", "")
+        UiSwitch.single_new_task_with_clear_task(repository().context, LoginActivity::class.java)
+    }
+
+
+
+
+
+}

app/src/main/java/com/zswc/creativity/vmodel/MyWalletVModel.kt

@@ -0,0 +1,56 @@
+package com.zswc.creativity.vmodel
+
+import android.app.Application
+import androidx.lifecycle.viewModelScope
+import com.hwangjr.rxbus.RxBus
+import com.zswc.creativity.config.ConfigRx
+import com.zswc.creativity.utils.net.NetEngine
+import com.ysnows.base.base.BRRepository
+import com.ysnows.base.base.BRViewModel
+import com.ysnows.base.net.IResp
+import com.ysnows.base.utils.UiSwitch
+import com.zswc.creativity.activity.MyInfoActivity
+import com.zswc.creativity.activity.WithdrawActivity
+import kotlinx.coroutines.launch
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/25
+ */
+class MyWalletVModel(application: Application) : BRViewModel<BRRepository>(application) {
+
+
+//    fun toDetails(data_id:String){
+//
+//        UiSwitch.bundle(repository().context, ArticleDetailActivity::class.java, Bundle().apply {
+//            putInt("type",-1)
+//            putString("id",data_id)
+//        })
+//
+//
+//    }
+
+    fun toWithdrawal(){
+        //提现
+        UiSwitch.single(repository().context, WithdrawActivity::class.java)
+
+    }
+
+    override fun apiFunc(): suspend () -> IResp<*> {
+        return { NetEngine.service.msgListPage(repository().page) }
+    }
+
+
+    fun isRead(data_id: String) {
+
+        viewModelScope.launch {
+
+            var it = repository().lreq { NetEngine.service.msgRead(data_id) }
+            if (it.ok()) {
+                //刷新我的界面-消息数量
+                RxBus.get().post(ConfigRx.REFRESH_USER_DATA, "")
+            }
+
+        }
+    }
+}

app/src/main/java/com/zswc/creativity/vmodel/SettingVModel.kt

@@ -1,15 +1,12 @@
 package com.zswc.creativity.vmodel
 
 import android.app.Application
-import android.widget.Switch
-import com.zswc.creativity.activity.LoginActivity
 import com.tencent.mmkv.MMKV
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
 import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiSwitch
-import com.zswc.creativity.activity.ArticleDetailActivity
-import com.zswc.creativity.activity.SettingActivity
+import com.zswc.creativity.activity.*
 
 class SettingVModel(application: Application) : BViewModel<BRepository>(application)  {
 
@@ -22,16 +19,30 @@ class SettingVModel(application: Application) : BViewModel<BRepository>(applicat
 
 
     fun toAgree(a:Int){
-        when(a){
-            1-> {//隐私协议
-                UiSwitch.bundle(repository().context, ArticleDetailActivity::class.java,
-                        B().putString("type","2")
-                                .putString("chose","1")
-                                .ok())
-            }
-        }
 
+        UiSwitch.bundle(repository().context, ArticleDetailActivity::class.java,
+                B().putString("type","2")
+                        .putString("chose",a.toString())
+                        .ok())
     }
+    fun  toMyInfo(){
+        UiSwitch.single(repository().context, MyInfoActivity::class.java)
+    }
+
+    fun toAccountSafe(){
+        UiSwitch.single(repository().context, AccountSafeActivity::class.java)
+
+    }
+
+    fun toChangePassword(){
+        UiSwitch.single(repository().context, ChangePasswordActivity::class.java)
+
+    }
+    fun toBindBank(){
+        UiSwitch.single(repository().context, BindBankActivity::class.java)
+    }
+
+
 
 
 

app/src/main/java/com/zswc/creativity/vmodel/WithdrawVModel.kt

@@ -0,0 +1,23 @@
+package com.zswc.creativity.vmodel
+
+import android.app.Application
+import com.zswc.creativity.activity.LoginActivity
+import com.tencent.mmkv.MMKV
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+import com.ysnows.base.utils.UiSwitch
+
+class WithdrawVModel(application: Application) : BViewModel<BRepository>(application)  {
+
+    //退出登录
+    fun  toExitLogin(){
+        //只清空token
+        MMKV.defaultMMKV().putString("token", "")
+        UiSwitch.single_new_task_with_clear_task(repository().context, LoginActivity::class.java)
+    }
+
+
+
+
+
+}

app/src/main/res/drawable/bg_click_on.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+android:shape="rectangle" >
+
+<!-- 填充的颜色-->
+
+    <solid android:color="#38D3D3" />
+
+    <corners
+       android:radius="6dp"
+       >
+    </corners>
+
+</shape >

app/src/main/res/drawable/bg_money_top.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <!-- 填充的颜色-->
+
+
+    <solid android:color="@color/white" />
+
+    <corners android:topLeftRadius="@dimen/dp_12"
+        android:topRightRadius="@dimen/dp_12"
+        />
+
+</shape >

app/src/main/res/drawable/bg_sure_but.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+
+    <gradient
+        android:angle="360"
+        android:startColor="#38D3D3"
+        android:endColor="#59D8ED" />
+    <corners
+        android:radius="20dp"
+        >
+    </corners>
+</shape>

app/src/main/res/layout/activity_account_safe.xml

@@ -0,0 +1,112 @@
+<?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">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.AccountSafeVModel" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginTop="12dp"
+            android:layout_height="53dp">
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@null"
+                android:hint="输入旧密码"
+                android:inputType="phone"
+                android:paddingStart="15dp"
+                android:paddingEnd="@dimen/dp_15"
+                android:textColor="@color/text_title"
+                android:textColorHint="#ACACAC"
+                android:textSize="15sp" />
+
+        </LinearLayout>
+
+        <View
+            android:background="#F3F3F3"
+            android:layout_marginEnd="15dp"
+            android:layout_marginStart="15dp"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_height="53dp">
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@null"
+                android:hint="输入新密码"
+                android:inputType="phone"
+                android:paddingStart="15dp"
+                android:paddingEnd="@dimen/dp_15"
+                android:textColor="@color/text_title"
+                android:textColorHint="#ACACAC"
+                android:textSize="15sp" />
+
+        </LinearLayout>
+        <View
+            android:background="#F3F3F3"
+            android:layout_marginEnd="15dp"
+            android:layout_marginStart="15dp"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_height="53dp">
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@null"
+                android:hint="再次输入新密码"
+                android:inputType="phone"
+                android:paddingStart="15dp"
+                android:paddingEnd="@dimen/dp_15"
+                android:textColor="@color/text_title"
+                android:textColorHint="#ACACAC"
+                android:textSize="15sp" />
+
+        </LinearLayout>
+        <View
+            android:background="#F3F3F3"
+            android:layout_marginEnd="15dp"
+            android:layout_marginStart="15dp"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"/>
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="46dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="30dp"
+            android:layout_marginEnd="15dp"
+            android:background="@drawable/bg_logo_but"
+            android:gravity="center"
+            android:text="确认修改"
+            android:textColor="@color/white"
+            android:textSize="20sp" />
+
+
+
+    </LinearLayout>
+</layout>

app/src/main/res/layout/activity_bind_bank.xml

@@ -0,0 +1,141 @@
+<?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">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.BindBankVModel" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="53dp"
+            android:layout_marginTop="12dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:textSize="14sp"
+                android:text="姓名"
+                android:layout_marginStart="18dp"
+                android:textColor="@color/text_title"
+                android:layout_width="wrap_content"
+                android:layout_marginEnd="70dp"
+                android:layout_height="wrap_content"/>
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@null"
+                android:hint="请输入本人真实姓名"
+                android:inputType="phone"
+                android:paddingEnd="@dimen/dp_15"
+                android:textColor="@color/text_title"
+                android:textColorHint="#ACACAC"
+                android:textSize="15sp" />
+
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="53dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:textSize="14sp"
+                android:text="卡号"
+                android:layout_marginStart="18dp"
+                android:textColor="@color/text_title"
+                android:layout_width="wrap_content"
+                android:layout_marginEnd="70dp"
+                android:layout_height="wrap_content"/>
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@null"
+                android:hint="请输入本人的银行卡号"
+                android:inputType="phone"
+                android:paddingEnd="@dimen/dp_15"
+                android:textColor="@color/text_title"
+                android:textColorHint="#ACACAC"
+                android:textSize="15sp" />
+
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="53dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:textSize="14sp"
+                android:text="身份证号"
+                android:layout_marginStart="18dp"
+                android:textColor="@color/text_title"
+                android:layout_width="wrap_content"
+                android:layout_marginEnd="50dp"
+                android:layout_height="wrap_content"/>
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@null"
+                android:hint="请输入本人的银行卡号"
+                android:inputType="phone"
+                android:paddingEnd="@dimen/dp_15"
+                android:textColor="@color/text_title"
+                android:textColorHint="#ACACAC"
+                android:textSize="15sp" />
+
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="53dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:textSize="14sp"
+                android:text="预留手机号"
+                android:layout_marginStart="18dp"
+                android:textColor="@color/text_title"
+                android:layout_width="wrap_content"
+                android:layout_marginEnd="35dp"
+                android:layout_height="wrap_content"/>
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@null"
+                android:hint="请输入本人的银行卡号"
+                android:inputType="phone"
+                android:paddingEnd="@dimen/dp_15"
+                android:textColor="@color/text_title"
+                android:textColorHint="#ACACAC"
+                android:textSize="15sp" />
+
+        </LinearLayout>
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="46dp"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="40dp"
+            android:layout_marginEnd="25dp"
+            android:background="@drawable/bg_sure_but"
+            android:gravity="center"
+            android:text="确认绑定"
+            android:textColor="@color/white"
+            android:textSize="20sp" />
+
+
+    </LinearLayout>
+</layout>

app/src/main/res/layout/activity_change_password.xml

@@ -0,0 +1,146 @@
+<?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">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.ChangePageVModel" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="53dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="12dp"
+            android:gravity="center_vertical"
+            android:hint="手机号"
+            android:textColor="@color/text_title"
+            android:textColorHint="#ACACAC"
+            android:textSize="15sp" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:background="#F3F3F3" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="53dp"
+            android:orientation="horizontal">
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="2"
+                android:background="@null"
+                android:hint="请输入验证码"
+                android:inputType="phone"
+                android:paddingStart="15dp"
+                android:paddingEnd="@dimen/dp_15"
+                android:textColor="@color/text_title"
+                android:textColorHint="#ACACAC"
+                android:textSize="15sp" />
+
+            <TextView
+                android:id="@+id/btn_get_code"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="12dp"
+                android:layout_weight="1"
+                android:onClick="@{v->vm.getSmsCode(1)}"
+                android:paddingTop="@dimen/dp_4"
+                android:paddingBottom="@dimen/dp_4"
+                android:text="@{vm.codeTip,default=@string/get_sms_code}"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_14" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:background="#F3F3F3" />
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="53dp"
+            android:orientation="horizontal">
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@null"
+                android:hint="请输入（支付/寄售）密码为6为纯数字"
+                android:inputType="phone"
+                android:paddingStart="15dp"
+                android:paddingEnd="@dimen/dp_15"
+                android:textColor="@color/text_title"
+                android:textColorHint="#ACACAC"
+                android:textSize="15sp" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:background="#F3F3F3" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="53dp"
+            android:orientation="horizontal">
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@null"
+                android:hint="再次输入上述密码"
+                android:inputType="phone"
+                android:paddingStart="15dp"
+                android:paddingEnd="@dimen/dp_15"
+                android:textColor="@color/text_title"
+                android:textColorHint="#ACACAC"
+                android:textSize="15sp" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:background="#F3F3F3" />
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="46dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="30dp"
+            android:layout_marginEnd="15dp"
+            android:background="@drawable/bg_logo_but"
+            android:gravity="center"
+            android:text="确认"
+            android:textColor="@color/white"
+            android:textSize="20sp" />
+
+
+    </LinearLayout>
+</layout>

app/src/main/res/layout/activity_my_info.xml

@@ -0,0 +1,140 @@
+<?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">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.MyInfoVModel" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_bg"
+        android:orientation="vertical">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginTop="@dimen/dp_12"
+            android:background="@color/white"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingStart="15dp"
+            android:paddingEnd="14dp">
+
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="头像"
+                android:textColor="@color/text_title"
+                android:textSize="15sp" />
+
+
+            <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+                android:layout_width="38dp"
+                android:layout_height="38dp"
+                android:layout_marginEnd="8dp"
+                android:background="@drawable/ic_default_avatar"
+                app:qmui_is_oval="true" />
+
+
+            <ImageView
+                android:layout_width="6dp"
+                android:layout_height="12dp"
+                android:src="@drawable/ct_back_right" />
+
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:background="#F3F3F3" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@color/white"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingStart="15dp"
+            android:paddingEnd="14dp">
+
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="昵称"
+                android:textColor="@color/text_title"
+                android:textSize="15sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="收藏家Edit_"
+                android:textColor="#999999"
+                android:textSize="15sp" />
+
+
+            <ImageView
+                android:layout_width="6dp"
+                android:layout_height="12dp"
+                android:src="@drawable/ct_back_right" />
+
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:background="#F3F3F3" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@color/white"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingStart="15dp"
+            android:paddingEnd="14dp">
+
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="手机号"
+                android:textColor="@color/text_title"
+                android:textSize="15sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="17833892981"
+                android:textColor="#999999"
+                android:textSize="15sp" />
+
+
+            <ImageView
+                android:layout_width="6dp"
+                android:layout_height="12dp"
+                android:src="@drawable/ct_back_right" />
+
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+</layout>

app/src/main/res/layout/activity_my_wallet.xml

@@ -0,0 +1,211 @@
+<?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:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.MyWalletVModel" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_home_bg"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="46dp"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="38dp"
+                android:layout_height="20dp"
+                android:paddingLeft="20dp"
+                android:src="@drawable/ic_back_black" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="58dp"
+                android:gravity="center_horizontal"
+                android:text="我的钱包"
+                android:textColor="@color/text_title"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="18dp"
+            android:layout_marginEnd="15dp"
+            android:orientation="vertical"
+            android:paddingStart="12dp"
+            android:paddingTop="12dp"
+            android:paddingEnd="18dp"
+            android:paddingBottom="10dp"
+            app:qmui_backgroundColor="#B3ffffff"
+            app:qmui_borderColor="@color/translucent"
+            app:qmui_radius="12dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="账户余额"
+                android:textColor="#222222"
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="23dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="¥"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="1008.06"
+                    android:textSize="30sp" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:onClick="@{v->vm.toWithdrawal()}"
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal">
+
+
+                    <ImageView
+                        android:layout_width="20dp"
+                        android:layout_height="16.5dp"
+                        android:layout_gravity="center_vertical"
+                        android:src="@drawable/ct_money" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="6dp"
+                        android:text="提现"
+                        android:textColor="#222222"
+                        android:textSize="14sp" />
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+
+        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="18sp"
+            android:background="@drawable/bg_money_top"
+            android:orientation="vertical"
+            android:paddingStart="15dp"
+            android:paddingTop="16dp"
+            android:paddingEnd="15dp"
+            android:paddingBottom="16dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:shadowColor="#38D3D3"
+                android:shadowDx="13"
+                android:shadowDy="13"
+                android:shadowRadius="2"
+                android:text="明细"
+                android:textColor="#222222"
+                android:textSize="15sp"
+                android:textStyle="bold" />
+
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginTop="12dp"
+                app:qmui_backgroundColor="#F3F3F3"
+                app:qmui_borderColor="@color/translucent"
+                app:qmui_radius="6dp">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_margin="6dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/bg_click_on"
+                    android:gravity="center"
+                    android:text="全部"
+                    android:textColor="#666666"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_margin="6dp"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="收入"
+                    android:textColor="#666666"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_margin="6dp"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="支出"
+                    android:textColor="#666666"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_margin="6dp"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="提现"
+                    android:textColor="#666666"
+                    android:textSize="14sp" />
+
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+        </LinearLayout>
+
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/white">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/item_my_wallet" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+    </LinearLayout>
+
+</layout>

app/src/main/res/layout/activity_setting.xml

@@ -24,6 +24,7 @@
             android:background="@color/white"
             android:gravity="center_vertical"
             android:orientation="horizontal"
+            android:onClick="@{v->vm.toMyInfo()}"
             android:paddingStart="15dp"
             android:paddingEnd="14dp">
 
@@ -55,6 +56,7 @@
             android:background="@color/white"
             android:gravity="center_vertical"
             android:orientation="horizontal"
+            android:onClick="@{v->vm.toAccountSafe()}"
             android:paddingStart="15dp"
             android:paddingEnd="14dp">
 
@@ -62,7 +64,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="我的收货地址"
+                android:text="账户安全"
                 android:textColor="@color/text_title"
                 android:textSize="15sp" />
 
@@ -75,13 +77,19 @@
 
         </LinearLayout>
 
+        <View
+            android:background="#F3F3F3"
+            android:layout_marginEnd="15dp"
+            android:layout_marginStart="15dp"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"/>
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:layout_marginTop="@dimen/dp_10"
             android:background="@color/white"
             android:gravity="center_vertical"
             android:orientation="horizontal"
+            android:onClick="@{v->vm.toChangePassword()}"
             android:paddingStart="15dp"
             android:paddingEnd="14dp">
 
@@ -89,7 +97,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="账户安全"
+                android:text="密码修改"
                 android:textColor="@color/text_title"
                 android:textSize="15sp" />
 
@@ -114,13 +122,14 @@
             android:gravity="center_vertical"
             android:orientation="horizontal"
             android:paddingStart="15dp"
+            android:onClick="@{v->vm.toBindBank()}"
             android:paddingEnd="14dp">
 
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="二级密码"
+                android:text="绑定银行卡"
                 android:textColor="@color/text_title"
                 android:textSize="15sp" />
 
@@ -192,6 +201,12 @@
 
 
         </LinearLayout>
+        <View
+            android:background="#F3F3F3"
+            android:layout_marginEnd="15dp"
+            android:layout_marginStart="15dp"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -257,15 +272,31 @@
             android:layout_height="0dp"
             android:layout_weight="1"/>
 
-        <TextView
-            android:text="退出登录"
-            android:textColor="#F02939"
-            android:gravity="center"
-            android:textSize="18sp"
-            android:onClick="@{v->vm.toExitLogin()}"
-            android:background="@color/white"
+
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"/>
+            android:background="@color/white"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="46dp"
+                android:layout_marginStart="30dp"
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="20dp"
+                android:layout_marginEnd="30dp"
+                android:background="@drawable/bg_logo_but"
+                android:gravity="center"
+                android:onClick="@{v->vm.toExitLogin()}"
+                android:text="退出登录"
+                android:textColor="@color/white"
+                android:textSize="20sp" />
+
+        </LinearLayout>
+
+
+
 
 
 

app/src/main/res/layout/activity_withdraw.xml

@@ -0,0 +1,199 @@
+<?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">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.WithdrawVModel" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_home_bg"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="46dp"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="38dp"
+                android:layout_height="20dp"
+                android:paddingLeft="20dp"
+                android:src="@drawable/ic_back_black" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="58dp"
+                android:gravity="center_horizontal"
+                android:text="提现"
+                android:textColor="@color/text_title"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="16dp"
+            android:text="可以提现金额"
+            android:textColor="#666666"
+            android:textSize="15sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="18dp"
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="¥"
+                android:textColor="@color/text_title"
+                android:textSize="20sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1008.06"
+                android:textColor="@color/text_title"
+                android:textSize="30sp" />
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10sp"
+            android:background="@drawable/bg_money_top"
+            android:orientation="vertical"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="54dp"
+                android:gravity="center_vertical"
+                android:text="提现金额"
+                android:textColor="@color/text_title"
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="54dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="¥"
+                    android:textColor="#222222"
+                    android:textSize="26sp" />
+
+                <com.ysnows.base.widget.DelEditText
+                    android:id="@+id/et_password"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@null"
+                    android:hint="请输入提现金额"
+                    android:inputType="textPassword"
+                    android:paddingStart="9dp"
+                    android:textColor="@color/text_title"
+                    android:textColorHint="#999999"
+                    android:textSize="30sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:text="全部提现"
+                    android:textColor="#38D3D3"
+                    android:textSize="13sp" />
+
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_1"
+                android:background="#F3F3F3" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:layout_marginTop="14dp"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:text="提现手续费"
+                    android:textSize="14sp"
+                    android:textColor="#666666"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+
+                <TextView
+                    android:text="¥10.00"
+                    android:textSize="14sp"
+                    android:textColor="#222222"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:gravity="right"
+                    android:layout_height="wrap_content"/>
+
+
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:layout_marginTop="20dp"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:text="实际到账金额"
+                    android:textSize="14sp"
+                    android:textColor="#666666"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+
+                <TextView
+                    android:text="¥990.00"
+                    android:textSize="14sp"
+                    android:textColor="#222222"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:gravity="right"
+                    android:layout_height="wrap_content"/>
+
+
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:layout_marginStart="15dp"
+                android:layout_marginTop="59dp"
+                android:layout_marginEnd="15dp"
+                android:background="@drawable/bg_logo_but"
+                android:gravity="center"
+                android:text="立即提现"
+                android:textColor="@color/white"
+                android:textSize="20sp" />
+
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+</layout>

app/src/main/res/layout/fragment_blidbox.xml

@@ -0,0 +1,27 @@
+<?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" >
+
+    <data >
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.BlindBoxVModel" />
+
+    </data >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="horizontal" >
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/item_recommed" />
+
+    </LinearLayout >
+</layout >

app/src/main/res/layout/fragment_home_my.xml

@@ -218,6 +218,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:onClick="@{v->vm.toMyWallet()}"
                     android:orientation="vertical">
 
                     <LinearLayout
@@ -410,6 +411,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="center"
+                    android:onClick="@{v->vm.toSpread()}"
                     android:orientation="vertical">
 
                     <ImageView
@@ -566,23 +568,33 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-
-                <androidx.viewpager.widget.ViewPager
-                    android:id="@+id/view_pager"
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_view"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                    app:spanCount="2"
+                    android:layout_marginEnd="15dp"
+                    android:layout_marginStart="15dp"
+                    tools:listitem="@layout/item_my_box" />
+
 
-                </androidx.viewpager.widget.ViewPager>
+                <!--                <FrameLayout-->
+                <!--                    android:id="@+id/my_container"-->
+                <!--                    android:layout_width="match_parent"-->
+                <!--                    android:layout_height="match_parent" />-->
 
 
             </LinearLayout>
 
+
             <!--            实名认证-->
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="50dp"
                 android:layout_marginEnd="50dp"
+                android:onClick="@{v->vm.toCertification()}"
                 android:orientation="vertical"
                 app:qmui_backgroundColor="@color/white"
                 app:qmui_borderColor="@color/translucent"
@@ -657,7 +669,6 @@
             </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
-
         </FrameLayout>
 
 

app/src/main/res/layout/item_my_box.xml

@@ -0,0 +1,80 @@
+<?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:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="item"
+            type="com.zswc.creativity.model.CollectionList" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <com.qmuiteam.qmui.layout.QMUILinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:orientation="vertical"
+            app:qmui_radius="12dp"
+            app:qmui_shadowAlpha="0.56"
+            app:qmui_shadowElevation="7dp">
+
+            <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+                android:layout_width="match_parent"
+                app:qmui_corner_radius="12dp"
+                android:src="@drawable/bg_need_error"
+                app:qmui_border_color="@color/translucent"
+                android:layout_height="139dp"/>
+
+            <TextView
+                android:text="唐宫手办-仕女乐队"
+                android:textSize="13sp"
+                android:textColor="@color/text_title"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="8dp"
+                android:gravity="center_vertical"
+                android:layout_marginBottom="12dp"
+                android:layout_height="wrap_content">
+
+                <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+                    android:layout_width="@dimen/dp_12"
+                    app:qmui_is_oval="true"
+                    android:src="#D8D8D8"
+                    android:layout_height="@dimen/dp_12"/>
+                <TextView
+                    android:text="河南博物馆文化有限公司"
+                    android:textSize="8sp"
+                    android:layout_marginStart="4dp"
+                    android:textColor="#A2A2A2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+
+
+            </LinearLayout>
+
+
+
+
+
+        </com.qmuiteam.qmui.layout.QMUILinearLayout>
+
+
+
+
+    </LinearLayout>
+</layout>

app/src/main/res/layout/item_my_wallet.xml

@@ -0,0 +1,70 @@
+<?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:tools="http://schemas.android.com/tools" >
+
+    <data >
+        <import type="android.view.View" />
+
+        <variable
+            name="vm"
+            type="com.zswc.creativity.vmodel.MyWalletVModel" />
+
+        <variable
+            name="item"
+            type="com.zswc.creativity.model.MsgList" />
+
+    </data >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:orientation="vertical"
+        android:paddingStart="15dp"
+        android:paddingEnd="15dp"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:layout_height="56dp">
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:orientation="vertical"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:text="购买数字藏品"
+                    android:textSize="14sp"
+                    android:textColor="#222222"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:text="2022-06-12 22:12"
+                    android:textSize="10sp"
+                    android:textColor="#999999"
+                    android:layout_marginTop="2dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+
+            </LinearLayout>
+
+
+            <TextView
+                android:text="-15.99"
+                android:textColor="#FF5F5C"
+                android:textSize="14sp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+
+
+        </LinearLayout>
+        <View
+            android:layout_width="match_parent"
+            android:background="#F3F3F3"
+            android:layout_height="1dp"/>
+
+    </LinearLayout>
+
+</layout >