Compare commits

...

1 Commits

Author SHA1 Message Date
18401019693
bf719c64ea 融云版本升级到5.3.6 2023-05-18 15:49:04 +08:00
2 changed files with 8 additions and 11 deletions

View File

@@ -154,12 +154,12 @@ dependencies {
//腾讯im //腾讯im
api 'com.tencent.imsdk:imsdk-plus:5.4.666' api 'com.tencent.imsdk:imsdk-plus:5.4.666'
api 'com.google.code.gson:gson:2.8.8' api 'com.google.code.gson:gson:2.8.8'
api 'cn.rongcloud.sdk:rtc_lib:5.2.0' // 音视频通话基础能力库 api 'cn.rongcloud.sdk:rtc_lib:5.3.6' // 音视频通话基础能力库
//此处以集成 5.1.2 版本为例 //此处以集成 5.1.2 版本为例
api 'cn.rongcloud.sdk:im_lib:5.2.0.2' api 'cn.rongcloud.sdk:im_lib:5.3.6'
//此处以集成 5.1.2 版本为例 //此处以集成 5.1.2 版本为例
api 'cn.rongcloud.sdk:im_kit:5.2.5.4' // 即时通讯 UI 基础组件 api 'cn.rongcloud.sdk:im_kit:5.3.6' // 即时通讯 UI 基础组件
//融云小视频模块 //融云小视频模块
api 'cn.rongcloud.sdk:sight:5.2.5.4' api 'cn.rongcloud.sdk:sight:5.2.5.4'
api 'com.facebook.android:facebook-android-sdk:15.2.0' api 'com.facebook.android:facebook-android-sdk:15.2.0'

View File

@@ -68,7 +68,6 @@ import com.yunbao.common.utils.LogUtil;
import com.yunbao.common.utils.MicStatusManager; import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.LiveNewWishListPopup; import com.yunbao.common.views.LiveNewWishListPopup;
import com.yunbao.common.views.LiveRobotSettingCustomPopup; import com.yunbao.common.views.LiveRobotSettingCustomPopup;
import com.yunbao.faceunity.FaceManager; import com.yunbao.faceunity.FaceManager;
@@ -223,9 +222,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
long bitRate = statusBean.bitRate; long bitRate = statusBean.bitRate;
//丢包率 //丢包率
long lossRate = statusBean.packetLostRate; long lossRate = statusBean.packetLostRate;
//带宽 Log.e("网速和内存", "获取视频:" + resolution + " 丢包率:" + lossRate);
String googAvailableSendBandwidth = statusReport.googAvailableSendBandwidth;
Log.e("网速和内存", "获取视频:" + resolution + " 丢包率:" + lossRate + " 带宽:" + googAvailableSendBandwidth);
} }
} }
}); });
@@ -799,7 +796,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
mLiveAnchorViewHolder.startAnchorLiveTime(); mLiveAnchorViewHolder.startAnchorLiveTime();
} }
mLiveBottomViewHolder = mLiveAnchorViewHolder; mLiveBottomViewHolder = mLiveAnchorViewHolder;
mSocketRyClient = new SocketRyClient(mLiveUid, this,mContext); mSocketRyClient = new SocketRyClient(mLiveUid, this, mContext);
mSocketRyClient.setLivePushRyViewHolder(mLivePushViewHolder); mSocketRyClient.setLivePushRyViewHolder(mLivePushViewHolder);
CommonAppContext.Ingroup = 1; CommonAppContext.Ingroup = 1;
@@ -861,7 +858,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
* 关闭直播 * 关闭直播
*/ */
public void closeLive() { public void closeLive() {
DialogUitl.showSimpleDialog(mContext,mContext.getString(R.string.live_end_live), new DialogUitl.SimpleCallback() { DialogUitl.showSimpleDialog(mContext, mContext.getString(R.string.live_end_live), new DialogUitl.SimpleCallback() {
@Override @Override
public void onConfirmClick(Dialog dialog, String content) { public void onConfirmClick(Dialog dialog, String content) {
PKing = false; PKing = false;
@@ -990,7 +987,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
@Override @Override
public Dialog createLoadingDialog() { public Dialog createLoadingDialog() {
return DialogUitl.loadingDialog(mContext,mContext.getString(R.string.live_end_ing)); return DialogUitl.loadingDialog(mContext, mContext.getString(R.string.live_end_ing));
} }
}); });
} }
@@ -1122,7 +1119,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
@Override @Override
public void onSuperCloseLive() { public void onSuperCloseLive() {
endLive(); endLive();
DialogUitl.showSimpleTipDialog(mContext,mContext.getString(R.string.live_illegal)); DialogUitl.showSimpleTipDialog(mContext, mContext.getString(R.string.live_illegal));
} }
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)