录制--冗余资源文件清除

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,16 +20,6 @@
  */
 @property (strong, nonatomic) UIImage *musicImage;
 
-/**
- 特效
- */
-@property (strong, nonatomic) UIImage *effectImage;
-
-/**
- 时间特效
- */
-@property (strong, nonatomic) UIImage *timeImage;
-
 /**
  播放对应图片
  */
@@ -40,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,12 +25,9 @@
     _filterImage = [UIImage imageNamed:@"video_ico_filter"];
     
     _musicImage = [UIImage imageNamed:@"video_ico_music"];
-    _effectImage = [AlivcImage imageNamed:@"alivc_svEdit_effect"];
-    _timeImage = [AlivcImage imageNamed:@"alivc_svEdit_time"];
     
-    _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/VideoEdit/Controller/AliyunEditViewController.m

@@ -114,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; //发布按钮
@@ -463,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];
@@ -895,7 +856,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
  根据编辑类型判断这个编辑类型是否能对视频逐帧操作,局部处理
  能的类型整理：
  //音乐 AliyunEditSouceClickTypeMusic
- //字幕 AliyunEditSouceClickTypeSubtitle
  //特效 AliyunEditSouceClickTypeEffect
  //时间特效 AliyunEditSouceClickTypeTimeFilter
  @param type 类型
@@ -1020,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];
@@ -1041,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];
@@ -1334,7 +1290,6 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
 
 //时间轴拖动事件
 - (void)timelineBeginDragging {
-    //    NSLog(@"timelineBeginDragging");
     self.userAction = AliyunEditUserEvent_Effect_Slider;
 }
 
@@ -1352,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/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];
     }