Commit be2d9a05 by Kim Peace

Merge branch 'feature/host_change' into debug/console_logs

# Conflicts:
#	public_new/js/views/collaboration/fermi-web-socket-bridge.js
#	public_new/js/views/collaboration/share-event-listener.js
parents 317f3397 4fce1a70
......@@ -67,6 +67,9 @@ FermiWebSocketBridge.getCollaborationTypeResponse = function (loginID) {
", meetingID: " +
meetingID
);
if (typeof meetingID == undefined ) {
var meetingID = 0;
}
fw.sendToMsg("others", "GET_COLLABORATION_TYPE_RESPONSE", {
loginId: loginID,
collaborationType: globalUserInfo.collaborationType,
......
......@@ -11,6 +11,7 @@ FermiWebSocketMessageHandler.bindWebSocketMessage = function () {
(data.payload.loginId == globalUserInfo.loginId)
);
if (g_isMainMan) {
// 自分がホストの場合
FermiWebSocketMessageHandler.handleMessagesToHost(data);
} else if (data.payload.loginId == globalUserInfo.loginId) {
// 自分自身の場合
......
......@@ -55,7 +55,7 @@ CollaborationFeature.checkAndRetryCamera = async function () {
", g_newStream: " +
g_newStream
);
if (!deviceInfo.isAndroid) {
if (!deviceInfo.isAndroid()) {
return;
}
if (globalUserInfo.collaborationType != COLLABORATION_TYPE.VIDEO) {
......
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