1.优化接口获取完数据后才展示占位图页面

.idea/misc.xml

@@ -103,6 +103,8 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_calendar.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_check_button.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_dialog_task.xml" value="0.2165" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_free_train_buttom_game.xml" value="0.219" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_free_train_top_game.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_home_btn.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_home_buttom_button.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_home_task.xml" value="0.2165" />

baselib/build.gradle

@@ -52,7 +52,7 @@ android {
             buildConfigField "String", "BAIDU_SECRETKEY", "\"lxcKDBZ9xDYBzeevUeIGZzWSOmYqtwba\""
             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://60.205.201.7:7110\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }

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

@@ -0,0 +1,7 @@
+<?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_23px" />
+    <solid android:color="@android:color/white" />
+</shape>

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

@@ -0,0 +1,7 @@
+<?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_23px" />
+    <solid android:color="@android:color/white" />
+</shape>

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

@@ -11,63 +11,88 @@
             type="com.yingyang.workbenches.entity.Record" />
     </data>
 
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/gameLayout"
-        android:layout_width="@dimen/divider_200px"
-        android:layout_height="@dimen/divider_245px"
+        android:layout_width="@dimen/divider_195px"
+        android:layout_height="@dimen/divider_289px"
         android:layout_marginTop="@dimen/divider_32px"
-        app:cardCornerRadius="@dimen/divider_20px">
+        android:theme="@style/Theme.MaterialComponents.NoActionBar"
+        app:cardBackgroundColor="@color/color_FFFFB841"
+        app:cardCornerRadius="@dimen/divider_38px">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/gameImage"
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/divider_200px"
-                android:scaleType="centerCrop"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                android:layout_height="match_parent">
+
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/cardImage"
+                    android:layout_width="@dimen/divider_185px"
+                    android:layout_height="@dimen/divider_185px"
+                    android:layout_marginTop="@dimen/divider_5px"
+                    android:theme="@style/Theme.MaterialComponents.NoActionBar"
+                    app:cardCornerRadius="@dimen/divider_36px"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:strokeColor="@android:color/white"
+                    app:strokeWidth="@dimen/divider_4px">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/gameImage"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerCrop" />
+
+                </com.google.android.material.card.MaterialCardView>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_marginStart="@dimen/divider_5px"
+                    android:layout_marginTop="@dimen/divider_10px"
+                    android:layout_marginEnd="@dimen/divider_5px"
+                    android:layout_marginBottom="@dimen/divider_10px"
+                    android:background="@drawable/bg_free_train_buttom_game"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/cardImage">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:text="@{data.gameName}"
+                        android:textColor="@color/color_FFA02C"
+                        android:textSize="@dimen/divider_22px"
+                        android:textStyle="bold" />
+
+                </LinearLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <TextView
                 android:id="@+id/tvType"
-                android:layout_width="@dimen/divider_108px"
+                android:layout_width="@dimen/divider_105px"
                 android:layout_height="@dimen/divider_46px"
-                android:background="@mipmap/bg_game_type"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="@dimen/divider_21px"
+                android:background="@mipmap/icon_free_train_top_game"
                 android:gravity="center"
                 android:text="@{data.gameType}"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/divider_18px"
                 android:textStyle="bold"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:background="@drawable/bg_workbenches_buttom_game"
-                android:gravity="center"
-                android:orientation="horizontal"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/gameImage">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="@{data.gameName}"
-                    android:textColor="@android:color/white"
-                    android:textSize="@dimen/divider_22px"
-                    android:textStyle="bold" />
-
-
-            </LinearLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                app:layout_constraintTop_toTopOf="parent" />
 
-    </androidx.cardview.widget.CardView>
+        </FrameLayout>
+    </com.google.android.material.card.MaterialCardView>
 
 </layout>

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

@@ -37,7 +37,7 @@
     <color name="color_FFCFD9FF" tools:ignore="ResourceName">#FFCFD9FF</color>
     <color name="color_FF383838" tools:ignore="ResourceName">#FF383838</color>
     <color name="color_FFF2F5FF" tools:ignore="ResourceName">#FFF2F5FF</color>
-    <color name="color_FFFF2B2B" tools:ignore="MissingDefaultResource,ResourceName">#FFFF2B2B</color>
+    <color name="color_FFFF2B2B" tools:ignore="ResourceName">#FFFF2B2B</color>
     <color name="color_FF4974FF" tools:ignore="ResourceName">#FF4974FF</color>
     <color name="color_80BFDAFF" tools:ignore="ResourceName">#80BFDAFF</color>
     <color name="color_FFCFDFFF" tools:ignore="ResourceName">#FFCFDFFF</color>
@@ -52,4 +52,6 @@
     <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>
+    <color name="color_FFFFB841" tools:ignore="ResourceName">#FFFFB841</color>
+    <color name="color_FFA02C" tools:ignore="ResourceName">#FFA02C</color>
 </resources>

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

@@ -38,6 +38,7 @@
     <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_241px" tools:ignore="ResourceName">241px</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>
@@ -48,6 +49,7 @@
     <dimen name="divider_200px" tools:ignore="ResourceName">200px</dimen>
     <dimen name="divider_195px" tools:ignore="ResourceName">195px</dimen>
     <dimen name="divider_190px" tools:ignore="ResourceName">190px</dimen>
+    <dimen name="divider_185px" tools:ignore="ResourceName">185px</dimen>
     <dimen name="divider_184px" tools:ignore="ResourceName">184px</dimen>
     <dimen name="divider_180px" tools:ignore="ResourceName">180px</dimen>
     <dimen name="divider_176px" tools:ignore="ResourceName">176px</dimen>