update 订单详情UI

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

@@ -48,7 +48,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp8"
             android:includeFontPadding="false"
-            android:text='@{"共" + String.valueOf(data.goodsNum) + "件"}'
+            android:text="@{@string/commodity_count(data.goodsNum)}"
             android:textColor="@color/color_999999"
             android:textSize="@dimen/sp13"
             app:layout_constraintStart_toStartOf="@id/tv_commodity_name"
@@ -61,7 +61,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp8"
             android:includeFontPadding="false"
-            android:text='@{"¥" + String.valueOf(data.price)}'
+            android:text="@{@string/amount(data.price)}"
             android:textColor="@color/color_333333"
             android:textSize="@dimen/sp16"
             android:textStyle="bold"

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

@@ -81,7 +81,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp8"
-            android:text="@{@string/pickup_point_contract_person(data.contactName)}"
+            android:text="@{@string/pickup_point_contract_name(data.contactName)}"
             android:textColor="@color/color_999999"
             android:textSize="@dimen/sp14"
             app:layout_constraintStart_toStartOf="parent"

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

@@ -127,7 +127,7 @@
             android:id="@+id/tv_coupon_amount"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text='@{"- ¥" + String.valueOf(data.discountFee)}'
+            android:text="@{@string/discount_amount(data.discountFee)}"
             android:textColor="@color/color_FB4653"
             android:textSize="@dimen/sp14"
             android:visibility="@{data.couponList.size() > 0 ? View.VISIBLE : View.GONE}"
@@ -150,7 +150,8 @@
             android:id="@+id/tv_discount_amount_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/discount_amount"
+            android:layout_marginEnd="@dimen/dp8"
+            android:text="@string/already_discount"
             android:textColor="@color/color_333333"
             android:textSize="@dimen/sp14"
             android:visibility="@{data.useCoupon == 1 ? View.VISIBLE : View.GONE}"
@@ -162,7 +163,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/dp8"
-            android:text='@{"¥" + String.valueOf(data.discountFee)}'
+            android:text="@{@string/amount(data.discountFee)}"
             android:textColor="@color/color_FB4653"
             android:textSize="@dimen/sp14"
             android:visibility="@{data.useCoupon == 1 ? View.VISIBLE : View.GONE}"
@@ -174,6 +175,7 @@
             android:id="@+id/tv_total_amount_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp8"
             android:text="@string/total_amount"
             android:textColor="@color/color_333333"
             android:textSize="@dimen/sp14"
@@ -185,7 +187,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp24"
-            android:text='@{String.format("¥%.2f", data.payment)}'
+            android:text="@{@string/amount(data.payment)}"
             android:textColor="@color/black"
             android:textSize="@dimen/sp18"
             android:textStyle="bold"

Components/BOrder/src/main/res/values/strings.xml

@@ -13,9 +13,9 @@
     <string name="apply_refund">申请退款</string>
     <string name="red_packet_or_coupon">红包/优惠券</string>
     <string name="coupons_available_num">张优惠券可用</string>
-    <string name="discount_amount">已优惠：</string>
+    <string name="already_discount">已优惠</string>
     <string name="renminbi">¥</string>
-    <string name="total_amount">合计：</string>
+    <string name="total_amount">合计:</string>
     <string name="order_info">订单信息</string>
     <string name="order_no">订单编号</string>
     <string name="copy">复制</string>
@@ -29,4 +29,8 @@
     <string name="cancel">取消</string>
     <string name="nearby_pickup_point">附近自提点</string>
     <string name="pickup_point_distance">距您: %fkm</string>
+    <string name="commodity_count">共%d件</string>
+    <string name="amount">¥%.2f</string>
+    <string name="discount_amount">- ¥%.2f</string>
+    <string name="pickup_point_contract_name">提货点联系人: %s</string>
 </resources>
\ No newline at end of file