diff options
| -rw-r--r-- | www/js/MontageCtrl.js | 18 | ||||
| -rw-r--r-- | www/templates/montage.html | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 16bf149a..729c2036 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -604,7 +604,7 @@ angular.module('zmApp.controllers') function loadNotifications() { if (simulStreaming) { - console.log ("Skipping timer as simulStreaming"); + // console.log ("Skipping timer as simulStreaming"); return; } @@ -706,6 +706,10 @@ angular.module('zmApp.controllers') }, 20); } + $scope.isCycleOn = function() { + return NVRDataModel.getLogin().cycleMontageProfiles; + } + $scope.getCycleStatus = function () { var c = NVRDataModel.getLogin().cycleMontageProfiles; var str = (c) ? $translate.instant('kOn') : $translate.instant('kOff'); @@ -1460,12 +1464,12 @@ angular.module('zmApp.controllers') //console.log ("NEW POS="+ld.packeryPositions); NVRDataModel.setLogin(ld); - currentStreamState = streamState.STOPPED; + $timeout(function () { // after render if (simulStreaming) { - + currentStreamState = streamState.STOPPED; NVRDataModel.debug("Killing all streams in montage to save memory/nw..."); if ($rootScope.platformOS == 'ios') { @@ -1493,6 +1497,14 @@ angular.module('zmApp.controllers') } + else { + NVRDataModel.regenConnKeys(); + $scope.monitors = NVRDataModel.getMonitorsNow(); + $scope.MontageMonitors = angular.copy($scope.monitors); + $timeout(function () { + initPackery(); + }, zm.packeryTimer); + } diff --git a/www/templates/montage.html b/www/templates/montage.html index 44a67662..cc265e84 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -47,7 +47,7 @@ <a href="" ng-click="squeezeMonitors()"> <i class="ion-android-apps"></i></a> </li> - <li ng-if="!isDragabillyOn"> + <li ng-style="{'background-color': isCycleOn()?'rgba(69, 170, 242,0.7)':'rgba(108, 122, 137, 0.7)'}" ng-if="!isDragabillyOn"> <a href="" ng-click="toggleCycle()"> <i class="ion-android-bicycle"></i>:{{getCycleStatus()}}</a> </li> |