diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index a69a719f..a07ec780 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -1066,6 +1066,7 @@ class RoomActivity : BaseMvpActivity(), } } mBinding?.ivPrivateSet?.tag = "1" + goneAll() } @@ -1164,7 +1165,7 @@ class RoomActivity : BaseMvpActivity(), "1", giftGiveEvent!!.getPit(), giftGiveEvent!!.heart_id, - giftGiveEvent!!.giftModel.gift_bag.toString(), + giftGiveEvent?.getRoonGiftModel()?.gift_bag?.toString(), object : BaseObserver() { override fun onSubscribe(d: Disposable) { } @@ -1507,6 +1508,9 @@ class RoomActivity : BaseMvpActivity(), } else { EventBus.getDefault().post(messageEvent.text.xlh_data) } + if (mRoomInfoResp?.room_info?.label_id == "11") { + return + } if (messageEvent.text.xlh_data != null) { if (messageEvent.text.xlh_data.status == 1) { @@ -1595,8 +1599,11 @@ class RoomActivity : BaseMvpActivity(), roomFragment?.handleRoomMessage(messageEvent) } else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatiousRoom) {//酒吧房约她进入小黑屋 - LogUtils.e("QXRoomMessageTypeFlirtatiousRoom", "酒吧房约她进入小黑屋:"+messageEvent.text.room_id+"----------------"+mRoomInfoResp?.room_info?.room_id) - if (mRoomInfoResp?.room_info?.room_id.equals(messageEvent.text.room_id)){ + LogUtils.e( + "QXRoomMessageTypeFlirtatiousRoom", + "酒吧房约她进入小黑屋:" + messageEvent.text.room_id + "----------------" + mRoomInfoResp?.room_info?.room_id + ) + if (mRoomInfoResp?.room_info?.room_id.equals(messageEvent.text.room_id)) { return } @@ -1607,14 +1614,17 @@ class RoomActivity : BaseMvpActivity(), // MvpPre?.downPit(roomId, mRoomInfoResp?.user_info?.pit_number.toString()) // } AgoraManager.getInstance().lastRoomId = roomId - MvpPre?.getRoomIn(messageEvent.text.room_id,"") + MvpPre?.getRoomIn(messageEvent.text.room_id, "") if (publicScreenFragment != null) { MessageExListenerSingleton.getInstance().joinGroup(messageEvent.text.room_id) publicScreenFragment?.setupExMessageListener() - publicScreenFragment?.setIsPriRoom(true, arrayListOf(messageEvent.text.user_id,messageEvent.text.meet_user_id)) + publicScreenFragment?.setIsPriRoom( + true, + arrayListOf(messageEvent.text.user_id, messageEvent.text.meet_user_id) + ) } } - }else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatiousRoomPush) {//酒吧房抱麦推送 + } else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatiousRoomPush) {//酒吧房抱麦推送 if (mRoomInfoResp?.user_info?.user_id.toString() == messageEvent.text.user_id) { WishGiftDialog( ActivityUtils.getTopActivity(), @@ -1623,11 +1633,20 @@ class RoomActivity : BaseMvpActivity(), ).show() } - }else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatiousRoomCustom) {//酒吧房设置了自定义礼物后推送 + } else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatiousRoomCustom) {//酒吧房设置了自定义礼物后推送 roomFragment?.handleRoomMessage(messageEvent) } } + private fun goneAll() { + if (mRoomInfoResp?.room_info?.label_id == "11") { + mBinding?.clDayTask?.visibility= View.GONE + }else{ + mBinding?.clDayTask?.visibility= View.VISIBLE + } + + } + private var endTime: Long = 0 private fun xlhDjs(endTimeStr: String?) { @@ -2568,7 +2587,7 @@ class RoomActivity : BaseMvpActivity(), pitBean.charm = messageEvent.text.fromUserInfo.charm pitBean.dress = messageEvent.text.fromUserInfo.dress pitBean.is_online = messageEvent.text.fromUserInfo.is_online - pitBean.had_custom_gift= messageEvent.text.fromUserInfo.had_custom_gift + pitBean.had_custom_gift = messageEvent.text.fromUserInfo.had_custom_gift if (type == 2) { //这是换麦的时候，这里是做了判断的，需要多次测试，各个房间类型，会不会出现错误，这里的这个值，只是在酒吧房有用 pitBean.had_custom_gift = mRoomInfoResp?.room_info?.pit_list?.let { pitList -> @@ -2691,8 +2710,13 @@ class RoomActivity : BaseMvpActivity(), val labelId = mRoomInfoResp?.room_info?.label_id //TODO 酒吧交友房 公开聊天时 if (typeId.equals("6") && labelId.equals("11") && mBinding?.ivPrivateSet?.tag == "0") { - publicScreenFragment?.sendPriMsg(2,null,emotion,AgoraManager.getInstance().lastRoomId) - }else{ + publicScreenFragment?.sendPriMsg( + 2, + null, + emotion, + AgoraManager.getInstance().lastRoomId + ) + } else { publicScreenFragment!!.sendChatEmoji(emotion) } } @@ -2795,11 +2819,11 @@ class RoomActivity : BaseMvpActivity(), } // } } else if (id == R.id.iv_private_set) { - if (mBinding?.ivPrivateSet?.tag == "1"){ + if (mBinding?.ivPrivateSet?.tag == "1") { mBinding?.ivPrivateSet?.setImageResource(R.mipmap.icon_pri_select_off) mBinding?.ivPrivateSet?.tag = "0" isShowPrivateMsg = true - }else { + } else { mBinding?.ivPrivateSet?.setImageResource(R.mipmap.icon_pri_select_on) mBinding?.ivPrivateSet?.tag = "1" isShowPrivateMsg = false @@ -3218,6 +3242,10 @@ class RoomActivity : BaseMvpActivity(), @SuppressLint("ClickableViewAccessibility") fun toutiao() { if (mRoomInfoResp?.room_info?.head_line != null) { + if (mRoomInfoResp?.room_info?.label_id == "11") { + return + } + mBinding!!.flaoatZuoji.visibility = View.VISIBLE ImageUtils.loadHeadCC( @@ -3542,6 +3570,9 @@ class RoomActivity : BaseMvpActivity(), GsonUtils.fromJson(event.message, XLHBean::class.java) if (xlhBean.from_type == 100) { if (xlhBean.xlh_data != null) { + if (mRoomInfoResp?.room_info?.label_id == "11") { + return + } if (xlhBean.xlh_data.status == 1) { mBinding?.xlhRk?.visibility = View.VISIBLE xlhDjs(xlhBean.xlh_data.end_time) @@ -3549,6 +3580,7 @@ class RoomActivity : BaseMvpActivity(), mBinding?.xlhRk?.visibility = View.INVISIBLE releaseCountDownTimer1() } + } } else if (xlhBean.from_type == 103) { val existingFragment = @@ -4513,8 +4545,13 @@ class RoomActivity : BaseMvpActivity(), val labelId = mRoomInfoResp?.room_info?.label_id //TODO 酒吧交友房 公开聊天时 if (typeId.equals("6") && labelId.equals("11") && mBinding?.ivPrivateSet?.tag == "0") { - publicScreenFragment?.sendPriMsg(1,RoomInputEvent(text),null,AgoraManager.getInstance().lastRoomId) - }else{ + publicScreenFragment?.sendPriMsg( + 1, + RoomInputEvent(text), + null, + AgoraManager.getInstance().lastRoomId + ) + } else { publicScreenFragment!!.fasong(RoomInputEvent(text)) } } @@ -4571,8 +4608,13 @@ class RoomActivity : BaseMvpActivity(), val labelId = mRoomInfoResp?.room_info?.label_id //TODO 酒吧交友房 公开聊天时 if (typeId.equals("6") && labelId.equals("11") && mBinding?.ivPrivateSet?.tag == "0") { - publicScreenFragment?.sendPriMsg(1,event,null,AgoraManager.getInstance().lastRoomId) - }else{ + publicScreenFragment?.sendPriMsg( + 1, + event, + null, + AgoraManager.getInstance().lastRoomId + ) + } else { publicScreenFragment!!.fasong(event) } } diff --git a/gradle.properties b/gradle.properties index f2cc412b..92e2baac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,8 +28,8 @@ isBuildModule=false #org.gradle.deamon=false android.injected.testOnly=false -APP_VERSION_NAME=1.0.9.6 -APP_VERSION_CODE=86 +APP_VERSION_NAME=1.0.9.7 +APP_VERSION_CODE=87 org.gradle.jvm.toolchain.useLegacyAdapters=false #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15