From ba5376d4c05a3e09e7cda2d9125fb80dac06125f Mon Sep 17 00:00:00 2001 From: oujunhui <313127320@qq.com> Date: Thu, 4 Jun 2020 16:56:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=A3=85=E9=A5=B0=E9=A1=B5ba?= =?UTF-8?q?nner=EF=BC=8C=E6=9B=BF=E6=8D=A2=E6=88=BF=E9=97=B4=E9=BA=A6?= =?UTF-8?q?=E4=BD=8Dicon,=E6=B8=A0=E9=81=93=E6=8E=A8=E8=8D=90=E6=88=BF?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E4=B8=80=E9=94=AE=E7=99=BB=E5=BD=95=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E8=B7=B3=E6=89=8B=E6=9C=BA=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yizhuan/erban/MainActivity.java | 3 +- .../fragment/HomePartyRoomFragment.java | 4 +- .../decoration/view/MyDecorationActivity.java | 98 ++++++++++++++++++ .../home/activity/HomeMoreRoomActivity.java | 5 + .../erban/home/fragment/GameHomeFragment.java | 31 ++++-- .../erban/home/fragment/MainFragment.java | 5 + .../erban/home/fragment/MeFragment.java | 5 + .../home/presenter/MainFragmentPresenter.java | 10 ++ .../erban/home/view/IMainFragmentView.java | 6 ++ .../ui/im/avtivity/AddBlackListActivity.java | 18 ++-- .../erban/ui/user/UserInfoActivity.java | 5 + .../drawable-xhdpi/icon_room_lock_micro.webp | Bin 2170 -> 3952 bytes .../drawable-xhdpi/icon_room_up_micro.webp | Bin 2318 -> 4160 bytes app/src/main/res/drawable/bg_e6e6e6_0_2_5.xml | 2 +- .../drawable/bg_userinfo_photo_hintview.xml | 2 +- .../res/layout/activity_my_decoration.xml | 29 +++++- .../main/res/layout/activity_user_info.xml | 9 +- .../main/res/layout/fragment_dialog_web.xml | 2 +- .../main/res/layout/fragment_game_home.xml | 6 +- .../main/res/layout/item_userinfo_gift.xml | 1 - .../main/res/layout/layout_choose_worlds.xml | 3 +- .../erban/quick_pass/QuickPassLoginAct.java | 2 +- .../home/model/GameHomeModel.java | 17 +++ 23 files changed, 232 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index 05a2ab118..e33e05541 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -65,7 +65,6 @@ import com.yizhuan.erban.decoration.view.widgets.ShowCarGuideDialog; import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; import com.yizhuan.erban.guide.GuideActivity; import com.yizhuan.erban.home.dialog.RecommendRoomForNewerDialog; -import com.yizhuan.xchat_android_core.home.event.HomeDynamicEvent; import com.yizhuan.erban.home.fragment.CommunityNoticeAct; import com.yizhuan.erban.home.fragment.ContactsListFragment; import com.yizhuan.erban.home.fragment.GameHomeFragment; @@ -124,6 +123,7 @@ import com.yizhuan.xchat_android_core.community.event.SquareTaskEvent; import com.yizhuan.xchat_android_core.community.event.UnReadCountEvent; import com.yizhuan.xchat_android_core.community.im.WorldDynamicAttachment; import com.yizhuan.xchat_android_core.customer_server.event.CustomerServerMsgEvent; +import com.yizhuan.xchat_android_core.home.event.HomeDynamicEvent; import com.yizhuan.xchat_android_core.home.model.HomeModel; import com.yizhuan.xchat_android_core.im.custom.bean.AssistantAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.CarAttachment; @@ -318,7 +318,6 @@ public class MainActivity extends BaseMvpActivity initTeamSessionCustomization(); EventBus.getDefault().register(this); otherModelInit(); - } private void otherModelInit() { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java index c6324d749..74a7f0799 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java @@ -3034,7 +3034,7 @@ public class HomePartyRoomFragment extends BaseMvpFragment { RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo; UserInfo userInfo = UserModel.get().getCacheLoginUserInfo(); - if (roomInfo == null || userInfo == null) { + if (roomInfo == null || userInfo == null || roomOwnner == null) { return; } RoomFollowOwnerAttachment2 roomFollowOwnerAttachment = new RoomFollowOwnerAttachment2(); diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java b/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java index 748826a49..7c7086a6d 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java +++ b/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java @@ -5,12 +5,21 @@ import android.content.Intent; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentPagerAdapter; import androidx.viewpager.widget.ViewPager; + +import android.graphics.Color; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.GradientDrawable; import android.view.View; +import android.view.ViewGroup; import android.view.ViewStub; import android.widget.RelativeLayout; import android.widget.TextView; +import com.jude.rollviewpager.Util; +import com.jude.rollviewpager.hintview.ColorPointHintView; import com.netease.nim.uikit.StatusBarUtil; +import com.netease.nim.uikit.common.util.log.LogUtil; +import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.trello.rxlifecycle3.android.ActivityEvent; @@ -20,23 +29,37 @@ import com.yizhuan.erban.databinding.ActivityMyDecorationBinding; import com.yizhuan.erban.decoration.helper.DecorationDialogHelper; import com.yizhuan.erban.decoration.helper.DecorationSaleType; import com.yizhuan.erban.decoration.view.widgets.CarMagicIndicator; +import com.yizhuan.erban.home.adapter.BannerAdapter; +import com.yizhuan.erban.home.presenter.MainFragmentPresenter; +import com.yizhuan.erban.home.view.IMainFragmentView; import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator; import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; +import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; import com.yizhuan.xchat_android_core.Constants; import com.yizhuan.xchat_android_core.decoration.car.CarModel; import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; +import com.yizhuan.xchat_android_core.home.bean.BannerInfo; import com.yizhuan.xchat_android_core.home.bean.TabInfo; +import com.yizhuan.xchat_android_core.home.model.GameHomeModel; +import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; +import com.yizhuan.xchat_android_library.utils.ListUtils; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; +import io.reactivex.SingleObserver; +import io.reactivex.disposables.Disposable; + /** * Created by yudi * on 2018/3/1. */ + @ActLayoutRes(R.layout.activity_my_decoration) public class MyDecorationActivity extends BaseBindingActivity implements ICarView, View.OnClickListener, CarMagicIndicator.OnItemSelectListener { @@ -53,6 +76,10 @@ public class MyDecorationActivity extends BaseBindingActivity>() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onSuccess(List bannerList) { + if (MarketVerifyModel.get().isMarketChecking()) { + Iterator iterator = bannerList.iterator(); + while (iterator.hasNext()) { + BannerInfo bannerInfo = iterator.next(); + if (bannerInfo.getSkipType() == 2) { + iterator.remove(); + } + } + } + if (ListUtils.isListEmpty(bannerList)) { + mBinding.rollView.setVisibility(View.GONE); + return; + } + mBinding.rollView.setVisibility(View.VISIBLE); + ViewGroup.LayoutParams layoutParams = mBinding.rollView.getLayoutParams(); + int bannerWidth = UIUtil.getScreenWidth(context) - UIUtil.dip2px(context, 40); + layoutParams.width = bannerWidth; + layoutParams.height = bannerWidth * 90 / 345; + mBinding.rollView.setLayoutParams(layoutParams); + + mBinding.rollView.setHintView(new ColorPointHintView(context, Color.WHITE, context.getResources().getColor(R.color.color_66FFFFFF)) { + @Override + public Drawable makeFocusDrawable() { + GradientDrawable dotFocus = new GradientDrawable(); + dotFocus.setColor(Color.WHITE); + dotFocus.setCornerRadius(Util.dip2px(getContext(), 2)); + dotFocus.setSize(Util.dip2px(getContext(), 9), Util.dip2px(getContext(), 4)); + return dotFocus; + } + + @Override + public Drawable makeNormalDrawable() { + GradientDrawable dotNormal = new GradientDrawable(); + dotNormal.setColor(context.getResources().getColor(R.color.color_66FFFFFF)); + dotNormal.setCornerRadius(Util.dip2px(getContext(), 2)); + dotNormal.setSize(Util.dip2px(getContext(), 4), Util.dip2px(getContext(), 4)); + return dotNormal; + } + }); + + BannerAdapter bannerAdapter = new BannerAdapter(bannerList, context); + bannerAdapter.setRoundingRadius(ScreenUtil.dip2px(12)); + mBinding.rollView.setAdapter(bannerAdapter); + mBinding.rollView.setPlayDelay(3000); + //设置透明度 + mBinding.rollView.setAnimationDurtion(500); + mBinding.rollView.setVisibility(View.VISIBLE); + bannerAdapter.notifyDataSetChanged(); + } + + @Override + public void onError(Throwable e) { + LogUtil.e(e.getMessage()); + } + }); + } + public void showDetail(CarInfo carInfo) { showCarDetail(carInfo); } diff --git a/app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java b/app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java index 82bba05e3..067ed5a35 100644 --- a/app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java +++ b/app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java @@ -318,6 +318,11 @@ public class HomeMoreRoomActivity extends BaseMvpActivity mFragments = new ArrayList<>(); private List mFragmentsBottom; @@ -268,7 +267,8 @@ public class GameHomeFragment extends BaseMvpFragment getMvpPresenter().getRoomShortcut(),1800); + } + @Override public void titleListSuccess(List tagListInfoList) { @@ -658,6 +662,15 @@ public class GameHomeFragment extends BaseMvpFragment tagInfos) { } + + @Override + public void getRoomShortcut(String data) { + + } } diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java index 5db303621..3bc24a4c8 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java @@ -665,4 +665,9 @@ public class MeFragment extends BaseMvpFragment { }); } + @SuppressLint("CheckResult") + public void getRoomShortcut(){ + GameHomeModel.get().getRoomShortcut().compose(RxHelper.handleException()) + .subscribe((result, throwable) -> { + if (mMvpView != null) { + mMvpView.getRoomShortcut(result); + } + }); + } + } diff --git a/app/src/main/java/com/yizhuan/erban/home/view/IMainFragmentView.java b/app/src/main/java/com/yizhuan/erban/home/view/IMainFragmentView.java index f91ca59e2..14b0ffa7d 100644 --- a/app/src/main/java/com/yizhuan/erban/home/view/IMainFragmentView.java +++ b/app/src/main/java/com/yizhuan/erban/home/view/IMainFragmentView.java @@ -102,6 +102,11 @@ public interface IMainFragmentView extends IMvpBaseView { public void onGetHomeTagSuccess(List tagInfos) { } + + @Override + public void getRoomShortcut(String data) { + + } } void titleListSuccess(List tagListInfoList); @@ -121,5 +126,6 @@ public interface IMainFragmentView extends IMvpBaseView { void onGetHomeTagSuccess(List tagInfos); + void getRoomShortcut(String data); } diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/AddBlackListActivity.java b/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/AddBlackListActivity.java index dfc2ff2f2..5ee95d154 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/AddBlackListActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/AddBlackListActivity.java @@ -103,14 +103,18 @@ public class AddBlackListActivity extends BaseMvpActivity list){ TextHintView hintView = new TextHintView(this); hintView.setBackground(getResources().getDrawable(R.drawable.bg_userinfo_photo_hintview)); hintView.setTextSize(SizeUtils.dp2px(this,4)); + hintView.setTextColor(getResources().getColor(R.color.blue)); mBinding.rollView.setHintView(hintView); UserInfoPhotoAdapter bannerAdapter = new UserInfoPhotoAdapter(list, this); mBinding.rollView.setAdapter(bannerAdapter); @@ -416,6 +420,7 @@ public class UserInfoActivity extends BaseBindingActivity { if (flag == 0 && oldScrollY > SizeUtils.dp2px(this,200)) { diff --git a/app/src/main/res/drawable-xhdpi/icon_room_lock_micro.webp b/app/src/main/res/drawable-xhdpi/icon_room_lock_micro.webp index 5a8034b10ba1542c5bce5d436e7efa2c930134a0..cb2413087a29f831c0e3dca787f7a050bd06e98a 100644 GIT binary patch literal 3952 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 diff --git a/app/src/main/res/drawable-xhdpi/icon_room_up_micro.webp b/app/src/main/res/drawable-xhdpi/icon_room_up_micro.webp index 0c4966a13ec819f861988bdad3ddbd3d5eede3c3..fa122e11bef404fa8a135abaa80686de6342bb14 100644 GIT binary patch literal 4160 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 K;o6wgc>n;z<|GsV literal 2318 zcmV+p3Gwz)Nk&En2><|BMM6+kP&il$0000G0001O003>|HU(|Mb!WqD+J=48@Rhgtb&XgeW!IcpI&IWawQ z)J!4W4Q&vTCaY$mw+D8MhVa=#W*NxPe7)E;eQ>#;qSK9K1C1__OT*6IOCyzAR-}=5 zf#GFDul~KU>>v@rGBS(|Xr9Y^+Y3TRYQbkocVCIlNoIQ@qc4H0umfr+?ro0<5sm}H z!O^>ySY6m&5n^N0u?feL{HL~el2^a9CX`cRi=J%+JbV2ZnlLQ+ke_T6JTfE?$=%XM zLh0)u$#iFr6jaz~Al3ri&Dr3UrXzwR(b>F^Hh8j80n$g(jggl$wUI#z?Pja@d=8b3 z4sTwh(=%jhyRgwAzBVr%;-#wUy^RoJtFboj`fC##CCOjfT^IZyS!Om$GC0+8O+2F4 zB86N!Y7gFa|FzMQoa%FHB*z;YEm(VaB*%#H2Wg21^cXSZaL^1TIYv!#+LFnR9~-xp zjjVWc-~UA2TfsO|Z=EW(X}EH#Gs{K({;zI95}yY@bE;P~c#HjDc{qQs*OJba1u~&m zBV>m#5{?L!RNz7M%7mt{`0ULTX|>@+DRA5;gIW~VCuM>56TSq`2_otCYi zh=54p@k5hSGU4s4RCQ<>xc3$MUF$8C2>@6O`_QSbc8r{<>YHWY+}G#l&w4rO$Jd=D zGjXb!5nl|;7v>B4?GROyul>6+@Zi4_kyll{wBh8wr#d>FB>-@Yckh$DngQ3H|7u`q zJK{6@&xS*84E#(mx8Y>}LK;p0{Nu0_-v2+yoU%BtMGbt|&LjW~%LwAqX5OZZZ8&d0 zi1kPSI7ZXhspf@K7MtP#T-(l|2AmDY7g%^x_Q!_v4Ito?$N+rXaFSDm0_6QHD);N@?iyPYKIK;1xrY1 zAq8s+frO>127kv{>)fqbxTX;NJ&rH|@NayER;8sd+TrX4q!zja0D_NFwAtV`V%@qMRNo)(=p8At@=+t(1AoJ364N!aRv{i zecl;$_@%~7G6aG%A|48d_w`i+&Czl?Uj4RRNvm;l`n#-wFAbsLeQ|h}iyC;;UA1D_g<00`W6Yu1T&q;Fh{MO@MJESrc=_nxK=5*|WtGaZ0)MQ-2_7wN zD{!9Oh1=gckQAz$yj_vVv~x0&ItU5(O|;f2+<{PCNZu756`J`=$#cf0)|H zNWL!T(v8APda_XgUz0*QGVsl0~-ybkFY1*Ib1~bBTPZtG5bg^X^IVV}@-yVD z3k*A#i$;R+0W?x_Y5HK7W~n-RVEIlnNJD0^YkJ~1HH5FyUEr!&(gY2O>DcthNi(53 zEAx)K^+`(dK24pNo;fO)Ep^cObbOazWM`*V6Eex~#?yJ5s%3d(B4FpLax7F=Nn&9? zpDtYxNV0F@V$0sVu3RVZdSkaFN(P6c>ta&P7fYv*d6kOm(c!?b0#;BsAj|>)01y-a zodGIt0B!(2kwlzGrKBSvEgLvUuo4Mr2y(W+gE=qw_ho!+UXtF@><08(!IG!^m+@{u zIAZ=O;0^K)f*;fW(fI=WgZuBWC-VR6eOo_Ky@Eet3kAF3@9>%9W2HmGjV|h2Ny+_ zvNcEY+VujYTX2a_xanuO#kR&%2kmh5s7xx@v6q8hC6=@R0Ol}oj{pDw diff --git a/app/src/main/res/drawable/bg_e6e6e6_0_2_5.xml b/app/src/main/res/drawable/bg_e6e6e6_0_2_5.xml index f46f30bda..c3043615f 100644 --- a/app/src/main/res/drawable/bg_e6e6e6_0_2_5.xml +++ b/app/src/main/res/drawable/bg_e6e6e6_0_2_5.xml @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_userinfo_photo_hintview.xml b/app/src/main/res/drawable/bg_userinfo_photo_hintview.xml index 4db6667fe..a07354804 100644 --- a/app/src/main/res/drawable/bg_userinfo_photo_hintview.xml +++ b/app/src/main/res/drawable/bg_userinfo_photo_hintview.xml @@ -1,7 +1,7 @@ - + + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> @@ -37,11 +38,35 @@ android:textSize="18dp" /> + + + + + + + android:layout_marginTop="@dimen/dp_10" + android:layout_below="@+id/fl_roll_view" /> @@ -143,7 +142,7 @@ app:layout_constraintTop_toBottomOf="@id/ll_level" app:layout_constraintStart_toStartOf="parent" android:gravity="center_vertical" - android:layout_marginTop="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_7" android:orientation="horizontal"> diff --git a/app/src/main/res/layout/fragment_dialog_web.xml b/app/src/main/res/layout/fragment_dialog_web.xml index a366b7db5..4b025d981 100644 --- a/app/src/main/res/layout/fragment_dialog_web.xml +++ b/app/src/main/res/layout/fragment_dialog_web.xml @@ -17,7 +17,7 @@ android:id="@+id/webview" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/transparent" /> + android:background="#00000000" /> @@ -210,10 +212,10 @@ - diff --git a/app/src/main/res/layout/item_userinfo_gift.xml b/app/src/main/res/layout/item_userinfo_gift.xml index c2a6612ee..7168dcff1 100644 --- a/app/src/main/res/layout/item_userinfo_gift.xml +++ b/app/src/main/res/layout/item_userinfo_gift.xml @@ -22,7 +22,6 @@ android:layout_height="wrap_content" android:ellipsize="end" android:lines="1" - tools:text="20" android:textColor="@color/appColor" android:textSize="@dimen/sp_10" diff --git a/app/src/main/res/layout/layout_choose_worlds.xml b/app/src/main/res/layout/layout_choose_worlds.xml index cd31f1e24..bbd9fb657 100644 --- a/app/src/main/res/layout/layout_choose_worlds.xml +++ b/app/src/main/res/layout/layout_choose_worlds.xml @@ -20,8 +20,9 @@ diff --git a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java b/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java index 85efc0544..5b2b8f75b 100644 --- a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java +++ b/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java @@ -168,7 +168,7 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe toast("一键登录失败，请使用其他方式登录"); getDialogManager().dismissDialog(); //跳转到手机登录页 -// LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode); + LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode); } }); } diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java index db072f28d..0c68ed80c 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java @@ -82,6 +82,14 @@ public class GameHomeModel extends BaseModel { .compose(RxHelper.handleSchedulers()); } + public Single getRoomShortcut(){ + return api.apiRoomShortcut(String.valueOf(AuthModel.get().getCurrentUid()), + CommunityConstant.VERSION_VALID_TYPE, + AuthModel.get().getTicket()) + .compose(RxHelper.handleBeanData()) + .compose(RxHelper.handleSchedulers()); + } + private static final class Helper { public static final GameHomeModel INSTANCE = new GameHomeModel(); @@ -190,7 +198,16 @@ public class GameHomeModel extends BaseModel { @Query("uid") String uid, @Query("types") String types, @Query("ticket") String ticket); + + @GET("/room/shortcut/recommend") + Single> apiRoomShortcut( + @Query("uid") String uid, + @Query("types") String types, + @Query("ticket") String ticket + ); } + + }