moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步peko：修复粉丝团入口逻辑

Browse Source
This commit is contained in:
Max
2023-12-13 14:44:17 +08:00
parent aa28ad2513
commit 609386f668
3 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt
View File

@@ -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?) {

2
app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt
View File

@@ -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,

1
app/src/module_mini_world/res/layout/fragment_single_room.xml
View File

@@ -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">