Commit c00c7cfd by Kim Peace

Merge branch 'feature/host_change' into debug/console_logs

# Conflicts:
#	public_new/js/views/collaboration/share-event-listener.js
parents 29e642c5 e9c2cd7e
...@@ -45,11 +45,19 @@ CoviewBridge.bindStartEvent = function () { ...@@ -45,11 +45,19 @@ CoviewBridge.bindStartEvent = function () {
}; };
CollaborationFeature.checkAndRetryCamera = async function () { CollaborationFeature.checkAndRetryCamera = async function () {
if (!deviceInfo.isAndroid) { return; } if (!deviceInfo.isAndroid) {
if (globalUserInfo.collaborationType != COLLABORATION_TYPE.VIDEO) { return; } return;
if (g_newStream != null) { return; } }
if (globalUserInfo.collaborationType != COLLABORATION_TYPE.VIDEO) {
return;
}
if (g_newStream != null) {
return;
}
try { try {
const cameraStream = await navigator.mediaDevices.getUserMedia(options.constraints); const cameraStream = await navigator.mediaDevices.getUserMedia(
options.constraints
);
if (cameraStream != null && options.isMainMan) { if (cameraStream != null && options.isMainMan) {
ORGcreateLocalVideo(options.constraints); ORGcreateLocalVideo(options.constraints);
} else { } else {
...@@ -167,7 +175,7 @@ CoviewBridge.bindMessageEvent = function () { ...@@ -167,7 +175,7 @@ CoviewBridge.bindMessageEvent = function () {
case "CreateRoomResponse": case "CreateRoomResponse":
if (json.resultCode == 200) { if (json.resultCode == 200) {
CollaborationFeature.didReceiveCreateRoomResponseMessage(); CollaborationFeature.didReceiveCreateRoomResponseMessage();
CollaborationFeature.checkAndRetryCamera(); CollaborationFeature.checkAndRetryCamera();
} }
break; break;
case "joinRoomInfoResponse": case "joinRoomInfoResponse":
...@@ -382,7 +390,7 @@ CollaborationUI.showHostMark = function (hostName) { ...@@ -382,7 +390,7 @@ CollaborationUI.showHostMark = function (hostName) {
attendingUsers.forEach(function (userName) { attendingUsers.forEach(function (userName) {
const user = "#collaboration_user_" + getReplacedLoginId(userName); const user = "#collaboration_user_" + getReplacedLoginId(userName);
$(user).removeClass("host"); $(user).removeClass("host");
}) });
// set host name as current user if host name is not set // set host name as current user if host name is not set
if (hostName == "") { if (hostName == "") {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment