summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js')
-rw-r--r--www/js/EventCtrl.js2
-rw-r--r--www/js/EventDateTimeFilterCtrl.js4
-rw-r--r--www/js/EventModalCtrl.js10
-rw-r--r--www/js/MomentCtrl.js4
-rw-r--r--www/js/MontageCtrl.js13
-rw-r--r--www/js/MontageHistoryCtrl.js4
-rw-r--r--www/js/NVR.js22
-rw-r--r--www/js/TimelineCtrl.js6
-rwxr-xr-xwww/js/app.js18
9 files changed, 55 insertions, 28 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 30c94874..40762f6b 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -1875,7 +1875,7 @@ angular.module('zmApp.controllers')
//https://server/zm/api/events/consoleEvents/5%20minute.json
var ld = NVR.getLogin();
- var af = "/"+"AlarmFrames>=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0);
+ var af = "/"+"AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0);
if (ld.objectDetectionFilter) {
af = af + '/'+'Notes REGEXP:detected:';
diff --git a/www/js/EventDateTimeFilterCtrl.js b/www/js/EventDateTimeFilterCtrl.js
index 9e834f67..e2d7b22e 100644
--- a/www/js/EventDateTimeFilterCtrl.js
+++ b/www/js/EventDateTimeFilterCtrl.js
@@ -154,11 +154,11 @@ angular.module('zmApp.controllers')
for (var i=0; i < $scope.monitors.length; i++) {
if ($scope.monitors[i].Monitor.isChecked) {
totalChecked += 1;
- includeString = includeString + '/'+'MonitorId=:'+$scope.monitors[i].Monitor.Id;
+ includeString = includeString + '/'+'MonitorId =:'+$scope.monitors[i].Monitor.Id;
}
else {
totalUnchecked +=1;
- excludeString = excludeString + '/'+'MonitorId!=:'+$scope.monitors[i].Monitor.Id;
+ excludeString = excludeString + '/'+'MonitorId !=:'+$scope.monitors[i].Monitor.Id;
}
}
if (!totalUnchecked) {
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index c93bd8f4..228817c5 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1479,19 +1479,19 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
var loginData = NVR.getLogin();
var nextEvent = loginData.apiurl + "/events/index" +
"/StartTime >:" + currentEvent.Event.StartTime +
- ($scope.followSameMonitor == '1' ? "/"+"MonitorId=:" + currentEvent.Monitor.Id : "") ;
+ ($scope.followSameMonitor == '1' ? "/"+"MonitorId =:" + currentEvent.Monitor.Id : "") ;
if ($scope.useFilters) {
- nextEvent = nextEvent + "/"+"AlarmFrames>=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
+ nextEvent = nextEvent + "/"+"AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
}
nextEvent = nextEvent + ".json?sort=StartTime&direction=asc&limit=1"+$rootScope.authSession;
var prevEvent = loginData.apiurl + "/events/index" +
- "/"+"StartTime<:" + currentEvent.Event.StartTime +
- ($scope.followSameMonitor == '1' ? "/"+"MonitorId=:"+ currentEvent.Monitor.Id : "");
+ "/"+"StartTime <:" + currentEvent.Event.StartTime +
+ ($scope.followSameMonitor == '1' ? "/"+"MonitorId =:"+ currentEvent.Monitor.Id : "");
if ($scope.useFilters) {
- prevEvent = prevEvent + "/"+"AlarmFrames>=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
+ prevEvent = prevEvent + "/"+"AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
}
prevEvent = prevEvent + ".json?sort=StartTime&direction=desc&limit=1"+$rootScope.authSession;
diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js
index 07f8b09d..a990343a 100644
--- a/www/js/MomentCtrl.js
+++ b/www/js/MomentCtrl.js
@@ -73,7 +73,7 @@ var masonry = null;
excludeMonitorsFilter = "";
for (var i = 0; i < excludeMonitors.length; i++) {
- excludeMonitorsFilter = excludeMonitorsFilter + "/"+"MonitorId!=:" + excludeMonitors[i];
+ excludeMonitorsFilter = excludeMonitorsFilter + "/"+"MonitorId !=:" + excludeMonitors[i];
}
NVR.debug("Constructed Monitor Filter =" + excludeMonitorsFilter);
}
@@ -785,7 +785,7 @@ var masonry = null;
var ld = NVR.getLogin();
// in API, always sort by StartTime so all monitors are represented
- var myurl = ld.apiurl + "/events/index/"+"AlarmFrames>=:1" + excludeMonitorsFilter + "/"+"StartTime<=:" + timeTo + "/"+"EndTime>=:" + timeFrom + ".json?sort=" + "StartTime" + "&direction=desc"+$rootScope.authSession;
+ var myurl = ld.apiurl + "/events/index/"+"AlarmFrames >=:1" + excludeMonitorsFilter + "/"+"StartTime <=:" + timeTo + "/"+"EndTime >=:" + timeFrom + ".json?sort=" + "StartTime" + "&direction=desc"+$rootScope.authSession;
NVR.debug("Retrieving " + myurl);
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 6facc5be..90cfac1c 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -583,16 +583,16 @@ angular.module('zmApp.controllers')
// https:///zm/api/events/index/MonitorId=:2.json?sort=StartTime&direction=desc&limit=1
var apiurl = ld.apiurl +'/events/index'; // we need some interval or it errors
- apiurl += "/"+"MonitorId=:" + monitor.Monitor.Id;
+ apiurl += "/"+"MonitorId =:" + monitor.Monitor.Id;
if (monitor.Monitor.Id in ld.lastEventCheckTimes) {
// now is server TZ time
var now = ld.lastEventCheckTimes[monitor.Monitor.Id];
- apiurl += "/StartTime>:" + now;
+ apiurl += "/StartTime >:" + now;
}
- apiurl += "/"+"AlarmFrames>=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0);
+ apiurl += "/"+"AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0);
if (ld.objectDetectionFilter) {
apiurl +='/'+'Notes REGEXP:detected:';
}
@@ -919,6 +919,7 @@ angular.module('zmApp.controllers')
if ($scope.MontageMonitors[i].Monitor.listDisplay == 'show') NVR.killLiveStream($scope.MontageMonitors[i].Monitor.connKey, $scope.MontageMonitors[i].Monitor.controlURL);
}
// in context of timeout
+
$scope.reorder = {
selected:false
};
@@ -932,12 +933,18 @@ angular.module('zmApp.controllers')
$scope.modal = modal;
$scope.reOrderActive = true;
$scope.modal.show();
+ $scope.reorder = {
+ selected:false
+ };
});
});
} else {
+ $scope.reorder = {
+ selected:false
+ };
$ionicModal.fromTemplateUrl('templates/reorder-modal.html', {
scope: $scope,
animation: 'slide-in-up',
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 4363099a..50ed1430 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -264,7 +264,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
function getNextSetHistory() {
// grab events that start on or after the time
- apiurl = ld.apiurl + "/events/index/"+"StartTime>=:" + TimeObjectFrom + "/"+"AlarmFrames>=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json?sort=StartTime&direction=asc"+$rootScope.authSession;
+ apiurl = ld.apiurl + "/events/index/"+"StartTime >=:" + TimeObjectFrom + "/"+"AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json?sort=StartTime&direction=asc"+$rootScope.authSession;
NVR.log("Grabbing history using: " + apiurl);
// make sure there are no more than 5 active streams (noevent is ok)
$scope.currentLimit = $scope.monLimit;
@@ -357,7 +357,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
for (i = 0; i < $scope.MontageMonitors.length; i++) {
//console.log("Fair chance check for " + $scope.MontageMonitors[i].Monitor.Name);
if ($scope.MontageMonitors[i].Monitor.eventUrl == 'img/noimage.png') {
- var indivGrab = ld.apiurl + "/events/index/MonitorId:" + $scope.MontageMonitors[i].Monitor.Id + "/"+"StartTime>=:" + TimeObjectFrom + "/"+"AlarmFrames>=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json?"+$rootScope.authSession;
+ var indivGrab = ld.apiurl + "/events/index/MonitorId:" + $scope.MontageMonitors[i].Monitor.Id + "/"+"StartTime >=:" + TimeObjectFrom + "/"+"AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json?"+$rootScope.authSession;
NVR.debug("Monitor " + $scope.MontageMonitors[i].Monitor.Id + ":" + $scope.MontageMonitors[i].Monitor.Name + " does not have events, trying " + indivGrab);
var p = getExpandedEvents(i, indivGrab);
promises.push(p);
diff --git a/www/js/NVR.js b/www/js/NVR.js
index 2ce30d9b..e6eadfd8 100644
--- a/www/js/NVR.js
+++ b/www/js/NVR.js
@@ -21,7 +21,7 @@ angular.module('zmApp.controllers')
DO NOT TOUCH zmAppVersion
It is changed by sync_version.sh
*/
- var zmAppVersion = "1.4.004";
+ var zmAppVersion = "1.4.005";
var isBackground = false;
var justResumed = false;
@@ -222,6 +222,7 @@ angular.module('zmApp.controllers')
'obfuscationScheme': 'lzs', // or 'aes'
'showAnimation': true,
'montageHideFooter': false,
+ 'httpCordovaNoEncode': false,
};
@@ -1639,6 +1640,11 @@ angular.module('zmApp.controllers')
+ if (typeof loginData.httpCordovaNoEncode == 'undefined') {
+ loginData.httpCordovaNoEncode = false;
+ }
+
+
loginData.canSwipeMonitors = true;
loginData.forceImageModePath = false;
loginData.enableBlog = true;
@@ -2825,7 +2831,7 @@ angular.module('zmApp.controllers')
log((forceReload == 1) ? "getMonitors:Force reloading all monitors" : "getMonitors:Loading all monitors");
var apiurl = loginData.apiurl;
var myurl = apiurl + "/monitors";
- myurl += "/index/"+"Type!=:WebSite.json" + "?"+$rootScope.authSession;
+ myurl += "/index/"+"Type !=:WebSite.json" + "?"+$rootScope.authSession;
getZmsMultiPortSupport()
.then(function (zmsPort) {
@@ -3483,11 +3489,11 @@ angular.module('zmApp.controllers')
if (monitorId != 0)
myurl = myurl + "/"+"MonitorId:" + monitorId;
if (startTime)
- myurl = myurl + "/"+"StartTime<=:" + endTime;
+ myurl = myurl + "/"+"StartTime <=:" + endTime;
if (endTime)
- myurl = myurl + "/"+"EndTime>=:" + startTime;
+ myurl = myurl + "/"+"EndTime >=:" + startTime;
- myurl = myurl + "/"+"AlarmFrames>=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
+ myurl = myurl + "/"+"AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
//https:///zm/api/events/index/Notes%20REGEXP:detected%3A.json
if (loginData.objectDetectionFilter && !noObjectFilter) {
@@ -3574,11 +3580,11 @@ angular.module('zmApp.controllers')
if (monitorId != 0)
myurl = myurl + "/"+"MonitorId:" + monitorId;
if (startTime)
- myurl = myurl + "/"+"StartTime<=:" + endTime;
+ myurl = myurl + "/"+"StartTime <=:" + endTime;
if (endTime)
- myurl = myurl + "/"+"EndTime>=:" + startTime;
+ myurl = myurl + "/"+"EndTime >=:" + startTime;
- myurl = myurl + "/"+"AlarmFrames>=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
+ myurl = myurl + "/"+"AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
//console.log ('********* MON FILTER '+monListFilter);
if (monListFilter)
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
index 9de37c18..82db8b59 100644
--- a/www/js/TimelineCtrl.js
+++ b/www/js/TimelineCtrl.js
@@ -783,9 +783,9 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
// FIXME: totally ignoring event pages - hoping it wont be more than 100 or 150 whatever
// the events per page limit is. Why? laziness.
//
- var completedEvents = ld.apiurl + '/events/index/'+'EndTime>=:' + from;
+ var completedEvents = ld.apiurl + '/events/index/'+'EndTime >=:' + from;
// we can add alarmCount as this is really for completed events
- completedEvents = completedEvents + "/"+"AlarmFrames>=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0);
+ completedEvents = completedEvents + "/"+"AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0);
if (ld.objectDetectionFilter) {
completedEvents = completedEvents + '/'+ 'Notes REGEXP:"detected:"';
@@ -800,7 +800,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
var st = moment(lastTimeForEvent).tz(NVR.getTimeZoneNow());
st = st.subtract(10, 'minutes').locale('en').format("YYYY-MM-DD HH:mm:ss");
- var ongoingEvents = ld.apiurl + '/'+'events/index/StartTime>=:' + st + '/EndTime=:.json'+'?'+$rootScope.authSession;
+ var ongoingEvents = ld.apiurl + '/'+'events/index/StartTime >=:' + st + '/EndTime =:.json'+'?'+$rootScope.authSession;
//NVR.debug("Getting incremental events using: " + completedEvents);
NVR.debug("Completed events API:" + completedEvents);
diff --git a/www/js/app.js b/www/js/app.js
index 9f9898f7..09365be6 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1210,6 +1210,11 @@ angular.module('zmApp', [
};
+ $rootScope.getLogin = function () {
+ return NVR.getLogin();
+ };
+
+
$rootScope.proceedWithLogin = function(obj) {
return NVR.proceedWithLogin(obj);
};
@@ -2096,12 +2101,21 @@ angular.module('zmApp', [
};
if (arguments[0].timeout) options.timeout = arguments[0].timeout;
+
+
// console.log ("**** -->"+method+"<-- using native HTTP with:"+encodeURI(url)+" payload:"+JSON.stringify(options));
// nvr.debug ("cordova: got url "+url);
//nvr.debug ("cordova: url after encode "+encodeURI(url));
//cordova.plugin.http.sendRequest(encodeURI(url), options,
- cordova.plugin.http.sendRequest(encodeURI(url), options,
+
+ if (!nvr.getLogin().httpCordovaNoEncode) {
+ url = encodeURI(url);
+ //nvr.debug("encoded URL="+url);
+ }
+
+
+ cordova.plugin.http.sendRequest(url, options,
function (succ) {
// automatic JSON parse if no responseType: text
// fall back to text if JSON parse fails too
@@ -2142,7 +2156,7 @@ angular.module('zmApp', [
},
function (err) {
- nvr.debug("*** Inside native HTTP error for url:"+JSON.stringify(url));
+ nvr.debug("*** Inside native HTTP error for url:"+JSON.stringify(err));
if (err.status == 401 && !options.skipIntercept && nvr.apiValid) {
if (err.error && err.error.indexOf("API is disabled for user") != -1) {
nvr.apiValid = false;
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 13:35:26 +0000