summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/js/EventModalCtrl.js5
-rw-r--r--www/js/MomentCtrl.js2
-rw-r--r--www/js/MonitorModalCtrl.js8
-rw-r--r--www/js/MontageCtrl.js14
-rw-r--r--www/js/NVR.js2
-rw-r--r--www/templates/events-modal.html8
-rw-r--r--www/templates/monitors-modal.html10
7 files changed, 40 insertions, 9 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index e15b2dc9..92eae748 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1075,9 +1075,14 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
});
+ $scope.showHideControls = function () {
+ $scope.displayControls = !$scope.displayControls;
+ NVR.debug ('control display is:'+$scope.displayControls);
+ };
$scope.$on('modal.shown', function (e, m) {
+ $scope.displayControls = true;
$ionicLoading.hide();
if (m.id != 'footage')
return;
diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js
index 186df5cd..c53974a3 100644
--- a/www/js/MomentCtrl.js
+++ b/www/js/MomentCtrl.js
@@ -8,7 +8,7 @@
angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$rootScope', '$ionicModal', 'NVR', '$ionicSideMenuDelegate', '$ionicHistory', '$state', '$translate', '$templateRequest', '$sce', '$compile', '$http', '$ionicLoading', 'zm', '$timeout', '$q', '$ionicPopover', '$ionicPopup', 'message', '$ionicScrollDelegate', function ($scope, $rootScope, $ionicModal, NVR, $ionicSideMenuDelegate, $ionicHistory, $state, $translate, $templateRequest, $sce, $compile, $http, $ionicLoading, zm, $timeout, $q, $ionicPopover, $ionicPopup, message, $ionicScrollDelegate) {
- var masonry = null;
+var masonry = null;
var timeFrom;
var timeTo;
var moments = [];
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js
index 1f0ce944..903c2e2a 100644
--- a/www/js/MonitorModalCtrl.js
+++ b/www/js/MonitorModalCtrl.js
@@ -5,6 +5,7 @@
angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$rootScope', 'zm', 'NVR', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$q', '$sce', 'carouselUtils', '$ionicPopup', 'SecuredPopups', '$translate', '$cordovaFile', function ($scope, $rootScope, zm, NVR, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, $q, $sce, carouselUtils, $ionicPopup, SecuredPopups, $translate, $cordovaFile) {
+ $scope.displayControls = true;
$scope.animationInProgress = false;
$scope.imageFit = true;
$scope.isModalActive = true;
@@ -1782,9 +1783,14 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
}
- $scope.$on('modal.shown', function () {
+ $scope.showHideControls = function () {
+ $scope.displayControls = !$scope.displayControls;
+ NVR.debug ('control display is:'+$scope.displayControls);
+ };
+ $scope.$on('modal.shown', function () {
+ $scope.displayControls = true;
if (0 && $rootScope.platformOS == 'ios') {
NVR.debug("Webkit hack, hammering window.stop();");
NVR.stopNetwork();
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 6292bae9..edca6dbb 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -1065,6 +1065,20 @@ angular.module('zmApp.controllers')
NVR.debug("MontageCtrl: switch minimal is " + $scope.minimal);
// console.log("Hide Statusbar");
ionic.Platform.fullScreen($scope.minimal, !$scope.minimal);
+
+ // hiding status bar messes up X
+ /*if ($scope.minimal) {
+ if ($rootScope.platformOS !='desktop') {
+ NVR.debug ('hiding device status bar');
+ return StatusBar.hide();
+ }
+ } else {
+ if ($rootScope.platformOS !='desktop') {
+ NVR.debug ('showing device status bar');
+ return StatusBar.show();
+ }
+ }*/
+
//console.log ("minimal switch:Cancelling timer");
$interval.cancel(intervalHandleMontage); //we will renew on reload
$interval.cancel(intervalHandleMontageCycle);
diff --git a/www/js/NVR.js b/www/js/NVR.js
index b8b3f57b..71d58df1 100644
--- a/www/js/NVR.js
+++ b/www/js/NVR.js
@@ -21,7 +21,7 @@ angular.module('zmApp.controllers')
DO NOT TOUCH zmAppVersion
It is changed by sync_version.sh
*/
- var zmAppVersion = "1.3.078";
+ var zmAppVersion = "1.3.079";
var isBackground = false;
var justResumed = false;
var timeSinceResumed = -1;
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index 466cd18e..be971b52 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -35,6 +35,7 @@
<img ng-if="!liveFeedMid" id="testaut_events_playwindow" image-spinner-src="{{constructStream()}}" ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}"
+ on-tap="showHideControls();"
on-double-tap="closeModal();" img-spinner-w="1024" img-spinner-h="768" image-spinner-loader="lines"
imageonload="modalImageLoaded()" on-swipe-left="onSwipeEvent(nextId,1)" on-swipe-right="onSwipeEvent(prevId,-1)" />
@@ -42,7 +43,9 @@
<div ng-if="liveFeedMid">
<img id="testaut_events_playwindow" image-spinner-src="{{currentEvent.Event.streamingURL}}/nph-zms?mode=jpeg&monitor={{liveFeedMid}}&connkey={{connKey}}{{$root.authSession}}"
- ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}" on-double-tap="closeModal();"
+ ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}"
+ on-tap="showHideControls();"
+ on-double-tap="closeModal();"
img-spinner-w="1024" img-spinner-h="768" image-spinner-loader="lines" imageonload="modalImageLoaded()"
on-swipe-left="onSwipeEvent(nextId,1)" on-swipe-right="onSwipeEvent(prevId,-1)" />
<div class="events-range-modal-text">
@@ -73,6 +76,7 @@
vg-update-state="onPlayerState($state)"
vg-update-playback="onPlaybackUpdate($playBack)"
vg-plays-inline="videoObject.config.playsInline" vg-theme="videoObject.config.theme" vg-complete="playbackFinished()"
+ on-tap="showHideControls();"
on-double-tap="closeModal();" vg-autoplay="videoObject.config.autoPlay" vg-responsive="videoObject.config.responsive"
vg-update-time="videoTime(event.Event.StartTime,$currentTime)" vg-error="onVideoError($event)">
<vg-media vg-src="videoObject.config.sources" vg-native-controls="videoObject.config.nativeControls">
@@ -130,7 +134,7 @@
- <div ng-show="!liveFeedMid">
+ <div ng-show="!liveFeedMid && displayControls">
<nav mfb-menu position="tr" effect="zoomin" label="{{'kCollapse'|translate}}" active-icon="ion-chevron-down"
resting-icon="ion-chevron-up" toggling-method="click">
<a mfb-button icon="ion-arrow-right-c" label="{{'kNextEvent'|translate}}" ng-click="jumpToEvent(nextId,1);"></a>
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index ff0a11c3..bd64cdd5 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -17,6 +17,7 @@
<img id="singlemonitor" style="width:100vw; height:100vh;" image-spinner-loader="lines"
image-spinner-src="{{constructSingleStream()}}" ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}"
on-swipe-left="onSwipe(monitorId,1)" on-swipe-right="onSwipe(monitorId,-1)" on-double-tap="closeModal();"
+ on-tap="showHideControls();"
imageonload="imageLoaded()" />
</div>
<div ng-if="animationInProgress">
@@ -112,7 +113,8 @@
</div>
</div>
</ion-modal-view>
- <nav id='testaut_monitormodal_nav_button' mfb-menu position="tr" effect="zoomin" label="{{'kCollapse' | translate}}" active-icon="ion-chevron-up"
+
+ <nav ng-if="displayControls" id='testaut_monitormodal_nav_button' mfb-menu position="tr" effect="zoomin" label="{{'kCollapse' | translate}}" active-icon="ion-chevron-up"
resting-icon="ion-chevron-down" toggling-method="click">
<button mfb-button icon="ion-arrow-resize" label="{{imageFit? ('kFillScreen' | translate):('kFitScreen' | translate)}}"
ng-click="scaleImage();">
@@ -122,7 +124,7 @@
<button mfb-button icon="ion-arrow-expand" label="{{'kControl'| translate}}" ng-click="togglePTZ();">
</button>
</nav>
- <nav mfb-menu position="br" effect="zoomin" label="{{'kCollapse' | translate}}" active-icon="ion-chevron-down"
+ <nav ng-if="displayControls" mfb-menu position="br" effect="zoomin" label="{{'kCollapse' | translate}}" active-icon="ion-chevron-down"
resting-icon="ion-chevron-up" toggling-method="click">
<button mfb-button icon="ion-android-arrow-back" label="{{'kPrevMonitor' | translate}} " ng-click="onTap(monitorId,-1);">
</button>
@@ -131,7 +133,7 @@
<button id='testaut_monitormodal_nav_exit_button' mfb-button icon="ion-close" label="{{'kExitLiveView' | translate}}" ng-click="closeModal();">
</button>
</nav>
- <div id="flyoutmenu" style="position:absolute;bottom:80px;left:10px">
+ <div id="flyoutmenu" ng-if="displayControls" style="position:absolute;bottom:80px;left:10px">
<ul>
<li>
@@ -208,7 +210,7 @@
</li>
</ul>
</div>
- <div ng-if="!showPTZ" class="monitor-modal-text">{{monitorName}} &nbsp;
+ <div ng-if="!showPTZ && displayControls" class="monitor-modal-text">{{monitorName}} &nbsp;
<span ng-style="{'background-color':stateColor()}">&nbsp;{{monStatus}}&nbsp;</span>
</div>
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 11:25:07 +0000