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

摄像头分享和切换网络时重连

This commit is contained in:
kai60 2020-05-18 17:37:54 +08:00
parent aff0f33ec6
commit 52e644f3ab
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ifish.xcodeproj/project.pbxproj
View File

@ -15697,7 +15697,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7; CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = WFX8GD5HFX; DEVELOPMENT_TEAM = WFX8GD5HFX;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
@ -15815,7 +15815,7 @@
CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 7; CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = WFX8GD5HFX; DEVELOPMENT_TEAM = WFX8GD5HFX;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;

13
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m
View File

@ -83,10 +83,23 @@
[super viewDidLoad]; [super viewDidLoad];
[self setup]; [self setup];
[self connect]; [self connect];
[self networknotify];
// Do any additional setup after loading the view from its nib. // Do any additional setup after loading the view from its nib.
} }
-(void)networknotify
{
AFNetworkReachabilityManager*networkManager=[AFNetworkReachabilityManager sharedManager];
[networkManager startMonitoring];
[networkManager setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) {
if (![Socketsingleton sharedInstance].clientSocket.isConnected)
{
[[Socketsingleton sharedInstance] cutOffSocket];
[self InitSocket];
}
}];
}
- (void)setup{ - (void)setup{
self.title = self.currentDevice.showName; self.title = self.currentDevice.showName;
//右侧菜单 //右侧菜单

2
Ifish/controllers/erweima/ScanViewController.m
View File

@ -356,7 +356,7 @@
} }
else if ([type isEqualToString:@"cameraId"]) else if ([type isEqualToString:@"cameraId"])
{ {
url=[NSString stringWithFormat:@"%@/api/user/shareCamaraDeviceByQrCode.do",JIEKOUPORT]; url=[NSString stringWithFormat:@"%@/api/user/shareCameraByQrCode.do",JIEKOUPORT];
para=@{ para=@{
@"deviceId":deviceId,@"userId":userID @"deviceId":deviceId,@"userId":userID
}; };