商品相关字端更新

Components/BOrder/src/main/java/com/yidian/shenghuoquan/border/adapter/OrderConfirmCommodityListAdapter.kt

@@ -3,8 +3,13 @@ package com.yidian.shenghuoquan.border.adapter
 import android.annotation.SuppressLint
 import android.widget.ImageView
 import android.widget.TextView
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.resource.bitmap.CenterCrop
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners
+import com.bumptech.glide.request.RequestOptions
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
+import com.yidian.news.util.DensityUtil
 import com.yidian.shenghuoquan.border.R
 import com.yidian.shenghuoquan.border.dto.GoodsList
 
@@ -15,18 +20,18 @@ class OrderConfirmCommodityListAdapter : BaseQuickAdapter<GoodsList, BaseViewHol
 
   @SuppressLint("SetTextI18n")
   override fun convert(holder: BaseViewHolder, item: GoodsList) {
-    holder.getView<TextView>(R.id.tv_commodity_name).text = item.name
-    holder.getView<TextView>(R.id.tv_commodity_count).text = "共" + item.name + "件"
-    holder.getView<TextView>(R.id.tv_commodity_amount).text = "¥" + item.name
+    holder.getView<TextView>(R.id.tv_commodity_name).text = item.goodsName
+    holder.getView<TextView>(R.id.tv_commodity_count).text = "共" + item.goodsNum + "件"
+    holder.getView<TextView>(R.id.tv_commodity_amount).text = "¥" + item.price
     val ivCommodityPic = holder.getView<ImageView>(R.id.iv_commodity_pic)
-//    Glide.with(context).load(item.url)
-//      .apply(
-//        RequestOptions()
-//          .transform(CenterCrop(), RoundedCorners(DensityUtil.dp2px(12F)))
-//          .error(R.drawable.img_order_commodity_placeholder)
-//          .placeholder(R.drawable.img_order_commodity_placeholder)
-//      )
-//      .into(ivCommodityPic)
+    Glide.with(context).load(item.picUrl)
+      .apply(
+        RequestOptions()
+          .transform(CenterCrop(), RoundedCorners(DensityUtil.dp2px(12F)))
+          .error(R.drawable.img_order_commodity_placeholder)
+          .placeholder(R.drawable.img_order_commodity_placeholder)
+      )
+      .into(ivCommodityPic)
   }
 
 }

Components/BOrder/src/main/java/com/yidian/shenghuoquan/border/dto/OrderConfirmDto.kt

@@ -55,12 +55,14 @@ data class CouponList(
  */
 @Parcelize
 data class GoodsList(
-  @SerializedName("name")
-  val name: String? = null,
+  @SerializedName("goods_name")// 商品名称
+  val goodsName: String? = null,
   @SerializedName("price") // 商品价格
   val price: Double,
-  @SerializedName("goods_num") // 商品数量
+  @SerializedName("goods_sku_num") // 商品数量
   val goodsNum: Int,
+  @SerializedName("desc_pic_url_list") // 商品数量
+  val picUrl: String,
 ) : Parcelable
 
 /**

Components/BOrder/src/main/res/layout/border_activity_confirm_order.xml

@@ -242,6 +242,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/dp8"
                         android:onClick="@{() -> vm.chooseVoucher()}"
+                        app:isShow="@{vm.couponsAvailableNum > 0}"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/rv_goods_list">

Components/BOrder/src/main/res/layout/border_activity_order_detail.xml

@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:CommonTopBarView_back_img="@drawable/icon_back_white"
-            app:CommonTopBarView_bg_color="@color/color_F6775B"
+            app:CommonTopBarView_bg_color="@color/color_FD7823"
             app:CommonTopBarView_title_text="@string/order_detail"
             app:CommonTopBarView_title_text_color="@color/white"
             app:layout_constraintTop_toTopOf="parent" />

Components/BOrder/src/main/res/layout/border_activity_select_pickup_point.xml

@@ -20,7 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:CommonTopBarView_back_img="@drawable/icon_back_white"
-            app:CommonTopBarView_bg_color="@color/color_F6775B"
+            app:CommonTopBarView_bg_color="@color/color_FD7823"
             app:CommonTopBarView_title_text="@string/select_pickup_point"
             app:CommonTopBarView_title_text_color="@color/white"
             app:layout_constraintTop_toTopOf="parent" />