From 3de455c004618aa66b90f8cbd391dcbf780fc46f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Wed, 24 Sep 2025 19:24:26 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=202=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81=203=EF=BC=9A?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=85=B3=E7=B3=BB=E5=8D=A1=204=EF=BC=9A?=
 =?UTF-8?q?=E6=88=BF=E9=97=B4=E7=B1=BB=E5=9E=8B=E5=88=A0=E9=99=A4=20?=
 =?UTF-8?q?=E5=8F=AA=E4=BF=9D=E7=95=99=E7=82=B9=E5=94=B1=E3=80=81=E7=94=B7?=
 =?UTF-8?q?=E7=A5=9E=E3=80=81=E5=A5=B3=E7=A5=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jdf/myyuliao/RealNameActivity.java    | 101 ++++++------
 .../moduleutil/base/CommonAppContext.java     |   2 +
 .../utils/config/EnvironmentEnum.java         |  30 ++--
 .../moduleroom/activity/RoomActivity.java     | 155 ++++++++++++++----
 .../dialog/RoomSettingFragment.java           |  41 +++--
 .../dialog/RoomUserInfoFragment.java          |   4 +-
 .../fragment/RoomCabinFragment.java           |  11 +-
 .../res/layout/fragment_room_user_info.xml    |   6 +-
 8 files changed, 227 insertions(+), 123 deletions(-)

diff --git a/app/src/main/java/com/jdf/myyuliao/RealNameActivity.java b/app/src/main/java/com/jdf/myyuliao/RealNameActivity.java
index 038eb4b..1493c2e 100644
--- a/app/src/main/java/com/jdf/myyuliao/RealNameActivity.java
+++ b/app/src/main/java/com/jdf/myyuliao/RealNameActivity.java
@@ -81,56 +81,59 @@ public class RealNameActivity extends BaseMvpActivity<RealNamePresenter, Activit
 
     @Override
     public void realNameSuccess(RealNameBean msg) {
-        Bundle data = new Bundle();
-        WbCloudFaceVerifySdk.InputData inputData = new WbCloudFaceVerifySdk.InputData(
-                msg.getFaceId(),
-                msg.getOrderNo(),
-                msg.getAppid(),
-                msg.getApiVersion(),
-                msg.getNonce(),
-                msg.getUserid(),
-                msg.getSign(),
-                FaceVerifyStatus.Mode.GRADE,
-                msg.getLicence());
-        data.putSerializable(WbCloudFaceContant.INPUT_DATA, inputData);
-        //设置是否打开语音提示，默认关闭，此处设置为关闭
-        data.putBoolean(WbCloudFaceContant. PLAY_VOICE, true);
 
-        //避免用户快速点击导致二次登录，二次拉起刷脸等操作引起问题
-        WbCloudFaceVerifySdk.getInstance().
-                initAdvSdk(RealNameActivity.this, data, new WbCloudFaceVerifyLoginListener() {
-                    @Override
-                    public void onLoginSuccess () {
-                        //登录成功，拉起 sdk 页面,由 FaceVerifyResultListener   返回刷脸结果
-                        WbCloudFaceVerifySdk.getInstance().startWbFaceVerifySdk(RealNameActivity.this, new WbCloudFaceVerifyResultListener() {
-                            @Override
-                            public void onFinish(WbFaceVerifyResult result) {
-                                if (result != null) {
-                                    if (result.isSuccess()) {
-                                        Log.d("@@@", "刷脸成功！");
-                                        SpUtil.setRealName(true);
-                                        MvpPre.realNameResult(result.getOrderNo());
+        finish();
 
-                                    } else {
-                                        Log.d("@@@", "刷脸失败！");
-                                        queren1();
-                                    }
-                                }
-                                //刷脸结束后，及时释放资源
-                                WbCloudFaceVerifySdk.getInstance().release();
-
-                            }
-                        });
-                    }
-                    @Override
-                    public void onLoginFailed (WbFaceError error){
-                        Log.d("@@@", "刷脸失败！");
-                        //刷脸结束后，及时释放资源
-                        WbCloudFaceVerifySdk.getInstance().release();
-                        queren1();
-
-                    }
-                });
+//        Bundle data = new Bundle();
+//        WbCloudFaceVerifySdk.InputData inputData = new WbCloudFaceVerifySdk.InputData(
+//                msg.getFaceId(),
+//                msg.getOrderNo(),
+//                msg.getAppid(),
+//                msg.getApiVersion(),
+//                msg.getNonce(),
+//                msg.getUserid(),
+//                msg.getSign(),
+//                FaceVerifyStatus.Mode.GRADE,
+//                msg.getLicence());
+//        data.putSerializable(WbCloudFaceContant.INPUT_DATA, inputData);
+//        //设置是否打开语音提示，默认关闭，此处设置为关闭
+//        data.putBoolean(WbCloudFaceContant. PLAY_VOICE, true);
+//
+//        //避免用户快速点击导致二次登录，二次拉起刷脸等操作引起问题
+//        WbCloudFaceVerifySdk.getInstance().
+//                initAdvSdk(RealNameActivity.this, data, new WbCloudFaceVerifyLoginListener() {
+//                    @Override
+//                    public void onLoginSuccess () {
+//                        //登录成功，拉起 sdk 页面,由 FaceVerifyResultListener   返回刷脸结果
+//                        WbCloudFaceVerifySdk.getInstance().startWbFaceVerifySdk(RealNameActivity.this, new WbCloudFaceVerifyResultListener() {
+//                            @Override
+//                            public void onFinish(WbFaceVerifyResult result) {
+//                                if (result != null) {
+//                                    if (result.isSuccess()) {
+//                                        Log.d("@@@", "刷脸成功！");
+//                                        SpUtil.setRealName(true);
+//                                        MvpPre.realNameResult(result.getOrderNo());
+//
+//                                    } else {
+//                                        Log.d("@@@", "刷脸失败！");
+//                                        queren1();
+//                                    }
+//                                }
+//                                //刷脸结束后，及时释放资源
+//                                WbCloudFaceVerifySdk.getInstance().release();
+//
+//                            }
+//                        });
+//                    }
+//                    @Override
+//                    public void onLoginFailed (WbFaceError error){
+//                        Log.d("@@@", "刷脸失败！");
+//                        //刷脸结束后，及时释放资源
+//                        WbCloudFaceVerifySdk.getInstance().release();
+//                        queren1();
+//
+//                    }
+//                });
     }
 
     @Override
@@ -181,7 +184,7 @@ public class RealNameActivity extends BaseMvpActivity<RealNamePresenter, Activit
                 return;
             }
             if (RegexUtils.isIDCard18Exact(mBinding.edPassword.getText().toString())) {
-                if (mBinding.btnSubmit.getText().toString().equals("下一步")) {
+                if (mBinding.btnSubmit.getText().toString().equals("立即认证")) {
                     mBinding.stepNum1.setBackground(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.num_11));
                     mBinding.stepNum2.setBackground(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.num_2));
 //                    mBinding.l1.setVisibility(View.GONE);
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
index 668bcd5..f79de0f 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
@@ -125,6 +125,8 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
     @Getter
     public UnreadCountEvent unreadCountEvent;
 
+    public boolean isShowAg;
+
     @Override
     public void onCreate() {
         super.onCreate();
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
index cf08e3d..60159b1 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
@@ -2,18 +2,18 @@ package com.xscm.moduleutil.utils.config;
 
 public enum EnvironmentEnum {
     PRODUCTION(//生产环境
-            "http://md.xscmmidi.site/",
-            "yIZtKT0bz5hhD3wb30p+n5+qoasPj0XGza1qRuYXhtm9nFJdf1fA5B4tB6MjGRQNrCIAmlRMiiUP2DhjsDcih9Szx8HmZADuwCI0YTnva6kibqgbuYOtU2zeem3phkbZe27vbZ94aCWAZulloMeXuAFHd0jSaCBxNctKTYLjGQUGnDt/IDQr6mvLHSbb19X9vgQBa2gsTHjt3HYh2EY7dRJA020SPDe35hKf54v826Vgd34isc+BERQ7dwSH0NJ16OqFP181nlGRZvFFbuab3mweFyDOXQTpuN4NbixO5QQ=",
+            "https://my.qixing2.top/",
+            "a/0XMgDa0h3iljlYhvH/zqMLzGQk5YDjF6iEsJdb17mBTlB1+9be2hQmDheV7PkuB+adQu3mSI7ledn0hmfKqEXDhTsNbL7JZ98+xk0ln3QUNBD0JNViY6mC/utOH+xD/2D5xSnq0xe8odd09vuyifxUuMhluLFKf8Bta7Q6NPi4REOzBLjq5lrdXbiJYHoTl/nK6XSCYw8hQuKRyztkZyFnlHzPM7rA34S8X1RMfYDL6DiVpbwY1IP9Yl+pY7Gr+wY+aX8izzK8IW7wCzODRqI+B0auNFso69smj0ECVLc=",
             "https://oss-cn-beijing.aliyuncs.com/",
-            "LTAI5tKgrfcFQxH46ZwWYgFW",
-            "ZOjTqAJmUL563EKFKySrUwAHtx4hKt",
-            "midi01",
-            "https://midi01.oss-cn-beijing.aliyuncs.com/",
-            "wxef1289d8a89b41d4",
-            1600101474,
-            "a3f0f0c78307434fa1c697c3429fbdcf",
-            "tcp://81.70.45.221",
-            "https://md.xscmmidi.site/h5"),
+            "LTAI5tPBEux6EFkknyNbcDGK",
+            "3pPqhBsF6y6O3q4euKg7MUOvKK7CYZ",
+            "myyuliao",
+            "https://myyuliao.oss-cn-beijing.aliyuncs.com/",
+            "wx7e232c2dae5f2ea5",
+            1600106900,
+            "b48912a0b10d48f88be7ac5ee8675a6b",
+            "tcp://119.45.34.13",
+            "https://myh5.qixing2.top"),
     TEST(//测试环境
             "http://md.qxmier.com/",
             "6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=",
@@ -22,11 +22,11 @@ public enum EnvironmentEnum {
             "DhpCS82gaigZljYqsWsUWUAZ20dREz",
             "qx-yusheng",
             "https://qx-yusheng.oss-cn-hangzhou.aliyuncs.com/",
-            "wxc7681513be9f926b",
-            1600101474,
-            "05b406b4541e413887d8d2bf9be8642c",
+            "wx7e232c2dae5f2ea5",
+            1600106900,
+            "b48912a0b10d48f88be7ac5ee8675a6b",
             "tcp://47.120.21.132",
-            "https://chatvespa.qxmier.com");
+            "https://myh5.qixing2.top");
 
     private final String serverUrl;
     private final String ALI_AUTH_KEY;//阿里云授权key
diff --git a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java
index be5442e..59016c9 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java
@@ -424,7 +424,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
 //            // 保持Activity alive，不调用finish()
 //            minimizeToBackground();
 //        }
-        if (mRoomInfoResp!=null) {
+        if (mRoomInfoResp != null) {
             if (!mRoomInfoResp.getRoom_info().getType_id().equals("6")) {
                 // 只有在用户主动离开应用时才执行最小化操作
                 if (!userLeaving) {
@@ -1162,13 +1162,67 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
         if (isFullScreen) {
             exitFullScreen();
         } else {
-            enterFullScreen();
+//            enterFullScreen();
+
+            // 修改为横屏展示模式而不是全屏模式
+            enterLandscapeMode();
         }
     }
+    private void enterLandscapeMode() {
+        isFullScreen = true;
 
+        // 设置横屏
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+
+        if (floatingMagnetView != null) {
+            // 修改Floa组件的布局参数，使其在横屏时占据更大区域
+            ViewGroup.LayoutParams layoutParams = floatingMagnetView.getLayoutParams();
+            if (layoutParams instanceof ConstraintLayout.LayoutParams) {
+                ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) layoutParams;
+                params.width = ConstraintLayout.LayoutParams.MATCH_CONSTRAINT;
+                params.height = ConstraintLayout.LayoutParams.MATCH_CONSTRAINT;
+                params.horizontalBias = 0.5f;
+                params.verticalBias = 0.5f;
+                floatingMagnetView.setLayoutParams(params);
+            } else {
+                // 如果不是ConstraintLayout.LayoutParams，创建新的
+                ConstraintLayout.LayoutParams params = new ConstraintLayout.LayoutParams(
+                        ConstraintLayout.LayoutParams.MATCH_CONSTRAINT,
+                        ConstraintLayout.LayoutParams.MATCH_CONSTRAINT
+                );
+                params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
+                params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+                params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+                floatingMagnetView.setLayoutParams(params);
+            }
+
+            // 可以调整内部fl_screenshare的布局参数
+            FrameLayout flScreenshare = floatingMagnetView.findViewById(R.id.fl_screenshare);
+            ViewGroup.LayoutParams screenParams = flScreenshare.getLayoutParams();
+            if (!(screenParams instanceof FrameLayout.LayoutParams)) {
+                // 如果不是FrameLayout.LayoutParams，创建新的
+                FrameLayout.LayoutParams newScreenParams = new FrameLayout.LayoutParams(
+                        FrameLayout.LayoutParams.MATCH_PARENT,
+                        FrameLayout.LayoutParams.MATCH_PARENT
+                );
+                flScreenshare.setLayoutParams(newScreenParams);
+            } else {
+                FrameLayout.LayoutParams newScreenParams = (FrameLayout.LayoutParams) screenParams;
+                newScreenParams.width = FrameLayout.LayoutParams.MATCH_PARENT;
+                newScreenParams.height = FrameLayout.LayoutParams.MATCH_PARENT;
+                flScreenshare.setLayoutParams(newScreenParams);
+            }
+
+            // 显示退出按钮
+            ivQuan.setVisibility(View.VISIBLE);
+        }
+    }
     private void enterFullScreen() {
         isFullScreen = true;
 
+
+
         // 隐藏系统UI
         View decorView = getWindow().getDecorView();
         decorView.setSystemUiVisibility(
@@ -1194,46 +1248,77 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
             safelyMoveViewToParent(fl_screenshare, floatingMagnetView);
             // 显示全屏容器
             fullScreenContainer.setVisibility(View.VISIBLE);
-//        floatingMagnetView.setVisibility(View.GONE);
+            floatingMagnetView.setVisibility(View.GONE);
             ivExitFullscreen.setVisibility(View.VISIBLE); // 显示退出按钮
         }
     }
 
     private void exitFullScreen() {
+
         isFullScreen = false;
-        // 恢复系统UI
-        View decorView = getWindow().getDecorView();
-//        decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
-        decorView.setSystemUiVisibility(
-                View.SYSTEM_UI_FLAG_FULLSCREEN
-                        | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                        | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-        );
+
         // 设置回竖屏
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-        // 找到 fl_screenshare 并移回原父容器
-        FrameLayout fl_screenshare = findViewById(R.id.fl_screenshare);
-        if (fl_screenshare != null) {
-            safelyMoveViewToParent(fl_screenshare, fullScreenContainer);
-//            ViewParent parent = fl_screenshare.getParent();
-//            if (parent instanceof ViewGroup) {
-//                ((ViewGroup) parent).removeView(fl_screenshare);
-//            }
-//            // 添加到全屏容器
-//            fullScreenContainer.addView(fl_screenshare);
-            // 找到原始父容器并重新添加
-//            FrameLayout originalParent = findViewById(R.id.fullscreen_container); // 或者你实际的容器
-//            if (originalParent != null) {
-//                originalParent.removeView(fl_screenshare); // 防止重复添加
-//            }
 
-//            floatingMagnetView.addView(fl_screenshare);
+        if (floatingMagnetView != null) {
+            // 恢复原始尺寸
+            ConstraintLayout.LayoutParams params = new ConstraintLayout.LayoutParams(
+                    getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_240),
+                    getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_135)
+            );
+            params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
+            params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+            params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+            params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+            floatingMagnetView.setLayoutParams(params);
+
+            // 恢复内部fl_screenshare的布局参数
+            FrameLayout flScreenshare = floatingMagnetView.findViewById(R.id.fl_screenshare);
+            FrameLayout.LayoutParams screenParams = new FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.MATCH_PARENT,
+                    FrameLayout.LayoutParams.MATCH_PARENT
+            );
+            flScreenshare.setLayoutParams(screenParams);
         }
-        // 恢复界面
-        fullScreenContainer.setVisibility(View.GONE);
-        floatingMagnetView.setVisibility(View.VISIBLE);
-        ivQuan.setVisibility(View.VISIBLE);
-        ivExitFullscreen.setVisibility(View.GONE); // 隐藏退出按钮
+
+        // 隐藏退出按钮
+        ivExitFullscreen.setVisibility(View.GONE);
+
+
+//        isFullScreen = false;
+//        // 恢复系统UI
+//        View decorView = getWindow().getDecorView();
+////        decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
+//        decorView.setSystemUiVisibility(
+//                View.SYSTEM_UI_FLAG_FULLSCREEN
+//                        | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+//                        | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+//        );
+//        // 设置回竖屏
+//        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+//        // 找到 fl_screenshare 并移回原父容器
+//        FrameLayout fl_screenshare = findViewById(R.id.fl_screenshare);
+//        if (fl_screenshare != null) {
+//            safelyMoveViewToParent(fl_screenshare, fullScreenContainer);
+////            ViewParent parent = fl_screenshare.getParent();
+////            if (parent instanceof ViewGroup) {
+////                ((ViewGroup) parent).removeView(fl_screenshare);
+////            }
+////            // 添加到全屏容器
+////            fullScreenContainer.addView(fl_screenshare);
+//            // 找到原始父容器并重新添加
+////            FrameLayout originalParent = findViewById(R.id.fullscreen_container); // 或者你实际的容器
+////            if (originalParent != null) {
+////                originalParent.removeView(fl_screenshare); // 防止重复添加
+////            }
+//
+////            floatingMagnetView.addView(fl_screenshare);
+//        }
+//        // 恢复界面
+//        fullScreenContainer.setVisibility(View.GONE);
+//        floatingMagnetView.setVisibility(View.VISIBLE);
+//        ivQuan.setVisibility(View.VISIBLE);
+//        ivExitFullscreen.setVisibility(View.GONE); // 隐藏退出按钮
     }
 
     @Override
@@ -1471,7 +1556,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
                         .commitAllowingStateLoss();
             }
             roomFragment.handleMsgType1028(messageEvent);
-        }else if ( msgType == 1058) {
+        } else if (msgType == 1058) {
             if (roomFragment == null) {
                 roomFragment = RoomFragment.newInstance();
                 getSupportFragmentManager()
@@ -2627,8 +2712,8 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
                     return true;
                 }
             }
-        }else {
-            return true ;
+        } else {
+            return true;
         }
         return false;
     }
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
index acf982a..33ac1be 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
@@ -141,11 +141,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
 // 添加标题和对应的内容项
         dataList.add(new RoomSettingBean("房间类型", null, null, null, -1, read, isSelected, false, false));
         dataList.add(new RoomSettingBean("点唱", "ic_sing", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeSing, read, isSelected, false, false));
-        dataList.add(new RoomSettingBean("拍卖", "ic_auction", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeAuction, read, isSelected, false, false));
-//        dataList.add(new RoomSettingBean("男神", "ic_boy", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeBoy, read, isSelected, false, false));
-//        dataList.add(new RoomSettingBean("女神", "ic_girl", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeGirl, read, isSelected, false, false));
-        dataList.add(new RoomSettingBean(" 交友", "jiao_y", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU, read, isSelected, false, false));// 添加的新的房间类型 ，交友 ，是原来的男神女神类型
-        dataList.add(new RoomSettingBean(" 互娱", "ic_jiaoy", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy, read, isSelected, false, false)); //原交友，更改互娱 2025年9月19日11:18:01
+//        dataList.add(new RoomSettingBean("拍卖", "ic_auction", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeAuction, read, isSelected, false, false));
+        dataList.add(new RoomSettingBean("男神", "ic_boy", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeBoy, read, isSelected, false, false));
+        dataList.add(new RoomSettingBean("女神", "ic_girl", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeGirl, read, isSelected, false, false));
+//        dataList.add(new RoomSettingBean(" 交友", "jiao_y", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU, read, isSelected, false, false));// 添加的新的房间类型 ，交友 ，是原来的男神女神类型
+//        dataList.add(new RoomSettingBean(" 互娱", "ic_jiaoy", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy, read, isSelected, false, false)); //原交友，更改互娱 2025年9月19日11:18:01
 
 
         dataList.add(new RoomSettingBean("常用工具", null, null, null, -1, read, isSelected, false, false));
@@ -266,14 +266,14 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
 //                    MvpPre.changeRoomType(roomId, "2");
                     queren("2");
                 }
-//                else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeBoy) {
-////                    MvpPre.changeRoomType(roomId, "3");
-//                    queren("3");
-//                }
-//                else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeGirl) {
-////                    MvpPre.changeRoomType(roomId, "4");
-//                    queren("4");
-//                }
+                else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeBoy) {
+//                    MvpPre.changeRoomType(roomId, "3");
+                    queren("3");
+                }
+                else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeGirl) {
+//                    MvpPre.changeRoomType(roomId, "4");
+                    queren("4");
+                }
                 else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy) {
 //                    MvpPre.changeRoomType(roomId, "7");
                     queren("7");
@@ -341,11 +341,13 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
         // 房主显示全部
         if (roleLevel == 1) {
             if (onMic) {
-                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic) {
+                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type==RoomSettingBean.QXRoomSettingTypeRoomTypeAuction || type==RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy
+                        ||  type==RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU) {
                     return false;
                 }
             }else {
-                if (type==RoomSettingBean.QXRoomSettingTypeRoomBgMusic){
+                if (type==RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type==RoomSettingBean.QXRoomSettingTypeRoomTypeAuction || type==RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy
+                        ||  type==RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU){
                     return false;
                 }
             }
@@ -357,11 +359,13 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
                     type == RoomSettingBean.QXRoomSettingTypeRoomClearMessage || type == QXRoomSettingTypeRoomOrderMic || type == RoomSettingBean.QXRoomSettingTypeRoomFloatingScreen
                     || type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomBgImage || type == -1) {
                 if (onMic) {
-                    if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic) {
+                    if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type==RoomSettingBean.QXRoomSettingTypeRoomTypeAuction || type==RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy
+                            ||  type==RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU) {
                         return false;
                     }
                 }else {
-                    if (type==RoomSettingBean.QXRoomSettingTypeRoomBgMusic){
+                    if (type==RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type==RoomSettingBean.QXRoomSettingTypeRoomTypeAuction || type==RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy
+                            ||  type==RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU){
                         return false;
                     }
                 }
@@ -372,7 +376,8 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
                    ) {
                 return true;
             }else {
-                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic){
+                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type==RoomSettingBean.QXRoomSettingTypeRoomTypeAuction || type==RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy
+                        ||  type==RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU){
                     return false;
                 }
             }
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomUserInfoFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomUserInfoFragment.java
index 534f74a..a4f9702 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomUserInfoFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomUserInfoFragment.java
@@ -418,7 +418,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
             setTextViewStyle(mBinding.textView2, false);
             setTextViewStyle(mBinding.textView1, true);
             if (userInfo.getQinmi() != null && !userInfo.getQinmi().equals("")) {
-                mBinding.ll.setVisibility(VISIBLE);
+                mBinding.ll.setVisibility(GONE);
                 mBinding.ll.setBackgroundResource(com.xscm.moduleutil.R.mipmap.guxi_k);
 //                mBinding.rlReqit.setBackgroundResource(com.qxcm.moduleutil.R.mipmap.regit_t);
                 ImageUtils.loadHeadCC(userInfo.getQinmi().getAvatar1(), mBinding.userNav1);
@@ -435,7 +435,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
             setTextViewStyle(mBinding.textView2, true);
             setTextViewStyle(mBinding.textView1, false);
             if (userInfo.getZhenai() != null && !userInfo.getZhenai().equals("")) {
-                mBinding.ll.setVisibility(VISIBLE);
+                mBinding.ll.setVisibility(GONE);
                 mBinding.ll.setBackgroundResource(com.xscm.moduleutil.R.mipmap.guxi_w);
 //                mBinding.rlReqit.setBackgroundResource(com.qxcm.moduleutil.R.mipmap.guanxiw_z);
                 ImageUtils.loadHeadCC(userInfo.getZhenai().getAvatar1(), mBinding.userNav1);
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomCabinFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomCabinFragment.java
index a458222..74813f7 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomCabinFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomCabinFragment.java
@@ -210,8 +210,12 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
 
             }
         });
-        isShow = true;
-        switchMic(2);
+        if (!CommonAppContext.getInstance().isShowAg){
+            switchMic(1);
+        }else {
+            isShow = true;
+            switchMic(2);
+        }
 
         mBinding.im3.setOnClickListener(new View.OnClickListener() {
 
@@ -344,6 +348,7 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
             AgoraManager.getInstance(getActivity()).muteLocalAudioStream(false);
             AgoraManager.getInstance(getActivity()).setLocalAudioEnabled(true,SpUtil.getUserId()+"");
             isShow = false;
+            CommonAppContext.getInstance().isShowAg=false;
 
         } else {
             mBinding.im1.setImageResource(com.xscm.moduleutil.R.mipmap.op_m);
@@ -351,6 +356,7 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
             AgoraManager.getInstance(getActivity()).muteLocalAudioStream(true);
             AgoraManager.getInstance(getActivity()).setLocalAudioEnabled(false,SpUtil.getUserId()+"");
             isShow = true;
+            CommonAppContext.getInstance().isShowAg=true;
 
         }
     }
@@ -831,5 +837,6 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
             mediaProjection[0].stop();
             mediaProjection[0] = null;
         }
+
     }
 }
diff --git a/moduleroom/src/main/res/layout/fragment_room_user_info.xml b/moduleroom/src/main/res/layout/fragment_room_user_info.xml
index 0608c37..190f826 100644
--- a/moduleroom/src/main/res/layout/fragment_room_user_info.xml
+++ b/moduleroom/src/main/res/layout/fragment_room_user_info.xml
@@ -273,7 +273,8 @@
                 android:layout_marginEnd="@dimen/dp_16"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/room_rl_gift">
+                app:layout_constraintTop_toBottomOf="@+id/room_rl_gift"
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/textView1"
@@ -327,7 +328,8 @@
                 android:layout_height="@dimen/dp_140"
                 android:background="@mipmap/guxi_k"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/custom_tab_layout">
+                app:layout_constraintTop_toBottomOf="@+id/custom_tab_layout"
+                android:visibility="gone">
 
                 <com.makeramen.roundedimageview.RoundedImageView
                     android:id="@+id/user_nav1"