From 1c544b656e47d8b8ddba19673daba07a35e3afb2 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 22 Sep 2018 13:28:05 -0400 Subject: various fixes for XCode 10 build process and iCloud --- build-auto.json | 2 ++ build_ios.sh | 2 +- config.xml | 6 +++--- electron_js/main.js | 4 ++-- package.json | 10 +++++----- resources/ios/icon/icon-1024.png | Bin 32775 -> 32775 bytes resources/ios/icon/icon-40.png | Bin 1526 -> 1526 bytes resources/ios/icon/icon-40@2x.png | Bin 3486 -> 3486 bytes resources/ios/icon/icon-40@3x.png | Bin 5265 -> 5265 bytes resources/ios/icon/icon-50.png | Bin 2181 -> 2181 bytes resources/ios/icon/icon-50@2x.png | Bin 4386 -> 4386 bytes resources/ios/icon/icon-60.png | Bin 2647 -> 2647 bytes resources/ios/icon/icon-60@2x.png | Bin 5265 -> 5265 bytes resources/ios/icon/icon-60@3x.png | Bin 7814 -> 7814 bytes resources/ios/icon/icon-72.png | Bin 3161 -> 3161 bytes resources/ios/icon/icon-72@2x.png | Bin 6195 -> 6195 bytes resources/ios/icon/icon-76.png | Bin 3352 -> 3352 bytes resources/ios/icon/icon-76@2x.png | Bin 6643 -> 6643 bytes resources/ios/icon/icon-83.5@2x.png | Bin 7168 -> 7168 bytes resources/ios/icon/icon-small.png | Bin 1205 -> 1205 bytes resources/ios/icon/icon-small@2x.png | Bin 2520 -> 2520 bytes resources/ios/icon/icon-small@3x.png | Bin 3803 -> 3803 bytes resources/ios/icon/icon.png | Bin 2451 -> 2451 bytes resources/ios/icon/icon@2x.png | Bin 4988 -> 4988 bytes resources/ios/splash/Default-568h@2x~iphone.png | Bin 26982 -> 26982 bytes resources/ios/splash/Default-667h.png | Bin 32395 -> 32395 bytes resources/ios/splash/Default-736h.png | Bin 62886 -> 62886 bytes resources/ios/splash/Default-Landscape-736h.png | Bin 62629 -> 62629 bytes resources/ios/splash/Default-Landscape@2x~ipad.png | Bin 59305 -> 59305 bytes resources/ios/splash/Default-Landscape@~ipadpro.png | Bin 87979 -> 87979 bytes resources/ios/splash/Default-Landscape~ipad.png | Bin 25129 -> 25129 bytes resources/ios/splash/Default-Portrait@2x~ipad.png | Bin 59374 -> 59374 bytes resources/ios/splash/Default-Portrait@~ipadpro.png | Bin 88671 -> 88671 bytes resources/ios/splash/Default-Portrait~ipad.png | Bin 25496 -> 25496 bytes resources/ios/splash/Default@2x~iphone.png | Bin 22993 -> 22993 bytes .../ios/splash/Default@2x~universal~anyany.png | Bin 97293 -> 97293 bytes resources/ios/splash/Default~iphone.png | Bin 10366 -> 10366 bytes www/js/DataModel.js | 6 ++++-- www/js/LogCtrl.js | 8 ++++++++ www/js/LoginCtrl.js | 1 + www/lang/locale-en.json | 2 +- www/templates/log.html | 5 +++++ 42 files changed, 32 insertions(+), 14 deletions(-) diff --git a/build-auto.json b/build-auto.json index 39f73603..2391f28a 100644 --- a/build-auto.json +++ b/build-auto.json @@ -6,6 +6,7 @@ "packageType": "development", "automaticProvisioning": true, "buildFlag": [ + "-UseModernBuildSystem=0", "EMBEDDED_CONTENT_CONTAINS_SWIFT = YES", "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES=NO", "LD_RUNPATH_SEARCH_PATHS = \"@executable_path/Frameworks\"" @@ -17,6 +18,7 @@ "packageType": "app-store", "automaticProvisioning": true, "buildFlag": [ + "-UseModernBuildSystem=0", "EMBEDDED_CONTENT_CONTAINS_SWIFT = YES", "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES=NO", "LD_RUNPATH_SEARCH_PATHS = \"@executable_path/Frameworks\"" diff --git a/build_ios.sh b/build_ios.sh index b3ecc31c..0e87eca7 100755 --- a/build_ios.sh +++ b/build_ios.sh @@ -1,4 +1,4 @@ echo "*** Using old build system due to XCode 10 issues ** " echo "see https://forum.ionicframework.com/t/how-to-build-ionic-cordova-with-xcode-10/142044" -ionic cordova build ios -- --buildFlag="-UseModernBuildSystem=0" +ionic cordova build ios --release --buildConfig="./build-auto.json" diff --git a/config.xml b/config.xml index b8a1ce51..9866dea0 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + zmNinja High performance ZoneMinder client @@ -143,13 +143,13 @@ - + - + diff --git a/electron_js/main.js b/electron_js/main.js index 10124bbf..86546de1 100644 --- a/electron_js/main.js +++ b/electron_js/main.js @@ -87,10 +87,10 @@ const mx = globalShortcut.register('CommandOrControl+Alt+F', () => { win.webContents.openDevTools(); }) - const newwinx = globalShortcut.register('CommandOrControl+Alt+N', () => { + /*const newwinx = globalShortcut.register('CommandOrControl+Alt+N', () => { console.log('CommandOrControl+Alt+N is pressed'); createAlternateWindow(); - }) + })*/ // Create the browser window. diff --git a/package.json b/package.json index 41c0621e..ecf8fb61 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,14 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version": "1.3.020", + "version": "1.3.022", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", "cordova": { "platforms": [ - "ios", - "android" + "android", + "ios" ], "plugins": { "cordova-plugin-add-swift-support": {}, @@ -60,7 +60,7 @@ "clivas": "^0.2.0", "com.telerik.plugins.nativepagetransitions": "^0.6.5", "cordova-android": "^6.3.0", - "cordova-ios": "latest", + "cordova-ios": "~4.5.5", "cordova-library-helper-pp-fork": "^1.0.1", "cordova-plugin-add-swift-support": "^1.7.2", "cordova-plugin-android-fingerprint-auth": "^1.4.0", @@ -68,7 +68,7 @@ "cordova-plugin-app-version": "^0.1.9", "cordova-plugin-canvas2image-pp-fork": "^0.6.0", "cordova-plugin-certificates": "^0.6.4", - "cordova-plugin-cloud-settings": "^1.0.3", + "cordova-plugin-cloud-settings": "^1.0.4", "cordova-plugin-customurlscheme": "^4.3.0", "cordova-plugin-device": "^2.0.1", "cordova-plugin-email": "^1.2.7", diff --git a/resources/ios/icon/icon-1024.png b/resources/ios/icon/icon-1024.png index 5c87b211..a8863a65 100644 Binary files a/resources/ios/icon/icon-1024.png and b/resources/ios/icon/icon-1024.png differ diff --git a/resources/ios/icon/icon-40.png b/resources/ios/icon/icon-40.png index 96f65fcd..e7f34dfe 100644 Binary files a/resources/ios/icon/icon-40.png and b/resources/ios/icon/icon-40.png differ diff --git a/resources/ios/icon/icon-40@2x.png b/resources/ios/icon/icon-40@2x.png index 0a17c18a..86427b97 100644 Binary files a/resources/ios/icon/icon-40@2x.png and b/resources/ios/icon/icon-40@2x.png differ diff --git a/resources/ios/icon/icon-40@3x.png b/resources/ios/icon/icon-40@3x.png index bf182ff5..f374d227 100644 Binary files a/resources/ios/icon/icon-40@3x.png and b/resources/ios/icon/icon-40@3x.png differ diff --git a/resources/ios/icon/icon-50.png b/resources/ios/icon/icon-50.png index 4339bbaa..28625a52 100644 Binary files a/resources/ios/icon/icon-50.png and b/resources/ios/icon/icon-50.png differ diff --git a/resources/ios/icon/icon-50@2x.png b/resources/ios/icon/icon-50@2x.png index d8403da5..89dbcbe9 100644 Binary files a/resources/ios/icon/icon-50@2x.png and b/resources/ios/icon/icon-50@2x.png differ diff --git a/resources/ios/icon/icon-60.png b/resources/ios/icon/icon-60.png index 362d5f8a..1b43dde7 100644 Binary files a/resources/ios/icon/icon-60.png and b/resources/ios/icon/icon-60.png differ diff --git a/resources/ios/icon/icon-60@2x.png b/resources/ios/icon/icon-60@2x.png index b3816683..f374d227 100644 Binary files a/resources/ios/icon/icon-60@2x.png and b/resources/ios/icon/icon-60@2x.png differ diff --git a/resources/ios/icon/icon-60@3x.png b/resources/ios/icon/icon-60@3x.png index 7a93e00b..0ea98f88 100644 Binary files a/resources/ios/icon/icon-60@3x.png and b/resources/ios/icon/icon-60@3x.png differ diff --git a/resources/ios/icon/icon-72.png b/resources/ios/icon/icon-72.png index ddf822fa..6dbbc4cf 100644 Binary files a/resources/ios/icon/icon-72.png and b/resources/ios/icon/icon-72.png differ diff --git a/resources/ios/icon/icon-72@2x.png b/resources/ios/icon/icon-72@2x.png index f3e2a473..aebe82bc 100644 Binary files a/resources/ios/icon/icon-72@2x.png and b/resources/ios/icon/icon-72@2x.png differ diff --git a/resources/ios/icon/icon-76.png b/resources/ios/icon/icon-76.png index 10344b6e..9b7b13ca 100644 Binary files a/resources/ios/icon/icon-76.png and b/resources/ios/icon/icon-76.png differ diff --git a/resources/ios/icon/icon-76@2x.png b/resources/ios/icon/icon-76@2x.png index 945a766a..e31278cc 100644 Binary files a/resources/ios/icon/icon-76@2x.png and b/resources/ios/icon/icon-76@2x.png differ diff --git a/resources/ios/icon/icon-83.5@2x.png b/resources/ios/icon/icon-83.5@2x.png index 8562bcc9..923975fd 100644 Binary files a/resources/ios/icon/icon-83.5@2x.png and b/resources/ios/icon/icon-83.5@2x.png differ diff --git a/resources/ios/icon/icon-small.png b/resources/ios/icon/icon-small.png index b452e267..eb650703 100644 Binary files a/resources/ios/icon/icon-small.png and b/resources/ios/icon/icon-small.png differ diff --git a/resources/ios/icon/icon-small@2x.png b/resources/ios/icon/icon-small@2x.png index a8155f16..6800f2b6 100644 Binary files a/resources/ios/icon/icon-small@2x.png and b/resources/ios/icon/icon-small@2x.png differ diff --git a/resources/ios/icon/icon-small@3x.png b/resources/ios/icon/icon-small@3x.png index d6016351..a5edb37f 100644 Binary files a/resources/ios/icon/icon-small@3x.png and b/resources/ios/icon/icon-small@3x.png differ diff --git a/resources/ios/icon/icon.png b/resources/ios/icon/icon.png index 3e8a8e6d..1430cc4c 100644 Binary files a/resources/ios/icon/icon.png and b/resources/ios/icon/icon.png differ diff --git a/resources/ios/icon/icon@2x.png b/resources/ios/icon/icon@2x.png index 39a380ee..e326f4ca 100644 Binary files a/resources/ios/icon/icon@2x.png and b/resources/ios/icon/icon@2x.png differ diff --git a/resources/ios/splash/Default-568h@2x~iphone.png b/resources/ios/splash/Default-568h@2x~iphone.png index a0c71b5f..6294c251 100644 Binary files a/resources/ios/splash/Default-568h@2x~iphone.png and b/resources/ios/splash/Default-568h@2x~iphone.png differ diff --git a/resources/ios/splash/Default-667h.png b/resources/ios/splash/Default-667h.png index f9ca582d..dcf6739c 100644 Binary files a/resources/ios/splash/Default-667h.png and b/resources/ios/splash/Default-667h.png differ diff --git a/resources/ios/splash/Default-736h.png b/resources/ios/splash/Default-736h.png index b7cfda65..b74244b2 100644 Binary files a/resources/ios/splash/Default-736h.png and b/resources/ios/splash/Default-736h.png differ diff --git a/resources/ios/splash/Default-Landscape-736h.png b/resources/ios/splash/Default-Landscape-736h.png index 727fae1f..e24c2e99 100644 Binary files a/resources/ios/splash/Default-Landscape-736h.png and b/resources/ios/splash/Default-Landscape-736h.png differ diff --git a/resources/ios/splash/Default-Landscape@2x~ipad.png b/resources/ios/splash/Default-Landscape@2x~ipad.png index 27941eb7..263d27d8 100644 Binary files a/resources/ios/splash/Default-Landscape@2x~ipad.png and b/resources/ios/splash/Default-Landscape@2x~ipad.png differ diff --git a/resources/ios/splash/Default-Landscape@~ipadpro.png b/resources/ios/splash/Default-Landscape@~ipadpro.png index 8d79a027..9ba935ac 100644 Binary files a/resources/ios/splash/Default-Landscape@~ipadpro.png and b/resources/ios/splash/Default-Landscape@~ipadpro.png differ diff --git a/resources/ios/splash/Default-Landscape~ipad.png b/resources/ios/splash/Default-Landscape~ipad.png index c8b69387..f31bd7b7 100644 Binary files a/resources/ios/splash/Default-Landscape~ipad.png and b/resources/ios/splash/Default-Landscape~ipad.png differ diff --git a/resources/ios/splash/Default-Portrait@2x~ipad.png b/resources/ios/splash/Default-Portrait@2x~ipad.png index 9ed9c1cc..9932c9c2 100644 Binary files a/resources/ios/splash/Default-Portrait@2x~ipad.png and b/resources/ios/splash/Default-Portrait@2x~ipad.png differ diff --git a/resources/ios/splash/Default-Portrait@~ipadpro.png b/resources/ios/splash/Default-Portrait@~ipadpro.png index 61ecae87..4b850386 100644 Binary files a/resources/ios/splash/Default-Portrait@~ipadpro.png and b/resources/ios/splash/Default-Portrait@~ipadpro.png differ diff --git a/resources/ios/splash/Default-Portrait~ipad.png b/resources/ios/splash/Default-Portrait~ipad.png index 66b338a4..cf6d37ef 100644 Binary files a/resources/ios/splash/Default-Portrait~ipad.png and b/resources/ios/splash/Default-Portrait~ipad.png differ diff --git a/resources/ios/splash/Default@2x~iphone.png b/resources/ios/splash/Default@2x~iphone.png index 95f01435..63aa416c 100644 Binary files a/resources/ios/splash/Default@2x~iphone.png and b/resources/ios/splash/Default@2x~iphone.png differ diff --git a/resources/ios/splash/Default@2x~universal~anyany.png b/resources/ios/splash/Default@2x~universal~anyany.png index c327a79e..cee7a645 100644 Binary files a/resources/ios/splash/Default@2x~universal~anyany.png and b/resources/ios/splash/Default@2x~universal~anyany.png differ diff --git a/resources/ios/splash/Default~iphone.png b/resources/ios/splash/Default~iphone.png index 25337e28..41c5fed8 100644 Binary files a/resources/ios/splash/Default~iphone.png and b/resources/ios/splash/Default~iphone.png differ diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 8b282aee..575f369c 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -20,7 +20,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.3.020"; + var zmAppVersion = "1.3.022"; var isBackground = false; var justResumed = false; var timeSinceResumed = -1; @@ -895,10 +895,12 @@ angular.module('zmApp.controllers') log("Did not find a valid local configuration, trying cloud..."); window.cordova.plugin.cloudsettings.exists(function (exists) { - log ("A cloud configuration has been found"); + if (exists) { + log ("A cloud configuration has been found"); window.cordova.plugin.cloudsettings.load(function (cloudData) { console.log ("CLOUD DATA FOUND"+JSON.stringify(cloudData)); + debug ("Cloud data retrieved is:"+JSON.stringify(cloudData)); if (cloudData && cloudData.defaultServerName && cloudData.serverGroupList) { log("retrieved a valid cloud config with a defaultServerName of:"+cloudData.defaultServerName); log("replacing local DB with cloud..."); diff --git a/www/js/LogCtrl.js b/www/js/LogCtrl.js index 8d2c2672..920cc499 100644 --- a/www/js/LogCtrl.js +++ b/www/js/LogCtrl.js @@ -260,6 +260,14 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo $scope.$on('$ionicView.enter', function () { //console.log("**VIEW ** Log Ctrl Entered"); + + /*n $scope.cloudString = "loading..."; + window.cordova.plugin.cloudsettings.load( + function (succ) {$scope.cloudString = JSON.stringify(succ);}, + function (err) {$scope.cloudString = JSON.stringify(err);} + + );*/ + $ionicSideMenuDelegate.canDragContent(false); $scope.selectOn = false; NVRDataModel.setAwake(false); diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index 155b648d..9410b276 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -596,6 +596,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r }, function () { NVRDataModel.debug("local data synced with cloud..."); + }, function (err) { diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 6674bd9b..fcdd8ecc 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -313,7 +313,7 @@ "kSave" :"Save", "kSavingSnapshot" :"saving snapshot", "kSaveToCloud" :"sync with cloud", - "kSaveToCloudIOS" :"saves settings to your personal iCloud account", + "kSaveToCloudIOS" :"saves settings to your personal iCloud account. May take several hours to sync", "kSaveToCloudANDROID" :"saves settings via Android's Backup Service. May take several hours to sync", "kScore" :"score", "kScrub" :"Scrub", diff --git a/www/templates/log.html b/www/templates/log.html index e505bda1..fb97ff72 100644 --- a/www/templates/log.html +++ b/www/templates/log.html @@ -21,6 +21,11 @@ + +