修复bug

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

@@ -32,7 +32,7 @@
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BL2-7v-gYm">
                         <rect key="frame" x="0.0" y="112" width="98" height="14.5"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                        <color key="textColor" red="0.76470588235294112" green="0.77254901960784317" blue="0.77647058823529413" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hc3-Ms-Bhd">

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

@@ -581,7 +581,7 @@ AliyunIExporterCallback, AliyunIPlayerCallback>
         _speedButton = [UIButton buttonWithType:UIButtonTypeCustom];
         _speedButton.backgroundColor = [UIColor clearColor];
         _speedButton.frame  =  CGRectMake(ScreenWidth - 44 - 10, SafeTop + 196, 44, 46);
-        [_speedButton setImage:[UIImage imageNamed:@"video_ico_overturn"] forState:UIControlStateNormal];
+        [_speedButton setImage:[UIImage imageNamed:@"video_ico_speed"] forState:UIControlStateNormal];
         [_speedButton addTarget:self action:@selector(timeButtonClicked) forControlEvents:UIControlEventTouchUpInside];
         [_speedButton setTitle:@"调速" forState:UIControlStateNormal];
         _speedButton.titleLabel.font = [UIFont systemFontOfSize:12];

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoRecord/Controller/AliyunMagicCameraViewController.m

@@ -857,22 +857,44 @@
     }];
 }
 
-- (void)filterButtonClicked {
+
+- (void)filterButtonClicked:(UIButton *)sender {
     self.filterView.isFilter = true;
-    [self hideFilterView:NO];
-    if (self.hideSegmentBlock) {
-        self.hideSegmentBlock(true);
-//        self.magicCameraView.rateView.hidden = true;
+    if (self.filterView.frame.origin.y == ScreenHeight) {
+        [self hideFilterView:false];
+        if (self.hideSegmentBlock) {
+            self.hideSegmentBlock(true);
+            //        self.magicCameraView.rateView.hidden = true;
+        }
+    }else {
+        [self hideFilterView:true];
+        if (self.hideSegmentBlock) {
+            self.hideSegmentBlock(true);
+            //        self.magicCameraView.rateView.hidden = true;
+        }
     }
+    
 }
 
-- (void)beautyButtonClicked {
+
+- (void)beautyButtonClicked:(UIButton *)sender {
+    
+    
     self.filterView.isFilter = false;
-    [self hideFilterView:NO];
-    if (self.hideSegmentBlock) {
-        self.hideSegmentBlock(true);
-        //        self.magicCameraView.rateView.hidden = true;
+    if (self.filterView.frame.origin.y == ScreenHeight) {
+        [self hideFilterView:false];
+        if (self.hideSegmentBlock) {
+            self.hideSegmentBlock(true);
+            //        self.magicCameraView.rateView.hidden = true;
+        }
+    }else {
+        [self hideFilterView:true];
+        if (self.hideSegmentBlock) {
+            self.hideSegmentBlock(true);
+            //        self.magicCameraView.rateView.hidden = true;
+        }
     }
+
 }
 
 

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

@@ -33,12 +33,12 @@
 /**
  滤镜按钮被点击的代理方法
  */
-- (void)filterButtonClicked;
+- (void)filterButtonClicked:(UIButton *)sender;
 
 /**
  没有按钮被点击的代理方法
  */
-- (void)beautyButtonClicked;
+- (void)beautyButtonClicked:(UIButton *)sender;;
 
 /**
  回删按钮被点击的代理方法

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

@@ -573,15 +573,15 @@
     }
 }
 
-- (void)filterButtonClicked:(id)sender {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(filterButtonClicked)]) {
-        [self.delegate filterButtonClicked];
+- (void)filterButtonClicked:(UIButton *)sender {
+    if (self.delegate && [self.delegate respondsToSelector:@selector(filterButtonClicked:)]) {
+        [self.delegate filterButtonClicked:sender];
     }
 }
 
-- (void)beautyButtonClicked:(id)sender {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(beautyButtonClicked)]) {
-        [self.delegate beautyButtonClicked];
+- (void)beautyButtonClicked:(UIButton *)sender {
+    if (self.delegate && [self.delegate respondsToSelector:@selector(beautyButtonClicked:)]) {
+        [self.delegate beautyButtonClicked:sender];
     }
 }
 

RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/video_ico_speed.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "video_ico_speed@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "video_ico_speed@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}