From aef80f5505002f638cd18937401f7a260d8154b8 Mon Sep 17 00:00:00 2001 From: jiangxuefei718 Date: Fri, 15 Mar 2019 18:09:13 +0800 Subject: [PATCH] =?UTF-8?q?fixed:1,=E6=91=84=E5=83=8F=E5=A4=B4=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E9=A1=B5=E9=9D=A2=E9=80=82=E9=85=8D=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=202.wifi=E5=AF=86=E7=A0=81=E6=A0=A1=E9=AA=8C=E8=A7=84?= =?UTF-8?q?=E5=88=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 6148 -> 6148 bytes Ifish/Info.plist | 2 +- .../maincontroller/CenterViewController.m | 21 +++++++++--------- .../IfishP2PMonitorController.m | 4 ++-- .../YooseeNextConnectViewController.mm | 14 ++++++------ .../SecondConnectWifiController.m | 14 ++++++------ 6 files changed, 28 insertions(+), 27 deletions(-) diff --git a/.DS_Store b/.DS_Store index 4d836a4e3ebaf1cb4e572706cf16f44845c1525f..a641f5583f4b18e4b0f5629efff15a2987fe2f82 100644 GIT binary patch delta 23 fcmZoMXfc?uhbjBg#C-;g2^&9(v2SMO_|Fdjb&CmM delta 23 fcmZoMXfc?uhslX+;ywdLgN+}>*f+Cs{O1P%Wn&0H diff --git a/Ifish/Info.plist b/Ifish/Info.plist index d5dc0b5..014ced4 100644 --- a/Ifish/Info.plist +++ b/Ifish/Info.plist @@ -70,7 +70,7 @@ CFBundleVersion - 531 + 535 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m index 000a6ed..ccefc5b 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m @@ -96,12 +96,13 @@ //self.navigationBar.alpha=0; self.view.backgroundColor=COLOR_MIAN; [self creatTableView]; - [self initUI]; - [self fishTankData]; - - [self creatMyindicaterView]; - [self notBindDeviceState]; - [self creatRefreshView]; + return; +// [self initUI]; +// [self fishTankData]; +// +// [self creatMyindicaterView]; +// [self notBindDeviceState]; +// [self creatRefreshView]; @@ -637,7 +638,7 @@ if (self.tableView==nil) { UITableView*table=[[UITableView alloc]init]; - table.frame=CGRectMake(0,0, kScreenSize.width, kScreenSize.height ); + table.frame=CGRectMake(0,0, kScreenSize.width, kScreenSize.height-TOP_HEIGHT); table.dataSource=self; table.delegate=self; table.separatorStyle=UITableViewCellSeparatorStyleSingleLine; @@ -660,9 +661,9 @@ return 0; } -(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ - - - + + + return nil; } diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m index 2eb409b..2a89c3d 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m @@ -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]; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm index 24402d3..9a03c80 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm @@ -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) { diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m index 3024bc6..26904d0 100644 --- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m +++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m @@ -397,13 +397,13 @@ extern BOOL isfromCameraView; [_wifiTextFiled resignFirstResponder]; - BOOL isRight =[dataContorl isIncludeSpecialCharact:_wifiTextFiled.text]; - - if (!isRight) { - [self.view makeToast:@"Wifi密码不能包含特殊字符，只能为数字字母下划线"]; - - return; - } +// BOOL isRight =[dataContorl isIncludeSpecialCharact:_wifiTextFiled.text]; +// +// if (!isRight) { +// [self.view makeToast:@"Wifi密码不能包含特殊字符，只能为数字字母下划线"]; +// +// return; +// } [self savePassw]; [self tapConfirmForResults];