Pārlūkot izejas kodu

1.替换游戏页面UI

王鹏鹏 2 gadi atpakaļ
vecāks
revīzija
86c6a3bc24

+ 1 - 1
game/src/main/res/drawable/bg_game_type.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
     <corners android:radius="@dimen/divider_8px" />
-    <solid android:color="@color/color_70FFD979" />
+    <solid android:color="@color/color_FF00A0F3" />
     <padding
         android:left="@dimen/divider_43px"
         android:right="@dimen/divider_43px" />

+ 1 - 1
game/src/main/res/drawable/bg_scientific_principle.xml

@@ -3,5 +3,5 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
     <corners android:radius="@dimen/divider_27px" />
-    <solid android:color="@color/color_70FFD979" />
+    <solid android:color="@color/color_FF00A0F3" />
 </shape>

+ 11 - 12
game/src/main/res/layout/activity_game_introduction.xml

@@ -139,22 +139,22 @@
                     android:scaleType="centerInside" />
 
                 <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="@dimen/divider_432px"
+                    android:layout_width="@dimen/divider_458px"
                     android:layout_height="match_parent"
                     android:layout_gravity="end"
-                    android:layout_marginEnd="@dimen/divider_120px">
+                    android:layout_marginEnd="@dimen/divider_80px">
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/tvScientificPrinciple"
                         android:layout_width="@dimen/divider_180px"
                         android:layout_height="@dimen/divider_53px"
-                        android:layout_marginTop="@dimen/divider_29px"
+                        android:layout_marginTop="@dimen/divider_96px"
                         android:background="@drawable/bg_scientific_principle"
                         android:fontFamily="@font/lcb"
                         android:gravity="center"
                         android:includeFontPadding="false"
                         android:text="@string/game_introduction"
-                        android:textColor="@color/color_FFA54A0B"
+                        android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_26px"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -183,34 +183,33 @@
                         android:layout_width="@dimen/divider_180px"
                         android:layout_height="@dimen/divider_53px"
                         android:layout_marginTop="@dimen/divider_10px"
-                        android:layout_marginBottom="@dimen/divider_16px"
+                        android:layout_marginBottom="@dimen/divider_86px"
                         android:background="@drawable/bg_scientific_principle"
                         android:fontFamily="@font/lcb"
                         android:gravity="center"
                         android:includeFontPadding="false"
                         android:text="@string/training_skill"
-                        android:textColor="@color/color_FFA54A0B"
+                        android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_26px"
-                        app:layout_constraintBottom_toTopOf="@+id/tvGameType"
+                        app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tvScientificPrincipleInfo" />
+                        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_16px"
+                        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="@color/color_FFA54A0B"
+                        android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_22px"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent" />
+                        app:layout_constraintStart_toEndOf="@+id/tvTrainingSkill" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </FrameLayout>

+ 1 - 0
game/src/main/res/values/colors.xml

@@ -48,4 +48,5 @@
     <color name="color_FFEBEDF0" tools:ignore="ResourceName">#FFEBEDF0</color>
     <color name="color_FF591D28" tools:ignore="ResourceName">#FF591D28</color>
     <color name="color_FFC02F21" tools:ignore="ResourceName">#FFC02F21</color>
+    <color name="color_FF00A0F3" tools:ignore="ResourceName">#FF00A0F3</color>
 </resources>

+ 1 - 0
game/src/main/res/values/dimens.xml

@@ -210,6 +210,7 @@
     <dimen name="divider_89px" tools:ignore="ResourceName">89px</dimen>
     <dimen name="divider_88px" tools:ignore="ResourceName">88px</dimen>
     <dimen name="divider_87px" tools:ignore="ResourceName">87px</dimen>
+    <dimen name="divider_86px" tools:ignore="ResourceName">86px</dimen>
     <dimen name="divider_83px" tools:ignore="ResourceName">83px</dimen>
     <dimen name="divider_82px" tools:ignore="ResourceName">82px</dimen>
     <dimen name="divider_81px" tools:ignore="ResourceName">81px</dimen>

+ 0 - 1
login/src/main/java/com/yingyang/login/service/InitService.kt

@@ -72,7 +72,6 @@ class InitService : Service() {
             }
 
             override fun onError(p0: Int, p1: String?) {
-                "IM登陆失败".toast()
             }
         })