diff options
| -rwxr-xr-x | www/js/DataModel.js | 2 | ||||
| -rw-r--r-- | www/js/MontageHistoryCtrl.js | 41 | ||||
| -rw-r--r-- | www/templates/montage-history.html | 6 |
3 files changed, 14 insertions, 35 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 55485aba..393cfd89 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -1573,7 +1573,7 @@ angular.module('zmApp.controllers') regenConnKeys: function () { - ddebug ("Regenerating connkeys..."); + debug ("Regenerating connkeys..."); for (var i=0; i < monitors.length; i++){ monitors[i].Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); } diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index be160413..111073f0 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -226,6 +226,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc $scope.isDragabillyOn = false; $ionicSideMenuDelegate.canDragContent(false); NVRDataModel.stopNetwork("MontageHistory-footerCollapse"); + + NVRDataModel.regenConnKeys(); var ld = NVRDataModel.getLogin(); $scope.sliderVal.realRate = $scope.sliderVal.rate * 100; @@ -898,41 +900,20 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc });*/ $scope.$on('$ionicView.beforeEnter', function() { - $scope.isMultiPort = NVRDataModel.getCurrentServerMultiPortSupported(); + $scope.isSimulStreaming = ($rootScope.platformOS == 'ios') ? true: NVRDataModel.getCurrentServerMultiPortSupported(); + + NVRDataModel.regenConnKeys(); // NVRDataModel.log ("Before Enter History: initing connkeys"); }); $scope.$on('$ionicView.beforeLeave', function() { //console.log("**VIEW ** Event History Ctrl Left, force removing modal"); if ($scope.modal) $scope.modal.remove(); - NVRDataModel.log("BeforeLeave: Nullifying the streams..."); - for (i = 0; i < $scope.MontageMonitors.length; i++) - { - var element = document.getElementById("img-" + i); - /*if (element) - { - NVRDataModel.debug("BeforeLeave: Nullifying " + element.src); - element.src=""; - //element.removeAttribute('src'); - - //$scope.$apply(nullify(element)); - //element.src=""; - }*/ - } NVRDataModel.log("Cancelling event query timer"); $interval.cancel($rootScope.eventQueryInterval); NVRDataModel.log("MontageHistory:Stopping network pull..."); // make sure this is applied in scope digest to stop network pull // thats why we are doing it beforeLeave - for (i = 0; i < $scope.MontageMonitors.length; i++) - { - if ($scope.MontageMonitors[i].Monitor.connKey != '' && $scope.MontageMonitors[i].Monitor.eventUrl != 'img/noevent.png' && $scope.MontageMonitors[i].Monitor.Function != 'None' && $scope.MontageMonitors[i].Monitor.lisDisplay != 'noshow' && $scope.MontageMonitors[i].Monitor.Enabled != '0') - { - NVRDataModel.log("Before leave: Calling kill with " + $scope.MontageMonitors[i].Monitor.connKey); - var tmpCK = angular.copy($scope.MontageMonitors[i].Monitor.connKey); - timedControlEventStream(2500, 17, "", tmpCK, -1); - } - } pckry.destroy(); window.removeEventListener("resize", orientationChanged, false); NVRDataModel.log("Forcing a window.stop() here"); @@ -1447,19 +1428,17 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc $scope.LoginData = NVRDataModel.getLogin(); $scope.monLimit = $scope.LoginData.maxMontage; $scope.currentLimit = $scope.LoginData.maxMontage; - if ($rootScope.platformOS != 'ios') + if (!$scope.isSimulStreaming) { - if (!NVRDataModel.getCurrentServerMultiPortSupported() && $rootScope.platformOS != 'ios') { + NVRDataModel.log("Limiting montage to 5, thanks to Chrome's stupid connection limit"); $scope.currentLimit = 5; $scope.monLimit = 5; - } - else { + } + else { NVRDataModel.debug ("Since Multiport is supported, or you are on iOS, taking off Chrome limit!"); - } - - } + $rootScope.authSession = "undefined"; $ionicLoading.show( { diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html index 0aaaffbf..21b57554 100644 --- a/www/templates/montage-history.html +++ b/www/templates/montage-history.html @@ -12,7 +12,7 @@ </ion-nav-buttons> <ion-content scroll-sista has-bouncing="false" style="background-color:#444444" delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll> <div class="timeline_text"> {{'kFrom' | translate}}:{{prettifyDateTimeFirst(datetimeValueFrom.value)}} ({{humanizeTime(datetimeValueFrom.value)}}) - <div ng-if="$root.platformOS != 'ios' && !isMultiPort">({{'kChromeMax' | translate}})</div> + <div ng-if="!isSimulStreaming">({{'kChromeMax' | translate}})</div> </div> <div class="grid" id="mygrid"> <div class="grid-sizer grid-item-10"></div> @@ -24,7 +24,7 @@ or we lose the handle for cleanup forever!--> <div class="grid-item grid-item-{{monitor.Monitor.gridScale}} " data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}}" > <figure height="{{Monitor.monitor.height}}" width="{{Monitor.monitor.width}}" class="{{dragBorder}}" ng-show=" monitor.Monitor.listDisplay!='noshow'"> - <img class="{{monitor.Monitor.selectStyle}}" image-spinner-src="{{monitor.Monitor.eventUrl}}" image-spinner-loader="lines" on-tap="!isDragabillyOn?noop():toggleSelectItem($index)" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}"/> + <img class="{{monitor.Monitor.selectStyle}}" image-spinner-src="{{monitor.Monitor.eventUrl}}&connkey={{monitor.Monitor.connKey}}" image-spinner-loader="lines" on-tap="!isDragabillyOn?noop():toggleSelectItem($index)" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}"/> <figcaption class="normal-figcaption" > @@ -41,7 +41,7 @@ <div ng-if = "monitor.Monitor.eventUrl != 'img/noevent.png' && monitor.Monitor.connKey !=''"> <div class="grid-item grid-item-{{monitor.Monitor.gridScale}} " data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}}" > <figure height="{{Monitor.monitor.height}}" width="{{Monitor.monitor.width}}" class="{{dragBorder}}" ng-show=" monitor.Monitor.listDisplay!='noshow'"> - <img class="{{monitor.Monitor.selectStyle}}" image-spinner-src="{{monitor.Monitor.eventUrl}}{{$root.authSession}}" image-spinner-loader="lines" on-tap="!isDragabillyOn?togglePause(monitor.Monitor.Id):toggleSelectItem($index)" on-swipe-left="toggleControls()" on-swipe-right="toggleControls()" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}"/> + <img class="{{monitor.Monitor.selectStyle}}" image-spinner-src="{{monitor.Monitor.eventUrl}}&connkey={{monitor.Monitor.connKey}}{{$root.authSession}}" image-spinner-loader="lines" on-tap="!isDragabillyOn?togglePause(monitor.Monitor.Id):toggleSelectItem($index)" on-swipe-left="toggleControls()" on-swipe-right="toggleControls()" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}"/> <figcaption class="normal-figcaption" > |