删除了无用的View

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -193,6 +193,9 @@
 		A74CF4272372DB2400BA620E /* PublishEditNewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74CF4262372DB2400BA620E /* PublishEditNewViewController.swift */; };
 		A74CF42A237313BA00BA620E /* PublishEditNewVideoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74CF429237313BA00BA620E /* PublishEditNewVideoView.swift */; };
 		A74CF42C237318B200BA620E /* PublishEditNewVideoPreView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74CF42B237318B200BA620E /* PublishEditNewVideoPreView.swift */; };
+		A74CF42E2373A81100BA620E /* PublishEditNewVideoSetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74CF42D2373A81100BA620E /* PublishEditNewVideoSetView.swift */; };
+		A74CF4322373BA9D00BA620E /* PublishEditNewPlayProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74CF4312373BA9D00BA620E /* PublishEditNewPlayProgressView.swift */; };
+		A74CF4342373C0E700BA620E /* PublishNewUISlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74CF4332373C0E700BA620E /* PublishNewUISlider.swift */; };
 		A74D9D572327B54100F05C14 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74D9D562327B54100F05C14 /* NotificationService.swift */; };
 		A74D9D5B2327B54100F05C14 /* NotificationService.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = A74D9D542327B54100F05C14 /* NotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		A74DF74922EAAF17007FB505 /* MJDIYFullScreenHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74DF74822EAAF17007FB505 /* MJDIYFullScreenHeader.swift */; };
@@ -542,9 +545,6 @@
 		A7FF159C228D9E3D00A85748 /* OrderRefundDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7FF159B228D9E3C00A85748 /* OrderRefundDetailModel.swift */; };
 		BD01B1FA22BC673900CE9F36 /* PublishConfirmPhotoController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD01B1F822BC673900CE9F36 /* PublishConfirmPhotoController.swift */; };
 		BD01B1FB22BC673A00CE9F36 /* PublishTakePhotoController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD01B1F922BC673900CE9F36 /* PublishTakePhotoController.swift */; };
-		BD01B20022BC677900CE9F36 /* PublishVideoRecorderController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD01B1FD22BC677900CE9F36 /* PublishVideoRecorderController.swift */; };
-		BD01B20122BC677900CE9F36 /* PublishFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD01B1FE22BC677900CE9F36 /* PublishFilterView.swift */; };
-		BD01B20222BC677900CE9F36 /* PublishVideoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD01B1FF22BC677900CE9F36 /* PublishVideoView.swift */; };
 		BD0808EC22C5BA3100D12E6A /* AliyunCompositionInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = BD0808EA22C5BA3000D12E6A /* AliyunCompositionInfo.m */; };
 		BD0F61F822CAFC8B004650FB /* CommunityVideoAuthModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD0F61F722CAFC8B004650FB /* CommunityVideoAuthModel.swift */; };
 		BD0FAA3722C465B900DDFB37 /* AliyunEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BD0FAA3522C465B900DDFB37 /* AliyunEditViewController.m */; };
@@ -564,7 +564,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 */; };
-		BD10CD0C22BFCC7C0040796E /* PublishMusicView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD10CD0B22BFCC7C0040796E /* PublishMusicView.swift */; };
 		BD10FBFE22C6F7D90096A34E /* AliyunPublishService.m in Sources */ = {isa = PBXBuildFile; fileRef = BD10FBFB22C6F7D80096A34E /* AliyunPublishService.m */; };
 		BD10FC0222C6F9770096A34E /* AlivcShortVideoUploadManager.m in Sources */ = {isa = PBXBuildFile; fileRef = BD10FC0022C6F9770096A34E /* AlivcShortVideoUploadManager.m */; };
 		BD10FC0822C748DA0096A34E /* AlivcAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD10FC0622C748D90096A34E /* AlivcAlertView.m */; };
@@ -636,7 +635,6 @@
 		BD3AA45822AE63EC00EF4F20 /* MessageMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD3AA45722AE63EC00EF4F20 /* MessageMainViewController.swift */; };
 		BD477F6322C23D66008BE2CB /* AliyunReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = BD477F6222C23D66008BE2CB /* AliyunReachability.m */; };
 		BD4B50AC22BC7DEA0073B516 /* FilterResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BD4B50AB22BC7DEA0073B516 /* FilterResource.bundle */; };
-		BD4B50AE22BC815F0073B516 /* PublishFilterCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD4B50AD22BC815F0073B516 /* PublishFilterCollectionCell.swift */; };
 		BD50F47022E157F50077D4BF /* PublishRecordMusicView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD50F46F22E157F50077D4BF /* PublishRecordMusicView.swift */; };
 		BD5CA89222DD73A500364A67 /* PublishMusicVolumnView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD5CA89122DD73A500364A67 /* PublishMusicVolumnView.swift */; };
 		BD5CA89522DDA2A100364A67 /* CustomSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD5CA89422DDA2A100364A67 /* CustomSlider.swift */; };
@@ -939,6 +937,9 @@
 		A74CF4262372DB2400BA620E /* PublishEditNewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishEditNewViewController.swift; sourceTree = "<group>"; };
 		A74CF429237313BA00BA620E /* PublishEditNewVideoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishEditNewVideoView.swift; sourceTree = "<group>"; };
 		A74CF42B237318B200BA620E /* PublishEditNewVideoPreView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishEditNewVideoPreView.swift; sourceTree = "<group>"; };
+		A74CF42D2373A81100BA620E /* PublishEditNewVideoSetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishEditNewVideoSetView.swift; sourceTree = "<group>"; };
+		A74CF4312373BA9D00BA620E /* PublishEditNewPlayProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishEditNewPlayProgressView.swift; sourceTree = "<group>"; };
+		A74CF4332373C0E700BA620E /* PublishNewUISlider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishNewUISlider.swift; sourceTree = "<group>"; };
 		A74D9D542327B54100F05C14 /* NotificationService.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NotificationService.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		A74D9D562327B54100F05C14 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
 		A74D9D582327B54100F05C14 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -1311,9 +1312,6 @@
 		A7FF159B228D9E3C00A85748 /* OrderRefundDetailModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderRefundDetailModel.swift; sourceTree = "<group>"; };
 		BD01B1F822BC673900CE9F36 /* PublishConfirmPhotoController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishConfirmPhotoController.swift; sourceTree = "<group>"; };
 		BD01B1F922BC673900CE9F36 /* PublishTakePhotoController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishTakePhotoController.swift; sourceTree = "<group>"; };
-		BD01B1FD22BC677900CE9F36 /* PublishVideoRecorderController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishVideoRecorderController.swift; sourceTree = "<group>"; };
-		BD01B1FE22BC677900CE9F36 /* PublishFilterView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishFilterView.swift; sourceTree = "<group>"; };
-		BD01B1FF22BC677900CE9F36 /* PublishVideoView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublishVideoView.swift; sourceTree = "<group>"; };
 		BD0808EA22C5BA3000D12E6A /* AliyunCompositionInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AliyunCompositionInfo.m; sourceTree = "<group>"; };
 		BD0808EB22C5BA3000D12E6A /* AliyunCompositionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliyunCompositionInfo.h; sourceTree = "<group>"; };
 		BD0F61F722CAFC8B004650FB /* CommunityVideoAuthModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityVideoAuthModel.swift; sourceTree = "<group>"; };
@@ -1343,7 +1341,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>"; };
-		BD10CD0B22BFCC7C0040796E /* PublishMusicView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishMusicView.swift; sourceTree = "<group>"; };
 		BD10FBFB22C6F7D80096A34E /* AliyunPublishService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AliyunPublishService.m; sourceTree = "<group>"; };
 		BD10FBFC22C6F7D80096A34E /* AliyunPublishService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliyunPublishService.h; sourceTree = "<group>"; };
 		BD10FC0022C6F9770096A34E /* AlivcShortVideoUploadManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AlivcShortVideoUploadManager.m; sourceTree = "<group>"; };
@@ -1423,7 +1420,6 @@
 		BD477F6122C23D65008BE2CB /* AliyunReachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliyunReachability.h; sourceTree = "<group>"; };
 		BD477F6222C23D66008BE2CB /* AliyunReachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AliyunReachability.m; sourceTree = "<group>"; };
 		BD4B50AB22BC7DEA0073B516 /* FilterResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = FilterResource.bundle; sourceTree = "<group>"; };
-		BD4B50AD22BC815F0073B516 /* PublishFilterCollectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishFilterCollectionCell.swift; sourceTree = "<group>"; };
 		BD50F46F22E157F50077D4BF /* PublishRecordMusicView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishRecordMusicView.swift; sourceTree = "<group>"; };
 		BD5CA89122DD73A500364A67 /* PublishMusicVolumnView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishMusicVolumnView.swift; sourceTree = "<group>"; };
 		BD5CA89422DDA2A100364A67 /* CustomSlider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomSlider.swift; sourceTree = "<group>"; };
@@ -2002,14 +1998,6 @@
 			path = FMLabel;
 			sourceTree = "<group>";
 		};
-		A7271DA722EFF5D400740C1A /* Unused */ = {
-			isa = PBXGroup;
-			children = (
-				BD01B1FC22BC677900CE9F36 /* PublishTakeVideo */,
-			);
-			path = Unused;
-			sourceTree = "<group>";
-		};
 		A7274C4E228EE5EF000E3A07 /* PhotoAndCameraManager */ = {
 			isa = PBXGroup;
 			children = (
@@ -2677,12 +2665,31 @@
 			sourceTree = "<group>";
 		};
 		A74CF4282373136100BA620E /* View */ = {
+			isa = PBXGroup;
+			children = (
+				A74CF4302373BA7200BA620E /* PublishEditNewPlayProgressView */,
+				A74CF42F2373B9E300BA620E /* PublishEditNew */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		A74CF42F2373B9E300BA620E /* PublishEditNew */ = {
 			isa = PBXGroup;
 			children = (
 				A74CF429237313BA00BA620E /* PublishEditNewVideoView.swift */,
 				A74CF42B237318B200BA620E /* PublishEditNewVideoPreView.swift */,
+				A74CF42D2373A81100BA620E /* PublishEditNewVideoSetView.swift */,
 			);
-			path = View;
+			path = PublishEditNew;
+			sourceTree = "<group>";
+		};
+		A74CF4302373BA7200BA620E /* PublishEditNewPlayProgressView */ = {
+			isa = PBXGroup;
+			children = (
+				A74CF4312373BA9D00BA620E /* PublishEditNewPlayProgressView.swift */,
+				A74CF4332373C0E700BA620E /* PublishNewUISlider.swift */,
+			);
+			path = PublishEditNewPlayProgressView;
 			sourceTree = "<group>";
 		};
 		A74D9D552327B54100F05C14 /* NotificationService */ = {
@@ -5033,18 +5040,6 @@
 			path = PublishTakePhoto;
 			sourceTree = "<group>";
 		};
-		BD01B1FC22BC677900CE9F36 /* PublishTakeVideo */ = {
-			isa = PBXGroup;
-			children = (
-				BD01B1FD22BC677900CE9F36 /* PublishVideoRecorderController.swift */,
-				BD01B1FF22BC677900CE9F36 /* PublishVideoView.swift */,
-				BD01B1FE22BC677900CE9F36 /* PublishFilterView.swift */,
-				BD4B50AD22BC815F0073B516 /* PublishFilterCollectionCell.swift */,
-				BD10CD0B22BFCC7C0040796E /* PublishMusicView.swift */,
-			);
-			path = PublishTakeVideo;
-			sourceTree = "<group>";
-		};
 		BD0FAA3422C465B900DDFB37 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
@@ -5224,7 +5219,6 @@
 				BD13B69F22B9CE8D008BB323 /* PublishEdit */,
 				BD13B6CF22BA03BB008BB323 /* PublishAddTopic */,
 				BD13B6CB22BA03BB008BB323 /* PublishAddAddress */,
-				A7271DA722EFF5D400740C1A /* Unused */,
 			);
 			path = PublishModule;
 			sourceTree = "<group>";
@@ -6222,7 +6216,6 @@
 				BD61226022C3561C00D3F513 /* AliyunRateSelectView.m in Sources */,
 				A7C0FDF022B6538200BC1E86 /* CommunityBannerFSPagerViewCell.swift in Sources */,
 				A7EE5BD4236C16E100309931 /* SwiftMoyaServiceDownLoadApi.swift in Sources */,
-				BD01B20022BC677900CE9F36 /* PublishVideoRecorderController.swift in Sources */,
 				BDE376DB22C22A260055E2EA /* UIView+AlivcHelper.m in Sources */,
 				A71AA5152272160A008FF1A5 /* ExpressAddressListTableViewCell.swift in Sources */,
 				A72A72B722321DE000B21995 /* Extension+NSMutableAttributedString.swift in Sources */,
@@ -6302,7 +6295,6 @@
 				A784F2B823505E3700E49140 /* CardContentPicHTMLTableViewCell.swift in Sources */,
 				BD61225E22C3561C00D3F513 /* AlivcRecordFocusView.m in Sources */,
 				A71AF0B0226EF185001730FE /* SearchCollectionViewCell.swift in Sources */,
-				BD01B20122BC677900CE9F36 /* PublishFilterView.swift in Sources */,
 				BD5CA89522DDA2A100364A67 /* CustomSlider.swift in Sources */,
 				A7811C85231AB2F600C2D8DE /* CommunityReportHeaderView.swift in Sources */,
 				A74CF42A237313BA00BA620E /* PublishEditNewVideoView.swift in Sources */,
@@ -6311,6 +6303,7 @@
 				A77F2CCA223209F2001BD3F6 /* BaseTabbarViewController.swift in Sources */,
 				BD61229A22C3605C00D3F513 /* AliyunEffectFilterCell.m in Sources */,
 				A7BF202B22B396F300396DB3 /* CardContentTitleTableViewCell.swift in Sources */,
+				A74CF4342373C0E700BA620E /* PublishNewUISlider.swift in Sources */,
 				A7D77DE422DDB4B20048D5F6 /* RedemptionAreaBannerTableViewCell.swift in Sources */,
 				A72623EE22C4CFD800AEF875 /* WaterFallLayout.m in Sources */,
 				A7D5F25A22C05D1400F8E9AF /* SwiftMoyaServiceCommunityApi.swift in Sources */,
@@ -6391,7 +6384,6 @@
 				A7F304C12333651400A4850F /* PushNotificationSettingsTableViewCell.swift in Sources */,
 				A70EBBC022561179000AD74F /* Extension+UITableView.swift in Sources */,
 				A72A72B022321DE000B21995 /* CGView.swift in Sources */,
-				BD01B20222BC677900CE9F36 /* PublishVideoView.swift in Sources */,
 				A77FAEF6235844BC002A1D08 /* CircleCommentListCommentTableViewCell.swift in Sources */,
 				A7EE5AF2236C131D00309931 /* PublishNewEffectFilterCollectionViewCell.swift in Sources */,
 				A7C0FDF322B65E5400BC1E86 /* FeaturedTopicsTableViewCell.swift in Sources */,
@@ -6510,6 +6502,7 @@
 				A771F07C226D4E1C007999DB /* AddressPOITableViewCell.swift in Sources */,
 				A72A72AE22321DE000B21995 /* CountdownButton.swift in Sources */,
 				A7C2567322CC8BB000420828 /* CommunityPostDetailFSPagerViewCell.swift in Sources */,
+				A74CF4322373BA9D00BA620E /* PublishEditNewPlayProgressView.swift in Sources */,
 				BD929CCE22B904A30098C139 /* PublishViewController.swift in Sources */,
 				A71738AD228AB7B2000AEA6A /* ProductCommentListModel.swift in Sources */,
 				A7C0FDF822B6671C00BC1E86 /* PopularVideoCollectionViewCell.swift in Sources */,
@@ -6517,7 +6510,6 @@
 				A747D824235C8FA8007F4E33 /* TLBundle.swift in Sources */,
 				A7F304C32333683600A4850F /* PushNotificationSettingsOneSectionHeaderView.swift in Sources */,
 				A7E19FA822BA2CDF009BCCE1 /* SearchProductListViewController.swift in Sources */,
-				BD4B50AE22BC815F0073B516 /* PublishFilterCollectionCell.swift in Sources */,
 				A7D5F23322BB9BE600F8E9AF /* H5CommonViewController.swift in Sources */,
 				A77BB46D2329F01C00DCAE32 /* NXLPermissionReminders.swift in Sources */,
 				BD13B6C522BA034D008BB323 /* PublishEditAddAddressCell.swift in Sources */,
@@ -6532,6 +6524,7 @@
 				BDF7C5D922D70B6E007F3B79 /* CommunityVideoMajorCommentCell.swift in Sources */,
 				A7778CB32244D73400C7C47A /* RegisterLoginViewController.swift in Sources */,
 				A747D80623599294007F4E33 /* CirclePublishMessageViewController.swift in Sources */,
+				A74CF42E2373A81100BA620E /* PublishEditNewVideoSetView.swift in Sources */,
 				A7D5F26522C118F100F8E9AF /* CMSMemberListModel.swift in Sources */,
 				BD1FC18622B09F9800D55081 /* CommunitySubCommentController.swift in Sources */,
 				BD6122AD22C3638300D3F513 /* AliyunEffectMusicInfo.m in Sources */,
@@ -6698,7 +6691,6 @@
 				A770E61622D6625700CBD0A4 /* ShareCollectionViewCell.swift in Sources */,
 				A70E3F41236FF9CD0039D7FC /* PublishUploadProgressView.swift in Sources */,
 				BD01B1FA22BC673900CE9F36 /* PublishConfirmPhotoController.swift in Sources */,
-				BD10CD0C22BFCC7C0040796E /* PublishMusicView.swift in Sources */,
 				A7F2D6DF22B25B5D0093000B /* CardContentPicVideoCollectionViewLayout.swift in Sources */,
 				A7D77DF422DDEED10048D5F6 /* FloorHeaderViewFloorHeaderView.swift in Sources */,
 				A72623E722C469B700AEF875 /* SearchMemberListModel.swift in Sources */,

RainbowPlanet/RainbowPlanet/Modules/PublishModule/Unused/PublishTakeVideo/PublishFilterCollectionCell.swift

@@ -1,81 +0,0 @@
-//
-//  PublishFilterCollectionCell.swift
-//  RainbowPlanet
-//
-//  Created by Christopher on 2019/6/21.
-//  Copyright © 2019 RainbowPlanet. All rights reserved.
-//
-
-import UIKit
-import RxSwift
-
-class PublishFilterCollectionCell: UICollectionViewCell {
-    
-    let disposeBag = DisposeBag()
-    
-    var titleStr: String? {
-        didSet {
-            titleLabel.text = titleStr
-        }
-    }
-    
-    class func cellWith(collectionView:UICollectionView,indexPath:IndexPath) -> PublishFilterCollectionCell {
-        let ID = "PublishFilterCollectionCell.swift"
-        collectionView.register(PublishFilterCollectionCell.self, forCellWithReuseIdentifier: ID)
-        let cell : PublishFilterCollectionCell = collectionView.dequeueReusableCell(withReuseIdentifier: ID, for: indexPath) as! PublishFilterCollectionCell
-        cell.indexPath = indexPath
-        return cell
-    }
-    //MARK: - indexPath
-    var indexPath: IndexPath?{
-        didSet {
-            
-        }
-    }
-    //MARK: - 初始化
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        
-        setupViews()
-        setupLayouts()
-    }
-    
-    required init?(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    //MRAK: - 设置View
-    private func setupViews() {
-        addSubview(typeImageView)
-        addSubview(titleLabel)
-    }
-    
-    private func setupLayouts() {
-        typeImageView.snp.makeConstraints { (make) in
-            make.top.equalToSuperview()
-            make.centerX.equalToSuperview()
-            make.size.equalTo(52)
-        }
-        titleLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(typeImageView.snp.bottom).offset(12)
-            make.left.equalTo(typeImageView.snp.left)
-            make.right.equalTo(typeImageView.snp.right)
-            make.height.equalTo(16)
-        }
-    }
-    
-    private lazy var typeImageView: UIImageView = {
-        let typeImageView = UIImageView()
-        return typeImageView
-    }()
-    
-    private lazy var titleLabel: UILabel = {
-        let titleLabel = UILabel()
-        titleLabel.textColor = kffffffColor
-        titleLabel.font = kRegularFont12
-        titleLabel.textAlignment = .center
-        titleLabel.numberOfLines = 1
-        return titleLabel
-    }()
-    
-}

RainbowPlanet/RainbowPlanet/Modules/PublishModule/Unused/PublishTakeVideo/PublishFilterView.swift

@@ -1,114 +0,0 @@
-//
-//  PublishFilterView.swift
-//  RainbowPlanet
-//
-//  Created by Christopher on 2019/6/20.
-//  Copyright © 2019 RainbowPlanet. All rights reserved.
-//  滤镜のView
-
-import UIKit
-
-class PublishFilterView: BaseView {
-    
-    typealias DimClickClosure = () -> Void
-    var dimClickClosure : DimClickClosure?
-    
-    override func setupViews() {
-        self.backgroundColor = UIColor.clear
-        
-        // 添加毛玻璃效果，需使用frame设置位置
-        let blurEffect = UIBlurEffect(style: .dark)
-        let blurEffectView = UIVisualEffectView(effect: blurEffect)
-        blurEffectView.frame = CGRect(x: CGFloat(0), y: kScreenHeight-173, width: kScreenWidth, height: 173)
-        addSubview(blurEffectView)
-        
-        addSubview(dimBackView)
-        addSubview(collectionView)
-        addSubview(titleLabel)
-    }
-    
-    override func setupLayouts() {
-        dimBackView.snp.makeConstraints { (make) in
-            make.edges.equalToSuperview()
-        }
-        collectionView.snp.makeConstraints { (make) in
-            make.height.equalTo(125)
-            make.bottom.equalTo(-kSafeTabBarHeight)
-            make.left.right.equalToSuperview()
-        }
-        titleLabel.snp.makeConstraints { (make) in
-            make.height.equalTo(48)
-            make.bottom.equalTo(collectionView.snp.top)
-            make.left.right.equalToSuperview()
-        }
-    }
-    
-    private lazy var dimBackView: UIView = {
-        let dimBackView = UIView()
-        dimBackView.backgroundColor = UIColor.clear
-        dimBackView.addTapGesture(1, target: self, action: #selector(dismissAction))
-        return dimBackView
-    }()
-    /// 内容详情页面
-    @objc func dismissAction() {        
-        if let dimClickClosure = self.dimClickClosure {
-            dimClickClosure()
-        }
-    }
-    
-    private lazy var titleLabel: UILabel = {
-        let titleLabel = UILabel()
-        titleLabel.backgroundColor = UIColor.clear
-        titleLabel.text = "滤镜"
-        titleLabel.textColor = kffffffColor
-        titleLabel.font = kRegularFont16
-        titleLabel.textAlignment = .center
-        return titleLabel
-    }()
-    
-    private lazy var collectionView: UICollectionView = {
-        let collectionView = UICollectionView.init(frame: CGRect.zero, collectionViewLayout: collectionViewLayout)
-        collectionView.backgroundColor = UIColor.clear
-        collectionView.delegate = self;
-        collectionView.dataSource = self;
-        collectionView.showsVerticalScrollIndicator = false
-        collectionView.showsHorizontalScrollIndicator = false
-        collectionView.bounces = false
-        return collectionView
-    }()
-    
-    private lazy var collectionViewLayout: UICollectionViewFlowLayout = {
-        let collectionViewLayout = UICollectionViewFlowLayout.init()
-        collectionViewLayout.minimumInteritemSpacing = 15
-        collectionViewLayout.scrollDirection = .horizontal
-        return collectionViewLayout
-    }()
-}
-
-extension PublishFilterView: UICollectionViewDelegateFlowLayout,UICollectionViewDataSource {
-    func numberOfSections(in collectionView: UICollectionView) -> Int {
-        return 1
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return 5
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let cell = PublishFilterCollectionCell.cellWith(collectionView: collectionView, indexPath: indexPath)
-        return cell
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
-        return CGSize(width:52, height: 80)
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets {
-        return UIEdgeInsets(top: 0, left: 14, bottom: 0, right: 14)
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        print("点击了collection----\(indexPath.row)")
-    }
-    
-}

RainbowPlanet/RainbowPlanet/Modules/PublishModule/Unused/PublishTakeVideo/PublishMusicView.swift

@@ -1,66 +0,0 @@
-//
-//  PublishMusicView.swift
-//  RainbowPlanet
-//
-//  Created by Christopher on 2019/6/23.
-//  Copyright © 2019 RainbowPlanet. All rights reserved.
-//  音乐选择のView
-
-import UIKit
-
-class PublishMusicView: BaseView {
-    
-    typealias DismissViewClosure = () -> Void
-    var dismissViewClosure : DismissViewClosure?
-    
-    override func setupViews() {
-        self.backgroundColor = UIColor.clear
-        
-        // 添加毛玻璃效果，需使用frame设置位置
-        let blurEffect = UIBlurEffect(style: .dark)
-        let blurEffectView = UIVisualEffectView(effect: blurEffect)
-        blurEffectView.frame = CGRect(x: CGFloat(0), y: kNavBarTotalHeight, width: kScreenWidth, height: kScreenHeight-kNavBarTotalHeight)
-        addSubview(blurEffectView)
-        
-        addSubview(tableView)
-    }
-    
-    override func setupLayouts() {
-        tableView.snp.makeConstraints { (make) in
-            make.top.equalToSuperview()
-            make.left.right.bottom.equalTo(0)
-        }
-    }
-    
-    lazy var tableView: UITableView = {
-        let tableView = UITableView(frame: CGRect.zero, style: UITableView.Style.plain)
-        tableView.separatorStyle = .none
-        tableView.backgroundColor = UIColor.clear
-        tableView.dataSource = self
-        tableView.delegate = self
-        return tableView
-    }()
-}
-
-extension PublishMusicView: UITableViewDataSource, UITableViewDelegate {
-    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 5
-    }
-    
-    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        return UITableViewCell()
-    }
-    
-    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        print("点击了----\(indexPath.row)")
-    }
-    
-    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 50
-    }
-    
-    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        return 0
-    }
-    
-}

RainbowPlanet/RainbowPlanet/Modules/PublishModule/Unused/PublishTakeVideo/PublishVideoRecorderController.swift

@@ -1,451 +0,0 @@
-//
-//  PublishVideoRecorderController.swift
-//  RainbowPlanet
-//
-//  Created by Christopher on 2019/6/18.
-//  Copyright © 2019 RainbowPlanet. All rights reserved.
-//
-
-import UIKit
-import JXSegmentedView
-import AliyunVideoSDKPro
-import CoreMotion
-
-class PublishVideoRecorderController: BaseViewController {
-    
-    override func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
-    }
-    
-    typealias DismissClosure = () -> Void
-    var dismissClosure: DismissClosure?
-    
-    typealias EditClosure = () -> Void
-    var editClosure: EditClosure?
-    
-    typealias HideSegmentClosure = (_ isHidden: Bool) -> Void
-    var hideSegmentClosure: HideSegmentClosure?
-    
-    // 滤镜Items
-    var effectFilterItems: Array<AliyunEffectFilter> = []
-    
-    // 视频片段管理器
-    var clipManager: AliyunClipManager?
-    
-    // 开始录制时间
-    var downTime: Double?
-    
-    // 结束录制时间
-    var upTime: Double?
-    
-    // 开始录制视频段数
-    var downVideoCount: Int = 0
-    
-    // 结束录制视频段数
-    var upVideoCount: Int = 0
-    
-    // 录制时间
-    var recordingDuration: CFTimeInterval?
-    
-    var motionManager: CMMotionManager?
-    
-    // 相机旋转角度
-    var cameraRotate: Int = 90
-    
-    // 录制时间区间
-    let maxDuration: CGFloat = 60.0
-    let minDuration: CGFloat = 3.0
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        setupViews()
-        setupLayouts()
-        setupFilterEffectData()
-        
-        //录制片段设置
-        clipManager = recorder.clipManager
-        clipManager?.maxDuration = maxDuration
-        clipManager?.minDuration = minDuration
-    }
-    
-    override func viewWillAppear(_ animated: Bool) {
-        startRetainCameraRotate()
-    }
-    
-    override func viewWillDisappear(_ animated: Bool) {
-        motionManager?.stopDeviceMotionUpdates()
-    }
-    
-    deinit {
-        // 控制器销毁时，销毁recorder
-        recorder.destroy()
-    }
-    
-    override func setupViews() {
-        navigationBar.isHidden = true
-        
-        view.addSubview(videoCameraView)
-        videoCameraView.preRecordViewShow()
-        
-        view.addSubview(filterView)        
-        filterView.isHidden = true
-        
-        view.addSubview(musicView)
-        musicView.isHidden = true
-    }
-    
-    override func setupLayouts() {
-        videoCameraView.snp.makeConstraints { (make) in
-            make.edges.equalToSuperview()
-        }
-        
-        filterView.snp.makeConstraints { (make) in
-            make.edges.equalToSuperview()
-        }
-        
-        musicView.snp.makeConstraints { (make) in
-            make.edges.equalToSuperview()
-        }
-    }
-    
-    func startRetainCameraRotate() {
-        if motionManager == nil {
-            motionManager = CMMotionManager()
-        }
-        
-        if motionManager?.isDeviceMotionAvailable ?? false {
-            motionManager?.deviceMotionUpdateInterval = 1
-            motionManager?.startDeviceMotionUpdates(to: OperationQueue.main, withHandler: {
-                [weak self] (motion, error) in
-                // Gravity 获取手机的重力值在各个方向上的分量，根据这个就可以获得手机的空间位置，倾斜角度等
-                let gravityX: Double = motion?.gravity.x ?? 0
-                let gravityY: Double = motion?.gravity.y ?? 0
-                //手机旋转角度
-                let xyTheta: Double = atan2(gravityX,gravityY)/Double.pi*180.0
-                
-                if (xyTheta >= -45 && xyTheta <= 45) {
-                    //down
-                    self?.cameraRotate = 180;
-                } else if (xyTheta > 45 && xyTheta < 135) {
-                    //left
-                    self?.cameraRotate = 90;
-                } else if ((xyTheta >= 135 && xyTheta < 180) || (xyTheta >= -180 && xyTheta < -135)) {
-                    //up
-                    self?.cameraRotate = 0;
-                } else if (xyTheta >= -135 && xyTheta < -45) {
-                    //right
-                    self?.cameraRotate = 270;
-                }
-            })
-        }
-    }
-    
-    
-    // SDK录制类
-    private lazy var recorder: AliyunIRecorder = {
-        //清除之前生成的录制路径
-        let recordDir: String = AliyunPathManager.createRecrodDir()
-        AliyunPathManager.clearDir(recordDir)
-        //生成这次的存储路径
-        let taskPath: String = recordDir.appending(AliyunPathManager.randomString())
-        //视频存储路径
-        let videoSavePath: String = taskPath.appending(AliyunPathManager.randomString()).appending(".mp4")
-        
-        let recorder = AliyunIRecorder.init(delegate: self, videoSize: CGSize(width: 540, height: 960))
-        
-        // 预览视图，必须设置
-        recorder?.preview = videoCameraView.previewView
-        
-        /*
-         视频的输出路径
-         注意：若上一次录制的 outputPath 路径的视频存在沙盒里没有删除，并且与本次录制的视频路径且相同重名的话，录制将会失败
-         */
-        recorder?.outputPath = videoSavePath
-        
-        // 视频的输出类型
-        recorder?.outputType = AliyunIRecorderVideoOutputPixelFormatType.type420f
-        
-        /*
-         文件配置路径
-         注意：若上一次录制的 taskPath  路径的视频存在沙盒里没有删除，并且与本次录制的视频路径相且同重名的话，录制将会失败
-         */
-        recorder?.taskPath = taskPath;
-        
-        // 美颜状态
-        recorder?.beautifyStatus = true;
-        
-        // 设置美颜度 [0,100]
-        recorder?.beautifyValue = 50
-       
-        
-        // 后置摄像头采集分辨率 默认：AVCaptureSessionPreset640x480
-        recorder?.backCaptureSessionPreset = AVCaptureSession.Preset.hd1280x720.rawValue
-        
-        // 前置摄像头采集分辨率 默认：AVCaptureSessionPreset640x480
-        recorder?.frontCaptureSessionPreset = AVCaptureSession.Preset.hd1280x720.rawValue
-        
-        // 设置视频最大时长 默认8
-        recorder?.clipManager.maxDuration = self.maxDuration
-        
-        return recorder!
-    }()
-    
-    lazy var videoCameraView: PublishVideoView = {
-        let videoCameraView = PublishVideoView()
-        videoCameraView.maxDuration = self.maxDuration
-        videoCameraView.minDuration = self.minDuration
-        videoCameraView.btnClickClosure = {
-            [weak self] (btnType) in
-            switch btnType {
-            case .back:
-                if let dismissClosure = self?.dismissClosure {
-                    dismissClosure()
-                }
-                
-            case .reverse:
-                self?.recorder.switchCameraPosition()
-                
-            case .music:
-                self?.musicView.isHidden = false
-                self?.videoCameraView.editMusicViewShow()
-                if let hideSegmentClosure = self?.hideSegmentClosure {
-                    hideSegmentClosure(true)
-                }
-                
-            case .filter:
-                self?.filterView.isHidden = false
-                if let hideSegmentClosure = self?.hideSegmentClosure {
-                    hideSegmentClosure(true)
-                }
-                
-            case .delete:
-                self?.deleteButtonClicked()
-                
-            case .confirm:
-                self?.recordButtonFinishVideo()
-            }
-        }
-        videoCameraView.videoClosure = {
-            [weak self] (isRecording) in
-            if isRecording == 0 {
-                self?.recordButtonPauseVideo()
-            } else {
-                self?.recordButtonRecordVideo()
-            }
-        }
-        return videoCameraView
-    }()
-    
-    lazy var filterView: PublishFilterView = {
-        let filterView = PublishFilterView()
-        
-        filterView.dimClickClosure = {
-            [weak self] in
-            self?.filterView.isHidden = true
-            if self?.clipManager?.partCount == 0 {
-                if let hideSegmentClosure = self?.hideSegmentClosure {
-                    hideSegmentClosure(false)
-                }
-            }
-        }
-        return filterView
-    }()
-    
-    lazy var musicView: PublishMusicView = {
-        let musicView = PublishMusicView()
-        
-        musicView.dismissViewClosure = {
-            [weak self] in
-            self?.musicView.isHidden = true
-            if self?.clipManager?.partCount == 0 {
-                self?.videoCameraView.preRecordViewShow()
-                if let hideSegmentClosure = self?.hideSegmentClosure {
-                    hideSegmentClosure(false)
-                }
-            } else {
-                self?.videoCameraView.pauseViewShow()
-            }
-        }
-        return musicView
-    }()
-    
-}
-
-// MARK: - Video
-extension PublishVideoRecorderController {
-    // 初始化滤镜数据
-    func setupFilterEffectData() {
-        let filterArr = ["炽黄","粉桃","海蓝","红润","灰白",
-                       "经典","麦茶","浓烈","柔柔","闪耀",
-                        "鲜果","雪梨","阳光","优雅","朝阳",
-                         "波普","光圈","海盐","黑白","胶片",
-                          "焦黄","蓝调","迷糊","思念","素描",
-                           "鱼眼","马赛克","模糊"]
-        
-        effectFilterItems.removeAll()
-        
-        let effectFilter1: AliyunEffectFilter = AliyunEffectFilter()
-        effectFilterItems.append(effectFilter1) //作为空效果
-        
-        for (_, filter) in filterArr.enumerated() {
-            let filterName: String = "filter/\(filter)"
-            let path = Bundle(for: type(of: self)).path(forResource: filterName, ofType: nil)
-            let effectFilter: AliyunEffectFilter = AliyunEffectFilter(file: path)
-            effectFilterItems.append(effectFilter)
-        }
-    }
-    
-    func recordButtonRecordVideo() {
-        print("---------->点击了录制按钮")
-        
-        videoCameraView.recordingViewShow()
-        if let hideSegmentClosure = self.hideSegmentClosure {
-            hideSegmentClosure(true)
-        }
-        
-        videoCameraView.progressView.videoCount += 1
-        recorder.startRecording()
-        
-        downTime = CFAbsoluteTimeGetCurrent()
-        downVideoCount = clipManager?.partCount ?? 0
-        if clipManager?.partCount ?? 0 <= 0 {
-            recorder.cameraRotate = Int32(cameraRotate)
-        }
-        
-        
-    }
-    
-    func recordButtonPauseVideo() {
-        print("---------->点击了暂停录制按钮")
-        
-        videoCameraView.pauseViewShow()
-        
-        recorder.stopRecording()
-        upTime = CFAbsoluteTimeGetCurrent();
-        
-        // 还原UI
-        
-    }
-    
-    func recordButtonFinishVideo() {
-        if clipManager?.partCount ?? 0 >= 1 {
-            recorder.finishRecording()
-        }
-    }
-    
-    func deleteButtonClicked() {
-        clipManager?.deletePart()
-        videoCameraView.progressView.videoCount -= 1
-        videoCameraView.recordingPercent(percent: CGFloat(clipManager?.duration ?? 0))
-        recordingDuration = Double(clipManager?.duration ?? 0)
-        
-        if clipManager?.partCount == 0 {
-            videoCameraView.preRecordViewShow()
-            if let hideSegmentClosure = self.hideSegmentClosure {
-                hideSegmentClosure(false)
-            }
-        } else {
-            videoCameraView.pauseViewShow()
-        }
-        
-        
-//        videoCameraView.enableFinishButton(clipManager.partCount())
-//        videoCameraView.musicButton.enabled = !clipManager.partCount()
-//        videoCameraView.countdownButton.enabled = clipManager.duration < clipManager.maxDuration
-        
-        let vDura: CGFloat = CGFloat(recordingDuration ?? 0)
-        if vDura >= minDuration {
-//            magicCameraView.enableFinishButton(true)
-//            magicCameraView.finishButton.enabled = true
-        } else {
-//            magicCameraView.enableFinishButton(false)
-        }
-    }
-    
-}
-
-// MARK: - AliyunIRecorderDelegate
-extension PublishVideoRecorderController: AliyunIRecorderDelegate {
-    func recorderDeviceAuthorization(_ status: AliyunIRecorderDeviceAuthor) {
-        if (status.rawValue == 1) {            
-            SwiftProgressHUD.shared().showText("麦克风无权限")
-        } else if (status.rawValue == 2) {
-            SwiftProgressHUD.shared().showText("摄像头无权限")
-        }
-    }
-    
-    // 录制实时时长
-    func recorderVideoDuration(_ duration: CGFloat) {
-        DispatchQueue.main.async {            
-            self.videoCameraView.recordingPercent(percent: duration)
-            self.recordingDuration = Double(duration)
-        }
-    }
-    
-    // 暂停录制回调
-    func recorderDidStopRecording() {
-        print("---------->暂停录制回调")
-        
-        upVideoCount = clipManager?.partCount ?? 0
-        
-        let vDura: CGFloat = CGFloat(recordingDuration ?? 0)
-        if vDura >= minDuration {
-            // 允许结束button点按
-        } else {
-            // 禁止结束button点按
-        }
-        
-    }
-    
-    // 收到完成录制回调，视频已经保存到初始化设置的`视频输出沙盒路径`路径下
-    func recorderDidFinishRecording() {
-        print("----录制完成回调")
-        
-        let outputPath: String = recorder.outputPath
-        UISaveVideoAtPathToSavedPhotosAlbum(outputPath, self, nil, nil)
-        
-        
-        if let editClosure = self.editClosure {
-            editClosure()
-        }
-        
-//        [[AlivcShortVideoRoute shared]registerEditVideoPath:outputPath];
-//        [[AlivcShortVideoRoute shared]registerEditMediasPath:nil];
-//        if(self.music && ![self.music.name isEqualToString:@"无音乐"]){
-//            [[AlivcShortVideoRoute shared] registerHasRecordMusic:YES];
-//        }else{
-//            [[AlivcShortVideoRoute shared] registerHasRecordMusic:NO];
-//        }
-    }
-    
-    // 收到录制达到最大时长回调，调用完成录制
-    func recorderDidStopWithMaxDuration() {
-        recorder.finishRecording()
-        print("----超时")
-        
-//        self.magicCameraView.backButton.enabled = YES;
-//        [MBProgressHUD showHUDAddedTo:self.view animated:YES];
-//        self.magicCameraView.flashButton.userInteractionEnabled = (_recorder.cameraPosition != 0);
-        videoCameraView.progressView.videoCount += 1
-        
-        videoCameraView.pauseViewShow()
-//        self.magicCameraView.progressView.showBlink = NO;
-//        [self.recorder finishRecording];
-//        [self.magicCameraView destroy];
-    }
-    
-}
-
-// MARK: - JXSegmentedDelegate
-extension PublishVideoRecorderController : JXSegmentedListContainerViewListDelegate {
-    func listView() -> UIView {
-        return view
-    }
-    func listDidAppear() {
-        recorder.startPreview()
-    }
-    func listDidDisappear() {
-        recorder.stopPreview()        
-    }
-}

RainbowPlanet/RainbowPlanet/Modules/PublishModule/Unused/PublishTakeVideo/PublishVideoView.swift

@@ -1,450 +0,0 @@
-//
-//  PublishVideoView.swift
-//  RainbowPlanet
-//
-//  Created by Christopher on 2019/6/19.
-//  Copyright © 2019 RainbowPlanet. All rights reserved.
-//
-
-import UIKit
-import RxSwift
-import RxCocoa
-import JXSegmentedView
-
-enum BtnActionType {
-    case back       // 返回
-    case reverse    // 翻转
-    case music      // 音乐
-    case filter     // 滤镜
-    case delete     // 回删
-    case confirm    // 确定
-}
-
-class PublishVideoView: BaseView {
-    
-    typealias BtnClickClosure = (_ btnType: BtnActionType) -> Void
-    var btnClickClosure : BtnClickClosure?
-    
-    typealias VideoClosure = (_ isRecord: Int) -> Void
-    var videoClosure : VideoClosure?
-    
-    var maxDuration: CGFloat? {
-        didSet {
-            progressView.maxDuration = maxDuration!
-        }
-    }
-    var minDuration: CGFloat? {
-        didSet {
-            progressView.minDuration = minDuration!
-        }
-    }
-    
-    // 是否正在录制
-    @objc var recording: Bool = false
-    
-    override func setupViews() {
-        self.backgroundColor = kffffffColor
-        
-        addSubview(progressView)
-        addSubview(backButton)
-        addSubview(recordButton)
-        addSubview(segmentedView)
-        
-        addSubview(controlBackView)
-        controlBackView.addSubview(reverseButton)
-        controlBackView.addSubview(musicButton)
-        controlBackView.addSubview(filterButton)
-        
-        addSubview(timeBackView)
-        timeBackView.addSubview(timeDotView)
-        timeBackView.addSubview(timeLabel)
-        
-        addSubview(selBackView)
-        selBackView.addSubview(confirmButton)
-        selBackView.addSubview(delButton)
-        
-        addSubview(previewView)
-        insertSubview(previewView, at: 0)
-    }
-    
-    override func setupLayouts() {
-        
-        backButton.snp.makeConstraints { (make) in
-            make.top.equalTo(55)
-            make.left.equalTo(5)
-            make.width.equalTo(40)
-            make.height.equalTo(40)
-        }
-        
-        recordButton.snp.makeConstraints { (make) in
-            make.bottom.equalTo(-56)
-            make.centerX.equalToSuperview()
-            make.width.equalTo(100)
-            make.height.equalTo(100)
-        }
-        
-        segmentedView.snp.makeConstraints { (make) in
-            make.height.equalTo(40)
-            make.left.equalTo(14)
-            make.right.equalTo(-14)
-            make.bottom.equalTo(recordButton.snp.top).offset(-21)
-        }
-        
-        /***** 翻转、音乐、滤镜 *****/
-        controlBackView.snp.makeConstraints { (make) in
-            make.top.equalTo(64)
-            make.right.equalTo(-15)
-            make.width.equalTo(44)
-        }
-        
-        reverseButton.snp.makeConstraints { (make) in
-            make.top.left.right.equalToSuperview()
-            make.height.equalTo(46)
-        }
-        reverseButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 4)
-        
-        musicButton.snp.makeConstraints { (make) in
-            make.top.equalTo(reverseButton.snp.bottom).offset(20)
-            make.left.right.equalToSuperview()
-            make.height.equalTo(46)
-        }
-        musicButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 4)
-        
-        filterButton.snp.makeConstraints { (make) in
-            make.top.equalTo(musicButton.snp.bottom).offset(20)
-            make.left.right.equalToSuperview()
-            make.height.equalTo(46)
-            make.bottom.equalToSuperview()
-        }
-        filterButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 4)
-        
-        /***** 拍摄时长 *****/
-        timeBackView.snp.makeConstraints { (make) in
-            make.bottom.equalTo(recordButton.snp.top).offset(-20)
-            make.centerX.equalToSuperview()
-            make.height.equalTo(20)
-        }
-        
-        timeDotView.snp.makeConstraints { (make) in
-            make.left.equalToSuperview()
-            make.centerY.equalToSuperview()
-            make.size.equalTo(8)
-        }
-        
-        timeLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(timeDotView.snp.right).offset(4)
-            make.top.bottom.equalToSuperview()
-            make.width.equalTo(40)
-            make.right.equalToSuperview()
-        }
-        
-        /***** 回删、确定 *****/
-        selBackView.snp.makeConstraints { (make) in
-            make.bottom.equalTo(-83)
-            make.right.equalTo(-24*kScaleWidth)
-            make.height.equalTo(50)
-        }
-        
-        confirmButton.snp.makeConstraints { (make) in
-            make.top.bottom.right.equalToSuperview()
-            make.width.equalTo(30)
-        }
-        confirmButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 4)
-        
-        delButton.snp.makeConstraints { (make) in
-            make.right.equalTo(confirmButton.snp.left).offset(-30*kScaleWidth)
-            make.top.bottom.equalToSuperview()
-            make.width.equalTo(30)
-            make.left.equalToSuperview()
-        }
-        delButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 4)
-        
-        /***** 预览视图 *****/
-        previewView.snp.makeConstraints { (make) in
-            make.edges.equalToSuperview()
-        }
-    }
-    
-    // MARK: - 创建视图控件
-    //1.初始化JXSegmentedViewx
-    lazy var segmentedView: JXSegmentedView = {
-        let segmentedView = JXSegmentedView()
-        segmentedView.delegate = self
-        segmentedView.dataSource = segmentedDataSource
-        segmentedView.selectItemAt(index: 2)
-        segmentedView.defaultSelectedIndex = 2
-        segmentedView.backgroundColor = kRGBAColor(r: 0, g: 0, b: 0, a: 0.2)
-        segmentedView.cornerRadius = 20
-        segmentedView.masksToBounds = true
-        return segmentedView
-    }()
-    
-    //2.初始化dataSource
-    private lazy var segmentedDataSource: JXSegmentedTitleDataSource = {
-        let segmentedDataSource = JXSegmentedTitleDataSource()
-        segmentedDataSource.isTitleColorGradientEnabled = true
-        segmentedDataSource.isItemSpacingAverageEnabled = true
-        segmentedDataSource.isTitleZoomEnabled = true
-        segmentedDataSource.titleNormalColor = kffffffColor
-        segmentedDataSource.titleSelectedColor = k333333Color
-        segmentedDataSource.titleNormalFont = kRegularFont14!
-        segmentedDataSource.titleSelectedFont = kBoldFont22
-        segmentedDataSource.titles = ["极慢","慢","标准","快","极快"]
-        //reloadData(selectedIndex:)方法一定要调用，方法内部会刷新数据源数组
-        segmentedDataSource.reloadData(selectedIndex: 2)
-        
-        return segmentedDataSource
-    }()
-    
-    //3.初始化指示器indicator
-    private lazy var indicator: JXSegmentedIndicatorBackgroundView = {
-        let indicator = JXSegmentedIndicatorBackgroundView()
-//        indicator.indicatorColors = [k62CC74Color,.white,.white]
-        indicator.indicatorHeight = 40
-        return indicator
-    }()
-    
-    lazy var backButton: UIButton = {
-        let backButton = UIButton(type: UIButton.ButtonType.custom)
-        backButton.setImage(kImage(name: "video_btn_close_white"), for: UIControl.State.normal)
-        backButton.rx.tap.subscribe(onNext: { [weak self] (data) in
-            if let btnClickClosure = self?.btnClickClosure {
-                btnClickClosure(BtnActionType.back)
-            }
-        }).disposed(by: disposeBag)
-        return backButton
-    }()
-    
-    // MARK:放置"翻转、音乐、滤镜"のView
-    lazy var controlBackView: UIView = {
-        let controlBackView = UIView()
-        return controlBackView
-    }()
-    
-    private lazy var reverseButton: UIButton = {
-        let reverseButton = UIButton(type: UIButton.ButtonType.custom)
-        reverseButton.setImage(kImage(name: "video_ico_overturn"), for: UIControl.State.normal)
-        reverseButton.setTitle("翻转", for: UIControl.State.normal)
-        reverseButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-        reverseButton.titleLabel?.font = kRegularFont12
-        reverseButton.rx.tap.subscribe(onNext: { [weak self] (data) in
-            if let btnClickClosure = self?.btnClickClosure {
-                btnClickClosure(BtnActionType.reverse)
-            }
-        }).disposed(by: disposeBag)
-        return reverseButton
-    }()
-    
-    private lazy var musicButton: UIButton = {
-        let musicButton = UIButton(type: UIButton.ButtonType.custom)
-        musicButton.setImage(kImage(name: "video_ico_music"), for: UIControl.State.normal)
-        musicButton.setTitle("音乐", for: UIControl.State.normal)
-        musicButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-        musicButton.titleLabel?.font = kRegularFont12
-        musicButton.rx.tap.subscribe(onNext: { [weak self] (data) in
-            if let btnClickClosure = self?.btnClickClosure {
-                btnClickClosure(BtnActionType.music)
-            }
-        }).disposed(by: disposeBag)
-        return musicButton
-    }()
-    
-    private lazy var filterButton: UIButton = {
-        let filterButton = UIButton(type: UIButton.ButtonType.custom)
-        filterButton.setImage(kImage(name: "video_ico_filter"), for: UIControl.State.normal)
-        filterButton.setTitle("滤镜", for: UIControl.State.normal)
-        filterButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-        filterButton.titleLabel?.font = kRegularFont12
-        filterButton.rx.tap.subscribe(onNext: { [weak self] (data) in
-            if let btnClickClosure = self?.btnClickClosure {
-                btnClickClosure(BtnActionType.filter)
-            }
-        }).disposed(by: disposeBag)
-        return filterButton
-    }()
-    
-    // MARK:放置"拍摄时长Label"のView
-    lazy var timeBackView: UIView = {
-        let timeBackView = UIView()
-        return timeBackView
-    }()
-    
-    private lazy var timeDotView: UIView = {
-        let timeDotView = UIView()
-        timeDotView.backgroundColor = kFF5E5EColor
-        timeDotView.cornerRadius = 4
-        timeDotView.masksToBounds = true
-        return timeDotView
-    }()
-    
-    private lazy var timeLabel: UILabel = {
-        let timeLabel = UILabel()
-        timeLabel.textColor = kffffffColor
-        timeLabel.font = kRegularFont14
-        timeLabel.textAlignment = .left
-        timeLabel.numberOfLines = 1
-        return timeLabel
-    }()
-    
-    // MARK:放置"回删、确定"のView
-    lazy var selBackView: UIView = {
-        let selBackView = UIView()
-        return selBackView
-    }()
-    
-    private lazy var delButton: UIButton = {
-        let delButton = UIButton(type: UIButton.ButtonType.custom)
-        delButton.setImage(kImage(name: "video_btn_delete"), for: UIControl.State.normal)
-        delButton.setTitle("回删", for: UIControl.State.normal)
-        delButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-        delButton.titleLabel?.font = kRegularFont12
-        delButton.rx.tap.subscribe(onNext: { [weak self] (data) in
-            if let btnClickClosure = self?.btnClickClosure {
-                btnClickClosure(BtnActionType.delete)
-            }
-        }).disposed(by: disposeBag)
-        return delButton
-    }()
-    
-    private lazy var confirmButton: UIButton = {
-        let confirmButton = UIButton(type: UIButton.ButtonType.custom)
-        confirmButton.setImage(kImage(name: "video_btn_submit"), for: UIControl.State.normal)
-        confirmButton.setTitle("确定", for: UIControl.State.normal)
-        confirmButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-        confirmButton.titleLabel?.font = kRegularFont12
-        confirmButton.rx.tap.subscribe(onNext: { [weak self] (data) in
-            if let btnClickClosure = self?.btnClickClosure {
-                btnClickClosure(BtnActionType.confirm)
-            }
-        }).disposed(by: disposeBag)
-        return confirmButton
-    }()
-    
-    // MARK:progressView
-    lazy var progressView: QUProgressView = {
-        let progressView = QUProgressView(frame: CGRect(x: 14, y: kSafeStatusBarHeight-20+40, width: kScreenWidth-28, height: 5))
-        progressView.showBlink = false
-        progressView.showNoticePoint = true
-        progressView.backgroundColor = kRGBAColor(r: 0/255.0, g:  0/255.0, b:  0/255.0, a: 0.3)
-        progressView.cornerRadius = 2
-        progressView.masksToBounds = true
-        
-        progressView.colorProgress = kffffffColor
-        progressView.colorNotice = UIColor.red
-        progressView.colorSepatorPoint = k62CC74Color
-        
-        return progressView
-    }()
-    
-    // MARK:录制のButton
-    private lazy var recordButton: UIButton = {
-        let recordButton = UIButton(type: UIButton.ButtonType.custom)
-        recordButton.setImage(kImage(name: "video_btn_shoot"), for: UIControl.State.normal)
-        recordButton.setImage(kImage(name: "video_btn_pause"), for: UIControl.State.selected)
-        recordButton.rx.tap.subscribe(onNext: { [weak self] (data) in
-            recordButton.isSelected = !recordButton.isSelected
-            if let videoClosure = self?.videoClosure {
-                let isRecord: Int = recordButton.isSelected == true ? 1 : 0
-                videoClosure(isRecord)
-            }
-        }).disposed(by: disposeBag)
-        
-        return recordButton
-    }()
-    
-    
-    // MARK:预览View
-    lazy var previewView: UIView = {
-        let previewView = UIView()
-        return previewView
-    }()
-    
-}
-
-// MARK: - 视图状态处理
-extension PublishVideoView {
-    // 刷新进度条进度
-    func recordingPercent(percent: CGFloat) {
-        progressView.updateProgress(percent)
-        
-        //        if recording {
-        let d: Int = Int(percent)
-        let m: Int = Int(d / 60)
-        let s: Int = Int(d % 60)
-        
-        timeLabel.text = String(format: "%02d:%02d", m, s)
-        //        }
-        
-        if percent == 0 {
-            progressView.reset()
-            timeLabel.text = ""
-        }
-        
-    }
-    
-    /**
-     * 显示默认视图
-     */
-    func preRecordViewShow() {
-        backButton.isHidden = false
-        recordButton.isHidden = false
-        progressView.isHidden = false
-        
-        controlBackView.isHidden = false
-        segmentedView.isHidden = false
-        timeBackView.isHidden = true
-        selBackView.isHidden = true
-    }
-    /**
-     * 显示正在拍摄视图
-     */
-    func recordingViewShow() {
-        backButton.isHidden = false
-        recordButton.isHidden = false
-        progressView.isHidden = false
-        
-        controlBackView.isHidden = true
-        segmentedView.isHidden = true
-        timeBackView.isHidden = false
-        selBackView.isHidden = true
-    }
-    /**
-     * 显示暂停拍摄视图
-     */
-    func pauseViewShow() {
-        backButton.isHidden = false
-        recordButton.isHidden = false
-        progressView.isHidden = false
-        
-        controlBackView.isHidden = false
-        segmentedView.isHidden = false
-        timeBackView.isHidden = true
-        selBackView.isHidden = false
-    }
-    /**
-     * 显示编辑音乐视图
-     */
-    func editMusicViewShow() {
-        backButton.isHidden = true
-        recordButton.isHidden = true
-        progressView.isHidden = true
-        
-        controlBackView.isHidden = true
-        segmentedView.isHidden = true
-        selBackView.isHidden = true
-    }
-}
-
-extension PublishVideoView : JXSegmentedViewDelegate {
-    
-    // 点击选中的情况才会调用该方法
-    func segmentedView(_ segmentedView: JXSegmentedView, didClickSelectedItemAt index: Int) {
-        print("----选中\(index)")
-    }
-    
-    /// 是否允许点击选中目标index的item
-    func segmentedView(_ segmentedView: JXSegmentedView, canClickItemAt index: Int) -> Bool {
-        return true
-    }
-}
-

RainbowPlanet/RainbowPlanet/Modules/PublishNewModule/PublishEditNew/View/PublishEditNew/PublishEditNewVideoSetView.swift

@@ -0,0 +1,185 @@
+//
+//  PublishEditNewVideoSetView.swift
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/11/7.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+
+class PublishEditNewVideoSetView: BaseView {
+
+    override func setupViews() {
+        // 返回按钮
+        addSubview(backButton)
+        // 下一步
+        addSubview(nextButton)
+        // 滤镜按钮
+        addSubview(filterButton)
+        // 音乐
+        addSubview(musicButton)
+        // 调速
+        addSubview(speedRegulationButton)
+        // 播放进度条
+        addSubview(playProgressView)
+        // 左滑手势
+        addLeftSwipe()
+        // 右滑手势
+        addRightSwipe()
+    }
+    
+    override func setupLayouts() {
+        
+        // 返回按钮
+        backButton.snp.makeConstraints { (make) in
+            make.top.equalTo(kSafeStatusBarHeight + 11)
+            make.left.equalTo(14)
+        }
+        
+        // 下一步
+        nextButton.snp.makeConstraints { (make) in
+            make.centerY.equalTo(backButton)
+            make.right.equalTo(-14)
+            make.height.equalTo(26)
+            make.width.equalTo(64)
+        }
+        
+        // 音乐
+        musicButton.snp.makeConstraints { (make) in
+            make.top.equalTo(kNavBarTotalHeight + 20)
+            make.right.equalTo(-26)
+            make.height.equalTo(50)
+            make.width.equalTo(30)
+        }
+        musicButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 6)
+        
+        // 滤镜
+        filterButton.snp.makeConstraints { (make) in
+            make.top.equalTo(musicButton.snp.bottom).offset(20)
+            make.right.equalTo(-26)
+            make.height.equalTo(50)
+            make.width.equalTo(30)
+        }
+        filterButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 6)
+        
+        // 调速
+        speedRegulationButton.snp.makeConstraints { (make) in
+            make.top.equalTo(filterButton.snp.bottom).offset(20)
+            make.right.equalTo(-26)
+            make.height.equalTo(50)
+            make.width.equalTo(30)
+        }
+        speedRegulationButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 6)
+        
+        // 播放进度View
+        playProgressView.snp.makeConstraints { (make) in
+            make.bottom.equalTo(-25)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(20)
+        }
+    }
+    
+    
+    /// 返回按钮
+    lazy var backButton: UIButton = {
+        let backButton = UIButton(type: UIButton.ButtonType.custom)
+        backButton.setImage(kImage(name: "navbar_back_white"), for: UIControl.State.normal)
+        return backButton
+    }()
+    
+    
+    /// 下一步
+    lazy var nextButton: UIButton = {
+        let nextButton = UIButton(type: UIButton.ButtonType.custom)
+        nextButton.setBackgroundImage(UIImage.imageWithColor(color: kThemeColor), for: UIControl.State.normal)
+        nextButton.setTitle("下一步", for: UIControl.State.normal)
+        nextButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
+        nextButton.titleLabel?.font = kMediumFont13
+        nextButton.cornerRadius = 13
+        nextButton.masksToBounds = true
+        return nextButton
+    }()
+    
+    /// 滤镜
+    lazy var filterButton: UIButton = {
+        let filterButton = UIButton()
+        filterButton.setImage(kImage(name: "video_ico_filter"), for: UIControl.State.normal)
+        filterButton.setImage(kImage(name: "video_ico_filter"), for: UIControl.State.highlighted)
+        filterButton.setTitle("滤镜", for: UIControl.State.normal)
+        filterButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
+        filterButton.titleLabel?.font = kRegularFont12
+        return filterButton
+    }()
+    /// 音乐
+    lazy var musicButton: UIButton = {
+        let musicButton = UIButton()
+        musicButton.setImage(kImage(name: "video_ico_music"), for: UIControl.State.normal)
+        musicButton.setImage(kImage(name: "video_ico_music_pre"), for: UIControl.State.highlighted)
+        musicButton.setTitle("音乐", for: UIControl.State.normal)
+        musicButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
+        musicButton.titleLabel?.font = kRegularFont12
+        return musicButton
+    }()
+    
+    
+    /// 调速
+    lazy var speedRegulationButton: UIButton = {
+        let speedRegulationButton = UIButton()
+        speedRegulationButton.setImage(kImage(name: "video_ico_speed"), for: UIControl.State.normal)
+        speedRegulationButton.setImage(kImage(name: "video_ico_speed"), for: UIControl.State.highlighted)
+        speedRegulationButton.setTitle("调速", for: UIControl.State.normal)
+        speedRegulationButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
+        speedRegulationButton.titleLabel?.font = kRegularFont12
+        return speedRegulationButton
+    }()
+    
+    /// 播放进度View
+    lazy var playProgressView: PublishEditNewPlayProgressView = {
+        let playProgressView = PublishEditNewPlayProgressView()
+        return playProgressView
+    }()
+    
+    /// 左滑手势
+    lazy var leftSwipe: UISwipeGestureRecognizer = {
+        let leftSwipe = UISwipeGestureRecognizer(target: self, action: #selector(leftSwipeAction))
+        leftSwipe.direction = .left
+        return leftSwipe
+    }()
+    
+    /// 右滑手势
+    lazy var rightSwipe: UISwipeGestureRecognizer = {
+        let rightSwipe = UISwipeGestureRecognizer(target: self, action: #selector(rightSwipeAction))
+        rightSwipe.direction = .right
+        return rightSwipe
+    }()
+    
+    /// 添加左滑手势
+    func addLeftSwipe() {
+        addGestureRecognizer(leftSwipe)
+    }
+    
+    /// 添加有滑动滑手势
+    func addRightSwipe() {
+        addGestureRecognizer(rightSwipe)
+    }
+    
+    /// 左滑手势
+    typealias LeftSwipeClosure = () -> Void
+    var leftSwipeClosure : LeftSwipeClosure?
+    @objc func leftSwipeAction() {
+        if let leftSwipeClosure = leftSwipeClosure {
+            leftSwipeClosure()
+        }
+    }
+    
+    /// 右滑手势
+    typealias RightSwipeClosure = () -> Void
+    var rightSwipeClosure : RightSwipeClosure?
+    @objc func rightSwipeAction() {
+        if let rightSwipeClosure = rightSwipeClosure {
+            rightSwipeClosure()
+        }
+    }
+    
+}

RainbowPlanet/RainbowPlanet/Modules/PublishNewModule/PublishEditNew/View/PublishEditNewVideoView.swift

@@ -7,9 +7,12 @@
 //
 
 import UIKit
+import RxSwift
 
 class PublishEditNewVideoView: UIView {
 
+    let disposeBag = DisposeBag()
+    
     /// 销毁View
     deinit {
         NXLLog("deinit")
@@ -42,21 +45,28 @@ class PublishEditNewVideoView: UIView {
     func setupViews() {
         backgroundColor = UIColor.black
         addSubview(editorPreview)
+        addSubview(publishEditNewVideoSetView)
     }
     
     /// 布局
     func setupLayouts() {
-
+        publishEditNewVideoSetView.snp.makeConstraints { (make) in
+            make.edges.equalToSuperview()
+        }
     }
     
     /// 设置数据
     func setupData() {
         //播放器视频
         player?.play()
+        // 返回
+        publishEditNewVideoSetView.backButton.rx.tap.subscribe(onNext: { (_) in
+            UIViewController.topMost?.navigationController?.popViewController(animated: true)
+        }).disposed(by: disposeBag)
         
     }
     
-    // 编辑
+    /// 编辑
     lazy var editor: AliyunEditor? = {
         let editor = AliyunEditor(path: taskPath, preview: editorPreview)
         editor?.delegate = self
@@ -67,75 +77,96 @@ class PublishEditNewVideoView: UIView {
         return editor
     }()
     
-    // 编辑预览view
-    lazy var editorPreview : PublishEditNewVideoPreView = {
-        let editorPreview = PublishEditNewVideoPreView(frame: kScreenBounds)
-        return editorPreview
-    }()
-    
-    // 获取播放器
+    /// 获取播放器
     lazy var player: AliyunIPlayer? = {
         let player = editor?.getPlayer()
         return player
     }()
     
-    // 媒体片段管理
+    /// 媒体片段管理
     lazy var clip: AliyunIClipConstructor? = {
         let clip = editor?.getClipConstructor()
         return clip
     }()
     
-    // 合成导出
+    /// 合成导出
     lazy var exporter: AliyunIExporter? = {
         let exporter = editor?.getExporter()
         return exporter
     }()
+    
+    /// 编辑预览view
+    lazy var editorPreview : PublishEditNewVideoPreView = {
+        let editorPreview = PublishEditNewVideoPreView(frame: kScreenBounds)
+        return editorPreview
+    }()
 
+    /// UI页面
+    lazy var publishEditNewVideoSetView: PublishEditNewVideoSetView = {
+        let publishEditNewVideoSetView = PublishEditNewVideoSetView()
+        return publishEditNewVideoSetView
+    }()
+    
 }
 
-extension PublishEditNewVideoView : AliyunIExporterCallback {
-    func exporterDidEnd(_ outputPath: String!) {
+
+extension PublishEditNewVideoView : AliyunIPlayerCallback {
+    
+    
+    /// 播放结束
+    func playerDidEnd() {
+        _ = player?.replay()
+    }
+    
+    
+    /// 播放进度
+    /// - Parameters:
+    ///   - playSec: 播放时间轴上的位置。
+    ///   - streamSec: 视频流上的位置。
+    func playProgress(_ playSec: Double, streamProgress streamSec: Double) {
         
     }
     
-    func exporterDidCancel() {
+    
+    /// 播放进度
+    /// - Parameter sec: s
+    func playProgress(_ sec: Double) {
         
     }
     
-    func exportProgress(_ progress: Float) {
+    func playError(_ errorCode: Int32) {
         
     }
     
-    func exportError(_ errorCode: Int32) {
+    func seekDidEnd() {
         
     }
     
-    func exporterDidStart() {
+    func playerDidStart() {
         
     }
     
     
 }
 
-extension PublishEditNewVideoView : AliyunIPlayerCallback {
-    
-    func playerDidEnd() {
-        _ = player?.replay()
+extension PublishEditNewVideoView : AliyunIExporterCallback {
+    func exporterDidEnd(_ outputPath: String!) {
+        
     }
     
-    func playProgress(_ playSec: Double, streamProgress streamSec: Double) {
+    func exporterDidCancel() {
         
     }
     
-    func playError(_ errorCode: Int32) {
+    func exportProgress(_ progress: Float) {
         
     }
     
-    func seekDidEnd() {
+    func exportError(_ errorCode: Int32) {
         
     }
     
-    func playerDidStart() {
+    func exporterDidStart() {
         
     }
     

RainbowPlanet/RainbowPlanet/Modules/PublishNewModule/PublishEditNew/View/PublishEditNewPlayProgressView/PublishEditNewPlayProgressView.swift

@@ -0,0 +1,88 @@
+//
+//  PublishEditNewPlayProgressView.swift
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/11/7.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+
+class PublishEditNewPlayProgressView: BaseView {
+    
+    override func setupViews() {
+        addSubview(playButton)
+        addSubview(startTimeLabel)
+        addSubview(endTimeLabel)
+        addSubview(slider)
+    }
+    
+    override func setupLayouts() {
+        playButton.snp.makeConstraints { (make) in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(-14)
+            make.size.equalTo(18)
+        }
+        startTimeLabel.snp.makeConstraints { (make) in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(playButton.snp.right).offset(5)
+            make.width.equalTo(41)
+            make.height.equalTo(15)
+        }
+        endTimeLabel.snp.makeConstraints { (make) in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(-9)
+            make.width.equalTo(41)
+            make.height.equalTo(15)
+        }
+        
+        slider.snp.makeConstraints { (make) in
+            make.centerY.equalToSuperview()
+            make.height.equalTo(16)
+            make.left.equalTo(startTimeLabel.snp.right).offset(5)
+            make.right.equalTo(endTimeLabel.snp.left).offset(-5)
+        }
+    }
+    
+    override func setupData() {
+        
+    }
+    
+    /// 播放
+    lazy var playButton: UIButton = {
+        let playButton = UIButton()
+        playButton.setImage(kImage(name: "music_btn_pause"), for: UIControl.State.normal)
+        playButton.setImage(kImage(name: "music_btn_play"), for: UIControl.State.selected)
+        return playButton
+    }()
+    
+    /// 开始时间
+    lazy var startTimeLabel: UILabel = {
+        let startTimeLabel = UILabel()
+        startTimeLabel.text = "00:00"
+        startTimeLabel.textColor = kffffffColor
+        startTimeLabel.font = kRegularFont11
+        startTimeLabel.textAlignment = .center
+        return startTimeLabel
+    }()
+    
+    /// 结束时间
+    lazy var endTimeLabel: UILabel = {
+        let endTimeLabel = UILabel()
+        endTimeLabel.text = "01:00"
+        endTimeLabel.textColor = kffffffColor
+        endTimeLabel.font = kRegularFont11
+        endTimeLabel.textAlignment = .center
+        return endTimeLabel
+    }()
+    
+    /// 播放进度滑块
+    lazy var slider: PublishNewUISlider = {
+        let slider = PublishNewUISlider()
+        slider.thumbTintColor = kffffffColor
+        slider.minimumTrackTintColor = kffffffColor
+        slider.maximumTrackTintColor = k000000Color.withAlphaComponent(0.3)
+        return slider
+    }()
+
+}

RainbowPlanet/RainbowPlanet/Modules/PublishNewModule/PublishEditNew/View/PublishEditNewPlayProgressView/PublishNewUISlider.swift

@@ -0,0 +1,32 @@
+//
+//  PublishNewUISlider.swift
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/11/7.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+
+class PublishNewUISlider: UISlider {
+    
+    
+    /// 控制slider的宽和高，这个方法才是真正的改变slider滑道的高的
+    /// - Parameter bounds:
+    override func trackRect(forBounds bounds: CGRect) -> CGRect {
+        let boundsNew = CGRect(x: bounds.origin.x, y: bounds.origin.y, width: bounds.size.width, height: 5)
+        self.cornerRadius = 2.5
+        return boundsNew
+    }
+    
+    ///  改变滑块的触摸范围
+    /// - Parameters:
+    ///   - bounds: bounds
+    ///   - rect: 范围
+    ///   - value: 值
+    override func thumbRect(forBounds bounds: CGRect, trackRect rect: CGRect, value: Float) -> CGRect {
+        let rectNew = CGRect(x: rect.origin.x - 5, y: rect.origin.y, width: rect.size.width + 10, height: rect.size.height)
+        return super.thumbRect(forBounds: bounds, trackRect: rectNew, value: value).insetBy(dx: 5, dy: 5)
+    }
+
+}