diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt index 0b68b57b..7bc8c827 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt @@ -219,11 +219,11 @@ class RoomPrivateFragment(var mRoomInfoResp: RoomInfoResp?) : // 设置 padding（左、上、右、下） itemImage.setPadding(paddingPx, paddingPx, paddingPx, paddingPx) itemImage.tag = showList[0].gift_id - Glide.with(itemImage!!) + Glide.with(itemImage) .load(showList[0].base_image) .into(itemImage) itemImage.visibility = View.VISIBLE - giftTViewList[idx].visibility = View.INVISIBLE + giftTViewList[idx].visibility = View.VISIBLE } @SuppressLint("SetTextI18n") diff --git a/MainModule/src/main/java/com/xscm/modulemain/widget/RoomPubWheatView.kt b/MainModule/src/main/java/com/xscm/modulemain/widget/RoomPubWheatView.kt index bf427408..c98b76e3 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/widget/RoomPubWheatView.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/widget/RoomPubWheatView.kt @@ -30,6 +30,7 @@ class RoomPubWheatView : BaseWheatView { private var iv_tag_type: ImageView? = null var iv_custom_gift: ImageView? = null + var iv_shutup: ImageView? = null private var hostTv: TextView? = null private var tv_time: TextView? = null private var ll_bottom: LinearLayout? = null @@ -64,6 +65,7 @@ class RoomPubWheatView : BaseWheatView { ivYueT = findViewById(R.id.iv_yue_t) ivLiaoT = findViewById(R.id.iv_liao_t) iv_gift = findViewById(R.id.iv_gift) + iv_shutup = findViewById(R.id.iv_shutup) } @@ -86,6 +88,7 @@ class RoomPubWheatView : BaseWheatView { tv_time?.visibility = View.INVISIBLE ll_bottom?.visibility = View.INVISIBLE iv_custom_gift?.visibility = View.GONE + iv_shutup?.visibility = View.GONE } "10" -> { @@ -94,12 +97,14 @@ class RoomPubWheatView : BaseWheatView { tv_time?.visibility = View.INVISIBLE ll_bottom?.visibility = View.INVISIBLE iv_custom_gift?.visibility = View.GONE + iv_shutup?.visibility = View.GONE } else -> { tv_time?.visibility = View.INVISIBLE ll_bottom?.visibility = View.INVISIBLE iv_custom_gift?.visibility = View.GONE + iv_shutup?.visibility = View.GONE } } @@ -142,6 +147,8 @@ class RoomPubWheatView : BaseWheatView { tv_time?.text = "00:00" } + iv_shutup?.setImageResource(if (bean.sex == "1") R.mipmap.icon_sex_1 else R.mipmap.icon_sex_0) + iv_shutup?.visibility = View.VISIBLE if (TextUtils.isEmpty(bean.dress)) { mIvFrame.stopAll() mIvFrame.visibility = INVISIBLE @@ -153,7 +160,13 @@ class RoomPubWheatView : BaseWheatView { private val pitNumberText: String get() { - return pitNumber+"号麦" + return if (pitNumber == "9") { + "" + } else if (pitNumber == "10") { + "" + }else{ + pitNumber+"号麦" + } } private fun handleOffState(bean: RoomPitBean) { @@ -165,6 +178,7 @@ class RoomPubWheatView : BaseWheatView { mIvFrame.stopAll() mIvFrame.visibility = GONE mIvRipple.visibility = GONE + iv_shutup?.visibility = View.GONE } private fun stopAndClearAnimation() { diff --git a/MainModule/src/main/res/layout/fragment_room_private.xml b/MainModule/src/main/res/layout/fragment_room_private.xml index d3659171..50bd93e4 100644 --- a/MainModule/src/main/res/layout/fragment_room_private.xml +++ b/MainModule/src/main/res/layout/fragment_room_private.xml @@ -145,21 +145,21 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintGuide_percent="0.66" /> + app:layout_constraintGuide_percent="0.6" /> + app:layout_constraintGuide_percent="0.72" /> + app:layout_constraintGuide_percent="0.82" /> + + + + - - diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_sex_0.png b/MainModule/src/main/res/mipmap-hdpi/icon_sex_0.png new file mode 100644 index 00000000..d0fa95da Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_sex_0.png differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_sex_1.png b/MainModule/src/main/res/mipmap-hdpi/icon_sex_1.png new file mode 100644 index 00000000..da0ecfb5 Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_sex_1.png differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_sex_0.png b/MainModule/src/main/res/mipmap-xhdpi/icon_sex_0.png new file mode 100644 index 00000000..bc0bac1f Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_sex_0.png differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_sex_1.png b/MainModule/src/main/res/mipmap-xhdpi/icon_sex_1.png new file mode 100644 index 00000000..256a03b2 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_sex_1.png differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_sex_0.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_sex_0.png new file mode 100644 index 00000000..134182eb Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_sex_0.png differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_sex_1.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_sex_1.png new file mode 100644 index 00000000..3b57cfd0 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_sex_1.png differ diff --git a/animplayer/src/main/java/com/tencent/qgame/animplayer/AudioPlayer.kt b/animplayer/src/main/java/com/tencent/qgame/animplayer/AudioPlayer.kt index 80b0f9a4..bb5429ed 100644 --- a/animplayer/src/main/java/com/tencent/qgame/animplayer/AudioPlayer.kt +++ b/animplayer/src/main/java/com/tencent/qgame/animplayer/AudioPlayer.kt @@ -99,6 +99,12 @@ class AudioPlayer(val player: AnimPlayer) { val bufferSize = AudioTrack.getMinBufferSize(sampleRate, channelConfig, AudioFormat.ENCODING_PCM_16BIT) val audioTrack = AudioTrack(AudioManager.STREAM_MUSIC, sampleRate, channelConfig, AudioFormat.ENCODING_PCM_16BIT, bufferSize, AudioTrack.MODE_STREAM) this.audioTrack = audioTrack + + // 2. 同步更新 AudioTrack 的音量（核心：调用 setStereoVolume） + audioTrack.takeIf { it.state == AudioTrack.STATE_INITIALIZED }?.apply { + // 左右声道设为相同值，兼容单/双声道场景 + setStereoVolume(0.04f, 0.04f) + } val state = audioTrack.state if (state != AudioTrack.STATE_INITIALIZED) { release()