Browse Source

1.添加退出登录功能

王鹏鹏 2 years ago
parent
commit
04d27d0b8c

+ 1 - 1
.idea/misc.xml

@@ -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.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_game_settlement.xml" value="1.2" />
         <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" />

+ 1 - 0
game/src/main/java/com/yingyangfly/game/settlement/GameSettlementActivity.kt

@@ -42,6 +42,7 @@ class GameSettlementActivity :
         binding {
             rvGameLevel.adapter = adapter
             adapter.setData(gameDetail)
+            binding.tvGameType.text = gameType
             val str = "继续加油,努力超越自己!\n坚持训练下去,你的<font color='#FF0000'>$gameType</font>能力会得到很大的提升"
             gameEncouragingWords.setText(Html.fromHtml(str))
         }

+ 52 - 9
game/src/main/res/layout/activity_game_settlement.xml

@@ -61,14 +61,12 @@
                 android:fontFamily="@font/lcb"
                 android:gravity="start"
                 android:includeFontPadding="false"
-                android:text="@string/keep_going_try_to_surpass_yourself"
                 android:textColor="@color/color_FF6F3218"
                 android:textSize="@dimen/divider_24px"
                 android:textStyle="bold" />
 
         </FrameLayout>
 
-
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/gamelayout"
             android:layout_width="@dimen/divider_679px"
@@ -80,30 +78,75 @@
             app:layout_constraintTop_toTopOf="parent">
 
             <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/gameImage"
+                android:layout_width="@dimen/divider_235px"
+                android:layout_height="@dimen/divider_69px"
+                android:layout_marginStart="@dimen/divider_42px"
+                android:layout_marginTop="@dimen/divider_70px"
+                android:background="@mipmap/icon_game_name_tips"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="@dimen/divider_234px"
+                android:layout_height="@dimen/divider_59px"
+                android:layout_marginStart="@dimen/divider_66px"
+                android:layout_marginTop="@dimen/divider_38px"
+                android:background="@mipmap/icon_game_name_title"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <FrameLayout
+                android:id="@+id/gameImageLayout"
                 android:layout_width="@dimen/divider_106px"
                 android:layout_height="@dimen/divider_106px"
                 android:layout_marginStart="@dimen/divider_26px"
                 android:layout_marginTop="@dimen/divider_32px"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:loadHeadImg="@{data.gameCoverImage}" />
+                app:layout_constraintTop_toTopOf="parent">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/gameImage"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scaleType="centerCrop"
+                    app:isCircle="@{true}"
+                    app:loadHeadImg="@{data.gameCoverImage}" />
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@mipmap/icon_game_background" />
+            </FrameLayout>
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvGameName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/divider_26px"
+                android:layout_marginStart="@dimen/divider_18px"
                 android:layout_marginTop="@dimen/divider_45px"
                 android:fontFamily="@font/lcb"
                 android:includeFontPadding="false"
                 android:text="@{data.gameName}"
-                android:textColor="@color/color_FFFF6F6F"
+                android:textColor="@android:color/white"
                 android:textSize="@dimen/divider_28px"
-                app:layout_constraintStart_toEndOf="@+id/gameImage"
+                app:layout_constraintStart_toEndOf="@+id/gameImageLayout"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="抓小羊" />
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvGameType"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_18px"
+                android:layout_marginTop="@dimen/divider_12px"
+                android:fontFamily="@font/lcb"
+                android:includeFontPadding="false"
+                android:textColor="@color/color_FF5E1F0C"
+                android:textSize="@dimen/divider_24px"
+                app:layout_constraintStart_toEndOf="@+id/gameImageLayout"
+                app:layout_constraintTop_toBottomOf="@+id/tvGameName"
+                tools:text="抓小羊" />
+
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rvGameLevel"
                 android:layout_width="match_parent"
@@ -116,7 +159,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/gameImage" />
+                app:layout_constraintTop_toBottomOf="@+id/gameImageLayout" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <FrameLayout

BIN
game/src/main/res/mipmap-xxhdpi/icon_game_background.png


BIN
game/src/main/res/mipmap-xxhdpi/icon_game_name_tips.png


BIN
game/src/main/res/mipmap-xxhdpi/icon_game_name_title.png


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

@@ -49,4 +49,5 @@
     <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>
+    <color name="color_FF5E1F0C" tools:ignore="ResourceName">#FF5E1F0C</color>
 </resources>