diff --git a/app/src/main/assets/svga/gold_box_bg.svga b/app/src/main/assets/svga/gold_box_bg.svga index 85221678b..314b82a7b 100644 Binary files a/app/src/main/assets/svga/gold_box_bg.svga and b/app/src/main/assets/svga/gold_box_bg.svga differ diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java index 939d4a1c9..1325c87ce 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java @@ -255,24 +255,19 @@ public class GameHomeFragment extends BaseMvpFragment { if (info == null) { @@ -1196,7 +1196,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene break; case GiftIndicator.TYPE_MAGIC: - compositeDisposable.add(getMagicData()); + //compositeDisposable.add(getMagicData()); break; } } diff --git a/app/src/main/res/layout/fragment_game_home.xml b/app/src/main/res/layout/fragment_game_home.xml index 8dfda4984..e4d450c7b 100644 --- a/app/src/main/res/layout/fragment_game_home.xml +++ b/app/src/main/res/layout/fragment_game_home.xml @@ -5,7 +5,8 @@ - + + @@ -58,13 +59,12 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_32" android:layout_gravity="center" - android:src="@mipmap/ic_home_ranking" - android:layout_marginEnd="@dimen/dp_15" android:layout_marginStart="@dimen/dp_13" + android:layout_marginEnd="@dimen/dp_15" + android:onClick="@{click}" android:paddingStart="8dp" android:paddingEnd="8dp" - android:onClick="@{click}" - /> + android:src="@mipmap/ic_home_ranking" /> + android:src="@drawable/icon_to_sign_in" + android:visibility="gone" /> + android:layout_height="0dp" + android:focusable="true" + android:focusableInTouchMode="true" + app:layout_constraintTop_toBottomOf="@+id/title_bar"> + android:layout_height="match_parent"> + android:layout_height="match_parent"> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:itemCount="1" + tools:listitem="@layout/item_home_concerns" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/rv_follow_room"> + + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@id/tv_room_more" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintBottom_toBottomOf="@id/magic_indicator" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/magic_indicator" + app:layout_constraintTop_toTopOf="@id/magic_indicator" /> - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/ll_indicator" /> + android:background="@color/color_F9F9F9" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/view_pager"> + app:rollviewpager_hint_paddingBottom="8dp" /> - + app:layout_constraintTop_toBottomOf="@+id/fl_roll_view"> + + app:layout_constraintTop_toBottomOf="@id/fl_indicator" /> @@ -227,9 +219,9 @@ android:layout_marginTop="@dimen/dp_5" android:layout_marginEnd="@dimen/dp_15" android:layout_marginBottom="@dimen/dp_15" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - android:visibility="gone"> + app:layout_constraintEnd_toEndOf="parent"> > getWxpayType(); }