diff options
Diffstat (limited to 'www/js/DataModel.js')
| -rw-r--r-- | www/js/DataModel.js | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 3e5f41c1..25a42c86 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -20,7 +20,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.3.029"; + var zmAppVersion = "1.3.030"; var isBackground = false; var justResumed = false; var timeSinceResumed = -1; @@ -221,6 +221,11 @@ angular.module('zmApp.controllers') console.log('-->Error setting SSL permissive'); }); + if ($rootScope.platformOS == 'android') { + log (">>> Android: enabling inline image view for self signed certs"); + cordova.plugins.certificates.trustUnsecureCerts(true); + } + } else { log(">>>> Enabling strict SSL checking (turn off in Dev Options if you can't connect)"); @@ -2182,7 +2187,19 @@ angular.module('zmApp.controllers') // make them all show for now - + var recordingType = ''; + if (monitors[i].Monitor.SaveJPEGs>0) { + recordingType = $translate.instant('kImages'); + } + if (monitors[i].Monitor.VideoWriter > 0) { + if (recordingType.length) recordingType +=" + "; + recordingType = recordingType + $translate.instant('kVideo') + " ("; + recordingType = recordingType + ( monitors[i].Monitor.VideoWriter == 1 ? $translate.instant('kMonitorVideoEncode'): $translate.instant('kMonitorVideoPassThru')) + ")"; + } + + // in 1.30.4 these fields did not exist + + monitors[i].Monitor.recordingType = recordingType ? recordingType : $translate.instant ('kImages'); monitors[i].Monitor.listDisplay = 'show'; monitors[i].Monitor.isAlarmed = false; monitors[i].Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); |