From c1798532a4c90a9fad9e4b8935a517eb736d28ea Mon Sep 17 00:00:00 2001 From: huangjian Date: Fri, 26 Feb 2021 11:00:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=90=AF=E7=9B=B8=E4=BA=B2=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E6=88=BF=E9=97=B4=E6=88=BF=E9=97=B4=E6=A6=9C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=88=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fragment/HomePartyRoomFragment.java | 7 +- .../fragment/RoomCharmListFragment.java | 14 +- .../fragment/RoomContributeListFragment.java | 16 +- .../fragment/RoomRankDialogFragment.java | 19 +- .../fragment/RoomRankHalfHourFragment.java | 359 ---------------- .../avroom/widget/RankNavigatorAdapter.java | 7 +- .../res/layout/fragment_room_charm_list.xml | 2 +- .../res/layout/fragment_room_contribute.xml | 2 +- .../layout/fragment_room_rank_half_hour.xml | 405 ------------------ .../room/bean/RoomContributeDataInfo.java | 1 + 10 files changed, 24 insertions(+), 808 deletions(-) delete mode 100644 app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankHalfHourFragment.java delete mode 100644 app/src/main/res/layout/fragment_room_rank_half_hour.xml 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 35efc52b0..796743a1a 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 @@ -1468,11 +1468,8 @@ public class HomePartyRoomFragment extends BaseMvpFragment fragments = new ArrayList<>(2); fragments.add(RoomCharmRankingListFragment.newInstance(RoomContributeDataInfo.TYPE_ROOM_DAY_RANKING)); fragments.add(RoomCharmRankingListFragment.newInstance(RoomContributeDataInfo.TYPE_ROOM_WEEK_RANKING)); -// fragments.add(RoomCharmRankingListFragment.newInstance(RoomContributeDataInfo.TYPE_ROOM_TOTAL_RANKING)); + if (AvRoomDataManager.get().isDatingMode()) { + fragments.add(RoomCharmRankingListFragment.newInstance(RoomContributeDataInfo.TYPE_ROOM_MONTH_RANKING)); + } mBinding.vpCharmRankings.setAdapter(new RoomContributeListAdapter(getChildFragmentManager(), fragments)); CommonNavigator commonNavigator = new CommonNavigator(getActivity()); - commonNavigator.setAdjustMode(true); + commonNavigator.setAdjustMode(false); RankNavigatorAdapter indicator = new RankNavigatorAdapter(); - indicator.setOnItemSelectListener(new RankNavigatorAdapter.OnItemSelectListener() { - @Override - public void onItemSelect(int position) { - mBinding.vpCharmRankings.setCurrentItem(position); - } - }); + indicator.setOnItemSelectListener(position -> mBinding.vpCharmRankings.setCurrentItem(position)); commonNavigator.setAdapter(indicator); mBinding.viewIndicator.setNavigator(commonNavigator); ViewPagerHelper.bind(mBinding.viewIndicator, mBinding.vpCharmRankings); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeListFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeListFragment.java index 830f58073..0e5d65c28 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeListFragment.java @@ -10,6 +10,7 @@ import com.yizhuan.erban.base.BaseMvpFragment; import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator; import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; +import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; import com.yizhuan.xchat_android_library.base.IMvpBaseView; @@ -39,19 +40,14 @@ public class RoomContributeListFragment extends BaseMvpFragment implements IMvpB ArrayList fragments = new ArrayList<>(2); fragments.add(RoomContributeFragment.newInstance(RoomContributeDataInfo.TYPE_ROOM_DAY_RANKING)); fragments.add(RoomContributeFragment.newInstance(RoomContributeDataInfo.TYPE_ROOM_WEEK_RANKING)); -// fragments.add(RoomContributeFragment.newInstance(RoomContributeDataInfo.TYPE_ROOM_TOTAL_RANKING)); + if (AvRoomDataManager.get().isDatingMode()) { + fragments.add(RoomContributeFragment.newInstance(RoomContributeDataInfo.TYPE_ROOM_MONTH_RANKING)); + } viewPager.setAdapter(new RoomContributeListAdapter(getChildFragmentManager(), fragments)); - CommonNavigator commonNavigator = new CommonNavigator(getActivity()); - commonNavigator.setAdjustMode(true); - + commonNavigator.setAdjustMode(false); RankNavigatorAdapter indicator = new RankNavigatorAdapter(); - indicator.setOnItemSelectListener(new RankNavigatorAdapter.OnItemSelectListener() { - @Override - public void onItemSelect(int position) { - viewPager.setCurrentItem(position); - } - }); + indicator.setOnItemSelectListener(position -> viewPager.setCurrentItem(position)); commonNavigator.setAdapter(indicator); viewIndicator.setNavigator(commonNavigator); ViewPagerHelper.bind(viewIndicator, viewPager); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogFragment.java index 9dae10c0a..cdd9e25de 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogFragment.java @@ -25,24 +25,14 @@ public class RoomRankDialogFragment extends AppCompatDialogFragment implements I private ViewPager mViewPager; - private long roomOwnerUid;// 房主Uid - public static RoomRankDialogFragment newInstance(long roomOwnerUid) { + public static RoomRankDialogFragment newInstance() { Bundle args = new Bundle(); - args.putLong("room_owner_uid", roomOwnerUid); RoomRankDialogFragment fragment = new RoomRankDialogFragment(); fragment.setArguments(args); return fragment; } - @Override - public void onAttach(Context context) { - super.onAttach(context); - if (getArguments() != null) { - roomOwnerUid = getArguments().getLong("room_owner_uid"); - } - } - @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { @@ -80,17 +70,10 @@ public class RoomRankDialogFragment extends AppCompatDialogFragment implements I if (getChildFragmentManager().getFragments() != null && getChildFragmentManager().getFragments().size() != 0) { fragmentList = getChildFragmentManager().getFragments(); } else { - //隐藏半小时榜 -// RoomRankHalfHourFragment halfHourFragment = RoomRankHalfHourFragment.newInstance(roomOwnerUid); -// halfHourFragment.setDismissListener(this); -// halfHourFragment.setChangePageListener(this); -// fragmentList.add(halfHourFragment); - RoomRankListFragment roomInsideFragment = RoomRankListFragment.newInstance(); roomInsideFragment.setDismissListener(this); roomInsideFragment.setChangePageListener(this); fragmentList.add(roomInsideFragment); - } mViewPager.setAdapter(new RoomRankFragmentPageAdapter(getChildFragmentManager(), fragmentList)); mViewPager.setOffscreenPageLimit(fragmentList.size()); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankHalfHourFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankHalfHourFragment.java deleted file mode 100644 index f10aba3bb..000000000 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankHalfHourFragment.java +++ /dev/null @@ -1,359 +0,0 @@ -package com.yizhuan.erban.avroom.fragment; - -import android.content.Context; -import android.os.Bundle; -import androidx.core.widget.NestedScrollView; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.RelativeLayout; -import android.widget.TextView; - -import com.netease.nim.uikit.common.util.sys.NetworkUtil; -import com.scwang.smartrefresh.layout.SmartRefreshLayout; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.avroom.adapter.RoomRankHalfHourListAdapter; -import com.yizhuan.erban.avroom.presenter.RoomRankHalfHourPresenter; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourMeInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourRankInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; - -import java.util.ArrayList; -import java.util.List; - -import butterknife.BindView; -import butterknife.ButterKnife; - -@CreatePresenter(RoomRankHalfHourPresenter.class) -public class RoomRankHalfHourFragment extends BaseMvpFragment - implements IRoomRankHalfHourView, View.OnClickListener { - - @BindView(R.id.tv_room_rank_half_hour_tab) - TextView mHalfHourTab; - @BindView(R.id.tv_room_rank_in_room_tab) - TextView mInsideRoomTab; - - @BindView(R.id.layout_room_rank_mine_info) - LinearLayout mMineInfoLayout; - @BindView(R.id.tv_room_rank_mine_ranking) - TextView mMineRanking; - @BindView(R.id.iv_number) - ImageView ivNumber; - @BindView(R.id.iv_room_rank_mine_avatar) - CircleImageView mMineAvatar; - - @BindView(R.id.tv_room_rank_mine_title) - TextView mMineTitle; - @BindView(R.id.tv_room_id) - TextView tvRoomId; - - @BindView(R.id.ll_number_one) - LinearLayout llNumberOne; - - @BindView(R.id.ll_to_last) - LinearLayout llToLast; - @BindView(R.id.tv_to_last) - TextView tvToLast; - @BindView(R.id.tv_label_to) - TextView tvLabelTo; - - @BindView(R.id.layout_room_rank_top_2) - RelativeLayout mTop2Layout; - @BindView(R.id.iv_room_rank_top_2_avatar_default) - ImageView mTop2AvatarDF;// 无数据时才显示 - @BindView(R.id.iv_room_rank_top_2_avatar) - CircleImageView mTop2Avatar;// 有数据时才显示 - @BindView(R.id.tv_number_two_id) - TextView mTop2Id; - @BindView(R.id.tv_two_to_last) - TextView mTop2Value; - @BindView(R.id.tv_label_number_two) - TextView mTop2Name; - - @BindView(R.id.layout_room_rank_top_1) - RelativeLayout mTop1Layout; - @BindView(R.id.iv_room_rank_top_1_avatar_default) - ImageView mTop1AvatarDF;// 无数据时才显示 - @BindView(R.id.iv_room_rank_top_1_avatar) - CircleImageView mTop1Avatar;// 有数据时才显示 - @BindView(R.id.tv_rank_half_one) - TextView tvRankHalfOne; - @BindView(R.id.tv_label_number_one) - TextView mTop1Name; - @BindView(R.id.tv_number_one_id) - TextView mTop1Id; - - @BindView(R.id.layout_room_rank_top_3) - RelativeLayout mTop3Layout; - @BindView(R.id.iv_room_rank_top_3_avatar_default) - ImageView mTop3AvatarDF;// 无数据时才显示 - @BindView(R.id.iv_room_rank_top_3_avatar) - CircleImageView mTop3Avatar;// 有数据时才显示 - @BindView(R.id.tv_number_three_id) - TextView mTop3Id; - @BindView(R.id.tv_three_to_last) - TextView mTop3Value; - @BindView(R.id.tv_label_number_three) - TextView mTop3Name; - - @BindView(R.id.recycler_room_rank_list) - RecyclerView mRoomRankRecycler; - @BindView(R.id.refresh_layout) - SmartRefreshLayout mRefreshLayout; - @BindView(R.id.nsv_rank_half) - NestedScrollView nestedScrollView; - - private RoomRankHalfHourListAdapter mAdapter; - - private IRoomRankDialogDismissListener dismissListener; - private IRoomRankDialogChangePageListener changePageListener; - - private long roomOwnerUid;// 房主Uid - - public static RoomRankHalfHourFragment newInstance(long roomOwnerUid) { - - Bundle args = new Bundle(); - args.putLong("room_owner_uid", roomOwnerUid); - RoomRankHalfHourFragment fragment = new RoomRankHalfHourFragment(); - fragment.setArguments(args); - return fragment; - } - - @Override - public void onAttach(Context context) { - super.onAttach(context); - if (getArguments() != null) { - roomOwnerUid = getArguments().getLong("room_owner_uid"); - } - } - - @Override - public int getRootLayoutId() { - return R.layout.fragment_room_rank_half_hour; - } - - @Override - public void onFindViews() { - ButterKnife.bind(this, mView); - } - - @Override - public void onSetListener() { - mHalfHourTab.setOnClickListener(this); - mInsideRoomTab.setOnClickListener(this); - } - - @Override - public void initiate() { - // 列表 - mAdapter = new RoomRankHalfHourListAdapter(mContext); - mRoomRankRecycler.setAdapter(mAdapter); - LinearLayoutManager layoutManager = new LinearLayoutManager(mContext); - layoutManager.setSmoothScrollbarEnabled(true); - mRoomRankRecycler.setLayoutManager(layoutManager); - mRoomRankRecycler.setHasFixedSize(true); - mRoomRankRecycler.setNestedScrollingEnabled(false); - mAdapter.setOnItemClickListener((adapter, view, position) -> { - RoomRankMultiItem roomRankMultiItem = mAdapter.getItem(position); - if (roomRankMultiItem == null) - return; - - if (roomRankMultiItem.getItemType() == RoomRankMultiItem.TYPE_LINEAR) { - RoomRankHalfHourRankInfo item = (RoomRankHalfHourRankInfo) roomRankMultiItem.getData(); - if (item != null && item.getUid() != 0) { - goToUserInfoPage(item.getUid()); - } - - } - }); - // 加载数据 - mRefreshLayout.setEnableRefresh(true); - mRefreshLayout.setOnRefreshListener(refreshlayout -> loadData()); - - mRefreshLayout.autoRefresh(100); - mRefreshLayout.setEnableLoadmore(false); - } - - private void loadData() { - if (!NetworkUtil.isNetAvailable(mContext)) { - showNetworkErr(); - mRefreshLayout.finishRefresh(); - return; - } - showLoading(); - getMvpPresenter().getRankListInfo(); - } - - private void goToUserInfoPage(long userId) { - if (dismissListener != null) { - dismissListener.onDismiss(); - } - UIHelper.showUserInfoAct(mContext, userId);// 个人中心 - } - - @Override - public void showMeInfo(RoomRankHalfHourMeInfo info) { - mRefreshLayout.finishRefresh(); - if (info == null) { - mMineRanking.setVisibility(View.GONE); - ivNumber.setVisibility(View.GONE); - llNumberOne.setVisibility(View.GONE); - llToLast.setVisibility(View.GONE); - mMineTitle.setText(""); - tvRoomId.setText(""); - return; - } - mMineInfoLayout.setOnClickListener(view -> goToUserInfoPage(roomOwnerUid)); - // 头像 - ImageLoadUtils.loadAvatar(mContext, info.getAvatar(), mMineAvatar, true); - // title - mMineTitle.setText(info.getRoomTitle()); - tvRoomId.setText("ID:" + info.getErbanNo()); - tvToLast.setText(RoomRankDialogUtils.getRoomRankValueText(info.getTotalNum())); - // value - // 展示方式不同:排名 + 值 - if (info.getSeqNo() == 0) {// 未上榜 - llNumberOne.setVisibility(View.GONE); - mMineRanking.setVisibility(View.VISIBLE); - llToLast.setVisibility(View.VISIBLE); - tvLabelTo.setText(""); - ivNumber.setVisibility(View.GONE); - } else { - int seqNo = info.getSeqNo(); - boolean isOne = seqNo == 1; - llNumberOne.setVisibility(isOne ? View.VISIBLE : View.GONE); - - if (seqNo >= 2 && seqNo <= 10) - tvLabelTo.setText("距离上一名"); - else if (seqNo > 10 && seqNo <= 20) - tvLabelTo.setText("距离上榜"); - else if (seqNo > 20) - tvLabelTo.setText(""); - - llToLast.setVisibility(isOne ? View.GONE : View.VISIBLE); - - int drawable = RoomRankDialogUtils.getNumberImage(seqNo); - if (drawable != 0) { - ivNumber.setVisibility(View.VISIBLE); - mMineRanking.setVisibility(View.GONE); - ivNumber.setImageResource(drawable); - } else { - ivNumber.setVisibility(View.GONE); - mMineRanking.setVisibility(View.VISIBLE); - } - } - } - - @Override - public void showTop3Info(List dataInfoList) { - if (dataInfoList == null) { - dataInfoList = new ArrayList<>(); - } - for (int i = 0; i < dataInfoList.size(); i++) { - RoomRankHalfHourRankInfo rankInfo = dataInfoList.get(i); - if (rankInfo == null) { - return; - } - if (i == 0) { - ImageLoadUtils.loadAvatar(mContext, rankInfo.getAvatar(), mTop1Avatar, true);// 头像 - mTop1Id.setText("ID:" + rankInfo.getErbanNo()); - mTop1Name.setText(rankInfo.getRoomTitle()); - mTop1AvatarDF.setImageResource(R.drawable.icon_consume_first); - tvRankHalfOne.setVisibility(View.VISIBLE); - mTop1Layout.setOnClickListener(view -> goToUserInfoPage(rankInfo.getUid())); - } - if (i == 1) { - ImageLoadUtils.loadAvatar(mContext, rankInfo.getAvatar(), mTop2Avatar, true);// 头像 - mTop2Id.setText("ID:" + rankInfo.getErbanNo()); - mTop2Value.setText("距前一名 " + RoomRankDialogUtils.getRoomRankValueText(rankInfo.getTotalNum()));// 经验值 - mTop2Name.setText(rankInfo.getRoomTitle()); - mTop2AvatarDF.setImageResource(R.drawable.icon_consume_second); - mTop2Layout.setOnClickListener(view -> goToUserInfoPage(rankInfo.getUid())); - } - if (i == 2) { - ImageLoadUtils.loadAvatar(mContext, rankInfo.getAvatar(), mTop3Avatar, true);// 头像 - mTop3Id.setText("ID:" + rankInfo.getErbanNo()); - mTop3Value.setText("距前一名 " + RoomRankDialogUtils.getRoomRankValueText(rankInfo.getTotalNum()));// 经验值 - mTop3Name.setText(rankInfo.getRoomTitle()); - mTop3AvatarDF.setImageResource(R.drawable.icon_consume_third); - mTop3Layout.setOnClickListener(view -> goToUserInfoPage(rankInfo.getUid())); - } - } - switch (dataInfoList.size()) { - case 0: - mTop1AvatarDF.setImageResource(R.drawable.icon_consume_first_empty); - mTop1Avatar.setVisibility(View.GONE); - tvRankHalfOne.setVisibility(View.GONE); - mTop1Id.setText(""); - - case 1: - mTop2AvatarDF.setImageResource(R.drawable.icon_consume_second_empty); - mTop2Avatar.setVisibility(View.GONE); - mTop2Id.setText(""); - mTop2Value.setText(""); - - case 2: - mTop3AvatarDF.setImageResource(R.drawable.icon_consume_third_empty); - mTop3Avatar.setVisibility(View.GONE); - mTop3Id.setText(""); - mTop3Value.setText(""); - break; - } - } - - @Override - public void showRankListInfo(List dataList) { - if (dataList == null) { - dataList = new ArrayList<>(); - } - mAdapter.replaceData(dataList); - if (dataList.size() > 0) { - mRoomRankRecycler.setVisibility(View.VISIBLE); - nestedScrollView.scrollTo(0, 0); - } else { - mRoomRankRecycler.setVisibility(View.GONE); - } - } - - @Override - public void loadDataFailure() { - mRefreshLayout.finishRefresh(); - showMeInfo(null/*, 0, ""*/); - showTop3Info(null); - showRankListInfo(null); - } - - @Override - public void onClick(View view) { - int id = view.getId(); - if (id == R.id.tv_room_rank_half_hour_tab) {// 半小时榜 - goToChangePage(0); - } else if (id == R.id.tv_room_rank_in_room_tab) {// 房内榜 - goToChangePage(1); - } - } - - /** - * 修改最外层Dialog的显示页面 - */ - private void goToChangePage(int pos) { - if (changePageListener != null) { - changePageListener.onChangePage(pos); - } - } - - public void setDismissListener(IRoomRankDialogDismissListener dismissListener) { - this.dismissListener = dismissListener; - } - - public void setChangePageListener(IRoomRankDialogChangePageListener changePageListener) { - this.changePageListener = changePageListener; - } -} diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RankNavigatorAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/RankNavigatorAdapter.java index d668be31d..4bd84a472 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RankNavigatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/RankNavigatorAdapter.java @@ -2,7 +2,9 @@ package com.yizhuan.erban.avroom.widget; import android.content.Context; import android.graphics.Color; + import androidx.core.content.ContextCompat; + import android.view.ViewGroup; import android.widget.FrameLayout; @@ -13,6 +15,7 @@ import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.C import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import java.util.ArrayList; import java.util.List; @@ -29,7 +32,9 @@ public class RankNavigatorAdapter extends CommonNavigatorAdapter { public RankNavigatorAdapter() { mTitleList.add("日榜"); mTitleList.add("周榜"); -// mTitleList.add("总榜"); + if (AvRoomDataManager.get().isDatingMode()) { + mTitleList.add("月榜"); + } } @Override diff --git a/app/src/main/res/layout/fragment_room_charm_list.xml b/app/src/main/res/layout/fragment_room_charm_list.xml index 30358eb9b..e990286a2 100644 --- a/app/src/main/res/layout/fragment_room_charm_list.xml +++ b/app/src/main/res/layout/fragment_room_charm_list.xml @@ -16,7 +16,7 @@ diff --git a/app/src/main/res/layout/fragment_room_contribute.xml b/app/src/main/res/layout/fragment_room_contribute.xml index 119ae1ba9..b0355ac1e 100644 --- a/app/src/main/res/layout/fragment_room_contribute.xml +++ b/app/src/main/res/layout/fragment_room_contribute.xml @@ -12,7 +12,7 @@ diff --git a/app/src/main/res/layout/fragment_room_rank_half_hour.xml b/app/src/main/res/layout/fragment_room_rank_half_hour.xml deleted file mode 100644 index 0b32c2e2d..000000000 --- a/app/src/main/res/layout/fragment_room_rank_half_hour.xml +++ /dev/null @@ -1,405 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeDataInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeDataInfo.java index 7727c6436..537fdd85a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeDataInfo.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeDataInfo.java @@ -13,6 +13,7 @@ public class RoomContributeDataInfo implements Parcelable { public static final String TYPE_ROOM_TOTAL_RANKING = "total"; public static final String TYPE_ROOM_WEEK_RANKING = "week"; + public static final String TYPE_ROOM_MONTH_RANKING = "month"; public static final String TYPE_ROOM_DAY_RANKING = "day"; private RoomContributeRoomInfo room;