Commit 4fce1a70 by Kim Peace

Fixed retry camera searching condition

parent e9c2cd7e
...@@ -46,6 +46,10 @@ FermiWebSocketBridge.hostRequestDone = function (hostID) { ...@@ -46,6 +46,10 @@ FermiWebSocketBridge.hostRequestDone = function (hostID) {
// GET_COLLABORATION_TYPE_RESPONSE // GET_COLLABORATION_TYPE_RESPONSE
FermiWebSocketBridge.getCollaborationTypeResponse = function (loginID) { FermiWebSocketBridge.getCollaborationTypeResponse = function (loginID) {
if (typeof meetingID == undefined ) {
var meetingID = 0;
}
fw.sendToMsg("others", "GET_COLLABORATION_TYPE_RESPONSE", { fw.sendToMsg("others", "GET_COLLABORATION_TYPE_RESPONSE", {
loginId: loginID, loginId: loginID,
collaborationType: globalUserInfo.collaborationType, collaborationType: globalUserInfo.collaborationType,
......
...@@ -3,6 +3,7 @@ var FermiWebSocketMessageHandler = {}; ...@@ -3,6 +3,7 @@ var FermiWebSocketMessageHandler = {};
FermiWebSocketMessageHandler.bindWebSocketMessage = function () { FermiWebSocketMessageHandler.bindWebSocketMessage = function () {
fw.socket.on("message", async function (data) { fw.socket.on("message", async function (data) {
if (g_isMainMan) { if (g_isMainMan) {
// 自分がホストの場合
FermiWebSocketMessageHandler.handleMessagesToHost(data); FermiWebSocketMessageHandler.handleMessagesToHost(data);
} else if (data.payload.loginId == globalUserInfo.loginId) { } else if (data.payload.loginId == globalUserInfo.loginId) {
// 自分自身の場合 // 自分自身の場合
......
...@@ -33,7 +33,7 @@ CoviewBridge.bindStartEvent = function () { ...@@ -33,7 +33,7 @@ CoviewBridge.bindStartEvent = function () {
}; };
CollaborationFeature.checkAndRetryCamera = async function () { CollaborationFeature.checkAndRetryCamera = async function () {
if (!deviceInfo.isAndroid) { if (!deviceInfo.isAndroid()) {
return; return;
} }
if (globalUserInfo.collaborationType != COLLABORATION_TYPE.VIDEO) { 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