修复一些UI bug

FuSiLive/AppDelegate.m

@@ -687,9 +687,9 @@ static dispatch_queue_t get_status_queue() {
                                                                  kLivePushConfigCodeModeKey:@"0",
                                                                  kLivePushConfigFPSKey:@"18",
                                                                  kLivePushConfigBeautyEnableKey:@"1",
-                                                                 kLivePushConfigMaxBitrateKey:@"1500",
-                                                                 kLivePushConfigMinBitrateKey:@"500",
-                                                                 kLivePushConfigTargetBitrateKey:@"1000",
+                                                                 kLivePushConfigMaxBitrateKey:@"4000",
+                                                                 kLivePushConfigMinBitrateKey:@"1000",
+                                                                 kLivePushConfigTargetBitrateKey:@"2000",
                                                                  kLivePushConfigResolutionKey:@"2",
                                                         } forKey:LIVE_PUSH_CONFIG];
     }

FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_invite_mic_btn.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_room_card_invite_mic_btn@2x.png",
+      "filename" : "上麦@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "live_room_card_invite_mic_btn@3x.png",
+      "filename" : "上麦@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_invite_mic_btn_pressed.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_room_card_invite_mic_btn_pressed@2x.png",
+      "filename" : "上麦@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "live_room_card_invite_mic_btn_pressed@3x.png",
+      "filename" : "上麦@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

FuSiLive/Classes/InstantMessaging/View/ToolViews/VideoChat/FunctionViews/FUSVideoChatUserInfoView.m

@@ -396,6 +396,8 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
     _richImageView.centerX = _faceImageView.centerX;
     _richImageView.centerY = _faceImageView.bottom;
 //    _richWearImageView.center = _faceImageView.center;
+    
+    [_bgView addRoundedCorners:UIRectCornerTopLeft|UIRectCornerTopRight withRadii:CGSizeMake(16, 16)];
 }
 
 - (void)fus_initBgView {
@@ -775,7 +777,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
 
 - (void)pd_setupRoomControlView {
     _roomControlView = [[UIView alloc] initWithFrame:CGRectMake(0, _buttomBtnBgView.bottom, _bgView.width, ROOM_CONTROL_VIEW_HEIGHT())];
-    _roomControlView.backgroundColor = [UIColor colorWithHex:@"#242A36"];
+    _roomControlView.backgroundColor = [UIColor colorWithHex:@"#F1F0F0"];
     [_bgView addSubview:_roomControlView];
     CGFloat bottonHeight = _roomControlView.height;
     if (@available(iOS 11.0, *)) {

FuSiLive/Classes/NewLive/Main/View/StreamView/FUSByteStreamCaptureHelper.m

@@ -50,9 +50,6 @@
 @end
 
 @implementation FUSByteStreamCaptureHelper
-{
-    long long captureTimeCount;
-}
 
 #pragma mark - Init
 
@@ -295,6 +292,10 @@
         {
             videoSize = CGSizeMake(720, 1280);
         }
+        case 4:// 1080P
+        {
+            videoSize = CGSizeMake(1080, 1920);
+        }
             break;
         default:// 默认 540
             videoSize = CGSizeMake(540, 960);
@@ -341,9 +342,9 @@
         // 视频帧率
         _liveConfig.videoFPS = fps;
         // 视频码率
-        _liveConfig.bitrate = targetBitrate;
-        _liveConfig.minBitrate = minBitrate;
-        _liveConfig.maxBitrate = maxBitrate;
+        _liveConfig.bitrate = targetBitrate * 1000;;
+        _liveConfig.minBitrate = minBitrate * 1000;;
+        _liveConfig.maxBitrate = maxBitrate * 1000;;
         
         _liveConfig.outputSize = videoSize;
         
@@ -427,13 +428,10 @@
     if (![FUSBeautyHelper shareInstance].beautyEngineEnable) {
         // 没有美颜正在运行或者当前开关处于关闭状态
         // 声网采集协议正在运行
-        if (self.agoraVideoSourceRuning) {
-            captureTimeCount += 1;
         // 声网采集协议正在运行
         if (self.videoFrameCallBackHandler) {
             self.videoFrameCallBackHandler(buffer, pts, 0);
         }
-        }
 
         [_capture pushVideoBuffer:buffer andCMTime:pts];
         return;
@@ -441,18 +439,11 @@
 
     CVPixelBufferRef targetPixelBuffer = [[FUSBeautyHelper shareInstance] renderBeautyWithPixelBuffer:buffer timeStamp:(pts.value / pts.timescale)];
     
-    
-    // 声网采集协议正在运行
-    if (self.agoraVideoSourceRuning) {
-        captureTimeCount++;
-        //CMTimeMake(captureTimeCount, 600)
     // 声网采集协议正在运行
     if (self.videoFrameCallBackHandler) {
         self.videoFrameCallBackHandler(buffer, pts, 0);
     }
     
-    }
-    
     [_capture pushVideoBuffer:targetPixelBuffer andCMTime:pts];
 }
 
@@ -542,8 +533,6 @@
 
 /**
  重新开始推理，不停止原来的推流
-
- @param completion 完成回调
  */
 - (void)fus_reloadPush
 {

FuSiLive/Classes/NewLive/Main/View/StreamView/FUSStreamCaptureHelper.h

@@ -57,9 +57,6 @@ typedef NS_ENUM(NSInteger, FUSStreamSessionState)
                                                              CMTime pts,
                                                              int rotation);
 
-// 声网自定义视频源是否正在运行中
-@property (nonatomic, assign) BOOL agoraVideoSourceRuning;
-
 + (FUSStreamCaptureHelper *)fus_captureHepler;
 
 #pragma mark - Public Method