Skip to content

F
freeswitch
提交 052b5466 authored 作者: Ítalo Rossi's avatar Ítalo Rossi
浏览文件
操作

Merge pull request #449 in FS/freeswitch from… 

Merge pull request #449 in FS/freeswitch from ~JMESQUITA/freeswitch:bugfix/FS-8018-call-recovery-doesn-t-select-the to master

* commit '6a6d2ae8':
  FS-8018 [verto_communicator] separation of concerns. Get storage service to manage all settings instead of vertoService.
上级 07e1ef63 6a6d2ae8
隐藏空白字符变更
内嵌 并排
正在显示 包含 47 行增加 和 103 行删除
html5/verto/verto_communicator/src/partials/modal_settings.html
浏览文件 @ 052b5466
...@@ -3,24 +3,24 @@ ...@@ -3,24 +3,24 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="form-group" ng-show="verto.data.useVideo"> <div class="form-group" ng-show="mydata.useVideo">
<label for="settings-camera">Camera:</label> <label for="settings-camera">Camera:</label>
<select name="camera" id="settings-camera" class="form-control" <select name="camera" id="settings-camera" class="form-control"
ng-model="verto.data.selectedVideo" ng-options="item.id as item.label for item in verto.data.videoDevices"> ng-model="mydata.selectedVideo" ng-options="item.id as item.label for item in verto.data.videoDevices">
</select> </select>
</div> </div>
<div class="form-group" ng-show="verto.data.useVideo"> <div class="form-group" ng-show="mydata.useVideo">
<label for="settings-share-device">Share device:</label> <label for="settings-share-device">Share device:</label>
<select name="share-device" id="settings-share-device" class="form-control" <select name="share-device" id="settings-share-device" class="form-control"
ng-model="verto.data.selectedShare" ng-options="item.id as item.label for item in verto.data.shareDevices"> ng-model="mydata.selectedShare" ng-options="item.id as item.label for item in verto.data.shareDevices">
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="settings-microphone">Microphone:</label> <label for="settings-microphone">Microphone:</label>
<select name="microphone" id="settings-microphone" class="form-control" <select name="microphone" id="settings-microphone" class="form-control"
ng-model="verto.data.selectedAudio" ng-options="item.id as item.label for item in verto.data.audioDevices"> ng-model="mydata.selectedAudio" ng-options="item.id as item.label for item in verto.data.audioDevices">
</select> </select>
<a class="btn btn-primary" href="" ng-click="refreshDeviceList()">Refresh device list</a> <a class="btn btn-primary" href="" ng-click="refreshDeviceList()">Refresh device list</a>
...@@ -30,37 +30,37 @@ ...@@ -30,37 +30,37 @@
<label for="settings-microphone">General settings:</label> <label for="settings-microphone">General settings:</label>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" name="use_video" value="verto.data.useVideo" ng-model="verto.data.useVideo"> <input type="checkbox" name="use_video" value="mydata.useVideo" ng-model="mydata.useVideo">
Use Video Use Video
</label> </label>
</div> </div>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" name="use_stereo_audio" ng-value="verto.data.useStereo" ng-model="verto.data.useStereo"> <input type="checkbox" name="use_stereo_audio" ng-value="mydata.useStereo" ng-model="mydata.useStereo">
Stereo Audio Stereo Audio
</label> </label>
</div> </div>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" name="use_stun" ng-value="verto.data.useSTUN" ng-model="verto.data.useSTUN"> <input type="checkbox" name="use_stun" ng-value="mydata.useSTUN" ng-model="mydata.useSTUN">
Use STUN Use STUN
</label> </label>
</div> </div>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" name="use_dedenc" ng-value="verto.data.useDedenc" ng-model="verto.data.useDedenc"> <input type="checkbox" name="use_dedenc" ng-value="mydata.useDedenc" ng-model="mydata.useDedenc">
Use Dedicated Remote Encoder Use Dedicated Remote Encoder
</label> </label>
</div> </div>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" name="mirror_input" ng-value="verto.data.mirrorInput" ng-model="verto.data.mirrorInput"> <input type="checkbox" name="mirror_input" ng-value="mydata.mirrorInput" ng-model="mydata.mirrorInput">
Scale Remote Video To Match Camera Resolution Scale Remote Video To Match Camera Resolution
</label> </label>
</div> </div>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" name="ask_recover_call" ng-value="storage.data.askRecoverCall" ng-model="storage.data.askRecoverCall"> <input type="checkbox" name="ask_recover_call" ng-value="mydata.askRecoverCall" ng-model="mydata.askRecoverCall">
Ask before recovering call Ask before recovering call
</label> </label>
</div> </div>
...@@ -70,21 +70,21 @@ ...@@ -70,21 +70,21 @@
<div class="form-group"> <div class="form-group">
<label for="video-quality">Video quality:</label> <label for="video-quality">Video quality:</label>
<select name="video_quality" id="video-quality" class="form-control" <select name="video_quality" id="video-quality" class="form-control"
ng-model="verto.data.vidQual" ng-model="mydata.vidQual"
ng-options="item.id as item.label for item in verto.videoQuality"></select> ng-options="item.id as item.label for item in verto.videoQuality"></select>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="outgoing-bandwidth">Max outgoing bandwidth:</label> <label for="outgoing-bandwidth">Max outgoing bandwidth:</label>
<select name="outgoing_bandwidth" id="outgoing-bandwidth" class="form-control" <select name="outgoing_bandwidth" id="outgoing-bandwidth" class="form-control"
ng-model="verto.data.outgoingBandwidth" ng-model="mydata.outgoingBandwidth"
ng-options="item.id as item.label for item in verto.bandwidth"></select> ng-options="item.id as item.label for item in verto.bandwidth"></select>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="incoming-bandwidth">Max incoming bandwidth:</label> <label for="incoming-bandwidth">Max incoming bandwidth:</label>
<select name="incoming_bandwidth" id="incoming-bandwidth" class="form-control" <select name="incoming_bandwidth" id="incoming-bandwidth" class="form-control"
ng-model="verto.data.incomingBandwidth" ng-model="mydata.incomingBandwidth"
ng-options="item.id as item.label for item in verto.bandwidth"></select> ng-options="item.id as item.label for item in verto.bandwidth"></select>
</div> </div>
......
html5/verto/verto_communicator/src/storageService/services/storage.js
浏览文件 @ 052b5466
...@@ -24,17 +24,13 @@ ...@@ -24,17 +24,13 @@
selectedVideo: null, selectedVideo: null,
selectedAudio: null, selectedAudio: null,
selectedShare: null, selectedShare: null,
useVideo: '', useStereo: true,
useCamera: '', useSTUN: true,
useVideo: '', useDedenc: false,
useCamera: '', mirrorInput: false,
useStereo: '', outgoingBandwidth: 'default',
useSTUN: '', incomingBandwidth: 'default',
useDedenc: '', vidQual: 'qvga',
mirrorInput: '',
outgoingBandwidth: '',
incomingBandwidth: '',
vidQual: '',
askRecoverCall: false, askRecoverCall: false,
googNoiseSuppression: false, googNoiseSuppression: false,
googHighpassFilter: false, googHighpassFilter: false,
...@@ -42,18 +38,7 @@ ...@@ -42,18 +38,7 @@
}); });
function changeData(verto_data) { function changeData(verto_data) {
data.selectedVideo = verto_data.data.selectedVideo; angular.extend(data, verto_data);
data.selectedAudio = verto_data.data.selectedAudio;
data.selectedShare = verto_data.data.selectedShare;
data.useVideo = verto_data.data.useVideo;
data.useCamera = verto_data.data.useCamera;
data.useStereo = verto_data.data.useStereo;
data.useDedenc = verto_data.data.useDedenc;
data.useSTUN = verto_data.data.useSTUN;
data.vidQual = verto_data.data.vidQual;
data.mirrorInput = verto_data.data.mirrorInput;
data.outgoingBandwidth = verto_data.data.outgoingBandwidth;
data.incomingBandwidth = verto_data.data.incomingBandwidth;
} }
return { return {
......
html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
浏览文件 @ 052b5466
...@@ -277,7 +277,6 @@ ...@@ -277,7 +277,6 @@
verto.hangup(); verto.hangup();
}); });
} else { } else {
verto.changeData(storage);
console.log('redirect to incall page'); console.log('redirect to incall page');
$location.path('/incall'); $location.path('/incall');
} }
...@@ -381,9 +380,9 @@ ...@@ -381,9 +380,9 @@
storage.data.onHold = false; storage.data.onHold = false;
verto.data.call.answer({ verto.data.call.answer({
useStereo: verto.data.useStereo, useStereo: storage.data.useStereo,
useCamera: verto.data.useCamera, useCamera: storage.data.selectedVideo,
useMic: verto.data.useMic, useMic: storage.data.useMic,
callee_id_name: verto.data.name, callee_id_name: verto.data.name,
callee_id_number: verto.data.login callee_id_number: verto.data.login
}); });
......
html5/verto/verto_communicator/src/vertoControllers/controllers/ModalSettingsController.js
浏览文件 @ 052b5466
...@@ -4,16 +4,16 @@ ...@@ -4,16 +4,16 @@
angular angular
.module('vertoControllers') .module('vertoControllers')
.controller('ModalSettingsController', ['$scope', '$http', .controller('ModalSettingsController', ['$scope', '$http',
'$location', '$modalInstance', 'verto', 'storage', '$location', '$modalInstance', 'storage', 'verto',
function($scope, $http, $location, $modalInstance, verto, storage) { function($scope, $http, $location, $modalInstance, storage, verto) {
console.debug('Executing ModalSettingsController.'); console.debug('Executing ModalSettingsController.');
verto.changeData(storage);
$scope.verto = verto;
$scope.storage = storage; $scope.storage = storage;
$scope.verto = verto;
$scope.mydata = angular.copy(storage.data);
$scope.ok = function() { $scope.ok = function() {
storage.changeData(verto); storage.changeData($scope.mydata);
$modalInstance.close('Ok.'); $modalInstance.close('Ok.');
}; };
......
html5/verto/verto_communicator/src/vertoService/services/vertoService.js
浏览文件 @ 052b5466
...@@ -117,23 +117,8 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora ...@@ -117,23 +117,8 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
textTo: $cookieStore.get('verto_demo_textto') || "1000", textTo: $cookieStore.get('verto_demo_textto') || "1000",
login: $cookieStore.get('verto_demo_login') || "1008", login: $cookieStore.get('verto_demo_login') || "1008",
password: $cookieStore.get('verto_demo_passwd') || "1234", password: $cookieStore.get('verto_demo_passwd') || "1234",
hostname: $cookieStore.get('verto_demo_hostname') || window.location.hostname, hostname: window.location.hostname,
wsURL: $cookieStore.get('verto_demo_wsurl') || ("wss://" + window.location.hostname + ":8082"), wsURL: ("wss://" + window.location.hostname + ":8082")
useVideo: $cookieStore.get('verto_demo_vid_checked') || true,
useCamera: $cookieStore.get('verto_demo_camera_checked') || true,
useStereo: $cookieStore.get('verto_demo_stereo_checked') || true,
useSTUN: $cookieStore.get('verto_demo_stun_checked') || true,
useDedenc: $cookieStore.get('verto_demo_dedenc_checked') || false,
mirrorInput: $cookieStore.get('verto_demo_mirror_input_checked') || false,
outgoingBandwidth: $cookieStore.get('verto_demo_outgoingBandwidth') || 'default',
incomingBandwidth: $cookieStore.get('verto_demo_incomingBandwidth') || 'default',
vidQual: $cookieStore.get('verto_demo_vqual') || 'qvga',
localVideo: $cookieStore.get('verto_demo_local_video_checked') || false,
bestWidth: '',
bestHeight: '',
selectedVideo: null,
selectedAudio: null,
selectedShare: null
}; };
function cleanShareCall(that) { function cleanShareCall(that) {
...@@ -199,31 +184,6 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora ...@@ -199,31 +184,6 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
}; };
} }
function changeData(verto_data) {
$cookieStore.put('verto_demo_vid_checked', verto_data.data.useVideo);
$cookieStore.put('verto_demo_camera_checked', verto_data.data.useCamera);
$cookieStore.put('verto_demo_stereo_checked', verto_data.data.useStereo);
$cookieStore.put('verto_demo_stun_checked', verto_data.data.useSTUN);
$cookieStore.put('verto_demo_dedenc_checked', verto_data.data.useDedenc);
$cookieStore.put('verto_demo_mirror_input_checked', verto_data.data.mirrorInput);
$cookieStore.put('verto_demo_outgoingBandwidth', verto_data.data.outgoingBandwidth);
$cookieStore.put('verto_demo_incomingBandwidth', verto_data.data.incomingBandwidth);
$cookieStore.put('verto_demo_vqual', verto_data.data.vidQual);
data.selectedVideo = verto_data.data.selectedVideo;
data.selectedAudio = verto_data.data.selectedAudio;
data.selectedShare = verto_data.data.selectedShare;
data.useVideo = verto_data.data.useVideo;
data.useCamera = verto_data.data.useCamera;
data.useStereo = verto_data.data.useStereo;
data.useDedenc = verto_data.data.useDedenc;
data.useSTUN = verto_data.data.useSTUN;
data.vidQual = verto_data.data.vidQual;
data.mirrorInput = verto_data.data.mirrorInput;
data.outgoingBandwidth = verto_data.data.outgoingBandwidth;
data.incomingBandwidth = verto_data.data.incomingBandwidth;
}
var callState = { var callState = {
muteMic: false, muteMic: false,
muteVideo: false muteVideo: false
...@@ -232,7 +192,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora ...@@ -232,7 +192,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
return { return {
data: data, data: data,
callState: callState, callState: callState,
changeData: changeData, // changeData: changeData,
// Options to compose the interface. // Options to compose the interface.
videoQuality: videoQuality, videoQuality: videoQuality,
...@@ -370,7 +330,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora ...@@ -370,7 +330,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
var conf = new $.verto.conf(v, { var conf = new $.verto.conf(v, {
dialog: dialog, dialog: dialog,
hasVid: data.useVideo, hasVid: storage.data.useVideo,
laData: pvtData, laData: pvtData,
onBroadcast: function(v, conf, message) { onBroadcast: function(v, conf, message) {
console.log('>>> conf.onBroadcast:', arguments); console.log('>>> conf.onBroadcast:', arguments);
...@@ -636,14 +596,14 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora ...@@ -636,14 +596,14 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
destination_number: destination, destination_number: destination,
caller_id_name: data.name, caller_id_name: data.name,
caller_id_number: data.login, caller_id_number: data.login,
outgoingBandwidth: data.outgoingBandwidth, outgoingBandwidth: storage.data.outgoingBandwidth,
incomingBandwidth: data.incomingBandwidth, incomingBandwidth: storage.data.incomingBandwidth,
useVideo: data.useVideo, useVideo: storage.data.useVideo,
useStereo: data.useStereo, useStereo: storage.data.useStereo,
useCamera: data.selectedVideo, useCamera: storage.data.selectedVideo,
useMic: data.selectedAudio, useMic: storage.data.selectedAudio,
dedEnc: data.useDedenc, dedEnc: storage.data.useDedenc,
mirrorInput: data.mirrorInput, mirrorInput: storage.data.mirrorInput,
userVariables: { userVariables: {
email : storage.data.email, email : storage.data.email,
avatar: "http://gravatar.com/avatar/" + md5(storage.data.email) + ".png?s=600" avatar: "http://gravatar.com/avatar/" + md5(storage.data.email) + ".png?s=600"
...@@ -674,13 +634,13 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora ...@@ -674,13 +634,13 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
destination_number: destination + '-screen', destination_number: destination + '-screen',
caller_id_name: data.name + ' (Screen)', caller_id_name: data.name + ' (Screen)',
caller_id_number: data.login + ' (Screen)', caller_id_number: data.login + ' (Screen)',
outgoingBandwidth: data.outgoingBandwidth, outgoingBandwidth: storage.data.outgoingBandwidth,
incomingBandwidth: data.incomingBandwidth, incomingBandwidth: storage.data.incomingBandwidth,
videoParams: screen_constraints.video.mandatory, videoParams: screen_constraints.video.mandatory,
useVideo: data.useVideo, useVideo: storage.data.useVideo,
screenShare: true, screenShare: true,
dedEnc: data.useDedenc, dedEnc: storage.data.useDedenc,
mirrorInput: data.mirrorInput, mirrorInput: storage.data.mirrorInput,
userVariables: { userVariables: {
email : storage.data.email, email : storage.data.email,
avatar: "http://gravatar.com/avatar/" + md5(storage.data.email) + ".png?s=600" avatar: "http://gravatar.com/avatar/" + md5(storage.data.email) + ".png?s=600"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论