Kaynağa Gözat

cocopods更新

南鑫林 5 yıl önce
ebeveyn
işleme
82ffb1d1ee

+ 29 - 27
RainbowPlanet/Podfile.lock

@@ -15,16 +15,16 @@ PODS:
   - AFNetworking/UIKit (3.2.1):
     - AFNetworking/NSURLSession
   - Alamofire (4.9.0)
-  - AlivcConan (0.9.5.1):
-    - AlivcConan/AlivcConan (= 0.9.5.1)
-  - AlivcConan/AlivcConan (0.9.5.1)
+  - AlivcConan (1.0.0):
+    - AlivcConan/AlivcConan (= 1.0.0)
+  - AlivcConan/AlivcConan (1.0.0)
   - AliyunOSSiOS (2.10.7)
-  - AliyunVideoSDKPro (3.11.0)
-  - BaiduMapKit (4.4.2)
+  - AliyunVideoSDKPro (3.12.0)
+  - BaiduMapKit (5.0.0)
   - BMKLocationKit (1.5.0)
   - Bugly (2.5.0)
   - Cache (5.2.0)
-  - DeviceKit (2.1.0)
+  - DeviceKit (2.2.0)
   - DPScrollNumberLabel (0.0.2)
   - ESTabBarController-swift (2.7)
   - FBRetainCycleDetector (0.1.4)
@@ -32,18 +32,20 @@ PODS:
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
   - FSPagerView (0.8.3)
-  - FWPopupView (4.0.7):
+  - FWPopupView (4.0.8):
     - SnapKit
   - InputBarAccessoryView (4.3.1):
     - InputBarAccessoryView/Core (= 4.3.1)
   - InputBarAccessoryView/Core (4.3.1)
-  - IQKeyboardManagerSwift (6.4.2)
+  - IQKeyboardManagerSwift (6.5.0)
   - JSONModel (1.7.0)
-  - JXSegmentedView (0.0.19)
+  - JXSegmentedView (0.0.20)
   - KeychainAccess (3.2.0)
-  - Kingfisher (5.7.1)
-  - lottie-ios (3.1.2)
-  - LYEmptyView (1.3.0)
+  - Kingfisher (5.8.1):
+    - Kingfisher/Core (= 5.8.1)
+  - Kingfisher/Core (5.8.1)
+  - lottie-ios (3.1.3)
+  - LYEmptyView (1.3.1)
   - Masonry (1.1.0)
   - MBProgressHUD (1.1.0)
   - MJRefresh (3.2.0)
@@ -59,13 +61,13 @@ PODS:
   - PPBadgeViewSwift (3.1.0)
   - QuCore-ThirdParty (3.10.0)
   - Result (4.1.0)
-  - RongCloudIM/IMKit (2.9.23):
+  - RongCloudIM/IMKit (2.9.25):
     - RongCloudIM/IMLib
-  - RongCloudIM/IMLib (2.9.23)
+  - RongCloudIM/IMLib (2.9.25)
   - RxCocoa (4.5.0):
     - RxSwift (>= 4.4.2, ~> 4.4)
   - RxSwift (4.5.0)
-  - SnapKit (4.2.0)
+  - SnapKit (5.0.1)
   - SwiftyJSON (5.0.0)
   - SwiftyMediator/Core (0.2.0)
   - SwiftyMediator/Routable (0.2.0):
@@ -205,28 +207,28 @@ SPEC REPOS:
 SPEC CHECKSUMS:
   AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
   Alamofire: afc3e7c6db61476cb45cdd23fed06bad03bbc321
-  AlivcConan: 7462cb9a4101b281dfa2434d251149c234424801
+  AlivcConan: 3e339a2bc6ce11e47c20ff4f2bd9c0a0dd90ebc8
   AliyunOSSiOS: 602b6a4e70e62a5f0a6431c20496343141d7e66f
-  AliyunVideoSDKPro: da710c1e7fb93b1e9a741b3619814c6608780b4b
-  BaiduMapKit: 11acde2e7c06e31b7de60b323880a5eb7c4dccb6
+  AliyunVideoSDKPro: 3f19f021ab48fbc41ac667a08322a506950281de
+  BaiduMapKit: 3a875b001293a9ee6692febd549d8bf82108dbac
   BMKLocationKit: 40d267478acd8704ddebd0e9deaddc727b13df9f
   Bugly: 3ca9f255c01025582df26f9222893b383c7e4b4e
   Cache: 807c5d86d01a177f06ede9865add3aea269bbfd4
-  DeviceKit: 2f6c28410d5a5fe2977be7f8cb9b313d28bdae69
+  DeviceKit: ee5d2ec3bc8ad3847f9f0f202de0be09448707e1
   DPScrollNumberLabel: 5124eaccf3029bb84116de391e1273cba676f4f5
   ESTabBarController-swift: 4fb52ad03d94d0717ef97bc9eb09a5abfdded0a2
   FBRetainCycleDetector: 46f8179bbb1c587deee3ea838a1a3ee02acf5015
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   FSPagerView: 670405b2f18e2a87fa37f20b00de783e562c25a8
-  FWPopupView: c1dbb33fbe4d223f619f28a7e5e5a00f08c10342
+  FWPopupView: 8357f7ab0185e1dcaaf888fbc8ee81ab8dccab72
   InputBarAccessoryView: 58a348be7ea2736c7eec60e5c315511c2dbb39fd
-  IQKeyboardManagerSwift: 79a3ec200dfb41cb66a89b8575417b5378107c5d
+  IQKeyboardManagerSwift: 6cd19976c6e871907c4ed9127c2d3affdd4defc2
   JSONModel: 840bc0fcffb24b8454d2c026bf26fea454b8e98d
-  JXSegmentedView: 6e22381bd1e6f0767fc078bef1947b13b2d337a1
+  JXSegmentedView: d31931eeb8ad8bf1e8faa1623126a32206bfcfd2
   KeychainAccess: 3b1bf8a77eb4c6ea1ce9404c292e48f948954c6b
-  Kingfisher: 176d377ad339113c99ad4980cbae687f807e20fe
-  lottie-ios: 49cd85b1f24f61a7708ad7ec76a523ab2d0e3100
-  LYEmptyView: bd85bfb78e943b30df3d34bcc2534f21b999938e
+  Kingfisher: de969e451c81ca6c07a454bc36fea84b8b08c3c7
+  lottie-ios: 496ac5cea1bbf1a7bd1f1f472f3232eb1b8d744b
+  LYEmptyView: b6d418cfa38b78df0cf243f9a9c25ccbdc399922
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
   MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437
@@ -236,10 +238,10 @@ SPEC CHECKSUMS:
   PPBadgeViewSwift: 18a219a9897f418342c22dd1a54f7b18ac56546b
   QuCore-ThirdParty: 60a6f08864631569569fa1e2c6208a7746698923
   Result: bd966fac789cc6c1563440b348ab2598cc24d5c7
-  RongCloudIM: eed56702cf74aa721fe7b5e33354b4f8ed888ede
+  RongCloudIM: cd6836aa86fbf6c02f7b6b5c895ea4caa894d67f
   RxCocoa: cbf70265dc65a981d4ac982e513c10cf23df24a0
   RxSwift: f172070dfd1a93d70a9ab97a5a01166206e1c575
-  SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a
+  SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
   SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
   SwiftyMediator: 73d97b2387f03c4f0320c1fbdf615e5fbb98871d
   UMCAnalytics: 045be2cd1ec05aa95ad62405a850757f932e2d59

+ 108 - 0
RainbowPlanet/RainbowPlanet/Tools/StartupPageView/StartupPageView 2.swift

@@ -0,0 +1,108 @@
+//
+//  StartupPageView.swift
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/9/24.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+import SwiftyMediator
+
+class StartupPageView: UIView {
+    
+    
+    /// 启动页的模型
+    var startupModel : StartupModel?
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        if isNetworkConnect {
+            //获取启动视图
+            let vc = UIStoryboard(name: "LaunchScreen", bundle: nil)
+                .instantiateViewController(withIdentifier: "launch")
+            self.addSubview(vc.view)
+            UIApplication.shared.windows.last?.addSubview(self)
+            configStartupApi()
+
+        }
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    lazy var imageView: UIImageView = {
+        let imageView = UIImageView(frame: CGRect(x: 0, y: 0, width: kScreenWidth, height: kScreenHeight-40-83-43.5))
+        imageView.contentMode = .scaleAspectFill
+        imageView.clipsToBounds = true
+        imageView.backgroundColor = UIColor.clear
+        imageView.isUserInteractionEnabled = true
+        imageView.addTapGesture(1, target: self, action: #selector(imageViewAction))
+        addSubview(imageView)
+        return imageView
+    }()
+    
+    
+    lazy var drawCircleProgressButton: DrawCircleProgressButton = {
+        let drawCircleProgressButton = DrawCircleProgressButton(frame: CGRect(x: kScreenWidth-20-38, y: kSafeStatusBarHeight, width: 38, height: 38))
+        drawCircleProgressButton.setTitle("跳过", for: UIControl.State.normal)
+        drawCircleProgressButton.setTitleColor(UIColor.white, for: UIControl.State.normal)
+        drawCircleProgressButton.titleLabel?.font = kRegularFont12
+        drawCircleProgressButton.trackColor = kThemeColor
+        drawCircleProgressButton.progressColor = UIColor.white
+        drawCircleProgressButton.fillColor = UIColor(hexString: "000000", alpha: 0.3)
+        drawCircleProgressButton.lineWidth = 1.5
+        drawCircleProgressButton.addTarget(self, action: #selector(skipAction), for: UIControl.Event.touchUpInside)
+        addSubview(drawCircleProgressButton)
+        return drawCircleProgressButton
+    }()
+    
+    // 获取数据
+    func configStartupApi() {
+        SwiftMoyaNetWorkServiceConfig.shared().configStartupApi(completion: {
+            [weak self] (startupModel) -> (Void) in
+            self?.startupModel = startupModel as? StartupModel
+            self?.imageView.kf.setImage(with: kURLImage(name: self?.startupModel?.img ?? ""), placeholder: kImage(name: "default_image"),completionHandler:{
+                [weak self] (image, error, cacheType, imageURL) in
+                self?.drawCircleProgressButton.startAnimationDuration(3, with: {
+                    [weak self] in
+                    self?.skipAction()
+                })
+            })
+
+        }) { [weak self] (loadingStatus) in
+            self?.removeAnimateView()
+        }
+    }
+    
+    //跳转H5
+    @objc func imageViewAction() {
+        if startupModel?.url != "" {
+            removeAnimateView()
+            Mediator.push(H5RouterModuleType.pushWeb(URLString: startupModel?.url ?? "http://www.uptoyo.com"), animated: true)
+        }
+    }
+    
+    //跳过
+    @objc func skipAction() {
+        removeAnimateView()
+    }
+    
+    // 移除动画
+    func removeAnimateView() {
+        //播放动画效果,完毕后将其移除
+        UIView.animate(withDuration: 1, delay: 0, options: .beginFromCurrentState, animations: {
+            [weak self] in
+            self?.alpha = 0.0
+            let transform = CATransform3DScale(CATransform3DIdentity, 1.5, 1.5, 1.0)
+            self?.layer.transform = transform
+        }) { [weak self] (finished) in
+            self?.removeFromSuperview()
+        }
+    }
+    
+    class func startupPageView() {
+        _ = StartupPageView.init(frame: UIScreen.main.bounds)
+    }
+}