yangyakun921/MoGoAiCloudSdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_loginMultiRoom_bug'

Browse Source 
# Conflicts:
#	app/src/main/java/com/mogo/cloud/LivePlayActivity.java
#	app/src/main/java/com/mogo/cloud/MoGoApplication.java
#	app/src/main/res/layout/activity_live_play.xml
#	foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java
#	gradle.properties
This commit is contained in:
donghongyu
2021-11-30 16:51:48 +08:00
parent d033ade272 e5293b24b7
commit 3b89b3f0e2
13 changed files with 330 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-trafficlive/build.gradle
View File

@@ -34,9 +34,11 @@ 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')
}
}

2
modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java
View File

@@ -192,7 +192,7 @@ public class TrafficLiveCurrentManager
}
}
});
MoGoLiveManager.getInstance().stopLive();
MoGoLiveManager.getInstance().stopLive(liveSn);
trafficLiveCallBack = null;
}