fix

无故事王国

2 天以前 2aac1ba6449741aedbf97d75c340719a7b67d7db

fix

 Podfile

@@ -17,15 +17,15 @@
  pod 'AliyunOSSiOS' # 阿里云OSS
  pod 'WechatOpenSDK-XCFramework' # 微信开放平台组件
  pod 'AlipaySDK-iOS' # 支付宝组件
  pod 'AMap2DMap-NO-IDFA' # 高德地图2D,无广告IDFA标识
#  pod 'AMap2DMap-NO-IDFA' # 高德地图2D,无广告IDFA标识
    pod 'CryptoSwift' # 常用加密算法
    pod 'RHSocketKit/Extend'# 长连接【备用】
#    pod 'RHSocketKit/Extend'# 长连接【备用】


  post_install do |installer|
    installer.pods_project.targets.each do |target|
      target.build_configurations.each do |config|
        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
      end
    end
  end

 Podfile.lock

@@ -1,19 +1,54 @@
PODS:
  - Alamofire (5.7.1)
  - AlipaySDK-iOS (15.8.11)
  - AliyunOSSiOS (2.10.18)
  - AMap2DMap-NO-IDFA (5.6.1):
    - AMapFoundation-NO-IDFA (~> 1.4)
  - AMapFoundation-NO-IDFA (1.8.2)
  - CocoaAsyncSocket (7.6.5)
  - CryptoSwift (1.8.0)
  - Alamofire (5.10.2)
  - AlipaySDK-iOS (15.8.30)
  - AliyunOSSiOS (2.11.1)
  - CryptoSwift (1.8.4)
  - Differentiator (5.0.0)
  - EmptyDataSet-Swift (5.0.0)
  - FFPage (3.0.0)
  - FSCalendar (2.8.4)
  - HandyJSON (5.0.2)
  - IQKeyboardManager (6.5.11)
  - IQKeyboardManagerSwift (6.5.11)
  - IQKeyboardCore (1.0.5)
  - IQKeyboardManager (6.5.19)
  - IQKeyboardManagerSwift (8.0.1):
    - IQKeyboardManagerSwift/Appearance (= 8.0.1)
    - IQKeyboardManagerSwift/Core (= 8.0.1)
    - IQKeyboardManagerSwift/IQKeyboardReturnManager (= 8.0.1)
    - IQKeyboardManagerSwift/IQKeyboardToolbarManager (= 8.0.1)
    - IQKeyboardManagerSwift/IQTextView (= 8.0.1)
    - IQKeyboardManagerSwift/Resign (= 8.0.1)
  - IQKeyboardManagerSwift/Appearance (8.0.1):
    - IQKeyboardManagerSwift/Core
  - IQKeyboardManagerSwift/Core (8.0.1):
    - IQKeyboardNotification
    - IQTextInputViewNotification
  - IQKeyboardManagerSwift/IQKeyboardReturnManager (8.0.1):
    - IQKeyboardReturnManager
  - IQKeyboardManagerSwift/IQKeyboardToolbarManager (8.0.1):
    - IQKeyboardManagerSwift/Core
    - IQKeyboardToolbarManager
  - IQKeyboardManagerSwift/IQTextView (8.0.1):
    - IQTextView
  - IQKeyboardManagerSwift/Resign (8.0.1):
    - IQKeyboardManagerSwift/Core
  - IQKeyboardNotification (1.0.3)
  - IQKeyboardReturnManager (1.0.4):
    - IQKeyboardCore (= 1.0.5)
  - IQKeyboardToolbar (1.1.1):
    - IQKeyboardCore
    - IQKeyboardToolbar/Core (= 1.1.1)
  - IQKeyboardToolbar/Core (1.1.1):
    - IQKeyboardCore
    - IQKeyboardToolbar/Placeholderable
  - IQKeyboardToolbar/Placeholderable (1.1.1):
    - IQKeyboardCore
  - IQKeyboardToolbarManager (1.1.3):
    - IQKeyboardToolbar
    - IQTextInputViewNotification
  - IQTextInputViewNotification (1.0.8):
    - IQKeyboardCore
  - IQTextView (1.0.5):
    - IQKeyboardToolbar/Placeholderable
  - JQTools (0.1.5):
    - EmptyDataSet-Swift
    - HandyJSON
@@ -21,91 +56,91 @@
    - IQKeyboardManagerSwift
    - MJRefresh
    - ObjectMapper
    - QMUIKit
    - RxCocoa
    - RxDataSources
    - RxSwift
    - SDWebImage
    - SnapKit
    - QMUIKit (~> 4.7.0)
    - RxCocoa (~> 6.9.0)
    - RxDataSources (~> 5.0.0)
    - RxSwift (~> 6.9.0)
    - SDWebImage (~> 5.20.0)
    - SnapKit (~> 5.7.0)
    - SVProgressHUD
    - TZImagePickerController
    - UserDefaultsStore (~> 1.5.0)
    - VTMagic
    - XCGLogger
  - Lantern (1.1.4)
  - MJRefresh (3.7.5)
  - ObjcExceptionBridging (1.0.1):
    - ObjcExceptionBridging/ObjcExceptionBridging (= 1.0.1)
  - ObjcExceptionBridging/ObjcExceptionBridging (1.0.1)
  - ObjectMapper (4.2.0)
  - QMUIKit (4.6.3):
    - QMUIKit/QMUIComponents (= 4.6.3)
    - QMUIKit/QMUICore (= 4.6.3)
    - QMUIKit/QMUILog (= 4.6.3)
    - QMUIKit/QMUIMainFrame (= 4.6.3)
    - QMUIKit/QMUIResources (= 4.6.3)
    - QMUIKit/QMUIWeakObjectContainer (= 4.6.3)
  - QMUIKit/QMUIComponents (4.6.3):
    - QMUIKit/QMUIComponents/NavigationBarTransition (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIAlertController (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIAnimation (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIAppearance (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIAssetLibrary (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIBadge (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIButton (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUICAAnimationExtension (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUICALayerExtension (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUICellHeightCache (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUICellHeightKeyCache (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUICellSizeKeyCache (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUICollectionViewPagingLayout (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIConsole (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIDialogViewController (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIEmotionInputManager (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIEmotionView (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIEmptyView (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIFloatLayoutView (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIGridView (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIImagePickerLibrary (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIImagePreviewView (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIKeyboardManager (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUILabel (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUILogManagerViewController (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUILogWithConfigurationSupported (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIMarqueeLabel (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIModalPresentationViewController (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIMoreOperationController (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIMultipleDelegates (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUINavigationButton (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUINavigationTitleView (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIOrderedDictionary (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIPieProgressView (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIPopupContainerView (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIPopupMenuView (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIScrollAnimator (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUISearchBar (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUISearchController (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUISegmentedControl (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIStaticTableView (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUITableView (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUITableViewCell (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUITableViewHeaderFooterView (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUITableViewProtocols (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUITestView (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUITextField (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUITextView (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUITheme (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUITips (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIToastView (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIToolbarButton (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIWindowSizeMonitor (= 4.6.3)
    - QMUIKit/QMUIComponents/QMUIZoomImageView (= 4.6.3)
  - Lantern (1.1.5)
  - MJRefresh (3.7.9)
  - ObjcExceptionBridging (7.1.5):
    - ObjcExceptionBridging/ObjcExceptionBridging (= 7.1.5)
  - ObjcExceptionBridging/ObjcExceptionBridging (7.1.5)
  - ObjectMapper (4.4.2)
  - QMUIKit (4.7.0):
    - QMUIKit/QMUIComponents (= 4.7.0)
    - QMUIKit/QMUICore (= 4.7.0)
    - QMUIKit/QMUILog (= 4.7.0)
    - QMUIKit/QMUIMainFrame (= 4.7.0)
    - QMUIKit/QMUIResources (= 4.7.0)
    - QMUIKit/QMUIWeakObjectContainer (= 4.7.0)
  - QMUIKit/QMUIComponents (4.7.0):
    - QMUIKit/QMUIComponents/NavigationBarTransition (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIAlertController (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIAnimation (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIAppearance (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIAssetLibrary (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIBadge (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIButton (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUICAAnimationExtension (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUICALayerExtension (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUICellHeightCache (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUICellHeightKeyCache (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUICellSizeKeyCache (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUICollectionViewPagingLayout (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIConsole (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIDialogViewController (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIEmotionInputManager (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIEmotionView (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIEmptyView (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIFloatLayoutView (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIGridView (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIImagePickerLibrary (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIImagePreviewView (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIKeyboardManager (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUILabel (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUILogManagerViewController (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUILogWithConfigurationSupported (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIMarqueeLabel (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIModalPresentationViewController (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIMoreOperationController (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIMultipleDelegates (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUINavigationButton (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUINavigationTitleView (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIOrderedDictionary (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIPieProgressView (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIPopupContainerView (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIPopupMenuView (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIScrollAnimator (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUISearchBar (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUISearchController (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUISegmentedControl (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIStaticTableView (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUITableView (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUITableViewCell (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUITableViewHeaderFooterView (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUITableViewProtocols (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUITestView (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUITextField (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUITextView (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUITheme (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUITips (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIToastView (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIToolbarButton (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIWindowSizeMonitor (= 4.7.0)
    - QMUIKit/QMUIComponents/QMUIZoomImageView (= 4.7.0)
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/NavigationBarTransition (4.6.3):
  - QMUIKit/QMUIComponents/NavigationBarTransition (4.7.0):
    - QMUIKit/QMUIComponents/QMUINavigationTitleView
    - QMUIKit/QMUICore
    - QMUIKit/QMUIMainFrame
  - QMUIKit/QMUIComponents/QMUIAlertController (4.6.3):
  - QMUIKit/QMUIComponents/QMUIAlertController (4.7.0):
    - QMUIKit/QMUIComponents/QMUIAppearance
    - QMUIKit/QMUIComponents/QMUIButton
    - QMUIKit/QMUIComponents/QMUIKeyboardManager
@@ -113,36 +148,36 @@
    - QMUIKit/QMUIComponents/QMUIModalPresentationViewController
    - QMUIKit/QMUIComponents/QMUITextField
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIAnimation (4.6.3):
  - QMUIKit/QMUIComponents/QMUIAnimation (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIAppearance (4.6.3):
  - QMUIKit/QMUIComponents/QMUIAppearance (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIAssetLibrary (4.6.3):
  - QMUIKit/QMUIComponents/QMUIAssetLibrary (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIBadge (4.6.3):
  - QMUIKit/QMUIComponents/QMUIBadge (4.7.0):
    - QMUIKit/QMUIComponents/QMUILabel
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIButton (4.6.3):
  - QMUIKit/QMUIComponents/QMUIButton (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUICAAnimationExtension (4.6.3):
  - QMUIKit/QMUIComponents/QMUICAAnimationExtension (4.7.0):
    - QMUIKit/QMUIComponents/QMUIMultipleDelegates
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUICALayerExtension (4.6.3):
  - QMUIKit/QMUIComponents/QMUICALayerExtension (4.7.0):
    - QMUIKit/QMUIComponents/QMUIMultipleDelegates
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUICellHeightCache (4.6.3):
  - QMUIKit/QMUIComponents/QMUICellHeightCache (4.7.0):
    - QMUIKit/QMUIComponents/QMUITableViewProtocols
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUICellHeightKeyCache (4.6.3):
  - QMUIKit/QMUIComponents/QMUICellHeightKeyCache (4.7.0):
    - QMUIKit/QMUIComponents/QMUIMultipleDelegates
    - QMUIKit/QMUIComponents/QMUITableViewProtocols
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUICellSizeKeyCache (4.6.3):
  - QMUIKit/QMUIComponents/QMUICellSizeKeyCache (4.7.0):
    - QMUIKit/QMUIComponents/QMUIMultipleDelegates
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUICollectionViewPagingLayout (4.6.3):
  - QMUIKit/QMUIComponents/QMUICollectionViewPagingLayout (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIConsole (4.6.3):
  - QMUIKit/QMUIComponents/QMUIConsole (4.7.0):
    - QMUIKit/QMUIComponents/QMUIButton
    - QMUIKit/QMUIComponents/QMUICAAnimationExtension
    - QMUIKit/QMUIComponents/QMUICellHeightKeyCache
@@ -153,7 +188,7 @@
    - QMUIKit/QMUIComponents/QMUITextView
    - QMUIKit/QMUICore
    - QMUIKit/QMUIResources
  - QMUIKit/QMUIComponents/QMUIDialogViewController (4.6.3):
  - QMUIKit/QMUIComponents/QMUIDialogViewController (4.7.0):
    - QMUIKit/QMUIComponents/QMUIAppearance
    - QMUIKit/QMUIComponents/QMUIButton
    - QMUIKit/QMUIComponents/QMUILabel
@@ -164,22 +199,22 @@
    - QMUIKit/QMUIComponents/QMUITextField
    - QMUIKit/QMUICore
    - QMUIKit/QMUIMainFrame
  - QMUIKit/QMUIComponents/QMUIEmotionInputManager (4.6.3):
  - QMUIKit/QMUIComponents/QMUIEmotionInputManager (4.7.0):
    - QMUIKit/QMUIComponents/QMUIEmotionView
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIEmotionView (4.6.3):
  - QMUIKit/QMUIComponents/QMUIEmotionView (4.7.0):
    - QMUIKit/QMUIComponents/QMUIButton
    - QMUIKit/QMUICore
    - QMUIKit/QMUIResources
  - QMUIKit/QMUIComponents/QMUIEmptyView (4.6.3):
  - QMUIKit/QMUIComponents/QMUIEmptyView (4.7.0):
    - QMUIKit/QMUIComponents/QMUIAppearance
    - QMUIKit/QMUIComponents/QMUIButton
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIFloatLayoutView (4.6.3):
  - QMUIKit/QMUIComponents/QMUIFloatLayoutView (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIGridView (4.6.3):
  - QMUIKit/QMUIComponents/QMUIGridView (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIImagePickerLibrary (4.6.3):
  - QMUIKit/QMUIComponents/QMUIImagePickerLibrary (4.7.0):
    - QMUIKit/QMUIComponents/QMUIAlertController
    - QMUIKit/QMUIComponents/QMUIAppearance
    - QMUIKit/QMUIComponents/QMUIAssetLibrary
@@ -192,7 +227,7 @@
    - QMUIKit/QMUICore
    - QMUIKit/QMUIMainFrame
    - QMUIKit/QMUIResources
  - QMUIKit/QMUIComponents/QMUIImagePreviewView (4.6.3):
  - QMUIKit/QMUIComponents/QMUIImagePreviewView (4.7.0):
    - QMUIKit/QMUIComponents/QMUIAppearance
    - QMUIKit/QMUIComponents/QMUIButton
    - QMUIKit/QMUIComponents/QMUICollectionViewPagingLayout
@@ -201,89 +236,89 @@
    - QMUIKit/QMUIComponents/QMUIZoomImageView
    - QMUIKit/QMUICore
    - QMUIKit/QMUIMainFrame
  - QMUIKit/QMUIComponents/QMUIKeyboardManager (4.6.3):
  - QMUIKit/QMUIComponents/QMUIKeyboardManager (4.7.0):
    - QMUIKit/QMUIComponents/QMUIAppearance
    - QMUIKit/QMUIComponents/QMUIMultipleDelegates
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUILabel (4.6.3):
  - QMUIKit/QMUIComponents/QMUILabel (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUILogManagerViewController (4.6.3):
  - QMUIKit/QMUIComponents/QMUILogManagerViewController (4.7.0):
    - QMUIKit/QMUIComponents/QMUIPopupMenuView
    - QMUIKit/QMUIComponents/QMUISearchController
    - QMUIKit/QMUIComponents/QMUIStaticTableView
    - QMUIKit/QMUIComponents/QMUITableView
    - QMUIKit/QMUICore
    - QMUIKit/QMUIMainFrame
  - QMUIKit/QMUIComponents/QMUILogWithConfigurationSupported (4.6.3):
  - QMUIKit/QMUIComponents/QMUILogWithConfigurationSupported (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIMarqueeLabel (4.6.3):
  - QMUIKit/QMUIComponents/QMUIMarqueeLabel (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIModalPresentationViewController (4.6.3):
  - QMUIKit/QMUIComponents/QMUIModalPresentationViewController (4.7.0):
    - QMUIKit/QMUIComponents/QMUIAppearance
    - QMUIKit/QMUIComponents/QMUIKeyboardManager
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIMoreOperationController (4.6.3):
  - QMUIKit/QMUIComponents/QMUIMoreOperationController (4.7.0):
    - QMUIKit/QMUIComponents/QMUIAppearance
    - QMUIKit/QMUIComponents/QMUIButton
    - QMUIKit/QMUIComponents/QMUIModalPresentationViewController
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIMultipleDelegates (4.6.3):
  - QMUIKit/QMUIComponents/QMUIMultipleDelegates (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUINavigationButton (4.6.3):
  - QMUIKit/QMUIComponents/QMUINavigationButton (4.7.0):
    - QMUIKit/QMUICore
    - QMUIKit/QMUIMainFrame
  - QMUIKit/QMUIComponents/QMUINavigationTitleView (4.6.3):
  - QMUIKit/QMUIComponents/QMUINavigationTitleView (4.7.0):
    - QMUIKit/QMUIComponents/QMUIAppearance
    - QMUIKit/QMUIComponents/QMUIButton
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIOrderedDictionary (4.6.3):
  - QMUIKit/QMUIComponents/QMUIOrderedDictionary (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIPieProgressView (4.6.3):
  - QMUIKit/QMUIComponents/QMUIPieProgressView (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIPopupContainerView (4.6.3):
  - QMUIKit/QMUIComponents/QMUIPopupContainerView (4.7.0):
    - QMUIKit/QMUIComponents/QMUIAppearance
    - QMUIKit/QMUICore
    - QMUIKit/QMUIMainFrame
  - QMUIKit/QMUIComponents/QMUIPopupMenuView (4.6.3):
  - QMUIKit/QMUIComponents/QMUIPopupMenuView (4.7.0):
    - QMUIKit/QMUIComponents/QMUIButton
    - QMUIKit/QMUIComponents/QMUIPopupContainerView
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIScrollAnimator (4.6.3):
  - QMUIKit/QMUIComponents/QMUIScrollAnimator (4.7.0):
    - QMUIKit/QMUIComponents/QMUIMultipleDelegates
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUISearchBar (4.6.3):
  - QMUIKit/QMUIComponents/QMUISearchBar (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUISearchController (4.6.3):
  - QMUIKit/QMUIComponents/QMUISearchController (4.7.0):
    - QMUIKit/QMUIComponents/QMUIEmptyView
    - QMUIKit/QMUIComponents/QMUISearchBar
    - QMUIKit/QMUICore
    - QMUIKit/QMUIMainFrame
  - QMUIKit/QMUIComponents/QMUISegmentedControl (4.6.3):
  - QMUIKit/QMUIComponents/QMUISegmentedControl (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIStaticTableView (4.6.3):
  - QMUIKit/QMUIComponents/QMUIStaticTableView (4.7.0):
    - QMUIKit/QMUIComponents/QMUIMultipleDelegates
    - QMUIKit/QMUIComponents/QMUITableViewCell
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUITableView (4.6.3):
  - QMUIKit/QMUIComponents/QMUITableView (4.7.0):
    - QMUIKit/QMUIComponents/QMUITableViewProtocols
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUITableViewCell (4.6.3):
  - QMUIKit/QMUIComponents/QMUITableViewCell (4.7.0):
    - QMUIKit/QMUIComponents/QMUIButton
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUITableViewHeaderFooterView (4.6.3):
  - QMUIKit/QMUIComponents/QMUITableViewHeaderFooterView (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUITableViewProtocols (4.6.3):
  - QMUIKit/QMUIComponents/QMUITableViewProtocols (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUITestView (4.6.3):
  - QMUIKit/QMUIComponents/QMUITestView (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUITextField (4.6.3):
  - QMUIKit/QMUIComponents/QMUITextField (4.7.0):
    - QMUIKit/QMUIComponents/QMUIMultipleDelegates
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUITextView (4.6.3):
  - QMUIKit/QMUIComponents/QMUITextView (4.7.0):
    - QMUIKit/QMUIComponents/QMUILabel
    - QMUIKit/QMUIComponents/QMUIMultipleDelegates
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUITheme (4.6.3):
  - QMUIKit/QMUIComponents/QMUITheme (4.7.0):
    - QMUIKit/QMUIComponents/QMUIAlertController
    - QMUIKit/QMUIComponents/QMUIBadge
    - QMUIKit/QMUIComponents/QMUIButton
@@ -301,29 +336,29 @@
    - QMUIKit/QMUIComponents/QMUITextView
    - QMUIKit/QMUIComponents/QMUIToastView
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUITips (4.6.3):
  - QMUIKit/QMUIComponents/QMUITips (4.7.0):
    - QMUIKit/QMUIComponents/QMUIToastView
    - QMUIKit/QMUICore
    - QMUIKit/QMUIResources
  - QMUIKit/QMUIComponents/QMUIToastView (4.6.3):
  - QMUIKit/QMUIComponents/QMUIToastView (4.7.0):
    - QMUIKit/QMUIComponents/QMUIKeyboardManager
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIToolbarButton (4.6.3):
  - QMUIKit/QMUIComponents/QMUIToolbarButton (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIWindowSizeMonitor (4.6.3):
  - QMUIKit/QMUIComponents/QMUIWindowSizeMonitor (4.7.0):
    - QMUIKit/QMUICore
  - QMUIKit/QMUIComponents/QMUIZoomImageView (4.6.3):
  - QMUIKit/QMUIComponents/QMUIZoomImageView (4.7.0):
    - QMUIKit/QMUIComponents/QMUIAssetLibrary
    - QMUIKit/QMUIComponents/QMUIButton
    - QMUIKit/QMUIComponents/QMUIEmptyView
    - QMUIKit/QMUIComponents/QMUIPieProgressView
    - QMUIKit/QMUICore
    - QMUIKit/QMUIResources
  - QMUIKit/QMUICore (4.6.3):
  - QMUIKit/QMUICore (4.7.0):
    - QMUIKit/QMUILog
    - QMUIKit/QMUIWeakObjectContainer
  - QMUIKit/QMUILog (4.6.3)
  - QMUIKit/QMUIMainFrame (4.6.3):
  - QMUIKit/QMUILog (4.7.0)
  - QMUIKit/QMUIMainFrame (4.7.0):
    - QMUIKit/QMUIComponents/QMUIEmptyView
    - QMUIKit/QMUIComponents/QMUIKeyboardManager
    - QMUIKit/QMUIComponents/QMUIMultipleDelegates
@@ -332,79 +367,81 @@
    - QMUIKit/QMUIComponents/QMUITableViewHeaderFooterView
    - QMUIKit/QMUICore
    - QMUIKit/QMUILog
  - QMUIKit/QMUIResources (4.6.3)
  - QMUIKit/QMUIWeakObjectContainer (4.6.3)
  - RHSocketKit/Core (2.3.7):
    - CocoaAsyncSocket
  - RHSocketKit/Extend (2.3.7):
    - RHSocketKit/Core
  - RxCocoa (6.5.0):
    - RxRelay (= 6.5.0)
    - RxSwift (= 6.5.0)
  - QMUIKit/QMUIResources (4.7.0)
  - QMUIKit/QMUIWeakObjectContainer (4.7.0)
  - RxCocoa (6.9.0):
    - RxRelay (= 6.9.0)
    - RxSwift (= 6.9.0)
  - RxDataSources (5.0.0):
    - Differentiator (~> 5.0)
    - RxCocoa (~> 6.0)
    - RxSwift (~> 6.0)
  - RxRelay (6.5.0):
    - RxSwift (= 6.5.0)
  - RxSwift (6.5.0)
  - SDWebImage (5.16.0):
    - SDWebImage/Core (= 5.16.0)
  - SDWebImage/Core (5.16.0)
  - SnapKit (5.6.0)
  - RxRelay (6.9.0):
    - RxSwift (= 6.9.0)
  - RxSwift (6.9.0)
  - SDWebImage (5.20.1):
    - SDWebImage/Core (= 5.20.1)
  - SDWebImage/Core (5.20.1)
  - SnapKit (5.7.1)
  - SPPageMenu (3.5.0)
  - SVProgressHUD (2.2.5)
  - SwifterSwift (5.2.0):
    - SwifterSwift/AppKit (= 5.2.0)
    - SwifterSwift/CoreAnimation (= 5.2.0)
    - SwifterSwift/CoreGraphics (= 5.2.0)
    - SwifterSwift/CoreLocation (= 5.2.0)
    - SwifterSwift/Dispatch (= 5.2.0)
    - SwifterSwift/Foundation (= 5.2.0)
    - SwifterSwift/MapKit (= 5.2.0)
    - SwifterSwift/SceneKit (= 5.2.0)
    - SwifterSwift/SpriteKit (= 5.2.0)
    - SwifterSwift/StoreKit (= 5.2.0)
    - SwifterSwift/SwiftStdlib (= 5.2.0)
    - SwifterSwift/UIKit (= 5.2.0)
  - SwifterSwift/AppKit (5.2.0)
  - SwifterSwift/CoreAnimation (5.2.0)
  - SwifterSwift/CoreGraphics (5.2.0)
  - SwifterSwift/CoreLocation (5.2.0)
  - SwifterSwift/Dispatch (5.2.0)
  - SwifterSwift/Foundation (5.2.0)
  - SwifterSwift/MapKit (5.2.0)
  - SwifterSwift/SceneKit (5.2.0)
  - SwifterSwift/SpriteKit (5.2.0)
  - SwifterSwift/StoreKit (5.2.0)
  - SwifterSwift/SwiftStdlib (5.2.0)
  - SwifterSwift/UIKit (5.2.0)
  - TZImagePickerController (3.8.3):
    - TZImagePickerController/Basic (= 3.8.3)
    - TZImagePickerController/Location (= 3.8.3)
  - TZImagePickerController/Basic (3.8.3)
  - TZImagePickerController/Location (3.8.3)
  - SVProgressHUD (2.3.1):
    - SVProgressHUD/Core (= 2.3.1)
  - SVProgressHUD/Core (2.3.1)
  - SwifterSwift (7.0.0):
    - SwifterSwift/AppKit (= 7.0.0)
    - SwifterSwift/CoreAnimation (= 7.0.0)
    - SwifterSwift/CoreGraphics (= 7.0.0)
    - SwifterSwift/CoreLocation (= 7.0.0)
    - SwifterSwift/CryptoKit (= 7.0.0)
    - SwifterSwift/Dispatch (= 7.0.0)
    - SwifterSwift/Foundation (= 7.0.0)
    - SwifterSwift/HealthKit (= 7.0.0)
    - SwifterSwift/MapKit (= 7.0.0)
    - SwifterSwift/SceneKit (= 7.0.0)
    - SwifterSwift/SpriteKit (= 7.0.0)
    - SwifterSwift/StoreKit (= 7.0.0)
    - SwifterSwift/SwiftStdlib (= 7.0.0)
    - SwifterSwift/UIKit (= 7.0.0)
    - SwifterSwift/WebKit (= 7.0.0)
  - SwifterSwift/AppKit (7.0.0)
  - SwifterSwift/CoreAnimation (7.0.0)
  - SwifterSwift/CoreGraphics (7.0.0)
  - SwifterSwift/CoreLocation (7.0.0)
  - SwifterSwift/CryptoKit (7.0.0)
  - SwifterSwift/Dispatch (7.0.0)
  - SwifterSwift/Foundation (7.0.0)
  - SwifterSwift/HealthKit (7.0.0)
  - SwifterSwift/MapKit (7.0.0)
  - SwifterSwift/SceneKit (7.0.0)
  - SwifterSwift/SpriteKit (7.0.0)
  - SwifterSwift/StoreKit (7.0.0)
  - SwifterSwift/SwiftStdlib (7.0.0)
  - SwifterSwift/UIKit (7.0.0)
  - SwifterSwift/WebKit (7.0.0)
  - TZImagePickerController (3.8.8):
    - TZImagePickerController/Basic (= 3.8.8)
    - TZImagePickerController/Location (= 3.8.8)
  - TZImagePickerController/Basic (3.8.8)
  - TZImagePickerController/Location (3.8.8)
  - UserDefaultsStore (1.5.0)
  - VTMagic (1.2.4):
    - VTMagic/Core (= 1.2.4)
  - VTMagic/Core (1.2.4)
  - WechatOpenSDK-XCFramework (2.0.2)
  - XCGLogger (7.0.1):
    - XCGLogger/Core (= 7.0.1)
  - XCGLogger/Core (7.0.1):
  - WechatOpenSDK-XCFramework (2.0.4)
  - XCGLogger (7.1.5):
    - XCGLogger/Core (= 7.1.5)
  - XCGLogger/Core (7.1.5):
    - ObjcExceptionBridging

DEPENDENCIES:
  - Alamofire
  - AlipaySDK-iOS
  - AliyunOSSiOS
  - AMap2DMap-NO-IDFA
  - CryptoSwift
  - FFPage
  - FSCalendar
  - JQTools (from `/Users/yvkd/MyProject/JQTools`)
  - Lantern
  - RHSocketKit/Extend
  - SPPageMenu
  - SVProgressHUD
  - SwifterSwift
@@ -415,23 +452,26 @@
    - Alamofire
    - AlipaySDK-iOS
    - AliyunOSSiOS
    - AMap2DMap-NO-IDFA
    - AMapFoundation-NO-IDFA
    - CocoaAsyncSocket
    - CryptoSwift
    - Differentiator
    - EmptyDataSet-Swift
    - FFPage
    - FSCalendar
    - HandyJSON
    - IQKeyboardCore
    - IQKeyboardManager
    - IQKeyboardManagerSwift
    - IQKeyboardNotification
    - IQKeyboardReturnManager
    - IQKeyboardToolbar
    - IQKeyboardToolbarManager
    - IQTextInputViewNotification
    - IQTextView
    - Lantern
    - MJRefresh
    - ObjcExceptionBridging
    - ObjectMapper
    - QMUIKit
    - RHSocketKit
    - RxCocoa
    - RxDataSources
    - RxRelay
@@ -452,42 +492,45 @@
    :path: "/Users/yvkd/MyProject/JQTools"

SPEC CHECKSUMS:
  Alamofire: 0123a34370cb170936ae79a8df46cc62b2edeb88
  AlipaySDK-iOS: a07b6eafa847a5b29acb6c150ea16d9792d5d167
  AliyunOSSiOS: e683c1b1faa0657b5cd02de733628cf996f4cd93
  AMap2DMap-NO-IDFA: ccecb3e2a044c17e6badb9b91c950e709368be20
  AMapFoundation-NO-IDFA: 6ce0ef596d4eb8d934ff498e56747b6de1247b05
  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
  CryptoSwift: 52aaf3fce7337552863b1d952e408085f0e65030
  Alamofire: 7193b3b92c74a07f85569e1a6c4f4237291e7496
  AlipaySDK-iOS: 913a1df564c64798903e71cf3d63141d9e1904d2
  AliyunOSSiOS: 51e8aa24dda25918e3b5b80d72105a57485b6bf7
  CryptoSwift: e64e11850ede528a02a0f3e768cec8e9d92ecb90
  Differentiator: e8497ceab83c1b10ca233716d547b9af21b9344d
  EmptyDataSet-Swift: eb382c0c87a2d9c678077385a595cec52da38171
  FFPage: 481cc0f2dde0f6be84a2359b6c86272e0024dc8d
  FSCalendar: 2d1d0d9398f12d439f55c1fe0f01525b151b8260
  HandyJSON: 9e4e236f5d2dbefad5155a77417bbea438201c03
  IQKeyboardManager: ef43ce1ba1e5aaf4adf222c0a46f39761f246879
  IQKeyboardManagerSwift: c7955c0bdbf7b2eb29bb7daaa44e3d90f55a9a85
  JQTools: d2b720c901e39d9959c9342ba42f9eba58886a02
  Lantern: 26ed71b2d9ace5073ecf53521e316ed8b95acdb0
  MJRefresh: fdf5e979eb406a0341468932d1dfc8b7f9fce961
  ObjcExceptionBridging: c30e00eb3700467e695faeea30e26e18bd445001
  ObjectMapper: 1eb41f610210777375fa806bf161dc39fb832b81
  QMUIKit: b831835f33d7fb3494809042225e6256eb22b892
  RHSocketKit: 0e804f9a12f1b1d44f775f43dc136b12fc6c4ac2
  RxCocoa: 94f817b71c07517321eb4f9ad299112ca8af743b
  IQKeyboardCore: 28c8bf3bcd8ba5aa1570b318cbc4da94b861711e
  IQKeyboardManager: c8665b3396bd0b79402b4c573eac345a31c7d485
  IQKeyboardManagerSwift: 835fc9c6e4732398113406d84900ad2e8f141218
  IQKeyboardNotification: d7382c4466c5a5adef92c7452ebf861b36050088
  IQKeyboardReturnManager: 972be48528ce9e7508ab3ab15ac7efac803f17f5
  IQKeyboardToolbar: d4bdccfb78324aec2f3920659c77bb89acd33312
  IQKeyboardToolbarManager: 6c693c8478d6327a7ef2107528d29698b3514dbb
  IQTextInputViewNotification: f5e954d8881fd9808b744e49e024cc0d4bcfe572
  IQTextView: ae13b4922f22e6f027f62c557d9f4f236b19d5c7
  JQTools: 1967cc465c5f11247f094c0ba46ecc58fe81283c
  Lantern: b192e7146c6d04e15e627f37281254a6a8593703
  MJRefresh: ff9e531227924c84ce459338414550a05d2aea78
  ObjcExceptionBridging: d3d37d62981bb7f252ecb31b62d7e23a96bbfb8a
  ObjectMapper: e6e4d91ff7f2861df7aecc536c92d8363f4c9677
  QMUIKit: 2fc09ba9a31a44a4081916ed4c41467bac798821
  RxCocoa: ac16414696ae706516be3e1ab00fcce5bdc9be8a
  RxDataSources: aa47cc1ed6c500fa0dfecac5c979b723542d79cf
  RxRelay: 1de1523e604c72b6c68feadedd1af3b1b4d0ecbd
  RxSwift: 5710a9e6b17f3c3d6e40d6e559b9fa1e813b2ef8
  SDWebImage: 2aea163b50bfcb569a2726b6a754c54a4506fcf6
  SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25
  RxRelay: 6b0c930e5cef57d5fe2032571e5e65b78e3cbdb1
  RxSwift: 31649ace6aceeb422e16ff71c60804f9c3281ed9
  SDWebImage: 33d0f23bddeb5d209ae959153883247be6703713
  SnapKit: d612e99e678a2d3b95bf60b0705ed0a35c03484a
  SPPageMenu: da182aafcec55719d5c326103cc7716c1e48f311
  SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
  SwifterSwift: 334181863c416882d97b7a60c05054d9e4d799e2
  TZImagePickerController: e9909edbadf7381140efc5b5c9f5bdbfd630f7d4
  SVProgressHUD: 4837c74bdfe2e51e8821c397825996a8d7de6e22
  SwifterSwift: e9caf990fc72e835432280755d1f4c43f2a483d5
  TZImagePickerController: d084a7b97c82d387e7669dd86dc9a9057500aacf
  UserDefaultsStore: 905e30372ff432197d199ce1f6fe51be7bf69628
  VTMagic: b49e5f456dbcbfd9a3588ba92417233a105bc193
  WechatOpenSDK-XCFramework: acdeeda129efbef9532bca8a10c24e1b4b8c7d69
  XCGLogger: 1943831ef907df55108b0b18657953f868de973b
  WechatOpenSDK-XCFramework: 36fb2bea0754266c17184adf4963d7e6ff98b69f
  XCGLogger: 399c5885210b4e2ad79d9f7a29b105d672ef724f

PODFILE CHECKSUM: f4b74442782ed9115ee44729149afd319c7ef22c
PODFILE CHECKSUM: 9372cd78e7ff14fa40db1607cf53ba6e6cffe7f2

COCOAPODS: 1.12.1
COCOAPODS: 1.16.2

 WanPai-Bridging-Header.h

@@ -9,6 +9,6 @@
#define WanPai_Bridging_Header_h
#import "WXApi.h"
#import <AlipaySDK/AlipaySDK.h>
#import <MAMapKit/MAMapKit.h>
//#import <MAMapKit/MAMapKit.h>

#endif /* WanPai_Bridging_Header_h */

 WanPai.xcodeproj/project.pbxproj

@@ -177,7 +177,6 @@
        138A25A92B91CC2300B2EE49 /* StudentsManagerListVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = 138A25A72B91CC2300B2EE49 /* StudentsManagerListVC.xib */; };
        138A25B02B91CE8E00B2EE49 /* StudentInfo_5_TCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 138A25AE2B91CE8E00B2EE49 /* StudentInfo_5_TCell.swift */; };
        138A25B12B91CE8E00B2EE49 /* StudentInfo_5_TCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 138A25AF2B91CE8E00B2EE49 /* StudentInfo_5_TCell.xib */; };
        138BE81C2AF0E41400FECE44 /* SocketManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 138BE81B2AF0E41400FECE44 /* SocketManager.swift */; };
        138D4CFB2A47ECAC005233E7 /* CourseInfoScheduleVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 138D4CF92A47ECAC005233E7 /* CourseInfoScheduleVC.swift */; };
        138D4CFC2A47ECAC005233E7 /* CourseInfoScheduleVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = 138D4CFA2A47ECAC005233E7 /* CourseInfoScheduleVC.xib */; };
        138D4CFF2A47EF4C005233E7 /* CourseDatetimeCCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 138D4CFD2A47EF4C005233E7 /* CourseDatetimeCCell.swift */; };
@@ -556,7 +555,6 @@
        138A25A72B91CC2300B2EE49 /* StudentsManagerListVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = StudentsManagerListVC.xib; sourceTree = "<group>"; };
        138A25AE2B91CE8E00B2EE49 /* StudentInfo_5_TCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudentInfo_5_TCell.swift; sourceTree = "<group>"; };
        138A25AF2B91CE8E00B2EE49 /* StudentInfo_5_TCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = StudentInfo_5_TCell.xib; sourceTree = "<group>"; };
        138BE81B2AF0E41400FECE44 /* SocketManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocketManager.swift; sourceTree = "<group>"; };
        138D4CF92A47ECAC005233E7 /* CourseInfoScheduleVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseInfoScheduleVC.swift; sourceTree = "<group>"; };
        138D4CFA2A47ECAC005233E7 /* CourseInfoScheduleVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CourseInfoScheduleVC.xib; sourceTree = "<group>"; };
        138D4CFD2A47EF4C005233E7 /* CourseDatetimeCCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseDatetimeCCell.swift; sourceTree = "<group>"; };
@@ -891,7 +889,6 @@
                134BD5092A5FF72800786819 /* OBSUploader.swift */,
                1353D5732A56CA0A00539FCA /* Services.swift */,
                1353D5742A56CA0A00539FCA /* NetworkRequest.swift */,
                138BE81B2AF0E41400FECE44 /* SocketManager.swift */,
            );
            path = Network;
            sourceTree = "<group>";
@@ -1951,7 +1948,6 @@
                8D4905AD2A31AE7100E38513 /* JoinMemberIntroduceVC.swift in Sources */,
                130EC1802AD3F6AF003CA9BA /* CommonAlertSheetView.swift in Sources */,
                1314FF932D93F8730070E83A /* CardCenterDetailVC.swift in Sources */,
                138BE81C2AF0E41400FECE44 /* SocketManager.swift in Sources */,
                13D7D6232A4EBBCF000136BD /* SearchStoreTCell.swift in Sources */,
                8DC3BE112A3803B500C91B7F /* ActivityListVC.swift in Sources */,
                1378018A2A3B08A600414959 /* CourseOnlineListVC.swift in Sources */,
@@ -2314,7 +2310,7 @@
                CODE_SIGN_IDENTITY = "Apple Development";
                "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
                CODE_SIGN_STYLE = Manual;
                CURRENT_PROJECT_VERSION = 18;
                CURRENT_PROJECT_VERSION = 19;
                DEVELOPMENT_TEAM = "";
                "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 2MWV8K39DV;
                FRAMEWORK_SEARCH_PATHS = (
@@ -2343,7 +2339,7 @@
                    "$(inherited)",
                    "$(PROJECT_DIR)/WanPai/YYPaymentManager/WeChatPay",
                );
                MARKETING_VERSION = 2.0.8;
                MARKETING_VERSION = 2.0.9;
                OTHER_LDFLAGS = (
                    "$(inherited)",
                    "-ObjC",
@@ -2353,10 +2349,6 @@
                    "-l\"sqlite3.0\"",
                    "-l\"swiftCoreGraphics\"",
                    "-l\"z\"",
                    "-framework",
                    "\"AMapFoundationKit\"",
                    "-framework",
                    "\"AVFoundation\"",
                    "-framework",
                    "\"Alamofire\"",
                    "-framework",
@@ -2403,8 +2395,6 @@
                    "\"JQTools\"",
                    "-framework",
                    "\"Lantern\"",
                    "-framework",
                    "\"MAMapKit\"",
                    "-framework",
                    "\"MJRefresh\"",
                    "-framework",
@@ -2479,7 +2469,7 @@
                CODE_SIGN_ENTITLEMENTS = WanPai/WanPaiRelease.entitlements;
                "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
                CODE_SIGN_STYLE = Manual;
                CURRENT_PROJECT_VERSION = 18;
                CURRENT_PROJECT_VERSION = 19;
                DEVELOPMENT_TEAM = "";
                "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 2MWV8K39DV;
                FRAMEWORK_SEARCH_PATHS = (
@@ -2508,7 +2498,7 @@
                    "$(inherited)",
                    "$(PROJECT_DIR)/WanPai/YYPaymentManager/WeChatPay",
                );
                MARKETING_VERSION = 2.0.8;
                MARKETING_VERSION = 2.0.9;
                OTHER_LDFLAGS = (
                    "$(inherited)",
                    "-ObjC",
@@ -2518,10 +2508,6 @@
                    "-l\"sqlite3.0\"",
                    "-l\"swiftCoreGraphics\"",
                    "-l\"z\"",
                    "-framework",
                    "\"AMapFoundationKit\"",
                    "-framework",
                    "\"AVFoundation\"",
                    "-framework",
                    "\"Alamofire\"",
                    "-framework",
@@ -2568,8 +2554,6 @@
                    "\"JQTools\"",
                    "-framework",
                    "\"Lantern\"",
                    "-framework",
                    "\"MAMapKit\"",
                    "-framework",
                    "\"MJRefresh\"",
                    "-framework",

 WanPai/AppDelegate.swift

@@ -8,118 +8,118 @@
import UIKit
import JQTools
import Alamofire
import AMapFoundationKit
//import AMapFoundationKit
import SDWebImage

@main
class AppDelegate: UIResponder, UIApplicationDelegate {

                var window: UIWindow?
                var orientation:UIInterfaceOrientationMask = .portrait
    var window: UIWindow?
    var orientation:UIInterfaceOrientationMask = .portrait

                func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
                                sleep(2)
                                Services.startNetworkMonitor()
                                YYPaymentManager.shared.configuredWeChat(appID: WeChatAPPID, universalLink: WechatUniversalLinks)
                                YYPaymentManager.shared.configuredAlipay(appScheme: APPScheme)
                                AMapServices.shared().enableHTTPS = true
                                AMapServices.shared().apiKey = AMapKey
    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
        sleep(2)
        Services.startNetworkMonitor()
        YYPaymentManager.shared.configuredWeChat(appID: WeChatAPPID, universalLink: WechatUniversalLinks)
        YYPaymentManager.shared.configuredAlipay(appScheme: APPScheme)
//        AMapServices.shared().enableHTTPS = true
//        AMapServices.shared().apiKey = AMapKey

                                Services.querySystemImg(type: .launch).subscribe(onNext: {data in
                                                if let img = data.data{
                                                                SDWebImageDownloader.shared.downloadImage(with: URL(string: img)) { image, _, _, _ in
                                                                                if let img = image{
                                                                                                LaunchImageHelper.changeAllLaunchImageToLandscape(img)
                                                                                }
                                                                }
                                                }
                                }).disposed(by: JQ_disposeBag)
                                return true
                }
        Services.querySystemImg(type: .launch).subscribe(onNext: {data in
            if let img = data.data{
                SDWebImageDownloader.shared.downloadImage(with: URL(string: img)) { image, _, _, _ in
                    if let img = image{
                        LaunchImageHelper.changeAllLaunchImageToLandscape(img)
                    }
                }
            }
        }).disposed(by: JQ_disposeBag)
        return true
    }

                // MARK: UISceneSession Lifecycle
    // MARK: UISceneSession Lifecycle

                func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
                                return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
                }
    func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
        return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
    }

                func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
    func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {

                }
    }

                func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask {
                                if UIDevice.current.userInterfaceIdiom == .pad{
                                                return .all
                                }else{
                                                return orientation
                                }
                }
    func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask {
        if UIDevice.current.userInterfaceIdiom == .pad{
            return .all
        }else{
            return orientation
        }
    }

                func application(_ application: UIApplication, open url: URL, sourceApplication: String?, annotation: Any) -> Bool {
                                print("---->")
                                return YYPaymentManager.shared.handleApplication(application, open: url, sourceApplication: sourceApplication, annotation: annotation)
                }
    func application(_ application: UIApplication, open url: URL, sourceApplication: String?, annotation: Any) -> Bool {
        print("---->")
        return YYPaymentManager.shared.handleApplication(application, open: url, sourceApplication: sourceApplication, annotation: annotation)
    }

                func application(_ application: UIApplication, handleOpen url: URL) -> Bool {
                                print("---->1")
                                return YYPaymentManager.shared.handleApplication(application, handleOpen: url)
                }
    func application(_ application: UIApplication, handleOpen url: URL) -> Bool {
        print("---->1")
        return YYPaymentManager.shared.handleApplication(application, handleOpen: url)
    }

                // NOTE: 9.0以后使用新API接口
                func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
                                print("---->2")
                                return YYPaymentManager.shared.handleApplication(app, open: url, options: options)
                }
    // NOTE: 9.0以后使用新API接口
    func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
        print("---->2")
        return YYPaymentManager.shared.handleApplication(app, open: url, options: options)
    }

                func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
                                print("---->3")
                                return YYPaymentManager.shared.handleApplication(userActivity)
                }
    func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
        print("---->3")
        return YYPaymentManager.shared.handleApplication(userActivity)
    }


}

extension AppDelegate{
                func registerAndLoginSuccess(){
                                let snapView = sceneDelegate?.window?.snapshotView(afterScreenUpdates: true)
    func registerAndLoginSuccess(){
        let snapView = sceneDelegate?.window?.snapshotView(afterScreenUpdates: true)

                                let tabBar = BaseTabBarVC()
                                let homeNav = BaseNav(rootViewController: HomeVC())
                                homeNav.tabBarItem = UITabBarItem(title: "玩湃公园", image: UIImage(named: "tabbar_home"), selectedImage: UIImage(named: "tabbar_home_s")!.withRenderingMode(.alwaysOriginal))
        let tabBar = BaseTabBarVC()
        let homeNav = BaseNav(rootViewController: HomeVC())
        homeNav.tabBarItem = UITabBarItem(title: "玩湃公园", image: UIImage(named: "tabbar_home"), selectedImage: UIImage(named: "tabbar_home_s")!.withRenderingMode(.alwaysOriginal))

                                let clouseNav = BaseNav(rootViewController: CourseVC())
                                clouseNav.tabBarItem = UITabBarItem(title: "我的运动营", image: UIImage(named: "tabbar_course"), selectedImage: UIImage(named: "tabbar_course_s")!.withRenderingMode(.alwaysOriginal))
        let clouseNav = BaseNav(rootViewController: CourseVC())
        clouseNav.tabBarItem = UITabBarItem(title: "我的运动营", image: UIImage(named: "tabbar_course"), selectedImage: UIImage(named: "tabbar_course_s")!.withRenderingMode(.alwaysOriginal))

//                                let welfareVCNav = BaseNav(rootViewController: WelfareVC())
//                                welfareVCNav.tabBarItem = UITabBarItem(title: "使用福利", image: UIImage(named: "tabbar_welfare"), selectedImage: UIImage(named: "tabbar_welfare_s")!.withRenderingMode(.alwaysOriginal))
        //                                let welfareVCNav = BaseNav(rootViewController: WelfareVC())
        //                                welfareVCNav.tabBarItem = UITabBarItem(title: "使用福利", image: UIImage(named: "tabbar_welfare"), selectedImage: UIImage(named: "tabbar_welfare_s")!.withRenderingMode(.alwaysOriginal))

        let carderCenterVCNav = BaseNav(rootViewController: CardCenterVC())
        carderCenterVCNav.tabBarItem = UITabBarItem(title: "玩湃惠民卡", image: UIImage(named: "tabbar_welfare"), selectedImage: UIImage(named: "tabbar_welfare_s")!.withRenderingMode(.alwaysOriginal))

                                let searchVCNav = BaseNav(rootViewController: SearchVC())
                                searchVCNav.tabBarItem = UITabBarItem(title: "我的玩湃", image: UIImage(named: "tabbar_search"), selectedImage: UIImage(named: "tabbar_search_s")!.withRenderingMode(.alwaysOriginal))
                                tabBar.viewControllers = [homeNav,carderCenterVCNav,clouseNav,searchVCNav]
                                sceneDelegate?.window?.rootViewController = tabBar
                                sceneDelegate?.window?.rootViewController?.view.addSubview(snapView!)
                                sceneDelegate?.window?.makeKeyAndVisible()
        let searchVCNav = BaseNav(rootViewController: SearchVC())
        searchVCNav.tabBarItem = UITabBarItem(title: "我的玩湃", image: UIImage(named: "tabbar_search"), selectedImage: UIImage(named: "tabbar_search_s")!.withRenderingMode(.alwaysOriginal))
        tabBar.viewControllers = [homeNav,carderCenterVCNav,clouseNav,searchVCNav]
        sceneDelegate?.window?.rootViewController = tabBar
        sceneDelegate?.window?.rootViewController?.view.addSubview(snapView!)
        sceneDelegate?.window?.makeKeyAndVisible()

                                UIView.animate(withDuration: 1.5) {
                                                snapView?.alpha = 0
                                                snapView?.transform3D = CATransform3DMakeScale(1.5, 1.5, 1.5)
                                } completion: { _ in
                                                snapView?.removeFromSuperview()
                                }
        UIView.animate(withDuration: 1.5) {
            snapView?.alpha = 0
            snapView?.transform3D = CATransform3DMakeScale(1.5, 1.5, 1.5)
        } completion: { _ in
            snapView?.removeFromSuperview()
        }

                                //        YYSocketManager.instance.startSocket(host: Socket_Url, port: 8888)
                }
        //        YYSocketManager.instance.startSocket(host: Socket_Url, port: 8888)
    }

                func needLogin(){
                                UserViewModel.clearToken()
                                UserDefaults.standard.setValue(nil, forKey: "currentStuId")
                                if JQ_currentViewController() is LoginVC{return}
                                let loginNav = LoginNav(rootViewController: LoginVC())
                                loginNav.modalPresentationStyle = .fullScreen
                                JQ_currentViewController().present(loginNav, animated: true)
                }
    func needLogin(){
        UserViewModel.clearToken()
        UserDefaults.standard.setValue(nil, forKey: "currentStuId")
        if JQ_currentViewController() is LoginVC{return}
        let loginNav = LoginNav(rootViewController: LoginVC())
        loginNav.modalPresentationStyle = .fullScreen
        JQ_currentViewController().present(loginNav, animated: true)
    }
}


 WanPai/Model/CommonModels.swift

@@ -499,7 +499,7 @@
                var longitude:Double = 0

                var index:Int?
                var annotation:MAPointAnnotation?
//                var annotation:MAPointAnnotation?

                required init(){}
}

 WanPai/Network/SocketManager.swift

File was deleted

 WanPai/Root/Activity/CustomPointAnnotation.swift

@@ -8,7 +8,7 @@
import Foundation


class CustomPointAnnotation:MAPointAnnotation{

    var index = 0
}
//class CustomPointAnnotation:MAPointAnnotation{
//
//    var index = 0
//}

 WanPai/Root/CardCenter/TCell/CardCenterTCell.swift

@@ -7,6 +7,7 @@

import UIKit
import SDWebImage
import JQTools

class CardCenterTCell: UITableViewCell {

@@ -14,7 +15,7 @@
    override func awakeFromNib() {
        super.awakeFromNib()
        selectionStyle = .none
        img_bg.cornerRadius = 10
        img_bg.jq_cornerRadius = 10
        backgroundColor = .clear
        contentView.backgroundColor = .clear
    }

 WanPai/Root/CardCenter/VC/CardCenterAddUserVC.swift

@@ -60,7 +60,7 @@
        let colors = [UIColor(hexStr: "#FD8C02").cgColor,
                      UIColor(hexStr: "#FD7202").cgColor,]
        btn_complete.jq_gradientNibColor(colorArr: colors, cornerRadius: 20)
        btn_complete.cornerRadius = 20
        btn_complete.jq_cornerRadius = 20
    }



 WanPai/Root/CardCenter/VC/CardCenterDetailVC.swift

@@ -69,7 +69,7 @@
    }
    
    override func setUI() {
        btn_payment.cornerRadius = 20
        btn_payment.jq_cornerRadius = 20
        biew_bottom.jq_addShadows(shadowColor: .black.withAlphaComponent(0.06), corner: 3, radius: 5, offset: CGSizeMake(10, -10), opacity: 1)

        view_banner.addSubview(bannerView)

 WanPai/Root/Course/VC/CourseInfoVC.swift

@@ -441,9 +441,9 @@
                                                                headerView = UITableViewHeaderFooterView(reuseIdentifier: "header")

                                                                let contentView = UIView()
                                                                contentView.borderColor = UIColor(hexStr: "#E7E3E3")
                                                                contentView.borderWidth = 1
                                                                contentView.cornerRadius = 11
                                                                contentView.jq_borderColor = UIColor(hexStr: "#E7E3E3")
                                                                contentView.jq_borderWidth = 1
                                                                contentView.jq_cornerRadius = 11
                                                                headerView?.contentView.addSubview(contentView)
                                                                contentView.snp.makeConstraints { make in
                                                                                make.center.equalToSuperview()

 WanPai/Root/Course/VC/ExperienceCourseVC.swift

@@ -126,8 +126,8 @@
        cell.label_content.text = experienceCourseModel!.day[indexPath.row]
        cell.label_content.backgroundColor = isSelected ? Def_ThemeColor : .white
        cell.label_content.textColor = isSelected ? .white : UIColor(hexStr: "#898989")
        cell.label_content.borderWidth = isSelected ? 0:1
        cell.label_content.borderColor = UIColor(hexStr: "#F2E9E9")
        cell.label_content.jq_borderWidth = isSelected ? 0:1
        cell.label_content.jq_borderColor = UIColor(hexStr: "#F2E9E9")
        return cell
    }
}

 WanPai/Root/Home/VC/HomeVC.swift

@@ -10,6 +10,7 @@
import RxSwift
import RxCocoa
import SDWebImage
import CoreLocation

let ChooseHomeStore_Noti = Notification.Name.init("ChooseHomeStore_Noti")
let UpdateCurrentStore_Noti = Notification.Name.init("UpdateCurrentStore_Noti")
@@ -450,7 +451,7 @@
                                if let m = item as? HomeStoreTopBannerModel{
                                                cell.img.sd_setImage(with: URL(string: m.backgroundImage), placeholderImage: nil, options: .lowPriority)
                                }
                                cell.cornerRadius = 10
                                cell.jq_cornerRadius = 10
        cell.layer.masksToBounds = true

                                return cell

 WanPai/Root/Other/CCell/Common_1_CCell.swift

@@ -6,6 +6,7 @@
//

import UIKit
import JQTools

class Common_1_CCell: UICollectionViewCell {

@@ -17,15 +18,15 @@
                label_content.text = "\(m.classHours)课时"
                label_content.backgroundColor = isSelected ? Def_ThemeColor : .white
                label_content.textColor = isSelected ? .white : UIColor(hexStr: "#898989")
                label_content.borderWidth = isSelected ? 0:1
                label_content.jq_borderWidth = isSelected ? 0:1
            }
        }
    }

    override func awakeFromNib() {
        super.awakeFromNib()
        label_content.borderColor = UIColor(hexStr: "#898989")
        label_content.cornerRadius = 4
        label_content.jq_borderColor = UIColor(hexStr: "#898989")
        label_content.jq_cornerRadius = 4
    }

}

 WanPai/Root/Other/View/StudentChoose2View.swift

@@ -131,10 +131,10 @@

                                cell.img_radio.image = UIImage(named: selectStudents?.id == viewModel.dataSource.value[indexPath.row].id ? "btn_select" : "btn_select_u")
                                if selectStudents?.id == viewModel.dataSource.value[indexPath.row].id{
                                                cell.view_container.borderColor = UIColor(hexString: "#FD7902")?.withAlphaComponent(0.28)
                                                cell.view_container.jq_borderColor = UIColor(hexString: "#FD7902")?.withAlphaComponent(0.28)
                                                cell.img_radio.isHidden = false
                                }else{
                                                cell.view_container.borderColor = UIColor(hexString: "#ADADAD")?.withAlphaComponent(0.28)
                                                cell.view_container.jq_borderColor = UIColor(hexString: "#ADADAD")?.withAlphaComponent(0.28)
                                                cell.img_radio.isHidden = true
                                }


 WanPai/Root/Other/View/StudentChoose3View.swift

@@ -150,10 +150,10 @@

        cell.img_radio.image = UIImage(named: isSelect ? "btn_select" : "btn_select_u")
        if isSelect{
            cell.view_container.borderColor = UIColor(hexString: "#FD7902")?.withAlphaComponent(0.28)
            cell.view_container.jq_borderColor = UIColor(hexString: "#FD7902")?.withAlphaComponent(0.28)
            cell.img_radio.isHidden = false
        }else{
            cell.view_container.borderColor = UIColor(hexString: "#ADADAD")?.withAlphaComponent(0.28)
            cell.view_container.jq_borderColor = UIColor(hexString: "#ADADAD")?.withAlphaComponent(0.28)
            cell.img_radio.isHidden = true
        }


 WanPai/Root/Other/View/StudentChooseView.swift

@@ -226,10 +226,10 @@
                                                cell.cons_handleCenterY.constant = -7
                                                if self.selectStudents.contains(where: {($0 as! CourseDetailStudentModel).id == item.id}){
                                                                cell.btn_handle.setImage(UIImage(named: "btn_choose_s"), for: .normal)
                                                                cell.view_container.borderColor = UIColor(hexStr: "#FD7902").withAlphaComponent(0.28)
                                                                cell.view_container.jq_borderColor = UIColor(hexStr: "#FD7902").withAlphaComponent(0.28)
                                                }else{
                                                                cell.btn_handle.setImage(nil, for: .normal)
                                                                cell.view_container.borderColor = UIColor(hexStr: "#ADADAD").withAlphaComponent(0.28)
                                                                cell.view_container.jq_borderColor = UIColor(hexStr: "#ADADAD").withAlphaComponent(0.28)
                                                }
                                                cell.studentModel = item
                                                return cell
@@ -241,11 +241,11 @@
                                                cell.activityDetailPartModel = item
                                                if self.selectStudents.contains(where: {($0 as! ActivityDetailPartModel).id == item.id}){
                                                                cell.img_radio.image = UIImage(named: "btn_choose_s")
                                                                cell.view_container.borderColor = UIColor(hexStr: "#FD7902").withAlphaComponent(0.28)
                                                                cell.view_container.jq_borderColor = UIColor(hexStr: "#FD7902").withAlphaComponent(0.28)
                                                                cell.img_radio.isHidden = false
                                                }else{
                                                                cell.img_radio.image = UIImage(named: "")
                                                                cell.view_container.borderColor = UIColor(hexStr: "#ADADAD").withAlphaComponent(0.28)
                                                                cell.view_container.jq_borderColor = UIColor(hexStr: "#ADADAD").withAlphaComponent(0.28)
                                                                cell.img_radio.isHidden = true
                                                }
                                                return cell

 WanPai/Root/Search/TCell/MyCardTCell.swift

@@ -24,9 +24,9 @@
    override func awakeFromNib() {
        super.awakeFromNib()
        selectionStyle = .none
        btn_refund.borderWidth = 1
        btn_refund.jq_borderWidth = 1
        btn_refund.jq_borderColor = UIColor(hexString: "#C8C8C8")
        btn_refund.cornerRadius = 2
        btn_refund.jq_cornerRadius = 2

        view_container.jq_addShadows(shadowColor: .black.withAlphaComponent(0.1), corner: 10, radius: 5, offset: CGSize(width: 0, height: 10), opacity: 1)

@@ -93,5 +93,9 @@
        if model.status == 3 || model.isExpire == 1{
            view_container.alpha = 0.5
        }

        if model.status == 2{
            btn_refund.isHidden = true
        }
    }
}

 WanPai/Root/Search/TCell/MyQRCodeTCell.swift

@@ -42,9 +42,9 @@
    override func awakeFromNib() {
        super.awakeFromNib()
        // Initialization code
                                view_container.borderColor = UIColor(hexString: "#FD8602")
                                view_container.borderWidth = 1
                                view_container.cornerRadius = 4
                                view_container.jq_borderColor = UIColor(hexString: "#FD8602")
                                view_container.jq_borderWidth = 1
                                view_container.jq_cornerRadius = 4
                                selectionStyle = .none
    }
}

 WanPai/Root/Search/TCell/WorldCupRankTCell.swift

@@ -41,12 +41,12 @@
                                                                                rankLabel.text = "\(m.rank)"
                                                                }

                                                                self.borderColor = UIColor(hexString: "#FC743A")
                                                                self.jq_borderColor = UIColor(hexString: "#FC743A")

                                                                if m.oneself == 1{
                                                                                self.borderWidth = 1
                                                                                self.jq_borderWidth = 1
                                                                }else{
                                                                                self.borderWidth = 0
                                                                                self.jq_borderWidth = 0
                                                                }
                                                }
                                }
@@ -87,7 +87,7 @@

                                userImg = UIImageView()
                                userImg.backgroundColor = .black.withAlphaComponent(0.4)
                                userImg.cornerRadius = 17
                                userImg.jq_cornerRadius = 17
                                contentView.addSubview(userImg)
                                userImg.snp.makeConstraints { make in
                                                make.left.equalTo(rankImg.snp.right).offset(37)

 WanPai/Root/Search/VC/WorldCupRankVC.swift

@@ -303,8 +303,8 @@

                                                yearBtn.setTitleColor(.black.withAlphaComponent(0.74), for: .normal)
                                                yearBtn.titleLabel?.font = UIFont.systemFont(ofSize: 16)
                                                yearBtn.borderColor = UIColor(hexString: "#D9D9D9")
                                                yearBtn.borderWidth = 1
                                                yearBtn.jq_borderColor = UIColor(hexString: "#D9D9D9")
                                                yearBtn.jq_borderWidth = 1
                                                yearBtn.setImage(UIImage(named: "icon_down_arrow"), for: .normal)
                                                yearBtn.addTarget(self, action: #selector(filterAction), for: .touchUpInside)
                                                yearBtn.spacingBetweenImageAndTitle = 5

 WanPai/Root/Search/VC/WorldCupVC.swift

@@ -140,16 +140,16 @@
                                provinceBtn.tag = 10
                                provinceBtn.titleLabel?.font = UIFont.systemFont(ofSize: 15, weight: .medium)
                                provinceBtn.setTitleColor(UIColor(hexString: "#FE7E03"), for: .normal)
                                provinceBtn.borderColor = UIColor(hexString: "#FE7E03")
                                provinceBtn.borderWidth = 1
                                provinceBtn.cornerRadius = 20
                                provinceBtn.jq_borderColor = UIColor(hexString: "#FE7E03")
                                provinceBtn.jq_borderWidth = 1
                                provinceBtn.jq_cornerRadius = 20
                                provinceBtn.addTarget(self, action: #selector(radiusAction), for: .touchUpInside)

                                cityBtn.titleLabel?.font = UIFont.systemFont(ofSize: 15, weight: .medium)
                                cityBtn.tag = 11
                                cityBtn.setTitleColor(.white, for: .normal)
                                cityBtn.backgroundColor = UIColor(hexString: "#FE7E03")
                                cityBtn.cornerRadius = 20
                                cityBtn.jq_cornerRadius = 20
                                cityBtn.addTarget(self, action: #selector(radiusAction), for: .touchUpInside)

                                stackView.addArrangedSubview(provinceBtn)
@@ -164,7 +164,7 @@

                                let cell = WorldCupRankTCell(style: .default, reuseIdentifier: nil)
                                cell.tag = 1100
                                cell.borderColor = UIColor(hexString: "#FC743A")
                                cell.jq_borderColor = UIColor(hexString: "#FC743A")
                                cell.jq_borderWidth = 1
                                footView.addSubview(cell)
                                cell.snp.makeConstraints { make in

 WanPai/Root/Search/View/CustomPointAnnotationView.swift

@@ -7,38 +7,38 @@

import UIKit

class CustomPointAnnotationView: MAAnnotationView {

    var label:UILabel!

    override init!(annotation: MAAnnotation!, reuseIdentifier: String!) {
        super.init(annotation: annotation, reuseIdentifier: reuseIdentifier)
        setUI()
    }

    override init(frame: CGRect) {
        super.init(frame: frame)

    }


    private func setUI(){
        label = UILabel(text: "")
        label.textColor = .white
        label.font = UIFont.systemFont(ofSize: 11, weight: .medium)
        addSubview(label)
        label.snp.makeConstraints { make in
            make.center.equalToSuperview().inset(UIEdgeInsets(top: -3, left: 0, bottom: 0, right: 0))
        }
    }

    override func setSelected(_ selected: Bool, animated: Bool) {
        super.setSelected(selected, animated: animated)

		
    }

    required init?(coder: NSCoder) {
        fatalError("init(coder:) has not been implemented")
    }
}
//class CustomPointAnnotationView: MAAnnotationView {
//
//    var label:UILabel!
//
//    override init!(annotation: MAAnnotation!, reuseIdentifier: String!) {
//        super.init(annotation: annotation, reuseIdentifier: reuseIdentifier)
//        setUI()
//    }
//
//    override init(frame: CGRect) {
//        super.init(frame: frame)
//
//    }
//
//
//    private func setUI(){
//        label = UILabel(text: "")
//        label.textColor = .white
//        label.font = UIFont.systemFont(ofSize: 11, weight: .medium)
//        addSubview(label)
//        label.snp.makeConstraints { make in
//            make.center.equalToSuperview().inset(UIEdgeInsets(top: -3, left: 0, bottom: 0, right: 0))
//        }
//    }
//
//    override func setSelected(_ selected: Bool, animated: Bool) {
//        super.setSelected(selected, animated: animated)
//
//		
//    }
//
//    required init?(coder: NSCoder) {
//        fatalError("init(coder:) has not been implemented")
//    }
//}

 WanPai/Root/Welfare/VC/WorldCupIntroVC.swift

@@ -43,7 +43,7 @@
                                btn.backgroundColor = Def_ThemeColor
                                btn.addTarget(self, action: #selector(jumpAction), for: .touchUpInside)
                                btn.setTitleColor(.white, for: .normal)
                                btn.cornerRadius = 20
                                btn.jq_cornerRadius = 20
                                view.addSubview(btn)
                                btn.snp.makeConstraints { make in
                                                make.left.equalTo(64)

 WanPai/Root/Yard/VC/YardDetailVC.swift

@@ -563,7 +563,7 @@
                                                cell.label_content.text = siteDetailModel.nextName[indexPath.row]
                                                cell.label_content.backgroundColor = yardIndex == indexPath.row ? Def_ThemeColor : .white
                                                cell.label_content.textColor = yardIndex == indexPath.row ? .white : UIColor(hexStr: "#898989")
                                                cell.label_content.borderWidth = yardIndex == indexPath.row ? 0:1
                                                cell.label_content.jq_borderWidth = yardIndex == indexPath.row ? 0:1
                                                return cell
                                }

@@ -573,7 +573,7 @@
                                                cell.label_content.text = siteDetailModel.halfName[indexPath.row]
                                                cell.label_content.backgroundColor = halfIndex == indexPath.row ? Def_ThemeColor : .white
                                                cell.label_content.textColor = halfIndex == indexPath.row ? .white : UIColor(hexStr: "#898989")
                                                cell.label_content.borderWidth = halfIndex == indexPath.row ? 0:1
                                                cell.label_content.jq_borderWidth = halfIndex == indexPath.row ? 0:1
                                                return cell
                                }
                                return UICollectionViewCell()