瀏覽代碼

1.音视频更换新的SDK
2.对应修改逻辑相关

huangxiaodong 1 年之前
父節點
當前提交
3ada8a7476

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

@@ -205,24 +205,12 @@
     if(_curPlayerVC){
         [_curPlayerVC disconnectVideoServer];
         
+        _curPlayerVC.isNeedRecyclResource = YES;
         [_curPlayerVC recyclResource];
-        ///后续要清掉下面的代码
-        [_curPlayerVC toStopRecoder];
-        [_curPlayerVC toStopAudioRecoder];
-
-        [_curPlayerVC removeNSNotification];
-        
-        //清空WebSocket连接
-        [_curPlayerVC.commandChannelManager rc_close];
-        
-//        globalBlock(^{
-//            [self->_curPlayerVC.liveStreamManager rc_release];
-//        });
-        /////////
         
         _curPlayerVC.liveStreamManager = nil;
         _curPlayerVC.commandChannelManager = nil;
-        //[_curPlayerVC.navigationController popViewControllerAnimated:NO];
+        [_curPlayerVC.navigationController popViewControllerAnimated:NO];
         _curPlayerVC = nil;
     }
     
@@ -234,14 +222,15 @@
     playerRootVC.isPwdVCShow = YES;
     _curPlayerVC = playerRootVC;
     
-    BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:playerRootVC];
-    self.window.rootViewController = playerNav;
-//    UIViewController *vc = [UIViewController new];
-//
-//    BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:vc];
-//    [playerNav pushViewController:playerRootVC animated:NO];
+//    BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:playerRootVC];
 //    self.window.rootViewController = playerNav;
     
+    UIViewController *vc = [UIViewController new];
+
+    BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:vc];
+    [playerNav pushViewController:playerRootVC animated:NO];
+    self.window.rootViewController = playerNav;
+    
     _preRootPlayerNav = playerNav;
     
     self.isLoginAgainType = NO;
@@ -282,13 +271,6 @@
         });
     }
     
-    //test code
-    //[playerRootVC showSecretkeyFun];
-   
-    
-//    MySetViewController *playerRootVC = [[MySetViewController alloc] init];
-//    BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:playerRootVC];
-//    self.window.rootViewController = playerNav;
 }
 
 #pragma mark 处理进来是非隐私模式的情况

+ 18 - 2
创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm

@@ -1628,13 +1628,29 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
   
    
     //目前支持 中文(简体 繁体) 英文 日语
-    if([languageCode  rangeOfString:preferredLanguage].location != NSNotFound){
-        preferredLanguage = languageCode;
+    if([languageCode rangeOfString:@"zh-Hans-"].location != NSNotFound)
+    {
+        preferredLanguage = @"zh-CN";
+    }
+    else if([languageCode rangeOfString:@"zh-Hant-"].location != NSNotFound)
+    {
+        preferredLanguage = @"zh-HK";
+    }
+    else if([languageCode rangeOfString:@"ja-"].location != NSNotFound)
+    {
+        preferredLanguage = @"ja-JP";
     }
     else{
         preferredLanguage = @"en-US";
     }
     
+//    if([languageCode  rangeOfString:preferredLanguage].location != NSNotFound){
+//        preferredLanguage = languageCode;
+//    }
+//    else{
+//        preferredLanguage = @"en-US";
+//    }
+    
     NSString*gmtStr = [self UTCOffset];
     HLog(@"%@",gmtStr);
 //    //获取名字,如“GMT+08:00

二進制
创维盒子/双子星云手机/CloudPlayer/RCCloudPhoneSDK.framework/Info.plist


+ 1 - 1
创维盒子/双子星云手机/CloudPlayer/RCCloudPhoneSDK.framework/Modules/module.modulemap

@@ -1,6 +1,6 @@
 framework module RCCloudPhoneSDK {
   umbrella header "RCCloudPhoneSDK.h"
-
   export *
+
   module * { export * }
 }

二進制
创维盒子/双子星云手机/CloudPlayer/RCCloudPhoneSDK.framework/RCCloudPhoneSDK


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

@@ -237,7 +237,7 @@ static connectDeviceManager *connectDeviceManagerInstance = nil;
 //    }
     
     if (self.peerConnected == YES) {
-        [self disconnect];
+        //[self disconnect];
         //return;
     }