1.修改自由训练接口

2.修改推荐游戏接口

livebroadcast/src/main/AndroidManifest.xml

@@ -12,7 +12,7 @@
 
     <application>
         <activity
-            android:name=".activity.LiveBroadcastActivity"
+            android:name=".activity.detail.LiveBroadcastActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />

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

@@ -1,16 +1,17 @@
-package com.yingyang.livebroadcast.activity
+package com.yingyang.livebroadcast.activity.detail
 
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.yingyang.livebroadcast.databinding.ActivityLiveBroadcastBinding
-import com.yingyangfly.baselib.base.BaseActivity
+import com.yingyangfly.baselib.ext.toast
+import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
 
 /**
  * 直播页面
  */
 @Route(path = RouterUrlCommon.liveBroadcast)
-class LiveBroadcastActivity : BaseActivity<ActivityLiveBroadcastBinding>() {
-
+class LiveBroadcastActivity :
+    BaseMVVMActivity<ActivityLiveBroadcastBinding, LiveBroadcastDetailViewModel>() {
 
     override fun initViews() {
 
@@ -21,7 +22,11 @@ class LiveBroadcastActivity : BaseActivity<ActivityLiveBroadcastBinding>() {
     }
 
     override fun initData() {
+        viewModel.getLiveDetail("", fail = {
+            it.toast()
+        }, success = {
 
+        })
     }
 
 }

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

@@ -0,0 +1,27 @@
+package com.yingyang.livebroadcast.activity.detail
+
+import com.yingyang.livebroadcast.entity.LiveBroadcastListBean
+import com.yingyang.livebroadcast.net.LIVEBROADCAST_API
+import com.yingyangfly.baselib.mvvm.BaseViewModel
+
+/**
+ * @author gold
+ * @date 2022/9/13 下午6:37
+ */
+class LiveBroadcastDetailViewModel : BaseViewModel() {
+
+    /**
+     * 获取直播列表
+     */
+    fun getLiveDetail(
+        id: String,
+        fail: ((msg: String) -> Unit)? = null,
+        success: ((success: LiveBroadcastListBean) -> Unit)? = null,
+    ) = launchFlow(true) {
+        LIVEBROADCAST_API.getLiveDetail(id)
+    }.runUI(
+        success,
+        fail
+    )
+
+}

livebroadcast/src/main/java/com/yingyang/livebroadcast/entity/LiveDetailBean.kt

@@ -0,0 +1,17 @@
+package com.yingyang.livebroadcast.entity
+
+/**
+ * 直播间详情
+ */
+data class LiveDetailBean(
+    val beginTime: String,//开始日期
+    val endTime: String,//结束日期
+    val id: Int,//直播id
+    val liveCoverImage: String,//封面图
+    val liveDesn: String,//直播描述
+    val liveMode: Int,//直播模式 1竖屏 2横屏
+    val liveName: String,//直播名称
+    val liveStatus: Int,//直播状态 1未开始 2直播中 3已结束 4已取消
+    val liveTags: String,//设置标签
+    val streamInfo: StreamInfo//流信息
+)

livebroadcast/src/main/java/com/yingyang/livebroadcast/net/LivebroadcastApiService.kt

@@ -5,6 +5,7 @@ import com.yingyangfly.baselib.net.BaseResp
 import okhttp3.RequestBody
 import retrofit2.http.Body
 import retrofit2.http.POST
+import retrofit2.http.Query
 
 interface LivebroadcastApiService {
 
@@ -13,4 +14,10 @@ interface LivebroadcastApiService {
      */
     @POST("live/page")
     suspend fun getLiveList(@Body requestBody: RequestBody): BaseResp<LiveBroadcastListBean>
+
+    /**
+     * 获取首页游戏列表
+     */
+    @POST("live/detail")
+    suspend fun getLiveDetail(@Query("id") id: String): BaseResp<LiveBroadcastListBean>
 }

livebroadcast/src/main/manifest/AndroidManifest.xml

@@ -22,7 +22,7 @@
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
         <activity
-            android:name=".activity.LiveBroadcastActivity"
+            android:name=".activity.detail.LiveBroadcastActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />

workbenches/README.md

@@ -5,4 +5,7 @@
 #DataMonitorFragment 数据监控
 #TrainContentFragment 训练内容
 #TrainDataActivity 训练数据
-#TrainReportFragment 训练报告
+#TrainReportFragment 训练报告
+#FreeTrainActivity 自由训练
+#LeisureBrainActivity 休闲健脑
+#ServicePackageActivity 服务套餐

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("1")
+        WORKBENCHES_API.getGameList("B")
     }.runUI(
         success,
         fail

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

@@ -25,7 +25,7 @@ class FreeTrainActivity : BaseMVVMActivity<ActivityFreeTrainBinding, FreeTrainVi
     }
 
     override fun initData() {
-        viewModel.getGameList(fail = {
+        viewModel.getFreeTrainList(fail = {
             it.toast()
         }, success = {
             "自由训练接口联调成功".toast()

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

@@ -13,11 +13,11 @@ class FreeTrainViewModel : BaseViewModel() {
     /**
      * 获取游戏列表
      */
-    fun getGameList(
+    fun getFreeTrainList(
         fail: ((msg: String) -> Unit)? = null,
         success: ((success: List<Record>) -> Unit)? = null,
     ) = launchFlow(false) {
-        WORKBENCHES_API.getGameList("2")
+        WORKBENCHES_API.getGameList("C")
     }.runUI(
         success,
         fail

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

@@ -9,7 +9,7 @@ interface WorkbenchesApiService {
 
     /**
      * 获取首页游戏列表
-     * @param palyClass = 0 任务，1推荐，2 自由训练
+     * @param palyClass 玩游戏类型（A 任务，B推荐，C自由训练）
      */
     @POST("app/game/selectMyList")
     suspend fun getGameList(@Query("palyClass") palyClass: String): BaseResp<List<Record>>