From 30726c41cea20fb6a8d6dce8bfb64a6966025871 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 25 Nov 2017 11:33:21 -0500 Subject: #562 next version of zmNinja will need new Event Server too --- GoogleService-Info.plist | 40 +++++++++ config.xml | 41 ++++++--- google-services.json | 42 +++++++++ package.json | 219 ++++++++++++++++++++++++----------------------- resources/.DS_Store | Bin 8196 -> 10244 bytes www/js/DataModel.js | 28 +++--- www/js/EventServer.js | 12 +-- www/js/MontageCtrl.js | 2 +- 8 files changed, 243 insertions(+), 141 deletions(-) create mode 100644 GoogleService-Info.plist create mode 100644 google-services.json diff --git a/GoogleService-Info.plist b/GoogleService-Info.plist new file mode 100644 index 00000000..eb3a19e2 --- /dev/null +++ b/GoogleService-Info.plist @@ -0,0 +1,40 @@ + + + + + AD_UNIT_ID_FOR_BANNER_TEST + ca-app-pub-3940256099942544/2934735716 + AD_UNIT_ID_FOR_INTERSTITIAL_TEST + ca-app-pub-3940256099942544/4411468910 + CLIENT_ID + 710936220256-mtpdflgn9euss9au2p4d9fd5u2bfjhc9.apps.googleusercontent.com + REVERSED_CLIENT_ID + com.googleusercontent.apps.710936220256-mtpdflgn9euss9au2p4d9fd5u2bfjhc9 + API_KEY + AIzaSyAUNODMtdCNU6TpE3Xm8dNowHmSHnqQW24 + GCM_SENDER_ID + 710936220256 + PLIST_VERSION + 1 + BUNDLE_ID + com.pliablepixels.zmninja-pro + PROJECT_ID + ninja-1105 + STORAGE_BUCKET + ninja-1105.appspot.com + IS_ADS_ENABLED + + IS_ANALYTICS_ENABLED + + IS_APPINVITE_ENABLED + + IS_GCM_ENABLED + + IS_SIGNIN_ENABLED + + GOOGLE_APP_ID + 1:710936220256:ios:b067cfb6eabdc840 + DATABASE_URL + https://ninja-1105.firebaseio.com + + \ No newline at end of file diff --git a/config.xml b/config.xml index 38260bcd..18a840e7 100644 --- a/config.xml +++ b/config.xml @@ -29,11 +29,12 @@ - + + Store photos of events and live feeds @@ -60,10 +61,22 @@ - - + + + + + + + + + + + + + + @@ -87,25 +100,21 @@ - - + + - - - - @@ -122,18 +131,22 @@ - - - - - + + + + + + + + + diff --git a/google-services.json b/google-services.json new file mode 100644 index 00000000..a7d3ae0b --- /dev/null +++ b/google-services.json @@ -0,0 +1,42 @@ +{ + "project_info": { + "project_number": "710936220256", + "firebase_url": "https://ninja-1105.firebaseio.com", + "project_id": "ninja-1105", + "storage_bucket": "ninja-1105.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:710936220256:android:aefe6da818d70d0b", + "android_client_info": { + "package_name": "com.pliablepixels.zmninja_pro" + } + }, + "oauth_client": [ + { + "client_id": "710936220256-lkqe18pbja8qubnorii7d3oi9n9avind.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyAZnFKzI4mhH3Tzg-czSe_hc8loXIi2xkw" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 1, + "other_platform_oauth_client": [] + }, + "ads_service": { + "status": 2 + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/package.json b/package.json index 22bc36c9..cafa1da0 100644 --- a/package.json +++ b/package.json @@ -1,110 +1,115 @@ { - "name": "com.pliablepixels.zmninjapro", - "version": "1.2.44", - "displayName": "zmNinja", - "cordova": { - "platforms": [ - "android", - "ios" - ], - "plugins": { - "com.telerik.plugins.nativepagetransitions": {}, - "cordova-library-helper": { - "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save media to your Camera Roll" - }, - "cordova-plugin-add-swift-support": {}, - "cordova-plugin-android-permissions": {}, - "cordova-plugin-app-version": {}, - "cordova-plugin-compat": {}, - "cordova-plugin-console": {}, - "cordova-plugin-customurlscheme": { - "URL_SCHEME": "zmninja" - }, - "cordova-plugin-device": {}, - "cordova-plugin-file": {}, - "cordova-plugin-file-transfer": {}, - "cordova-plugin-globalization": {}, - "cordova-plugin-inappbrowser": {}, - "cordova-plugin-insomnia": {}, - "cordova-plugin-ios-longpress-fix": {}, - "cordova-plugin-media": { - "MICROPHONE_USAGE_DESCRIPTION": " " - }, - "cordova-plugin-network-information": {}, - "cordova-plugin-photo-library": { - "PHOTO_LIBRARY_USAGE_DESCRIPTION": "images to gallery" - }, - "cordova-plugin-pin-dialog": {}, - "cordova-plugin-settings-hook": {}, - "cordova-plugin-splashscreen": {}, - "cordova-plugin-websocket": {}, - "cordova-plugin-whitelist": {}, - "cordova-sqlite-storage": {}, - "ionic-plugin-keyboard": {}, - "org.devgeeks.Canvas2ImagePlugin": { - "PHOTOLIBRARY_USAGE_DESCRIPTION": " " - }, - "phonegap-plugin-mobile-accessibility": {}, - "phonegap-plugin-push": { - "SENDER_ID": "710936220256" - }, - "cordova-custom-config": {}, - "cordova.plugins.diagnostic": {}, - "cordova-plugin-email": {}, - "cordova-plugin-touch-id": {}, - "cordova-plugin-android-fingerprint-auth": {}, - "cordova-plugin-statusbar": {}, - "cordova-plugin-certificates": {} - } - }, - "dependencies": { - "EmailComposer": "git+https://github.com/pliablepixels/email-composer.git", - "com.telerik.plugins.nativepagetransitions": "^0.6.5", - "cordova-android": "^6.2.3", - "cordova-custom-config": "^4.0.2", - "cordova-ios": "^4.5.1", - "cordova-library-helper": "^1.0.4", - "cordova-plugin-add-swift-support": "^1.7.0", - "cordova-plugin-android-fingerprint-auth": "^1.4.0", - "cordova-plugin-android-permissions": "^1.0.0", - "cordova-plugin-app-version": "^0.1.9", - "cordova-plugin-canvas2image": "git+https://github.com/flache/Canvas2ImagePlugin.git", - "cordova-plugin-certificates": "git+https://github.com/hypery2k/cordova-certificate-plugin.git", - "cordova-plugin-compat": "^1.2.0", - "cordova-plugin-console": "^1.1.0", - "cordova-plugin-customurlscheme": "^4.3.0", - "cordova-plugin-device": "^1.1.6", - "cordova-plugin-email": "git+https://github.com/pliablepixels/cordova-email-plugin.git", - "cordova-plugin-file": "^4.3.3", - "cordova-plugin-file-transfer": "^1.6.3", - "cordova-plugin-globalization": "^1.0.7", - "cordova-plugin-inappbrowser": "^1.7.1", - "cordova-plugin-insomnia": "^4.3.0", - "cordova-plugin-ios-longpress-fix": "^1.1.0", - "cordova-plugin-media": "git+https://github.com/pliablepixels/cordova-plugin-media.git", - "cordova-plugin-network-information": "^1.3.3", - "cordova-plugin-photo-library": "^1.2.2", - "cordova-plugin-pin-dialog": "^0.1.3", - "cordova-plugin-settings-hook": "^0.2.7", - "cordova-plugin-splashscreen": "^4.0.3", - "cordova-plugin-statusbar": "git+https://github.com/apache/cordova-plugin-statusbar.git", - "cordova-plugin-touch-id": "^3.2.0", - "cordova-plugin-websocket": "^0.12.2", - "cordova-plugin-whitelist": "^1.3.2", - "cordova-sqlite-storage": "^1.5.3", - "cordova.plugins.diagnostic": "^3.7.1", - "deep-equal": "^1.0.1", - "default-passive-events": "^0.1.1", - "electron-window-state": "^4.1.1", - "ionic-plugin-keyboard": "^2.2.1", - "json-file": "^0.1.0", - "minimist": "^1.2.0", - "mkdirp": "^0.5.1", - "org.devgeeks.Canvas2ImagePlugin": "https://github.com/flache/Canvas2ImagePlugin", - "phonegap-plugin-mobile-accessibility": "^1.0.5", - "phonegap-plugin-push": "^1.10.5" - }, - "devDependencies": { - "bower": "^1.8.2" + "name": "com.pliablepixels.zmninjapro", + "version": "1.2.44", + "displayName": "zmNinja", + "cordova": { + "platforms": [ + "ios", + "android" + ], + "plugins": { + "com.telerik.plugins.nativepagetransitions": {}, + "cordova-library-helper": { + "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save media to your Camera Roll" + }, + "cordova-plugin-add-swift-support": {}, + "cordova-plugin-android-permissions": {}, + "cordova-plugin-app-version": {}, + "cordova-plugin-compat": {}, + "cordova-plugin-console": {}, + "cordova-plugin-customurlscheme": { + "URL_SCHEME": "zmninja" + }, + "cordova-plugin-device": {}, + "cordova-plugin-file": {}, + "cordova-plugin-file-transfer": {}, + "cordova-plugin-globalization": {}, + "cordova-plugin-inappbrowser": {}, + "cordova-plugin-insomnia": {}, + "cordova-plugin-ios-longpress-fix": {}, + "cordova-plugin-media": { + "MICROPHONE_USAGE_DESCRIPTION": " " + }, + "cordova-plugin-network-information": {}, + "cordova-plugin-photo-library": { + "PHOTO_LIBRARY_USAGE_DESCRIPTION": "images to gallery" + }, + "cordova-plugin-pin-dialog": {}, + "cordova-plugin-settings-hook": {}, + "cordova-plugin-splashscreen": {}, + "cordova-plugin-websocket": {}, + "cordova-plugin-whitelist": {}, + "cordova-sqlite-storage": {}, + "ionic-plugin-keyboard": {}, + "org.devgeeks.Canvas2ImagePlugin": { + "PHOTOLIBRARY_USAGE_DESCRIPTION": " " + }, + "phonegap-plugin-mobile-accessibility": {}, + "cordova-custom-config": {}, + "cordova.plugins.diagnostic": {}, + "cordova-plugin-email": {}, + "cordova-plugin-touch-id": {}, + "cordova-plugin-android-fingerprint-auth": {}, + "cordova-plugin-certificates": {}, + "phonegap-plugin-push": { + "FCM_VERSION": "11.0.1" + }, + "cordova-plugin-statusbar": {} } + }, + "dependencies": { + "EmailComposer": "git+https://github.com/pliablepixels/email-composer.git", + "com.telerik.plugins.nativepagetransitions": "^0.6.5", + "cordova-android": "6.4.0", + "cordova-custom-config": "^4.0.2", + "cordova-ios": "4.5.4", + "cordova-library-helper": "^1.0.4", + "cordova-plugin-add-swift-support": "^1.7.0", + "cordova-plugin-android-fingerprint-auth": "^1.4.0", + "cordova-plugin-android-permissions": "^1.0.0", + "cordova-plugin-app-version": "^0.1.9", + "cordova-plugin-canvas2image": "git+https://github.com/flache/Canvas2ImagePlugin.git", + "cordova-plugin-certificates": "git+https://github.com/hypery2k/cordova-certificate-plugin.git", + "cordova-plugin-compat": "^1.2.0", + "cordova-plugin-console": "^1.1.0", + "cordova-plugin-customurlscheme": "^4.3.0", + "cordova-plugin-device": "^1.1.6", + "cordova-plugin-email": "git+https://github.com/pliablepixels/cordova-email-plugin.git", + "cordova-plugin-file": "^4.3.3", + "cordova-plugin-file-transfer": "^1.6.3", + "cordova-plugin-globalization": "^1.0.7", + "cordova-plugin-inappbrowser": "^1.7.1", + "cordova-plugin-insomnia": "^4.3.0", + "cordova-plugin-ios-longpress-fix": "^1.1.0", + "cordova-plugin-media": "git+https://github.com/pliablepixels/cordova-plugin-media.git", + "cordova-plugin-network-information": "^1.3.3", + "cordova-plugin-photo-library": "^1.2.2", + "cordova-plugin-pin-dialog": "^0.1.3", + "cordova-plugin-settings-hook": "^0.2.7", + "cordova-plugin-splashscreen": "^4.0.3", + "cordova-plugin-statusbar": "git+https://github.com/apache/cordova-plugin-statusbar.git", + "cordova-plugin-touch-id": "^3.2.0", + "cordova-plugin-websocket": "^0.12.2", + "cordova-plugin-whitelist": "^1.3.2", + "cordova-sqlite-storage": "^1.5.3", + "cordova.plugins.diagnostic": "^3.7.1", + "deep-equal": "^1.0.1", + "default-passive-events": "^0.1.1", + "electron-window-state": "^4.1.1", + "ionic-plugin-keyboard": "^2.2.1", + "json-file": "^0.1.0", + "minimist": "^1.2.0", + "mkdirp": "^0.5.1", + "org.devgeeks.Canvas2ImagePlugin": "https://github.com/flache/Canvas2ImagePlugin", + "phonegap-plugin-mobile-accessibility": "^1.0.5", + "phonegap-plugin-push": "^2.1.1" + }, + "devDependencies": { + "bower": "^1.8.2", + "gulp": "^3.9.1", + "gulp-concat": "^2.6.1", + "gulp-minify-css": "^1.2.4", + "gulp-rename": "^1.2.2", + "gulp-sass": "^3.1.0" + } } \ No newline at end of file diff --git a/resources/.DS_Store b/resources/.DS_Store index bd336247..b1d2f77c 100644 Binary files a/resources/.DS_Store and b/resources/.DS_Store differ diff --git a/www/js/DataModel.js b/www/js/DataModel.js index f6d59140..078a2fe2 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -1563,25 +1563,25 @@ angular.module('zmApp.controllers') monitors[i].Monitor.isAlarmed = false; monitors[i].Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); - var st = loginData.streamingurl; + var st2 = loginData.streamingurl; if (zmsPort >0) { // we need to insert minport - st = ""; - var p = URI.parse(loginData.streamingurl); - st += p.scheme + "://"; - if (!p.host) { - p.host = p.path; - p.path = undefined; + st2 = ""; + var p2 = URI.parse(loginData.streamingurl); + st2 += p2.scheme + "://"; + if (!p2.host) { + p2.host = p2.path; + p2.path = undefined; } - st += p.host; - var sport = parseInt(zmsPort) + parseInt(monitors[i].Monitor.Id); - st = st + ':'+sport; - if (p.path) st += p.path; + st2 += p2.host; + var sport2 = parseInt(zmsPort) + parseInt(monitors[i].Monitor.Id); + st2 = st2 + ':'+sport2; + if (p2.path) st2 += p2.path; } - monitors[i].Monitor.streamingURL = st; - console.log ("NO SERVER MATCH CONSTRUCTED STREAMING PATH="+st); + monitors[i].Monitor.streamingURL = st2; + console.log ("NO SERVER MATCH CONSTRUCTED STREAMING PATH="+st2); monitors[i].Monitor.baseURL = loginData.url; monitors[i].Monitor.imageMode = (versionCompare($rootScope.apiVersion, "1.30") == -1) ? "path" : "fid"; @@ -1652,7 +1652,7 @@ angular.module('zmApp.controllers') $ionicLoading.hide(); monitorsLoaded = 0; }); - }) + }); return d.promise; diff --git a/www/js/EventServer.js b/www/js/EventServer.js index b0d0c83f..ce5ef044 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -392,10 +392,12 @@ angular.module('zmApp.controllers') { "ios": { - "alert": true, - "badge": true, + "alert": "true", + "badge": "true", "sound": ld.soundOnPush, - "clearBadge": true + //"sound": "true", + "clearBadge": "true", + // "fcmSandbox": true } } @@ -412,9 +414,9 @@ angular.module('zmApp.controllers') { "android": { - "senderID": zm.gcmSenderId, + // "senderID": zm.gcmSenderId, "icon": "ic_stat_notification", - sound: ld.soundOnPush, + sound: "true", vibrate: ld.vibrateOnPush //"sound": android_media_file } diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index a254bb2f..49cd60cd 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -1628,7 +1628,7 @@ angular.module('zmApp.controllers') multiPortZms = 0; } - ) + ); }); -- cgit v1.2.3