Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud

张旭
2 parents 43b0a017 0b9e891a
Showing 7 changed files with 430 additions and 53 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/View/FilterFunctionView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/View/FilterFunctionView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/View/SliderView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/View/SliderView.m
LiveVideoCloud/LiveVideoCloud/Info.plist
@@ -22,7 +22,6 @@
 		810B650A1E77B39D00133E15 /* LVCFullScreenPlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 810B65091E77B39D00133E15 /* LVCFullScreenPlayerController.m */; };
 		8112D4311E7927A5002E00F6 /* LVCPlayerLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8112D4301E7927A5002E00F6 /* LVCPlayerLoadingView.m */; };
 		812E50531E7699DC004F5FCD /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */; };
-		812E50541E7699DC004F5FCD /* KSYGPUResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 812E50511E7699DC004F5FCD /* KSYGPUResource.bundle */; };
 		812E50551E7699E9004F5FCD /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */; };
 		812E50561E7699E9004F5FCD /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		812E50581E7699E9004F5FCD /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -146,6 +145,9 @@
 		D2575C7E1E76A4F300E3A8FC /* NHPlaneViews.m in Sources */ = {isa = PBXBuildFile; fileRef = D2575C771E76A4F300E3A8FC /* NHPlaneViews.m */; };
 		D2575C7F1E76A4F300E3A8FC /* NHPlaneViews.xib in Resources */ = {isa = PBXBuildFile; fileRef = D2575C781E76A4F300E3A8FC /* NHPlaneViews.xib */; };
 		D2575C801E76A4F300E3A8FC /* resource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D2575C791E76A4F300E3A8FC /* resource.bundle */; };
+		D25BF87A1E7B8A82007FB138 /* FilterFunctionView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8771E7B8A82007FB138 /* FilterFunctionView.m */; };
+		D25BF87B1E7B8A82007FB138 /* SliderView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8791E7B8A82007FB138 /* SliderView.m */; };
+		D25BF87D1E7B8C78007FB138 /* KSYGPUResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */; };
 		D2888D941E6EB8B4003A77C8 /* LVCTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */; };
 		D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */; };
 		D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB01E6EC05F003A77C8 /* TempViewController.m */; };
@@ -477,6 +479,11 @@
 		D2575C771E76A4F300E3A8FC /* NHPlaneViews.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NHPlaneViews.m; sourceTree = "<group>"; };
 		D2575C781E76A4F300E3A8FC /* NHPlaneViews.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NHPlaneViews.xib; sourceTree = "<group>"; };
 		D2575C791E76A4F300E3A8FC /* resource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = resource.bundle; sourceTree = "<group>"; };
+		D25BF8761E7B8A82007FB138 /* FilterFunctionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilterFunctionView.h; sourceTree = "<group>"; };
+		D25BF8771E7B8A82007FB138 /* FilterFunctionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FilterFunctionView.m; sourceTree = "<group>"; };
+		D25BF8781E7B8A82007FB138 /* SliderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SliderView.h; sourceTree = "<group>"; };
+		D25BF8791E7B8A82007FB138 /* SliderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SliderView.m; sourceTree = "<group>"; };
+		D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = KSYGPUResource.bundle; sourceTree = "<group>"; };
 		D2888D921E6EB8B4003A77C8 /* LVCTabBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCTabBar.h; sourceTree = "<group>"; };
 		D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCTabBar.m; sourceTree = "<group>"; };
 		D2888D9A1E6EBF1B003A77C8 /* LVCLiveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCLiveViewController.h; sourceTree = "<group>"; };
@@ -560,9 +567,9 @@
 		812E504E1E7699B9004F5FCD /* CNLiveSDK */ = {
 			isa = PBXGroup;
 			children = (
+				D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */,
 				812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */,
 				812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */,
-				812E50511E7699DC004F5FCD /* KSYGPUResource.bundle */,
 			);
 			path = CNLiveSDK;
 			sourceTree = "<group>";
@@ -1319,6 +1326,24 @@
 			path = GiftResource;
 			sourceTree = "<group>";
 		};
+		D25BF8741E7B8A59007FB138 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
+		D25BF8751E7B8A59007FB138 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				D25BF8761E7B8A82007FB138 /* FilterFunctionView.h */,
+				D25BF8771E7B8A82007FB138 /* FilterFunctionView.m */,
+				D25BF8781E7B8A82007FB138 /* SliderView.h */,
+				D25BF8791E7B8A82007FB138 /* SliderView.m */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
 		D2888D911E6EB897003A77C8 /* View */ = {
 			isa = PBXGroup;
 			children = (
@@ -1332,8 +1357,8 @@
 			isa = PBXGroup;
 			children = (
 				D2888D991E6EBF1B003A77C8 /* Controller */,
-				D2888D9C1E6EBF1B003A77C8 /* Model */,
-				D2888D9D1E6EBF1B003A77C8 /* View */,
+				D25BF8741E7B8A59007FB138 /* Model */,
+				D25BF8751E7B8A59007FB138 /* View */,
 			);
 			path = LiveSections;
 			sourceTree = "<group>";
@@ -1347,20 +1372,6 @@
 			path = Controller;
 			sourceTree = "<group>";
 		};
-		D2888D9C1E6EBF1B003A77C8 /* Model */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Model;
-			sourceTree = "<group>";
-		};
-		D2888D9D1E6EBF1B003A77C8 /* View */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = View;
-			sourceTree = "<group>";
-		};
 		D2888DA71E6EC014003A77C8 /* homeSections */ = {
 			isa = PBXGroup;
 			children = (
@@ -1553,6 +1564,8 @@
 				D2029B911E6EAAA50027CD92 /* animation.xcassets in Resources */,
 				D2029CB01E6EADE10027CD92 /* MJRefresh.bundle in Resources */,
 				D2575C7C1E76A4F300E3A8FC /* NHFighterView.nib in Resources */,
+				D25BF87D1E7B8C78007FB138 /* KSYGPUResource.bundle in Resources */,
+				D2029B8F1E6EAAA50027CD92 /* Main.storyboard in Resources */,
 				812E50541E7699DC004F5FCD /* KSYGPUResource.bundle in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1669,6 +1682,7 @@
 				D2029D091E6EAE2E0027CD92 /* Foundation+Log.m in Sources */,
 				D2029C8E1E6EADE10027CD92 /* AFImageDownloader.m in Sources */,
 				D2029BCA1E6EADD70027CD92 /* BaseModel.m in Sources */,
+				D25BF87B1E7B8A82007FB138 /* SliderView.m in Sources */,
 				810B65041E779B1F00133E15 /* NSArray+MASAdditions.m in Sources */,
 				D2029D031E6EAE2E0027CD92 /* UIImage+ZXExtension.m in Sources */,
 				D2029D0A1E6EAE2E0027CD92 /* ZXServerUrl.m in Sources */,
@@ -1684,6 +1698,7 @@
 				D2029BCD1E6EADD70027CD92 /* BaseViewController.m in Sources */,
 				810B64E01E779AE900133E15 /* LVCPlayer.m in Sources */,
 				810B64FF1E779B1F00133E15 /* MASConstraint.m in Sources */,
+				D25BF87A1E7B8A82007FB138 /* FilterFunctionView.m in Sources */,
 				D2029D001E6EAE2E0027CD92 /* NSNumber+ScaleHeight.m in Sources */,
 				D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */,
 				D2029C951E6EADE10027CD92 /* UIWebView+AFNetworking.m in Sources */,
@@ -9,11 +9,12 @@
 #import "LVCLiveViewController.h"
 #import <CNLivePlayerSDK/CNLiveGPUStreamerKit.h>
 #import <CNLivePlayerSDK/CNLiveWebcastManager.h>
+#import "FilterFunctionView.h"
 #define KAppId @"60_irn9edco29"
 #define KAppKey @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
-@interface LVCLiveViewController () {
+@interface LVCLiveViewController ()<UIGestureRecognizerDelegate> {
     // 开始直播
     UIButton *_startLiveBtn;
     // 缩放因子
@@ -24,6 +25,8 @@
 @property (nonatomic,strong) CNLiveGPUStreamerKit *kitCN;
+@property (nonatomic,strong) FilterFunctionView *filterView;
+
 @end
 @implementation LVCLiveViewController
@@ -69,7 +72,9 @@
     //        _kitCN.activityName = @"iOS test";
     //        _kitCN.coverImgUrl = @"djfiwooa";
+    // 设置推流配置
     [self setStreamerCfg];
+    // 添加监听
     [self addObservers];
     _startLiveBtn = [self addButton:@"开始直播" frame:CGRectMake(100, 40, 80, 40) action:@selector(startCapture:)];
@@ -77,7 +82,7 @@
     [_startLiveBtn setTitle:@"停止直播" forState:UIControlStateSelected];
     [self addButton:@"关闭预览" frame:CGRectMake(10, 40, 80, 40) action:@selector(startPreview:)];
-    [self addButton:@"退出" frame:CGRectMake(190, 40, 80, 40) action:@selector(quit)];
+//    [self addButton:@"退出" frame:CGRectMake(190, 40, 80, 40) action:@selector(quit)];
     [self addButton:@"美颜" frame:CGRectMake(10, 100, 80, 40) action:@selector(openFilter:)];
     [self addButton:@"摄像头" frame:CGRectMake(100, 100, 80, 40) action:@selector(changeCamera:)];
     [self addButton:@"闪光灯" frame:CGRectMake(190, 100, 80, 40) action:@selector(openFlash)];
@@ -120,16 +125,16 @@
     [_kitCN startPreview:self.captureView];
     //水印图片
-    _kitCN.watermark.logoPic = [UIImage imageNamed:@"互动电视180x180"];
-    _kitCN.watermark.logoRect = CGRectMake(0.8, 0.8, 50, 50);
-    _kitCN.watermark.logoAlpha = 0.6;
+//    _kitCN.watermark.logoPic = [UIImage imageNamed:@"互动电视180x180"];
+//    _kitCN.watermark.logoRect = CGRectMake(0.8, 0.8, 50, 50);
+//    _kitCN.watermark.logoAlpha = 0.6;
     //水印文字
-    _kitCN.watermark.textLabel = [[UILabel alloc] init];
-    _kitCN.watermark.textLabel.text = [NSString stringWithFormat:@"cnlive"];
-    _kitCN.watermark.textLabel.font = [UIFont systemFontOfSize:8];
-    _kitCN.watermark.textRect = CGRectMake(0.78, 0.88, 0.2, 0.04);
-    [_kitCN.watermark updateTextLabel];
+//    _kitCN.watermark.textLabel = [[UILabel alloc] init];
+//    _kitCN.watermark.textLabel.text = [NSString stringWithFormat:@"cnlive"];
+//    _kitCN.watermark.textLabel.font = [UIFont systemFontOfSize:8];
+//    _kitCN.watermark.textRect = CGRectMake(0.78, 0.88, 0.2, 0.04);
+//    [_kitCN.watermark updateTextLabel];
 }
@@ -156,11 +161,13 @@
         [_kitCN startStream:^{
             NSLog(@"开启推流成功 ------- success");
         } failure:^(NSDictionary *errorDic) {
+            NSString *str=[[NSMutableString alloc] initWithData:errorDic[@"errorMessage"] encoding:NSUTF8StringEncoding];
+            NSLog(@"%@",str);
             [self toast:errorDic[@"errorMessage"]];
             _startLiveBtn.selected = NO;
         }];
     }else{
-//        _stateLab.text = nil;
+
         [_kitCN stopStream];
     }
 }
@@ -184,6 +191,59 @@
     }
 }
+// 美颜滤镜
+- (void)openFilter:(UIButton *)button {
+    
+    button.selected = !button.selected;
+    
+    if (button.selected) {
+        
+        _filterView.hidden = NO;
+        
+        __weak LVCLiveViewController *weakselff = self;
+        
+        _filterView.filterViewBlock = ^(float grindRatio , float whitenRatio, float intensity){
+            
+            [weakselff.kitCN.beautifyFaceFilter filterAdjustingParameterWithGrindRatio:grindRatio
+                                                                          whitenRatio:whitenRatio
+                                                                            intensity:intensity];
+        };
+        
+        _filterView.currentTypeBlock = ^(NSInteger currentType){
+            [weakselff.kitCN.beautifyFaceFilter  setBeautyType:currentType];
+        };
+        
+        _filterView.currentIdxBlock = ^(NSInteger currentIdx){
+            weakselff.kitCN.beautifyFaceFilter.curEffectIdx = currentIdx;
+        };
+        
+    } else {
+        
+        _filterView.hidden = YES;
+        
+    }
+}
+
+// 转换前后置摄像头
+- (void)changeCamera:(UIButton *)button {
+    
+//        button.selected = !button.selected;
+//        if (button.selected) {
+//            _kitCN.cameraPosition = AVCaptureDevicePositionBack;
+//        }else{
+//            _kitCN.cameraPosition = AVCaptureDevicePositionFront;
+//        }
+    [_kitCN switchCamera];
+    
+}
+
+// 闪光灯
+- (void)openFlash {
+    
+    [_kitCN toggleTorch];
+    //    [_kitCN setTorchMode:AVCaptureTorchModeOn];
+}
+
 // 退出
 - (void)closeBtnClivk {
@@ -200,8 +260,8 @@
 #pragma mark - UIGestureRecognizer Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 //对焦与曝光
-- (void)onTap:(UIGestureRecognizer *)sender
-{
+- (void)onTap:(UIGestureRecognizer *)sender {
+    
     CGPoint current = [sender locationInView:self.view];
     CGPoint point = [self convertToPointOfInterestFromViewCoordinates:current];
     [_kitCN exposureAtPoint:point];
@@ -209,7 +269,8 @@
 }
 //缩放
-- (void)pinchDetected:(UIPinchGestureRecognizer *)recognizer{
+- (void)pinchDetected:(UIPinchGestureRecognizer *)recognizer {
+    
     if (recognizer.state == UIGestureRecognizerStateBegan) {
         _currentPinchZoomFactor = _kitCN.pinchZoomFactor;
     }
@@ -228,45 +289,39 @@
     [_kitCN appBecomeActive];
 }
-// 拍摄状态改变
+// 采集状态改变
 - (void)captureStateChange {
     if ( _kitCN.captureState == CNLiveCaptureStateIdle){
         //初始化时状态为空闲
-//        _stateLab.text = @"CNLiveCaptureStateIdle";
         return;
     }
     else if (_kitCN.captureState == CNLiveCaptureStateCapturing ) {
         //设备工作中
-//        _stateLab.text = @"CNLiveCaptureStateCapturing";
         return;
     }
     else if (_kitCN.captureState == CNLiveCaptureStateClosingCapture ) {
         //关闭采集设备中
-//        _stateLab.text = @"CNLiveCaptureStateClosingCapture";
         return;
     }
     else if (_kitCN.captureState == CNLiveCaptureStateDevAuthDenied ) {
         //设备授权被拒绝
         NSLog(@"---------CNLiveCaptureStateDevAuthDenied");
-//        _stateLab.text = @"camera/mic Authorization Denied";
         return;
     }
     else if (_kitCN.captureState == CNLiveCaptureStateParameterError ) {
         // 参数错误，无法打开
         NSLog(@"---------CNLiveCaptureStateParameterError");
-//        _stateLab.text = @"capture devices ParameterError";
         return;
     }
     else if (_kitCN.captureState == CNLiveCaptureStateDevBusy ) {
         //设备正忙，请稍后尝试
         NSLog(@"---------CNLiveCaptureStateDevBusy");
-//        _stateLab.text = @"device busy, try later";
     }
 }
@@ -276,19 +331,16 @@
     if (_kitCN.streamState == CNLiveStreamStateIdle) {
         NSLog(@"---------CNLiveStreamStateIdle");
-//        _stateLab.text = @"CNLiveStreamStateIdle";
     }
     if (_kitCN.streamState == CNLiveStreamStateConnected) {
         NSLog(@"---------CNLiveStreamStateConnected");
-//        _stateLab.text = [NSString stringWithFormat:@"CNLiveStreamStateConnected------%@",_hostURL];
     }
     if (_kitCN.streamState == CNLiveStreamStateConnecting) {
         NSLog(@"---------CNLiveStreamStateConnecting");
-//        _stateLab.text = @"CNLiveStreamStateConnecting";
     }
     //推流出错
@@ -302,14 +354,12 @@
     if ( _kitCN.streamState == CNLiveStreamStateDisconnecting) {
         NSLog(@"---------CNLiveStreamStateDisconnecting");
-//        _stateLab.text = @"CNLiveStreamStateDisconnecting";
     }
     //结束推流成功
     if ( _kitCN.streamState == CNLiveStopStreamSuccess) {
         NSLog(@"---------CNLiveStopStreamSuccess");
-//        _stateLab.text = @"CNLiveStopStreamSuccess";
     }
 }
 // 推流失败
@@ -320,19 +370,19 @@
     NSLog(@"onErr: %lu ", (unsigned long) err);
     if ( CNLiveStreamErrorCode_CNLiveAUTHFAILED == err ) {
-//        _stateLab.text = @"SDK auth failed, \npls check ak/sk";
+        
     }
     else if ( CNLiveStreamErrorCode_CODEC_OPEN_FAILED == err) {
-//        _stateLab.text = @"Selected Codec not supported \n in this version";
+        
     }
     else if ( CNLiveStreamErrorCode_CONNECT_FAILED == err) {
-//        _stateLab.text = @"Connecting error, pls check host url \nor network";
+
     }
     else if ( CNLiveStreamErrorCode_CONNECT_BREAK == err) {
-//        _stateLab.text = @"Connection break";
+
     }
     else if ( CNLiveStreamErrorCode_ABNORMAL == err) {
-//        _stateLab.text = @"CNLiveStreamErrorCode_ABNORMAL";
+
         [self toast:@"推流异常中断~~"];
         _startLiveBtn.selected = NO;
@@ -376,8 +426,7 @@
 }
 // 提示框
-- (void)toast:(NSString*)message
-{
+- (void)toast:(NSString*)message {
     UIAlertView *toast = [[UIAlertView alloc] initWithTitle:nil
                                                     message:message
@@ -393,8 +442,8 @@
 // 将UI的坐标转换成相机坐标
-- (CGPoint)convertToPointOfInterestFromViewCoordinates:(CGPoint)viewCoordinates
-{
+- (CGPoint)convertToPointOfInterestFromViewCoordinates:(CGPoint)viewCoordinates {
+    
     CGPoint pointOfInterest = CGPointMake(.5f, .5f);
     CGSize frameSize = self.view.frame.size;
     CGSize apertureSize = [_kitCN captureDimension];
+//
+//  FilterFunctionView.h
+//  CNLivePlayerSDKDemo
+//
+//  Created by iOS on 16/12/21.
+//  Copyright © 2016年 雷浩杰. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+typedef void(^FilterViewBlock)(float grindRatio , float whitenRatio, float intensity);
+
+typedef void(^FilterCurrentType)(NSInteger currentType);
+
+typedef void(^FilterCurrentIdx)(NSInteger currentIdx);
+
+@interface FilterFunctionView : UIView
+
+@property (nonatomic, copy) FilterViewBlock filterViewBlock;
+
+@property (nonatomic, copy) FilterCurrentType currentTypeBlock;
+
+@property (nonatomic, copy) FilterCurrentIdx currentIdxBlock;
+
+@end
+
+//
+//  FilterFunctionView.m
+//  CNLivePlayerSDKDemo
+//
+//  Created by iOS on 16/12/21.
+//  Copyright © 2016年 雷浩杰. All rights reserved.
+//
+
+#import "FilterFunctionView.h"
+#import "SliderView.h"
+
+@interface FilterFunctionView ()<SliderViewDelegate,UIPickerViewDelegate,UIPickerViewDataSource>
+{
+    NSArray *_dataArr;
+}
+
+@property (nonatomic, strong) SliderView *slider1;
+@property (nonatomic, strong) SliderView *slider2;
+@property (nonatomic, strong) SliderView *slider3;
+@property (nonatomic, strong) UISegmentedControl  * filterGroupType;
+@property (nonatomic, strong) UIPickerView *effectPicker;
+
+@end
+
+@implementation FilterFunctionView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        [self addSubview:self.slider1];
+        [self addSubview:self.slider2];
+        [self addSubview:self.slider3];
+        [self addSubview:self.effectPicker];
+        [self addSubview:self.filterGroupType];
+        
+        _dataArr = @[@"小清新",@"靓丽",@"甜美可人",@"怀旧",@"蓝调",@"老照片"];
+        
+    }
+    return self;
+}
+
+#pragma mark -
+#pragma mark - SliderViewDelegate
+
+- (void)sliderValueChenged
+{
+    if (_filterViewBlock) {
+        _filterViewBlock(_slider1.currentValue, _slider2.currentValue, _slider3.currentValue);
+    }
+}
+
+- (void)onSegCtrl:(UISegmentedControl *)sender
+{
+    
+    if (sender.selectedSegmentIndex == 0) {
+        _slider1.hidden = YES;
+        _slider2.hidden = YES;
+        _slider3.hidden = YES;
+        _effectPicker.hidden = YES;
+        
+    } else if (sender.selectedSegmentIndex == 1) {
+        _slider1.hidden = NO;
+        _slider2.hidden = YES;
+        _slider3.hidden = YES;
+        _effectPicker.hidden = YES;
+    } else if (sender.selectedSegmentIndex == 2) {
+        _slider1.hidden = NO;
+        _slider2.hidden = NO;
+        _slider3.hidden = NO;
+        _effectPicker.hidden = YES;
+    } else {
+        _slider1.hidden = NO;
+        _slider2.hidden = NO;
+        _slider3.hidden = NO;
+        _effectPicker.hidden = NO;
+    }
+    
+    _currentTypeBlock ? _currentTypeBlock(sender.selectedSegmentIndex) : nil;
+
+}
+
+#pragma mark -
+#pragma mark - effectPicker
+- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView
+{
+    return 1;
+}
+
+- (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component
+{
+    return _dataArr.count;
+}
+
+- (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component
+{
+    return _dataArr[row];
+}
+
+- (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component
+{    
+    _currentIdxBlock ? _currentIdxBlock(row) : nil;
+}
+
+#pragma mark -
+#pragma mark - getter
+
+- (SliderView *)slider1
+{
+    if (!_slider1) {
+        _slider1 = [[SliderView alloc] initWithFrame:CGRectMake(8, 50, self.bounds.size.width-16, 24) title:@"磨皮"];
+        _slider1.delagate = self;
+    }
+    return _slider1;
+}
+
+- (SliderView *)slider2
+{
+    if (!_slider2) {
+        _slider2 = [[SliderView alloc] initWithFrame:CGRectMake(8, 80, self.bounds.size.width-16, 24) title:@"美白"];
+        _slider2.delagate = self;
+    }
+    return _slider2;
+}
+
+- (SliderView *)slider3
+{
+    if (!_slider3) {
+        _slider3 = [[SliderView alloc] initWithFrame:CGRectMake(8, 110, self.bounds.size.width-16, 24) title:@"特效"];
+        _slider3.delagate = self;
+    }
+    return _slider3;
+}
+
+- (UIPickerView *)effectPicker
+{
+    if (!_effectPicker) {
+        _effectPicker = [[UIPickerView alloc] initWithFrame:CGRectMake(8, 130, self.bounds.size.width-16, 100)];
+        _effectPicker.showsSelectionIndicator=YES;
+        _effectPicker.tintColor = [UIColor whiteColor];
+        _effectPicker.dataSource = self;
+        _effectPicker.delegate = self;
+        _effectPicker.hidden = YES;
+    }
+    return _effectPicker;
+}
+
+- (UISegmentedControl *)filterGroupType
+{
+    if (!_filterGroupType) {
+        NSArray *items = @[ @"关",
+                            @"旧美颜",
+                            @"红润美颜",
+                            @"美颜特效",
+                            ];
+
+        _filterGroupType = [[UISegmentedControl alloc] initWithItems:items];
+        _filterGroupType.frame = CGRectMake(10, 0, self.bounds.size.width-20, 30);
+        _filterGroupType.tintColor= [UIColor blackColor];
+        _filterGroupType.selectedSegmentIndex = 0;
+        _filterGroupType.layer.cornerRadius = 5;
+        _filterGroupType.selectedSegmentIndex = 1;
+        [_filterGroupType addTarget:self action:@selector(onSegCtrl:) forControlEvents:UIControlEventValueChanged];
+    }
+    return _filterGroupType;
+}
+@end
+//
+//  SliderView.h
+//  CNLivePlayerSDKDemo
+//
+//  Created by iOS on 16/12/21.
+//  Copyright © 2016年 雷浩杰. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@protocol SliderViewDelegate <NSObject>
+
+- (void)sliderValueChenged;
+
+@end
+
+@interface SliderView : UIView
+
+@property (nonatomic, strong) UILabel*  nameL;  // 滑块对应参数名称
+@property (nonatomic, strong) UISlider* slider; // 滑块
+@property (nonatomic, strong) UILabel*  valueL; // 滑块当前的值
+@property (nonatomic, assign, readonly) float  currentValue;
+@property (nonatomic, assign) id<SliderViewDelegate> delagate;
+
+- (instancetype)initWithFrame:(CGRect)frame title:(NSString *)title;
+
+@end
+//
+//  SliderView.m
+//  CNLivePlayerSDKDemo
+//
+//  Created by iOS on 16/12/21.
+//  Copyright © 2016年 雷浩杰. All rights reserved.
+//
+
+#import "SliderView.h"
+
+@implementation SliderView
+{
+    NSString *_title;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame title:(NSString *)title{
+    self = [super initWithFrame:frame];
+    if (self) {
+        _title = title;
+        [self addSubview:self.nameL];
+        [self addSubview:self.valueL];
+        [self addSubview:self.slider];
+    }
+    return self;
+}
+
+- (float)currentValue
+{
+    return _slider.value;
+}
+
+#pragma mark -
+#pragma mark - action
+
+- (void)onSlider:(UISlider *)slider
+{
+    _valueL.text = [NSString stringWithFormat:@"%d",(int)(slider.value * 100)];
+    if (self.delagate && [self.delagate respondsToSelector:@selector(sliderValueChenged)]) {
+        [self.delagate sliderValueChenged];
+    }
+}
+
+#pragma mark -
+#pragma mark - getter
+
+- (UILabel *)nameL
+{
+    if (!_nameL) {
+        _nameL = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 40, 24)];
+        _nameL.text = _title;
+        _nameL.textAlignment = NSTextAlignmentCenter;
+        _nameL.textColor = [UIColor whiteColor];
+        _nameL.backgroundColor = [UIColor colorWithRed:192/255.0 green:192/255.0 blue:192/255.0 alpha:1];
+        _nameL.layer.cornerRadius = 5;
+        _nameL.layer.masksToBounds = YES;
+    }
+    return _nameL;
+}
+
+- (UILabel *)valueL
+{
+    if (!_valueL) {
+        _valueL = [[UILabel alloc] initWithFrame:CGRectMake(self.bounds.size.width-40, 0, 40, 24)];
+        _valueL.text = @"50";
+        _valueL.textAlignment = NSTextAlignmentCenter;
+        _valueL.textColor = [UIColor whiteColor];
+        _valueL.backgroundColor = [UIColor colorWithRed:192/255.0 green:192/255.0 blue:192/255.0 alpha:1];
+        _valueL.layer.cornerRadius = 5;
+        _valueL.layer.masksToBounds = YES;
+
+    }
+    return _valueL;
+}
+
+- (UISlider *)slider
+{
+    if (!_slider) {
+        _slider = [[UISlider alloc] initWithFrame:CGRectMake(40, 0, self.bounds.size.width-80, 24)];
+        _slider.value = 0.5;
+        [_slider addTarget:self action:@selector(onSlider:) forControlEvents:UIControlEventValueChanged];
+    }
+    return _slider;
+}
+@end
@@ -6,6 +6,15 @@
 	<false/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
+    <key>NSAppTransportSecurity</key>
+    <dict>
+        <key>NSAllowsArbitraryLoads</key>
+        <true/>
+    </dict>
+    <key>NSCameraUsageDescription</key>
+    <string></string>
+    <key>NSMicrophoneUsageDescription</key>
+    <string></string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>