1.添加获取脑力值和训练时长接口

.idea/misc.xml

@@ -28,6 +28,7 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/selector_train_report_tab_left.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/selector_train_report_tab_right.xml" value="0.2265" />
         <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_service_package.xml" value="0.22826086956521738" />
         <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.264" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_train_report.xml" value="0.22826086956521738" />

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

@@ -94,20 +94,19 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
     override fun initData() {
         binding {
             swipeGame.setOnRefreshListener {
-                loadData(true)
+                getGameList(true)
             }
             swipeGame.setOnLoadMoreListener {
-                loadData(false)
+                getGameList(false)
             }
         }
-        loadData(true)
     }
 
     /**
      * 加载游戏数据
      */
     @SuppressLint("NotifyDataSetChanged")
-    private fun loadData(isRefresh: Boolean) {
+    private fun getGameList(isRefresh: Boolean) {
         if (isRefresh) {
             gameList.clear()
             binding.swipeGame.resetNoMoreData()
@@ -115,7 +114,7 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
         } else {
             page++
         }
-        viewModel.loadData(page, fail = {
+        viewModel.getGameList(page, fail = {
             endRefresh()
             "数据加载失败，请重试".toast()
         }, success = {
@@ -140,4 +139,23 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        //加载游戏列表
+        getGameList(true)
+        //获取脑力值和训练时长接口
+        getCountTrain()
+    }
+
+    /**
+     * 获取脑力值和训练时长接口
+     */
+    private fun getCountTrain() {
+        viewModel.getCountTrain(fail = {
+            it.toast()
+        }, success = {
+            binding.data = it
+        })
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.yingyang.workbenches
 
+import com.yingyang.workbenches.entity.CountTrainBean
 import com.yingyang.workbenches.net.WORKBENCHES_API
 import com.yingyang.workbenches.net.WorkBenchesBean
 import com.yingyang.workbenches.net.WorkBenchesRequestBodyBean
@@ -15,7 +16,10 @@ import com.yingyangfly.baselib.utils.GsonUtil
  */
 class WorkbenchesViewModel : BaseViewModel() {
 
-    fun loadData(
+    /**
+     * 获取游戏列表
+     */
+    fun getGameList(
         pageStr: Int,
         fail: ((msg: String) -> Unit)? = null,
         success: ((success: WorkBenchesBean) -> Unit)? = null,
@@ -30,4 +34,17 @@ class WorkbenchesViewModel : BaseViewModel() {
         success,
         fail
     )
+
+    /**
+     * 获取脑力值和训练时长接口
+     */
+    fun getCountTrain(
+        fail: ((msg: String) -> Unit)? = null,
+        success: ((success: CountTrainBean) -> Unit)? = null,
+    ) = launchFlow(true) {
+        WORKBENCHES_API.getCountTrain()
+    }.runUI(
+        success,
+        fail
+    )
 }

workbenches/src/main/java/com/yingyang/workbenches/entity/CountTrainBean.kt

@@ -0,0 +1,9 @@
+package com.yingyang.workbenches.entity
+
+/**
+ * 脑力值和累计训练时长bean
+ */
+data class CountTrainBean(
+    val mentalPower: String,
+    val trainTime: String
+)

workbenches/src/main/java/com/yingyang/workbenches/net/WorkbenchesApiService.kt

@@ -1,5 +1,6 @@
 package com.yingyang.workbenches.net
 
+import com.yingyang.workbenches.entity.CountTrainBean
 import com.yingyangfly.baselib.net.BaseResp
 import okhttp3.RequestBody
 import retrofit2.http.*
@@ -13,4 +14,10 @@ interface WorkbenchesApiService {
     suspend fun getGameList(
         @Body requestBody: RequestBody
     ): BaseResp<WorkBenchesBean>
+
+    /**
+     * 获取脑力值和累计训练时长
+     */
+    @POST("app/user/countTrain")
+    suspend fun getCountTrain(): BaseResp<CountTrainBean>
 }

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

@@ -4,6 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
 
+    <data>
+
+        <variable
+            name="data"
+            type="com.yingyang.workbenches.entity.CountTrainBean" />
+    </data>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -204,6 +211,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/divider_9px"
+                        android:text="@{data.mentalPower}"
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_34px"
                         android:textStyle="bold" />
@@ -221,6 +229,7 @@
                         android:layout_height="0dp"
                         android:layout_marginTop="@dimen/divider_9px"
                         android:layout_weight="1"
+                        android:text="@{data.trainTime}"
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_32px"
                         android:textStyle="bold" />