huangxiaodong преди 1 година
родител
ревизия
c05efef586

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

@@ -148,6 +148,9 @@ UIKIT_EXTERN NSString *const Const_did_show_version_and_click_wait;
 
 /*推流页导航栏是否隐藏 YES:隐藏  其他显示*/
 UIKIT_EXTERN NSString *const Consn_player_Nav_hide;
+/*推流页是否全屏 YES:全屏  其他显示*/
+UIKIT_EXTERN NSString *const Consn_player_full_screen_show;
+
 @end
 
 NS_ASSUME_NONNULL_END

+ 2 - 0
创维盒子/双子星云手机/AppDelegate/Config/Const.m

@@ -144,4 +144,6 @@ NSString *const Const_did_show_version_and_click_wait = @"show_version_and_click
 
 /*推流页导航栏是否隐藏 YES:隐藏  其他显示*/
 NSString *const Consn_player_Nav_hide = @"player_Nav_hide";
+/*推流页是否全屏 YES:全屏  其他显示*/
+NSString *const Consn_player_full_screen_show = @"player_full_screen_show";
 @end

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

@@ -143,4 +143,7 @@
 /*获取推流页导航栏变化通知*/
 #define getPlayerBottomNavNotification                 @"getPlayerBottomNavNot"
 
+/*设置推流页全屏是否通知*/
+#define setPlayerFullScreenNotification                 @"setPlayerFullScreenNot"
+
 #endif /* Notification_h */

+ 1 - 1
创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch

@@ -124,7 +124,7 @@ isBangsScreen; \
 #define USEAQAAC  NO
 #define USEOPENGL  YES
 #define USELOCALKEYBOARD  NO/*是否使用键盘透传*/
-#define fullScreenShow  NO
+//#define fullScreenShow  NO
 
 #define P2PModelList_bg_tableName(userName) [[NSString alloc] initWithFormat:@"P2PModelList_bg_tableName_%@",userName];
 #define DB_HWBuryPointModelList_TableName   @"DB_HWBuryPointModelList_New"

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

@@ -1292,11 +1292,14 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
                 break;
             case 100:
                 {
-                    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;
-                    });
-                    [[webSocketManager shareInstance] onTvFun];
+                    BOOL fullscreenType = [HWDataManager getBoolWithKey:Consn_player_full_screen_show];
+                    if(fullscreenType){
+                        [weakSelf showOpenTVP2PFun];
+                    }
+                    else{
+                        [weakSelf openTvShowFun];
+                    }
+                    
                 }
                 break;
             case 101:
@@ -1362,6 +1365,42 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
 }
 
 #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:nil
+                                                                             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];
+        [[NSNotificationCenter defaultCenter] postNotificationName:setPlayerFullScreenNotification object:nil];
+    } didClickCancel:^{
+        
+    }];
+    nextVC.modalPresentationStyle = UIModalPresentationCustom;
+    [self presentViewController:nextVC animated:YES completion:^{
+        nextVC.view.superview.backgroundColor = [UIColor clearColor];
+    }];
+}
+
+
+#pragma mark 开始投屏
+- (void)openTvShowFun
+{
+    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;
+    });
+    [[webSocketManager shareInstance] onTvFun];
+    
+    [[iToast makeText:NSLocalizedString(@"cloudPhone_TV_show_tip",nil)] show];
+}
+
+#pragma mark 显示关闭投屏提示语
 - (void)showCloseTVP2PFun{
     /*弹窗提示TV投屏*/
     ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"my_set_no_close_TV_p2p_tip",nil)
@@ -2123,6 +2162,8 @@ BOOL inReconnect = NO;
     
     //某一个YCDownloadItem下载成功通知
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(downloadTaskFinishedNoti:) name:nasDownloadTaskFinishedNotification object:nil];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(setPlayerFullScreenNotFun)  name:setPlayerFullScreenNotification  object:nil];
 }
 
 - (void)removeNSNotification
@@ -2905,4 +2946,22 @@ static int  couneeee = 0;
 {
     [self documentPicker:controller didPickDocumentsAtURLs:urls];
 }
+
+- (void)setPlayerFullScreenNotFun
+{
+    BOOL fullscreenType = [HWDataManager getBoolWithKey:Consn_player_full_screen_show];
+    
+    //重新设置分辨率
+    if(fullscreenType){
+        NSString *commandStr = [RCCommandHelp commondToSetFullScreenPhoneSize];
+        [self send_data:commandStr];
+    }
+    else{
+        NSString *commondStr  = @"{\"data\":{\"height\":1920,\"width\":1080},\"type\":\"setPhoneSize\"}";
+        [self send_data:commondStr];
+    }
+    
+    [self updatePlayViewRate:1.0];
+}
+
 @end

+ 11 - 3
创维盒子/双子星云手机/CloudPlayer/View/PlayerView.m

@@ -151,7 +151,8 @@ ShowImageViewDelegate>{
     
     /*下方控制器*/
     bottomContrView = [[UIView alloc] initWithFrame:CGRectMake(0, frame.size.height - 47.f, frame.size.width, 47.f)];
-    [bottomContrView setBackgroundColor:[UIColor blackColor]];
+    //[bottomContrView setBackgroundColor:[UIColor blackColor]];
+    [bottomContrView setBackgroundColor:[UIColor clearColor]];
     [self addSubview:bottomContrView];
     [bottomContrView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.mas_equalTo(0);
@@ -253,6 +254,8 @@ ShowImageViewDelegate>{
 - (void)setPoMas_makeWithImageRate:(CGFloat)w_h_rate isOpenVirtual:(BOOL)isOpenVirtual isUsageMode:(BOOL)isUsageMode{
     /*播放视图*/
 //    touchCommondView.isLan = NO;
+    BOOL fullScreenShow = [HWDataManager getBoolWithKey:Consn_player_full_screen_show];
+
     [showImageView setBackgroundColor:[UIColor blackColor]];
     [touchCommondView mas_remakeConstraints:^(MASConstraintMaker *make) {
         CGFloat scr_W = SCREEN_W;
@@ -278,7 +281,7 @@ ShowImageViewDelegate>{
             make.left.mas_equalTo(0.f);
             make.right.mas_equalTo(0.f);
             if(fullScreenShow){
-                make.height.mas_equalTo(scr_H - TABBARHEIGHT);
+                make.height.mas_equalTo(scr_H);
                 make.top.mas_equalTo(0.f);
             }
             else{
@@ -308,7 +311,12 @@ ShowImageViewDelegate>{
     [bottomContrView mas_remakeConstraints:^(MASConstraintMaker *make) {
         make.height.mas_equalTo(40.f);
         make.right.equalTo(touchCommondView.mas_right);
-        make.top.equalTo(touchCommondView.mas_bottom);
+        if(fullScreenShow){
+            make.bottom.mas_equalTo(0);
+        }
+        else{
+            make.top.equalTo(touchCommondView.mas_bottom);
+        }
         make.left.equalTo(touchCommondView.mas_left);
     }];
 

+ 22 - 2
创维盒子/双子星云手机/CloudPlayer/View/playerSetView.m

@@ -229,10 +229,12 @@
 {
     BOOL haveShowBottonNavType = ![HWDataManager getBoolWithKey:Consn_player_Nav_hide];
     [_bottomNavSwitch setOn:haveShowBottonNavType];
+    
+    BOOL fullscreenType = [HWDataManager getBoolWithKey:Consn_player_full_screen_show];
+    [_fullScreenSwitch setOn:fullscreenType];
 }
 
 - (void)maskSwitchPressed:(SYJUISwitch *)maskSwitch{
-   
     if(_bottomNavSwitch == maskSwitch){
         if (maskSwitch.on) {
             [HWDataManager setBoolWithKey:Consn_player_Nav_hide value:NO];
@@ -243,8 +245,26 @@
         
         [[NSNotificationCenter defaultCenter] postNotificationName:getPlayerBottomNavNotification object:nil];
     }
+    else if (_fullScreenSwitch == maskSwitch){
+        
+        BOOL isTVShowType = ksharedAppDelegate.TvStatusMod.isTVShowType;
+        if(isTVShowType){
+            [[iToast makeText:NSLocalizedString(@"cloudPhone_tvShow_before_fullscreen_tip",nil)] show];
+            [self removeFun];
+            return;
+        }
+        
+        if (maskSwitch.on) {
+            [HWDataManager setBoolWithKey:Consn_player_full_screen_show value:YES];
+        }
+        else{
+            [HWDataManager setBoolWithKey:Consn_player_full_screen_show value:NO];
+        }
+        
+        [[NSNotificationCenter defaultCenter] postNotificationName:setPlayerFullScreenNotification object:nil];
+    }
     
-    
+    [self removeFun];
 }
 
 #pragma mark 按钮事件

+ 3 - 0
创维盒子/双子星云手机/Helpers/iTools.h

@@ -183,6 +183,9 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSString *)base64UrlEncoder:(NSString *)str;
 // base64 url 解码
 + (NSString *)base64UrlDecoder:(NSString *)str;
+
+//获取机型
++ (NSString *)getCurrentDeviceModel;
 @end
 
 NS_ASSUME_NONNULL_END

+ 101 - 0
创维盒子/双子星云手机/Helpers/iTools.m

@@ -10,6 +10,7 @@
 #import "CommonCrypto/CommonDigest.h"
 #import <CommonCrypto/CommonCrypto.h>
 #import "RSA.h"
+#import <sys/utsname.h>//获取机型要导入头文件
 
 static const char encodingTable[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
@@ -1296,4 +1297,104 @@ static const char encodingTable[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopq
     return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
 }
 
+
+//获取机型
++ (NSString *)getCurrentDeviceModel{
+   struct utsname systemInfo;
+   uname(&systemInfo);
+   
+   NSString *deviceModel = [NSString stringWithCString:systemInfo.machine encoding:NSASCIIStringEncoding];
+   
+   
+    if ([deviceModel isEqualToString:@"iPhone3,1"])    return @"iPhone 4";
+    if ([deviceModel isEqualToString:@"iPhone3,2"])    return @"iPhone 4";
+    if ([deviceModel isEqualToString:@"iPhone3,3"])    return @"iPhone 4";
+    if ([deviceModel isEqualToString:@"iPhone4,1"])    return @"iPhone 4S";
+    if ([deviceModel isEqualToString:@"iPhone5,1"])    return @"iPhone 5";
+    if ([deviceModel isEqualToString:@"iPhone5,2"])    return @"iPhone 5 (GSM+CDMA)";
+    if ([deviceModel isEqualToString:@"iPhone5,3"])    return @"iPhone 5c (GSM)";
+    if ([deviceModel isEqualToString:@"iPhone5,4"])    return @"iPhone 5c (GSM+CDMA)";
+    if ([deviceModel isEqualToString:@"iPhone6,1"])    return @"iPhone 5s (GSM)";
+    if ([deviceModel isEqualToString:@"iPhone6,2"])    return @"iPhone 5s (GSM+CDMA)";
+    if ([deviceModel isEqualToString:@"iPhone7,1"])    return @"iPhone 6 Plus";
+    if ([deviceModel isEqualToString:@"iPhone7,2"])    return @"iPhone 6";
+    if ([deviceModel isEqualToString:@"iPhone8,1"])    return @"iPhone 6s";
+    if ([deviceModel isEqualToString:@"iPhone8,2"])    return @"iPhone 6s Plus";
+    if ([deviceModel isEqualToString:@"iPhone8,4"])    return @"iPhone SE";
+    // 日行两款手机型号均为日本独占,可能使用索尼FeliCa支付方案而不是苹果支付
+    if ([deviceModel isEqualToString:@"iPhone9,1"])    return @"iPhone 7";
+    if ([deviceModel isEqualToString:@"iPhone9,2"])    return @"iPhone 7 Plus";
+    if ([deviceModel isEqualToString:@"iPhone9,3"])    return @"iPhone 7";
+    if ([deviceModel isEqualToString:@"iPhone9,4"])    return @"iPhone 7 Plus";
+    if ([deviceModel isEqualToString:@"iPhone10,1"])   return @"iPhone_8";
+    if ([deviceModel isEqualToString:@"iPhone10,4"])   return @"iPhone_8";
+    if ([deviceModel isEqualToString:@"iPhone10,2"])   return @"iPhone_8_Plus";
+    if ([deviceModel isEqualToString:@"iPhone10,5"])   return @"iPhone_8_Plus";
+    if ([deviceModel isEqualToString:@"iPhone10,3"])   return @"iPhone X";
+    if ([deviceModel isEqualToString:@"iPhone10,6"])   return @"iPhone X";
+    if ([deviceModel isEqualToString:@"iPhone11,8"])   return @"iPhone XR";
+    if ([deviceModel isEqualToString:@"iPhone11,2"])   return @"iPhone XS";
+    if ([deviceModel isEqualToString:@"iPhone11,6"])   return @"iPhone XS Max";
+    if ([deviceModel isEqualToString:@"iPhone11,4"])   return @"iPhone XS Max";
+    if ([deviceModel isEqualToString:@"iPhone12,1"])   return @"iPhone 11";
+    if ([deviceModel isEqualToString:@"iPhone12,3"])   return @"iPhone 11 Pro";
+    if ([deviceModel isEqualToString:@"iPhone12,5"])   return @"iPhone 11 Pro Max";
+    if ([deviceModel isEqualToString:@"iPhone12,8"])   return @"iPhone SE2";
+    if ([deviceModel isEqualToString:@"iPhone13,1"])   return @"iPhone 12 mini";
+    if ([deviceModel isEqualToString:@"iPhone13,2"])   return @"iPhone 12";
+    if ([deviceModel isEqualToString:@"iPhone13,3"])   return @"iPhone 12 Pro";
+    if ([deviceModel isEqualToString:@"iPhone13,4"])   return @"iPhone 12 Pro Max";
+    if ([deviceModel isEqualToString:@"iPhone14,4"])   return @"iPhone 13 mini";
+    if ([deviceModel isEqualToString:@"iPhone14,5"])   return @"iPhone 13";
+    if ([deviceModel isEqualToString:@"iPhone14,2"])   return @"iPhone 13 Pro";
+    if ([deviceModel isEqualToString:@"iPhone14,3"])   return @"iPhone 13 Pro Max";
+    if ([deviceModel isEqualToString:@"iPod1,1"])      return @"iPod Touch 1G";
+    if ([deviceModel isEqualToString:@"iPod2,1"])      return @"iPod Touch 2G";
+    if ([deviceModel isEqualToString:@"iPod3,1"])      return @"iPod Touch 3G";
+    if ([deviceModel isEqualToString:@"iPod4,1"])      return @"iPod Touch 4G";
+    if ([deviceModel isEqualToString:@"iPod5,1"])      return @"iPod Touch (5 Gen)";
+    if ([deviceModel isEqualToString:@"iPad1,1"])      return @"iPad";
+    if ([deviceModel isEqualToString:@"iPad1,2"])      return @"iPad 3G";
+    if ([deviceModel isEqualToString:@"iPad2,1"])      return @"iPad 2 (WiFi)";
+    if ([deviceModel isEqualToString:@"iPad2,2"])      return @"iPad 2";
+    if ([deviceModel isEqualToString:@"iPad2,3"])      return @"iPad 2 (CDMA)";
+    if ([deviceModel isEqualToString:@"iPad2,4"])      return @"iPad 2";
+    if ([deviceModel isEqualToString:@"iPad2,5"])      return @"iPad Mini (WiFi)";
+    if ([deviceModel isEqualToString:@"iPad2,6"])      return @"iPad Mini";
+    if ([deviceModel isEqualToString:@"iPad2,7"])      return @"iPad Mini (GSM+CDMA)";
+    if ([deviceModel isEqualToString:@"iPad3,1"])      return @"iPad 3 (WiFi)";
+    if ([deviceModel isEqualToString:@"iPad3,2"])      return @"iPad 3 (GSM+CDMA)";
+    if ([deviceModel isEqualToString:@"iPad3,3"])      return @"iPad 3";
+    if ([deviceModel isEqualToString:@"iPad3,4"])      return @"iPad 4 (WiFi)";
+    if ([deviceModel isEqualToString:@"iPad3,5"])      return @"iPad 4";
+    if ([deviceModel isEqualToString:@"iPad3,6"])      return @"iPad 4 (GSM+CDMA)";
+    if ([deviceModel isEqualToString:@"iPad4,1"])      return @"iPad Air (WiFi)";
+    if ([deviceModel isEqualToString:@"iPad4,2"])      return @"iPad Air (Cellular)";
+    if ([deviceModel isEqualToString:@"iPad4,4"])      return @"iPad Mini 2 (WiFi)";
+    if ([deviceModel isEqualToString:@"iPad4,5"])      return @"iPad Mini 2 (Cellular)";
+    if ([deviceModel isEqualToString:@"iPad4,6"])      return @"iPad Mini 2";
+    if ([deviceModel isEqualToString:@"iPad4,7"])      return @"iPad Mini 3";
+    if ([deviceModel isEqualToString:@"iPad4,8"])      return @"iPad Mini 3";
+    if ([deviceModel isEqualToString:@"iPad4,9"])      return @"iPad Mini 3";
+    if ([deviceModel isEqualToString:@"iPad5,1"])      return @"iPad Mini 4 (WiFi)";
+    if ([deviceModel isEqualToString:@"iPad5,2"])      return @"iPad Mini 4 (LTE)";
+    if ([deviceModel isEqualToString:@"iPad5,3"])      return @"iPad Air 2";
+    if ([deviceModel isEqualToString:@"iPad5,4"])      return @"iPad Air 2";
+    if ([deviceModel isEqualToString:@"iPad6,3"])      return @"iPad Pro 9.7";
+    if ([deviceModel isEqualToString:@"iPad6,4"])      return @"iPad Pro 9.7";
+    if ([deviceModel isEqualToString:@"iPad6,7"])      return @"iPad Pro 12.9";
+    if ([deviceModel isEqualToString:@"iPad6,8"])      return @"iPad Pro 12.9";
+
+    if ([deviceModel isEqualToString:@"AppleTV2,1"])      return @"Apple TV 2";
+    if ([deviceModel isEqualToString:@"AppleTV3,1"])      return @"Apple TV 3";
+    if ([deviceModel isEqualToString:@"AppleTV3,2"])      return @"Apple TV 3";
+    if ([deviceModel isEqualToString:@"AppleTV5,3"])      return @"Apple TV 4";
+
+    if ([deviceModel isEqualToString:@"i386"])         return @"Simulator";
+    if ([deviceModel isEqualToString:@"x86_64"])       return @"Simulator";
+    
+    return deviceModel;
+}
+
+
 @end

+ 22 - 0
创维盒子/双子星云手机/cloudPhone/cloudPhoneViewController.m

@@ -191,6 +191,28 @@
             break;
         case 2:
         {
+            BOOL isTVShowType = ksharedAppDelegate.TvStatusMod.isTVShowType;
+            if(isTVShowType){//关闭全屏屏
+                [HWDataManager setBoolWithKey:Consn_player_full_screen_show value:NO];
+            }
+            
+            BOOL fullscreenType = [HWDataManager getBoolWithKey:Consn_player_full_screen_show];
+            //重新设置分辨率
+            if(fullscreenType){
+                NSString *commandStr = [RCCommandHelp commondToSetFullScreenPhoneSize];
+                [[webSocketManager shareInstance] send_data:commandStr];
+            }
+            else{
+                if ((ksharedAppDelegate.couldPhone_W_PHONE == 720 && ksharedAppDelegate.couldPhone_H_PHONE == 1280)
+                    || (ksharedAppDelegate.couldPhone_W_PHONE == 1080 && ksharedAppDelegate.couldPhone_H_PHONE == 1920)) {//云机可能存在的分辨率
+                    
+                }
+                else{
+                    NSString *commondStr  = @"{\"data\":{\"height\":1920,\"width\":1080},\"type\":\"setPhoneSize\"}";
+                    [[webSocketManager shareInstance] send_data:commondStr];
+                }
+            }
+            
             PlayerViewController *vc = [PlayerViewController new];
             [self pushViewController:vc animated:YES];
             

+ 6 - 0
创维盒子/双子星云手机/cloudPhone/websocket/RCCommandHelp.h

@@ -256,6 +256,12 @@ NS_ASSUME_NONNULL_BEGIN
  * @param taskUid
  */
 + (NSString *)applyForDownloadThumbnailFileBy:(NSString *)taskUid withFilePath:(NSString *)filePath withPosition:(long)position;
+
+/**
+ * @brief 1.4.1 设置全屏推流
+ *
+ */
++ (NSString *)commondToSetFullScreenPhoneSize;
 @end
 
 NS_ASSUME_NONNULL_END

+ 88 - 0
创维盒子/双子星云手机/cloudPhone/websocket/RCCommandHelp.m

@@ -1174,4 +1174,92 @@ withType:(BOOL)isUploadType
     return dataStr;
 }
 
+/**
+ * @brief 1.4.1 设置全屏推流
+ *
+ */
++ (NSString *)commondToSetFullScreenPhoneSize
+{
+    
+    UIWindow *window = [[[UIApplication sharedApplication] windows] lastObject];
+    CGFloat phoneW = window.frame.size.width * 3;
+    CGFloat phoneH = window.frame.size.height * 3;
+    
+    CGFloat W_PHONE = phoneW;
+    CGFloat H_PHONE = phoneH;
+    
+    //朱珠令验证  设置分辨率的宽高要求余8为零才能解码成功 20220221
+    W_PHONE = ((int)(W_PHONE/8)) *8;
+    H_PHONE = ((int)(H_PHONE/8)) *8;
+//    
+//    //从iPhone 6开始适配
+//    NSString *phoneModel = [iTools getCurrentDeviceModel];
+//    if([phoneModel isEqualToString:@"iPhone 6"]
+//       ||[phoneModel isEqualToString:@"iPhone 6s"]
+//       ||[phoneModel isEqualToString:@"iPhone 7"]
+//       ||[phoneModel isEqualToString:@"iPhone 7s"]
+//       ||[phoneModel isEqualToString:@"iPhone 8"]
+//       ||[phoneModel isEqualToString:@"iPhone 8s"]
+//       ||[phoneModel isEqualToString:@"iPhone SE"])
+//    {//不行 可以用 1920 *1080  没有真机验证
+////         W_PHONE = 1334;
+////         H_PHONE = 750;
+//        H_PHONE = 1920;
+//        W_PHONE = 1080;
+//        
+//    }
+//    else if ([phoneModel isEqualToString:@"iPhone 6 Plus"]
+//             ||[phoneModel isEqualToString:@"iPhone 7 Plus"]
+//             ||[phoneModel isEqualToString:@"iPhone 8 Plus"]
+//             ||[phoneModel isEqualToString:@"iPhone 6s Plus"]
+//             ||[phoneModel isEqualToString:@"iPhone 7s Plus"]
+//             ||[phoneModel isEqualToString:@"iPhone 8s Plus"])
+//    {
+//        H_PHONE = 1920;
+//        W_PHONE = 1080;
+//    }
+    
+//    else if ([phoneModel isEqualToString:@"iPhone X"]
+//             ||[phoneModel isEqualToString:@"iPhone XS"])
+//    {
+////        W_PHONE = 2436;
+////        H_PHONE = 1125;
+//    }
+//    else if ([phoneModel isEqualToString:@"iPhone XR"]
+//             ||[phoneModel isEqualToString:@"iPhone XS Max"])
+//    {//不用改
+//    }
+    
+    //
+    CGFloat scale = 1080.0/W_PHONE;
+    W_PHONE = 1080;//W_PHONE*scale;
+    H_PHONE = H_PHONE * scale;
+    H_PHONE = ((int)(H_PHONE/8)) *8;
+
+    //[RCGameCommondToStr setCurrentCouldPhone_W_PHONE:W_PHONE];
+    //[RCGameCommondToStr setCurrentCouldPhone_H_PHONE:H_PHONE];
+                
+    //不行
+//    CGFloat W_PHONE = 812;
+//    CGFloat H_PHONE = 375;
+    
+
+    //ok
+//    CGFloat W_PHONE = 1136;
+//    CGFloat H_PHONE = 640;
+    
+    
+    NSString *dataStr = [NSString stringWithFormat:@"{\"data\":{\"width\":\"%d\",\"height\":\"%d\"},\"type\":\"setPhoneSize\"}",(int)W_PHONE,(int)H_PHONE];
+    
+    if (USENEWCONTROLLCOMMONDNO500)
+    {
+//        dataStr = [self commondAppendingHeadAndEndStrWithSourStr:dataStr];
+    }
+    else
+    {
+        dataStr = [self commandAppending00StringWithSourStr:dataStr];
+    }
+    
+    return dataStr;
+}
 @end

+ 3 - 1
创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings

@@ -548,7 +548,9 @@
 "cloudPhone_fullScreen_show_tip"   = "全面屏";
 "cloudPhone_set_exit_tip"   = "退出云机";
 "cloudPhone_set_screenshot_tip"   = "截图";
-//"cloudPhone_screenshot_done_tip"   = "";
+"cloudPhone_TV_show_tip"   = "投屏已开启,请在TV查看是否成功投屏";
+"cloudPhone_fullscreen_tvshow_tip"   = "系统监测到当前为全屏模式,开启TV投屏,客户端将会关闭全屏状态";
+"cloudPhone_tvShow_before_fullscreen_tip"   = "TV投屏时全面屏功能受限,请关闭投屏后使用。";
 "mine_net_LAN"   = "内网";
 "mine_net_WAN"   = "外网";
 "mine_help_title"   = "帮助与反馈";