1.添加自由训练接口

2.添加推荐游戏接口

.idea/misc.xml

@@ -39,10 +39,12 @@
         <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_free_train.xml" value="0.21014492753623187" />
         <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_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_content.xml" value="0.21014492753623187" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_train_report.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_game_list.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_train_report.xml" value="0.536" />

baselib/src/main/java/com/yingyangfly/baselib/router/RouterUrlCommon.kt

@@ -85,4 +85,9 @@ object RouterUrlCommon {
      */
     const val messageList = "/message/list"
 
+    /**
+     * 自由训练
+     */
+    const val freeTrain = "/free/train"
+
 }

workbenches/src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
             android:launchMode="singleTask"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
+
         <activity
             android:name=".traindata.TrainDataActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -20,11 +21,18 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
+
         <activity
             android:name=".leisurebrain.LeisureBrainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
+
+        <activity
+            android:name=".freetraining.FreeTrainActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize|adjustPan" />
     </application>
 
 </manifest>

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

@@ -87,7 +87,7 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
             }
             //自由训练
             layoutFreeTraining.setOnSingleClickListener {
-                "自由训练".toast()
+                JumpUtil.jumpActivity(RouterUrlCommon.freeTrain)
             }
             //在线测评
             layoutOnlineAssessment.setOnSingleClickListener {

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

@@ -19,7 +19,7 @@ class WorkbenchesViewModel : BaseViewModel() {
         fail: ((msg: String) -> Unit)? = null,
         success: ((success: List<Record>) -> Unit)? = null,
     ) = launchFlow(false) {
-        WORKBENCHES_API.getGameList()
+        WORKBENCHES_API.getGameList("1")
     }.runUI(
         success,
         fail

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

@@ -0,0 +1,31 @@
+package com.yingyang.workbenches.freetraining
+
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.yingyang.workbenches.databinding.ActivityFreeTrainBinding
+import com.yingyangfly.baselib.ext.toast
+import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
+import com.yingyangfly.baselib.router.RouterUrlCommon
+
+/**
+ * 自由训练
+ */
+@Route(path = RouterUrlCommon.freeTrain)
+class FreeTrainActivity : BaseMVVMActivity<ActivityFreeTrainBinding, FreeTrainViewModel>() {
+
+    override fun initViews() {
+
+    }
+
+    override fun initListener() {
+
+    }
+
+    override fun initData() {
+        viewModel.getGameList(fail = {
+            it.toast()
+        }, success = {
+            "自由训练接口联调成功".toast()
+        })
+    }
+
+}

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

@@ -0,0 +1,25 @@
+package com.yingyang.workbenches.freetraining
+
+import com.yingyang.workbenches.entity.Record
+import com.yingyang.workbenches.net.WORKBENCHES_API
+import com.yingyangfly.baselib.mvvm.BaseViewModel
+
+/**
+ * @author 王鹏鹏
+ * @description 工作台页面ViewModel
+ */
+class FreeTrainViewModel : BaseViewModel() {
+
+    /**
+     * 获取游戏列表
+     */
+    fun getGameList(
+        fail: ((msg: String) -> Unit)? = null,
+        success: ((success: List<Record>) -> Unit)? = null,
+    ) = launchFlow(false) {
+        WORKBENCHES_API.getGameList("2")
+    }.runUI(
+        success,
+        fail
+    )
+}

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

@@ -3,14 +3,16 @@ package com.yingyang.workbenches.net
 import com.yingyang.workbenches.entity.*
 import com.yingyangfly.baselib.net.BaseResp
 import retrofit2.http.POST
+import retrofit2.http.Query
 
 interface WorkbenchesApiService {
 
     /**
      * 获取首页游戏列表
+     * @param palyClass = 0 任务，1推荐，2 自由训练
      */
     @POST("app/game/selectMyList")
-    suspend fun getGameList(): BaseResp<List<Record>>
+    suspend fun getGameList(@Query("palyClass") palyClass: String): BaseResp<List<Record>>
 
     /**
      * 获取脑力值和累计训练时长

workbenches/src/main/manifest/AndroidManifest.xml

@@ -3,22 +3,31 @@
     package="com.yingyang.workbenches">
 
     <application>
+        <activity
+            android:name=".freetraining.FreeTrainActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize|adjustPan" />
+
         <activity
             android:name=".leisurebrain.LeisureBrainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
+
         <activity
             android:name=".traindata.TrainDataActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
+
         <activity
             android:name="com.yingyang.workbenches.WorkbenchesActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTask"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
+
         <activity
             android:name=".servicepackage.ServicePackageActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

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

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_train">
+
+        <LinearLayout
+            android:id="@+id/layoutHead"
+            android:layout_width="@dimen/divider_195px"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="@dimen/divider_48px"
+                android:layout_height="@dimen/divider_43px"
+                android:layout_marginStart="@dimen/divider_65px"
+                android:layout_marginTop="@dimen/divider_35px"
+                android:background="@mipmap/bg_home" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_14px"
+                android:layout_marginTop="@dimen/divider_38px"
+                android:text="@string/home_pager"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_28px"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="自由训练"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_36px"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>