diff options
| -rw-r--r-- | www/js/EventModalCtrl.js | 16 | ||||
| -rw-r--r-- | www/js/NVR.js | 9 | ||||
| -rw-r--r-- | www/lang/locale-en.json | 2 | ||||
| -rw-r--r-- | www/templates/devoptions.html | 8 |
4 files changed, 29 insertions, 6 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 13e20ecb..e73779a6 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -2006,10 +2006,20 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro if (data.event.Event.Notes.indexOf('detected:') != -1) { NVR.debug ("You have object detection! Adding object detect frame"); + var frameid = 'objdetect'; + var ld = NVR.getLogin(); + if (!ld.showAnimation) { + if (NVR.versionCompare(ld.currentServerVersion, '1.35') != -1) { + frameid = 'objdetect_jpg'; + } + + } + $scope.alarm_images.unshift({ - frameid: 'objdetect', - id: 'doesntseemtobeusedhuh' - }); + frameid: frameid, + id: 'whatever' + }); + NVR.debug ("Your ZM version is:"+NVR.getCurrentServerVersion()+" and your obj frame setting is:"+NVR.getLogin().showObjectDetectionFrame); } else { diff --git a/www/js/NVR.js b/www/js/NVR.js index b9c63a7c..62dd9da3 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.091"; + var zmAppVersion = "1.3.093"; var isBackground = false; var justResumed = false; @@ -215,7 +215,8 @@ angular.module('zmApp.controllers') 'pauseStreams': false, 'liveStreamBuffer': 10, 'zmNinjaCustomId':undefined, // filled in init. custom header - 'obfuscationScheme': 'lzs' // or 'aes' + 'obfuscationScheme': 'lzs', // or 'aes' + 'showAnimation': true }; @@ -1620,6 +1621,10 @@ angular.module('zmApp.controllers') loginData.obfuscationScheme = 'lzs'; } + if (typeof loginData.showAnimation == 'undefined') { + loginData.showAnimation = true; + } + loginData.canSwipeMonitors = true; loginData.forceImageModePath = false; loginData.enableBlog = true; diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 7fe655a3..591cd738 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -367,6 +367,8 @@ "kShowAlarmedEvents" :"Show alarmed events", "kShowAllEvents" :"Show all events", "kShowAllFrames" :"all", + "kShowAnimation" : "Show thumbnail animation", + "kShowAnimationNote" : "only ZM 1.35+ if enabled in objdetect", "kShowLiveForInProgress" :"play live feed if event recording in progress", "kShowObjectDetectionEvents" :"Only detected objects", "kShowTimeDiffFrames" :"unique times", diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html index 17d794bc..6dcc3645 100644 --- a/www/templates/devoptions.html +++ b/www/templates/devoptions.html @@ -193,7 +193,6 @@ <label> <ion-toggle ng-model="loginData.enableThumbs" toggle-class="toggle-calm"> <span class="item-text-wrap">{{'kEnableThumbs' | translate}} - <p>{{'kEnableThumbsSub' | translate}}</p> </span> </ion-toggle> </label> @@ -243,6 +242,13 @@ </label> <label> + <ion-toggle ng-model="loginData.showAnimation" toggle-class="toggle-calm"> + <span class="item-text-wrap">{{'kShowAnimation' | translate}}</span> + <p>{{'kShowAnimationNote' | translate}}</p> + </ion-toggle> + </label> + + <label> <div class="item item-button-right"> {{'kObfuscation' | translate}}: {{loginData.obfuscationScheme}}<button class="button button-calm" ng-click="selectObfuscationScheme()"> <i class="icon ion-gear-b"></i> |