FS-10858 - [verto_communicator] Waiting for resolution check finish before redirecting to preview screen.
This commit is contained in:
parent
91cc3c56e0
commit
e9e5298151
|
@ -132,6 +132,7 @@
|
||||||
<script type="text/javascript" src="src/vertoControllers/controllers/ModalLoginInformationController.js"></script>
|
<script type="text/javascript" src="src/vertoControllers/controllers/ModalLoginInformationController.js"></script>
|
||||||
<script type="text/javascript" src="src/vertoControllers/controllers/SettingsController.js"></script>
|
<script type="text/javascript" src="src/vertoControllers/controllers/SettingsController.js"></script>
|
||||||
<script type="text/javascript" src="src/vertoControllers/controllers/PreviewController.js"></script>
|
<script type="text/javascript" src="src/vertoControllers/controllers/PreviewController.js"></script>
|
||||||
|
<script type="text/javascript" src="src/vertoControllers/controllers/LoadingController.js"></script>
|
||||||
|
|
||||||
<script type="text/javascript" src="src/vertoDirectives/vertoDirectives.module.js"></script>
|
<script type="text/javascript" src="src/vertoDirectives/vertoDirectives.module.js"></script>
|
||||||
<script type="text/javascript" src="src/vertoDirectives/directives/autofocus.js"></script>
|
<script type="text/javascript" src="src/vertoDirectives/directives/autofocus.js"></script>
|
||||||
|
|
|
@ -156,5 +156,6 @@
|
||||||
"LANGUAGE": "Language:",
|
"LANGUAGE": "Language:",
|
||||||
"BROWSER_LANGUAGE": "Browser Language",
|
"BROWSER_LANGUAGE": "Browser Language",
|
||||||
"FACTORY_RESET_SETTINGS": "Factory Reset Settings",
|
"FACTORY_RESET_SETTINGS": "Factory Reset Settings",
|
||||||
"AUTOGAIN_CONTROL": "Auto Gain Control"
|
"AUTOGAIN_CONTROL": "Auto Gain Control",
|
||||||
|
"WAITING_DEVICES": "Waiting for devices..."
|
||||||
}
|
}
|
||||||
|
|
|
@ -154,5 +154,6 @@
|
||||||
"CHAT_DEAF": "Ligar Áudio",
|
"CHAT_DEAF": "Ligar Áudio",
|
||||||
"CHAT_UNDEAF": "Desligar Áudio",
|
"CHAT_UNDEAF": "Desligar Áudio",
|
||||||
"FACTORY_RESET_SETTINGS": "Redefinir configurações",
|
"FACTORY_RESET_SETTINGS": "Redefinir configurações",
|
||||||
"AUTOGAIN_CONTROL": "Controle de Ganho Automático (AGC)"
|
"AUTOGAIN_CONTROL": "Controle de Ganho Automático (AGC)",
|
||||||
|
"WAITING_DEVICES": "Aguardando dispositivos..."
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
<div class="centered-block-frame" id="loading">
|
||||||
|
<div class="col-md-6 centered-block">
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-body text-center">
|
||||||
|
<h2>{{ 'LOADING' | translate}}</h2>
|
||||||
|
<div>{{ 'WAITING_DEVICES' | translate }}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
|
@ -94,6 +94,11 @@
|
||||||
templateUrl: 'partials/incall.html',
|
templateUrl: 'partials/incall.html',
|
||||||
controller: 'InCallController'
|
controller: 'InCallController'
|
||||||
}).
|
}).
|
||||||
|
when('/loading', {
|
||||||
|
title: 'Loading Verto Communicator',
|
||||||
|
templateUrl: 'partials/loading.html',
|
||||||
|
controller: 'LoadingController'
|
||||||
|
}).
|
||||||
when('/preview', {
|
when('/preview', {
|
||||||
title: 'Preview Video',
|
title: 'Preview Video',
|
||||||
templateUrl: 'partials/preview.html',
|
templateUrl: 'partials/preview.html',
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
(function() {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
angular
|
||||||
|
.module('vertoControllers')
|
||||||
|
.controller('LoadingController', ['$rootScope', '$scope', '$location',
|
||||||
|
function($rootScope, $scope, $location) {
|
||||||
|
console.log('Loading controller');
|
||||||
|
$rootScope.$on('res_check_done', function() {
|
||||||
|
$location.path('/preview');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
]);
|
||||||
|
})();
|
|
@ -98,7 +98,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if (redirect && storage.data.preview) {
|
if (redirect && storage.data.preview) {
|
||||||
$location.path('/preview');
|
$location.path('/loading');
|
||||||
} else if (redirect) {
|
} else if (redirect) {
|
||||||
$location.path('/dialpad');
|
$location.path('/dialpad');
|
||||||
}
|
}
|
||||||
|
|
|
@ -448,6 +448,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$rootScope.$emit('res_check_done');
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
console.debug('There is no instance of verto.');
|
console.debug('There is no instance of verto.');
|
||||||
|
|
Loading…
Reference in New Issue