diff --git a/xplan-ios.xcodeproj/project.pbxproj b/xplan-ios.xcodeproj/project.pbxproj index 9ba372fd..a9e89c84 100644 --- a/xplan-ios.xcodeproj/project.pbxproj +++ b/xplan-ios.xcodeproj/project.pbxproj @@ -112,6 +112,7 @@ 73FFADDC93E195344047A2EC /* Pods_xplan_ios.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CACF623970097D653132D69A /* Pods_xplan_ios.framework */; }; 9B0086C627BA392B0032BD2B /* AnchorStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C527BA392B0032BD2B /* AnchorStageView.m */; }; 9B0086CA27BA4F570032BD2B /* AnchorMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C927BA4F570032BD2B /* AnchorMicroView.m */; }; + 9B044D9D282D2A6400DE4859 /* XPRoomAnchorRankEnterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B044D9C282D2A6400DE4859 /* XPRoomAnchorRankEnterView.m */; }; 9B060B5827BCAEE20001B767 /* AnchorGiftValueView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B060B5727BCAEE20001B767 /* AnchorGiftValueView.m */; }; 9B0997A127F19D8A00EB8F14 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 9B0997A027F19D8900EB8F14 /* README.md */; }; 9B0997A327F19DE500EB8F14 /* QGHWDShaders.metal in Sources */ = {isa = PBXBuildFile; fileRef = 9B0997A227F19DE500EB8F14 /* QGHWDShaders.metal */; }; @@ -941,6 +942,8 @@ 9B0086C527BA392B0032BD2B /* AnchorStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorStageView.m; sourceTree = ""; }; 9B0086C827BA4F570032BD2B /* AnchorMicroView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnchorMicroView.h; sourceTree = ""; }; 9B0086C927BA4F570032BD2B /* AnchorMicroView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorMicroView.m; sourceTree = ""; }; + 9B044D9B282D2A6400DE4859 /* XPRoomAnchorRankEnterView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomAnchorRankEnterView.h; sourceTree = ""; }; + 9B044D9C282D2A6400DE4859 /* XPRoomAnchorRankEnterView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomAnchorRankEnterView.m; sourceTree = ""; }; 9B060B5627BCAEE20001B767 /* AnchorGiftValueView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnchorGiftValueView.h; sourceTree = ""; }; 9B060B5727BCAEE20001B767 /* AnchorGiftValueView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorGiftValueView.m; sourceTree = ""; }; 9B0997A027F19D8900EB8F14 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; @@ -5102,6 +5105,8 @@ E877A7F327842EF800EFACED /* XPRoomDatingVipUpMicView.m */, 9B86D88128192DC000494FCD /* XPRoomRankEntranceView.h */, 9B86D88228192DC000494FCD /* XPRoomRankEntranceView.m */, + 9B044D9B282D2A6400DE4859 /* XPRoomAnchorRankEnterView.h */, + 9B044D9C282D2A6400DE4859 /* XPRoomAnchorRankEnterView.m */, ); path = BaseUIContainerView; sourceTree = ""; @@ -6374,6 +6379,7 @@ E8AC722426F47E5E007D6E91 /* XPMineFeedbackViewController.m in Sources */, E87E914E2796678D00A7B3F2 /* XPMineDressEmptyTableViewCell.m in Sources */, 9B7D804D27537950003DAC0C /* MessageCell.m in Sources */, + 9B044D9D282D2A6400DE4859 /* XPRoomAnchorRankEnterView.m in Sources */, 9B92C02227E0BD040044C5EA /* XPNobleTrumpetModel.m in Sources */, 18F404C927609A4300A6C548 /* MessagePresenter.m in Sources */, 9BC9DAEF27E33B3F009EE409 /* XPRoomGiftAnimationParser.m in Sources */, diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_arrange_mic.imageset/room_menu_arrange_mic@2x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_arrange_mic.imageset/room_menu_arrange_mic@2x.png index 6bb1868d..c955500a 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_arrange_mic.imageset/room_menu_arrange_mic@2x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_arrange_mic.imageset/room_menu_arrange_mic@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_arrange_mic.imageset/room_menu_arrange_mic@3x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_arrange_mic.imageset/room_menu_arrange_mic@3x.png index 28958c27..e42c122b 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_arrange_mic.imageset/room_menu_arrange_mic@3x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_arrange_mic.imageset/room_menu_arrange_mic@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_arrange_mic_new.imageset/room_menu_arrange_mic_new@2x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_arrange_mic_new.imageset/room_menu_arrange_mic_new@2x.png index 51373fd0..1e6f848f 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_arrange_mic_new.imageset/room_menu_arrange_mic_new@2x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_arrange_mic_new.imageset/room_menu_arrange_mic_new@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_arrange_mic_new.imageset/room_menu_arrange_mic_new@3x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_arrange_mic_new.imageset/room_menu_arrange_mic_new@3x.png index 76621d4f..50fa6928 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_arrange_mic_new.imageset/room_menu_arrange_mic_new@3x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_arrange_mic_new.imageset/room_menu_arrange_mic_new@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_face.imageset/room_menu_face@2x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_face.imageset/room_menu_face@2x.png index 1ddb355f..47ff180e 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_face.imageset/room_menu_face@2x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_face.imageset/room_menu_face@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_face.imageset/room_menu_face@3x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_face.imageset/room_menu_face@3x.png index 3589b560..c5c56e5a 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_face.imageset/room_menu_face@3x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_face.imageset/room_menu_face@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_input_bg.imageset/Contents.json b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_input_bg.imageset/Contents.json deleted file mode 100644 index e4b610aa..00000000 --- a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_input_bg.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "room_menu_input_bg@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "room_menu_input_bg@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_input_bg.imageset/room_menu_input_bg@2x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_input_bg.imageset/room_menu_input_bg@2x.png deleted file mode 100644 index 0f5ba967..00000000 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_input_bg.imageset/room_menu_input_bg@2x.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_input_bg.imageset/room_menu_input_bg@3x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_input_bg.imageset/room_menu_input_bg@3x.png deleted file mode 100644 index 47cdf4e7..00000000 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_input_bg.imageset/room_menu_input_bg@3x.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_message.imageset/room_menu_message@2x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_message.imageset/room_menu_message@2x.png index 264b5f50..52d4a440 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_message.imageset/room_menu_message@2x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_message.imageset/room_menu_message@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_message.imageset/room_menu_message@3x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_message.imageset/room_menu_message@3x.png index 5e84554b..98f190fd 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_message.imageset/room_menu_message@3x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_message.imageset/room_menu_message@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_mic_close.imageset/room_menu_mic_close@2x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_mic_close.imageset/room_menu_mic_close@2x.png index 64712f4f..14939ef1 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_mic_close.imageset/room_menu_mic_close@2x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_mic_close.imageset/room_menu_mic_close@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_mic_close.imageset/room_menu_mic_close@3x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_mic_close.imageset/room_menu_mic_close@3x.png index 2fb09467..54a96899 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_mic_close.imageset/room_menu_mic_close@3x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_mic_close.imageset/room_menu_mic_close@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_mic_open.imageset/room_menu_mic_open@2x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_mic_open.imageset/room_menu_mic_open@2x.png index 4d0d4e4c..3a036a96 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_mic_open.imageset/room_menu_mic_open@2x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_mic_open.imageset/room_menu_mic_open@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_mic_open.imageset/room_menu_mic_open@3x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_mic_open.imageset/room_menu_mic_open@3x.png index 44237afe..f37c5b63 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_mic_open.imageset/room_menu_mic_open@3x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_mic_open.imageset/room_menu_mic_open@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_more.imageset/Contents.json b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_more.imageset/Contents.json index df7e3b9b..9771e355 100644 --- a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_more.imageset/Contents.json +++ b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_more.imageset/Contents.json @@ -10,6 +10,7 @@ "scale" : "2x" }, { + "filename" : "room_menu_more@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_more.imageset/room_menu_more@2x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_more.imageset/room_menu_more@2x.png index 3d083e13..d7f5241d 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_more.imageset/room_menu_more@2x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_more.imageset/room_menu_more@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_more.imageset/room_menu_more@3x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_more.imageset/room_menu_more@3x.png new file mode 100644 index 00000000..293fa609 Binary files /dev/null and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_more.imageset/room_menu_more@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_more3x.imageset/Contents.json b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_more3x.imageset/Contents.json deleted file mode 100644 index a6034d7f..00000000 --- a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_more3x.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "room_menu_more3x.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_more3x.imageset/room_menu_more3x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_more3x.imageset/room_menu_more3x.png deleted file mode 100644 index 5ae618bd..00000000 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_more3x.imageset/room_menu_more3x.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_new_message.imageset/room_menu_new_message@2x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_new_message.imageset/room_menu_new_message@2x.png index 28ad324e..e0bdacb6 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_new_message.imageset/room_menu_new_message@2x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_new_message.imageset/room_menu_new_message@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_new_message.imageset/room_menu_new_message@3x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_new_message.imageset/room_menu_new_message@3x.png index 568ffee2..1c19606b 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_new_message.imageset/room_menu_new_message@3x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_new_message.imageset/room_menu_new_message@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_noble.imageset/room_menu_noble@2x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_noble.imageset/room_menu_noble@2x.png index 77ab2aa1..2fb45dfb 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_noble.imageset/room_menu_noble@2x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_noble.imageset/room_menu_noble@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_noble.imageset/room_menu_noble@3x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_noble.imageset/room_menu_noble@3x.png index d938bab9..26d69a0a 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_noble.imageset/room_menu_noble@3x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_noble.imageset/room_menu_noble@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_voice_close.imageset/room_menu_voice_close@2x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_voice_close.imageset/room_menu_voice_close@2x.png index 0eb76285..37494e62 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_voice_close.imageset/room_menu_voice_close@2x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_voice_close.imageset/room_menu_voice_close@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_voice_close.imageset/room_menu_voice_close@3x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_voice_close.imageset/room_menu_voice_close@3x.png index da82f91d..e5e414bf 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_voice_close.imageset/room_menu_voice_close@3x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_voice_close.imageset/room_menu_voice_close@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_voice_open.imageset/room_menu_voice_open@2x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_voice_open.imageset/room_menu_voice_open@2x.png index 2212b37c..7530dd96 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_voice_open.imageset/room_menu_voice_open@2x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_voice_open.imageset/room_menu_voice_open@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_voice_open.imageset/room_menu_voice_open@3x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_voice_open.imageset/room_menu_voice_open@3x.png index f0eaebaf..be42db39 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_voice_open.imageset/room_menu_voice_open@3x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_voice_open.imageset/room_menu_voice_open@3x.png differ diff --git a/xplan-ios/Main/Home/View/Cell/XPHomeAttentionCollectionViewCell.m b/xplan-ios/Main/Home/View/Cell/XPHomeAttentionCollectionViewCell.m index 1281b38c..288c911d 100644 --- a/xplan-ios/Main/Home/View/Cell/XPHomeAttentionCollectionViewCell.m +++ b/xplan-ios/Main/Home/View/Cell/XPHomeAttentionCollectionViewCell.m @@ -90,6 +90,7 @@ self.noteImageView.hidden = _liveRoom.roomUid <=0; if (_liveRoom.roomUid > 0) { self.noteImageView.animationImages = self.animationArray; + self.noteImageView.animationDuration = 0.5; [self.noteImageView startAnimating]; }else { self.noteImageView.animationImages = nil; @@ -144,8 +145,7 @@ if (!_noteImageView) { _noteImageView = [[UIImageView alloc] init]; _noteImageView.userInteractionEnabled = YES; - _noteImageView.animationRepeatCount = HUGE; - _noteImageView.image = [UIImage imageNamed:@"home_note_0000"]; + _noteImageView.animationRepeatCount = 0; } return _noteImageView; } diff --git a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomAnchorRankEnterView.h b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomAnchorRankEnterView.h new file mode 100644 index 00000000..c2e3937e --- /dev/null +++ b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomAnchorRankEnterView.h @@ -0,0 +1,16 @@ +// +// XPRoomAnchorRankEnterView.h +// xplan-ios +// +// Created by GreenLand on 2022/5/12. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface XPRoomAnchorRankEnterView : UIView + +@end + +NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m new file mode 100644 index 00000000..cd6b860d --- /dev/null +++ b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m @@ -0,0 +1,98 @@ +// +// XPRoomAnchorRankEnterView.m +// xplan-ios +// +// Created by GreenLand on 2022/5/12. +// + +#import "XPRoomAnchorRankEnterView.h" +///Third +#import +#import "ThemeColor.h" +///Tool +#import "NetImageView.h" + +@interface XPRoomAnchorRankEnterView () + +///背景图 +@property (nonatomic, strong) UIImageView *bgImageView; +/// +@property (nonatomic, strong) UILabel *titleLabel; +///图标 +@property (nonatomic, strong) UIImageView *iconImageView; + +@end + + +@implementation XPRoomAnchorRankEnterView + +- (instancetype)initWithFrame:(CGRect)frame { + if (self = [super initWithFrame:frame]) { + [self initSubViews]; + [self initSubViewConstraints]; + } + return self; +} +- (void)layoutSubviews { + [super layoutSubviews]; + CAGradientLayer *layer = [CAGradientLayer new]; + layer.colors=@[(__bridge id)UIColorRGBAlpha(0x2B00CA, 0.55).CGColor,(__bridge id)UIColorRGBAlpha(0x170ACD, 0.2).CGColor]; + layer.startPoint = CGPointMake(0, 0); + layer.endPoint = CGPointMake(1, 0); + layer.frame = self.bounds; + [self.bgImageView.layer addSublayer:layer]; +} + +#pragma mark - Private Method +- (void)initSubViews { + [self addSubview:self.bgImageView]; + [self addSubview:self.titleLabel]; + [self addSubview:self.iconImageView]; +} + +- (void)initSubViewConstraints { + [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.mas_equalTo(11); + make.top.bottom.left.mas_equalTo(0); + }]; + [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.centerY.mas_equalTo(self); + make.left.mas_equalTo(self.iconImageView.mas_right).mas_offset(4); + }]; + [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.mas_equalTo(22); + make.centerY.mas_equalTo(self); + make.left.mas_equalTo(0); + }]; +} + +#pragma mark - Getters And Setters +- (UIImageView *)bgImageView { + if (_bgImageView == nil) { + _bgImageView = [[UIImageView alloc] init]; + _bgImageView.layer.cornerRadius = 11; + _bgImageView.layer.masksToBounds = YES; + } + return _bgImageView; +} + +- (UIImageView *)iconImageView { + if (_iconImageView == nil) { + _iconImageView = [[UIImageView alloc] init]; + _iconImageView.image = [UIImage imageNamed:@"anchor_hourRank_btn"]; + _iconImageView.contentMode = UIViewContentModeScaleAspectFit; + } + return _iconImageView; +} + +- (UILabel *)titleLabel { + if (_titleLabel == nil) { + _titleLabel = [[UILabel alloc] init]; + _titleLabel.textColor = UIColor.whiteColor; + _titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; + _titleLabel.text = @"小时榜"; + } + return _titleLabel; +} + +@end diff --git a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m index 8e0acbc6..b3587c7a 100644 --- a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m +++ b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m @@ -61,6 +61,7 @@ #import "XPRoomTrumpetView.h" #import "XPMineUserInfoViewController.h" #import "XPRoomRankEntranceView.h" +#import "XPRoomAnchorRankEnterView.h" ///个播PK #import "XPAnchorFansTeamEntranceView.h" #import "XPAnchorFansTeamViewController.h" @@ -80,7 +81,7 @@ ///个播粉丝团入口 @property (nonatomic, strong) XPAnchorFansTeamEntranceView *fansTeamEntranceView; ///个播小时榜入口按钮 -@property (nonatomic, strong) UIButton *anchorHourRankButton; +@property (nonatomic, strong) XPRoomAnchorRankEnterView *hourRankEntranceView; ///话题的容器 @property (nonatomic,strong) UIStackView *topicStackView; ///话题 @@ -146,7 +147,7 @@ #pragma mark - Private Method - (void)initSubViews { [self addSubview:self.contributeEnterView]; - [self addSubview:self.anchorHourRankButton]; + [self addSubview:self.hourRankEntranceView]; [self addSubview:self.topicStackView]; [self addSubview:self.fansTeamEntranceView]; [self.topicStackView addArrangedSubview:self.topicLabel]; @@ -160,10 +161,10 @@ make.width.mas_equalTo(116); make.height.mas_equalTo(22); }]; - [self.anchorHourRankButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(11); + [self.hourRankEntranceView mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.mas_equalTo(0); make.centerY.mas_equalTo(self.contributeEnterView); - make.width.mas_equalTo(67); + make.width.mas_equalTo(69); make.height.mas_equalTo(22); }]; [self.fansTeamEntranceView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -292,7 +293,7 @@ if (roomInfo.type == RoomType_Anchor) { self.contributeEnterView.title = @"主播榜"; self.fansTeamEntranceView.hidden = NO; - self.anchorHourRankButton.hidden = NO; + self.hourRankEntranceView.hidden = NO; if (!roomInfo.showGiftValue) { } if (roomInfo.hadChangeRoomType) { @@ -306,7 +307,7 @@ } else { self.contributeEnterView.title = @"房间榜"; self.fansTeamEntranceView.hidden = YES; - self.anchorHourRankButton.hidden = YES; + self.hourRankEntranceView.hidden = YES; if (roomInfo.hadChangeRoomType) { [self updateContrionEntranceWithRoomUid:[NSString stringWithFormat:@"%ld", roomInfo.uid] type:@"day"]; } @@ -767,7 +768,7 @@ } } -- (void)onAnchorHourRankButtonAction:(UIButton *)sender { +- (void)onAnchorHourRankButtonAction:(UITapGestureRecognizer *)ges { NSString * roomUid = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.uid]; XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; webView.url = [NSString stringWithFormat:@"%@?roomUid=%@", URLWithType(kRoomHourRankURL), roomUid]; @@ -1194,22 +1195,13 @@ return _contributeEnterView; } -- (UIButton *)anchorHourRankButton { - if (!_anchorHourRankButton) { - _anchorHourRankButton = [[UIButton alloc]init]; - [_anchorHourRankButton addTarget:self action:@selector(onAnchorHourRankButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_anchorHourRankButton setTitle:@"小时榜" forState:UIControlStateNormal]; - [_anchorHourRankButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x322BFF), UIColorFromRGB(0x49ACFF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(67, 22)] forState:UIControlStateNormal]; - [_anchorHourRankButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _anchorHourRankButton.titleLabel.font = [UIFont systemFontOfSize:10]; - _anchorHourRankButton.layer.cornerRadius = 11; - _anchorHourRankButton.layer.masksToBounds = YES; - [_anchorHourRankButton setImage:[UIImage imageNamed:@"anchor_hourRank_btn"] forState:UIControlStateNormal]; - _anchorHourRankButton.imageEdgeInsets = UIEdgeInsetsMake(1, -15, 0, 0); - _anchorHourRankButton.titleEdgeInsets = UIEdgeInsetsMake(0, -12, 0, 0); - _anchorHourRankButton.hidden = YES; +- (XPRoomAnchorRankEnterView *)hourRankEntranceView { + if (!_hourRankEntranceView) { + _hourRankEntranceView = [[XPRoomAnchorRankEnterView alloc] init]; + UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onAnchorHourRankButtonAction:)]; + [_hourRankEntranceView addGestureRecognizer:tap]; } - return _anchorHourRankButton; + return _hourRankEntranceView; } - (UIButton *)datingProgresButton { diff --git a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomRankEntranceView.m b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomRankEntranceView.m index 2f9e5855..75d2a736 100644 --- a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomRankEntranceView.m +++ b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomRankEntranceView.m @@ -15,7 +15,7 @@ @interface XPRoomRankEntranceView () ///背景图 -@property (nonatomic, strong) UIImageView *bgImageView; +@property (nonatomic, strong) UIView *bgView; ///排行榜容器 @property (nonatomic, strong) UIView *rankContentView; ///礼物值 @@ -35,19 +35,9 @@ return self; } -- (void)layoutSubviews { - [super layoutSubviews]; - CAGradientLayer *layer = [CAGradientLayer new]; - layer.colors=@[(__bridge id)UIColorRGBAlpha(0xFFB300, 0.5).CGColor,(__bridge id)UIColorRGBAlpha(0xFFCA45, 0).CGColor]; - layer.startPoint = CGPointMake(0, 0); - layer.endPoint = CGPointMake(1, 0); - layer.frame = self.bounds; - [self.bgImageView.layer addSublayer:layer]; -} - #pragma mark - Private Method - (void)initSubViews { - [self addSubview:self.bgImageView]; + [self addSubview:self.bgView]; [self addSubview:self.rankContentView]; [self addSubview:self.titleLabel]; [self addSubview:self.iconImageView]; @@ -67,8 +57,9 @@ } - (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); + [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_equalTo(-11); + make.top.bottom.right.mas_equalTo(0); }]; [self.rankContentView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); @@ -105,11 +96,14 @@ } } -- (UIImageView *)bgImageView { - if (_bgImageView == nil) { - _bgImageView = [[UIImageView alloc] init]; +- (UIView *)bgView { + if (_bgView == nil) { + _bgView = [[UIView alloc] init]; + _bgView.backgroundColor = UIColorRGBAlpha(0xFFFFFF, 0.2); + _bgView.layer.cornerRadius = 11; + _bgView.layer.masksToBounds = YES; } - return _bgImageView; + return _bgView; } - (UIView *)rankContentView { @@ -132,7 +126,7 @@ if (_titleLabel == nil) { _titleLabel = [[UILabel alloc] init]; _titleLabel.textColor = UIColor.whiteColor; - _titleLabel.font = [UIFont systemFontOfSize:12]; + _titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; _titleLabel.text = @"房间榜"; } return _titleLabel; diff --git a/xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.m b/xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.m index d065fe2d..64f1fd6b 100644 --- a/xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.m +++ b/xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.m @@ -14,6 +14,7 @@ #import "RtcManager.h" #import "XCHudTool.h" #import "StatisticsServiceHelper.h" +#import "Themecolor.h" ///Model #import "XPRoomMenuItem.h" #import "MicroQueueModel.h" @@ -363,7 +364,7 @@ _inputButton.titleLabel.font = [UIFont systemFontOfSize:15]; _inputButton.layer.masksToBounds = YES; _inputButton.layer.cornerRadius = 15; - [_inputButton setBackgroundImage:[UIImage imageNamed:@"room_menu_input_bg"] forState:UIControlStateNormal]; + _inputButton.backgroundColor = UIColorRGBAlpha(0xFFFFFF, 0.3); _inputButton.tag = XPRoomMenuItemType_Input; [_inputButton addTarget:self action:@selector(menuButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } diff --git a/xplan-ios/Main/Room/View/MoreView/Presenter/XPMoreMenuPresenter.m b/xplan-ios/Main/Room/View/MoreView/Presenter/XPMoreMenuPresenter.m index 7581b7e4..c5bdf981 100644 --- a/xplan-ios/Main/Room/View/MoreView/Presenter/XPMoreMenuPresenter.m +++ b/xplan-ios/Main/Room/View/MoreView/Presenter/XPMoreMenuPresenter.m @@ -108,7 +108,6 @@ request.userIds = @[uid]; [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { NSMutableArray * array = [NSMutableArray array]; - [array addObject:giftEffect]; if (error == nil) { NIMChatroomMember * member = members.firstObject; BOOL isCreator = member.type == NIMChatroomMemberTypeCreator; @@ -123,19 +122,25 @@ if (isCreator || isManager || isSuperAdmin) { if (roomInfo.canOpenBlindDate && roomInfo.type != RoomType_Anchor && roomInfo.type != RoomType_MiniGame) { - [array addObject:dating]; + [array insertObject:dating atIndex:0]; } - [array addObject:messageScreen]; - [array addObject:clearScreen]; - [array addObject:giftValue]; - [array addObject:roomSetting]; - [array addObject:inviteFriend]; + [array addObject:inviteFriend]; + [array addObject:trumpet]; if (isCreator && roomInfo.type != RoomType_Anchor && roomInfo.isPermitRoom != PermitRoomType_Licnese && roomInfo.isPermitRoom != PermitRoomType_YoungerStar) { [array addObject:releaseRadio]; } + [array addObject:giftEffect]; + [array addObject:roomSetting]; + [array addObject:messageScreen]; + [array addObject:clearScreen]; + [array addObject:giftValue]; + } else { + [array addObject:trumpet]; + [array addObject:giftEffect]; } - [array addObject:trumpet]; - } + } else { + [array addObject:giftEffect]; + } [[self getView] getMoreMenuDataSuccess:array]; }]; } diff --git a/xplan-ios/Main/Room/View/RoomRecommend/XPRoomRecommendView.m b/xplan-ios/Main/Room/View/RoomRecommend/XPRoomRecommendView.m index 377e447b..6fa0a532 100644 --- a/xplan-ios/Main/Room/View/RoomRecommend/XPRoomRecommendView.m +++ b/xplan-ios/Main/Room/View/RoomRecommend/XPRoomRecommendView.m @@ -36,7 +36,8 @@ @property (nonatomic,strong) UILabel *miniLabel; ///退出房间 @property (nonatomic,strong) UILabel *exitLabel; - +///为你推荐 +@property (nonatomic, strong) UILabel *recommentLabel; @end @@ -62,6 +63,7 @@ [self.miniStackView addArrangedSubview:self.miniLabel]; [self.exitStackView addArrangedSubview:self.exitButton]; [self.exitStackView addArrangedSubview:self.exitLabel]; + [self addSubview:self.recommentLabel]; [self addSubview:self.tableView]; } @@ -97,9 +99,13 @@ [self.exitButton mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(54); }]; + [self.recommentLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(self.miniStackView.mas_bottom).mas_offset(16); + make.left.mas_equalTo(11); + }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.right.bottom.mas_equalTo(0); - make.top.mas_equalTo(self.miniStackView.mas_bottom).mas_offset(8); + make.top.mas_equalTo(self.recommentLabel.mas_bottom); }]; } @@ -258,6 +264,16 @@ return _exitLabel; } +- (UILabel *)recommentLabel { + if (!_recommentLabel) { + _recommentLabel = [[UILabel alloc] init]; + _recommentLabel.text = @"为你推荐"; + _recommentLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; + _recommentLabel.textColor = [UIColor whiteColor]; + } + return _recommentLabel; +} + - (UITableView *)tableView { if (!_tableView) { _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];