1.优化接口返回参数

baselib/src/main/java/com/yingyangfly/baselib/mvvm/BaseViewModel.kt

@@ -69,7 +69,7 @@ abstract class BaseViewModel : ViewModel() {
      * 运行在UI线程的协程
      */
     fun <T> Flow<BaseResp<T>>.runUI(
-        success: ((success: T) -> Unit)?,
+        success: ((success: T?) -> Unit)?,
         fail: ((msg: String) -> Unit)?
     ) = viewModelScope.launch {
         try {

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

@@ -19,11 +19,9 @@ open class BaseResp<T>(
     /**
      * 网络数据请求成功
      */
-    inline fun y(func: (data: T) -> Unit) {
+    inline fun y(func: (data: T?) -> Unit) {
         if (this.code == ResponseCode.SUCCESS) {
-            if (data != null) {
-                func(data!!)
-            }
+            func(data)
         } else {
             n {
                 this.message

baselib/src/main/java/com/yingyangfly/baselib/utils/AppUtil.java

@@ -206,4 +206,21 @@ public class AppUtil {
     public static Context getContext() {
         return Utils.getApp();
     }
+
+    /**
+     * [获取应用程序版本名称信息]
+     * @param context
+     * @return 当前应用的版本名称
+     */
+    public static synchronized int getVersionCode(Context context) {
+        try {
+            PackageManager packageManager = context.getPackageManager();
+            PackageInfo packageInfo = packageManager.getPackageInfo(
+                    context.getPackageName(), 0);
+            return packageInfo.versionCode;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return 0;
+    }
 } 

home/src/main/java/com/yingyangfly/home/activity/HomeActivity.kt

@@ -2,6 +2,7 @@ package com.yingyangfly.home.activity
 
 import android.annotation.SuppressLint
 import android.text.TextUtils
+import android.util.Log
 import androidx.recyclerview.widget.GridLayoutManager
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.yingyang.home.databinding.ActivityHomeBinding
@@ -17,6 +18,7 @@ import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.net.BaseObserver
 import com.yingyangfly.baselib.net.MyRxScheduler
 import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.AppUtil
 import com.yingyangfly.baselib.utils.JumpUtil
 import com.yingyangfly.baselib.utils.User
 import com.yingyangfly.home.adapter.GameAdapter
@@ -157,6 +159,8 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
 
     override fun onResume() {
         super.onResume()
+        //获取app升级信息
+        selectNewVersion()
         //获取脑力值和训练时长接口
         getCountTrain()
         //获取未读消息数量
@@ -173,6 +177,19 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
         }
     }
 
+    /**
+     * 获取app升级信息
+     */
+    private fun selectNewVersion() {
+        val versionCode = AppUtil.getVersionCode(mContext)
+        Log.e("wpp", "versionCode-------------------->" + versionCode)
+        viewModel.selectNewVersion(versionCode, fail = {
+            it.toast()
+        }, success = {
+
+        })
+    }
+
     /**
      * 查询
      */
@@ -212,7 +229,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
         viewModel.getCountMyMsg(fail = {
             it.toast()
         }, success = {
-            if (it.isNullOrEmpty().not()) {
+            if (it != null) {
                 val num = it.toInt()
                 binding.unReadLayout.show(num > 0)
             }
@@ -228,7 +245,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
         }, success = {
             if (it.isNullOrEmpty().not()) {
                 showLayout(false)
-                it[0].let {
+                it!![0].let {
                     binding.task = it
                     if (it.details.isNullOrEmpty().not()) {
                         val index = it.currentTaskNum - 1
@@ -349,7 +366,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
             if (it.isNullOrEmpty().not()) {
                 gameList.clear()
                 pageList.clear()
-                gameList.addAll(it)
+                gameList.addAll(it!!)
                 binding.btnNextPage.show(it.size > 4)
                 if (it.size > 4) {
                     binding.btnNextPage.show(true)

home/src/main/java/com/yingyangfly/home/activity/HomeViewModel.kt

@@ -5,6 +5,7 @@ import com.yingyangfly.home.entity.CountTrainBean
 import com.yingyangfly.home.entity.MyTaskBean
 import com.yingyangfly.home.entity.Record
 import com.yingyangfly.home.net.HOME_API
+import java.util.*
 
 /**
  * @author 王鹏鹏
@@ -17,7 +18,7 @@ class HomeViewModel : BaseViewModel() {
      */
     fun getGameList(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<Record>) -> Unit)? = null,
+        success: ((success: List<Record>?) -> Unit)? = null,
     ) = launchFlow(true) {
         HOME_API.getGameList()
     }.runUI(
@@ -30,7 +31,7 @@ class HomeViewModel : BaseViewModel() {
      */
     fun getCountTrain(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: CountTrainBean) -> Unit)? = null,
+        success: ((success: CountTrainBean?) -> Unit)? = null,
     ) = launchFlow(false) {
         HOME_API.getCountTrain()
     }.runUI(
@@ -43,7 +44,7 @@ class HomeViewModel : BaseViewModel() {
      */
     fun findMyCurrentTask(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<MyTaskBean>) -> Unit)? = null,
+        success: ((success: List<MyTaskBean>?) -> Unit)? = null,
     ) = launchFlow(true) {
         HOME_API.findMyCurrentTask()
     }.runUI(
@@ -56,11 +57,25 @@ class HomeViewModel : BaseViewModel() {
      */
     fun getCountMyMsg(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: String) -> Unit)? = null,
+        success: ((success: String?) -> Unit)? = null,
     ) = launchFlow(false) {
         HOME_API.getCountMyMsg()
     }.runUI(
         success,
         fail
     )
+
+    /**
+     * 获取app升级信息
+     */
+    fun selectNewVersion(
+        versionCode: Int,
+        fail: ((msg: String) -> Unit)? = null,
+        success: ((success: Objects?) -> Unit)? = null,
+    ) = launchFlow(true) {
+        HOME_API.selectNewVersion(versionCode)
+    }.runUI(
+        success,
+        fail
+    )
 }

home/src/main/java/com/yingyangfly/home/net/HomeApiService.kt

@@ -5,6 +5,8 @@ import com.yingyangfly.home.entity.CountTrainBean
 import com.yingyangfly.home.entity.MyTaskBean
 import com.yingyangfly.home.entity.Record
 import retrofit2.http.POST
+import retrofit2.http.Query
+import java.util.*
 
 interface HomeApiService {
     /**
@@ -31,4 +33,10 @@ interface HomeApiService {
     @POST("app/warn/countMyMsg")
     suspend fun getCountMyMsg(): BaseResp<String>
 
+    /**
+     * 获取未读消息数量
+     */
+    @POST("app/selectNewVersion")
+    suspend fun selectNewVersion(@Query("versionCode") versionCode: Int): BaseResp<Objects>
+
 }

livebroadcast/src/main/java/com/yingyang/livebroadcast/activity/detail/LiveBroadcastActivity.kt

@@ -171,7 +171,7 @@ class LiveBroadcastActivity :
         viewModel.getUserSign(User.getUserId(), fail = {
             it.toast()
         }, success = {
-            if (it.isNullOrEmpty().not()) {
+            if (it != null) {
                 loginIm(it)
             }
         })

livebroadcast/src/main/java/com/yingyang/livebroadcast/activity/detail/LiveBroadcastDetailViewModel.kt

@@ -15,7 +15,7 @@ class LiveBroadcastDetailViewModel : BaseViewModel() {
     fun getUserSign(
         id: String,
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: String) -> Unit)? = null,
+        success: ((success: String?) -> Unit)? = null,
     ) = launchFlow(true) {
         LIVEBROADCAST_API.getUserSign(id)
     }.runUI(

livebroadcast/src/main/java/com/yingyang/livebroadcast/activity/list/LiveBroadcastListActivity.kt

@@ -175,11 +175,13 @@ class LiveBroadcastListActivity :
             it.toast()
         }, success = {
             endRefresh()
-            if (it.records.isNullOrEmpty().not()) {
-                liveBroadcastList.addAll(it.records)
-            }
-            if (page >= it.pages) {
-                finishLoadMoreWithNoMoreData()
+            if (it != null) {
+                if (it.records.isNullOrEmpty().not()) {
+                    liveBroadcastList.addAll(it.records)
+                }
+                if (page >= it.pages) {
+                    finishLoadMoreWithNoMoreData()
+                }
             }
             binding {
                 rvLiveBroadcast.show(liveBroadcastList.isNullOrEmpty().not())

livebroadcast/src/main/java/com/yingyang/livebroadcast/activity/list/LiveBroadcastListViewModel.kt

@@ -20,7 +20,7 @@ class LiveBroadcastListViewModel : BaseViewModel() {
         method: String,
         pageStr: Int,
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: LiveBroadcastListBean) -> Unit)? = null,
+        success: ((success: LiveBroadcastListBean?) -> Unit)? = null,
     ) = launchFlow(true) {
         val requestBean = LiveBroadcastListRequestBodyBean().apply {
             page = pageStr.toString()

login/src/main/java/com/yingyang/login/ui/login/LoginActivity.kt

@@ -34,10 +34,10 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>() {
      * 用户登录
      */
     private fun login() {
-        viewModel.login("18701938401", "yaorong2023@@!", fail = {
+        viewModel.login("18701938401", "yingyang2023@@!", fail = {
             it.toast()
         }, success = {
-            if (it.isNullOrEmpty().not()) {
+            if (it != null) {
                 User.saveToken(it)
                 getUserInfo()
             }
@@ -72,7 +72,7 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>() {
                     User.saveUserId(it.id)
                 }
                 //保存是否第一次登陆（0第一次登陆）
-                if(it.firstLogin.isNullOrEmpty().not()){
+                if (it.firstLogin.isNullOrEmpty().not()) {
                     User.saveFirstLogin(it.firstLogin)
                 }
                 ARouter.getInstance().build(RouterUrlCommon.home)

login/src/main/java/com/yingyang/login/ui/login/LoginViewModel.kt

@@ -16,7 +16,7 @@ class LoginViewModel : BaseViewModel() {
         name: String,
         pwd: String,
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: String) -> Unit)? = null,
+        success: ((success: String?) -> Unit)? = null,
     ) = launchFlow(true) {
         val requestBean = LoginRequestBodyBean().apply {
             loginName = name
@@ -31,7 +31,7 @@ class LoginViewModel : BaseViewModel() {
 
     fun getUserInfo(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: UserInfoBean) -> Unit)? = null,
+        success: ((success: UserInfoBean?) -> Unit)? = null,
     ) = launchFlow(true) {
         LOGIN_API.getUserInfo()
     }.runUI(

personalcenter/src/main/java/com/yingyang/personalcenter/activity/PersonalCenterActivity.kt

@@ -64,9 +64,11 @@ class PersonalCenterActivity :
         viewModel.getUserInfo(fail = {
             it.toast()
         }, success = {
-            binding.data = it
-            if (it.diagnoseResult.isNullOrEmpty().not()) {
-                diagnosisAdapter.setData(it.diagnoseResult)
+            if (it != null) {
+                binding.data = it
+                if (it.diagnoseResult.isNullOrEmpty().not()) {
+                    diagnosisAdapter.setData(it.diagnoseResult)
+                }
             }
         })
     }

personalcenter/src/main/java/com/yingyang/personalcenter/activity/PersonalCenterViewModel.kt

@@ -11,7 +11,7 @@ class PersonalCenterViewModel : BaseViewModel() {
 
     fun getUserInfo(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: UserInfoBean) -> Unit)? = null,
+        success: ((success: UserInfoBean?) -> Unit)? = null,
     ) = launchFlow(true) {
         PERSONALCENTER_API.getUserInfo()
     }.runUI(

push/src/main/java/com/yingyang/push/activity/MessgeListActivity.kt

@@ -107,7 +107,7 @@ class MessgeListActivity : BaseMVVMActivity<ActivityMessgeListBinding, PushViewM
             it.toast()
         }, success = {
             if (it.isNullOrEmpty().not()) {
-                pushTypeList.addAll(it)
+                pushTypeList.addAll(it!!)
             }
             pushTypeAdapter.setData(pushTypeList)
         })
@@ -123,7 +123,7 @@ class MessgeListActivity : BaseMVVMActivity<ActivityMessgeListBinding, PushViewM
             it.toast()
         }, success = {
             if (it.isNullOrEmpty().not()) {
-                pushList.addAll(it)
+                pushList.addAll(it!!)
             }
             binding {
                 rvPush.show(pushList.isNullOrEmpty().not())

push/src/main/java/com/yingyang/push/activity/PushViewModel.kt

@@ -16,7 +16,7 @@ class PushViewModel : BaseViewModel() {
      */
     fun getSelectByDictType(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<PushMessageTypeBean>) -> Unit)? = null,
+        success: ((success: List<PushMessageTypeBean>?) -> Unit)? = null,
     ) = launchFlow(false) {
         PUSH_API.getSelectByDictType("warn_type")
     }.runUI(
@@ -30,7 +30,7 @@ class PushViewModel : BaseViewModel() {
     fun getPushList(
         type: String,
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<PushMessageBean>) -> Unit)? = null,
+        success: ((success: List<PushMessageBean>?) -> Unit)? = null,
     ) = launchFlow(true) {
         PUSH_API.getPushList(type)
     }.runUI(

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

@@ -203,7 +203,7 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
             if (it.isNullOrEmpty().not()) {
                 binding.rvGame.show(false)
                 binding.taskLayout.show(true)
-                it[0].let {
+                it!![0].let {
                     binding.task = it
                     if (it.details.isNullOrEmpty().not()) {
                         val index = it.currentTaskNum - 1
@@ -259,7 +259,7 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
         viewModel.getCountMyMsg(fail = {
             it.toast()
         }, success = {
-            if (it.isNullOrEmpty().not()) {
+            if (it != null) {
                 val num = it.toInt()
                 binding.unReadLayout.show(num > 0)
             }

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

@@ -17,7 +17,7 @@ class WorkbenchesViewModel : BaseViewModel() {
      */
     fun getGameList(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<Record>) -> Unit)? = null,
+        success: ((success: List<Record>?) -> Unit)? = null,
     ) = launchFlow(true) {
         WORKBENCHES_API.getGameList()
     }.runUI(
@@ -30,7 +30,7 @@ class WorkbenchesViewModel : BaseViewModel() {
      */
     fun getCountTrain(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: CountTrainBean) -> Unit)? = null,
+        success: ((success: CountTrainBean?) -> Unit)? = null,
     ) = launchFlow(true) {
         WORKBENCHES_API.getCountTrain()
     }.runUI(
@@ -43,7 +43,7 @@ class WorkbenchesViewModel : BaseViewModel() {
      */
     fun findMyCurrentTask(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<MyTaskBean>) -> Unit)? = null,
+        success: ((success: List<MyTaskBean>?) -> Unit)? = null,
     ) = launchFlow(true) {
         WORKBENCHES_API.findMyCurrentTask()
     }.runUI(
@@ -56,7 +56,7 @@ class WorkbenchesViewModel : BaseViewModel() {
      */
     fun getCountMyMsg(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: String) -> Unit)? = null,
+        success: ((success: String?) -> Unit)? = null,
     ) = launchFlow(true) {
         WORKBENCHES_API.getCountMyMsg()
     }.runUI(

workbenches/src/main/java/com/yingyang/workbenches/freetraining/FreeTrainActivity.kt

@@ -107,7 +107,7 @@ class FreeTrainActivity : BaseMVVMActivity<ActivityFreeTrainBinding, FreeTrainVi
             it.toast()
         }, success = {
             if (it.isNullOrEmpty().not()) {
-                freeTypeList.addAll(it)
+                freeTypeList.addAll(it!!)
             }
             freeTrainTypeAdapter.setData(freeTypeList)
         })

workbenches/src/main/java/com/yingyang/workbenches/freetraining/FreeTrainViewModel.kt

@@ -17,7 +17,7 @@ class FreeTrainViewModel : BaseViewModel() {
      */
     fun getSelectByDictType(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<TrainTypeBean>) -> Unit)? = null,
+        success: ((success: List<TrainTypeBean>?) -> Unit)? = null,
     ) = launchFlow(false) {
         WORKBENCHES_API.getSelectByDictType("game_type")
     }.runUI(
@@ -32,7 +32,7 @@ class FreeTrainViewModel : BaseViewModel() {
         type: String,
         page: Int,
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: FreeTrainBean) -> Unit)? = null,
+        success: ((success: FreeTrainBean?) -> Unit)? = null,
     ) = launchFlow(true) {
         WORKBENCHES_API.getTrainingList(type, page, "12")
     }.runUI(

workbenches/src/main/java/com/yingyang/workbenches/leisurebrain/LeisureBrainActivity.kt

@@ -100,7 +100,7 @@ class LeisureBrainActivity :
             it.toast()
         }, success = {
             if (it.isNullOrEmpty().not()) {
-                leisureBrainTypeList.addAll(it)
+                leisureBrainTypeList.addAll(it!!)
             }
             leisureBrainTrainTypeAdapter.setData(leisureBrainTypeList)
         })
@@ -123,7 +123,7 @@ class LeisureBrainActivity :
         }, success = {
             leisureBrainList.clear()
             if (it.isNullOrEmpty().not()) {
-                leisureBrainList.addAll(it)
+                leisureBrainList.addAll(it!!)
             }
             binding.rvLeisureBrain.show(leisureBrainList.isNullOrEmpty().not())
             binding.emptyLayout.show(leisureBrainList.isNullOrEmpty())

workbenches/src/main/java/com/yingyang/workbenches/leisurebrain/LeisureBrainViewModel.kt

@@ -15,7 +15,7 @@ class LeisureBrainViewModel : BaseViewModel() {
      */
     fun getSelectByDictType(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<TrainTypeBean>) -> Unit)? = null,
+        success: ((success: List<TrainTypeBean>?) -> Unit)? = null,
     ) = launchFlow(false) {
         WORKBENCHES_API.getSelectByDictType("video_type")
     }.runUI(
@@ -29,7 +29,7 @@ class LeisureBrainViewModel : BaseViewModel() {
     fun getSelectAllVideo(
         videoType: String,
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<LeisureBrainBean>) -> Unit)? = null,
+        success: ((success: List<LeisureBrainBean>?) -> Unit)? = null,
     ) = launchFlow(true) {
         WORKBENCHES_API.getVideoList(videoType)
     }.runUI(

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

@@ -38,7 +38,7 @@ class OrderListActivity : BaseMVVMActivity<ActivityOrderListBinding, OrderListVi
         }, success = {
             orderListList.clear()
             if (it.isNullOrEmpty().not()) {
-                orderListList.addAll(it)
+                orderListList.addAll(it!!)
             }
             binding {
                 rvOrderList.show(orderListList.isNullOrEmpty().not())

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

@@ -15,7 +15,7 @@ class OrderListViewModel : BaseViewModel() {
      */
     fun getOrderList(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<OrderBean>) -> Unit)? = null,
+        success: ((success: List<OrderBean>?) -> Unit)? = null,
     ) = launchFlow(true) {
         WORKBENCHES_API.getQueryMyOrder()
     }.runUI(

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

@@ -74,7 +74,7 @@ class ServicePackageActivity :
         }, success = {
             runOnUiThread {
                 if (it.isNullOrEmpty().not()) {
-                    servicePackageTypeList.addAll(it)
+                    servicePackageTypeList.addAll(it!!)
                 }
                 binding {
                     rvType.layoutManager =
@@ -109,7 +109,7 @@ class ServicePackageActivity :
         }, success = {
             servicePackageList.clear()
             if (it.isNullOrEmpty().not()) {
-                servicePackageList.addAll(it)
+                servicePackageList.addAll(it!!)
             }
             binding.rvTrainingPackage.show(servicePackageList.isNullOrEmpty().not())
             binding.emptyLayout.show(servicePackageList.isNullOrEmpty())

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

@@ -16,7 +16,7 @@ class ServicePackageViewModel : BaseViewModel() {
      */
     fun getSelectByDictType(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<TrainTypeBean>) -> Unit)? = null,
+        success: ((success: List<TrainTypeBean>?) -> Unit)? = null,
     ) = launchFlow(false) {
         WORKBENCHES_API.getSelectByDictType("package_type")
     }.runUI(
@@ -30,7 +30,7 @@ class ServicePackageViewModel : BaseViewModel() {
     fun getServicePackageList(
         packageType: String,
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<PackageInfoBean>) -> Unit)? = null,
+        success: ((success: List<PackageInfoBean>?) -> Unit)? = null,
     ) = launchFlow(true) {
         WORKBENCHES_API.getServicePackageList(packageType)
     }.runUI(

workbenches/src/main/java/com/yingyang/workbenches/traincontent/TrainContentFragment.kt

@@ -73,7 +73,7 @@ class TrainContentFragment :
                     }
                 binding.treatmentSpinner.setSpinnerTextFormatter(textFormatter)
                 binding.treatmentSpinner.setSelectedTextFormatter(textFormatter)
-                binding.treatmentSpinner.attachDataSource(it)
+                binding.treatmentSpinner.attachDataSource(it!!)
                 findMyTask(it[0].id)
             }
         })
@@ -89,7 +89,7 @@ class TrainContentFragment :
         }, success = {
             trainContentBeanList.clear()
             if (it.isNullOrEmpty().not()) {
-                trainContentBeanList.addAll(it)
+                trainContentBeanList.addAll(it!!)
             }
             adapter.setData(trainContentBeanList)
         })

workbenches/src/main/java/com/yingyang/workbenches/traincontent/TrainContentViewModel.kt

@@ -16,7 +16,7 @@ class TrainContentViewModel : BaseViewModel() {
      */
     fun findAllTreatment(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<TreatmentBean>) -> Unit)? = null,
+        success: ((success: List<TreatmentBean>?) -> Unit)? = null,
     ) = launchFlow(false) {
         WORKBENCHES_API.findAllTreatment()
     }.runUI(
@@ -30,7 +30,7 @@ class TrainContentViewModel : BaseViewModel() {
     fun findMyTask(
         treatmentId: String,
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<TrainContentBean>) -> Unit)? = null,
+        success: ((success: List<TrainContentBean>?) -> Unit)? = null,
     ) = launchFlow(true) {
         WORKBENCHES_API.findMyTask(treatmentId)
     }.runUI(

workbenches/src/main/java/com/yingyang/workbenches/traincontentdetails/TrainContentDetailsViewModel.kt

@@ -16,7 +16,7 @@ class TrainContentDetailsViewModel : BaseViewModel() {
     fun getSelectTaskDetailById(
         taskId: String,
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<TrainContentDetailsBean>) -> Unit)? = null,
+        success: ((success: List<TrainContentDetailsBean>?) -> Unit)? = null,
     ) = launchFlow(true) {
         WORKBENCHES_API.getSelectTaskDetailById(taskId)
     }.runUI(