Merge branch 'feature/dev_Chris' into develop

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -434,8 +434,6 @@
 		BD108C9722A60C2100837DAB /* HGImagePickerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD108C9222A60C2100837DAB /* HGImagePickerController.swift */; };
 		BD108C9A22A60C3300837DAB /* HGImage.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BD108C9822A60C3200837DAB /* HGImage.xcassets */; };
 		BD108C9B22A60C3300837DAB /* HGImage.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BD108C9922A60C3300837DAB /* HGImage.storyboard */; };
-		BD10CCF822BE6DF00040796E /* PublishCutVideoController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD10CCF722BE6DF00040796E /* PublishCutVideoController.swift */; };
-		BD10CCFB22BE75080040796E /* PublishChooseVideoCover.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD10CCFA22BE75080040796E /* PublishChooseVideoCover.swift */; };
 		BD10CD0822BFC1C20040796E /* PublishMusicItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD10CD0722BFC1C20040796E /* PublishMusicItemCell.swift */; };
 		BD10CD0A22BFC5E40040796E /* PublishMusicHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD10CD0922BFC5E40040796E /* PublishMusicHeader.swift */; };
 		BD10CD0C22BFCC7C0040796E /* PublishMusicView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD10CD0B22BFCC7C0040796E /* PublishMusicView.swift */; };
@@ -583,7 +581,6 @@
 		BD7AB8432284390B0030646A /* OrderPaySelfPickInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB8422284390B0030646A /* OrderPaySelfPickInfoCell.swift */; };
 		BD7AB8452284398A0030646A /* OrderPaySelfPickAddInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB8442284398A0030646A /* OrderPaySelfPickAddInfoCell.swift */; };
 		BD929CCE22B904A30098C139 /* PublishViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD929CCD22B904A30098C139 /* PublishViewController.swift */; };
-		BDA5F8F322BCE9AB00C174B6 /* PublishEditVideoController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA5F8F222BCE9AB00C174B6 /* PublishEditVideoController.swift */; };
 		BDAA40F7228E947500CF841D /* OrderApplyRefundAccountCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDAA40F6228E947500CF841D /* OrderApplyRefundAccountCell.swift */; };
 		BDAA40F9228E9ADA00CF841D /* OrderApplyRefundReasonCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDAA40F8228E9ADA00CF841D /* OrderApplyRefundReasonCell.swift */; };
 		BDAA40FB228E9CC300CF841D /* OrderApplyRefundNoteInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDAA40FA228E9CC300CF841D /* OrderApplyRefundNoteInfoCell.swift */; };
@@ -1117,8 +1114,6 @@
 		BD108C9222A60C2100837DAB /* HGImagePickerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HGImagePickerController.swift; sourceTree = "<group>"; };
 		BD108C9822A60C3200837DAB /* HGImage.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = HGImage.xcassets; sourceTree = "<group>"; };
 		BD108C9922A60C3300837DAB /* HGImage.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = HGImage.storyboard; sourceTree = "<group>"; };
-		BD10CCF722BE6DF00040796E /* PublishCutVideoController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishCutVideoController.swift; sourceTree = "<group>"; };
-		BD10CCFA22BE75080040796E /* PublishChooseVideoCover.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishChooseVideoCover.swift; sourceTree = "<group>"; };
 		BD10CD0722BFC1C20040796E /* PublishMusicItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishMusicItemCell.swift; sourceTree = "<group>"; };
 		BD10CD0922BFC5E40040796E /* PublishMusicHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishMusicHeader.swift; sourceTree = "<group>"; };
 		BD10CD0B22BFCC7C0040796E /* PublishMusicView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishMusicView.swift; sourceTree = "<group>"; };
@@ -1337,7 +1332,6 @@
 		BD7AB8442284398A0030646A /* OrderPaySelfPickAddInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderPaySelfPickAddInfoCell.swift; sourceTree = "<group>"; };
 		BD9052C044FD3AE4E62D3929 /* Pods-RainbowPlanet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RainbowPlanet.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RainbowPlanet/Pods-RainbowPlanet.debug.xcconfig"; sourceTree = "<group>"; };
 		BD929CCD22B904A30098C139 /* PublishViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishViewController.swift; sourceTree = "<group>"; };
-		BDA5F8F222BCE9AB00C174B6 /* PublishEditVideoController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishEditVideoController.swift; sourceTree = "<group>"; };
 		BDAA40F6228E947500CF841D /* OrderApplyRefundAccountCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderApplyRefundAccountCell.swift; sourceTree = "<group>"; };
 		BDAA40F8228E9ADA00CF841D /* OrderApplyRefundReasonCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderApplyRefundReasonCell.swift; sourceTree = "<group>"; };
 		BDAA40FA228E9CC300CF841D /* OrderApplyRefundNoteInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderApplyRefundNoteInfoCell.swift; sourceTree = "<group>"; };
@@ -4302,22 +4296,6 @@
 			path = HGImagePicker;
 			sourceTree = "<group>";
 		};
-		BD10CCF622BE6D6A0040796E /* PublishCutVideo */ = {
-			isa = PBXGroup;
-			children = (
-				BD10CCF722BE6DF00040796E /* PublishCutVideoController.swift */,
-			);
-			path = PublishCutVideo;
-			sourceTree = "<group>";
-		};
-		BD10CCF922BE74E20040796E /* PublishChooseVideoCover */ = {
-			isa = PBXGroup;
-			children = (
-				BD10CCFA22BE75080040796E /* PublishChooseVideoCover.swift */,
-			);
-			path = PublishChooseVideoCover;
-			sourceTree = "<group>";
-		};
 		BD12203222AF803A0051C7C2 /* MessagePlanetActivity */ = {
 			isa = PBXGroup;
 			children = (
@@ -4385,9 +4363,6 @@
 				BD12B67222B4E99800AEB10B /* PublishMediaPicker */,
 				BD01B1FC22BC677900CE9F36 /* PublishTakeVideo */,
 				BD01B1F722BC673900CE9F36 /* PublishTakePhoto */,
-				BD10CCF622BE6D6A0040796E /* PublishCutVideo */,
-				BD10CCF922BE74E20040796E /* PublishChooseVideoCover */,
-				BDA5F8F122BCE96E00C174B6 /* PublishEditVideo */,
 				BD13B69F22B9CE8D008BB323 /* PublishEditController */,
 				BD13B6CF22BA03BB008BB323 /* PublishAddTopic */,
 				BD13B6CB22BA03BB008BB323 /* PublishAddAddress */,
@@ -5086,14 +5061,6 @@
 			path = AdressCell;
 			sourceTree = "<group>";
 		};
-		BDA5F8F122BCE96E00C174B6 /* PublishEditVideo */ = {
-			isa = PBXGroup;
-			children = (
-				BDA5F8F222BCE9AB00C174B6 /* PublishEditVideoController.swift */,
-			);
-			path = PublishEditVideo;
-			sourceTree = "<group>";
-		};
 		BDAF83AE22B3B6150004BCC3 /* AllCommentCell */ = {
 			isa = PBXGroup;
 			children = (
@@ -5747,7 +5714,6 @@
 				BD7AB83F228438290030646A /* OrderPayExpressAddInfoCell.swift in Sources */,
 				A7DF50DF22A5590200998908 /* BrowsePicturesViewController.swift in Sources */,
 				BD61229E22C3629800D3F513 /* AlivcAppServer.m in Sources */,
-				BD10CCF822BE6DF00040796E /* PublishCutVideoController.swift in Sources */,
 				A77F2CB92232010F001BD3F6 /* ShoppingCartViewController.swift in Sources */,
 				BD13B6C122BA034D008BB323 /* PublishEditAddPicCell.swift in Sources */,
 				A72A72B822321DE000B21995 /* Extension+UserDefaults.swift in Sources */,
@@ -5938,7 +5904,6 @@
 				A7BB685922696B9200AB07A2 /* SelfRecommendationCollectionViewCell.swift in Sources */,
 				BD61231522C3749800D3F513 /* AliyunPathManager.m in Sources */,
 				BD12B69A22B4FA8400AEB10B /* KSMediaPickerSelectIndicator.swift in Sources */,
-				BDA5F8F322BCE9AB00C174B6 /* PublishEditVideoController.swift in Sources */,
 				A7636AC822682BAF00374F9E /* LocationView.swift in Sources */,
 				BD61227C22C35C7F00D3F513 /* AliyunMediaConfig.m in Sources */,
 				A738D205225AF90D00EEE860 /* WeChatpayOrderModel.swift in Sources */,
@@ -6104,7 +6069,6 @@
 				A757849F22C1CEA900D4DB61 /* FollowStatusModel.swift in Sources */,
 				A7CC751F227190C5003C4F38 /* AccountSecurityViewController.swift in Sources */,
 				BD13B6C422BA034D008BB323 /* PublishEditDefaultCollectionCell.swift in Sources */,
-				BD10CCFB22BE75080040796E /* PublishChooseVideoCover.swift in Sources */,
 				BD29A92E228F99780018CFC3 /* OrderCommentParameterModel.swift in Sources */,
 				BD61230522C36C6900D3F513 /* AlivcPushBeautyDataManager.m in Sources */,
 				A7284440224DFACD00F82F30 /* InfoModel.swift in Sources */,

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishChooseVideoCover/PublishChooseVideoCover.swift

@@ -1,47 +0,0 @@
-//
-//  PublishChooseVideoCover.swift
-//  RainbowPlanet
-//
-//  Created by Christopher on 2019/6/22.
-//  Copyright © 2019 RainbowPlanet. All rights reserved.
-//  视频封面选择
-
-import UIKit
-
-class PublishChooseVideoCover: BaseViewController {
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        setupViews()
-        setupLayouts()
-        
-    }
-    
-    override func setupViews() {
-        navigationBar.title = "视频编辑"
-        view.backgroundColor = kf7f8faColor
-        
-        view.addSubview(topView)
-        
-    }
-    
-    override func setupLayouts() {
-        topView.snp.makeConstraints { (make) in
-            make.top.equalToSuperview().offset(kNavBarTotalHeight + 1)
-            make.left.right.equalToSuperview().offset(0)
-            make.height.equalTo(104)
-        }
-        
-    }
-    
-    override func setupData() {
-        
-    }
-    
-    
-    private lazy var topView: UIView = {
-        let topView = UIView()
-        topView.backgroundColor = UIColor.white
-        return topView
-    }()
-}

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishCutVideo/PublishCutVideoController.swift

@@ -1,69 +0,0 @@
-//
-//  PublishCutVideoController.swift
-//  RainbowPlanet
-//
-//  Created by Christopher on 2019/6/22.
-//  Copyright © 2019 RainbowPlanet. All rights reserved.
-//  视频裁剪
-
-import UIKit
-
-class PublishCutVideoController: BaseViewController {
-    
-    var videoItemModel: KSMediaPickerItemModel?
-    
-    var avAsset: AVAsset?
-    var playerItem: AVPlayerItem?
-    var avPlayer: AVPlayer?
-    var avPlayerLayer: AVPlayerLayer?
-    var timeObserver: Any?
-    var currentTime: CMTime?
-    
-//    var progressView: AliyunCycleProgressView?
-    
-    
-    
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        setupViews()
-        setupLayouts()
-        
-        
-//        NSURL *sourceURL = [NSURL fileURLWithPath:_cutInfo.sourcePath];
-//        _avAsset = [AVAsset assetWithURL:sourceURL];
-//        _originalMediaSize = [_avAsset avAssetNaturalSize];
-//        _destRatio = _cutInfo.outputSize.width / _cutInfo.outputSize.height;
-//        _orgVideoRatio = _originalMediaSize.width / _originalMediaSize.height;
-//        [self setAVPlayer];
-//        _thumbnailView.avAsset = _avAsset;
-    }
-    
-    override func setupViews() {
-        navigationBar.title = "视频编辑"
-        view.backgroundColor = kf7f8faColor
-        
-        view.addSubview(topView)
-        
-    }
-    
-    override func setupLayouts() {
-        topView.snp.makeConstraints { (make) in
-            make.top.equalToSuperview().offset(kNavBarTotalHeight + 1)
-            make.left.right.equalToSuperview().offset(0)
-            make.height.equalTo(104)
-        }
-        
-    }
-    
-    override func setupData() {
-        
-    }
-    
-    
-    private lazy var topView: UIView = {
-        let topView = UIView()
-        topView.backgroundColor = UIColor.white
-        return topView
-    }()
-}

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEditController/Controller/PublishEditController.swift

@@ -13,6 +13,13 @@ import Photos
 
 class PublishEditController: BaseViewController {
     
+    var imgCount: Int = 0
+    var imageArr: Array<UIImage>? {
+        didSet {
+            imgCount = self.imageArr?.count ?? 0
+        }
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEditVideo/PublishEditVideoController.swift

@@ -1,75 +0,0 @@
-//
-//  PublishEditVideoController.swift
-//  RainbowPlanet
-//
-//  Created by Christopher on 2019/6/21.
-//  Copyright © 2019 RainbowPlanet. All rights reserved.
-//  视频编辑
-
-import UIKit
-import AliyunVideoSDKPro
-
-class PublishEditVideoController: BaseViewController {
-    
-    
-    let editor: AliyunEditor? = nil
-    
-    let player: AliyunIPlayer? = nil
-    
-    
-    
-    // 视频的本地路径 - 录制进入编辑传这个值
-    let videoPath: String? = ""
-    
-    // 录制的时候是否带音乐
-    var hasRecordMusic: Bool = false
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        setupViews()
-        setupLayouts()
-        
-//        editor = AliyunEditor(path: <#T##String!#>, preview: movieView)
-        
-//        self.editor = [[AliyunEditor alloc] initWithPath:_taskPath
-//            preview:self.movieView];
-//        self.editor.delegate = (id)self;
-//        // player
-//        self.player = [self.editor getPlayer];
-    }
-    
-    override func setupViews() {
-        navigationBar.title = "视频编辑"
-        view.backgroundColor = kf7f8faColor
-        
-        view.addSubview(movieView)
-        
-    }
-    
-    override func setupLayouts() {
-        movieView.snp.makeConstraints { (make) in
-            make.edges.equalToSuperview()
-        }
-        
-    }
-    
-    override func setupData() {
-        
-    }
-    
-    // 播放视图
-    private lazy var movieView: UIView = {
-        let movieView = UIView()
-        movieView.backgroundColor = kffffffColor
-        return movieView
-        
-        
-//        CGFloat factor = _outputSize.height / _outputSize.width;
-//        self.movieView = [[UIView alloc]initWithFrame:CGRectMake(0, 44 + ScreenWidth / 8 + SafeTop, ScreenWidth, ScreenWidth * factor)];
-//        [self p_setMovieViewFrameToPlayStatus];
-//        self.movieView.backgroundColor =
-//            [[UIColor brownColor] colorWithAlphaComponent:.3];
-//        [self.view addSubview:self.movieView];
-    }()
-}
-

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/Controller/KSMediaPickerController.swift

@@ -31,6 +31,9 @@ open class KSMediaPickerController: UIViewController, UICollectionViewDelegate,
     typealias CropClosure = (_ vItemMdl: KSMediaPickerItemModel) -> Void
     var cropClosure: CropClosure?
     
+    typealias PubImgClosure = (_ selectedAssetArray: Array<UIImage>) -> Void
+    var pubImgClosure: PubImgClosure?
+    
     @objc public enum mediaType : Int {
         case all        = 0
         case picture    = 1
@@ -172,7 +175,17 @@ open class KSMediaPickerController: UIViewController, UICollectionViewDelegate,
             }
             
         } else {
-            print("----图片选择完成，传递_selectedAssetArray")
+            var imageArray: Array<UIImage> = []
+            for selItem in _selectedAssetArray {
+                let itemModel = selItem as! KSMediaPickerItemModel
+                let image: UIImage = itemModel.thumb ?? UIImage()
+                imageArray.append(image)
+            }
+            
+            if let pubImgClosure = self.pubImgClosure {
+                (view as! KSMediaPickerView).previewView.videoPause()
+                pubImgClosure(imageArray)
+            }
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishViewController.swift

@@ -198,6 +198,12 @@ extension PublishViewController :JXSegmentedListContainerViewDataSource {
                 [weak self] (vItemModel) in
                 self?.getAvUrlAssetAndCrop(vItemModel)
             }
+            mediaVc.pubImgClosure = {
+                [weak self] (imageArray) in
+                let pubVc = PublishEditController()
+                pubVc.imageArr = imageArray
+                self?.navigationController?.pushViewController(pubVc, animated: true)
+            }
             return mediaVc
         case 1:
             let videoVc = AliyunMagicCameraViewController()