1.修改页面UI

baselib/build.gradle

@@ -38,7 +38,7 @@ android {
             buildConfigField "String", "BAIDU_SECRETKEY", "\"4AfYdqAyA9PtLOoNFFsyUogDfxoMBmqS\""
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
             buildConfigField "String", "BUGLY_APPID", "\"d400f20398\""
-            buildConfigField "String", "API_URL", "\"http://60.205.201.7:8110\""
+            buildConfigField "String", "API_URL", "\"http://192.168.0.120:8110\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
 
@@ -52,7 +52,7 @@ android {
             buildConfigField "String", "BAIDU_SECRETKEY", "\"4AfYdqAyA9PtLOoNFFsyUogDfxoMBmqS\""
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
             buildConfigField "String", "BUGLY_APPID", "\"ad3db4d529\""
-            buildConfigField "String", "API_URL", "\"http://60.205.201.7:8110\""
+            buildConfigField "String", "API_URL", "\"http://192.168.0.120:8110\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }

push/src/main/java/com/yingyang/push/net/PushApiFactory.kt

@@ -0,0 +1,14 @@
+package com.yingyang.push.net
+
+import com.yingyangfly.baselib.net.NetConfig
+import com.yingyangfly.baselib.net.initAPI
+
+val Any.PUSH_API: PushApiService by lazy {
+    PushApiFactory.api
+}
+
+object PushApiFactory {
+    val api: PushApiService by lazy {
+        initAPI(NetConfig.API_URL, PushApiService::class.java)
+    }
+}

push/src/main/java/com/yingyang/push/net/PushApiService.kt

@@ -0,0 +1,15 @@
+package com.yingyang.push.net
+
+import com.yingyangfly.baselib.net.BaseResp
+import retrofit2.http.POST
+import retrofit2.http.Query
+
+interface PushApiService {
+
+    /**
+     * 获取训练内容详情
+     */
+    @POST("app/task/selectTaskDetailById")
+    suspend fun getSelectTaskDetailById(@Query("taskId") taskId: String): BaseResp<Unit>
+
+}

push/src/main/res/layout/activity_messge_list.xml

@@ -33,16 +33,6 @@
                 android:textStyle="bold" />
         </LinearLayout>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="消息列表"
-            android:textColor="@android:color/black"
-            android:textSize="@dimen/divider_42px"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -1,5 +1,6 @@
 package com.yingyang.workbenches.freetraining
 
+import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.yingyang.workbenches.adapter.FreeTrainAdapter
@@ -46,7 +47,7 @@ class FreeTrainActivity : BaseMVVMActivity<ActivityFreeTrainBinding, FreeTrainVi
                 loadData()
             }
             //自由训练游戏列表
-            rvTrain.layoutManager = LinearLayoutManager(this@FreeTrainActivity)
+            rvTrain.layoutManager = GridLayoutManager(this@FreeTrainActivity, 5)
             rvTrain.adapter = freeTrainListAdapter
             freeTrainListAdapter.onGameClickListener = { bean ->
                 val str = bean.gameUrl + "?gameCode=" + bean.gameCode + "&gameLevel=" + bean.currentLevel +

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

@@ -80,6 +80,7 @@
                     android:id="@+id/layoutTraining"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
+                    android:layout_margin="@dimen/divider_28px"
                     android:layout_marginTop="@dimen/divider_8px"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"

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

@@ -15,6 +15,7 @@
         android:id="@+id/gameLayout"
         android:layout_width="@dimen/divider_184px"
         android:layout_height="@dimen/divider_249px"
+        android:layout_marginTop="@dimen/divider_16px"
         app:cardCornerRadius="@dimen/divider_20px">
 
         <androidx.constraintlayout.widget.ConstraintLayout