diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2017-12-27 15:11:02 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2017-12-27 15:11:02 -0500 |
| commit | 1af01a05ee5692f0af13e815acf171215cf869b7 (patch) | |
| tree | 49dccfc00c635f13bee9e0b4f306fd3c7258c0f7 /www/js/EventServer.js | |
| parent | d77d5e2e321e9f17b736d87b38e32992bd8ffea3 (diff) | |
remove temp state if setLogin called - this was causing issues in android with eventserver settings blanking out
Diffstat (limited to 'www/js/EventServer.js')
| -rw-r--r-- | www/js/EventServer.js | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/www/js/EventServer.js b/www/js/EventServer.js index 91fcd694..45bca98b 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -32,6 +32,13 @@ angular.module('zmApp.controllers') return; } + if (typeof ws == 'undefined') { + NVRDataModel.debug ("websocket is undefined, need to create ws before I can sent auth"); + ws = $websocket(loginData.eventServer,{reconnectIfNotNormalClose: false}); + // ws.onOpen(openHandshake); + // return; + } + NVRDataModel.log("openHandshake: Websocket open, sending Auth"); ws.send( { @@ -117,7 +124,7 @@ angular.module('zmApp.controllers') lazy: true });*/ - ws = $websocket(loginData.eventServer,{reconnectIfNotNormalClose: true}); + ws = $websocket(loginData.eventServer,{reconnectIfNotNormalClose: false}); ws.onOpen(openHandshake); // Transmit auth information to server @@ -139,7 +146,7 @@ angular.module('zmApp.controllers') }, 3000); // leave 3 seconds for transitions firstError = false; lastEventServerCheck = Date.now(); - ws.close(); + if (typeof ws !== 'undefined') ws.close(); ws = undefined; // NVRDataModel.log ("Will try to reconnect in 10 sec.."); @@ -541,6 +548,8 @@ angular.module('zmApp.controllers') $rootScope.isAlarm = 0; $rootScope.tappedNotification = 1; var mid = data.additionalData.mid; + var eid = data.additionalData.eid; + // if Multiple mids, take the first one var mi = mid.indexOf(','); @@ -551,6 +560,7 @@ angular.module('zmApp.controllers') mid = parseInt(mid); $rootScope.tappedMid = mid; + $rootScope.tappedEid = eid; NVRDataModel.log("Push notification: Tapped Monitor taken as:" + $rootScope.tappedMid); if ($rootScope.platformOS == 'ios') |