1.部分调试 未完成

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

@@ -22,33 +22,38 @@
             scr_W = SCREEN_H;
             scr_H = SCREEN_W;
         }
-        if ((scr_H - scr_W/w_h_rate - 40.f)/2.f < 0){
-            if(fullScreenShow){
-                make.height.mas_equalTo(scr_H);
-                make.width.mas_equalTo(scr_W);
-            }
-            else{
+        
+        if(fullScreenShow){//全屏
+            make.left.mas_equalTo(0.f);
+            make.right.mas_equalTo(0.f);
+            make.bottom.mas_equalTo(0.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);
+                make.centerX.equalTo(self.view.mas_centerX);
+                make.top.mas_equalTo(0);
             }
-
-            make.centerX.equalTo(self.view.mas_centerX);
-            make.top.mas_equalTo(0);
-        }
-        else{
-            make.left.mas_equalTo(0.f);
-            make.right.mas_equalTo(0.f);
-            if(fullScreenShow){
+            else if ((scr_H - scr_W/w_h_rate - 40.f*2) < 0){//空余高度不满 80 （Y不能居中）
                 make.height.mas_equalTo(scr_H);
-                make.top.mas_equalTo(0.f);
+                make.width.mas_equalTo((scr_H)*w_h_rate);
+                make.centerX.equalTo(self.view.mas_centerX);
+                make.bottom.mas_equalTo(-40);
             }
-            else{
+            else{// 宽满屏 Y居中
+                make.left.mas_equalTo(0.f);
+                make.right.mas_equalTo(0.f);
                 make.height.mas_equalTo(scr_W/w_h_rate);
-                make.top.mas_equalTo((scr_H - scr_W/w_h_rate - 40.f)/2.f);
+                //make.top.mas_equalTo((scr_H - scr_W/w_h_rate - 40.f)/2.f);
+                make.centerY.equalTo(self.view.mas_centerY);
             }
         }
+        
     }];
     
+    [self.mediaStream setVideoContentMode:UIViewContentModeScaleAspectFit];
     
     [self.bottomContrView mas_remakeConstraints:^(MASConstraintMaker *make) {
         make.height.mas_equalTo(40.f);

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

@@ -60,6 +60,8 @@
 
 - (void)viewDidDisappear:(BOOL)animated{
     [super viewDidDisappear:animated];
+    [UIApplication sharedApplication].idleTimerDisabled = NO;
+    [[UIApplication sharedApplication] setStatusBarHidden:NO];
     
     [_mediaStream disconnect];
     [self enablePanRightBack];
@@ -523,6 +525,7 @@
         [self setCardSize:size.width cardHeight:size.height cardDensity:cardDensity];
         
         tempRate = (size.width *1.0)/(size.height *1.0);
+        //_mediaStream.frame =CGRectMake(0, 0, SCREEN_W, SCREEN_H);
     }
     else{
 //        NSString *commondStr  = [RCCommandHelp setPhoneSizecommandWithWidth:1080 high:1920 dpi:480];
@@ -533,11 +536,13 @@
         tempRate = 1080.0/1920.0;
     }
     
-    if (tempRate > 1) {/*横屏*/
-        [self setLanMas_makeWithImageRate:tempRate];
-    }else{/*竖屏*/
-        [self setPoMas_makeWithImageRate:tempRate];
-    }
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        if (tempRate > 1) {/*横屏*/
+            [self setLanMas_makeWithImageRate:tempRate];
+        }else{/*竖屏*/
+            [self setPoMas_makeWithImageRate:tempRate];
+        }
+    });
 }
 
 #pragma mark -- /*推流中修改卡的分辨率*/
@@ -632,7 +637,7 @@
 #pragma mark WebRTC 回调 MediaStreamClientEventsDelegate
 #pragma mark - 宽高变化
 -(void)onFrameResolutionChangedFromPeerName:(NSString*)peerName videoWidth:(int)videoWidth videoHeight:(int)videoHeight rotation:(int)rotation {
-    HLog(@"peerName:%@---%d---%d--%d",peerName,videoWidth,videoHeight,rotation)
+    HLog(@"onFrameResolutionChangedFromPeerName:%@---%d---%d--%d",peerName,videoWidth,videoHeight,rotation)
     
     mainBlock(^{
         [self handlUIAfterGetCloudPhoneVideoWidth:videoWidth videoHeight:videoHeight rotation:rotation];