Merge branch 'master' into 重庆IFS

Conflicts:
	IFS/Podfile.lock

IFS/IFS.xcodeproj/project.pbxproj

@@ -1070,6 +1070,7 @@
 				29EA0B921FEA2F9C005A6170 /* Frameworks */,
 				29EA0B931FEA2F9C005A6170 /* Resources */,
 				5E336BBD8B004CA3BAB4C722 /* [CP] Embed Pods Frameworks */,
+				8ABD0DE15AF2CBD40822EF34 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -1216,6 +1217,21 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-IFS/Pods-IFS-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		8ABD0DE15AF2CBD40822EF34 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-IFS/Pods-IFS-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		CBE320842D54E4A6128E312F /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

IFS/Podfile.lock

@@ -17,11 +17,7 @@ PODS:
   - Moya/Core (10.0.1):
     - Alamofire (~> 4.1)
     - Result (~> 3.0)
-  - MZAppearance (1.1.6)
-  - MZFormSheetPresentationController (2.4.3):
-    - MZAppearance
   - PPBadgeViewSwift (2.0.0)
-  - RATreeView (2.1.2)
   - Result (3.2.4)
   - RxCocoa (4.1.1):
     - RxSwift (~> 4.0)
@@ -29,7 +25,6 @@ PODS:
   - SKPhotoBrowser (5.0.3)
   - SnapKit (4.0.0)
   - SVProgressHUD (2.2.2)
-  - swiftScan (1.1.3)
   - SwiftyJSON (4.0.0)
   - UMengAnalytics (4.2.4)
   - YXAlertController (1.0.8)
@@ -47,51 +42,17 @@ DEPENDENCIES:
   - Kingfisher
   - MJRefresh (~> 3.1.15.1)
   - Moya
-  - MZFormSheetPresentationController (~> 2.4.2)
   - PPBadgeViewSwift
-  - RATreeView
   - RxCocoa
   - RxSwift
   - SKPhotoBrowser (~> 5.0.0)
   - SnapKit
   - SVProgressHUD (~> 2.2.2)
-  - swiftScan
   - SwiftyJSON
   - UMengAnalytics
   - YXAlertController
   - YXKit
 
-SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
-    - Alamofire
-    - DeviceKit
-    - DZNEmptyDataSet
-    - FDFullscreenPopGesture
-    - HandyJSON
-    - Hero
-    - ImagePicker
-    - IQKeyboardManager
-    - JCore
-    - JPush
-    - Kingfisher
-    - MJRefresh
-    - Moya
-    - MZAppearance
-    - MZFormSheetPresentationController
-    - PPBadgeViewSwift
-    - RATreeView
-    - Result
-    - RxCocoa
-    - RxSwift
-    - SKPhotoBrowser
-    - SnapKit
-    - SVProgressHUD
-    - swiftScan
-    - SwiftyJSON
-    - UMengAnalytics
-    - YXAlertController
-    - YXKit
-
 SPEC CHECKSUMS:
   Alamofire: f41a599bd63041760b26d393ec1069d9d7b917f4
   DeviceKit: fa74d97499660e88081718b16688e19217595dba
@@ -106,22 +67,18 @@ SPEC CHECKSUMS:
   Kingfisher: 1f9157d9c02b380cbd0b7cc890161195164eb634
   MJRefresh: 5f8552bc25ca8751c010f621c1098dbdaacbccd6
   Moya: 9e621707ff754eeb51ff3ec51a3d54e517c0733a
-  MZAppearance: 0c06d3fa9cc55142f1da14bc8631fbe8fd6e19d5
-  MZFormSheetPresentationController: fbfdbad31884f16fac17fbe3c44c168306cc1095
   PPBadgeViewSwift: dc520c183e11d87fbe19bdb223e8b47d158f3c6b
-  RATreeView: 380cde0090cfde21dc6ac29137f49d3b768fdd28
   Result: d2d07204ce72856f1fd9130bbe42c35a7b0fea10
   RxCocoa: fd0862fd2df95fa55562ad28ffd2522c25eb4a85
   RxSwift: c6e3b1c7b325c7d121cd4327e9d98b7ed746b570
   SKPhotoBrowser: 6de77f7004442e79059f19d86e2e7e6a03b43a13
   SnapKit: a42d492c16e80209130a3379f73596c3454b7694
   SVProgressHUD: 59b2d3dabacbd051576d21d32293ca7228dc18b0
-  swiftScan: ad753846f4292c19a376dd159db035d62b689458
   SwiftyJSON: 070dabdcb1beb81b247c65ffa3a79dbbfb3b48aa
   UMengAnalytics: ef8d45f94c0e5771dc364cf6a5731d9d3b101da2
   YXAlertController: 37a54642cb8e8b43b79004fe9148bb8ff2fab814
   YXKit: 73d6ffbcf7530f1159e030460207286e9153b080
 
-PODFILE CHECKSUM: e53e38d1b7ecd4918d26c8ad6db504ba34f88b2f
+PODFILE CHECKSUM: f129d1e18957ae13e839f8aa18e676cc404743df
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.3.1