1:修改pk中,设置的pk按钮 is_pk=1:是接受pk。2:是不接受pk

This commit is contained in:
2026-01-14 16:34:52 +08:00
parent a3551e2e33
commit d7a27baf5c
3 changed files with 19 additions and 6 deletions

View File

@@ -1094,6 +1094,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
} }
mBinding?.ivPrivateSet?.tag = "1" mBinding?.ivPrivateSet?.tag = "1"
goneAll() 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( val fragment = RoomPkDialogFragment.newInstance(
roomId, roomId,
SpUtil.getUserId().toString() + "", 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!!}") LogUtils.e("pk_info", "id == R.id.rl_pk ${mRoomInfoResp?.room_info?.is_pk!!}")

View File

@@ -44,7 +44,7 @@ public class LiveBattleSettingsDialog extends Dialog {
switchFriendInvitation.setChecked(false); switchFriendInvitation.setChecked(false);
switchRecommendInvitation.setChecked(false); switchRecommendInvitation.setChecked(false);
if (is_pk==1){ if (is_pk==2){
switchFriendInvitation.setChecked(true); switchFriendInvitation.setChecked(true);
}else { }else {
switchFriendInvitation.setChecked(false); switchFriendInvitation.setChecked(false);

View File

@@ -5,6 +5,7 @@ import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.util.DisplayMetrics;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.Window; import android.view.Window;
@@ -15,6 +16,7 @@ import android.widget.LinearLayout;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import com.blankj.utilcode.util.ScreenUtils;
import com.blankj.utilcode.util.StringUtils; import com.blankj.utilcode.util.StringUtils;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; 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.xscm.moduleutil.utils.ImageUtils;
import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import com.xscm.moduleutil.utils.SpUtil;
import java.util.List; import java.util.List;
@@ -71,7 +74,8 @@ public class RoomPkDialogFragment extends BaseMvpDialogFragment<RoomPkPresenter,
super.onAttach(context); super.onAttach(context);
mRoomId = getArguments().getString("roomId"); mRoomId = getArguments().getString("roomId");
mUserId = getArguments().getString("userId"); 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 @Override
@@ -180,9 +184,11 @@ public class RoomPkDialogFragment extends BaseMvpDialogFragment<RoomPkPresenter,
// 例如: // 例如:
// MvpPre.updateFriendInvitationSetting(isChecked); // MvpPre.updateFriendInvitationSetting(isChecked);
if (isChecked){ if (isChecked){
MvpPre.refusePk(mRoomId, "1");
}else {
MvpPre.refusePk(mRoomId, "2"); 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); super.initDialogStyle(window);
window.setGravity(Gravity.BOTTOM); window.setGravity(Gravity.BOTTOM);
WindowManager.LayoutParams lp = window.getAttributes(); WindowManager.LayoutParams lp = window.getAttributes();
lp.dimAmount = 0.6f; lp.dimAmount = 0.6f;
// 获取屏幕高度
int screenHeight = ScreenUtils.getAppScreenHeight();
// 固定对话框的宽度和高度 // 固定对话框的宽度和高度
lp.width = WindowManager.LayoutParams.MATCH_PARENT; // 宽度设置为屏幕宽度 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.setAttributes(lp);
window.addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND); window.addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);