1.TV 投屏相关处理

创维盒子/双子星云手机/webRtc/webRtcManager/webRtcManager.h

@@ -49,6 +49,13 @@ NS_ASSUME_NONNULL_BEGIN
 #pragma mark 恢复出厂设置云机
 - (void)needToResetFun;
 
+#pragma mark 获取TV投屏状态
+- (void)getTvStatusFun;
+#pragma mark 关闭TV投屏状态
+- (void)offTvFun;
+#pragma mark 开启TV投屏状态
+- (void)onTvFun;
+
 //创建备份文件夹
 - (void)createBackupsFolderBy:(NSString*)backupsDefaultPath;
 //获取备份文件夹列表

创维盒子/双子星云手机/webRtc/webRtcManager/webRtcManager.m

@@ -390,13 +390,6 @@
     [[NSNotificationCenter defaultCenter] postNotificationName:getCouldPhoneBaseInfoNotification object:model];
 }
 
-#pragma mark 获取TV投屏状态
-- (void)getTvStatusFun
-{
-    NSString *commondStr  = @"{\"type\":\"TvStatus\"}";
-    [self send_data:commondStr];
-}
-
 #pragma mark 获取到TV投屏状态
 - (void)getCouldPhoneTvStatusResponseFun:(NSDictionary *)dataDict
 {
@@ -445,6 +438,27 @@
     _isResetingType = YES;
 }
 
+#pragma mark 获取TV投屏状态
+- (void)getTvStatusFun
+{
+    NSString *commondStr  = @"{\"type\":\"TvStatus\"}";
+    [self send_data:commondStr];
+}
+
+#pragma mark 关闭TV投屏状态
+- (void)offTvFun
+{
+    NSString *commondStr  = @"{\"type\":\"TvOff\"}";
+    [self send_data:commondStr];
+}
+
+#pragma mark 开启TV投屏状态
+- (void)onTvFun
+{
+    NSString *commondStr  = @"{\"type\":\"wakeupTV\"}";
+    [self send_data:commondStr];
+}
+
 #pragma mark 创建备份文件夹
 - (void)createBackupsFolderBy:(NSString*)backupsDefaultPath
 {
@@ -669,16 +683,16 @@
     else if ([messageType isEqualToString:@"TvStatus"]){/*获取TV投屏信息*/
         [self getCouldPhoneTvStatusResponseFun:dataDict];
     }
-//    else if ([messageType isEqualToString:@"TvOff"]){/*关闭TV投屏*/
-//        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-//            [weakSelf getTvStatusFun];
-//        });
-//    }
-//    else if ([messageType isEqualToString:@"wakeupTV"]){/*开启TV投屏*/
-//        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-//            [weakSelf getTvStatusFun];
-//        });
-//    }
+    else if ([messageType isEqualToString:@"TvOff"]){/*关闭TV投屏*/
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [self getTvStatusFun];
+        });
+    }
+    else if ([messageType isEqualToString:@"wakeupTV"]){/*开启TV投屏*/
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [self getTvStatusFun];
+        });
+    }
     else if ([messageType isEqualToString:@"reboot"]){/*重启*/
         //[weakSelf stopForceStartTimerFun];
     }

创维盒子/双子星云手机/webRtc/webRtcPlayerViewController.m

@@ -277,23 +277,23 @@
                 break;
             case 100:
                 {
-//                    BOOL fullscreenType = [HWDataManager getBoolWithKey:Consn_player_full_screen_show];
-//                    if(fullscreenType){
-//                        [weakSelf showOpenTVP2PFun];
-//                    }
-//                    else{
-//                        [weakSelf openTvShowFun];
-//                    }
+                    BOOL fullscreenType = [HWDataManager getBoolWithKey:Consn_player_full_screen_show];
+                    if(fullscreenType){
+                        [weakSelf showOpenTVP2PFun];
+                    }
+                    else{
+                        [weakSelf openTvShowFun];
+                    }
                     
                 }
                 break;
             case 101:
                 {
-//                    self->mPlayerView.controlBtn.userInteractionEnabled = NO;
-//                    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-//                        self->mPlayerView.controlBtn.userInteractionEnabled = YES;
-//                    });
-//                    [weakSelf showCloseTVP2PFun];
+                    self.controlBtn.userInteractionEnabled = NO;
+                    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                        self->controlBtn.userInteractionEnabled = YES;
+                    });
+                    [weakSelf showCloseTVP2PFun];
                 }
                 break;
             default:
@@ -395,6 +395,71 @@
     [self.navigationController popViewControllerAnimated:YES];
 }
 
+#pragma mark 显示关闭投屏提示语
+- (void)showOpenTVP2PFun{
+    /*弹窗提示TV投屏*/
+    ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"File_upload_Record_clear_Tip_title",nil)
+                                                                                     msg:NSLocalizedString(@"cloudPhone_fullscreen_tvshow_tip",nil)
+                                                                                imageStr:@""
+                                                                             cancelTitle:NSLocalizedString(@"other_cancel",nil)
+                                                                                 okTitle:NSLocalizedString(@"my_set_TVP2P_Open_sure",nil) isOkBtnHighlight:YES
+                                                                              didClickOk:^{
+        [self openTvShowFun];
+        
+        //关闭全屏屏
+        [HWDataManager setBoolWithKey:Consn_player_full_screen_show value:NO];
+        [self setPlayerFullScreenNotFun];
+    } didClickCancel:^{
+        
+    }];
+    nextVC.modalPresentationStyle = UIModalPresentationCustom;
+    [self presentViewController:nextVC animated:YES completion:^{
+        nextVC.view.superview.backgroundColor = [UIColor clearColor];
+    }];
+}
+
+
+#pragma mark 开始投屏
+- (void)openTvShowFun
+{
+    self.controlBtn.userInteractionEnabled = NO;
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        self->controlBtn.userInteractionEnabled = YES;
+    });
+    [[webRtcManager shareManager] onTvFun];
+    
+    [[iToast makeText:NSLocalizedString(@"cloudPhone_TV_show_tip",nil)] show];
+    
+    //数据埋点
+    [[netWorkManager shareInstance] DataEmbeddingPointBy:3 withEventValue:@"Cloud_tv"];
+}
+
+#pragma mark 显示关闭投屏提示语
+- (void)showCloseTVP2PFun{
+    /*弹窗提示TV投屏*/
+    ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"my_set_no_close_TV_p2p_tip",nil)
+                                                                                     msg:@""
+                                                                                imageStr:@""
+                                                                             cancelTitle:NSLocalizedString(@"other_cancel",nil)
+                                                                                 okTitle:NSLocalizedString(@"my_set_TVP2P_Open_sure",nil) isOkBtnHighlight:YES
+                                                                              didClickOk:^{
+        [self gotoCloseTVP2PFun];
+    } didClickCancel:^{
+        //HLog(@"2222");
+        
+    }];
+    nextVC.modalPresentationStyle = UIModalPresentationCustom;
+    [self presentViewController:nextVC animated:YES completion:^{
+        nextVC.view.superview.backgroundColor = [UIColor clearColor];
+    }];
+}
+
+#pragma mark 确认开始TV投屏
+-(void)gotoCloseTVP2PFun
+{
+    [[webRtcManager shareManager] offTvFun];
+}
+
 #pragma mark 底部按钮事件
 - (void)didClickBottomFunBy:(NSInteger)tag
 {
@@ -451,7 +516,7 @@
 //        NSString *commandStr = [RCCommandHelp commondToSetFullScreenPhoneSize];
 //        [self send_data:commandStr];
         
-        NSInteger cardDensity = 480;//422;//380;//460;
+        NSInteger cardDensity = 380;//480;//422;//380;//460;
         
         
         CGSize size = [RCCommandHelp commondToSetFullScreenPhoneSizeBySize];