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-10-01 00:35:49 +08:00
parent 47ce1c9462
commit aae94d15e0
19 changed files with 391 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3726,6 +3726,10 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
override fun onResume() {
super.onResume()
LogUtils.e("RoomActivity", "onResume")
CommonAppContext.getInstance().isShow = true
CommonAppContext.getInstance().isPlaying = true
@@ -3784,9 +3788,12 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
if (isMinimized) {
isMinimized = false
clearMinimizeState()
// 恢复房间状态
resumeRoomState()
setupEffectView()
MvpPre!!.postRoomInfo(CommonAppContext.getInstance().playId)
// resetFragment()
}

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

@@ -27,14 +27,18 @@ public class RoomHourlyAdapter extends BaseQuickAdapter<RoomHourBean.RoomListBea
@Override
protected void convert(BaseViewHolder baseViewHolder, RoomHourBean.RoomListBean roomListBean) {
// 获取当前项的索引
int position = baseViewHolder.getAdapterPosition();
int position = baseViewHolder.getLayoutPosition();
if (position == 0){
baseViewHolder.setText(R.id.tv_num, "");
baseViewHolder.setBackgroundRes(R.id.tv_num, com.xscm.moduleutil.R.mipmap.top1);
}else if (position == 1){
baseViewHolder.setText(R.id.tv_num, "");
baseViewHolder.setBackgroundRes(R.id.tv_num, com.xscm.moduleutil.R.mipmap.top2);
}else if (position == 2){
baseViewHolder.setText(R.id.tv_num, "");
baseViewHolder.setBackgroundRes(R.id.tv_num, com.xscm.moduleutil.R.mipmap.top3);
}else {
baseViewHolder.setBackgroundRes(R.id.tv_num, com.xscm.moduleutil.R.mipmap.hourly_num);
baseViewHolder.setText(R.id.tv_num, position+1+"");
}

4
moduleroom/src/main/java/com/example/moduleroom/contacts/RoomUserContacts.java
View File

@@ -25,6 +25,8 @@ public class RoomUserContacts {
void topRelationCard(String s);
void deleteRelationCard(String s);
void clearUserCharm();
void applyPit();
}
public interface ViewGx extends IView<Activity> {
@@ -54,5 +56,7 @@ public class RoomUserContacts {
void deleteRelationCard(String id);
void clearUserCharm(String roomId,String userId);
void applyPit(String roomId,String pitNumber);
}
}

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

@@ -161,7 +161,11 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
int id = view.getId();
if (id == R.id.room_m_cz) {
if (mBinding.roomMCz.getText().equals("上麦")) {
} else {
MvpPre.applyPit(room_id, "");
}else if (mBinding.roomMCz.getText().equals("抱麦")){
MvpPre.hostUserPit(room_id, pit_number, user_id, "1");
}
else {
if(user_id.equals(SpUtil.getUserId()+"")){
MvpPre.downPit(room_id, pit_number);
}else {
@@ -495,12 +499,22 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
mBinding.roomBo.setVisibility(View.VISIBLE);
mBinding.imQml.setVisibility(VISIBLE);
mBinding.roomMCz.setVisibility(View.VISIBLE);
if (userInfo.getIs_in_pit() == 1) {
mBinding.roomMCz.setText("下麦");
} else {
mBinding.roomMCz.setText("抱麦");
}
if (isSelf){
mBinding.roomDian.setVisibility(GONE);
mBinding.roomJb.setVisibility(View.GONE);
mBinding.roomLh.setVisibility(View.GONE);
mBinding.roomBo.setVisibility(GONE);
mBinding.roomMCz.setVisibility(View.VISIBLE);
if (userInfo.getIs_in_pit() == 1) {
mBinding.roomMCz.setText("下麦");
} else {
mBinding.roomMCz.setText("上麦");
}
}
break;
@@ -523,6 +537,11 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
// mBinding.roomMCz.setVisibility(GONE);
// }
mBinding.roomMCz.setVisibility(View.VISIBLE);
if (userInfo.getIs_in_pit() == 1) {
mBinding.roomMCz.setText("下麦");
} else {
mBinding.roomMCz.setText("抱麦");
}
}
if (isSelf){
mBinding.roomDian.setVisibility(GONE);
@@ -530,6 +549,11 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
mBinding.roomLh.setVisibility(View.GONE);
mBinding.roomBo.setVisibility(GONE);
mBinding.roomMCz.setVisibility(View.VISIBLE);
if (userInfo.getIs_in_pit() == 1) {
mBinding.roomMCz.setText("下麦");
} else {
mBinding.roomMCz.setText("上麦");
}
}
mBinding.imQml.setVisibility(VISIBLE);
break;
@@ -551,6 +575,11 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
// mBinding.roomMCz.setVisibility(GONE);
// }
mBinding.roomMCz.setVisibility(View.VISIBLE);
if (userInfo.getIs_in_pit() == 1) {
mBinding.roomMCz.setText("下麦");
} else {
mBinding.roomMCz.setText("抱麦");
}
}
if (isSelf){
mBinding.roomDian.setVisibility(GONE);
@@ -558,6 +587,11 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
mBinding.roomLh.setVisibility(View.GONE);
mBinding.roomBo.setVisibility(GONE);
mBinding.roomMCz.setVisibility(View.VISIBLE);
if (userInfo.getIs_in_pit() == 1) {
mBinding.roomMCz.setText("下麦");
} else {
mBinding.roomMCz.setText("上麦");
}
}
mBinding.imQml.setVisibility(VISIBLE);
break;
@@ -583,6 +617,11 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
mBinding.roomLh.setVisibility(View.GONE);
mBinding.roomBo.setVisibility(GONE);
mBinding.roomMCz.setVisibility(View.VISIBLE);
if (userInfo.getIs_in_pit() == 1) {
mBinding.roomMCz.setText("下麦");
} else {
mBinding.roomMCz.setText("上麦");
}
}
break;
@@ -740,5 +779,10 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
ToastUtils.show("清除成功");
}
@Override
public void applyPit() {
dismiss();
}
}

5
moduleroom/src/main/java/com/example/moduleroom/fragment/RelationshipFragment.java
View File

@@ -228,4 +228,9 @@ public class RelationshipFragment extends BaseMvpDialogFragment<RoomUserPresente
public void clearUserCharm() {
}
@Override
public void applyPit() {
}
}

18
moduleroom/src/main/java/com/example/moduleroom/presenter/RoomUserPresenter.java
View File

@@ -298,4 +298,22 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
}
});
}
@Override
public void applyPit(String roomId, String pitNumber) {
RetrofitClient.getInstance().applyPit(roomId, pitNumber, new BaseObserver<String>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
}
@Override
public void onNext(String s) {
if (MvpRef==null){
MvpRef=new WeakReference<>(mView);
}
MvpRef.get().applyPit();
}
});
}
}

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

@@ -17,6 +17,36 @@
android:clipToPadding="false"
android:keepScreenOn="true">
<com.xscm.moduleutil.widget.DropHourlView
android:id="@+id/cl_xsb"
android:layout_width="@dimen/dp_68"
android:layout_height="@dimen/dp_35"
android:layout_marginTop="@dimen/dp_60"
android:layout_marginEnd="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_100"
android:gravity="right"
android:background="@mipmap/room_xsb"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible"
android:elevation="4dp"
android:visibility="invisible">
<!-- android:background="@mipmap/room_xsb"-->
<TextView
android:id="@+id/tv_xlh"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center"
android:gravity="center|right"
android:padding="@dimen/dp_8"
android:text="小时榜"
android:textColor="#FFFFFF"
android:textSize="13sp"/>
</com.xscm.moduleutil.widget.DropHourlView>
<ImageView
android:id="@+id/iv_bg"
android:layout_width="0dp"
@@ -521,34 +551,7 @@
</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"
android:layout_marginTop="@dimen/dp_60"
android:layout_marginEnd="@dimen/dp_10"
android:gravity="right"
android:background="@mipmap/room_xsb"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible"
android:elevation="4dp"
android:visibility="invisible">
<!-- android:background="@mipmap/room_xsb"-->
<TextView
android:id="@+id/tv_xlh"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center"
android:gravity="center|right"
android:paddingEnd="@dimen/dp_5"
android:text="小时榜"
android:textColor="#FFFFFF"
android:textSize="11sp"/>
</com.xscm.moduleutil.widget.DropHourlView>
<com.xscm.moduleutil.widget.floatingView.Floa

2
moduleroom/src/main/res/layout/fragment_room_user_info.xml
View File

@@ -55,7 +55,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_3"
android:text="所属工会:"
android:text="所属公会:"
android:textColor="#ffffff"
android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="parent"