라이브
- 메뉴판 UI 추가
This commit is contained in:
@@ -26,7 +26,6 @@ import android.widget.Toast
|
||||
import androidx.activity.OnBackPressedCallback
|
||||
import androidx.activity.result.contract.ActivityResultContracts
|
||||
import androidx.appcompat.widget.PopupMenu
|
||||
import androidx.constraintlayout.widget.ConstraintLayout
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
@@ -454,6 +453,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
|
||||
dialog.show(screenWidth)
|
||||
}
|
||||
binding.tvNotification.setOnClickListener { viewModel.toggleShowNotice() }
|
||||
binding.tvMenuPan.setOnClickListener { viewModel.toggleShowMenuPan() }
|
||||
|
||||
binding.tvBgSwitch.setOnClickListener { viewModel.toggleBackgroundImage() }
|
||||
binding.llDonation.setOnClickListener {
|
||||
@@ -807,6 +807,14 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
|
||||
isActiveRoulette = response.isActiveRoulette
|
||||
)
|
||||
|
||||
if (response.menuPan.isNotBlank()) {
|
||||
binding.tvMenuPan.visibility = View.VISIBLE
|
||||
binding.tvMenuPanDetail.text = response.menuPan
|
||||
} else {
|
||||
binding.tvMenuPan.visibility = View.GONE
|
||||
binding.tvMenuPanDetail.text = ""
|
||||
}
|
||||
|
||||
if (agora.rtmChannelIsNull()) {
|
||||
joinChannel(response)
|
||||
}
|
||||
@@ -840,6 +848,34 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
|
||||
}
|
||||
}
|
||||
|
||||
viewModel.isShowMenuPan.observe(this) {
|
||||
if (it) {
|
||||
binding.tvMenuPan.setTextColor(
|
||||
ContextCompat.getColor(
|
||||
applicationContext,
|
||||
R.color.color_3bb9f1
|
||||
)
|
||||
)
|
||||
binding.tvMenuPan.setBackgroundResource(
|
||||
R.drawable.bg_round_corner_5_3_transparent_3bb9f1
|
||||
)
|
||||
|
||||
binding.llMenuPan.visibility = View.VISIBLE
|
||||
} else {
|
||||
binding.tvMenuPan.setTextColor(
|
||||
ContextCompat.getColor(
|
||||
applicationContext,
|
||||
R.color.color_bbbbbb
|
||||
)
|
||||
)
|
||||
binding.tvMenuPan.setBackgroundResource(
|
||||
R.drawable.bg_round_corner_5_3_transparent_bbbbbb
|
||||
)
|
||||
|
||||
binding.llMenuPan.visibility = View.GONE
|
||||
}
|
||||
}
|
||||
|
||||
viewModel.totalDonationCan.observe(this) {
|
||||
binding.tvTotalCan.text = it.moneyFormat()
|
||||
}
|
||||
|
@@ -54,6 +54,10 @@ class LiveRoomViewModel(
|
||||
val isShowNotice: LiveData<Boolean>
|
||||
get() = _isShowNotice
|
||||
|
||||
private val _isShowMenuPan = MutableLiveData(false)
|
||||
val isShowMenuPan: LiveData<Boolean>
|
||||
get() = _isShowMenuPan
|
||||
|
||||
private val _totalDonationCan = MutableLiveData(0)
|
||||
val totalDonationCan: LiveData<Int>
|
||||
get() = _totalDonationCan
|
||||
@@ -355,9 +359,15 @@ class LiveRoomViewModel(
|
||||
}
|
||||
|
||||
fun toggleShowNotice() {
|
||||
_isShowMenuPan.value = false
|
||||
_isShowNotice.value = !isShowNotice.value!!
|
||||
}
|
||||
|
||||
fun toggleShowMenuPan() {
|
||||
_isShowNotice.value = false
|
||||
_isShowMenuPan.value = !isShowMenuPan.value!!
|
||||
}
|
||||
|
||||
fun toggleBackgroundImage() {
|
||||
_isBgOn.value = !isBgOn.value!!
|
||||
}
|
||||
|
@@ -21,6 +21,7 @@ data class GetRoomInfoResponse(
|
||||
@SerializedName("listenerList") val listenerList: List<LiveRoomMember>,
|
||||
@SerializedName("managerList") val managerList: List<LiveRoomMember>,
|
||||
@SerializedName("donationRankingTop3UserIds") val donationRankingTop3UserIds: List<Long>,
|
||||
@SerializedName("menuPan") val menuPan: String,
|
||||
@SerializedName("isActiveRoulette") val isActiveRoulette: Boolean,
|
||||
@SerializedName("isPrivateRoom") val isPrivateRoom: Boolean,
|
||||
@SerializedName("password") val password: String? = null
|
||||
|
Reference in New Issue
Block a user