美颜做了一半

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -238,12 +238,14 @@
 		A7811C87231AB49800C2D8DE /* CommunityReportTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7811C86231AB49800C2D8DE /* CommunityReportTableViewCell.swift */; };
 		A7811C89231ACC3900C2D8DE /* OtherPersonalCenterReportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7811C88231ACC3900C2D8DE /* OtherPersonalCenterReportView.swift */; };
 		A7811C8C231AD26300C2D8DE /* OtherPersonalCenterReportSureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7811C8B231AD26300C2D8DE /* OtherPersonalCenterReportSureView.swift */; };
+		A7811C98231F503800C2D8DE /* CommunityRecommnendSuperViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7811C97231F503800C2D8DE /* CommunityRecommnendSuperViewController.swift */; };
+		A7811C9A231F908D00C2D8DE /* CommunityRecommendCategorysModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7811C99231F908C00C2D8DE /* CommunityRecommendCategorysModel.swift */; };
 		A7811CA5231FB13700C2D8DE /* KSTriangleIndicatorButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A7811C9F231FB13700C2D8DE /* KSTriangleIndicatorButton.m */; };
 		A7811CA6231FB13700C2D8DE /* KSIndicatorLabelControl.m in Sources */ = {isa = PBXBuildFile; fileRef = A7811CA0231FB13700C2D8DE /* KSIndicatorLabelControl.m */; };
 		A7811CA7231FB13700C2D8DE /* KSTriangleDisclosureIndicator.m in Sources */ = {isa = PBXBuildFile; fileRef = A7811CA2231FB13700C2D8DE /* KSTriangleDisclosureIndicator.m */; };
 		A7811CAA231FB89600C2D8DE /* KSMediaPickerViewAlbumCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7811CA9231FB89600C2D8DE /* KSMediaPickerViewAlbumCell.swift */; };
-		A7811C98231F503800C2D8DE /* CommunityRecommnendSuperViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7811C97231F503800C2D8DE /* CommunityRecommnendSuperViewController.swift */; };
-		A7811C9A231F908D00C2D8DE /* CommunityRecommendCategorysModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7811C99231F908C00C2D8DE /* CommunityRecommendCategorysModel.swift */; };
+		A7811CB523220C8C00C2D8DE /* AliyunBeautyLevelCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A7811CB323220C8C00C2D8DE /* AliyunBeautyLevelCollectionViewCell.m */; };
+		A7811CB623220C8C00C2D8DE /* AliyunBeautyLevelCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A7811CB423220C8C00C2D8DE /* AliyunBeautyLevelCollectionViewCell.xib */; };
 		A7824AFB2271EA2600ABA381 /* SelfMentionContactsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7824AFA2271EA2600ABA381 /* SelfMentionContactsListView.swift */; };
 		A7824AFD2271EAC900ABA381 /* SelfMentionContactsListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7824AFC2271EAC900ABA381 /* SelfMentionContactsListTableViewCell.swift */; };
 		A7824B002271F0DD00ABA381 /* EditSelfMentionContactsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7824AFF2271F0DD00ABA381 /* EditSelfMentionContactsViewController.swift */; };
@@ -846,6 +848,8 @@
 		A7811C86231AB49800C2D8DE /* CommunityReportTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityReportTableViewCell.swift; sourceTree = "<group>"; };
 		A7811C88231ACC3900C2D8DE /* OtherPersonalCenterReportView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OtherPersonalCenterReportView.swift; sourceTree = "<group>"; };
 		A7811C8B231AD26300C2D8DE /* OtherPersonalCenterReportSureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OtherPersonalCenterReportSureView.swift; sourceTree = "<group>"; };
+		A7811C97231F503800C2D8DE /* CommunityRecommnendSuperViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityRecommnendSuperViewController.swift; sourceTree = "<group>"; };
+		A7811C99231F908C00C2D8DE /* CommunityRecommendCategorysModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommunityRecommendCategorysModel.swift; sourceTree = "<group>"; };
 		A7811C9F231FB13700C2D8DE /* KSTriangleIndicatorButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSTriangleIndicatorButton.m; sourceTree = "<group>"; };
 		A7811CA0231FB13700C2D8DE /* KSIndicatorLabelControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSIndicatorLabelControl.m; sourceTree = "<group>"; };
 		A7811CA1231FB13700C2D8DE /* KSTriangleDisclosureIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSTriangleDisclosureIndicator.h; sourceTree = "<group>"; };
@@ -854,8 +858,9 @@
 		A7811CA4231FB13700C2D8DE /* KSTriangleIndicatorButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSTriangleIndicatorButton.h; sourceTree = "<group>"; };
 		A7811CA8231FB16800C2D8DE /* KSLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSLayout.h; sourceTree = "<group>"; };
 		A7811CA9231FB89600C2D8DE /* KSMediaPickerViewAlbumCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KSMediaPickerViewAlbumCell.swift; sourceTree = "<group>"; };
-		A7811C97231F503800C2D8DE /* CommunityRecommnendSuperViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityRecommnendSuperViewController.swift; sourceTree = "<group>"; };
-		A7811C99231F908C00C2D8DE /* CommunityRecommendCategorysModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommunityRecommendCategorysModel.swift; sourceTree = "<group>"; };
+		A7811CB223220C8C00C2D8DE /* AliyunBeautyLevelCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AliyunBeautyLevelCollectionViewCell.h; sourceTree = "<group>"; };
+		A7811CB323220C8C00C2D8DE /* AliyunBeautyLevelCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AliyunBeautyLevelCollectionViewCell.m; sourceTree = "<group>"; };
+		A7811CB423220C8C00C2D8DE /* AliyunBeautyLevelCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AliyunBeautyLevelCollectionViewCell.xib; sourceTree = "<group>"; };
 		A7824AFA2271EA2600ABA381 /* SelfMentionContactsListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelfMentionContactsListView.swift; sourceTree = "<group>"; };
 		A7824AFC2271EAC900ABA381 /* SelfMentionContactsListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelfMentionContactsListTableViewCell.swift; sourceTree = "<group>"; };
 		A7824AFF2271F0DD00ABA381 /* EditSelfMentionContactsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditSelfMentionContactsViewController.swift; sourceTree = "<group>"; };
@@ -4638,6 +4643,9 @@
 				BD61229222C3605B00D3F513 /* AliyunEffectFilterCell.h */,
 				BD61229022C3605B00D3F513 /* AliyunEffectFilterCell.m */,
 				BD61229122C3605B00D3F513 /* AliyunEffectFilterCell.xib */,
+				A7811CB223220C8C00C2D8DE /* AliyunBeautyLevelCollectionViewCell.h */,
+				A7811CB323220C8C00C2D8DE /* AliyunBeautyLevelCollectionViewCell.m */,
+				A7811CB423220C8C00C2D8DE /* AliyunBeautyLevelCollectionViewCell.xib */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -4967,6 +4975,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A7811CB623220C8C00C2D8DE /* AliyunBeautyLevelCollectionViewCell.xib in Resources */,
 				A7F3069122E1698400DC7917 /* json_Image_0.png in Resources */,
 				A75B787C22E07A51007B986A /* shoppingMallModuleTabbar.json in Resources */,
 				A7D77DE922DDBEF70048D5F6 /* RedemptionAreaModule.xcassets in Resources */,
@@ -5503,6 +5512,7 @@
 				BD2E5D4922D87ED900534603 /* MXSlider.m in Sources */,
 				BDA45BFF22E45EBC009DE548 /* PublishUploadProgressView.swift in Sources */,
 				A7BA1902230EA80000E3B969 /* TGCaculateNumberTool.m in Sources */,
+				A7811CB523220C8C00C2D8DE /* AliyunBeautyLevelCollectionViewCell.m in Sources */,
 				BD61229722C3605C00D3F513 /* AliyunEffectPrestoreManager.m in Sources */,
 				A7DAB33322D881F5005B964E /* H5RouterModuleType.swift in Sources */,
 				A7EF3E132303EB7C001E4D26 /* GuidePageView.swift in Sources */,

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

@@ -8,6 +8,7 @@
 
 #import "AliyunEffectFilterView.h"
 #import "AliyunEffectFilterCell.h"
+#import "AliyunBeautyLevelCollectionViewCell.h"
 #import "AliyunEffectInfo.h"
 #import "AliyunDBHelper.h"
 #import "AVC_ShortVideo_Config.h"
@@ -22,11 +23,18 @@
  */
 @property (nonatomic, strong) UICollectionView *collectionView;
 
+@property (nonatomic, strong) UICollectionView *collectionView1;
+
 /**
  数据模型数组
  */
 @property (nonatomic, strong) NSMutableArray *dataArray;
 
+/**
+ 数据模型数组
+ */
+@property (nonatomic, strong) NSMutableArray *dataArray1;
+
 /**
  FMDB的封装类
  */
@@ -67,18 +75,19 @@
  */
 - (void)addSubViews {
 
-    _headerView = [[AlivcEditBottomHeaderView alloc]initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.bounds), 48)];
-    [_headerView setTitle:@"滤镜" icon:nil];
-    [_headerView hiddenButton];
-    [self addSubview:_headerView];
+//    _headerView = [[AlivcEditBottomHeaderView alloc]initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.bounds), 48)];
+//    [_headerView setTitle:@"滤镜" icon:nil];
+//    [_headerView hiddenButton];
+//    [self addSubview:_headerView];
+    
     UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
     layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
-    layout.itemSize = CGSizeMake(52, 80);
-    layout.sectionInset = UIEdgeInsetsMake(5, 14, 20, 14);
+    layout.itemSize = CGSizeMake(53, 53);
+    layout.sectionInset = UIEdgeInsetsMake(0, 14, 0, 14);
     layout.minimumInteritemSpacing = 15;
     layout.minimumLineSpacing = 15;
     
-    _collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 62.5, ScreenWidth, 102) collectionViewLayout:layout];
+    _collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 30, ScreenWidth, 83) collectionViewLayout:layout];
     _collectionView.backgroundColor = [UIColor clearColor];
     _collectionView.showsHorizontalScrollIndicator = NO;
     [_collectionView registerNib:[UINib nibWithNibName:@"AliyunEffectFilterCell" bundle:nil] forCellWithReuseIdentifier:@"AliyunEffectFilterCell"];
@@ -86,8 +95,24 @@
     _collectionView.dataSource = (id<UICollectionViewDataSource>)self;
     _collectionView.delegate = (id<UICollectionViewDelegate>)self;
     [self addSubview:_collectionView];
-    
     [self reloadDataWithEffectType:AliyunEffectTypeFilter];
+
+    
+    UICollectionViewFlowLayout *layout1 = [[UICollectionViewFlowLayout alloc] init];
+    layout1.scrollDirection = UICollectionViewScrollDirectionHorizontal;
+    layout1.itemSize = CGSizeMake(44*ScaleWidth, 44*ScaleWidth);
+    layout1.sectionInset = UIEdgeInsetsMake(0, 37.5*ScaleWidth, 0, 37.5*ScaleWidth);
+    layout1.minimumInteritemSpacing = 20*ScaleWidth;
+    layout1.minimumLineSpacing = 20*ScaleWidth;
+    
+    _collectionView1 = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 47, ScreenWidth, 44*ScaleWidth) collectionViewLayout:layout];
+    _collectionView1.backgroundColor = [UIColor clearColor];
+    _collectionView1.showsHorizontalScrollIndicator = NO;
+    [_collectionView1 registerNib:[UINib nibWithNibName:@"AliyunBeautyLevelCollectionViewCell" bundle:nil] forCellWithReuseIdentifier:@"AliyunBeautyLevelCollectionViewCell"];
+    _collectionView1.dataSource = (id<UICollectionViewDataSource>)self;
+    _collectionView1.delegate = (id<UICollectionViewDelegate>)self;
+    [self addSubview:_collectionView1];
+    
 }
 
 
@@ -99,7 +124,7 @@
 - (void)setHideTop:(BOOL)hideTop{
     _hideTop = hideTop;
     _headerView.hidden = hideTop;
-    _collectionView.frame = CGRectMake(0, 20, ScreenWidth, 102);
+    _collectionView.frame = CGRectMake(0, 30, ScreenWidth, 83);
     
 }
 
@@ -139,40 +164,54 @@
 }
 
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
-    return _dataArray.count;
+    if (collectionView == self.collectionView) {
+        return _dataArray.count;
+
+    }else {
+        return 5;
+    }
 }
 
 - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
-    AliyunEffectFilterCell *cell;
-    if (indexPath.row == 0 || indexPath.row == _dataArray.count - 1) {
-        cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"AliyunEffectFilterFuncCell" forIndexPath:indexPath];
-    } else {
-        cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"AliyunEffectFilterCell" forIndexPath:indexPath];
+    if (collectionView == self.collectionView) {
+        AliyunEffectFilterCell *cell;
+        if (indexPath.row == 0 || indexPath.row == _dataArray.count - 1) {
+            cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"AliyunEffectFilterFuncCell" forIndexPath:indexPath];
+        } else {
+            cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"AliyunEffectFilterCell" forIndexPath:indexPath];
+            
+        }
         
-    }
-    
-    AliyunEffectInfo *effectInfo = _dataArray[indexPath.row];
-    [cell cellModel:effectInfo];
-    if (_effectType != AliyunEffectTypeSpecialFilter) {
-        if (indexPath.row == _selectIndex) {
-            [cell setSelected:YES];
-        }else{
-            [cell setSelected:NO];
+        AliyunEffectInfo *effectInfo = _dataArray[indexPath.row];
+        [cell cellModel:effectInfo];
+        if (_effectType != AliyunEffectTypeSpecialFilter) {
+            if (indexPath.row == _selectIndex) {
+                [cell setSelected:YES];
+            }else{
+                [cell setSelected:NO];
+            }
         }
-    }
-    if (_effectType == AliyunEffectTypeFilter) {
-        if (indexPath.row == 0) {
-            cell.imageView.contentMode = UIViewContentModeCenter;
-            cell.imageView.image = [UIImage imageNamed:@"video_pic_filter_artwork"];
-            cell.nameLabel.text = @"原图";
-        }else{
-            cell.imageView.contentMode = UIViewContentModeScaleAspectFill;
-            cell.imageView.backgroundColor = [UIColor clearColor];
+        if (_effectType == AliyunEffectTypeFilter) {
+            if (indexPath.row == 0) {
+                cell.imageView.contentMode = UIViewContentModeCenter;
+                cell.imageView.image = [UIImage imageNamed:@"video_pic_filter_artwork"];
+                cell.nameLabel.text = @"原图";
+            }else{
+                cell.imageView.contentMode = UIViewContentModeScaleAspectFill;
+                cell.imageView.backgroundColor = [UIColor clearColor];
+            }
         }
+        
+        [cell setExclusiveTouch:YES];
+        return cell;
+        
+    }else {
+        AliyunBeautyLevelCollectionViewCell *cell;
+        cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"AliyunBeautyLevelCollectionViewCell" forIndexPath:indexPath];
+        cell.indexPath = indexPath;
+        return cell;
     }
     
-    [cell setExclusiveTouch:YES];
-    return cell;
 }
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {

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

@@ -0,0 +1,20 @@
+//
+//  AliyunBeautyLevelCollectionViewCell.h
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/9/6.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface AliyunBeautyLevelCollectionViewCell : UICollectionViewCell
+@property (weak, nonatomic) IBOutlet UIImageView *imageView;
+@property (nonatomic,strong) NSIndexPath *indexPath;
+@property (weak, nonatomic) IBOutlet UILabel *titleLabel;
+@property (weak, nonatomic) IBOutlet UIView *selectView;
+@end
+
+NS_ASSUME_NONNULL_END

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

@@ -0,0 +1,22 @@
+//
+//  AliyunBeautyLevelCollectionViewCell.m
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/9/6.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+#import "AliyunBeautyLevelCollectionViewCell.h"
+
+@implementation AliyunBeautyLevelCollectionViewCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+- (void)setIndexPath:(NSIndexPath *)indexPath {
+    _indexPath = indexPath;
+}
+
+@end

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

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="AliyunBeautyLevelCollectionViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="91" height="84"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                <rect key="frame" x="0.0" y="0.0" width="91" height="84"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="PlL-oN-CFM">
+                        <rect key="frame" x="0.0" y="0.0" width="91" height="84"/>
+                    </imageView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D1W-jK-WDY">
+                        <rect key="frame" x="0.0" y="0.0" width="91" height="84"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mvv-Mh-vTr">
+                        <rect key="frame" x="0.0" y="0.0" width="91" height="84"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    </view>
+                </subviews>
+            </view>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="mvv-Mh-vTr" secondAttribute="trailing" id="C7Z-Cm-3fu"/>
+                <constraint firstAttribute="bottom" secondItem="mvv-Mh-vTr" secondAttribute="bottom" id="FEg-9m-SBw"/>
+                <constraint firstAttribute="bottom" secondItem="D1W-jK-WDY" secondAttribute="bottom" id="KHe-SD-aly"/>
+                <constraint firstItem="D1W-jK-WDY" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="O60-ZO-luT"/>
+                <constraint firstAttribute="trailing" secondItem="D1W-jK-WDY" secondAttribute="trailing" id="PHh-Qb-7Oi"/>
+                <constraint firstAttribute="trailing" secondItem="PlL-oN-CFM" secondAttribute="trailing" id="Rt0-SX-QKq"/>
+                <constraint firstItem="mvv-Mh-vTr" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="U4T-TJ-Lgy"/>
+                <constraint firstItem="D1W-jK-WDY" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="W2r-Mx-z40"/>
+                <constraint firstItem="mvv-Mh-vTr" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="Ym9-di-LjP"/>
+                <constraint firstAttribute="bottom" secondItem="PlL-oN-CFM" secondAttribute="bottom" id="slS-ez-Yof"/>
+                <constraint firstItem="PlL-oN-CFM" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="tGx-IY-L9a"/>
+                <constraint firstItem="PlL-oN-CFM" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="uV7-68-FKo"/>
+            </constraints>
+            <viewLayoutGuide key="safeArea" id="SEy-5g-ep8"/>
+            <size key="customSize" width="91" height="84"/>
+            <connections>
+                <outlet property="imageView" destination="PlL-oN-CFM" id="4mk-8m-w3T"/>
+                <outlet property="selectView" destination="mvv-Mh-vTr" id="T6v-hP-QTl"/>
+                <outlet property="titleLabel" destination="D1W-jK-WDY" id="x9a-bp-tiM"/>
+            </connections>
+            <point key="canvasLocation" x="167.39130434782609" y="163.39285714285714"/>
+        </collectionViewCell>
+    </objects>
+</document>

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

@@ -24,6 +24,7 @@
  被选中的按钮
  */
 @property (weak, nonatomic) IBOutlet UIButton *selectedButton;
+@property (weak, nonatomic) IBOutlet UIView *bgView;
 
 
 /**

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

@@ -30,9 +30,14 @@
 
 - (void)awakeFromNib {
     [super awakeFromNib];
-    _imageView.layer.cornerRadius = 25;
+    _imageView.layer.cornerRadius = 53/2;
     _imageView.layer.masksToBounds = YES;
-    _imageView.layer.borderColor = AlivcOxRGB(0x25E0CD).CGColor;
+    self.bgView.backgroundColor = [AlivcOxRGB(0x25E0CD) colorWithAlphaComponent:(0.2)];
+    self.bgView.layer.cornerRadius = 53/2;
+    self.bgView.layer.masksToBounds = YES;
+    self.bgView.layer.borderColor = AlivcOxRGB(0x25E0CD).CGColor;
+    self.bgView.layer.borderWidth = 1.5;
+
 }
 
 - (void)cellModel:(AliyunEffectInfo *)effectInfo {
@@ -64,9 +69,10 @@
     self.selectedButton.hidden = !selected;
     
     if (selected) {
-        _imageView.layer.borderWidth = 2;
+        self.bgView.hidden = false;
+
     } else {
-        _imageView.layer.borderWidth = 0;
+        self.bgView.hidden = true;
     }
     
 

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

@@ -25,14 +25,18 @@
                             <constraint firstAttribute="width" constant="98" id="yp9-UA-RuW"/>
                         </constraints>
                     </imageView>
+                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zzL-Ag-k1Z">
+                        <rect key="frame" x="0.0" y="0.0" width="98" height="98"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    </view>
                     <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="110" width="98" height="14.5"/>
+                        <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"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <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="124.5"/>
+                        <rect key="frame" x="0.0" y="0.0" width="98" height="126.5"/>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
                                 <integer key="value" value="25"/>
@@ -47,8 +51,12 @@
                 <constraint firstAttribute="trailing" secondItem="Hc3-Ms-Bhd" secondAttribute="trailing" id="52T-9U-1kN"/>
                 <constraint firstItem="BL2-7v-gYm" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="G2F-WW-MAm"/>
                 <constraint firstItem="Hc3-Ms-Bhd" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="K8I-pE-ofy"/>
+                <constraint firstItem="zzL-Ag-k1Z" firstAttribute="centerX" secondItem="uJ7-8S-mmE" secondAttribute="centerX" id="Mdb-ve-Bij"/>
+                <constraint firstItem="zzL-Ag-k1Z" firstAttribute="height" secondItem="uJ7-8S-mmE" secondAttribute="height" id="Of3-vT-ccC"/>
                 <constraint firstItem="BL2-7v-gYm" firstAttribute="bottom" secondItem="Hc3-Ms-Bhd" secondAttribute="bottom" id="PSu-ek-Sv7"/>
-                <constraint firstItem="BL2-7v-gYm" firstAttribute="top" secondItem="uJ7-8S-mmE" secondAttribute="bottom" constant="12" id="lHV-cz-n2o"/>
+                <constraint firstItem="zzL-Ag-k1Z" firstAttribute="centerY" secondItem="uJ7-8S-mmE" secondAttribute="centerY" id="U6M-yt-nIT"/>
+                <constraint firstItem="zzL-Ag-k1Z" firstAttribute="width" secondItem="uJ7-8S-mmE" secondAttribute="width" id="Vpz-WX-Pbb"/>
+                <constraint firstItem="BL2-7v-gYm" firstAttribute="top" secondItem="uJ7-8S-mmE" secondAttribute="bottom" constant="14" id="lHV-cz-n2o"/>
                 <constraint firstItem="uJ7-8S-mmE" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="mC4-H4-Aar"/>
                 <constraint firstAttribute="trailing" secondItem="BL2-7v-gYm" secondAttribute="trailing" id="sKt-Ka-bRN"/>
                 <constraint firstItem="uJ7-8S-mmE" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="sWu-IT-x6U"/>
@@ -56,11 +64,12 @@
             </constraints>
             <size key="customSize" width="98" height="137"/>
             <connections>
+                <outlet property="bgView" destination="zzL-Ag-k1Z" id="ihm-Xq-I0U"/>
                 <outlet property="imageView" destination="uJ7-8S-mmE" id="4as-zD-5Sv"/>
                 <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.8" y="117.84107946026987"/>
+            <point key="canvasLocation" x="-101.44927536231884" y="117.1875"/>
         </collectionViewCell>
     </objects>
 </document>

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

@@ -395,7 +395,7 @@
 - (void)musicViewDidClose {
     
     [self hideMusicView:YES];
-    self.magicCameraView.rateView.hidden = false;
+//    self.magicCameraView.rateView.hidden = false;
     
     if (self.clipManager.partCount == 0) {
         if (self.hideSegmentBlock) {
@@ -634,7 +634,7 @@
     [self hideMusicView:YES];
     if (_magicCameraView.recording) {
         // hideMusicView方法会唤起rateView，录制时需隐藏
-        self.magicCameraView.rateView.hidden = true;
+//        self.magicCameraView.rateView.hidden = true;
     }
     
     
@@ -758,7 +758,7 @@
     
     if (self.hideSegmentBlock) {
         self.hideSegmentBlock(true);
-        self.magicCameraView.rateView.hidden = true;
+//        self.magicCameraView.rateView.hidden = true;
     }
 }
 
@@ -772,7 +772,7 @@
     
     __weak __typeof(self)weakSelf = self;
 
-    self.magicCameraView.rateView.hidden = false;
+//    self.magicCameraView.rateView.hidden = false;
     [UIView animateWithDuration:0.2 animations:^{
          // __strong __typeof(weakSelf)strongSelf = weakSelf;
         weakSelf.musicView.frame = frame;
@@ -783,7 +783,7 @@
     [self hideFilterView:NO];
     if (self.hideSegmentBlock) {
         self.hideSegmentBlock(true);
-        self.magicCameraView.rateView.hidden = true;
+//        self.magicCameraView.rateView.hidden = true;
     }
 }
 
@@ -795,7 +795,7 @@
         frame.origin.y = ScreenHeight - self.filterView.bounds.size.height;
     }
     __weak __typeof(self)weakSelf = self;
-    self.magicCameraView.rateView.hidden = false;
+//    self.magicCameraView.rateView.hidden = false;
     [UIView animateWithDuration:0.2 animations:^{
          // __strong __typeof(weakSelf)strongSelf = weakSelf;  //3
         weakSelf.filterView.frame = frame;
@@ -1059,7 +1059,7 @@
 - (AliyunEffectFilterView *)filterView {
     if (!_filterView) {
         _filterView = [[AliyunEffectFilterView alloc]
-                       initWithFrame:CGRectMake(0, ScreenHeight, ScreenWidth, 180)];
+                       initWithFrame:CGRectMake(0, ScreenHeight, ScreenWidth, 173 + SafeBottom)];
         _filterView.delegate = (id<AliyunEffectFilter2ViewDelegate>)self;
 //        [self.view addSubview:_filterView];
         [_filterView addVisualEffect];

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

@@ -129,7 +129,7 @@
 /**
  速度选择器
  */
-@property (nonatomic, strong) AliyunRateSelectView *rateView;
+//@property (nonatomic, strong) AliyunRateSelectView *rateView;
 
 /**
  放置"回删、确定"のView

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

@@ -105,15 +105,15 @@
     [self addSubview:self.circleBtn];
     [self.circleBtn addTarget:self action:@selector(recordButtonTouchUp) forControlEvents:UIControlEventTouchUpInside];
     
-    CGFloat rateViewH = 40;
-    CGFloat rateViewY = ScreenHeight-SafeBottom-177-rateViewH;
-    self.rateView = [[AliyunRateSelectView alloc] initWithItems:@[@"极慢",@"慢",@"标准",@"快",@"极快"]];
-    self.rateView.frame = CGRectMake(14,rateViewY, ScreenWidth-28, rateViewH);
-    self.rateView.layer.cornerRadius = 20;
-    self.rateView.layer.masksToBounds = YES;
-    self.rateView.selectedSegmentIndex = 2;
-    [self.rateView addTarget:self action:@selector(rateChanged:) forControlEvents:UIControlEventValueChanged];
-    [self addSubview:self.rateView];
+//    CGFloat rateViewH = 40;
+//    CGFloat rateViewY = ScreenHeight-SafeBottom-177-rateViewH;
+//    self.rateView = [[AliyunRateSelectView alloc] initWithItems:@[@"极慢",@"慢",@"标准",@"快",@"极快"]];
+//    self.rateView.frame = CGRectMake(14,rateViewY, ScreenWidth-28, rateViewH);
+//    self.rateView.layer.cornerRadius = 20;
+//    self.rateView.layer.masksToBounds = YES;
+//    self.rateView.selectedSegmentIndex = 2;
+//    [self.rateView addTarget:self action:@selector(rateChanged:) forControlEvents:UIControlEventValueChanged];
+//    [self addSubview:self.rateView];
     
     
     self.timeLabel = [[UILabel alloc] init];
@@ -236,7 +236,7 @@
 - (void)setHide:(BOOL)hide {
     self.deleteButton.hidden = hide;
     self.finishButton.hidden = hide;
-    self.rateView.hidden = hide;
+//    self.rateView.hidden = hide;
     
     self.reverseButton.hidden = hide;
     self.musicButton.hidden = hide;
@@ -245,7 +245,7 @@
 
 - (void)setBottomHide:(BOOL)hide{
     _bottomHide = hide;
-    self.rateView.hidden = hide;
+//    self.rateView.hidden = hide;
     self.circleBtn.hidden = hide;
     if(self.progressView.videoCount){
         self.deleteButton.hidden = NO;

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/Config/AlivcMacro.h

@@ -24,6 +24,8 @@
 #define rgba(R,G,B,A)  [UIColor colorWithRed:(R * 1.0) / 255.0 green:(G * 1.0) / 255.0 blue:(B * 1.0) / 255.0 alpha:A]
 
 
+#define ScaleWidth ScreenWidth/375
+
 #define BundleID [[NSBundle mainBundle] bundleIdentifier]
 //#define BundleID @"com.aliyun.apsaravideo"