diff --git a/xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityContainerView.m b/xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityContainerView.m index b7ef5296..0e07a8c2 100644 --- a/xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityContainerView.m +++ b/xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityContainerView.m @@ -75,9 +75,9 @@ - (void)initSubViews { [self addSubview:self.stackView]; [self.stackView addArrangedSubview:self.cycleScrollView]; - [self.stackView addArrangedSubview:self.sailingImageView]; [self.stackView addArrangedSubview:self.placeHolderView]; [self.stackView addArrangedSubview:self.firstRechargeImageView]; + [self.stackView addArrangedSubview:self.sailingImageView]; [self.stackView addArrangedSubview:self.candyTreeImageView]; [self.stackView addArrangedSubview:self.joinDatingView]; } diff --git a/xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.m b/xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.m index d42139a6..b44b4600 100644 --- a/xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.m +++ b/xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.m @@ -279,7 +279,7 @@ [self receiveLicneseHourRank:attachment]; } else if (attachment.first == CustomMessageType_Gift_Compound && attachment.second == Custom_Message_Sub_Gift_Compound) {///魔法小屋合成礼物 [self receiveGiftCompound:attachment]; - } else if(attachment.first == CustomMessageType_Room_Sailing) { + } else if(attachment.first == CustomMessageType_Room_Sailing && (attachment.second == Custom_Message_Sub_Sailing_AllRoom_Notify || attachment.second == Custom_Message_Sub_Sailing_InRoom_NeedAllMicSend)) { [self receiveRoomSailing:attachment]; } else if(attachment.first == CustomMessageType_Graffiti_Gift) {///涂鸦礼物 [self receiveRoomGraffitiGift:attachment]; diff --git a/xplan-ios/Main/Room/View/Sailing/View/XPSailingAnimationView.m b/xplan-ios/Main/Room/View/Sailing/View/XPSailingAnimationView.m index c21e01b1..ffb3f139 100644 --- a/xplan-ios/Main/Room/View/Sailing/View/XPSailingAnimationView.m +++ b/xplan-ios/Main/Room/View/Sailing/View/XPSailingAnimationView.m @@ -14,6 +14,7 @@ #import "NSObject+MJExtension.h" #import + @interface XPSailingAnimationView () ///背景图 @property (nonatomic,strong) UIImageView *backImageView; @@ -55,6 +56,8 @@ return attr; } + + #pragma mark - Getters And Setters - (void)setPrizeInfo:(NSDictionary *)prizeInfo { _prizeInfo = prizeInfo; @@ -90,6 +93,7 @@ if (!_titleLabel) { _titleLabel = [[MarqueeLabel alloc] init]; _titleLabel.scrollDuration = 4.0; + _titleLabel.fadeLength = 15; _titleLabel.userInteractionEnabled = YES; } return _titleLabel;