1.修改游戏启动页面UI

.idea/misc.xml

@@ -484,7 +484,7 @@
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/activity_base.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/activity_base_web_view.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/dialog_evaluate.xml" value="0.23697916666666666" />
-        <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/dialog_game_loading.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/dialog_game_loading.xml" value="0.264" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/dialog_loading.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/fragment_task.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/rv_empty.xml" value="0.23697916666666666" />
@@ -513,7 +513,7 @@
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_start_game.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_introduction.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_loading.xml" value="0.22239583333333332" />
-        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_settlement.xml" value="0.6" />
+        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_settlement.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_main.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_play_game.xml" value="0.3953084274543875" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_completion_training.xml" value="0.536" />

baselib/src/main/java/com/yingyangfly/baselib/dialog/GameLoadingDialog.kt

@@ -66,7 +66,7 @@ class GameLoadingDialog : DialogFragment() {
     private fun initView() {
         Glide.with(requireActivity())
             .asGif()
-            .load(R.drawable.fish)
+            .load(R.drawable.game_loading_gif)
             .into(loadingImage!!)
     }
 

baselib/src/main/res/layout/dialog_game_loading.xml

@@ -1,31 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg_game_loading"
+    android:background="@mipmap/icon_game_loading_bg"
     tools:ignore="ResourceName">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/loadingImage"
-        android:layout_width="@dimen/divider_360px"
-        android:layout_height="@dimen/divider_416px"
-        android:layout_marginTop="@dimen/divider_243px"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_width="@dimen/divider_834px"
+        android:layout_height="@dimen/divider_667px"
+        android:layout_gravity="center"
+        android:scaleType="centerInside" />
 
-    <ProgressBar
-        android:id="@+id/progressBar"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="@dimen/divider_527px"
-        android:layout_height="@dimen/divider_20px"
-        android:layout_marginTop="@dimen/divider_41px"
-        android:indeterminate="false"
-        android:max="3"
-        android:progressDrawable="@drawable/bg_game_progressbar_selector"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loadingImage" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="@dimen/divider_45px">
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="@dimen/divider_527px"
+            android:layout_height="@dimen/divider_20px"
+            android:indeterminate="false"
+            android:max="3"
+            android:progressDrawable="@drawable/bg_game_progressbar_selector"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</FrameLayout>

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

@@ -7,6 +7,7 @@
     <dimen name="divider_900px" tools:ignore="ResourceName">900px</dimen>
     <dimen name="divider_834px" tools:ignore="ResourceName">834px</dimen>
     <dimen name="divider_800px" tools:ignore="ResourceName">800px</dimen>
+    <dimen name="divider_760px" tools:ignore="ResourceName">760px</dimen>
     <dimen name="divider_689px" tools:ignore="ResourceName">689px</dimen>
     <dimen name="divider_667px" tools:ignore="ResourceName">667px</dimen>
     <dimen name="divider_600px" tools:ignore="ResourceName">600px</dimen>

game/src/main/res/values/themes.xml

@@ -6,7 +6,7 @@
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowIsTranslucent">false</item>
-        <item name="android:windowBackground">@drawable/bg_game_loading</item>
+        <item name="android:windowBackground">@mipmap/icon_game_loading_bg</item>
     </style>
 
     <style name="PlayeFullActivity" parent="Theme.AppCompat.Light.NoActionBar" tools:ignore="ResourceName">
@@ -15,7 +15,7 @@
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowIsTranslucent">false</item>
-        <item name="android:windowBackground">@drawable/bg_game_background_settlement</item>
+        <item name="android:windowBackground">@mipmap/icon_game_loading_bg</item>
     </style>
 
 </resources>

workbenches/build.gradle

@@ -22,7 +22,6 @@ dependencies {
     implementation(rootProject.ext.androidx.material)
     implementation(rootProject.ext.androidx.constraintlayout)
     implementation(rootProject.ext.dependencies.Zxing)
-    implementation(rootProject.ext.dependencies.MPAndroidChart)
     //RxJava2.0
     implementation(rootProject.ext.dependencies.rxjava)
     implementation(rootProject.ext.dependencies.rxandroid)

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

@@ -11,10 +11,5 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <com.github.mikephil.charting.charts.LineChart
-            android:id="@+id/lineChart"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>