diff options
Diffstat (limited to 'www/js/EventModalCtrl.js')
| -rw-r--r-- | www/js/EventModalCtrl.js | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 9a3730f7..81cf702a 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -185,6 +185,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro $scope.onCanPlay = function() { + console.log ("*********** CAN PLAY"); $ionicLoading.hide(); NVRDataModel.debug("This video can be played"); @@ -192,23 +193,17 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro // now set up cue points NVRDataModel.debug("Setting cue points.."); NVRDataModel.debug ("API-Total length:"+currentEvent.Event.Length); - - var vt1 = $filter('date')(handle.totalTime, "ss"); - - NVRDataModel.debug ("reported player length:"+vt1); - var factor = vt1/currentEvent.Event.Length; - NVRDataModel.debug ("hack - conversion factor:"+factor); - //NVRDataModel.debug ("Video-Total length left:"+handle.timeLeft); - //console.log ("jEvent=" + JSON.stringify(currentEvent)); - //var event = $scope.currentEvent.event; - // console.log (JSON.stringify(event)); - var st = moment(currentEvent.Event.StartTime); + NVRDataModel.debug ("Player-Total length:"+handle.totalTime/1000); + for (var l=0; l<currentEvent.Frame.length; l++ ) { if (currentEvent.Frame[l].Type=='Alarm') { - var ft = moment(currentEvent.Frame[l].TimeStamp); - var s = factor*Math.abs(st.diff(ft,'seconds')); + // var ft = moment(currentEvent.Frame[l].TimeStamp); + //var s = factor*Math.abs(st.diff(ft,'seconds')); + + var s = currentEvent.Frame[l].Delta; + //console.log("START="+currentEvent.Event.StartTime); //console.log("END="+currentEvent.Frame[l].TimeStamp); NVRDataModel.debug ("alarm cue at:"+s+"s"); |