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

修改可以使用

Browse Source
This commit is contained in:
liangxiaojiang
2025-07-17 22:46:35 +08:00
parent 4a7e96473a
commit 7f0df85123
114 changed files with 267690 additions and 266676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java
View File

@@ -51,6 +51,8 @@ import com.lzf.easyfloat.EasyFloat;
import com.petterp.floatingx.assist.helper.FxScopeHelper;
import com.petterp.floatingx.listener.control.IFxControl;
import com.qxcm.moduleutil.base.CommonAppContext;
import com.qxcm.moduleutil.bean.HeadlineBean;
import com.qxcm.moduleutil.bean.HeadlineEvent;
import com.qxcm.moduleutil.bean.UserInfo;
import com.qxcm.moduleutil.bean.room.RoomOnline;
import com.qxcm.moduleutil.databinding.RoomDialogMusicWindowOpenBinding;
@@ -86,6 +88,7 @@ import com.qxcm.moduleutil.utils.ImageUtils;
import com.qxcm.moduleutil.utils.SpUtil;
import com.qxcm.moduleutil.widget.CustomMusicFloatingView;
import com.qxcm.moduleutil.widget.MusicView;
import com.qxcm.moduleutil.widget.SilentCountDownTimer;
import com.qxcm.moduleutil.widget.ViewUtils;
import com.qxcm.moduleutil.widget.floatingView.FloatingMagnetView;
import com.tencent.imsdk.v2.V2TIMCallback;
@@ -133,6 +136,9 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
private boolean isFullScreen = false;
private ImageView ivExitFullscreen;
ImageView ivQuan;
private boolean imYc;
private SilentCountDownTimer silentCountDownTimer;
@Override
protected void onNewIntent(Intent intent) {
@@ -152,13 +158,13 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
return true;
}
return false;
}
// @Override
// public boolean onKeyDown(int keyCode, KeyEvent event) {
// if (keyCode == KeyEvent.KEYCODE_BACK) {
// return true;
// }
// return false;
// }
// 禁用系统手势导航
@@ -536,7 +542,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
public void upRoomInfo(RoomInfoResp resp) {
this.mRoomInfoResp = resp;
if (mRoomInfoResp.getRoom_info().getPit_list().get(8).getUser_id().equals(SpUtil.getUserId() + "")) {
if (mRoomInfoResp.getUser_info().getPit_number()==9 && mRoomInfoResp.getUser_info().getUser_id().equals(SpUtil.getUserId() + "")) {
mBinding.roomTop.rl.setVisibility(View.VISIBLE);
} else {
mBinding.roomTop.rl.setVisibility(View.GONE);
@@ -610,23 +616,89 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
AgoraManager.getInstance(this).stopMuisc();
initializeAudio();
toutiao();
upRoomInfo(resp);
}
public void toutiao(){
if (mRoomInfoResp.getRoom_info().getHead_line() != null) {
mBinding.flaoatZuoji.setVisibility(VISIBLE);
// 设置 OnTouchListener，强制悬浮框自己处理拖动
ImageUtils.loadHeadCC(mRoomInfoResp.getRoom_info().getHead_line().getAvatar(), mBinding.headAvate);
mBinding.headName.setText(mRoomInfoResp.getRoom_info().getHead_line().getNickname());
mBinding.headCone.setText(mRoomInfoResp.getRoom_info().getHead_line().getContent());
mBinding.cc.setOnClickListener(v -> {
mBinding.flaoatZuoji.setVisibility(GONE);
});
// mBinding.cc.setOnClickListener(v -> {
// mBinding.flaoatZuoji.setVisibility(GONE);
// });
mBinding.ivQuanQiang.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
PublishCommentDialogFragment.show(getSupportFragmentManager());
mBinding.flaoatZuoji.setVisibility(GONE);
PublishCommentDialogFragment.show(roomId,getSupportFragmentManager());
}
});
mBinding.ivQuanC.setOnClickListener(new View.OnClickListener() {//这是跟随的意思
@Override
public void onClick(View v) {
ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("from", "我的界面").withString("roomId", mRoomInfoResp.getRoom_info().getHead_line().getRoom_id() ).navigation();
}
});
mBinding.imYc.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (imYc){
mBinding.cl.setVisibility(VISIBLE);
imYc = false;
}else {
mBinding.cl.setVisibility(GONE);
imYc = true;
}
}
});
mBinding.imHq.setOnClickListener(new View.OnClickListener(){
@Override
public void onClick(View v) {
if (!imYc){
mBinding.cl.setVisibility(VISIBLE);
imYc = true;
}else {
mBinding.cl.setVisibility(GONE);
imYc = false;
}
}
});
silentCountDownTimer = new SilentCountDownTimer();
silentCountDownTimer.setOnCountDownFinishListener(() -> {
// 倒计时结束后的操作
Log.d("CountDown", "倒计时结束，执行清理或通知操作");
hideSomeViewOrDoSomething();
});
// 启动倒计时（例如：目标时间戳 1752661716）
silentCountDownTimer.start(Long.parseLong(mRoomInfoResp.getRoom_info().getHead_line().getEnd_time()));
}else {
mBinding.flaoatZuoji.setVisibility(GONE);
}
}
private void hideSomeViewOrDoSomething() {
runOnUiThread(() -> {
// 执行你需要的操作，比如隐藏某个控件
// mBinding.someView.setVisibility(View.GONE);
mBinding.flaoatZuoji.setVisibility(GONE);
});
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onHeadlineEvent(HeadlineBean event) {
mRoomInfoResp.getRoom_info().setHead_line(event);
toutiao();
}
/**
* @author qx
@@ -933,6 +1005,9 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
if (isSave) {
finish();
}
if (silentCountDownTimer != null) {
silentCountDownTimer.release();
}
super.onDestroy();
}

2
moduleroom/src/main/java/com/example/moduleroom/adapter/RankingAutcionAdapter.java
View File

@@ -57,7 +57,7 @@ public class RankingAutcionAdapter extends BaseQuickAdapter<RoomAuction.AuctionL
protected void convert(BaseViewHolder helper, RoomAuction.AuctionListBean item) {
helper.setText(R.id.room_item_seq, String.valueOf(helper.getAdapterPosition() + 4));//从第四个开始设置值
helper.setText(R.id.room_item_name, item.getNickname());
helper.setText(R.id.room_item_pop, item.getGift_price());
helper.setText(R.id.room_item_pop, item.getGift_prices());
ImageUtils.loadHeadCC(item.getAvatar(), helper.getView(R.id.room_item_head));
helper.addOnClickListener(R.id.room_item_head);

83
moduleroom/src/main/java/com/example/moduleroom/adapter/RankingCharmListAdapter.java
View File

@@ -1,9 +1,12 @@
package com.example.moduleroom.adapter;
import static com.qxcm.moduleutil.utils.UtilConfig.getContext;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -17,59 +20,71 @@ import com.qxcm.moduleutil.utils.ImageUtils;
import com.qxcm.moduleutil.utils.logger.Logger;
import com.qxcm.moduleutil.widget.BeautifulNameView;
import java.util.List;
/**
* 项目名称 qipao-android
* 包名：com.qpyy.room.adapter
* 创建人 黄强
* 创建时间 2020/7/25 10:37
* 描述 describe
*@author qx
*@data 2025/7/16
*@description: 房间榜单适配器
*/
public class RankingCharmListAdapter extends BaseQuickAdapter<CharmRankingResp.ListsBean, BaseViewHolder> {
public class RankingCharmListAdapter extends BaseQuickAdapter<CharmRankingResp, BaseViewHolder> {
private static String GG = "0";
private static String MM = "1";
public RankingCharmListAdapter() {
super(R.layout.room_rv_item_ranking);
super(R.layout.room_rv_item_ranking_rich);
}
@Override
protected void convert(BaseViewHolder helper, CharmRankingResp.ListsBean item) {
protected void convert(BaseViewHolder helper, CharmRankingResp item) {
//数据绑定赋值
helper.setText(R.id.room_item_seq, String.valueOf(helper.getAdapterPosition() + 4));//从第四个开始设置值
helper.setText(R.id.room_item_name, item.getNickname());
// ((BeautifulNameView) helper.getView(R.id.bnv_rank_list_room)).setText(String.format(mContext.getResources().getString(R.string.common_id_formatter), item.getUser_code()));
// ((BeautifulNameView) helper.getView(R.id.bnv_rank_list_room)).setTextColor(!TextUtils.isEmpty(item.getId_color()) ? Color.parseColor(item.getId_color()) : mContext.getResources().getColor(R.color.color_FFCCCCCC));
((BeautifulNameView) helper.getView(R.id.bnv_rank_list_room)).setPlay(!TextUtils.isEmpty(item.getId_color()));
((BeautifulNameView) helper.getView(R.id.bnv_rank_list_room)).setImgVisible("1".equals(item.getGood_number()));
helper.setText(R.id.room_item_pop, item.getNumber_format());
helper.setText(R.id.room_item_pop, item.getTotal());
// if (GG.equals(item.getSex())) {
// helper.setBackgroundRes(R.id.room_item_pop, R.mipmap.room_bg_wheat_charm_gg_sr);
// } else {
// helper.setBackgroundRes(R.id.room_item_pop, R.mipmap.room_bg_wheat_charm_mm_sr);
// }
ImageUtils.loadHeadCC(item.getHead_picture(), helper.getView(R.id.room_item_head));
String nobility = item.getLevel_icon();//等级
String status = item.getNobility_icon();//爵位
ImageUtils.loadImageView(item.getNobility_icon(), helper.getView(R.id.room_item_rank));
ImageUtils.loadImageView(item.getLevel_icon(), helper.getView(R.id.room_item_grade));
if (TextUtils.isEmpty(nobility)) {
helper.getView(R.id.room_item_grade).setVisibility(View.GONE);
} else {
helper.getView(R.id.room_item_grade).setVisibility(View.VISIBLE);
}
if (TextUtils.isEmpty(status)) {
helper.getView(R.id.room_item_rank).setVisibility(View.GONE);
} else {
helper.getView(R.id.room_item_rank).setVisibility(View.VISIBLE);
}
TextView textView = helper.getView(R.id.room_item_pop);
if (helper.getAdapterPosition() % 2 == 1) {
helper.getView(R.id.room_item_bg).setVisibility(View.GONE);//隔开隐藏背景
} else {
helper.getView(R.id.room_item_bg).setVisibility(View.VISIBLE);
}
ImageUtils.loadHeadCC(item.getAvatar(), helper.getView(R.id.room_item_head));
// if (TextUtils.isEmpty(nobility)) {
// helper.getView(R.id.room_item_grade).setVisibility(View.GONE);
// } else {
// helper.getView(R.id.room_item_grade).setVisibility(View.VISIBLE);
// }
// if (TextUtils.isEmpty(status)) {
// helper.getView(R.id.room_item_rank).setVisibility(View.GONE);
// } else {
// helper.getView(R.id.room_item_rank).setVisibility(View.VISIBLE);
// }
// TextView textView = helper.getView(R.id.room_item_pop);
// if (helper.getAdapterPosition() % 2 == 1) {
// helper.getView(R.id.room_item_bg).setVisibility(View.GONE);//隔开隐藏背景
// } else {
// helper.getView(R.id.room_item_bg).setVisibility(View.VISIBLE);
// }
helper.addOnClickListener(R.id.room_item_head);
LinearLayout ll = helper.getView(R.id.bnv_rank_list_rich);
List<String> images = item.getIcon(); // 获取图片列表
for (String url : images) {
if (url.contains("http")) {
ImageView imageView1 = new ImageView(getContext());
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
getContext().getResources().getDimensionPixelSize(com.qxcm.moduleutil.R.dimen.dp_37),
getContext().getResources().getDimensionPixelSize(com.qxcm.moduleutil.R.dimen.dp_15)
);
params.setMargins(0, 0, getContext().getResources().getDimensionPixelSize(com.qxcm.moduleutil.R.dimen.dp_5), 0); // 右边距
imageView1.setLayoutParams(params);
imageView1.setScaleType(ImageView.ScaleType.FIT_CENTER);
// 使用 Glide 加载图片
ImageUtils.loadHeadCC(url, imageView1);
ll.addView(imageView1);
}
}
}
@Override

18
moduleroom/src/main/java/com/example/moduleroom/contacts/DataListContacts.java
View File

@@ -20,29 +20,21 @@ public class DataListContacts {
public interface View extends IView<Activity> {
//榜一更新
void setNo1(CharmRankingResp.ListsBean listsBean);
void setNo1(WealthRankingResp.ListsBean listsBean);
void setNo1(CharmRankingResp listsBean);
//榜二更新
void setNo2(CharmRankingResp.ListsBean listsBean);
void setNo2(WealthRankingResp.ListsBean listsBean);
void setNo2(CharmRankingResp listsBean);
//榜三更新
void setNo3(CharmRankingResp.ListsBean listsBean);
void setNo3(WealthRankingResp.ListsBean listsBean);
void setNo3(CharmRankingResp listsBean);
//魅力榜和魅力榜界面更新
void setCharmView(List<CharmRankingResp.ListsBean> listsBeans);
void setWealthView(List<WealthRankingResp.ListsBean> listsBeans);
void setCharmEmpty();
void setCharmEmpty( List<CharmRankingResp> list);
void setWealthEmpty();
}
public interface IRoomDataListPre extends IPresenter {
//定义魅力榜数据访问接口
void getCharmListInfo(String roomId,int type);
void getCharmListInfo(String roomId,String type, String time_type, String page, String page_limit);
//定义财富榜数据访问接口
void getWealthListInfo(String roomId,int type);

2
moduleroom/src/main/java/com/example/moduleroom/contacts/PublishCommentContacts.java
View File

@@ -12,7 +12,7 @@ public class PublishCommentContacts {
void currentHeadline(HeadlineBean headlineBean);
}
public interface IRoomPre extends IPresenter {
void sendHeadine(String content,String money);
void sendHeadine(String content,String money,String roomId);
void currentHeadline();
}

8
moduleroom/src/main/java/com/example/moduleroom/dialog/BidListDialogFragment.java
View File

@@ -98,7 +98,7 @@ public class BidListDialogFragment extends BaseMvpDialogFragment<BidListPresente
);
params.setMargins(0, 0, getContext().getResources().getDimensionPixelSize(com.qxcm.moduleutil.R.dimen.dp_5), 0); // 右边距
imageView1.setLayoutParams(params);
imageView1.setScaleType(ImageView.ScaleType.CENTER_CROP);
imageView1.setScaleType(ImageView.ScaleType.FIT_CENTER);
// 使用 Glide 加载图片
ImageUtils.loadHeadCC(url, imageView1);
@@ -107,7 +107,7 @@ public class BidListDialogFragment extends BaseMvpDialogFragment<BidListPresente
}
}
mBinding.roomHeadTop1Label.setText(listsBean.getGift_price());
mBinding.roomHeadTop1Label.setText(listsBean.getGift_prices());
}
@Override
@@ -137,7 +137,7 @@ public class BidListDialogFragment extends BaseMvpDialogFragment<BidListPresente
}
}
mBinding.roomHeadTop2Label.setText(listsBean.getGift_price());
mBinding.roomHeadTop2Label.setText(listsBean.getGift_prices());
}
@Override
@@ -167,7 +167,7 @@ public class BidListDialogFragment extends BaseMvpDialogFragment<BidListPresente
}
}
mBinding.roomHeadTop3Label.setText(listsBean.getGift_price());
mBinding.roomHeadTop3Label.setText(listsBean.getGift_prices());
}
@Override

3
moduleroom/src/main/java/com/example/moduleroom/dialog/CardRelationshipFragment.java
View File

@@ -92,6 +92,9 @@ public class CardRelationshipFragment extends BaseMvpDialogFragment<CardRelation
// 可选：设置动画样式（从底部弹出）
window.setWindowAnimations(com.qxcm.moduleutil.R.style.CommonShowDialogBottom);
}
// 设置不可通过点击外部关闭
getDialog().setCancelable(false);
getDialog().setCanceledOnTouchOutside(false);
}
@Override
protected void initDialogStyle(Window window) {

8
moduleroom/src/main/java/com/example/moduleroom/dialog/PublishCommentDialogFragment.java
View File

@@ -27,15 +27,16 @@ import com.qxcm.moduleutil.bean.HeadlineBean;
*/
public class PublishCommentDialogFragment extends BaseMvpDialogFragment<PublishCommentPresenter, DialogPublishCommentBinding> implements PublishCommentContacts.View{
HeadlineBean headlineBean;
String roomId;
@Override
protected PublishCommentPresenter bindPresenter() {
return new PublishCommentPresenter(this, getActivity());
}
public static void show( FragmentManager fragmentManager) {
public static void show(String roomId, FragmentManager fragmentManager) {
PublishCommentDialogFragment dialogFragment = new PublishCommentDialogFragment();
Bundle args = new Bundle();
args.putString("roomId", roomId);
dialogFragment.setArguments(args);
dialogFragment.show(fragmentManager, "PublishCommentDialogFragment");
}
@@ -60,6 +61,7 @@ public class PublishCommentDialogFragment extends BaseMvpDialogFragment<PublishC
@Override
protected void initData() {
roomId=getArguments().getString("roomId");
MvpPre.currentHeadline();
}
@@ -79,7 +81,7 @@ public class PublishCommentDialogFragment extends BaseMvpDialogFragment<PublishC
ToastUtils.showShort("请输入内容");
return;
}
MvpPre.sendHeadine(mBinding.edRoomName.getText().toString().trim(),headlineBean.getNext_money() );
MvpPre.sendHeadine(mBinding.edRoomName.getText().toString().trim(),headlineBean.getNext_money(),roomId );
}
});
}

7
moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
View File

@@ -3,6 +3,7 @@ package com.example.moduleroom.dialog;
import static com.qxcm.moduleutil.bean.room.RoomSettingBean.QXRoomSettingTypeRoomOrderMic;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.Gravity;
import android.view.View;
@@ -13,6 +14,7 @@ import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentManager;
import androidx.recyclerview.widget.GridLayoutManager;
import com.alibaba.android.arouter.launcher.ARouter;
import com.blankj.utilcode.util.GsonUtils;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.example.moduleroom.R;
@@ -31,6 +33,7 @@ import com.qxcm.moduleutil.bean.RoomMessageEvent;
import com.qxcm.moduleutil.bean.RoomSettingEvent;
import com.qxcm.moduleutil.bean.room.RoomInfoResp;
import com.qxcm.moduleutil.bean.room.RoomSettingBean;
import com.qxcm.moduleutil.utils.ARouteConstants;
import com.qxcm.moduleutil.utils.SpUtil;
import org.greenrobot.eventbus.EventBus;
@@ -242,6 +245,8 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
}else if (bean.getType()==RoomSettingBean.QXRoomSettingTypeRoomTypeGirl){
}else if (bean.getType()==RoomSettingBean.QXRoomSettingTypeRoomSetting){
ARouter.getInstance().build(ARouteConstants.CREATED_ROOM).withSerializable("roomInfoResp", roomInfoResp).navigation();
}
}
@@ -290,7 +295,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
mBinding.cl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
PublishCommentDialogFragment.show(getChildFragmentManager());
PublishCommentDialogFragment.show(roomId,getChildFragmentManager());
}
});
}

6
moduleroom/src/main/java/com/example/moduleroom/dialog/RoomUserInfoFragment.java
View File

@@ -257,8 +257,8 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
Map<String, String> textMap = new HashMap<>();
textMap.put("is_manager", userInfo.getIs_manager().equals("1") ? "取消管理" : "设为管理");
textMap.put("is_host", userInfo.getIs_host().equals("1") ? "取消主持" : "设为主持");
textMap.put("is_mute", userInfo.getIs_mute().equals("1") ? "开麦" : "禁麦");
textMap.put("is_mute_pit", userInfo.getIs_mute_pit().equals("1") ? "解除禁言" : "禁言");
textMap.put("is_mute", userInfo.getIs_mute_pit().equals("1") ? "开麦" : "禁麦");
textMap.put("is_mute_pit", userInfo.getIs_mute().equals("1") ? "解除禁言" : "禁言");
switch (type) {
case 1:
@@ -292,7 +292,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
// ImageUtils.loadHeadCC(userInfo.getAvatar(), mBinding.ivAvatar);
mBinding.ivAvatar.setData(userInfo.getAvatar(), "", userInfo.getSex() + "");
mBinding.tvName.setText(userInfo.getNickname());
mBinding.tvId.setText("ID:" + userInfo.getUser_id());
mBinding.tvId.setText("ID:" + userInfo.getUser_code());
if (userInfo.getIs_in_pit() == 1) {
mBinding.roomMCz.setText("下麦");
} else {

11
moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java
View File

@@ -499,10 +499,17 @@ public class PublicScreenEaseChatFragment extends BaseMvpFragment<PublicScreenEa
}
EventBus.getDefault().post(message);
return;
}else if (message.getMsgType()==1016||message.getMsgType()==1026){
}else if (message.getMsgType()==1016){
if (message.getText().getFromUserInfo().getUser_id()==SpUtil.getUserId()) {
easeChatAdapter.addData(new EMMessageInfo(message));
}
EventBus.getDefault().post(message);
return;
}else if (message.getMsgType()==1003){
}else if (message.getMsgType()==1026){
EventBus.getDefault().post(message);
return;
}
else if (message.getMsgType()==1003){
EventBus.getDefault().post(message);
easeChatAdapter.addData(new EMMessageInfo(message));
scrollToBottomIfNeed();

161
moduleroom/src/main/java/com/example/moduleroom/fragment/RankingChildFragment.java
View File

@@ -1,10 +1,14 @@
package com.example.moduleroom.fragment;
import static com.qxcm.moduleutil.utils.UtilConfig.getContext;
import android.graphics.Color;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -92,6 +96,7 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
wAdapter.bindToRecyclerView(mBinding.rankRecycleView);
}
// onRefreshEvent(null);
MvpPre.getCharmListInfo(roomId, rankType+"", dataType+"","1","20");
}
@Override
@@ -116,7 +121,7 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
if (view.getId() == R.id.room_item_head) {
CharmRankingResp.ListsBean item = cAdapter.getItem(position);
CharmRankingResp item = cAdapter.getItem(position);
// ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", item.getUser_id()).withBoolean("returnRoom", true).navigation();
}
}
@@ -141,20 +146,14 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
return R.layout.room_ranking_child;
}
@Override
public void setNo1(CharmRankingResp.ListsBean listsBean) {//魅力排行榜一数据设值
ImageUtils.loadHeadCC(listsBean.getHead_picture(), mBinding.roomRankTop1HeadIcon);
setSexBg(mBinding.roomHeadTop1Label, listsBean.getSex());
public void setNo1(CharmRankingResp listsBean) {
ImageUtils.loadHeadCC(listsBean.getAvatar(), mBinding.roomRankTop1HeadIcon);
mBinding.roomTop1Name.setText(listsBean.getNickname());
// mBinding.bnvFirst.setText(String.format(getString(R.string.room_rank_list_id_formatter), listsBean.getUser_code()));
// mBinding.bnvFirst.setTextColor(!TextUtils.isEmpty(listsBean.getId_color()) ? Color.parseColor(listsBean.getId_color()) : getResources().getColor(R.color.color_white));
mBinding.bnvFirst.setPlay(!TextUtils.isEmpty(listsBean.getId_color()));
mBinding.bnvFirst.setImgVisible("1".equals(listsBean.getGood_number()));
mBinding.roomHeadTop1Label.setText(listsBean.getNumber_format());
mBinding.roomTop1Label.setVisibility(TextUtils.isEmpty(listsBean.getLevel_icon()) ? View.GONE : View.VISIBLE);
ImageUtils.loadImageView(listsBean.getLevel_icon(), mBinding.roomTop1Label);
mBinding.roomTop1Grade.setVisibility(TextUtils.isEmpty(listsBean.getNobility_icon()) ? View.GONE : View.VISIBLE);
ImageUtils.loadImageView(listsBean.getNobility_icon(), mBinding.roomTop1Grade);
mBinding.roomHeadTop1Label.setText(listsBean.getTotal());
setview(listsBean.getIcon(), mBinding.llVip1);
mBinding.roomRankTop1HeadIcon.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -164,40 +163,11 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
}
@Override
public void setNo1(WealthRankingResp.ListsBean listsBean) {//财富排行榜一数据设值
ImageUtils.loadHeadCC(listsBean.getHead_picture(), mBinding.roomRankTop1HeadIcon);
mBinding.roomTop1Name.setText(listsBean.getNickname());
// mBinding.bnvFirst.setText(String.format(getString(R.string.room_rank_list_id_formatter), listsBean.getUser_code()));
// mBinding.bnvFirst.setTextColor(!TextUtils.isEmpty(listsBean.getId_color()) ? Color.parseColor(listsBean.getId_color()) : getResources().getColor(R.color.color_white));
mBinding.bnvFirst.setPlay(!TextUtils.isEmpty(listsBean.getId_color()));
mBinding.bnvFirst.setImgVisible("1".equals(listsBean.getGood_number()));
mBinding.roomHeadTop1Label.setText(listsBean.getNumber_format());
mBinding.roomTop1Label.setVisibility(TextUtils.isEmpty(listsBean.getLevel_icon()) ? View.GONE : View.VISIBLE);
ImageUtils.loadImageView(listsBean.getLevel_icon(), mBinding.roomTop1Label);
mBinding.roomTop1Grade.setVisibility(TextUtils.isEmpty(listsBean.getNobility_icon()) ? View.GONE : View.VISIBLE);
ImageUtils.loadImageView(listsBean.getNobility_icon(), mBinding.roomTop1Grade);
mBinding.roomRankTop1HeadIcon.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", listsBean.getUser_id()).withBoolean("returnRoom", true).navigation();
}
});
}
@Override
public void setNo2(CharmRankingResp.ListsBean listsBean) {//魅力榜二
ImageUtils.loadHeadCC(listsBean.getHead_picture(), mBinding.roomRankTop2HeadIcon);
setSexBg(mBinding.roomHeadTop2Label, listsBean.getSex());
public void setNo2(CharmRankingResp listsBean) {
ImageUtils.loadHeadCC(listsBean.getAvatar(), mBinding.roomRankTop2HeadIcon);
mBinding.roomTop2Name.setText(listsBean.getNickname());
// mBinding.bnvSecond.setText(String.format(getString(R.string.room_rank_list_id_formatter), listsBean.getUser_code()));
// mBinding.bnvSecond.setTextColor(!TextUtils.isEmpty(listsBean.getId_color()) ? Color.parseColor(listsBean.getId_color()) : getResources().getColor(R.color.color_white));
mBinding.bnvSecond.setPlay(!TextUtils.isEmpty(listsBean.getId_color()));
mBinding.bnvSecond.setImgVisible("1".equals(listsBean.getGood_number()));
mBinding.roomHeadTop2Label.setText(listsBean.getNumber_format());
mBinding.roomTop2Label.setVisibility(TextUtils.isEmpty(listsBean.getLevel_icon()) ? View.GONE : View.VISIBLE);
ImageUtils.loadImageView(listsBean.getLevel_icon(), mBinding.roomTop2Label);
mBinding.roomTop2Grade.setVisibility(TextUtils.isEmpty(listsBean.getNobility_icon()) ? View.GONE : View.VISIBLE);
ImageUtils.loadImageView(listsBean.getNobility_icon(), mBinding.roomTop2Grade);
mBinding.roomHeadTop2Label.setText(listsBean.getTotal());
setview(listsBean.getIcon(), mBinding.llVip2);
mBinding.roomRankTop2HeadIcon.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -206,41 +176,34 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
});
}
@Override
public void setNo2(WealthRankingResp.ListsBean listsBean) {//财富榜二
ImageUtils.loadHeadCC(listsBean.getHead_picture(), mBinding.roomRankTop2HeadIcon);
mBinding.roomTop2Name.setText(listsBean.getNickname());
// mBinding.bnvSecond.setText(String.format(getString(R.string.room_rank_list_id_formatter), listsBean.getUser_code()));
// mBinding.bnvSecond.setTextColor(!TextUtils.isEmpty(listsBean.getId_color()) ? Color.parseColor(listsBean.getId_color()) : getResources().getColor(R.color.color_white));
mBinding.bnvSecond.setPlay(!TextUtils.isEmpty(listsBean.getId_color()));
mBinding.bnvSecond.setImgVisible("1".equals(listsBean.getGood_number()));
mBinding.roomHeadTop2Label.setText(listsBean.getNumber_format());
mBinding.roomTop2Label.setVisibility(TextUtils.isEmpty(listsBean.getLevel_icon()) ? View.GONE : View.VISIBLE);
ImageUtils.loadImageView(listsBean.getLevel_icon(), mBinding.roomTop2Label);
mBinding.roomTop2Grade.setVisibility(TextUtils.isEmpty(listsBean.getNobility_icon()) ? View.GONE : View.VISIBLE);
ImageUtils.loadImageView(listsBean.getNobility_icon(), mBinding.roomTop2Grade);
mBinding.roomRankTop2HeadIcon.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", listsBean.getUser_id()).withBoolean("returnRoom", true).navigation();
private void setview(List<String> item, LinearLayout llContainer){
List<String> images = item; // 获取图片列表
for (String url : images) {
if (url.contains("http")) {
ImageView imageView1 = new ImageView(getContext());
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
getContext().getResources().getDimensionPixelSize(com.qxcm.moduleutil.R.dimen.dp_37),
getContext().getResources().getDimensionPixelSize(com.qxcm.moduleutil.R.dimen.dp_15)
);
params.setMargins(0, 0, getContext().getResources().getDimensionPixelSize(com.qxcm.moduleutil.R.dimen.dp_5), 0); // 右边距
imageView1.setLayoutParams(params);
imageView1.setScaleType(ImageView.ScaleType.FIT_CENTER);
// 使用 Glide 加载图片
ImageUtils.loadHeadCC(url, imageView1);
llContainer.addView(imageView1);
}
});
}
}
@Override
public void setNo3(CharmRankingResp.ListsBean listsBean) {//魅力榜三
ImageUtils.loadHeadCC(listsBean.getHead_picture(), mBinding.roomRankTop3HeadIcon);
setSexBg(mBinding.roomHeadTop3Label, listsBean.getSex());
public void setNo3(CharmRankingResp listsBean) {
ImageUtils.loadHeadCC(listsBean.getAvatar(), mBinding.roomRankTop3HeadIcon);
mBinding.roomTop3Name.setText(listsBean.getNickname());
// mBinding.bnvThird.setText(String.format(getString(R.string.room_rank_list_id_formatter), listsBean.getUser_code()));
// mBinding.bnvThird.setTextColor(!TextUtils.isEmpty(listsBean.getId_color()) ? Color.parseColor(listsBean.getId_color()) : getResources().getColor(R.color.color_white));
mBinding.bnvThird.setPlay(!TextUtils.isEmpty(listsBean.getId_color()));
mBinding.bnvThird.setImgVisible("1".equals(listsBean.getGood_number()));
mBinding.roomHeadTop3Label.setText(listsBean.getNumber_format());
mBinding.roomTop3Label.setVisibility(TextUtils.isEmpty(listsBean.getLevel_icon()) ? View.GONE : View.VISIBLE);
ImageUtils.loadImageView(listsBean.getLevel_icon(), mBinding.roomTop3Label);
mBinding.roomTop3Grade.setVisibility(TextUtils.isEmpty(listsBean.getNobility_icon()) ? View.GONE : View.VISIBLE);
ImageUtils.loadImageView(listsBean.getNobility_icon(), mBinding.roomTop3Grade);
mBinding.roomHeadTop3Label.setText(listsBean.getTotal());
setview(listsBean.getIcon(), mBinding.llVip3);
mBinding.roomRankTop3HeadIcon.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -250,40 +213,8 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
}
@Override
public void setNo3(WealthRankingResp.ListsBean listsBean) {//财富榜三
ImageUtils.loadHeadCC(listsBean.getHead_picture(), mBinding.roomRankTop3HeadIcon);
mBinding.roomTop3Name.setText(listsBean.getNickname());
// mBinding.bnvThird.setText(String.format(getString(R.string.room_rank_list_id_formatter), listsBean.getUser_code()));
// mBinding.bnvThird.setTextColor(!TextUtils.isEmpty(listsBean.getId_color()) ? Color.parseColor(listsBean.getId_color()) : getResources().getColor(R.color.color_white));
mBinding.bnvThird.setPlay(!TextUtils.isEmpty(listsBean.getId_color()));
mBinding.bnvThird.setImgVisible("1".equals(listsBean.getGood_number()));
mBinding.roomHeadTop3Label.setText(listsBean.getNumber_format());
mBinding.roomTop3Label.setVisibility(TextUtils.isEmpty(listsBean.getLevel_icon()) ? View.GONE : View.VISIBLE);
ImageUtils.loadImageView(listsBean.getLevel_icon(), mBinding.roomTop3Label);
mBinding.roomTop3Grade.setVisibility(TextUtils.isEmpty(listsBean.getNobility_icon()) ? View.GONE : View.VISIBLE);
ImageUtils.loadImageView(listsBean.getNobility_icon(), mBinding.roomTop3Grade);
mBinding.roomRankTop3HeadIcon.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", listsBean.getUser_id()).withBoolean("returnRoom", true).navigation();
}
});
}
@Override
public void setCharmView(List<CharmRankingResp.ListsBean> listsBeans) {
cAdapter.setNewData(listsBeans);
}
@Override
public void setWealthView(List<WealthRankingResp.ListsBean> listsBeans) {
wAdapter.setNewData(listsBeans);
}
@Override
public void setCharmEmpty() {
cAdapter.setEmptyView(commonEmptyView);
public void setCharmEmpty(List<CharmRankingResp> list) {
cAdapter.setNewData( list);
}
@Override
@@ -308,21 +239,11 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
// EventBus.getDefault().register(this);
}
@Override
public void onDestroyView() {
// EventBus.getDefault().unregister(this);
super.onDestroyView();
}
// @Subscribe(threadMode = ThreadMode.MAIN)
// public void onRefreshEvent(RankingRefreshEvent event) {
// if (rankType == 1) {
// MvpPre.getCharmListInfo(roomId, dataType);
// } else {
// MvpPre.getWealthListInfo(roomId, dataType);
// }
// }
}

121
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java
View File

@@ -21,6 +21,7 @@ import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat;
import com.blankj.utilcode.util.LogUtils;
@@ -138,6 +139,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
}
RoomPitBean roomPitBean = roomInfoResp.getRoom_info().getPit_list().get(0);
if (roomPitBean.getUser_id() != null && !roomPitBean.getUser_id().isEmpty() && !roomPitBean.getUser_id().equals("0")) {
roomPitBean.setIs_pm(1);
wheatView.setData(roomPitBean);
}
parentFragment = (RoomFragment) getParentFragment();
@@ -153,8 +155,9 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
roomPitBean1.setDress(auctionUserBean.getDress());
roomPitBean1.setSex(auctionUserBean.getSex());
roomPitBean1.setPit_number("888");
roomPitBean1.setIs_pm(1);
wheatView2.setData(roomPitBean1);
mBinding.tvPB.setText(auctionUserBean.getCharm());
countDownTime(auctionUserBean.getDuration());
if (auctionUserBean.getUser_id() != null && auctionUserBean.getUser_id().equals(SpUtil.getUserId() + "")) {
mBinding.ivJp.setVisibility(INVISIBLE);
@@ -191,7 +194,9 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
roomPitBean1.setUser_id("");
roomPitBean1.setNickname("");
roomPitBean1.setAvatar("");
roomPitBean1.setIs_pm(1);
wheatView2.setData(roomPitBean1);
mBinding.tvPB.setText("0");
auctionId = "";
SpUtil.setAuctionId("");
}
@@ -205,8 +210,12 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
mBinding.roomMakeWheat.setOnClickListener(this::onChock);
mBinding.roomMakeWheat2.setOnClickListener(this::onChock);
mBinding.bangdan.setOnClickListener(this::onChock);
mBinding.ivAuction1.setOnClickListener(this::onChock);
mBinding.ivAuction2.setOnClickListener(this::onChock);
mBinding.ivAuction3.setOnClickListener(this::onChock);
getTextView();
initOverlayButtons();
steView(type);
}
private void onChock(View view) {
@@ -242,8 +251,20 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
MvpPre.auctionDelay(SpUtil.getauctionId());
} else if (id == R.id.im_action_js) {
MvpPre.auctionEnd(SpUtil.getauctionId());
} else if (id == R.id.bangdan) {
} else if (id == R.id.bangdan) {//出价榜单
BidListDialogFragment.newInstance(SpUtil.getauctionId()).show(getChildFragmentManager(), "BidListDialogFragment");
} else if (id == R.id.iv_auction1) {
if (mBinding.ivAuction1.getUserId() != null && !mBinding.ivAuction1.getUserId().equals("")) {
RoomUserInfoFragment.show(roomInfoResp.getRoom_info().getRoom_id(), mBinding.ivAuction1.getUserId(), mBinding.ivAuction1.pitNumber, getHostUser(), false, getChildFragmentManager());
}
} else if (id == R.id.iv_auction2) {
if (mBinding.ivAuction2.getUserId() != null && !mBinding.ivAuction2.getUserId().equals("")) {
RoomUserInfoFragment.show(roomInfoResp.getRoom_info().getRoom_id(), mBinding.ivAuction2.getUserId(), mBinding.ivAuction2.pitNumber, getHostUser(), false, getChildFragmentManager());
}
} else if (id == R.id.iv_auction3) {
if (mBinding.ivAuction3.getUserId() != null && !mBinding.ivAuction3.getUserId().equals("")) {
RoomUserInfoFragment.show(roomInfoResp.getRoom_info().getRoom_id(), mBinding.ivAuction3.getUserId(), mBinding.ivAuction3.pitNumber, getHostUser(), false, getChildFragmentManager());
}
}
}
@@ -251,29 +272,22 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
private void getTextView() {
int defaultColor = ContextCompat.getColor(requireContext(), com.qxcm.moduleutil.R.color.color_0DFFB9); // 原亲密拍颜色
int selectedColor = Color.WHITE; // 原真爱拍颜色
float defaultSize = 24f; // 亲密拍默认字体大小
float selectedSize = 16f; // 真爱拍默认字体大小
// if (type == 2) {
toggleTextStyles(mBinding.qinmi, mBinding.zhenai, defaultColor, selectedColor, defaultSize, selectedSize, type);
// } else if (type == 1) {
// toggleTextStyles( mBinding.zhenai,mBinding.qinmi, defaultColor, selectedColor, defaultSize, selectedSize);
// }
if (type == 1) {
toggleTextStyles(mBinding.qinmi, mBinding.zhenai, defaultColor, selectedColor, defaultSize, selectedSize, type);
}else {
toggleTextStyles(mBinding.zhenai, mBinding.qinmi, defaultColor, selectedColor, defaultSize, selectedSize, type);
}
mBinding.zhenai.setOnClickListener(v -> {
// type = 1;
// toggleTextStyles(mBinding.qinmi, mBinding.zhenai, defaultColor, selectedColor, defaultSize, selectedSize);
if (wheatView.getUserId().equals(SpUtil.getUserId() + "")) {
// 判断 wheatView2 是否有人
if (wheatView2 != null && wheatView2.getUserId() != null && !wheatView2.getUserId().isEmpty()) {
// 显示提示：竞拍进行中
// showAlertDialog("提示", "竞拍正在进行中，请稍后再操作");
ToastUtils.show("竞拍正在进行中，请稍后再操作");
} else {
// 显示确认对话框
// showConfirmDialog(1);
queren(1);
}
} else {
@@ -286,11 +300,9 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
if (wheatView2 != null && wheatView2.getUserId() != null && !wheatView2.getUserId().isEmpty()) {
// 显示提示：竞拍进行中
// showAlertDialog("提示", "竞拍正在进行中，请稍后再操作");
ToastUtils.show("竞拍正在进行中，请稍后再操作");
} else {
// 显示确认对话框
// showConfirmDialog(2);
queren(2);
}
} else {
@@ -309,20 +321,80 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
"确认",
"取消",
v -> {
steView(newType);
// 点击“确认”按钮时执行
// MvpPre.agreeSong(roomId, "1");
MvpPre.auctionMode(roomInfoResp.getRoom_info().getRoom_id(), newType == 1 ? "1" : "2");
// type = newType;
// toggleTextStyles(mBinding.qinmi, mBinding.zhenai,
// ContextCompat.getColor(requireContext(), com.qxcm.moduleutil.R.color.color_0DFFB9),
// Color.WHITE, 24f, 16f);
},
v -> {
// 点击“取消”按钮时什么都不做
// MvpPre.agreeSong(roomId, "2");
}, false, 0).show();
}
private void steView(int type) {
if (type == 1) {
mBinding.tvPB.setVisibility(VISIBLE);
mBinding.ccc.setBackgroundResource(com.qxcm.moduleutil.R.mipmap.za_bj);
mBinding.pB.setImageResource(com.qxcm.moduleutil.R.mipmap.za_t);
mBinding.btnRelation.setImageResource(com.qxcm.moduleutil.R.mipmap.za_g);
mBinding.tvRelation.setTextColor(ContextCompat.getColor(requireContext(), com.qxcm.moduleutil.R.color.color_white));
mBinding.btnGift.setImageResource(com.qxcm.moduleutil.R.mipmap.za_l);
mBinding.tvGift.setTextColor(ContextCompat.getColor(requireContext(), com.qxcm.moduleutil.R.color.color_white));
mBinding.btnTime.setImageResource(com.qxcm.moduleutil.R.mipmap.za_sj);
mBinding.tvTimetg.setTextColor(ContextCompat.getColor(requireContext(), com.qxcm.moduleutil.R.color.color_white));
mBinding.ivJp.setImageResource(com.qxcm.moduleutil.R.mipmap.za_ljjp);
mBinding.avatar4.setImageResource(com.qxcm.moduleutil.R.mipmap.za_m);
mBinding.avatar5.setImageResource(com.qxcm.moduleutil.R.mipmap.za_m);
mBinding.avatar6.setImageResource(com.qxcm.moduleutil.R.mipmap.za_m);
if (wheatView.getUserId() == null || wheatView.getUserId().isEmpty() || wheatView.getUserId().equals("") || wheatView.getUserId().equals("0")) {
wheatView.setImageResource(com.qxcm.moduleutil.R.mipmap.za_m, 0, "0");
}
// wheatView2.pitImageVId=com.qxcm.moduleutil.R.mipmap.za_p;
wheatView2.setImageResource(com.qxcm.moduleutil.R.mipmap.za_p, 0, "0");
mBinding.ivAuction1.setImageResource(com.qxcm.moduleutil.R.mipmap.za_m, 0, "0");
mBinding.ivAuction2.setImageResource(com.qxcm.moduleutil.R.mipmap.za_m, 0, "0");
mBinding.ivAuction3.setImageResource(com.qxcm.moduleutil.R.mipmap.za_m, 0, "0");
setparams();
mBinding.clBj1.setBackgroundResource(com.qxcm.moduleutil.R.mipmap.za_maiw);
mBinding.clBj2.setBackgroundResource(com.qxcm.moduleutil.R.mipmap.za_maiw);
mBinding.clBj3.setBackgroundResource(com.qxcm.moduleutil.R.mipmap.za_maiw);
} else {
mBinding.ccc.setBackgroundResource(com.qxcm.moduleutil.R.drawable.bg_rounded_corner);
mBinding.pB.setImageResource(com.qxcm.moduleutil.R.mipmap.qm_b);
mBinding.btnRelation.setImageResource(com.qxcm.moduleutil.R.mipmap.guanx);
mBinding.tvRelation.setTextColor(ContextCompat.getColor(requireContext(), com.qxcm.moduleutil.R.color.color_FF999999));
mBinding.btnGift.setImageResource(com.qxcm.moduleutil.R.mipmap.liwu);
mBinding.tvGift.setTextColor(ContextCompat.getColor(requireContext(), com.qxcm.moduleutil.R.color.color_FF999999));
mBinding.btnTime.setImageResource(com.qxcm.moduleutil.R.mipmap.shij);
mBinding.tvTimetg.setTextColor(ContextCompat.getColor(requireContext(), com.qxcm.moduleutil.R.color.color_FF999999));
mBinding.ivJp.setImageResource(com.qxcm.moduleutil.R.mipmap.room_auction_jp);
mBinding.avatar4.setImageResource(com.qxcm.moduleutil.R.mipmap.auction);
mBinding.avatar5.setImageResource(com.qxcm.moduleutil.R.mipmap.auction);
mBinding.avatar6.setImageResource(com.qxcm.moduleutil.R.mipmap.auction);
mBinding.tvPB.setVisibility(GONE);
if (wheatView.getUserId() == null || wheatView.getUserId().isEmpty() || wheatView.getUserId().equals("") || wheatView.getUserId().equals("0")) {
wheatView.setImageResource(com.qxcm.moduleutil.R.mipmap.auction, 0, "0");
}
wheatView2.setImageResource(com.qxcm.moduleutil.R.mipmap.auction, 0, "0");
mBinding.ivAuction1.setImageResource(com.qxcm.moduleutil.R.mipmap.auction, 0, "0");
mBinding.ivAuction2.setImageResource(com.qxcm.moduleutil.R.mipmap.auction, 0, "0");
mBinding.ivAuction3.setImageResource(com.qxcm.moduleutil.R.mipmap.auction, 0, "0");
mBinding.clBj1.setBackgroundResource(com.qxcm.moduleutil.R.mipmap.auction_bj1);
mBinding.clBj2.setBackgroundResource(com.qxcm.moduleutil.R.mipmap.auction_bj2);
mBinding.clBj3.setBackgroundResource(com.qxcm.moduleutil.R.mipmap.auction_bj3);
}
}
private void setparams() {
ConstraintLayout.LayoutParams params =
(ConstraintLayout.LayoutParams) wheatView2.getLayoutParams();
params.setMargins(0, 100, 0, 0);
wheatView2.setLayoutParams(params);
}
@Override
protected int getLayoutId() {
return R.layout.fragment_room_auction;
@@ -454,6 +526,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
} else if (messageEvent.getMsgType() == 1027) {
type = messageEvent.getText().getType();
getTextView();
steView(type);
}
}
@@ -485,7 +558,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
private void gexList() {
if (auctionList != null && auctionList.size() > 0) {
for (int i = 0; i < auctionList.size(); i++) {
int j = 0;
int j = i;
j++;
RoomAuction.AuctionListBean auctionListBean = auctionList.get(i);
@@ -696,7 +769,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
pitBean.setNickname("");
pitBean.setSex("");
pitBean.setCharm("");
pitBean.setIs_pm(1);
return pitBean;
}

38
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomChartsFragment.java
View File

@@ -1,7 +1,9 @@
package com.example.moduleroom.fragment;
import android.content.Context;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import android.view.Gravity;
@@ -65,9 +67,15 @@ public class RoomChartsFragment extends BaseMvpDialogFragment<RoomChartsPresente
}
@Override
protected void initData() {
public void onAttach(@NonNull Context context) {
super.onAttach(context);
mRoomId = getArguments().getString("roomId");
// FragmentUtils.add(getChildFragmentManager(), RankingChildFragment.newInstance(mRoomId, childType, type), R.id.fl_content);
}
@Override
protected void initData() {
FragmentUtils.add(getChildFragmentManager(), RankingChildFragment.newInstance(mRoomId, childType, type), R.id.fl_content);
}
@Override
@@ -84,26 +92,28 @@ public class RoomChartsFragment extends BaseMvpDialogFragment<RoomChartsPresente
}
});
// ArrayList<CustomTabEntity> tabItems = new ArrayList<>();
// tabItems.add(new TabItem("小时榜"));
// tabItems.add(new TabItem("日榜"));
// tabItems.add(new TabItem("周榜"));
ArrayList<CustomTabEntity> tabItems = new ArrayList<>();
tabItems.add(new TabItem("小时榜"));
tabItems.add(new TabItem("日榜"));
tabItems.add(new TabItem("周榜"));
mBinding.slidingTabLayout.setTabData(tabItems);
String[] title = new String[]{"小时榜", "日榜", "周榜"};
// mBinding.slidingTabLayout.setViewPager(mBinding.vpRankChild, title);
List<Fragment> fragments = new ArrayList<>();
fragments.add(RankingChildFragment.newInstance(mRoomId, childType, type));
fragments.add(RankingChildFragment.newInstance(mRoomId, childType, type));
fragments.add(RankingChildFragment.newInstance(mRoomId, childType, type));
MyFragmentPagerAdapter myFragmentPagerAdapter = new MyFragmentPagerAdapter(fragments, getChildFragmentManager());
mBinding.vpRankChild.setAdapter(myFragmentPagerAdapter);
mBinding.slidingTabLayout.setViewPager(mBinding.vpRankChild, title);
// List<Fragment> fragments = new ArrayList<>();
// fragments.add(RankingChildFragment.newInstance(mRoomId, childType, type));
// fragments.add(RankingChildFragment.newInstance(mRoomId, childType, type));
// fragments.add(RankingChildFragment.newInstance(mRoomId, childType, type));
// MyFragmentPagerAdapter myFragmentPagerAdapter = new MyFragmentPagerAdapter(fragments, getChildFragmentManager());
// mBinding.vpRankChild.setAdapter(myFragmentPagerAdapter);
// mBinding.vpRankChild.setCurrentItem(0);
// mBinding.slidingTabLayout.setViewPager(mBinding.vpRankChild, title);
mBinding.tvCharm.setOnClickListener(this::onViewClicked);
mBinding.tvWealth.setOnClickListener(this::onViewClicked);
}
private void refresh() {
// FragmentUtils.replace(getChildFragmentManager(), RankingChildFragment.newInstance(mRoomId, childType, type), R.id.fl_content);
FragmentUtils.replace(getChildFragmentManager(), RankingChildFragment.newInstance(mRoomId, childType, type), R.id.fl_content);
}
public static class TabItem implements CustomTabEntity {

20
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
View File

@@ -164,6 +164,20 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
} else if (mRoomInfoResp.getRoom_info().getType_id().equals("6")) {
replaceNestedFragment(RoomCabinFragment.newInstance(mRoomInfoResp), R.id.container);
setviewyc();
}else if (mRoomInfoResp.getRoom_info().getType_id().equals("3")){
if (mRoomInfoResp.getRoom_info().getLabel_id().equals("1")) {
replaceNestedFragment(SingSongFragment.newInstance(mRoomInfoResp), R.id.container);
// replaceNestedFragment(RoomPkFragment.newInstance(mRoomInfoResp), R.id.container);
} else if (mRoomInfoResp.getRoom_info().getLabel_id().equals("2")) {
replaceNestedFragment(RoomKtvFragment.newInstance(mRoomInfoResp), R.id.container);
}
}else if (mRoomInfoResp.getRoom_info().getType_id().equals("4")){
if (mRoomInfoResp.getRoom_info().getLabel_id().equals("1")) {
replaceNestedFragment(SingSongFragment.newInstance(mRoomInfoResp), R.id.container);
// replaceNestedFragment(RoomPkFragment.newInstance(mRoomInfoResp), R.id.container);
} else if (mRoomInfoResp.getRoom_info().getLabel_id().equals("2")) {
replaceNestedFragment(RoomKtvFragment.newInstance(mRoomInfoResp), R.id.container);
}
}
// FragmentUtils.add(getChildFragmentManager(), PublicScreenEaseChatFragment.newInstance(mRoomInfoResp), R.id.ease_container);
@@ -548,17 +562,17 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
isSwith = false;
AgoraManager.getInstance(getActivity()).muteLocalAudioStream(false);
AgoraManager.getInstance(getActivity()).ClientRole( true);
// AgoraManager.getInstance(getActivity()).setLocalAudioEnabled( true);
} else {
mBinding.ivMic.setImageResource(com.qxcm.moduleutil.R.mipmap.room_microphone_off);
AgoraManager.getInstance(getContext()).setLocalAudioEnabled(false,SpUtil.getUserId()+"");
AgoraManager.getInstance(getActivity()).muteLocalAudioStream(false);
AgoraManager.getInstance(getActivity()).ClientRole( false);
// AgoraManager.getInstance(getActivity()).muteLocalAudioStream(false);
// AgoraManager.getInstance(getActivity()).ClientRole( false);
isSwith = true;
// AgoraManager.getInstance(getActivity()).muteLocalAudioStream(true);
// AgoraManager.getInstance(getActivity()).setLocalAudioEnabled( false);
isMute(1);
}
}

34
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java
View File

@@ -1,5 +1,6 @@
package com.example.moduleroom.fragment;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
@@ -128,6 +129,16 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
if (roomInfoResp.getSong_user_info() != null) {
RoomFragment parentFragment = (RoomFragment) getParentFragment();
if (parentFragment != null) {
if (roomInfoResp.getSong_user_info().getUser_id().equals(SpUtil.getUserId() + "")) {
parentFragment.setRoleType(3, -1);
parentFragment.switchMic(1);
}else {
parentFragment.setRoleType(0, -1);
parentFragment.switchMic(2);
}
}
AgoraManager.getInstance(getActivity()).stopMuisc();
if (roomInfoResp.getSong_user_info().getUser_id().equals(SpUtil.getUserId() + "")) {
did = roomInfoResp.getSong_user_info().getDid();
@@ -439,13 +450,13 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
RoomFragment parentFragment = (RoomFragment) getParentFragment();
if (messageEvent.getMsgType() == 1013) {
LogUtils.e("@@", messageEvent);
if (messageEvent.getText().getAction() == 3) {
if (messageEvent.getText().getAction() == 3) {//下一首变化
if (messageEvent.getText().getNextInfo() != null) {
mBinding.muXName.setText(messageEvent.getText().getNextInfo().getSong_name());
} else {
mBinding.muXName.setText("暂无歌曲");
}
} else if (messageEvent.getText().getAction() == 2) {
} else if (messageEvent.getText().getAction() == 2) {//切歌
if (messageEvent.getText().getSongInfo() != null) {
musicSongBean = messageEvent.getText().getSongInfo();
did = messageEvent.getText().getSongInfo().getDid();
@@ -462,22 +473,27 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
pitBean.setCharm(messageEvent.getText().getSongInfo().getCharm());
roomDefaultWheatView.setData(pitBean);
roomInfoResp.setSong_user_info(musicSongBean);
if (parentFragment != null) {
if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) {
parentFragment.setRoleType(3, -1);
}else {
parentFragment.setRoleType(0, -1);
}
}
if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) {
AgoraManager.getInstance(getActivity()).stopMuisc();
LogUtils.e("推送过来的code", messageEvent.getText().getSongInfo().getSong_code());
AgoraManager.getInstance(getActivity()).isPreload(Long.parseLong(messageEvent.getText().getSongInfo().getSong_code()), 1);
} else {
AgoraManager.getInstance(getActivity()).stopMuisc();
AgoraManager.getInstance(getActivity()).isPreload(Long.parseLong(messageEvent.getText().getSongInfo().getSong_code()), 2);
}
if (parentFragment != null) {
if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) {
parentFragment.setRoleType(3, -1);
parentFragment.switchMic(1);
}else {
parentFragment.setRoleType(0, -1);
parentFragment.switchMic(2);
}
}
if (roomInfoResp.getUser_info().getIs_host() == 1 && roomInfoResp.getUser_info().getPit_number() == 9) {
setVisibilityView(1);
} else if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "") && roomInfoResp.getUser_info().getIs_host() == 1 && roomInfoResp.getUser_info().getPit_number() == 9) {

2
moduleroom/src/main/java/com/example/moduleroom/fragment/SingSongFragment.java
View File

@@ -539,10 +539,12 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
mBinding.imMkf.setImageResource(com.qxcm.moduleutil.R.mipmap.room_microphone);
is_mute=0;
aBoolean=false;
AgoraManager.getInstance(getActivity()).muteAllRemoteAudioStreamsEx(true);
}else {
mBinding.imMkf.setImageResource(com.qxcm.moduleutil.R.mipmap.room_microphone_off);
is_mute=1;
aBoolean=true;
AgoraManager.getInstance(getActivity()).muteAllRemoteAudioStreamsEx(false);
}
RoomMessageEvent.text text=new RoomMessageEvent.text();
text.setIs_mute(is_mute);

33
moduleroom/src/main/java/com/example/moduleroom/presenter/DataListPresenter.java
View File

@@ -1,12 +1,14 @@
package com.example.moduleroom.presenter;
import android.content.Context;
import android.util.Log;
import com.blankj.utilcode.util.ObjectUtils;
import com.example.moduleroom.contacts.DataListContacts;
import com.qxcm.moduleutil.base.BaseRoomPresenter;
import com.qxcm.moduleutil.bean.CharmRankingResp;
import com.qxcm.moduleutil.http.BaseObserver;
import java.util.List;
@@ -25,7 +27,34 @@ public class DataListPresenter extends BaseRoomPresenter<DataListContacts.View>
@Override
public void getCharmListInfo(String roomId, int type) {
public void getCharmListInfo(String roomId, String type, String time_type, String page, String page_limit) {
api.getRoomRank(roomId, type,time_type,page,page_limit, new BaseObserver<List<CharmRankingResp>>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
}
@Override
public void onNext(List<CharmRankingResp> charmRankingResp) {
if (!ObjectUtils.isEmpty(charmRankingResp)){
if (charmRankingResp.size()>0){
MvpRef.get().setNo1(charmRankingResp.get(0));
}
if (charmRankingResp.size()>1){
MvpRef.get().setNo2(charmRankingResp.get(1));
}
if (charmRankingResp.size()>2){
MvpRef.get().setNo3(charmRankingResp.get(2));
}
if (charmRankingResp.size()>3) {
MvpRef.get().setCharmEmpty(charmRankingResp.subList(3, charmRankingResp.size()));
}
}
}
});
// ApiClient.getInstance().getCharmList(roomId, type, new BaseObserver<CharmRankingResp>() {
// @Override
// public void onSubscribe(Disposable d) {

4
moduleroom/src/main/java/com/example/moduleroom/presenter/PublishCommentPresenter.java
View File

@@ -15,8 +15,8 @@ public class PublishCommentPresenter extends BasePresenter<PublishCommentContact
}
@Override
public void sendHeadine(String content, String money) {
api.sendHeadine(content, money, new BaseObserver<String>() {
public void sendHeadine(String content, String money,String roomId) {
api.sendHeadine(content, money,roomId, new BaseObserver<String>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);

170
moduleroom/src/main/res/layout/activity_room.xml
View File

@@ -158,8 +158,8 @@
<com.qxcm.moduleutil.widget.floatingView.FloatingMagnetView
android:id="@+id/flaoat_zuoji"
android:layout_width="@dimen/dp_240"
android:layout_height="@dimen/dp_56"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -170,78 +170,112 @@
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_46"
android:layout_gravity="center|bottom"
android:background="@mipmap/headline_bj">
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_65"
android:layout_gravity="center"
android:gravity="center"
android:orientation="horizontal">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="-5dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/im_hq">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
android:src="@mipmap/headline_b"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/head_avate"
android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_28"
android:layout_marginStart="@dimen/dp_26"
android:src="@mipmap/default_avatar"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true" />
<TextView
android:id="@+id/headName"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:layout_marginStart="@dimen/dp_4"
android:text="名称"
android:textColor="@color/color_FFFFF0F0"
android:textSize="@dimen/sp_12"
app:layout_constraintStart_toEndOf="@+id/head_avate"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/head_cone"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:layout_marginStart="@dimen/dp_4"
android:gravity="center"
android:text="内容"
android:textColor="@color/color_FFFFF0F0"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/head_avate"
app:layout_constraintTop_toBottomOf="@+id/headName" />
<ImageView
android:id="@+id/iv_quan_qiang"
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_22"
android:src="@mipmap/tt_q"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/im_yc"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_quan_c"
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_22"
android:layout_marginEnd="@dimen/dp_8"
android:src="@mipmap/tt_c"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/iv_quan_qiang"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/im_yc"
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_22"
android:src="@mipmap/tt_yc"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id="@+id/im_hq"
android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_25"
android:layout_marginStart="@dimen/dp_8"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:scaleType="fitXY"
android:src="@mipmap/heab_t"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/head_avate"
android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_28"
android:layout_marginStart="@dimen/dp_8"
android:src="@mipmap/default_avatar"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/im_hq"
app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true" />
<TextView
android:id="@+id/headName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_7"
android:text="名称"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_12"
app:layout_constraintStart_toEndOf="@+id/head_avate"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/head_cone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_4"
android:text="内容"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_12"
app:layout_constraintStart_toEndOf="@+id/head_avate"
app:layout_constraintTop_toBottomOf="@+id/headName" />
<TextView
android:id="@+id/iv_quan_qiang"
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_22"
android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_5"
android:background="@drawable/bg_r11_333"
android:gravity="center"
android:text="抢"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id="@+id/cc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginStart="@dimen/dp_8"
android:src="@mipmap/head_cc" />
</com.qxcm.moduleutil.widget.floatingView.FloatingMagnetView>
<FrameLayout
@@ -258,12 +292,12 @@
android:layout_gravity="start|top"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginBottom="@dimen/dp_46"
android:layout_marginEnd="@dimen/dp_50"
android:layout_marginBottom="@dimen/dp_46"
android:src="@mipmap/quan"
android:visibility="gone" />
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

15
moduleroom/src/main/res/layout/dialog_room_bid_list.xml
View File

@@ -12,6 +12,18 @@
android:layout_height="match_parent"
android:background="@mipmap/room_rank_bj">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="出价榜单"
android:textColor="@color/color_white"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@dimen/dp_14"
android:textSize="18sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -20,6 +32,7 @@
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -196,7 +209,7 @@
android:drawableStart="@mipmap/rank_h"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/sp_8"
android:textSize="@dimen/sp_14"
app:layout_constraintEnd_toEndOf="@id/view_top1"
app:layout_constraintStart_toStartOf="@id/view_top1"
app:layout_constraintTop_toBottomOf="@+id/ll_vip1"

37
moduleroom/src/main/res/layout/fragment_room_auction.xml
View File

@@ -16,6 +16,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ccc"
android:layout_width="@dimen/dp_343"
android:layout_height="@dimen/dp_282"
android:layout_marginStart="@dimen/dp_16"
@@ -34,6 +35,7 @@
android:layout_marginStart="@dimen/dp_12"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:room_make_pic="@mipmap/za_m"
app:room_make_wheat_number="9" />
@@ -101,11 +103,37 @@
android:layout_width="@dimen/dp_168"
android:layout_height="@dimen/dp_208"
android:layout_marginTop="@dimen/dp_10"
android:background="@drawable/bg_r16_1c182f"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/room_make_wheat">
<ImageView
android:id="@+id/p_b"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:scaleType="fitXY"
tools:src="@mipmap/za_t" />
<TextView
android:id="@+id/tv_p_b"
android:layout_width="@dimen/dp_46"
android:layout_height="@dimen/dp_16"
android:gravity="center"
android:text="0000"
android:background="@mipmap/za_s"
android:textColor="#FFE8B0"
android:textSize="@dimen/sp_12"
android:layout_marginTop="@dimen/dp_30"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
/>
<com.qxcm.moduleutil.widget.RoomMakeWheatView
android:id="@+id/room_make_wheat2"
android:layout_width="@dimen/dp_60"
@@ -114,6 +142,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:room_make_pic="@mipmap/za_p"
app:room_make_wheat_number="888" />
@@ -121,7 +150,7 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_5"
app:layout_constraintTop_toBottomOf="@id/room_make_wheat2">
<!-- 关系 -->
@@ -206,7 +235,6 @@
android:id="@+id/iv_jp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
android:src="@mipmap/room_auction_jp"
android:visibility="invisible"
app:layout_constraintEnd_toEndOf="parent"
@@ -242,6 +270,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:room_make_pic="@mipmap/za_m"
app:room_make_wheat_number="111" />
<TextView
@@ -283,6 +312,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:room_make_pic="@mipmap/za_m"
app:room_make_wheat_number="222" />
<TextView
@@ -325,6 +355,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:room_make_pic="@mipmap/za_m"
app:room_make_wheat_number="333" />
<TextView

17
moduleroom/src/main/res/layout/fragment_room_charts.xml
View File

@@ -77,7 +77,7 @@
android:background="@color/color_1A000000"
app:layout_constraintTop_toBottomOf="@+id/cl">
<com.example.moduletablayout.SlidingTabLayout
<com.example.moduletablayout.CommonTabLayout
android:id="@+id/sliding_tab_layout"
android:layout_width="0dp"
android:layout_height="0dp"
@@ -103,18 +103,19 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- <FrameLayout-->
<!-- android:id="@+id/fl_content"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/cl2"-->
<!-- />-->
<FrameLayout
android:id="@+id/fl_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintTop_toBottomOf="@+id/cl2"
/>
<com.qxcm.moduleutil.widget.ScrollViewPager
android:id="@+id/vp_rank_child"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintTop_toBottomOf="@+id/cl2"/>
app:layout_constraintTop_toBottomOf="@+id/cl2"
android:visibility="gone"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

7
moduleroom/src/main/res/layout/fragment_room_ktv.xml
View File

@@ -77,7 +77,7 @@
app:lineSpacing="8dp"
app:startOfVerseIndicatorPaddingTop="6dp"
app:startOfVerseIndicatorRadius="4dp"
app:textSize="12sp" />
app:textSize="@dimen/sp_12" />
<TextView
android:id="@+id/mu_title"
@@ -93,10 +93,11 @@
<TextView
android:id="@+id/mu_name"
android:layout_width="wrap_content"
android:layout_width="@dimen/dp_70"
android:layout_height="@dimen/dp_18"
android:layout_marginStart="@dimen/dp_12"
android:ellipsize="none"
android:layout_marginEnd="@dimen/dp_72"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"

105
moduleroom/src/main/res/layout/room_ranking_child.xml
View File

@@ -54,6 +54,7 @@
app:layout_constraintTop_toTopOf="@id/view_top2" />
<ImageView
android:id="@+id/zt"
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_13"
android:background="@mipmap/room_status"
@@ -75,7 +76,23 @@
app:layout_constraintEnd_toEndOf="@id/view_top2"
app:layout_constraintStart_toStartOf="@id/view_top2"
app:layout_constraintTop_toBottomOf="@+id/view_top2"
android:text="sdfdfgfg" />
tools:text="sdfdfgfg" />
<TextView
android:id="@+id/room_head_top2_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="34dp"
android:drawableStart="@mipmap/rank_h"
android:drawablePadding="@dimen/dp_4"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="@+id/ll_vip2"
app:layout_constraintTop_toBottomOf="@+id/room_top2_name"
app:layout_constraintEnd_toEndOf="@id/ll_vip2"
app:layout_constraintStart_toStartOf="@id/ll_vip2"
tools:text="00000" />
<View
android:id="@+id/view_top1"
@@ -97,8 +114,6 @@
<com.qxcm.moduleutil.widget.GifAvatarOvalView
android:id="@+id/room_rank_top1_headIcon"
android:layout_width="@dimen/dp_67"
@@ -149,7 +164,8 @@
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="@id/view_top2"
app:layout_constraintStart_toStartOf="@id/view_top2"
app:layout_constraintTop_toBottomOf="@+id/room_top2_name" />
app:layout_constraintTop_toBottomOf="@+id/room_top2_name"
android:visibility="gone"/>
<TextView
android:id="@+id/room_top1_name"
@@ -165,7 +181,22 @@
app:layout_constraintEnd_toEndOf="@id/view_top1"
app:layout_constraintStart_toStartOf="@id/view_top1"
app:layout_constraintTop_toBottomOf="@+id/view_top1"
android:text="sdfdfgfg" />
tools:text="sdfdfgfg" />
<TextView
android:id="@+id/room_head_top1_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="43dp"
android:drawableStart="@mipmap/rank_h"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="@+id/view_top1"
app:layout_constraintTop_toBottomOf="@+id/room_top1_name"
app:layout_constraintEnd_toEndOf="@id/view_top1"
app:layout_constraintStart_toStartOf="@id/view_top1"
app:layout_constraintBottom_toTopOf="@+id/ll_vip1"
tools:text="00000" />
<com.qxcm.moduleutil.widget.BeautifulNameView
android:id="@+id/bnv_first"
@@ -173,7 +204,8 @@
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="@id/view_top1"
app:layout_constraintStart_toStartOf="@id/view_top1"
app:layout_constraintTop_toBottomOf="@+id/room_top1_name" />
app:layout_constraintTop_toBottomOf="@+id/room_top1_name"
android:visibility="gone"/>
<TextView
android:id="@+id/room_top3_name"
@@ -189,7 +221,7 @@
app:layout_constraintEnd_toEndOf="@id/view_top3"
app:layout_constraintStart_toStartOf="@id/view_top3"
app:layout_constraintTop_toBottomOf="@id/view_top3"
android:text="sdfdfgfg" />
tools:text="sdfdfgfg" />
<com.qxcm.moduleutil.widget.BeautifulNameView
android:id="@+id/bnv_third"
@@ -197,25 +229,13 @@
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="@id/view_top3"
app:layout_constraintStart_toStartOf="@id/view_top3"
app:layout_constraintTop_toBottomOf="@+id/room_top3_name" />
app:layout_constraintTop_toBottomOf="@+id/room_top3_name"
android:visibility="gone"/>
<TextView
android:id="@+id/room_head_top2_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="34dp"
android:drawableStart="@mipmap/rank_h"
android:drawablePadding="@dimen/dp_4"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/sp_8"
app:layout_constraintBottom_toBottomOf="@+id/ll_vip2"
app:layout_constraintBottom_toTopOf="@+id/room_top2_name"
app:layout_constraintEnd_toEndOf="@id/ll_vip2"
app:layout_constraintStart_toStartOf="@id/ll_vip2"
tools:text="00000" />
<ImageView
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_13"
android:background="@mipmap/room_status"
@@ -224,20 +244,7 @@
app:layout_constraintEnd_toEndOf="@id/view_top1"
app:layout_constraintStart_toStartOf="@id/view_top1"/>
<TextView
android:id="@+id/room_head_top1_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="33dp"
android:drawableStart="@mipmap/rank_h"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/sp_8"
app:layout_constraintBottom_toBottomOf="@+id/view_top1"
app:layout_constraintBottom_toTopOf="@+id/room_top1_name"
app:layout_constraintEnd_toEndOf="@id/view_top1"
app:layout_constraintStart_toStartOf="@id/view_top1"
tools:text="00000" />
<ImageView
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_13"
@@ -251,13 +258,13 @@
android:id="@+id/room_head_top3_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="34dp"
android:layout_marginTop="64dp"
android:drawableStart="@mipmap/rank_h"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/sp_8"
android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="@+id/view_top3"
app:layout_constraintBottom_toTopOf="@+id/room_top3_name"
app:layout_constraintTop_toBottomOf="@+id/room_top3_name"
app:layout_constraintEnd_toEndOf="@id/view_top3"
app:layout_constraintStart_toStartOf="@id/view_top3"
tools:text="00000" />
@@ -277,13 +284,15 @@
android:id="@+id/room_top2_grade"
android:layout_width="31dp"
android:layout_height="24dp"
android:scaleType="fitCenter" />
android:scaleType="fitCenter"
android:visibility="gone"/>
<ImageView
android:id="@+id/room_top2_label"
android:layout_width="24dp"
android:layout_height="24dp"
android:scaleType="fitCenter" />
android:scaleType="fitCenter"
android:visibility="gone"/>
</LinearLayout>
@@ -302,13 +311,15 @@
android:id="@+id/room_top1_grade"
android:layout_width="31dp"
android:layout_height="24dp"
android:scaleType="fitCenter" />
android:scaleType="fitCenter"
android:visibility="gone"/>
<ImageView
android:id="@+id/room_top1_label"
android:layout_width="24dp"
android:layout_height="24dp"
android:scaleType="fitCenter" />
android:scaleType="fitCenter"
android:visibility="gone"/>
</LinearLayout>
@@ -327,13 +338,15 @@
android:id="@+id/room_top3_grade"
android:layout_width="31dp"
android:layout_height="24dp"
android:scaleType="fitCenter" />
android:scaleType="fitCenter"
android:visibility="gone"/>
<ImageView
android:id="@+id/room_top3_label"
android:layout_width="24dp"
android:layout_height="24dp"
android:scaleType="fitCenter" />
android:scaleType="fitCenter"
android:visibility="gone"/>
</LinearLayout>

25
moduleroom/src/main/res/layout/room_rv_item_ranking_rich.xml
View File

@@ -61,7 +61,8 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp">
android:layout_marginLeft="5dp"
android:visibility="gone">
<ImageView
android:id="@+id/room_item_rank"
@@ -78,13 +79,25 @@
</LinearLayout>
<com.qxcm.moduleutil.widget.BeautifulNameView
<!-- <com.qxcm.moduleutil.widget.BeautifulNameView-->
<!-- android:id="@+id/bnv_rank_list_rich"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="10dp"-->
<!-- app:layout_constraintBottom_toBottomOf="@+id/room_item_head"-->
<!-- app:layout_constraintLeft_toRightOf="@+id/room_item_head"-->
<!-- android:visibility="gone"/>-->
<LinearLayout
android:id="@+id/bnv_rank_list_rich"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_width="0dp"
android:layout_height="3dp"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@+id/room_item_head"
app:layout_constraintLeft_toRightOf="@+id/room_item_head" />
app:layout_constraintLeft_toRightOf="@+id/room_item_head"
app:layout_constraintTop_toTopOf="@+id/room_item_head" />
<TextView
android:id="@+id/room_item_pop"