Merge branch 'develop' into feature/jeremy

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -436,11 +436,8 @@
 		BD0E678522A4C23B00B980BA /* ShoppingCartOrderPayFreightCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD0E678422A4C23B00B980BA /* ShoppingCartOrderPayFreightCell.swift */; };
 		BD0F61F822CAFC8B004650FB /* CommunityVideoAuthModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD0F61F722CAFC8B004650FB /* CommunityVideoAuthModel.swift */; };
 		BD0FAA3722C465B900DDFB37 /* AliyunEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BD0FAA3522C465B900DDFB37 /* AliyunEditViewController.m */; };
-		BD0FAA4122C465F500DDFB37 /* AliyunEditButtonsView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD0FAA3A22C465F500DDFB37 /* AliyunEditButtonsView.m */; };
 		BD0FAA4222C465F500DDFB37 /* AliyunEffectTimeFilterView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD0FAA3C22C465F500DDFB37 /* AliyunEffectTimeFilterView.m */; };
-		BD0FAA4322C465F500DDFB37 /* AlivcCoverImageSelectedView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD0FAA3F22C465F500DDFB37 /* AlivcCoverImageSelectedView.m */; };
 		BD0FAA4922C4663100DDFB37 /* AlivcEditItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BD0FAA4622C4663000DDFB37 /* AlivcEditItemModel.m */; };
-		BD0FAA4A22C4663100DDFB37 /* AlivcEditItemManager.m in Sources */ = {isa = PBXBuildFile; fileRef = BD0FAA4822C4663100DDFB37 /* AlivcEditItemManager.m */; };
 		BD0FAA4F22C474D400DDFB37 /* AliyunCoverPickViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BD0FAA4E22C474D400DDFB37 /* AliyunCoverPickViewController.m */; };
 		BD0FAA5322C4750A00DDFB37 /* AliyunCoverPickView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD0FAA5222C4750A00DDFB37 /* AliyunCoverPickView.m */; };
 		BD0FAA5622C4752C00DDFB37 /* AliyunPublishTopView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD0FAA5522C4752C00DDFB37 /* AliyunPublishTopView.m */; };
@@ -1128,16 +1125,10 @@
 		BD0F61F722CAFC8B004650FB /* CommunityVideoAuthModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityVideoAuthModel.swift; sourceTree = "<group>"; };
 		BD0FAA3522C465B900DDFB37 /* AliyunEditViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AliyunEditViewController.m; sourceTree = "<group>"; };
 		BD0FAA3622C465B900DDFB37 /* AliyunEditViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliyunEditViewController.h; sourceTree = "<group>"; };
-		BD0FAA3922C465F500DDFB37 /* AliyunEditButtonsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliyunEditButtonsView.h; sourceTree = "<group>"; };
-		BD0FAA3A22C465F500DDFB37 /* AliyunEditButtonsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AliyunEditButtonsView.m; sourceTree = "<group>"; };
 		BD0FAA3C22C465F500DDFB37 /* AliyunEffectTimeFilterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AliyunEffectTimeFilterView.m; sourceTree = "<group>"; };
 		BD0FAA3D22C465F500DDFB37 /* AliyunEffectTimeFilterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliyunEffectTimeFilterView.h; sourceTree = "<group>"; };
-		BD0FAA3F22C465F500DDFB37 /* AlivcCoverImageSelectedView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AlivcCoverImageSelectedView.m; sourceTree = "<group>"; };
-		BD0FAA4022C465F500DDFB37 /* AlivcCoverImageSelectedView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlivcCoverImageSelectedView.h; sourceTree = "<group>"; };
 		BD0FAA4522C4663000DDFB37 /* AlivcEditItemModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlivcEditItemModel.h; sourceTree = "<group>"; };
 		BD0FAA4622C4663000DDFB37 /* AlivcEditItemModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AlivcEditItemModel.m; sourceTree = "<group>"; };
-		BD0FAA4722C4663000DDFB37 /* AlivcEditItemManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlivcEditItemManager.h; sourceTree = "<group>"; };
-		BD0FAA4822C4663100DDFB37 /* AlivcEditItemManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AlivcEditItemManager.m; sourceTree = "<group>"; };
 		BD0FAA4D22C474D400DDFB37 /* AliyunCoverPickViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliyunCoverPickViewController.h; sourceTree = "<group>"; };
 		BD0FAA4E22C474D400DDFB37 /* AliyunCoverPickViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AliyunCoverPickViewController.m; sourceTree = "<group>"; };
 		BD0FAA5122C4750900DDFB37 /* AliyunCoverPickView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AliyunCoverPickView.h; sourceTree = "<group>"; };
@@ -4320,10 +4311,7 @@
 		BD0FAA3822C465F500DDFB37 /* View */ = {
 			isa = PBXGroup;
 			children = (
-				BD0FAA3922C465F500DDFB37 /* AliyunEditButtonsView.h */,
-				BD0FAA3A22C465F500DDFB37 /* AliyunEditButtonsView.m */,
 				BD0FAA3B22C465F500DDFB37 /* Filter */,
-				BD0FAA3E22C465F500DDFB37 /* Cover */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -4337,20 +4325,9 @@
 			path = Filter;
 			sourceTree = "<group>";
 		};
-		BD0FAA3E22C465F500DDFB37 /* Cover */ = {
-			isa = PBXGroup;
-			children = (
-				BD0FAA4022C465F500DDFB37 /* AlivcCoverImageSelectedView.h */,
-				BD0FAA3F22C465F500DDFB37 /* AlivcCoverImageSelectedView.m */,
-			);
-			path = Cover;
-			sourceTree = "<group>";
-		};
 		BD0FAA4422C4661B00DDFB37 /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				BD0FAA4722C4663000DDFB37 /* AlivcEditItemManager.h */,
-				BD0FAA4822C4663100DDFB37 /* AlivcEditItemManager.m */,
 				BD0FAA4522C4663000DDFB37 /* AlivcEditItemModel.h */,
 				BD0FAA4622C4663000DDFB37 /* AlivcEditItemModel.m */,
 			);
@@ -6034,7 +6011,6 @@
 				BD7AB8432284390B0030646A /* OrderPaySelfPickInfoCell.swift in Sources */,
 				A7D5F26522C118F100F8E9AF /* CMSMemberListModel.swift in Sources */,
 				BD1FC18622B09F9800D55081 /* CommunitySubCommentController.swift in Sources */,
-				BD0FAA4122C465F500DDFB37 /* AliyunEditButtonsView.m in Sources */,
 				BD6122AD22C3638300D3F513 /* AliyunEffectMusicInfo.m in Sources */,
 				A71CAB3E22CAF57500D908A8 /* CardContentUserDisLikeView.swift in Sources */,
 				A7C0FE0222B682DB00BC1E86 /* CommunityFeaturedTopicsHeaderView.swift in Sources */,
@@ -6077,7 +6053,6 @@
 				A7FF1564228C696B00A85748 /* OrderListView.swift in Sources */,
 				A70B2C072284305400B2449F /* ProductModel.swift in Sources */,
 				A72A72BC22321DE000B21995 /* Extension+UIAlertController.swift in Sources */,
-				BD0FAA4322C465F500DDFB37 /* AlivcCoverImageSelectedView.m in Sources */,
 				A71CAB4522CB36EC00D908A8 /* CommunityFollowUserViewModel.swift in Sources */,
 				A7BB68662269B1DD00AB07A2 /* AddressPOIView.swift in Sources */,
 				BDF862A7228E42FA000DEF84 /* OrderApplyRefundController.swift in Sources */,
@@ -6150,7 +6125,6 @@
 				A74322A022B8D1F30017C367 /* MyFollowAndFanViewController.swift in Sources */,
 				BD2FCBE622B2586C0006D974 /* CommunityTagCollectionCell.swift in Sources */,
 				A743229422B88ED30017C367 /* EnumMacro.swift in Sources */,
-				BD0FAA4A22C4663100DDFB37 /* AlivcEditItemManager.m in Sources */,
 				BD1DC6C9228D005000B89C57 /* OrderCreateParameterModel.swift in Sources */,
 				A7BF203422B47E8600396DB3 /* CardContentActionTableViewCell.swift in Sources */,
 				A71AA52622732068008FF1A5 /* SwiftMoyaServiceConfigApi.swift in Sources */,

RainbowPlanet/RainbowPlanet/Model/CommunityModel/CommunityTopicCategoryModel.swift

@@ -40,7 +40,7 @@ class CommunityTopicModel : NSObject, Mappable{
         return CommunityTopicModel()
     }
     required init?(map: Map){}
-    private override init(){}
+    override init(){}
     
     func mapping(map: Map)
     {

RainbowPlanet/RainbowPlanet/Model/ConfigModel/ConfigModel.swift

@@ -11,6 +11,8 @@ class ConfigModel : NSObject, Mappable{
     
     static let shared : ConfigModel = ConfigModel()
     
+    var sharePostBean : Int?
+    var suggestImg: String?
     var findFriendImg : String?
     var orderExpiredTime : String?
     var virus : VirusModel?
@@ -27,6 +29,8 @@ class ConfigModel : NSObject, Mappable{
     
     func mapping(map: Map)
     {
+        sharePostBean <- map["share_post_bean"]
+        suggestImg <- map["suggest_img"]
         findFriendImg <- map["find_friend_img"]
         orderExpiredTime <- map["order_expired_time"]
         virus <- map["virus"]

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/FilterAbout/AlivcEditBottomHeaderView.m

@@ -8,7 +8,6 @@
 
 #import "AlivcEditBottomHeaderView.h"
 #import "AlivcEditIconButton.h"
-#import "AlivcImage.h"
 #import "AlivcMacro.h"
 
 #define AEBH_Icon_Size 40
@@ -36,7 +35,7 @@
 
 -(void)layerSubviews{
     _cancelBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, (CGRectGetHeight(self.bounds)-CGRectGetHeight(self.bounds))/2, CGRectGetHeight(self.bounds), CGRectGetHeight(self.bounds))];
-    [_cancelBtn setImage:[AlivcImage imageNamed:@"shortVideo_edit_close"] forState:UIControlStateNormal];
+    [_cancelBtn setImage:[UIImage imageNamed:@"video_btn_close_white"] forState:UIControlStateNormal];
     [self addSubview:_cancelBtn];
     
     _iconBtn = [[AlivcEditIconButton alloc]initWithFrame:CGRectMake(CGRectGetMaxX(_cancelBtn.frame), (CGRectGetHeight(self.bounds)-AEBH_Icon_Size)/2, CGRectGetWidth(self.bounds)-CGRectGetMaxX(_cancelBtn.frame)*2, AEBH_Icon_Size)];
@@ -45,7 +44,7 @@
     [self addSubview:_iconBtn];
     
     _enterBtn = [[UIButton alloc] initWithFrame:CGRectMake(CGRectGetMaxX(_iconBtn.frame), CGRectGetMinY(_cancelBtn.frame), CGRectGetHeight(_cancelBtn.bounds), CGRectGetHeight(_cancelBtn.bounds))];
-    [_enterBtn setImage:[AlivcImage imageNamed:@"shortVideo_edit_affirm"] forState:UIControlStateNormal];
+    [_enterBtn setImage:[UIImage imageNamed:@"edit_topic_pitchon"] forState:UIControlStateNormal];
     [self addSubview:_enterBtn];
     //        [_iconBtn setImageEdgeInsets:UIEdgeInsetsMake(10, 0, 10, 0)];
 

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/FilterAbout/AliyunEffectFilterView.m

@@ -14,7 +14,6 @@
 #import "AliyunEffectResourceModel.h"
 #import "AlivcEditBottomHeaderView.h"
 #import "AlivcMacro.h"
-#import "AlivcImage.h"
 
 @interface AliyunEffectFilterView()
 
@@ -69,7 +68,7 @@
 - (void)addSubViews {
 
     _headerView = [[AlivcEditBottomHeaderView alloc]initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.bounds), 45)];
-    [_headerView setTitle:@"滤镜" icon:[AlivcImage imageNamed:@"shortVideo_fliter"]];
+    [_headerView setTitle:@"滤镜" icon:[UIImage imageNamed:@"video_ico_filter"]];
     [_headerView hiddenButton];
     [self addSubview:_headerView];
     UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
@@ -168,8 +167,8 @@
         if (indexPath.row == 0) {
             cell.imageView.contentMode = UIViewContentModeCenter;
             cell.imageView.backgroundColor = rgba(255, 255, 255, 0.2);
-            cell.imageView.image = [AlivcImage imageNamed:@"shortVideo_clear"];
-            cell.nameLabel.text = @"无效果";
+            cell.imageView.image = [UIImage imageNamed:@"pic_preload"];
+            cell.nameLabel.text = @"原图";
         }else{
             cell.imageView.contentMode = UIViewContentModeScaleAspectFill;
             cell.imageView.backgroundColor = [UIColor clearColor];

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/MusicPick/AliyunMusicPickViewController.m

@@ -29,7 +29,6 @@
 #import "MBProgressHUD+AlivcHelper.h"
 #import "AliyunResourceRequestManager.h"
 #import "AlivcMacro.h"
-#import "AlivcImage.h"
 
 //缓存远程音乐的文件路径
 #define tmpMusicPath [NSTemporaryDirectory() stringByAppendingString:@"tmpMusicPath"]
@@ -204,10 +203,6 @@
         self.automaticallyAdjustsScrollViewInsets = NO;
     }
     self.view.backgroundColor = [UIColor whiteColor];
-    UIImageView *imageView = [[UIImageView alloc]initWithImage:[AlivcImage imageNamed:@"shortVideo_musicBackground"]];
-    imageView.frame = CGRectMake(0, 0, ScreenWidth, ScreenHeight);
-    //    imageView.contentMode = UIViewContentModeScaleAspectFill;
-    [self.view addSubview:imageView];
     
     UIBlurEffect *blurEffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark];
     UIVisualEffectView *blurEffectView = [[UIVisualEffectView alloc] initWithEffect:blurEffect];

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/MusicPick/View/AliyunMusicPickHeaderView.m

@@ -12,7 +12,6 @@
 #import "UIView+Progress.h"
 #import "AliyunMusicPickModel.h"
 #import "AlivcMacro.h"
-#import "AlivcImage.h"
 
 @interface AliyunMusicPickHeaderView()
 @property (nonatomic,strong) UIView *pieView;
@@ -56,8 +55,7 @@
     self.artistLabel.font = [UIFont systemFontOfSize:12.0f];
     [contentView addSubview:self.artistLabel];
     
-    self.imageView = [[UIImageView alloc] initWithFrame:CGRectMake(ScreenWidth - 36, 24, 16, 16)];
-    self.imageView.image = [AlivcImage imageNamed:@"shortVideo_musicStatus"];
+    self.imageView = [[UIImageView alloc] initWithFrame:CGRectMake(ScreenWidth - 36, 24, 16, 16)];    
     self.imageView.hidden = YES;
     [contentView addSubview:self.imageView];
     

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/MusicPick/View/AliyunMusicPickTopView.m

@@ -8,7 +8,6 @@
 
 #import "AliyunMusicPickTopView.h"
 #import "AlivcMacro.h"
-#import "AlivcImage.h"
 
 @implementation AliyunMusicPickTopView
 
@@ -53,7 +52,7 @@
     
     UIButton *nextButton = [UIButton buttonWithType:(UIButtonTypeCustom)];
     nextButton.frame = CGRectMake(ScreenWidth - SizeWidth(44), 0, SizeWidth(44), CGRectGetHeight(topView.frame));
-    [nextButton setImage:[AlivcImage imageNamed:@"shortVideo_edit_affirm"] forState:UIControlStateNormal];
+    [nextButton setImage:[UIImage imageNamed:@"edit_topic_pitchon"] forState:UIControlStateNormal];
     [nextButton addTarget:self action:@selector(nextButtonAction) forControlEvents:(UIControlEventTouchUpInside)];
     [topView addSubview:nextButton];
     

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/ResourceManager/Views/AliyunEffectFilterCell.h

@@ -10,11 +10,6 @@
 #import "AliyunEffectInfo.h"
 @interface AliyunEffectFilterCell : UICollectionViewCell
 
-/**
- 下载的view
- */
-@property (weak, nonatomic) IBOutlet UIImageView *downloadImageView;
-
 /**
  名称Label
  */
@@ -30,10 +25,6 @@
  */
 @property (weak, nonatomic) IBOutlet UIButton *selectedButton;
 
-/**
- 是否是音效
- */
-@property (assign, nonatomic) BOOL isAudioEffect;
 
 /**
  给cell数据
@@ -42,18 +33,4 @@
  */
 - (void)cellModel:(AliyunEffectInfo *)effectInfo;
 
-/**
- 是否应该显示下载的view
-
- @param flag 是否显示
- */
-- (void)shouldDownload:(BOOL)flag;
-
-/**
- 刷新进度的方法
-
- @param progress 进度（0-1）
- */
-- (void)downloadProgress:(CGFloat)progress;
-
 @end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/ResourceManager/Views/AliyunEffectFilterCell.m

@@ -15,21 +15,11 @@
 
 @interface AliyunEffectFilterCell ()
 
-/**
- MV中的中间黑洞
- */
-@property (weak, nonatomic) IBOutlet UIImageView *mvCenterImageView;
-
 /**
  数据ID
  */
 @property (nonatomic, assign) NSInteger eid;
 
-/**
- 下载进度view
- */
-@property (nonatomic, strong) UIView *pieView;
-
 /**
  数据类型
  */
@@ -44,68 +34,22 @@
     _imageView.layer.cornerRadius = 25;
     _imageView.layer.masksToBounds = YES;
     _imageView.layer.borderColor = AlivcOxRGB(0x00c1de).CGColor;
-    
-
-    self.downloadImageView.backgroundColor = [UIColor clearColor];
-    self.downloadImageView.image = [AlivcImage imageNamed:@"shortVideo_download"];
-    [self addSubview:self.downloadImageView];
-    self.downloadImageView.hidden = YES;
-    
-    _pieView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 50, 50)];
-    [self addSubview:_pieView];
-    _pieView.backgroundColor = [UIColor clearColor];
-    [_pieView pieProgressView].progressColor = [UIColor colorWithRed:27.0/255 green:33.0/255 blue:51.0/255 alpha:0.8] ;
-    _pieView.hidden = YES;
-    
-}
-
-- (void)shouldDownload:(BOOL)flag
-{
-    self.downloadImageView.hidden = flag;
-    if (flag == YES) {
-        self.pieView.hidden = YES;
-    }
 }
 
 - (void)cellModel:(AliyunEffectInfo *)effectInfo {
     self.type = effectInfo.effectType;
     _nameLabel.text = effectInfo.name;
     _eid = effectInfo.eid;
-    if (self.isAudioEffect) {
-        _mvCenterImageView.hidden = YES;
+    
+    _imageView.image = [UIImage imageWithContentsOfFile:[effectInfo localFilterIconPath]];
+    if ((effectInfo.effectType == AliyunEffectTypeSpecialFilter)&&(effectInfo.eid == -1)) {
         _imageView.image = [AlivcImage imageNamed:effectInfo.icon];
-    }else if (effectInfo.effectType == AliyunEffectTypeFilter || effectInfo.effectType == AliyunEffectTypeSpecialFilter) {
-        _mvCenterImageView.hidden = YES;
-        _imageView.image = [UIImage imageWithContentsOfFile:[effectInfo localFilterIconPath]];
-        if ((effectInfo.effectType == AliyunEffectTypeSpecialFilter)&&(effectInfo.eid == -1)) {
-            _imageView.image = [AlivcImage imageNamed:effectInfo.icon];
-        }
-    } else if (effectInfo.effectType == AliyunEffectTypeMV) {
-        if (effectInfo.eid == -1) {
-            _mvCenterImageView.hidden = YES;
-            _imageView.image = [AlivcImage imageNamed:effectInfo.icon];
-        } else {
-            _mvCenterImageView.hidden = NO;
-            _mvCenterImageView.image  = [AlivcImage imageNamed:@"shortVideo_edit_center"];
-            NSURL *url = [NSURL URLWithString:[effectInfo.icon stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
-            
-            if([effectInfo.icon isEqualToString:@"shortVideo_mv_default"]){
-                _imageView.image = [AlivcImage imageNamed:@"shortVideo_mv_default"];
-            }else{
-                NSLog(@"----设置mv图片");
-            }
-            
-            
-        }
     }
 }
 
 - (void)layoutSubviews{
     [super layoutSubviews];
-    self.downloadImageView.frame = CGRectMake(CGRectGetWidth(self.frame) - 16, CGRectGetWidth(self.frame) - 16, 16, 16);
-    _pieView.frame = CGRectMake(0, 0, 50, 50);
-    _pieView.layer.masksToBounds = YES;
-    _pieView.layer.cornerRadius = 50 / 2.0;
+    
 }
 
 /**
@@ -115,20 +59,11 @@
  */
 - (void)setSelected:(BOOL)selected {
     [super setSelected:selected];
-    if (self.type == AliyunEffectTypeSpecialFilter && !self.isAudioEffect) {
+    if (self.type == AliyunEffectTypeSpecialFilter) {
         return;
     }
     self.selectedButton.hidden = !selected;
 
 }
 
-- (void)downloadProgress:(CGFloat)progress
-{
-    _pieView.hidden = NO;
-    [_pieView setPieProgress:progress];
-    if (progress == 1) {
-        _pieView.hidden = YES;
-    }
-}
-
 @end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/ResourceManager/Views/AliyunEffectFilterCell.xib

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -32,24 +31,9 @@
                         <color key="textColor" red="0.76470588235294112" green="0.77254901960784317" blue="0.77647058823529413" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="QTe-6e-hxx">
-                        <rect key="frame" x="40" y="40" width="18" height="18"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="18" id="JId-8z-3y9"/>
-                            <constraint firstAttribute="width" constant="18" id="c92-9d-GHw"/>
-                        </constraints>
-                    </imageView>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="C2e-MY-zbj">
-                        <rect key="frame" x="82" y="82" width="16" height="16"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="16" id="PHo-oD-ktg"/>
-                            <constraint firstAttribute="width" constant="16" id="g9J-X0-Zhi"/>
-                        </constraints>
-                    </imageView>
                     <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hc3-Ms-Bhd">
                         <rect key="frame" x="0.0" y="0.0" width="98" height="98"/>
                         <color key="backgroundColor" red="0.0" green="0.75686274509803919" blue="0.87058823529411766" alpha="1" colorSpace="calibratedRGB"/>
-                        <state key="normal" image="AlivcShortVideoImage.bundle/shortVideo_edit_affirm"/>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
                                 <integer key="value" value="25"/>
@@ -62,12 +46,8 @@
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="uJ7-8S-mmE" secondAttribute="trailing" id="3T1-Xp-ggT"/>
                 <constraint firstAttribute="trailing" secondItem="Hc3-Ms-Bhd" secondAttribute="trailing" id="52T-9U-1kN"/>
-                <constraint firstItem="QTe-6e-hxx" firstAttribute="centerX" secondItem="uJ7-8S-mmE" secondAttribute="centerX" id="AU0-hp-Xju"/>
-                <constraint firstItem="QTe-6e-hxx" firstAttribute="centerY" secondItem="uJ7-8S-mmE" secondAttribute="centerY" id="DUD-Pp-Eee"/>
                 <constraint firstItem="BL2-7v-gYm" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="G2F-WW-MAm"/>
-                <constraint firstAttribute="trailing" secondItem="C2e-MY-zbj" secondAttribute="trailing" id="IpZ-fx-7ag"/>
                 <constraint firstItem="Hc3-Ms-Bhd" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="K8I-pE-ofy"/>
-                <constraint firstItem="BL2-7v-gYm" firstAttribute="top" secondItem="C2e-MY-zbj" secondAttribute="bottom" constant="5" id="RRw-Xz-oHO"/>
                 <constraint firstItem="BL2-7v-gYm" firstAttribute="top" secondItem="Hc3-Ms-Bhd" secondAttribute="bottom" constant="5" id="XlX-eG-5jl"/>
                 <constraint firstItem="BL2-7v-gYm" firstAttribute="top" secondItem="uJ7-8S-mmE" secondAttribute="bottom" constant="5" id="lHV-cz-n2o"/>
                 <constraint firstItem="uJ7-8S-mmE" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="mC4-H4-Aar"/>
@@ -77,16 +57,11 @@
             </constraints>
             <size key="customSize" width="98" height="119"/>
             <connections>
-                <outlet property="downloadImageView" destination="C2e-MY-zbj" id="dSS-uE-j6J"/>
                 <outlet property="imageView" destination="uJ7-8S-mmE" id="4as-zD-5Sv"/>
-                <outlet property="mvCenterImageView" destination="QTe-6e-hxx" id="POO-wq-CnM"/>
                 <outlet property="nameLabel" destination="BL2-7v-gYm" id="Qdl-0n-m6G"/>
                 <outlet property="selectedButton" destination="Hc3-Ms-Bhd" id="B4R-s1-jeJ"/>
             </connections>
             <point key="canvasLocation" x="-100" y="110"/>
         </collectionViewCell>
     </objects>
-    <resources>
-        <image name="AlivcShortVideoImage.bundle/shortVideo_edit_affirm" width="16" height="16"/>
-    </resources>
 </document>

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/UIConfig/AlivcEditUIConfig.h

@@ -20,52 +20,6 @@
  */
 @property (strong, nonatomic) UIImage *musicImage;
 
-/**
- 动图
- */
-@property (strong, nonatomic) UIImage *pasterImage;
-
-/**
- 字幕
- */
-@property (strong, nonatomic) UIImage *captionImage;
-
-/**
- MV
- */
-@property (strong, nonatomic) UIImage *mvImage;
-
-/**
- 音效
- */
-@property (strong, nonatomic) UIImage *soundImage;
-
-/**
- 特效
- */
-@property (strong, nonatomic) UIImage *effectImage;
-
-/**
- 时间特效
- */
-@property (strong, nonatomic) UIImage *timeImage;
-
-/**
- 转场
- */
-@property (strong, nonatomic) UIImage *translationImage;
-
-/**
- 封面选择
- */
-@property (strong, nonatomic) UIImage *coverImage;
-
-/**
- 涂鸦
- */
-@property (strong, nonatomic) UIImage *paintImage;
-
-
 /**
  播放对应图片
  */
@@ -76,10 +30,4 @@
  */
 @property (strong, nonatomic) UIImage *pauseImage;
 
-/**
- 编辑完成对应图片
- */
-@property (strong, nonatomic) UIImage *finishImage;
-
-
 @end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/UIConfig/AlivcEditUIConfig.m

@@ -7,8 +7,6 @@
 //
 
 #import "AlivcEditUIConfig.h"
-#import "AlivcImage.h"
-
 
 @implementation AlivcEditUIConfig
 - (instancetype)init{
@@ -27,19 +25,9 @@
     _filterImage = [UIImage imageNamed:@"video_ico_filter"];
     
     _musicImage = [UIImage imageNamed:@"video_ico_music"];
-    _pasterImage = [AlivcImage imageNamed:@"alivc_svEdit_paster"];
-    _captionImage = [AlivcImage imageNamed:@"alivc_svEdit_subtitle"];
-    _mvImage = [AlivcImage imageNamed:@"alivc_svEdit_mv"];
-    _soundImage =[AlivcImage imageNamed:@"alivc_svEdit_audio"];
-    _effectImage = [AlivcImage imageNamed:@"alivc_svEdit_effect"];
-    _timeImage = [AlivcImage imageNamed:@"alivc_svEdit_time"];
-    _translationImage = [AlivcImage imageNamed:@"alivc_svEdit_translation"];
-    _paintImage = [AlivcImage imageNamed:@"alivc_svEdit_paint"];
-    _coverImage = [AlivcImage imageNamed:@"alivc_svEdit_cover"];
     
-    _playImage = [AlivcImage imageNamed:@"alivc_shortVideo_play"];
-    _pauseImage = [AlivcImage imageNamed:@"alivc_svEdit_pause"];
-    _finishImage = [AlivcImage imageNamed:@"shortVideo_finishButtonNormal"];
+    _playImage = [UIImage imageNamed:@"music_btn_play"];
+    _pauseImage = [UIImage imageNamed:@"music_btn_pause"];
     
 }
 @end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/UIConfig/AlivcRecordUIConfig.h

@@ -25,11 +25,6 @@
  */
 @property (strong, nonatomic) UIImage *switchCameraImage;
 
-/**
- 完成的按钮图片 - 可用
- */
-@property (strong, nonatomic) UIImage *finishImageEnable;
-
 /**
  拍摄按钮图片 - 未开始拍摄
  */
@@ -45,9 +40,5 @@
  */
 @property (strong, nonatomic) UIImage *deleteImage;
 
-/**
- 拍摄中红点对应的图片
- */
-@property (strong, nonatomic) UIImage *dotImage;
 
 @end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/UIConfig/AlivcRecordUIConfig.m

@@ -7,7 +7,6 @@
 //
 
 #import "AlivcRecordUIConfig.h"
-#import "AlivcImage.h"
 
 @implementation AlivcRecordUIConfig
 
@@ -26,13 +25,11 @@
     
     _switchCameraImage = [UIImage imageNamed:@"video_ico_overturn"];
     _musicImage  = [UIImage imageNamed:@"video_ico_music"];
-    _filterImage = [UIImage imageNamed:@"video_ico_filter"];    
-    _finishImageEnable = [AlivcImage imageNamed:@"shortVideo_finishButtonNormal"];
+    _filterImage = [UIImage imageNamed:@"video_ico_filter"];
     
     _videoShootImageNormal = [UIImage imageNamed:@"video_btn_shoot"];
     _videoShootImageShooting = [UIImage imageNamed:@"video_btn_pause"];
-    _deleteImage = [AlivcImage imageNamed:@"shortVideo_deleteButton"];
-    _dotImage = [AlivcImage imageNamed:@"shortVideo_dot"];
+    _deleteImage = [UIImage imageNamed:@"video_btn_delete"];
 }
 
 @end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoCoverPick/Controller/AliyunCoverPickViewController.m

@@ -7,18 +7,16 @@
 //
 
 #import "AliyunCoverPickViewController.h"
-#import "AVC_ShortVideo_Config.h"
 #import "AliyunCoverPickView.h"
 #import "AliyunPublishTopView.h"
 #import "AlivcMacro.h"
 #import "RainbowPlanet-Swift.h"
 
-@interface AliyunCoverPickViewController () <AliyunPublishTopViewDelegate,
-                                             AliyunCoverPickViewDelegate>
+@interface AliyunCoverPickViewController () <AliyunPublishTopViewDelegate, AliyunCoverPickViewDelegate>
 @property(nonatomic, strong) AliyunPublishTopView *topView;
 @property(nonatomic, strong) UIImageView *coverView;
 @property(nonatomic, strong) AliyunCoverPickView *pickView;
-
+@property(nonatomic, strong) UILabel *tipLabel;
 @end
 
 @implementation AliyunCoverPickViewController
@@ -58,12 +56,10 @@
                     initWithFrame:CGRectMake(0, 0, ScreenWidth, StatusBarHeight + 44)];
     [self.topView.cancelButton setImage:[UIImage imageNamed:@"navbar_back_white"]
                                forState:UIControlStateNormal];
-    [self.topView.cancelButton setTitle:nil forState:UIControlStateNormal];
-    [self.topView.finishButton setTitle:@"下一步" forState:UIControlStateNormal];
     self.topView.delegate = self;
     self.topView.delegate = self;
     [self.view addSubview:self.topView];
-
+    
     self.pickView = [[AliyunCoverPickView alloc]
       initWithFrame:CGRectMake(28,
                                ScreenHeight - SafeBottom - pickWith / 8 - 30,
@@ -72,7 +68,13 @@
     self.pickView.videoPath = _videoPath;
     self.pickView.outputSize = _outputSize;
     [self.view addSubview:self.pickView];
-    self.view.backgroundColor = [AliyunIConfig config].backgroundColor;
+    
+    self.tipLabel = [[UILabel alloc] initWithFrame:CGRectMake((ScreenWidth-100)/2, ScreenHeight - SafeBottom - pickWith / 8 - 30 - 20 - 20, 100, 20)];
+    self.tipLabel.text = @"滑动选择封面";
+    self.tipLabel.textColor = [UIColor whiteColor];
+    self.tipLabel.textAlignment = NSTextAlignmentCenter;
+    self.tipLabel.font = [UIFont systemFontOfSize:13];
+    [self.view addSubview:self.tipLabel];
 }
 
 #pragma mark - top view delegate

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoCoverPick/View/AliyunPublishTopView.m

@@ -7,70 +7,65 @@
 //
 
 #import "AliyunPublishTopView.h"
-#import "AVC_ShortVideo_Config.h"
 #import "AlivcMacro.h"
 
 @implementation AliyunPublishTopView
 
 - (instancetype)initWithFrame:(CGRect)frame {
-  self = [super initWithFrame:frame];
-  if (self) {
-    [self setupTopViews];
-  }
-  return self;
+    self = [super initWithFrame:frame];
+    if (self) {
+        [self setupTopViews];
+    }
+    return self;
 }
 
 - (instancetype)initWithCoder:(NSCoder *)aDecoder {
-  self = [super initWithCoder:aDecoder];
-  if (self) {
-    [self setupTopViews];
-  }
-  return self;
+    self = [super initWithCoder:aDecoder];
+    if (self) {
+        [self setupTopViews];
+    }
+    return self;
 }
 
 - (void)setupTopViews {
 
-  UIView *topView = [[UIView alloc] init];
-  topView.frame = CGRectMake(0, 0, ScreenWidth, self.frame.size.height);
-  topView.backgroundColor = [UIColor clearColor];
-  [self addSubview:topView];
+    UIView *topView = [[UIView alloc] init];
+    topView.frame = CGRectMake(0, 0, ScreenWidth, self.frame.size.height);
+    topView.backgroundColor = [UIColor clearColor];
+    [self addSubview:topView];
 
-  UIButton *backButton = [UIButton buttonWithType:(UIButtonTypeCustom)];
-  backButton.frame = CGRectMake(4, StatusBarHeight, 44, 44);
-  [backButton setTitle:NSLocalizedString(@"cancel_camera_import", nil)
-              forState:(UIControlStateNormal)];
-  [backButton setTitleColor:[UIColor whiteColor]
-                   forState:(UIControlStateNormal)];
-  backButton.titleLabel.font = [UIFont systemFontOfSize:14.f];
-  backButton.titleLabel.textAlignment = NSTextAlignmentCenter;
-  [backButton addTarget:self
+    UIButton *backButton = [UIButton buttonWithType:(UIButtonTypeCustom)];
+    backButton.frame = CGRectMake(4, StatusBarHeight, 44, 44);
+    [backButton addTarget:self
                  action:@selector(backButtonAction)
        forControlEvents:(UIControlEventTouchUpInside)];
-  self.cancelButton = backButton;
-  [topView addSubview:backButton];
+    self.cancelButton = backButton;
+    [topView addSubview:backButton];
 
-  UIButton *nextButton = [UIButton buttonWithType:(UIButtonTypeCustom)];
-  nextButton.frame = CGRectMake(ScreenWidth - 44 - 4, StatusBarHeight, 44, 44);
-  [nextButton setTitle:NSLocalizedString(@"finish_subtitle_edit", nil)
-              forState:(UIControlStateNormal)];
-  [nextButton setTitleColor:[UIColor whiteColor]
-                   forState:(UIControlStateNormal)];
-  [nextButton setTitleColor:rgba(110, 118, 139, 1)
-                   forState:(UIControlStateDisabled)];
-  nextButton.titleLabel.font = [UIFont systemFontOfSize:14.f];
-  nextButton.titleLabel.textAlignment = NSTextAlignmentCenter;
-  [nextButton addTarget:self
+    UIButton *nextButton = [UIButton buttonWithType:UIButtonTypeCustom];
+    nextButton.frame = CGRectMake(ScreenWidth - 14 - 64, SafeTop + 8, 64, 26);    
+    [nextButton setTitle:@"下一步" forState:(UIControlStateNormal)];
+    nextButton.titleLabel.font = [UIFont systemFontOfSize:13 weight:UIFontWeightMedium];
+    [nextButton setTitleColor:[UIColor whiteColor]
+                     forState:UIControlStateNormal];
+    [nextButton setTitleColor:rgba(110, 118, 139, 1)
+                     forState:(UIControlStateDisabled)];
+    nextButton.backgroundColor = RGBToColor(98, 204, 116);
+    nextButton.layer.cornerRadius = 13;
+    nextButton.layer.masksToBounds = YES;
+    
+    [nextButton addTarget:self
                  action:@selector(nextButtonAction)
        forControlEvents:(UIControlEventTouchUpInside)];
-  self.finishButton = nextButton;
-  [topView addSubview:nextButton];
+    self.finishButton = nextButton;
+    [topView addSubview:nextButton];
 }
 
 - (void)backButtonAction {
-  [self.delegate cancelButtonClicked];
+    [self.delegate cancelButtonClicked];
 }
 
 - (void)nextButtonAction {
-  [self.delegate finishButtonClicked];
+    [self.delegate finishButtonClicked];
 }
 @end

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

@@ -13,9 +13,7 @@
 #import "AlivcDefine.h"
 #import "AliyunEditViewController.h"
 #import <AliyunVideoSDKPro/AVAsset+AliyunSDKInfo.h>
-#import <AliyunVideoSDKPro/AliyunAlphaAction.h>
 #import <AliyunVideoSDKPro/AliyunAudioRecorder.h>
-#import <AliyunVideoSDKPro/AliyunCustomAction.h>
 #import <AliyunVideoSDKPro/AliyunEditor.h>
 #import <AliyunVideoSDKPro/AliyunEffectMusic.h>
 #import <AliyunVideoSDKPro/AliyunErrorCode.h>
@@ -43,7 +41,6 @@
 //其它
 #import "AVAsset+VideoInfo.h"
 #import "AliAssetImageGenerator.h"
-#import "AlivcCoverImageSelectedView.h"
 #import "AliyunCustomFilter.h"
 #import "AliyunEffectFilterView.h"
 #import "AliyunEffectTimeFilterView.h"
@@ -52,7 +49,6 @@
 #import "AlivcAlertView.h"
 
 //底部UI适配
-#import "AlivcEditItemManager.h"
 #import "AlivcEditItemModel.h"
 
 //用户操作事件，目前特效里长按特效和缩略图滑动互斥，长按特效优先
@@ -70,26 +66,23 @@ typedef enum : NSUInteger {
 
 // TODO:此类需再抽一层,否则会太庞大
 @interface AliyunEditViewController () <
-AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDelegate ,AlivcCoverImageSelectedViewDelegate,AliyunEffectTimeFilterDelegate>
+AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDelegate ,AliyunEffectTimeFilterDelegate>
 
 @property(nonatomic, strong) UIView *movieView;
 @property(nonatomic, strong) AliyunTimelineView *currentTimelineView;
 @property(nonatomic, strong) UIButton *backgroundTouchButton;
 @property(nonatomic, strong) UILabel *currentTimeLabel;
 @property(nonatomic, strong) UIButton *playButton;
-@property(nonatomic, strong) UIView *playButtonConView;
 
 @property(nonatomic, strong) AliyunEditor *editor;
 @property(nonatomic, strong) id<AliyunIPlayer> player;
 @property(nonatomic, strong) id<AliyunIExporter> exporter;
 @property(nonatomic, strong) id<AliyunIClipConstructor> clipConstructor;
-@property(nonatomic, strong) AliyunEffectImage *paintImage;
 @property (nonatomic, assign) BOOL hasUesedintelligentFilter;
 
 @property (nonatomic, strong) AliyunEffectFilterInfo *intelligentFilter;
 @property(nonatomic, strong) AliyunEffectFilterView *filterView;
 @property(nonatomic, strong) AliyunEffectTimeFilterView *timeFilterView;
-@property(nonatomic, strong) AlivcCoverImageSelectedView *coverSelectedView;
 
 /**
  用户操作的记录
@@ -106,12 +99,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
  */
 @property(nonatomic, strong) AliyunEffectTimeFilter *currentTimeFilter;
 
-
-/**
- 封面图
- */
-@property(nonatomic, strong, nullable) UIImage *coverImage;
-
 @property(nonatomic, strong) AliyunDBHelper *dbHelper;
 
 @property(nonatomic, assign) BOOL isExporting;
@@ -127,10 +114,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
 @property(nonatomic, assign) CGSize outputSize;
 @property(nonatomic, strong) AliyunCustomFilter *filter;
 
-@property(nonatomic, strong) UIButton *saveButton; //保存
-
-@property(nonatomic, strong) UIButton *cancelButton; //取消
-
 @property(nonatomic, strong) UIButton *backButton; //返回按钮
 
 @property(nonatomic, strong) UIButton *publishButton; //发布按钮
@@ -468,18 +451,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
     return _timeFilterView;
 }
 
-//封面选择
-- (AlivcCoverImageSelectedView *)coverSelectedView {
-    if (!_coverSelectedView) {
-        _coverSelectedView = [[AlivcCoverImageSelectedView alloc]
-                              initWithFrame:CGRectMake(0, ScreenHeight, ScreenWidth, 120)];
-        _coverSelectedView.timelineView = [self getOneTimeLineView];
-        _coverSelectedView.delegate = self;
-        [self.view addSubview:_coverSelectedView];
-    }
-    return _coverSelectedView;
-}
-
 - (AliyunDBHelper *)dbHelper {
     if (!_dbHelper) {
         _dbHelper = [[AliyunDBHelper alloc] init];
@@ -488,41 +459,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
     return _dbHelper;
 }
 
-- (UIButton *)saveButton {
-    if (!_saveButton) {
-        _saveButton = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_saveButton setTitle:[@"保存" localString] forState:UIControlStateNormal];
-        [_saveButton setTitle:[@"保存" localString]
-                     forState:UIControlStateSelected];
-        [_saveButton setTitleColor:[UIColor whiteColor]
-                          forState:UIControlStateNormal];
-        [_saveButton setTitleColor:[UIColor whiteColor]
-                          forState:UIControlStateSelected];
-        [_saveButton addTarget:self
-                        action:@selector(apply)
-              forControlEvents:UIControlEventTouchUpInside];
-    }
-    return _saveButton;
-}
-
-- (UIButton *)cancelButton {
-    if (!_cancelButton) {
-        _cancelButton = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_cancelButton setTitle:[@"取消" localString]
-                       forState:UIControlStateNormal];
-        [_cancelButton setTitle:[@"取消" localString]
-                       forState:UIControlStateSelected];
-        [_cancelButton setTitleColor:[UIColor whiteColor]
-                            forState:UIControlStateNormal];
-        [_cancelButton setTitleColor:[UIColor whiteColor]
-                            forState:UIControlStateSelected];
-        [_cancelButton addTarget:self
-                          action:@selector(cancel)
-                forControlEvents:UIControlEventTouchUpInside];
-    }
-    return _cancelButton;
-}
-
 - (UIButton *)backButton {
     if (!_backButton) {
         _backButton = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -740,11 +676,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
 - (void)applicationWillResignActive {
     if (self.isAppear) {
         self.isBackground = YES;
-        // 特效正在添加过程中
-        if (_processAnimationFilter &&
-            _editSouceClickType == AliyunEditSouceClickTypeEffect) {
-            [self pause];
-        }
         
         // app退到后台前先停止滑动，否则播放器状态在特定情境下会出现异常
         [self.currentTimelineView stopSlid];
@@ -925,8 +856,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
  根据编辑类型判断这个编辑类型是否能对视频逐帧操作,局部处理
  能的类型整理：
  //音乐 AliyunEditSouceClickTypeMusic
- //动图 AliyunEditSouceClickTypePaster
- //字幕 AliyunEditSouceClickTypeSubtitle
  //特效 AliyunEditSouceClickTypeEffect
  //时间特效 AliyunEditSouceClickTypeTimeFilter
  @param type 类型
@@ -934,13 +863,7 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
  */
 - (BOOL)isEditFrameType:(AliyunEditSouceClickType)type {
     if (type == AliyunEditSouceClickTypeMusic ||
-        type == AliyunEditSouceClickTypePaster ||
-        type == AliyunEditSouceClickTypeCaption ||
-        type == AliyunEditSouceClickTypeEffect ||
-        type == AliyunEditSouceClickTypeTimeFilter ||
-        type == AliyunEditSouceClickTypeTranslation ||
-        type == AliyunEditSouceClickTypePaint ||
-        type == AliyunEditSouceClickTypeCover) {
+        type == AliyunEditSouceClickTypeTimeFilter) {
         return YES;
     }
     return NO;
@@ -963,9 +886,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
         case AliyunEditSouceClickTypeTimeFilter:
             return self.timeFilterView;
             break;
-        case AliyunEditSouceClickTypeCover:
-            return self.coverSelectedView;
-            break;
         default:
             break;
     }
@@ -1060,8 +980,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
  让界面进入能编辑视频帧的模式
  */
 - (void)p_changeUIToEnterEditFrameModeCompletionHandle:(void (^__nullable)(BOOL finished))completion {
-    [self.saveButton sizeToFit];
-    [self.cancelButton sizeToFit];
     self.backButton.hidden = YES;
     self.publishButton.hidden = YES;
     CGRect editFrame = [self editStatusFrameMovieView];
@@ -1081,8 +999,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
  界面退出编辑模式
  */
 - (void)p_changeUIToQuitEditFrameMode {
-    [self.saveButton removeFromSuperview];
-    [self.cancelButton removeFromSuperview];
     self.backButton.hidden = NO;
     self.publishButton.hidden = NO;
     [self p_setMovieViewFrameToPlayStatusWithAnimation];
@@ -1374,7 +1290,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
 
 //时间轴拖动事件
 - (void)timelineBeginDragging {
-    //    NSLog(@"timelineBeginDragging");
     self.userAction = AliyunEditUserEvent_Effect_Slider;
 }
 
@@ -1392,14 +1307,12 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
     if (_prePlaying) {
         [self resume];
     }
-    //    NSLog(@"短视频编辑播放器测试:结束滑动预览视图更新%.2f",time);
     self.userAction = AliyunEditUserEvent_None;
 }
 
 - (void)timelineEditDraggingAtTime:(CGFloat)time {
     _isEidtTuchAction = YES;
     [self.player seek:time];
-    //    NSLog(@"timelineEditDraggingAtTime");
 }
 
 

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoEdit/Model/AlivcEditItemManager.h

@@ -1,22 +0,0 @@
-//
-//  AlivcEditItemManager.h
-//  AliyunVideoClient_Entrance
-//
-//  Created by Zejian Cai on 2018/12/26.
-//  Copyright © 2018年 Alibaba. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@class AlivcEditItemModel;
-@class AlivcEditUIConfig;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface AlivcEditItemManager : NSObject
-
-+ (NSArray <AlivcEditItemModel*>*)defaultModelsWithUIConfig:(AlivcEditUIConfig *)uiConfig;
-
-@end
-
-NS_ASSUME_NONNULL_END

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoEdit/Model/AlivcEditItemManager.m

@@ -1,122 +0,0 @@
-//
-//  AlivcEditItemManager.m
-//  AliyunVideoClient_Entrance
-//
-//  Created by Zejian Cai on 2018/12/26.
-//  Copyright © 2018年 Alibaba. All rights reserved.
-//
-
-#import "AlivcEditItemManager.h"
-#import "AlivcEditItemModel.h"
-#import "AlivcEditUIConfig.h"
-#import "AVC_ShortVideo_Config.h"
-#import "NSString+AlivcHelper.h"
-#import "AlivcDefine.h"
-#import "AlivcMacro.h"
-
-@implementation AlivcEditItemManager
-+ (NSArray <AlivcEditItemModel*>*)defaultModelsWithUIConfig:(AlivcEditUIConfig *)uiConfig{
-    NSMutableArray *resultArray = [[NSMutableArray alloc]init];
-    NSInteger defaultAllValue = 10;
-    AlivcOutputProductType productType = kAlivcProductType;
-    if (productType == AlivcOutputProductTypeSmartVideo) {
-        defaultAllValue = 11;
-    }
-    for (NSInteger i = 0; i < defaultAllValue; i++) {
-        AlivcEditItemModel *model =[AlivcEditItemManager configModelsWithIndex:i withUIConfig:uiConfig];
-        if (model) {
-            [resultArray addObject:model];
-        }else{
-            NSLog(@"#Wrong:model can't be null");
-        }
-    }
-    return (NSArray *)resultArray;
-}
-
-+ (AlivcEditItemModel *)configModelsWithIndex:(NSInteger)index withUIConfig:(AlivcEditUIConfig *)uiConfig{
-    AlivcEditItemModel *model = [[AlivcEditItemModel alloc]initWithType:index];
-    switch (model.itemType) {
-        case AliyunEditSouceClickTypeFilter:
-        {
-            model.title = [@"滤镜" localString];
-            model.showImage = uiConfig.filterImage;
-            model.selString = @"filterButtonClicked:";
-        }
-            break;
-        case AliyunEditSouceClickTypeMusic:
-        {
-            model.title = [@"音乐" localString];
-            model.showImage = uiConfig.musicImage;
-            model.selString = @"musicButtonClicked:";
-        }
-            break;
-        case AliyunEditSouceClickTypePaster:
-        {
-            model.title = [@"动图" localString];
-            model.showImage = uiConfig.pasterImage;
-            model.selString = @"pasterButtonClicked:";
-        }
-            break;
-        case AliyunEditSouceClickTypeCaption:
-        {
-            model.title = [@"字幕" localString];
-            model.showImage = uiConfig.captionImage;
-            model.selString = @"subtitleButtonClicked:";
-        }
-            break;
-        case AliyunEditSouceClickTypeMV:
-        {
-            model.title = [@"MV" localString];
-            model.showImage = uiConfig.mvImage;
-            model.selString = @"mvButtonClicked:";
-        }
-            break;
-        case AliyunEditSouceClickTypeEffect:
-        {
-            model.title = [@"特效" localString];
-            model.showImage = uiConfig.effectImage;
-            model.selString = @"effectButtonClicked:";
-        }
-            break;
-        case AliyunEditSouceClickTypeTimeFilter:
-        {
-            model.title = [@"变速" localString];
-            model.showImage = uiConfig.timeImage;
-            model.selString = @"timeButtonClicked:";
-        }
-            break;
-        case AliyunEditSouceClickTypeTranslation:
-        {
-            model.title = [@"转场" localString];
-            model.showImage = uiConfig.translationImage;
-            model.selString = @"translationButtonCliked:";
-        }
-            break;
-        case AliyunEditSouceClickTypePaint:
-        {
-            model.title = [@"涂鸦" localString];
-            model.showImage = uiConfig.paintImage;
-            model.selString = @"paintButtonClicked:";
-        }
-            break;
-        case AliyunEditSouceClickTypeCover:
-        {
-            model.title = [@"封面" localString];
-            model.showImage = uiConfig.coverImage;
-            model.selString = @"coverButtonClicked:";
-        }
-            break;
-        case AliyunEditSouceClickTypeEffectSound:
-        {
-            model.title = [@"音效" localString];
-            model.showImage = uiConfig.soundImage;
-            model.selString = @"soundButtonClicked:";
-        }
-            break;
-        default:
-            return nil;
-    }
-    return model;
-}
-
-@end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoEdit/Model/AlivcEditItemModel.h

@@ -14,27 +14,13 @@ NS_ASSUME_NONNULL_BEGIN
 typedef NS_ENUM(NSInteger,AliyunEditSouceClickType){
     AliyunEditSouceClickTypeFilter = 0,
     AliyunEditSouceClickTypeMusic,
-    AliyunEditSouceClickTypePaster,
-    AliyunEditSouceClickTypeCaption,
-    AliyunEditSouceClickTypeMV,
-    AliyunEditSouceClickTypeEffectSound,
-    AliyunEditSouceClickTypeEffect,
-    AliyunEditSouceClickTypeTimeFilter,
-    AliyunEditSouceClickTypeTranslation,
-    AliyunEditSouceClickTypePaint,
-    AliyunEditSouceClickTypeCover
+    AliyunEditSouceClickTypeTimeFilter
 };
 
 @interface AlivcEditItemModel : NSObject
 
 - (instancetype)initWithType:(AliyunEditSouceClickType)itemType;
 
-@property (strong, nonatomic) NSString *title;
-
-@property (strong, nonatomic) NSString *selString;
-
-@property (strong, nonatomic, nullable) UIImage *showImage;
-
 @property (assign, nonatomic, readonly) AliyunEditSouceClickType itemType;
 
 @end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoEdit/View/AliyunEditButtonsView.h

@@ -1,69 +0,0 @@
-//
-//  AliyunEditButtonsView.h
-//  AliyunVideo
-//
-//  Created by Vienta on 2017/3/6.
-//  Copyright (C) 2010-2017 Alibaba Group Holding Limited. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-@class AlivcEditItemModel;
-
-//素材类别 1: 字体 2: 动图 3:imv 4:滤镜 5:音乐 6:字幕 7:动效滤镜
-typedef NS_ENUM(NSInteger, AliyunEditMaterialType) {
-    AliyunEditMaterialTypeFont      = 1,
-    AliyunEditMaterialTypePaster    = 2,
-    AliyunEditMaterialTypeMV        = 3,
-    AliyunEditMaterialTypeFilter    = 4,
-    AliyunEditMaterialTypeMusic     = 5,
-    AliyunEditMaterialTypeTime      = 6,
-};
-
-
-@protocol AliyunEditButtonsViewDelegate <NSObject>
-//滤镜
-- (void)filterButtonClicked:(AliyunEditMaterialType)type;
-
-//音乐
-- (void)musicButtonClicked;
-
-//动图
-- (void)pasterButtonClicked;
-
-//字幕
-- (void)subtitleButtonClicked;
-
-//MV
-- (void)mvButtonClicked:(AliyunEditMaterialType)type;
-
-//音效
-- (void)soundButtonClicked;
-
-//特效
-- (void)effectButtonClicked;
-
-//时间特效
-- (void)timeButtonClicked;
-
-//转场
-- (void)translationButtonCliked;
-
-//涂鸦
-- (void)paintButtonClicked;
-
-//封面选择
-- (void)coverButtonClicked;
-@end
-
-
-
-@interface AliyunEditButtonsView : UIView
-
-- (instancetype)initWithModels:(NSArray <AlivcEditItemModel *>*)models;
-
-@property (nonatomic, weak) id<AliyunEditButtonsViewDelegate> delegate;
-
-@end
-
-
-

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoEdit/View/AliyunEditButtonsView.m

@@ -1,170 +0,0 @@
-//
-//  AliyunEditButtonsView.m
-//  AliyunVideo
-//
-//  Created by Vienta on 2017/3/6.
-//  Copyright (C) 2010-2017 Alibaba Group Holding Limited. All rights reserved.
-//
-
-#import "AliyunEditButtonsView.h"
-#import "AlivcEditItemModel.h"
-#import "AlivcMacro.h"
-
-@implementation AliyunEditButtonsView
-
-- (instancetype)initWithModels:(NSArray<AlivcEditItemModel *> *)models{
-    self = [super initWithFrame:CGRectMake(0, ScreenHeight - 70 - SafeBottom, ScreenWidth, 70)];
-    if(self){
-        [self addButtonsWithModels:models];
-        self.backgroundColor = [UIColor clearColor];
-    }
-    return self;
-}
-/**
- 逻辑：在一个屏幕的宽度下，固定放5个半的图标，超出部分以滑动的形式显示
- */
-- (void)addButtonsWithModels:(NSArray<AlivcEditItemModel *> *)models{
-    //滤镜 音乐 动图 字幕 MV 特效 时间特效 转场 涂鸦
-    AlivcEditItemModel *firstModel = models.firstObject;
-    
-    //2个按钮中心之间的间距
-    CGFloat devide = ScreenWidth / 5.5;
-    //基础参数
-//    UIImage *image = firstModel.showImage;
-//    CGFloat buttonWidth = image.size.width;
-    CGFloat buttonWidth = 40;
-    CGFloat labelHeight = 30;
-    CGFloat buttonHeight = buttonWidth + labelHeight;
-
-    //强制宽度等于屏幕宽
-    CGRect frame = self.frame;
-    if (frame.size.width != ScreenWidth) {
-        frame.size.width = ScreenWidth;
-        self.frame = frame;
-    }
-    //添加scrollView
-    UIScrollView *scrollView = [[UIScrollView alloc]initWithFrame:CGRectMake(0, 0, frame.size.width, frame.size.height)];
-    scrollView.contentSize = CGSizeMake(devide * models.count, frame.size.height);
-    scrollView.showsHorizontalScrollIndicator = NO;
-    [self addSubview:scrollView];
-    
-    for (int idx = 0; idx < [models count]; idx++) {
-        AlivcEditItemModel *itemModel = models[idx];
-        UIImage *image = itemModel.showImage;
-        NSString *selName = itemModel.selString;
-        NSString *title = itemModel.title;
-        SEL sel = NSSelectorFromString(selName);
-        UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
-        btn.frame = CGRectMake(0, 0, buttonWidth, buttonHeight);
-        [btn addTarget:self action:sel forControlEvents:UIControlEventTouchUpInside];
-        
-        if(image){
-            [btn setImage:image forState:UIControlStateNormal];
-        }
-        
-        [btn setTitle:title forState:UIControlStateNormal];
-        [btn.titleLabel setFont:[UIFont systemFontOfSize:13]];
-        [btn.titleLabel sizeToFit];
-        
-        //
-        CGFloat titleHeight = btn.titleLabel.intrinsicContentSize.height;
-//        CGFloat titleWidth = btn.titleLabel.intrinsicContentSize.width;
-        CGFloat imageWidth = btn.imageView.frame.size.width;
-        CGFloat imageHeight = btn.imageView.frame.size.height;
-        btn.imageEdgeInsets = UIEdgeInsetsMake(0, 0, titleHeight + 8, 0);
-        btn.titleEdgeInsets = UIEdgeInsetsMake(imageHeight + 8, -imageWidth, 0, 0);
-        [scrollView addSubview:btn];
-        btn.center = CGPointMake((idx+0.5) * devide, frame.size.height / 2);
-        //设置阴影
-        [btn setExclusiveTouch:YES];
-        btn.layer.shadowColor = [UIColor grayColor].CGColor;
-        btn.layer.shadowOpacity = 0.5;
-        btn.layer.shadowOffset = CGSizeMake(1, 1);
-        
-    }
-}
-
-//滤镜
-- (void)filterButtonClicked:(id)sender {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(filterButtonClicked:)]) {
-        [self.delegate filterButtonClicked:AliyunEditMaterialTypeFilter];
-    }
-    
-}
-
-//音乐
-- (void)musicButtonClicked:(id)sender {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(musicButtonClicked)]) {
-        [self.delegate musicButtonClicked];
-    }
-    
-}
-
-//动图
-- (void)pasterButtonClicked:(id)sender {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(pasterButtonClicked)]) {
-        [self.delegate pasterButtonClicked];
-    }
-   
-}
-
-//字幕
-- (void)subtitleButtonClicked:(id)sender {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(subtitleButtonClicked)]) {
-        [self.delegate subtitleButtonClicked];
-    }
-    
-}
-
-//mv
-- (void)mvButtonClicked:(id)sender {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(mvButtonClicked:)]) {
-        [self.delegate mvButtonClicked:AliyunEditMaterialTypeMV];
-    }
-    
-}
-
-//音效
--(void)soundButtonClicked:(id)sender{
-    if (self.delegate && [self.delegate respondsToSelector:@selector(soundButtonClicked)]) {
-        [self.delegate soundButtonClicked];
-    }
-}
-
-//特效
-- (void)effectButtonClicked:(id)sender {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(effectButtonClicked)]) {
-        [self.delegate effectButtonClicked];
-    }
-    
-}
-
-//时间特效
-- (void)timeButtonClicked:(id)sender {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(timeButtonClicked)]) {
-        [self.delegate timeButtonClicked];
-    }
-}
-
-//转场
-- (void)translationButtonCliked:(id)sender {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(translationButtonCliked)]) {
-        [self.delegate translationButtonCliked];
-    }
-   
-}
-
-//涂鸦
-- (void)paintButtonClicked:(id)sender {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(paintButtonClicked)]) {
-        [self.delegate paintButtonClicked];
-    }
-}
-
-//封面选择
-- (void)coverButtonClicked:(id)sender {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(coverButtonClicked)]) {
-        [self.delegate coverButtonClicked];
-    }
-}
-@end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoEdit/View/Cover/AlivcCoverImageSelectedView.h

@@ -1,34 +0,0 @@
-//
-//  AlivcCoverImageSelectedView.h
-//  AliyunVideoClient_Entrance
-//
-//  Created by Zejian Cai on 2018/12/26.
-//  Copyright © 2018年 Alibaba. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-@class AliyunTimelineView;
-@class AlivcCoverImageSelectedView;
-
-@protocol AlivcCoverImageSelectedViewDelegate <NSObject>
-
-- (void)cancelCoverImageSelectedView:(AlivcCoverImageSelectedView *)view;
-
-- (void)applyCoverImageSelectedView:(AlivcCoverImageSelectedView *)view;
-
-@end
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface AlivcCoverImageSelectedView : UIView
-
-/**
- 设置缩略图。frame自适应，不用设置frame
- */
-@property (nonatomic, strong) AliyunTimelineView *timelineView;
-
-@property (nonatomic, weak) id <AlivcCoverImageSelectedViewDelegate> delegate;
-
-@end
-
-NS_ASSUME_NONNULL_END

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoEdit/View/Cover/AlivcCoverImageSelectedView.m

@@ -1,118 +0,0 @@
-//
-//  AlivcCoverImageSelectedView.m
-//  AliyunVideoClient_Entrance
-//
-//  Created by Zejian Cai on 2018/12/26.
-//  Copyright © 2018年 Alibaba. All rights reserved.
-//
-
-#import "AlivcCoverImageSelectedView.h"
-#import "AlivcEditBottomHeaderView.h"
-#import "AliyunTimelineView.h"
-#import "AlivcImage.h"
-#import "AlivcMacro.h"
-
-@interface AlivcCoverImageSelectedView ()
-/**
- 占位view
- */
-@property (nonatomic, strong) UIView *timeLinePalletView;
-
-@end
-
-@implementation AlivcCoverImageSelectedView
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
-- (instancetype)init{
-    self = [self initWithFrame:CGRectZero];
-    if (self) {
-        
-    }
-    return self;
-}
-
-
-- (instancetype)initWithFrame:(CGRect)frame{
-    self = [super initWithFrame:frame];
-    if (self) {
-        [self configBaseUI];
-    }
-    return self;
-}
-
-- (void)configBaseUI{
-    [self addSubview:self.timeLinePalletView];
-    
-    AlivcEditBottomHeaderView *headerView = [[AlivcEditBottomHeaderView alloc]initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.bounds), 45)];
-    
-    [headerView setTitle:@"封面" icon:[AlivcImage imageNamed:@"shortVideo_edit_timeFliter_coverImage"]];
-    [self addSubview:headerView];
-    __weak typeof(self)weakSelf = self;
-    [headerView bindingApplyOnClick:^{
-        [weakSelf apply];
-    } cancelOnClick:^{
-        [weakSelf noApply];
-    }];
-    
-    self.backgroundColor = [UIColor blackColor];
-}
-
-/**
- 重写timelineView的set方法
- 
- @param timelineView 进度条
- */
--(void)setTimelineView:(AliyunTimelineView *)timelineView{
-    _timelineView = timelineView;
-    if (_timelineView) {
-        _timelineView.frame = CGRectMake(0, 15, CGRectGetWidth(_timeLinePalletView.frame), CGRectGetHeight(_timeLinePalletView.frame)-10);
-        _timelineView.backgroundColor = self.backgroundColor;
-        [_timeLinePalletView addSubview:_timelineView];
-    }
-}
-
-
-/**
- 占位view的懒加载
- 
- @return 占位view
- */
-- (UIView *)timeLinePalletView{
-    if (!_timeLinePalletView) {
-        _timeLinePalletView = [[UIView alloc]initWithFrame:CGRectMake(0, 44, ScreenWidth, 40)];
-        _timeLinePalletView.backgroundColor = [UIColor clearColor];
-        if (_timelineView) {
-            _timelineView.frame = CGRectMake(0, 5, CGRectGetWidth(_timeLinePalletView.frame), CGRectGetHeight(_timeLinePalletView.frame)-10);
-            _timelineView.backgroundColor = self.backgroundColor;
-            [_timeLinePalletView addSubview:_timelineView];
-        }
-    }
-    return _timeLinePalletView;
-}
-
-#pragma mark - Response
-/**
- 点击应用的触发方法
- */
-- (void)apply{
-    if ([self.delegate respondsToSelector:@selector(applyCoverImageSelectedView:)]) {
-        [self.delegate applyCoverImageSelectedView:self];
-    }
-}
-
-/**
- 点击取消的触发方法
- */
-- (void)noApply{
-    if ([self.delegate respondsToSelector:@selector(cancelCoverImageSelectedView:)]) {
-        [self.delegate cancelCoverImageSelectedView:self];
-    }
-}
-@end

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoEdit/View/Filter/AliyunEffectTimeFilterView.m

@@ -123,7 +123,6 @@
     self.tipLabel = tipLabel;
     
     AlivcEditBottomHeaderView *headerView = [[AlivcEditBottomHeaderView alloc]initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.bounds), 45)];
-    [headerView setTitle:@"变速" icon:[AlivcImage imageNamed:@"shortVideo_edit_timeFliter_nameButton"]];
     [self addSubview:headerView];
     __weak typeof(self)weakSelf = self;
     [headerView bindingApplyOnClick:^{
@@ -164,7 +163,7 @@
         btn.layer.cornerRadius = 25;
         [btn setExclusiveTouch:YES];
         [btn setImage:[AlivcImage imageNamed:buttonNormalImages[i]] forState:UIControlStateNormal];
-        [btn setImage:[AlivcImage imageNamed:@"shortVideo_edit_affirm"] forState:UIControlStateSelected];
+        [btn setImage:[UIImage imageNamed:@"edit_topic_pitchon"] forState:UIControlStateSelected];
         btn.backgroundColor = rgba(255, 255, 255, 0.2);
         SEL action = NSSelectorFromString(buttonActions[i]);
         [btn addTarget:self action:action forControlEvents:UIControlEventTouchUpInside];
@@ -198,7 +197,6 @@
     [firstTip setTitle:@"点击可添加效果" forState:UIControlStateNormal];
     firstTip.titleEdgeInsets = UIEdgeInsetsMake(5, 0, 8, 0);
     firstTip.titleLabel.font = [UIFont systemFontOfSize:14];
-    [firstTip setBackgroundImage:[self resizableImage:@"shortVideo_edit_firstTip"]  forState:UIControlStateNormal];
     firstTip.hidden = YES;
     [firstTip addTarget:self action:@selector(removeFirstTip) forControlEvents:UIControlEventTouchUpInside];
     [self addSubview:firstTip];

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoRecord/View/AliyunMagicCameraView.m

@@ -11,6 +11,7 @@
 #import "AlivcUIConfig.h"
 #import "AlivcRecordFocusView.h"
 #import "AlivcMacro.h"
+#import "UIColor+AlivcHelper.h"
 
 #define finishBtnX  (CGRectGetWidth(self.bounds) - 58 - 10)
 
@@ -39,7 +40,7 @@
 /**
  时间显示控件旁边的小圆点，正在录制的时候显示
  */
-@property (nonatomic, strong) UIImageView *dotImageView;
+@property (nonatomic, strong) UIView *timeDotView;
 
 /**
  短视频拍摄界面UI配置
@@ -131,10 +132,13 @@
     self.timeLabel.center = CGPointMake(ScreenWidth / 2+10, ScreenHeight - 152-SafeBottom);
     [self addSubview:self.timeLabel];
     
-    self.dotImageView = [[UIImageView alloc] initWithImage:_uiConfig.dotImage];
-    self.dotImageView.center = CGPointMake(ScreenWidth/2-30, self.timeLabel.center.y);
-    self.dotImageView.hidden = YES;
-    [self addSubview:self.dotImageView];
+    self.timeDotView = [[UIView alloc] initWithFrame:CGRectMake(-10, -10, 8, 8)];
+    self.timeDotView.center = CGPointMake(ScreenWidth/2-30, self.timeLabel.center.y);
+    self.timeDotView.hidden = YES;
+    self.timeDotView.backgroundColor = [UIColor colorWithHexString:@"#FF5E5E"];
+    self.timeDotView.layer.cornerRadius = 4;
+    self.timeDotView.layer.masksToBounds = YES;
+    [self addSubview:self.timeDotView];
     
     [self addSubview:self.progressView];
     
@@ -166,7 +170,7 @@
                 _progressView.videoCount++;
                 self.circleBtn.transform = CGAffineTransformScale(self.transform, 1.32, 1.32);
                 [self.circleBtn setImage:_uiConfig.videoShootImageShooting forState:UIControlStateNormal];
-                self.dotImageView.hidden = NO;
+                self.timeDotView.hidden = NO;
                 [_delegate recordButtonRecordVideo];
             }
             break;
@@ -214,7 +218,7 @@
     if (self.progressView.videoCount > 0 ) {
         self.deleteButton.hidden = NO;
     }
-    self.dotImageView.hidden = YES;
+    self.timeDotView.hidden = YES;
 }
 
 
@@ -238,7 +242,7 @@
 - (void)destroy
 {
     self.timeLabel.text = @"";
-    self.dotImageView.hidden = YES;
+    self.timeDotView.hidden = YES;
 }
 
 #pragma mark - MagicCameraScrollViewDelegate
@@ -459,7 +463,7 @@
 - (void)resetRecordButtonUI{
     self.circleBtn.transform = CGAffineTransformIdentity;
     [self.circleBtn setImage:_uiConfig.videoShootImageNormal forState:UIControlStateNormal];
-    self.dotImageView.hidden = YES;
+    self.timeDotView.hidden = YES;
     if([AliyunIConfig config].recordType == AliyunIRecordActionTypeClick){
         [self.circleBtn setTitle:@"" forState:UIControlStateNormal];
     }