|
@@ -209,19 +209,24 @@ ComontAlretViewControllerDelegate>
|
|
|
|
|
|
HLog(@"局域网是否能ping通:%d",[connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPingOk);
|
|
|
HLog(@"瑞云连接状态:%d",[[connectDeviceManager shareInstance] curConnectDeviceState]);
|
|
|
- if([connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPingOk){
|
|
|
- ip = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.ip;
|
|
|
- internetVideoPort = @"9100";
|
|
|
- [self didCanConnectServerFun];
|
|
|
- }
|
|
|
- else{
|
|
|
- if([[connectDeviceManager shareInstance] curConnectDeviceState] == DeviceConnectDeciceOk){
|
|
|
- ip = @"127.0.0.1";
|
|
|
- internetVideoPort = [[connectDeviceManager shareInstance] tcpPortStr];
|
|
|
+
|
|
|
+ //第一次进 先输入密码才能连接
|
|
|
+ if([connectDeviceManager shareInstance].isFirstInputPwdDone){
|
|
|
+ if([connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPingOk){
|
|
|
+ ip = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.ip;
|
|
|
+ internetVideoPort = @"9100";
|
|
|
[self didCanConnectServerFun];
|
|
|
}
|
|
|
+ else{
|
|
|
+ if([[connectDeviceManager shareInstance] curConnectDeviceState] == DeviceConnectDeciceOk){
|
|
|
+ ip = @"127.0.0.1";
|
|
|
+ internetVideoPort = [[connectDeviceManager shareInstance] tcpPortStr];
|
|
|
+ [self didCanConnectServerFun];
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+
|
|
|
}
|
|
|
|
|
|
#pragma mark 走局域网或者瑞云SDK链接OK
|