iOS Initial Update
Updated cordova-plugin-wifiwizard2 and added iOS Build configuration
20
config.xml
|
@ -1,5 +1,5 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<widget id="de.sensebox.blockly" version="1.1.4" android-versionCode="10104" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
|
||||
<widget android-versionCode="10104" id="de.sensebox.blockly" version="1.1.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
|
||||
<name>Blockly for senseBox</name>
|
||||
<description>graphical programming & OTA upload for senseBox MCU</description>
|
||||
<author email="kontakt@reedu.de" href="https://reedu.de/">re:edu</author>
|
||||
|
@ -77,6 +77,24 @@
|
|||
<splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
|
||||
<splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
|
||||
<splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
|
||||
<icon height="20" src="resources/ios/icon/icon-20.png" width="20" />
|
||||
<icon height="40" src="resources/ios/icon/icon-20@2x.png" width="40" />
|
||||
<icon height="60" src="resources/ios/icon/icon-20@3x.png" width="60" />
|
||||
<icon height="29" src="resources/ios/icon/icon-29.png" width="29" />
|
||||
<icon height="58" src="resources/ios/icon/icon-29@2x.png" width="58" />
|
||||
<icon height="87" src="resources/ios/icon/icon-29@3x.png" width="87" />
|
||||
<icon height="48" src="resources/ios/icon/icon-24@2x.png" width="48" />
|
||||
<icon height="55" src="resources/ios/icon/icon-27.5@2x.png" width="55" />
|
||||
<icon height="88" src="resources/ios/icon/icon-44@2x.png" width="88" />
|
||||
<icon height="172" src="resources/ios/icon/icon-86@2x.png" width="172" />
|
||||
<icon height="196" src="resources/ios/icon/icon-98@2x.png" width="196" />
|
||||
<icon height="216" src="resources/ios/icon/icon-108@2x.png" width="216" />
|
||||
<splash height="2688" src="resources/ios/splash/Default-2688h~iphone.png" width="1242" />
|
||||
<splash height="1242" src="resources/ios/splash/Default-Landscape-2688h~iphone.png" width="2688" />
|
||||
<splash height="1792" src="resources/ios/splash/Default-1792h~iphone.png" width="828" />
|
||||
<splash height="828" src="resources/ios/splash/Default-Landscape-1792h~iphone.png" width="1792" />
|
||||
<splash height="2436" src="resources/ios/splash/Default-2436h.png" width="1125" />
|
||||
<splash height="1125" src="resources/ios/splash/Default-Landscape-2436h.png" width="2436" />
|
||||
</platform>
|
||||
<plugin name="cordova-plugin-whitelist" spec="1.3.3" />
|
||||
<plugin name="cordova-plugin-statusbar" spec="2.4.2" />
|
||||
|
|
1406
package-lock.json
generated
|
@ -34,6 +34,7 @@
|
|||
"@ngx-translate/http-loader": "^2.0.1",
|
||||
"cordova-android": "7.1.1",
|
||||
"cordova-browser": "5.0.4",
|
||||
"cordova-ios": "5.0.1",
|
||||
"cordova-plugin-device": "^2.0.2",
|
||||
"cordova-plugin-ionic-keyboard": "^2.1.3",
|
||||
"cordova-plugin-ionic-webview": "^2.4.1",
|
||||
|
@ -41,13 +42,13 @@
|
|||
"cordova-plugin-splashscreen": "^5.0.2",
|
||||
"cordova-plugin-statusbar": "^2.4.2",
|
||||
"cordova-plugin-whitelist": "^1.3.3",
|
||||
"cordova-plugin-wifiwizard2": "3.1.0",
|
||||
"cordova-plugin-wifiwizard2": "3.1.1",
|
||||
"cordova-res": "^0.8.1",
|
||||
"es6-promise-plugin": "^4.1.0",
|
||||
"ionic-angular": "3.9.2",
|
||||
"ionicons": "3.0.0",
|
||||
"rxjs": "5.5.11",
|
||||
"sw-toolbox": "3.6.0",
|
||||
"wifiwizard2": "^3.1.0",
|
||||
"zone.js": "0.8.26"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
@ -70,6 +71,7 @@
|
|||
},
|
||||
"platforms": [
|
||||
"android",
|
||||
"ios",
|
||||
"browser"
|
||||
]
|
||||
}
|
||||
|
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 6.9 KiB |
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 8.3 KiB |
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 54 KiB |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 73 KiB |
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 96 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 51 KiB |
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 68 KiB |
Before Width: | Height: | Size: 57 KiB After Width: | Height: | Size: 92 KiB |
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 39 KiB |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 30 KiB |
BIN
resources/ios/icon/icon-108@2x.png
Normal file
After Width: | Height: | Size: 10 KiB |
BIN
resources/ios/icon/icon-20.png
Normal file
After Width: | Height: | Size: 774 B |
BIN
resources/ios/icon/icon-20@2x.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
resources/ios/icon/icon-20@3x.png
Normal file
After Width: | Height: | Size: 2.8 KiB |
BIN
resources/ios/icon/icon-24@2x.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
resources/ios/icon/icon-27.5@2x.png
Normal file
After Width: | Height: | Size: 2.6 KiB |
BIN
resources/ios/icon/icon-29.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
resources/ios/icon/icon-29@2x.png
Normal file
After Width: | Height: | Size: 2.7 KiB |
BIN
resources/ios/icon/icon-29@3x.png
Normal file
After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 5.7 KiB |
BIN
resources/ios/icon/icon-44@2x.png
Normal file
After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 4 KiB After Width: | Height: | Size: 4.7 KiB |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 8.7 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 6.9 KiB |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 7.3 KiB |
Before Width: | Height: | Size: 6.6 KiB After Width: | Height: | Size: 8 KiB |
BIN
resources/ios/icon/icon-86@2x.png
Normal file
After Width: | Height: | Size: 8 KiB |
BIN
resources/ios/icon/icon-98@2x.png
Normal file
After Width: | Height: | Size: 9.6 KiB |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 5.5 KiB |
BIN
resources/ios/splash/Default-1792h~iphone.png
Normal file
After Width: | Height: | Size: 77 KiB |
BIN
resources/ios/splash/Default-2436h.png
Normal file
After Width: | Height: | Size: 121 KiB |
BIN
resources/ios/splash/Default-2688h~iphone.png
Normal file
After Width: | Height: | Size: 129 KiB |
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 45 KiB |
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 53 KiB |
Before Width: | Height: | Size: 65 KiB After Width: | Height: | Size: 108 KiB |
BIN
resources/ios/splash/Default-Landscape-1792h~iphone.png
Normal file
After Width: | Height: | Size: 83 KiB |
BIN
resources/ios/splash/Default-Landscape-2436h.png
Normal file
After Width: | Height: | Size: 132 KiB |
BIN
resources/ios/splash/Default-Landscape-2688h~iphone.png
Normal file
After Width: | Height: | Size: 137 KiB |
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 118 KiB |
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 101 KiB |
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 57 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 43 KiB |
Before Width: | Height: | Size: 57 KiB After Width: | Height: | Size: 98 KiB |
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 57 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 64 KiB |
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 16 KiB |
|
@ -31,10 +31,10 @@ export class OtaWifiProvider {
|
|||
|
||||
// FIXME: iOS 11+ supposedly allows WiFi API queries (see WifiWizard2 docs),
|
||||
// but testing in emulator gives "not supported". might be an emulator issue?
|
||||
if (this.platform.is('android'))
|
||||
return WifiStrategy.Automatic
|
||||
// if (this.platform.is('android'))
|
||||
return WifiStrategy.Automatic
|
||||
|
||||
return WifiStrategy.Manual
|
||||
//return WifiStrategy.Manual
|
||||
}
|
||||
|
||||
async findSenseboxes (filterSsids = false): Promise<string[]> {
|
||||
|
|