Skip to content

pidan / FuSiLive

Go to a project
Commit 69a06fa0 by pierce
Options

Merge branch 'feature/私讯+座驾体系' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私讯+座驾体系

parents aabf284e e3932b36
Inline Side-by-side
Showing with 34 additions and 15 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>72</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>76</integer> <integer>72</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key> <key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>75</integer> <integer>74</integer>
</dict> </dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key> <key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>74</integer> <integer>77</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
...@@ -6167,6 +6167,7 @@ UIGestureRecognizerDelegate ...@@ -6167,6 +6167,7 @@ UIGestureRecognizerDelegate
[FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_ROOM_HOTRANK label:nil parameters:nil]; [FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_ROOM_HOTRANK label:nil parameters:nil];
MJWeakSelf
// 避免重复显示 // 避免重复显示
if (self.contributionListView) return; if (self.contributionListView) return;
self.contributionListView = [FUSShowRoomUserContributionListView fus_showContributionListView]; self.contributionListView = [FUSShowRoomUserContributionListView fus_showContributionListView];
...@@ -6174,6 +6175,9 @@ UIGestureRecognizerDelegate ...@@ -6174,6 +6175,9 @@ UIGestureRecognizerDelegate
[[FUSLiveHelper shareInstance] fus_setupScrollToSwitchRoomEnable:YES]; [[FUSLiveHelper shareInstance] fus_setupScrollToSwitchRoomEnable:YES];
}]; }];
[[FUSLiveHelper shareInstance] fus_setupScrollToSwitchRoomEnable:NO]; [[FUSLiveHelper shareInstance] fus_setupScrollToSwitchRoomEnable:NO];
[self.contributionListView setHandleClickUserAction:^(FUSRoomUserInfoModel * _Nonnull model) {
[weakSelf.userInfoView fus_showUserInfoViewWithUserInfoViewType:FUSUserInfoViewTypeLive userInfoModel:model shouldRequestData:YES];
}];
} }
- (void)fus_headViewLikeSucceed { - (void)fus_headViewLikeSucceed {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LiveThemeView/FUSLiveThemeView.m
...@@ -120,8 +120,8 @@ ...@@ -120,8 +120,8 @@
switch (gesture.state) { switch (gesture.state) {
case UIGestureRecognizerStateBegan: { case UIGestureRecognizerStateBegan: {
self.gestureBeginPoint = self.origin; self.gestureBeginPoint = self.origin;
CGFloat y = self.gestureBeginPoint.y; CGFloat y = self.gestureBeginPoint.y + offset.y;
CGFloat x = self.gestureBeginPoint.x; CGFloat x = self.gestureBeginPoint.x + offset.x;
frame.origin = CGPointMake(x, y); frame.origin = CGPointMake(x, y);
self.frame = frame; self.frame = frame;
self.hasMoved = YES; self.hasMoved = YES;
...@@ -129,8 +129,8 @@ ...@@ -129,8 +129,8 @@
} }
case UIGestureRecognizerStateChanged: { case UIGestureRecognizerStateChanged: {
CGFloat y = self.gestureBeginPoint.y; CGFloat y = self.gestureBeginPoint.y + offset.y;
CGFloat x = self.gestureBeginPoint.x; CGFloat x = self.gestureBeginPoint.x + offset.x;
frame.origin = CGPointMake(x, y); frame.origin = CGPointMake(x, y);
self.frame = frame; self.frame = frame;
break; break;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PopularListView/FUSShowRoomUserContributionListView.h
...@@ -13,6 +13,8 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -13,6 +13,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, copy) void(^handleDismissViewAction)(void); @property (nonatomic, copy) void(^handleDismissViewAction)(void);
@property (nonatomic, copy) void(^handleClickUserAction)(FUSRoomUserInfoModel *model);
+ (FUSShowRoomUserContributionListView *)fus_showContributionListView; + (FUSShowRoomUserContributionListView *)fus_showContributionListView;
- (void)fus_hideViewWithAnim; - (void)fus_hideViewWithAnim;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PopularListView/FUSShowRoomUserContributionListView.m
...@@ -233,6 +233,9 @@ ...@@ -233,6 +233,9 @@
model.uid = userModel.uid; model.uid = userModel.uid;
model.isHide = [NSString stringWithFormat:@"%ld",userModel.inHide]; model.isHide = [NSString stringWithFormat:@"%ld",userModel.inHide];
//TODO:跳转: added By Pidan //TODO:跳转: added By Pidan
if (self.handleClickUserAction) {
self.handleClickUserAction(model);
}
[self fus_hideViewWithAnim]; [self fus_hideViewWithAnim];
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/TreasureBox/View/FUSLiveBoxDetailSettingView.m
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
self.optionsList = optionsModel.optionsList; self.optionsList = optionsModel.optionsList;
_orderTextField.backgroundColor = [UIColor colorWithHex:@"#F0EEEF"]; _orderTextField.backgroundColor = [UIColor colorWithHex:@"#F0EEEF"];
_orderTextField.textMaxLength = 30; _orderTextField.textMaxLength = 60;
_orderTextField.layer.cornerRadius = 4; _orderTextField.layer.cornerRadius = 4;
_orderTextField.layer.masksToBounds = YES; _orderTextField.layer.masksToBounds = YES;
......
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>73</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>77</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>78</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