diff --git a/app/src/main/java/com/mango/moshen/treasurefairy/HomeFairyActivity.kt b/app/src/main/java/com/mango/moshen/treasurefairy/HomeFairyActivity.kt index d6250e176..681082703 100644 --- a/app/src/main/java/com/mango/moshen/treasurefairy/HomeFairyActivity.kt +++ b/app/src/main/java/com/mango/moshen/treasurefairy/HomeFairyActivity.kt @@ -149,9 +149,9 @@ class HomeFairyActivity : BaseViewBindingActivity() { if (isFairy) { viewModel.cleanDrawForestLiveData() } - binding.tvTitle.text = if (isFairy) "获得精灵" else "意外发现" + binding.tvTitle.text = if (isFairy) "恭喜获得" else "意外发现" if (!isFairy && !isSingle && hasSurprise) { newInstance(true).show(context) } diff --git a/app/src/main/res/drawable-xhdpi/bg_elf.png b/app/src/main/res/drawable-xhdpi/treasure_fairy_bg_elf.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/bg_elf.png rename to app/src/main/res/drawable-xhdpi/treasure_fairy_bg_elf.png diff --git a/app/src/main/res/layout/activity_elf_dialog_web_view.xml b/app/src/main/res/layout/activity_elf_dialog_web_view.xml index 2dd2746ea..1f7e233dc 100644 --- a/app/src/main/res/layout/activity_elf_dialog_web_view.xml +++ b/app/src/main/res/layout/activity_elf_dialog_web_view.xml @@ -8,7 +8,7 @@ + app:layout_constraintWidth_percent="0.84" /> @@ -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="精灵球" /> \ No newline at end of file diff --git a/app/src/main/res/layout/treasure_fairy_item_forest_prizes_child.xml b/app/src/main/res/layout/treasure_fairy_item_forest_prizes_child.xml index 60adcd6a6..ca6ad20bd 100644 --- a/app/src/main/res/layout/treasure_fairy_item_forest_prizes_child.xml +++ b/app/src/main/res/layout/treasure_fairy_item_forest_prizes_child.xml @@ -1,36 +1,56 @@ - + tools:layout_width="94dp"> + + + 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" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/treasure_fairy_item_test_fairy.xml b/app/src/main/res/layout/treasure_fairy_item_test_fairy.xml index 3af9d0be8..bdaaf5bd5 100644 --- a/app/src/main/res/layout/treasure_fairy_item_test_fairy.xml +++ b/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"> diff --git a/core/src/main/java/com/mango/core/initial/InitialModel.java b/core/src/main/java/com/mango/core/initial/InitialModel.java index 16065336e..ef8b35427 100644 --- a/core/src/main/java/com/mango/core/initial/InitialModel.java +++ b/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; }