Commit 55c29848ac5cd5832725ba5acf8c4d91a1733b17

Authored by 王军波
2 parents 25ea651e 8ef3b998

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

LiveVideoCloud/Classes/Sections/Mine/Controllers/FeedbackViewController.m
... ... @@ -62,8 +62,6 @@
62 62 [self.view addSubview:_bgScrollView];
63 63  
64 64 [Tools addLineToView:_bgScrollView separatorColorType:SeparatorColorGray lineFrame:CGRectMake(10, 129.5, KScreenWidth-20, 0.5)];
65   - [Tools addLineToView:_bgScrollView separatorColorType:SeparatorColorGray lineFrame:CGRectMake(10, 174.5, KScreenWidth-20, 0.5)];
66   - [Tools addLineToView:_bgScrollView separatorColorType:SeparatorColorGray lineFrame:CGRectMake(10, 219.5, KScreenWidth-20, 0.5)];
67 65  
68 66 _descriptionView = [[UITextView alloc] initWithFrame:CGRectMake(5, 0, KScreenWidth-10, 129)];
69 67 _descriptionView.font = [UIFont systemFontOfSize:15];
... ... @@ -77,20 +75,6 @@
77 75 _desPlaceholder.textColor = [UIColor colorWithHexString:@"#c7c4c4"];
78 76 [_descriptionView addSubview:_desPlaceholder];
79 77  
80   - _reportField = [[UITextField alloc] initWithFrame:CGRectMake(10, 130, KScreenWidth-20, 45)];
81   - _reportField.placeholder = @"举报视频或上传者(可选)";
82   - _reportField.font = [UIFont systemFontOfSize:15];
83   - _reportField.returnKeyType = UIReturnKeyDone;
84   - _reportField.delegate = self;
85   - [_bgScrollView addSubview:_reportField];
86   -
87   - _phoneField = [[UITextField alloc] initWithFrame:CGRectMake(10, 175, KScreenWidth-20, 45)];
88   - _phoneField.placeholder = @"您的QQ/电话/邮箱";
89   - _phoneField.font = [UIFont systemFontOfSize:15];
90   - _phoneField.returnKeyType = UIReturnKeyDone;
91   - _phoneField.delegate = self;
92   - [_bgScrollView addSubview:_phoneField];
93   -
94 78 //字数限制label
95 79 _wordsCountLab = [[UILabel alloc] initWithFrame:CGRectMake(_descriptionView.size.width-60, _descriptionView.size.height-15, 60, 15)];
96 80 _wordsCountLab.text = @"0/100";
... ... @@ -98,16 +82,8 @@
98 82 _wordsCountLab.textColor = [UIColor grayColorCNLive];
99 83 _wordsCountLab.font = [UIFont systemFontOfSize:15];
100 84 [_descriptionView addSubview:_wordsCountLab];
  85 +
101 86 //提交
102   -// UIButton *submitBtn = [UIButton buttonWithType:UIButtonTypeCustom];
103   -// [submitBtn setTitle:@"提 交" forState:UIControlStateNormal];
104   -// submitBtn.backgroundColor = [UIColor yellowColorCNLive];
105   -// [submitBtn setTitleColor:[UIColor blackColorCNLive] forState:UIControlStateNormal];
106   -// //[submitBtn setBackgroundImage:[[UIImage imageNamed:@"denglu"] stretchableImageWithLeftCapWidth:57 topCapHeight:0] forState:UIControlStateNormal];
107   -// submitBtn.clipsToBounds = YES;
108   -// submitBtn.layer.cornerRadius = 20.0f;
109   -// submitBtn.layer.borderWidth = 1.0f;//设置边框宽度
110   -// submitBtn.layer.borderColor = [UIColor blackColorCNLive].CGColor;//设置边框颜色
111 87 UIButton *submitBtn = [UIButton buttonWithTitle:@"提 交" titleColor:[UIColor blackColorCNLive] cornerRadius:20.0f borderWidth:1.0f borderColor:[UIColor blackColorCNLive] backgroundColor:[UIColor yellowColorCNLive]];
112 88 submitBtn.frame = CGRectMake(10, 295, KScreenWidth - 20, 40);
113 89 [submitBtn addTarget:self action:@selector(submitBtnAction) forControlEvents:UIControlEventTouchUpInside];
... ... @@ -159,13 +135,6 @@
159 135 [self performSelector:@selector(dismissView) withObject:nil afterDelay:2];
160 136  
161 137 }];
162   -
163   -// if ([Tools isEmployeeQQNumber:_phoneField.text] || [Tools isValidateEmail:_phoneField.text] || [Tools isMobileNumber:_phoneField.text]) {
164   -//
165   -// }else{
166   -// [Tools showHUDInView:self.view withString:@"请填写正确联系方式" autoHide:YES];
167   -// }
168   -
169 138 }
170 139  
171 140 - (void)dismissView
... ... @@ -221,7 +190,6 @@
221 190 #pragma mark - 键盘监听
222 191 - (void)keyboardWasShown:(NSNotification*)aNotification
223 192 {
224   -
225 193 BOOL desc = _descriptionView.isFirstResponder;
226 194 BOOL report = _reportField.isFirstResponder;
227 195 BOOL number = _phoneField.isFirstResponder;
... ... @@ -235,7 +203,6 @@
235 203 }
236 204  
237 205 _bgScrollView.contentSize = CGSizeMake(KScreenWidth, 750);
238   -
239 206 }
240 207  
241 208 - (void)keyboardWillBeHidden:(NSNotification*)aNotification
... ...