1.抽签

app/src/main/AndroidManifest.xml

@@ -37,14 +37,15 @@
     <queries >
         <package android:name="com.tencent.mm" />
     </queries >
+
     <application
         tools:replace="android:allowBackup"
         android:name="com.hdl.xl.App"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
         android:supportsRtl="true"
+        android:icon="@mipmap/ic_launcher"
         android:theme="@style/AppTheme.NoActionBar"
         android:exported="false"
         android:screenOrientation="portrait"
@@ -120,6 +121,7 @@
         <activity android:name=".activity.UpCellActivity"/>
         <activity android:name=".activity.LotsDetailsActivity"/>
         <activity android:name=".activity.RosterActivity"/>
+        <activity android:name=".activity.PartakeActivity"/>
 
 
         <activity

app/src/main/java/com/hdl/xl/activity/LotsDetailsActivity.kt

@@ -256,21 +256,11 @@ class LotsDetailsActivity : MBActivity<LotsDetailsVModel, ActivityLotsDetailsBin
                             "sd"
                     )
                 }
-                if(vm.data.value?.issue_mode==2){//抽签发行
+                if (it.ok()) {
+                    vm.toPayOrder(it.data?.order_no, "sd")
 
-                    if (it.ok(true)) {
-                        vm.popuBuyUtils?.setDisMiss()
-                    }
-
-                }else{//普通发行
-                    if (it.ok()) {
-                        vm.toPayOrder(it.data?.order_no, "sd")
-
-                    }
                 }
 
-
-
             }
 
 
@@ -288,21 +278,13 @@ class LotsDetailsActivity : MBActivity<LotsDetailsVModel, ActivityLotsDetailsBin
                             "wallet",
                     )
                 }
-                if(vm.data.value?.issue_mode==2){//抽签发行
+                if (it.ok()) {
+                    vm.toPayOrder(it.data?.order_no, "sd")
 
-                    if (it.ok(true)) {
-                        vm.popuBuyUtils?.setDisMiss()
-                    }
-
-                }else{//普通发行
-                    if (it.ok()) {
-
-                        vm.toPayOrder(it.data?.order_no, "wallet")
-
-                    }
                 }
 
 
+
             }
 
         }

app/src/main/java/com/hdl/xl/activity/PartakeActivity.kt

@@ -26,7 +26,7 @@ class PartakeActivity : MBActivity<PartakeVModel, ActivityPartakeBinding>() {
 
         adapter = PartakeAdapter()
         binding.recyclerView.adapter = adapter
-
+        vm.getInfo()
         vm.list.observe(this){
             if(it.isEmpty() ||null==it){
                 binding.listEmpty.visibility= View.VISIBLE

app/src/main/java/com/hdl/xl/adapter/PartakeAdapter.kt

@@ -13,12 +13,11 @@ import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
 import com.google.gson.Gson
 import com.hdl.xl.R
 import com.hdl.xl.activity.ArticleDetailActivity
-import com.hdl.xl.databinding.ItemMsgBinding
 import com.hdl.xl.databinding.ItemPartakeBinding
-import com.hdl.xl.databinding.ItemSellOrderBinding
 import com.hdl.xl.model.MsgList
 import com.hdl.xl.model.MyCollection
 import com.hdl.xl.model.PartackBean
+import com.hdl.xl.model.RosterBean
 import com.hdl.xl.vmodel.MsgVModel
 import com.hdl.xl.vmodel.SellOrderVModel
 import com.qmuiteam.qmui.kotlin.onClick

app/src/main/java/com/hdl/xl/adapter/RecommedAdapter.kt

@@ -31,35 +31,20 @@ class RecommedAdapter() : BAdapter<CollectionList,
 
             }else{
 
-                when (item.state) {
-                    "1" -> {
-                        holder.dataBinding?.tvState?.text = "进行中  "
-                        holder.dataBinding?.tvState?.setTextColor(Color.parseColor("#FFF488"))
-                        holder.dataBinding?.imgState?.setImageResource(R.drawable.ct_chou_two)
-                    }
-                    "2" -> {
-                        holder.dataBinding?.tvState?.text = "未开始 " + item.sell_time
-                        holder.dataBinding?.tvState?.setTextColor(Color.parseColor("#BEE88D"))
-                        holder.dataBinding?.imgState?.setImageResource(R.drawable.ct_chou_one)
-                    }
-                    "3" -> {
-
-                        holder.dataBinding?.tvState?.text = "已结束 "
-                        holder.dataBinding?.tvState?.setTextColor(Color.parseColor("#FF6A6A"))
-                        holder.dataBinding?.imgState?.setImageResource(R.drawable.ct_time_stop)
-                    }
-                    else -> {
-                        holder.dataBinding?.tvState?.text = "已结束 "
-                        holder.dataBinding?.tvState?.setTextColor(Color.parseColor("#FF6A6A"))
-                        holder.dataBinding?.imgState?.setImageResource(R.drawable.ct_time_stop)
-
-                    }
+                //判断有没有开始
+                if(TimeUtils.timeCompare(item.apply_st,TimeUtils.getTime())==3){
+                    holder.dataBinding?.tvState?.text = "进行中  "
+                    holder.dataBinding?.tvState?.setTextColor(Color.parseColor("#FFF488"))
+                    holder.dataBinding?.imgState?.setImageResource(R.drawable.ct_chou_two)
 
+                }else{
+                    holder.dataBinding?.tvState?.text = "未开始 " + item.sell_time
+                    holder.dataBinding?.tvState?.setTextColor(Color.parseColor("#BEE88D"))
+                    holder.dataBinding?.imgState?.setImageResource(R.drawable.ct_chou_one)
                 }
 
-            }
-
 
+            }
 
 
         }else{

app/src/main/java/com/hdl/xl/fragment/OrderListFragment.kt

@@ -9,6 +9,7 @@ import com.hdl.xl.adapter.OrderListFragmentAdapter
 import com.hdl.xl.base.MBRFragment
 import com.hdl.xl.config.MIntentAction
 import com.hdl.xl.databinding.FragmentOrderListBinding
+import com.hdl.xl.model.User
 import com.hdl.xl.vmodel.OrderListFragmentVModel
 
 /**
@@ -35,6 +36,24 @@ class OrderListFragment : MBRFragment<OrderListFragmentVModel, OrderListFragment
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
+
+        vm.bean.observe(this) {
+
+            var amount = it.pay.body.totalAmount.toFloat() * 0.01
+            var name = User.get()?.true_name
+            var certNo = User.get()?.id_card
+            //创建用户支付订单信息
+            //amount:订单金额
+            //orderNumber:商户订单号
+            //createTime: 订单创建时间
+            //goodsName:商品名称
+            //name:真实姓名
+            //certNo:身份证号 //6888803045944  16938552
+//            cashierPay("MD5", "16938552", "06030001", amount.toString(),
+//                    it.pay.body.orderCode, it.pay.head.respTime, "象链数购买藏品", name!!, certNo!!)
+
+
+        }
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {

app/src/main/java/com/hdl/xl/model/TibetaDetails.kt

@@ -17,6 +17,7 @@ data class TibetaDetails(var auth_name:String, var auth_img:String, var buy_coun
                          var state:Int, var warm_prompt:String,var inventory:String,
                          var now_inventory:String,var is_remind:Boolean,
                          var issue_mode:Int,var all_apply:String,var apply_st:String,
-                         var apply_end:String,var has_apply:Int,var ballot_status:Int
+                         var apply_end:String,var has_apply:Int,var ballot_status:Int,
+                         var is_task:Int,var apply_code:String,
 ): IModel {
 }

app/src/main/java/com/hdl/xl/utils/net/ApiService.kt

@@ -500,6 +500,15 @@ interface ApiService {
             @Query("page") page: Int?
     ): Resp<PartackBean>
 
+    /**
+     * 报名抽签
+     * @return
+     */
+    @FormUrlEncoded
+    @POST("Collect_draw/userApplyDraw")
+    suspend fun userApplyDraw(
+            @Field("coll_id") coll_id: String?,
+    ): Resp<Any>
 
 
 

app/src/main/java/com/hdl/xl/vmodel/LotsDetailsVModel.kt

@@ -47,83 +47,183 @@ class LotsDetailsVModel(application: Application) : BViewModel<BRepository>(appl
     var  is_remind=MutableLiveData<Boolean>()
 
 
-    fun isHasApply(has_apply:Int?,sell_time:String?):Int{
+
+
+
+
+
+
+
+
+    fun isShowStart(apply_st:String?,sell_time:String?):Int{
+        if (TimeUtils.timeCompare(sell_time, TimeUtils.getTime()) == 3) {
+            return View.GONE
+        }
+
+        if (TimeUtils.timeCompare(apply_st, TimeUtils.getTime()) == 3) {
+            return View.GONE
+        }
+        return View.VISIBLE
+
+    }
+    fun toShowMing(sell_time:String?):Int{//中奖名单
+        if (TimeUtils.timeCompare(sell_time, TimeUtils.getTime()) == 3) {
+            return View.VISIBLE
+        }
+
+        return View.GONE
+
+    }
+
+    fun toShowCode(has_apply:Int?):Int{
+        if (has_apply==1) {
+            return View.VISIBLE
+        }
+        return View.GONE
+    }
+
+
+
+    //---------------
+
+    fun isShowJonin(sell_time:String?,apply_st:String?,has_apply:Int?):Int{//立即参与
 
         if (TimeUtils.timeCompare(sell_time, TimeUtils.getTime()) == 3) {//抽签结束了
             return View.GONE
         }
-        if(has_apply==1){//已经报名
+        if (TimeUtils.timeCompare(apply_st, TimeUtils.getTime()) == 3&&has_apply==0) {
             return View.VISIBLE
         }
         return View.GONE
     }
 
-    fun isShowEnd(state:Int?,sell_time:String?):Int{//已经结束
 
-        if (TimeUtils.timeCompare(sell_time, TimeUtils.getTime()) == 3) {
+    fun isHasApply(has_apply:Int?,sell_time:String?,apply_st:String?):Int{
+
+        if (TimeUtils.timeCompare(sell_time, TimeUtils.getTime()) == 3) {//抽签结束了
+            return View.GONE
+        }
+
+        if (TimeUtils.timeCompare(apply_st, TimeUtils.getTime()) == 3&&has_apply==1) {
             return View.VISIBLE
         }
+        return View.GONE
+    }
 
-        if(state == 3){
+    fun isShowEnd(sell_time:String?,has_apply:Int?,ballot_status:Int?):Int{//已经结束
+        if (TimeUtils.timeCompare(sell_time, TimeUtils.getTime()) == 3&&has_apply==0) {
+            return View.VISIBLE
+        }
+
+        if (TimeUtils.timeCompare(sell_time, TimeUtils.getTime()) == 3&&has_apply==1&&ballot_status==2) {
             return View.VISIBLE
         }
         return View.GONE
 
     }
 
+    fun isShowIng(sell_time:String?,ballot_status:Int?):Int{
 
-    fun isShowIng(state:Int?,sell_time:String?,has_apply:Int?):Int{//立即购买
-
-        if (TimeUtils.timeCompare(sell_time, TimeUtils.getTime()) == 3) {
-            return View.GONE
+        if (TimeUtils.timeCompare(sell_time, TimeUtils.getTime()) == 3&&ballot_status==1) {//已结束
+            return View.VISIBLE
         }
-        if(has_apply==1){//已经报名
+
+        return View.GONE
+
+    }
+
+    fun isShowStop(sell_time:String?,ballot_status:Int?,now_inventory:String?):Int{
+        if(null==now_inventory){
             return View.GONE
         }
-        if(state == 1){
+        var num=now_inventory!!.toDouble()
+        if (TimeUtils.timeCompare(sell_time, TimeUtils.getTime()) == 3&&ballot_status==1&&num==0.0) {//已售罄
             return View.VISIBLE
         }
         return View.GONE
-
     }
 
-    fun isShowStart(state:Int?,sell_time:String?):Int{//即将开始
+    //-----
+
+    fun isShowTopOne(apply_st:String?,sell_time:String?):Int{
         if (TimeUtils.timeCompare(sell_time, TimeUtils.getTime()) == 3) {
             return View.GONE
         }
-        if(state==2){
+
+        if (TimeUtils.timeCompare(apply_st, TimeUtils.getTime()) == 1) {
             return View.VISIBLE
         }
         return View.GONE
 
-
     }
-    fun toShowMing(state:Int?,sell_time:String?):Int{//中奖名单
+
+    fun isShowTopTwo(apply_st:String?,sell_time:String?,has_apply:Int?,is_task:Int?):Int{
         if (TimeUtils.timeCompare(sell_time, TimeUtils.getTime()) == 3) {
+            return View.GONE
+        }
+
+        if (TimeUtils.timeCompare(apply_st, TimeUtils.getTime()) == 3&&has_apply==0) {
             return View.VISIBLE
         }
-        if(state!=2){
+
+        if (TimeUtils.timeCompare(apply_st, TimeUtils.getTime()) == 3&&has_apply==1&&is_task==0) {
             return View.VISIBLE
         }
+
         return View.GONE
 
     }
 
-    fun isShowNo(state:Int?,ballot_status:Int?,sell_time:String?):Int{//未中签
-
-        if (TimeUtils.timeCompare(sell_time, TimeUtils.getTime()) != 3&&state==1&&ballot_status==0) {//没结束
+    fun isShowTopThree(sell_time:String?,ballot_status:Int?):Int{
+        if (TimeUtils.timeCompare(sell_time, TimeUtils.getTime()) == 3&&ballot_status==2) {
             return View.VISIBLE
         }
-        if (TimeUtils.timeCompare(sell_time, TimeUtils.getTime()) == 3&&ballot_status==0) {//已结束
+        return View.GONE
+
+    }
+
+    fun isShowTopFour(sell_time:String?,ballot_status:Int?):Int{
+        if (TimeUtils.timeCompare(sell_time, TimeUtils.getTime()) == 3&&ballot_status==1) {
             return View.VISIBLE
         }
+        return View.GONE
+
+    }
 
+    fun isShowTopFive(sell_time:String?,ballot_status:Int?):Int{
+        if (TimeUtils.timeCompare(sell_time, TimeUtils.getTime()) == 3&&ballot_status==0) {
+            return View.VISIBLE
+        }
         return View.GONE
+
     }
 
 
 
 
+
+   fun  toGoing(){//去参与抽签
+
+       viewModelScope.launch {
+         var it=  NetEngine.service.userApplyDraw(id)
+           if(it.ok(true)){
+               //刷新
+               getInfo()
+
+           }
+
+       }
+
+
+
+   }
+
+
+
+
+
+
+
     fun toCopy(){
         if(TextUtils.isEmpty(link.value)){
             toast("合约地址为空")
@@ -190,20 +290,7 @@ class LotsDetailsVModel(application: Application) : BViewModel<BRepository>(appl
         }
     }
 
-    //设置购买提醒
-    fun toBuyTime(){
-          viewModelScope.launch {
 
-              var it=repository().lreq { NetEngine.service.setRemind(data.value?.id) }
-              if(it.ok(true)){
-                  //刷新
-                  is_remind.value=true
-              }
-
-          }
-
-
-    }
 
     fun toPayOrder(order_no:String?,from:String?){
         viewModelScope.launch {
@@ -238,7 +325,7 @@ class LotsDetailsVModel(application: Application) : BViewModel<BRepository>(appl
 
         UiSwitch.bundle(repository().context, PartakeActivity::class.java,
                 B().putString("coll_id",id)
-                        .putString("is_ballot","1")
+                        .putString("is_ballot","0")
                         .ok())
     }
 

app/src/main/java/com/hdl/xl/vmodel/OrderListFragmentVModel.kt

@@ -7,6 +7,7 @@ import android.widget.LinearLayout
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.hdl.xl.inte.ChoiceData
+import com.hdl.xl.model.PayOrder
 import com.hdl.xl.utils.PopuTipsUtils
 import com.ysnows.base.base.BRRepository
 import com.ysnows.base.base.BRViewModel
@@ -23,6 +24,11 @@ class OrderListFragmentVModel(application: Application) : BRViewModel<BRReposito
     var ll: LinearLayout? = null
 
 
+    //杉德支付需要的
+    var position_sd:Int?=0
+    var  bean=MutableLiveData<PayOrder>()//杉德支付需要的参数
+
+
 
     // state //   0:待付款  1待开始 2进行中 3待评论  4已完成 9:已取消
     fun toShowTips(state: Int?): String {
@@ -103,20 +109,36 @@ class OrderListFragmentVModel(application: Application) : BRViewModel<BRReposito
 
             viewModelScope.launch {
                 var it = repository().lreq { NetEngine.service.payOrder(order_no, pay_type) }
-                if (it.code == 0) {
-                    toast(it.msg)
-                    return@launch
-                }
+
                 if (it.ok(true)) {
-                    index.value=position
-                  }
+                    index.value = position
+                }
 
 
+            }
+
+            return
+
+        }
+        if (pay_type.equals("sd")) {//快捷支付
+
+            viewModelScope.launch {
+                var it = repository().lreq { NetEngine.service.payOrder(order_no, pay_type) }
+
+                if (it.ok(true)) {
+                    position_sd = position
+                    bean.value = it.data
+
                 }
+
             }
 
+            return
+
         }
 
+    }
+
 
 
 

app/src/main/java/com/hdl/xl/vmodel/PartakeVModel.kt

@@ -15,6 +15,7 @@ import com.hdl.xl.activity.UpCellActivity
 import com.hdl.xl.config.ConfigRx
 import com.hdl.xl.model.MyCollection
 import com.hdl.xl.model.PartackBean
+import com.hdl.xl.model.RosterBean
 import com.hdl.xl.utils.net.NetEngine
 import com.ysnows.base.utils.UiSwitch
 import kotlinx.coroutines.launch

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

@@ -1,6 +1,6 @@
 <?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>
 

app/src/main/res/layout/activity_all_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:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    >
 
     <data>
 

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

@@ -1,6 +1,6 @@
 <?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>
         <import type="android.view.View" />

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

@@ -1,6 +1,6 @@
 <?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>
 

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

@@ -1,7 +1,7 @@
 <?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>
 

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

@@ -1,6 +1,6 @@
 <?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>
 

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:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+   >
 
     <data>
 
@@ -87,10 +87,19 @@
                             android:layout_marginTop="5dp">
 
 
-                            <ImageView
+
+                            <LinearLayout
                                 android:layout_width="30dp"
-                                android:layout_height="18dp"
-                                android:src="@drawable/ct_collect" />
+                                android:background="@drawable/bg_three_but"
+                                android:gravity="center"
+                                android:layout_height="18dp">
+
+                                <ImageView
+                                    android:src="@drawable/ct_lian"
+                                    android:layout_width="14dp"
+                                    android:layout_height="14dp"/>
+
+                            </LinearLayout>
 
 
                             <TextView

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

@@ -11,7 +11,6 @@
     </data>
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/c_bg"

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

@@ -1,6 +1,6 @@
 <?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>
 

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

@@ -1,7 +1,6 @@
 <?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 >
 

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

@@ -131,7 +131,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="20dp"
                             android:text="@{`X`+vm.bean.num}"
-                            android:textColor="@color/white"
+                            android:textColor="#888888"
                             android:textSize="14sp" />
 
                     </LinearLayout>
@@ -140,6 +140,32 @@
                 </LinearLayout>
 
 
+
+
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="商品总额"
+                    android:textColor="@color/white"
+                    android:textSize="13sp" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="right"
+                    android:text="@{`￥`+vm.bean.pay_price}"
+                    android:textColor="@color/white"
+                    android:textSize="16sp" />
+
+
             </LinearLayout>
 
 
@@ -166,7 +192,7 @@
                 android:layout_marginTop="14dp"
                 android:layout_height="wrap_content">
                 <TextView
-                    android:text="商品状态："
+                    android:text="商品状态"
                     android:textSize="13sp"
                     android:textColor="@color/white"
                     android:layout_width="wrap_content"
@@ -190,7 +216,7 @@
                 android:layout_marginTop="14dp"
                 android:layout_height="wrap_content">
                 <TextView
-                    android:text="赠与时间："
+                    android:text="赠与时间"
                     android:textSize="13sp"
                     android:textColor="@color/white"
                     android:layout_width="wrap_content"
@@ -213,7 +239,7 @@
                 android:layout_marginTop="14dp"
                 android:layout_height="wrap_content">
                 <TextView
-                    android:text="受赠人："
+                    android:text="受赠人"
                     android:textSize="13sp"
                     android:textColor="@color/white"
                     android:layout_width="wrap_content"
@@ -237,7 +263,7 @@
                 android:layout_marginTop="14dp"
                 android:layout_height="wrap_content">
                 <TextView
-                    android:text="链上HASH："
+                    android:text="链上HASH"
                     android:textSize="13sp"
                     android:textColor="@color/white"
                     android:layout_width="wrap_content"

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

@@ -77,7 +77,7 @@
                                 app:qmui_borderColor="@color/translucent"
                                 app:qmui_backgroundColor="#66000000"
                                 android:textColor="@color/white"
-                                android:visibility="@{vm.toShowMing(vm.data.state,vm.data.sell_time)}"
+                                android:visibility="@{vm.toShowMing(vm.data.sell_time)}"
                                 android:text="查看中签名单"
                                 android:textSize="13sp"
                                 android:layout_gravity="bottom|right"
@@ -152,6 +152,7 @@
                                 android:layout_marginEnd="12dp"
                                 android:background="@drawable/bg_kuang_blue"
                                 android:hint="100份"
+                                android:gravity="center"
                                 android:paddingStart="2dp"
                                 android:paddingTop="2dp"
                                 android:paddingEnd="2dp"
@@ -179,6 +180,8 @@
                                 android:layout_marginEnd="12dp"
                                 android:background="@drawable/bg_kuang_blue"
                                 android:hint="100份"
+                                android:gravity="center"
+
                                 android:paddingStart="2dp"
                                 android:paddingTop="2dp"
                                 android:paddingEnd="2dp"
@@ -205,6 +208,7 @@
                                 android:layout_height="wrap_content"
                                 android:background="@drawable/bg_kuang_blue"
                                 android:hint="100份"
+                                android:gravity="center"
                                 android:paddingStart="2dp"
                                 android:paddingTop="2dp"
                                 android:paddingEnd="2dp"
@@ -220,7 +224,7 @@
                             android:layout_width="match_parent"
                             android:layout_marginTop="20dp"
                             app:qmui_borderColor="@color/white"
-                            app:qmui_backgroundColor="#333333"
+                            app:qmui_backgroundColor="#B3444444"
                             app:qmui_radius="3dp"
                             android:paddingStart="10dp"
                             android:paddingEnd="10dp"
@@ -241,6 +245,42 @@
 
                         </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:orientation="horizontal"
+                            android:layout_marginTop="23dp"
+                            android:visibility="@{vm.toShowCode(vm.data.has_apply)}"
+                            android:gravity="center_vertical"
+                            android:layout_height="wrap_content">
+
+                            <TextView
+                                android:text="我的序列"
+                                android:textSize="14sp"
+                                android:textColor="#FFFFFF"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"/>
+
+                            <LinearLayout
+                                android:layout_width="150dp"
+                                android:orientation="horizontal"
+                                android:background="@drawable/ct_xu"
+                                android:layout_marginStart="15dp"
+                                android:gravity="center"
+                                android:layout_height="38dp">
+
+                                <TextView
+                                    android:text="@{vm.data.apply_code}"
+                                    android:textColor="#141414"
+                                    android:textSize="20sp"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+
+                            </LinearLayout>
+
+
+                        </LinearLayout>
+
+
 
                     </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
@@ -576,7 +616,7 @@
                 android:layout_marginStart="15dp"
                 android:layout_marginEnd="15dp"
                 android:gravity="center"
-                android:visibility="@{vm.isShowStart(vm.data.state,vm.data.sell_time)}"
+                android:visibility="@{vm.isShowTopOne(vm.data.apply_st,vm.data.sell_time)}"
                 app:qmui_backgroundColor="#4D000000"
                 app:qmui_borderColor="#979797"
                 app:qmui_borderWidth="@dimen/dp_1"
@@ -597,14 +637,39 @@
 
             </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
+
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                android:id="@+id/qmll_two"
                 android:layout_width="match_parent"
                 android:layout_marginStart="15dp"
                 android:layout_marginEnd="15dp"
+                android:gravity="center"
+                android:visibility="@{vm.isShowTopTwo(vm.data.apply_st,vm.data.sell_time,vm.data.has_apply,vm.data.is_task)}"
+                app:qmui_backgroundColor="#4D000000"
+                app:qmui_borderColor="#979797"
+                app:qmui_borderWidth="@dimen/dp_1"
+                app:qmui_radius="22dp"
+                android:layout_height="44dp">
+                <TextView
+                    android:text="中签公布时间："
+                    android:textColor="@color/white"
+                    android:textSize="16sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:text="@{vm.data.sell_time}"
+                    android:textColor="#39C0FB"
+                    android:textSize="16sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
 
-                android:visibility="@{vm.data.ballot_status==2?View.VISIBLE:View.GONE}"
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                android:id="@+id/qmll_two"
+                android:layout_width="match_parent"
+                android:layout_marginStart="15dp"
+                android:layout_marginEnd="15dp"
+                android:visibility="@{vm.isShowTopThree(vm.data.sell_time,vm.data.ballot_status)}"
                 android:gravity="center"
                 app:qmui_backgroundColor="#4D000000"
                 app:qmui_borderColor="#979797"
@@ -626,8 +691,8 @@
                 android:layout_width="match_parent"
                 android:layout_marginStart="15dp"
                 android:layout_marginEnd="15dp"
+                android:visibility="@{vm.isShowTopFour(vm.data.sell_time,vm.data.ballot_status)}"
                 android:gravity="center"
-                android:visibility="@{vm.data.ballot_status==1?View.VISIBLE:View.GONE}"
                 app:qmui_backgroundColor="#4D000000"
                 app:qmui_borderColor="#979797"
                 app:qmui_borderWidth="@dimen/dp_1"
@@ -647,9 +712,8 @@
                 android:layout_width="match_parent"
                 android:layout_marginStart="15dp"
                 android:layout_marginEnd="15dp"
-
                 android:gravity="center"
-                android:visibility="@{vm.isShowNo(vm.data.state,vm.data.ballot_status,vm.data.sell_time)}"
+                android:visibility="@{vm.isShowTopFive(vm.data.sell_time,vm.data.ballot_status)}"
                 app:qmui_backgroundColor="#4D000000"
                 app:qmui_borderColor="#979797"
                 app:qmui_borderWidth="@dimen/dp_1"
@@ -668,12 +732,45 @@
 
         </FrameLayout>
 
+        <!--        立即参与-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="81dp"
+            android:onClick="@{v->vm.toGoing()}"
+            android:orientation="horizontal"
+            android:visibility="@{vm.isShowJonin(vm.data.sell_time,vm.data.apply_st,vm.data.has_apply)}"
+            tools:visibility="visible">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="14dp"
+                android:layout_marginStart="16dp"
+                android:layout_weight="1"
+                android:text="@{`￥`+vm.data.price}"
+                android:textColor="@color/white"
+                android:textSize="30sp" />
+
+            <TextView
+                android:id="@+id/but_join"
+                android:layout_width="180dp"
+                android:layout_height="40dp"
+                android:layout_marginTop="6dp"
+                android:layout_marginEnd="25dp"
+                android:background="@drawable/bg_logo_but"
+                android:gravity="center"
+                android:text="立即参与"
+                android:textColor="#000000"
+                android:textSize="16sp" />
+
+
+        </LinearLayout>
 
         <!--        参与成功-->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="81dp"
-            android:visibility="@{vm.isHasApply(vm.data.has_apply,vm.data.sell_time)}"
+            android:visibility="@{vm.isHasApply(vm.data.has_apply,vm.data.sell_time,vm.data.apply_st)}"
             android:orientation="horizontal"
             >
 
@@ -707,7 +804,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="81dp"
-            android:visibility="@{vm.isShowEnd(vm.data.state,vm.data.sell_time)}"
+            android:visibility="@{vm.isShowEnd(vm.data.sell_time,vm.data.has_apply,vm.data.ballot_status)}"
             android:orientation="horizontal"
             >
 
@@ -737,12 +834,46 @@
 
         </LinearLayout>
 
-        <!--        立即参与-->
+        <!--        未开始-->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="81dp"
+            android:visibility="@{vm.isShowStart(vm.data.apply_st,vm.data.sell_time)}"
             android:orientation="horizontal"
-            android:visibility="@{vm.isShowIng(vm.data.state,vm.data.sell_time,vm.data.has_apply)}"
+            >
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="14dp"
+                android:layout_marginStart="16dp"
+                android:layout_weight="1"
+                android:text="@{`￥`+vm.data.price}"
+                android:textColor="@color/white"
+                android:textSize="30sp" />
+
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:layout_width="180dp"
+                android:layout_height="40dp"
+                android:layout_marginStart="25dp"
+                android:layout_marginEnd="25dp"
+                android:layout_marginTop="6dp"
+                android:text="未开始"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                app:qmui_backgroundColor="#666666"
+                app:qmui_borderColor="@color/translucent"
+                app:qmui_radius="14dp" />
+
+        </LinearLayout>
+
+        <!--        去支付-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="81dp"
+            android:orientation="horizontal"
+            android:visibility="@{vm.isShowIng(vm.data.sell_time,vm.data.ballot_status)}"
             tools:visibility="visible">
 
             <TextView
@@ -770,11 +901,11 @@
 
         </LinearLayout>
 
-        <!--        未开始-->
+        <!--        已售罄-->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="81dp"
-            android:visibility="@{vm.isShowStart(vm.data.state,vm.data.sell_time)}"
+            android:visibility="@{vm.isShowStop(vm.data.sell_time,vm.data.ballot_status,vm.data.now_inventory)}"
             android:orientation="horizontal"
             >
 
@@ -795,7 +926,7 @@
                 android:layout_marginStart="25dp"
                 android:layout_marginEnd="25dp"
                 android:layout_marginTop="6dp"
-                android:text="未开始"
+                android:text="已售罄"
                 android:textColor="@color/white"
                 android:textSize="16sp"
                 app:qmui_backgroundColor="#666666"
@@ -806,5 +937,7 @@
 
 
 
+
+
     </LinearLayout>
 </layout>

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

@@ -1,7 +1,6 @@
 <?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>
 

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

@@ -11,7 +11,6 @@
     </data>
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="#F2F2F2"

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

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android" >
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+
+
+    >
 
     <data >
 
@@ -10,7 +14,7 @@
             type="com.hdl.xl.vmodel.OneLoginVModel" />
     </data >
 
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:id="@+id/cl"
         android:background="@drawable/ic_login_bg"

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

@@ -11,7 +11,6 @@
     </data>
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/c_bg"

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

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<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>
 
@@ -9,8 +12,7 @@
 
     </data>
 
-    <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/color_bg"

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

@@ -10,7 +10,7 @@
             type="com.hdl.xl.vmodel.RecordVModel" />
     </data>
 
-    <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/color_bg"

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

@@ -1,6 +1,6 @@
 <?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>
 

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

@@ -170,7 +170,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="20dp"
                             android:text="@{`X`+vm.bean.num}"
-                            android:textColor="@color/white"
+                            android:textColor="#888888"
                             android:textSize="14sp" />
 
                     </LinearLayout>
@@ -190,7 +190,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="商品总额："
+                    android:text="商品总额"
                     android:textColor="@color/white"
                     android:textSize="13sp" />
 
@@ -258,7 +258,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="订单金额："
+                    android:text="订单金额"
                     android:textColor="@color/white"
                     android:textSize="13sp" />
 
@@ -267,7 +267,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="right"
-                    android:text="@{vm.bean.pay_price}"
+                    android:text="@{`￥`+vm.bean.pay_price}"
                     android:textColor="#888888"
                     android:textSize="13sp" />
 

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

@@ -105,6 +105,7 @@
                             android:background="@drawable/bg_kuang_blue"
                             android:hint="100份"
                             android:paddingStart="2dp"
+                            android:gravity="center"
                             android:paddingTop="2dp"
                             android:paddingEnd="2dp"
                             android:paddingBottom="2dp"
@@ -131,6 +132,7 @@
                             android:layout_marginEnd="12dp"
                             android:background="@drawable/bg_kuang_blue"
                             android:hint="100份"
+                            android:gravity="center"
                             android:paddingStart="2dp"
                             android:paddingTop="2dp"
                             android:paddingEnd="2dp"
@@ -160,6 +162,7 @@
                             android:paddingStart="2dp"
                             android:paddingTop="2dp"
                             android:paddingEnd="2dp"
+                            android:gravity="center"
                             android:paddingBottom="2dp"
                             android:text="@{vm.data.buy_count+`份`}"
                             android:textColor="#54D7E9"

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

@@ -1,6 +1,6 @@
 <?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>
 

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

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android" >
+<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"
+    >
 
     <data >
         <variable
@@ -13,8 +16,7 @@
         android:layout_height="match_parent"
         android:background="@color/color_bg"
         android:paddingStart="12dp"
-        xmlns:tools="http://schemas.android.com/tools"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+
         android:paddingEnd="11dp"
         android:orientation="vertical" >
         

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

@@ -1,5 +1,6 @@
 <?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" >
 
     <data >
@@ -13,7 +14,6 @@
         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

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

@@ -1,7 +1,7 @@
 <?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>
 

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

@@ -150,15 +150,13 @@
                             android:layout_width="match_parent"
                             android:layout_height="match_parent">
 
-
-
-                        <androidx.recyclerview.widget.RecyclerView
-                            android:id="@+id/recycler_collect_view"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-                            app:spanCount="2"
-                            tools:listitem="@layout/item_home_good" />
+                            <androidx.recyclerview.widget.RecyclerView
+                                android:id="@+id/recycler_collect_view"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                                app:spanCount="2"
+                                tools:listitem="@layout/item_home_good" />
 
                             <com.hdl.xl.view.ListEmptyView
                                 android:id="@+id/list_empty"

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

@@ -1,13 +1,13 @@
 <?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>
 
 
     </data>
 
-    <LinearLayout xmlns:tools="http://schemas.android.com/tools"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"

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

@@ -1,6 +1,6 @@
 <?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>
 
@@ -8,7 +8,7 @@
 
     </data>
 
-    <LinearLayout xmlns:tools="http://schemas.android.com/tools"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"

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

@@ -1,6 +1,6 @@
 <?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>
 

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

@@ -7,7 +7,7 @@
     android:orientation="vertical">
 
 
-    <LinearLayout xmlns:tools="http://schemas.android.com/tools"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"

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

@@ -1,7 +1,7 @@
 <?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>

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

@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical">
 
     <LinearLayout

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

@@ -1,7 +1,6 @@
 <?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">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 

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

@@ -1,7 +1,7 @@
 <?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>
 

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

@@ -1,5 +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">
 
     <data>
@@ -17,7 +19,6 @@
     </data>
 
     <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="9dp"

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

@@ -1,7 +1,7 @@
 <?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" />

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

@@ -36,7 +36,7 @@
 
             <com.qmuiteam.qmui.widget.QMUIRadiusImageView
                 android:layout_width="100dp"
-                android:layout_height="90dp"
+                android:layout_height="100dp"
                 app:url="@{item.cover}"
                 android:src="@drawable/bg_need_error"
                 app:qmui_border_color="@color/translucent"
@@ -58,13 +58,14 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="30dp"
                     android:layout_marginTop="30dp"
+                    android:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="0dp"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:textColor="#F14351"
                         android:textSize="18sp" />

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

@@ -1,7 +1,7 @@
 <?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"
-    :tools="http://schemas.android.com/tools">
+    >
 
     <data>
 
@@ -90,10 +90,20 @@
                 android:layout_marginTop="2dp"
                 android:orientation="horizontal">
 
-                <androidx.appcompat.widget.AppCompatImageView
+
+                <LinearLayout
                     android:layout_width="24dp"
-                    android:layout_height="14dp"
-                    android:src="@drawable/ct_collect" />
+                    android:background="@drawable/bg_three_but"
+                    android:gravity="center"
+                    android:layout_height="14dp">
+
+                    <ImageView
+                        android:src="@drawable/ct_lian"
+                        android:layout_width="14dp"
+                        android:layout_height="14dp"/>
+
+                </LinearLayout>
+
 
                 <TextView
                     android:layout_width="74dp"

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

@@ -1,7 +1,7 @@
 <?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" />

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

@@ -1,7 +1,7 @@
 <?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>
 

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

@@ -9,7 +9,7 @@
             type="String" />
     </data>
 
-    <LinearLayout xmlns:tools="http://schemas.android.com/tools"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">

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

@@ -1,7 +1,7 @@
 <?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>
 

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

@@ -1,7 +1,7 @@
 <?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>
 
@@ -49,14 +49,25 @@
             android:layout_marginTop="2dp"
             android:orientation="horizontal">
 
-            <androidx.appcompat.widget.AppCompatImageView
+            <LinearLayout
                 android:layout_width="24dp"
-                android:layout_height="14dp"
-                android:src="@drawable/ct_collect" />
+                android:background="@drawable/bg_three_but"
+                android:gravity="center"
+                android:layout_height="14dp">
+
+                <ImageView
+                    android:src="@drawable/ct_lian"
+                    android:layout_width="14dp"
+                    android:layout_height="14dp"/>
+
+            </LinearLayout>
+
+
 
             <TextView
-                android:layout_width="74dp"
+                android:layout_width="wrap_content"
                 android:layout_height="14dp"
+                android:paddingEnd="10dp"
                 android:background="#333333"
                 android:gravity="center"
                 android:text="@{item.tag}"

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

@@ -1,7 +1,6 @@
 <?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" />

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

@@ -1,7 +1,7 @@
 <?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" />

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

@@ -1,7 +1,7 @@
 <?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>
 

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

@@ -1,7 +1,7 @@
 <?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" />
@@ -13,6 +13,12 @@
 
     </data >
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:orientation="horizontal"
+        android:layout_height="wrap_content">
+
+
     <com.qmuiteam.qmui.widget.QMUIRadiusImageView
         android:layout_width="45dp"
         app:qmui_is_oval="true"
@@ -22,5 +28,5 @@
         android:src="#D8D8D8"
         android:layout_marginBottom="12dp"
         android:layout_height="45dp"/>
-
+    </LinearLayout>
 </layout >

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

@@ -1,6 +1,7 @@
 <?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>
 
@@ -16,7 +17,7 @@
 
     </data>
 
-    <LinearLayout xmlns:tools="http://schemas.android.com/tools"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">

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

@@ -18,7 +18,7 @@
     </LinearLayout>
 
 
-    <LinearLayout xmlns:tools="http://schemas.android.com/tools"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">

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

@@ -18,7 +18,7 @@
     </LinearLayout>
 
 
-    <LinearLayout xmlns:tools="http://schemas.android.com/tools"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">

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

@@ -73,10 +73,19 @@
                             android:layout_marginBottom="10dp"
                             android:orientation="horizontal">
 
-                            <androidx.appcompat.widget.AppCompatImageView
+                            <LinearLayout
                                 android:layout_width="24dp"
-                                android:layout_height="14dp"
-                                android:src="@drawable/ct_collect" />
+                                android:background="@drawable/bg_three_but"
+                                android:gravity="center"
+                                android:layout_height="14dp">
+
+                                <ImageView
+                                    android:src="@drawable/ct_lian"
+                                    android:layout_width="14dp"
+                                    android:layout_height="14dp"/>
+
+                            </LinearLayout>
+
 
                             <TextView
                                 android:id="@+id/tv_tag"

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

@@ -96,6 +96,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
+                android:paddingBottom="10dp"
                 android:layout_marginTop="6dp">
 
                 <TextView
@@ -140,7 +141,6 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
                 android:layout_marginBottom="12dp"
                 android:layout_marginStart="20dp"
                 android:orientation="horizontal">

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

@@ -1,7 +1,7 @@
 <?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>
 

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

@@ -1,7 +1,7 @@
 <?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>
 

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

@@ -1,7 +1,7 @@
 <?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" />

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

@@ -1,7 +1,7 @@
 <?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>
 

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

@@ -1,7 +1,7 @@
 <?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>
 

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

@@ -1,7 +1,7 @@
 <?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" />
@@ -32,13 +32,13 @@
             app:qmui_border_color="@color/translucent"
             android:src="@drawable/bg_need_error"
             app:url="@{item.cover}"
-            android:layout_height="90dp"/>
+            android:layout_height="100dp"/>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:orientation="vertical"
             android:layout_marginStart="@dimen/dp_10"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent">
 
             <TextView
                 android:text="@{item.name}"
@@ -59,7 +59,7 @@
                     android:textColor="#F14351"
                     android:layout_width="0dp"
                     android:layout_weight="1"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="30dp"/>
 
                 <TextView
                     android:layout_width="72dp"

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

@@ -1,6 +1,5 @@
 <?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"

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

@@ -1,6 +1,5 @@
 <?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"

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

@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/c_bg"
     android:gravity="center"
     android:orientation="vertical">
 

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"

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

@@ -2,7 +2,7 @@
 
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:showIn="@layout/activity_add_functions" >
+     >
 
     <data >
 
@@ -44,4 +44,3 @@
 
     </merge >
 </layout >
-        

app/xiaomi/release/output-metadata.json

@@ -4,7 +4,7 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "com.zswc.creativity",
+  "applicationId": "com.hdl.xl",
   "variantName": "xiaomiRelease",
   "elements": [
     {

lookimg/src/main/res/layout/fragment_imagedetail.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+
+    >
 
     <data>
 
@@ -13,7 +16,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/black"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:orientation="vertical">