适配swiftScan, 更新App图标

IFS/IFS/Resource/Assets.xcassets/AppIcon.appiconset/Contents.json

 {
   "images" : [
     {
-      "idiom" : "ios-marketing",
-      "size" : "1024x1024",
-      "scale" : "1x"
+      "filename" : "icon-20@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
+      "filename" : "icon-20@3x.png",
       "idiom" : "iphone",
-      "filename" : "4D9DA91A8816DEABED989099FF97939BiPhoneNotification_20pt@2x.png",
-      "scale" : "2x"
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
+      "filename" : "icon-29.png",
       "idiom" : "iphone",
-      "filename" : "4D9DA91A8816DEABED989099FF97939BiPhoneNotification_20pt@3x.png",
-      "scale" : "3x"
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
+      "filename" : "icon-29@2x.png",
       "idiom" : "iphone",
-      "filename" : "4D9DA91A8816DEABED989099FF97939BiPhoneSpootlight5_29pt@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
+      "filename" : "icon-29@3x.png",
       "idiom" : "iphone",
-      "filename" : "4D9DA91A8816DEABED989099FF97939BiPhoneSpootlight5_29pt@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
+      "filename" : "icon-40@2x.png",
       "idiom" : "iphone",
-      "filename" : "4D9DA91A8816DEABED989099FF97939BiPhoneSpootlight7_40pt@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "40x40",
+      "filename" : "icon-40@3x.png",
       "idiom" : "iphone",
-      "filename" : "4D9DA91A8816DEABED989099FF97939BiPhoneSpootlight7_40pt@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "40x40"
     },
     {
-      "size" : "60x60",
+      "filename" : "icon-60@2x.png",
       "idiom" : "iphone",
-      "filename" : "4D9DA91A8816DEABED989099FF97939BiPhoneApp_60pt@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "60x60"
     },
     {
-      "size" : "60x60",
+      "filename" : "icon-60@3x.png",
       "idiom" : "iphone",
-      "filename" : "4D9DA91A8816DEABED989099FF97939BiPhoneApp_60pt@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "60x60"
     },
     {
-      "size" : "20x20",
+      "filename" : "icon-20-ipad.png",
       "idiom" : "ipad",
-      "filename" : "4D9DA91A8816DEABED989099FF97939BiPadNotifications_20pt.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
+      "filename" : "icon-20@2x-ipad.png",
       "idiom" : "ipad",
-      "filename" : "4D9DA91A8816DEABED989099FF97939BiPadNotifications_20pt@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "29x29",
+      "filename" : "icon-29-ipad.png",
       "idiom" : "ipad",
-      "filename" : "4D9DA91A8816DEABED989099FF97939BiPadSpootlight5_29pt.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
+      "filename" : "icon-29@2x-ipad.png",
       "idiom" : "ipad",
-      "filename" : "4D9DA91A8816DEABED989099FF97939BiPadSpootlight5_29pt@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
+      "filename" : "icon-40.png",
       "idiom" : "ipad",
-      "filename" : "4D9DA91A8816DEABED989099FF97939BiPadSpootlight7_40pt.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "40x40"
     },
     {
-      "size" : "40x40",
+      "filename" : "icon-40@2x.png",
       "idiom" : "ipad",
-      "filename" : "4D9DA91A8816DEABED989099FF97939BiPadSpootlight7_40pt@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "76x76",
+      "filename" : "icon-76.png",
       "idiom" : "ipad",
-      "filename" : "4D9DA91A8816DEABED989099FF97939BiPadApp_76pt.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "76x76"
     },
     {
-      "size" : "76x76",
+      "filename" : "icon-76@2x.png",
       "idiom" : "ipad",
-      "filename" : "4D9DA91A8816DEABED989099FF97939BiPadApp_76pt@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "76x76"
     },
     {
-      "size" : "83.5x83.5",
+      "filename" : "icon-83.5@2x.png",
       "idiom" : "ipad",
-      "filename" : "4D9DA91A8816DEABED989099FF97939BiPadProApp_83.5pt@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "icon-1024.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

IFS/IFS/Resource/Assets.xcassets/Contents.json

 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

IFS/Podfile

@@ -23,7 +23,7 @@ target 'IFS' do
     pod 'SVProgressHUD', '~> 2.2.2'
     pod 'UMengAnalytics'
     pod 'JPush'
-    pod 'swiftScan'
+    pod 'swiftScan', :git => 'https://github.com/MxABC/swiftScan.git'
     pod 'MZFormSheetPresentationController', '~> 2.4.2'
     pod 'RATreeView'
 end

IFS/Podfile.lock

@@ -57,7 +57,7 @@ DEPENDENCIES:
   - SKPhotoBrowser (~> 5.0.0)
   - SnapKit
   - SVProgressHUD (~> 2.2.2)
-  - swiftScan
+  - swiftScan (from `https://github.com/MxABC/swiftScan.git`)
   - SwiftyJSON
   - UMengAnalytics
   - YXAlertController
@@ -87,7 +87,6 @@ SPEC REPOS:
     - SKPhotoBrowser
     - SnapKit
     - SVProgressHUD
-    - swiftScan
     - SwiftyJSON
     - UMengAnalytics
     - YXAlertController
@@ -95,11 +94,16 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   ImagePicker:
     :git: https://github.com/jzhang0480/ImagePicker.git
+  swiftScan:
+    :git: https://github.com/MxABC/swiftScan.git
 
 CHECKOUT OPTIONS:
   ImagePicker:
     :commit: 635cb203704500e1284a64b8b332158474906336
     :git: https://github.com/jzhang0480/ImagePicker.git
+  swiftScan:
+    :commit: b0cc9aea11140125b75d1baaccb16c9567cdf69a
+    :git: https://github.com/MxABC/swiftScan.git
 
 SPEC CHECKSUMS:
   Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
@@ -131,6 +135,6 @@ SPEC CHECKSUMS:
   UMengAnalytics: ef8d45f94c0e5771dc364cf6a5731d9d3b101da2
   YXAlertController: 8234d980cda27a86a285faea140a3c8676bca768
 
-PODFILE CHECKSUM: af4018deaa74f05952e75391bd627def2d830677
+PODFILE CHECKSUM: dd0794c6b5360eed685bedd16b0e46d7843eceea
 
 COCOAPODS: 1.11.3