huangxiaodong пре 11 месеци
родитељ
комит
fae3a2b2ac

+ 1 - 1
创维盒子/双子星云手机/AppDelegate/SceneDelegate.m

@@ -791,7 +791,7 @@
     
     if(SCREEN_W > SCREEN_H){
         HLog(@"showCalculatorVC 屏幕还是横屏状态")
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             [self showCalculatorVC];
         });
         return;

+ 4 - 0
创维盒子/双子星云手机/webRtc/webRtcManager/webRtcManager+StatisticsReport.h

@@ -12,6 +12,10 @@ NS_ASSUME_NONNULL_BEGIN
 @interface webRtcManager (StatisticsReport)
 // IsChannel:是否是P2P通道
 - (void)reportWebRtcRePoportTypeIsChannel:(BOOL)IsChannel withStats:(RTC_OBJC_TYPE(RTCStatisticsReport) *)stats;
+
+// IsChannel:是否是P2P通道
+- (void)reportWebRtcRePoportTypeIsChannel:(BOOL)IsChannel withLocal:(RTC_OBJC_TYPE(RTCIceCandidate) *)local remoteCandidate:(RTC_OBJC_TYPE(RTCIceCandidate) *)remote;
+
 @end
 
 NS_ASSUME_NONNULL_END

+ 40 - 0
创维盒子/双子星云手机/webRtc/webRtcManager/webRtcManager+StatisticsReport.m

@@ -203,4 +203,44 @@
         HLog(@"")
     }];
 }
+
+// IsChannel:是否是P2P通道
+- (void)reportWebRtcRePoportTypeIsChannel:(BOOL)IsChannel withLocal:(RTC_OBJC_TYPE(RTCIceCandidate) *)local remoteCandidate:(RTC_OBJC_TYPE(RTCIceCandidate) *)remote{
+    
+    // candidate:504853897 1 udp 41885695 115.227.9.195 35762 typ relay raddr 115.227.9.184 rport 43877 generation 0 ufrag OP7P network-id 1
+    NSString*localSdpStr = local.sdp;
+    if(!localSdpStr || localSdpStr.length==0){
+        return;
+    }
+    //正常可以分割到20个非空格元素
+    NSArray *localSdpArr = [localSdpStr componentsSeparatedByString:@" "];
+    if(localSdpArr.count < 20){
+        return;
+    }
+    NSString* localIp = localSdpArr[4];
+    NSString* localPort = localSdpArr[5];
+    NSString* localType = localSdpArr[7];
+    NSString* localRelatedAddress = localSdpArr[9];// 可能为 null
+    NSString* localRelatedPort = localSdpArr[11];
+    //NSString* localNetworkId = localSdpArr[11];// 可能为 null
+    
+    NSString*remoteSdpStr = remote.sdp;
+    if(!remoteSdpStr || remoteSdpStr.length==0){
+        return;
+    }
+    //正常可以分割到20个非空格元素
+    NSArray *remoteSdpArr = [remoteSdpStr componentsSeparatedByString:@" "];
+    if(remoteSdpArr.count < 20){
+        return;
+    }
+    NSString* remoteIp = remoteSdpArr[4];
+    NSString* remotePort = remoteSdpArr[5];
+    NSString* remoteType = remoteSdpArr[7];
+    NSString* remoteRelatedAddress = remoteSdpArr[9];// 可能为 null
+    NSString* remoteRelatedPort = remoteSdpArr[11];
+    //NSString* remoteNetworkId = remoteSdpArr[11];// 可能为 null
+    
+    HLog(@"11");
+}
+
 @end

+ 1 - 0
创维盒子/双子星云手机/webRtc/webRtcManager/webRtcManager.h

@@ -8,6 +8,7 @@
 #import <Foundation/Foundation.h>
 #import <WebRTC/AMediaStream.h>
 #import <WebRTC/RTCMacros.h>
+#import <WebRTC/RTCIceCandidate.h>
 #import "webRtcMsgModel.h"
 #import "USBInsertPopView.h"
 #import "addLogObject.h"

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

@@ -1013,7 +1013,8 @@
              lastReceivedMs:(int)lastDataReceivedMs
                changeReason:(NSString *)reason
 {
-    HLog(@"webRtc P2P didChangeLocalCandidate")
+    //HLog(@"webRtc P2P didChangeLocalCandidate")
+    [self reportWebRtcRePoportTypeIsChannel:YES withLocal:local remoteCandidate:remote];
 }
 
 @end