some fix

config.xml

@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-targetSdkVersion="22" android-versionCode="36" id="com.izouma.milk" ios-CFBundleIdentifier="com.brightdairy.milk" ios-CFBundleVersion="1.3.6" version="1.3.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-targetSdkVersion="22" android-versionCode="36" id="com.izouma.milk" ios-CFBundleIdentifier="com.brightdairy.milk" ios-CFBundleVersion="1.3.6" version="1.3.6" 
+    xmlns="http://www.w3.org/ns/widgets" 
+    xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>奶源追溯</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>
@@ -11,6 +13,9 @@
     <allow-intent href="sms:*" />
     <allow-intent href="mailto:*" />
     <allow-intent href="geo:*" />
+    <allow-intent href="itms-apps:*" />
+    <allow-intent href="market:*" />
+    <allow-navigation href="*" />
     <platform name="android">
         <allow-intent href="market:*" />
         <icon density="hdpi" src="res/icon/android/drawable-hdpi/ic_launcher.png" />
@@ -61,8 +66,8 @@
         <variable name="API_KEY" value="PPQBZ-HCQLO-MMNWE-SHIDE-Y42BH-D3F76" />
     </plugin>
     <plugin name="cordova-plugin-navigationbar" spec="/Users/xiongzhu/Projects/Cordova/Milk/node_modules/cordova-plugin-navigationbar" />
-    <plugin name="cordova-plugin-handheld" spec="../handheld" />
     <engine name="android" spec="^6.3.0" />
     <plugin name="cordova-plugin-remote-injection" spec="^0.5.2" />
     <engine name="ios" spec="~4.5.4" />
+    <plugin name="cordova-plugin-handheld" spec="../handheld" />
 </widget>

package.json

@@ -37,8 +37,8 @@
                 "API_KEY": "PPQBZ-HCQLO-MMNWE-SHIDE-Y42BH-D3F76"
             },
             "cordova-plugin-navigationbar": {},
-            "cordova-plugin-handheld": {},
-            "cordova-plugin-remote-injection": {}
+            "cordova-plugin-remote-injection": {},
+            "cordova-plugin-handheld": {}
         },
         "platforms": [
             "android",

platforms/android/android.json

@@ -180,10 +180,10 @@
     "cordova-plugin-navigationbar": {
       "PACKAGE_NAME": "com.izouma.milk"
     },
-    "cordova-plugin-handheld": {
+    "cordova-plugin-remote-injection": {
       "PACKAGE_NAME": "com.izouma.milk"
     },
-    "cordova-plugin-remote-injection": {
+    "cordova-plugin-handheld": {
       "PACKAGE_NAME": "com.izouma.milk"
     }
   },
@@ -284,7 +284,7 @@
     "cordova-plugin-camera": "4.0.2",
     "cordova-plugin-tencent-bg-location": "1.0.0",
     "cordova-plugin-navigationbar": "1.0.0",
-    "cordova-plugin-handheld": "1.0.0",
-    "cordova-plugin-remote-injection": "0.5.2"
+    "cordova-plugin-remote-injection": "0.5.2",
+    "cordova-plugin-handheld": "1.0.0"
   }
 }

platforms/android/assets/www/cordova_plugins.js

@@ -97,8 +97,8 @@ module.exports.metadata =
   "cordova-plugin-camera": "4.0.2",
   "cordova-plugin-tencent-bg-location": "1.0.0",
   "cordova-plugin-navigationbar": "1.0.0",
-  "cordova-plugin-handheld": "1.0.0",
-  "cordova-plugin-remote-injection": "0.5.2"
+  "cordova-plugin-remote-injection": "0.5.2",
+  "cordova-plugin-handheld": "1.0.0"
 };
 // BOTTOM OF METADATA
 });

platforms/android/platform_www/cordova_plugins.js

@@ -97,8 +97,8 @@ module.exports.metadata =
   "cordova-plugin-camera": "4.0.2",
   "cordova-plugin-tencent-bg-location": "1.0.0",
   "cordova-plugin-navigationbar": "1.0.0",
-  "cordova-plugin-handheld": "1.0.0",
-  "cordova-plugin-remote-injection": "0.5.2"
+  "cordova-plugin-remote-injection": "0.5.2",
+  "cordova-plugin-handheld": "1.0.0"
 };
 // BOTTOM OF METADATA
 });

platforms/android/res/xml/config.xml

@@ -24,10 +24,6 @@
     <feature name="navigationbar">
         <param name="android-package" value="cn.x1ongzhu.navigationbar.navigationbar" />
     </feature>
-    <feature name="Handheld">
-        <param name="android-package" value="com.izouma.handheld.Handheld" />
-        <param name="onload" value="true" />
-    </feature>
     <name>奶源追溯</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>
@@ -55,4 +51,8 @@
         <param name="android-package" value="com.truckmovers.cordova.RemoteInjectionPlugin" />
         <param name="onload" value="true" />
     </feature>
+    <feature name="Handheld">
+        <param name="android-package" value="com.izouma.handheld.Handheld" />
+        <param name="onload" value="true" />
+    </feature>
 </widget>

platforms/ios/ios.json

@@ -44,10 +44,6 @@
               "xml": "<preference name=\"CameraUsesGeolocation\" value=\"false\" />",
               "count": 1
             },
-            {
-              "xml": "<feature name=\"Handheld\"><param name=\"ios-package\" value=\"Handheld\" /><param name=\"onload\" value=\"true\" /></feature>",
-              "count": 1
-            },
             {
               "xml": "<feature name=\"navigationbar\"><param name=\"ios-package\" value=\"navigationbar\" /></feature>",
               "count": 1
@@ -79,6 +75,10 @@
             {
               "xml": "<feature name=\"Toast\"><param name=\"ios-package\" value=\"Toast\" /></feature>",
               "count": 1
+            },
+            {
+              "xml": "<feature name=\"Handheld\"><param name=\"ios-package\" value=\"Handheld\" /><param name=\"onload\" value=\"true\" /></feature>",
+              "count": 1
             }
           ]
         }
@@ -89,9 +89,6 @@
     "cordova-plugin-camera": {
       "PACKAGE_NAME": "com.brightdairy.milk"
     },
-    "cordova-plugin-handheld": {
-      "PACKAGE_NAME": "com.brightdairy.milk"
-    },
     "cordova-plugin-navigationbar": {
       "PACKAGE_NAME": "com.brightdairy.milk"
     },
@@ -117,6 +114,9 @@
     },
     "cordova-plugin-x-toast": {
       "PACKAGE_NAME": "com.brightdairy.milk"
+    },
+    "cordova-plugin-handheld": {
+      "PACKAGE_NAME": "com.brightdairy.milk"
     }
   },
   "dependent_plugins": {},
@@ -153,14 +153,6 @@
         "CameraPopoverHandle"
       ]
     },
-    {
-      "id": "cordova-plugin-handheld.Handheld",
-      "file": "plugins/cordova-plugin-handheld/www/Handheld.js",
-      "pluginId": "cordova-plugin-handheld",
-      "clobbers": [
-        "Handheld"
-      ]
-    },
     {
       "id": "cordova-plugin-navigationbar.navigationbar",
       "file": "plugins/cordova-plugin-navigationbar/www/navigationbar.js",
@@ -221,11 +213,18 @@
       "id": "cordova-plugin-x-toast.tests",
       "file": "plugins/cordova-plugin-x-toast/test/tests.js",
       "pluginId": "cordova-plugin-x-toast"
+    },
+    {
+      "id": "cordova-plugin-handheld.Handheld",
+      "file": "plugins/cordova-plugin-handheld/www/Handheld.js",
+      "pluginId": "cordova-plugin-handheld",
+      "clobbers": [
+        "Handheld"
+      ]
     }
   ],
   "plugin_metadata": {
     "cordova-plugin-camera": "4.0.2",
-    "cordova-plugin-handheld": "1.0.0",
     "cordova-plugin-navigationbar": "1.0.0",
     "cordova-plugin-pgyer": "1.0.0",
     "cordova-plugin-remote-injection": "0.5.2",
@@ -233,6 +232,7 @@
     "cordova-plugin-tencent-bg-location": "1.0.0",
     "cordova-plugin-whitelist": "1.3.3",
     "cordova-plugin-wkwebview-engine": "1.1.4",
-    "cordova-plugin-x-toast": "2.6.0"
+    "cordova-plugin-x-toast": "2.6.0",
+    "cordova-plugin-handheld": "1.0.0"
   }
 }

platforms/ios/platform_www/cordova_plugins.js

@@ -32,14 +32,6 @@ module.exports = [
       "CameraPopoverHandle"
     ]
   },
-  {
-    "id": "cordova-plugin-handheld.Handheld",
-    "file": "plugins/cordova-plugin-handheld/www/Handheld.js",
-    "pluginId": "cordova-plugin-handheld",
-    "clobbers": [
-      "Handheld"
-    ]
-  },
   {
     "id": "cordova-plugin-navigationbar.navigationbar",
     "file": "plugins/cordova-plugin-navigationbar/www/navigationbar.js",
@@ -100,13 +92,20 @@ module.exports = [
     "id": "cordova-plugin-x-toast.tests",
     "file": "plugins/cordova-plugin-x-toast/test/tests.js",
     "pluginId": "cordova-plugin-x-toast"
+  },
+  {
+    "id": "cordova-plugin-handheld.Handheld",
+    "file": "plugins/cordova-plugin-handheld/www/Handheld.js",
+    "pluginId": "cordova-plugin-handheld",
+    "clobbers": [
+      "Handheld"
+    ]
   }
 ];
 module.exports.metadata = 
 // TOP OF METADATA
 {
   "cordova-plugin-camera": "4.0.2",
-  "cordova-plugin-handheld": "1.0.0",
   "cordova-plugin-navigationbar": "1.0.0",
   "cordova-plugin-pgyer": "1.0.0",
   "cordova-plugin-remote-injection": "0.5.2",
@@ -114,7 +113,8 @@ module.exports.metadata =
   "cordova-plugin-tencent-bg-location": "1.0.0",
   "cordova-plugin-whitelist": "1.3.3",
   "cordova-plugin-wkwebview-engine": "1.1.4",
-  "cordova-plugin-x-toast": "2.6.0"
+  "cordova-plugin-x-toast": "2.6.0",
+  "cordova-plugin-handheld": "1.0.0"
 };
 // BOTTOM OF METADATA
 });

platforms/ios/www/cordova_plugins.js

@@ -32,14 +32,6 @@ module.exports = [
       "CameraPopoverHandle"
     ]
   },
-  {
-    "id": "cordova-plugin-handheld.Handheld",
-    "file": "plugins/cordova-plugin-handheld/www/Handheld.js",
-    "pluginId": "cordova-plugin-handheld",
-    "clobbers": [
-      "Handheld"
-    ]
-  },
   {
     "id": "cordova-plugin-navigationbar.navigationbar",
     "file": "plugins/cordova-plugin-navigationbar/www/navigationbar.js",
@@ -100,13 +92,20 @@ module.exports = [
     "id": "cordova-plugin-x-toast.tests",
     "file": "plugins/cordova-plugin-x-toast/test/tests.js",
     "pluginId": "cordova-plugin-x-toast"
+  },
+  {
+    "id": "cordova-plugin-handheld.Handheld",
+    "file": "plugins/cordova-plugin-handheld/www/Handheld.js",
+    "pluginId": "cordova-plugin-handheld",
+    "clobbers": [
+      "Handheld"
+    ]
   }
 ];
 module.exports.metadata = 
 // TOP OF METADATA
 {
   "cordova-plugin-camera": "4.0.2",
-  "cordova-plugin-handheld": "1.0.0",
   "cordova-plugin-navigationbar": "1.0.0",
   "cordova-plugin-pgyer": "1.0.0",
   "cordova-plugin-remote-injection": "0.5.2",
@@ -114,7 +113,8 @@ module.exports.metadata =
   "cordova-plugin-tencent-bg-location": "1.0.0",
   "cordova-plugin-whitelist": "1.3.3",
   "cordova-plugin-wkwebview-engine": "1.1.4",
-  "cordova-plugin-x-toast": "2.6.0"
+  "cordova-plugin-x-toast": "2.6.0",
+  "cordova-plugin-handheld": "1.0.0"
 };
 // BOTTOM OF METADATA
 });

platforms/ios/奶源追溯.xcodeproj/project.pbxproj

@@ -22,10 +22,6 @@
 		7EB4699243E84E22B0C799CB /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EB864BC5F1A49018486CD7D /* ImageIO.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		E31FD1339FD84FEA81A47AB9 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5624A6E1B0C14070BA69E79E /* CoreLocation.framework */; };
 		501C8325CD9F4AB58B77E785 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A668A558554479DB1A6ED47 /* AVFoundation.framework */; };
-		0A9399145F654832A5A1ACA3 /* Handheld.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F8147F457AD4229A75882EE /* Handheld.m */; };
-		29FF9E63AE7B472EAFC2F849 /* ScanViewController.h in Resources */ = {isa = PBXBuildFile; fileRef = ACD1AB8CFFB34BA8AD8435BC /* ScanViewController.h */; };
-		F443A436CFE14DC6AF893533 /* ScanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B3BA88B8B6F4B5F8B50FC60 /* ScanViewController.m */; };
-		5AD4F3B9EF0A403F8D286F1D /* qrCodeScanner.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 128F670048194F789E7EB254 /* qrCodeScanner.bundle */; };
 		CD79098119284DB190746EB9 /* navigationbar.m in Sources */ = {isa = PBXBuildFile; fileRef = FC89ABBC8C874E4C81B61AAA /* navigationbar.m */; };
 		2000CCF4DBC541D19F4B163A /* Navigationbar.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 1D3E0A1B6463441BBA2331E9 /* Navigationbar.bundle */; };
 		4CEF50305F4C48AF8D111CD7 /* CDVRemoteInjection.m in Sources */ = {isa = PBXBuildFile; fileRef = BAE982ECD2B6440789B19A98 /* CDVRemoteInjection.m */; };
@@ -47,6 +43,10 @@
 		EF6C40D56F214AB190847A6D /* Toast+UIView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD24EF4088B1481D85024623 /* Toast+UIView.m */; };
 		F1EF0B62FB5B4D2A985F3E73 /* Toast.m in Sources */ = {isa = PBXBuildFile; fileRef = C9E9E44345F14457B218BA0F /* Toast.m */; };
 		AB915EE1DE79498BBD0BBDD3 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E58A419A5382479A9268FE52 /* QuartzCore.framework */; };
+		F9023DAE5B8A4FF69BB34B9A /* Handheld.m in Sources */ = {isa = PBXBuildFile; fileRef = D109DC20B94F48EBBC201A0D /* Handheld.m */; };
+		7DE6683967294D41A96A1125 /* ScanViewController.h in Resources */ = {isa = PBXBuildFile; fileRef = B348E6F89301427EA89FC391 /* ScanViewController.h */; };
+		F868D1F5556F4C098B54B3AA /* ScanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DFAC7D7CCC9C42B0A538E5A2 /* ScanViewController.m */; };
+		AB0E3EFDCFA94F528E9C17C6 /* qrCodeScanner.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 1A76CBBFB0A240A796A89205 /* qrCodeScanner.bundle */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -97,10 +97,6 @@
 		4EB864BC5F1A49018486CD7D /* ImageIO.framework */ = {isa = PBXFileReference; name = "ImageIO.framework"; path = "System/Library/Frameworks/ImageIO.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; };
 		5624A6E1B0C14070BA69E79E /* CoreLocation.framework */ = {isa = PBXFileReference; name = "CoreLocation.framework"; path = "System/Library/Frameworks/CoreLocation.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; };
 		3A668A558554479DB1A6ED47 /* AVFoundation.framework */ = {isa = PBXFileReference; name = "AVFoundation.framework"; path = "System/Library/Frameworks/AVFoundation.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; };
-		8F8147F457AD4229A75882EE /* Handheld.m */ = {isa = PBXFileReference; name = "Handheld.m"; path = "cordova-plugin-handheld/Handheld.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };
-		ACD1AB8CFFB34BA8AD8435BC /* ScanViewController.h */ = {isa = PBXFileReference; name = "ScanViewController.h"; path = "cordova-plugin-handheld/ScanViewController.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };
-		8B3BA88B8B6F4B5F8B50FC60 /* ScanViewController.m */ = {isa = PBXFileReference; name = "ScanViewController.m"; path = "cordova-plugin-handheld/ScanViewController.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };
-		128F670048194F789E7EB254 /* qrCodeScanner.bundle */ = {isa = PBXFileReference; name = "qrCodeScanner.bundle"; path = "qrCodeScanner.bundle"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.plug-in; explicitFileType = undefined; includeInIndex = 0; };
 		FC89ABBC8C874E4C81B61AAA /* navigationbar.m */ = {isa = PBXFileReference; name = "navigationbar.m"; path = "cordova-plugin-navigationbar/navigationbar.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };
 		1D3E0A1B6463441BBA2331E9 /* Navigationbar.bundle */ = {isa = PBXFileReference; name = "Navigationbar.bundle"; path = "Navigationbar.bundle"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.plug-in; explicitFileType = undefined; includeInIndex = 0; };
 		BAE982ECD2B6440789B19A98 /* CDVRemoteInjection.m */ = {isa = PBXFileReference; name = "CDVRemoteInjection.m"; path = "cordova-plugin-remote-injection/CDVRemoteInjection.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };
@@ -133,6 +129,10 @@
 		6CE5CD06755441ABAA1FC73C /* Toast+UIView.h */ = {isa = PBXFileReference; name = "Toast+UIView.h"; path = "cordova-plugin-x-toast/Toast+UIView.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };
 		25293D9110BF458CA0612FC8 /* Toast.h */ = {isa = PBXFileReference; name = "Toast.h"; path = "cordova-plugin-x-toast/Toast.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };
 		E58A419A5382479A9268FE52 /* QuartzCore.framework */ = {isa = PBXFileReference; name = "QuartzCore.framework"; path = "System/Library/Frameworks/QuartzCore.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; };
+		D109DC20B94F48EBBC201A0D /* Handheld.m */ = {isa = PBXFileReference; name = "Handheld.m"; path = "cordova-plugin-handheld/Handheld.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };
+		B348E6F89301427EA89FC391 /* ScanViewController.h */ = {isa = PBXFileReference; name = "ScanViewController.h"; path = "cordova-plugin-handheld/ScanViewController.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };
+		DFAC7D7CCC9C42B0A538E5A2 /* ScanViewController.m */ = {isa = PBXFileReference; name = "ScanViewController.m"; path = "cordova-plugin-handheld/ScanViewController.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };
+		1A76CBBFB0A240A796A89205 /* qrCodeScanner.bundle */ = {isa = PBXFileReference; name = "qrCodeScanner.bundle"; path = "qrCodeScanner.bundle"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.plug-in; explicitFileType = undefined; includeInIndex = 0; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -213,8 +213,8 @@
 				3047A50E1AB8057F00498E2A /* config */,
 				8D1107310486CEB800E47090 /* 奶源追溯-Info.plist */,
 				6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */,
-				128F670048194F789E7EB254 /* qrCodeScanner.bundle */,
 				1D3E0A1B6463441BBA2331E9 /* Navigationbar.bundle */,
+				1A76CBBFB0A240A796A89205 /* qrCodeScanner.bundle */,
 			);
 			name = Resources;
 			path = "奶源追溯/Resources";
@@ -265,9 +265,6 @@
 				72C7F0FFC92B42F69BEC769F /* CDVCamera.h */,
 				9486D27AC08246BB81636455 /* CDVJpegHeaderWriter.h */,
 				7790E6D1C499484C83AE2188 /* CDVExif.h */,
-				8F8147F457AD4229A75882EE /* Handheld.m */,
-				ACD1AB8CFFB34BA8AD8435BC /* ScanViewController.h */,
-				8B3BA88B8B6F4B5F8B50FC60 /* ScanViewController.m */,
 				FC89ABBC8C874E4C81B61AAA /* navigationbar.m */,
 				BAE982ECD2B6440789B19A98 /* CDVRemoteInjection.m */,
 				3FF055369A454DE48D727D12 /* CDVRemoteInjectionWebViewBaseDelegate.m */,
@@ -292,6 +289,9 @@
 				C9E9E44345F14457B218BA0F /* Toast.m */,
 				6CE5CD06755441ABAA1FC73C /* Toast+UIView.h */,
 				25293D9110BF458CA0612FC8 /* Toast.h */,
+				D109DC20B94F48EBBC201A0D /* Handheld.m */,
+				B348E6F89301427EA89FC391 /* ScanViewController.h */,
+				DFAC7D7CCC9C42B0A538E5A2 /* ScanViewController.m */,
 			);
 			name = Plugins;
 			path = "奶源追溯/Plugins";
@@ -373,8 +373,8 @@
 				302D95F214D2391D003F00A1 /* MainViewController.xib in Resources */,
 				0207DA581B56EA530066E2B4 /* Images.xcassets in Resources */,
 				6AFF5BF91D6E424B00AB3073 /* CDVLaunchScreen.storyboard in Resources */,
-				5AD4F3B9EF0A403F8D286F1D /* qrCodeScanner.bundle in Resources */,
 				2000CCF4DBC541D19F4B163A /* Navigationbar.bundle in Resources */,
+				AB0E3EFDCFA94F528E9C17C6 /* qrCodeScanner.bundle in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -409,9 +409,6 @@
 				B3FFFDD9C8FD4ACEA4E7EEA4 /* UIImage+CropScaleOrientation.m in Sources */,
 				40E4812D8857410198594BEF /* CDVCamera.m in Sources */,
 				04F57070E1B84A94962B27F3 /* CDVJpegHeaderWriter.m in Sources */,
-				0A9399145F654832A5A1ACA3 /* Handheld.m in Sources */,
-				29FF9E63AE7B472EAFC2F849 /* ScanViewController.h in Resources */,
-				F443A436CFE14DC6AF893533 /* ScanViewController.m in Sources */,
 				CD79098119284DB190746EB9 /* navigationbar.m in Sources */,
 				4CEF50305F4C48AF8D111CD7 /* CDVRemoteInjection.m in Sources */,
 				D3A3603EE9BD4479B3CCFF73 /* CDVRemoteInjectionWebViewBaseDelegate.m in Sources */,
@@ -425,6 +422,9 @@
 				82108B1E6A2B460E9ADE5994 /* CDVWKProcessPoolFactory.m in Sources */,
 				EF6C40D56F214AB190847A6D /* Toast+UIView.m in Sources */,
 				F1EF0B62FB5B4D2A985F3E73 /* Toast.m in Sources */,
+				F9023DAE5B8A4FF69BB34B9A /* Handheld.m in Sources */,
+				7DE6683967294D41A96A1125 /* ScanViewController.h in Resources */,
+				F868D1F5556F4C098B54B3AA /* ScanViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

platforms/ios/奶源追溯/config.xml

@@ -22,10 +22,6 @@
     <feature name="Camera">
         <param name="ios-package" value="CDVCamera" />
     </feature>
-    <feature name="Handheld">
-        <param name="ios-package" value="Handheld" />
-        <param name="onload" value="true" />
-    </feature>
     <feature name="navigationbar">
         <param name="ios-package" value="navigationbar" />
     </feature>
@@ -101,4 +97,8 @@
     <preference name="forceUpdate" value="true" />
     <preference name="ShowSplashScreenSpinner" value="false" />
     <preference name="SplashMaintainAspectRatio" value="true" />
+    <feature name="Handheld">
+        <param name="ios-package" value="Handheld" />
+        <param name="onload" value="true" />
+    </feature>
 </widget>

platforms/ios/奶源追溯/奶源追溯-Info.plist

@@ -59,11 +59,11 @@
     <array>
       <string>zh_CN</string>
     </array>
-    <key>NSCameraUsageDescription</key>
-    <string>需要打开相机来扫码</string>
     <key>NSLocationWhenInUseUsageDescription</key>
     <string>我们需要通过您的地理位置信息来获取周边数据</string>
     <key>NSLocationAlwaysUsageDescription</key>
     <string>我们需要通过您的地理位置信息来获取周边数据</string>
+    <key>NSCameraUsageDescription</key>
+    <string>需要打开相机来扫码</string>
   </dict>
 </plist>

plugins/android.json

@@ -33,10 +33,10 @@
     "cordova-plugin-navigationbar": {
       "PACKAGE_NAME": "com.izouma.milk"
     },
-    "cordova-plugin-handheld": {
+    "cordova-plugin-remote-injection": {
       "PACKAGE_NAME": "com.izouma.milk"
     },
-    "cordova-plugin-remote-injection": {
+    "cordova-plugin-handheld": {
       "PACKAGE_NAME": "com.izouma.milk"
     }
   },

plugins/cordova-plugin-handheld/plugin.xml

@@ -92,4 +92,5 @@
         <source-file src="src/ios/ScanViewController.m" />
         <resource-file src="src/ios/qrCodeScanner.bundle"/>
     </platform>
+    <dependency id="cordova-plugin-camera" />
 </plugin>

plugins/fetch.json

@@ -67,18 +67,18 @@
     "is_top_level": true,
     "variables": {}
   },
-  "cordova-plugin-handheld": {
+  "cordova-plugin-remote-injection": {
     "source": {
-      "type": "local",
-      "path": "/Users/xiongzhu/Projects/Cordova/Milk/node_modules/cordova-plugin-handheld"
+      "type": "registry",
+      "id": "cordova-plugin-remote-injection@^0.5.2"
     },
     "is_top_level": true,
     "variables": {}
   },
-  "cordova-plugin-remote-injection": {
+  "cordova-plugin-handheld": {
     "source": {
-      "type": "registry",
-      "id": "cordova-plugin-remote-injection@^0.5.2"
+      "type": "local",
+      "path": "/Users/xiongzhu/Projects/Cordova/Milk/node_modules/cordova-plugin-handheld"
     },
     "is_top_level": true,
     "variables": {}

plugins/ios.json

@@ -10,9 +10,6 @@
     "cordova-plugin-camera": {
       "PACKAGE_NAME": "com.brightdairy.milk"
     },
-    "cordova-plugin-handheld": {
-      "PACKAGE_NAME": "com.brightdairy.milk"
-    },
     "cordova-plugin-navigationbar": {
       "PACKAGE_NAME": "com.brightdairy.milk"
     },
@@ -38,6 +35,9 @@
     },
     "cordova-plugin-x-toast": {
       "PACKAGE_NAME": "com.brightdairy.milk"
+    },
+    "cordova-plugin-handheld": {
+      "PACKAGE_NAME": "com.brightdairy.milk"
     }
   },
   "dependent_plugins": {}