From 0dc1009661c7d466754576d320bd3fc82b9b68b1 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Fri, 15 Dec 2023 15:16:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=82=E7=9C=8B=E6=97=B6=E9=95=BF=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/http/live/LiveNetManager.java | 1 + .../live/dialog/LiveUserDialogFragment.java | 6 +----- .../yunbao/live/views/LiveRoomViewHolder.java | 5 ++++- .../live/views/PortraitLiveManager.java | 19 ++++++++++++------- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java index 5716e4c33..b562973be 100644 --- a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java +++ b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java @@ -481,6 +481,7 @@ public class LiveNetManager { * @param liveUid */ public void leaveRoomNew(String stream, String liveUid, HttpCallback callback) { + Log.e("观看时长","leaveRoomNew-----------------------"+liveUid); API.get().pdLiveApi(mContext) .leaveRoomNew("g" + liveUid, stream) .subscribeOn(Schedulers.io()) diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java index 7ed21d2d1..2b11f8911 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java @@ -22,8 +22,6 @@ import com.opensource.svgaplayer.SVGADrawable; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; -import com.tencent.imsdk.v2.V2TIMCallback; -import com.tencent.imsdk.v2.V2TIMManager; import com.umeng.analytics.MobclickAgent; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.Constants; @@ -65,9 +63,6 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; -import io.rong.imlib.IRongCoreCallback; -import io.rong.imlib.IRongCoreEnum; -import io.rong.imlib.chatroom.base.RongChatRoomClient; import pl.droidsonroids.gif.GifImageView; /** @@ -637,6 +632,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On private void gotoLive(String live_id) { + dismiss(); DialogUitl.showSimpleDialog(mContext, mContext.getString(R.string.party_studio), new DialogUitl.SimpleCallback() { @Override public void onConfirmClick(Dialog dialog, String content) { diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index b6da2cd0a..59fb289d2 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -1826,6 +1826,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis * 重置数据 */ public void resetView() { + countdownHandler.removeCallbacks(countdownRunnable); svgaImageViewHashMap.clear(); pa_pao_layout.removeAllViews(); timeHandler.removeCallbacks(timeRunnable); @@ -5061,7 +5062,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis countdownHandler.post(countdownRunnable); } } - + Log.e("多人Pk", "upDataPkScore mPkTimeCount:" +mPkTimeCount); for (int i = 0; i < pkScores.size(); i++) { JSONObject score = pkScores.getJSONObject(i); String userNiceName = score.getString("user_nicename"); @@ -5152,8 +5153,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis public void run() { mPkTimeCount--; if (mPkTimeCount > 0) {// + Log.e("多人Pk", "countdownRunnable mPkTimeCount:" +mPkTimeCount); String s1 = StringUtil.getDurationText(mPkTimeCount * 1000); textTime.setText(String.format(mContext.getString(R.string.pk_time), s1)); + Log.e("多人Pk", "countdownRunnable s1:" +s1); countdownHandler.postAtTime(countdownRunnable, getNextSecondTime()); } else { mPkTimeCount = 0; diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index 030057c83..dff06b39b 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -242,15 +242,17 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe } public void setGiftRemainingQuantity(String giftRemainingQuantity) { - if (mLiveAudienceViewHolder!=null){ + if (mLiveAudienceViewHolder != null) { mLiveAudienceViewHolder.setGiftRemainingQuantity(giftRemainingQuantity); } } + public void setHotNum(String hotNum) { - if (mLiveRoomViewHolder!=null){ - mLiveRoomViewHolder.setHotNum(hotNum); - } + if (mLiveRoomViewHolder != null) { + mLiveRoomViewHolder.setHotNum(hotNum); + } } + public PortraitLiveManager(Activity context, Intent intent) { this.mContext = context; this.mIntent = intent; @@ -447,6 +449,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe public void run() { //加入房间发送Im消息 LiveNetManager.get(mContext).userJoinRoomNew(mLiveBean.getStream(), mLiveBean.getUid()); + Log.e("观看时长","userJoinRoomNew-----------------------"+mLiveBean.getUid()); } }; @@ -459,6 +462,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe .enterRoomNew(mLiveBean.getStream(), mLiveBean.getUid(), mLiveBean.getCity(), new com.yunbao.common.http.base.HttpCallback() { @Override public void onSuccess(EnterRoomNewModel data) { + Log.e("观看时长","enterRoomNew-----------------------"+ mLiveBean.getUid()); isEnterRoom = true; if (TextUtils.isEmpty(leaveStream)) { leaveStream = mLiveBean.getStream(); @@ -686,6 +690,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe } upDataPkScore(pkInfo.getJSONArray("userlist"), pkInfo.getIntValue("drpk_time")); + Log.e("多人Pk", "enterRoomNew drpk_time:" + pkInfo.getIntValue("drpk_time")); } // mLivePlayViewHolder.setLayoutInterface(new LivePlayRyViewHolder.PlayViewLayoutInterface() { // @Override @@ -808,7 +813,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe @Override public void onRemove(boolean isQuit) { - Log.e("直播间接口调用排查","onRemove---------------"); + Log.e("直播间接口调用排查", "onRemove---------------"); LiveNetManager.get(mContext).cancelLive(); liveHandler.removeCallbacks(sendFIm); linkMicPkStartHandler.removeCallbacks(linkMicPkStartRunnable); @@ -978,7 +983,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe Conversation.ConversationType conversationType = Conversation.ConversationType.PRIVATE; TextMessage messageContent = TextMessage.obtain(msg.mResult.toString()); - io.rong.imlib.model.Message message = io.rong.imlib.model.Message.obtain(liveID, conversationType, messageContent); + io.rong.imlib.model.Message message = io.rong.imlib.model.Message.obtain(liveID, conversationType, messageContent); RongIMClient.getInstance().sendMessage(message, null, null, new IRongCallback.ISendMessageCallback() { @Override @@ -1850,7 +1855,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe .leaveRoomNew(leaveStream, leaveGroupId, new com.yunbao.common.http.base.HttpCallback() { @Override public void onSuccess(String data) { - Log.e("直播间接口调用排查","leaveRoomNew---------------"); + } @Override