diff options
| -rw-r--r-- | config.xml | 2 | ||||
| -rw-r--r-- | www/js/DataModel.js | 13 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 9 | ||||
| -rw-r--r-- | www/js/app.js | 5 | ||||
| -rw-r--r-- | www/lang/locale-en.json | 2 | ||||
| -rw-r--r-- | www/templates/devoptions.html | 4 |
6 files changed, 27 insertions, 8 deletions
@@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.21" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.22" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>zmNinja</name> <description> High performance ZoneMinder client diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 83982c1c..dcd6b768 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -40,10 +40,14 @@ angular.module('zmApp.controllers') text: 'Portugese', value: 'pt' }, + /*{ + text: 'Arabic', + value: 'ar' + }, { text: 'Hindi', value: 'hi' - } + }*/ ]; var serverGroupList = {}; @@ -114,6 +118,7 @@ angular.module('zmApp.controllers') 'cycleMonitorsInterval':10, // 10sec 'enableLowBandwidth':false, 'autoSwitchBandwidth':false, + 'disableAlarmCheckMontage': false, @@ -759,6 +764,12 @@ angular.module('zmApp.controllers') } + if (typeof loginData.disableAlarmCheckMontage == 'undefined') { + + loginData.disableAlarmCheckMontage = false; + + } + diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 1859e866..bff471d3 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -293,14 +293,15 @@ angular.module('zmApp.controllers') function loadAlarmStatus() { - if (NVRDataModel.versionCompare($rootScope.apiVersion, "1.30") == -1) { + if ((NVRDataModel.versionCompare($rootScope.apiVersion, "1.30") == -1) || + (NVRDataModel.getBandwidth() == 'lowbw') || + (NVRDataModel.getLogin().disableAlarmCheckMontage == true)) + { return; } - if (NVRDataModel.getBandwidth() == 'lowbw') { - return; - } + for (var i = 0; i < $scope.MontageMonitors.length; i++) { if (($scope.MontageMonitors[i].Monitor.Function == 'None') || diff --git a/www/js/app.js b/www/js/app.js index 93269a32..eb254aa8 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -578,8 +578,8 @@ angular.module('zmApp', [ $rootScope.newBlogPost = "(new post)"; return; + } - var mLastDate = moment(lastDate); var mItemDate = moment(data[0].date); @@ -1501,7 +1501,7 @@ angular.module('zmApp', [ //$translateProvider.useLocalStorage(); - $translateProvider.registerAvailableLanguageKeys(['en', 'de', 'es', 'fr', 'it', 'ja', 'ko', 'zh', 'zh_CN', 'zh_TW', 'pt', 'hi'], { + $translateProvider.registerAvailableLanguageKeys(['en', 'de', 'es', 'fr', 'it', 'ja', 'ko', 'zh', 'zh_CN', 'zh_TW', 'pt', 'ar','hi'], { 'en_*': 'en', 'de_*': 'de', 'es_*': 'es', @@ -1510,6 +1510,7 @@ angular.module('zmApp', [ 'ja_*': 'ja', 'ko_*': 'ko', 'pt_*': 'pt', + 'ar_*': 'ar', 'hi_*': 'hi', '*': 'en' // must be last }); diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 7d1e33ee..ca8469c8 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -57,6 +57,8 @@ "kDeletingEvent" :"deleting event", "kDevOptions" :"Dev. Settings", "kDeveloperOptionsFor" :"Developer Options for", + "kDisableAlarmMontage" : "Disable alarm API in montage", + "kDisableAlarmMontageSub" : "may help if server gets overloaded", "kDisableNative" :"Disable Native transitions", "kDisableNativeSub" :"Enable if the menu is freezing", "kDisablePush" :"disable APNS/GCM", diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html index a2bf0e8c..98a9dcef 100644 --- a/www/templates/devoptions.html +++ b/www/templates/devoptions.html @@ -131,6 +131,10 @@ </div> <label> + <ion-toggle ng-model="loginData.disableAlarmCheckMontage" ng-checked="loginData.disableAlarmCheckMontage" toggle-class="toggle-calm">{{'kDisableAlarmMontage' | translate}}<p>{{'kDisableAlarmMontageSub' | translate}}</p></ion-toggle> + </label> + + <label> <ion-toggle ng-model="loginData.enableLogs" ng-checked="{{loginData.enableLogs}}" toggle-class="toggle-calm">{{'kEnableLogs' | translate}}</ion-toggle> </label> |