1.添加订单列表UI

.idea/misc.xml

@@ -44,6 +44,7 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_home_task.xml" value="0.2165" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_item_order_list.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_item_report.xml" value="0.2265" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_item_service_package_list.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_item_task.xml" value="0.2165" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_order_list.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_package_one.xml" value="0.219" />

workbenches/src/main/java/com/yingyang/workbenches/WorkbenchesActivity.kt

@@ -198,17 +198,17 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
             it.toast()
         }, success = {
             if (it.isNullOrEmpty().not()) {
+                binding.rvGame.show(false)
+                binding.taskLayout.show(true)
                 taskBean.addAll(it)
                 it[0].let {
                     binding.task = it
                     if (it.gameCoverImages.isNullOrEmpty().not()) {
                         taskList.addAll(it.gameCoverImages)
-                        taskAdapter.setCurrentTaskNum(it.currentTaskNum)
-                        taskAdapter.setData(taskList)
                     }
+                    taskAdapter.setCurrentTaskNum(it.currentTaskNum)
+                    taskAdapter.setData(taskList)
                 }
-                binding.rvGame.show(false)
-                binding.taskLayout.show(true)
             } else {
                 binding.rvGame.show(true)
                 binding.taskLayout.show(false)

workbenches/src/main/java/com/yingyang/workbenches/adapter/ServicePackageListAdapter.kt

@@ -3,12 +3,9 @@ package com.yingyang.workbenches.adapter
 import android.annotation.SuppressLint
 import com.yingyang.workbenches.R
 import com.yingyang.workbenches.databinding.ItemServicePackageListBinding
-import com.yingyang.workbenches.databinding.ItemServicePackageTypeBinding
 import com.yingyang.workbenches.entity.PackageInfoBean
-import com.yingyang.workbenches.entity.TrainTypeBean
 import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
-import com.yingyangfly.baselib.ext.setTextColorResource
 
 /**
  * 服务套餐列表
@@ -29,7 +26,7 @@ class ServicePackageListAdapter(override val layoutId: Int = R.layout.item_servi
         if (index % 3 == 0) {
             binding.tvTitle.setBackgroundResource(R.drawable.bg_package_three)
         } else {
-            if (index % 2 == 0) {
+            if (index % 3 == 2) {
                 binding.tvTitle.setBackgroundResource(R.drawable.bg_package_two)
             } else {
                 binding.tvTitle.setBackgroundResource(R.drawable.bg_package_one)

workbenches/src/main/java/com/yingyang/workbenches/entity/MyTaskBean.kt

@@ -24,8 +24,7 @@ data class MyTaskBean(
 ) {
     fun getGameImage(): String {
         return if (gameCoverImages.isNullOrEmpty().not()) {
-            var index = currentTaskNum - 1
-            gameCoverImages[index]
+            gameCoverImages[currentTaskNum]
         } else {
             ""
         }

workbenches/src/main/res/drawable/bg_item_service_package_list.xml

@@ -0,0 +1,10 @@
+<?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:radius="@dimen/divider_20px" />
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_FF979797" />
+    <solid android:color="@android:color/white" />
+</shape>

workbenches/src/main/res/layout/activity_service_package.xml

@@ -111,7 +111,7 @@
                     android:background="@drawable/bg_service_package_button"
                     android:gravity="center"
                     android:text="@string/select_training_package"
-                    android:textColor="@color/color_FF333333"
+                    android:textColor="@color/color_FF4A76FF"
                     android:textSize="@dimen/divider_24px" />
 
                 <androidx.recyclerview.widget.RecyclerView

workbenches/src/main/res/layout/item_service_package_list.xml

@@ -11,59 +11,54 @@
             type="com.yingyang.workbenches.entity.PackageInfoBean" />
     </data>
 
-    <androidx.cardview.widget.CardView
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="@dimen/divider_313px"
         android:layout_height="@dimen/divider_432px"
         android:layout_marginTop="@dimen/divider_20px"
-        android:orientation="vertical"
-        app:cardCornerRadius="@dimen/divider_20px">
+        android:layout_marginBottom="@dimen/divider_20px"
+        android:background="@drawable/bg_item_service_package_list">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvTitle"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="@dimen/divider_203px"
+            android:background="@color/color_FF343049"
+            android:gravity="center"
+            android:text="@{data.packageName}"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_34px"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tvTitle"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/divider_203px"
-                android:background="@color/color_FF343049"
-                android:gravity="center"
-                android:text="@{data.packageName}"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_34px"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/divider_29px"
+            android:gravity="center"
+            android:text='@{data.price+"元"}'
+            android:textColor="@color/color_FFC46D40"
+            android:textSize="@dimen/divider_48px"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/divider_29px"
-                android:background="@color/color_FF343049"
-                android:gravity="center"
-                android:textColor="@color/color_FFC46D40"
-                android:textSize="@dimen/divider_48px"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
-
-            <Button
-                android:id="@+id/buyBtn"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/divider_59px"
-                android:layout_marginStart="@dimen/divider_55px"
-                android:layout_marginEnd="@dimen/divider_54px"
-                android:layout_marginBottom="@dimen/divider_48px"
-                android:background="@drawable/bg_work_benches_btn"
-                android:text="@string/purchase"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_24px"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent" />
+        <Button
+            android:id="@+id/buyBtn"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/divider_59px"
+            android:layout_marginStart="@dimen/divider_55px"
+            android:layout_marginEnd="@dimen/divider_54px"
+            android:layout_marginBottom="@dimen/divider_48px"
+            android:background="@drawable/bg_work_benches_btn"
+            android:text="@string/purchase"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_24px"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent" />
 
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.cardview.widget.CardView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>

workbenches/src/main/res/values/colors.xml

@@ -47,4 +47,5 @@
     <color name="color_FFFECE75" tools:ignore="ResourceName">#FFFECE75</color>
     <color name="color_FFCEE4EE" tools:ignore="ResourceName">#FFCEE4EE</color>
     <color name="color_FF93C5D8" tools:ignore="ResourceName">#FF93C5D8</color>
+    <color name="color_FF979797" tools:ignore="ResourceName">#FF979797</color>
 </resources>