diff --git a/common/build.gradle b/common/build.gradle index 48efd0c77..ebeb7bafd 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -154,10 +154,10 @@ dependencies { //腾讯im api 'com.tencent.imsdk:imsdk-plus:5.4.666' api 'com.google.code.gson:gson:2.8.8' - api 'cn.rongcloud.sdk:rtc_lib:5.2.5.3' // 音视频通话基础能力库 + api 'cn.rongcloud.sdk:rtc_lib:5.2.0' // 音视频通话基础能力库 //此处以集成 5.1.2 版本为例 - api 'cn.rongcloud.sdk:im_lib:5.2.5.1' // 即时通讯基础能力库 - api 'cn.rongcloud.sdk:im_kit:5.2.5.1' // 即时通讯 UI 基础组件 + api 'cn.rongcloud.sdk:im_lib:5.1.3.10' // 即时通讯基础能力库 + api 'cn.rongcloud.sdk:im_kit:5.1.3.10' // 即时通讯 UI 基础组件 //此处以集成 5.1.2 版本为例 api 'cn.rongcloud.sdk:im_lib:5.2.5' // 即时通讯基础能力库 api 'cn.rongcloud.sdk:im_kit:5.2.5' // 即时通讯 UI 基础组件 diff --git a/config.gradle b/config.gradle index 0e368884a..0fbdf38fb 100644 --- a/config.gradle +++ b/config.gradle @@ -4,7 +4,7 @@ ext { buildToolsVersion: "28.0.3", minSdkVersion : 21, targetSdkVersion : 31, - versionCode : 215, + versionCode : 217, versionName : "6.4.2" ] manifestPlaceholders = [ diff --git a/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java index e3e2bcd89..989f5ded5 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java @@ -378,10 +378,10 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder { // mVideoView.start(); } mPaused = false; - if (mPlayer.isPlaying() == 1) { - mPlayer.resumeVideo(); - mPlayer.resumeAudio(); - } +// if (mPlayer.isPlaying() == 1) { +// mPlayer.resumeVideo(); +// mPlayer.resumeAudio(); +// } } @Override @@ -390,8 +390,8 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder { // mVideoView.runInBackground(false); // } // mPaused = true; - mPlayer.pauseVideo(); - mPlayer.pauseAudio(); +// mPlayer.pauseVideo(); +// mPlayer.pauseAudio(); } @Override 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 38faa5e59..38e573e71 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -365,14 +365,14 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe @Override public void onResume() { - if (mLivePlayViewHolder != null) - mLivePlayViewHolder.onResume(); +// if (mLivePlayViewHolder != null) +// mLivePlayViewHolder.onResume(); } @Override public void onPause() { - if (mLivePlayViewHolder != null) - mLivePlayViewHolder.onPause(); +// if (mLivePlayViewHolder != null) +// mLivePlayViewHolder.onPause(); } @Override