精灵夺宝:UI对稿

app/src/main/java/com/mango/moshen/treasurefairy/HomeFairyActivity.kt

@@ -149,9 +149,9 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
 
                 binding.tvShortLuckyValue.text =
                     SpannableBuilder()
-                        .append("达到 ", ForegroundColorSpan("#59FDFF".toColorInt()))
+                        .append("幸运值达到", ForegroundColorSpan("#59FDFF".toColorInt()))
                         .append("${it.needLuckyNum}", ForegroundColorSpan("#FFE8AA".toColorInt()))
-                        .append(" 后下次夺宝,额外获赠精灵球", ForegroundColorSpan("#59FDFF".toColorInt()))
+                        .append("后，下次夺宝获赠精灵球", ForegroundColorSpan("#59FDFF".toColorInt()))
                         .build()
                 binding.ivLuckyStone.post {
                     val drawable =

app/src/main/java/com/mango/moshen/treasurefairy/dialog/ForestPrizeDialog.kt

@@ -51,7 +51,7 @@ class ForestPrizeDialog : BaseDialog<TreasureFairyDialogForestPrizeBinding>() {
         if (isFairy) {
             viewModel.cleanDrawForestLiveData()
         }
-        binding.tvTitle.text = if (isFairy) "获得精灵" else "意外发现"
+        binding.tvTitle.text = if (isFairy) "恭喜获得" else "意外发现"
         if (!isFairy && !isSingle && hasSurprise) {
             newInstance(true).show(context)
         }

app/src/main/res/layout/activity_elf_dialog_web_view.xml

@@ -8,7 +8,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/bg_elf"
+        android:background="@drawable/treasure_fairy_bg_elf"
         android:orientation="vertical">
 
         <FrameLayout

app/src/main/res/layout/treasure_fairy_dialog_exchange.xml

@@ -10,7 +10,7 @@
         android:id="@+id/view_bg"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="@drawable/bg_elf"
+        android:background="@drawable/treasure_fairy_bg_elf"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="750:1100"
         app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/treasure_fairy_dialog_forest_prize.xml

@@ -36,7 +36,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginStart="20dp"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="12dp"
         android:layout_marginEnd="20dp"
         android:layout_marginBottom="5dp"
         android:overScrollMode="never"

app/src/main/res/layout/treasure_fairy_dialog_forest_record.xml

@@ -16,7 +16,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_percent="0.75" />
+        app:layout_constraintWidth_percent="0.84" />
 
     <View
         android:id="@+id/view_line"

app/src/main/res/layout/treasure_fairy_dialog_my_fairy_search_friend.xml

@@ -9,7 +9,7 @@
         android:id="@+id/view_bg"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="@drawable/bg_elf"
+        android:background="@drawable/treasure_fairy_bg_elf"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="750:1100"
         app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/treasure_fairy_dialog_test_fairy_result.xml

@@ -22,7 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="53dp"
-        android:text="获得精灵"
+        android:text="恭喜获得"
         android:textColor="@color/white"
         android:textSize="15sp"
         android:textStyle="bold"

app/src/main/res/layout/treasure_fairy_item_forest_prize.xml

@@ -4,7 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginStart="5dp"
     android:layout_marginTop="5dp"
+    android:layout_marginEnd="5dp"
     android:layout_marginBottom="5dp"
     android:gravity="center_horizontal"
     android:orientation="vertical">
@@ -29,13 +31,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="4dp"
         android:ellipsize="end"
         android:gravity="center"
         android:includeFontPadding="false"
         android:maxLines="1"
-        android:text="精灵球"
         android:textColor="@color/white"
-        android:textSize="12sp" />
+        android:textSize="12sp"
+        tools:text="精灵球" />
 
 </LinearLayout>

app/src/main/res/layout/treasure_fairy_item_forest_prizes_child.xml

@@ -1,36 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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="94dp"
+    android:layout_width="match_parent"
-    android:layout_height="115dp"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="2dp"
     android:layout_marginTop="10dp"
+    android:layout_marginEnd="2dp"
     android:layout_marginBottom="10dp"
+    tools:layout_width="94dp">
+
+    <View
+        android:id="@+id/view_bg"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         android:background="@drawable/treasure_fairy_bg_forest_pool"
         android:gravity="center_horizontal"
-    android:orientation="vertical">
+        android:orientation="vertical"
+        app:layout_constraintDimensionRatio="188:230"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/iv_prize_icon"
-        android:layout_width="65dp"
+        android:layout_width="0dp"
-        android:layout_height="65dp"
+        android:layout_height="0dp"
-        android:layout_gravity="center"
         android:layout_marginTop="18dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/default_cover" />
+        android:src="@drawable/default_cover"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="@id/view_bg"
+        app:layout_constraintStart_toStartOf="@id/view_bg"
+        app:layout_constraintTop_toTopOf="@id/view_bg"
+        app:layout_constraintWidth_percent="0.7" />
 
     <TextView
         android:id="@+id/tv_prize_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="10dp"
+        app:layout_constraintTop_toBottomOf="@id/iv_prize_icon"
         android:ellipsize="end"
         android:gravity="center"
         android:includeFontPadding="false"
         android:maxLines="1"
+        app:layout_constraintVertical_bias="0.58"
         android:textColor="@color/color_1f5764"
         android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         tools:text="精灵球" />
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/treasure_fairy_item_test_fairy.xml

@@ -8,6 +8,7 @@
     android:layout_marginTop="5dp"
     android:layout_marginEnd="2dp"
     android:layout_marginBottom="5dp"
+    tools:layout_width="65dp"
     android:background="@drawable/treasure_fairy_bg_test_fairy_item_unselect">
 
     <LinearLayout
@@ -27,6 +28,7 @@
             android:id="@+id/iv_fairy_icon"
             android:layout_width="44dp"
             android:layout_height="44dp"
+            android:layout_marginTop="4dp"
             android:layout_gravity="center"
             android:scaleType="centerCrop"
             android:src="@drawable/default_cover" />

core/src/main/java/com/mango/core/initial/InitialModel.java

@@ -497,13 +497,11 @@ public class InitialModel extends BaseModel implements IInitialModel {
     @Nullable
     @Override
     public FairyOpenInfo getFairyOpenInfo() {
-        if (fairyOpenInfo != null) {
+        //每次请求都刷新
-            return fairyOpenInfo;
-        }
         requestFairyOpenInfo()
                 .doOnSuccess(fairyOpenInfo -> this.fairyOpenInfo = fairyOpenInfo)
                 .subscribe();
-        return null;
+        return fairyOpenInfo;
     }