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

1：修改小时榜入口

Browse Source 
2：修改小时榜图片大小
3：修改换麦后清除魅力展示
This commit is contained in:
梁小江
2025-09-30 19:52:56 +08:00
parent 2a9416c1ea
commit 47ce1c9462
20 changed files with 406 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -685,6 +685,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
override fun onConnectSuccess() { //重连成功
if (CommonAppContext.getInstance().playId != null) {
LogUtils.e("@@@", "重连成功")
LogUtils.e("@@@", ""+CommonAppContext.getInstance().playId)
RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId)
}
}
@@ -1563,7 +1564,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
mRoomInfoResp!!.room_info.type_id == "4" || mRoomInfoResp!!.room_info.type_id == "8"
) {
if (mRoomInfoResp!!.room_info.label_id == "1") {
roomFragment!!.SingSongEvent(messageEvent)
// roomFragment!!.SingSongEvent(messageEvent)
} else {
roomFragment!!.KtvFragmentEvent(messageEvent)
}
@@ -1748,6 +1749,30 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
messageEvent: RoomMessageEvent
) {
mRoomInfoResp!!.user_info.pit_number = Integer.parseInt(toPitNumber)
// if (messageEvent.text.user_id .equals(SpUtil.getUserId().toString()) && "9" == toPitNumber) {
// if (customMusicFloatingView != null) {
// customMusicFloatingView!!.destroy()
// AgoraManager.getInstance(this@RoomActivity).desMusic()
// isMusic = false
// }
// mBinding!!.roomTop.rl.visibility = View.GONE
// ivSoundEffects(false)
// }
if ("9" == toPitNumber && messageEvent.text.user_id .equals(SpUtil.getUserId().toString())) {
mBinding!!.roomTop.rl.visibility = View.VISIBLE
ivSoundEffects(true)
}else{
if (customMusicFloatingView != null) {
customMusicFloatingView!!.destroy()
AgoraManager.getInstance(this@RoomActivity).desMusic()
isMusic = false
}
mBinding!!.roomTop.rl.visibility = View.GONE
ivSoundEffects(false)
}
// if (TextUtils.isEmpty(fromPitNumber) || TextUtils.isEmpty(toPitNumber)) {
// return
// }

9
moduleroom/src/main/java/com/example/moduleroom/adapter/RoomHourlyAdapter.java
View File

@@ -41,12 +41,17 @@ public class RoomHourlyAdapter extends BaseQuickAdapter<RoomHourBean.RoomListBea
ImageUtils.loadHeadCC(roomListBean.getRoom_cover(), baseViewHolder.getView(R.id.room_tx));
if (roomListBean.getXlh_status()==1){
baseViewHolder.getView(R.id.im_xlh).setVisibility(View.VISIBLE);
baseViewHolder.setImageResource(R.id.im_xlh, com.xscm.moduleutil.R.mipmap.hourly_xlh_status);
baseViewHolder.getView(R.id.tv_sta).setVisibility(View.VISIBLE);
baseViewHolder.setText(R.id.tv_sta, "进行中");
baseViewHolder.setBackgroundRes(R.id.tv_sta, com.xscm.moduleutil.R.mipmap.jxz);
}else if (roomListBean.getXlh_status()==2){
baseViewHolder.getView(R.id.im_xlh).setVisibility(View.VISIBLE);
baseViewHolder.setImageResource(R.id.im_xlh, com.xscm.moduleutil.R.mipmap.hourly_xlh_sta);
baseViewHolder.getView(R.id.tv_sta).setVisibility(View.VISIBLE);
baseViewHolder.setText(R.id.tv_sta, "即将开始");
baseViewHolder.setBackgroundRes(R.id.tv_sta, com.xscm.moduleutil.R.mipmap.jiks);
}else {
baseViewHolder.getView(R.id.im_xlh).setVisibility(View.GONE);
baseViewHolder.getView(R.id.tv_sta).setVisibility(View.GONE);
}
baseViewHolder.setText(R.id.room_name, roomListBean.getRoom_name());
ImageUtils.loadHeadCC(roomListBean.getLabel_icon(), baseViewHolder.getView(R.id.iv_type));

56
moduleroom/src/main/java/com/example/moduleroom/dialog/HourlyChartDialog.java
View File

@@ -1,10 +1,12 @@
package com.example.moduleroom.dialog;
import android.app.Dialog;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.view.Gravity;
import android.view.ViewGroup;
import android.os.Bundle;
import android.view.*;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.example.moduleroom.R;
import com.example.moduleroom.adapter.RoomHourlyAdapter;
@@ -16,8 +18,10 @@ import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.adapter.CirleListAdapter;
import com.xscm.moduleutil.base.BaseMvpDialogFragment;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.base.RoomManager;
import com.xscm.moduleutil.bean.room.RoomHourBean;
import com.xscm.moduleutil.dialog.RoomAuctionWebViewDialog;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
@@ -31,6 +35,9 @@ public class HourlyChartDialog extends BaseMvpDialogFragment<HourlyChartPresente
private int page;
private RoomHourlyAdapter roomHourlyAdapter;
// 添加标志，控制对话框从右侧显示
protected boolean mGravityRight = true;
@Override
protected HourlyChartPresenter bindPresenter() {
@@ -47,17 +54,35 @@ public class HourlyChartDialog extends BaseMvpDialogFragment<HourlyChartPresente
protected void initData() {
}
@NonNull
@Override
public @NotNull Dialog onCreateDialog(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
Dialog dialog = new Dialog(requireContext(), com.xscm.moduleutil.R.style.FullScreenDialogStyle);
return dialog;
}
@Override
public void onStart() {
super.onStart();
if (getDialog() != null && getDialog().getWindow() != null) {
// 设置为全屏高度，并去掉状态栏
getDialog().getWindow().setLayout(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT
);
getDialog().getWindow().setGravity(Gravity.END);
// 添加全屏标志，去掉状态栏
getDialog().getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,WindowManager.LayoutParams.FLAG_FULLSCREEN);
getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
if (mGravityRight) {
getDialog().getWindow().setGravity(Gravity.END);
} else {
getDialog().getWindow().setGravity(Gravity.BOTTOM);
}
}
}
@Override
public void onResume() {
super.onResume();
@@ -70,7 +95,11 @@ public class HourlyChartDialog extends BaseMvpDialogFragment<HourlyChartPresente
// 设置dialog的窗口属性
if (getDialog() != null && getDialog().getWindow() != null) {
getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
getDialog().getWindow().setGravity(Gravity.END); // 保持右侧显示
if (mGravityRight) {
getDialog().getWindow().setGravity(Gravity.END);
} else {
getDialog().getWindow().setGravity(Gravity.BOTTOM);
}
}
mBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
roomHourlyAdapter = new RoomHourlyAdapter();
@@ -108,6 +137,12 @@ public class HourlyChartDialog extends BaseMvpDialogFragment<HourlyChartPresente
});
mBinding.viewBackground.setOnClickListener(v -> dismiss());
mBinding.imHourlyWf.setOnClickListener(v -> {
Bundle bundle = new Bundle();
bundle.putString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "api/Page/page_show?id=24");
RoomAuctionWebViewDialog dialog = new RoomAuctionWebViewDialog(getActivity(), bundle);
dialog.show();
});
}
@Override
@@ -141,4 +176,15 @@ public class HourlyChartDialog extends BaseMvpDialogFragment<HourlyChartPresente
mBinding.smartRefreshLayout.finishLoadMore() ;
mBinding.smartRefreshLayout.finishRefresh();
}
}
@Override
protected void initDialogStyle(Window window) {
if (mGravityRight) {
window.setGravity(Gravity.END);
window.setWindowAnimations(com.xscm.moduleutil.R.style.DialogSlideRightAnimation);
} else {
window.setGravity(Gravity.BOTTOM);
window.setWindowAnimations(com.xscm.moduleutil.R.style.CommonShowDialogBottom);
}
}
}

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

@@ -27,6 +27,7 @@ import com.example.moduleroom.dialog.WheatFeedingDialogFragment;
import com.example.moduleroom.presenter.RoomPresenter;
import com.hjq.toast.ToastUtils;
import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.RoomCharmRankBean;
import com.xscm.moduleutil.bean.RoomMessageEvent;
import com.xscm.moduleutil.bean.UserOnlineStatusBean;
@@ -795,8 +796,10 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
setview();
if (mRoomInfoResp.getUser_info().getPit_number() != 0) {
AgoraManager.getInstance(getActivity()).muteLocalAudioStream(false);
((RoomActivity) getActivity()).switchMic(2);
if (!CommonAppContext.getInstance().isMai) {
AgoraManager.getInstance(getActivity()).muteLocalAudioStream(false);
((RoomActivity) getActivity()).switchMic(2);
}
} else {
AgoraManager.getInstance(getActivity()).muteLocalAudioStream(true);
}

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

@@ -297,7 +297,8 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
return false;
} else {
if (roomInfoResp.getRoom_info().getPit_list().size() > 8) {
if (roomInfoResp.getRoom_info().getPit_list().get(8).getUser_id().equals(SpUtil.getUserId() + "") && !pitNumber.equals("10")) {
// if (roomInfoResp.getRoom_info().getPit_list().get(8).getUser_id().equals(SpUtil.getUserId() + "") && !pitNumber.equals("10")) {
if (roomInfoResp.getUser_info().getPit_number()==9 && !pitNumber.equals("10")) {
return true;
}
return false;
@@ -383,7 +384,8 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
wheatLayoutSingManager.setOnWheatClickListener(new WheatLayoutSingManager.OnWheatClickListener() {
@Override
public void onWheatClick(RoomSingSongWheatView view, int pitNumber1) {
RoomPitBean pitBean = roomInfoResp.getRoom_info().getPit_list().get(pitNumber1 - 1);
// RoomPitBean pitBean = roomInfoResp.getRoom_info().getPit_list().get(pitNumber1 - 1);
RoomPitBean pitBean = view.pitBean;
// 可选：点击事件处理
Log.d("Wheat", "Clicked pit: " + pitNumber1);
@@ -1338,7 +1340,9 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
}
}
if (roomInfoRespPk == null || roomInfoRespPk.getPk_info() == null) {
wheatLayoutSingManager.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number()!=null ? roomPitBean.getPit_number() : "0"));
if (roomInfoResp!=null) {
wheatLayoutSingManager.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number() != null ? roomPitBean.getPit_number() : "0"));
}
} else {
wheatLayoutManager1.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number()));
}
@@ -1349,6 +1353,7 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
// for (int i = 0; i < roomInfoResp.getRoom_info().getPit_list().size(); i++) {
// wheatLayoutSingManager.updateSingleWheat(roomInfoResp.getRoom_info().getPit_list().get(i), i + 1);
// }
wheatLayoutSingManager.setUpData(message);
} else {
for (int i = 0; i < roomInfoResp.getRoom_info().getPit_list().size(); i++) {

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

@@ -521,7 +521,7 @@
</com.xscm.moduleutil.widget.DropViewRoom>
<com.xscm.moduleutil.widget.DropViewRoom
<com.xscm.moduleutil.widget.DropHourlView
android:id="@+id/cl_xsb"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_25"
@@ -548,7 +548,7 @@
android:textSize="11sp"/>
</com.xscm.moduleutil.widget.DropViewRoom>
</com.xscm.moduleutil.widget.DropHourlView>
<com.xscm.moduleutil.widget.floatingView.Floa

23
moduleroom/src/main/res/layout/item_hourly.xml
View File

@@ -44,14 +44,29 @@
<ImageView
android:id="@+id/im_xlh"
android:layout_width="@dimen/dp_44"
android:layout_height="@dimen/dp_48"
android:src="@mipmap/hourly_xlh_status"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"
android:src="@mipmap/xlh_rk_bj"
android:scaleType="fitCenter"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"/>
/>
<TextView
android:id="@+id/tv_sta"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="@+id/im_xlh"
app:layout_constraintTop_toBottomOf="@+id/im_xlh"
app:layout_constraintEnd_toEndOf="@+id/im_xlh"
android:textColor="@color/white"
android:background="@mipmap/jxz"
android:gravity="center"
tools:text="进行中"
android:textSize="@dimen/sp_10"/>
<TextView
android:id="@+id/room_name"