huangxiaodong месяцев назад: 5
Родитель
Сommit
470440a9c3

+ 2 - 2
创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -6214,7 +6214,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6293,7 +6293,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

+ 10 - 2
创维盒子/双子星云手机/webRtc/webRtcPlayerViewController.m

@@ -361,7 +361,7 @@
     
     _testLostLabel = [[UILabel alloc] init];
     _testLostLabel.textColor = [UIColor greenColor];
-    _testLostLabel.textAlignment = NSTextAlignmentCenter;
+    //_testLostLabel.textAlignment = NSTextAlignmentCenter;
     _testLostLabel.font = [UIFont systemFontOfSize:14.0];
     _testLostLabel.numberOfLines = 0;
     [self.view addSubview:_testLostLabel];
@@ -1343,7 +1343,15 @@
             __block NSString*lostDataStr = [[NSString alloc] initWithFormat:@"总包数:%ld --总丢包数:%ld--3秒接受到包数:%ld---3秒丢包数:%ld---3秒丢包率:%0.2f%%",lasPacketsReceived,lastAlllostData,(NSInteger)NsecondReceivedData,(NSInteger)NsecondLostData,prelostRate];
             
             webrtcServerModel * webrtcServerMod = ksharedAppDelegate.bestWebrtcServerModel;
-            NSString *signallingUrl = [[NSString alloc] initWithFormat:@"%@:%@--\n%@:%@--%.0fms",webrtcServerMod.signallingIp,webrtcServerMod.signallingPort,webrtcServerMod.turnIp,webrtcServerMod.turnPort,webrtcServerMod.delayedms];
+            NSMutableString *signallingUrl = [[NSMutableString alloc] initWithFormat:@"当前使用:%@:%@--\n%@:%@--%.0fms\n\n",webrtcServerMod.signallingIp,webrtcServerMod.signallingPort,webrtcServerMod.turnIp,webrtcServerMod.turnPort,webrtcServerMod.delayedms];
+           
+            for (webrtcServerModel *model in ksharedAppDelegate.DeviceWebRtcMsgMod.data.webrtcServerList) {
+                NSString *curStr = [[NSMutableString alloc] initWithFormat:@"%@:%@--\n%@:%@--%.0fms\n",model.signallingIp,model.signallingPort,model.turnIp,model.turnPort,model.delayedms];
+                
+                [signallingUrl appendString:curStr];
+            }
+            
+            
             
             lostDataStr = [[NSString alloc] initWithFormat:@"%@\n%@",lostDataStr,signallingUrl];