Merge development to master

config.xml

@@ -22,7 +22,12 @@
     <preference name="FadeSplashScreenDuration" value="300" />
     <preference name="SplashShowOnlyFirstTime" value="false" />
     <preference name="SplashScreen" value="screen" />
-    <preference name="SplashScreenDelay" value="7000" />
+    <preference name="orientation" value="default" />
+    <preference name="ScrollEnabled" value="false" />
+    <preference name="StatusBarStyle" value="default" />
+    <preference name="ShowSplashScreenSpinner" value="false" />
+    <preference name="AutoHideSplashScreen" value="false" />
+    <preference name="SplashScreenDelay" value="3000" />
     <platform name="android">
         <allow-intent href="market:*" />
         <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
@@ -44,11 +49,10 @@
         <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
         <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
     </platform>
-    <content src="index.html" />
+    <content original-src="index.html" src="http://192.168.137.1:8100" />
     <allow-navigation href="http://192.168.0.104:8100" />
     <allow-navigation href="http://192.168.0.104:8101" />
     <allow-navigation href="http://192.168.0.115:8100" />
-    <engine name="android" spec="^6.2.3" />
     <plugin name="cordova-clipboard" spec="^1.0.0" />
     <plugin name="cordova-plugin-camera" spec="^2.4.1" />
     <plugin name="cordova-plugin-console" spec="^1.0.5" />
@@ -59,4 +63,10 @@
     <plugin name="cordova-plugin-whitelist" spec="^1.3.1" />
     <plugin name="cordova-skycoin-liteclient" spec="^1.0.7" />
     <plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
+    <allow-navigation href="http://192.168.0.100:8100" />
+    <allow-navigation href="http://10.42.0.1:8100" />
+    <allow-navigation href="http://192.168.137.1:8100" />
+    <plugin name="phonegap-plugin-barcodescanner" spec="^7.0.2" />
+    <plugin name="cordova-plugin-x-toast" spec="^2.6.0" />
+    <engine name="android" spec="6.4.0" />
 </widget>