1.修改问题

app/proguard-rules.pro

@@ -391,9 +391,14 @@
 -keep public class com.project.mocha_patient.login.SignResponseData { private *; }
 # Application classes that will be serialized/deserialized over Gson
 -keep class com.hdl.xl.model.** { *; }
+-keep class com.ysnows.base.net.** { *; }
 -keep class com.ysnows.base.model.** { *; }
 -keep class com.ysnows.base.route.** { *; }
 
+
+-keepattributes Signature
+
+
 #保持 Parcelable 不被混淆
 -keep class * implements android.os.Parcelable {
   public static final android.os.Parcelable$Creator *;

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

@@ -86,7 +86,7 @@ class CertificationActivity : MBActivity<CertificationVModel, ActivityCertificat
                    vm.toSure(certifyId)
 
                 } else {
-                    toast("认证失败，请检查信息")
+                   // toast("认证失败，请检查信息")
                 }
                 return true
             }

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

@@ -54,7 +54,6 @@ class LotsDetailsActivity : MBActivity<LotsDetailsVModel, ActivityLotsDetailsBin
     var screenHeightPixels = 0
 
 
-
     var adapter: ImagesAdapter? = null
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
@@ -302,7 +301,7 @@ class LotsDetailsActivity : MBActivity<LotsDetailsVModel, ActivityLotsDetailsBin
                     )
                 }
                 if (it.ok()) {
-                    vm.toPayOrder(it.data?.order_no, "sd")
+                    vm.toPayOrderTo(it.data?.order_no, "wallet")
 
                 }
 

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

@@ -284,7 +284,7 @@ class TibetanDetailsActivity : MBActivity<TibetanDetailsVModel, ActivityTibetanD
 
                 if (it.ok()) {
 
-                    vm.toPayOrder(it.data?.order_no, "wallet")
+                    vm.toPayOrderTo(it.data?.order_no, "wallet")
 
                 }
 

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

@@ -18,26 +18,29 @@ open class WebViewActivity : MBActivity<BViewModel<BRepository>, ActivityWebview
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
 
-        var  type=intent.extras?.getString("type","1")
+        var type = intent.extras?.getString("type", "1")
 
-        binding.webView.webViewClient=object :QMUIWebViewClient(true,false){
+        binding.webView.webViewClient = object : QMUIWebViewClient(true, false) {
             override fun shouldOverrideUrlLoading(view: WebView?, url: String?): Boolean {
 
                 Log.e("-shy-", "url=: " + url)
-
+                if (url!!.contains("about:blank")) {
+                    finishActivity()
+                    return false
+                }
                 if (url!!.contains("xl://goods:8888/goodsDetail")) {
                     //发送消息--关闭
 //                    var ss = url!!.split("&")
 //                    var s1 = ss[1].split("=")
 
-                    if(type.equals("1")) {
+                    if (type.equals("1")) {
                         RxBus.get().post(ConfigRx.PAY_SD_SUESS, "")
-                    }else{
+                    } else {
                         //寄售
                         RxBus.get().post(ConfigRx.REFRESH_SELL, "")
                     }
 
-                     finishActivity()
+                    finishActivity()
 
                     return false
                 }
@@ -57,7 +60,7 @@ open class WebViewActivity : MBActivity<BViewModel<BRepository>, ActivityWebview
 
         }
 
-      //  binding.webView.webViewClient = MyWebViewClient()
+        //  binding.webView.webViewClient = MyWebViewClient()
         val settings = binding.webView.settings
         settings.javaScriptEnabled = true
 

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

@@ -9,6 +9,7 @@ import android.text.Spanned
 import android.text.style.AbsoluteSizeSpan
 import android.text.style.ForegroundColorSpan
 import android.text.style.StyleSpan
+import android.view.View
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
 import com.google.gson.Gson
 import com.hdl.xl.R
@@ -19,6 +20,7 @@ import com.hdl.xl.databinding.ItemMsgBinding
 import com.hdl.xl.databinding.ItemSellOrderBinding
 import com.hdl.xl.model.MsgList
 import com.hdl.xl.model.MyCollection
+import com.hdl.xl.utils.TimeUtils
 import com.hdl.xl.vmodel.GivenOrderVModel
 import com.hdl.xl.vmodel.MsgVModel
 import com.hdl.xl.vmodel.SellOrderVModel
@@ -31,6 +33,18 @@ class GivenOrderAdapter() : BAdapter<MyCollection, BaseDataBindingHolder<ItemGiv
 
     override fun convert(holder: BaseDataBindingHolder<ItemGivenOrderBinding>, item: MyCollection) {
         holder.dataBinding?.item = item
+
+        if (TimeUtils.timeCompare(item.send_time, TimeUtils.getTime()) == 1) {
+           holder.dataBinding?.tv?.visibility=View.GONE
+            holder.dataBinding?.llTime?.visibility=View.VISIBLE
+            holder.dataBinding?.line?.visibility=View.VISIBLE
+        }else{
+            holder.dataBinding?.tv?.visibility=View.VISIBLE
+            holder.dataBinding?.llTime?.visibility=View.GONE
+            holder.dataBinding?.line?.visibility=View.GONE
+
+        }
+
         holder.dataBinding?.tv?.onClick {
 
             UiSwitch.bundle(context, TrannsferActivity::class.java,

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

@@ -138,6 +138,7 @@ class RecommendFragment : MBFragment<RecommendVModel, FragmentRecommendBinding>(
 
             vm.list.value?.get(position)?.id
 
+
             if (vm.list.value?.get(position)?.issue_mode == 1) {
                 UiSwitch.bundle(context, TibetanDetailsActivity::class.java,
                         B().putString("id", vm.list.value?.get(position)?.id)
@@ -147,6 +148,9 @@ class RecommendFragment : MBFragment<RecommendVModel, FragmentRecommendBinding>(
                         B().putString("id", vm.list.value?.get(position)?.id)
                                 .ok())
             }
+
+            //跳过去的时候刷新该item
+            adapter.notifyItemChanged(position)
         }
 
 

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

@@ -13,6 +13,7 @@ data class MyCollection(var c_id:String, var auth_img :String, var auth_name:Str
                         var inventory:String, var label :String,
                         var id:String, var name :String, var num:String,
                         var tag:String, var type :String,
+                        var send_time:String,
                           ) : IModel {
 
 

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

@@ -352,6 +352,17 @@ interface ApiService {
             @Field("from") from: String?
     ): Resp<PayOrder>
 
+    /**
+     * 待支付订单支付
+     * @return
+     */
+    @FormUrlEncoded
+    @POST("Order/payOrder")
+    suspend fun payOrderTo(
+            @Field("order_no") order_no: String?,
+            @Field("from") from: String?
+    ): Resp<Any>
+
 
     /**
      * 我的收藏-转赠

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

@@ -334,6 +334,24 @@ class LotsDetailsVModel(application: Application) : BViewModel<BRepository>(appl
 
 
 
+    fun toPayOrderTo(order_no:String?,from:String?){//钱包支付
+
+        viewModelScope.launch {
+            var it=repository().lreq { NetEngine.service.payOrderTo(order_no,from) }
+            if(it.code==0){
+                toast(it.msg)
+                return@launch
+            }
+            if(it.ok(true)){
+                popuBuyUtils?.setDisMiss()
+                //刷新数据
+                getMyOrder(order_no)
+            }
+        }
+
+    }
+
+
     fun toPayOrder(order_no:String?,from:String?){
         viewModelScope.launch {
             var it=repository().lreq { NetEngine.service.payOrder(order_no,from) }
@@ -345,9 +363,6 @@ class LotsDetailsVModel(application: Application) : BViewModel<BRepository>(appl
                 if("sd" == from) {
                     bean.value = it.data
 
-                }else{
-                    //刷新数据
-                    getMyOrder(order_no)
                 }
                 popuBuyUtils?.setDisMiss()
 

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

@@ -100,7 +100,7 @@ class OrderListFragmentVModel(application: Application) : BRViewModel<BRReposito
         if (pay_type.equals("wallet")) {//钱包支付
 
             viewModelScope.launch {
-                var it = repository().lreq { NetEngine.service.payOrder(order_no, pay_type) }
+                var it = repository().lreq { NetEngine.service.payOrderTo(order_no, pay_type) }
 
                 if (it.ok(true)) {
                     index.value = position

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

@@ -2,6 +2,7 @@ package com.hdl.xl.vmodel
 
 import android.app.Activity
 import android.app.Application
+import android.text.Editable
 import android.text.TextUtils
 import androidx.databinding.Bindable
 import androidx.lifecycle.MutableLiveData
@@ -15,6 +16,7 @@ import com.hdl.xl.config.ConfigRx
 import com.hdl.xl.model.MyTibetaDetails
 import com.hdl.xl.utils.DecimalUtils
 import com.hdl.xl.utils.net.NetEngine
+import com.hdl.xl.view.SimpleTextWatcher
 import com.hwangjr.rxbus.RxBus
 import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiSwitch
@@ -31,12 +33,58 @@ class ResaleVModel(application: Application) : BViewModel<BRepository>(applicati
 
 
     @Bindable
+    open var sellPrice: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.sellPrice)
+        }
+
+
+    @Bindable
     open var phone: String? = null
         set(value) {
             field = value
             notifyPropertyChanged(BR.phone)
         }
 
+
+
+    var oldText = ""
+    var textWatcher = object : SimpleTextWatcher() {
+        override fun afterTextChanged(s: Editable?) {
+            super.afterTextChanged(s)
+            var content = s.toString()
+            if (!TextUtils.isEmpty(oldText) && content == oldText) {
+                return
+            }
+            oldText=content
+            //重新计算
+            if(TextUtils.isEmpty(content)){
+                sum("0")
+            }else {
+                sum(content)
+            }
+
+
+        }
+    }
+    fun sum(content:String){
+
+        var goodPrice=content!!.toDouble()
+        if(!TextUtils.isEmpty(data?.value?.service_fee_rate)){
+            var s=data?.value?.service_fee_rate?.split("%")
+            oneprice.value= DecimalUtils.getNumber(s!![0].toDouble()*0.01*goodPrice)
+        }
+        if(!TextUtils.isEmpty(data?.value?.royalties_rate)){
+            var s=data?.value?.royalties_rate?.split("%")
+            twoprice.value= DecimalUtils.getNumber(s!![0].toDouble()*0.01*goodPrice)
+        }
+        var ss=goodPrice-oneprice.value!!.toDouble()-twoprice.value!!.toDouble()
+        price.value=DecimalUtils.getNumber(ss)
+
+
+    }
+
     fun getInfo(id:String){
         viewModelScope.launch {
             var it=repository().lreq { NetEngine.service.myCollectionDetail(id) }
@@ -44,18 +92,7 @@ class ResaleVModel(application: Application) : BViewModel<BRepository>(applicati
 
                 data.value=it.data
 
-                var goodPrice=it.data?.pro_info?.price!!.toDouble()
-                if(!TextUtils.isEmpty(it.data?.service_fee_rate)){
-                    var s=it.data?.service_fee_rate?.split("%")
-                    oneprice.value= DecimalUtils.getNumber(s!![0].toDouble()*0.01*goodPrice)
-                }
-                if(!TextUtils.isEmpty(it.data?.royalties_rate)){
-                    var s=it.data?.royalties_rate?.split("%")
-                    twoprice.value= DecimalUtils.getNumber(s!![0].toDouble()*0.01*goodPrice)
-                }
-                var ss=goodPrice-oneprice.value!!.toDouble()-twoprice.value!!.toDouble()
-                price.value=DecimalUtils.getNumber(ss)
-
+                sellPrice=it.data?.pro_info?.price
 
             }
 

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

@@ -104,7 +104,7 @@ class TibOrderVModel(application: Application) : BViewModel<BRepository>(applica
         if (bean.value?.pay_type.equals("wallet")) {//钱包支付
 
             viewModelScope.launch {
-                var it = repository().lreq { NetEngine.service.payOrder(bean.value?.order_no, bean.value?.pay_type) }
+                var it = repository().lreq { NetEngine.service.payOrderTo(bean.value?.order_no, bean.value?.pay_type) }
 
                 if (it.ok(true)) {
                     RxBus.get().post(ConfigRx.REFRESH_CANCEL_ORDER,"")

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

@@ -141,6 +141,24 @@ class TibetanDetailsVModel(application: Application) : BViewModel<BRepository>(a
 
     }
 
+
+    fun toPayOrderTo(order_no:String?,from:String?){//钱包支付
+
+        viewModelScope.launch {
+            var it=repository().lreq { NetEngine.service.payOrderTo(order_no,from) }
+            if(it.code==0){
+                toast(it.msg)
+                return@launch
+            }
+            if(it.ok(true)){
+                popuBuyUtils?.setDisMiss()
+                    //刷新数据
+                    getMyOrder(order_no)
+            }
+        }
+
+    }
+
     fun toPayOrder(order_no:String?,from:String?){
         viewModelScope.launch {
             var it=repository().lreq { NetEngine.service.payOrder(order_no,from) }
@@ -153,12 +171,8 @@ class TibetanDetailsVModel(application: Application) : BViewModel<BRepository>(a
                 if("sd_rapid" == from) {//杉德支付
                     bean.value = it.data
 
-                }else{
-                    //刷新数据
-                    getMyOrder(order_no)
                 }
 
-
             }
         }
 

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

@@ -361,8 +361,7 @@
                             android:layout_marginTop="14dp"
                             android:gravity="center_vertical"
                             android:orientation="horizontal"
-                            android:visibility="gone"
-                            tools:visibility="visible">
+                           >
 
                             <TextView
                                 android:layout_width="wrap_content"
@@ -954,40 +953,145 @@
         </LinearLayout>
 
         <!--        未开始-->
+
+
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="81dp"
+            android:orientation="vertical"
             android:visibility="@{vm.isShowStart(vm.data.apply_st,vm.data.sell_time)}"
-            android:orientation="horizontal"
-            >
+            android:layout_height="wrap_content">
 
-            <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" />
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="91dp"
+                android:layout_marginBottom="10dp"
+                android:visibility="@{vm.is_remind?View.GONE:View.VISIBLE}"
+                android:orientation="horizontal"
+                tools:visibility="visible">
 
-            <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" />
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="14dp"
 
-        </LinearLayout>
+                    android:layout_marginStart="16dp"
+                    android:layout_weight="1"
+                    android:text="@{`￥`+vm.data.price}"
+                    android:textColor="@color/white"
+                    android:textSize="30sp" />
 
+                <LinearLayout
+                    android:layout_width="180dp"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="25dp"
+                    android:onClick="@{v->vm.toBuyTime()}"
+                    android:background="@drawable/bg_logo_but"
+                    android:gravity="center"
+                    android:orientation="vertical">
 
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="设置购买提醒"
+                        android:textColor="#000000"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{vm.data.sell_time}"
+                        android:textColor="#000000"
+                        android:textSize="12sp" />
+
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="91dp"
+                android:layout_marginBottom="10dp"
+                android:orientation="horizontal"
+                android:visibility="@{vm.is_remind?View.VISIBLE:View.GONE}"
+                >
+                <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" />
+
+                <LinearLayout
+                    android:layout_width="180dp"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="25dp"
+                    android:onClick="@{v->vm.toBuyTime()}"
+                    android:background="@drawable/bg_logo_but_on"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="设置购买提醒"
+                        android:textColor="#DFDFDF"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{vm.data.sell_time}"
+                        android:textColor="#DFDFDF"
+                        android:textSize="12sp" />
+
+
+                </LinearLayout>
+
+
+            </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"-->
+<!--                >-->
+
+<!--                <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>
 
 
         <!--        去支付-->

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

@@ -119,6 +119,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="13dp"
+                android:gravity="center_vertical"
                 android:orientation="horizontal">
 
                 <TextView
@@ -128,22 +129,38 @@
                     android:textColor="@color/white"
                     android:textSize="13sp" />
 
-                <TextView
+                <View
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:gravity="right"
+                    android:layout_height="match_parent"/>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_height="wrap_content">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:text="¥"
                     android:textColor="#F14351"
                     android:textSize="10sp" />
 
-                <TextView
+                <com.ysnows.base.widget.DelEditText
                     android:layout_width="wrap_content"
+                    android:paddingStart="5dp"
+                    android:paddingEnd="5dp"
+                    android:textColorHint="#F14351"
+                    android:background="@null"
+                    android:inputType="number|numberDecimal"
                     android:layout_height="wrap_content"
-                    android:text="@{vm.data.pro_info.price}"
+                    android:text="@={vm.sellPrice}"
                     android:textColor="#F14351"
+                    app:addTextChangedListener="@{vm.textWatcher}"
                     android:textSize="16sp" />
 
+                </LinearLayout>
+
 
             </LinearLayout>
             <View

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

@@ -17,5 +17,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+
+
     </androidx.constraintlayout.widget.ConstraintLayout >
 </layout >

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

@@ -62,7 +62,7 @@
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:src="@drawable/ic_default_avatar"
-                    app:qmui_border_color="@color/white"
+                    app:qmui_border_color="@color/translucent"
                     app:qmui_corner_radius="2dp"
                     app:url="@{vm.user.headimg}"
                     app:qmui_is_oval="true"

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

@@ -42,6 +42,7 @@
                 android:hint="搜索内容"
                 android:paddingStart="10dp"
                 android:paddingEnd="10dp"
+                app:addTextChangedListener="@{vm.textWatcher}"
                 android:textColor="@color/text_title"
                 android:textColorHint="#999999"
                 android:textSize="14sp" />

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

@@ -76,6 +76,8 @@
                         android:layout_height="26dp"
                         android:background="@drawable/bg_six_but"
                         android:gravity="center"
+                        android:visibility="gone"
+                        tools:visibility="visible"
                         android:text="转赠"
                         android:textColor="#151314"
                         android:textSize="14sp" />
@@ -89,6 +91,7 @@
         </LinearLayout>
 
         <View
+            android:id="@+id/line"
             android:background="#343434"
             android:layout_marginTop="10dp"
             android:visibility="gone"
@@ -97,10 +100,11 @@
             android:layout_height="@dimen/dp_1"/>
 
         <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+           android:id="@+id/ll_time"
             android:layout_width="match_parent"
+            app:qmui_radius="6dp"
             android:visibility="gone"
             tools:visibility="visible"
-            app:qmui_radius="6dp"
             app:qmui_borderColor="@color/translucent"
             app:qmui_backgroundColor="#1Affffff"
             android:gravity="center_vertical"
@@ -115,7 +119,7 @@
                 android:textColor="#59FFF1"
                 android:textSize="14sp"
                 android:layout_marginStart="@dimen/dp_10"
-                android:text="2022年9月16日可转赠"
+                android:text="@{item.send_time+`后可进行转赠`}"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
 

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

@@ -79,7 +79,7 @@
                 android:layout_marginStart="10dp"
                 android:layout_marginTop="5dp"
                 android:layout_marginEnd="10dp"
-                android:text="MOLLY 童心时光机"
+                android:text="@{item.name}"
                 android:textColor="@color/white"
                 android:textSize="14sp" />
 

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

@@ -135,11 +135,24 @@
                      android:textSize="10sp"
                      android:textColor="#333333"
                      android:gravity="center"
+                     android:visibility="@{item.issue_mode==1?View.VISIBLE:View.GONE}"
                      android:background="@drawable/bg_one_but"
                      android:layout_marginStart="8dp"
                      android:layout_width="50dp"
                      android:layout_height="16dp"/>
 
+                <TextView
+                    android:text="抽签认购"
+                    android:layout_marginBottom="@dimen/dp_10"
+                    android:textSize="10sp"
+                    android:visibility="@{item.issue_mode==2?View.VISIBLE:View.GONE}"
+                    android:textColor="#333333"
+                    android:gravity="center"
+                    android:background="@drawable/bg_one_but"
+                    android:layout_marginStart="8dp"
+                    android:layout_width="50dp"
+                    android:layout_height="16dp"/>
+
             </LinearLayout>
 
             <LinearLayout

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

@@ -73,7 +73,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="29.9"
+                    android:text="@{item.resale_price}"
                     android:textColor="@color/white"
                     android:textSize="20sp" />