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

pk房完成，剩余禁止对方麦未完成

Browse Source 
拍卖房完成
点歌房完成，音乐播放需要测试
This commit is contained in:
梁小江
2025-07-04 16:38:21 +08:00
parent 4c7e996706
commit 2d510ffe2a
640 changed files with 698375 additions and 163954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modulevoice/src/main/java/com/example/modulevoice/adapter/CarouselBannerAdapter.java
View File

@@ -24,11 +24,11 @@ public class CarouselBannerAdapter extends BaseBannerAdapter<TopRoom> {
}
@Override
protected void bindData(BaseViewHolder<TopRoom> holder, TopRoom data, int position, int pageSize) {
ImageUtils.loadHeadCC(data.getCover_picture(), holder.itemView.findViewById(R.id.iv_follow_bg));
ImageUtils.loadHeadCC(data.getRoom_cover(), holder.itemView.findViewById(R.id.iv_follow_bg));
TextView textView= holder.itemView.findViewById(R.id.tv_num);
TextView textView2= holder.itemView.findViewById(R.id.tv_room_name);
textView.setText(data.getUser_count()+"人");
textView.setText(data.getUser_list().size()+"人");
textView2.setText(data.getRoom_name());
ImageView iv = holder.itemView.findViewById(R.id.iv_play);
// if (item.getOn_line().equals("1")){

2
modulevoice/src/main/java/com/example/modulevoice/adapter/CarouselImgAdapter.java
View File

@@ -13,6 +13,6 @@ public class CarouselImgAdapter extends BaseQuickAdapter<TopRoom.UserList, BaseV
@Override
protected void convert(BaseViewHolder helper, TopRoom.UserList item) {
ImageUtils.loadHeadCC(item.getHead_picture(), helper.getView(R.id.riv_user_head));
ImageUtils.loadHeadCC(item.getAvatar(), helper.getView(R.id.riv_user_head));
}
}

33
modulevoice/src/main/java/com/example/modulevoice/adapter/HotAdapter.java
View File

@@ -11,14 +11,15 @@ import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.example.modulevoice.R;
import com.qxcm.moduleutil.bean.RoomModel;
import com.qxcm.moduleutil.bean.TopRoom;
import com.qxcm.moduleutil.utils.ARouteConstants;
import com.qxcm.moduleutil.utils.ImageUtils;
import com.qxcm.moduleutil.utils.logger.Logger;
import java.util.List;
public class HotAdapter extends BaseMultiItemQuickAdapter<RoomModel, BaseViewHolder> {
public HotAdapter(List<RoomModel> data) {
public class HotAdapter extends BaseMultiItemQuickAdapter<TopRoom, BaseViewHolder> {
public HotAdapter(List<TopRoom> data) {
super(data);
// addItemType(1, R.layout.index_rv_item_room_hot1);
addItemType(1, R.layout.index_rv_item_room_hot0);
@@ -27,24 +28,24 @@ public class HotAdapter extends BaseMultiItemQuickAdapter<RoomModel, BaseViewHol
}
@Override
protected void convert(BaseViewHolder helper, RoomModel item) {
protected void convert(BaseViewHolder helper, TopRoom item) {
ImageUtils.loadHeadCC(item.getRoomPicture(), helper.getView(R.id.iv_follow_bg));
if (item.getLabel_id().equals("23")){
helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.diang_c);
}else if (item.getLabel_id().equals("108")){
helper.setImageResource(R.id.iv_type, R.mipmap.jiaoyou);
}else if (item.getLabel_id().equals("101")){
helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.youxi);
}else if (item.getLabel_id().equals("120")){//女神
helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.nvshen);
}else if (item.getLabel_id().equals("121")){//男神
helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.nans);
}
ImageUtils.loadHeadCC(item.getRoom_cover(), helper.getView(R.id.iv_follow_bg));
// if (item.getLabel_id().equals("23")){
// helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.diang_c);
// }else if (item.getLabel_id().equals("108")){
// helper.setImageResource(R.id.iv_type, R.mipmap.jiaoyou);
// }else if (item.getLabel_id().equals("101")){
// helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.youxi);
// }else if (item.getLabel_id().equals("120")){//女神
// helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.nvshen);
// }else if (item.getLabel_id().equals("121")){//男神
// helper.setImageResource(R.id.iv_type, com.qxcm.moduleutil.R.mipmap.nans);
// }
helper.setText(R.id.tv_name, item.getRoom_name());
ImageView iv = helper.getView(R.id.iv_play);
ImageUtils.loadRes(com.qxcm.moduleutil.R.drawable.voice_play, iv);
helper.setText(R.id.tv_num, item.getPopularity());
helper.setText(R.id.tv_num, item.getHot_value());
helper.itemView.setOnClickListener(new View.OnClickListener() {
@Override

8
modulevoice/src/main/java/com/example/modulevoice/contacts/HotListContacts.java
View File

@@ -6,15 +6,15 @@ import android.app.Activity;
import com.qxcm.moduleutil.activity.IPresenter;
import com.qxcm.moduleutil.activity.IView;
import com.qxcm.moduleutil.bean.HomeBean;
import com.qxcm.moduleutil.bean.RoomModel;
import com.qxcm.moduleutil.bean.TopRoom;
import java.util.List;
public final class HotListContacts {
public class HotListContacts {
public interface View extends IView<Activity> {
void roomList(List<RoomModel> data);
void roomList(List<TopRoom> data, int type);
void finishRefreshLoadMore();
@@ -22,7 +22,7 @@ public final class HotListContacts {
}
public interface IHotListPre extends IPresenter {
void getRoomList(String type);
void getRoomList(int type,String page,String page_limit,String is_top,String label_id);
void getMoreRoomList(String userId);

4
modulevoice/src/main/java/com/example/modulevoice/contacts/VoiceCategoryContacts.java
View File

@@ -22,7 +22,7 @@ public final class VoiceCategoryContacts {
void setRoomId(String roomId);
void setTopRoom(List<TopRoom> topRooms);
void setTopRoom(List<TopRoom> topRooms,int type);
}
public interface IIndexCategoryPre extends IPresenter {
@@ -30,6 +30,6 @@ public final class VoiceCategoryContacts {
void getMediaRoom(String type);
void getCarousels();
void getCarousels(int type, int page,String page_limit,String is_top,String label_id);
}
}

63
modulevoice/src/main/java/com/example/modulevoice/fragment/HotListFragment.java
View File

@@ -17,23 +17,26 @@ import com.example.modulevoice.presenter.HotListPresenter;
import com.qxcm.moduleutil.base.BaseMvpFragment;
import com.qxcm.moduleutil.bean.HomeBean;
import com.qxcm.moduleutil.bean.RoomModel;
import com.qxcm.moduleutil.bean.TopRoom;
import com.qxcm.moduleutil.utils.ARouteConstants;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import org.greenrobot.eventbus.EventBus;
import java.util.List;
public class HotListFragment extends BaseMvpFragment<HotListPresenter, FragmentHotListBinding> implements HotListContacts.View {
private String type;
private String label_id;
private HotAdapter mAdapter;
private String tag;
private int page;
public static HotListFragment newInstance(String type,String tag) {
public static HotListFragment newInstance(String type, String tag) {
Bundle args = new Bundle();
args.putString("type", type);
args.putString("label_id", type);
args.putString("tag", tag);
HotListFragment fragment = new HotListFragment();
fragment.setArguments(args);
@@ -43,7 +46,7 @@ public class HotListFragment extends BaseMvpFragment<HotListPresenter, FragmentH
@Override
public void initArgs(Bundle arguments) {
super.initArgs(arguments);
type = arguments.getString("type");
label_id = arguments.getString("label_id");
tag = arguments.getString("tag");
}
@@ -54,18 +57,14 @@ public class HotListFragment extends BaseMvpFragment<HotListPresenter, FragmentH
@Override
protected void initData() {
if (Integer.parseInt(type)<0){
MvpPre.getRoomListTow();
}else {
MvpPre.getRoomList(type);
}
MvpPre.getRoomList(2, "1", "10", "1", label_id);
}
@Override
protected void initView() {
if(tag.equals(VoiceCategoryFragment.TYPE_HOT)){
if (tag.equals(VoiceCategoryFragment.TYPE_HOT)) {
mBinding.tvHot.setVisibility(View.VISIBLE);
}else {
} else {
mBinding.tvHot.setVisibility(View.GONE);
}
@@ -87,24 +86,27 @@ public class HotListFragment extends BaseMvpFragment<HotListPresenter, FragmentH
}
});
mBinding.recycleView.setLayoutManager(gridLayoutManager);
mBinding.smartRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
@Override
public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
page++;
MvpPre.getRoomList(2, page+"", "10", "1", label_id);
}
@Override
public void onRefresh(@NonNull RefreshLayout refreshLayout) {
// EventBus.getDefault().post(new BannerRefreshEvent());
if (Integer.parseInt(type)<0){
MvpPre.getRoomListTow();
}else {
MvpPre.getRoomList(type);
}
page = 1;
MvpPre.getRoomList(2, page+"", "10", "1", label_id);
}
});
mAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
RoomModel item = mAdapter.getItem(position);
TopRoom item = mAdapter.getItem(position);
if (item != null) {
// ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("form","首页热门列表").withString("roomId", item.getId()).navigation();
ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form","首页热门列表").withString("roomId", item.getRoom_id()).navigation();
ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()).navigation();
}
}
});
@@ -116,25 +118,10 @@ public class HotListFragment extends BaseMvpFragment<HotListPresenter, FragmentH
}
@Override
public void roomList(List<RoomModel> data) {
// switch (data.size()) {
// case 0:
// break;
// case 1:
// data.get(0).setItemViewType(1);
// break;
// case 2:
// data.get(0).setItemViewType(1);
// data.get(1).setItemViewType(1);
// break;
// default:
// data.get(0).setItemViewType(1);
// data.get(1).setItemViewType(1);
// data.get(2).setItemViewType(1);
// break;
// }
//
mAdapter.setNewData(data);
public void roomList(List<TopRoom> data, int type) {
if (data!=null) {
mAdapter.setNewData(data);
}
}
@Override

16
modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceCategoryFragment.java
View File

@@ -14,6 +14,7 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import com.alibaba.android.arouter.launcher.ARouter;
import com.example.modulevoice.R;
import com.example.modulevoice.adapter.CarouselBannerAdapter;
import com.example.modulevoice.contacts.VoiceCategoryContacts;
@@ -24,6 +25,7 @@ import com.qxcm.moduleutil.base.BaseMvpFragment;
import com.qxcm.moduleutil.bean.BannerModel;
import com.qxcm.moduleutil.bean.RoomTypeModel;
import com.qxcm.moduleutil.bean.TopRoom;
import com.qxcm.moduleutil.utils.ARouteConstants;
import com.qxcm.moduleutil.utils.ImageUtils;
import com.stx.xhb.xbanner.XBanner;
import com.sunfusheng.marqueeview.MarqueeView;
@@ -80,7 +82,7 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
@Override
protected void initData() {
MvpPre.getBanners();
MvpPre.getCarousels();//顶部推荐
MvpPre.getCarousels(1,1,"10","2","");//顶部推荐
MvpPre.getCategories();
}
@@ -151,10 +153,10 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
ToastUtils.show("点击了第 " + position + " 个 item");
// 示例：跳转到房间详情页
if (data != null) {
// ARouter.getInstance().build(ARouteConstants.LIVE_ROOM)
// .withString("form", "首页热门列表")
// .withString("roomId", data.getId())
// .navigation();
ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS)
.withString("form", "首页热门列表")
.withString("roomId", data.getRoom_id())
.navigation();
}
});
List<String> info = new ArrayList<>();
@@ -204,7 +206,7 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
}
@Override
public void setTopRoom(List<TopRoom> topRooms) {
public void setTopRoom(List<TopRoom> topRooms,int type) {
// if (topRooms == null || topRooms.isEmpty() || topRooms.size() < 1) {
// mBinding.constraintLayout.setVisibility(View.GONE);
// return;
@@ -245,7 +247,7 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
@Override
public CharSequence getPageTitle(int position) {
RoomTypeModel model = list.get(position);
return model.getName();
return model.getLabel_name();
}
}
}

7
modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceFragment.java
View File

@@ -7,6 +7,7 @@ import android.util.Log;
import androidx.fragment.app.Fragment;
import com.alibaba.android.arouter.launcher.ARouter;
import com.example.modulevoice.R;
import com.example.modulevoice.activity.RankingListActivity;
import com.example.modulevoice.activity.SearchActivity;
@@ -19,6 +20,7 @@ import com.qxcm.moduleutil.dialog.FirstChargeDialog;
import com.qxcm.moduleutil.dialog.HeavenGiftDialog;
import com.qxcm.moduleutil.dialog.InviteDialog;
import com.qxcm.moduleutil.dialog.YouthModelDialog;
import com.qxcm.moduleutil.utils.ARouteConstants;
import java.util.ArrayList;
import java.util.List;
@@ -48,10 +50,7 @@ public class VoiceFragment extends BaseMvpFragment<VoicePresenter, FragmentVoice
mBinding.ivRoom.setOnClickListener(v -> {
//我的房间
// if (mMyInfoResp != null) {
// ARouter.getInstance().build(ARouteConstants.MY_ROOM_LIST).withString("from", "我的界面").withString("roomId", mMyInfoResp.getRoom_id())
// .withInt("auth_status", mMyInfoResp.getAuth_status()).withString("roomId", mMyInfoResp.getRoom_id()).navigation();
// }
ARouter.getInstance().build(ARouteConstants.MY_ROOM).navigation();
});
// mBinding.ivRoom2.setOnClickListener(v -> {

146
modulevoice/src/main/java/com/example/modulevoice/presenter/HotListPresenter.java
View File

@@ -5,8 +5,13 @@ import android.content.Context;
import com.example.modulevoice.contacts.HotListContacts;
import com.google.gson.reflect.TypeToken;
import com.qxcm.moduleutil.bean.RoomModel;
import com.qxcm.moduleutil.bean.TopRoom;
import com.qxcm.moduleutil.http.BaseObserver;
import com.qxcm.moduleutil.presenter.BasePresenter;
import com.qxcm.moduleutil.utils.GsonUtils;
import com.qxcm.moduleutil.utils.SpUtil;
import java.lang.ref.WeakReference;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
@@ -14,73 +19,42 @@ import java.util.List;
import io.reactivex.disposables.Disposable;
public class HotListPresenter extends BasePresenter<HotListContacts.View> implements HotListContacts.IHotListPre {
HotListContacts.View mView;
public HotListPresenter(HotListContacts.View view, Context context) {
super(view, context);
mView = view;
}
@Override
public void getRoomList(String type) {
// Type listType = new TypeToken<List<RoomModel>>() {}.getType();
// List<RoomModel> restoredRoomModels = GsonUtils.getGSON().fromJson(SpUtils.getRoomModel(), listType);
// if (restoredRoomModels != null && restoredRoomModels.size() > 0) {
// MvpRef.get().roomList(restoredRoomModels);
// }
// ApiClient.getInstance().getHotRoomList(type,new BaseObserver<List<RoomModel>>() {
// @Override
// public void onSubscribe(Disposable d) {
// addDisposable(d);
// }
//
// @Override
// public void onNext(List<RoomModel> roomModels) {
//
//// MvpRef.get().roomList(roomModels);
// String newHomeBeanJson = GsonUtils.getGSON().toJson(roomModels);
// // 从本地缓存中读取现有的数据
// String existingHomeBeanJson = SpUtils.getRoomModel();
// // 比较新获取的数据和缓存中的数据是否一致
// if (!newHomeBeanJson.equals(existingHomeBeanJson)) {
// // 如果不一致，保存新数据到本地缓存
// SpUtils.setRoomModel(newHomeBeanJson);
// // 并调用方法处理新数据
// MvpRef.get().roomList(roomModels);
// }else {
// MvpRef.get().finishRefreshLoadMore();
// }
//
// }
//
//
// @Override
// public void onComplete() {
// MvpRef.get().finishRefreshLoadMore();
// }
// });
List<RoomModel> roomModels = new ArrayList<RoomModel>();
for (int i = 0; i < 5; i++) {
RoomModel roomModel = new RoomModel();
roomModel.setRoom_id("1");
roomModel.setRoom_code("1");
roomModel.setUser_id("1");
roomModel.setRoom_name("房间名称"+i);
roomModel.setLabel_id("23");
roomModel.setType_id("1");
roomModel.setPopularity("1");
roomModel.setLabel_name("1");
roomModel.setOwner_picture("1");
roomModel.setOwner_sex("1");
roomModel.setHolder("1");
roomModel.setHolder_picture("1");
roomModel.setHolder_sex("1");
roomModel.setOwner_nickname("名称"+i);
roomModel.setHolder_nickname("h名称"+i);
roomModel.setIs_owner(1);
roomModel.setLocked(1);
public void getRoomList(int type, String page, String page_limit, String is_top, String label_id) {
Type listType = new TypeToken<List<TopRoom>>() {}.getType();
List<TopRoom> restoredRoomModels = GsonUtils.getGSON().fromJson(SpUtil.getTopRoom(), listType);
if (restoredRoomModels!= null && restoredRoomModels.size() > 0) {
MvpRef.get().roomList(restoredRoomModels, type);
}
api.getTopRooms(page+"",page_limit,is_top,label_id,new BaseObserver<List<TopRoom>>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
}
roomModels.add(roomModel);
}
MvpRef.get().roomList(roomModels);
@Override
public void onNext(List<TopRoom> topRooms) {
if (MvpRef==null){
MvpRef=new WeakReference<>(mView);
}
HotListContacts.View view = MvpRef.get();
if (view != null) {
if (topRooms != null) {
SpUtil.setTopRoom(GsonUtils.getGSON().toJson(topRooms));
view.roomList(topRooms, type);
} else {
view.roomList(new ArrayList<>(), type);
}
}
}
});
}
@Override
@@ -164,30 +138,30 @@ public class HotListPresenter extends BasePresenter<HotListContacts.View> implem
// }
// });
List<RoomModel> roomModels = new ArrayList<RoomModel>();
for (int i = 0; i < 5; i++) {
RoomModel roomModel = new RoomModel();
roomModel.setRoom_id("1");
roomModel.setRoom_code("1");
roomModel.setUser_id("1");
roomModel.setRoom_name("房间名称"+i);
roomModel.setLabel_id("23");
roomModel.setType_id("1");
roomModel.setPopularity("1");
roomModel.setLabel_name("1");
roomModel.setOwner_picture("1");
roomModel.setOwner_sex("1");
roomModel.setHolder("1");
roomModel.setHolder_picture("1");
roomModel.setHolder_sex("1");
roomModel.setOwner_nickname("名称"+i);
roomModel.setHolder_nickname("h名称"+i);
roomModel.setIs_owner(1);
roomModel.setLocked(1);
roomModels.add(roomModel);
}
MvpRef.get().roomList(roomModels);
// List<RoomModel> roomModels = new ArrayList<RoomModel>();
// for (int i = 0; i < 5; i++) {
// RoomModel roomModel = new RoomModel();
// roomModel.setRoom_id("1");
// roomModel.setRoom_code("1");
// roomModel.setUser_id("1");
// roomModel.setRoom_name("房间名称"+i);
// roomModel.setLabel_id("23");
// roomModel.setType_id("1");
// roomModel.setPopularity("1");
// roomModel.setLabel_name("1");
// roomModel.setOwner_picture("1");
// roomModel.setOwner_sex("1");
// roomModel.setHolder("1");
// roomModel.setHolder_picture("1");
// roomModel.setHolder_sex("1");
// roomModel.setOwner_nickname("名称"+i);
// roomModel.setHolder_nickname("h名称"+i);
// roomModel.setIs_owner(1);
// roomModel.setLocked(1);
//
// roomModels.add(roomModel);
// }
//
// MvpRef.get().roomList(roomModels);
}
}

178
modulevoice/src/main/java/com/example/modulevoice/presenter/VoiceCategoryPresenter.java
View File

@@ -4,14 +4,21 @@ import android.content.Context;
import android.speech.tts.Voice;
import com.example.modulevoice.contacts.VoiceCategoryContacts;
import com.google.gson.reflect.TypeToken;
import com.qxcm.moduleutil.bean.BannerModel;
import com.qxcm.moduleutil.bean.RoomTypeModel;
import com.qxcm.moduleutil.bean.TopRoom;
import com.qxcm.moduleutil.http.BaseObserver;
import com.qxcm.moduleutil.presenter.BasePresenter;
import com.qxcm.moduleutil.utils.GsonUtils;
import com.qxcm.moduleutil.utils.SpUtil;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import io.reactivex.disposables.Disposable;
public class VoiceCategoryPresenter extends BasePresenter<VoiceCategoryContacts.View> implements VoiceCategoryContacts.IIndexCategoryPre {
public VoiceCategoryPresenter(VoiceCategoryContacts.View view, Context context) {
super(view, context);
@@ -19,39 +26,35 @@ public class VoiceCategoryPresenter extends BasePresenter<VoiceCategoryContacts.
@Override
public void getCategories() {
// Type listType = new TypeToken<List<RoomTypeModel>>() {}.getType();
// List<RoomTypeModel> restoredRoomModels = GsonUtils.getGSON().fromJson(SpUtils.getRoomTypeModel(), listType);
// if (restoredRoomModels!= null && restoredRoomModels.size() > 0) {
// MvpRef.get().setCategories(restoredRoomModels);
// }
// ApiClient.getInstance().getRoomCategories(new BaseObserver<List<RoomTypeModel>>() {
// @Override
// public void onSubscribe(Disposable d) {
// addDisposable(d);
// }
//
// @Override
// public void onNext(List<RoomTypeModel> list) {
// SpUtils.setRoomTypeModel(GsonUtils.getGSON().toJson(list));
// MvpRef.get().setCategories(list);
// }
//
// @Override
// public void onComplete() {
//// MvpRef.get().disLoadings();
// }
// });
List<RoomTypeModel> list = new ArrayList<RoomTypeModel>();
for (int i = 0; i < 5; i++) {
RoomTypeModel roomTypeModel = new RoomTypeModel();
roomTypeModel.setId(i+"");
roomTypeModel.setName("分类"+i);
roomTypeModel.setSort(i+"");
roomTypeModel.setType("1");
list.add(roomTypeModel);
Type listType = new TypeToken<List<RoomTypeModel>>() {}.getType();
List<RoomTypeModel> restoredRoomModels = GsonUtils.getGSON().fromJson(SpUtil.getRoomTypeModel(), listType);
if (restoredRoomModels!= null && restoredRoomModels.size() > 0) {
MvpRef.get().setCategories(restoredRoomModels);
}
MvpRef.get().setCategories(list);
api.getRoomCategories(new BaseObserver<List<RoomTypeModel>>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
}
@Override
public void onNext(List<RoomTypeModel> list) {
SpUtil.setRoomTypeModel(GsonUtils.getGSON().toJson(list));
MvpRef.get().setCategories(list);
}
});
// List<RoomTypeModel> list = new ArrayList<RoomTypeModel>();
// for (int i = 0; i < 5; i++) {
// RoomTypeModel roomTypeModel = new RoomTypeModel();
// roomTypeModel.setId(i+"");
// roomTypeModel.setName("分类"+i);
// roomTypeModel.setSort(i+"");
// roomTypeModel.setType("1");
// list.add(roomTypeModel);
// }
// MvpRef.get().setCategories(list);
}
@Override
@@ -111,57 +114,68 @@ public class VoiceCategoryPresenter extends BasePresenter<VoiceCategoryContacts.
MvpRef.get().setBanners(bannerModels);
}
@Override
public void getCarousels() {
// Type listType = new TypeToken<List<TopRoom>>() {}.getType();
// List<TopRoom> restoredRoomModels = GsonUtils.getGSON().fromJson(SpUtils.getTopRoom(), listType);
// if (restoredRoomModels!= null && restoredRoomModels.size() > 0) {
// MvpRef.get().setTopRoom(restoredRoomModels);
// }
// ApiClient.getInstance().getTopRooms(new BaseObserver<List<TopRoom>>() {
// @Override
// public void onSubscribe(Disposable d) {
// addDisposable(d);
// }
//
// @Override
// public void onNext(List<TopRoom> topRooms) {
// SpUtils.setTopRoom(GsonUtils.getGSON().toJson(topRooms));
//// List<TopRoom> topRooms1 = new ArrayList<TopRoom>();
//// for (int i = 0; i < 5; i++) {
//// TopRoom topRoom = topRooms.get(0);
//// topRooms1.add(topRoom);
//// }
////
//
// MvpRef.get().setTopRoom(topRooms);
//
// }
//
// @Override
// public void onComplete() {
//
// }
// });
public void getCarousels(int type, int page, String page_limit, String is_top, String label_id) {
if (type == 1) {//这是获取顶部的推荐房间
Type listType = new TypeToken<List<TopRoom>>() {}.getType();
List<TopRoom> restoredRoomModels = GsonUtils.getGSON().fromJson(SpUtil.getTopRoomTop(), listType);
if (restoredRoomModels!= null && restoredRoomModels.size() > 0) {
MvpRef.get().setTopRoom(restoredRoomModels,type);
}
api.getTopRooms(page+"",page_limit,is_top,label_id,new BaseObserver<List<TopRoom>>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
}
List<TopRoom> topRooms = new ArrayList<TopRoom>();
for (int i = 0; i < 5; i++) {
TopRoom topRoom = new TopRoom();
topRoom.setRoom_name("名："+i);
topRoom.setCover_picture("");
topRoom.setUser_count("123");
topRoom.setUser_list(new ArrayList<TopRoom.UserList>());
TopRoom.UserList userList = new TopRoom.UserList();
userList.setHead_picture("");
topRoom.getUser_list().add(userList);
topRoom.setOn_line("123");
topRoom.setChatrooms("123");
topRoom.setPopularity("123");
topRoom.setRoom_id("123");
topRoom.setLabel_id("123");
topRoom.setVoice("123");
topRoom.setUser_id("123");
topRooms.add(topRoom);
@Override
public void onNext(List<TopRoom> topRooms) {
SpUtil.setTopRoomTop(GsonUtils.getGSON().toJson(topRooms));
MvpRef.get().setTopRoom(topRooms,type);
}
});
}else if (type == 2){//这是获取所有房间
Type listType = new TypeToken<List<TopRoom>>() {}.getType();
List<TopRoom> restoredRoomModels = GsonUtils.getGSON().fromJson(SpUtil.getTopRoom(), listType);
if (restoredRoomModels!= null && restoredRoomModels.size() > 0) {
MvpRef.get().setTopRoom(restoredRoomModels, type);
}
api.getTopRooms(page+"",page_limit,is_top,label_id,new BaseObserver<List<TopRoom>>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
}
@Override
public void onNext(List<TopRoom> topRooms) {
SpUtil.setTopRoom(GsonUtils.getGSON().toJson(topRooms));
MvpRef.get().setTopRoom(topRooms,type);
}
});
}
MvpRef.get().setTopRoom(topRooms);
// List<TopRoom> topRooms = new ArrayList<TopRoom>();
// for (int i = 0; i < 5; i++) {
// TopRoom topRoom = new TopRoom();
// topRoom.setRoom_name("名："+i);
// topRoom.setCover_picture("");
// topRoom.setUser_count("123");
// topRoom.setUser_list(new ArrayList<TopRoom.UserList>());
// TopRoom.UserList userList = new TopRoom.UserList();
// userList.setHead_picture("");
// topRoom.getUser_list().add(userList);
// topRoom.setOn_line("123");
// topRoom.setChatrooms("123");
// topRoom.setPopularity("123");
// topRoom.setRoom_id("123");
// topRoom.setLabel_id("123");
// topRoom.setVoice("123");
// topRoom.setUser_id("123");
// topRooms.add(topRoom);
// }
// MvpRef.get().setTopRoom(topRooms);
}
}

11
modulevoice/src/main/res/drawable/index_level_search.xml
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@mipmap/index_level_search_o"
android:maxLevel="1" />
<item
android:drawable="@mipmap/index_icon_close"
android:maxLevel="2" />
</level-list>

4
modulevoice/src/main/res/layout/fragment_hot_list.xml
View File

@@ -6,8 +6,8 @@
android:id="@+id/smart_refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:srlEnableLoadMore="false"
app:srlEnableRefresh="true">
app:srlEnableLoadMore="true"
app:srlEnableRefresh="false">
<LinearLayout
android:layout_width="match_parent"