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

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

2
Ifish/Info.plist
View File

@ -70,7 +70,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>531</string> <string>535</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>

21
Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m
View File

@ -96,12 +96,13 @@
//self.navigationBar.alpha=0; //self.navigationBar.alpha=0;
self.view.backgroundColor=COLOR_MIAN; self.view.backgroundColor=COLOR_MIAN;
[self creatTableView]; [self creatTableView];
[self initUI]; return;
[self fishTankData]; // [self initUI];
// [self fishTankData];
[self creatMyindicaterView]; //
[self notBindDeviceState]; // [self creatMyindicaterView];
[self creatRefreshView]; // [self notBindDeviceState];
// [self creatRefreshView];
@ -637,7 +638,7 @@
if (self.tableView==nil) { if (self.tableView==nil) {
UITableView*table=[[UITableView alloc]init]; 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.dataSource=self;
table.delegate=self; table.delegate=self;
table.separatorStyle=UITableViewCellSeparatorStyleSingleLine; table.separatorStyle=UITableViewCellSeparatorStyleSingleLine;
@ -660,9 +661,9 @@
return 0; return 0;
} }
-(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ -(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
return nil; return nil;
} }

4
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
View File

@ -499,7 +499,7 @@
//显示监控画面的载体canvasView //显示监控画面的载体canvasView
CGFloat canvasView_h = [UIScreen mainScreen].bounds.size.width * 9/16; 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]; canvasView.backgroundColor = [UIColor blackColor];
[self.view addSubview:canvasView]; [self.view addSubview:canvasView];
self.canvasView = canvasView; self.canvasView = canvasView;
@ -1074,7 +1074,7 @@
CGFloat height = rect.size.height; CGFloat height = rect.size.height;
if (!_fishControlView) { 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.cameraId = self.contact.cameraId;
_fishControlView.MonitorBottomDelegate=self; _fishControlView.MonitorBottomDelegate=self;
[self.bottomFishHView addSubview:_fishControlView]; [self.bottomFishHView addSubview:_fishControlView];

14
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
View File

@ -948,13 +948,13 @@ withFilterContext:(id)filterContext
return; return;
} }
BOOL isRight =[dataContorl isIncludeSpecialCharact:self.wifiSecFiled.text]; // BOOL isRight =[dataContorl isIncludeSpecialCharact:self.wifiSecFiled.text];
//
if (!isRight) { // if (!isRight) {
[self.view makeToast:@"Wifi密码不能包含特殊字符，只能为数字字母下划线"]; // [self.view makeToast:@"Wifi密码不能包含特殊字符，只能为数字字母下划线"];
//
return; // return;
} // }
if (!self.wifiName) { if (!self.wifiName) {

14
Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
View File

@ -397,13 +397,13 @@ extern BOOL isfromCameraView;
[_wifiTextFiled resignFirstResponder]; [_wifiTextFiled resignFirstResponder];
BOOL isRight =[dataContorl isIncludeSpecialCharact:_wifiTextFiled.text]; // BOOL isRight =[dataContorl isIncludeSpecialCharact:_wifiTextFiled.text];
//
if (!isRight) { // if (!isRight) {
[self.view makeToast:@"Wifi密码不能包含特殊字符，只能为数字字母下划线"]; // [self.view makeToast:@"Wifi密码不能包含特殊字符，只能为数字字母下划线"];
//
return; // return;
} // }
[self savePassw]; [self savePassw];
[self tapConfirmForResults]; [self tapConfirmForResults];