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

1：修改所有接口返回提示，只是添加了返回错误的提示，不涉及功能

Browse Source 
2：给所有网络请求添加网络判断，添加拦截器
3：启动页添加启动视频，添加跳过功能
4：去掉抱麦弹框，直接跳转到用户列表
5：修改拍卖房，当抱人上麦后，没有选择关系，然后退出房间再次进来后，显示立即竞拍的按钮
6：修改我的歌单，添加和修改的时候，选择了不能使用的礼物，让dialog不关闭
7：修改点唱房，点一个人同一首歌，右侧下一首歌的作者不显示的问题
8：修改互娱房，选择关系的时候，会出现两次选择关系的问题
9：修改在送背包礼物的时候，最后一个送出，页面没有刷新
10：修改房间设置里面，点击了抽盘，设置页面不关闭的问题
11：修改个性装扮中，购买的装扮展示的时候，出现图片裁剪
This commit is contained in:
梁小江
2025-12-24 17:52:26 +08:00
parent 214c339e93
commit 342cfd347c
17 changed files with 1443 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
View File

@@ -1815,6 +1815,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
}
}
LogUtils.e("handleMsgType1004", "mRoomInfoResp = $mRoomInfoResp")
roomFragment!!.upRoomInfoData(mRoomInfoResp)
roomFragment?.handleRoomMessage(messageEvent)
roomBtnShowIsHide(fromUserInfo.user_id)

23
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java
View File

@@ -100,14 +100,14 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
@Override
public void endFriend(FriendUserBean friendUserBean) {
if (friendUserBean != null) {
dialogFragment = (RoomConcernDialogFragment) getChildFragmentManager().findFragmentByTag("RoomConcernDialogFragment");
if (dialogFragment != null && dialogFragment.isAdded()) {
return;
}
RoomConcernDialogFragment.newInstance(friendUserBean, this).show(getChildFragmentManager(), "RoomConcernDialogFragment");
}
// if (friendUserBean != null) {
// dialogFragment = (RoomConcernDialogFragment) getChildFragmentManager().findFragmentByTag("RoomConcernDialogFragment");
// if (dialogFragment != null && dialogFragment.isAdded()) {
// return;
// }
// RoomConcernDialogFragment.newInstance(friendUserBean, this).show(getChildFragmentManager(), "RoomConcernDialogFragment");
//
// }
}
@Override
@@ -238,7 +238,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
initFriendshipViews();
// 设置默认状态
updateFriendshipState(FriendshipPartType.WAIT);
initPopupWindow();
// initPopupWindow(); 2025年12月24日11:21:56 去掉抱麦弹框
roomId = roomInfoResp.getRoom_info().getRoom_id();
@@ -359,7 +359,10 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
// 3. 锁定/解锁麦位等
pitNumber = pitBean.getPit_number();
if (checkWeather(pitBean.getPit_number())) {
showPopupMenu(wheatView); // v 是点击的按钮视图
// showPopupMenu(wheatView); // v 是点击的按钮视图
if (getActivity() != null && getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).showUserListDialog(roomId, pitNumber, roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
}
} else if (pitBean.getPit_number().equals("10")) {
if (getActivity() != null && getActivity() instanceof RoomActivity) {
if (((RoomActivity) getActivity()).getHostUser() < 4) {

23
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomAuctionFragment.java
View File

@@ -148,16 +148,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
mBinding.tvPB.setText(StringUtil.toWan2(auctionUserBean.getCharm(), 1));
countDownTime(auctionUserBean.getDuration());
if (auctionUserBean.getAuction_id() != null) {
mBinding.ivJp.setVisibility(VISIBLE);
gengv();
auctionId = auctionUserBean.getAuction_id();
SpUtil.setAuctionId(auctionId);
} else {
SpUtil.setAuctionId("");
mBinding.ivJp.setVisibility(INVISIBLE);
}
if (auctionUserBean.getUser_id() != null && auctionUserBean.getUser_id().equals(SpUtil.getUserId() + "")) {
mBinding.ivJp.setVisibility(INVISIBLE);
} else {
@@ -179,7 +169,15 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
mBinding.ivJp.setVisibility(VISIBLE);
}
if (auctionUserBean.getAuction_id() != null && !auctionUserBean.getAuction_id().isEmpty()) {
mBinding.ivJp.setVisibility(VISIBLE);
gengv();
auctionId = auctionUserBean.getAuction_id();
SpUtil.setAuctionId(auctionId);
} else {
SpUtil.setAuctionId("");
mBinding.ivJp.setVisibility(INVISIBLE);
}
}
if (roomAuction.getAuction_list() != null && !roomAuction.getAuction_list().isEmpty()) {
auctionList = roomAuction.getAuction_list();
@@ -615,10 +613,13 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
mBinding.pB.setImageResource(com.xscm.moduleutil.R.mipmap.qm_b);
mBinding.btnRelation.setImageResource(com.xscm.moduleutil.R.mipmap.guanx);
mBinding.tvRelation.setTextColor(ContextCompat.getColor(requireContext(), com.xscm.moduleutil.R.color.color_FF999999));
mBinding.tvRelation.setBackgroundResource(0);
mBinding.btnGift.setImageResource(com.xscm.moduleutil.R.mipmap.liwu);
mBinding.tvGift.setTextColor(ContextCompat.getColor(requireContext(), com.xscm.moduleutil.R.color.color_FF999999));
mBinding.tvGift.setBackgroundResource(0);
mBinding.btnTime.setImageResource(com.xscm.moduleutil.R.mipmap.shij);
mBinding.tvTimetg.setTextColor(ContextCompat.getColor(requireContext(), com.xscm.moduleutil.R.color.color_FF999999));
mBinding.tvTimetg.setBackgroundResource(0);
mBinding.ivJp.setImageResource(com.xscm.moduleutil.R.mipmap.room_auction_jp);
mBinding.avatar4.setImageResource(com.xscm.moduleutil.R.mipmap.room_ic_wheat_default);
mBinding.avatar5.setImageResource(com.xscm.moduleutil.R.mipmap.room_ic_wheat_default);

8
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java
View File

@@ -103,7 +103,7 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
@Override
protected void initView() {
initPopupWindow();
// initPopupWindow(); 2025年12月24日11:25:00 去掉抱麦弹框
mBinding.guestContainer.setVisibility(GONE);
viewList.clear();
@@ -135,7 +135,10 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
if (cheackWether(pitBean.getPit_number())) {
pitNumber = pitBean.getPit_number();
roomPitBean = pitBean;
showPopupMenu(roomJukeboxWheatView); // v 是点击的按钮视图
// showPopupMenu(roomJukeboxWheatView); // v 是点击的按钮视图
if (getActivity() != null && getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).showUserListDialog(roomId, pitNumber, roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
}
} else if ((finalI + 1) == 10) {
if (getActivity() instanceof RoomActivity) {
if (((RoomActivity) ActivityUtils.getTopActivity()).getHostUser() < 4) {
@@ -647,6 +650,7 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
roomInfoResp.getSinger_info().setNext_song_info(messageEvent.getText().getNext_song_info());
} else {
mBinding.guestContainer.setVisibility(View.GONE);
roomInfoResp.getSinger_info().setNext_song_info(null);
}
}

2
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt
View File

@@ -105,7 +105,7 @@ class RoomMentorShipFragment(var mRoomInfoResp: RoomInfoResp?) :
}
override fun initView() {
initPopupWindow()
// initPopupWindow() 2025年12月24日11:27:57，去掉抱麦弹框
viewList.clear()
viewList.add(mBinding.rmsw1)

17
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java
View File

@@ -147,7 +147,7 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
initPopupWindow();
// initPopupWindow(); 2025年12月24日11:18:58，去掉弹框，直接进行抱麦
flexboxLayout = mBinding.flexboxLayout;
var wheatContainer = WheatLayoutSingManager.Companion.getInstance().getRootContainer();
flexboxLayout.addView(wheatContainer);
@@ -185,7 +185,10 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
if (cheackWether(pitBean.getPit_number())) {
pitNumber = pitBean.getPit_number();
roomPitBean = pitBean;
showPopupMenu(view); // v 是点击的按钮视图
// showPopupMenu(view); // v 是点击的按钮视图
if(getActivity() != null && getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).showUserListDialog(roomId, pitNumber, roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
}
} else if (pitNumber1 == 10) {
if (getActivity() != null && getActivity() instanceof RoomActivity){
if (getActivity() != null && ((RoomActivity) getActivity()).getHostUser() < 4){
@@ -714,7 +717,10 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
pitNumber = pitBean.getPit_number();
roomPitBean = pitBean;
showPopupMenu(view); // v 是点击的按钮视图
// showPopupMenu(view); // v 是点击的按钮视图
if(getActivity() != null && getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).showUserListDialog(roomId, pitNumber, roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
}
} else if (pitNumber1 == 10) {
// 添加防重复点击检查
if (!isFastDoubleClick("online_dialog", pitNumber1 + "")) {
@@ -785,7 +791,10 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
pitNumber = pitBean.getPit_number();
roomPitBean = pitBean;
showPopupMenu(view); // v 是点击的按钮视图
// showPopupMenu(view); // v 是点击的按钮视图
if(getActivity() != null && getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).showUserListDialog(roomId, pitNumber, roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
}
} else if (pitNumber1 == 10) {
// 添加防重复点击检查
if (!isFastDoubleClick("online_dialog", pitNumber1 + "")) {

7
MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/HotListPresenter.java
View File

@@ -60,6 +60,13 @@ public class HotListPresenter extends BasePresenter<HotListContacts.View> implem
view.finishRefreshLoadMore();
}
}
@Override
public void onError(Throwable e) {
if (MvpRef==null){
MvpRef=new WeakReference<>(mView);
}
MvpRef.get().finishRefreshLoadMore();
}
});
}

4
MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java
View File

@@ -185,6 +185,10 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
}
public void onClick(View view) {
if (userInfo==null ){
ToastUtils.show("用户数据错误");
return;
}
int id = view.getId();
if (id == R.id.ll_visit) {
// ARouter.getInstance().build(ARouteConstants.ME_VISIT).navigation();

2
MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/zhuangb/ZhuangBanShangChengAdapter.java
View File

@@ -25,7 +25,7 @@ public class ZhuangBanShangChengAdapter extends BaseQuickAdapter<ZhuangBanShangC
if (item.getBase_image().equals("")) {
helper.getView(R.id.integral).setVisibility(View.GONE);
} else {
ImageUtils.loadHeadCC(item.getBase_image(), helper.getView(R.id.iv_img));
ImageUtils.loadHead(item.getBase_image(), helper.getView(R.id.iv_img));
}
TextView tv_integral = helper.getView(R.id.integral);

2
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java
View File

@@ -442,6 +442,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
GiftLotteryDialog newDialog = GiftLotteryDialog.newInstance(
"11", roomId, "", "", "");
newDialog.show(fm, "GiftLotteryDialog");
dismiss();
}
} catch (Exception e) {
LogUtils.e("RoomGiftDialogFragment", "Error in showGiftLotteryDialog", e);
@@ -458,6 +459,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
GiftLotteryDialog newDialog = GiftLotteryDialog.newInstance(
"12", roomId, "", "", "");
newDialog.show(fm, "GiftLotteryDialog");
dismiss();
}
} catch (Exception e) {
LogUtils.e("RoomGiftDialogFragment", "Error in showGiftLotteryDialog", e);