fix

config.xml

@@ -11,12 +11,18 @@
     <access origin="*" />
     <access launch-external="yes" origin="mailto:*" />
     <access launch-external="yes" origin="tel:*" />
+    <allow-intent href="http://*/*" />
+    <allow-intent href="https://*/*" />
     <allow-intent href="mailto:*" />
     <allow-intent href="tel:*" />
+    <allow-intent href="geo:*" />
     <allow-navigation href="mailto:*" />
+    <allow-navigation href="ionic://localhost/*" />
+    <allow-navigation href="gap://ready/*" />
     <allow-navigation href="tel:*" />
-    <allow-navigation href="http://wechat.hand-china.com/*" />
-    <allow-navigation href="https://www.pgyer.com/*" />
+    <allow-navigation href="http://180.104.121.66:8088/*" />
+    <allow-navigation href="https://docs.jiguang.cn/*" />
+    <allow-navigation href="https://www.rongcloud.cn/*" />
     <access launch-external="yes" origin="tel:*" />
     <access launch-external="yes" origin="sms:*" />
     <preference name="ScrollEnabled" value="false" />
@@ -32,6 +38,7 @@
     <feature name="StatusBar">
         <param name="ios-package" onload="true" value="CDVStatusBar" />
     </feature>
+    <preference name="CordovaWebViewEngine" value="CDVWKWebViewEngine" />
     <platform name="android">
         <allow-intent href="market:*" />
         <hook src="hooks/copy-build-extras-gradle.js" type="before_build" />
@@ -102,6 +109,6 @@
     <plugin name="cordova-plugin-device" spec="2.0.2" />
     <plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
     <plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
-    <engine name="ios" />
     <engine name="android" spec="^6.2.0" />
+    <engine name="ios" spec="~5.1.1" />
 </widget>

config/dev.env.js

@@ -10,7 +10,8 @@ module.exports = merge(prodEnv, {
   loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
   basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="',
   rootPath: '"http://180.104.121.66:8088/r/api"',
-  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
+  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
+  fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
   ocrPath: '"http://180.104.121.66:8088/r/api"',
   appId: '"com.xcmg.app.dev"',
   currentVersion: '"1.9.0"',

index.html

@@ -14,7 +14,7 @@
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
   <script type="text/javascript" src="./static/vuePlatform.js"></script>
   <script type="text/javascript" src="./static/prototype.js"></script>
-  <script type="text/javascript" src="cordova.js"></script>
+  <script type="text/javascript" src="./cordova.js"></script>
   <!-- 定位 -->
   <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script>
   <title>徐工金服</title>

package.json

@@ -16,9 +16,11 @@
     "autosize": "^3.0.20",
     "better-scroll": "^1.10.3",
     "cordova-android": "^6.2.0",
+    "cordova-ios": "^5.1.1",
     "cordova-plugin-camera": "^2.4.1",
-    "cordova-plugin-crosswalk-webview": "^2.2.0",
+    "cordova-plugin-compat": "^1.2.0",
     "cordova-plugin-device": "^2.0.2",
+    "cordova-plugin-ionic-webview": "^4.1.3",
     "cordova-plugin-splashscreen": "5.0.2",
     "cordova-plugin-statusbar": "2.4.2",
     "cordova-plugin-whitelist": "^1.3.3",
@@ -104,8 +106,7 @@
     "cordova-plugin-statusbar",
     "cordova-plugin-splashscreen",
     "cordova-plugin-whitelist",
-    "ionic-plugin-keyboard",
-    "cordova-plugin-inappbrowser"
+    "ionic-plugin-keyboard"
   ],
   "engines": {
     "node": ">= 4.0.0",
@@ -117,16 +118,15 @@
   ],
   "cordova": {
     "platforms": [
-      "ios",
-      "android"
+      "android",
+      "ios"
     ],
     "plugins": {
       "cordova-plugin-camera": {},
       "cordova-plugin-device": {},
       "cordova-plugin-whitelist": {},
-      "cordova-plugin-crosswalk-webview": {},
       "cordova-plugin-themeablebrowser": {},
-      "cordova-plugin-hls-cloudroom": {},
+      "cordova-plugin-ionic-webview": {},
       "cordova-plugin-statusbar": {},
       "cordova-plugin-splashscreen": {},
       "ionic-plugin-keyboard": {}

plugins/android.json

+{
+  "prepare_queue": {
+    "installed": [],
+    "uninstalled": []
+  },
+  "config_munge": {
+    "files": {}
+  },
+  "installed_plugins": {},
+  "dependent_plugins": {}
+}

plugins/cordova-plugin-baidumaplocation/plugin.xml

@@ -114,6 +114,9 @@
     <config-file parent="NSLocationWhenInUseUsageDescription" target="*-Info.plist">
       <string>根据您当前的位置将自动选择最近的服务网点</string>
     </config-file>
+    <config-file parent="NSLocationAlwaysUsageDescription" target="*-Info.plist">
+      <string>根据您当前的位置将自动选择最近的服务网点</string>
+    </config-file>
 
     <!--API_KEY-->
     <config-file parent="BaiduMapLocation" target="*-Info.plist">

plugins/cordova-plugin-camera/appium-tests/ios/ios.spec.js

@@ -254,7 +254,7 @@ describe('Camera tests iOS.', function () {
                     }, function noAlert() {
                         // in case the contacts permission alert never showed up: no problem, don't freak out.
                         // This can happen if:
-                        // a) The applications-under-test already had photos permissions granted to it
+                        // a) The application-under-test already had photos permissions granted to it
                         // b) Appium's autoAcceptAlerts capability is provided (and functioning)
                     })
                     .elementByAccessibilityId('Cancel', 10000)