diff options
| -rw-r--r-- | www/js/DataModel.js | 39 | ||||
| -rw-r--r-- | www/js/EventCtrl.js | 20 | ||||
| -rw-r--r-- | www/js/EventModalCtrl.js | 5 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 2 | ||||
| -rw-r--r-- | www/templates/events.html | 6 |
5 files changed, 60 insertions, 12 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index e5d366c4..eda58e8a 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -1028,8 +1028,11 @@ angular.module('zmApp.controllers') zmDebug ("portal parsed is " + JSON.stringify(p)); var st = ""; + var baseurl = ""; + st+= (s.scheme? s.scheme: p.scheme)+"://"; // server scheme overrides + // if server doesn't have a protocol, what we want is in path if (!s.host) { @@ -1038,13 +1041,22 @@ angular.module('zmApp.controllers') } st+=s.host; + + if (p.port || s.port) { st+= (s.port ? ":"+s.port: ":"+p.port); + } + + baseurl = st; + st+= (s.path? s.path: p.path); monitors[i].Monitor.streamingURL = st; + monitors[i].Monitor.baseURL = baseurl; + zmDebug ("Streaming URL for Monitor " + i + " is " + monitors[i].Monitor.streamingURL ); + zmDebug ("Base URL for Monitor " + i + " is " + monitors[i].Monitor.baseURL ); } } @@ -1060,7 +1072,9 @@ angular.module('zmApp.controllers') monitors[i].Monitor.isAlarmed = false; monitors[i].Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); monitors[i].Monitor.streamingURL = loginData.streamingurl; + monitors[i].Monitor.baseURL = loginData.url; + } d.resolve(monitors); @@ -1343,6 +1357,31 @@ angular.module('zmApp.controllers') } return "(Unknown)"; }, + + getStreamingURL: function (id) { + var idnum = parseInt(id); + for (var i = 0; i < monitors.length; i++) { + if (parseInt(monitors[i].Monitor.Id) == idnum) { + // console.log ("Matched, exiting getMonitorname"); + return monitors[i].Monitor.streamingURL; + } + + } + return "(Unknown)"; + }, + + getBaseURL: function (id) { + var idnum = parseInt(id); + for (var i = 0; i < monitors.length; i++) { + if (parseInt(monitors[i].Monitor.Id) == idnum) { + // console.log ("Matched, exiting getMonitorname"); + return monitors[i].Monitor.baseURL; + } + + } + return "(Unknown)"; + }, + }; }]); diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 28b64adc..27b1aee0 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -84,6 +84,7 @@ angular.module('zmApp.controllers') document.addEventListener("pause", onPause, false); //console.log("I got STATE PARAM " + $stateParams.id); $scope.id = parseInt($stateParams.id, 10); + // $scope.connKey = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111; @@ -121,7 +122,7 @@ angular.module('zmApp.controllers') title: "" }; $scope.search = { - text: "" + }; $scope.myfilter = ""; $scope.eventCommands = eventCommands; @@ -203,7 +204,7 @@ angular.module('zmApp.controllers') .then(function (data) { // console.log("EventCtrl Got events"); //var events = []; - + console.log ("********** MULTISERVER"); var myevents = data; ZMDataModel.zmDebug("EventCtrl: success, got " + myevents.length + " events"); var loginData = ZMDataModel.getLogin(); @@ -214,7 +215,7 @@ angular.module('zmApp.controllers') idfound = false; for (var ii = 0; ii < $scope.monitors.length; ii++) { if ($scope.monitors[ii].Monitor.Id == myevents[i].Event.MonitorId) { - + //console.log ( $scope.monitors[ii].Monitor.Id + " MATCHES " + myevents[i].Event.MonitorId); idfound = true; break; @@ -223,6 +224,12 @@ angular.module('zmApp.controllers') } + myevents[i].Event.streamingURL = ZMDataModel.getStreamingURL (myevents[i].Event.MonitorId); + myevents[i].Event.baseURL = ZMDataModel.getBaseURL (myevents[i].Event.MonitorId); + console.log ("***** MULTISERVER STREAMING URL FOR EVENTS " + myevents[i].Event.streamingURL); + + console.log ("***** MULTISERVER BASE URL FOR EVENTS " + myevents[i].Event.baseURL); + myevents[i].Event.MonitorName = ZMDataModel.getMonitorName(myevents[i].Event.MonitorId); myevents[i].Event.ShowScrub = false; myevents[i].Event.height = zm.eventsListDetailsHeight; @@ -237,7 +244,7 @@ angular.module('zmApp.controllers') var min = moment(str).format('mm'); var sec = moment(str).format('ss'); - myevents[i].Event.BasePath = loginData.url + "/events/" + + myevents[i].Event.BasePath = myevents[i].Event.baseURL + "/events/" + myevents[i].Event.MonitorId + "/" + yy + "/" + mm + "/" + @@ -797,7 +804,7 @@ angular.module('zmApp.controllers') event.Event.DefaultVideo = ""; // grab video details event.Event.video = {}; - var videoURL = loginData.url + "/events/" + event.Event.relativePath + event.Event.DefaultVideo; + var videoURL = event.Event.baseURL + "/events/" + event.Event.relativePath + event.Event.DefaultVideo; // console.log("************** VIDEO IS " + videoURL); event.Event.video.config = { @@ -1258,7 +1265,7 @@ angular.module('zmApp.controllers') var min = moment(str).format('mm'); var sec = moment(str).format('ss'); - basePath = loginData.url + "/events/" + + basePath = event.Event.baseURL + "/events/" + event.Event.MonitorId + "/" + yy + "/" + mm + "/" + @@ -1472,6 +1479,7 @@ angular.module('zmApp.controllers') //console.log ( $scope.monitors[ii].Monitor.Id + " MATCHES " + myevents[i].Event.MonitorId); idfound = true; + break; } } diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index a98ad2a8..726cbc04 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -141,7 +141,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro $http({ method: 'POST', /*timeout: 15000,*/ - url: loginData.url + '/index.php', + url: $scope.commandURL + '/index.php', headers: { 'Content-Type': 'application/x-www-form-urlencoded', //'Accept': '*/*', @@ -660,7 +660,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro //$scope.singleImageQuality = 100; - + $scope.commandURL = $scope.currentEvent.Event.baseURL; + ZMDataModel.zmLog (">>>>>>>>>>>>>>>>>>ZMS url command is " + $scope.commandURL); currentEvent = $scope.currentEvent; diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index ac2065d7..10d52311 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -43,7 +43,7 @@ <!--<div style="color:white">connkey:{{connKey}}</div>--> <div style="width:100vw; height:100vh" > - <img image-spinner-src="{{loginData.streamingurl}}/nph-zms?source=event&mode=jpeg&event={{eventId}}&frame=1&replay={{currentStreamMode}}&rate=100&connkey={{connKey}}&scale={{singleImageQuality}}{{$root.authSession}}" ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}" on-double-tap="closeModal();"/> + <img image-spinner-src="{{event.Event.streamingURL}}/nph-zms?source=event&mode=jpeg&event={{eventId}}&frame=1&replay={{currentStreamMode}}&rate=100&connkey={{connKey}}&scale={{singleImageQuality}}{{$root.authSession}}" ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}" on-double-tap="closeModal();"/> <div ng-if="isPaused" style="position:absolute; top:50%; left:50%;white-space:nowrap;overflow:hidden;z-index:999" class="header-paused"> diff --git a/www/templates/events.html b/www/templates/events.html index 1a324d0d..13083ba0 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -150,13 +150,13 @@ <p>scroll <i class="icon ion-arrow-left-c"></i> <i class="icon ion-arrow-right-c"></i></p> <ion-scroll direction="x" overflow-scroll="false"> - + baseURL {{event.Event.baseURL}} <span ng-repeat="alarm in alarm_images"> <figure style="display:inline-block"> <figcaption><p>frame:{{alarm.id}} score:{{alarm.score}}</p></figcaption> - <img image-spinner-src="{{playbackURL}}/index.php?view=image&path={{event.Event.relativePath}}{{alarm.fname}}&height=380" style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(playbackURL,event.Event.relativePath,alarm.fname, alarm.id, event.Event.Id)"/> + <img image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{alarm.fname}}&height=380" style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.id, event.Event.Id)"/> </figure> @@ -194,7 +194,7 @@ <!-- <img imageonload="finishedLoadingImage($index)" image-spinner-src="{{playbackURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/> --> - <img imageonload="finishedLoadingImage($index)" image-spinner-src="{{playbackURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/> + <img imageonload="finishedLoadingImage($index)" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/> <br/> |