diff options
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/package.json b/package.json index 24a537b3..6649e40c 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "clivas": "^0.2.0", "cordova-android": "8.0.0", "cordova-custom-config": "^5.1.0", - "cordova-ios": "5.0.0", + "cordova-ios": "^5.0.1", "cordova-library-helper-pp-fork": "^1.0.1", "cordova-plugin-add-swift-support": "1.7.2", "cordova-plugin-advanced-http": "git+https://github.com/silkimen/cordova-plugin-advanced-http.git", diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index d9bfd19b..7f978447 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -589,7 +589,7 @@ angular.module('zmApp.controllers') apiurl += '.json?sort=StartTime&direction=desc&limit=1'+$rootScope.authSession; - NVR.debug ("Getting event count "+apiurl); + NVR.debug ("Getting event count "); $http.get(apiurl) .then (function (data) { // console.log ("EVENTS GOT: "+JSON.stringify(data)); @@ -723,8 +723,9 @@ angular.module('zmApp.controllers') } function randEachTime() { + randToAvoidCacheMem = new Date().getTime(); - + //$scope.randToAvoidCacheMem = "1"; //console.log ("Generating:"+$scope.randToAvoidCacheMem); } @@ -1376,7 +1377,11 @@ angular.module('zmApp.controllers') function cleanupOnCloseModal() { - + if (simulStreaming){ + randEachTime(); + NVR.debug ('rand each time:'+randToAvoidCacheMem); + } + NVR.log("Restarting montage timers..."); var ld = NVR.getLogin(); // console.log ("closeModal: Cancelling timer"); @@ -2079,7 +2084,7 @@ angular.module('zmApp.controllers') if (stream) stream += NVR.insertBasicAuthToken(); - + //randEachTime(); //"&rand=" + randToAvoidCacheMem; |