[Add]解决冲突
This commit is contained in:
4
.idea/misc.xml
generated
4
.idea/misc.xml
generated
@@ -8,6 +8,10 @@
|
||||
<asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
|
||||
<groovy codeStyle="LEGACY" />
|
||||
</component>
|
||||
<component name="ASMSmaliIdeaPluginConfiguration">
|
||||
<asm skipDebug="true" skipFrames="true" skipCode="false" expandFrames="false" />
|
||||
<groovy codeStyle="LEGACY" />
|
||||
</component>
|
||||
<component name="DesignSurface">
|
||||
<option name="filePathToZoomLevelMap">
|
||||
<map>
|
||||
|
||||
@@ -722,18 +722,6 @@ public class MoGoLiveManager {
|
||||
}
|
||||
}
|
||||
|
||||
public void startLive(TextureView textureView) {
|
||||
Log.i(TAG, "尝试开始播放直播 startLive multiStreamId : " + mLiveStatusModel.getMultiStreamId());
|
||||
if (!TextUtils.isEmpty(mLiveStatusModel.getMultiStreamId()) &&
|
||||
mLiveStatusModel.getMultiStreamId().startsWith(STREAM_ID_PREFIX)) {
|
||||
ZegoCanvas zegoCanvas = new ZegoCanvas(textureView);
|
||||
zegoCanvas.viewMode = ZegoViewMode.SCALE_TO_FILL;
|
||||
mExpressEngine.startPlayingStream(mLiveStatusModel.getMultiStreamId(), zegoCanvas);
|
||||
} else {
|
||||
Log.e(TAG, "直播ID有误,请重试");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 停止播放直播
|
||||
*/
|
||||
|
||||
@@ -34,11 +34,9 @@ dependencies {
|
||||
if (Boolean.valueOf(RELEASE)) {
|
||||
implementation "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}"
|
||||
api "com.mogo.cloud:live:${MOGO_LIVE_VERSION}"
|
||||
api "com.mogo.cloud:utils:${MOGO_UTILS_VERSION}"
|
||||
} else {
|
||||
implementation project(":foudations:mogo-network")
|
||||
api project(":foudations:mogo-live")
|
||||
api project(':foudations:mogo-utils')
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user