Przeglądaj źródła

feat: 总价展示问题

DoggyZhang 2 miesięcy temu
rodzic
commit
6fc2ee9683

+ 1 - 1
module/im/src/main/java/com/adealink/weparty/im/session/comp/fragment/widget/OrderTopBarView.kt

@@ -40,7 +40,7 @@ class OrderTopBarView @JvmOverloads constructor(
         binding.ivOrderCategory.setImageUrl(data.categoryIcon)
         val orderStatus = OrderStatus.map(data.status)
         binding.tvOrderCategory.text = getUserOrderStatusText(orderStatus, data.refundApply)
-        binding.tvOrderCategoryDesc.text = "${data.categoryName}/${data.unit}X${data.purchaseQty}"
+        binding.tvOrderCategoryDesc.text = "${data.categoryName}/${data.unit} x${data.purchaseQty}"
 
         if (data.isPendingAccept()) {
             val endTs = data.createTime + 3_600_000

+ 17 - 4
module/im/src/main/res/layout/view_session_order_top_bar.xml

@@ -31,21 +31,34 @@
             android:id="@+id/tv_order_category"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="8dp"
+            android:layout_marginStart="8dp"
             android:ellipsize="middle"
             android:fontFamily="@font/poppins_semibold"
             android:includeFontPadding="false"
             android:singleLine="true"
             android:textColor="@color/color_FF1D2129"
-            android:textSize="14sp"
+            android:textSize="12sp"
             app:layout_constrainedWidth="true"
             app:layout_constraintBottom_toTopOf="@id/tv_order_category_desc"
-            app:layout_constraintEnd_toStartOf="@id/right_barrier"
+            app:layout_constraintEnd_toStartOf="@id/iv_go"
             app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toEndOf="@id/iv_order_category"
             app:layout_constraintTop_toTopOf="@id/iv_order_category"
             app:layout_constraintVertical_chainStyle="packed"
-            tools:text="Wait for Accept >" />
+            tools:text="Wait for Accept" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/iv_go"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:layout_marginStart="2dp"
+            android:layout_marginEnd="8dp"
+            app:layout_constraintBottom_toBottomOf="@id/tv_order_category"
+            app:layout_constraintEnd_toStartOf="@id/right_barrier"
+            app:layout_constraintStart_toEndOf="@id/tv_order_category"
+            app:layout_constraintTop_toTopOf="@id/tv_order_category"
+            app:srcCompat="@drawable/common_go_ic" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_order_category_desc"

+ 1 - 11
module/order/src/main/res/layout/layout_order_center_dashboard.xml

@@ -125,21 +125,11 @@
             android:textColor="@color/color_FF4E5969"
             android:textSize="12sp"
             app:layout_constrainedWidth="true"
-            app:layout_constraintEnd_toStartOf="@id/iv_exposure_desc"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_exposure" />
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/iv_exposure_desc"
-            android:layout_width="12dp"
-            android:layout_height="12dp"
-            app:layout_constraintBottom_toBottomOf="@id/tv_exposure_desc"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tv_exposure_desc"
-            app:layout_constraintTop_toTopOf="@id/tv_exposure_desc"
-            app:srcCompat="@drawable/common_go_ic" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <View