From c20802f89ce52c158c7a149464ddf18dc13bccb0 Mon Sep 17 00:00:00 2001 From: klaus Date: Tue, 16 Jan 2024 18:19:55 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20-=20=EA=B3=B5?= =?UTF-8?q?=EC=A7=80=20UI=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../sodalive/live/room/LiveRoomActivity.kt | 43 ++-- .../sodalive/live/room/LiveRoomViewModel.kt | 11 +- .../main/res/drawable-xxhdpi/ic_notice.png | Bin 545 -> 0 bytes .../drawable-xxhdpi/ic_notice_triangle.png | Bin 0 -> 419 bytes .../res/drawable-xxhdpi/ic_speaker_on.png | Bin 5950 -> 5971 bytes .../main/res/layout/activity_live_room.xml | 184 +++++++++++------- 7 files changed, 138 insertions(+), 102 deletions(-) delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_notice.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_notice_triangle.png diff --git a/app/build.gradle b/app/build.gradle index ed29a5a..e4adfdc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -138,7 +138,7 @@ dependencies { implementation "io.github.bootpay:android:4.3.4" // agora - implementation "io.agora.rtc:voice-sdk:4.1.0-1" + implementation "io.agora.rtc:voice-sdk:4.2.6" implementation 'io.agora.rtm:rtm-sdk:1.5.3' // sound visualizer 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 e9cdafa..aaedd4d 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 @@ -454,7 +454,6 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB dialog.show(screenWidth) } binding.tvNotification.setOnClickListener { viewModel.toggleShowNotice() } - binding.rlNotice.setOnClickListener { viewModel.toggleExpandNotice() } binding.tvBgSwitch.setOnClickListener { viewModel.toggleBackgroundImage() } binding.llDonation.setOnClickListener { @@ -821,17 +820,9 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB viewModel.isShowNotice.observe(this) { if (it) { - binding.rlNotice.visibility = View.VISIBLE + binding.llNotice.visibility = View.VISIBLE } else { - binding.rlNotice.visibility = View.GONE - } - } - - viewModel.isExpandNotice.observe(this) { - binding.tvNotice.maxLines = if (it) { - Int.MAX_VALUE - } else { - 1 + binding.llNotice.visibility = View.GONE } } @@ -1146,10 +1137,14 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB isMicrophoneMute = !isMicrophoneMute agora.muteLocalAudioStream(isMicrophoneMute) - if (isMicrophoneMute) { - speakerListAdapter.muteSpeakers.add(SharedPreferenceManager.userId.toInt()) + if (SharedPreferenceManager.userId == viewModel.roomInfoResponse.creatorId) { + setMuteSpeakerCreator(isMicrophoneMute) } else { - speakerListAdapter.muteSpeakers.remove(SharedPreferenceManager.userId.toInt()) + if (isMicrophoneMute) { + speakerListAdapter.muteSpeakers.add(SharedPreferenceManager.userId.toInt()) + } else { + speakerListAdapter.muteSpeakers.remove(SharedPreferenceManager.userId.toInt()) + } } } @@ -1459,6 +1454,14 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB } } + private fun setMuteSpeakerCreator(isMute: Boolean) { + binding.ivMute.visibility = if (isMute) { + View.VISIBLE + } else { + View.GONE + } + } + private val rtcEventHandler = object : IRtcEngineEventHandler() { @SuppressLint("NotifyDataSetChanged") override fun onAudioVolumeIndication( @@ -1512,12 +1515,16 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB override fun onUserMuteAudio(uid: Int, muted: Boolean) { super.onUserMuteAudio(uid, muted) handler.post { - if (muted) { - speakerListAdapter.muteSpeakers.add(uid) + if (uid == viewModel.roomInfoResponse.creatorId.toInt()) { + setMuteSpeakerCreator(muted) } else { - speakerListAdapter.muteSpeakers.remove(uid) + if (muted) { + speakerListAdapter.muteSpeakers.add(uid) + } else { + speakerListAdapter.muteSpeakers.remove(uid) + } + speakerListAdapter.notifyDataSetChanged() } - speakerListAdapter.notifyDataSetChanged() } Logger.e("onUserMuteAudio - uid: $uid, muted: $muted") } 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 9c41233..59e33c3 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 @@ -50,14 +50,10 @@ class LiveRoomViewModel( val toastLiveData: LiveData get() = _toastLiveData - private val _isShowNotice = MutableLiveData(true) + private val _isShowNotice = MutableLiveData(false) val isShowNotice: LiveData get() = _isShowNotice - private val _isExpandNotice = MutableLiveData(false) - val isExpandNotice: LiveData - get() = _isExpandNotice - private val _totalDonationCan = MutableLiveData(0) val totalDonationCan: LiveData get() = _totalDonationCan @@ -361,11 +357,6 @@ class LiveRoomViewModel( fun toggleShowNotice() { _isShowNotice.value = !isShowNotice.value!! - _isExpandNotice.value = false - } - - fun toggleExpandNotice() { - _isExpandNotice.value = !isExpandNotice.value!! } fun toggleBackgroundImage() { diff --git a/app/src/main/res/drawable-xxhdpi/ic_notice.png b/app/src/main/res/drawable-xxhdpi/ic_notice.png deleted file mode 100644 index 8b52c0bb4182a4b42c373240d7eda15f102862b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 545 zcmV++0^a?JP)a$kTA;Itb13MrIu1BuuHmPuqF zhR#|9_)%Qy?Li1+1&Hi3Lup#7S0=zjStxkO?0?G`5VE;uVQB%sQ6gHNuZ(T#G|P5F z9`!ITSL)~kp%_jKVL{9ka9sPk6~^n~Ik8~T@cT#EZp-Z{9fOPkR7AL!#b@9oQUaDp z*cIbb8e48RFNz0{5!&jB`SwW3d5He_x-P+pfV0;)R6xP z{lEMv@+8Z$_c)Hjx~`ApfglgkG!2zfdw$hz+h$c&oyieN9!M#__(=G94uas5JaA6T zX%kL+7=6-0h?lY~|HuL7#Ju$P?vv13JEvAI!+D;6@bPN+l|)f=X`1GrK;Wux6?YdZ zTo^gsF4~a*;Hr7)w`FO^6VLn*2(-9!mX9}JbXOF`4wzf7dgN?E7zf1d)x;xbQ6RUi zi4D%8th#MYY;YE3)$K)(EzY7?-8NPYIE%9Awy|o!S(HV$XNw)2MKQWPsoKL?l$qO; z#2(I~%-kLlKj19N#O)#R1J0sM-0nTzz*&^RZLy)VD81WqLuXNXx3B+nb^(Y65<>t0 N002ovPDHLkV1lf|uK@r6 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_speaker_on.png b/app/src/main/res/drawable-xxhdpi/ic_speaker_on.png index be48c2d04961f8ff8d8b196468b4340727b4c1b1..c3de9c67eed1c774c4ac3a989fe3358249199f95 100644 GIT binary patch delta 5938 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 diff --git a/app/src/main/res/layout/activity_live_room.xml b/app/src/main/res/layout/activity_live_room.xml index 4236f8e..03e3111 100644 --- a/app/src/main/res/layout/activity_live_room.xml +++ b/app/src/main/res/layout/activity_live_room.xml @@ -9,13 +9,13 @@ + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/ll_top" /> + + + + + + + + + + + + + + + + + - - - + android:layout_height="36.7dp"> + + + + + + + + android:textSize="10.7sp" + tools:ignore="SmallSp" /> @@ -290,7 +366,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:text="참여자" android:textColor="@color/color_bbbbbb" - android:textSize="10.7sp" + android:textSize="12sp" tools:ignore="SmallSp" /> - - - - - - - - - - + android:padding="8dp"> + android:padding="8dp">