1.修改服务套餐页面，没有数据显示，并且弹出非法提示bug

.idea/misc.xml

@@ -601,6 +601,7 @@
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/bg_brain_ability_type_three.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/bg_brain_ability_type_two.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/bg_record_title.xml" value="0.151" />
+        <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/bg_service_package_title.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/bg_total_training_duration.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/bg_training_daily.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/bg_work_benches_btn.xml" value="0.164" />

baselib/src/main/java/com/yingyangfly/baselib/net/BaseResp.kt

@@ -9,7 +9,7 @@ open class BaseResp<T>(
     // 响应状态码
     var code: Int = -1,
     // 响应信息
-    var message: String = "success ~",
+    var message: String = "",
     // 数据实体
     var data: T? = null
 

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

@@ -18,16 +18,6 @@ class ServicePackageTypeAdapter(override val layoutId: Int = R.layout.item_servi
 
     private var currentPosition = 0
 
-    /**
-     * 数据总数
-     */
-    private var dataSize = 0
-
-    fun setServicePackageTypeSize(size: Int) {
-        dataSize = size
-        notifyDataSetChanged()
-    }
-
     @SuppressLint("NotifyDataSetChanged")
     override fun onBindViewHolder(
         binding: ItemServicePackageTypeBinding,

workbenches/src/main/java/com/yingyang/workbenches/servicepackage/ServicePackageActivity.kt

@@ -1,6 +1,8 @@
 package com.yingyang.workbenches.servicepackage
 
 import android.annotation.SuppressLint
+import android.text.TextUtils
+import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 import androidx.recyclerview.widget.GridLayoutManager
@@ -30,6 +32,7 @@ class ServicePackageActivity :
     /**
      * 服务套餐类型
      */
+    private var servicePackageTypeGridLayoutManager: GridLayoutManager? = null
     private var servicePackageTypeList = mutableListOf<TrainTypeBean>()
     private val servicePackageTypeAdapter by lazy { ServicePackageTypeAdapter() }
     private var packageType = ""
@@ -37,12 +40,18 @@ class ServicePackageActivity :
     /**
      * 服务套餐列表
      */
+    private var gridLayoutManager: GridLayoutManager? = null
     private var servicePackageList = mutableListOf<PackageInfoBean>()
     private val servicePackageListAdapter by lazy { ServicePackageListAdapter() }
 
     override fun initViews() {
         binding {
-            rvTrainingPackage.layoutManager = GridLayoutManager(this@ServicePackageActivity, 3)
+            servicePackageTypeGridLayoutManager = GridLayoutManager(this@ServicePackageActivity, 2)
+            rvType.layoutManager = servicePackageTypeGridLayoutManager
+            rvType.adapter = servicePackageTypeAdapter
+
+            gridLayoutManager = GridLayoutManager(this@ServicePackageActivity, 3)
+            rvTrainingPackage.layoutManager = gridLayoutManager
             rvTrainingPackage.adapter = servicePackageListAdapter
             servicePackageListAdapter.onServicePackageListClickListener = {
                 val dialog = PurchaseServicesDialog()
@@ -63,6 +72,11 @@ class ServicePackageActivity :
     }
 
     override fun initData() {
+        servicePackageTypeAdapter.onServicePackageTypeClickListener = {
+            packageType = it.dictValue
+            servicePackageListAdapter.clearData()
+            getServicePackageList()
+        }
         getSelectByDictType()
     }
 
@@ -70,29 +84,21 @@ class ServicePackageActivity :
      * 获取服务套餐类型列表
      */
     private fun getSelectByDictType() {
-        servicePackageTypeList.clear()
         viewModel.getSelectByDictType(fail = {
             it.toast()
         }, success = {
             runOnUiThread {
+                servicePackageTypeList.clear()
                 if (it.isNullOrEmpty().not()) {
                     servicePackageTypeList.addAll(it!!)
-                }
-                binding {
-                    rvType.layoutManager =
-                        GridLayoutManager(this@ServicePackageActivity, servicePackageTypeList.size)
-                    rvType.adapter = servicePackageTypeAdapter
-                    servicePackageTypeAdapter.setServicePackageTypeSize(servicePackageTypeList.size)
+                    Log.e("wpp", "size------------------>" + it.size)
+                    servicePackageTypeGridLayoutManager?.spanCount = it.size
                     servicePackageTypeAdapter.setData(servicePackageTypeList)
-                    if (servicePackageTypeList.isEmpty().not()) {
-                        packageType = servicePackageTypeList[0].dictValue
-                        getServicePackageList()
-                    }
-                    servicePackageTypeAdapter.onServicePackageTypeClickListener = {
-                        packageType = it.dictValue
-                        servicePackageListAdapter.clearData()
-                        getServicePackageList()
-                    }
+                    packageType = servicePackageTypeList[0].dictValue
+                    getServicePackageList()
+                } else {
+                    gridLayoutManager?.spanCount = 1
+                    servicePackageListAdapter.showEmptyView = servicePackageList.isEmpty()
                 }
             }
         })
@@ -104,12 +110,18 @@ class ServicePackageActivity :
     private fun getServicePackageList() {
         servicePackageList.clear()
         viewModel.getServicePackageList(packageType, fail = {
-            it.toast()
+            if (TextUtils.isEmpty(it).not()) {
+                it.toast()
+            }
         }, success = {
             servicePackageList.clear()
             if (it.isNullOrEmpty().not()) {
+                gridLayoutManager?.spanCount = 3
                 servicePackageList.addAll(it!!)
+            } else {
+                gridLayoutManager?.spanCount = 1
             }
+            servicePackageListAdapter.showEmptyView = servicePackageList.isEmpty()
             servicePackageListAdapter.setData(servicePackageList)
         })
     }

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

@@ -11,7 +11,7 @@
     </data>
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="horizontal">
 
@@ -20,8 +20,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="center"
-            android:paddingStart="@dimen/divider_31px"
-            android:paddingEnd="@dimen/divider_31px"
+            android:minWidth="@dimen/divider_195px"
             android:text="@{data.dictLabel}"
             android:textSize="@dimen/divider_24px" />