diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/MonitorCtrl.js | 7 | ||||
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 60 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 7 |
3 files changed, 69 insertions, 5 deletions
diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js index 97110760..900084cb 100644 --- a/www/js/MonitorCtrl.js +++ b/www/js/MonitorCtrl.js @@ -346,6 +346,11 @@ angular.module('zmApp.controllers') $scope.LoginData = ZMDataModel.getLogin(); $rootScope.modalRand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111; + + $scope.ptzWakeCommand = ""; + $scope.ptzSleepCommand = ""; + $scope.ptzResetCommand = ""; + $scope.ptzMoveCommand = ""; $scope.ptzStopCommand = ""; @@ -493,4 +498,4 @@ angular.module('zmApp.controllers') }; -}]);
\ No newline at end of file +}]); diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index e4912294..cbfa972d 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -1031,6 +1031,10 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ // function configurePTZ(mid) { + $scope.ptzWakeCommand = ""; + $scope.ptzSleepCommand = ""; + $scope.ptzResetCommand = ""; + $scope.ptzMoveCommand = ""; $scope.ptzStopCommand = ""; @@ -1048,17 +1052,46 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ .success (function (data) { $scope.isControllable = data.monitor.Monitor.Controllable; + + // *** Only for testing - comment out // + //$scope.isControllable = '1'; // for testing only // $scope.isControllable = 1; $scope.controlid = data.monitor.Monitor.ControlId; - if ($scope.isControllable=='1') + if ($scope.isControllable=='1' ) { + + var apiurl = ZMDataModel.getLogin().apiurl; var myurl = apiurl + "/controls/" + $scope.controlid + ".json"; ZMDataModel.zmDebug("configurePTZ : getting controllable data " + myurl); $http.get(myurl) .success(function (data) { + + // *** Only for testing - comment out - start// + /*data.Control.Control.CanSleep = '1'; + data.Control.Control.CanWake = '1'; + data.Control.Control.CanReset = '1'; + data.Control.Control.CanZoom = '1'; + data.control.Control.HasPresets = '1'; + data.control.Control.HasHomePreset = '1';*/ + // *** Only for testing - comment out - end // + + if (data.control.Control.CanWake == '1') + { + $scope.ptzWakeCommand = 'wake'; + } + + if (data.control.Control.CanSleep == '1') + { + $scope.ptzSleepCommand = 'sleep'; + } + + if (data.control.Control.CanReset == '1') + { + $scope.ptzResetCommand = 'reset'; + } $scope.ptzMoveCommand = "move"; // start with as move; $scope.ptzStopCommand = ""; @@ -1127,8 +1160,29 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ if (data.control.Control.HasHomePreset == '1') { $scope.ptzPresets.unshift({name:'', icon:"ion-ios-home", cmd:'presetHome'}); + + } + + // lets add these to the end + // strictly speaking, they aren't really presets, but meh for now + + if (data.control.Control.CanWake == '1') + { + + $scope.ptzPresets.push({name:'', icon:"ion-eye", cmd:'wake'}); - $scope.ptzPresetCount++; + } + + if (data.control.Control.CanSleep == '1') + { + $scope.ptzPresets.push({name:'', icon:"ion-eye-disabled", cmd:'sleep'}); + + } + + if (data.control.Control.CanReset == '1') + { + $scope.ptzPresets.push({name:'', icon:"ion-ios-loop-strong", cmd:'reset'}); + } } @@ -1174,4 +1228,4 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ }); -}]);
\ No newline at end of file +}]); diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 6d93e753..c5ba05bd 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -664,6 +664,11 @@ function initPackery() $scope.LoginData = ZMDataModel.getLogin(); $rootScope.modalRand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111; + + $scope.ptzWakeCommand = ""; + $scope.ptzSleepCommand = ""; + $scope.ptzResetCommand = ""; + $scope.ptzMoveCommand = ""; $scope.ptzStopCommand = ""; @@ -1154,4 +1159,4 @@ $scope.$on('$ionicView.afterEnter', function () { }; -}]);
\ No newline at end of file +}]); |