Commit 3cea9d2e by pierce

fixed bugs

parent 5555176a
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
buildConfiguration = "Debug" buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
disableMainThreadChecker = "YES"
launchStyle = "0" launchStyle = "0"
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
......
...@@ -436,6 +436,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange"; ...@@ -436,6 +436,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
- (void)setLocalMicEnable:(BOOL)localMicEnable { - (void)setLocalMicEnable:(BOOL)localMicEnable {
_localMicEnable = localMicEnable; _localMicEnable = localMicEnable;
[_agoraEngine enableLocalAudio:localMicEnable]; [_agoraEngine enableLocalAudio:localMicEnable];
[_agoraEngine muteLocalAudioStream:!localMicEnable];
} }
- (void)setAgoraHelperDelegate:(id<FUSAgoraHelperDelegate>)agoraHelperDelegate{ - (void)setAgoraHelperDelegate:(id<FUSAgoraHelperDelegate>)agoraHelperDelegate{
......
...@@ -69,7 +69,8 @@ class FUSPkWinningStreakView: UIView { ...@@ -69,7 +69,8 @@ class FUSPkWinningStreakView: UIView {
override func layoutSubviews() { override func layoutSubviews() {
super.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.x = 12.5
self.xImageView.bottom = self.height - 15 self.xImageView.bottom = self.height - 15
......
...@@ -146,7 +146,11 @@ ...@@ -146,7 +146,11 @@
} }
[_numberSetingView addSubview:_collectionView]; [_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) { if (boxType == FUSTreasureTypeOrder) {
_normalView.hidden = YES; _normalView.hidden = YES;
...@@ -191,7 +195,7 @@ ...@@ -191,7 +195,7 @@
FUSLiveBoxNumSettingCollectionViewCell *lastCell = (FUSLiveBoxNumSettingCollectionViewCell *)[_collectionView cellForItemAtIndexPath:_currentIndexPath]; FUSLiveBoxNumSettingCollectionViewCell *lastCell = (FUSLiveBoxNumSettingCollectionViewCell *)[_collectionView cellForItemAtIndexPath:_currentIndexPath];
lastCell.contentView.layer.borderWidth = 0; 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]; FUSLiveBoxNumSettingCollectionViewCell *cell = (FUSLiveBoxNumSettingCollectionViewCell *)[_collectionView cellForItemAtIndexPath:_currentIndexPath];
cell.contentView.layer.borderWidth = 1; cell.contentView.layer.borderWidth = 1;
...@@ -238,10 +242,11 @@ ...@@ -238,10 +242,11 @@
cell.optionModel = model; cell.optionModel = model;
} }
if (indexPath.row == 0 && _firstLoad) { if (indexPath.row == _currentIndexPath.row) {
cell.contentView.layer.borderWidth = 1; cell.contentView.layer.borderWidth = 1;
cell.contentView.layer.borderColor = UIColor.fus_appMainColor.CGColor; cell.contentView.layer.borderColor = UIColor.fus_appMainColor.CGColor;
} else {
cell.contentView.layer.borderWidth = 0;
} }
return cell; return cell;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment