diff options
Diffstat (limited to 'www/js/app.js')
| -rwxr-xr-x | www/js/app.js | 57 |
1 files changed, 32 insertions, 25 deletions
diff --git a/www/js/app.js b/www/js/app.js index 487a0d0e..01928d5e 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -52,14 +52,11 @@ angular.module('zmApp', [ logFile: 'zmNinjaLog.txt', authoremail: 'pliablepixels+zmNinja@gmail.com', logFileMaxSize: 20000, // after this limit log gets reset - //loginInterval: 300000, //5m*60s*1000 - ZM auto login after 5 mins - loginInterval: 1800000, //30m*60s*1000 - ZM auto login after 30 mins - - //loginInterval: 30000, + updateCheckInterval: 86400000, // 24 hrs loadingTimeout: 15000, slowLoadingTimeout: 60000, - safeMontageLimit: 100, + safeMontageLimit: 10, safeImageQuality: 10, maxFPS: 30, defaultFPS: 3, @@ -93,6 +90,8 @@ angular.module('zmApp', [ cipherKey: 'sdf#@#%FSXSA_AR', minCycleTime: 5, + loginInterval: 1800000, //30m*60s*1000 - ZM auto login after 30 mins + //loginInterval: 20000, eventPlaybackQueryLowBW: 6000, loginIntervalLowBW: 1800000, //30m login eventSingleImageQualityLowBW: 70, @@ -104,8 +103,9 @@ angular.module('zmApp', [ maxGifWidth: 800.0, quantSample: 15, hashSecret: 'unused at the moment', - forceMontageReloadDelay: 3600, // 1 hr, - thumbWidth:200 + forceMontageReloadDelay: 4500000, // 1 hr 15m, + thumbWidth:200, + alarmStatusTime: 10000, }) @@ -840,7 +840,7 @@ angular.module('zmApp', [ $rootScope.$on("auth-error", function () { - NVRDataModel.debug("zmAutoLogin: Inside auth-error emit"); + NVRDataModel.debug("zmAutoLogin: Inside auth-error broadcast"); NVRDataModel.displayBanner('error', ['ZoneMinder authentication failed', 'Please check settings']); }); @@ -853,7 +853,7 @@ angular.module('zmApp', [ //------------------------------------------------------------------ $rootScope.$on("init-complete", function () { - NVRDataModel.log(">>>>>>>>>>>>>>> All init over, going to portal login"); + NVRDataModel.log("Inside init-complete in app.js: All init over, going to portal login"); $ionicHistory.nextViewOptions({ disableAnimate: true }); @@ -883,7 +883,7 @@ angular.module('zmApp', [ $timeout(function () { contentBannerInstance(); }, 2000); - NVRDataModel.debug("auth-success emit:Successful"); + NVRDataModel.debug("auth-success broadcast:Successful"); }); $rootScope.getProfileName = function () { @@ -929,7 +929,7 @@ angular.module('zmApp', [ // coming here means login not needed, old login is valid .then(function (success) { d.resolve("Login Success due to fast login"); - $rootScope.$emit('auth-success', "fast login mode"); + $rootScope.$broadcast('auth-success', "fast login mode"); return d.promise; }, @@ -1010,7 +1010,7 @@ angular.module('zmApp', [ NVRDataModel.log("Auth is disabled!"); d.resolve("Login Success"); - $rootScope.$emit('auth-success', 'no auth'); + $rootScope.$broadcast('auth-success', 'no auth'); return (d.promise); } @@ -1102,14 +1102,14 @@ angular.module('zmApp', [ d.resolve("Login Success"); - $rootScope.$emit('auth-success', data); + $rootScope.$broadcast('auth-success', data); } else // this means login error { $rootScope.loggedIntoZm = -1; //console.log("**** ZM Login FAILED"); NVRDataModel.log("zmAutologin Error: Bad Credentials ", "error"); - $rootScope.$emit('auth-error', "incorrect credentials"); + $rootScope.$broadcast('auth-error', "incorrect credentials"); d.reject("Login Error"); return (d.promise); @@ -1150,7 +1150,7 @@ angular.module('zmApp', [ NVRDataModel.log("zmAutologin Error " + JSON.stringify(error) + " and status " + status); // bad urls etc come here $rootScope.loggedIntoZm = -1; - $rootScope.$emit('auth-error', error); + $rootScope.$broadcast('auth-error', error); d.reject("Login Error"); return d.promise; @@ -1328,7 +1328,8 @@ angular.module('zmApp', [ $rootScope.online = true; $timeout(function () { - var networkState = navigator.connection.type; + var networkState="browser not supported"; + if (navigator.connection) networkState = navigator.connection.type; NVRDataModel.debug("Detected network type as: " + networkState); var strState = NVRDataModel.getBandwidth(); NVRDataModel.debug("getBandwidth() normalized it as: " + strState); @@ -1336,7 +1337,7 @@ angular.module('zmApp', [ if ((NVRDataModel.getLogin().autoSwitchBandwidth == true) && (NVRDataModel.getLogin().enableLowBandwidth == true)) { NVRDataModel.debug("Setting app state to: " + strState); - $rootScope.$emit('bandwidth-change', strState); + $rootScope.$broadcast('bandwidth-change', strState); } else { NVRDataModel.debug("Not changing bandwidth state, as auto change is not on"); } @@ -1774,7 +1775,7 @@ angular.module('zmApp', [ // now do SSL check //setSSLCerts(); - EventServer.init(); + //EventServer.init(); zmCheckUpdates.start(); NVRDataModel.log("Setting up POST LOGIN timer"); zmAutoLogin.start(); @@ -1794,6 +1795,7 @@ angular.module('zmApp', [ //---------------------------------------------------------------------------- document.addEventListener("resume", function () { + NVRDataModel.setJustResumed(true); $ionicPlatform.ready(function () { NVRDataModel.log("App is resuming from background"); $rootScope.isDownloading = false; @@ -1850,7 +1852,8 @@ angular.module('zmApp', [ //---------------------------------------------------------------------------- document.addEventListener("pause", function () { NVRDataModel.setBackground(true); - NVRDataModel.setJustResumed(true); // used for window stop + NVRDataModel.setJustResumed(false); + // NVRDataModel.setJustResumed(true); // used for window stop EventServer.disconnect(); @@ -1858,18 +1861,21 @@ angular.module('zmApp', [ $interval.cancel($rootScope.eventQueryInterval); $interval.cancel($rootScope.intervalHandle); + zmAutoLogin.stop(); + if ($rootScope.zmPopup) + $rootScope.zmPopup.close(); - NVRDataModel.log("ROOT APP: Stopping network pull..."); - window.stop(); // dont call stopNetwork - we need to stop here - var ld = NVRDataModel.getLogin(); + NVRDataModel.log("ROOT APP: Stopping network "); + NVRDataModel.stopNetwork("called from app.js"); + // dont call stopNetwork - we need to stop here + + var ld = NVRDataModel.getLogin(); - zmAutoLogin.stop(); - if ($rootScope.zmPopup) - $rootScope.zmPopup.close(); + if (ld.exitOnSleep && $rootScope.platformOS == "android") { NVRDataModel.log("user exited app"); @@ -2258,6 +2264,7 @@ angular.module('zmApp', [ resolve: { message: function (NVRDataModel) { //console.log("Inside app.events resolve"); + NVRDataModel.regenConnKeys(); return NVRDataModel.getMonitors(0); } |