moliparty/peko-ios
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

通用飘屏更换协议

Browse Source
This commit is contained in:
liyuhua
2024-03-25 14:54:27 +08:00
parent 17346ffedf
commit 6d450443d0
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
YuMi/Modules/YMMessage/Model/AttachmentModel.h
View File

@@ -115,10 +115,11 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) {
CustomMessageType_General_Public_Screen = 103, CustomMessageType_General_Public_Screen = 103,
///疯狂动物园飘屏 ///疯狂动物园飘屏
CustomMessageType_Graffiti_Star_Kitchen = 104, CustomMessageType_Graffiti_Star_Kitchen = 104,
///通用飘屏
CustomMessageType_General_Floating_Screen = 105,
///超级礼物 ///超级礼物
CustomMessageType_Super_Gift = 106, CustomMessageType_Super_Gift = 106,
///通用飘屏
CustomMessageType_General_Floating_Screen = 107,
}; };
@@ -637,13 +638,7 @@ typedef NS_ENUM(NSUInteger, CustomMessageTypeGeneralPublicScreen) {
Custom_Message_Sub_General_Public_Screen_One_Room = 1031,//单房间 Custom_Message_Sub_General_Public_Screen_One_Room = 1031,//单房间
Custom_Message_Sub_General_Public_Screen_All_Room = 1032,///全部房间 Custom_Message_Sub_General_Public_Screen_All_Room = 1032,///全部房间
}; };
///通用飘屏
//CustomMessageType_General_Floating_Screen = 105,
typedef NS_ENUM(NSUInteger, CustomMessageTypeGeneralFloatingScreen) {
///所有房间
Custom_Message_Sub_General_Floating_Screen_One_Room = 1051,//单房间
Custom_Message_Sub_General_Floating_Screen_All_Room = 1052,///全部房间
};
///超级礼物 ///超级礼物
//CustomMessageType_Super_Gift = 106, //CustomMessageType_Super_Gift = 106,
typedef NS_ENUM(NSUInteger, CustomMessageTypeSuperGift) { typedef NS_ENUM(NSUInteger, CustomMessageTypeSuperGift) {
@@ -651,6 +646,13 @@ typedef NS_ENUM(NSUInteger, CustomMessageTypeSuperGift) {
Custom_Message_Sub_Super_Gift = 1061, Custom_Message_Sub_Super_Gift = 1061,
}; };
///通用飘屏
//CustomMessageType_General_Floating_Screen = 105,
typedef NS_ENUM(NSUInteger, CustomMessageTypeGeneralFloatingScreen) {
///所有房间
Custom_Message_Sub_General_Floating_Screen_One_Room = 1071,//单房间
Custom_Message_Sub_General_Floating_Screen_All_Room = 1072,///全部房间
};
@interface AttachmentModel : PIBaseModel<NIMCustomAttachment> @interface AttachmentModel : PIBaseModel<NIMCustomAttachment>
@property (nonatomic,assign) int first; @property (nonatomic,assign) int first;
@property (nonatomic,assign) int second; @property (nonatomic,assign) int second;

17
YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
View File

@@ -418,11 +418,26 @@
bannerView = [[PIUniversalBannerView alloc]initWithFrame:CGRectMake(0, top, model.resourceWidth, model.resourceHeight) ]; bannerView = [[PIUniversalBannerView alloc]initWithFrame:CGRectMake(0, top, model.resourceWidth, model.resourceHeight) ];
[self showGeneralFloatingScreenView:bannerView model:model]; [self showGeneralFloatingScreenView:bannerView model:model];
} failureBlock:^(NSError * _Nonnull error) { } failureBlock:^(NSError * _Nonnull error) {
[bannerView removeFromSuperview];
self.isPlayOfB = NO;
if(self.animationListB.count > 0){
[self.animationListB removeObjectAtIndex:0];
}
[self playAnimationWithModel];
}]; }];
}else{ }else{
NetImageView *imageView = [NetImageView new]; NetImageView *imageView = [NetImageView new];
[imageView loadImageWithUrl:model.resourceContent completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { [imageView loadImageWithUrl:model.resourceContent completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) {
if (image == nil){
[bannerView removeFromSuperview];
self.isPlayOfB = NO;
if(self.animationListB.count > 0){
[self.animationListB removeObjectAtIndex:0];
}
[self playAnimationWithModel];
return;
}
model.image = image; model.image = image;
CGFloat width = image.size.width <= 0 ? kGetScaleWidth(60) : image.size.width; CGFloat width = image.size.width <= 0 ? kGetScaleWidth(60) : image.size.width;
CGFloat height = image.size.height ; CGFloat height = image.size.height ;