FS-10858 - [verto_communicator] Waiting for resolution check finish before redirectin...

diff --git a/html5/verto/verto_communicator/src/index.html b/html5/verto/verto_communicator/src/index.html
index 16e11f5ceeafdb1b2e1a654ff9e353a6d2241f09..87879b5ae94dfba433e54b477ff9b97ca702b550 100644 (file)
--- a/html5/verto/verto_communicator/src/index.html
+++ b/html5/verto/verto_communicator/src/index.html
@@ -132,6 +132,7 @@
     <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/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/directives/autofocus.js"></script>

diff --git a/html5/verto/verto_communicator/src/locales/locale-en.json b/html5/verto/verto_communicator/src/locales/locale-en.json
index f5f778e6d4135ac705fb0f59bb4e5543abe419fb..8cb3d5ae9a22d54d25370b060c620b0869e28e1c 100644 (file)
--- a/html5/verto/verto_communicator/src/locales/locale-en.json
+++ b/html5/verto/verto_communicator/src/locales/locale-en.json
@@ -156,5 +156,6 @@
   "LANGUAGE": "Language:",
   "BROWSER_LANGUAGE": "Browser Language",
   "FACTORY_RESET_SETTINGS": "Factory Reset Settings",
-  "AUTOGAIN_CONTROL": "Auto Gain Control"
+  "AUTOGAIN_CONTROL": "Auto Gain Control",
+  "WAITING_DEVICES": "Waiting for devices..."
 }

diff --git a/html5/verto/verto_communicator/src/locales/locale-pt.json b/html5/verto/verto_communicator/src/locales/locale-pt.json
index 7d3260b5ed3b4ac1fe8b404323360276fe4a94c5..5a64454151edebefb334b2ddfe973563e064a21d 100644 (file)
--- a/html5/verto/verto_communicator/src/locales/locale-pt.json
+++ b/html5/verto/verto_communicator/src/locales/locale-pt.json
@@ -154,5 +154,6 @@
   "CHAT_DEAF": "Ligar Áudio",
   "CHAT_UNDEAF": "Desligar Áudio",
   "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..."
 }

diff --git a/html5/verto/verto_communicator/src/partials/loading.html b/html5/verto/verto_communicator/src/partials/loading.html
new file mode 100644 (file)
index 0000000..943a6cb
--- /dev/null
+++ b/html5/verto/verto_communicator/src/partials/loading.html
@@ -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>
\ No newline at end of file

diff --git a/html5/verto/verto_communicator/src/vertoApp/vertoApp.module.js b/html5/verto/verto_communicator/src/vertoApp/vertoApp.module.js
index dc3ce4a18101dc5caacf8cc72ad1777f3357262f..3fa2f0edaa58ef88843e20764f9ade42643e2ce4 100644 (file)
--- a/html5/verto/verto_communicator/src/vertoApp/vertoApp.module.js
+++ b/html5/verto/verto_communicator/src/vertoApp/vertoApp.module.js
@@ -94,6 +94,11 @@
           templateUrl: 'partials/incall.html',
           controller: 'InCallController'
         }).
+      when('/loading', {
+        title: 'Loading Verto Communicator',
+        templateUrl: 'partials/loading.html',
+        controller: 'LoadingController'
+      }).
       when('/preview', {
         title: 'Preview Video',
         templateUrl: 'partials/preview.html',

diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/LoadingController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/LoadingController.js
new file mode 100644 (file)
index 0000000..43ceeae
--- /dev/null
+++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/LoadingController.js
@@ -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');
+                });
+            }
+        ]);
+})();

diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
index ba305c363cb1f6b9f2dd3844d484071e710776b2..066b69b33e266dc5859ae271f00354202e6c647a 100644 (file)
--- a/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
+++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
@@ -98,7 +98,7 @@
             }
 
             if (redirect && storage.data.preview) {
-              $location.path('/preview');
+              $location.path('/loading');
             } else if (redirect) {
               $location.path('/dialpad');
             }

diff --git a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
index 5f22eacebb30c936b6b43defbd750bbbc0a0331d..3e083bfe19b2f48aaa52de2d1d9cb1fcc3a07a5f 100644 (file)
--- a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
+++ b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
@@ -448,6 +448,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
             }
 
           });
+          $rootScope.$emit('res_check_done');
 
         } else {
           console.debug('There is no instance of verto.');