Skip to content

pidan / FuSiLive

Go to a project
Commit e3932b36 by ludi
Options

SH模式下没有直播奖励和私房设置，修复宝箱记录的背景

parent ca62e7a5
Inline Side-by-side
Showing with 19 additions and 9 deletions
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key> <key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>75</integer> <integer>78</integer>
</dict> </dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key> <key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>74</integer> <integer>72</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key> <key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>73</integer> <integer>74</integer>
</dict> </dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key> <key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict> <dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/TreasureBox/View/FUSLiveTreasureBoxRecordDetailView.m
...@@ -34,13 +34,14 @@ ...@@ -34,13 +34,14 @@
UIImageView *bgImgView = [[UIImageView alloc] initWithFrame:self.bounds]; UIImageView *bgImgView = [[UIImageView alloc] initWithFrame:self.bounds];
bgImgView.contentMode = UIViewContentModeScaleAspectFill; bgImgView.contentMode = UIViewContentModeScaleAspectFill;
bgImgView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.8]; // bgImgView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.8];
bgImgView.backgroundColor = [UIColor whiteColor];
bgImgView.clipsToBounds = YES; bgImgView.clipsToBounds = YES;
[self addSubview:bgImgView]; [self addSubview:bgImgView];
UIButton *backBtn = [UIButton buttonWithType:UIButtonTypeCustom]; UIButton *backBtn = [UIButton buttonWithType:UIButtonTypeCustom];
backBtn.frame = CGRectMake(0, 0, HEADERVIEW_H, HEADERVIEW_H); backBtn.frame = CGRectMake(0, 0, HEADERVIEW_H, HEADERVIEW_H);
[backBtn setImage:UIImage.fus_backWhiteImage forState:UIControlStateNormal]; [backBtn setImage:UIImage.fus_backImage forState:UIControlStateNormal];
[backBtn addTarget:self action:@selector(fus_backToBoxDetail) forControlEvents:UIControlEventTouchUpInside]; [backBtn addTarget:self action:@selector(fus_backToBoxDetail) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:backBtn]; [self addSubview:backBtn];
...@@ -49,7 +50,8 @@ ...@@ -49,7 +50,8 @@
[_titleLabel sizeToFit]; [_titleLabel sizeToFit];
_titleLabel.centerY = backBtn.centerY; _titleLabel.centerY = backBtn.centerY;
_titleLabel.centerX = self.width/2.0; _titleLabel.centerX = self.width/2.0;
_titleLabel.textColor = [UIColor whiteColor]; // _titleLabel.textColor = [UIColor whiteColor];
_titleLabel.textColor = [UIColor fus_textColorRich];
[self addSubview:_titleLabel]; [self addSubview:_titleLabel];
_detailWebView = [[FUSWKWebView alloc] initWithFrame:CGRectMake(0, backBtn.height, self.width, self.height - backBtn.height)]; _detailWebView = [[FUSWKWebView alloc] initWithFrame:CGRectMake(0, backBtn.height, self.width, self.height - backBtn.height)];
......
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSUserCenterModule.xcscheme_^#shared#^_</key> <key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>78</integer> <integer>75</integer>
</dict> </dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key> <key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>76</integer> <integer>73</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/ImAnchor/FUSImAnchorViewController.m
...@@ -144,6 +144,10 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){ ...@@ -144,6 +144,10 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
-(void)fus_createItems{ -(void)fus_createItems{
// NSArray *section1 = @[@(FUSImAnchorItemTypeLiveTask), @(FUSImAnchorItemTypePopular)]; // NSArray *section1 = @[@(FUSImAnchorItemTypeLiveTask), @(FUSImAnchorItemTypePopular)];
NSArray *section1 = @[@(FUSImAnchorItemTypeLiveReward), @(FUSImAnchorItemTypeLiveRecord)]; NSArray *section1 = @[@(FUSImAnchorItemTypeLiveReward), @(FUSImAnchorItemTypeLiveRecord)];
if ([FUSConfig sharedInstanced].devConfigs.appStatus == YES) {
// sh模式没有直播奖励
section1 = @[@(FUSImAnchorItemTypeLiveRecord)];
}
NSArray *section2 = @[@(FUSImAnchorItemTypeLiveTime), @(FUSImAnchorItemTypeTotalFire)]; NSArray *section2 = @[@(FUSImAnchorItemTypeLiveTime), @(FUSImAnchorItemTypeTotalFire)];
if (FUSConfig.sharedInstanced.devConfigs.appStatus) { if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
section2 = @[@(FUSImAnchorItemTypeLiveTime)]; section2 = @[@(FUSImAnchorItemTypeLiveTime)];
...@@ -156,6 +160,10 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){ ...@@ -156,6 +160,10 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
section4 = @[@(FUSImAnchorItemTypeBroadcastBuild)]; section4 = @[@(FUSImAnchorItemTypeBroadcastBuild)];
} }
NSArray *itemTypeSectionList = @[section1, section2, section3, section4]; NSArray *itemTypeSectionList = @[section1, section2, section3, section4];
if ([FUSConfig sharedInstanced].devConfigs.appStatus == YES) {
// sh模式没有私房设置
itemTypeSectionList = @[section1, section2, section4];
}
[self.allGroups removeAllObjects]; [self.allGroups removeAllObjects];
for (NSArray *evSection in itemTypeSectionList) { for (NSArray *evSection in itemTypeSectionList) {
......
Pods/Pods.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -392,7 +392,7 @@ ...@@ -392,7 +392,7 @@
<key>SSZipArchive.xcscheme_^#shared#^_</key> <key>SSZipArchive.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>72</integer> <integer>76</integer>
</dict> </dict>
<key>SnapKit-SnapKit_Privacy.xcscheme</key> <key>SnapKit-SnapKit_Privacy.xcscheme</key>
<dict> <dict>
......
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