Merge branch 'feature/UI修改版本' of http://git.yabolive.net:88/pidan/FuSiLive into feature/UI修改版本

FuSiLive.xcodeproj/xcshareddata/xcschemes/FuSiLive.xcscheme

@@ -34,6 +34,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      disableMainThreadChecker = "YES"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

FuSiLive/Classes/NewLive/Main/View/FunctionView/LinkMicro/Other/FUSAgoraHelper.m

@@ -436,6 +436,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
 - (void)setLocalMicEnable:(BOOL)localMicEnable {
     _localMicEnable = localMicEnable;
     [_agoraEngine enableLocalAudio:localMicEnable];
+    [_agoraEngine muteLocalAudioStream:!localMicEnable];
 }
 
 - (void)setAgoraHelperDelegate:(id<FUSAgoraHelperDelegate>)agoraHelperDelegate{

FuSiLive/Classes/NewLive/Main/View/FunctionView/PK/View/FUSPkWinningStreakView.swift

@@ -69,7 +69,8 @@ class FUSPkWinningStreakView: UIView {
     
     override func layoutSubviews() {
         super.layoutSubviews()
-        self.bgImageView.frame = self.bounds
+//        self.bgImageView.frame = self.bounds
+        self.bgImageView.size = CGSizeMake(64, 56)
         
         self.xImageView.x = 12.5
         self.xImageView.bottom = self.height - 15

FuSiLive/Classes/NewLive/Main/View/FunctionView/TreasureBox/View/FUSLiveBoxDetailSettingView.m

@@ -146,7 +146,11 @@
     }
     [_numberSetingView addSubview:_collectionView];
     
-    _currentIndexPath = [NSIndexPath indexPathForRow:0 inSection:0];
+    if (_optionsList.count) {
+        _currentIndexPath = [NSIndexPath indexPathForRow:_optionsList.count - 1 inSection:0];
+    } else {
+        _currentIndexPath = [NSIndexPath indexPathForRow:0 inSection:0];
+    }
     
     if (boxType == FUSTreasureTypeOrder) {
         _normalView.hidden = YES;
@@ -191,7 +195,7 @@
     FUSLiveBoxNumSettingCollectionViewCell *lastCell = (FUSLiveBoxNumSettingCollectionViewCell *)[_collectionView cellForItemAtIndexPath:_currentIndexPath];
     lastCell.contentView.layer.borderWidth = 0;
     
-    _currentIndexPath = [NSIndexPath indexPathForRow:0 inSection:0];
+    _currentIndexPath = [NSIndexPath indexPathForRow:_optionsList.count - 1 inSection:0];
     FUSLiveBoxNumSettingCollectionViewCell *cell = (FUSLiveBoxNumSettingCollectionViewCell *)[_collectionView cellForItemAtIndexPath:_currentIndexPath];
     
     cell.contentView.layer.borderWidth = 1;
@@ -238,10 +242,11 @@
         cell.optionModel = model;
     }
     
-    if (indexPath.row == 0 && _firstLoad) {
-        
+    if (indexPath.row == _currentIndexPath.row) {
         cell.contentView.layer.borderWidth = 1;
         cell.contentView.layer.borderColor = UIColor.fus_appMainColor.CGColor;
+    } else {
+        cell.contentView.layer.borderWidth = 0;
     }
     
     return cell;