功能按钮更换

王军波
1 parent 64f045c6
Showing 4 changed files with 47 additions and 28 deletions
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/View/FilterFunctionView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/View/LVCUGCLivePrepareView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/View/LVCUGCLivePrepareView.m
@@ -47,6 +47,8 @@
     [self.view addSubview:self.quitButton];
     [self.view addSubview:self.changeCameraButton];
     [self.view addSubview:self.openFilterButton];
+    [self.view addSubview:self.openFlashButton];
+    [self.view addSubview:self.filterView];
  
     // 初始化推流
     NSString *activityId = [NSString stringWithFormat:@"%d%d%d%d%d",arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9];
@@ -62,8 +64,6 @@
     [self setStreamerCfg];
  
     [self addObservers];
-
-    [self addButton:@"闪光灯" frame:CGRectMake(190, 100, 80, 40) action:@selector(openFlash)];
  
     UITapGestureRecognizer * singleRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTap:)];
     singleRecognizer.delegate = self;
@@ -104,20 +104,15 @@
 #pragma mark - UIButton Action  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (void)startCapture:(UIButton *)button {   // 开始推流
  
-    button.selected = !button.selected;
+    [_prepareView removeFromSuperview];
  
-    if (button.selected) {
-        [_kitCN startStream:^{
-            NSLog(@"开启推流成功 ------- success");
-        } failure:^(NSDictionary *errorDic) {
-            NSString *str=[[NSMutableString alloc] initWithData:errorDic[@"errorMessage"] encoding:NSUTF8StringEncoding];
-            NSLog(@"%@",str);
-            [self toast:errorDic[@"errorMessage"]];
-        }];
-    }else{
-
-        [_kitCN stopStream];
-    }
+    [_kitCN startStream:^{
+        NSLog(@"开启推流成功 ------- success");
+    } failure:^(NSDictionary *errorDic) {
+        NSString *str=[[NSMutableString alloc] initWithData:errorDic[@"errorMessage"] encoding:NSUTF8StringEncoding];
+        NSLog(@"%@",str);
+        [self toast:errorDic[@"errorMessage"]];
+    }];
 }
  
  
@@ -149,14 +144,14 @@
     } else {
  
         _filterView.hidden = YES;
-        
     }
 }
  
  
 - (void)changeCamera:(UIButton *)button {   // 转换前后置摄像头
  
-//        button.selected = !button.selected;
+    button.selected = !button.selected;
+    _openFlashButton.hidden = !_openFlashButton.hidden;
 //        if (button.selected) {
 //            _kitCN.cameraPosition = AVCaptureDevicePositionBack;
 //        }else{
@@ -167,8 +162,9 @@
 }
  
  
-- (void)openFlash {   // 闪光灯
+- (void)openFlash:(UIButton *)button {   // 闪光灯
  
+    button.selected = !button.selected;
     [_kitCN toggleTorch];
     //    [_kitCN setTorchMode:AVCaptureTorchModeOn];
 }
@@ -195,6 +191,10 @@
     CGPoint point = [self convertToPointOfInterestFromViewCoordinates:current];
     [_kitCN exposureAtPoint:point];
     [_kitCN focusAtPoint:point];
+    
+    if ([_prepareView.titleTextField isFirstResponder]) {
+        [_prepareView.titleTextField resignFirstResponder];
+    }
 }
  
 #pragma mark - notification  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -399,10 +399,22 @@
     if (!_prepareView) {
         _prepareView = [[LVCUGCLivePrepareView alloc] initWithFrame:self.view.bounds];
         [_prepareView.startButton addTarget:self action:@selector(startCapture:) forControlEvents:UIControlEventTouchUpInside];
+        UITapGestureRecognizer * tapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTap:)];
+        tapRecognizer.delegate = self;
+        [_prepareView addGestureRecognizer:tapRecognizer];
     }
     return _prepareView;
 }
  
+- (FilterFunctionView *)filterView
+{
+    if (!_filterView) {
+        _filterView = [[FilterFunctionView alloc] initWithFrame:CGRectMake(0, 75, SCREEN_WIDTH, 200)];
+        _filterView.hidden = YES;
+    }
+    return _filterView;
+}
+
 - (UIView *)captureView {  // 拍摄视图
  
     if (!_captureView) {
@@ -415,7 +427,7 @@
 - (UIButton *)quitButton {
  
     if (!_quitButton) {
-        _quitButton = [self createButtonWithFrame:CGRectMake(SCREEN_WIDTH - 50, 30, 40, 40) image:@"LiveCloseNormal" selected:@"LiveCloseTouch"];
+        _quitButton = [self createButtonWithFrame:CGRectMake(SCREEN_WIDTH - 50, 30, 35, 35) image:@"LiveCloseNormal" selected:@"LiveCloseTouch"];
         [_quitButton addTarget:self action:@selector(quitBtnClick) forControlEvents:UIControlEventTouchUpInside];
     }
     return _quitButton;
@@ -424,7 +436,7 @@
 - (UIButton *)changeCameraButton {
  
     if (!_changeCameraButton) {
-        _changeCameraButton = [self createButtonWithFrame:CGRectMake(SCREEN_WIDTH - 100, 30, 40, 40) image:@"LiveCloseNormal" selected:@"LiveCloseTouch"];
+        _changeCameraButton = [self createButtonWithFrame:CGRectMake(SCREEN_WIDTH - 100, 30, 35, 35) image:@"camera" selected:@"Select the camera"];
         [_changeCameraButton addTarget:self action:@selector(changeCamera:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _changeCameraButton;
@@ -433,7 +445,9 @@
 - (UIButton *)openFlashButton {
  
     if (!_openFlashButton) {
-        
+        _openFlashButton = [self createButtonWithFrame:CGRectMake(SCREEN_WIDTH - 100, 75, 35, 35) image:@"open flash" selected:@"Flash off"];
+        _openFlashButton.hidden = YES;
+        [_openFlashButton addTarget:self action:@selector(openFlash:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _openFlashButton;
 }
@@ -441,7 +455,7 @@
 - (UIButton *)openFilterButton {
  
     if (!_openFilterButton) {
-        _openFilterButton = [self createButtonWithFrame:CGRectMake(SCREEN_WIDTH - 150, 30, 40, 40) image:@"LiveCloseNormal" selected:@"LiveCloseTouch"];
+        _openFilterButton = [self createButtonWithFrame:CGRectMake(SCREEN_WIDTH - 150, 30, 35, 35) image:@"Is closed" selected:@"Is open"];
         [_openFilterButton addTarget:self action:@selector(openFilter:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _openFilterButton;
@@ -135,7 +135,7 @@
 - (UIPickerView *)effectPicker
 {
     if (!_effectPicker) {
-        _effectPicker = [[UIPickerView alloc] initWithFrame:CGRectMake(8, 130, self.bounds.size.width-16, 100)];
+        _effectPicker = [[UIPickerView alloc] initWithFrame:CGRectMake(8, 20, self.bounds.size.width-16, 100)];
         _effectPicker.showsSelectionIndicator=YES;
         _effectPicker.tintColor = [UIColor whiteColor];
         _effectPicker.dataSource = self;
@@ -12,4 +12,6 @@
  
 @property (nonatomic, strong) UIButton *startButton;
  
+@property (nonatomic, strong) UITextField *titleTextField;
+
 @end
@@ -12,8 +12,6 @@
  
 @property (nonatomic, strong) UIImageView *iconView;
  
-@property (nonatomic, strong) UITextField *titleTextField;
-
 @property (nonatomic, strong) UIView *lineView;
  
 @end
@@ -51,8 +49,13 @@
  
     if (!_titleTextField) {
         _titleTextField = [[UITextField alloc] initWithFrame:CGRectMake(110, SCREEN_HEIGHT * 0.35 + 50, SCREEN_WIDTH - 120, 30)];
-        _titleTextField.placeholder = @"起一个名字开始直播吧~";
-        _titleTextField.font = [UIFont systemFontOfSize:20];
+        
+        NSMutableAttributedString *placeholder = [[NSMutableAttributedString alloc]initWithString:@"起个名字开始直播~"];
+        
+        
+        _titleTextField.attributedPlaceholder = placeholder;
+        
+        _titleTextField.font = [UIFont systemFontOfSize:19];
     }
     return _titleTextField;
 }
@@ -70,7 +73,7 @@
  
     if (!_startButton) {
         _startButton = [UIButton buttonWithType:UIButtonTypeCustom];
-        _startButton.frame = CGRectMake(30, SCREEN_HEIGHT * 0.6, SCREEN_WIDTH - 60, 38);
+        _startButton.frame = CGRectMake(30, SCREEN_HEIGHT * 0.62, SCREEN_WIDTH - 60, 38);
         _startButton.backgroundColor = [UIColor redColor];
         [_startButton setTitle:@"开始直播" forState:UIControlStateNormal];
         _startButton.titleLabel.font = [UIFont systemFontOfSize:20];