1.全面屏底部流60的空间放自己的按钮

创维盒子/双子星云手机/cloudPhone/websocket/RCCommandHelp.m

@@ -1305,10 +1305,14 @@ withType:(BOOL)isUploadType
         W_PHONE = W_PHONE * scale;
         W_PHONE = ((int)(W_PHONE/8)) *8;
         
+        //1.4.3全屏需求变更
+        W_PHONE -= 60;
+        
         //音视频说方案webrtc 最大解码分辨率 宽1080  高 1920
         if(W_PHONE > 1920){//超宽了
-            CGFloat scale = 1920.0/W_PHONE;
-            W_PHONE = 1920.0;
+            CGFloat scale = (1920.0 - 60)/W_PHONE;
+            //W_PHONE = 1920.0;
+            W_PHONE = 1920.0 - 60;
             H_PHONE = H_PHONE * scale;
             H_PHONE = ((int)(H_PHONE/8)) *8;
         }
@@ -1323,10 +1327,14 @@ withType:(BOOL)isUploadType
         H_PHONE = H_PHONE * scale;
         H_PHONE = ((int)(H_PHONE/8)) *8;
         
+        //1.4.3全屏需求变更
+        H_PHONE -= 60;
+        
         //音视频说方案webrtc 最大解码分辨率 宽1080  高 1920
         if(H_PHONE > 1920){//超宽了
-            CGFloat scale = 1920.0/H_PHONE;
-            H_PHONE = 1920.0;
+            CGFloat scale = (1920.0 - 60)/H_PHONE;
+            //H_PHONE = 1920.0;
+            H_PHONE = 1920.0 - 60;
             W_PHONE = W_PHONE * scale;
             W_PHONE = ((int)(W_PHONE/8)) *8;
         }

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

@@ -26,21 +26,22 @@
         if(fullScreenShow){//全屏
             make.left.mas_equalTo(0.f);
             make.right.mas_equalTo(0.f);
-            make.bottom.mas_equalTo(0.f);
+            //make.bottom.mas_equalTo(0.f);
+            make.bottom.mas_equalTo(-60.f);
             make.top.mas_equalTo(0.f);
         }
         else{//非全屏
-            if ((scr_H - scr_W/w_h_rate - 40.f) < 0){//空余高度不满 40 （宽不能满屏）
-                make.height.mas_equalTo(scr_H - 40.f);
-                make.width.mas_equalTo((scr_H - 40.f)*w_h_rate);
+            if ((scr_H - scr_W/w_h_rate - 60.f) < 0){//空余高度不满 60 （宽不能满屏）
+                make.height.mas_equalTo(scr_H - 60.f);
+                make.width.mas_equalTo((scr_H - 60.f)*w_h_rate);
                 make.centerX.equalTo(self.view.mas_centerX);
                 make.top.mas_equalTo(0);
             }
-            else if ((scr_H - scr_W/w_h_rate - 40.f*2) < 0){//空余高度不满 80 （Y不能居中）
+            else if ((scr_H - scr_W/w_h_rate - 60.f*2) < 0){//空余高度不满 80 （Y不能居中）
                 make.height.mas_equalTo(scr_H);
                 make.width.mas_equalTo((scr_H)*w_h_rate);
                 make.centerX.equalTo(self.view.mas_centerX);
-                make.bottom.mas_equalTo(-40);
+                make.bottom.mas_equalTo(-60);
             }
             else{// 宽满屏 Y居中
                 make.left.mas_equalTo(0.f);
@@ -56,10 +57,11 @@
     //[self.mediaStream setVideoContentMode:UIViewContentModeScaleAspectFit];
     
     [self.bottomContrView mas_remakeConstraints:^(MASConstraintMaker *make) {
-        make.height.mas_equalTo(40.f);
+        make.height.mas_equalTo(60.f);
         make.right.mas_equalTo(0.f);
         if(fullScreenShow){
-            make.bottom.mas_equalTo(0);
+            //make.bottom.mas_equalTo(0);
+            make.top.equalTo(self.mediaStream.mas_bottom);
         }
         else{
             make.top.equalTo(self.mediaStream.mas_bottom);
@@ -81,7 +83,7 @@
     lastVideoWHRate = w_h_rate;
     BOOL fullScreenShow = [HWDataManager getBoolWithKey:Consn_player_full_screen_show];
     
-    CGFloat h_forPhoneBottomView = 40.0;
+    CGFloat h_forPhoneBottomView = 60.0;
     CGFloat h_forPhoneTop = 0;
     if (IPHONE_X){
         h_forPhoneTop = 44.f;
@@ -106,22 +108,23 @@
         
         if(fullScreenShow){//全屏
             make.left.mas_equalTo(0.f);
-            make.right.mas_equalTo(0.f);
+            //make.right.mas_equalTo(0.f);
+            make.right.mas_equalTo(-60.f);
             make.bottom.mas_equalTo(0.f);
             make.top.mas_equalTo(0.f);
         }
         else{//非全屏
-            if ((scr_W - scr_H*w_h_rate - 40.f) < 0){//空余宽度不满 40 （高不能满屏）
-                make.height.mas_equalTo((scr_W - 40.f)/w_h_rate);
-                make.width.mas_equalTo(scr_W - 40.f);
+            if ((scr_W - scr_H*w_h_rate - 60.f) < 0){//空余宽度不满 40 （高不能满屏）
+                make.height.mas_equalTo((scr_W - 60.f)/w_h_rate);
+                make.width.mas_equalTo(scr_W - 60.f);
                 make.centerX.equalTo(self.view.mas_centerX);
                 make.left.mas_equalTo(0);
             }
-            else if ((scr_W - scr_H*w_h_rate - 40.f*2) < 0){//空余宽度不满 80 （X不能居中）
+            else if ((scr_W - scr_H*w_h_rate - 60.f*2) < 0){//空余宽度不满 80 （X不能居中）
                 make.height.mas_equalTo(scr_H);
                 make.width.mas_equalTo((scr_H)*w_h_rate);
                 make.centerY.equalTo(self.view.mas_centerX);
-                make.right.mas_equalTo(-40);
+                make.right.mas_equalTo(-60);
             }
             else{// 高满屏 X居中
                 make.height.mas_equalTo(scr_H);
@@ -138,7 +141,8 @@
     [self.bottomContrView mas_remakeConstraints:^(MASConstraintMaker *make) {
         make.width.mas_equalTo(h_forPhoneBottomView);
         if(fullScreenShow){
-            make.right.mas_equalTo(0);
+            //make.right.mas_equalTo(0);
+            make.left.equalTo(self.mediaStream.mas_right);
         }
         else{
             make.left.equalTo(self.mediaStream.mas_right);