修复PK显示问题：【是用户先进主播后挂断会显示对方信息角标】

调整直播间游戏半屏UI 调整战令UI
2024-01-23 15:28:13 +08:00
parent aa62dda844
commit 47077a465a
16 changed files with 361 additions and 69 deletions
--- a/live/src/main/java/com/yunbao/live/activity/LiveActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveActivity.java
@@ -729,23 +729,38 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
        Log.e("ry", "pkUid = " + pkUid + ", pkhead = " + pkhead + ", pkname = " + pkname + ", isLadders = " + isLadders);
        if (mLiveRyLinkMicPkPresenter != null && mLiveRoomViewHolder != null) {
            mLiveRyLinkMicPkPresenter.onLinkMicPkStart(pkUid, 1);
-            Handler handler = new Handler();
-            handler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    if (mLiveRoomViewHolder != null) {
-                        Log.e("tasdsdg", mLiveUid + "1111" + CommonAppConfig.getInstance().getUid());
-                        if (!mLiveUid.equals(CommonAppConfig.getInstance().getUid())) {
-                            mLiveRoomViewHolder.setOtherInfo(pkUid, pkhead, pkname);
-                            mLiveRoomViewHolder.initPkRank(isLadders);
-                        }
-                    }
-                }
-            }, 4000);//3秒后执行Runnable中的run方法
+            pr = new pkRunnable(pkUid, pkhead, pkname, isLadders);
+            mHandler.postDelayed(pr, 4000);//3秒后执行Runnable中的run方法

        }
    }
+    public  Handler mHandler = new Handler();
+    public pkRunnable pr;

+    public class pkRunnable implements Runnable {
+        private String pkUid;
+        private String pkhead;
+        private String pkname;
+        private String isLadders;
+
+        public pkRunnable(String pkUid, String pkhead, String pkname, String isLadders) {
+            this.pkUid = pkUid;
+            this.pkhead = pkhead;
+            this.pkname = pkname;
+            this.isLadders = isLadders;
+        }
+
+        @Override
+        public void run() {
+            if (mLiveRoomViewHolder != null) {
+                Log.e("tasdsdg", mLiveUid + "1111" + CommonAppConfig.getInstance().getUid());
+                if (!mLiveUid.equals(CommonAppConfig.getInstance().getUid())) {
+                    mLiveRoomViewHolder.setOtherInfo(pkUid, pkhead, pkname);
+                    mLiveRoomViewHolder.initPkRank(isLadders);
+                }
+            }
+        }
+    }

    /**
     * 主播与主播PK  所有人收到断开连麦pk的回调
@@ -951,7 +966,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
                }
                String[] data = new String[]{obj.getString("barragetoken")};
                SocketRyChatUtil.sendDanmuMessage(mLiveUid, contents, obj.getIntValue("level_fans"));
-            } else if (code==1001) {
+            } else if (code == 1001) {
                DialogUitl.showSimpleDialog(mContext, msg, new DialogUitl.SimpleCallback2() {
                    @Override
                    public void onCancelClick() {
@@ -1289,9 +1304,9 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
        //粉絲團粉絲團
        //不是粉絲
        if (LiveAudienceActivity.is_fans != null && LiveAudienceActivity.is_fans.equals("2")) {
-            bundle.putString(Constants.URL, CommonAppConfig.HOST + "/h5/live/joinFansClub.html" + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + uid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
+            bundle.putString(Constants.URL, CommonAppConfig.HOST + "/h5/live/joinFansClub.html" + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + uid + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
        } else {
-            bundle.putString(Constants.URL, CommonAppConfig.HOST + "/h5/live/fansClub.html" + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + uid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
+            bundle.putString(Constants.URL, CommonAppConfig.HOST + "/h5/live/fansClub.html" + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + uid + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
        }
        bundle.putString("liveUid", mLiveUid);
        bundle.putString("anchorName", mAncherName);
@@ -1331,7 +1346,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
                        @Override
                        public void onError(String error) {
                            Log.e("LiveUserMoreDialog", error);
-                              ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
+                            ToastUtil.show(WordUtil.isNewZh() ? "抱歉！出錯了！" : "i \\'m sorry! An error occurred");
                        }
                    });
        } else {
@@ -1470,7 +1485,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
     */
    public void openLuckGiftTip() {
        UserBean u = CommonAppConfig.getInstance().getUserBean();
-        String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&anchorUid=" + mLiveUid + "&anchorName=" + mAncherName+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
+        String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&anchorUid=" + mLiveUid + "&anchorName=" + mAncherName + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
        startActivity(new Intent(this, ZhuangBanActivity.class).putExtra("url", url).putExtra("title", ""));
    }

--- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
@@ -392,7 +392,12 @@ public class LiveAudienceActivity extends LiveActivity {
                mStream = mLiveBean.getStream();
                mAncherName = mLiveBean.getUserNiceName();
                mAncherIcon = mLiveBean.getAvatar();
+                if (pr != null) {
+                    mHandler.removeCallbacks(pr);
+                    pr = null;
+                }
                manager.onAdd(mLiveBean, mLiveType, mLiveTypeVal, mLiveSDK);
+
                //加载完页面后再后台静默下载礼物svga
                downloadAllGift();
                over();
@@ -824,7 +829,7 @@ public class LiveAudienceActivity extends LiveActivity {
        if (manager != null && !StringUtil.isEmpty(is_fans)) {
            if (is_fans.equals("-2")) {
                manager.setAttention(0);
-                if (mLiveRoomViewHolder!=null){
+                if (mLiveRoomViewHolder != null) {
                    mLiveRoomViewHolder.setFansGroup("0");
                }

--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -1237,6 +1237,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
        if (LivePushTxViewHolder.mTRTCCloud != null || LivePushRyViewHolder.rtcRoom != null) {
            fans_btn.setVisibility(View.GONE);
        }
+        mPkRankTopIcon.setVisibility(View.GONE);
        goto_room_view = (LinearLayout) findViewById(R.id.goto_room_view);
        goto_room_view.setVisibility(View.GONE);
        avatarOther = (ImageView) findViewById(R.id.avatarOther);
@@ -1817,6 +1818,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
        mAnchorLayout.setBackgroundResource(R.drawable.bg_live_ico);
        mGoodNumberIcon.setVisibility(View.GONE);
        mAnchorSay.setVisibility(View.INVISIBLE);
+        showAnchorSayAndCallAnchor();
    }

    /**
@@ -2488,7 +2490,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
        }
    }

-    public void initRankPKInfo(String mLiveUid,String pkUid) {
+    public void initRankPKInfo(String mLiveUid, String pkUid) {
        LiveNetManager.get(mContext)
                .getRandomPk(mLiveUid, pkUid, new com.yunbao.common.http.base.HttpCallback<PkRankBean>() {
                    @Override
@@ -2843,12 +2845,14 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
        Log.e("LiveRoomViewHolder", "closePkTwo: 隐藏PK信息" + goto_room_view.getVisibility());
        mPkRankTopIcon.setVisibility(View.GONE);
        lt_pk_line.setVisibility(View.GONE);
+        pkHandler = false;
        pkUid = "";
        goto_room_view.setVisibility(View.GONE);
        livePKUserListBean = new LivePKUserListBean();
        mRedVal.setVisibility(View.GONE);
        mBlueVal.setVisibility(View.GONE);
        mPkRankTopIcon.setVisibility(View.GONE);
+        showAnchorSayAndCallAnchor();
    }

    /**
@@ -4916,7 +4920,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                hideAnchorSayAndCallAnchor();
                break;
            case LIVE_PK_END:
-                showAnchorSayAndCallAnchor();
+                //showAnchorSayAndCallAnchor();
                break;
            case LIVE_FONT_SIZE:
                int fount = event.getNums();
@@ -5508,7 +5512,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis

    public void showAnchorSayAndCallAnchor() {
        isHinde = false;
-        if (mAnchorSay.getVisibility() == View.GONE &&
+        if (mAnchorSay.getVisibility() != View.VISIBLE &&
                sayModel != null && sayModel.getLivePreview() != null &&
                sayModel.getLivePreview().getIsShow() == 1
        ) {
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -817,6 +817,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
        Log.e("直播间接口调用排查", "onRemove---------------");
        LiveNetManager.get(mContext).cancelLive();
        liveHandler.removeCallbacks(sendFIm);
+        pkInfo=null;
        linkMicPkStartHandler.removeCallbacks(linkMicPkStartRunnable);
        LiveHttpUtil.cancel(LiveHttpConsts.CHECK_LIVE);
        LiveHttpUtil.cancel(LiveHttpConsts.ENTER_ROOM);
@@ -1552,7 +1553,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
        linkMicPkStartRunnable = () -> {
            if (mLiveRoomViewHolder != null) {
                Log.e("tasdsdg", liveID + "1111" + CommonAppConfig.getInstance().getUid());
-                if (!liveID.equals(CommonAppConfig.getInstance().getUid())) {
+                if (!liveID.equals(CommonAppConfig.getInstance().getUid()) && pkInfo != null && pkInfo.containsKey("pkuid") && pkInfo.containsKey("pkuimg") && pkInfo.containsKey("pkuname")) {
                    mLiveRoomViewHolder.setOtherInfo(mPkUid, mPkhead, mPkname);
                    mLiveRoomViewHolder.initPkRank(mIsLadders);
                }
@@ -1620,7 +1621,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
    public void onLinkMicPkEnd(String winUid) {
        if (mLiveRyLinkMicPkPresenter != null) {
            mLiveRyLinkMicPkPresenter.onLinkMicPkEnd(winUid);
-            mLiveRoomViewHolder.setDelOtherInfo();
+            //mLiveRoomViewHolder.setDelOtherInfo();
        }
    }