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

王军波
2 parents 25ea651e 8ef3b998
Showing 1 changed file with 1 additions and 34 deletions
LiveVideoCloud/Classes/Sections/Mine/Controllers/FeedbackViewController.m
@@ -62,8 +62,6 @@
     [self.view addSubview:_bgScrollView];
     [Tools addLineToView:_bgScrollView separatorColorType:SeparatorColorGray lineFrame:CGRectMake(10, 129.5, KScreenWidth-20, 0.5)];
-    [Tools addLineToView:_bgScrollView separatorColorType:SeparatorColorGray lineFrame:CGRectMake(10, 174.5, KScreenWidth-20, 0.5)];
-    [Tools addLineToView:_bgScrollView separatorColorType:SeparatorColorGray lineFrame:CGRectMake(10, 219.5, KScreenWidth-20, 0.5)];
     _descriptionView = [[UITextView alloc] initWithFrame:CGRectMake(5, 0, KScreenWidth-10, 129)];
     _descriptionView.font = [UIFont systemFontOfSize:15];
@@ -77,20 +75,6 @@
     _desPlaceholder.textColor = [UIColor colorWithHexString:@"#c7c4c4"];
     [_descriptionView addSubview:_desPlaceholder];
-    _reportField = [[UITextField alloc] initWithFrame:CGRectMake(10, 130, KScreenWidth-20, 45)];
-    _reportField.placeholder = @"举报视频或上传者（可选）";
-    _reportField.font = [UIFont systemFontOfSize:15];
-    _reportField.returnKeyType = UIReturnKeyDone;
-    _reportField.delegate = self;
-    [_bgScrollView addSubview:_reportField];
-    
-    _phoneField = [[UITextField alloc] initWithFrame:CGRectMake(10, 175, KScreenWidth-20, 45)];
-    _phoneField.placeholder = @"您的QQ/电话/邮箱";
-    _phoneField.font = [UIFont systemFontOfSize:15];
-    _phoneField.returnKeyType = UIReturnKeyDone;
-    _phoneField.delegate = self;
-    [_bgScrollView addSubview:_phoneField];
-    
     //字数限制label
     _wordsCountLab = [[UILabel alloc] initWithFrame:CGRectMake(_descriptionView.size.width-60, _descriptionView.size.height-15, 60, 15)];
     _wordsCountLab.text = @"0/100";
@@ -98,16 +82,8 @@
     _wordsCountLab.textColor = [UIColor grayColorCNLive];
     _wordsCountLab.font = [UIFont systemFontOfSize:15];
     [_descriptionView addSubview:_wordsCountLab];
+    
     //提交
-//    UIButton *submitBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-//    [submitBtn setTitle:@"提  交" forState:UIControlStateNormal];
-//    submitBtn.backgroundColor = [UIColor yellowColorCNLive];
-//    [submitBtn setTitleColor:[UIColor blackColorCNLive] forState:UIControlStateNormal];
-//    //[submitBtn setBackgroundImage:[[UIImage imageNamed:@"denglu"] stretchableImageWithLeftCapWidth:57 topCapHeight:0] forState:UIControlStateNormal];
-//    submitBtn.clipsToBounds = YES;
-//    submitBtn.layer.cornerRadius = 20.0f;
-//    submitBtn.layer.borderWidth = 1.0f;//设置边框宽度
-//    submitBtn.layer.borderColor = [UIColor blackColorCNLive].CGColor;//设置边框颜色
      UIButton *submitBtn = [UIButton buttonWithTitle:@"提  交" titleColor:[UIColor blackColorCNLive] cornerRadius:20.0f borderWidth:1.0f borderColor:[UIColor blackColorCNLive] backgroundColor:[UIColor yellowColorCNLive]];
     submitBtn.frame = CGRectMake(10, 295, KScreenWidth - 20, 40);
     [submitBtn addTarget:self action:@selector(submitBtnAction) forControlEvents:UIControlEventTouchUpInside];
@@ -159,13 +135,6 @@
         [self performSelector:@selector(dismissView) withObject:nil afterDelay:2];
     }];
-
-//        if ([Tools isEmployeeQQNumber:_phoneField.text] || [Tools isValidateEmail:_phoneField.text] || [Tools isMobileNumber:_phoneField.text]) {
-//           
-//        }else{
-//            [Tools showHUDInView:self.view withString:@"请填写正确联系方式" autoHide:YES];
-//        }
-    
 }
 - (void)dismissView
@@ -221,7 +190,6 @@
 #pragma mark - 键盘监听
 - (void)keyboardWasShown:(NSNotification*)aNotification
 {
-    
     BOOL desc = _descriptionView.isFirstResponder;
     BOOL report  = _reportField.isFirstResponder;
     BOOL number = _phoneField.isFirstResponder;
@@ -235,7 +203,6 @@
     }
     _bgScrollView.contentSize = CGSizeMake(KScreenWidth, 750);
-    
 }
 - (void)keyboardWillBeHidden:(NSNotification*)aNotification