1.添加退出登录功能

.idea/misc.xml

@@ -511,7 +511,7 @@
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_type.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_scientific_principle.xml" value="0.151" />
         <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_introduction.xml" value="0.6518624641833811" />
         <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.3953084274543875" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_main.xml" value="0.23697916666666666" />

game/src/main/res/drawable/bg_game_type.xml

@@ -4,7 +4,4 @@
     tools:ignore="ResourceName">
     <corners android:radius="@dimen/divider_8px" />
     <solid android:color="@color/color_FF00A0F3" />
-    <padding
-        android:left="@dimen/divider_43px"
-        android:right="@dimen/divider_43px" />
 </shape>

game/src/main/res/drawable/bg_scientific_principle.xml

@@ -2,6 +2,6 @@
 <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_27px" />
+    <corners android:radius="@dimen/divider_42px" />
     <solid android:color="@color/color_FF00A0F3" />
 </shape>

game/src/main/res/layout/activity_game_introduction.xml

@@ -167,47 +167,55 @@
                         android:layout_marginStart="@dimen/divider_53px"
                         android:layout_marginTop="@dimen/divider_18px"
                         android:layout_marginEnd="@dimen/divider_30px"
+                        android:layout_marginBottom="@dimen/divider_12px"
                         android:fontFamily="@font/lcb"
                         android:includeFontPadding="false"
+                        android:scrollbarStyle="insideOverlay"
                         android:scrollbars="vertical"
                         android:text="@{data.desn}"
                         android:textColor="@color/color_FFA54A0B"
                         android:textSize="@dimen/divider_22px"
-                        app:layout_constraintBottom_toTopOf="@+id/tvTrainingSkill"
+                        app:layout_constraintBottom_toTopOf="@+id/trainingSkillLayout"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/tvScientificPrinciple" />
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tvTrainingSkill"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/divider_53px"
-                        android:layout_marginTop="@dimen/divider_10px"
-                        android:layout_marginBottom="@dimen/divider_86px"
-                        android:fontFamily="@font/lcb"
-                        android:gravity="center"
-                        android:includeFontPadding="false"
-                        android:text="@string/training_skill"
-                        android:textColor="@android:color/white"
-                        android:textSize="@dimen/divider_26px"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tvGameType"
-                        android:layout_width="@dimen/divider_146px"
-                        android:layout_height="@dimen/divider_46px"
-                        android:layout_marginBottom="@dimen/divider_86px"
-                        android:background="@drawable/bg_game_type"
-                        android:fontFamily="@font/lcb"
-                        android:gravity="center"
-                        android:includeFontPadding="false"
-                        android:text="@{data.gameType}"
-                        android:textColor="@android:color/white"
-                        android:textSize="@dimen/divider_22px"
+                    <LinearLayout
+                        android:id="@+id/trainingSkillLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_53px"
+                        android:layout_marginBottom="@dimen/divider_110px"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toEndOf="@+id/tvTrainingSkill" />
-
+                        app:layout_constraintStart_toStartOf="parent">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvTrainingSkill"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/lcb"
+                            android:gravity="center"
+                            android:includeFontPadding="false"
+                            android:text="@string/training_skill"
+                            android:textColor="@android:color/white"
+                            android:textSize="@dimen/divider_26px" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvGameType"
+                            android:layout_width="@dimen/divider_146px"
+                            android:layout_height="@dimen/divider_46px"
+                            android:layout_marginStart="@dimen/divider_15px"
+                            android:background="@drawable/bg_game_type"
+                            android:fontFamily="@font/lcb"
+                            android:gravity="center"
+                            android:includeFontPadding="false"
+                            android:text="@{data.gameType}"
+                            android:textColor="@android:color/white"
+                            android:textSize="@dimen/divider_22px" />
+
+                    </LinearLayout>
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </FrameLayout>