提交 0a2eafa3 authored 作者: Joao Mesquita's avatar Joao Mesquita

FS-7840 [verto_communicator] Use chatChannel to send and receive messages from conferences.

上级 288c6257
......@@ -132,9 +132,11 @@
* Public methods.
*/
$scope.send = function() {
verto.sendMessage($scope.message, function() {
$scope.message = CLEAN_MESSAGE;
});
// Only conferencing chat is supported for now
// but still calling method with the conference prefix
// so we know that explicitly.
verto.sendConferenceChat($scope.message);
$scope.message = CLEAN_MESSAGE;
};
// Participants moderation.
......
......@@ -335,6 +335,14 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
dialog: dialog,
hasVid: storage.data.useVideo,
laData: pvtData,
chatCallback: function(v, e) {
var from = e.data.fromDisplay || e.data.from || "Unknown";
var message = e.data.message || "";
$rootScope.$emit('chat.newMessage', {
from: from,
body: message
});
},
onBroadcast: function(v, conf, message) {
console.log('>>> conf.onBroadcast:', arguments);
if (message.action == 'response') {
......@@ -441,6 +449,10 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
}
}
break;
/**
* This is not being used for conferencing chat
* anymore (see conf.chatCallback for that).
*/
case $.verto.enum.message.info:
var body = params.body;
var from = params.from_msg_name || params.from;
......@@ -750,7 +762,16 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
callback(data.instance, true);
}
},
/*
* Method is used to send conference chats ONLY.
*/
sendConferenceChat: function(message) {
data.conf.sendChat(message, "message");
},
/*
* Method is used to send user2user chats.
* VC does not yet support that.
*/
sendMessage: function(body, callback) {
data.call.message({
to: data.chattingWith,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论