Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

# Conflicts:
#	galaxy/Podfile

处理冲突

galaxy/Podfile

 # Uncomment the next line to define a global platform for your project
-source 'https://github.com/CocoaPods/Specs.git'
+# source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '13.0'
 
 target 'galaxy' do
   use_frameworks!
   
   #网络检查
-  pod 'ReachabilitySwift'
-  
+  pod 'ReachabilitySwift','5.0.0'
   #键盘处理
   pod 'IQKeyboardManagerSwift','6.5.10'
-  
-  
-  
-  
+  #网络请求
+  pod 'Alamofire','5.8.1'
+  #图片加载
+  pod 'Kingfisher','7.10.1'
+  #
+  pod 'RxSwift','6.6.0'
+  pod 'SwiftyUserDefaults','5.3.0'
+  pod 'CryptoSwift','1.8.0'
+  pod 'SnapKit','5.6.0'
+  pod 'Refresher','0.7.0'
 end