diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/DataModel.js | 12 | ||||
| -rw-r--r-- | www/templates/devoptions.html | 7 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 4 | ||||
| -rw-r--r-- | www/templates/events.html | 4 |
4 files changed, 22 insertions, 5 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 3ea54158..8cc58798 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -49,6 +49,7 @@ angular.module('zmApp.controllers') 'canSwipeMonitors':true, 'persistMontageOrder':false, 'onTapScreen':'events', + 'enableh264':true, }; @@ -296,6 +297,12 @@ angular.module('zmApp.controllers') } + if (window.localStorage.getItem("enableh264") != undefined) { + var enableh264 = window.localStorage.getItem("enableh264"); + loginData.enableh264 = (enableh264 == "1") ? true:false; + } + + if (window.localStorage.getItem("usePin") != undefined) { var pinValue = window.localStorage.getItem("usePin"); loginData.usePin = (pinValue == "1") ? true:false; @@ -423,6 +430,9 @@ angular.module('zmApp.controllers') window.localStorage.setItem("usePin", loginData.usePin?"1":"0"); window.localStorage.setItem("canSwipeMonitors", loginData.canSwipeMonitors?"1":"0"); window.localStorage.setItem("persistMontageOrder", loginData.persistMontageOrder?"1":"0"); + + window.localStorage.setItem("enableh264", loginData.enableh264?"1":"0"); + window.localStorage.setItem("pinCode", loginData.pinCode); @@ -437,7 +447,7 @@ angular.module('zmApp.controllers') window.localStorage.setItem("isUseEventServer", loginData.isUseEventServer); window.localStorage.setItem("disablePush", loginData.disablePush); window.localStorage.setItem("onTapScreen", loginData.onTapScreen); - + console.log ("***** SETTING ISUSEAUTH TO " + loginData.isUseAuth); diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html index 78c5dbbb..c6a56447 100644 --- a/www/templates/devoptions.html +++ b/www/templates/devoptions.html @@ -62,6 +62,13 @@ ng-checked="{{loginData.persistMontageOrder}}" toggle-class="toggle-calm">Persist hidden monitors</ion-toggle> </label> + + + <label> + <ion-toggle ng-model="loginData.enableh264" + ng-checked="{{loginData.enableh264}}" + toggle-class="toggle-calm">Enable H.264 video branch support</ion-toggle> + </label> </div> diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index f0d32d52..ee3be1b2 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -7,7 +7,7 @@ <div style="height: 100vh;"> - <div ng-if="defaultVideo==''"> + <div ng-if="defaultVideo=='' || loginData.enableh264==false"> <ul rn-carousel rn-carousel-buffered rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{calcMsTimer(eFramesNum, eventDur)/1000.0}}" rn-carousel-pause-on-hover> <li ng-repeat="slide in slides"> @@ -24,7 +24,7 @@ </div> <!-- no default video --> - <div ng-if="defaultVideo!=''"> + <div ng-if="defaultVideo!='' && loginData.enableh264 == true"> <div> <videogular vg-theme="videoObject.config.theme"> <vg-media vg-src="videoObject.config.sources" vg-native-controls="true"> diff --git a/www/templates/events.html b/www/templates/events.html index ef6bf0d0..32fcd70a 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -121,7 +121,7 @@ <!-- this is the event scrub area --> <div ng-if="isGroupShown(event)"> - <div ng-if="event.Event.DefaultVideo==''"> + <div ng-if="event.Event.DefaultVideo=='' || loginData.enableh264==false"> <br/> @@ -152,7 +152,7 @@ <!-- no DefaultVideo --> - <div ng-if="event.Event.DefaultVideo!=''"> + <div ng-if="event.Event.DefaultVideo!='' && loginData.enableh264 == true"> <br/> <br/> |