fix ui bugs
This commit is contained in:
4
Podfile
4
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'
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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);
|
||||
}
|
||||
}];
|
||||
|
||||
|
@@ -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"];
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 28 KiB |
Reference in New Issue
Block a user