yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
huangjian
2020-05-09 14:15:30 +08:00
parent 3f797d8c1f
commit a3530f1b54
5 changed files with 55 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/assets/svga/gold_box_bg.svga
View File

Binary file not shown.

11
app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
View File

@@ -255,24 +255,19 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
} }
public void scrollToView() { public void scrollToView() {
mBinding.stickyScrollView.post(new Runnable() { mBinding.stickyScrollView.postDelayed(new Runnable() {
@Override
public void run() {
mBinding.llIndicator.post(new Runnable() {
@Override @Override
public void run() { public void run() {
int position = mBinding.llIndicator.getTop(); int position = mBinding.llIndicator.getTop();
mBinding.stickyScrollView.scrollTo(0,position);//ScreenUtil.dip2px(100) mBinding.stickyScrollView.scrollTo(0,position);//ScreenUtil.dip2px(100)
}
});
// mBinding.rvFollowRoom.setVisibility(View.VISIBLE); // mBinding.rvFollowRoom.setVisibility(View.VISIBLE);
} }
}); }, 2000);
mBinding.rvFollowRoom.setVisibility(View.VISIBLE); mBinding.rvFollowRoom.setVisibility(View.VISIBLE);
} }
private void initLocation() { private void initLocation() {
//初始化定位 //初始化定位
mLocationClient = new AMapLocationClient(getContext().getApplicationContext()); mLocationClient = new AMapLocationClient(getContext().getApplicationContext());

4
app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
View File

@@ -455,7 +455,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
}); });
compositeDisposable.add(GiftModel.get().requestKnapGiftInfos().subscribe()); compositeDisposable.add(GiftModel.get().requestKnapGiftInfos().subscribe());
compositeDisposable.add(getMagicData()); //compositeDisposable.add(getMagicData());
radishObserver = info -> { radishObserver = info -> {
if (info == null) { if (info == null) {
@@ -1196,7 +1196,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
break; break;
case GiftIndicator.TYPE_MAGIC: case GiftIndicator.TYPE_MAGIC:
compositeDisposable.add(getMagicData()); //compositeDisposable.add(getMagicData());
break; break;
} }
} }

100
app/src/main/res/layout/fragment_game_home.xml
View File

@@ -6,6 +6,7 @@
<data> <data>
<import type="android.view.View" /> <import type="android.view.View" />
<variable <variable
name="click" name="click"
type="android.view.View.OnClickListener" /> type="android.view.View.OnClickListener" />
@@ -58,13 +59,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_32" android:layout_height="@dimen/dp_32"
android:layout_gravity="center" android:layout_gravity="center"
android:src="@mipmap/ic_home_ranking"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_13" android:layout_marginStart="@dimen/dp_13"
android:layout_marginEnd="@dimen/dp_15"
android:onClick="@{click}"
android:paddingStart="8dp" android:paddingStart="8dp"
android:paddingEnd="8dp" android:paddingEnd="8dp"
android:onClick="@{click}" android:src="@mipmap/ic_home_ranking" />
/>
<ImageView <ImageView
android:id="@+id/iv_to_sign_in" android:id="@+id/iv_to_sign_in"
@@ -74,42 +74,42 @@
android:layout_marginStart="@dimen/dp_11" android:layout_marginStart="@dimen/dp_11"
android:gravity="center" android:gravity="center"
android:onClick="@{click}" android:onClick="@{click}"
android:visibility="gone"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/icon_to_sign_in" /> android:src="@drawable/icon_to_sign_in"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
<com.yizhuan.erban.utils.VpSwipeRefreshLayout <com.yizhuan.erban.utils.VpSwipeRefreshLayout
android:id="@+id/refresh_layout" android:id="@+id/refresh_layout"
android:focusableInTouchMode="true"
android:focusable="true"
app:layout_constraintTop_toBottomOf="@+id/title_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp"> android:layout_height="0dp"
android:focusable="true"
android:focusableInTouchMode="true"
app:layout_constraintTop_toBottomOf="@+id/title_bar">
<com.yizhuan.erban.home.widget.StickyScrollView <com.yizhuan.erban.home.widget.StickyScrollView
android:id="@+id/sticky_scroll_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:id="@+id/sticky_scroll_view">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_follow_room" android:id="@+id/rv_follow_room"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:paddingTop="@dimen/dp_8"
android:paddingStart="@dimen/dp_15" android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_8"
android:paddingEnd="@dimen/dp_15" android:paddingEnd="@dimen/dp_15"
android:visibility="gone" android:visibility="gone"
/> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:itemCount="1"
tools:listitem="@layout/item_home_concerns" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
@@ -117,64 +117,59 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/rv_follow_room"
app:layout_constraintStart_toStartOf="parent"
android:paddingStart="14dp" android:paddingStart="14dp"
android:paddingEnd="15dp" android:paddingEnd="15dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rv_follow_room">
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator <com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator" android:id="@+id/magic_indicator"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/dp_38" android:layout_height="@dimen/dp_38"
app:layout_constraintEnd_toStartOf="@id/tv_room_more"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_weight="1" android:layout_weight="1"
android:paddingEnd="@dimen/dp_10" android:paddingEnd="@dimen/dp_10"
/> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/tv_room_more"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/tv_room_more" android:id="@+id/tv_room_more"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableRight="@drawable/arrow_right_white"
android:drawablePadding="@dimen/dp_3"
android:gravity="center" android:gravity="center"
android:text="更多房间"
app:layout_constraintTop_toTopOf="@id/magic_indicator"
app:layout_constraintStart_toEndOf="@id/magic_indicator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="@id/magic_indicator"
android:paddingTop="@dimen/dp_5"
android:onClick="@{click}" android:onClick="@{click}"
android:paddingTop="@dimen/dp_5"
android:text="更多房间"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/dp_14" android:textSize="@dimen/dp_14"
android:drawablePadding="@dimen/dp_3" app:layout_constraintBottom_toBottomOf="@id/magic_indicator"
android:drawableRight="@drawable/arrow_right_white" app:layout_constraintEnd_toEndOf="parent"
/> app:layout_constraintStart_toEndOf="@id/magic_indicator"
app:layout_constraintTop_toTopOf="@id/magic_indicator" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<com.yizhuan.erban.ui.widget.ContentWrapViewPager <com.yizhuan.erban.ui.widget.ContentWrapViewPager
android:id="@+id/view_pager" android:id="@+id/view_pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/ll_indicator"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
/> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_indicator" />
<FrameLayout <FrameLayout
android:id="@+id/fl_roll_view" android:id="@+id/fl_roll_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/color_F9F9F9"
app:layout_constraintTop_toBottomOf="@id/view_pager"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@dimen/dp_15" android:layout_marginTop="@dimen/dp_15"
> android:background="@color/color_F9F9F9"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_pager">
<com.jude.rollviewpager.RollPagerView <com.jude.rollviewpager.RollPagerView
android:id="@+id/roll_view" android:id="@+id/roll_view"
@@ -183,12 +178,10 @@
android:layout_marginStart="@dimen/dp_15" android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15" android:layout_marginEnd="@dimen/dp_15"
app:rollviewpager_hint_gravity="left" app:rollviewpager_hint_gravity="left"
app:rollviewpager_hint_paddingBottom="8dp" app:rollviewpager_hint_paddingBottom="8dp" />
/>
</FrameLayout> </FrameLayout>
<!-- </com.google.android.material.appbar.CollapsingToolbarLayout>--> <!-- </com.google.android.material.appbar.CollapsingToolbarLayout>-->
<FrameLayout <FrameLayout
@@ -197,8 +190,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/color_F9F9F9" android:background="@color/color_F9F9F9"
android:tag="sticky" android:tag="sticky"
app:layout_constraintTop_toBottomOf="@+id/fl_roll_view" app:layout_constraintTop_toBottomOf="@+id/fl_roll_view">
>
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator <com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator_bottom" android:id="@+id/magic_indicator_bottom"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -214,8 +207,7 @@
android:id="@+id/view_pager_bottom" android:id="@+id/view_pager_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/fl_indicator" app:layout_constraintTop_toBottomOf="@id/fl_indicator" />
/>
<!-- </androidx.coordinatorlayout.widget.CoordinatorLayout>--> <!-- </androidx.coordinatorlayout.widget.CoordinatorLayout>-->
@@ -227,9 +219,9 @@
android:layout_marginTop="@dimen/dp_5" android:layout_marginTop="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_15" android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_15" android:layout_marginBottom="@dimen/dp_15"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent">
android:visibility="gone">
<com.jude.rollviewpager.RollPagerView <com.jude.rollviewpager.RollPagerView
android:id="@+id/activity_img" android:id="@+id/activity_img"

2
core/src/main/java/com/yizhuan/xchat_android_core/pay/PayModel.java
View File

@@ -527,7 +527,7 @@ public class PayModel extends BaseModel implements IPayModel {
* *
* @return * @return
*/ */
@GET("/charge/v2/wxpay/type") @GET("/charge/wxpay/type")
Single<ServiceResult<WxPayType>> getWxpayType(); Single<ServiceResult<WxPayType>> getWxpayType();
} }