Переглянути джерело

1.去掉其他测评模块module

王鹏鹏 2 роки тому
батько
коміт
da9e92c651

+ 1 - 2
workbenches/src/main/java/com/yingyang/workbenches/adapter/OrderListAdapter.kt

@@ -4,7 +4,6 @@ import com.yingyang.workbenches.R
 import com.yingyang.workbenches.databinding.ItemOrderListBinding
 import com.yingyang.workbenches.entity.OrderBean
 import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
-import com.yingyangfly.baselib.ext.click
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
 
 /**
@@ -17,7 +16,7 @@ class OrderListAdapter(override val layoutId: Int = R.layout.item_order_list) :
 
     override fun onBindViewHolder(binding: ItemOrderListBinding, item: OrderBean, position: Int) {
         binding.data = item
-        binding.tvContactAfterSalesService.setOnSingleClickListener {
+        binding.tvCustomerService.setOnSingleClickListener {
             onOrderClickListener?.invoke(item)
         }
     }

+ 9 - 0
workbenches/src/main/res/drawable/bg_evaluation_date.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners
+        android:topLeftRadius="@dimen/divider_28px"
+        android:topRightRadius="@dimen/divider_28px" />
+    <solid android:color="@color/color_FF4A76FF" />
+</shape>

+ 4 - 1
workbenches/src/main/res/drawable/bg_item_order_list.xml

@@ -2,6 +2,9 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
-    <corners android:radius="@dimen/divider_12px" />
+    <corners
+        android:bottomLeftRadius="@dimen/divider_12px"
+        android:bottomRightRadius="@dimen/divider_12px"
+        android:topLeftRadius="@dimen/divider_12px" />
     <solid android:color="@color/color_4794BCFF" />
 </shape>

+ 1 - 0
workbenches/src/main/res/layout/activity_order_list.xml

@@ -68,6 +68,7 @@
                 android:layout_marginStart="@dimen/divider_33px"
                 android:layout_marginTop="@dimen/divider_12px"
                 android:layout_marginEnd="@dimen/divider_31px"
+                android:paddingBottom="@dimen/divider_12px"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
         </androidx.cardview.widget.CardView>

+ 91 - 69
workbenches/src/main/res/layout/item_order_list.xml

@@ -13,86 +13,108 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/divider_36px"
-        android:background="@drawable/bg_item_order_list"
-        android:paddingBottom="@dimen/divider_28px">
+        android:layout_height="wrap_content">
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvPackageType"
+            android:id="@+id/tvCustomerService"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/divider_40px"
-            android:layout_marginTop="@dimen/divider_21px"
-            android:text='@{data.description}'
-            android:textColor="@color/color_FF2B70FF"
-            android:textSize="@dimen/divider_28px"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvPayOrderId"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/divider_40px"
-            android:layout_marginTop="@dimen/divider_16px"
-            android:text='@{"订单编号:"+ data.payOrderId}'
-            android:textColor="@color/color_FF333333"
-            android:textSize="@dimen/divider_24px"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvPackageType" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvPayMoney"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/divider_40px"
-            android:layout_marginTop="@dimen/divider_16px"
-            android:layout_marginBottom="@dimen/divider_28px"
-            android:text='@{"费用:¥"+data.payMoneyYUAN}'
-            android:textColor="@color/color_FF333333"
-            android:textSize="@dimen/divider_24px"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvPayOrderId" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvContactAfterSalesService"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="@dimen/divider_6px"
-            android:paddingTop="@dimen/divider_28px"
-            android:paddingEnd="@dimen/divider_38px"
-            android:paddingBottom="@dimen/divider_6px"
+            android:layout_height="@dimen/divider_37px"
+            android:layout_marginTop="@dimen/divider_36px"
+            android:background="@drawable/bg_evaluation_date"
+            android:gravity="center"
+            android:paddingStart="@dimen/divider_45px"
+            android:paddingEnd="@dimen/divider_45px"
             android:text="@string/contact_after_sales_service"
-            android:textColor="@color/color_FF2B70FF"
+            android:textColor="@android:color/white"
             android:textSize="@dimen/divider_24px"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvSendPayTime"
-            android:layout_width="wrap_content"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/divider_16px"
-            android:layout_marginEnd="@dimen/divider_38px"
-            android:layout_marginBottom="@dimen/divider_28px"
-            android:text='@{"支付时间:"+data.sendPayTime}'
-            android:textColor="@color/color_FF333333"
-            android:textSize="@dimen/divider_24px"
+            android:background="@drawable/bg_item_order_list"
+            android:paddingBottom="@dimen/divider_28px"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvContactAfterSalesService" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvCustomerService">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvPackageType"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_40px"
+                android:layout_marginTop="@dimen/divider_21px"
+                android:text='@{data.description}'
+                android:textColor="@color/color_FF2B70FF"
+                android:textSize="@dimen/divider_28px"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvPayOrderId"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_40px"
+                android:layout_marginTop="@dimen/divider_16px"
+                android:text='@{"订单编号:"+ data.payOrderId}'
+                android:textColor="@color/color_FF333333"
+                android:textSize="@dimen/divider_24px"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvPackageType" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvPayMoney"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_40px"
+                android:layout_marginTop="@dimen/divider_16px"
+                android:layout_marginBottom="@dimen/divider_28px"
+                android:text='@{"费用:¥"+data.payMoneyYUAN}'
+                android:textColor="@color/color_FF333333"
+                android:textSize="@dimen/divider_24px"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvPayOrderId" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvContactAfterSalesService"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="@dimen/divider_6px"
+                android:paddingTop="@dimen/divider_28px"
+                android:paddingEnd="@dimen/divider_38px"
+                android:paddingBottom="@dimen/divider_6px"
+                android:textColor="@color/color_FF2B70FF"
+                android:textSize="@dimen/divider_24px"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvSendPayTime"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/divider_16px"
+                android:layout_marginEnd="@dimen/divider_38px"
+                android:layout_marginBottom="@dimen/divider_28px"
+                android:text='@{"支付时间:"+data.sendPayTime}'
+                android:textColor="@color/color_FF333333"
+                android:textSize="@dimen/divider_24px"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvContactAfterSalesService" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/divider_16px"
+                android:layout_marginEnd="@dimen/divider_38px"
+                android:layout_marginBottom="@dimen/divider_28px"
+                android:text='@{"订单类型:"+data.orderType}'
+                android:textColor="@color/color_FF333333"
+                android:textSize="@dimen/divider_24px"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvSendPayTime" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/divider_16px"
-            android:layout_marginEnd="@dimen/divider_38px"
-            android:layout_marginBottom="@dimen/divider_28px"
-            android:text='@{"订单类型:"+data.orderType}'
-            android:textColor="@color/color_FF333333"
-            android:textSize="@dimen/divider_24px"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvSendPayTime" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>