Browse Source

1.添加订单列表UI

王鹏鹏 2 years ago
parent
commit
6f6411e25e

+ 1 - 1
.idea/misc.xml

@@ -84,7 +84,7 @@
         <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_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_service_package.xml" value="0.326671261199173" />
         <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" />

+ 9 - 2
workbenches/src/main/java/com/yingyang/workbenches/servicepackage/ServicePackageActivity.kt

@@ -55,8 +55,15 @@ class ServicePackageActivity :
     }
 
     override fun initListener() {
-        binding.layoutHead.setOnSingleClickListener {
-            JumpUtil.jumpActivity(RouterUrlCommon.workbenches)
+        binding {
+            //工作台
+            layoutHead.setOnSingleClickListener {
+                JumpUtil.jumpActivity(RouterUrlCommon.workbenches)
+            }
+            //订单记录
+            tvOrderList.setOnSingleClickListener {
+                JumpUtil.jumpActivity(RouterUrlCommon.orderList)
+            }
         }
     }
 

+ 12 - 4
workbenches/src/main/res/layout/activity_service_package.xml

@@ -62,6 +62,18 @@
 
         </androidx.cardview.widget.CardView>
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvOrderList"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/divider_42px"
+            android:layout_marginEnd="@dimen/divider_49px"
+            android:text="@string/order_list"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_27px"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="0dp"
@@ -107,15 +119,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_marginStart="@dimen/divider_46px"
-                    android:layout_marginTop="@dimen/divider_20px"
                     android:layout_marginEnd="@dimen/divider_46px" />
 
             </LinearLayout>
 
-
         </androidx.cardview.widget.CardView>
-
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>

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

@@ -14,6 +14,7 @@
     <androidx.cardview.widget.CardView
         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">