[Add]解决冲突

This commit is contained in:
donghongyu
2021-12-17 19:48:02 +08:00
parent 3b89b3f0e2
commit c01d52bacc
3 changed files with 4 additions and 14 deletions

4
.idea/misc.xml generated
View File

@@ -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>

View File

@@ -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有误请重试");
}
}
/**
* 停止播放直播
*/

View File

@@ -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')
}
}