summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/js/DataModel.js21
-rw-r--r--www/js/EventCtrl.js4
-rw-r--r--www/js/EventModalCtrl.js14
-rw-r--r--www/js/MomentCtrl.js18
-rwxr-xr-xwww/js/app.js4
-rw-r--r--www/lang/locale-pl.json2
-rw-r--r--www/templates/moment.html3
7 files changed, 37 insertions, 29 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 25a42c86..86c9415a 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -25,6 +25,10 @@ angular.module('zmApp.controllers')
var justResumed = false;
var timeSinceResumed = -1;
var monitorsLoaded = 0;
+ var snapshotFrame = 1; // will be 'snapshot'
+ // if ZM >= 1.31
+
+
var monitors = [];
var multiservers = [];
@@ -1780,10 +1784,19 @@ angular.module('zmApp.controllers')
$http.get(apiurl)
.then(function (success) {
if (success.data.version) {
- // console.log ("API VERSION RETURNED: " + JSON.stringify(success));
+ console.log ("API VERSION RETURNED: " + JSON.stringify(success));
$rootScope.apiValid = true;
+
+ if (versionCompare(success.data.version, '1.31.0') != -1 ) {
+ debug ("snapshot supported in image.php");
+ snapshotFrame = 'snapshot';
+ }
+ else {
+ debug ("snapshot NOT supported in image.php");
+ snapshotFrame = 1;
+ }
setCurrentServerVersion(success.data.version);
- debug("getAPI version succeded with " + success.data.version);
+ debug("getAPI version succeeded with " + success.data.version);
d.resolve(success.data.version);
} else {
debug("Setting APIValid to false as API version was not retrieved");
@@ -1952,6 +1965,10 @@ angular.module('zmApp.controllers')
return getBandwidth();
},
+ getSnapshotFrame: function () {
+ return snapshotFrame;
+ },
+
//-----------------------------------------------------------------------------
// This function returns a list of monitors
// if forceReload == 1 then it will force an HTTP API request to get a list of monitors
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 66ff6463..8947df19 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -2606,7 +2606,7 @@ angular.module('zmApp.controllers')
id: 'footage',
showLive: sl, // seems bool is not allowed...
snapshot: snapshot,
- snapshotId: event.Event.MaxScoreFrameId,
+ snapshotId: NVRDataModel.getSnapshotFrame(),
eventId: event.Event.Id
})
.then(function (modal) {
@@ -2881,7 +2881,7 @@ angular.module('zmApp.controllers')
var stream = "";
stream = event.Event.recordingURL +
"/index.php?view=image&show=capture&fid=" +
- (event.Event.MaxScoreFrameId ? event.Event.MaxScoreFrameId : "1&eid=" + event.Event.Id) +
+ NVRDataModel.getSnapshotFrame()+"&eid="+event.Event.Id +
"&width=" + event.Event.thumbWidth * 2 +
"&height=" + event.Event.thumbHeight * 2;
if ($rootScope.authSession != 'undefined') stream += $rootScope.authSession;
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 11a7434a..50da86d4 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -23,7 +23,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
var gEvent;
var handle;
var showLive = true;
- var isGlobalFid = false; // true if its set to MaxScoreFrameId in events
+ //var isGlobalFid = false; // true if its set to MaxScoreFrameId in events
var eventId = 0;
var isSnapShotEnabled = false;
@@ -1051,7 +1051,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
$scope.changeSnapshot = function (id) {
$scope.snapshotFrameId = id;
- isGlobalFid = false;
+ //isGlobalFid = false;
};
$scope.constructStream = function (monitor) {
@@ -1067,7 +1067,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
stream = currentEvent.Event.recordingURL +
"/index.php?view=image" +
"&fid=" + $scope.snapshotFrameId +
- (!isGlobalFid ? "&eid=" + $scope.eventId : "") +
+ "&eid=" + $scope.eventId +
"&scale=" + $scope.singleImageQuality +
$rootScope.authSession;
} else if (currentStreamState == streamState.ACTIVE) {
@@ -1134,10 +1134,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
currentStreamState = streamState.SNAPSHOT;
if (m.snapshotId) {
- $scope.snapshotFrameId = m.snapshotId;
-
- $scope.snapshotFrameId = m.snapshotId;
- isGlobalFid = true;
+ $scope.snapshotFrameId = NVRDataModel.getSnapshotFrame();
+ // isGlobalFid = false;
} else {
$scope.snapshotFrameId = 1;
isSnapShotEnabled = false;
@@ -1611,7 +1609,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
function jumpToEvent(eid, dirn) {
$scope.snapshotFrameId = 1;
$scope.isPaused = false;
- isGlobalFid = false;
+ //isGlobalFid = false;
var oState;
NVRDataModel.log("HERE: Event jump called with:" + eid);
if (eid == "") {
diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js
index 44f653df..ab243b3e 100644
--- a/www/js/MomentCtrl.js
+++ b/www/js/MomentCtrl.js
@@ -17,7 +17,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$
var excludeMonitors = [];
var excludeMonitorsFilter = "";
var momentType = "StartTime";
- $scope.isMaxScoreFramePresent = false;
+
$scope.openMenu = function () {
$ionicSideMenuDelegate.toggleLeft();
@@ -269,7 +269,8 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$
var stream = "";
// console.log ($scope.isMaxScoreFramePresent);
stream = moment.Event.recordingURL + "/index.php?view=image" +
- ($scope.isMaxScoreFramePresent ? "&fid=" + moment.Event.MaxScoreFrameId : "&eid=" + moment.Event.Id + "&fid=1") +
+ "&eid=" + moment.Event.Id + "&fid=" +
+ NVRDataModel.getSnapshotFrame() +
"&width=" + moment.Event.thumbWidth * 2 +
"&height=" + moment.Event.thumbHeight * 2;
@@ -638,7 +639,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$
id: 'footage',
showLive: sl,
snapshot: 'enabled',
- snapshotId: $scope.isMaxScoreFramePresent ? event.Event.MaxScoreFrameId : undefined,
+ snapshotId: 'snapshot',
eventId: event.Event.Id
//eventId:event.Event.Id
@@ -791,14 +792,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$
moments = objSort(moments, [sortCondition, ascordesc], ["dateObject", true]);
}
- // check the very first element for presence of maxscoreframe id
- // if its not there, we can't show snuff
- if (moments.length && !moments[0].Event.MaxScoreFrameId) {
- $scope.isMaxScoreFramePresent = false;
-
- } else {
- $scope.isMaxScoreFramePresent = true;
- }
+
$scope.moments = moments;
$timeout(function () {
initMasonry();
@@ -859,7 +853,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$
$scope.expand = ld.montageReviewCollapse;
console.log(">>>>>>>>> RESTORING EXPAND AS:" + $scope.expand);
- $scope.isMaxScoreFramePresent = false;
+
$scope.loadingStatus = $translate.instant('kLoading');
$scope.gridSize = ld.momentGridSize;
diff --git a/www/js/app.js b/www/js/app.js
index cf64c31b..86617745 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -90,9 +90,9 @@ angular.module('zmApp', [
minCycleTime: 5,
loginInterval: 1800000, //30m*60s*1000 - ZM auto login after 30 mins
- //loginInterval: 60000, // testing 1 min
- eventPlaybackQueryLowBW: 6000,
+ //loginInterval: 20000, // testing 20sec
loginIntervalLowBW: 1800000, //30m login
+ eventPlaybackQueryLowBW: 6000,
eventSingleImageQualityLowBW: 70,
monSingleImageQualityLowBW: 70,
diff --git a/www/lang/locale-pl.json b/www/lang/locale-pl.json
index 6a24dfcd..c18ffc16 100644
--- a/www/lang/locale-pl.json
+++ b/www/lang/locale-pl.json
@@ -227,6 +227,8 @@
"kMonStreamingURL" :"url Streamingu",
"kMonitorSingleImageScale" :"Skalowanie pojedynczego obrazy Podglądu na żywo",
"kMonitors" :"Monitory",
+ "kMonitorVideoPassThru" :"Obsługa H264",
+ "kMonitorVideoEncode" :"Kodowanie video X264",
"kMontage" :"Podgląd",
"kMontageDefaultProfile" :"wszystkie Podglądy",
"kMontageImageScale" :"Skalowanie obrazu Podglądu",
diff --git a/www/templates/moment.html b/www/templates/moment.html
index 0f0f55c4..9c4c13be 100644
--- a/www/templates/moment.html
+++ b/www/templates/moment.html
@@ -29,9 +29,6 @@
<div ng-if="areImagesLoading" class="screen-note">&nbsp;{{ 'kArrangingImages' | translate }}...&nbsp;</div>
- <div ng-if="!areImagesLoading && !isMaxScoreFramePresent" class="screen-note">&nbsp;{{ 'kApiUpgrade' | translate
- }}&nbsp;</div>
-
<div ng-if="isSubMenu">
<br />
<div id="flyoutmenu" style="float:left">
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 13:13:03 +0000