Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
ea69f4bcb7
@ -514,7 +514,6 @@ public class LiveAnchorActivity extends LiveActivity implements LiveFunctionClic
|
||||
mLiveRyLinkMicPkPresenter.setLiveUid(mLiveUid, "");
|
||||
}
|
||||
|
||||
// }
|
||||
|
||||
//开始推流
|
||||
if (mLivePushViewHolder != null) {
|
||||
|
@ -710,6 +710,9 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
|
||||
if (mLiveRyLinkMicPkPresenter != null) {
|
||||
mLiveRyLinkMicPkPresenter.setSelfStream(mStream);
|
||||
}
|
||||
if (mLiveRyLinkMicPkPresenter != null) {
|
||||
mLiveRyLinkMicPkPresenter.setLiveUid(mLiveUid, "");
|
||||
}
|
||||
|
||||
//开始推流
|
||||
if (mLivePushViewHolder != null) {
|
||||
|
@ -69,6 +69,7 @@ import com.yunbao.live.socket.SocketSendBean;
|
||||
import com.yunbao.live.views.LiveLinkMicPkViewHolder;
|
||||
import com.yunbao.live.views.LivePushRyViewHolder;
|
||||
import com.yunbao.live.views.LiveRoomPlayViewHolder;
|
||||
import com.yunbao.live.views.PortraitLiveManager;
|
||||
|
||||
import org.greenrobot.eventbus.EventBus;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user