1.分享适配Android11

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

@@ -136,8 +136,8 @@ class AllCollectDetailsActivity : MBActivity<AllCollectDetailsVModel, ActivityAl
         }
 
 
+        binding.scroll.setOnScrollChangeListener { v, x, y, oldX, oldY ->
 
-        binding.scroll.setOnScrollListener { x, y, oldX, oldY ->
             if (islide) {
 
                 if (y == 0) {
@@ -153,10 +153,14 @@ class AllCollectDetailsActivity : MBActivity<AllCollectDetailsVModel, ActivityAl
                 } else if (y - oldY < 0) {
                 }
             }
+
         }
 
 
 
+
+
+
         titleBar()?.imgLeft?.onClick {
 
             finishActivity()
@@ -250,6 +254,7 @@ class AllCollectDetailsActivity : MBActivity<AllCollectDetailsVModel, ActivityAl
                 }
 
                 if (it.ok(true)) {
+                    vm.isBuy.value=1
                     vm.popuBuyUtils?.setDisMiss()
                     RxBus.get().post(ConfigRx.REFRESH_SELL, "")
                     finishActivity()

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

@@ -158,8 +158,8 @@ class CollectDetailsActivity : MBActivity<CollectDetailsVModel, ActivityCollectD
 
         }
 
+        binding.scroll.setOnScrollChangeListener { v, x, y, oldX, oldY ->
 
-        binding.scroll.setOnScrollListener { x, y, oldX, oldY ->
             if (islide) {
 
                 if (y == 0) {
@@ -175,8 +175,27 @@ class CollectDetailsActivity : MBActivity<CollectDetailsVModel, ActivityCollectD
                 } else if (y - oldY < 0) {
                 }
             }
+
         }
 
+//        binding.scroll.setOnScrollListener { x, y, oldX, oldY ->
+//            if (islide) {
+//
+//                if (y == 0) {
+//                    binding.llShowTwo.visibility = View.GONE
+//                    binding.llShowOne.visibility = View.VISIBLE
+//
+//                } else if (y - oldY > 0) {
+//                    if (screenHeightPixels <= 960) {
+//                        setBarVisibility(y, 100)
+//                    } else {
+//                        setBarVisibility(y, 200)
+//                    }
+//                } else if (y - oldY < 0) {
+//                }
+//            }
+//        }
+
 
 
         titleBar()?.imgLeft?.onClick {

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

@@ -1,6 +1,8 @@
 package com.zswc.creativity.activity
 
+import android.graphics.Color
 import android.os.Bundle
+import com.githang.statusbar.StatusBarCompat
 import com.zswc.creativity.base.MBActivity
 import com.zswc.creativity.databinding.*
 import com.zswc.creativity.vmodel.*
@@ -13,6 +15,8 @@ class GiftOrderActivity : MBActivity<GiftOrderVModel, ActivityGiftOrderBinding>(
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
+        StatusBarCompat.setStatusBarColor(this, Color.parseColor("#00ffffff"))
+
         var orderid=intent?.extras?.getString("orderid")
         vm.getOrderDetals(orderid)
 

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

@@ -1,6 +1,8 @@
 package com.zswc.creativity.activity
 
+import android.graphics.Color
 import android.os.Bundle
+import com.githang.statusbar.StatusBarCompat
 import com.google.gson.Gson
 import com.zswc.creativity.base.MBActivity
 import com.zswc.creativity.databinding.ActivityMarketDetailsBinding
@@ -19,6 +21,8 @@ class MarketDetailsActivity: MBActivity<MarketDetailsVModel, ActivityMarketDetai
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
+        StatusBarCompat.setStatusBarColor(this, Color.parseColor("#00ffffff"))
+
         vm.ll=binding.ll
         var data=intent.extras?.getString("bean")
         vm.bean.value = Gson().fromJson(data, SecondListTo::class.java)

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

@@ -1,11 +1,13 @@
 package com.zswc.creativity.activity
 
 import android.app.Activity
+import android.graphics.Color
 import android.os.Bundle
 import android.os.Handler
 import android.os.Message
 import android.util.Log
 import android.view.View
+import com.githang.statusbar.StatusBarCompat
 import com.google.gson.Gson
 import com.hwangjr.rxbus.RxBus
 import com.hwangjr.rxbus.annotation.Subscribe
@@ -32,6 +34,8 @@ class MarketOrderActivity : MBActivity<MarketOrderVModel, ActivityMarketOrderBin
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
+        StatusBarCompat.setStatusBarColor(this, Color.parseColor("#00ffffff"))
+
         var data=intent.extras?.getString("bean")
         vm.bean.value = Gson().fromJson(data, SecondList::class.java)
 

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

@@ -41,9 +41,8 @@ class MyCollectActivity : MBActivity<MyCollectVModel,  ActivityMyCollectBinding>
 
 
     }
-
+    var adapter=MyCollectAdapter()
     fun setData(list:List<MyCollectionList>){
-        var adapter=MyCollectAdapter()
         binding.recyclerView.adapter=adapter
         adapter?.addData(list)
         adapter?.setOnItemClickListener { adapter, view, position ->
@@ -70,11 +69,21 @@ class MyCollectActivity : MBActivity<MyCollectVModel,  ActivityMyCollectBinding>
         return "我的藏品"
     }
 
+
+
     override val isRxbus: Boolean
         get() = true
     @Subscribe(tags = [Tag(ConfigRx.REFRESH_ZENG)])
     fun setRefreshList(type: String) {//刷新
+        adapter?.clearList()
+        vm.getList()
 
+    }
+
+    @Subscribe(tags = [Tag(ConfigRx.REFRESH_ZHOU)])
+    fun setRefreshZhou(type: String) {//转售后刷新
+        //刷新
+        adapter?.clearList()
         vm.getList()
 
     }
@@ -88,7 +97,20 @@ class MyCollectActivity : MBActivity<MyCollectVModel,  ActivityMyCollectBinding>
 
     @Subscribe(tags = [Tag(ConfigRx.REFRESH_OPEN)])
     fun setOpen(type: String) {
+
+        adapter?.clearList()
         vm.getList()
     }
 
+
+    @Subscribe(tags = [Tag(ConfigRx.REFRESH_ZHOU_CANCEL)])
+    fun setCancelZhou(type: String) {
+
+        adapter?.clearList()
+        vm.getList()
+    }
+
+
+
+
 }

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

@@ -1,6 +1,7 @@
 package com.zswc.creativity.activity
 
 import android.os.Bundle
+import android.text.Html
 import android.text.TextUtils
 import coil.load
 import coil.transform.RoundedCornersTransformation
@@ -31,6 +32,7 @@ class ResaleActivity : MBActivity<ResaleVModel, ActivityResaleBinding>() {
         vm.getInfo(id!!)
         vm.data.observe(this){
             if(null!=it){
+                binding.tvExamples.text=Html.fromHtml(it.examplesIllustrate)
                 GlideUtils.lImg(context(),it.cover,14,binding.imgBg)
 
             }

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

@@ -1,9 +1,11 @@
 package com.zswc.creativity.activity
 
+import android.graphics.Color
 import android.os.Bundle
 import android.os.Handler
 import android.os.Message
 import android.util.Log
+import com.githang.statusbar.StatusBarCompat
 import com.zswc.creativity.base.MBActivity
 import com.zswc.creativity.databinding.ActivityMyInfoBinding
 import com.zswc.creativity.databinding.ActivitySpreadBinding
@@ -26,10 +28,10 @@ class TibOrderActivity : MBActivity<TibOrderVModel, ActivityTibOrderBinding>() {
     var sumSecond = 300//5分钟的总的秒数
 
 
-
-
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
+        StatusBarCompat.setStatusBarColor(this, Color.parseColor("#00ffffff"))
+
         vm.ll=binding.ll
         var orderid=intent?.extras?.getString("orderid")
         var type=intent?.extras?.getString("type")

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

@@ -102,7 +102,6 @@ class TibetanDetailsActivity : MBActivity<TibetanDetailsVModel, ActivityTibetanD
 
                 }
 
-
             }
 
 
@@ -181,29 +180,26 @@ class TibetanDetailsActivity : MBActivity<TibetanDetailsVModel, ActivityTibetanD
         }
 
 
+        binding.scroll.setOnScrollChangeListener { v, x, y, oldX, oldY ->
 
+            if (islide) {
 
-        binding.scroll.setOnScrollListener(object : MyScrollView.OnScrollChangedListener {
-
-
-            override fun onScrollChanged(x: Int, y: Int, oldX: Int, oldY: Int) {
-                if (islide) {
-
-                    if (y == 0) {
-                        binding.llShowTwo.visibility = View.GONE
-                        binding.llShowOne.visibility = View.VISIBLE
+                if (y == 0) {
+                    binding.llShowTwo.visibility = View.GONE
+                    binding.llShowOne.visibility = View.VISIBLE
 
-                    } else if (y - oldY > 0) {
-                        if (screenHeightPixels <= 960) {
-                            setBarVisibility(y, 100)
-                        } else {
-                            setBarVisibility(y, 200)
-                        }
-                    } else if (y - oldY < 0) {
+                } else if (y - oldY > 0) {
+                    if (screenHeightPixels <= 960) {
+                        setBarVisibility(y, 100)
+                    } else {
+                        setBarVisibility(y, 200)
                     }
+                } else if (y - oldY < 0) {
                 }
             }
-        })
+
+        }
+
 
 
 

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

@@ -2,6 +2,7 @@ package com.zswc.creativity.adapter
 
 import android.content.Context
 import android.graphics.Color
+import android.graphics.Typeface
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -72,8 +73,15 @@ class TabsAdapter(var context: Context): BaseAdapter() {
         holder.tv.text=dEntity.name
 
         if(dEntity.chose){
+            holder.tv.setTextColor(Color.parseColor("#222222"))
+            holder.tv.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
+
             holder.lin.visibility=View.VISIBLE
+
         }else{
+            holder.tv.setTextColor(Color.parseColor("#666666"))
+            holder.tv.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
+
             holder.lin.visibility=View.INVISIBLE
         }
 

app/src/main/java/com/zswc/creativity/config/ConfigRx.kt

@@ -45,6 +45,8 @@ object ConfigRx {
 
     const val REFRESH_ZHOU = "REFRESH_ZHOU" //转售
 
+
+
     const val CHOSE_TAB = "CHOSE_TAB"
 
     const val REFRESH_CANCEL_ORDER = "REFRESH_CANCEL_ORDER" //详情-取消我的订单

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

@@ -13,6 +13,7 @@ import com.zswc.creativity.adapter.CollectAdapter
 import com.zswc.creativity.base.MBFragment
 import com.zswc.creativity.config.ConfigRx
 import com.zswc.creativity.databinding.FragmentHomeMyBinding
+import com.zswc.creativity.databinding.FragmentHomeMyToBinding
 import com.zswc.creativity.inte.ChoiceData
 import com.zswc.creativity.model.MyCollection
 import com.zswc.creativity.utils.PopuSignedInUtils
@@ -24,7 +25,7 @@ import com.zswc.creativity.vmodel.HomeMyVModel
  *Created by shihuiyun
  *on 2020/9/11
  */
-class HomeMyFragment : MBFragment<HomeMyVModel, FragmentHomeMyBinding>() {
+class HomeMyFragment : MBFragment<HomeMyVModel, FragmentHomeMyToBinding>() {
 //    var fragments = emptyArray<Fragment>()
 
     var adapter: CollectAdapter? = null
@@ -125,8 +126,8 @@ class HomeMyFragment : MBFragment<HomeMyVModel, FragmentHomeMyBinding>() {
         return HomeMyVModel::class.java
     }
 
-    override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentHomeMyBinding {
-        return FragmentHomeMyBinding.inflate(layoutInflater)
+    override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentHomeMyToBinding {
+        return FragmentHomeMyToBinding.inflate(layoutInflater)
     }
 
     override fun title(): String? {
@@ -136,6 +137,12 @@ class HomeMyFragment : MBFragment<HomeMyVModel, FragmentHomeMyBinding>() {
     override val isRxbus: Boolean
         get() = true
 
+    override fun onRefresh() {
+        super.onRefresh()
+        vm.getUserInfo()
+        vm.getMyCollection()
+    }
+
     @Subscribe(tags = [Tag(ConfigRx.REFRESH_USER)])
     fun setRefreshUser(type: String) {
         vm.getUserInfo()

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

@@ -189,6 +189,7 @@ class HomeSaleFragmet : MBRFragment<HomeSaleVModel, HomeSaleAdapter, FragmentHom
                     vm.label = value.name
                 }
                 value.chose = true
+                adapter().clearList()
                 onRefresh()
             } else {
                 value.chose = false
@@ -201,6 +202,7 @@ class HomeSaleFragmet : MBRFragment<HomeSaleVModel, HomeSaleAdapter, FragmentHom
 
     @Subscribe(tags = [Tag(ConfigRx.REFRESH_SELL)])
     fun setRefresh(type: String) {//二级市场钱包购买后
+        adapter().clearList()
         onRefresh()
     }
 

app/src/main/java/com/zswc/creativity/model/MyOrderListDetail.kt

@@ -19,7 +19,7 @@ data class MyOrderListDetail(
         var payPrice:String,var payAt:String?,var payType:String,var cancelTime:String,
         var price:String,
 
-        var sendName:String,
+        var toName:String,
 
         ) : IModel {
 

app/src/main/java/com/zswc/creativity/utils/PopuPaySuesstils.kt

@@ -0,0 +1,79 @@
+package com.zswc.creativity.utils
+
+import android.content.Context
+import android.text.TextUtils
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.*
+import com.qmuiteam.qmui.kotlin.onClick
+import com.qmuiteam.qmui.layout.QMUIFrameLayout
+import com.qmuiteam.qmui.skin.QMUISkinValueBuilder
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+import com.qmuiteam.qmui.widget.popup.QMUIPopup
+import com.qmuiteam.qmui.widget.popup.QMUIPopups
+import com.ysnows.base.widget.DelEditText
+import com.zswc.creativity.R
+import com.zswc.creativity.model.MyOrderListDetail
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/21
+ */
+object PopuPaySuesstils {
+
+    fun show(context: Context, view: View,bean: MyOrderListDetail) {
+
+        var mNormalPopup = QMUIPopups.fullScreenPopup(context)
+        val builder: QMUISkinValueBuilder = QMUISkinValueBuilder.acquire()
+        val frameLayout = QMUIFrameLayout(context)
+        //自定义布局
+        val layoutInflater = context?.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        var layout = layoutInflater.inflate(R.layout.popu_suess_pay, null)
+
+        val tvMoney: TextView = layout.findViewById(R.id.tv_money)
+        val tvNumber: TextView = layout.findViewById(R.id.tv_number)
+        val tvTime: TextView = layout.findViewById(R.id.tv_time)
+        val tvPay: TextView = layout.findViewById(R.id.tv_pay)
+        val tvSure: TextView = layout.findViewById(R.id.tv_sure)
+
+        tvMoney.text=bean.payPrice
+        tvNumber.text="订单编号："+bean.orderNo
+        tvTime.text="下单时间："+bean.createAt
+
+        if(bean.payType == "ye"){
+            tvPay.text="余额支付"
+        }
+        if(bean.payType == "qb"){
+            tvPay.text="钱包支付"
+        }
+
+        tvSure.onClick {
+
+            mNormalPopup.dismiss()
+        }
+
+
+        builder.release();
+
+
+        val size = QMUIDisplayHelper.getScreenWidth(context)
+        val height = QMUIDisplayHelper.getScreenHeight(context)
+
+
+        val lp: FrameLayout.LayoutParams = FrameLayout.LayoutParams(size,
+                height)
+        frameLayout.addView(layout, lp)
+
+        mNormalPopup.addView(frameLayout)
+        mNormalPopup.onDismiss() {
+        }
+
+        mNormalPopup.dismissIfOutsideTouch(false)
+        mNormalPopup.animStyle(QMUIPopup.ANIM_GROW_FROM_CENTER)
+        mNormalPopup.show(view)
+
+
+    }
+
+
+}

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

@@ -165,8 +165,9 @@ class CollectDetailsVModel(application: Application) : BViewModel<BRepository>(a
                     if(it.ok(true)){
                         //刷新
                         resaleStatus.value=1
-
                         getInfo()
+                        RxBus.get().post(ConfigRx.REFRESH_ZHOU_CANCEL,"")
+
                     }
 
                 }

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

@@ -181,6 +181,9 @@ open class HomeMyVModel(application: Application) : BViewModel<BRepository>(appl
                 user.value = it.result
                 is_auth.value = !it.result?.isAuth.equals("0")
 
+                view().refreshing(false)
+            }else{
+                view().refreshing(false)
             }
         }
     }

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

@@ -46,6 +46,7 @@ class MyCollectVModel(application: Application) : BViewModel<BRepository>(applic
        var it=  repository().lreq { NetEngine.service.myCollectionList(param) }
          if(it.ok()){
              list.value=it.result
+
          }
      }
  }

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

@@ -53,20 +53,12 @@ class TibOrderVModel(application: Application) : BViewModel<BRepository>(applica
 
     fun setShowTips(pay_type:String?):String{
 
-        if(pay_type == "wx"){
-            return "微信支付"
-        }
-        if(pay_type == "h5"){
-            return "网页支付"
-        }
-        if(pay_type == "sd"){
-            return "快捷支付"
-        }
-        if(pay_type == "wallet"){
+        if(pay_type == "ye"){
             return "余额支付"
         }
-
-
+        if(pay_type == "qb"){
+            return "钱包支付"
+        }
         return ""
     }
 

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

@@ -141,6 +141,8 @@ class TibetanDetailsVModel(application: Application) : BViewModel<BRepository>(a
             var it = repository().lreq { NetEngine.service.setCreateOrder(param) }
             if (it.ok(true)) {
                 popuBuyUtils?.setDisMiss()
+                //todo:
+               //             PopuPaySuesstils.show(this, binding.ll, it)
 
 //                UiSwitch.bundle(
 //                       repository().context, PaySuessActivity::class.java,

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

@@ -26,7 +26,7 @@
             android:layout_height="0dp"
             android:layout_weight="1">
 
-            <com.zswc.creativity.view.MyScrollView
+            <androidx.core.widget.NestedScrollView
                 android:id="@+id/scroll"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -47,6 +47,8 @@
                             android:id="@+id/image_gif_view"
                             android:layout_width="match_parent"
                             android:layout_height="360dp"
+                            android:scaleType="centerCrop"
+
                             android:src="@drawable/bg_need_error" />
 
                         <ImageView
@@ -497,7 +499,7 @@
 
                 </FrameLayout>
 
-            </com.zswc.creativity.view.MyScrollView>
+            </androidx.core.widget.NestedScrollView>
             <!--             滑动时候显示的   -->
 
 
@@ -539,7 +541,6 @@
                         android:id="@+id/tv_show_title"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="14dp"
                         android:layout_weight="1"
                         android:gravity="center_horizontal"
                         android:text="臧品详情"
@@ -550,7 +551,7 @@
                     <ImageView
                         android:layout_width="28dp"
                         android:layout_height="20dp"
-                        android:layout_marginEnd="16dp"
+                        android:layout_marginEnd="10dp"
                         android:src="@drawable/ct_share"
                         android:visibility="invisible" />
 
@@ -581,10 +582,7 @@
                 android:textSize="26sp" />
 
 
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1" />
+
 
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
                 android:id="@+id/but_buy"
@@ -622,11 +620,6 @@
                 android:textSize="26sp" />
 
 
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1" />
-
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
                 android:layout_width="180dp"

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <data>
 
@@ -25,7 +25,7 @@
             android:layout_height="0dp"
             android:layout_weight="1">
 
-            <com.zswc.creativity.view.MyScrollView
+            <androidx.core.widget.NestedScrollView
                 android:id="@+id/scroll"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -117,6 +117,7 @@
 
                         </LinearLayout>
 
+
                         <LinearLayout
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -125,23 +126,16 @@
                             android:gravity="center_vertical"
                             android:orientation="horizontal">
 
+                            <View
+                                android:layout_width="4dp"
+                                android:layout_height="14dp"
+                                android:background="@drawable/bg_chose_line" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="认证"
-                                android:textColor="#222222"
-                                android:textSize="16sp"
-                                android:textStyle="bold" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:shadowColor="#38D3D3"
-                                android:shadowDx="11"
-                                android:shadowDy="22"
-                                android:shadowRadius="2"
-                                android:text="信息"
+                                android:layout_marginStart="4dp"
+                                android:text="认证信息"
                                 android:textColor="#222222"
                                 android:textSize="16sp"
                                 android:textStyle="bold" />
@@ -149,6 +143,7 @@
 
                         </LinearLayout>
 
+
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -222,22 +217,16 @@
                             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="16sp"
-                                android:textStyle="bold" />
+                            <View
+                                android:layout_width="4dp"
+                                android:layout_height="14dp"
+                                android:background="@drawable/bg_chose_line" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:shadowColor="#38D3D3"
-                                android:shadowDx="11"
-                                android:shadowDy="22"
-                                android:shadowRadius="2"
-                                android:text="信息"
+                                android:layout_marginStart="4dp"
+                                android:text="卖家信息"
                                 android:textColor="#222222"
                                 android:textSize="16sp"
                                 android:textStyle="bold" />
@@ -245,6 +234,8 @@
 
                         </LinearLayout>
 
+
+
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -308,33 +299,28 @@
                             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="16sp"
-                                android:textStyle="bold" />
+                            <View
+                                android:layout_width="4dp"
+                                android:layout_height="14dp"
+                                android:background="@drawable/bg_chose_line" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:shadowColor="#38D3D3"
-                                android:shadowDx="11"
-                                android:shadowDy="22"
-                                android:shadowRadius="2"
-                                android:text="描述"
+                                android:layout_marginStart="4dp"
+                                android:text="藏品描述"
                                 android:textColor="#222222"
                                 android:textSize="16sp"
                                 android:textStyle="bold" />
 
+
                         </LinearLayout>
 
                         <RelativeLayout
                             android:layout_width="match_parent"
-                            android:orientation="vertical"
+                            android:layout_height="wrap_content"
                             android:layout_marginTop="14dp"
-                            android:layout_height="wrap_content">
+                            android:orientation="vertical">
 
 
                             <androidx.recyclerview.widget.RecyclerView
@@ -359,32 +345,29 @@
                             app:qmui_borderColor="@color/translucent"
                             app:qmui_radius="8dp">
 
+
+
                             <LinearLayout
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 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="16sp"
-                                    android:textStyle="bold" />
+                                <View
+                                    android:layout_width="4dp"
+                                    android:layout_height="14dp"
+                                    android:background="@drawable/bg_chose_line" />
 
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:shadowColor="#38D3D3"
-                                    android:shadowDx="11"
-                                    android:shadowDy="22"
-                                    android:shadowRadius="2"
-                                    android:text="须知"
+                                    android:layout_marginStart="4dp"
+                                    android:text="购买须知"
                                     android:textColor="#222222"
                                     android:textSize="16sp"
                                     android:textStyle="bold" />
 
+
                             </LinearLayout>
 
                             <TextView
@@ -418,22 +401,16 @@
                                 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="16sp"
-                                    android:textStyle="bold" />
+                                <View
+                                    android:layout_width="4dp"
+                                    android:layout_height="14dp"
+                                    android:background="@drawable/bg_chose_line" />
 
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:shadowColor="#38D3D3"
-                                    android:shadowDx="11"
-                                    android:shadowDy="22"
-                                    android:shadowRadius="2"
-                                    android:text="提示"
+                                    android:layout_marginStart="4dp"
+                                    android:text="温馨提示"
                                     android:textColor="#222222"
                                     android:textSize="16sp"
                                     android:textStyle="bold" />
@@ -506,7 +483,7 @@
 
                 </FrameLayout>
 
-            </com.zswc.creativity.view.MyScrollView>
+            </androidx.core.widget.NestedScrollView>
             <!--             滑动时候显示的   -->
 
 
@@ -548,7 +525,6 @@
                         android:id="@+id/tv_show_title"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="14dp"
                         android:layout_weight="1"
                         android:gravity="center_horizontal"
                         android:text="臧品详情"
@@ -559,7 +535,7 @@
                     <ImageView
                         android:layout_width="28dp"
                         android:layout_height="20dp"
-                        android:layout_marginEnd="16dp"
+                        android:layout_marginEnd="10dp"
                         android:src="@drawable/ct_share"
                         android:visibility="invisible" />
 
@@ -727,134 +703,134 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:visibility="@{vm.resaleStatus==1?View.VISIBLE:View.GONE}"
-                android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="80dp"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:paddingBottom="30dp"
-                android:visibility="@{vm.is_destruction==1?View.VISIBLE:View.GONE}">
+                android:visibility="@{vm.resaleStatus==1?View.VISIBLE:View.GONE}">
 
                 <LinearLayout
-                    android:id="@+id/ll_certificate_to"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="20dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="80dp"
                     android:gravity="center"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="22dp"
-                        android:layout_height="22dp"
-                        android:src="@drawable/ct_shu" />
+                    android:orientation="horizontal"
+                    android:paddingBottom="30dp"
+                    android:visibility="@{vm.is_destruction==1?View.VISIBLE:View.GONE}">
 
-                    <TextView
+                    <LinearLayout
+                        android:id="@+id/ll_certificate_to"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:text="证书"
-                        android:textColor="@color/text_title"
-                        android:textSize="10sp" />
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="20dp"
+                        android:gravity="center"
+                        android:orientation="vertical">
 
-                </LinearLayout>
+                        <ImageView
+                            android:layout_width="22dp"
+                            android:layout_height="22dp"
+                            android:src="@drawable/ct_shu" />
 
-                <LinearLayout
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:text="证书"
+                            android:textColor="@color/text_title"
+                            android:textSize="10sp" />
 
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="30dp"
-                    android:gravity="center"
-                    android:onClick="@{v->vm.toSell()}"
-                    android:orientation="vertical">
+                    </LinearLayout>
 
-                    <ImageView
-                        android:layout_width="22dp"
-                        android:layout_height="22dp"
-                        android:src="@drawable/ct_bottom_jishou" />
+                    <LinearLayout
 
-                    <TextView
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:text="寄售"
-                        android:textColor="@color/text_title"
-                        android:textSize="10sp" />
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="30dp"
+                        android:gravity="center"
+                        android:onClick="@{v->vm.toSell()}"
+                        android:orientation="vertical">
 
-                </LinearLayout>
+                        <ImageView
+                            android:layout_width="22dp"
+                            android:layout_height="22dp"
+                            android:src="@drawable/ct_bottom_jishou" />
 
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:text="寄售"
+                            android:textColor="@color/text_title"
+                            android:textSize="10sp" />
 
-                <LinearLayout
+                    </LinearLayout>
 
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="30dp"
-                    android:gravity="center"
-                    android:onClick="@{v->vm.toGiven()}"
-                    android:orientation="vertical">
 
-                    <ImageView
-                        android:layout_width="22dp"
-                        android:layout_height="22dp"
-                        android:src="@drawable/ct_gift" />
+                    <LinearLayout
 
-                    <TextView
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:text="转赠"
-                        android:textColor="@color/text_title"
-                        android:textSize="10sp" />
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="30dp"
+                        android:gravity="center"
+                        android:onClick="@{v->vm.toGiven()}"
+                        android:orientation="vertical">
 
-                </LinearLayout>
+                        <ImageView
+                            android:layout_width="22dp"
+                            android:layout_height="22dp"
+                            android:src="@drawable/ct_gift" />
 
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:text="转赠"
+                            android:textColor="@color/text_title"
+                            android:textSize="10sp" />
 
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1" />
+                    </LinearLayout>
 
-                <TextView
-                    android:layout_width="180dp"
-                    android:layout_height="36dp"
-                    android:layout_marginEnd="25dp"
-                    android:background="@drawable/bg_six_but"
-                    android:gravity="center"
-                    android:onClick="@{v->vm.toOpen()}"
-                    android:text="打开"
-                    android:textColor="@color/white"
-                    android:textSize="16sp" />
 
-            </LinearLayout>
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1" />
 
+                    <TextView
+                        android:layout_width="180dp"
+                        android:layout_height="36dp"
+                        android:layout_marginEnd="25dp"
+                        android:background="@drawable/bg_six_but"
+                        android:gravity="center"
+                        android:onClick="@{v->vm.toOpen()}"
+                        android:text="打开"
+                        android:textColor="@color/white"
+                        android:textSize="16sp" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="80dp"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:paddingBottom="30dp"
-                android:visibility="@{vm.is_destruction==0?View.VISIBLE:View.GONE}">
+                </LinearLayout>
 
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="36dp"
-                    android:layout_marginStart="25dp"
-                    android:layout_marginEnd="25dp"
+                    android:layout_height="80dp"
                     android:gravity="center"
-                    android:text="已开启"
-                    android:textColor="#999999"
-                    android:textSize="16sp"
-                    app:qmui_backgroundColor="#D8D8D8"
-                    app:qmui_borderColor="@color/translucent"
-                    app:qmui_radius="14dp" />
+                    android:orientation="horizontal"
+                    android:paddingBottom="30dp"
+                    android:visibility="@{vm.is_destruction==0?View.VISIBLE:View.GONE}">
 
 
-            </LinearLayout>
+                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                        android:layout_width="match_parent"
+                        android:layout_height="36dp"
+                        android:layout_marginStart="25dp"
+                        android:layout_marginEnd="25dp"
+                        android:gravity="center"
+                        android:text="已开启"
+                        android:textColor="#999999"
+                        android:textSize="16sp"
+                        app:qmui_backgroundColor="#D8D8D8"
+                        app:qmui_borderColor="@color/translucent"
+                        app:qmui_radius="14dp" />
+
+
+                </LinearLayout>
 
             </LinearLayout>
 

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

@@ -243,7 +243,7 @@
                     android:layout_height="wrap_content"/>
 
                 <TextView
-                    android:text="@{vm.bean.sendName}"
+                    android:text="@{vm.bean.toName}"
                     android:textSize="13sp"
                     android:textColor="#222222"
                     android:layout_width="0dp"

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

@@ -231,7 +231,7 @@
                     android:layout_height="wrap_content"/>
 
                 <TextView
-                    android:text="@{vm.bean.sendName}"
+                    android:text="@{vm.bean.createAt}"
                     android:textSize="13sp"
                     android:textColor="#222222"
                     android:layout_width="0dp"

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

@@ -13,23 +13,17 @@
         android:background="@color/color_bg"
         android:orientation="vertical">
 
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/refresh_layout"
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/dp_12"
             android:layout_marginStart="10dp"
-            android:layout_marginTop="@dimen/dp_12">
-
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-                app:spanCount="2"
-                tools:listitem="@layout/item_my_collect" />
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2"
+            tools:listitem="@layout/item_my_collect" />
 
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     </LinearLayout>
 
 </layout>

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

@@ -258,12 +258,12 @@
             android:textSize="12sp" />
 
         <TextView
+            android:id="@+id/tv_examples"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="15dp"
             android:layout_marginTop="6dp"
             android:layout_marginEnd="15dp"
-            android:text="@{vm.data.examplesIllustrate}"
             android:textColor="#666666"
             android:textSize="12sp" />
 
@@ -276,7 +276,7 @@
             android:layout_marginEnd="15dp"
             android:background="@drawable/bg_logo_but"
             android:gravity="center"
-            android:text="立即转售"
+            android:text="立即寄售"
             android:textColor="@color/white"
             android:textSize="18sp" />
 

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

@@ -46,6 +46,7 @@
                             android:id="@+id/image_gif_view"
                             android:layout_width="match_parent"
                             android:layout_height="360dp"
+                            android:scaleType="centerCrop"
                             android:src="@drawable/bg_need_error" />
 
                         <ImageView
@@ -543,10 +544,10 @@
                         android:id="@+id/tv_show_title"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="14dp"
                         android:layout_weight="1"
                         android:gravity="center_horizontal"
-                        android:text="臧品详情"
+                        android:text="藏品详情"
+                        android:layout_marginStart="6dp"
                         android:textColor="@color/text_title"
                         android:textSize="18sp"
                         android:textStyle="bold" />

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

@@ -617,19 +617,18 @@
 
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_collect_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginStart="15dp"
-                app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-                app:spanCount="2"
-                tools:listitem="@layout/item_my_box" />
-
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_collect_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="15dp"
+                    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                    app:spanCount="2"
+                    tools:listitem="@layout/item_my_box" />
 
             <!--            -->
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout

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

@@ -0,0 +1,729 @@
+<?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.HomeMyVModel" />
+
+        <import type="android.view.View" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_home_bg"
+        android:orientation="vertical">
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:focusable="true">
+
+            <androidx.core.widget.NestedScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scrollbars="none">
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
+
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        app:layout_scrollFlags="scroll">
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="right"
+                            android:layout_marginTop="56dp"
+                            android:layout_marginEnd="15dp"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+
+                            <ImageView
+                                android:layout_width="24dp"
+                                android:layout_height="24dp"
+                                android:onClick="@{v->vm.toMsg()}"
+                                android:src="@drawable/ct_msg" />
+
+                            <ImageView
+                                android:id="@+id/img_sign"
+                                android:layout_width="64dp"
+                                android:layout_height="30dp"
+                                android:layout_marginStart="12dp"
+                                android:src="@drawable/ct_qiandao_off" />
+
+                        </LinearLayout>
+
+
+                        <FrameLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="15dp"
+                                android:layout_marginEnd="26dp"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal"
+                                android:visibility="@{vm.isLogin?View.VISIBLE:View.GONE}">
+
+                                <FrameLayout
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content">
+                                    <!--                   app:url="@{vm.user.avatar}"-->
+                                    <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+                                        android:id="@+id/img_avater"
+                                        android:layout_width="64dp"
+                                        android:layout_height="64dp"
+                                        android:src="@drawable/ic_default_avatar"
+                                        app:qmui_border_color="@color/white"
+                                        app:qmui_corner_radius="2dp"
+                                        app:qmui_is_oval="true"
+                                        app:url="@{vm.user.headimg}" />
+
+                                    <ImageView
+                                        android:layout_width="56dp"
+                                        android:layout_height="24dp"
+                                        android:layout_marginStart="20dp"
+                                        android:layout_marginTop="45dp"
+                                        android:src="@{vm.isShowAuth(vm.user.isAuth)}" />
+
+
+                                </FrameLayout>
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="6dp"
+                                    android:orientation="vertical">
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="@{vm.user.name}"
+                                        android:textColor="#1B1A1B"
+                                        android:textSize="20sp"
+                                        android:textStyle="bold" />
+
+
+                                    <LinearLayout
+                                        android:layout_width="match_parent"
+                                        android:layout_height="22dp"
+                                        android:layout_marginTop="6dp"
+                                        android:background="#B3FFFFFF"
+                                        android:orientation="horizontal">
+
+
+                                        <TextView
+                                            android:layout_width="0dp"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginStart="6dp"
+                                            android:layout_weight="1"
+                                            android:ellipsize="end"
+                                            android:singleLine="true"
+                                            android:text="@{`区块链地址:`+vm.user.walletAddress}"
+                                            android:textColor="#222222"
+                                            android:textSize="10sp" />
+
+                                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginEnd="4dp"
+                                            android:onClick="@{v->vm.toCopyText()}"
+                                            android:paddingStart="6dp"
+                                            android:paddingTop="4dp"
+                                            android:paddingEnd="6dp"
+                                            android:paddingBottom="4dp"
+                                            android:text="复制"
+                                            android:textColor="@color/white"
+                                            android:textSize="10sp"
+                                            app:qmui_backgroundColor="#38D3D3"
+                                            app:qmui_borderColor="@color/translucent"
+                                            app:qmui_radius="2dp" />
+
+                                    </LinearLayout>
+
+
+                                </LinearLayout>
+
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="15dp"
+                                android:layout_marginEnd="26dp"
+                                android:onClick="@{v->vm.toLogin()}"
+                                android:orientation="horizontal"
+                                android:visibility="@{vm.isLogin?View.GONE:View.VISIBLE}">
+
+                                <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+                                    android:layout_width="64dp"
+                                    android:layout_height="64dp"
+                                    android:background="@drawable/ic_default_avatar"
+                                    app:qmui_border_color="@color/white"
+                                    app:qmui_corner_radius="2dp"
+                                    app:qmui_is_oval="true" />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_marginStart="10dp"
+                                    android:text="请登录"
+                                    android:textColor="#1B1A1B"
+                                    android:textSize="20sp" />
+
+
+                            </LinearLayout>
+
+                        </FrameLayout>
+
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="15dp"
+                            android:layout_marginTop="19dp"
+                            android:layout_marginEnd="15dp"
+                            android:orientation="horizontal"
+                            app:qmui_backgroundColor="@color/white"
+                            app:qmui_borderColor="@color/translucent"
+                            app:qmui_radius="10dp">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:layout_marginTop="16dp"
+                                android:layout_marginBottom="9dp"
+                                android:orientation="horizontal">
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:orientation="vertical">
+
+                                    <LinearLayout
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:layout_gravity="center"
+                                        android:gravity="center"
+                                        android:onClick="@{v->vm.toIntegral()}"
+                                        android:orientation="horizontal">
+
+                                        <ImageView
+                                            android:layout_width="22dp"
+                                            android:layout_height="26dp"
+                                            android:src="@drawable/ct_my_jifen" />
+
+                                        <TextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginStart="8dp"
+                                            android:text="积分"
+                                            android:textColor="#666666"
+                                            android:textSize="14sp" />
+
+                                    </LinearLayout>
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_gravity="center_horizontal"
+                                        android:layout_marginTop="13dp"
+                                        android:text="@{vm.user.integral}"
+                                        android:textColor="@color/text_title"
+                                        android:textSize="20sp" />
+
+                                </LinearLayout>
+
+
+                                <View
+                                    android:layout_width="1dp"
+                                    android:layout_height="46dp"
+                                    android:background="#E7E7E7" />
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:onClick="@{v->vm.toMyWallet()}"
+                                    android:orientation="vertical">
+
+                                    <LinearLayout
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:layout_gravity="center"
+                                        android:gravity="center"
+                                        android:orientation="horizontal">
+
+                                        <ImageView
+                                            android:layout_width="22dp"
+                                            android:layout_height="26dp"
+                                            android:src="@drawable/ct_my_banlance" />
+
+                                        <TextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginStart="8dp"
+                                            android:text="余额"
+                                            android:textColor="#666666"
+                                            android:textSize="14sp" />
+
+                                    </LinearLayout>
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_gravity="center_horizontal"
+                                        android:layout_marginTop="@dimen/dp_13"
+                                        android:text="@{vm.user.money}"
+                                        android:textColor="@color/text_title"
+                                        android:textSize="20sp" />
+
+                                </LinearLayout>
+
+
+                            </LinearLayout>
+
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="15dp"
+                            android:layout_marginTop="12dp"
+                            android:layout_marginEnd="15dp"
+                            android:orientation="vertical"
+                            android:paddingTop="18dp"
+                            android:paddingBottom="18dp"
+                            app:qmui_backgroundColor="#FFFFFF"
+                            app:qmui_borderColor="@color/translucent"
+                            app:qmui_radius="12dp">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="horizontal">
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="center"
+                                    android:onClick="@{v->vm.toMyOrder()}"
+                                    android:orientation="vertical">
+
+                                    <ImageView
+                                        android:layout_width="24dp"
+                                        android:layout_height="24dp"
+                                        android:src="@drawable/ct_home_order" />
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="1dp"
+                                        android:text="我的订单"
+                                        android:textColor="#222222"
+                                        android:textSize="12sp" />
+
+
+                                </LinearLayout>
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="center"
+                                    android:onClick="@{v->vm.toConsignmentOrder()}"
+                                    android:orientation="vertical">
+
+                                    <ImageView
+                                        android:layout_width="24dp"
+                                        android:layout_height="24dp"
+                                        android:src="@drawable/ct_my_jishou" />
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="1dp"
+                                        android:text="寄售订单"
+                                        android:textColor="#222222"
+                                        android:textSize="12sp" />
+
+
+                                </LinearLayout>
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="center"
+                                    android:onClick="@{v->vm.toMall()}"
+                                    android:orientation="vertical">
+
+                                    <ImageView
+                                        android:layout_width="24dp"
+                                        android:layout_height="24dp"
+                                        android:src="@drawable/ct_my_store" />
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="1dp"
+                                        android:text="商城订单"
+                                        android:textColor="#222222"
+                                        android:textSize="12sp" />
+
+
+                                </LinearLayout>
+
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="center"
+                                    android:onClick="@{v->vm.toGiven()}"
+                                    android:orientation="vertical">
+
+                                    <ImageView
+                                        android:layout_width="24dp"
+                                        android:layout_height="24dp"
+                                        android:src="@drawable/ct_my_zeng" />
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="1dp"
+                                        android:text="转赠"
+                                        android:textColor="#222222"
+                                        android:textSize="12sp" />
+
+
+                                </LinearLayout>
+
+
+                            </LinearLayout>
+
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="27dp"
+                                android:orientation="horizontal">
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="center"
+                                    android:onClick="@{v->vm.toCertification()}"
+                                    android:orientation="vertical">
+
+                                    <ImageView
+                                        android:layout_width="24dp"
+                                        android:layout_height="24dp"
+                                        android:src="@drawable/ct_my_renzheng" />
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="1dp"
+                                        android:text="实名认证"
+                                        android:textColor="#222222"
+                                        android:textSize="12sp" />
+
+
+                                </LinearLayout>
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="center"
+                                    android:onClick="@{v->vm.toSetting()}"
+                                    android:orientation="vertical">
+
+                                    <ImageView
+                                        android:layout_width="24dp"
+                                        android:layout_height="24dp"
+                                        android:src="@drawable/ct_my_setting" />
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="1dp"
+                                        android:text="设置"
+                                        android:textColor="#222222"
+                                        android:textSize="12sp" />
+
+
+                                </LinearLayout>
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="center"
+                                    android:onClick="@{v->vm.toSpread()}"
+                                    android:orientation="vertical">
+
+                                    <ImageView
+                                        android:layout_width="24dp"
+                                        android:layout_height="24dp"
+                                        android:src="@drawable/ct_my_tuiguang" />
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="1dp"
+                                        android:text="推广"
+                                        android:textColor="#222222"
+                                        android:textSize="12sp" />
+
+
+                                </LinearLayout>
+
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="center"
+                                    android:orientation="vertical">
+
+
+                                </LinearLayout>
+
+
+                            </LinearLayout>
+
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="15dp"
+                            android:layout_marginTop="12dp"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="我的藏品"
+                                android:textColor="@color/text_title"
+                                android:textSize="15sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:text="@{vm.num}"
+                                android:textColor="@color/text_title"
+                                android:textSize="15sp"
+                                android:textStyle="bold" />
+
+                            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                                android:layout_width="70dp"
+                                android:layout_height="20dp"
+                                android:layout_marginEnd="15dp"
+                                android:onClick="@{v->vm.toSynthesis()}"
+                                android:text="合成藏品"
+                                android:textColor="@color/white"
+                                app:qmui_backgroundColor="#38D3D3"
+                                app:qmui_borderColor="@color/translucent"
+                                app:qmui_radius="4dp" />
+
+
+                        </LinearLayout>
+
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="15dp"
+                            android:layout_marginTop="12dp"
+                            android:padding="4dp"
+                            app:qmui_backgroundColor="#B3ffffff"
+                            app:qmui_borderColor="@color/translucent"
+                            app:qmui_radius="12dp">
+
+                            <TextView
+                                android:id="@+id/tv_all"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:background="@drawable/bg_chose_gray"
+                                android:paddingStart="12dp"
+                                android:paddingTop="6dp"
+                                android:paddingEnd="12dp"
+                                android:paddingBottom="4dp"
+                                android:text="全部"
+                                android:textColor="@color/text_title"
+                                android:textSize="15sp" />
+
+                            <TextView
+                                android:id="@+id/tv_one"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:background="@drawable/bg_chose_white"
+                                android:paddingStart="12dp"
+                                android:paddingTop="6dp"
+                                android:paddingEnd="12dp"
+                                android:paddingBottom="4dp"
+                                android:text="藏品"
+                                android:textColor="#A2A2A2"
+                                android:textSize="15sp" />
+
+                            <TextView
+                                android:id="@+id/tv_two"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:background="@drawable/bg_chose_white"
+                                android:paddingStart="12dp"
+                                android:paddingTop="6dp"
+                                android:paddingEnd="12dp"
+                                android:paddingBottom="4dp"
+                                android:text="盲盒"
+                                android:textColor="#A2A2A2"
+                                android:textSize="15sp" />
+
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="18dp" />
+
+                    </LinearLayout>
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/recycler_collect_view"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="15dp"
+                            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                            app:spanCount="2"
+                            tools:listitem="@layout/item_my_box" />
+
+                        <!--            -->
+
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="180dp"
+                            android:layout_marginStart="50dp"
+                            android:layout_marginEnd="50dp"
+                            android:gravity="center"
+                            android:orientation="vertical"
+                            android:visibility="@{vm.is_show?View.VISIBLE:View.GONE}"
+                            app:qmui_backgroundColor="@color/white"
+                            app:qmui_borderColor="@color/translucent"
+                            app:qmui_radius="12dp">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="16dp"
+                                android:text="暂无藏品"
+                                android:textColor="@color/text_title"
+                                android:textSize="15sp" />
+
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+                        <!--            实名认证-->
+                        <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:orientation="vertical"
+                            android:visibility="@{vm.isShowAuthView(vm.is_auth)}"
+                            app:qmui_backgroundColor="@color/white"
+                            app:qmui_borderColor="@color/translucent"
+                            app:qmui_radius="12dp">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="16dp"
+                                android:text="暂无藏品"
+                                android:textColor="@color/text_title"
+                                android:textSize="15sp" />
+
+                            <ImageView
+                                android:layout_width="40dp"
+                                android:layout_height="40dp"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="20dp"
+                                android:src="@drawable/ct_my_avator" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="@dimen/dp_13"
+                                android:text="实名认证后才能支付购买藏品"
+                                android:textColor="@color/text_title"
+                                android:textSize="13sp" />
+
+                            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                                android:layout_width="match_parent"
+                                android:layout_height="40dp"
+                                android:layout_marginStart="50dp"
+                                android:layout_marginTop="12dp"
+                                android:layout_marginEnd="50dp"
+                                android:layout_marginBottom="20dp"
+                                android:onClick="@{v->vm.toCertification()}"
+                                android:text="实名认证"
+                                android:textColor="@color/white"
+                                android:textSize="15sp"
+                                android:textStyle="bold"
+                                app:qmui_backgroundColor="#38D3D3"
+                                app:qmui_borderColor="#38D3D3"
+                                app:qmui_radius="8dp" />
+
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+                    </FrameLayout>
+
+                </LinearLayout>
+
+            </androidx.core.widget.NestedScrollView>
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+
+    </LinearLayout>
+
+</layout>

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

@@ -150,6 +150,10 @@
 
             </HorizontalScrollView>
 
+           <View
+               android:background="#F3F3F3"
+               android:layout_width="match_parent"
+               android:layout_height="@dimen/dp_1"/>
 
             <LinearLayout
                 android:layout_width="match_parent"

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

@@ -0,0 +1,125 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+
+    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:qmui_backgroundColor="@color/white"
+        app:qmui_radius="12dp">
+
+        <ImageView
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="60dp"
+            android:src="@drawable/ct_pay_suess" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="12dp"
+            android:text="支付成功"
+            android:textColor="#222222"
+            android:textSize="16sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:gravity="center_horizontal"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="¥"
+                android:textColor="#222222"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_money"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="79.9"
+                android:textColor="#222222"
+                android:textSize="30sp" />
+
+        </LinearLayout>
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="60dp"
+            android:layout_marginEnd="25dp"
+            android:orientation="vertical"
+            android:paddingStart="15dp"
+            android:paddingTop="20dp"
+            android:paddingEnd="15dp"
+            android:paddingBottom="20dp"
+            app:qmui_backgroundColor="#F3F3F3"
+            app:qmui_radius="14dp">
+
+            <TextView
+                android:id="@+id/tv_number"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="订单编号："
+                android:textColor="#333333"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_time"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:text="下单时间："
+
+                android:textColor="#333333"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_pay"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:text="支付方式："
+                android:textColor="#333333"
+                android:textSize="14sp" />
+
+
+        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+        <TextView
+            android:id="@+id/tv_sure"
+            android:layout_width="match_parent"
+            android:layout_height="46dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="60dp"
+            android:layout_marginEnd="30dp"
+            android:layout_marginBottom="22dp"
+            android:background="@drawable/bg_logo_but"
+            android:gravity="center"
+            android:text="确定"
+            android:textColor="@color/text_title"
+            android:textSize="20sp" />
+
+
+    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+</LinearLayout>

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

@@ -13,7 +13,7 @@
         android:layout_marginStart="27dp"
         android:layout_marginEnd="27dp"
         android:orientation="vertical"
-        app:qmui_backgroundColor="#DFDFDF"
+        app:qmui_backgroundColor="@color/white"
         app:qmui_radius="8dp">
 
 
@@ -52,7 +52,7 @@
             android:layout_marginTop="18dp"
             android:layout_marginEnd="15dp"
             android:layout_marginBottom="20dp"
-            app:qmui_backgroundColor="@color/white"
+            app:qmui_backgroundColor="#F3F3F3"
             app:qmui_borderColor="@color/translucent"
             app:qmui_radius="@dimen/dp_12">
 
@@ -63,8 +63,9 @@
                 android:background="@null"
                 android:hint="请输入支付密码"
                 android:inputType="number"
-                android:paddingStart="@dimen/dp_2"
+                android:paddingStart="@dimen/dp_5"
                 android:paddingEnd="12dp"
+                android:textColorHint="#999999"
                 android:textColor="@color/text_title"
                 android:textSize="15sp" />
 

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

@@ -81,7 +81,7 @@
             android:layout_marginBottom="40dp"
             android:background="@drawable/bg_logo_but"
             android:gravity="center"
-            android:text="确认转售"
+            android:text="确认寄售"
             android:textColor="@color/white"
             android:textSize="20sp" />