diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt index 0f9f2ea5..6b6c3c36 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt @@ -1,11 +1,8 @@ package com.xscm.modulemain.activity.room.fragment import android.annotation.SuppressLint -import android.content.Context import android.os.Bundle -import android.os.Vibrator import android.view.Gravity -import android.view.HapticFeedbackConstants import android.view.LayoutInflater import android.view.View import android.widget.PopupWindow @@ -238,6 +235,7 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : R.id.tv_time_right -> { MvpPre.signEnd(mSignId!!) } + R.id.iv_help -> { //签约规则 val bundle = Bundle() @@ -399,7 +397,7 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : if (fromUserInfo != null && toUserInfo != null && signValue != null) { signTypeDialog?.show(1) - }else{ + } else { signTypeDialog?.show(2) } } @@ -417,13 +415,14 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : override fun signCoinList(list: List) { MvpPre!!.wallet(list) } + override fun wallet(list: List, walletBean: WalletBean?) { if (dialogMentorShip == null) { dialogMentorShip = DialogMentorShip(ActivityUtils.getTopActivity()) } ActivityUtils.getTopActivity() dialogMentorShip?.setClickable(true) - dialogMentorShip?.show(mRoomId,list, mSignPitBean, walletBean, + dialogMentorShip?.show(mRoomId, list, mSignPitBean, walletBean, object : DialogMentorShip.OnItemClickListener { override fun onItemClick(coin: String) { dialogMentorShip?.setClickable(false) @@ -481,7 +480,10 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : fun event1035(messageEvent: RoomMessageEvent) { - + val fromUserId = messageEvent.text.fromUserInfo.user_id + val viewPos = indexList.indexOf(fromUserId.toString()) + val pitBean = mRoomInfo?.room_info?.pit_list!![indexList[viewPos].toInt() - 1] + viewList[viewPos].setData(pitBean) } fun event1039(messageEvent: RoomMessageEvent) { @@ -633,11 +635,8 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : } fun event1005(message: RoomMessageEvent) { - - // 检查是否有多个用户信息 - if (message.text.toUserInfos != null && !message.text.toUserInfos.isEmpty() - ) { + if (!message.text.toUserInfos.isNullOrEmpty()) { // 处理多个用户的情况 for (userOnlineStatusBean in message.text.toUserInfos) { updateCharmForUser(userOnlineStatusBean) @@ -657,7 +656,7 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : if (mBinding.rmsw1.getUserId() != null && mBinding.rmsw1.getUserId().equals(userId)) { mBinding.rmsw1.setCharm(charm) } - if(mBinding.rmswMidd.userId!=null && mBinding.rmswMidd.userId.equals(userId)){ + if (mBinding.rmswMidd.userId != null && mBinding.rmswMidd.userId.equals(userId)) { mBinding.rmswMidd.setCharm(charm) } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java index 79799212..30bb474d 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java @@ -535,6 +535,43 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment