确认订单UI优化

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/buserorder/adapter/OrderConfirmCommodityListAdapter.kt

@@ -33,7 +33,7 @@ class OrderConfirmCommodityListAdapter : BaseQuickAdapter<GoodsDto, BaseViewHold
       Glide.with(context).load(item.picUrl)
         .apply(
           RequestOptions()
-            .transform(CenterCrop(), RoundedCorners(DensityUtil.dp2px(12F)))
+            .transform(CenterCrop(), RoundedCorners(DensityUtil.dp2px(10F)))
             .error(R.drawable.img_order_commodity_placeholder)
             .placeholder(R.drawable.img_order_commodity_placeholder)
         )

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

@@ -150,9 +150,9 @@
                     android:layout_marginTop="@dimen/dp8"
                     android:background="@drawable/shape_white_card_bg"
                     android:paddingStart="@dimen/dp16"
-                    android:paddingTop="@dimen/dp20"
+                    android:paddingTop="@dimen/dp18"
                     android:paddingEnd="@dimen/dp16"
-                    android:paddingBottom="@dimen/dp20">
+                    android:paddingBottom="@dimen/dp18">
 
                     <TextView
                         android:id="@+id/tv_receiving_name_title"
@@ -185,7 +185,7 @@
                         android:id="@+id/tv_receiving_phone_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp20"
+                        android:layout_marginTop="@dimen/dp18"
                         android:text="手机号码"
                         android:textColor="@color/color_333333"
                         android:textSize="@dimen/sp16"
@@ -216,9 +216,9 @@
                     android:layout_marginTop="@dimen/dp8"
                     android:background="@drawable/shape_white_card_bg"
                     android:paddingStart="@dimen/dp16"
-                    android:paddingTop="@dimen/dp20"
+                    android:paddingTop="@dimen/dp18"
                     android:paddingEnd="@dimen/dp16"
-                    android:paddingBottom="@dimen/dp20">
+                    android:paddingBottom="@dimen/dp18">
 
                     <TextView
                         android:id="@+id/tv_goods_title"
@@ -270,7 +270,8 @@
                             app:layout_constraintEnd_toStartOf="@id/tv_coupons_available"
                             app:layout_constraintHorizontal_bias="0"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
+                            app:layout_constraintTop_toTopOf="parent"
+                            tools:text="@string/red_packet_or_coupon" />
 
                         <TextView
                             android:id="@+id/tv_coupons_available"
@@ -465,7 +466,7 @@
                         android:layout_height="wrap_content"
                         android:drawableStart="@drawable/icon_weixin_pay"
                         android:text="微信支付"
-                        android:textColor="@color/color_333333"
+                        android:textColor="@color/color_999999"
                         android:textSize="@dimen/sp16"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -487,8 +488,19 @@
                 android:id="@+id/tv_total_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="合计：¥"
-                android:textColor="@color/color_FD7823"
+                android:text="合计："
+                android:textColor="@color/color_999999"
+                android:textSize="@dimen/sp14"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/tv_price_symbol"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_price_symbol"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/renminbi"
+                android:textColor="@color/color_FB4653"
                 android:textSize="@dimen/sp14"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/tv_total_amount"
@@ -500,7 +512,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/dp12"
                 android:text='@{String.format("%.2f", vm.totalAmount)}'
-                android:textColor="@color/color_FD7823"
+                android:textColor="@color/color_FB4653"
                 android:textSize="@dimen/sp24"
                 android:textStyle="bold"
                 app:layout_constraintBaseline_toBaselineOf="@id/tv_total_title"

Components/BUserOrder/src/main/res/layout/border_item_order_confirm_commodity_list.xml

@@ -27,10 +27,11 @@
         android:maxLines="1"
         android:textColor="@color/color_333333"
         android:textSize="@dimen/sp15"
+        android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/iv_commodity_pic"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="肉末茄子+蔬蒸蛋套餐+肉沫豆角+清蒸鲈鱼" />
+        tools:text="肉末茄子+蔬蒸蛋套餐+肉沫豆角+清蒸鲈鱼收到分身乏术" />
 
     <TextView
         android:id="@+id/tv_commodity_count"
@@ -54,7 +55,6 @@
         android:includeFontPadding="false"
         android:textColor="@color/color_333333"
         android:textSize="@dimen/sp16"
-        android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="@id/tv_commodity_name"