diff options
| -rwxr-xr-x | www/js/DataModel.js | 7 | ||||
| -rw-r--r-- | www/js/DevOptionsCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/EventCtrl.js | 1 | ||||
| -rw-r--r-- | www/js/MonitorCtrl.js | 2 | ||||
| -rw-r--r-- | www/lang/locale-en.json | 2 | ||||
| -rw-r--r-- | www/templates/devoptions.html | 66 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 3 | ||||
| -rw-r--r-- | www/templates/eventserversettings.html | 14 | ||||
| -rw-r--r-- | www/templates/log.html | 2 | ||||
| -rw-r--r-- | www/templates/login.html | 8 | ||||
| -rw-r--r-- | www/templates/wizard.html | 6 |
11 files changed, 49 insertions, 64 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 97bbe4fd..8824d162 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -981,6 +981,8 @@ angular.module('zmApp.controllers') debug("reachability does not exist. Setting to true"); loginData.reachability = true; } + + // force it - this may not be the problem loginData.reachability = true; @@ -1283,12 +1285,17 @@ angular.module('zmApp.controllers') loginData.showLiveForInProgressEvents = true; } + + loginData.canSwipeMonitors = true; + loginData.forceImageModePath = false; + loginData.enableBlog = true; log("DataModel init retrieved store loginData"); } else { log("defaultServer configuration NOT found. Keeping login at defaults"); } + //console.log ("LOGS="+JSON.stringify(loginData.enableLogs)); // now set up SSL - need to do it after data return // from local forage setSSLCerts(); diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js index 9ae1ba39..9b4bd2c9 100644 --- a/www/js/DevOptionsCtrl.js +++ b/www/js/DevOptionsCtrl.js @@ -58,6 +58,8 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope' { //console.log("**VIEW ** DevOptions Ctrl Entered"); $scope.loginData = NVRDataModel.getLogin(); + console.log ("DEV LOGS="+$scope.loginData.enableLogs); + $scope.isMultiPort = false; NVRDataModel.getZmsMultiPortSupport() diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index be9e0665..c6427844 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -594,6 +594,7 @@ angular.module('zmApp.controllers') //console.log("***ERROR"); } + function saveNow(imgsrc, r, f) { diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js index 74842c08..b41abfd0 100644 --- a/www/js/MonitorCtrl.js +++ b/www/js/MonitorCtrl.js @@ -150,7 +150,7 @@ angular.module('zmApp.controllers') $rootScope.zmPopup = $ionicPopup.show( { scope: $scope, - template: '<ion-toggle ng-model="monfunc.myenabled" ng-checked="monfunc.myenabled" toggle-class="toggle-calm">Enabled</ion-toggle><ion-radio-fix ng-repeat="item in monFunctions" ng-value="item.value" ng-model="monfunc.myfunc"> {{item.text}} </ion-radio-fix>', + template: '<ion-toggle ng-model="monfunc.myenabled" toggle-class="toggle-calm">Enabled</ion-toggle><ion-radio-fix ng-repeat="item in monFunctions" ng-value="item.value" ng-model="monfunc.myfunc"> {{item.text}} </ion-radio-fix>', title: $translate.instant('kChangeSettingsFor') + ' ' + monitorName, diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 77961cfe..e394c483 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -65,7 +65,7 @@ "kDisableAlarmMontageSub" :"may help if server gets overloaded", "kDisableNative" :"Disable Native transitions", "kDisableNativeSub" :"Enable if the menu is freezing", - "kDisablePush" :"disable APNS/GCM", + "kDisablePush" :"disable FCM", "kDisableSamsung" :"If you are on a samsung device and are facing input issues, please temporarily disable auto-correction", "kDisableSimulStreaming" :"Ignore ZM 1.32.0 multi-port", "kDisableSimulStreamingNote" :"(disabling in iOS may cause issues)", diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html index fb26a293..86c19561 100644 --- a/www/templates/devoptions.html +++ b/www/templates/devoptions.html @@ -18,36 +18,24 @@ </label> </div> <label> - <ion-toggle ng-model="loginData.use24hr" ng-checked="{{loginData.use24hr}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnable24hr' | translate}}</span></ion-toggle> + <ion-toggle ng-model="loginData.use24hr" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnable24hr' | translate}}</span></ion-toggle> </label> <label> - <ion-toggle ng-model="loginData.useLocalTimeZone" ng-checked="{{loginData.useLocalTimeZone}}" ng-disabled="!isTzSupported()" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kLocalTimeZone' | translate}}<span ng-if="!isTzSupported()"><p>{{'kTimeZoneNotSupported' | translate}}</p></span><span ng-if="isTzSupported()"><p>{{'kServerTimeZone' | translate}}:{{getTimeZoneNow()}}</p></span></span> + <ion-toggle ng-model="loginData.useLocalTimeZone" ng-disabled="!isTzSupported()" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kLocalTimeZone' | translate}}<span ng-if="!isTzSupported()"><p>{{'kTimeZoneNotSupported' | translate}}</p></span><span ng-if="isTzSupported()"><p>{{'kServerTimeZone' | translate}}:{{getTimeZoneNow()}}</p></span></span> </ion-toggle> </label> <label> - <ion-toggle ng-model="loginData.showLiveForInProgressEvents" ng-checked="{{loginData.showLiveForInProgressEvents}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kShowLiveForInProgress' | translate}}</span> + <ion-toggle ng-model="loginData.showLiveForInProgressEvents" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kShowLiveForInProgress' | translate}}</span> </ion-toggle> </label> <div ng-if="$root.platformOS=='android'"> <label> - <ion-toggle ng-model="loginData.exitOnSleep" ng-checked="{{loginData.exitOnSleep}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kExitAppBackground' | translate}}</span></ion-toggle> + <ion-toggle ng-model="loginData.exitOnSleep" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kExitAppBackground' | translate}}</span></ion-toggle> </label> </div> - <!-- - <label> - <ion-toggle ng-model="loginData.useNphZms" - ng-checked="{{loginData.useNphZms}}" - toggle-class="toggle-calm">use ZMS for single live view</ion-toggle> - </label> - - <label> - <ion-toggle ng-model="loginData.useNphZmsForEvents" - ng-checked="{{loginData.useNphZmsForEvents}}" - toggle-class="toggle-calm">use ZMS for events footage</ion-toggle> - </label> - --> + <div class="item item-text-wrap item-input-inset"> {{'kMaxMonitorsMontage' | translate }} <label class="item-input-wrapper"> @@ -117,52 +105,52 @@ </div> <label> - <ion-toggle ng-model="loginData.hideArchived" ng-checked="loginData.hideArchived" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kHideArchived' | translate}} + <ion-toggle ng-model="loginData.hideArchived" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kHideArchived' | translate}} </span> </ion-toggle> </label> <label ng-if="$root.platformOS!='desktop'"> - <ion-toggle ng-model="loginData.enableStrictSSL" ng-checked="loginData.enableStrictSSL" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnableStrictSSL' | translate}} + <ion-toggle ng-model="loginData.enableStrictSSL" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnableStrictSSL' | translate}} </span> </ion-toggle> </label> <label> - <ion-toggle ng-model="loginData.enableGIFMP4" ng-checked="loginData.enableGIFMP4" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnableGIFMP4' | translate}} + <ion-toggle ng-model="loginData.enableGIFMP4" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnableGIFMP4' | translate}} </span> </ion-toggle> </label> <label> - <ion-toggle ng-model="loginData.enableThumbs" ng-checked="loginData.enableThumbs" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnableThumbs' | translate}} + <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> <label> - <ion-toggle ng-model="loginData.enableSlowLoading" ng-checked="loginData.enableSlowLoading" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnableSlowLoading' | translate}} + <ion-toggle ng-model="loginData.enableSlowLoading" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnableSlowLoading' | translate}} </span> </ion-toggle> </label> <label> - <ion-toggle ng-model="loginData.disableAlarmCheckMontage" ng-checked="loginData.disableAlarmCheckMontage" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kDisableAlarmMontage' | translate}} + <ion-toggle ng-model="loginData.disableAlarmCheckMontage" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kDisableAlarmMontage' | translate}} <p>{{'kDisableAlarmMontageSub' | translate}}</p></span> </ion-toggle> </label> <label> - <ion-toggle ng-model="loginData.insertBasicAuthToken" ng-checked="loginData.insertBasicAuthToken" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kInsertBasicAuthToken' | translate}} + <ion-toggle ng-model="loginData.insertBasicAuthToken" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kInsertBasicAuthToken' | translate}} <p>{{'kInsertBasicAuthTokenNote' | translate}}</p></span> </ion-toggle> </label> <label ng-if="isMultiPort"> - <ion-toggle ng-model="loginData.disableSimulStreaming" ng-checked="loginData.disableSimulStreaming" + <ion-toggle ng-model="loginData.disableSimulStreaming" ng-change="checkMultiPortToggle()" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kDisableSimulStreaming' | translate}} <p ng-if="$root.platformOS=='ios'">{{'kDisableSimulStreamingNote' | translate}}</p> </span> @@ -170,8 +158,13 @@ </label> <label> - <ion-toggle ng-model="loginData.enableLogs" ng-checked="{{loginData.enableLogs}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnableLogs' | translate}}</span></ion-toggle> + <ion-toggle ng-model="loginData.enableLogs" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnableLogs' | translate}}</span></ion-toggle> </label> + + <label> + <ion-toggle ng-if="loginData.enableLogs" ng-model="loginData.enableDebug" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnableDebug' | translate}}</span></ion-toggle> + </label> + <div class="item item-text-wrap item-input-inset"> {{'kCycleMonitorsInterval'|translate}}({{'kSec'|translate}}.) <label class="item-input-wrapper"> @@ -187,25 +180,10 @@ </div> - <label> - <ion-toggle ng-if="loginData.enableLogs" ng-model="loginData.enableDebug" ng-checked="{{loginData.enableDebug}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnableDebug' | translate}}</span></ion-toggle> - </label> - <label> - <ion-toggle ng-model="loginData.canSwipeMonitors" ng-checked="{{loginData.canSwipeMonitors}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kSwipeToChangeMon' | translate}}</span></ion-toggle> - </label> - <label> - <ion-toggle ng-model="loginData.forceImageModePath" ng-checked="{{loginData.forceImageModePath}}" toggle-class="toggle-calm"> <span class="item-text-wrap">{{'kForceImagePath' | translate}}</span></ion-toggle> - </label> - <!-- - <label> - <ion-toggle ng-model="loginData.reachability" ng-checked="{{loginData.reachability}}" toggle-class="toggle-calm"> {{'kReachability' | translate}}</ion-toggle> - </label> - --> - <label> - <ion-toggle ng-model="loginData.enableBlog" ng-checked="{{loginData.enableBlog}}" toggle-class="toggle-calm"> <span class="item-text-wrap">{{'kEnableNewsUpdates' | translate}}</span></ion-toggle> - </label> + + <label ng-if="$root.platformOS != 'desktop'"> - <ion-toggle ng-model="loginData.disableNative" ng-checked="{{loginData.disableNative}}" toggle-class="toggle-calm"> <span class="item-text-wrap">{{'kDisableNative' | translate}} + <ion-toggle ng-model="loginData.disableNative" toggle-class="toggle-calm"> <span class="item-text-wrap">{{'kDisableNative' | translate}} <p>{{'kDisableNativeSub' | translate}}</p></span> </ion-toggle> </label> diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 4cd1bf38..36810257 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -10,7 +10,7 @@ <div style="white-space:nowrap;"> <span ng-repeat="alarm in alarm_images"> <figure class="animated slideInLeft" style="display:inline-block"> - <img ng-src="{{constructFrame(alarm.frameid)}}" fallback-src="img/frameerror.png" style="width: auto; height: auto;max-width: 100%;max-height: 100px" ng-click="changeSnapshot(alarm.frameid)" /> + <img ng-src="{{constructFrame(alarm.frameid)}}" fallback-src="img/frameerror.png" style="width: auto; height: auto;max-width: 100%;max-height: 100px" ng-click="changeSnapshot(alarm.frameid)" on-double-tap="closeModal();" /> </figure> </span> </div> @@ -26,6 +26,7 @@ <div style="width:100vw; height:100vh;"> <div ng-if="isSnapShot() && !liveFeedMid" class="event-modal-play"> + <button class="button button-assertive icon ion-play" ng-click="convertSnapShotToStream()"> {{'kPlay'|translate}}</button> </div> diff --git a/www/templates/eventserversettings.html b/www/templates/eventserversettings.html index 02107ed6..1eff634b 100644 --- a/www/templates/eventserversettings.html +++ b/www/templates/eventserversettings.html @@ -11,7 +11,7 @@ <div class="list list-inset"> {{'kEventServerConfig1' | translate }} </div> - <ion-checkbox ng-model="loginData.isUseEventServer" ng-checked="loginData.isUseEventServer">{{'kUseEventServer' | translate}}</ion-checkbox> + <ion-checkbox ng-model="loginData.isUseEventServer">{{'kUseEventServer' | translate}}</ion-checkbox> <ion-item ng-href="" ng-click="selectScreen()"> {{'kOnTapNavigate' | translate}}: {{defScreen}} </ion-item> @@ -19,16 +19,14 @@ <span class="input-label">{{'kEventServer' | translate}}</span> <input autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="{{'kEventNotificationUrl' | translate}}" ng-model="loginData.eventServer"> </label> - <ion-toggle ng-if="loginData.isUseEventServer" ng-model="loginData.disablePush" ng-checked="loginData.disablePush" toggle-class="toggle-calm" class="item-text-wrap">{{'kOnlyUseWebSocket'| translate }} + <ion-toggle ng-if="loginData.isUseEventServer" ng-model="loginData.disablePush" toggle-class="toggle-calm" class="item-text-wrap">{{'kOnlyUseWebSocket'| translate }} <br/> <p>{{'kDisablePush' | translate }}</p> </ion-toggle> <!-- vibrate app setting is not av. on iOS--> - <ion-toggle ng-if="loginData.isUseEventServer && $root.platformOS !='ios'" ng-model="loginData.vibrateOnPush" ng-checked="loginData.vibrateOnPush" toggle-class="toggle-calm">{{'kVibrateOnPush'| translate }}</ion-toggle> - <ion-toggle ng-if="loginData.isUseEventServer" ng-model="loginData.soundOnPush" ng-checked="loginData.soundOnPush" toggle-class="toggle-calm" class="item-text-wrap">{{'kSoundOnPush'| translate }}</ion-toggle> - <!-- - <ion-toggle ng-model="loginData.defaultPushSound" toggle-class="toggle-calm" class="item-text-wrap" ng-checked="{{loginData.defaultPushSound}}">use system sound<p>please save and restart app</p></ion-toggle> - --> + <ion-toggle ng-if="loginData.isUseEventServer && $root.platformOS !='ios'" ng-model="loginData.vibrateOnPush" toggle-class="toggle-calm">{{'kVibrateOnPush'| translate }}</ion-toggle> + <ion-toggle ng-if="loginData.isUseEventServer" ng-model="loginData.soundOnPush" toggle-class="toggle-calm" class="item-text-wrap">{{'kSoundOnPush'| translate }}</ion-toggle> + <ion-list> <div ng-repeat="monitor in monitors"> <ion-item class="custom-list" ng-click="toggleGroup(monitor)" ng-class="{active: isGroupShown(monitor)}"> @@ -39,7 +37,7 @@ {{'kReportEvents' | translate }} <label class="checkbox"> - <input type="checkbox" ng-model="monitor.Monitor.isChecked" ng-checked="monitor.Monitor.isChecked"> + <input type="checkbox" ng-model="monitor.Monitor.isChecked" > </label> </span> </ion-item> diff --git a/www/templates/log.html b/www/templates/log.html index af5e345e..144ada6a 100644 --- a/www/templates/log.html +++ b/www/templates/log.html @@ -2,7 +2,7 @@ <ion-nav-buttons side="left"> <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button> - <button ng-class="selectOn? 'button button-icon button-clear ion-ios-copy':'button button-icon button-clear ion-ios-copy-outline'" ng-click="selectToggle()"></button> + <button ng-class="selectOn? 'button button-icon button-clear ion-ios-copy':'button button-icon button-clear ion-ios-copy-outline'" ng-click="selectToggle()"></button> <button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" ng-click="handleAlarms();" ng-if="$root.isAlarm"></button> </ion-nav-buttons> diff --git a/www/templates/login.html b/www/templates/login.html index 60f6642e..cbd5a024 100644 --- a/www/templates/login.html +++ b/www/templates/login.html @@ -86,15 +86,13 @@ </a> <div ng-if="$root.platformOS != 'desktop'"> <label> - <ion-toggle ng-model="loginData.usePin" ng-change="pinPrompt();" ng-checked="{{loginData.usePin}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kPassword' | translate}} {{'kProtect'|translate}}</span></ion-toggle> + <ion-toggle ng-model="loginData.usePin" ng-change="pinPrompt();" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kPassword' | translate}} {{'kProtect'|translate}}</span></ion-toggle> </label> </div> - <!--<label> - <ion-toggle ng-model="loginData.useSSL" ng-checked="{{loginData.useSSL}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kUseSSL' | translate}}</span></ion-toggle> - </label>--> + <div ng-if="$root.platformOS != 'desktop'"> <label> - <ion-toggle ng-model="loginData.keepAwake" ng-checked="{{loginData.keepAwake}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kAwake1'|translate}} + <ion-toggle ng-model="loginData.keepAwake" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kAwake1'|translate}} <p>{{'kAwake2'| translate}}</p></span> </ion-toggle> </label> diff --git a/www/templates/wizard.html b/www/templates/wizard.html index 872dc7fb..7c6dc887 100644 --- a/www/templates/wizard.html +++ b/www/templates/wizard.html @@ -28,8 +28,8 @@ <h4>{{'kWizPortalAuth' | translate}}</h4> <!--<img src="img/wizard.svg" width="100px" style="float:left"/>--> <p>{{'kWizPortalText' | translate}}</p> - <ion-toggle ng-change="toggleAuth()" ng-model="wizard.useauth" ng-checked="wizard.useauth" toggle-class="toggle-calm">{{'kWizUseAuth' | translate}}</ion-toggle> - <ion-toggle ng-show="wizard.useauth" ng-model="wizard.usezmauth" ng-checked="wizard.usezmauth" toggle-class="toggle-calm">{{'kWizZMAuth' | translate}}</ion-toggle> + <ion-toggle ng-change="toggleAuth()" ng-model="wizard.useauth" toggle-class="toggle-calm">{{'kWizUseAuth' | translate}}</ion-toggle> + <ion-toggle ng-show="wizard.useauth" ng-model="wizard.usezmauth" toggle-class="toggle-calm">{{'kWizZMAuth' | translate}}</ion-toggle> <div ng-if="wizard.usezmauth"> <label class="item item-input item-floating-label"> <span class="input-label">{{'kUserName' | translate}}</span> @@ -41,7 +41,7 @@ <!--<p >{{'kWizPasswdNote' | translate}}</p>--> </label> </div> - <ion-toggle ng-show="wizard.useauth" ng-model="wizard.usebasicauth" ng-checked="wizard.usebasicauth" toggle-class="toggle-calm">{{'kWizBasicAuth' | translate}}<p ng-show="wizard.usebasicauth">{{'kWarningBasicAuth'|translate}}</p></ion-toggle> + <ion-toggle ng-show="wizard.useauth" ng-model="wizard.usebasicauth" toggle-class="toggle-calm">{{'kWizBasicAuth' | translate}}<p ng-show="wizard.usebasicauth">{{'kWarningBasicAuth'|translate}}</p></ion-toggle> <label class="item item-input item-floating-label" ng-show="wizard.usebasicauth"> <span class="input-label">{{'kUserName' | translate}}</span> |