提交 05ff8ec7 authored 作者: Jaon EarlWolf's avatar Jaon EarlWolf

FS-7800 [verto_communicator] - Added Canvas controls and now opening popup with…

FS-7800 [verto_communicator] - Added Canvas controls and now opening popup with original (master)  dimensions
上级 d4d4165b
...@@ -99,6 +99,24 @@ ...@@ -99,6 +99,24 @@
Transfer Transfer
</a> </a>
</li> </li>
<li>
<a href="" ng-click="confCanvasIn(member.id)">
<span class="mdi-fw mdi-image-switch-video"></span>
Canvas In
</a>
</li>
<li>
<a href="" ng-click="confCanvasOut(member.id)">
<span class="mdi-fw mdi-action-swap-horiz"></span>
Canvas Out
</a>
</li>
<li>
<a href="" ng-click="confLayer(member.id)">
<span class="mdi-fw mdi-action-view-carousel"></span>
Layer
</a>
</li>
</ul> </ul>
</div> </div>
</div> </div>
......
...@@ -196,6 +196,41 @@ ...@@ -196,6 +196,41 @@
}); });
}; };
$scope.confCanvasIn = function(memberID, canvasID) {
if (canvasID) {
verto.setCanvasIn(memberID, canvasID);
return;
}
shortPrompt('Please insert the Canvas Id', function(canvasID) {
console.log(memberID, canvasID);
verto.setCanvasIn(memberID, canvasID);
});
};
$scope.confCanvasOut = function(memberID, canvasID) {
if (canvasID) {
verto.setCanvasOut(memberID, canvasID);
return;
}
shortPrompt('Please insert the Canvas Id', function(canvasID) {
verto.setCanvasOut(memberID, canvasID);
});
};
$scope.confLayer = function(memberID, canvasID) {
if (canvasID) {
verto.setLayer(memberID, canvasID);
return;
}
shortPrompt('Please insert the Layer', function(canvasID) {
verto.setLayer(memberID, canvasID);
});
};
$scope.confResetBanner = function(memberID) { $scope.confResetBanner = function(memberID) {
console.log('$scope.confResetBanner'); console.log('$scope.confResetBanner');
var text = 'reset'; var text = 'reset';
...@@ -226,6 +261,19 @@ ...@@ -226,6 +261,19 @@
} }
}); });
}; };
function shortPrompt(text, cb) {
prompt({
title: text,
input: true,
label: '',
value: '',
}).then(function(val) {
if (val && cb) {
cb(val);
}
});
}
} }
]); ]);
......
...@@ -81,12 +81,14 @@ ...@@ -81,12 +81,14 @@
}; };
$scope.confPopup = function(canvas_id) { $scope.confPopup = function(canvas_id) {
var video = document.getElementById('webcam');
var s = window.location.href; var s = window.location.href;
var curCall = verto.data.call.callID; var curCall = verto.data.call.callID;
var extension = verto.data.call.params.remote_caller_id_number; var extension = verto.data.call.params.remote_caller_id_number;
var width = 465, height = 360; var width = webcam.offsetWidth;
var x = screen.width/2 - width/2 var height = webcam.offsetHeight + 100;
var y = screen.height/2 - height/2 var x = (screen.width - width)/2
var y = (screen.height - height)/2
s = s.replace(/\#.*/, ''); s = s.replace(/\#.*/, '');
s += "#/?sessid=random&master=" + curCall + "&watcher=true&extension=" + extension+ "&canvas_id=" + canvas_id; s += "#/?sessid=random&master=" + curCall + "&watcher=true&extension=" + extension+ "&canvas_id=" + canvas_id;
......
...@@ -919,6 +919,15 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora ...@@ -919,6 +919,15 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
sendConferenceChat: function(message) { sendConferenceChat: function(message) {
data.conf.sendChat(message, "message"); data.conf.sendChat(message, "message");
}, },
setCanvasIn: function(memberID, canvasID) {
data.conf.modCommand('vid-canvas', memberID, canvasID);
},
setCanvasOut: function(memberID, canvasID) {
data.conf.modCommand('vid-watching-canvas', memberID, canvasID);
},
setLayer: function(memberID, canvasID) {
data.conf.modCommand('vid-layer', memberID, canvasID);
},
/* /*
* Method is used to send user2user chats. * Method is used to send user2user chats.
* VC does not yet support that. * VC does not yet support that.
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论