summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js')
-rw-r--r--www/js/MontageCtrl.js29
-rw-r--r--www/js/MontageHistoryCtrl.js69
-rw-r--r--www/js/app.js12
3 files changed, 59 insertions, 51 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 9a564dd1..3e0b6305 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -230,7 +230,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
}
- var intervalHandle;
+ $rootScope.intervalHandle="";
$scope.isModalActive = false;
var modalIntervalHandle;
@@ -301,7 +301,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
$scope.minimal = !$scope.minimal;
ZMDataModel.zmDebug("MontageCtrl: switch minimal is " + $scope.minimal);
ionic.Platform.fullScreen($scope.minimal, !$scope.minimal);
- $interval.cancel(intervalHandle);
+ $interval.cancel($rootScope.intervalHandle);
if (!$rootScope.isAlarm)
{
@@ -532,7 +532,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
ZMDataModel.zmDebug("MontageCtrl: switch minimal is " + $scope.minimal);
console.log("Hide Statusbar");
ionic.Platform.fullScreen($scope.minimal, !$scope.minimal);
- $interval.cancel(intervalHandle); //we will renew on reload
+ $interval.cancel($rootScope.intervalHandle); //we will renew on reload
// We are reloading this view, so we don't want entry animations
$ionicHistory.nextViewOptions({
disableAnimate: true,
@@ -576,7 +576,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
ZMDataModel.zmLog("Cancelling montage timer, opening Modal");
// ZMDataModel.zmLog("Starting Modal timer");
- $interval.cancel(intervalHandle);
+ $interval.cancel($rootScope.intervalHandle);
// let's start modal timer
// modalIntervalHandle= $interval(function () {
@@ -693,8 +693,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
ZMDataModel.zmLog("Restarting montage timer, closing Modal...");
var ld = ZMDataModel.getLogin();
- $interval.cancel(intervalHandle);
- intervalHandle = $interval(function () {
+ $interval.cancel($rootScope.intervalHandle);
+ $rootScope.intervalHandle = $interval(function () {
loadNotifications();
// console.log ("Refreshing Image...");
}.bind(this), ld.refreshSec * 1000);
@@ -782,7 +782,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
function onPause() {
ZMDataModel.zmDebug("MontageCtrl: onpause called");
- $interval.cancel(intervalHandle);
+ $interval.cancel($rootScope.intervalHandle);
// $interval.cancel(modalIntervalHandle);
// FIXME: Do I need to setAwake(false) here?
@@ -790,13 +790,16 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
function onResume() {
+
+ /*FIXME: Do we need to resume timers? when you resume, you go to portal and then here
+
if (!$scope.isModalActive) {
var ld = ZMDataModel.getLogin();
ZMDataModel.zmDebug("MontageCtrl: onresume called");
ZMDataModel.zmLog("Restarting montage timer on resume");
$rootScope.rand = Math.floor((Math.random() * 100000) + 1);
- $interval.cancel(intervalHandle);
- intervalHandle = $interval(function () {
+ $interval.cancel($rootScope.intervalHandle);
+ $rootScope.intervalHandle = $interval(function () {
loadNotifications();
// console.log ("Refreshing Image...");
}.bind(this), ld.refreshSec * 1000);
@@ -806,7 +809,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
}
-
+*/
}
@@ -820,7 +823,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
$scope.$on('$destroy', function () {
console.log("*** CANCELLING INTERVAL ****");
- $interval.cancel(intervalHandle);
+ $interval.cancel($rootScope.intervalHandle);
});
@@ -834,8 +837,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
console.log("Setting Awake to " + ZMDataModel.getKeepAwake());
ZMDataModel.setAwake(ZMDataModel.getKeepAwake());
- $interval.cancel(intervalHandle);
- intervalHandle = $interval(function () {
+ $interval.cancel($rootScope.intervalHandle);
+ $rootScope.intervalHandle = $interval(function () {
loadNotifications();
// console.log ("Refreshing Image...");
}.bind(this), ld.refreshSec * 1000);
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 967c20fb..6301863c 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -404,7 +404,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
// Controller main
//---------------------------------------------------------------------
-
+ document.addEventListener("pause", onPause, false);
+ document.addEventListener("resume", onResume, false);
$scope.displayDateTimeSliders = true;
$scope.showtimers = true;
@@ -442,7 +443,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
$scope.datetimeValue = {value:""};
$scope.datetimeValue.value = timenow.toDate();
- var eventQueryInterval;
+ $rootScope.eventQueryInterval="";
var commonCss =
@@ -534,7 +535,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
montageOrder = tempResponse[1];
hiddenOrder = tempResponse[2];
- ZMDataModel.zmLog("Inside Montage Ctrl:We found " + $scope.monitors.length + " monitors");
+ ZMDataModel.zmLog("Inside MontageHistoryCtrl:We found " + $scope.monitors.length + " monitors");
$scope.MontageMonitors = ZMDataModel.applyMontageMonitorPrefs (message, 1)[0];
@@ -584,8 +585,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
}, zm.eventHistoryTimer);
- document.addEventListener("pause", onPause, false);
- document.addEventListener("resume", onResume, false);
+
$scope.showSizeButtons = false;
$ionicPopover.fromTemplateUrl('templates/help/montage-help.html', {
@@ -636,7 +636,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
$scope.LoginData = ZMDataModel.getLogin();
$scope.monLimit = $scope.LoginData.maxMontage;
- console.log("********* Inside Montage Ctrl, MAX LIMIT=" + $scope.monLimit);
+ console.log("********* Inside MontageHistoryCtrl, MAX LIMIT=" + $scope.monLimit);
$rootScope.authSession = "undefined";
@@ -666,9 +666,9 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
function (error) {
$ionicLoading.hide();
- ZMDataModel.zmDebug("MontageCtrl: Error in authkey retrieval " + error);
+ ZMDataModel.zmDebug("MontageHistoryCtrl: Error in authkey retrieval " + error);
//$rootScope.authSession="";
- ZMDataModel.zmLog("MontageCtrl: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession);
+ ZMDataModel.zmLog("MontageHistoryCtrl: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession);
});
@@ -729,10 +729,10 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
$rootScope.isAlarm=!$rootScope.isAlarm;
$scope.minimal = !$scope.minimal;
- ZMDataModel.zmDebug("MontageCtrl: switch minimal is " + $scope.minimal);
+ ZMDataModel.zmDebug("MontageHistoryCtrl: switch minimal is " + $scope.minimal);
ionic.Platform.fullScreen($scope.minimal, !$scope.minimal);
$interval.cancel(intervalHandle);
- $interval.cancel(eventQueryInterval);
+ $interval.cancel($rootScope.eventQueryInterval);
if (!$rootScope.isAlarm)
{
@@ -929,7 +929,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
function reorderItem(item, from, to, reorderHidden) {
- ZMDataModel.zmDebug("MontageCtrl: Reorder from " + from + " to " + to);
+ ZMDataModel.zmDebug("MontageHistoryCtrl: Reorder from " + from + " to " + to);
$scope.MontageMonitors.splice(from, 1);
$scope.MontageMonitors.splice(to, 0, item);
@@ -960,7 +960,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
//---------------------------------------------------------------------
$scope.switchMinimal = function () {
$scope.minimal = !$scope.minimal;
- ZMDataModel.zmDebug("MontageCtrl: switch minimal is " + $scope.minimal);
+ ZMDataModel.zmDebug("MontageHistoryCtrl: switch minimal is " + $scope.minimal);
console.log("Hide Statusbar");
ionic.Platform.fullScreen($scope.minimal, !$scope.minimal);
$interval.cancel(intervalHandle); //we will renew on reload
@@ -1000,7 +1000,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
// main monitor modal open
//---------------------------------------------------------------------
$scope.openModal = function (mid, controllable, controlid) {
- ZMDataModel.zmDebug("MontageCtrl: Open Monitor Modal with monitor Id=" + mid + " and Controllable:" + controllable + " with control ID:" + controlid);
+ ZMDataModel.zmDebug("MontageHistoryCtrl: Open Monitor Modal with monitor Id=" + mid + " and Controllable:" + controllable + " with control ID:" + controlid);
// $scope.isModalActive = true;
// Note: no need to setAwake(true) as its already awake
// in montage view
@@ -1030,14 +1030,14 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
// if its controllable, lets get the control command
if (controllable == '1') {
- ZMDataModel.zmDebug("MontageCtrl: getting controllable data " + myurl);
+ ZMDataModel.zmDebug("MontageHistoryCtrl: getting controllable data " + myurl);
var apiurl = $scope.LoginData.apiurl;
var myurl = apiurl + "/controls/" + controlid + ".json";
- ZMDataModel.zmDebug("MontageCtrl: getting controllable data " + myurl);
+ ZMDataModel.zmDebug("MontageHistoryCtrl: getting controllable data " + myurl);
$http.get(myurl)
.success(function (data) {
- ZMDataModel.zmDebug("MontageCtrl: control data returned " + JSON.stringify(data));
+ ZMDataModel.zmDebug("MontageHistoryCtrl: control data returned " + JSON.stringify(data));
$scope.ptzMoveCommand = (data.control.Control.CanMoveCon == '1') ? 'moveCon' : 'move';
$scope.ptzStopCommand = "moveStop";
console.log("***moveCommand: " + $scope.ptzMoveCommand);
@@ -1109,7 +1109,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
//---------------------------------------------------------------------
$scope.closeModal = function () {
- ZMDataModel.zmDebug("MontageCtrl: Close & Destroy Monitor Modal");
+ ZMDataModel.zmDebug("MontageHistoryCtrl: Close & Destroy Monitor Modal");
// $scope.isModalActive = false;
// Note: no need to setAwake(false) as needs to be awake
// in montage view
@@ -1212,9 +1212,10 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
//---------------------------------------------------------------------
function onPause() {
- ZMDataModel.zmDebug("MontageCtrl: onpause called");
+ ZMDataModel.zmDebug("MontageHistoryCtrl: onpause called");
+ $interval.cancel($rootScope.eventQueryInterval);
$interval.cancel(intervalHandle);
- $interval.cancel(eventQueryInterval);
+
// $interval.cancel(modalIntervalHandle);
// FIXME: Do I need to setAwake(false) here?
@@ -1222,24 +1223,28 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
function onResume() {
+
+ // FIXME: Do we need to resume timers? when you resume, you go to portal and then here
+ /*
if (!$scope.isModalActive) {
var ld = ZMDataModel.getLogin();
- ZMDataModel.zmDebug("MontageCtrl: onresume called");
+ ZMDataModel.zmDebug("MontageHistoryCtrl: onresume called");
ZMDataModel.zmLog("Restarting eventQuery timer on resume");
+ console.log ("************** TIMER STARTED INSIDE RESUME ***************");
//$rootScope.rand = Math.floor((Math.random() * 100000) + 1);
- $interval.cancel(eventQueryInterval);
- eventQueryInterval = $interval(function () {
+ $interval.cancel($rootScope.eventQueryInterval);
+ $rootScope.eventQueryInterval = $interval(function () {
checkAllEvents();
// console.log ("Refreshing Image...");
}.bind(this),zm.eventHistoryTimer);
} else // modal is active
{
// $rootScope.modalRand = Math.floor((Math.random() * 100000) + 1);
- }
+ }*/
@@ -1255,8 +1260,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
};
$scope.$on('$destroy', function () {
- console.log("*** CANCELLING INTERVAL ****");
- $interval.cancel(intervalHandle);
+ ZMDataModel.zmDebug("Cancelling eventQueryInterval");
+ $interval.cancel($rootScope.eventQueryInterval);
@@ -1265,20 +1270,24 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
$scope.$on('$ionicView.loaded', function () {
- console.log("**VIEW ** Montage Ctrl Loaded");
+ console.log("**VIEW ** MontageHistoryCtrl Loaded");
});
$scope.$on('$ionicView.enter', function () {
- console.log("**VIEW ** Montage Ctrl Entered, Starting loadNotifications");
+ console.log("**VIEW ** MontageHistory Ctrl Entered, Starting loadNotifications");
var ld = ZMDataModel.getLogin();
console.log("Setting Awake to " + ZMDataModel.getKeepAwake());
ZMDataModel.setAwake(ZMDataModel.getKeepAwake());
- $interval.cancel(eventQueryInterval);
- eventQueryInterval = $interval(function () {
+ $interval.cancel($rootScope.eventQueryInterval);
+ console.log ("****************** TIMER STARTED INSIDE ENTER");
+ $rootScope.eventQueryInterval = $interval(function () {
checkAllEvents();
// console.log ("Refreshing Image...");
}.bind(this), zm.eventHistoryTimer);
+
+
+
});
@@ -1288,7 +1297,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
if ($scope.modal) $scope.modal.remove();
ZMDataModel.zmLog("Cancelling event query timer");
- $interval.cancel(eventQueryInterval);
+ $interval.cancel($rootScope.eventQueryInterval);
ZMDataModel.zmLog ("Stopping network pull...");
// make sure this is applied in scope digest to stop network pull
diff --git a/www/js/app.js b/www/js/app.js
index f1f23c2e..ac0daa59 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -921,10 +921,7 @@ angular.module('zmApp', [
document.addEventListener("resume", function () {
ZMDataModel.zmLog("App is resuming from background");
var ld = ZMDataModel.getLogin();
- if ($rootScope.apnsToken && ld.isUseEventServer == true) {
- // ZMDataModel.zmDebug("sending enable push to Event Server");
- // EventServer.sendMessage('push', {type:'control', enablepush:'0'});
- }
+
ZMDataModel.setBackground(false);
// don't animate
@@ -957,6 +954,9 @@ angular.module('zmApp', [
ZMDataModel.setBackground(true);
ZMDataModel.zmLog("ROOT APP:App is going into background");
+
+ $interval.cancel($rootScope.eventQueryInterval);
+ $interval.cancel($rootScope.intervalHandle);
ZMDataModel.setBackground(true);
ZMDataModel.zmLog("ROOT APP: Stopping network pull...");
@@ -971,10 +971,6 @@ angular.module('zmApp', [
ionic.Platform.exitApp();
}
- if ($rootScope.apnsToken && ld.isUseEventServer == true) {
- // ZMDataModel.zmDebug("sending enable push to Event Server");
- //EventServer.sendMessage('push', {type:'control',enablepush:'1'});
- }
zmAutoLogin.stop();
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-07 08:02:34 +0000