root/ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed:1,摄像头绑定页面适配

Browse Source 
2.wifi密码校验规则修改
This commit is contained in:
jiangxuefei718
2019-03-15 18:09:13 +08:00
parent 6f23d287c0
commit aef80f5505
6 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
+2 -2
View File
@@ -499,7 +499,7 @@
//显示监控画面的载体canvasView
CGFloat canvasView_h = [UIScreen mainScreen].bounds.size.width * 9/16;
UIView *canvasView = [[UIView alloc] initWithFrame:CGRectMake(0, 64, width, canvasView_h)];
UIView *canvasView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, width, canvasView_h)];
canvasView.backgroundColor = [UIColor blackColor];
[self.view addSubview:canvasView];
self.canvasView = canvasView;
@@ -1074,7 +1074,7 @@
CGFloat height = rect.size.height;
if (!_fishControlView) {
_fishControlView=[[MonitorBootmView alloc] initWithFrame:CGRectMake(0,0, width, height-CGRectGetMaxY(self.segControl.frame) -15)];
_fishControlView=[[MonitorBootmView alloc] initWithFrame:CGRectMake(0,0, width, height-CGRectGetMaxY(self.segControl.frame) -15-TOP_HEIGHT)];
_fishControlView.cameraId = self.contact.cameraId;
_fishControlView.MonitorBottomDelegate=self;
[self.bottomFishHView addSubview:_fishControlView];
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
+7 -7
View File
@@ -948,13 +948,13 @@ withFilterContext:(id)filterContext
return;
}
BOOL isRight =[dataContorl isIncludeSpecialCharact:self.wifiSecFiled.text];
if (!isRight) {
[self.view makeToast:@"Wifi密码不能包含特殊字符，只能为数字字母下划线"];
return;
}
// BOOL isRight =[dataContorl isIncludeSpecialCharact:self.wifiSecFiled.text];
//
// if (!isRight) {
// [self.view makeToast:@"Wifi密码不能包含特殊字符，只能为数字字母下划线"];
//
// return;
// }
if (!self.wifiName) {