diff options
| -rw-r--r-- | package.json | 5 | ||||
| -rw-r--r-- | plugins/fetch.json | 16 | ||||
| -rw-r--r-- | www/js/DataModel.js | 2 | ||||
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 6 | ||||
| -rw-r--r-- | www/templates/events.html | 4 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 3 | ||||
| -rw-r--r-- | www/templates/timeline-modal.html | 4 |
7 files changed, 21 insertions, 19 deletions
diff --git a/package.json b/package.json index a642f8c9..d0e097dd 100644 --- a/package.json +++ b/package.json @@ -70,11 +70,6 @@ "cordovaPlatforms": [ {}, "android", - { - "platform": "android", - "version": "", - "locator": "android" - }, "ios", { "platform": "ios", diff --git a/plugins/fetch.json b/plugins/fetch.json index f4230c96..a6638ce5 100644 --- a/plugins/fetch.json +++ b/plugins/fetch.json @@ -133,14 +133,6 @@ "is_top_level": true, "variables": {} }, - "cordova-plugin-connectsdk": { - "source": { - "type": "registry", - "id": "cordova-plugin-connectsdk" - }, - "is_top_level": true, - "variables": {} - }, "cordova-plugin-console": { "source": { "type": "registry", @@ -167,5 +159,13 @@ }, "is_top_level": true, "variables": {} + }, + "cordova-plugin-connectsdk": { + "source": { + "type": "registry", + "id": "cordova-plugin-connectsdk" + }, + "is_top_level": true, + "variables": {} } }
\ No newline at end of file diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 14864648..512ae20c 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -337,7 +337,7 @@ angular.module('zmApp.controllers') { if (urls.length > 0 && $rootScope.userCancelledAuth != true) { - $ionicLoading.show({template: $translate.instant('kTrying') + urls[0].server}); + $ionicLoading.show({template: $translate.instant('kTrying') + ' ' +urls[0].server}); zmLog ("Reachability test.." + urls[0].url); return $http.get(urls[0].url).then(function () { zmLog ("Success: reachability on "+ urls[0].url); diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index ebdc5326..ef9b9509 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -198,7 +198,13 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ console.log ("PASSED WITH " + JSON.stringify(mon)); //ConnectSDK.discoveryManager.startDiscovery(); + + console.log ("Stopping"); + ConnectSDK.discoveryManager.stopDiscovery(); + + console.log ("Starting"); ConnectSDK.discoveryManager.startDiscovery(); + console.log ("picking"); ConnectSDK.discoveryManager.pickDevice() .success(function (device) { //device.disconnect(); diff --git a/www/templates/events.html b/www/templates/events.html index 2b7c2c59..a7a7a394 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -154,9 +154,9 @@ <figure style="display:inline-block"> <!--{{event.Event.baseURL}} p:{{event.Event.imageMode}}--> <figcaption class="smallnote">{{ 'kFrame' | translate}} :{{alarm.frameid}} {{ 'kScore' | translate }} :{{alarm.score}}</figcaption> - <img ng-if="event.Event.imageMode=='path'" 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.frameid, event.Event.Id, event.Event.imageMode, alarm.id)" /> + <img ng-if="event.Event.imageMode=='path'" 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.frameid, event.Event.Id, event.Event.imageMode, alarm.id)" image-spinner-loader="lines"/> - <img ng-if="event.Event.imageMode=='fid'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&fid={{alarm.id}}" style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id)" /> + <img ng-if="event.Event.imageMode=='fid'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&fid={{alarm.id}}" style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id)" image-spinner-loader="lines"/> diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index dc16a223..35c5664d 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -113,7 +113,8 @@ </li> <li> - <a href="" ng-click="cast(monitorId, monitor)"> <i class="icon ion-android-funnel"></i></a> + <!-- + <a href="" ng-click="cast(monitorId, monitor)"> <i class="icon ion-android-funnel"></i></a>--> </li> diff --git a/www/templates/timeline-modal.html b/www/templates/timeline-modal.html index 7893f0be..28147213 100644 --- a/www/templates/timeline-modal.html +++ b/www/templates/timeline-modal.html @@ -35,9 +35,9 @@ <figure style="display:inline-block"> <figcaption class="smallnote">f:{{alarm.fid}} scr:{{alarm.score}} @ {{alarm.time}}</figcaption> - <img ng-if="event.Event.imageMode=='path'" 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.fid, event.Event.Id, event.Event.imageMode, alarm.id)"/> + <img ng-if="event.Event.imageMode=='path'" 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.fid, event.Event.Id, event.Event.imageMode, alarm.id)" image-spinner-loader="lines"/> - <img ng-if="event.Event.imageMode=='fid'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&fid={{alarm.id}}" style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.fid, event.Event.Id, event.Event.imageMode, alarm.id)"/> + <img ng-if="event.Event.imageMode=='fid'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&fid={{alarm.id}}" style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.fid, event.Event.Id, event.Event.imageMode, alarm.id)" image-spinner-loader="lines"/> |