1.添加订单列表UI

.idea/misc.xml

@@ -42,8 +42,10 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_home_btn.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_home_buttom_button.xml" value="0.2265" />
         <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_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" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_package_three.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_package_two.xml" value="0.219" />
@@ -81,7 +83,8 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/tips_shadow_bg.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_free_train.xml" value="0.176" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_leisure_brain.xml" value="0.22826086956521738" />
-        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_service_package.xml" value="0.30660377358490565" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_order_list.xml" value="0.264" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_service_package.xml" value="0.12" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_train_content_details.xml" value="0.176" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_train_data.xml" value="0.4700413223140496" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_workbenches.xml" value="0.72" />
@@ -99,6 +102,7 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_free_training_type.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_game_list.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_leisure_brain_list.xml" value="0.1" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_order_list.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_service_package_list.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_service_package_type.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_task.xml" value="0.8800000000000001" />

baselib/src/main/java/com/yingyangfly/baselib/router/RouterUrlCommon.kt

@@ -95,4 +95,9 @@ object RouterUrlCommon {
      */
     const val trainContentDetails = "/trainContent/details"
 
+    /**
+     * 订单记录
+     */
+    const val orderList = "/OrderList/OrderList"
+
 }

workbenches/src/main/AndroidManifest.xml

@@ -38,6 +38,11 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
+        <activity
+            android:name=".orderlist.OrderListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize|adjustPan" />
     </application>
 
 </manifest>

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

@@ -0,0 +1,16 @@
+package com.yingyang.workbenches.adapter
+
+import com.yingyang.workbenches.R
+import com.yingyang.workbenches.databinding.ItemOrderListBinding
+import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
+
+/**
+ * 订单记录adapter
+ */
+class OrderListAdapter(override val layoutId: Int = R.layout.item_order_list) :
+    BaseDataBindingAdapter<String, ItemOrderListBinding>() {
+
+    override fun onBindViewHolder(binding: ItemOrderListBinding, item: String, position: Int) {
+
+    }
+}

workbenches/src/main/java/com/yingyang/workbenches/orderlist/OrderListActivity.kt

@@ -0,0 +1,41 @@
+package com.yingyang.workbenches.orderlist
+
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.yingyang.workbenches.adapter.OrderListAdapter
+import com.yingyang.workbenches.databinding.ActivityOrderListBinding
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
+import com.yingyangfly.baselib.ext.toast
+import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
+import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.JumpUtil
+
+/**
+ * 订单记录
+ */
+@Route(path = RouterUrlCommon.orderList)
+class OrderListActivity : BaseMVVMActivity<ActivityOrderListBinding, OrderListViewModel>() {
+
+    private var orderListList = mutableListOf<String>()
+    private val orderListAdapter by lazy { OrderListAdapter() }
+
+    override fun initViews() {
+        binding {
+            rvOrderList.adapter = orderListAdapter
+        }
+    }
+
+    override fun initListener() {
+        binding.layoutHead.setOnSingleClickListener {
+            JumpUtil.jumpActivity(RouterUrlCommon.workbenches)
+        }
+    }
+
+    override fun initData() {
+        viewModel.getOrderList(fail = {
+            it.toast()
+        }, success = {
+
+        })
+    }
+
+}

workbenches/src/main/java/com/yingyang/workbenches/orderlist/OrderListViewModel.kt

@@ -0,0 +1,26 @@
+package com.yingyang.workbenches.orderlist
+
+import com.yingyang.workbenches.entity.TrainTypeBean
+import com.yingyang.workbenches.net.WORKBENCHES_API
+import com.yingyangfly.baselib.mvvm.BaseViewModel
+
+/**
+ * @author 王鹏鹏
+ * @description 订单记录ViewModel
+ */
+class OrderListViewModel : BaseViewModel() {
+
+    /**
+     * 获取服务套餐类型列表
+     */
+    fun getOrderList(
+        fail: ((msg: String) -> Unit)? = null,
+        success: ((success: List<TrainTypeBean>) -> Unit)? = null,
+    ) = launchFlow(true) {
+        WORKBENCHES_API.getSelectByDictType("package_type")
+    }.runUI(
+        success,
+        fail
+    )
+
+}

workbenches/src/main/manifest/AndroidManifest.xml

@@ -3,6 +3,11 @@
     package="com.yingyang.workbenches">
 
     <application>
+        <activity
+            android:name=".orderlist.OrderListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize|adjustPan" />
         <activity
             android:name=".traincontentdetails.TrainContentDetailsActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

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

@@ -0,0 +1,7 @@
+<?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_12px" />
+    <solid android:color="@color/color_4794BCFF" />
+</shape>

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

@@ -0,0 +1,7 @@
+<?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_28px" />
+    <solid android:color="@android:color/white" />
+</shape>

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

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_train">
+
+        <LinearLayout
+            android:id="@+id/layoutHead"
+            android:layout_width="@dimen/divider_195px"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="@dimen/divider_48px"
+                android:layout_height="@dimen/divider_43px"
+                android:layout_marginStart="@dimen/divider_65px"
+                android:layout_marginTop="@dimen/divider_35px"
+                android:background="@mipmap/bg_home" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_14px"
+                android:layout_marginTop="@dimen/divider_38px"
+                android:text="@string/home_pager"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_28px"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/divider_40px"
+            android:text="@string/order_list"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_34px"
+            android:textStyle="bold"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginStart="@dimen/divider_22px"
+            android:layout_marginTop="@dimen/divider_21px"
+            android:layout_marginEnd="@dimen/divider_22px"
+            android:layout_marginBottom="@dimen/divider_18px"
+            app:cardBackgroundColor="@android:color/white"
+            app:cardCornerRadius="@dimen/divider_28px"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvTitle">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rvOrderList"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginStart="@dimen/divider_33px"
+                android:layout_marginTop="@dimen/divider_12px"
+                android:layout_marginEnd="@dimen/divider_31px"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+
+        </androidx.cardview.widget.CardView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <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">
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>

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

@@ -37,4 +37,5 @@
     <string name="alipay_payment" tools:ignore="ResourceName">支付宝支付</string>
     <string name="purchase" tools:ignore="ResourceName">购买</string>
     <string name="good" tools:ignore="ResourceName">好的</string>
+    <string name="order_list" tools:ignore="ResourceName">订单记录</string>
 </resources>