klaus/sodalive-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

라이브

Browse Source 
- 우측 하단 옵션 버튼 순서 변경
This commit is contained in:
klaus
2024-10-29 13:54:36 +09:00
parent 936074081c
commit dc2cda58b2
2 changed files with 27 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt
View File

@@ -173,7 +173,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(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<ActivityLiveRoomBinding>(ActivityLiveRoomB
} else {
binding.flLikeHeart
}
originalButtonPosition = IntArray(2)
button.getLocationInWindow(originalButtonPosition)
buttonPosition = IntArray(2)
button.getLocationInWindow(buttonPosition)
},
500
)
@@ -578,12 +578,6 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(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<ActivityLiveRoomBinding>(ActivityLiveRoomB
}
private fun activatingRouletteButton(isActiveRoulette: Boolean) {
hideKeyboard { setHeartButtonPosition() }
handler.postDelayed(
{
if (!isHost && isActiveRoulette) {
@@ -1394,7 +1387,6 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(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<ActivityLiveRoomBinding>(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<ActivityLiveRoomBinding>(ActivityLiveRoomB
if (containNoChatRoom()) {
startNoChatting()
}
setHeartButtonPosition()
},
rtmChannelJoinFail = {
agoraConnectFail()

46
app/src/main/res/layout/activity_live_room.xml
View File

@@ -583,7 +583,7 @@
</FrameLayout>
<FrameLayout
android:id="@+id/fl_like_heart"
android:id="@+id/fl_microphone_mute"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="13.3dp"
@@ -592,12 +592,29 @@
android:visibility="gone">
<ImageView
android:id="@+id/iv_like_heart"
android:id="@+id/iv_microphone_mute"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center"
android:contentDescription="@null"
android:src="@drawable/ic_heart_pink" />
android:src="@drawable/ic_mic_on" />
</FrameLayout>
<FrameLayout
android:id="@+id/fl_donation_message_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="13.3dp"
android:background="@drawable/bg_round_corner_10_99525252"
android:padding="10dp">
<ImageView
android:id="@+id/iv_donation_message_list"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center"
android:contentDescription="@null"
android:src="@drawable/ic_donation_message_list" />
</FrameLayout>
<FrameLayout
@@ -634,23 +651,6 @@
android:src="@drawable/ic_roulette_settings" />
</FrameLayout>
<FrameLayout
android:id="@+id/fl_donation_message_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="13.3dp"
android:background="@drawable/bg_round_corner_10_99525252"
android:padding="10dp">
<ImageView
android:id="@+id/iv_donation_message_list"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center"
android:contentDescription="@null"
android:src="@drawable/ic_donation_message_list" />
</FrameLayout>
<FrameLayout
android:id="@+id/fl_donation"
android:layout_width="wrap_content"
@@ -669,7 +669,7 @@
</FrameLayout>
<FrameLayout
android:id="@+id/fl_microphone_mute"
android:id="@+id/fl_like_heart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="13.3dp"
@@ -678,12 +678,12 @@
android:visibility="gone">
<ImageView
android:id="@+id/iv_microphone_mute"
android:id="@+id/iv_like_heart"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center"
android:contentDescription="@null"
android:src="@drawable/ic_mic_on" />
android:src="@drawable/ic_heart_pink" />
</FrameLayout>
</LinearLayout>