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 891bd89..1671fa4 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 @@ -173,7 +173,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB private var isShowSignatureImage = false private var isAvailableLikeHeart = false - private var originalButtonPosition: IntArray? = null + private var buttonPosition = IntArray(2) private val countDownTimer = object : CountDownTimer(remainingNoChattingTime * 1000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -561,8 +561,8 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB } else { binding.flLikeHeart } - originalButtonPosition = IntArray(2) - button.getLocationInWindow(originalButtonPosition) + buttonPosition = IntArray(2) + button.getLocationInWindow(buttonPosition) }, 500 ) @@ -578,12 +578,6 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB } else { binding.flLikeHeart } - var buttonPosition = originalButtonPosition - - if (buttonPosition == null) { - buttonPosition = IntArray(2) - button.getLocationInWindow(buttonPosition) - } // 하트 이미지뷰 생성 val heart = ImageView(this).apply { @@ -1219,7 +1213,6 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB } private fun activatingRouletteButton(isActiveRoulette: Boolean) { - hideKeyboard { setHeartButtonPosition() } handler.postDelayed( { if (!isHost && isActiveRoulette) { @@ -1394,7 +1387,6 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB binding.ivNotiMicrophoneMute.visibility = View.GONE speakerListAdapter.muteSpeakers.remove(SharedPreferenceManager.userId.toInt()) }, 100) - hideKeyboard { setHeartButtonPosition() } } private fun setBroadcaster() { @@ -1406,7 +1398,6 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB binding.flMicrophoneMute.visibility = View.VISIBLE binding.ivNotiMicrophoneMute.visibility = View.GONE }, 100) - hideKeyboard { setHeartButtonPosition() } } private fun changeListenerMessage(peerId: Long, isFromManager: Boolean = false) { @@ -1868,6 +1859,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB if (containNoChatRoom()) { startNoChatting() } + setHeartButtonPosition() }, rtmChannelJoinFail = { agoraConnectFail() diff --git a/app/src/main/res/layout/activity_live_room.xml b/app/src/main/res/layout/activity_live_room.xml index ea82b87..827321c 100644 --- a/app/src/main/res/layout/activity_live_room.xml +++ b/app/src/main/res/layout/activity_live_room.xml @@ -583,7 +583,7 @@ + android:src="@drawable/ic_mic_on" /> + + + + + - - - - - + android:src="@drawable/ic_heart_pink" />