diff --git a/app/src/main/java/com/mango/moshen/avroom/dialog/RoomOperationDialog.java b/app/src/main/java/com/mango/moshen/avroom/dialog/RoomOperationDialog.java index 6048e0f99..3db32266d 100644 --- a/app/src/main/java/com/mango/moshen/avroom/dialog/RoomOperationDialog.java +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/RoomOperationDialog.java @@ -16,6 +16,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.coorchice.library.utils.LogUtils; import com.google.android.material.bottomsheet.BottomSheetDialog; +import com.mango.core.manager.AudioEngineManager; import com.tongdaxing.erban.sadmin.RoomSAdminManagerActivity; import com.mango.moshen.R; import com.mango.moshen.avroom.activity.CreatePKActivity; @@ -121,6 +122,7 @@ public class RoomOperationDialog extends BottomSheetDialog { addCleanScreenAction(optAdapter); addRoomLimit(optAdapter); addGiftValueAction(optAdapter); + addRemoteMuteOptAdapter(); addSuperAdminAction(optAdapter); rvOPtList.setAdapter(optAdapter); } @@ -412,7 +414,7 @@ public class RoomOperationDialog extends BottomSheetDialog { superAdminModel.roomOperate(SuperAdminModel.CLOSE_PUBLIC_SCREEN).subscribe(); } AvRoomModel.get().closeScreen(roomInfo.getRoomId(), - !isCloseScreen) + !isCloseScreen) .compose(RxHelper.bindContext(context)) .flatMap(data -> IMNetEaseManager.get().closeOpenScreen( data.getRoomId(), data)) @@ -513,6 +515,26 @@ public class RoomOperationDialog extends BottomSheetDialog { })); } + /** + * 开关远端声音 + */ + private void addRemoteMuteOptAdapter() { + optAdapter.addData(new OptAction( + AudioEngineManager.get().isRemoteMute() ? R.drawable.icon_remote_mute_open : R.drawable.icon_remote_mute_close, + "扬声器", + () -> { + boolean isRemoteMute = !AudioEngineManager.get().isRemoteMute(); + if (isRemoteMute) { + if (AvRoomDataManager.get().isCpRoom()) { + StatisticManager.Instance() + .onEvent(StatisticsProtocol.EVENT_CP_ROOM_CLOSE_SOUND_CLICK, "关闭声音"); + } else StatisticManager.Instance() + .onEvent(StatisticsProtocol.EVENT_MP_ROOM_CLOSE_SOUND_CLICK, "关闭声音"); + } + AudioEngineManager.get().setRemoteMute(isRemoteMute); + })); + } + private void handleOpenGiftValue() { boolean isOpen = !AvRoomDataManager.get().isShowGiftValue(); GiftValueModel.get().openGiftValue(isOpen) @@ -677,7 +699,7 @@ public class RoomOperationDialog extends BottomSheetDialog { helper.setText(R.id.tv_name, item.name) .setImageResource(R.id.iv_icon, item.icon) .setTextColor(R.id.tv_name, context.getResources().getColor( - item.isAppColor ? R.color.appColor : R.color.white_transparent_50)); + item.isAppColor ? R.color.appColor : R.color.white)); helper.itemView.setOnClickListener(v -> { item.onAction.onAction(); dismiss(); diff --git a/app/src/main/res/drawable-xhdpi/icon_remote_mute_close.png b/app/src/main/res/drawable-xhdpi/icon_remote_mute_close.png index c35ef859e..dbd6b02b6 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_remote_mute_close.png and b/app/src/main/res/drawable-xhdpi/icon_remote_mute_close.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_remote_mute_open.png b/app/src/main/res/drawable-xhdpi/icon_remote_mute_open.png index 97d8aa712..7fe990c44 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_remote_mute_open.png and b/app/src/main/res/drawable-xhdpi/icon_remote_mute_open.png differ diff --git a/app/src/main/res/layout/dialog_room_operation.xml b/app/src/main/res/layout/dialog_room_operation.xml index 206eb36f3..ce04c6e0d 100644 --- a/app/src/main/res/layout/dialog_room_operation.xml +++ b/app/src/main/res/layout/dialog_room_operation.xml @@ -1,14 +1,36 @@ - + + + + + + + + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_room_opt_dialog.xml b/app/src/main/res/layout/item_room_opt_dialog.xml index 05d5c5d51..ecf74dcab 100644 --- a/app/src/main/res/layout/item_room_opt_dialog.xml +++ b/app/src/main/res/layout/item_room_opt_dialog.xml @@ -18,7 +18,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:textColor="@color/white_transparent_50" + android:textColor="@color/white" android:textSize="@dimen/sp_10" tools:text="@string/team_admin" /> diff --git a/app/src/main/res/layout/layout_bottom_view.xml b/app/src/main/res/layout/layout_bottom_view.xml index cfc335c35..021413a90 100644 --- a/app/src/main/res/layout/layout_bottom_view.xml +++ b/app/src/main/res/layout/layout_bottom_view.xml @@ -68,6 +68,7 @@