MIDI/midi-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1:添加在离线展示

Browse Source 
2：修改在进入房间后再最小化，从后台进入出现在首页的问题
This commit is contained in:
梁小江
2025-09-12 11:19:27 +08:00
parent ea599bb63a
commit 5ddf6fc638
12 changed files with 302 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
moduleUtil/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java
View File

@@ -160,6 +160,11 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
setCardiac(pitBean.getCharm(), getTzbl());
setPitData(bean);
if (bean.getIs_online() == 2){
iv_on_line.setVisibility(VISIBLE);
}else {
iv_on_line.setVisibility(GONE);
}
// if (bean.getIs_online() == 0 &&bean.getUser_id() != null && !bean.getUser_id().equals("0") && !bean.getUser_id().isEmpty()) {
// iv_on_line.setVisibility(VISIBLE);
// } else {
@@ -296,19 +301,6 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void subscribeMessages(RoomMessageEvent roomMessageEvent) {
if(roomMessageEvent.getMsgType()==1058){
if (roomMessageEvent.getText().getUser_id().equals(pitBean.getUser_id())){
if (roomMessageEvent.getText().getType()==1){
iv_on_line.setVisibility(GONE);
}else {
iv_on_line.setVisibility(VISIBLE);
}
}
}
}
/**
* 开始倒计时

3
modulemain/src/main/AndroidManifest.xml
View File

@@ -10,8 +10,7 @@
<activity
android:name=".activity.MainActivity"
android:launchMode="singleTask"
android:exported="true"
/>
</application>

3
modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java
View File

@@ -371,7 +371,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
// 3. 应用是从后台恢复的（通过检查 CommonAppContext 状态）
return CommonAppContext.getInstance().isPlaying
&& CommonAppContext.getInstance().isShow
&& CommonAppContext.getInstance().wasInBackground();
;
}
@Override
@@ -379,6 +379,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
super.onResume();
LogUtils.e("isShow", CommonAppContext.getInstance().isShow ,CommonAppContext.getInstance().isPlaying,isTaskRoot());
LogUtils.e("isShow2", CommonAppContext.getInstance().isShow ,CommonAppContext.getInstance().isPlaying,CommonAppContext.getInstance().wasInBackground());
// if (isTaskRoot() &&CommonAppContext.getInstance().isPlaying && CommonAppContext.getInstance().isShow) {
// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", CommonAppContext.getInstance().playId).navigation();
// return;

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

@@ -333,7 +333,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
// }
return false;
}
///最小化
private void showExitRoomDialog() {
ExitRoomBottomSheet bottomSheet = ExitRoomBottomSheet.newInstance();
bottomSheet.setOnOptionSelectedListener(new ExitRoomBottomSheet.OnOptionSelectedListener() {
@@ -994,7 +994,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
handleMsgType1039(messageEvent, text);
} else if (msgType == 1028) {
roomFragment.handleMsgType1028(messageEvent);
} else if (msgType == 1059) {//清除个人魅力
} else if (msgType == 1059 || msgType == 1058) {// 1059清除个人魅力 1058在离线
if (mRoomInfoResp.getRoom_info().getType_id().equals("1") || mRoomInfoResp.getRoom_info().getType_id().equals("3") || mRoomInfoResp.getRoom_info().getType_id().equals("4")) {
if (mRoomInfoResp.getRoom_info().getLabel_id().equals("1")) {
roomFragment.SingSongEvent(messageEvent);

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

@@ -205,6 +205,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+ "/web/index.html#/pages/feedback/report?id="+SpUtil.getToken()+"&fromType=1&fromId="+user_id).withString("title", "举报").navigation();
}else if (id==R.id.iv_avatar){
ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", userInfo.getUser_id()+"").navigation();
dismiss();
}else if (id==R.id.tv_zb){
RoomHostZBDialog dialog = new RoomHostZBDialog(getContext());
dialog.setListener(new RoomHostIncomeDialog.OnConfirmClickListener() {

99
moduleroom/src/main/java/com/example/moduleroom/fragment/FriendshipRoomFragment.java
View File

@@ -112,7 +112,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
@Override
public void onConcernSelected(RoomRelationBean selectedDean, FriendUserBean relationshipList) {
MvpPre.createRelation(roomId,roomInfoResp.getFriend_info().getFriend_id()+"",relationshipList.getUser1_id(),relationshipList.getUser2_id(),selectedDean.getRelation_id());
MvpPre.createRelation(roomId, roomInfoResp.getFriend_info().getFriend_id() + "", relationshipList.getUser1_id(), relationshipList.getUser2_id(), selectedDean.getRelation_id());
}
// 交友状态枚举
@@ -204,7 +204,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
userInfo.setNickname(pitBean.getNickname());
userInfo.setUser_id(Integer.parseInt(pitBean.getUser_id()));
userInfo.setPit_number("0");
RoomGiftDialogFragment.show(null, userInfo, roomId, 0,pitBean.getHeartId()+"", getParentFragmentManager());
RoomGiftDialogFragment.show(null, userInfo, roomId, 0, pitBean.getHeartId() + "", getParentFragmentManager());
}
});
@@ -215,7 +215,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
if (ClickUtils.isFastDoubleClick()) {
return; // 快速重复点击，直接返回
}
if (pitBean.getUser_id()!=null && !pitBean.getUser_id().isEmpty() && !pitBean.getUser_id().equals("0")) {
if (pitBean.getUser_id() != null && !pitBean.getUser_id().isEmpty() && !pitBean.getUser_id().equals("0")) {
RoomCharmDialog.newInstance(roomId, pitBean.getUser_id()).show(getChildFragmentManager(), "RoomCharmDialog");
}
}
@@ -253,8 +253,8 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
// 麦位上有人，可以查看用户信息等操作
handleUserClick(pitBean);
} else {
if (currentPartType.value == 2 || currentPartType.value == 3){
if (pitBean.getPit_number().equals("9") || pitBean.getPit_number().equals("10")){
if (currentPartType.value == 2 || currentPartType.value == 3) {
if (pitBean.getPit_number().equals("9") || pitBean.getPit_number().equals("10")) {
handleEmptyPitClick(wheatView, pitBean);
}
return;
@@ -280,7 +280,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
}
public void upFriendList(){
public void upFriendList() {
mBinding.wheatView1.pitBean.setCharm("0");
mBinding.wheatView1.setData(mBinding.wheatView1.pitBean);
mBinding.wheatView2.pitBean.setCharm("0");
@@ -335,57 +335,110 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
}
}
public void event1059(RoomMessageEvent messageEvent){
// TODO: 2025/9/12 清除个人魅力
public void event1059(RoomMessageEvent messageEvent) {
RoomPitBean pitBean = mBinding.wheatView9.pitBean;
if (pitBean.getUser_id().equals(messageEvent.getText().getUser_id())){
if (pitBean.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean.setCharm("");
mBinding.wheatView9.setData(pitBean);
return;
}
RoomPitBean pitBean1=mBinding.wheatView10.pitBean;
if (pitBean1.getUser_id().equals(messageEvent.getText().getUser_id())){
RoomPitBean pitBean1 = mBinding.wheatView10.pitBean;
if (pitBean1.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean1.setCharm("");
mBinding.wheatView10.setData(pitBean1);
return;
}
RoomPitBean pitBean2=mBinding.wheatView1.pitBean;
if (pitBean2.getUser_id().equals(messageEvent.getText().getUser_id())){
RoomPitBean pitBean2 = mBinding.wheatView1.pitBean;
if (pitBean2.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean2.setCharm("");
mBinding.wheatView1.setData(pitBean2);
return;
}
RoomPitBean pitBean3=mBinding.wheatView2.pitBean;
if (pitBean3.getUser_id().equals(messageEvent.getText().getUser_id())){
RoomPitBean pitBean3 = mBinding.wheatView2.pitBean;
if (pitBean3.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean3.setCharm("");
mBinding.wheatView2.setData(pitBean3);
return;
}
RoomPitBean pitBean4=mBinding.wheatView3.pitBean;
if (pitBean4.getUser_id().equals(messageEvent.getText().getUser_id())){
RoomPitBean pitBean4 = mBinding.wheatView3.pitBean;
if (pitBean4.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean4.setCharm("");
mBinding.wheatView3.setData(pitBean4);
return;
}
RoomPitBean pitBean5=mBinding.wheatView4.pitBean;
if (pitBean5.getUser_id().equals(messageEvent.getText().getUser_id())){
RoomPitBean pitBean5 = mBinding.wheatView4.pitBean;
if (pitBean5.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean5.setCharm("");
mBinding.wheatView4.setData(pitBean5);
return;
}
RoomPitBean pitBean6=mBinding.wheatView5.pitBean;
if (pitBean6.getUser_id().equals(messageEvent.getText().getUser_id())){
RoomPitBean pitBean6 = mBinding.wheatView5.pitBean;
if (pitBean6.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean6.setCharm("");
mBinding.wheatView5.setData(pitBean6);
return;
}
RoomPitBean pitBean7=mBinding.wheatView6.pitBean;
if (pitBean7.getUser_id().equals(messageEvent.getText().getUser_id())){
RoomPitBean pitBean7 = mBinding.wheatView6.pitBean;
if (pitBean7.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean7.setCharm("");
mBinding.wheatView6.setData(pitBean7);
return;
}
}
public void event1058(RoomMessageEvent messageEvent) {
int type = messageEvent.getText().getType();
RoomPitBean pitBean = mBinding.wheatView9.pitBean;
if (pitBean.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean.setIs_online(type == 1 ? 1 : 2);
mBinding.wheatView9.setData(pitBean);
return;
}
RoomPitBean pitBean1 = mBinding.wheatView10.pitBean;
if (pitBean1.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean1.setIs_online(type == 1 ? 1 : 2);
mBinding.wheatView10.setData(pitBean1);
return;
}
RoomPitBean pitBean2 = mBinding.wheatView1.pitBean;
if (pitBean2.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean2.setIs_online(type == 1 ? 1 : 2);
mBinding.wheatView1.setData(pitBean2);
return;
}
RoomPitBean pitBean3 = mBinding.wheatView2.pitBean;
if (pitBean3.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean3.setIs_online(type == 1 ? 1 : 2);
mBinding.wheatView2.setData(pitBean3);
return;
}
RoomPitBean pitBean4 = mBinding.wheatView3.pitBean;
if (pitBean4.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean4.setIs_online(type == 1 ? 1 : 2);
mBinding.wheatView3.setData(pitBean4);
return;
}
RoomPitBean pitBean5 = mBinding.wheatView4.pitBean;
if (pitBean5.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean5.setIs_online(type == 1 ? 1 : 2);
mBinding.wheatView4.setData(pitBean5);
return;
}
RoomPitBean pitBean6 = mBinding.wheatView5.pitBean;
if (pitBean6.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean6.setIs_online(type == 1 ? 1 : 2);
mBinding.wheatView5.setData(pitBean6);
return;
}
RoomPitBean pitBean7 = mBinding.wheatView6.pitBean;
if (pitBean7.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean7.setIs_online(type == 1 ? 1 : 2);
mBinding.wheatView6.setData(pitBean7);
return;
}
}
/// 抱麦、锁麦
private void initPopupWindow() {
// 加载弹出视图布局
@@ -517,6 +570,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
// tvHand.setOnClickListener(v -> updateFriendshipState(FriendshipPartType.HAND));
}
private void queren() {
// 创建并显示确认对话框
new ConfirmDialog(getActivity(),
@@ -1147,6 +1201,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
/**
* 安全地停止并释放SVGA资源
*
* @param svgaView SVGAImageView实例
*/
private void stopAndReleaseSVGA(com.opensource.svgaplayer.SVGAImageView svgaView) {

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

@@ -937,6 +937,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
}
}
// TODO: 2025/9/12 清除个人魅力
public void event1059(RoomMessageEvent messageEvent) {
RoomPitBean pitBean = wheatView.pitBean;
if (pitBean.getUser_id().equals(messageEvent.getText().getUser_id())) {
@@ -969,8 +970,61 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
mBinding.ivAuction3.setData(pitBean5);
return;
}
}
public void event1058(RoomMessageEvent messageEvent){
int type = messageEvent.getText().getType();
RoomPitBean pitBean = wheatView.pitBean;
if (pitBean.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean.setIs_online(type == 1 ? 1 :2);
wheatView.setData(pitBean);
return;
}
RoomPitBean pitBean2 = wheatView2.pitBean;
if (pitBean2.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean2.setIs_online(type == 1 ? 1 :2);
wheatView2.setData(pitBean2);
mBinding.tvPB.setText("0");
return;
}
RoomPitBean pitBean3 = mBinding.ivAuction1.pitBean;
if (pitBean3.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean3.setIs_online(type == 1 ? 1 :2);
mBinding.ivAuction1.setData(pitBean3);
return;
}
RoomPitBean pitBean4 = mBinding.ivAuction2.pitBean;
if (pitBean4.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean4.setIs_online(type == 1 ? 1 :2);
mBinding.ivAuction2.setData(pitBean4);
return;
}
RoomPitBean pitBean5 = mBinding.ivAuction3.pitBean;
if (pitBean5.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean5.setIs_online(type == 1 ? 1 :2);
mBinding.ivAuction3.setData(pitBean5);
return;
}
if (auctionList != null && auctionList.size() > 0) {
for (int i = 0; i < auctionList.size(); i++) {
RoomAuction.AuctionListBean auctionListBean = auctionList.get(i);
int j = i;
j++;
if (j == 4) {
if (auctionListBean.getUser_id().equals(messageEvent.getText().getUser_id())){
mBinding.ivOnline4.setVisibility(type==1?GONE : VISIBLE);
}
} else if (j == 5) {
if (auctionListBean.getUser_id().equals(messageEvent.getText().getUser_id())){
mBinding.ivOnline5.setVisibility(type==1?GONE : VISIBLE);
}
} else if (j == 6) {
if (auctionListBean.getUser_id().equals(messageEvent.getText().getUser_id())){
mBinding.ivOnline6.setVisibility(type==1?GONE : VISIBLE);
}
}
}
}
}
public void event1003(RoomMessageEvent messageEvent) {

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

@@ -1006,6 +1006,9 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
case 1059:
auctionFragment.event1059(messageEvent);
break;
case 1058:
auctionFragment.event1058(messageEvent);
break;
default:
// 可以添加默认处理或日志记录
LogUtils.w("Unhandled auction message type: " + messageEvent.getMsgType());
@@ -1023,6 +1026,11 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
case 1059:
friendshipRoomFragment.event1059(messageEvent);
break;
case 1058:
friendshipRoomFragment.event1058(messageEvent);
break;
default:
break;
}
}
}
@@ -1037,6 +1045,41 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
}
}
// TODO: 2025/9/12 1058,在离线
public void handleMsgType1058(RoomMessageEvent messageEvent) {
String typeId = mRoomInfoResp.getRoom_info().getType_id();
String labelId = mRoomInfoResp.getRoom_info().getLabel_id();
if ("7".equals(typeId)) {
FriendshipRoomFragment friendshipRoomFragment = findFragmentByTag(FriendshipRoomFragment.class);
if (friendshipRoomFragment != null && friendshipRoomFragment.isAdded()) {
friendshipRoomFragment.upRoomInfo(mRoomInfoResp);
}
} else if ("2".equals(typeId)) {
RoomAuctionFragment auctionRoomFragment = findFragmentByTag(RoomAuctionFragment.class);
if (auctionRoomFragment != null && auctionRoomFragment.isAdded()) {
auctionRoomFragment.upRoomInfo(mRoomInfoResp);
}
} else if ("1".equals(typeId) || "3".equals(typeId) || "4".equals(typeId)) {
if ("2".equals(labelId)) {
RoomKtvFragment roomKtvFragment = findFragmentByTag(RoomKtvFragment.class);
if (roomKtvFragment != null && roomKtvFragment.isAdded()) {
roomKtvFragment.upRoomInfo(mRoomInfoResp);
}
} else if ("1".equals(labelId)) {
SingSongFragment singSongFragment = findFragmentByTag(SingSongFragment.class);
if (singSongFragment != null && singSongFragment.isAdded()) {
singSongFragment.upRoomInfo(mRoomInfoResp);
}
}
} else if ("6".equals(typeId)) {
RoomCabinFragment roomCabinFragment = findFragmentByTag(RoomCabinFragment.class);
if (roomCabinFragment != null && roomCabinFragment.isAdded()) {
roomCabinFragment.upRoomInfo(mRoomInfoResp);
}
}
}
// TODO: 2025/8/30 Ktv模式
public void KtvFragmentEvent(RoomMessageEvent messageEvent) {
@@ -1065,6 +1108,8 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
case 1059:
ktvFragment.event1059(messageEvent);
break;
case 1058:
ktvFragment.event1058(messageEvent);
default:
// 可以添加默认处理或日志记录
LogUtils.w("Unhandled auction message type: " + messageEvent.getMsgType());
@@ -1117,6 +1162,9 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
case 1059:
singSongFragment.event1059(messageEvent);
break;
case 1058:
singSongFragment.event1058(messageEvent);
break;
default:
// 可以添加默认处理或日志记录
LogUtils.w("Unhandled auction message type: " + messageEvent.getMsgType());

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

@@ -111,6 +111,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
public View getNegativeMarginView() {
return mBinding.muZc;
}
public void upRoomInfo(RoomInfoResp roomInfoResp) {
this.roomInfoResp = roomInfoResp;
}
@@ -356,14 +357,14 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
RoomUserInfoFragment.show(roomInfoResp.getRoom_info().getRoom_id(), roomDefaultWheatView.getUserId(), roomDefaultWheatView.pitNumber, getHostUser(), false, 2, isNumberWhether(), getChildFragmentManager());
}
});
mu_rank.setmOnCharmClickListener(new RoomKtvWheatView.onCharmClickListener(){
mu_rank.setmOnCharmClickListener(new RoomKtvWheatView.onCharmClickListener() {
@Override
public void onCharmClick(RoomKtvWheatView view, RoomPitBean pitBean) {
if (ClickUtils.isFastDoubleClick()){
if (ClickUtils.isFastDoubleClick()) {
return;
}
if (pitBean.getUser_id()!=null && !pitBean.getUser_id().isEmpty() && !pitBean.getUser_id().equals("0")) {
if (pitBean.getUser_id() != null && !pitBean.getUser_id().isEmpty() && !pitBean.getUser_id().equals("0")) {
RoomCharmDialog.newInstance(roomInfoResp.getRoom_info().getRoom_id(), pitBean.getUser_id()).show(getChildFragmentManager(), "RoomCharmDialog");
}
}
@@ -393,7 +394,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
if (ClickUtils.isFastDoubleClick()) {
return;
}
if (pitBean.getUser_id()!=null && !pitBean.getUser_id().isEmpty() && !pitBean.getUser_id().equals("0")) {
if (pitBean.getUser_id() != null && !pitBean.getUser_id().isEmpty() && !pitBean.getUser_id().equals("0")) {
RoomCharmDialog.newInstance(roomInfoResp.getRoom_info().getRoom_id(), pitBean.getUser_id()).show(getChildFragmentManager(), "RoomCharmDialog");
}
}
@@ -419,7 +420,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
if (ClickUtils.isFastDoubleClick()) {
return;
}
if (pitBean.getUser_id()!=null && !pitBean.getUser_id().isEmpty() && !pitBean.getUser_id().equals("0")) {
if (pitBean.getUser_id() != null && !pitBean.getUser_id().isEmpty() && !pitBean.getUser_id().equals("0")) {
RoomCharmDialog.newInstance(roomInfoResp.getRoom_info().getRoom_id(), pitBean.getUser_id()).show(getChildFragmentManager(), "RoomCharmDialog");
}
}
@@ -446,7 +447,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
if (ClickUtils.isFastDoubleClick()) {
return;
}
if (pitBean.getUser_id()!=null && !pitBean.getUser_id().isEmpty() && !pitBean.getUser_id().equals("0")) {
if (pitBean.getUser_id() != null && !pitBean.getUser_id().isEmpty() && !pitBean.getUser_id().equals("0")) {
RoomCharmDialog.newInstance(roomInfoResp.getRoom_info().getRoom_id(), pitBean.getUser_id()).show(getChildFragmentManager(), "RoomCharmDialog");
}
@@ -855,6 +856,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
adapter.setNewData(roomInfoResp.getSong_pit_list());
}
// TODO: 2025/9/12 清除个人魅力
public void event1059(RoomMessageEvent messageEvent) {
RoomPitBean pitBean = mBinding.muZc.pitBean;
if (pitBean.getUser_id().equals(messageEvent.getText().getUser_id())) {
@@ -883,6 +885,36 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
adapter.setNewData(roomInfoResp.getSong_pit_list());
}
// TODO: 2025/9/12 在离线
public void event1058(RoomMessageEvent messageEvent) {
int type = messageEvent.getText().getType();
RoomPitBean pitBean = mBinding.muZc.pitBean;
if (pitBean.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean.setIs_online(type == 1 ? 1 : 2);
mBinding.muZc.setData(pitBean);
}
RoomPitBean pitBean1 = mBinding.muJb.pitBean;
if (pitBean1.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean1.setIs_online(type == 1 ? 1 : 2);
mBinding.muJb.setData(pitBean1);
}
RoomPitBean pitBean2 = mBinding.muYc.pitBean;
if (pitBean2.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean2.setIs_online(type == 1 ? 1 : 2);
mBinding.muYc.setData(pitBean2);
}
for (int i = 0; i < roomInfoResp.getSong_pit_list().size(); i++) {
if (roomInfoResp.getSong_pit_list().get(i).getUser_id().equals(messageEvent.getText().getUser_id())) {
roomInfoResp.getSong_pit_list().get(i).setIs_online(type == 1 ? 1 : 2);
break;
}
}
adapter.setNewData(roomInfoResp.getSong_pit_list());
}
public void event1035(RoomMessageEvent messageEvent) {
RoomPitBean pitBean = mBinding.muZc.pitBean;
if (pitBean.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {

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

@@ -1272,6 +1272,7 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
}
}
// TODO: 2025/9/12 清除个人魅力
public void event1059(RoomMessageEvent message){
String userId = message.getText().getUser_id();
RoomPitBean pitBean=new RoomPitBean();
@@ -1290,6 +1291,26 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
}
}
// TODO: 2025/9/12 在离线
public void event1058(RoomMessageEvent message) {
String userId = message.getText().getUser_id();
int type = message.getText().getType();
RoomPitBean pitBean=new RoomPitBean();
for (RoomPitBean roomPitBean : roomInfoResp.getRoom_info().getPit_list()){
if (roomPitBean.getUser_id() == null && roomPitBean.getUser_id().equals(userId)){
pitBean=roomPitBean;
pitBean.setIs_online(type == 1 ? 1 : 2);
break;
}
}
if (roomInfoRespPk == null || roomInfoRespPk.getPk_info() == null) {
wheatLayoutSingManager.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number()));
} else {
wheatLayoutManager1.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number()));
}
}
/// 推送的下麦1003
public void event1003(RoomMessageEvent message) {

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

@@ -400,6 +400,16 @@
android:layout_height="@dimen/dp_36"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_online4"
android:layout_width="@dimen/dp_36"
android:layout_height="@dimen/dp_36"
android:background="@mipmap/room_ic_owner_offline"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:loopCount="0"
tools:visibility="visible" />
<TextView
android:id="@+id/number_4"
@@ -430,6 +440,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_online5"
android:layout_width="@dimen/dp_36"
android:layout_height="@dimen/dp_36"
android:background="@mipmap/room_ic_owner_offline"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:loopCount="0"
tools:visibility="visible" />
<TextView
android:id="@+id/number_5"
android:layout_width="wrap_content"
@@ -456,10 +477,20 @@
android:id="@+id/avatar_6"
android:layout_width="@dimen/dp_36"
android:layout_height="@dimen/dp_36"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_online6"
android:layout_width="@dimen/dp_36"
android:layout_height="@dimen/dp_36"
android:background="@mipmap/room_ic_owner_offline"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:loopCount="0"
tools:visibility="visible" />
<TextView
android:id="@+id/number_6"
android:layout_width="wrap_content"

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

@@ -41,41 +41,18 @@ public class VoiceCategoryPresenter extends BasePresenter<VoiceCategoryContacts.
@Override
public void onNext(List<RoomTypeModel> list) {
SpUtil.setRoomTypeModel(GsonUtils.getGSON().toJson(list));
if (MvpRef==null){
MvpRef=new WeakReference<>(mView);
}
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
public void getMediaRoom(String label_id) {
// ApiClient.getInstance().getMediaRoom(label_id,new BaseObserver<String>() {
// @Override
// public void onSubscribe(Disposable d) {
// addDisposable(d);
// }
//
// @Override
// public void onNext(String roomId) {
// MvpRef.get().setRoomId(roomId);
// }
//
// @Override
// public void onComplete() {
//// MvpRef.get().disLoadings();
// }
// });
}
public void getBanners() {
@@ -103,11 +80,11 @@ public class VoiceCategoryPresenter extends BasePresenter<VoiceCategoryContacts.
@Override
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);
}
// 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) {
@@ -117,16 +94,19 @@ public class VoiceCategoryPresenter extends BasePresenter<VoiceCategoryContacts.
@Override
public void onNext(List<TopRoom> topRooms) {
SpUtil.setTopRoomTop(GsonUtils.getGSON().toJson(topRooms));
if (MvpRef==null){
MvpRef=new WeakReference<>(mView);
}
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);
}
// 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) {
@@ -135,34 +115,14 @@ public class VoiceCategoryPresenter extends BasePresenter<VoiceCategoryContacts.
@Override
public void onNext(List<TopRoom> topRooms) {
SpUtil.setTopRoom(GsonUtils.getGSON().toJson(topRooms));
// SpUtil.setTopRoom(GsonUtils.getGSON().toJson(topRooms));
if (MvpRef==null){
MvpRef=new WeakReference<>(mView);
}
MvpRef.get().setTopRoom(topRooms,type);
}
});
}
// 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);
}
}