合并冲突

Author: he-shiliang

config.xml

@@ -83,23 +83,9 @@
         <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
         <icon height="1024" src="resources/ios/icon/icon-1024.png" width="1024" />
     </platform>
-    <allow-navigation href="http://192.168.0.105:8100" />
-    <allow-navigation href="http://192.168.0.102:8101" />
-    <allow-navigation href="http://192.168.0.100:8101" />
-    <allow-navigation href="http://192.168.1.121:8101" />
-    <allow-navigation href="http://192.168.0.104:8101" />
-    <allow-navigation href="http://192.168.0.106:8101" />
-    <allow-navigation href="http://192.168.56.1:8101" />
-    <allow-navigation href="http://192.168.0.103:8101" />
-    <allow-navigation href="http://192.168.0.103:8100" />
-    <allow-navigation href="http://192.168.0.103:8103" />
-    <allow-navigation href="http://192.168.0.107:8101" />
-    <allow-navigation href="http://192.168.19.2:8101" />
-    <allow-navigation href="http://192.168.0.104:8102" />
-    <allow-navigation href="http://192.168.0.104:8100" />
-    <allow-navigation href="http://192.168.211.1:8102" />
-    <allow-navigation href="http://192.168.0.103:8102" />
-    <allow-navigation href="http://192.168.0.105:8101" />
+    <engine name="android" spec="^6.2.3" />
+    <engine name="ios" spec="~4.4.0" />
+    <plugin name="com.hutchind.cordova.plugins.streamingmedia" spec="~0.1.4" />
     <plugin name="com.synconset.imagepicker" spec="^2.1.10">
         <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="是否允许访问您的相册" />
     </plugin>
@@ -110,16 +96,12 @@
     <plugin name="cordova-plugin-camera" spec="^2.4.1" />
     <plugin name="cordova-plugin-console" spec="^1.1.0" />
     <plugin name="cordova-plugin-device" spec="^1.1.7" />
+    <plugin name="cordova-plugin-file" spec="^4.3.3" />
+    <plugin name="cordova-plugin-file-transfer" spec="^1.7.0" />
+    <plugin name="cordova-plugin-shake" spec="^0.6.0" />
     <plugin name="cordova-plugin-splashscreen" spec="^4.1.0" />
     <plugin name="cordova-plugin-statusbar" spec="^2.3.0" />
     <plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
     <plugin name="cordova-sqlite-storage" spec="^2.1.4" />
     <plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
-    <allow-navigation href="http://192.168.0.105:8102" />
-    <plugin name="cordova-plugin-shake" spec="^0.6.0" />
-    <plugin name="com.hutchind.cordova.plugins.streamingmedia" spec="~0.1.4" />
-    <plugin name="cordova-plugin-file" spec="^4.3.3" />
-    <plugin name="cordova-plugin-file-transfer" spec="^1.7.0" />
-    <engine name="android" spec="^6.2.3" />
-    <engine name="ios" spec="~4.4.0" />
 </widget>

package-lock.json

@@ -36,6 +36,7 @@
         "@ionic-native/streaming-media": "^4.5.2",
         "@ionic-native/video-player": "^4.5.2",
         "@ionic/storage": "^2.1.3",
+        "com.hutchind.cordova.plugins.streamingmedia": "~0.1.4",
         "com.synconset.imagepicker": "^2.1.10",
         "cordova-alipay-base": "file:node_modules/cordova-alipay-base",
         "cordova-android": "^6.2.3",
@@ -100,4 +101,4 @@
             "cordova-plugin-file-transfer": {}
         }
     }
-}
+}