|
|
@@ -39,6 +39,11 @@
|
|
|
return self;
|
|
|
}
|
|
|
|
|
|
+- (void)startPingNextFun
|
|
|
+{
|
|
|
+ pingRoomIndex++;
|
|
|
+ [self startPingFun];
|
|
|
+}
|
|
|
|
|
|
#pragma mark ---ping-----站点 判断是否是局域网
|
|
|
- (void)startPingFun
|
|
|
@@ -54,11 +59,12 @@
|
|
|
roomInternetIp = model.turnIp;
|
|
|
}
|
|
|
else{//完成遍历了
|
|
|
-
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
//IP 出错
|
|
|
if(!roomInternetIp || roomInternetIp.length ==0){
|
|
|
+ [self startPingNextFun];
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -102,10 +108,10 @@
|
|
|
//[self didGetPingStateIsOK:NO];
|
|
|
}
|
|
|
|
|
|
- if(pingOneIPErrorNumber == 3){
|
|
|
+ if(pingOneIPErrorNumber >= 3){
|
|
|
[self didGetPingStateIsOK:NO];
|
|
|
}
|
|
|
- else if (pingOneIPNumber == 10){
|
|
|
+ else if (pingOneIPNumber >= 9){
|
|
|
[self didGetPingStateIsOK:YES];
|
|
|
}
|
|
|
|
|
|
@@ -121,9 +127,22 @@
|
|
|
|
|
|
-(void)didGetPingStateIsOK:(BOOL)isOk
|
|
|
{
|
|
|
-// self.isPingOk = isOk;
|
|
|
-// [self->whPingTester stopPing];
|
|
|
-// self->whPingTester = nil;
|
|
|
+ [self->whPingTester stopPing];
|
|
|
+ self->whPingTester = nil;
|
|
|
+
|
|
|
+ if (allTimeInPingOneIP > 0) {
|
|
|
+ CGFloat averageDelayedms = allTimeInPingOneIP/pingOneIPNumber;
|
|
|
+
|
|
|
+ webrtcServerModel*preBestModel = ksharedAppDelegate.DeviceWebRtcMsgMod;
|
|
|
+
|
|
|
+ NSArray<webrtcServerModel>* webrtcServerList = ksharedAppDelegate.DeviceWebRtcMsgMod.data.webrtcServerList;
|
|
|
+ if (!webrtcServerList || webrtcServerList.count > pingRoomIndex) {
|
|
|
+ webrtcServerModel *model = webrtcServerList[pingRoomIndex];
|
|
|
+ model.delayedms = averageDelayedms;
|
|
|
+
|
|
|
+ if([model.turnIp isEqualToString:preBestModel.turnIp];)
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
@end
|