1:添加酒吧房的弹框获取数据

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

@@ -95,6 +95,7 @@ import com.xscm.modulemain.dialog.RoomPkDialogFragment
 import com.xscm.modulemain.dialog.RoomSettingFragment
 import com.xscm.modulemain.dialog.SoundEffectsDialogFragment
 import com.xscm.modulemain.dialog.TourClubDialogFragment
+import com.xscm.modulemain.dialog.barRoom.MakeFriendsDialog
 import com.xscm.modulemain.manager.RoomManager
 import com.xscm.modulemain.service.ForegroundService
 import com.xscm.modulemain.service.RoomPlayService
@@ -498,6 +499,11 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                 view
             )
         }
+        mBinding!!.roomTop.rl2.setOnClickListener { view: View ->
+            this.onClick(
+                view
+            )
+        }
         mBinding!!.ivSoundEffects.setOnClickListener { view: View ->
             this.onClick(
                 view
@@ -2603,7 +2609,10 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             )
         } else if (id == R.id.rl) {
             MvpPre!!.clearUserCharm(roomId, "")
-        } else if (id == R.id.ll_input) {
+        }else if (id == R.id.rl2) {
+            MakeFriendsDialog(this, roomId).show()
+        }
+        else if (id == R.id.ll_input) {
             mBinding?.llInput?.visibility = View.GONE
             mBinding?.inputMenu1?.dismiss()
         } else if (id == R.id.iv_emoji) {
@@ -4024,6 +4033,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             mBinding!!.roomTop.btnCloseLive.setOnClickListener(null)
             mBinding!!.roomTop.tvNum.setOnClickListener(null)
             mBinding!!.roomTop.rl.setOnClickListener(null)
+            mBinding!!.roomTop.rl2.setOnClickListener(null)
             mBinding!!.ivSoundEffects.setOnClickListener(null)
             mBinding!!.ivWheatFeeding.setOnClickListener(null)
             mBinding!!.clFirstCharge.setOnClickListener(null)
@@ -4279,6 +4289,16 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         } else {
             mBinding?.roomTop?.rl?.visibility = View.GONE
         }
+        userMakeVisibility()
+    }
+
+    // TODO: 判断房间类型是否是酒吧房，只有酒吧房才会有交友小屋，其他房间类型没有 
+    private fun userMakeVisibility(){
+        if(mRoomInfoResp?.room_info?.type_id=="11"){
+            mBinding?.roomTop?.rl2?.visibility = View.VISIBLE
+        }else{
+            mBinding?.roomTop?.rl2?.visibility = View.GONE
+        }
     }
 
     @SuppressLint("MissingInflatedId")

MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java

@@ -93,13 +93,16 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
 
     @Override
     protected void initData() {
+        if (roomInfoResp == null) {
+            return;
+        }
         setRoomInfo(roomInfoResp);
         parentFragment = (RoomFragment) getParentFragment();
     }
 
     private void setRoomInfo(RoomInfoResp roomInfoResp) {
         this.roomInfoResp = roomInfoResp;
-        roomId = roomInfoResp.getRoom_info().getRoom_id();
+        roomId = roomInfoResp == null ? "" : roomInfoResp.getRoom_info().getRoom_id();
 
         setView();
     }
@@ -404,7 +407,7 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
         Animation rotateAnimation = AnimationUtils.loadAnimation(getContext(), com.xscm.moduleutil.R.anim.image_rotate);
         LinearInterpolator lin = new LinearInterpolator();
         rotateAnimation.setInterpolator(lin);
-         mBinding.ciUserAva.setAnimation(rotateAnimation);
+        mBinding.ciUserAva.setAnimation(rotateAnimation);
     }
 
     //关闭旋转

MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPubFragment.kt

@@ -1,5 +1,6 @@
 package com.xscm.modulemain.activity.room.fragment
 
+import android.os.Bundle
 import com.blankj.utilcode.util.ActivityUtils
 import com.blankj.utilcode.util.LogUtils
 import com.blankj.utilcode.util.ToastUtils
@@ -7,15 +8,22 @@ import com.xscm.modulemain.R
 import com.xscm.modulemain.activity.room.activity.RoomActivity
 import com.xscm.modulemain.activity.room.presenter.PubPresenter
 import com.xscm.modulemain.databinding.FragmentPubRoomBinding
+import com.xscm.modulemain.dialog.RoomAuctionWebViewDialog
 import com.xscm.modulemain.dialog.RoomUserInfoFragment
+import com.xscm.modulemain.dialog.barRoom.FlirtatiousDialog
+import com.xscm.modulemain.dialog.barRoom.GiftGivingDialog
+import com.xscm.modulemain.dialog.barRoom.RoomAboutDialog
 import com.xscm.modulemain.dialog.barRoom.RoomDurationDialog
+import com.xscm.modulemain.dialog.barRoom.SetupCustomGiftDialog
 import com.xscm.modulemain.widget.RoomPubWheatView
 import com.xscm.moduleutil.base.BaseMvpFragment
+import com.xscm.moduleutil.base.CommonAppContext
 import com.xscm.moduleutil.bean.RoomMessageEvent
 import com.xscm.moduleutil.bean.UserInfo
 import com.xscm.moduleutil.bean.room.RoomInfoResp
 import com.xscm.moduleutil.bean.room.RoomUserBean
 import com.xscm.moduleutil.utils.ClickUtils
+import com.xscm.moduleutil.utils.SpUtil
 
 
 class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
@@ -62,7 +70,6 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
         viewList.add(mBinding.rpwv5)
         viewList.add(mBinding.rpwv6)
 
-
         for ((idx, view) in viewList.withIndex()) {
             if (mRoomInfoResp?.room_info?.pit_list!!.size > indexList[idx].toInt() - 1) {
                 view.setRoomWheatNumber(indexList[idx])
@@ -71,14 +78,21 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
 
                 view.iv_custom_gift?.setOnClickListener {
                     ToastUtils.showShort("礼物")
+                    GiftGivingDialog(ActivityUtils.getTopActivity(), mRoomId,view.pitBean.user_id,view.pitBean.nickname,view.pitBean.avatar).show()
                 }
 
                 view.ivYueT?.setOnClickListener {
                     ToastUtils.showShort("约她")
+                    RoomAboutDialog(ActivityUtils.getTopActivity(),mRoomId,view.pitBean.user_id,view.pitBean.nickname,view.pitBean.avatar).show()
                 }
 
                 view.ivLiaoT?.setOnClickListener {
                     ToastUtils.showShort("撩她")
+                    if (!SpUtil.getBooleanValue("pub", false)) {
+                        FlirtatiousDialog(ActivityUtils.getTopActivity()).show()
+                    }else{
+
+                    }
                 }
 
                 view.setOnClickListener { v ->
@@ -132,6 +146,21 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
         mBinding.ivSetTime.setOnClickListener {
             RoomDurationDialog(ActivityUtils.getTopActivity(),mRoomId).show()
         }
+        mBinding.ivCustomGift.setOnClickListener {
+            SetupCustomGiftDialog(ActivityUtils.getTopActivity(), mRoomId).show()
+        }
+
+        mBinding.ivPubHeart.setOnClickListener {
+            //酒吧房规则
+            val bundle = Bundle()
+            bundle.putString(
+                "url",
+                CommonAppContext.getInstance()
+                    .getCurrentEnvironment().serverUrl + "api/Page/page_show?id=36"
+            )
+            val dialog = RoomAuctionWebViewDialog(ActivityUtils.getTopActivity(), bundle)
+            dialog.show()
+        }
     }
 
     fun roomInfoUpdate(roomInfoResp: RoomInfoResp) {

MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/AlbumDetailActivity.java

@@ -86,6 +86,7 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
                 MvpPre.getAlbumDetail(albumId, pwd, page + "", "10");
             }
         });
+        mBinding.tvBj.setVisibility(userId.equals(SpUtil.getUserId() + "") ? VISIBLE : View.GONE);
         mBinding.imCrAlbum.setOnClickListener(this::onClick);
         mBinding.tvBj.setOnClickListener(this::onClick);
         mBinding.zan.setOnClickListener(this::onClick);