moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PK中隐藏排麦按钮

Browse Source
This commit is contained in:
huangjian
2020-12-19 15:17:19 +08:00
parent 8ac67ace40
commit be9becff82
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
View File

@@ -25,7 +25,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.viewpager.widget.ViewPager;
import android.text.TextUtils;
import android.util.SparseArray;
import android.view.View;
import android.view.ViewStub;
import android.widget.EditText;
@@ -36,7 +35,6 @@ import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.coorchice.library.SuperTextView;
import com.heytap.mcssdk.utils.StatUtil;
import com.jude.rollviewpager.RollPagerView;
import com.jude.rollviewpager.Util;
import com.jude.rollviewpager.hintview.ColorPointHintView;
@@ -113,7 +111,6 @@ import com.yizhuan.erban.ui.widget.dynamicface.DynamicFaceDialog;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.erban.ui.widget.marqueeview.AvRoomNobleWelcomeView;
import com.yizhuan.erban.utils.KeyBoardUtils;
import com.yizhuan.erban.utils.UserUtils;
import com.yizhuan.tutu.music.widget.MusicPlayerView;
import com.yizhuan.tutu.room_chat.activity.RoomInviteFansActivity;
import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity;
@@ -216,7 +213,6 @@ import java.util.ListIterator;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import io.reactivex.Observable;
import io.reactivex.Single;
import io.reactivex.SingleObserver;
import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -783,7 +779,7 @@ public class HomePartyRoomFragment extends BaseMvpFragment<IHomePartyView, HomeP
case RoomEvent.PK_INFO_UPDATE:
updatePkScoreBoard();
updateQueuingMicBtn();
break;
case RoomEvent.PK_INVITE_IN_TEAM:
if (AvRoomDataManager.get().isOwner(roomEvent.getAccount())) {
@@ -1388,8 +1384,7 @@ public class HomePartyRoomFragment extends BaseMvpFragment<IHomePartyView, HomeP
private void updateQueuingMicBtn() {
if (AvRoomDataManager.get().mCurrentRoomInfo != null) {
bottomView.setQueuingMicButton(AvRoomDataManager.get().isQueuingMicro()
|| AvRoomDataManager.get().isOpenPKMode());
bottomView.updateQueuingMicButton();
if (!AvRoomDataManager.get().isQueuingMicro()) {
if (isMicQueueDialogShowing()) {

14
app/src/main/java/com/yizhuan/erban/avroom/widget/BottomView.java
View File

@@ -15,6 +15,7 @@ import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.IMMessageManager;
import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.pk.model.PkModel;
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
@@ -31,7 +32,9 @@ import java.util.List;
public class BottomView extends RelativeLayout implements View.OnClickListener {
/** 有新功能，加1 */
/**
* 有新功能，加1
*/
private static final int NEW_OPTION = 1;
private static final String SH_NEW_OPTION = "sh_new_option";
@@ -99,7 +102,7 @@ public class BottomView extends RelativeLayout implements View.OnClickListener {
setMicBtnEnable(false);
setMicBtnOpen(false);
setQueuingMicButton(AvRoomDataManager.get().isQueuingMicro());
updateQueuingMicButton();
setRoomMessageUnread(IMMessageManager.get().queryUnreadMsg());
if (SuperAdminUtil.isSuperAdmin()) {
@@ -205,12 +208,15 @@ public class BottomView extends RelativeLayout implements View.OnClickListener {
micLayout.setVisibility(GONE);
}
public void setQueuingMicButton(boolean isQueuingMicroMode) {
public void updateQueuingMicButton() {
if (SuperAdminUtil.isSuperAdmin()) {
iconMicQueue.setVisibility(GONE);
return;
}
iconMicQueue.setVisibility(isQueuingMicroMode && !AvRoomDataManager.get().isCpRoom() ? VISIBLE : GONE);
//排麦模式或PK模式非进行中展示排麦麦按钮
iconMicQueue.setVisibility((AvRoomDataManager.get().isQueuingMicro() || AvRoomDataManager.get().isOpenPKMode()) &&
!AvRoomDataManager.get().isCpRoom() &&
!PkModel.get().isFighting() ? VISIBLE : GONE);
}
public void setQueuingMicButtonBackground(boolean isEmpty) {