移除视频编辑中已废弃代码，及相应文件

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -584,12 +584,6 @@
 		BD6122D422C364E400D3F513 /* AliyunMusicPickTabView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD6122CA22C364E400D3F513 /* AliyunMusicPickTabView.m */; };
 		BD6122D522C364E400D3F513 /* AliyunMusicPickCoverView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD6122CB22C364E400D3F513 /* AliyunMusicPickCoverView.m */; };
 		BD6122D622C364E400D3F513 /* AliyunMusicPickHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD6122CC22C364E400D3F513 /* AliyunMusicPickHeaderView.m */; };
-		BD6122E422C3654500D3F513 /* AliyunTimelineView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD6122DA22C3654400D3F513 /* AliyunTimelineView.m */; };
-		BD6122E522C3654500D3F513 /* AliyunTimelineItem.m in Sources */ = {isa = PBXBuildFile; fileRef = BD6122DB22C3654400D3F513 /* AliyunTimelineItem.m */; };
-		BD6122E622C3654500D3F513 /* AliyunTimelineMediaInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = BD6122DC22C3654400D3F513 /* AliyunTimelineMediaInfo.m */; };
-		BD6122E722C3654500D3F513 /* AliyunTimelineFilterItem.m in Sources */ = {isa = PBXBuildFile; fileRef = BD6122DD22C3654400D3F513 /* AliyunTimelineFilterItem.m */; };
-		BD6122E822C3654500D3F513 /* AliyunTimelineItemCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BD6122DE22C3654400D3F513 /* AliyunTimelineItemCell.m */; };
-		BD6122E922C3654500D3F513 /* AliyunTimelineTimeFilterItem.m in Sources */ = {isa = PBXBuildFile; fileRef = BD6122DF22C3654400D3F513 /* AliyunTimelineTimeFilterItem.m */; };
 		BD6122ED22C367E900D3F513 /* AliAssetImageGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = BD6122EC22C367E900D3F513 /* AliAssetImageGenerator.m */; };
 		BD6122F822C36A8100D3F513 /* AVAsset+VideoInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = BD6122F122C36A8100D3F513 /* AVAsset+VideoInfo.m */; };
 		BD6122F922C36A8100D3F513 /* UIView+Progress.m in Sources */ = {isa = PBXBuildFile; fileRef = BD6122F422C36A8100D3F513 /* UIView+Progress.m */; };
@@ -1343,18 +1337,6 @@
 		BD6122CC22C364E400D3F513 /* AliyunMusicPickHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AliyunMusicPickHeaderView.m; sourceTree = "<group>"; };
 		BD6122CD22C364E400D3F513 /* AliyunMusicPickTopView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliyunMusicPickTopView.h; sourceTree = "<group>"; };
 		BD6122CE22C364E400D3F513 /* AliyunMusicLineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliyunMusicLineView.h; sourceTree = "<group>"; };
-		BD6122D822C3654400D3F513 /* AliyunTimelineItemCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliyunTimelineItemCell.h; sourceTree = "<group>"; };
-		BD6122D922C3654400D3F513 /* AliyunTimelineTimeFilterItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliyunTimelineTimeFilterItem.h; sourceTree = "<group>"; };
-		BD6122DA22C3654400D3F513 /* AliyunTimelineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AliyunTimelineView.m; sourceTree = "<group>"; };
-		BD6122DB22C3654400D3F513 /* AliyunTimelineItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AliyunTimelineItem.m; sourceTree = "<group>"; };
-		BD6122DC22C3654400D3F513 /* AliyunTimelineMediaInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AliyunTimelineMediaInfo.m; sourceTree = "<group>"; };
-		BD6122DD22C3654400D3F513 /* AliyunTimelineFilterItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AliyunTimelineFilterItem.m; sourceTree = "<group>"; };
-		BD6122DE22C3654400D3F513 /* AliyunTimelineItemCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AliyunTimelineItemCell.m; sourceTree = "<group>"; };
-		BD6122DF22C3654400D3F513 /* AliyunTimelineTimeFilterItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AliyunTimelineTimeFilterItem.m; sourceTree = "<group>"; };
-		BD6122E022C3654400D3F513 /* AliyunTimelineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliyunTimelineView.h; sourceTree = "<group>"; };
-		BD6122E122C3654400D3F513 /* AliyunTimelineFilterItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliyunTimelineFilterItem.h; sourceTree = "<group>"; };
-		BD6122E222C3654400D3F513 /* AliyunTimelineMediaInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliyunTimelineMediaInfo.h; sourceTree = "<group>"; };
-		BD6122E322C3654400D3F513 /* AliyunTimelineItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliyunTimelineItem.h; sourceTree = "<group>"; };
 		BD6122EB22C367E900D3F513 /* AliAssetImageGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliAssetImageGenerator.h; sourceTree = "<group>"; };
 		BD6122EC22C367E900D3F513 /* AliAssetImageGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AliAssetImageGenerator.m; sourceTree = "<group>"; };
 		BD6122F022C36A8100D3F513 /* AVAsset+VideoInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "AVAsset+VideoInfo.h"; sourceTree = "<group>"; };
@@ -5037,7 +5019,6 @@
 				BD6122B222C3639E00D3F513 /* FilterAbout */,
 				BD6122EA22C367E900D3F513 /* AliAssetImageGenerator */,
 				BD61229F22C3638300D3F513 /* Model */,
-				BD6122D722C3654400D3F513 /* QUTimeline */,
 				BD6122BC22C364E400D3F513 /* MusicPick */,
 				BD61226322C3595B00D3F513 /* UIConfig */,
 				BD61227D22C3605B00D3F513 /* ResourceManager */,
@@ -5218,25 +5199,6 @@
 			path = View;
 			sourceTree = "<group>";
 		};
-		BD6122D722C3654400D3F513 /* QUTimeline */ = {
-			isa = PBXGroup;
-			children = (
-				BD6122D922C3654400D3F513 /* AliyunTimelineTimeFilterItem.h */,
-				BD6122DF22C3654400D3F513 /* AliyunTimelineTimeFilterItem.m */,
-				BD6122E322C3654400D3F513 /* AliyunTimelineItem.h */,
-				BD6122DB22C3654400D3F513 /* AliyunTimelineItem.m */,
-				BD6122D822C3654400D3F513 /* AliyunTimelineItemCell.h */,
-				BD6122DE22C3654400D3F513 /* AliyunTimelineItemCell.m */,
-				BD6122E222C3654400D3F513 /* AliyunTimelineMediaInfo.h */,
-				BD6122DC22C3654400D3F513 /* AliyunTimelineMediaInfo.m */,
-				BD6122E122C3654400D3F513 /* AliyunTimelineFilterItem.h */,
-				BD6122DD22C3654400D3F513 /* AliyunTimelineFilterItem.m */,
-				BD6122E022C3654400D3F513 /* AliyunTimelineView.h */,
-				BD6122DA22C3654400D3F513 /* AliyunTimelineView.m */,
-			);
-			path = QUTimeline;
-			sourceTree = "<group>";
-		};
 		BD6122EA22C367E900D3F513 /* AliAssetImageGenerator */ = {
 			isa = PBXGroup;
 			children = (
@@ -5825,7 +5787,6 @@
 				A70B2C3322880BB700B2449F /* ProductDetailProductLabelTableViewCell.swift in Sources */,
 				BDF45F0D228C00B8004E2682 /* DefaultContactInfoModel.swift in Sources */,
 				BD13B6DA22BA03BC008BB323 /* PublishAddAddressController.swift in Sources */,
-				BD6122E822C3654500D3F513 /* AliyunTimelineItemCell.m in Sources */,
 				A72A72BA22321DE000B21995 /* Extension+String.swift in Sources */,
 				BDAF83B222B3B67D0004BCC3 /* RecommendCommentFooter.swift in Sources */,
 				A70B8430228FF6D400882BC5 /* ProductCartCountModel.swift in Sources */,
@@ -6081,7 +6042,6 @@
 				BDE8AD1622CC59EE00E03C65 /* CommunityVideoListModel.swift in Sources */,
 				A7284401224DBB7700F82F30 /* SwiftMoyaNetWorkServiceUser.swift in Sources */,
 				A7B4E728228160BA0012914A /* ProductRightSideleftPictureCollectionViewCell.swift in Sources */,
-				BD6122E622C3654500D3F513 /* AliyunTimelineMediaInfo.m in Sources */,
 				BDEF7793228575A800ED0AC0 /* CommonPayCell.swift in Sources */,
 				A70B2C75228920BA00B2449F /* ProductDetailSkuSectionHeaerCollectionReusableView.swift in Sources */,
 				A7DF50D822A4FAFC00998908 /* ProductDetailEvaluationImageCollectionViewCell.swift in Sources */,
@@ -6123,7 +6083,6 @@
 				A70B2C46228840B100B2449F /* ProductDetailHotSellTableViewCell.swift in Sources */,
 				BD6122CF22C364E400D3F513 /* AliyunMusicPickViewController.m in Sources */,
 				A7D5F25F22C0614400F8E9AF /* CommunityTopicCategoryModel.swift in Sources */,
-				BD6122E522C3654500D3F513 /* AliyunTimelineItem.m in Sources */,
 				A7778CDF22461BAD00C7C47A /* PhoneCountryAreaSectionHeaderView.swift in Sources */,
 				A7AA9F5A22C5FB1E0086498B /* SwiftMoyaNetWorkServiceVirus.swift in Sources */,
 				A7A98E2D22801642005306E9 /* SwiftMoyaServiceCMSApi.swift in Sources */,
@@ -6327,7 +6286,6 @@
 				BD12B68022B4EF2600AEB10B /* KSMediaPickerViewImageCell.swift in Sources */,
 				A7274C5A228EE636000E3A07 /* LBXScanView.swift in Sources */,
 				A7FF1560228C693D00A85748 /* OrderViewController.swift in Sources */,
-				BD6122E922C3654500D3F513 /* AliyunTimelineTimeFilterItem.m in Sources */,
 				A729B5B42267254B004AE098 /* PasswordLoginViewController.swift in Sources */,
 				A7B4E7582282897B0012914A /* ProductFloorLeftHeaderCollectionReusableView.swift in Sources */,
 				A7D4608E227616F800A5A54E /* SQLiteManager.swift in Sources */,
@@ -6345,7 +6303,6 @@
 				A770E61622D6625700CBD0A4 /* ShareCollectionViewCell.swift in Sources */,
 				BD01B1FA22BC673900CE9F36 /* PublishConfirmPhotoController.swift in Sources */,
 				BD6122D622C364E400D3F513 /* AliyunMusicPickHeaderView.m in Sources */,
-				BD6122E722C3654500D3F513 /* AliyunTimelineFilterItem.m in Sources */,
 				BD10CD0C22BFCC7C0040796E /* PublishMusicView.swift in Sources */,
 				A7F2D6DF22B25B5D0093000B /* CardContentPicVideoCollectionViewLayout.swift in Sources */,
 				A72623E722C469B700AEF875 /* SearchMemberListModel.swift in Sources */,
@@ -6353,7 +6310,6 @@
 				A7A98DFD227E84F4005306E9 /* SwiftMoyaServiceProductApi.swift in Sources */,
 				BD01B1FB22BC673A00CE9F36 /* PublishTakePhotoController.swift in Sources */,
 				A739121B229F75F50033177E /* JXPagingView.swift in Sources */,
-				BD6122E422C3654500D3F513 /* AliyunTimelineView.m in Sources */,
 				A7D07CCF22B77E0200186014 /* UserPersonalCenterOrderCollectionViewCell.swift in Sources */,
 				BD7AB8452284398A0030646A /* OrderPaySelfPickAddInfoCell.swift in Sources */,
 				BD0808EC22C5BA3100D12E6A /* AliyunCompositionInfo.m in Sources */,

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/QUTimeline/AliyunTimelineFilterItem.h

@@ -1,18 +0,0 @@
-//
-//  AliyunTimelineFilterItem.h
-//  qusdk
-//
-//  Created by Vienta on 2018/1/15.
-//  Copyright © 2018年 Alibaba Group Holding Limited. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface AliyunTimelineFilterItem : NSObject
-
-@property (nonatomic, assign) CGFloat startTime;
-@property (nonatomic, assign) CGFloat endTime;
-@property (nonatomic, strong) UIColor *displayColor;
-@property (nonatomic, strong) id obj;
-
-@end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/QUTimeline/AliyunTimelineFilterItem.m

@@ -1,13 +0,0 @@
-//
-//  AliyunTimelineFilterItem.m
-//  qusdk
-//
-//  Created by Vienta on 2018/1/15.
-//  Copyright © 2018年 Alibaba Group Holding Limited. All rights reserved.
-//
-
-#import "AliyunTimelineFilterItem.h"
-
-@implementation AliyunTimelineFilterItem
-
-@end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/QUTimeline/AliyunTimelineItem.h

@@ -1,20 +0,0 @@
-//
-//  AliyunTimelineItem.h
-//  AliyunVideo
-//
-//  Created by Vienta on 2017/3/15.
-//  Copyright (C) 2010-2017 Alibaba Group Holding Limited. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreGraphics/CoreGraphics.h>
-
-@interface AliyunTimelineItem : NSObject
-
-@property (nonatomic, assign) CGFloat startTime;
-@property (nonatomic, assign) CGFloat endTime;
-@property (nonatomic, assign) BOOL isEdit;
-@property (nonatomic, weak) id obj;
-@property (nonatomic, assign) CGFloat minDuration;
-
-@end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/QUTimeline/AliyunTimelineItem.m

@@ -1,15 +0,0 @@
-
-//
-//  AliyunTimelineItem.m
-//  AliyunVideo
-//
-//  Created by Vienta on 2017/3/15.
-//  Copyright (C) 2010-2017 Alibaba Group Holding Limited. All rights reserved.
-//
-
-#import "AliyunTimelineItem.h"
-
-@implementation AliyunTimelineItem
-
-@end
-

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/QUTimeline/AliyunTimelineItemCell.h

@@ -1,34 +0,0 @@
-//
-//  AliyunTimelineItemCell.h
-//  QPSDKCore
-//
-//  Created by Vienta on 2016/11/25.
-//  Copyright © 2016年 lyle. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-
-@interface AliyunTimelinePercent : NSObject
-
-@property (nonatomic, assign) CGFloat leftPercent;
-@property (nonatomic, assign) CGFloat rightPercent;
-@property (nonatomic, strong) UIColor *color;
-
-@end
-
-
-@interface AliyunTimelineItemCell : UICollectionViewCell
-
-@property (nonatomic, assign) CGFloat mappedBeginTime;
-@property (nonatomic, assign) CGFloat mappedEndTime;
-@property (nonatomic, strong) UIImageView *imageView;
-
-- (void)setMappedBeginTime:(CGFloat)mappedBeginTime
-                   endTime:(CGFloat)mappedEndTime
-                     image:(UIImage *)image
-          timelinePercents:(NSArray *)percents
-    timelineFilterPercents:(NSArray *)filterPercents
-timelineTimeFilterPercents:(NSArray *)timeFilterPercents;
-
-@end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/QUTimeline/AliyunTimelineItemCell.m

@@ -1,175 +0,0 @@
-//
-//  AliyunTimelineItemCell.m
-//  QPSDKCore
-//
-//  Created by Vienta on 2016/11/25.
-//  Copyright © 2016年 lyle. All rights reserved.
-//
-
-#import "AliyunTimelineItemCell.h"
-#import "AlivcMacro.h"
-
-@implementation AliyunTimelinePercent
-
-
-
-@end
-
-
-@interface AliyunTimelineItemCell ()
-
-@property (nonatomic, strong) UIView *greyView;
-@property (nonatomic, strong) NSMutableArray *greyViews;
-@property (nonatomic, strong) NSMutableArray *percents;
-@property (nonatomic, strong) NSMutableArray *filterPercents;
-@property (nonatomic, strong) NSMutableArray *filterViews;
-@property (nonatomic, strong) NSMutableArray *timeFilterPercents;
-@property (nonatomic, strong) NSMutableArray *timeFilterViews;
-
-@end
-
-@implementation AliyunTimelineItemCell
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-    if (self = [super initWithFrame:frame]) {
-        UIColor *backgroundColor = [UIColor clearColor];
-        self.backgroundColor = backgroundColor;
-        self.imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(frame), CGRectGetHeight(frame))];
-        self.imageView.contentMode = UIViewContentModeScaleAspectFill;
-        self.imageView.clipsToBounds = YES;
-        [self addSubview:self.imageView];
-        
-        self.greyView = [[UIView alloc] initWithFrame:CGRectZero];
-        [self addSubview:self.greyView];
-        self.greyView.backgroundColor = AlivcOxRGBA(0x3CF2FF, 0.7);
-        self.greyView.hidden = YES;
-    }
-    return self;
-}
-
-
-- (void)layoutSubviews
-{
-    [super layoutSubviews];
-    self.imageView.bounds = self.bounds;
-}
-
-- (void)refreshGreyviews
-{
-    for (AliyunTimelinePercent *percent in self.percents) {
-        CGFloat x = percent.leftPercent * self.bounds.size.width;
-        CGFloat width = (percent.rightPercent - percent.leftPercent) * self.bounds.size.width;
-        CGRect frame = CGRectMake(x, 0, width, CGRectGetHeight(self.bounds));
-        UIView *greyview = [[UIView alloc] initWithFrame:frame];
-        greyview.backgroundColor = AlivcOxRGBA(0x3CF2FF, 0.7);
-//        greyview.backgroundColor = [[UIColor whiteColor] colorWithAlphaComponent:.4];
-        [self addSubview:greyview];
-        [self.greyViews addObject:greyview];
-    }
-}
-
-- (void)refreshFilterviews {
-    for (AliyunTimelinePercent *percent in self.filterPercents) {
-        CGFloat x = percent.leftPercent * self.bounds.size.width;
-        CGFloat width = (percent.rightPercent - percent.leftPercent) * self.bounds.size.width;
-        CGRect frame = CGRectMake(x, 0, width, CGRectGetHeight(self.bounds));
-        UIView *filterView = [[UIView alloc] initWithFrame:frame];
-        filterView.backgroundColor = percent.color;
-        [self addSubview:filterView];
-        [self.filterViews addObject:filterView];
-    }
-}
-
-- (void)refreshTimeFilterviews {
-    for (AliyunTimelinePercent *percent in self.timeFilterPercents) {
-        CGFloat x = percent.leftPercent * self.bounds.size.width;
-        CGFloat width = (percent.rightPercent - percent.leftPercent) * self.bounds.size.width;
-        CGRect frame = CGRectMake(x, 0, width, CGRectGetHeight(self.bounds));
-        UIView *filterView = [[UIView alloc] initWithFrame:frame];
-        filterView.backgroundColor = percent.color;
-        [self addSubview:filterView];
-        [self.timeFilterViews addObject:filterView];
-    }
-}
-
-- (void)setMappedBeginTime:(CGFloat)mappedBeginTime
-                   endTime:(CGFloat)mappedEndTime
-                     image:(UIImage *)image
-          timelinePercents:(NSArray *)percents
-    timelineFilterPercents:(NSArray *)filterPercents
-timelineTimeFilterPercents:(NSArray *)timeFilterPercents
-{
-    self.mappedBeginTime = mappedBeginTime;
-    self.mappedEndTime = mappedEndTime;
-    
-    if (![self.imageView.image isEqual:image]) {
-        [self.imageView setImage:image];
-    }
-    
-    [self.percents removeAllObjects];
-    [self.percents addObjectsFromArray:percents];
-    [self.greyViews makeObjectsPerformSelector:@selector(removeFromSuperview)];
-    [self.greyViews removeAllObjects];
-    [self refreshGreyviews];
-
-    [self.filterPercents removeAllObjects];
-    [self.filterPercents addObjectsFromArray:filterPercents];
-    [self.filterViews makeObjectsPerformSelector:@selector(removeFromSuperview)];
-    [self.filterViews removeAllObjects];
-    [self refreshFilterviews];
-
-
-    [self.timeFilterPercents removeAllObjects];
-    [self.timeFilterPercents addObjectsFromArray:timeFilterPercents];
-    [self.timeFilterViews makeObjectsPerformSelector:@selector(removeFromSuperview)];
-    [self.timeFilterViews removeAllObjects];
-    
-    [self refreshTimeFilterviews];
-}
-
-- (NSMutableArray *)greyViews
-{
-    if (!_greyViews) {
-        _greyViews = [[NSMutableArray alloc] init];
-    }
-    return _greyViews;
-}
-
-- (NSMutableArray *)percents
-{
-    if (!_percents) {
-        _percents = [[NSMutableArray alloc] init];
-    }
-    return _percents;
-}
-
-- (NSMutableArray *)filterPercents {
-    if (!_filterPercents) {
-        _filterPercents = [[NSMutableArray alloc] init];
-    }
-    return _filterPercents;
-}
-
-- (NSMutableArray *)filterViews {
-    if (!_filterViews) {
-        _filterViews = [[NSMutableArray alloc] init];
-    }
-    return _filterViews;
-}
-
-- (NSMutableArray *)timeFilterPercents {
-    if (!_timeFilterPercents) {
-        _timeFilterPercents = [[NSMutableArray alloc] init];
-    }
-    return _timeFilterPercents;
-}
-
-- (NSMutableArray *)timeFilterViews {
-    if (!_timeFilterViews) {
-        _timeFilterViews = [[NSMutableArray alloc] init];
-    }
-    return _timeFilterViews;
-}
-
-@end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/QUTimeline/AliyunTimelineMediaInfo.h

@@ -1,25 +0,0 @@
-//
-//  AliyunTimelineMediaInfo.h
-//  qusdk_debug
-//
-//  Created by Vienta on 2017/6/28.
-//  Copyright © 2017年 Alibaba Group Holding Limited. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-typedef enum : NSUInteger {
-    AliyunTimelineMediaInfoTypeVedio = 0,
-    AliyunTimelineMediaInfoTypePhoto = 1,
-    AliyunTimelineMediaInfoTypeGif = 3
-} AliyunTimelineMediaInfoType;
-
-@interface AliyunTimelineMediaInfo : NSObject
-
-@property (nonatomic, assign) AliyunTimelineMediaInfoType mediaType; //媒体类型 视频或者图片
-@property (nonatomic, copy) NSString *path;     //媒体资源路径
-@property (nonatomic, assign) CGFloat duration; //媒体持续时长
-@property (nonatomic, assign) CGFloat startTime; //媒体持续时长
-@property (nonatomic, assign) int rotate;//旋转角度
-
-@end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/QUTimeline/AliyunTimelineMediaInfo.m

@@ -1,13 +0,0 @@
-//
-//  AliyunTimelineMediaInfo.m
-//  qusdk_debug
-//
-//  Created by Vienta on 2017/6/28.
-//  Copyright © 2017年 Alibaba Group Holding Limited. All rights reserved.
-//
-
-#import "AliyunTimelineMediaInfo.h"
-
-@implementation AliyunTimelineMediaInfo
-
-@end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/QUTimeline/AliyunTimelineTimeFilterItem.h

@@ -1,18 +0,0 @@
-//
-//  AliyunTimelineTimeFilterItem.h
-//  qusdk
-//
-//  Created by Vienta on 2018/2/26.
-//  Copyright © 2018年 Alibaba Group Holding Limited. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface AliyunTimelineTimeFilterItem : NSObject
-
-@property (nonatomic, assign) CGFloat startTime;
-@property (nonatomic, assign) CGFloat endTime;
-@property (nonatomic, strong) UIColor *displayColor;
-@property (nonatomic, strong) id obj;
-
-@end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/QUTimeline/AliyunTimelineTimeFilterItem.m

@@ -1,23 +0,0 @@
-//
-//  AliyunTimelineTimeFilterItem.m
-//  qusdk
-//
-//  Created by Vienta on 2018/2/26.
-//  Copyright © 2018年 Alibaba Group Holding Limited. All rights reserved.
-//
-
-#import "AliyunTimelineTimeFilterItem.h"
-#import "UIColor+AlivcHelper.h"
-#import "AlivcMacro.h"
-
-@implementation AliyunTimelineTimeFilterItem
-- (instancetype)init
-{
-    self = [super init];
-    if (self) {
-        _displayColor = [UIColor colorWithHexString:@"0x3CF2FF" alpha:0.7];
-        
-    }
-    return self;
-}
-@end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/QUTimeline/AliyunTimelineView.h

@@ -1,229 +0,0 @@
-//
-//  AliyunTimelineView.h
-//  QPSDKCore
-//
-//  Created by Vienta on 2016/11/25.
-//  Copyright © 2016年 lyle. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "AliyunTimelineItem.h"
-#import "AliyunTimelineMediaInfo.h"
-#import "AliyunTimelineFilterItem.h"
-#import "AliyunTimelineTimeFilterItem.h"
-
-@protocol AliyunTimelineViewDelegate;
-
-@interface AliyunTimelineView : UIView
-
-/**
- 代理
- */
-@property (nonatomic, weak) id<AliyunTimelineViewDelegate> delegate;
-
-
-/**
- 区域编辑 - 左边的滑动块图片对应的名称
- */
-@property (nonatomic, copy) NSString *leftPinchImageName;
-
-/**
- 区域编辑 - 右边的滑动块图片对应的名称
- */
-@property (nonatomic, copy) NSString *rightPinchImageName;
-
-/**
- 区域编辑 - 背景图片
- */
-@property (nonatomic, copy) NSString *pinchBgImageName;
-
-/**
- 中间指针的颜色
- */
-@property (nonatomic, strong) UIColor *indicatorColor;
-
-/**
- 区域编辑 - 左右滑动拉出区域的背景颜色
- */
-@property (nonatomic, strong) UIColor *pinchBgColor;
-
-
-/**
- 总的实际的时间
- */
-@property (nonatomic, assign) CGFloat actualDuration;
-
-
-/**
- 第一帧图片
- */
-@property (nonatomic, strong) UIImage *coverImage;
-
-/**
- 同步获取第一帧图片
-
- @return 图片
- */
-- (UIImage *)getCoverImageSync;
-/**
- 装载数据，用来显示
-
- @param clips 媒体片段
- @param segment 段长（指的是一个屏幕宽度的视频时长  单位：s）
- @param photos 一个段长上需要显示的图片个数 默认为8
- */
-- (void)setMediaClips:(NSArray<AliyunTimelineMediaInfo *> *)clips segment:(CGFloat)segment photosPersegent:(NSInteger)photos;
-
-/**
- 获取当前时间指针所指向的时间
-
- @return 时间
- */
-- (CGFloat)getCurrentTime;
-
-/**
- 视频播放过程中，传入当前播放的时间，导航条进行相应的展示
-
- @param time 当前播放时间
- */
-- (void)seekToTime:(CGFloat)time;
-
-
-/**
- 取消当前控件行为 例如：在滑动时，调用此方法则不再滑动
- */
-- (void)cancel;
-
-/**
- 添加显示元素 （例如加动图后，需要构建timelineItem对象，并且传入用来显示）
-
- @param timelineItem 显示元素
- */
-- (void)addTimelineItem:(AliyunTimelineItem *)timelineItem;
-
-/**
- 删除显示元素
-
- @param timelineItem 显示元素
- */
-- (void)removeTimelineItem:(AliyunTimelineItem *)timelineItem;
-
-/**
- 传入Timeline进入编辑
-
- @param timelineItem timelineItem
- */
-- (void)editTimelineItem:(AliyunTimelineItem *)timelineItem;
-
-/**
- timelineView编辑完成
- */
-- (void)editTimelineComplete;
-
-/**
- 从vid获取AliyunTimelineItem对象
-
- @param obj obj
- @return AliyunTimelineItem
- */
-- (AliyunTimelineItem *)getTimelineItemWithOjb:(id)obj;
-
-/**
- 动效滤镜的显示元素
- 添加元素
-
- @param filterItem 动效滤镜元素
- */
-- (void)addTimelineFilterItem:(AliyunTimelineFilterItem *)filterItem;
-
-/**
- 更新进度
-
- @param filterItem 动效滤镜
- */
-- (void)updateTimelineFilterItems:(AliyunTimelineFilterItem *)filterItem;
-
-/**
- 删除动效滤镜显示元素
-
- @param filterItem 动效滤镜元素
- */
-- (void)removeTimelineFilterItem:(AliyunTimelineFilterItem *)filterItem;
-
-/**
- 删除最后一个滤镜显示元素
- */
-- (void)removeLastFilterItemFromTimeline;
-
-/**
- 删除所有的动效元素
- */
-- (void)removeAllFilterItemFromTimeline;
-/**
- 时间特效的显示元素
-
- @param timeFilterItem 时间特效元素
- */
-- (void)addTimelineTimeFilterItem:(AliyunTimelineTimeFilterItem *)timeFilterItem;
-
-/**
- 删除时间特效元素
-
- @param timeFilterItem 时间特效元素
- */
-- (void)removeTimelineTimeFilterItem:(AliyunTimelineTimeFilterItem *)timeFilterItem;
-
-- (void)removeAllTimelineTimeFilterItem;
-
-/**
- 更新透明度
-
- @param alpha 透明度
- */
-- (void)updateTimelineViewAlpha:(CGFloat)alpha;
-
-
-/**
- 停止滑动
- */
-- (void)stopSlid;
-
-@end
-
-
-
-
-@protocol AliyunTimelineViewDelegate <NSObject>
-/**
- 回调拖动的item对象（在手势结束时发生）
-
- @param item timeline对象
- */
-- (void)timelineDraggingTimelineItem:(AliyunTimelineItem *)item;
-
-
-/**
- 回调timeline开始被手动滑动
- */
-- (void)timelineBeginDragging;
-
-- (void)timelineDraggingAtTime:(CGFloat)time;
-
-- (void)timelineEndDraggingAndDecelerate:(CGFloat)time;
-
-- (void)timelineCurrentTime:(CGFloat)time duration:(CGFloat)duration;
-
-/**
- 调节覆盖时长的拖动事件
-
- @param time 当前时间
- */
-- (void)timelineEditDraggingAtTime:(CGFloat)time;
-
-
-
-@end
-
-
-
-

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoEdit/Controller/AliyunEditViewController.m

@@ -31,10 +31,6 @@
 //公用类相关
 #import "AliyunDBHelper.h"
 #import "AliyunPathManager.h"
-#import "AliyunTimelineItem.h"
-#import "AliyunTimelineMediaInfo.h"
-#import "AliyunTimelineView.h"
-
 #import "AliyunCoverPickViewController.h"
 #import "AliyunPublishService.h"
 
@@ -54,13 +50,6 @@
 
 #import "RainbowPlanet-Swift.h"
 
-//用户操作事件，目前特效里长按特效和缩略图滑动互斥，长按特效优先
-typedef NS_ENUM(NSInteger, AliyunEditUserEvent) {
-    AliyunEditUserEvent_None,             //当前用户无操作
-    AliyunEditUserEvent_Effect_LongPress, //特效长按
-    AliyunEditUserEvent_Effect_Slider,    //特效缩略图滑动
-};
-
 typedef enum : NSUInteger {
     AlivcEditVCStatus_Normal = 0, //播放或者暂停状态 - 非编辑状态
     AlivcEditVCStatus_Edit,       //编辑状态
@@ -72,7 +61,6 @@ typedef enum : NSUInteger {
 AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDelegate>
 
 @property(nonatomic, strong) UIView *movieView;
-@property(nonatomic, strong) AliyunTimelineView *currentTimelineView;
 @property(nonatomic, strong) UIButton *backgroundTouchButton;
 @property(nonatomic, strong) UILabel *currentTimeLabel;
 @property(nonatomic, strong) UILabel *totalTimeLabel;
@@ -90,10 +78,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
 @property(nonatomic, strong) AliyunEffectFilterView *filterView;
 @property (nonatomic, strong) UIView *rateViewWithDim;
 
-/**
- 用户操作的记录
- */
-@property(nonatomic, assign) AliyunEditUserEvent userAction;
 
 /**
  保存的时间特效
@@ -112,11 +96,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
 @property(nonatomic, assign) BOOL exportFinished;
 @property(nonatomic, assign) BOOL exportFailed;
 
-/**
- 是否是编辑时间的拖动动作
- */
-@property(nonatomic, assign) BOOL isEidtTuchAction;
-
 @property(nonatomic, assign) CGSize outputSize;
 @property(nonatomic, strong) AliyunCustomFilter *filter;
 
@@ -150,8 +129,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
     BOOL _prePlaying; //是：播放中，否：不在播放中
     BOOL _tryResumeWhenBack; //本界面的基础上跳转其他界面，回来的时候，尝试继续播放
     AliyunEffectFilter *_processAnimationFilter;
-    AliyunTimelineFilterItem *_processAnimationFilterItem;
-    
 }
 
 #pragma mark - System
@@ -379,8 +356,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
     [super viewWillAppear:animated];
     self.isAppear = YES;
     [[UIApplication sharedApplication]setStatusBarHidden:YES];
-    //为了让导航条播放时长匹配，必须在这里设置时长
-    self.currentTimelineView.actualDuration = [self.player getStreamDuration];
     if (_tryResumeWhenBack) {
         if (!_prePlaying) {
             [self resume];
@@ -564,7 +539,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
 #pragma mark - ButtonAction
 
 - (void)playControlClick:(UIButton *)sender {
-    _isEidtTuchAction = NO;
     [self playButtonTouchedHandle];
 }
 
@@ -703,7 +677,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
         }
         if (self.vcStatus == AlivcEditVCStatus_Edit) { //编辑状态下，app进入前台，手动同步播放器播放进度到缩略图。
             [self play];
-            [self.currentTimelineView seekToTime:[self.player getCurrentTime]];
         }
         if (!_exportFinished && !_exportFailed) {
             [[AliyunPublishService service] exportWithTaskPath:_taskPath
@@ -717,10 +690,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
 - (void)applicationWillResignActive {
     if (self.isAppear) {
         self.isBackground = YES;
-        
-        // app退到后台前先停止滑动，否则播放器状态在特定情境下会出现异常
-        [self.currentTimelineView stopSlid];
-        NSLog(@"\n ++++>程序挂起!");
     }
 }
 
@@ -842,11 +811,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
     if (canEditFrame) {
         [self p_changeUIToEnterEditFrameModeCompletionHandle:completion];
         [self pause];
-        //每次进入编辑模式，同步播放器进度到timelineView
-        [self.currentTimelineView setActualDuration:[self.player
-                getStreamDuration]];
-        CGFloat time = [self.player getCurrentStreamTime];
-        [self.currentTimelineView seekToTime:time];
     } else {
         [self p_presentBackgroundButton];
     }
@@ -865,8 +829,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
               CompletionHandle:(void (^__nullable)(BOOL finished))completion {
     _vcStatus = AlivcEditVCStatus_Normal;
     
-    _isEidtTuchAction = NO;
-    
     CGFloat animationTime = 0.2f;
     UIView *view = [self editViewWithType:type];
     if (view) {
@@ -1137,11 +1099,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
 }
 
 - (void)playProgress:(double)playSec streamProgress:(double)streamSec {
-    if (!_isEidtTuchAction) {
-        // 1.添加动图并且调整遮罩层时，_isEidtTuchAction 为YES为了保持缩略条不动。
-        // 2.添加动图时，如果遮罩层在动，那么对于缩略图来说，他不能动，因为如果2者同时动的话，用户体验不好，所有有这个判断
-        [self.currentTimelineView seekToTime:streamSec];
-    }
     
     self.currentTimeLabel.text = [self stringFromTimeInterval:streamSec];
     
@@ -1150,10 +1107,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
     self.playSlider.value = time;
 }
 
-- (void)seekDidEnd {
-    NSLog(@"seek end");
-}
-
 - (NSString *)stringFromTimeInterval:(NSTimeInterval)interval {
     NSInteger ti = (NSInteger)interval;
     NSInteger seconds = ti % 60;
@@ -1271,71 +1224,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
     [self.navigationController pushViewController:vc animated:YES];
 }
 
-#pragma mark - AliyunTimelineView相关 -
-- (void)addAnimationFilterToTimeline:(AliyunEffectFilter *)animationFilter {
-    AliyunTimelineFilterItem *filterItem = [[AliyunTimelineFilterItem alloc] init];
-    NSLog(@"边缘特效:%f--%f", animationFilter.streamStartTime, animationFilter.streamEndTime);
-    
-    filterItem.startTime = animationFilter.streamStartTime;
-    filterItem.endTime = animationFilter.streamEndTime;
-    
-    NSLog(@"特效结束时间%f--%f", filterItem.startTime, filterItem.endTime);
-    
-    
-    filterItem.obj = animationFilter;
-    [self.currentTimelineView addTimelineFilterItem:filterItem];
-}
-
-- (void)updateAnimationFilterToTimeline:(AliyunEffectFilter *)animationFilter {
-    if (_processAnimationFilterItem == NULL) {
-        _processAnimationFilterItem = [[AliyunTimelineFilterItem alloc] init];
-    }
-    
-    _processAnimationFilterItem.startTime = animationFilter.streamStartTime;
-    _processAnimationFilterItem.endTime = animationFilter.streamEndTime;
-    
-    [self.currentTimelineView updateTimelineFilterItems:_processAnimationFilterItem];
-}
-
-- (void)removeAnimationFilterFromTimeline:(AliyunTimelineFilterItem *)animationFilterItem {
-    [self.currentTimelineView removeTimelineFilterItem:animationFilterItem];
-}
-
-- (void)removeLastAnimtionFilterItemFromTimeLineView {
-    [self.currentTimelineView removeLastFilterItemFromTimeline];
-}
-
-
-#pragma mark - AliyunTimelineViewDelegate -
-
-//时间轴拖动事件
-- (void)timelineBeginDragging {
-    self.userAction = AliyunEditUserEvent_Effect_Slider;
-}
-
-- (void)timelineDraggingAtTime:(CGFloat)time {
-    [self.player seek:time];
-    self.currentTimeLabel.text = [self stringFromTimeInterval:time];
-    [self updateUIAndDataWhenPlayStatusChanged];
-}
-
-- (void)timelineEndDraggingAndDecelerate:(CGFloat)time {
-    _isEidtTuchAction = NO;
-    
-    [self.player seek:time];
-    if (_prePlaying) {
-        [self resume];
-    }
-    self.userAction = AliyunEditUserEvent_None;
-}
-
-- (void)timelineEditDraggingAtTime:(CGFloat)time {
-    _isEidtTuchAction = YES;
-    [self.player seek:time];
-}
-
-
-
 #pragma mark -
 //滤镜
 - (void)filterButtonClicked {
@@ -1456,7 +1344,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
     self.currentTimeFilter = nil;
     [_editor removeTimeFilter];
     [self resume];
-    [_currentTimelineView removeAllTimelineTimeFilterItem];
 }
 
 @end