.

config.xml

@@ -108,15 +108,15 @@
     <preference name="ShowSplashScreenSpinner" value="false" />
     <preference name="SplashMaintainAspectRatio" value="true" />
     <preference name="SplashScreenDelay" value="2000" />
-    <preference name="xwalkMultipleApk" value="false" />
     <plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
     <plugin name="cordova-plugin-remote-injection" spec="^0.5.2" />
-    <plugin name="cordova-plugin-crosswalk-webview" spec="https://github.com/fribace/cordova-plugin-crosswalk-webview.git" />
     <plugin name="cordova-plugin-splashscreen" spec="^5.0.2" />
     <plugin name="cordova-plugin-wkwebview-engine" spec="^1.1.4" />
     <plugin name="jpush-phonegap-plugin" spec="^3.5.1">
         <variable name="APP_KEY" value="9c6e3cd69bd572f7c548ac83" />
     </plugin>
+    <plugin name="cordova-plugin-crosswalk-webview" spec="https://github.com/fribace/cordova-plugin-crosswalk-webview.git" />
+    <plugin name="cordova-build-architecture" spec="https://github.com/MBuchalik/cordova-build-architecture.git#v1.0.4" />
     <engine name="ios" spec="^4.5.5" />
     <engine name="android" spec="^7.1.2" />
 </widget>

distribute.js

@@ -35,8 +35,9 @@ const apkDir = path.resolve(
     "build",
     "outputs",
     "apk",
+    "armv7",
     "release",
-    "app-release.apk"
+    "app-armv7-release.apk"
 );
 var argv = require('minimist')(process.argv.slice(2));
 // console.dir(argv);

package-lock.json

@@ -413,6 +413,10 @@
                 }
             }
         },
+        "cordova-build-architecture": {
+            "version": "git+https://github.com/MBuchalik/cordova-build-architecture.git#bc126ae7761f33abd25fd0c566b3b7d5107c314b",
+            "from": "git+https://github.com/MBuchalik/cordova-build-architecture.git#v1.0.4"
+        },
         "cordova-ios": {
             "version": "4.5.5",
             "resolved": "http://registry.npm.taobao.org/cordova-ios/download/cordova-ios-4.5.5.tgz",

package.json

@@ -12,6 +12,7 @@
     "dependencies": {
         "alloyfinger": "^0.1.15",
         "cordova-android": "^7.1.2",
+        "cordova-build-architecture": "git+https://github.com/MBuchalik/cordova-build-architecture.git#v1.0.4",
         "cordova-ios": "^4.5.5",
         "cordova-plugin-camera": "^4.0.3",
         "cordova-plugin-clipboard-x": "^1.0.1",
@@ -47,12 +48,19 @@
             "cordova-plugin-statusbar": {},
             "cordova-plugin-file": {},
             "cordova-plugin-remote-injection": {},
-            "cordova-plugin-crosswalk-webview": {},
             "cordova-plugin-splashscreen": {},
             "cordova-plugin-wkwebview-engine": {},
             "jpush-phonegap-plugin": {
                 "APP_KEY": "9c6e3cd69bd572f7c548ac83"
-            }
+            },
+            "cordova-plugin-crosswalk-webview": {
+                "XWALK_VERSION": "23+",
+                "XWALK_LITEVERSION": "xwalk_core_library_canary:17+",
+                "XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect",
+                "XWALK_MODE": "embedded",
+                "XWALK_MULTIPLEAPK": "true"
+            },
+            "cordova-build-architecture": {}
         },
         "platforms": [
             "ios",

platforms/android/android.json

@@ -10,35 +10,35 @@
           "/*": [
             {
               "xml": "<uses-permission android:name=\"android.permission.INTERNET\" />",
-              "count": 24
+              "count": 42
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\" />",
-              "count": 12
+              "count": 21
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\" />",
-              "count": 12
+              "count": 21
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\" />",
-              "count": 13
+              "count": 22
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\" />",
-              "count": 12
+              "count": 21
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />",
-              "count": 13
+              "count": 22
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\" />",
-              "count": 12
+              "count": 21
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\" />",
-              "count": 12
+              "count": 21
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
@@ -173,67 +173,71 @@
               "count": 1
             },
             {
-              "xml": "<preference name=\"webView\" value=\"org.crosswalk.engine.XWalkWebViewEngine\" />",
+              "xml": "<feature name=\"Device\"><param name=\"android-package\" value=\"org.apache.cordova.device.Device\" /></feature>",
               "count": 1
             },
             {
-              "xml": "<preference name=\"xwalkVersion\" value=\"23+\" />",
+              "xml": "<feature name=\"File\"><param name=\"android-package\" value=\"org.apache.cordova.file.FileUtils\" /><param name=\"onload\" value=\"true\" /></feature>",
               "count": 1
             },
             {
-              "xml": "<preference name=\"xwalkLiteVersion\" value=\"xwalk_core_library_canary:17+\" />",
+              "xml": "<allow-navigation href=\"cdvfile:*\" />",
               "count": 1
             },
             {
-              "xml": "<preference name=\"xwalkCommandLine\" value=\"--disable-pull-to-refresh-effect\" />",
+              "xml": "<feature name=\"InAppBrowser\"><param name=\"android-package\" value=\"org.apache.cordova.inappbrowser.InAppBrowser\" /></feature>",
               "count": 1
             },
             {
-              "xml": "<preference name=\"xwalkMode\" value=\"embedded\" />",
+              "xml": "<feature name=\"SplashScreen\"><param name=\"android-package\" value=\"org.apache.cordova.splashscreen.SplashScreen\" /><param name=\"onload\" value=\"true\" /></feature>",
               "count": 1
             },
             {
-              "xml": "<preference name=\"xwalkMultipleApk\" value=\"true\" />",
+              "xml": "<feature name=\"StatusBar\"><param name=\"android-package\" value=\"org.apache.cordova.statusbar.StatusBar\" /><param name=\"onload\" value=\"true\" /></feature>",
               "count": 1
             },
             {
-              "xml": "<preference name=\"android-minSdkVersion\" value=\"16\" />",
+              "xml": "<feature name=\"Whitelist\"><param name=\"android-package\" value=\"org.apache.cordova.whitelist.WhitelistPlugin\" /><param name=\"onload\" value=\"true\" /></feature>",
               "count": 1
             },
             {
-              "xml": "<feature name=\"Device\"><param name=\"android-package\" value=\"org.apache.cordova.device.Device\" /></feature>",
+              "xml": "<feature name=\"Toast\"><param name=\"android-package\" value=\"nl.xservices.plugins.Toast\" /></feature>",
               "count": 1
             },
             {
-              "xml": "<feature name=\"File\"><param name=\"android-package\" value=\"org.apache.cordova.file.FileUtils\" /><param name=\"onload\" value=\"true\" /></feature>",
+              "xml": "<feature name=\"JPushPlugin\"><param name=\"android-package\" value=\"cn.jiguang.cordova.push.JPushPlugin\" /></feature>",
               "count": 1
             },
             {
-              "xml": "<allow-navigation href=\"cdvfile:*\" />",
+              "xml": "<preference name=\"webView\" value=\"org.crosswalk.engine.XWalkWebViewEngine\" />",
               "count": 1
             },
             {
-              "xml": "<feature name=\"InAppBrowser\"><param name=\"android-package\" value=\"org.apache.cordova.inappbrowser.InAppBrowser\" /></feature>",
+              "xml": "<preference name=\"xwalkVersion\" value=\"23+\" />",
               "count": 1
             },
             {
-              "xml": "<feature name=\"SplashScreen\"><param name=\"android-package\" value=\"org.apache.cordova.splashscreen.SplashScreen\" /><param name=\"onload\" value=\"true\" /></feature>",
+              "xml": "<preference name=\"xwalkLiteVersion\" value=\"xwalk_core_library_canary:17+\" />",
               "count": 1
             },
             {
-              "xml": "<feature name=\"StatusBar\"><param name=\"android-package\" value=\"org.apache.cordova.statusbar.StatusBar\" /><param name=\"onload\" value=\"true\" /></feature>",
+              "xml": "<preference name=\"xwalkCommandLine\" value=\"--disable-pull-to-refresh-effect\" />",
               "count": 1
             },
             {
-              "xml": "<feature name=\"Whitelist\"><param name=\"android-package\" value=\"org.apache.cordova.whitelist.WhitelistPlugin\" /><param name=\"onload\" value=\"true\" /></feature>",
+              "xml": "<preference name=\"xwalkMode\" value=\"embedded\" />",
               "count": 1
             },
             {
-              "xml": "<feature name=\"Toast\"><param name=\"android-package\" value=\"nl.xservices.plugins.Toast\" /></feature>",
+              "xml": "<preference name=\"xwalkMultipleApk\" value=\"true\" />",
               "count": 1
             },
             {
-              "xml": "<feature name=\"JPushPlugin\"><param name=\"android-package\" value=\"cn.jiguang.cordova.push.JPushPlugin\" /></feature>",
+              "xml": "<preference name=\"android-minSdkVersion\" value=\"16\" />",
+              "count": 1
+            },
+            {
+              "xml": "<preference default=\"arm\" name=\"buildArchitecture\" />",
               "count": 1
             }
           ]
@@ -258,14 +262,6 @@
     "cordova-plugin-clipboard-x": {
       "PACKAGE_NAME": "com.izouma.yuanqijjc"
     },
-    "cordova-plugin-crosswalk-webview": {
-      "XWALK_VERSION": "23+",
-      "XWALK_LITEVERSION": "xwalk_core_library_canary:17+",
-      "XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect",
-      "XWALK_MODE": "embedded",
-      "XWALK_MULTIPLEAPK": "true",
-      "PACKAGE_NAME": "com.izouma.yuanqijjc"
-    },
     "cordova-plugin-device": {
       "PACKAGE_NAME": "com.izouma.yuanqijjc"
     },
@@ -299,6 +295,17 @@
     "jpush-phonegap-plugin": {
       "APP_KEY": "9c6e3cd69bd572f7c548ac83",
       "PACKAGE_NAME": "com.izouma.yuanqijjc"
+    },
+    "cordova-plugin-crosswalk-webview": {
+      "XWALK_VERSION": "23+",
+      "XWALK_LITEVERSION": "xwalk_core_library_canary:17+",
+      "XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect",
+      "XWALK_MODE": "embedded",
+      "XWALK_MULTIPLEAPK": "true",
+      "PACKAGE_NAME": "com.izouma.yuanqijjc"
+    },
+    "cordova-build-architecture": {
+      "PACKAGE_NAME": "com.izouma.yuanqijjc"
     }
   },
   "dependent_plugins": {},
@@ -570,7 +577,6 @@
   "plugin_metadata": {
     "cordova-plugin-camera": "4.0.3",
     "cordova-plugin-clipboard-x": "1.0.1",
-    "cordova-plugin-crosswalk-webview": "2.4.0",
     "cordova-plugin-device": "2.0.2",
     "cordova-plugin-file": "6.0.1",
     "cordova-plugin-inappbrowser": "3.0.0",
@@ -581,6 +587,8 @@
     "cordova-plugin-whitelist": "1.3.3",
     "cordova-plugin-wkwebview-engine": "1.1.4",
     "cordova-plugin-x-toast": "2.6.2",
-    "jpush-phonegap-plugin": "3.5.1"
+    "jpush-phonegap-plugin": "3.5.1",
+    "cordova-plugin-crosswalk-webview": "2.4.0",
+    "cordova-build-architecture": "1.0.4"
   }
 }

platforms/android/app/build.gradle

@@ -92,6 +92,7 @@ ext {
 
 // PLUGIN GRADLE EXTENSIONS START
 apply from: "../cordova-plugin-crosswalk-webview/yuanqijjc-xwalk.gradle"
+apply from: "../cordova-build-architecture/yuanqijjc-architecture.gradle"
 // PLUGIN GRADLE EXTENSIONS END
 
 def hasBuildExtras = file('build-extras.gradle').exists()

platforms/android/app/src/main/assets/www/cordova_plugins.js

@@ -269,7 +269,6 @@ module.exports.metadata =
 {
   "cordova-plugin-camera": "4.0.3",
   "cordova-plugin-clipboard-x": "1.0.1",
-  "cordova-plugin-crosswalk-webview": "2.4.0",
   "cordova-plugin-device": "2.0.2",
   "cordova-plugin-file": "6.0.1",
   "cordova-plugin-inappbrowser": "3.0.0",
@@ -280,7 +279,9 @@ module.exports.metadata =
   "cordova-plugin-whitelist": "1.3.3",
   "cordova-plugin-wkwebview-engine": "1.1.4",
   "cordova-plugin-x-toast": "2.6.2",
-  "jpush-phonegap-plugin": "3.5.1"
+  "jpush-phonegap-plugin": "3.5.1",
+  "cordova-plugin-crosswalk-webview": "2.4.0",
+  "cordova-build-architecture": "1.0.4"
 };
 // BOTTOM OF METADATA
 });

platforms/android/app/src/main/res/xml/config.xml

@@ -35,6 +35,7 @@
     <feature name="JPushPlugin">
         <param name="android-package" value="cn.jiguang.cordova.push.JPushPlugin" />
     </feature>
+    <preference default="arm" name="buildArchitecture" />
     <feature name="RemoteInjection">
         <param name="android-package" value="com.truckmovers.cordova.RemoteInjectionPlugin" />
         <param name="onload" value="true" />
@@ -85,7 +86,7 @@
     <preference name="xwalkLiteVersion" value="xwalk_core_library_canary:17+" />
     <preference name="xwalkCommandLine" value="--disable-pull-to-refresh-effect" />
     <preference name="xwalkMode" value="embedded" />
-    <preference name="xwalkMultipleApk" value="false" />
+    <preference name="xwalkMultipleApk" value="true" />
     <preference name="android-minSdkVersion" value="16" />
     <preference name="BackgroundColor" value="0xFFFFFFFF" />
     <preference name="SuppressesIncrementalRendering" value="true" />

platforms/android/cordova-build-architecture/yuanqijjc-architecture.gradle

@@ -0,0 +1,24 @@
+def getArchitecturePreference() {
+  def architecture = 'arm'
+  def file_content
+
+  if (file('src/main/res/xml/config.xml').exists()) {
+    // Cordova-android >= 7
+    file_content = file('src/main/res/xml/config.xml').getText()
+  } else {
+    file_content = file('res/xml/config.xml').getText()
+  }
+
+  def xml = new XmlParser(false, false).parseText(file_content)
+
+  xml.preference.each { it ->
+    def name = it.attribute('name')
+    if(name && name.toLowerCase() == 'buildarchitecture')
+      if(it.attribute('value') != null)
+        architecture = it.attribute('value')
+  }
+
+  return architecture
+}
+ext.cdvBuildArch = getArchitecturePreference()
+ext.cdvBuildMultipleApks = true

platforms/android/platform_www/cordova_plugins.js

@@ -269,7 +269,6 @@ module.exports.metadata =
 {
   "cordova-plugin-camera": "4.0.3",
   "cordova-plugin-clipboard-x": "1.0.1",
-  "cordova-plugin-crosswalk-webview": "2.4.0",
   "cordova-plugin-device": "2.0.2",
   "cordova-plugin-file": "6.0.1",
   "cordova-plugin-inappbrowser": "3.0.0",
@@ -280,7 +279,9 @@ module.exports.metadata =
   "cordova-plugin-whitelist": "1.3.3",
   "cordova-plugin-wkwebview-engine": "1.1.4",
   "cordova-plugin-x-toast": "2.6.2",
-  "jpush-phonegap-plugin": "3.5.1"
+  "jpush-phonegap-plugin": "3.5.1",
+  "cordova-plugin-crosswalk-webview": "2.4.0",
+  "cordova-build-architecture": "1.0.4"
 };
 // BOTTOM OF METADATA
 });

platforms/android/project.properties

@@ -12,4 +12,5 @@ target=android-27
 android.library.reference.1=CordovaLib
 android.library.reference.2=app
 cordova.system.library.1=com.android.support:support-v4:24.1.1+
-cordova.gradle.include.1=cordova-plugin-crosswalk-webview/yuanqijjc-xwalk.gradle
+cordova.gradle.include.1=cordova-plugin-crosswalk-webview/yuanqijjc-xwalk.gradle
+cordova.gradle.include.2=cordova-build-architecture/yuanqijjc-architecture.gradle

platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/drew.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
 		<key>Cordova.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>2</integer>
 		</dict>
 		<key>CordovaLib.xcscheme</key>
 		<dict>

platforms/ios/ios.json

@@ -10,35 +10,35 @@
           "CFBundleLocalizations": [
             {
               "xml": "<array><string>zh_CN</string></array>",
-              "count": 6,
+              "count": 7,
               "id": "config.xml"
             }
           ],
           "NSCameraUsageDescription": [
             {
               "xml": "<string>需要相机权限才能继续使用</string>",
-              "count": 6,
+              "count": 7,
               "id": "config.xml"
             }
           ],
           "NSPhotoLibraryUsageDescription": [
             {
               "xml": "<string>需要相册权限才能继续使用</string>",
-              "count": 6,
+              "count": 7,
               "id": "config.xml"
             }
           ],
           "NSLocationWhenInUseUsageDescription": [
             {
               "xml": "<string>您的当前位置将会在地图上显示，并且用于获取周边的园区数据</string>",
-              "count": 6,
+              "count": 7,
               "id": "config.xml"
             }
           ],
           "ITSAppUsesNonExemptEncryption": [
             {
               "xml": "<false />",
-              "count": 6,
+              "count": 7,
               "id": "config.xml"
             }
           ],
@@ -155,9 +155,6 @@
     "cordova-plugin-clipboard-x": {
       "PACKAGE_NAME": "com.izouma.dianjing"
     },
-    "cordova-plugin-crosswalk-webview": {
-      "PACKAGE_NAME": "com.izouma.dianjing"
-    },
     "cordova-plugin-device": {
       "PACKAGE_NAME": "com.izouma.dianjing"
     },
@@ -191,6 +188,12 @@
     "jpush-phonegap-plugin": {
       "APP_KEY": "9c6e3cd69bd572f7c548ac83",
       "PACKAGE_NAME": "com.izouma.yuanqijjc"
+    },
+    "cordova-plugin-crosswalk-webview": {
+      "PACKAGE_NAME": "com.izouma.yuanqijjc"
+    },
+    "cordova-build-architecture": {
+      "PACKAGE_NAME": "com.izouma.yuanqijjc"
     }
   },
   "dependent_plugins": {},
@@ -478,7 +481,6 @@
   "plugin_metadata": {
     "cordova-plugin-camera": "4.0.3",
     "cordova-plugin-clipboard-x": "1.0.1",
-    "cordova-plugin-crosswalk-webview": "2.4.0",
     "cordova-plugin-device": "2.0.2",
     "cordova-plugin-file": "6.0.1",
     "cordova-plugin-inappbrowser": "3.0.0",
@@ -489,6 +491,8 @@
     "cordova-plugin-wkwebview-engine": "1.1.4",
     "cordova-plugin-x-toast": "2.6.2",
     "cordova-plugin-jcore": "1.2.6",
-    "jpush-phonegap-plugin": "3.5.1"
+    "jpush-phonegap-plugin": "3.5.1",
+    "cordova-plugin-crosswalk-webview": "2.4.0",
+    "cordova-build-architecture": "1.0.4"
   }
 }

platforms/ios/platform_www/cordova_plugins.js

@@ -285,7 +285,6 @@ module.exports.metadata =
 {
   "cordova-plugin-camera": "4.0.3",
   "cordova-plugin-clipboard-x": "1.0.1",
-  "cordova-plugin-crosswalk-webview": "2.4.0",
   "cordova-plugin-device": "2.0.2",
   "cordova-plugin-file": "6.0.1",
   "cordova-plugin-inappbrowser": "3.0.0",
@@ -296,7 +295,9 @@ module.exports.metadata =
   "cordova-plugin-wkwebview-engine": "1.1.4",
   "cordova-plugin-x-toast": "2.6.2",
   "cordova-plugin-jcore": "1.2.6",
-  "jpush-phonegap-plugin": "3.5.1"
+  "jpush-phonegap-plugin": "3.5.1",
+  "cordova-plugin-crosswalk-webview": "2.4.0",
+  "cordova-build-architecture": "1.0.4"
 };
 // BOTTOM OF METADATA
 });

platforms/ios/www/cordova_plugins.js

@@ -285,7 +285,6 @@ module.exports.metadata =
 {
   "cordova-plugin-camera": "4.0.3",
   "cordova-plugin-clipboard-x": "1.0.1",
-  "cordova-plugin-crosswalk-webview": "2.4.0",
   "cordova-plugin-device": "2.0.2",
   "cordova-plugin-file": "6.0.1",
   "cordova-plugin-inappbrowser": "3.0.0",
@@ -296,7 +295,9 @@ module.exports.metadata =
   "cordova-plugin-wkwebview-engine": "1.1.4",
   "cordova-plugin-x-toast": "2.6.2",
   "cordova-plugin-jcore": "1.2.6",
-  "jpush-phonegap-plugin": "3.5.1"
+  "jpush-phonegap-plugin": "3.5.1",
+  "cordova-plugin-crosswalk-webview": "2.4.0",
+  "cordova-build-architecture": "1.0.4"
 };
 // BOTTOM OF METADATA
 });

platforms/ios/元气竞技场.xcodeproj/project.pbxproj

@@ -5,6 +5,7 @@
 	};
 	objectVersion = 46;
 	objects = {
+
 /* Begin PBXBuildFile section */
 		0207DA581B56EA530066E2B4 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0207DA571B56EA530066E2B4 /* Images.xcassets */; };
 		026E2EB8E48D422C8F5CF95B /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E0A9190800D419497F0568C /* AdSupport.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
@@ -420,6 +421,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
@@ -588,7 +590,7 @@
 					"\"$(SRCROOT)/元气竞技场/Plugins/jpush-phonegap-plugin\"",
 				);
 				PRODUCT_NAME = "元气竞技场";
-				PROVISIONING_PROFILE_SPECIFIER = YuanQi;
+				PROVISIONING_PROFILE_SPECIFIER = YuanqiApptore;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

platforms/ios/元气竞技场/config.xml

@@ -136,5 +136,4 @@
     <preference name="ShowSplashScreenSpinner" value="false" />
     <preference name="SplashMaintainAspectRatio" value="true" />
     <preference name="SplashScreenDelay" value="2000" />
-    <preference name="xwalkMultipleApk" value="false" />
 </widget>

plugins/android.json

@@ -13,14 +13,6 @@
     "cordova-plugin-clipboard-x": {
       "PACKAGE_NAME": "com.izouma.yuanqijjc"
     },
-    "cordova-plugin-crosswalk-webview": {
-      "XWALK_VERSION": "23+",
-      "XWALK_LITEVERSION": "xwalk_core_library_canary:17+",
-      "XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect",
-      "XWALK_MODE": "embedded",
-      "XWALK_MULTIPLEAPK": "true",
-      "PACKAGE_NAME": "com.izouma.yuanqijjc"
-    },
     "cordova-plugin-device": {
       "PACKAGE_NAME": "com.izouma.yuanqijjc"
     },
@@ -51,6 +43,17 @@
     "jpush-phonegap-plugin": {
       "APP_KEY": "9c6e3cd69bd572f7c548ac83",
       "PACKAGE_NAME": "com.izouma.yuanqijjc"
+    },
+    "cordova-plugin-crosswalk-webview": {
+      "XWALK_VERSION": "23+",
+      "XWALK_LITEVERSION": "xwalk_core_library_canary:17+",
+      "XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect",
+      "XWALK_MODE": "embedded",
+      "XWALK_MULTIPLEAPK": "true",
+      "PACKAGE_NAME": "com.izouma.yuanqijjc"
+    },
+    "cordova-build-architecture": {
+      "PACKAGE_NAME": "com.izouma.yuanqijjc"
     }
   },
   "dependent_plugins": {

plugins/cordova-build-architecture/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Martin Buchalik
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

plugins/cordova-build-architecture/README.md

@@ -0,0 +1,46 @@
+# cordova-build-architecture
+This plugin allows you to build your application for arm (or x86) only.
+# Why?
+Plugins like cordova-plugin-crosswalk-webview (https://github.com/crosswalk-project/cordova-plugin-crosswalk-webview) create two or more .apk files with one build. On Phonegap Build, you can only download one file which leads to problems if you want to get access to the other .apks.
+
+Also, the Crosswalk plugin sometimes creates a combined arm/x86 file on Phonegap Build even if you set the preference *xwalkMultipleApk* to *true*.
+
+Maybe you simply need to build for one architecture because of other reasons? This plugin might help you :-)
+
+# Usage
+Include this plugin in your config.xml:
+```xml
+<plugin name="cordova-build-architecture" spec="https://github.com/MBuchalik/cordova-build-architecture.git#v1.0.4" source="git" />
+```
+
+By default, it will try to produce arm builds only. If you want to target x86, add the following preference:
+```xml
+<preference name="buildArchitecture" value="x86" />
+```
+
+## Advanced configuration
+Crosswalk also allows you to generate 64 bit builds. This is usually done via a command line parameter, but also seems to be possible using the following preference:
+```xml
+<preference name="xwalk64bit" value="true" />
+```
+
+If you want to fetch the 64 bit arm build, simply use use
+```xml
+<preference name="buildArchitecture" value="arm64" />
+```
+For the 64 bit x86 build, you have to specify the following value:
+```xml
+<preference name="buildArchitecture" value="x86_64" />
+```
+
+## Summary
+The following values can be used in our ```buildArchitecture``` preference:
+
+| target platform | value | should the xwalk64bit preference be set (to true)? |
+| -------- | ----- | ----------------------------- |
+| arm      | arm   | :x: |
+| arm: 64 bit | arm64 | :white_check_mark: |
+| x86      | x86   | :x: |
+| x86: 64 bit | x86_64 | :white_check_mark: |
+
+**Please note that this plugin is experimental.**

plugins/cordova-build-architecture/package.json

@@ -0,0 +1,43 @@
+{
+  "_from": "git+https://github.com/MBuchalik/cordova-build-architecture.git#v1.0.4",
+  "_id": "cordova-build-architecture@1.0.4",
+  "_inBundle": false,
+  "_integrity": "",
+  "_location": "/cordova-build-architecture",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "git",
+    "raw": "https://github.com/MBuchalik/cordova-build-architecture.git#v1.0.4",
+    "rawSpec": "https://github.com/MBuchalik/cordova-build-architecture.git#v1.0.4",
+    "saveSpec": "git+https://github.com/MBuchalik/cordova-build-architecture.git#v1.0.4",
+    "fetchSpec": "https://github.com/MBuchalik/cordova-build-architecture.git",
+    "gitCommittish": "v1.0.4"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "git+https://github.com/MBuchalik/cordova-build-architecture.git#bc126ae7761f33abd25fd0c566b3b7d5107c314b",
+  "_spec": "https://github.com/MBuchalik/cordova-build-architecture.git#v1.0.4",
+  "_where": "/Users/drew/Projects/cordova/e-games-app",
+  "author": {
+    "name": "Martin Buchalik"
+  },
+  "bugs": {
+    "url": "https://github.com/MBuchalik/cordova-build-architecture/issues"
+  },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "Experimental plugin to force one single arm or x86 build",
+  "homepage": "https://github.com/MBuchalik/cordova-build-architecture#readme",
+  "keywords": [
+    "cordova"
+  ],
+  "license": "MIT",
+  "name": "cordova-build-architecture",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/MBuchalik/cordova-build-architecture.git"
+  },
+  "version": "1.0.4"
+}

plugins/cordova-build-architecture/platforms/android/architecture.gradle

@@ -0,0 +1,24 @@
+def getArchitecturePreference() {
+  def architecture = 'arm'
+  def file_content
+
+  if (file('src/main/res/xml/config.xml').exists()) {
+    // Cordova-android >= 7
+    file_content = file('src/main/res/xml/config.xml').getText()
+  } else {
+    file_content = file('res/xml/config.xml').getText()
+  }
+
+  def xml = new XmlParser(false, false).parseText(file_content)
+
+  xml.preference.each { it ->
+    def name = it.attribute('name')
+    if(name && name.toLowerCase() == 'buildarchitecture')
+      if(it.attribute('value') != null)
+        architecture = it.attribute('value')
+  }
+
+  return architecture
+}
+ext.cdvBuildArch = getArchitecturePreference()
+ext.cdvBuildMultipleApks = true

plugins/cordova-build-architecture/plugin.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        id="cordova-build-architecture"
+        version="1.0.4">
+
+    <name>Build Architecture</name>
+    <description>Experimental plugin to force one single arm or x86 build</description>
+    <license>MIT</license>
+    <repo>https://github.com/MBuchalik/cordova-build-architecture</repo>
+
+    <engines>
+        <engine name="cordova-android" version=">=4"/>
+        <engine name="cordova-plugman" version=">=4.2.0"/><!-- needed for gradleReference support -->
+    </engines>
+
+    <!-- android -->
+    <platform name="android">
+        <config-file target="res/xml/config.xml" parent="/*">
+        	<preference name="buildArchitecture" default="arm" />
+        </config-file>
+
+        <framework src="platforms/android/architecture.gradle" custom="true" type="gradleReference"/>
+    </platform>
+</plugin>

plugins/cordova-plugin-crosswalk-webview/package.json

@@ -19,7 +19,7 @@
   ],
   "_resolved": "git+https://github.com/fribace/cordova-plugin-crosswalk-webview.git#2bd1dd341224e08f11cffac66a405ea68c1f24d7",
   "_spec": "https://github.com/fribace/cordova-plugin-crosswalk-webview.git",
-  "_where": "/Users/drew/Projects/Cordova/HuanBaoJia",
+  "_where": "/Users/drew/Projects/cordova/e-games-app",
   "author": "",
   "bugs": {
     "url": "https://crosswalk-project.org/jira"

plugins/fetch.json

@@ -71,14 +71,6 @@
     "is_top_level": true,
     "variables": {}
   },
-  "cordova-plugin-crosswalk-webview": {
-    "source": {
-      "type": "registry",
-      "id": "https://github.com/fribace/cordova-plugin-crosswalk-webview.git"
-    },
-    "is_top_level": true,
-    "variables": {}
-  },
   "cordova-plugin-splashscreen": {
     "source": {
       "type": "registry",
@@ -112,5 +104,21 @@
     },
     "is_top_level": false,
     "variables": {}
+  },
+  "cordova-plugin-crosswalk-webview": {
+    "source": {
+      "type": "registry",
+      "id": "https://github.com/fribace/cordova-plugin-crosswalk-webview.git"
+    },
+    "is_top_level": true,
+    "variables": {}
+  },
+  "cordova-build-architecture": {
+    "source": {
+      "type": "registry",
+      "id": "https://github.com/MBuchalik/cordova-build-architecture.git#v1.0.4"
+    },
+    "is_top_level": true,
+    "variables": {}
   }
 }

plugins/ios.json

@@ -13,9 +13,6 @@
     "cordova-plugin-clipboard-x": {
       "PACKAGE_NAME": "com.izouma.dianjing"
     },
-    "cordova-plugin-crosswalk-webview": {
-      "PACKAGE_NAME": "com.izouma.dianjing"
-    },
     "cordova-plugin-device": {
       "PACKAGE_NAME": "com.izouma.dianjing"
     },
@@ -46,6 +43,12 @@
     "jpush-phonegap-plugin": {
       "APP_KEY": "9c6e3cd69bd572f7c548ac83",
       "PACKAGE_NAME": "com.izouma.yuanqijjc"
+    },
+    "cordova-plugin-crosswalk-webview": {
+      "PACKAGE_NAME": "com.izouma.yuanqijjc"
+    },
+    "cordova-build-architecture": {
+      "PACKAGE_NAME": "com.izouma.yuanqijjc"
     }
   },
   "dependent_plugins": {