Переглянути джерело

通过信令通道拿系统版本信息,小于等于1.4.3版本使用老的音视频token鉴权vclusters,等于或者大于1.4.4版本还是用新的音视频token鉴权mediakit(新老版本做兼容

huangxiaodong 11 місяців тому
батько
коміт
5cd15e1752

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

@@ -27,6 +27,7 @@
 @property (nonatomic, assign)BOOL DisabledFileTransferType;//禁用文件传输
 @property (nonatomic, assign)BOOL isImageNewFor130;//1.3.0的镜像是否待更新
 @property (nonatomic, assign)BOOL isNeedShowImageNewType;//是否需要显示镜像强制更新
+@property (nonatomic, assign)BOOL isImageFor144Orlater;//镜像版本是否为1.4.4 或者之后
 
 @property (nonatomic, assign)BOOL isWebSockLinkOKAginType;//WebSock断开后或者链接上了
 @property (nonatomic, strong) TvStatusModel * TvStatusMod;

+ 1 - 1
创维盒子/双子星云手机/NAS/NASViewController.m

@@ -947,7 +947,7 @@
 #pragma mark 弹框流程 1 强制盒子更新弹窗
 - (void)handelUpgradeInfoFun
 {
-    self.otaUpgradeInfoModel.data.status = 1;
+    //self.otaUpgradeInfoModel.data.status = 1;
     if(self.otaUpgradeInfoModel.data.status < 1){  //-1=没有更新 0=下载中
         //2. APP版本更新弹窗
         [self checkVersionFun];

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

@@ -141,6 +141,7 @@
     [ksharedAppDelegate.WebRtcLogger start];
     HLog(@"webrtc :%@",ksharedAppDelegate.WebRtcLogger)
     
+    //vclusters
     NSInteger result = [_mediaStream startUploadChannel:url ice:ice sn:roomName token:@"vclusters"];
     
     HLog(@"webrtc 发起连接 result:%ld",result)
@@ -371,6 +372,21 @@
         else{
             ksharedAppDelegate.DisabledFileTransferType = NO;
         }
+        
+        
+        //判断镜像是否为1.4.4以后
+        if(oneStr.integerValue >=2){
+            ksharedAppDelegate.isImageFor144Orlater = YES;
+        }
+        else if(twoStr.integerValue > 4){
+            ksharedAppDelegate.isImageFor144Orlater = YES;
+        }
+        else if(threeStr.integerValue >= 4){
+            ksharedAppDelegate.isImageFor144Orlater = YES;
+        }
+        else{
+            ksharedAppDelegate.isImageFor144Orlater = NO;
+        }
     }
     
     [[NSNotificationCenter defaultCenter] postNotificationName:getCouldPhoneSysInfoNotification object:model];

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

@@ -231,6 +231,11 @@
     //2.客户端开始写日志
     [ksharedAppDelegate.WebRtcLogger start];
     
+    NSString* curToken = @"vclusters";
+    if(ksharedAppDelegate.isImageFor144Orlater){
+        curToken = @"mediakit";
+    }
+    
     NSInteger result = [_mediaStream start:url
                             ice:ice
                              sn:roomName
@@ -243,7 +248,7 @@
                       cardWidth:(NSInteger)phoneSize.width//0//1080//0
                      cardHeight:(NSInteger)phoneSize.height//0//1920//0
                     cardDensity:cardDensity
-                          token:@"vclusters"];
+                          token:curToken];
     
     HLog(@"result:%ld",result)