diff --git a/Podfile b/Podfile index 2dbaeb3e..2708456d 100644 --- a/Podfile +++ b/Podfile @@ -64,9 +64,9 @@ target 'YuMi' do pod 'UMCommon' pod 'UMDevice' - pod 'lottie-ios' +# pod 'lottie-ios' pod 'ZLCollectionViewFlowLayout' - pod 'WMZDropDownMenu' +# pod 'WMZDropDownMenu' pod 'TABAnimated' pod 'YuMi',:path=>'yum' pod 'QCloudCOSXML' diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGameMateOrderView.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGameMateOrderView.m index eec46848..275628f2 100644 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGameMateOrderView.m +++ b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGameMateOrderView.m @@ -296,13 +296,14 @@ - (NetImageView *)logoImageView { if (!_logoImageView) { NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; + config.placeHolder = [UIImageConstant defaultBannerPlaceholder]; _logoImageView = [[NetImageView alloc] initWithConfig:config]; _logoImageView.contentMode = UIViewContentModeScaleAspectFill; _logoImageView.layer.masksToBounds = YES; _logoImageView.layer.cornerRadius = 8; - + _logoImageView.layer.borderWidth = 2; + _logoImageView.layer.borderColor = UIColorFromRGB(0xf09540).CGColor; + _logoImageView.backgroundColor = [UIColor systemTealColor]; } return _logoImageView; diff --git a/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.m b/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.m index 75713b03..90490ed3 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.m @@ -80,11 +80,8 @@ if ([attribute.string containsString:[NSString stringWithFormat:@"{%@}",model.key]]){ [attribute replaceCharactersInRange:[attribute.string rangeOfString:[NSString stringWithFormat:@"{%@}",model.key]] withAttributedString:attText]; } - } - } - } if(_isSvga == YES){ self.bgImageView.hidden = YES; diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameVC.m b/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameVC.m index 7648efc2..736664c7 100644 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameVC.m +++ b/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameVC.m @@ -119,22 +119,21 @@ NIMChatroomMember * member = members.firstObject; BOOL isCreator = member.type == NIMChatroomMemberTypeCreator; BOOL isManager = member.type == NIMChatroomMemberTypeManager; - if (isCreator && - roomInfo.type != RoomType_MiniGame //&& -// roomInfo.type != RoomType_10Mic && -// roomInfo.type != RoomType_15Mic - ) { - if(roomInfo.type != RoomType_Anchor){ + + if (isCreator && + roomInfo.type != RoomType_MiniGame) { + XPRoomMoreItemModel *pkModel = [self createCrossRoomPKModel:roomInfo]; + if(roomInfo.type != RoomType_Anchor && pkModel){ [tempArray insertObject:[self createCrossRoomPKModel:roomInfo] atIndex:0]; } } if ((isCreator || isManager || meIsSuperAdmin) && roomInfo.type != RoomType_MiniGame && - roomInfo.type != RoomType_Anchor //&& -// roomInfo.type != RoomType_10Mic && -// roomInfo.type != RoomType_15Mic - ) { - [tempArray insertObject:[self createRoomPKModel:roomInfo] atIndex:0]; + roomInfo.type != RoomType_Anchor ) { + XPRoomMoreItemModel *pkModel = [self createRoomPKModel:roomInfo]; + if (pkModel) { + [tempArray insertObject:[self createRoomPKModel:roomInfo] atIndex:0]; + } } } self.gameView.playList = tempArray; diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessagChatHallHeadView.m b/YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessagChatHallHeadView.m index 1a664955..f5c9059b 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessagChatHallHeadView.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessagChatHallHeadView.m @@ -100,9 +100,9 @@ make.centerY.mas_equalTo(self.coinBgImageView); make.width.height.mas_equalTo(10); if (isMSRTL()) { - make.left.mas_equalTo(self.coinLabel.mas_right).inset(2); + make.left.mas_equalTo(self.coinLabel.mas_right).inset(-2); } else { - make.right.mas_equalTo(self.coinLabel.mas_left).inset(-2); + make.right.mas_equalTo(self.coinLabel.mas_left).inset(2); } }]; diff --git a/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m b/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m index c1aeb9da..64697fc6 100644 --- a/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m +++ b/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m @@ -248,7 +248,6 @@ BOOL isSvga = [model.resourceType isEqualToString:@"SVGA"]; __block PIUniversalBannerView *bannerView; if (isSvga == YES) { - SVGAParser *parser = [SVGAParser new]; [parser parseWithURL:[NSURL URLWithString:model.resourceContent] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { model.videoItem = videoItem; @@ -266,7 +265,6 @@ } [self playAnimationWithModel]; }]; - }else{ NetImageView *imageView = [NetImageView new]; [imageView loadImageWithUrl:model.resourceContent completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { @@ -283,9 +281,7 @@ } [self playAnimationWithModel]; }]; - } - } -(void)showGeneralFloatingScreenView:(PIUniversalBannerView *)bannerView model:(PIUniversalBannerModel *)model{ BOOL isSvga = [model.resourceType isEqualToString:@"SVGA"]; diff --git a/YuMi/pi_login_new_logo.png b/YuMi/pi_login_new_logo.png index 6e36187b..b96ad210 100644 Binary files a/YuMi/pi_login_new_logo.png and b/YuMi/pi_login_new_logo.png differ