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

合并 fix bugs

Browse Source
This commit is contained in:
骆召亮
2025-11-22 11:22:41 +08:00
parent 3c344e1359 46b02ac407
commit 95a1e21909
17 changed files with 153 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -504,11 +504,12 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
mBinding?.roomTop?.userRecyclerView?.adapter = likeUserAdapter
likeUserAdapter!!.onItemClickListener =
BaseQuickAdapter.OnItemClickListener { adapter, view, position ->
// RoomOnlineDialogFragment.show(roomId, "", mRoomUserBean, mRoomInfoResp, getSupportFragmentManager());
val fragment = RoomOnlineDialogFragment.show(
roomId, "", mRoomUserBean, mRoomInfoResp,
supportFragmentManager
)
LogUtils.e("fragment: ${(fragment != null)}")
if (fragment != null) {
addActiveDialogFragment(fragment) // 添加到管理列表
}
@@ -902,7 +903,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
AppStateManager.getInstance().roomInfo = resp
this.mRoomInfoResp = resp
val roomBean = resp.room_info
LogUtils.e("setView_mRoomBean", roomBean.toString())
LogUtils.e("setView_mRoomBean", resp.toString())
this.mRoomUserBean = resp.user_info
this.mRoomOwnerBean = resp.room_owner
this.roomId = roomBean.room_id
@@ -1588,7 +1589,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
messageEvent: RoomMessageEvent
) {
mRoomInfoResp!!.room_info.pit_list[toPitNumber.toInt() - 1] = getPitBean(messageEvent, 2)
mRoomInfoResp?.room_info?.pit_list!![fromPitNumber.toInt() - 1] = RoomPitBean()
mRoomInfoResp?.room_info?.pit_list!![fromPitNumber.toInt() - 1] = RoomPitBean(fromPitNumber)
if ("9" == toPitNumber && messageEvent.text.fromUserInfo.user_id == SpUtil.getUserId()) {
mRoomInfoResp!!.user_info.pit_number = Integer.parseInt(toPitNumber)
@@ -1701,8 +1702,9 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
val userId = fromUserInfo.user_id
val currentUserId = SpUtil.getUserId()
if ("9" == pitNumber && userId == currentUserId) {
// mBinding!!.roomTop.rl.visibility = View.VISIBLE
ivSoundEffects(true)
}
@@ -1748,6 +1750,9 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
mBinding!!.rlMore.visibility = View.GONE
mBinding!!.rlMisc.visibility = View.GONE
mRoomInfoResp?.room_info?.pit_list!![pitNumber.toInt() - 1] = getPitBean(messageEvent, 1)
roomFragment!!.upRoomInfoData(mRoomInfoResp)
roomFragment!!.handleRoomMessage(messageEvent)
}
@@ -1800,15 +1805,17 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
val roomType = RoomType.fromTypeId(typeId)
when (roomType) {
RoomType.AUCTION -> {
if ("9" == pitNumber) {
mRoomInfoResp!!.room_info.pit_list[0] = RoomPitBean(pitNumber)
if (userId == currentUserId) {
if (mRoomInfoResp!!.user_info != null) {
mRoomInfoResp!!.user_info.pit_number = 0
}
}
} else if ("888" == pitNumber) {
} else if ("888" == pitNumber) {//被拍者
mRoomInfoResp!!.room_auction = null
if (userId == currentUserId) {
setRoleType(0, 0)
@@ -1819,16 +1826,26 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
RoomType.DATING -> {
//TODO 下麦更换数据
val labelId = mRoomInfoResp!!.room_info.label_id
if ("1" == labelId) {
mRoomInfoResp?.room_info?.pit_list!![pitNumber.toInt() - 1] = RoomPitBean(pitNumber)
roomFragment!!.upRoomInfoData(mRoomInfoResp)
if (mRoomInfoResp!!.user_info.user_id == SpUtil.getUserId()) {
ivSoundEffects(false)
}
}
}
RoomType.MUTUAL_ENTERTAINMENT -> {
mRoomInfoResp?.room_info?.pit_list!![pitNumber.toInt() - 1] = RoomPitBean(pitNumber)
else -> {}
roomFragment!!.upRoomInfoData(mRoomInfoResp)
roomFragment!!.handleRoomMessage(messageEvent)
}
else -> {
roomFragment!!.updateSeatViewExchangedWithPitArray(mRoomInfoResp)
}
}
roomFragment!!.handleRoomMessage(messageEvent)
}
@@ -2505,8 +2522,10 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
val fragment = RoomPkDialogFragment.newInstance(
roomId,
SpUtil.getUserId().toString() + "",
mRoomInfoResp!!.room_info.is_pk
mRoomInfoResp?.room_info?.is_pk!!
)
LogUtils.e("pk_info","id == R.id.rl_more ${mRoomInfoResp?.room_info?.is_pk!!}")
fragment.show(supportFragmentManager, "RoomPkDialogFragment")
addActiveDialogFragment(fragment) // 添加到管理列表
} else if (id == R.id.rl_message) {

1
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java
View File

@@ -346,6 +346,7 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
mBinding.tvTabUser.setTextSize(12);
} else if (view_id == R.id.tv_count) {
mBinding.recycleViewPublic.scrollToPosition(easeChatAdapter.getItemCount() - 1);
isBottom = true;
mBinding.tvCount.setVisibility(View.GONE);
}

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

@@ -239,13 +239,10 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
roomId = roomInfoResp.getRoom_info().getRoom_id();
for (int i = 0; i < roomInfoResp.getRoom_info().getPit_list().size(); i++) {
RoomPitBean roomPitBean = roomInfoResp.getRoom_info().getPit_list().get(i);
if (roomPitBean.getPit_number().equals("7") || roomPitBean.getPit_number().equals("8")) {
if (i == 6 || i == 7) {
continue;
}
if (Integer.parseInt(!roomPitBean.getPit_number().isEmpty() ? roomPitBean.getPit_number() : "0") > 10) {
continue;
}
RoomFriendshipWheatView object = mWheatViews.get(Integer.parseInt(roomPitBean.getPit_number()) - 1);
RoomFriendshipWheatView object = mWheatViews.get(i);
if (object != null) {
object.setData(roomPitBean);
}
@@ -492,21 +489,15 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
}
public void event1035(RoomMessageEvent message) {
for (int i = 0; i < roomInfoResp.getRoom_info().getPit_list().size(); i++) {
if (i == 6 || i == 7)
continue;
RoomPitBean roomPitBean = roomInfoResp.getRoom_info().getPit_list().get(i);
if (roomPitBean.getPit_number().equals("7") || roomPitBean.getPit_number().equals("8")) {
continue;
}
if (Integer.parseInt(!roomPitBean.getPit_number().isEmpty() ? roomPitBean.getPit_number() : "0") > 10) {
continue;
}
RoomFriendshipWheatView object = mWheatViews.get(Integer.parseInt(roomPitBean.getPit_number()) - 1);
if (object != null) {
object.setData(roomPitBean);
break;
} else {
continue;
if (Integer.parseInt(roomPitBean.getUser_id()) == message.getText().getFromUserInfo().getUser_id()){
RoomFriendshipWheatView object = mWheatViews.get(i);
if (object != null) {
object.setData(roomPitBean);
}
}
}
}
@@ -931,14 +922,11 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
roomInfoResp = resp;
roomId = roomInfoResp.getRoom_info().getRoom_id();
for (int i = 0; i < roomInfoResp.getRoom_info().getPit_list().size(); i++) {
if (i == 6 || i == 7) {
continue;
}
RoomPitBean roomPitBean = roomInfoResp.getRoom_info().getPit_list().get(i);
if (roomPitBean.getPit_number().equals("7") || roomPitBean.getPit_number().equals("8")) {
continue;
}
if (Integer.parseInt(!roomPitBean.getPit_number().isEmpty() ? roomPitBean.getPit_number() : "0") > 10) {
continue;
}
RoomFriendshipWheatView object = mWheatViews.get(Integer.parseInt(roomPitBean.getPit_number()) - 1);
RoomFriendshipWheatView object = mWheatViews.get(i);
if (object != null) {
object.setData(roomPitBean);
}

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

@@ -229,8 +229,13 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
startActivity(new Intent(getContext(), MyBagActivity.class));
} else if (id==R.id.me_daily) {//每日任务
startActivity(new Intent(getContext(), DailyTasksActivity.class));
<<<<<<< HEAD
} else if (id == R.id.iv_sz) {//设置
// startActivity(new Intent(getContext(), SettingActivity.class));
=======
}
else if (id == R.id.iv_sz) {//设置
>>>>>>> branch_new_dev
Intent intent = new Intent(getContext(), SettingActivity.class);
Bundle bundle = new Bundle();
bundle.putSerializable("userInfo", userInfo);

17
MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/CurrencyExchangePresenter.java
View File

@@ -8,11 +8,17 @@ import com.xscm.moduleutil.bean.WalletConfig;
import com.xscm.moduleutil.http.BaseObserver;
import com.xscm.moduleutil.presenter.BasePresenter;
import java.lang.ref.WeakReference;
import io.reactivex.disposables.Disposable;
public class CurrencyExchangePresenter extends BasePresenter<CurrencyExchangeConacts.View> implements CurrencyExchangeConacts.IMePre {
CurrencyExchangeConacts.View mView;
public CurrencyExchangePresenter(CurrencyExchangeConacts.View view, Context context) {
super(view, context);
this.mView = view;
}
@Override
@@ -25,7 +31,10 @@ public class CurrencyExchangePresenter extends BasePresenter<CurrencyExchangeCon
@Override
public void onNext(String s) {
MvpRef.get().exchangeCoin(s);
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().exchangeCoin(s);
}
});
}
@@ -40,6 +49,9 @@ public class CurrencyExchangePresenter extends BasePresenter<CurrencyExchangeCon
@Override
public void onNext(WalletBean walletBean) {
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().wallet(walletBean);
}
});
@@ -55,6 +67,9 @@ public class CurrencyExchangePresenter extends BasePresenter<CurrencyExchangeCon
@Override
public void onNext(WalletConfig walletConfig) {
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().getWalletConfig(walletConfig);
}
});

22
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
View File

@@ -123,6 +123,10 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
if (userInfo != null) {
LogUtils.e("RoomGiftDialogFragment_userInfo", userInfo.toString());
}
<<<<<<< HEAD
=======
>>>>>>> branch_new_dev
}
@Override
@@ -241,7 +245,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
List<RoomPitBean> pitList2 = new ArrayList<>();
List<RoomPitBean> pitList3 = new ArrayList<>();
List<String> added = new ArrayList<>();
if (roomInfoResp.getSong_pit_list() != null && roomInfoResp.getSong_pit_list().size() > 0) {
if (roomInfoResp.getSong_pit_list() != null && !roomInfoResp.getSong_pit_list().isEmpty()) {
pitList2.addAll(roomInfoResp.getSong_pit_list());
// 使用 HashSet 进行去重
Set<RoomPitBean> uniquePitSet = new HashSet<>(pitList);
@@ -252,7 +256,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
}
if (roomInfoResp.getRoom_auction() != null) {
if (roomInfoResp.getRoom_auction().getAuction_list() != null && roomInfoResp.getRoom_auction().getAuction_list().size() > 0) {
if (roomInfoResp.getRoom_auction().getAuction_list() != null && !roomInfoResp.getRoom_auction().getAuction_list().isEmpty()) {
for (int i = 0; i < roomInfoResp.getRoom_auction().getAuction_list().size(); i++) {
RoomAuction.AuctionListBean auctionListBean = roomInfoResp.getRoom_auction().getAuction_list().get(i);
RoomPitBean pitBean = new RoomPitBean();
@@ -286,9 +290,10 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
// 优先添加指定麦位
for (String targetPit : priorityPits) {
for (RoomPitBean bean : pitList) {
if (bean.getPit_number().equals(targetPit) &&
!bean.getUser_id().equals("0") && !bean.getUser_id().equals("") &&
!bean.getUser_id().equals(SpUtil.getUserId() + "")) {
if (bean.getPit_number().equals(targetPit)
&& !bean.getUser_id().isEmpty()
&& !bean.getUser_id().equals("0")
&& !bean.getUser_id().equals(SpUtil.getUserId() + "")) {
RewardUserBean rewardUserBean = new RewardUserBean();
rewardUserBean.setUser_id(bean.getUser_id());
@@ -305,9 +310,10 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
// 添加剩余的
for (RoomPitBean bean : pitList) {
String pitNumber = bean.getPit_number();
if (!added.contains(pitNumber) &&
!bean.getUser_id().equals("0") && !bean.getUser_id().equals("") &&
!bean.getUser_id().equals(SpUtil.getUserId() + "")) {
if (!added.contains(pitNumber)
&& !bean.getUser_id().isEmpty()
&&!bean.getUser_id().equals("0")
&&!bean.getUser_id().equals(SpUtil.getUserId() + "")) {
RewardUserBean rewardUserBean = new RewardUserBean();
rewardUserBean.setUser_id(bean.getUser_id());

3
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomOnlineDialogFragment.java
View File

@@ -77,10 +77,7 @@ public class RoomOnlineDialogFragment extends BaseMvpDialogFragment<RoomPresente
// 设置固定高度为 500dp
int screenHeight = getResources().getDisplayMetrics().heightPixels;
int heightInDp = (int) (screenHeight * 0.6f);
;
// int heightInPx = (int) (heightInDp * getResources().getDisplayMetrics().density);
window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, heightInDp);
// 可选：设置动画样式（从底部弹出）
window.setWindowAnimations(com.xscm.moduleutil.R.style.CommonShowDialogBottom);
}

10
MainModule/src/main/res/layout/room_top.xml
View File

@@ -92,10 +92,9 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/user_recyclerView"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_27"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:overScrollMode="never"
android:layout_marginTop="@dimen/dp_5"
tools:listitem="@layout/item_like_user"/>
<TextView
@@ -114,10 +113,11 @@
<ImageView
android:id="@+id/btn_close_live"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:layout_width="wrap_content"
android:padding="@dimen/dp_4"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="5dp"
android:layout_marginStart="@dimen/dp_5"
android:src="@mipmap/room_colse" />
</LinearLayout>