Просмотр исходного кода

1.修改游戏页面多次全屏缩放切换按钮消失bug

王鹏鹏 2 лет назад
Родитель
Сommit
427d407eca

+ 1 - 0
app/src/main/AndroidManifest.xml

@@ -38,6 +38,7 @@
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="false"
         android:supportsRtl="true"
         android:theme="@style/Theme.Yingyangfly"
         android:usesCleartextTraffic="true"

+ 1 - 1
config.gradle

@@ -14,7 +14,7 @@ ext {
             minSdkVersion    : 19,
             targetSdkVersion : 30,
             versionCode      : 4,
-            versionName      : "1.0.0.1",
+            versionName      : "1.0.0.2",
     ]
     //androidx配置
     androidx = [

+ 12 - 8
home/src/main/res/layout/item_game.xml

@@ -13,7 +13,7 @@
 
     <androidx.cardview.widget.CardView
         android:id="@+id/gameLayout"
-        android:layout_width="@dimen/divider_181px"
+        android:layout_width="match_parent"
         android:layout_height="@dimen/divider_200px"
         android:layout_marginStart="@dimen/divider_14px"
         android:layout_marginTop="@dimen/divider_26px"
@@ -26,11 +26,11 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/gameImage"
-                android:layout_width="@dimen/divider_181px"
+                android:layout_width="match_parent"
                 android:layout_height="@dimen/divider_181px"
                 android:scaleType="centerCrop"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:loadImg="@{data.gameCoverImage}" />
 
@@ -52,22 +52,26 @@
                 android:gravity="center"
                 android:orientation="horizontal"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent">
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent">
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ellipsize="end"
                     android:gravity="center"
+                    android:maxLines="1"
                     android:text="@{data.gameName}"
                     android:textColor="@android:color/white"
-                    android:textSize="@dimen/divider_24px"
+                    android:textSize="@dimen/divider_18px"
                     android:textStyle="bold" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/divider_16px"
+                    android:layout_marginStart="@dimen/divider_6px"
+                    android:layout_marginEnd="@dimen/divider_6px"
                     android:background="@drawable/bg_home_level"
                     android:text='@{data.currentLevel+"-"+data.totalNum}'
                     android:textColor="@android:color/white"

+ 1 - 1
personalcenter/src/main/res/layout/activity_help.xml

@@ -88,7 +88,7 @@
                             style="@style/layout_properties_self_adaption"
                             android:layout_marginStart="@dimen/divider_44px"
                             android:layout_marginTop="@dimen/divider_48px"
-                            android:text="训练指导"
+                            android:text="@string/training_guidance"
                             android:textColor="@color/color_FF4A76FF"
                             android:textSize="@dimen/divider_28px"
                             android:textStyle="bold" />

+ 1 - 0
personalcenter/src/main/res/values/strings.xml

@@ -17,4 +17,5 @@
     <string name="version_record" tools:ignore="ResourceName">历史版本</string>
     <string name="current_version" tools:ignore="ResourceName">当前版本</string>
     <string name="login_out" tools:ignore="ResourceName">退出登录</string>
+    <string name="training_guidance" tools:ignore="ResourceName">训练指导</string>
 </resources>