Ver código fonte

1.修改套餐列表UI

王鹏鹏 2 anos atrás
pai
commit
4a8938e7aa

+ 3 - 0
.idea/misc.xml

@@ -44,6 +44,9 @@
         <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_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_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" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_pay_success.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_purchase_services.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_purchase_services_button.xml" value="0.219" />

+ 10 - 1
workbenches/src/main/java/com/yingyang/workbenches/adapter/ServicePackageListAdapter.kt

@@ -25,7 +25,16 @@ class ServicePackageListAdapter(override val layoutId: Int = R.layout.item_servi
         position: Int
     ) {
         binding.data = item
-
+        val index = position + 1
+        if (index % 3 == 0) {
+            binding.tvTitle.setBackgroundResource(R.drawable.bg_package_three)
+        } else {
+            if (index % 2 == 0) {
+                binding.tvTitle.setBackgroundResource(R.drawable.bg_package_two)
+            } else {
+                binding.tvTitle.setBackgroundResource(R.drawable.bg_package_one)
+            }
+        }
         binding.buyBtn.setOnSingleClickListener {
             onServicePackageListClickListener?.invoke(item)
         }

+ 4 - 0
workbenches/src/main/java/com/yingyang/workbenches/servicepackage/ServicePackageActivity.kt

@@ -95,6 +95,10 @@ class ServicePackageActivity :
                     rvType.adapter = servicePackageTypeAdapter
                     servicePackageTypeAdapter.setServicePackageTypeSize(servicePackageTypeList.size)
                     servicePackageTypeAdapter.setData(servicePackageTypeList)
+                    if (servicePackageTypeList.isNullOrEmpty().not()) {
+                        packageType = servicePackageTypeList[0].dictValue
+                        getServicePackageList()
+                    }
                     servicePackageTypeAdapter.onServicePackageTypeClickListener = {
                         packageType = it.dictValue
                         getServicePackageList()

+ 1 - 1
workbenches/src/main/java/com/yingyang/workbenches/servicepackage/ServicePackageViewModel.kt

@@ -35,7 +35,7 @@ class ServicePackageViewModel : BaseViewModel() {
         packageType: String,
         fail: ((msg: String) -> Unit)? = null,
         success: ((success: List<PackageInfoBean>) -> Unit)? = null,
-    ) = launchFlow(false) {
+    ) = launchFlow(true) {
         WORKBENCHES_API.getServicePackageList(packageType)
     }.runUI(
         success,

+ 20 - 0
workbenches/src/main/res/drawable/bg_package_one.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <item>
+        <shape android:shape="rectangle">
+            <corners
+                android:topLeftRadius="@dimen/divider_20px"
+                android:topRightRadius="@dimen/divider_20px" />
+            <gradient
+                android:angle="90"
+                android:endColor="@color/color_FF343049"
+                android:startColor="@color/color_FF383838"
+                android:type="linear"
+                android:useLevel="true" />
+        </shape>
+    </item>
+
+</layer-list>

+ 20 - 0
workbenches/src/main/res/drawable/bg_package_three.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <item>
+        <shape android:shape="rectangle">
+            <corners
+                android:topLeftRadius="@dimen/divider_20px"
+                android:topRightRadius="@dimen/divider_20px" />
+            <gradient
+                android:angle="90"
+                android:endColor="@color/color_FFCEE4EE"
+                android:startColor="@color/color_FF93C5D8"
+                android:type="linear"
+                android:useLevel="true" />
+        </shape>
+    </item>
+
+</layer-list>

+ 20 - 0
workbenches/src/main/res/drawable/bg_package_two.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <item>
+        <shape android:shape="rectangle">
+            <corners
+                android:topLeftRadius="@dimen/divider_20px"
+                android:topRightRadius="@dimen/divider_20px" />
+            <gradient
+                android:angle="90"
+                android:endColor="@color/color_FFFFBE8A"
+                android:startColor="@color/color_FFFECE75"
+                android:type="linear"
+                android:useLevel="true" />
+        </shape>
+    </item>
+
+</layer-list>

+ 4 - 0
workbenches/src/main/res/values/colors.xml

@@ -43,4 +43,8 @@
     <color name="color_FFCFDFFF" tools:ignore="ResourceName">#FFCFDFFF</color>
     <color name="color_FF343049" tools:ignore="ResourceName">#FF343049</color>
     <color name="color_FFC46D40" tools:ignore="ResourceName">#FFC46D40</color>
+    <color name="color_FFFFBE8A" tools:ignore="ResourceName">#FFFFBE8A</color>
+    <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>
 </resources>