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

1：修改BUG

Browse Source
This commit is contained in:
梁小江
2025-12-05 14:35:34 +08:00
parent 3a193da90d
commit 8640c7366a
19 changed files with 218 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3337,6 +3337,18 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
mBinding!!.headName.text = mRoomInfoResp?.room_info?.head_line?.nickname
mBinding!!.headCone.text = mRoomInfoResp?.room_info?.head_line?.content
mBinding!!.headAvate.setOnClickListener { view ->
RoomUserInfoFragment.show(
roomId,
mRoomInfoResp?.room_info?.head_line?.user_id,
"",
getHostUser(),
false,
2,
isNumberWhether(),
supportFragmentManager)
}
mBinding!!.ivQuanQiang.setOnClickListener { v: View? ->
val fragment = PublishCommentDialogFragment.show(
roomId,

6
MainModule/src/main/java/com/xscm/modulemain/activity/room/adapter/RequestSongPagerAdapter.java
View File

@@ -15,9 +15,11 @@ import com.xscm.modulemain.activity.room.fragment.SongRequestFragment;
public class RequestSongPagerAdapter extends FragmentStateAdapter {
private static final int TAB_COUNT = 3; // 三个标签页
private String zcUserId;
public RequestSongPagerAdapter(@NonNull FragmentActivity fragmentActivity) {
public RequestSongPagerAdapter(String zcUserId,@NonNull FragmentActivity fragmentActivity) {
super(fragmentActivity);
this.zcUserId = zcUserId;
}
@NonNull
@@ -27,7 +29,7 @@ public class RequestSongPagerAdapter extends FragmentStateAdapter {
case 0:
return new SongRequestFragment(); // 点歌页面
case 1:
return new RequestedSongsFragment(); // 已点歌曲页面
return RequestedSongsFragment.newInstance(zcUserId); // 已点歌曲页面
case 2:
return new SongHistoryFragment(); // 历史记录页面
default:

41
MainModule/src/main/java/com/xscm/modulemain/activity/room/adapter/RequestedSongsAdapter.java
View File

@@ -30,15 +30,14 @@ public class RequestedSongsAdapter extends BaseQuickAdapter<SongPlaylist.SongPla
private OnItemClickListener onItemClickListener;
public RequestedSongsAdapter() {
public RequestedSongsAdapter(String zcUserId) {
super(R.layout.item_requested_song);
this.zcUserId=zcUserId;
}
private String zcUserId="";
public void setZcUserId(String zcUserId) {
this.zcUserId=zcUserId;
}
public interface OnItemClickListener {
void onPlayClick(SongPlaylist.SongPlaylistBean song, int position);
@@ -68,19 +67,31 @@ public class RequestedSongsAdapter extends BaseQuickAdapter<SongPlaylist.SongPla
helper.setText(R.id.tv_request_status, "置顶");
helper.setTextColor(R.id.tv_request_status, 0xFFFFFFFF);
helper.setBackgroundRes(R.id.tv_request_status, com.xscm.moduleutil.R.drawable.bg_r34_3abc6d);
try {
if (zcUserId.equals(SpUtil.getUserId()+"")){
helper.getView(R.id.tv_request_status).setVisibility(View.VISIBLE);
}else {
helper.getView(R.id.tv_request_status).setVisibility(View.GONE);
}
}catch (Exception e){
helper.getView(R.id.tv_request_status).setVisibility(View.GONE);
LogUtils.e("RequestedSongsAdapter",e.getMessage());
}
}
try {
if (((RoomActivity)ActivityUtils.getTopActivity()).getMRoomInfoResp().getRoom_info().getPit_list().get(8).getUser_id()
.equals(SpUtil.getUserId()+"")){
helper.getView(R.id.tv_request_status).setVisibility(View.VISIBLE);
}else {
helper.getView(R.id.tv_request_status).setVisibility(View.GONE);
}
}catch (Exception e){
helper.getView(R.id.tv_request_status).setVisibility(View.GONE);
LogUtils.e("RequestedSongsAdapter",e.getMessage());
}
// try {
// if (((RoomActivity)ActivityUtils.getTopActivity()).getMRoomInfoResp().getRoom_info().getPit_list().get(8).getUser_id()
// .equals(SpUtil.getUserId()+"")){
// helper.getView(R.id.tv_request_status).setVisibility(View.VISIBLE);
// }else {
// helper.getView(R.id.tv_request_status).setVisibility(View.GONE);
// }
// }catch (Exception e){
// helper.getView(R.id.tv_request_status).setVisibility(View.GONE);
// LogUtils.e("RequestedSongsAdapter",e.getMessage());
// }
// 设置tvRequestStatus的点击事件，只有置顶状态才能点击

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

@@ -30,6 +30,7 @@ public class RequestSongFragment extends BaseMvpDialogFragment<RequestSongPresen
private int historySongsCount = 0; // 历史记录数量
private String roomId;
private String zcUserId;
public RequestSongFragment() {
// Required empty public constructor
@@ -40,9 +41,11 @@ public class RequestSongFragment extends BaseMvpDialogFragment<RequestSongPresen
* @return
*/
// TODO: Rename and change types and number of parameters
public static RequestSongFragment show(FragmentManager fragmentManager) {
public static RequestSongFragment show(String zcUserId,FragmentManager fragmentManager) {
RequestSongFragment fragment = new RequestSongFragment();
Bundle args = new Bundle();
args.putString("zcUserId", zcUserId);
fragment.setArguments(args);
fragment.show(fragmentManager, "RequestSongFragment");
return fragment;
}
@@ -64,8 +67,9 @@ public class RequestSongFragment extends BaseMvpDialogFragment<RequestSongPresen
}
private void initViewPager() {
zcUserId= getArguments().getString("zcUserId");
// 创建适配器
pagerAdapter = new RequestSongPagerAdapter(getActivity());
pagerAdapter = new RequestSongPagerAdapter(zcUserId,getActivity());
// 设置适配器
mBinding.viewPager.setAdapter(pagerAdapter);

24
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestedSongsFragment.java
View File

@@ -1,5 +1,6 @@
package com.xscm.modulemain.activity.room.fragment;
import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -19,6 +20,7 @@ import com.xscm.modulemain.activity.room.adapter.RequestedSongsAdapter;
import com.xscm.modulemain.activity.room.contacts.RequestSongContacts;
import com.xscm.modulemain.activity.room.presenter.RequestSongPresenter;
import com.xscm.modulemain.databinding.FragmentRequestedSongsBinding;
import com.xscm.moduleutil.adapter.GiftTwoDetailsFragment;
import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.bean.SingerSongCount;
import com.xscm.moduleutil.bean.SongPlaylist;
@@ -37,6 +39,26 @@ public class RequestedSongsFragment extends BaseMvpFragment<RequestSongPresenter
private int page = 1;
private RequestedSongsAdapter adapter;
private List<SongPlaylist.SongPlaylistBean> songList = new ArrayList<>();
private String zcUserId;
public RequestedSongsFragment(){
}
public static RequestedSongsFragment newInstance(String zcUserId) {
Bundle args = new Bundle();
args.putString("zcUserId", zcUserId);
RequestedSongsFragment fragment = new RequestedSongsFragment();
fragment.setArguments(args);
return fragment;
}
@Override
public void onAttach(@NonNull Context context) {
super.onAttach(context);
zcUserId= getArguments().getString("zcUserId");
}
@Override
protected RequestSongPresenter bindPresenter() {
@@ -68,7 +90,7 @@ public class RequestedSongsFragment extends BaseMvpFragment<RequestSongPresenter
private void initRecyclerView() {
// 初始化RecyclerView
adapter = new RequestedSongsAdapter();
adapter = new RequestedSongsAdapter(zcUserId);
mBinding.rvMyRequestedSongs.setLayoutManager(new LinearLayoutManager(getContext()));
mBinding.rvMyRequestedSongs.setAdapter(adapter);

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

@@ -166,8 +166,11 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
if (ClickUtils.isFastDoubleClick(v)) {
return;
}
LogUtils.e("cc",mBinding.wvZc.getUserId());
RoomPitBean roomPitBean1=mBinding.wvZc.pitBean;
LogUtils.e("roomPitBean1",roomPitBean1);
// 保存RequestSongFragment的引用，以便后续调用其方法
requestSongFragment = RequestSongFragment.show(getChildFragmentManager());
requestSongFragment = RequestSongFragment.show(roomPitBean1.getUser_id(),getChildFragmentManager());
}
});
@@ -211,6 +214,20 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
}
}
});
mBinding.ciGsAva.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (ClickUtils.isFastDoubleClick(v)) {
return;
}
if (roomInfoResp.getSinger_info()!=null && roomInfoResp.getSinger_info().getNext_song_info()!=null) {
if (roomInfoResp.getSinger_info().getNext_song_info().getSinger_user_id() != 0)
RoomUserInfoFragment.show(roomId, roomInfoResp.getSinger_info().getNext_song_info().getSinger_user_id() + "", "0", getHostUser(), false, 1, isNumberWhether(), getChildFragmentManager());
}
}
});
}
@@ -633,9 +650,13 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
if (toPit.equals("9")) {
RoomPitBean fromBean = adapter.getData().get(fromIndex);
fromBean.setPit_number(toPit);
mBinding.wvZc.setRoomWheatNumber("9");
mBinding.wvZc.setData(fromBean);
roomInfoResp.getRoom_info().getPit_list().set(8, fromBean);
fromBean.clone();
//这里需要是重新的指向地址，不然会出现，虽然页面展示的是，但是在点击的时候，找不到对应的数据
RoomPitBean pitBean = fromBean.clone();
mBinding.wvZc.setData(pitBean);
roomInfoResp.getRoom_info().getPit_list().set(8, pitBean);
if (fromBean.getUser_id().equals(SpUtil.getUserId() + "")) {
myPitNumber = 9;
@@ -650,7 +671,7 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
temp.setCharm("");
temp.setDress("");
temp.setImageType(false);
temp.setPit_number(fromPit);
roomInfoResp.getRoom_info().getPit_list().set(fromIndex, temp);
roomPitBeans.set(fromIndex, temp);
adapter.notifyItemChanged(fromIndex);
@@ -666,6 +687,7 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
adapter.notifyItemChanged(fromIndex);
adapter.notifyItemChanged(toIndex);
}
LogUtils.e("huanmai2",mBinding.wvZc.pitBean);
setMike();
}