yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw 2022-12-12 15:14:15 +08:00
commit ea69f4bcb7
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
live/src/main/java/com/yunbao/live/activity/LiveAnchorActivity.java
View File

@ -514,7 +514,6 @@ public class LiveAnchorActivity extends LiveActivity implements LiveFunctionClic
mLiveRyLinkMicPkPresenter.setLiveUid(mLiveUid, ""); mLiveRyLinkMicPkPresenter.setLiveUid(mLiveUid, "");
} }
// }
//开始推流 //开始推流
if (mLivePushViewHolder != null) { if (mLivePushViewHolder != null) {

3
live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
View File

@ -710,6 +710,9 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
if (mLiveRyLinkMicPkPresenter != null) { if (mLiveRyLinkMicPkPresenter != null) {
mLiveRyLinkMicPkPresenter.setSelfStream(mStream); mLiveRyLinkMicPkPresenter.setSelfStream(mStream);
} }
if (mLiveRyLinkMicPkPresenter != null) {
mLiveRyLinkMicPkPresenter.setLiveUid(mLiveUid, "");
}
//开始推流 //开始推流
if (mLivePushViewHolder != null) { if (mLivePushViewHolder != null) {

1
live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
View File

@ -69,6 +69,7 @@ import com.yunbao.live.socket.SocketSendBean;
import com.yunbao.live.views.LiveLinkMicPkViewHolder; import com.yunbao.live.views.LiveLinkMicPkViewHolder;
import com.yunbao.live.views.LivePushRyViewHolder; import com.yunbao.live.views.LivePushRyViewHolder;
import com.yunbao.live.views.LiveRoomPlayViewHolder; import com.yunbao.live.views.LiveRoomPlayViewHolder;
import com.yunbao.live.views.PortraitLiveManager;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;