diff options
| -rw-r--r-- | www/js/DataModel.js | 44 | ||||
| -rw-r--r-- | www/js/EventServer.js | 17 | ||||
| -rw-r--r-- | www/js/EventServerSettingsCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 18 | ||||
| -rw-r--r-- | www/js/app.js | 34 |
5 files changed, 59 insertions, 56 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index ac1e472c..b69bcbc2 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -121,7 +121,7 @@ angular.module('zmApp.controllers') //zmDebug ("DataModel/setLogin: writing " + JSON.stringify(newLogin)); //$localstorage.setObject($rootScope.currentServerGroup, loginData); - console.log ("Saving For " + loginData.serverName); + //console.log ("Saving For " + loginData.serverName); // console.log ("SERVER GROUP BEFORE IS " + JSON.stringify(serverGroupList)); serverGroupList[loginData.serverName]=angular.copy(loginData); @@ -276,7 +276,7 @@ angular.module('zmApp.controllers') monitorsLoaded = 0; - console.log("Getting out of ZMDataModel init"); + //console.log("Getting out of ZMDataModel init"); zmDebug ( "loginData structure values: " + JSON.stringify(loginData)); }, @@ -359,7 +359,7 @@ angular.module('zmApp.controllers') { - console.log ("**** setAwake called with:" + val); + //console.log ("**** setAwake called with:" + val); // zmLog("Switching screen always on to " + val); if (val) { @@ -654,8 +654,8 @@ angular.module('zmApp.controllers') montageOrder[i] = i; // order to show is order ZM returns hiddenOrder[i] = 0; // don't hide them } - console.log("Order string is " + montageOrder.toString()); - console.log("Hiddent string is " + hiddenOrder.toString()); + //console.log("Order string is " + montageOrder.toString()); + //console.log("Hiddent string is " + hiddenOrder.toString()); zmLog("Stored montage order does not exist"); } else @@ -756,7 +756,7 @@ angular.module('zmApp.controllers') //----------------------------------------------------------------------------- getMonitors: function (forceReload) { - console.log("** Inside ZMData getMonitors with forceReload=" + forceReload); + //console.log("** Inside ZMData getMonitors with forceReload=" + forceReload); @@ -775,11 +775,11 @@ angular.module('zmApp.controllers') var d = $q.defer(); if ((monitorsLoaded == 0) || (forceReload == 1)) // monitors are empty or force reload { - console.log("ZMDataModel: Invoking HTTP get to load monitors"); + //console.log("ZMDataModel: Invoking HTTP get to load monitors"); zmLog ( (forceReload==1)? "getMonitors:Force reloading all monitors" : "getMonitors:Loading all monitors"); var apiurl = loginData.apiurl; var myurl = apiurl + "/monitors.json"; - console.log ("API:"+myurl); + //console.log ("API:"+myurl); $http.get(myurl /*,{timeout:15000}*/ ) .success(function (data) { //console.log("HTTP success got " + JSON.stringify(data.monitors)); @@ -807,12 +807,12 @@ angular.module('zmApp.controllers') d.resolve(monitors); }) .error(function (err) { - console.log("HTTP Error " + err); + //console.log("HTTP Error " + err); zmLog ("Monitor load failed " + JSON.stringify(err), "error"); // To keep it simple for now, I'm translating an error // to imply no monitors could be loaded. FIXME: conver to proper error monitors = []; - console.log("promise resolved inside HTTP fail"); + //console.log("promise resolved inside HTTP fail"); displayBanner ('error', ['error retrieving monitor list', 'please try again']); d.resolve(monitors); $ionicLoading.hide(); @@ -822,7 +822,7 @@ angular.module('zmApp.controllers') } else // monitors are loaded { - console.log("Returning pre-loaded list of " + monitors.length + " monitors"); + //console.log("Returning pre-loaded list of " + monitors.length + " monitors"); zmLog("Returning pre-loaded list of " + monitors.length + " monitors"); d.resolve(monitors); $ionicLoading.hide(); @@ -835,7 +835,7 @@ angular.module('zmApp.controllers') // //----------------------------------------------------------------------------- setMonitors: function (mon) { - console.log("ZMData setMonitors called with " + mon.length + " monitors"); + //console.log("ZMData setMonitors called with " + mon.length + " monitors"); monitors = mon; }, @@ -848,7 +848,7 @@ angular.module('zmApp.controllers') //----------------------------------------------------------------------------- getEventsPages: function (monitorId,startTime, endTime) { - console.log("********** INSIDE EVENTS PAGES "); + //console.log("********** INSIDE EVENTS PAGES "); var apiurl = loginData.apiurl; var myurl = apiurl + "/events/index"; @@ -863,7 +863,7 @@ angular.module('zmApp.controllers') myurl = myurl + ".json"; - console.log (">>>>>Constructed URL " + myurl); + //console.log (">>>>>Constructed URL " + myurl); $ionicLoading.show({ template: 'calculating events list size...', @@ -887,7 +887,7 @@ angular.module('zmApp.controllers') }) .error(function (error) { $ionicLoading.hide(); - console.log("*** ERROR GETTING TOTAL PAGES ***"); + // console.log("*** ERROR GETTING TOTAL PAGES ***"); zmLog ("Error retrieving page count of events " + JSON.stringify(error), "error"); displayBanner ('error', ['error retrieving event page count', 'please try again']); @@ -907,7 +907,7 @@ angular.module('zmApp.controllers') getEvents: function (monitorId, pageId, loadingStr, startTime, endTime) { - console.log("ZMData getEvents called with ID=" + monitorId + "and Page=" + pageId); + //console.log("ZMData getEvents called with ID=" + monitorId + "and Page=" + pageId); if (!loadingStr) { loadingStr = "loading events..."; @@ -944,14 +944,14 @@ angular.module('zmApp.controllers') if (pageId) { myurl = myurl + "?page=" + pageId; } else { - console.log("**** PAGE WAS " + pageId); + //console.log("**** PAGE WAS " + pageId); } // Simulated data // myurl = "https://api.myjson.com/bins/4jx44.json"; - console.log (">>>>>Constructed URL " + myurl); + //console.log (">>>>>Constructed URL " + myurl); @@ -965,7 +965,7 @@ angular.module('zmApp.controllers') oldevents = myevents; } //console.log (JSON.stringify(data)); - console.log("DataModel Returning " + myevents.length + "events for page" + pageId); + // console.log("DataModel Returning " + myevents.length + "events for page" + pageId); d.resolve(myevents); return d.promise; @@ -973,7 +973,7 @@ angular.module('zmApp.controllers') .error(function (err) { if (loadingStr != 'none') $ionicLoading.hide(); displayBanner ('error', ['error retrieving event list', 'please try again']); - console.log("HTTP Events error " + err); + //console.log("HTTP Events error " + err); zmLog("Error fetching events for page " + pageId + " Err: " + JSON.stringify(err), "error"); // I need to reject this as I have infinite scrolling // implemented in EventCtrl.js --> and if it does not know @@ -1011,7 +1011,7 @@ angular.module('zmApp.controllers') // //----------------------------------------------------------------------------- getMonitorsLoaded: function () { - console.log("**** Inside promise function "); + // console.log("**** Inside promise function "); var deferred = $q.defer(); if (monitorsLoaded != 0) { deferred.resolve(monitorsLoaded); @@ -1024,7 +1024,7 @@ angular.module('zmApp.controllers') // //----------------------------------------------------------------------------- setMonitorsLoaded: function (loaded) { - console.log("ZMData.setMonitorsLoaded=" + loaded); + // console.log("ZMData.setMonitorsLoaded=" + loaded); monitorsLoaded = loaded; }, diff --git a/www/js/EventServer.js b/www/js/EventServer.js index 40882e15..77287feb 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -215,7 +215,7 @@ angular.module('zmApp.controllers') if (eventsToDisplay.length > 0) { if (eventsToDisplay.length == 1) { - console.log("Single Display: " + eventsToDisplay[0]); + //console.log("Single Display: " + eventsToDisplay[0]); ZMDataModel.displayBanner('alarm', [eventsToDisplay[0]], 5000, 5000); } else { ZMDataModel.displayBanner('alarm', eventsToDisplay, @@ -282,8 +282,8 @@ angular.module('zmApp.controllers') ws.$on('$open', openHandshake, function () { - console.log(" sending " + type + " " + - JSON.stringify(obj)); + //console.log(" sending " + type + " " + + // JSON.stringify(obj)); ws.$emit(type, obj); ws.$un('$open'); @@ -295,7 +295,7 @@ angular.module('zmApp.controllers') } else { ws.$emit(type, obj); - console.log("sending " + type + " " + JSON.stringify(obj)); + //console.log("sending " + type + " " + JSON.stringify(obj)); } @@ -444,14 +444,16 @@ angular.module('zmApp.controllers') push.on('notification', function (data) { + + ZMDataModel.zmDebug ("received push notification"); var ld = ZMDataModel.getLogin(); if (ld.isUseEventServer ==false) { ZMDataModel.zmDebug("received push notification, but event server disabled. Not acting on it"); return; } - console.log("************* PUSH RECEIVED ******************"); - console.log(JSON.stringify(data)); + //console.log("************* PUSH RECEIVED ******************"); + //console.log(JSON.stringify(data)); // data.message, // data.title, @@ -510,7 +512,8 @@ angular.module('zmApp.controllers') }); push.on('error', function (e) { - console.log("************* PUSH ERROR ******************"); + ZMDataModel.zmDebug ("Push error: " + JSON.stringify(e)); + // console.log("************* PUSH ERROR ******************"); }); } diff --git a/www/js/EventServerSettingsCtrl.js b/www/js/EventServerSettingsCtrl.js index e1e7d106..fbde9f9b 100644 --- a/www/js/EventServerSettingsCtrl.js +++ b/www/js/EventServerSettingsCtrl.js @@ -167,7 +167,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventServerSettingsCtrl', if ($scope.loginData.isUseEventServer==true) { EventServer.init() .then(function (data) { - console.log("Sending control filter"); + // console.log("Sending control filter"); ZMDataModel.zmDebug("Sending Control message 'filter' with monlist="+monstring+" and interval="+intervalstring); EventServer.sendMessage("control", { type: 'filter', diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 3e0b6305..e0f5917d 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -26,7 +26,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' $scope.slider = {}; - console.log ("************ GETTIGN SLIDER AS " + ZMDataModel.getMontageSize()); + $scope.slider.monsize = ZMDataModel.getMontageSize(); $scope.revMonSize = 11 - parseInt($scope.slider.monsize); @@ -133,7 +133,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' var timestamp = new Date().getUTCMilliseconds(); $scope.minimal = $stateParams.minimal; $scope.zmMarginTop = $scope.minimal ? 0:15; - console.log ("********* MARGIN IS " + $scope.zmMarginTop); + $scope.isRefresh = $stateParams.isRefresh; var sizeInProgress = false; @@ -158,7 +158,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' } else // recover previous settings { var msize = loginData.montageArraySize; - console.log("MontageArrayString is=>" + msize); + // console.log("MontageArrayString is=>" + msize); $scope.monitorSize = msize.split(":"); var j; @@ -166,7 +166,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' // convert to number other wise adding to it concatenates :-) $scope.monitorSize[j] = parseInt($scope.monitorSize[j]); $scope.scaleDirection.push(1); - console.log("Montage size for monitor " + j + " is " + $scope.monitorSize[j]); + // console.log("Montage size for monitor " + j + " is " + $scope.monitorSize[j]); } @@ -176,7 +176,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' $scope.LoginData = ZMDataModel.getLogin(); $scope.monLimit = $scope.LoginData.maxMontage; - console.log("********* Inside Montage Ctrl, MAX LIMIT=" + $scope.monLimit); + //console.log("********* Inside Montage Ctrl, MAX LIMIT=" + $scope.monLimit); $rootScope.authSession = "undefined"; @@ -197,7 +197,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' ZMDataModel.getAuthKey($rootScope.validMonitorId, $scope.monitors[0].Monitor.connKey) .then(function (success) { $ionicLoading.hide(); - console.log(success); + //console.log(success); $rootScope.authSession = success; ZMDataModel.zmLog("Stream authentication construction: " + $rootScope.authSession); @@ -236,7 +236,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' $scope.closeReorderModal = function () { - console.log("Close & Destroy Monitor Modal"); + // console.log("Close & Destroy Monitor Modal"); // switch off awake, as liveview is finished //ZMDataModel.setAwake(false); $scope.modal.remove(); @@ -251,11 +251,11 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' // FIXME: I should probably unregister this instead if (typeof $scope.monitors === undefined) return; - console.log ("***EVENT TRAP***"); + //console.log ("***EVENT TRAP***"); var alarmMonitors = args.message; for (var i=0; i< alarmMonitors.length; i++) { - console.log ("**** TRAPPED EVENT: "+alarmMonitors[i]); + //console.log ("**** TRAPPED EVENT: "+alarmMonitors[i]); for (var j=0; j<$scope.monitors.length; j++) { diff --git a/www/js/app.js b/www/js/app.js index 3b3c49cb..15f52211 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -89,7 +89,7 @@ angular.module('zmApp', [ return directive; function postLink(scope, element, attrs) { - console.log ("HELLO NEW"); + //console.log ("HELLO NEW"); var requestConfig = { method: 'GET', //url: attrs.httpSrc, @@ -109,11 +109,11 @@ angular.module('zmApp', [ } attrs.$observe('httpSrc', function (newValue) { requestConfig.url = newValue; - console.log ("requestConfig is " + JSON.stringify(requestConfig)); + //console.log ("requestConfig is " + JSON.stringify(requestConfig)); imageLoadingDataShare.set(1); $http(requestConfig) .success(function (data) { - console.log ("Inside HTTP after Calling " + requestConfig.url); + //console.log ("Inside HTTP after Calling " + requestConfig.url); //console.log ("data got " + JSON.stringify(data)); @@ -647,7 +647,7 @@ angular.module('zmApp', [ .error(function (error) { $ionicLoading.hide(); $rootScope.loggedIntoZm = -1; - console.log("**** ZM Login FAILED"); + //console.log("**** ZM Login FAILED"); ZMDataModel.zmLog("zmAutologin Error " + JSON.stringify(error), "error, but not calling auth-error emit"); // bad urls etc come here @@ -759,7 +759,7 @@ angular.module('zmApp', [ e.preventDefault(); if (!$ionicSideMenuDelegate.isOpenLeft()) { $ionicSideMenuDelegate.toggleLeft(); - console.log("Status of SIDE MENU IS : " + $ionicSideMenuDelegate.isOpen()); + //console.log("Status of SIDE MENU IS : " + $ionicSideMenuDelegate.isOpen()); } else { navigator.app.exitApp(); } @@ -804,11 +804,11 @@ angular.module('zmApp', [ var requireLogin = toState.data.requireLogin; if (ZMDataModel.isLoggedIn()) { - console.log("State transition is authorized"); + //console.log("State transition is authorized"); return; } else { - console.log("Not logged in, requested to go to " + JSON.stringify(toState)); + ZMDataModel.zmLog("Not logged in, requested to go to " + JSON.stringify(toState)); // event.preventDefault(); // $state.transitionTo('login'); @@ -852,7 +852,7 @@ angular.module('zmApp', [ if ($ionicPlatform.is('android')) $rootScope.platformOS = "android"; - console.log("**** You are running on " + $rootScope.platformOS); + ZMDataModel.zmLog("You are running on " + $rootScope.platformOS); ZMDataModel.init(); EventServer.init(); @@ -875,7 +875,7 @@ angular.module('zmApp', [ }); } else { - console.log("Log file size is " + resp.size + " bytes"); + //console.log("Log file size is " + resp.size + " bytes"); } @@ -923,8 +923,8 @@ angular.module('zmApp', [ $rootScope.devWidth = ((window.innerWidth > 0) ? window.innerWidth : screen.width); $rootScope.devHeight = ((window.innerHeight > 0) ? window.innerHeight : screen.height); - console.log("********Computed Dev Width & Height as" + $rootScope.devWidth + "*" + - $rootScope.devHeight); + //console.log("********Computed Dev Width & Height as" + $rootScope.devWidth + "*" + + // $rootScope.devHeight); // What I noticed is when I moved the app to the device // the montage screens were not redrawn after resuming from background mode @@ -1018,7 +1018,7 @@ angular.module('zmApp', [ // lets POST so we get a session ID right hre - console.log("Setting up POST LOGIN timer"); + ZMDataModel.zmLog("Setting up POST LOGIN timer"); zmAutoLogin.start(); @@ -1093,7 +1093,7 @@ angular.module('zmApp', [ }, resolve: { message: function (ZMDataModel) { - console.log("Inside app.montage resolve"); + // console.log("Inside app.montage resolve"); return ZMDataModel.getMonitors(0); } }, @@ -1109,7 +1109,7 @@ angular.module('zmApp', [ }, resolve: { message: function (ZMDataModel) { - console.log("Inside app.events resolve"); + //console.log("Inside app.events resolve"); return ZMDataModel.getMonitors(0); } }, @@ -1186,7 +1186,7 @@ angular.module('zmApp', [ }, resolve: { message: function (ZMDataModel) { - console.log("Inside app.events resolve"); + //console.log("Inside app.events resolve"); return ZMDataModel.getMonitors(0); } }, @@ -1244,7 +1244,7 @@ angular.module('zmApp', [ }, resolve: { message: function (ZMDataModel) { - console.log("Inside app.events resolve"); + //console.log("Inside app.events resolve"); return ZMDataModel.getMonitors(0); } @@ -1265,7 +1265,7 @@ angular.module('zmApp', [ }, resolve: { message: function (ZMDataModel) { - console.log("Inside app.events resolve"); + //console.log("Inside app.events resolve"); return ZMDataModel.getMonitors(0); } |