From 609386f6688b1bc265b489f714cad7b819fbae7d Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Wed, 13 Dec 2023 14:44:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5peko=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=B2=89=E4=B8=9D=E5=9B=A2=E5=85=A5=E5=8F=A3=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/avroom/fragment/SingleRoomFragment.kt | 61 ++++++++++++++++---
 .../chwl/app/fansteam/FansTeamJoinActivity.kt |  2 +-
 .../res/layout/fragment_single_room.xml       |  1 -
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt
index a97e0d399..e3d32dc0c 100644
--- a/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt
+++ b/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt
@@ -93,16 +93,10 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
     @SuppressLint("SetTextI18n")
     private fun updateFansTeamInfo(initInfo: FansTeamInitInfo) {
         var clickListener: View.OnClickListener? = null
-        if (!AvRoomDataManager.get().isRoomOwner && !initInfo.isAnchorFans && initInfo.hasFansTeamCurrentRoom) {
-            gameBinding.flFansTeamJoinTip.isVisible = true
-            gameBinding.tvFansTeamOpt.isVisible = false
-        } else {
-            gameBinding.flFansTeamJoinTip.isVisible = false
-            gameBinding.tvFansTeamOpt.isVisible = true
-        }
-
         if (initInfo.hasFansTeamCurrentRoom) {
             if (AvRoomDataManager.get().isRoomOwner) {
+                gameBinding.flFansTeamJoinTip.isVisible = false
+                gameBinding.tvFansTeamOpt.isVisible = true
                 gameBinding.tvFansTeamOpt.text = "粉絲團(${initInfo.anchorFansNum})"
                 clickListener = View.OnClickListener {
                     DialogWebViewActivity.start(
@@ -112,12 +106,16 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
                 }
             } else {
                 if (initInfo.isAnchorFans) {
+                    gameBinding.flFansTeamJoinTip.isVisible = false
+                    gameBinding.tvFansTeamOpt.isVisible = true
                     gameBinding.tvFansTeamOpt.text =
                         "粉絲LV.${if (initInfo.fansLevelSeq == 0) 1 else initInfo.fansLevelSeq}"
                     clickListener = View.OnClickListener {
                         FansTeamJoinedActivity.start(requireContext())
                     }
                 } else {
+                    gameBinding.flFansTeamJoinTip.isVisible = true
+                    gameBinding.tvFansTeamOpt.isVisible = false
                     clickListener = View.OnClickListener {
                         FansTeamJoinActivity.start(requireContext())
                     }
@@ -125,6 +123,8 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
             }
         } else {
             if (AvRoomDataManager.get().isRoomOwner) {
+                gameBinding.flFansTeamJoinTip.isVisible = false
+                gameBinding.tvFansTeamOpt.isVisible = true
                 gameBinding.tvFansTeamOpt.text = "開通粉絲團"
                 clickListener = View.OnClickListener {
                     CommonWebViewActivity.start(
@@ -133,10 +133,55 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
                     )
                 }
             } else {
+                gameBinding.flFansTeamJoinTip.isVisible = false
+                gameBinding.tvFansTeamOpt.isVisible = true
                 gameBinding.tvFansTeamOpt.text = "該主播暫未開通粉絲團"
             }
         }
         gameBinding.flFansTeam.setOnClickListener(clickListener)
+
+
+//
+//        var clickListener: View.OnClickListener? = null
+//        gameBinding.flFansTeam.isGone =
+//            !AvRoomDataManager.get().isRoomOwner && !initInfo.hasFansTeamCurrentRoom
+//        if (initInfo.hasFansTeamCurrentRoom) {
+//            if (AvRoomDataManager.get().isRoomOwner) {
+//                gameBinding.tvFansTeamOpt.text = "粉絲團(${initInfo.anchorFansNum})"
+//                clickListener = View.OnClickListener {
+//                    DialogWebViewActivity.start(
+//                        requireContext(),
+//                        UriProvider.getFansTeamMyFansUrl(AvRoomDataManager.get().roomUid)
+//                    )
+//                }
+//            } else {
+//                if (initInfo.isAnchorFans) {
+//                    gameBinding.tvFansTeamOpt.text =
+//                        "粉絲LV.${if (initInfo.fansLevelSeq == 0) 1 else initInfo.fansLevelSeq}"
+//                    clickListener = View.OnClickListener {
+//                        FansTeamJoinedActivity.start(requireContext())
+//                    }
+//                } else {
+//                    gameBinding.tvFansTeamOpt.text = "加入粉絲團"
+//                    clickListener = View.OnClickListener {
+//                        FansTeamJoinActivity.start(requireContext())
+//                    }
+//                }
+//            }
+//        } else {
+//            if (AvRoomDataManager.get().isRoomOwner) {
+//                gameBinding.tvFansTeamOpt.text = "開通粉絲團"
+//                clickListener = View.OnClickListener {
+//                    CommonWebViewActivity.start(
+//                        requireContext(),
+//                        UriProvider.getFansTeamOpenUrl(AvRoomDataManager.get().roomUid)
+//                    )
+//                }
+//            } else {
+//                gameBinding.tvFansTeamOpt.text = "該主播暫未開通粉絲團"
+//            }
+//        }
+//        gameBinding.flFansTeam.setOnClickListener(clickListener)
     }
 
     override fun onReceiveRoomEvent(roomEvent: RoomEvent?) {
diff --git a/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt
index 5604e1d3d..d4f574f22 100644
--- a/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt
+++ b/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt
@@ -79,7 +79,7 @@ class FansTeamJoinActivity : BaseViewBindingActivity<ActivityFansTeamJoinBinding
                     ?.let { privilegeConfig ->
                         binding.ivJoinLogo.load(privilegeConfig.icon)
                         binding.tvJoin.text = privilegeConfig.name
-                        binding.tvJoin.setOnClickListener {
+                        binding.bgJoin.setOnClickListener {
                             privilegeConfig.giftVo?.let { giftInfo ->
                                 GiftModel.get().sendFansTeamGift(
                                     giftInfo.giftId,
diff --git a/app/src/module_mini_world/res/layout/fragment_single_room.xml b/app/src/module_mini_world/res/layout/fragment_single_room.xml
index 04a957d8c..d0f121080 100644
--- a/app/src/module_mini_world/res/layout/fragment_single_room.xml
+++ b/app/src/module_mini_world/res/layout/fragment_single_room.xml
@@ -46,7 +46,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="85dp"
-            android:visibility="gone"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:visibility="visible">