From 7e9bcb6c385a6d31aaa43f409c51ec2ef9038df7 Mon Sep 17 00:00:00 2001 From: klaus Date: Mon, 14 Aug 2023 22:56:57 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=ED=95=84=EB=93=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/live/room/LiveRoomActivity.kt | 58 +++++++------------ .../sodalive/live/room/LiveRoomViewModel.kt | 4 +- .../live/room/info/GetRoomInfoResponse.kt | 9 ++- .../room/profile/LiveRoomProfileDialog.kt | 2 +- .../main/res/layout/activity_live_room.xml | 3 +- 5 files changed, 30 insertions(+), 46 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt index 5037364..304a442 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt @@ -106,7 +106,6 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB private var isMicrophoneMute = false private var isSpeaker = false private var isSpeakerFold = false - private var isAvailableDonation = false private val onBackPressedCallback = object : OnBackPressedCallback(true) { override fun handleOnBackPressed() { @@ -565,15 +564,8 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB placeholder(R.drawable.ic_logo) } - isAvailableDonation = response.isAvailableDonation - binding.flDonation.visibility = if (response.isAvailableDonation) { - View.VISIBLE - } else { - View.GONE - } - if ( - response.managerId == SharedPreferenceManager.userId && + response.creatorId == SharedPreferenceManager.userId && SharedPreferenceManager.role == MemberRole.CREATOR.name ) { binding.flDonationMessageList.visibility = View.VISIBLE @@ -605,10 +597,10 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB binding.flDonationMessageList.visibility = View.GONE } - speakerListAdapter.managerId = response.managerId + speakerListAdapter.managerId = response.creatorId speakerListAdapter.updateList(response.speakerList) - if (response.managerId == SharedPreferenceManager.userId) { + if (response.creatorId == SharedPreferenceManager.userId) { binding.ivEdit.setOnClickListener { roomInfoEditDialog.setRoomInfo(response.title, response.notice) roomInfoEditDialog.setCoverImageUrl(response.coverImageUrl) @@ -676,41 +668,35 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB binding.tvParticipate.text = "${response.participantsCount}" setNoticeAndClickableUrl(binding.tvNotice, response.notice) - binding.tvCreatorNickname.text = response.managerNickname - binding.ivCreatorProfile.load(response.managerProfileUrl) { + binding.tvCreatorNickname.text = response.creatorNickname + binding.ivCreatorProfile.load(response.creatorProfileUrl) { crossfade(true) placeholder(R.drawable.ic_logo) transformations(CircleCropTransformation()) } binding.ivCreatorProfile.setOnClickListener { - if (response.managerId != SharedPreferenceManager.userId) { - showLiveRoomUserProfileDialog(userId = response.managerId) + if (response.creatorId != SharedPreferenceManager.userId) { + showLiveRoomUserProfileDialog(userId = response.creatorId) } } - if (response.isAvailableDonation) { - binding.ivCreatorFollow.visibility = View.VISIBLE - - if (response.isFollowingManager) { - binding.ivCreatorFollow.setImageResource(R.drawable.btn_following) - binding.ivCreatorFollow.setOnClickListener { - viewModel.creatorUnFollow( - creatorId = response.managerId, - roomId = roomId - ) - } - } else { - binding.ivCreatorFollow.setImageResource(R.drawable.btn_follow) - binding.ivCreatorFollow.setOnClickListener { - viewModel.creatorFollow( - creatorId = response.managerId, - roomId = roomId - ) - } + if (response.isFollowing) { + binding.ivCreatorFollow.setImageResource(R.drawable.btn_following) + binding.ivCreatorFollow.setOnClickListener { + viewModel.creatorUnFollow( + creatorId = response.creatorId, + roomId = roomId + ) } } else { - binding.ivCreatorFollow.visibility = View.GONE + binding.ivCreatorFollow.setImageResource(R.drawable.btn_follow) + binding.ivCreatorFollow.setOnClickListener { + viewModel.creatorFollow( + creatorId = response.creatorId, + roomId = roomId + ) + } } if (agora.rtmChannelIsNull()) { @@ -1190,7 +1176,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB } }, rtmChannelJoinSuccess = { - if (userId == roomInfo.managerId) { + if (userId == roomInfo.creatorId) { setBroadcaster() } else { setAudience() diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomViewModel.kt index a0ec09f..8e63d99 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomViewModel.kt @@ -118,7 +118,7 @@ class LiveRoomViewModel( } fun getManagerNickname(): String { - return roomInfoResponse.managerNickname + return roomInfoResponse.creatorNickname } fun setSpeaker(roomId: Long, userId: Long, onSuccess: () -> Unit) { @@ -213,7 +213,7 @@ class LiveRoomViewModel( } fun isEqualToHostId(memberId: Int): Boolean { - return memberId == roomInfoResponse.managerId.toInt() + return memberId == roomInfoResponse.creatorId.toInt() } fun getMemberCan() { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/info/GetRoomInfoResponse.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/info/GetRoomInfoResponse.kt index ea5c2cf..c3b45db 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/info/GetRoomInfoResponse.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/info/GetRoomInfoResponse.kt @@ -10,17 +10,16 @@ data class GetRoomInfoResponse( @SerializedName("channelName") val channelName: String, @SerializedName("rtcToken") val rtcToken: String, @SerializedName("rtmToken") val rtmToken: String, - @SerializedName("managerId") val managerId: Long, - @SerializedName("managerNickname") val managerNickname: String, - @SerializedName("managerProfileUrl") val managerProfileUrl: String, - @SerializedName("isFollowingManager") val isFollowingManager: Boolean, + @SerializedName("creatorId") val creatorId: Long, + @SerializedName("creatorNickname") val creatorNickname: String, + @SerializedName("creatorProfileUrl") val creatorProfileUrl: String, + @SerializedName("isFollowing") val isFollowing: Boolean, @SerializedName("participantsCount") val participantsCount: Int, @SerializedName("totalAvailableParticipantsCount") val totalAvailableParticipantsCount: Int, @SerializedName("speakerList") val speakerList: List, @SerializedName("listenerList") val listenerList: List, @SerializedName("managerList") val managerList: List, @SerializedName("donationRankingTop3UserIds") val donationRankingTop3UserIds: List, - @SerializedName("isAvailableDonation") val isAvailableDonation: Boolean = false, @SerializedName("isPrivateRoom") val isPrivateRoom: Boolean, @SerializedName("password") val password: String? = null ) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/profile/LiveRoomProfileDialog.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/profile/LiveRoomProfileDialog.kt index 478ccc5..b136bd6 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/profile/LiveRoomProfileDialog.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/profile/LiveRoomProfileDialog.kt @@ -52,7 +52,7 @@ class LiveRoomProfileDialog( @SuppressLint("SetTextI18n") private fun bindData() { roomInfoLiveData.observe(activity) { - adapter.managerId = it.managerId + adapter.managerId = it.creatorId adapter.totalUserCount = it.totalAvailableParticipantsCount dialogView.tvParticipate.text = "${it.participantsCount}" dialogView.tvTotalPeoples.text = "/${it.totalAvailableParticipantsCount}" diff --git a/app/src/main/res/layout/activity_live_room.xml b/app/src/main/res/layout/activity_live_room.xml index 38fe6f8..8b7a6c4 100644 --- a/app/src/main/res/layout/activity_live_room.xml +++ b/app/src/main/res/layout/activity_live_room.xml @@ -406,8 +406,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="13.3dp" android:background="@drawable/bg_round_corner_10_99525252" - android:padding="11.7dp" - android:visibility="visible"> + android:padding="11.7dp">