手持机

app/gmMis/config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.izouma.gmmis" version="1.3.4" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.izouma.gmmis" version="1.3.8" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>gmMis</name>
     <description>        A sample Apache Cordova application that responds to the deviceready event.    </description>
     <author email="dev@cordova.apache.org" href="http://cordova.io">        Apache Cordova Team    </author>
@@ -52,7 +52,6 @@
     <plugin name="cordova-plugin-wkwebview-engine" spec="^1.1.4" />
     <plugin name="cordova-plugin-camera" spec="^4.0.3" />
     <plugin name="cordova-plugin-device" spec="^2.0.2" />
-    <plugin name="cordova-plugin-x-toast" spec="^2.6.2" />
     <plugin name="cordova-plugin-clipboard-x" spec="^1.0.1" />
     <preference name="xwalkMultipleApk" value="false" />
     <plugin name="cordova-plugin-pgyer" spec="https://github.com/x1ongzhu/cordova-plugin-pgyer.git">

app/gmMis/package-lock.json

@@ -4878,7 +4878,7 @@
         },
         "cordova-plugin-camera": {
             "version": "4.0.3",
-            "resolved": "http://registry.npm.taobao.org/cordova-plugin-camera/download/cordova-plugin-camera-4.0.3.tgz",
+            "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-4.0.3.tgz",
             "integrity": "sha1-c3Olk4MYyGzP2E43E+I4LRD+B2s="
         },
         "cordova-plugin-clipboard-x": {
@@ -4887,8 +4887,12 @@
             "integrity": "sha1-WJTQibfVfEJ7xK7tYZZ5mlXu7F4="
         },
         "cordova-plugin-crosswalk-webview": {
+<<<<<<< HEAD
             "version": "git+https://github.com/x1ongzhu/cordova-plugin-crosswalk-webview.git#a03dc194e326cc94b90fc6eeceace16a57417f7d",
             "from": "git+https://github.com/x1ongzhu/cordova-plugin-crosswalk-webview.git"
+=======
+            "version": "git+https://github.com/x1ongzhu/cordova-plugin-crosswalk-webview.git#a03dc194e326cc94b90fc6eeceace16a57417f7d"
+>>>>>>> 手持机
         },
         "cordova-plugin-device": {
             "version": "2.0.2",
@@ -4896,12 +4900,19 @@
             "integrity": "sha1-/Ajzci5n7ve2xnv8mag99q3Quro="
         },
         "cordova-plugin-handheld": {
+<<<<<<< HEAD
             "version": "git+https://github.com/x1ongzhu/cordova-plugin-handheld.git#f8fb4b61c81ea74f826ca8f31e8efd62e1a44ee7",
             "from": "git+https://github.com/x1ongzhu/cordova-plugin-handheld.git"
         },
         "cordova-plugin-pgyer": {
             "version": "git+https://github.com/x1ongzhu/cordova-plugin-pgyer.git#d7e65157a4b7805ab1c40d3f008c301fe3492bb8",
             "from": "git+https://github.com/x1ongzhu/cordova-plugin-pgyer.git"
+=======
+            "version": "git+https://github.com/x1ongzhu/cordova-plugin-handheld.git#f8fb4b61c81ea74f826ca8f31e8efd62e1a44ee7"
+        },
+        "cordova-plugin-pgyer": {
+            "version": "git+https://github.com/x1ongzhu/cordova-plugin-pgyer.git#d7e65157a4b7805ab1c40d3f008c301fe3492bb8"
+>>>>>>> 手持机
         },
         "cordova-plugin-statusbar": {
             "version": "2.4.2",
@@ -4919,9 +4930,9 @@
             "integrity": "sha1-EbnPoRTsBSXFxj5nok6rQVcDQGA="
         },
         "cordova-plugin-x-toast": {
-            "version": "2.7.0",
-            "resolved": "https://registry.npmjs.org/cordova-plugin-x-toast/-/cordova-plugin-x-toast-2.7.0.tgz",
-            "integrity": "sha512-snd4KTWXvku9BHgwRFiz75fGZCtr1K/Z6KRLWmtmqKWT/6lKlMZHbPOQfXavOyV9iqotJHgzbv2BMJtLuXlRVg=="
+            "version": "2.7.2",
+            "resolved": "https://registry.npmjs.org/cordova-plugin-x-toast/-/cordova-plugin-x-toast-2.7.2.tgz",
+            "integrity": "sha512-nx4LaBkJyEk1MknkLC0/U904A42WX/1/OZUeUyXkKRtChShsoTdbWlvEqHKzPbELzf2bEMnXd1CI70WRv+a4hA=="
         }
     }
 }

app/gmMis/package.json

@@ -21,7 +21,7 @@
         "cordova-plugin-statusbar": "^2.4.2",
         "cordova-plugin-whitelist": "^1.3.3",
         "cordova-plugin-wkwebview-engine": "^1.1.4",
-        "cordova-plugin-x-toast": "^2.6.2"
+        "cordova-plugin-x-toast": "^2.7.2"
     },
     "cordova": {
         "plugins": {
@@ -29,19 +29,22 @@
             "cordova-plugin-wkwebview-engine": {},
             "cordova-plugin-camera": {},
             "cordova-plugin-device": {},
-            "cordova-plugin-x-toast": {},
             "cordova-plugin-clipboard-x": {},
             "cordova-plugin-whitelist": {},
-            "cordova-plugin-pgyer": {
-                "APP_ID": "d0f09be14a67a2082bdf777eb0b2a8c2"
-            },
-            "cordova-plugin-handheld": {},
             "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": "false"
+<<<<<<< HEAD
+=======
+            },
+            "cordova-plugin-x-toast": {},
+            "cordova-plugin-handheld": {},
+            "cordova-plugin-pgyer": {
+                "APP_ID": "d0f09be14a67a2082bdf777eb0b2a8c2"
+>>>>>>> 手持机
             }
         },
         "platforms": [

app/gmMis/platforms/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 #Fri Nov 23 15:52:02 CST 2018
+=======
+#Fri Nov 23 17:23:23 CST 2018
+>>>>>>> 手持机
 gradle.version=4.1

app/gmMis/platforms/android/CordovaLib/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1 +1,5 @@
+<<<<<<< HEAD
 #Fri Nov 23 15:52:03 CST 2018
+=======
+#Fri Nov 23 17:23:23 CST 2018
+>>>>>>> 手持机

app/gmMis/platforms/android/android.json

@@ -10,7 +10,19 @@
           "/*": [
             {
               "xml": "<uses-permission android:name=\"android.permission.INTERNET\" />",
+<<<<<<< HEAD
               "count": 20
+=======
+              "count": 56
+            },
+            {
+              "xml": "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />",
+              "count": 3
+            },
+            {
+              "xml": "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\" />",
+              "count": 3
+>>>>>>> 手持机
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
@@ -91,6 +103,7 @@
               "count": 1
             },
             {
+<<<<<<< HEAD
               "xml": "<feature name=\"Device\"><param name=\"android-package\" value=\"org.apache.cordova.device.Device\" /></feature>",
               "count": 1
             },
@@ -116,9 +129,7 @@
             },
             {
               "xml": "<feature name=\"Handheld\"><param name=\"android-package\" value=\"com.izouma.handheld.Handheld\" /><param name=\"onload\" value=\"true\" /></feature>",
-              "count": 1
-            },
-            {
+=======
               "xml": "<preference name=\"webView\" value=\"org.crosswalk.engine.XWalkWebViewEngine\" />",
               "count": 1
             },
@@ -144,6 +155,43 @@
             },
             {
               "xml": "<preference name=\"android-minSdkVersion\" value=\"19\" />",
+>>>>>>> 手持机
+              "count": 1
+            },
+            {
+              "xml": "<feature name=\"Device\"><param name=\"android-package\" value=\"org.apache.cordova.device.Device\" /></feature>",
+              "count": 1
+            },
+            {
+              "xml": "<feature name=\"Camera\"><param name=\"android-package\" value=\"org.apache.cordova.camera.CameraLauncher\" /></feature>",
+              "count": 1
+            },
+            {
+              "xml": "<feature name=\"Handheld\"><param name=\"android-package\" value=\"com.izouma.handheld.Handheld\" /><param name=\"onload\" value=\"true\" /></feature>",
+              "count": 1
+            },
+            {
+              "xml": "<feature name=\"pgyer\"><param name=\"android-package\" value=\"cn.x1ongzhu.pgyer.pgyer\" /><param name=\"onload\" value=\"true\" /></feature>",
+              "count": 1
+            },
+            {
+              "xml": "<feature name=\"StatusBar\"><param name=\"android-package\" value=\"org.apache.cordova.statusbar.StatusBar\" /><param name=\"onload\" value=\"true\" /></feature>",
+              "count": 1
+            },
+            {
+<<<<<<< HEAD
+              "xml": "<preference name=\"xwalkMultipleApk\" value=\"false\" />",
+              "count": 1
+            },
+            {
+              "xml": "<preference name=\"android-minSdkVersion\" value=\"19\" />",
+=======
+              "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=\"Toast\"><param name=\"android-package\" value=\"nl.xservices.plugins.Toast\" /></feature>",
+>>>>>>> 手持机
               "count": 1
             }
           ]
@@ -153,11 +201,35 @@
   },
   "installed_plugins": {
     "cordova-plugin-clipboard-x": {
+<<<<<<< HEAD
+=======
+      "PACKAGE_NAME": "com.izouma.gmmis"
+    },
+    "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": "false",
+>>>>>>> 手持机
       "PACKAGE_NAME": "com.izouma.gmmis"
     },
     "cordova-plugin-device": {
       "PACKAGE_NAME": "com.izouma.gmmis"
     },
+<<<<<<< HEAD
+=======
+    "cordova-plugin-camera": {
+      "PACKAGE_NAME": "com.izouma.gmmis"
+    },
+    "cordova-plugin-handheld": {
+      "PACKAGE_NAME": "com.izouma.gmmis"
+    },
+    "cordova-plugin-pgyer": {
+      "APP_ID": "d0f09be14a67a2082bdf777eb0b2a8c2",
+      "PACKAGE_NAME": "com.izouma.gmmis"
+    },
+>>>>>>> 手持机
     "cordova-plugin-statusbar": {
       "PACKAGE_NAME": "com.izouma.gmmis"
     },
@@ -169,6 +241,7 @@
     },
     "cordova-plugin-x-toast": {
       "PACKAGE_NAME": "com.izouma.gmmis"
+<<<<<<< HEAD
     },
     "cordova-plugin-pgyer": {
       "APP_ID": "d0f09be14a67a2082bdf777eb0b2a8c2",
@@ -187,6 +260,8 @@
       "XWALK_MODE": "embedded",
       "XWALK_MULTIPLEAPK": "false",
       "PACKAGE_NAME": "com.izouma.gmmis"
+=======
+>>>>>>> 手持机
     }
   },
   "dependent_plugins": {},
@@ -195,6 +270,26 @@
       "id": "cordova-plugin-clipboard-x.Clipboard",
       "file": "plugins/cordova-plugin-clipboard-x/www/clipboard.js",
       "pluginId": "cordova-plugin-clipboard-x",
+<<<<<<< HEAD
+=======
+      "clobbers": [
+        "cordova.plugins.clipboard",
+        "cordova.plugins.clipboard-x"
+      ]
+    },
+    {
+      "id": "cordova-plugin-device.device",
+      "file": "plugins/cordova-plugin-device/www/device.js",
+      "pluginId": "cordova-plugin-device",
+      "clobbers": [
+        "device"
+      ]
+    },
+    {
+      "id": "cordova-plugin-camera.Camera",
+      "file": "plugins/cordova-plugin-camera/www/CameraConstants.js",
+      "pluginId": "cordova-plugin-camera",
+>>>>>>> 手持机
       "clobbers": [
         "cordova.plugins.clipboard",
         "cordova.plugins.clipboard-x"
@@ -225,6 +320,7 @@
       ]
     },
     {
+<<<<<<< HEAD
       "id": "cordova-plugin-pgyer.pgyer",
       "file": "plugins/cordova-plugin-pgyer/www/pgyer.js",
       "pluginId": "cordova-plugin-pgyer",
@@ -244,6 +340,11 @@
       "id": "cordova-plugin-camera.CameraPopoverOptions",
       "file": "plugins/cordova-plugin-camera/www/CameraPopoverOptions.js",
       "pluginId": "cordova-plugin-camera",
+=======
+      "id": "cordova-plugin-handheld.Handheld",
+      "file": "plugins/cordova-plugin-handheld/www/Handheld.js",
+      "pluginId": "cordova-plugin-handheld",
+>>>>>>> 手持机
       "clobbers": [
         "CameraPopoverOptions"
       ]
@@ -275,7 +376,9 @@
   ],
   "plugin_metadata": {
     "cordova-plugin-clipboard-x": "1.0.1",
+    "cordova-plugin-crosswalk-webview": "2.4.0",
     "cordova-plugin-device": "2.0.2",
+<<<<<<< HEAD
     "cordova-plugin-statusbar": "2.4.2",
     "cordova-plugin-whitelist": "1.3.3",
     "cordova-plugin-wkwebview-engine": "1.1.4",
@@ -284,5 +387,14 @@
     "cordova-plugin-camera": "4.0.3",
     "cordova-plugin-handheld": "1.0.0",
     "cordova-plugin-crosswalk-webview": "2.4.0"
+=======
+    "cordova-plugin-camera": "4.0.3",
+    "cordova-plugin-handheld": "1.0.0",
+    "cordova-plugin-pgyer": "1.0.0",
+    "cordova-plugin-statusbar": "2.4.2",
+    "cordova-plugin-whitelist": "1.3.3",
+    "cordova-plugin-wkwebview-engine": "1.1.4",
+    "cordova-plugin-x-toast": "2.7.2"
+>>>>>>> 手持机
   }
 }

app/gmMis/platforms/android/app/build.gradle

@@ -91,9 +91,15 @@ ext {
 }
 
 // PLUGIN GRADLE EXTENSIONS START
+<<<<<<< HEAD
 apply from: "../cordova-plugin-pgyer/gmmis-pgyer.gradle"
 apply from: "../cordova-plugin-handheld/gmmis-handheld.gradle"
 apply from: "../cordova-plugin-crosswalk-webview/gmmis-xwalk.gradle"
+=======
+apply from: "../cordova-plugin-crosswalk-webview/gmmis-xwalk.gradle"
+apply from: "../cordova-plugin-handheld/gmmis-handheld.gradle"
+apply from: "../cordova-plugin-pgyer/gmmis-pgyer.gradle"
+>>>>>>> 手持机
 // PLUGIN GRADLE EXTENSIONS END
 
 def hasBuildExtras1 = file('build-extras.gradle').exists()

app/gmMis/platforms/android/app/build/generated/source/buildConfig/debug/com/izouma/gmmis/BuildConfig.java

@@ -8,6 +8,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "com.izouma.gmmis";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 10304;
-  public static final String VERSION_NAME = "1.3.4";
+  public static final int VERSION_CODE = 10308;
+  public static final String VERSION_NAME = "1.3.8";
 }

app/gmMis/platforms/android/app/build/generated/source/r/debug/com/izouma/gmmis/R.java

@@ -897,8 +897,13 @@ public final class R {
      * @see #ButtonCompat_buttonRaised
      */
     public static final int[] ButtonCompat={
+<<<<<<< HEAD
       0x7f020000, 0x7f020001
     };
+=======
+        0x7f020000, 0x7f020001
+      };
+>>>>>>> 手持机
     /**
      * <p>This symbol is the offset where the {@link com.izouma.gmmis.R.attr#buttonColor}
      * attribute's value can be found in the {@link #ButtonCompat} array.
@@ -938,8 +943,13 @@ public final class R {
      * @see #CoordinatorLayout_statusBarBackground
      */
     public static final int[] CoordinatorLayout={
+<<<<<<< HEAD
       0x7f02000c, 0x7f020038
     };
+=======
+        0x7f02000c, 0x7f020038
+      };
+>>>>>>> 手持机
     /**
      * <p>This symbol is the offset where the {@link com.izouma.gmmis.R.attr#keylines}
      * attribute's value can be found in the {@link #CoordinatorLayout} array.
@@ -991,9 +1001,15 @@ public final class R {
      * @see #CoordinatorLayout_Layout_layout_keyline
      */
     public static final int[] CoordinatorLayout_Layout={
+<<<<<<< HEAD
       0x010100b3, 0x7f02000d, 0x7f02000e, 0x7f02000f, 
       0x7f020010, 0x7f020011, 0x7f020012
     };
+=======
+        0x010100b3, 0x7f02000d, 0x7f02000e, 0x7f02000f, 
+        0x7f020010, 0x7f020011, 0x7f020012
+      };
+>>>>>>> 手持机
     /**
      * <p>This symbol is the offset where the {@link android.R.attr#layout_gravity}
      * attribute's value can be found in the {@link #CoordinatorLayout_Layout} array.
@@ -1144,8 +1160,13 @@ public final class R {
      * @see #DualControlLayout_stackedMargin
      */
     public static final int[] DualControlLayout={
+<<<<<<< HEAD
       0x7f020014, 0x7f020034, 0x7f020037
     };
+=======
+        0x7f020014, 0x7f020034, 0x7f020037
+      };
+>>>>>>> 手持机
     /**
      * <p>This symbol is the offset where the {@link com.izouma.gmmis.R.attr#primaryButtonText}
      * attribute's value can be found in the {@link #DualControlLayout} array.
@@ -1208,9 +1229,15 @@ public final class R {
      * @see #FontFamily_fontProviderQuery
      */
     public static final int[] FontFamily={
+<<<<<<< HEAD
       0x7f020004, 0x7f020005, 0x7f020006, 0x7f020007, 
       0x7f020008, 0x7f020009
     };
+=======
+        0x7f020004, 0x7f020005, 0x7f020006, 0x7f020007, 
+        0x7f020008, 0x7f020009
+      };
+>>>>>>> 手持机
     /**
      * <p>This symbol is the offset where the {@link com.izouma.gmmis.R.attr#fontProviderAuthority}
      * attribute's value can be found in the {@link #FontFamily} array.
@@ -1309,9 +1336,15 @@ public final class R {
      * @see #FontFamilyFont_fontWeight
      */
     public static final int[] FontFamilyFont={
+<<<<<<< HEAD
       0x01010532, 0x01010533, 0x0101053f, 0x7f020003, 
       0x7f02000a, 0x7f02000b
     };
+=======
+        0x01010532, 0x01010533, 0x0101053f, 0x7f020003, 
+        0x7f02000a, 0x7f02000b
+      };
+>>>>>>> 手持机
     /**
      * <p>This symbol is the offset where the {@link android.R.attr#font}
      * attribute's value can be found in the {@link #FontFamilyFont} array.
@@ -1460,6 +1493,7 @@ public final class R {
      * @see #QRCodeView_qrcv_topOffset
      */
     public static final int[] QRCodeView={
+<<<<<<< HEAD
       0x7f020015, 0x7f020016, 0x7f020017, 0x7f020018, 
       0x7f020019, 0x7f02001a, 0x7f02001b, 0x7f02001c, 
       0x7f02001d, 0x7f02001e, 0x7f02001f, 0x7f020020, 
@@ -1469,6 +1503,17 @@ public final class R {
       0x7f02002d, 0x7f02002e, 0x7f02002f, 0x7f020030, 
       0x7f020031, 0x7f020032, 0x7f020033
     };
+=======
+        0x7f020015, 0x7f020016, 0x7f020017, 0x7f020018, 
+        0x7f020019, 0x7f02001a, 0x7f02001b, 0x7f02001c, 
+        0x7f02001d, 0x7f02001e, 0x7f02001f, 0x7f020020, 
+        0x7f020021, 0x7f020022, 0x7f020023, 0x7f020024, 
+        0x7f020025, 0x7f020026, 0x7f020027, 0x7f020028, 
+        0x7f020029, 0x7f02002a, 0x7f02002b, 0x7f02002c, 
+        0x7f02002d, 0x7f02002e, 0x7f02002f, 0x7f020030, 
+        0x7f020031, 0x7f020032, 0x7f020033
+      };
+>>>>>>> 手持机
     /**
      * <p>This symbol is the offset where the {@link com.izouma.gmmis.R.attr#qrcv_animTime}
      * attribute's value can be found in the {@link #QRCodeView} array.
@@ -1909,8 +1954,13 @@ public final class R {
      * @see #TextViewWithLeading_leading
      */
     public static final int[] TextViewWithLeading={
+<<<<<<< HEAD
       0x7f020013
     };
+=======
+        0x7f020013
+      };
+>>>>>>> 手持机
     /**
      * <p>This symbol is the offset where the {@link com.izouma.gmmis.R.attr#leading}
      * attribute's value can be found in the {@link #TextViewWithLeading} array.

app/gmMis/platforms/android/app/build/intermediates/assets/debug/www/cordova_plugins.js

@@ -4,6 +4,26 @@ module.exports = [
     "id": "cordova-plugin-clipboard-x.Clipboard",
     "file": "plugins/cordova-plugin-clipboard-x/www/clipboard.js",
     "pluginId": "cordova-plugin-clipboard-x",
+<<<<<<< HEAD
+=======
+    "clobbers": [
+      "cordova.plugins.clipboard",
+      "cordova.plugins.clipboard-x"
+    ]
+  },
+  {
+    "id": "cordova-plugin-device.device",
+    "file": "plugins/cordova-plugin-device/www/device.js",
+    "pluginId": "cordova-plugin-device",
+    "clobbers": [
+      "device"
+    ]
+  },
+  {
+    "id": "cordova-plugin-camera.Camera",
+    "file": "plugins/cordova-plugin-camera/www/CameraConstants.js",
+    "pluginId": "cordova-plugin-camera",
+>>>>>>> 手持机
     "clobbers": [
       "cordova.plugins.clipboard",
       "cordova.plugins.clipboard-x"
@@ -34,6 +54,7 @@ module.exports = [
     ]
   },
   {
+<<<<<<< HEAD
     "id": "cordova-plugin-pgyer.pgyer",
     "file": "plugins/cordova-plugin-pgyer/www/pgyer.js",
     "pluginId": "cordova-plugin-pgyer",
@@ -53,6 +74,11 @@ module.exports = [
     "id": "cordova-plugin-camera.CameraPopoverOptions",
     "file": "plugins/cordova-plugin-camera/www/CameraPopoverOptions.js",
     "pluginId": "cordova-plugin-camera",
+=======
+    "id": "cordova-plugin-handheld.Handheld",
+    "file": "plugins/cordova-plugin-handheld/www/Handheld.js",
+    "pluginId": "cordova-plugin-handheld",
+>>>>>>> 手持机
     "clobbers": [
       "CameraPopoverOptions"
     ]
@@ -86,7 +112,9 @@ module.exports.metadata =
 // TOP OF METADATA
 {
   "cordova-plugin-clipboard-x": "1.0.1",
+  "cordova-plugin-crosswalk-webview": "2.4.0",
   "cordova-plugin-device": "2.0.2",
+<<<<<<< HEAD
   "cordova-plugin-statusbar": "2.4.2",
   "cordova-plugin-whitelist": "1.3.3",
   "cordova-plugin-wkwebview-engine": "1.1.4",
@@ -95,6 +123,15 @@ module.exports.metadata =
   "cordova-plugin-camera": "4.0.3",
   "cordova-plugin-handheld": "1.0.0",
   "cordova-plugin-crosswalk-webview": "2.4.0"
+=======
+  "cordova-plugin-camera": "4.0.3",
+  "cordova-plugin-handheld": "1.0.0",
+  "cordova-plugin-pgyer": "1.0.0",
+  "cordova-plugin-statusbar": "2.4.2",
+  "cordova-plugin-whitelist": "1.3.3",
+  "cordova-plugin-wkwebview-engine": "1.1.4",
+  "cordova-plugin-x-toast": "2.7.2"
+>>>>>>> 手持机
 };
 // BOTTOM OF METADATA
 });

app/gmMis/platforms/android/app/build/intermediates/assets/debug/www/gmMis.html

@@ -4,4 +4,4 @@
 
          ::-webkit-scrollbar {
             display: none;
-        }</style><link href=static/css/app.b7e7ed410fbcbbacf0e49a7313b01ad7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/manifest.5f7dc4aed0e2d03e4800.js></script><script type=text/javascript src=static/js/vendor.2fc36304660a7b72871d.js></script><script type=text/javascript src=static/js/app.485212b2dd600c7df7ce.js></script></body></html>
+        }</style><link href=static/css/app.16142e3698a613aa4a7f4159cc535004.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/manifest.68b04110a606b663edaf.js></script><script type=text/javascript src=static/js/vendor.b19911fad9de021d52bb.js></script><script type=text/javascript src=static/js/app.21bb8d7a1bfbabf73bc0.js></script></body></html>