Merge branch 'master' into lym/test

* master:
  update
  fix
  update podfile.lock

# Conflicts:
#	Example/Podfile.lock

Example/GMAILab.xcodeproj/project.pbxproj

@@ -650,6 +650,7 @@
 				INFOPLIST_FILE = "GMAILab/GMAILab-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
+				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.wanmeizhensuo.ZhengXing;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = user_dev;

Example/Podfile.lock

@@ -272,7 +272,7 @@ SPEC CHECKSUMS:
   DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b
   EVReflection: 1abc1a81927ab0d30170238cf9b79bff489e9728
   GM-Swift-Observable: 756d8fc13638b9faa68cb10266b2ffb47a911595
-  GMAILab: 3ce710c62440f0568f23f5b55e4f2b5cfe1187b7
+  GMAILab: 9e7bb15887e119f7a76492392c7420b0b465040f
   GMAlbum: d667396a6dab574a45af71dfebd1a75257c80192
   GMBase: 358e72062cb0f64a57ff34ec181b20ad9973d79b
   GMBaseSwift: 8f327883b33ac24d0dcdb648ac3f9d6c57949ad5
@@ -300,7 +300,7 @@ SPEC CHECKSUMS:
   PLMediaStreamingKit: 3f4fafe3535de54a02c219f40331afa2b47592e0
   PLPlayerKit: a44734dc78c1f8f9fb22c537fa1916612fa46b06
   Qiniu: 9d1f20dcc348919972b4ee1b1272f9b9d4a7e69e
-  SDWebImage: e3eae2eda88578db0685a0c88597fdadd9433f05
+  SDWebImage: 84000f962cbfa70c07f19d2234cbfcf5d779b5dc
   SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a
   TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
   "UITableView+FDTemplateLayoutCell": 234e1582bcc4e18461af91155123bb96538ed030

GMAILab.podspec

@@ -91,14 +91,14 @@ TODO: Add long description of the pod here.
   
   s.libraries    = "z", "c++", "xml2", "sqlite3"
   s.frameworks = 'ReplayKit', 'CoreTelephony', 'SystemConfiguration'
-  s.pod_target_xcconfig = { 'VALID_ARCHS[sdk=iphonesimulator*]' => '' }
+#  s.pod_target_xcconfig = { 'VALID_ARCHS[sdk=iphonesimulator*]' => '' }
 
 
 #  s.dependency 'TTTRtcEngineKit_iOS'
 #  s.dependency 'TTTPlayerKit_iOS'
   s.static_framework  =  true
   
-  s.pod_target_xcconfig = { 'VALID_ARCHS' => 'armv7' }
+#  s.pod_target_xcconfig = { 'VALID_ARCHS' => 'armv7' }
 
 
 end