1.修改自由训练UI

.idea/misc.xml

@@ -29,9 +29,11 @@
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_game_current_level.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_game_total_level.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_health_counseling.xml" value="0.2185" />
+        <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_home_buttom_game.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_home_check_button.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_home_game_btn.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_home_leve.xml" value="0.2185" />
+        <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_home_level.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_home_task_btn.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_home_task_progress.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_home_title.xml" value="0.2185" />
@@ -113,6 +115,8 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_training_content_list.xml" value="0.2345" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_training_content_title.xml" value="0.2165" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_work_benches_btn.xml" value="0.2265" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_workbenches_buttom_game.xml" value="0.219" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_workbenches_level.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/layer_tab_indicator.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/selector.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/selector_train_radio.xml" value="0.2265" />

livebroadcast/src/main/res/layout/activity_video_player.xml

@@ -56,6 +56,7 @@
             android:layout_width="@dimen/divider_1078px"
             android:layout_height="@dimen/divider_606px"
             app:cardCornerRadius="@dimen/divider_40px"
+            android:layout_marginTop="@dimen/divider_45px"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"

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

@@ -24,6 +24,7 @@ data class Record(
     val updateTime: String,
     val currentLevel: String,//当前等级
     val totalLevel: String,//  总共等级
+    val totalNum: String,//  总共等级
     val status: String, //0 通关
     val duration: String, //0 持续时长
     val playClass: String//游戏玩耍分类  其他 是可以继续 关卡，A 是只有一关

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

@@ -53,8 +53,9 @@ class FreeTrainActivity : BaseMVVMActivity<ActivityFreeTrainBinding, FreeTrainVi
             rvTrain.layoutManager = GridLayoutManager(this@FreeTrainActivity, 4)
             rvTrain.adapter = freeTrainListAdapter
             freeTrainListAdapter.onGameClickListener = { bean ->
-                val str = bean.gameUrl + "?gameCode=" + bean.gameCode + "&gameLevel=" + bean.currentLevel +
-                        "&playClass=" + bean.playClass + "&userToken=" + User.getToken()
+                val str =
+                    bean.gameUrl + "?gameCode=" + bean.gameCode + "&gameLevel=" + bean.currentLevel +
+                            "&playClass=" + bean.playClass + "&userToken=" + User.getToken()
                 JumpUtil.jumpActivityWithUrl(RouterUrlCommon.WEB_VIEW_INTERACTION_JS, str, mContext)
             }
         }
@@ -68,11 +69,15 @@ class FreeTrainActivity : BaseMVVMActivity<ActivityFreeTrainBinding, FreeTrainVi
             layoutTraining.setOnRefreshListener {
                 loadData()
             }
-
         }
     }
 
     override fun initData() {
+
+    }
+
+    override fun onResume() {
+        super.onResume()
         getSelectByDictType()
         loadData()
     }
@@ -99,8 +104,10 @@ class FreeTrainActivity : BaseMVVMActivity<ActivityFreeTrainBinding, FreeTrainVi
     private fun loadData() {
         freeTrainList.clear()
         viewModel.getFreeTrainList(type, fail = {
+            binding.layoutTraining.finishRefresh()
             it.toast()
         }, success = {
+            binding.layoutTraining.finishRefresh()
             freeTrainList.clear()
             if (it != null) {
                 freeTrainList.addAll(it)

workbenches/src/main/res/drawable/bg_workbenches_buttom_game.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners
+        android:bottomLeftRadius="@dimen/divider_20px"
+        android:bottomRightRadius="@dimen/divider_20px"
+        android:topLeftRadius="@dimen/divider_8px"
+        android:topRightRadius="@dimen/divider_8px" />
+    <solid android:color="@color/color_FF4A76FF" />
+</shape>

workbenches/src/main/res/drawable/bg_workbenches_level.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners android:radius="@dimen/divider_17px" />
+    <solid android:color="@color/color_FF92ACFF" />
+    <padding
+        android:bottom="@dimen/divider_3px"
+        android:left="@dimen/divider_15px"
+        android:right="@dimen/divider_15px"
+        android:top="@dimen/divider_3px" />
+</shape>

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

@@ -80,7 +80,8 @@
                     android:id="@+id/layoutTraining"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_margin="@dimen/divider_28px"
+                    android:layout_marginStart="@dimen/divider_16px"
+                    android:layout_marginBottom="@dimen/divider_8px"
                     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

@@ -13,8 +13,8 @@
 
     <androidx.cardview.widget.CardView
         android:id="@+id/gameLayout"
-        android:layout_width="@dimen/divider_184px"
-        android:layout_height="@dimen/divider_229px"
+        android:layout_width="@dimen/divider_200px"
+        android:layout_height="@dimen/divider_245px"
         android:layout_marginTop="@dimen/divider_32px"
         app:cardCornerRadius="@dimen/divider_20px">
 
@@ -23,62 +23,56 @@
             android:layout_height="match_parent">
 
             <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/gameImage"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="@dimen/divider_200px"
                 app:isCircle="@{false}"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:loadHeadImg="@{data.gameCoverImage}" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tvTitle"
-                android:layout_width="@dimen/divider_133px"
-                android:layout_height="@dimen/divider_34px"
-                android:layout_marginTop="@dimen/divider_9px"
-                android:background="@drawable/bg_train_title"
+            <TextView
+                android:layout_width="@dimen/divider_108px"
+                android:layout_height="@dimen/divider_46px"
+                android:background="@mipmap/bg_game_type"
                 android:gravity="center"
                 android:text="@{data.gameType}"
-                android:textColor="@color/color_FF416AFF"
-                android:textSize="@dimen/divider_18px"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="@string/accumulated_training_duration" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tvTimes"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/divider_34px"
-                android:layout_marginTop="@dimen/divider_9px"
-                android:background="@drawable/bg_train_times"
-                android:gravity="center"
-                android:text='@{"累计训练"+data.currentLevel+"次"}'
                 android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_18px"
-                app:layout_constraintBottom_toTopOf="@+id/tvName"
-                app:layout_constraintLeft_toLeftOf="parent"
+                android:textSize="@dimen/divider_14px"
                 app:layout_constraintRight_toRightOf="parent"
-                tools:text="@string/accumulated_training_duration" />
+                app:layout_constraintTop_toTopOf="parent" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tvName"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/divider_45px"
-                android:layout_marginTop="@dimen/divider_9px"
-                android:background="@color/color_FF416AFF"
+                android:layout_height="0dp"
+                android:background="@drawable/bg_workbenches_buttom_game"
                 android:gravity="center"
-                android:text="@{data.gameName}"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_24px"
-                android:textStyle="bold"
+                android:orientation="horizontal"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
-                tools:text="@string/accumulated_training_duration" />
+                app:layout_constraintTop_toBottomOf="@+id/gameImage">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="@{data.gameName}"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_24px"
+                    android:textStyle="bold" />
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_16px"
+                    android:background="@drawable/bg_workbenches_level"
+                    android:text='@{data.currentLevel+"-"+data.totalNum}'
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_14px" />
 
+            </LinearLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.cardview.widget.CardView>

workbenches/src/main/res/values/colors.xml

@@ -51,4 +51,5 @@
     <color name="color_FF9FA5B4" tools:ignore="ResourceName">#FF9FA5B4</color>
     <color name="color_15BA11" tools:ignore="ResourceName">#15BA11</color>
     <color name="color_FF333333" tools:ignore="ResourceName">#FF333333</color>
+    <color name="color_FF92ACFF" tools:ignore="ResourceName">#FF92ACFF</color>
 </resources>

workbenches/src/main/res/values/dimens.xml

@@ -37,6 +37,7 @@
     <dimen name="divider_260px" tools:ignore="ResourceName">260px</dimen>
     <dimen name="divider_250px" tools:ignore="ResourceName">250px</dimen>
     <dimen name="divider_249px" tools:ignore="ResourceName">249px</dimen>
+    <dimen name="divider_245px" tools:ignore="ResourceName">245px</dimen>
     <dimen name="divider_237px" tools:ignore="ResourceName">237px</dimen>
     <dimen name="divider_230px" tools:ignore="ResourceName">230px</dimen>
     <dimen name="divider_229px" tools:ignore="ResourceName">229px</dimen>
@@ -75,6 +76,7 @@
     <dimen name="divider_102px" tools:ignore="ResourceName">102px</dimen>
     <dimen name="divider_101px" tools:ignore="ResourceName">101px</dimen>
     <dimen name="divider_100px" tools:ignore="ResourceName">100px</dimen>
+    <dimen name="divider_98px" tools:ignore="ResourceName">98px</dimen>
     <dimen name="divider_90px" tools:ignore="ResourceName">90px</dimen>
     <dimen name="divider_88px" tools:ignore="ResourceName">88px</dimen>
     <dimen name="divider_82px" tools:ignore="ResourceName">82px</dimen>