diff --git a/app/src/main/java/com/chwl/app/avroom/ButtonItemFactory.java b/app/src/main/java/com/chwl/app/avroom/ButtonItemFactory.java index e63fecaea..d643d9446 100644 --- a/app/src/main/java/com/chwl/app/avroom/ButtonItemFactory.java +++ b/app/src/main/java/com/chwl/app/avroom/ButtonItemFactory.java @@ -4,6 +4,7 @@ import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; +import com.hjq.toast.ToastUtils; import com.netease.nim.uikit.business.uinfo.UserInfoHelper; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; @@ -262,6 +263,11 @@ public class ButtonItemFactory { @Override public void onClick() { + if (VipHelper.notKick(userInfo)) { + ToastUtils.show(R.string.vipPower); + return; + } + String tips = (AvRoomDataManager.get().isGamePlaying(Long.parseLong(account)) ? ResUtil.getString(R.string.erban_avroom_buttonitemfactory_07) : "") + ResUtil.getString(R.string.erban_avroom_buttonitemfactory_08); if (VipHelper.notKick(userInfo)) { if (AvRoomDataManager.get().isRoomOwner()) { @@ -350,6 +356,10 @@ public class ButtonItemFactory { final String account, String nick) { return new ViewItem(ResUtil.getString(R.string.erban_avroom_buttonitemfactory_015), R.drawable.icon_dialog_mark_black_list, () -> { + if (VipHelper.notKick(userInfo)) { + ToastUtils.show(R.string.vipPower); + return; + } int roomBlackListSize = 200; InitInfo initInfo = InitialModel.get().getCacheInitInfo(); if (initInfo != null && initInfo.getRoomBlackListSize() != 0) { @@ -446,9 +456,6 @@ public class ButtonItemFactory { public void onOk() { NimFriendModel.get().addToBlackList(account) .subscribe((aBoolean, throwable) -> { -// Toast.makeText(BasicConfig.INSTANCE.getAppContext(), -// (throwable == null) ? ResUtil.getString(R.string.erban_avroom_buttonitemfactory_032) : ResUtil.getString(R.string.erban_avroom_buttonitemfactory_033), -// Toast.LENGTH_SHORT).show(); SingleToastUtil.showToastShort((throwable == null) ? ResUtil.getString(R.string.erban_avroom_buttonitemfactory_034) : ResUtil.getString(R.string.erban_avroom_buttonitemfactory_035)); }); } diff --git a/app/src/main/java/com/chwl/app/ui/setting/VipSetActivity.kt b/app/src/main/java/com/chwl/app/ui/setting/VipSetActivity.kt index 27d3c5899..40c7792e7 100644 --- a/app/src/main/java/com/chwl/app/ui/setting/VipSetActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/setting/VipSetActivity.kt @@ -69,10 +69,10 @@ class VipSetActivity : BaseViewBindingActivity(), ILog, V .compose(bindToLifecycle()) .doOnSuccess { it.userVipInfoVO?.let { vInfo-> - setSwitchView(binding.vipSetSwitch1,vInfo.enterHide) - setSwitchView(binding.vipSetSwitch2,vInfo.enterHide) - setSwitchView(binding.vipSetSwitch3,vInfo.enterHide) - setSwitchView(binding.vipSetSwitch4,vInfo.enterHide) + setSwitchView(binding.vipSetSwitch1,vInfo.enterHide)//不被关注 + setSwitchView(binding.vipSetSwitch2,vInfo.enterHide)//防跟随 + setSwitchView(binding.vipSetSwitch3,vInfo.enterHide)//开关隐身进房状态 + setSwitchView(binding.vipSetSwitch4,vInfo.preventKick)//防踢 } } .doOnError { @@ -137,12 +137,12 @@ class VipSetActivity : BaseViewBindingActivity(), ILog, V /** * 不被关注 */ - @GET("/vip/changeInvisibleInRoom") + @GET("/vip/changePreventFollow") fun notFollowed(@Query("open") open: Boolean): Single> /** * 防跟随 */ - @GET("/vip/changeInvisibleInRoom") + @GET("/vip/changePreventTrace") fun notTrace(@Query("open") open: Boolean): Single> /** * 开关隐身进房状态 @@ -152,7 +152,7 @@ class VipSetActivity : BaseViewBindingActivity(), ILog, V /** * 防踢 */ - @GET("/vip/changeInvisibleInRoom") + @GET("/vip/changePreventKick") fun notKick(@Query("open") open: Boolean): Single> } diff --git a/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java b/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java index f77da56db..442ac04d0 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java @@ -42,6 +42,7 @@ import com.chwl.library.download.FileDownloadListener; import com.chwl.library.utils.PathHelper; import com.chwl.library.widget.SVGAView; import com.google.android.flexbox.FlexboxLayout; +import com.hjq.toast.ToastUtils; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent; @@ -1415,6 +1416,12 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe return new ViewItem(getString(R.string.ui_widget_userinfodialog_029), R.drawable.user_card_ic_down_mic_listen, true, new ViewItem.OnClickListener() { @Override public void onClick() { + + if (userInfo != null && userInfo.getUserVipInfoVO() != null && userInfo.getUserVipInfoVO().getPreventKick()) { + ToastUtils.show(R.string.vipPower); + return; + } + if (SuperAdminUtil.isSuperAdmin()) { mSuperAdminModel.roomOperate(SuperAdminModel.TAKE_OUT_MIC, uid).subscribe(); kickDownMicCode(); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f6b1b53ad..febcc0d80 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5390,10 +5390,12 @@ You cannot join again within 24 hours after leaving vipSetTitle2 - vipSetItemTitle1 - vipSetItemTitle2 - vipSetItemTitle3 - vipSetItemTitle4 + 不被关注 + 防跟随 + 开关隐身进房状态 + 防踢 + + vip权利 diff --git a/core/src/main/java/com/chwl/core/vip/bean/UserVipInfo.kt b/core/src/main/java/com/chwl/core/vip/bean/UserVipInfo.kt index e9ddb1c36..86c7a549a 100644 --- a/core/src/main/java/com/chwl/core/vip/bean/UserVipInfo.kt +++ b/core/src/main/java/com/chwl/core/vip/bean/UserVipInfo.kt @@ -9,6 +9,8 @@ data class UserVipInfo( val friendNickColour: String = "", val preventKick: Boolean = false, var enterHide: Boolean = false, + val preventTrace: Boolean = false, + var enterFollow: Boolean = false, val enterRoomEffects: String = "", var userCardBG: String = "" ) : Serializable