From d7a27baf5cfb0377241f55cb55badbf1d741c8b7 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, 14 Jan 2026 16:34:52 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9pk=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9A=84pk=E6=8C=89=E9=92=AE=20is=5Fpk=3D1:?=
 =?UTF-8?q?=E6=98=AF=E6=8E=A5=E5=8F=97pk=E3=80=822=EF=BC=9A=E6=98=AF?=
 =?UTF-8?q?=E4=B8=8D=E6=8E=A5=E5=8F=97pk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/room/activity/RoomActivity.kt    |  4 +++-
 .../dialog/LiveBattleSettingsDialog.java      |  2 +-
 .../dialog/RoomPkDialogFragment.java          | 19 +++++++++++++++----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
index 811458b4..d20fab71 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
@@ -1094,6 +1094,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         }
         mBinding?.ivPrivateSet?.tag = "1"
         goneAll()
+
+        SpUtil.getInstance().setIntValue("is_pk",mRoomInfoResp?.room_info?.is_pk?:1)
     }
 
 
@@ -2799,7 +2801,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             val fragment = RoomPkDialogFragment.newInstance(
                 roomId,
                 SpUtil.getUserId().toString() + "",
-                mRoomInfoResp?.room_info?.is_pk!!
+                SpUtil.getInstance().getIntValue("is_pk",1)
             )
 
             LogUtils.e("pk_info", "id == R.id.rl_pk   ${mRoomInfoResp?.room_info?.is_pk!!}")
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/LiveBattleSettingsDialog.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/LiveBattleSettingsDialog.java
index 25c82a6d..8d5b07ea 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/LiveBattleSettingsDialog.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/LiveBattleSettingsDialog.java
@@ -44,7 +44,7 @@ public class LiveBattleSettingsDialog extends Dialog {
         switchFriendInvitation.setChecked(false);
         switchRecommendInvitation.setChecked(false);
 
-        if (is_pk==1){
+        if (is_pk==2){
             switchFriendInvitation.setChecked(true);
         }else {
             switchFriendInvitation.setChecked(false);
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomPkDialogFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomPkDialogFragment.java
index cd3ac37a..65bbf419 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomPkDialogFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomPkDialogFragment.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
@@ -15,6 +16,7 @@ import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.blankj.utilcode.util.ScreenUtils;
 import com.blankj.utilcode.util.StringUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
@@ -28,6 +30,7 @@ import com.xscm.moduleutil.bean.room.RoomBean;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xscm.moduleutil.utils.SpUtil;
 
 import java.util.List;
 
@@ -71,7 +74,8 @@ public class RoomPkDialogFragment extends BaseMvpDialogFragment<RoomPkPresenter,
         super.onAttach(context);
         mRoomId = getArguments().getString("roomId");
         mUserId = getArguments().getString("userId");
-        is_pk = getArguments().getInt("is_pk");
+//        is_pk = getArguments().getInt("is_pk");
+        is_pk=SpUtil.getInstance().getIntValue("is_pk",1);
     }
 
     @Override
@@ -180,9 +184,11 @@ public class RoomPkDialogFragment extends BaseMvpDialogFragment<RoomPkPresenter,
         // 例如：
 //        MvpPre.updateFriendInvitationSetting(isChecked);
         if (isChecked){
-            MvpPre.refusePk(mRoomId, "1");
-        }else {
             MvpPre.refusePk(mRoomId, "2");
+            SpUtil.getInstance().setIntValue("is_pk",2);
+        }else {
+            MvpPre.refusePk(mRoomId, "1");
+            SpUtil.getInstance().setIntValue("is_pk",1);
         }
     }
 
@@ -201,10 +207,15 @@ public class RoomPkDialogFragment extends BaseMvpDialogFragment<RoomPkPresenter,
         super.initDialogStyle(window);
         window.setGravity(Gravity.BOTTOM);
         WindowManager.LayoutParams lp = window.getAttributes();
+
         lp.dimAmount = 0.6f;
+        // 获取屏幕高度
+        int screenHeight = ScreenUtils.getAppScreenHeight();
+
         // 固定对话框的宽度和高度
         lp.width = WindowManager.LayoutParams.MATCH_PARENT; // 宽度设置为屏幕宽度
-        lp.height = WindowManager.LayoutParams.WRAP_CONTENT; // 高度设置为内容高度
+//        lp.height = WindowManager.LayoutParams.WRAP_CONTENT; // 高度设置为内容高度
+        lp.height = (int) (screenHeight * 0.5); // 高度设置为内容高度
 
         window.setAttributes(lp);
         window.addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);