更换项目

YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.h

@@ -0,0 +1,121 @@
+//
+//  YMGiftInfoModel.h
+//  YUMI
+//
+//  Created by YUMI on 2021/11/11.
+//
+
+#import <Foundation/Foundation.h>
+#import "GiftNobleInfoModel.h"
+#import "XPWeekStarRankUserModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+//礼物类型
+typedef NS_ENUM(NSUInteger, GiftType) {
+	GiftType_Game = 2, // 游戏轰趴礼物
+	GiftType_Lucky = 3, // 福袋礼物
+    GiftType_LuckyPool = 5, //福袋奖池礼物
+    GiftType_Noble = 7, // 贵族礼物
+    GiftType_WeekStar = 8, //周星礼物
+	GiftType_Graffiti = 10, //涂鸦礼物
+	GiftType_Anchor = 11,  //个播礼物
+    GiftType_Punish = 12, //惩罚礼物
+	GiftType_Twelve_Star = 13, //星座礼物
+};
+
+//礼物类型
+typedef NS_ENUM(NSUInteger, GiftSourceType) {
+	GiftSourceType_Normal = 1, //普通礼物
+	GiftSourceType_Pack = 2, // 背包礼物
+};
+
+///礼物播放类型（0 无， 1 MP4、VAP播放)
+typedef NS_ENUM(NSUInteger, GiftOtherViewType) {
+    GiftOtherViewTypeNormal = 0,
+    GiftOtherViewTypeMp4 = 1,
+};
+
+/**
+ 赠送类型 1给主播直接刷礼物，2私聊送个人礼物,3房间内给坑位上的人送礼物,5.公聊大厅给人送礼物
+ 
+ - GameRoomSendType_Room: 给主播直接刷礼物
+ - GameRoomSendType_Chat: 2私聊送个人礼物
+ - GameRoomSendType_OnMic: 3房间内给坑位上的人送礼物
+ - GameRoomSendType_PublicChat: 公聊大厅给人送礼物
+ - GameRoomSendType_Team 群聊礼物
+ */
+typedef NS_ENUM(NSUInteger, GiftSendType) {
+	GiftSendType_Room = 1,///zho
+	GiftSendType_Chat = 2,
+	GiftSendType_OnMic = 3,
+};
+
+/**
+ 送礼物的类型，1全麦，2多人非全麦，3个人送礼w
+ - GameRoomSendGiftType_AllMic: 全麦
+ - GameRoomSendGiftType_MutableOnMic: 多人w非全麦
+ - GameRoomSendGiftType_ToOne: 对个人送礼
+ */
+typedef NS_ENUM(NSUInteger, RoomSendGiftType) {
+	RoomSendGiftType_AllMic,
+	RoomSendGiftType_MutableOnMic,
+	RoomSendGiftType_ToOne,
+};
+
+@interface GiftInfoModel : NSObject
+///礼物id
+@property (nonatomic, assign)NSInteger giftId;
+///礼物名字
+@property (nonatomic, strong)NSString *giftName;
+///价格
+@property (nonatomic, assign)double goldPrice;
+///礼物url
+@property (nonatomic, copy)NSString *giftUrl;
+///福袋svagUrl
+@property (nonatomic, copy)NSString *luckyGiftSvgaUrl;
+///玩法说明Url
+@property (nonatomic, copy)NSString *giftExplainUrl;
+
+@property (nonatomic, assign) GiftType giftType;//礼物类型
+///是否有vgg特效
+@property (assign, nonatomic) BOOL hasVggPic;
+///动效url
+@property (copy, nonatomic) NSString *vggUrl;
+///是否最新
+@property (assign, nonatomic) BOOL hasLatest;
+///是否限时
+@property (assign, nonatomic) BOOL hasTimeLimit;
+///是否特效
+@property (assign, nonatomic) BOOL hasEffect;
+///是否是房间专属礼物
+@property (assign, nonatomic) BOOL roomExclude;
+///是否支持发广播
+@property (nonatomic,assign) BOOL isSendMsg;
+///礼物文件类型 0 其他， 1 mp4
+@property (nonatomic, assign) GiftOtherViewType otherViewType;
+///mp4类型特效url
+@property (nonatomic, copy) NSString *viewUrl;
+
+/**-------------  礼物背包 ----------------**/
+///个数
+@property (nonatomic, assign) NSInteger count;
+@property (nonatomic, assign) NSInteger reciveCount;
+
+//isSelected 用于本地修改
+@property (nonatomic,assign) BOOL isSelected;//是否被选中
+///礼物来源
+@property (nonatomic,assign) GiftSourceType sourceType;
+///贵族礼物专属信息
+@property (nonatomic, strong) GiftNobleInfoModel *giftVipInfo;
+
+/*----------周星礼物--------*/
+///上周周星礼物ID
+@property (nonatomic, assign) NSInteger lastGiftId;
+///上周对应礼物的魅力榜第一
+@property (nonatomic, strong) XPWeekStarRankUserModel *firstCharmRankUser;
+///上周对应礼物豪气榜第一
+@property (nonatomic, strong) XPWeekStarRankUserModel *firstLevelRankUser;
+@property (nonatomic,assign) BOOL isEmpty;
+@end
+
+NS_ASSUME_NONNULL_END

YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.m

@@ -5,8 +5,8 @@
 //  Created by YUMI on 2021/11/11.
 //
 
-#import "PresentAbstractMatrix.h"
+#import "GiftInfoModel.h"
 #import "MJExtension.h"
-@implementation PresentAbstractMatrix
+@implementation GiftInfoModel
 MJCodingImplementation
 @end

YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftLuckyBroadcastModel.h

@@ -1,5 +1,5 @@
 //
-//  PresentFortunatePingbackMatrix.h
+//  GiftLuckyBroadcastModel.h
 //  YUMI
 //
 //  Created by YUMI on 2022/10/17.
@@ -9,12 +9,18 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface PresentFortunatePingbackMatrix : NSObject
+@interface GiftLuckyBroadcastModel : NSObject
+///礼物名称
 @property (nonatomic,strong) NSString *giftName;
+///价格
 @property (nonatomic, assign)double goldPrice;
+///幸运礼物
 @property (nonatomic,strong) NSString *luckyBagName;
+///昵称
 @property (nonatomic,strong) NSString *nick;
+///房间标题
 @property (nonatomic,strong) NSString *roomTitle;
+///房间的uid
 @property (nonatomic,strong) NSString *roomUid;
 @end
 

YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftLuckyBroadcastModel.m

@@ -0,0 +1,14 @@
+//
+//  GiftLuckyBroadcastModel.m
+//  YUMI
+//
+//  Created by YUMI on 2022/10/17.
+//
+
+#import "GiftLuckyBroadcastModel.h"
+
+@implementation GiftLuckyBroadcastModel
+
+
+
+@end

YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftNobleInfoModel.h

@@ -1,5 +1,5 @@
 //
-//  PresentMagnificentAbstractMatrix.h
+//  GiftNobleInfoModel.h
 //  YUMI
 //
 //  Created by YUMI on 2021/12/27.
@@ -9,10 +9,13 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface PresentMagnificentAbstractMatrix : NSObject
+@interface GiftNobleInfoModel : NSObject
 
+///贵族图标
 @property (nonatomic, copy)NSString *vipIcon;
+///可用贵族等级
 @property (nonatomic, assign) NSInteger vipLevel;
+///贵族名称
 @property (nonatomic, copy) NSString *vipName;
 
 @end

YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftNobleInfoModel.m

@@ -0,0 +1,12 @@
+//
+//  GiftNobleInfoModel.m
+//  YUMI
+//
+//  Created by YUMI on 2021/12/27.
+//
+
+#import "GiftNobleInfoModel.h"
+#import "MJExtension.h"
+@implementation GiftNobleInfoModel
+MJCodingImplementation
+@end

YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.h

@@ -0,0 +1,128 @@
+//
+//  GiftReceiveInfoModel.h
+//  YUMI
+//
+//  Created by YUMI on 2021/11/16.
+//
+#import <Foundation/Foundation.h>
+#import "GiftInfoModel.h"
+
+typedef NS_ENUM(NSInteger, BroadCastLevel) {
+    BroadCastLevel_Normal = 1,
+    BroadCastLevel_Middle = 2,
+    ///最高级
+    BroadCastLevel_High = 3,
+};
+
+NS_ASSUME_NONNULL_BEGIN
+@class GiftValueInfoModel;
+@interface GiftReceiveUserInfoModel : NSObject
+///收礼物的人
+@property(nonatomic, strong)NSString *nick;
+///收礼物的人的头像
+@property(nonatomic, strong)NSString *avatar;
+///用户uid
+@property(nonatomic, assign) NSInteger uid;
+@end
+
+@interface GiftLuckyUserInfo : NSObject
+@property(nonatomic, copy) NSString *nick;
+//基础信息
+@property(nonatomic, assign) NSInteger uid;
+@end
+
+
+@interface GiftListsInfo : NSObject
+@property (nonatomic, assign) NSInteger giftNum;
+@property (nonatomic, assign) NSInteger prizeLevel;
+@property (nonatomic, assign) NSInteger giftId;
+@end
+
+
+// 要多次发送消息 福袋相关的modle单独处理
+
+@interface GiftLuckyBagGiftsInfo : NSObject
+@property (nonatomic, strong) NSArray <GiftListsInfo *> *giftList;
+@property (nonatomic, strong) GiftLuckyUserInfo *user;
+@end
+
+@interface GiftReceiveInfoModel : NSObject
+///目标的uid
+@property(nonatomic,copy)NSString * targetUid;
+///目标的头像
+@property (nonatomic,copy) NSString *targetAvatar;
+///目标的昵称
+@property (nonatomic,copy) NSString *targetNick;
+@property (nonatomic,strong) NSArray<NSString *> *targetUids;
+///礼物信息
+@property (nonatomic,strong) GiftInfoModel *gift;
+///礼物信息
+@property (nonatomic,strong) GiftInfoModel *giftInfo;
+///送礼物的人uid
+@property(nonatomic, assign)NSString * uid;
+///礼物的id
+@property (nonatomic,copy) NSString *giftId;
+///送礼物的人
+@property(nonatomic, strong)NSString *nick;
+///送礼物的人的头像
+@property(nonatomic, strong)NSString *avatar;
+///送礼物的个数
+@property (assign, nonatomic) NSInteger giftNum;
+///礼物价格
+@property(nonatomic,assign) NSInteger giftGolds;
+///礼物名字
+@property (nonatomic,strong)NSString *giftName;
+///动效url
+@property (copy,nonatomic) NSString *vggUrl;
+///vap动效url
+@property (nonatomic, copy) NSString *viewUrl;
+///福袋svagUrl
+@property (nonatomic, copy)NSString *luckyGiftSvgaUrl;
+///非全麦 多人送礼时
+@property (nonatomic,strong) NSArray<GiftReceiveUserInfoModel *> *targetUsers;
+///福袋礼物需要展示的vg动画
+@property (nonatomic,strong) NSArray<GiftInfoModel *> *displayGift;
+///福袋随机获取的礼物
+@property (nonatomic,strong) NSArray <GiftLuckyBagGiftsInfo *> *luckyBagGifts;
+///多人接收到的具体福袋礼物  是对luckyBagGifts的分离 要多次发送消息使用
+@property (nonatomic,strong) GiftLuckyBagGiftsInfo* luckyGiftList;
+///礼物来源
+@property (nonatomic,assign) GiftSourceType sourceType;
+///房间送礼物的类型
+@property (nonatomic,assign) RoomSendGiftType roomSendGiftType;
+///礼物值信息
+@property (nonatomic, strong) NSArray<GiftValueInfoModel *> *giftValueVos;
+///是否是背包礼物
+@property (nonatomic,assign) BOOL isLuckyBagGift;
+///是不是全麦
+@property (nonatomic,assign) BOOL isBatch;
+///播放哪个动画
+@property (nonatomic, assign) BOOL isShowAnimation;
+
+///礼物的地址
+@property (nonatomic,copy) NSString *giftUrl;
+///是否可跳转房间
+@property (nonatomic,assign) BOOL isSkipRoom;
+///全服礼物通知等级编号
+@property (nonatomic,assign) BroadCastLevel levelNum;
+///停留的时间
+@property (nonatomic,assign) CGFloat notifyStaySecond;
+///接收者的头像
+@property (nonatomic,copy) NSString *recvUserAvatar;
+///接收者的昵称
+@property (nonatomic,copy) NSString *recvUserNick;
+///发送者的头像
+@property (nonatomic, copy) NSString *sendUserAvatar;
+///发送者的昵称
+@property (nonatomic, copy) NSString *sendUserNick;
+///跳转的房间的uid
+@property (nonatomic,assign) NSInteger roomUid;
+///平台id
+@property (nonatomic,copy) NSString *roomErbanNo;
+///是否年度飘屏
+@property (nonatomic, assign) BOOL ceremonyGift;
+///是否是房间外飘屏
+@property(nonatomic,assign) BOOL isHomeShow;
+@end
+
+NS_ASSUME_NONNULL_END

YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.m

@@ -0,0 +1,44 @@
+//
+//  GiftReceiveInfoModel.m
+//  YUMI
+//
+//  Created by YUMI on 2021/11/16.
+//
+
+#import "GiftReceiveInfoModel.h"
+#import "NSObject+MJExtension.h"
+
+@implementation GiftReceiveUserInfoModel
+
+@end
+
+@implementation GiftLuckyUserInfo
+
+
+@end
+
+@implementation GiftListsInfo
+
+
+@end
+
+@implementation GiftLuckyBagGiftsInfo
+
++ (NSDictionary *)objectClassInArray {
+	return @{@"giftList":GiftListsInfo.class
+	};
+}
+
+
+@end
+
+@implementation GiftReceiveInfoModel
+
++ (NSDictionary *)objectClassInArray {
+	return @{@"targetUsers":GiftReceiveUserInfoModel.class,
+			 @"displayGift":GiftInfoModel.class,
+			 @"luckyBagGifts":GiftLuckyBagGiftsInfo.class
+	};
+}
+
+@end

YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftTwelveStarFirstModel.h

@@ -1,5 +1,5 @@
 //
-//  PresentTwelveSatelliteThresholdMatrix.h
+//  GiftTwelveStarFirstModel.h
 //  YUMI
 //
 //  Created by YUMI on 2022/12/7.
@@ -9,7 +9,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface PresentTwelveSatelliteThresholdMatrix : NSObject
+@interface GiftTwelveStarFirstModel : NSObject
 @property (nonatomic, copy) NSString *avatar;
 @property (nonatomic, copy) NSString *erbanNo;
 @property (nonatomic, copy) NSString *markUrl;

YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftTwelveStarFirstModel.m

@@ -0,0 +1,12 @@
+//
+//  GiftTwelveStarFirstModel.m
+//  YUMI
+//
+//  Created by YUMI on 2022/12/7.
+//
+
+#import "GiftTwelveStarFirstModel.h"
+
+@implementation GiftTwelveStarFirstModel
+
+@end

YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftValueInfoModel.h

@@ -0,0 +1,25 @@
+//
+//  MicroGiftValueModel.h
+//  YUMI
+//
+//  Created by YUMI on 2021/12/13.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+@class GiftValueDetailModel;
+@interface GiftValueInfoModel : NSObject
+@property (nonatomic, copy) NSString *currentTime;//系统时间戳
+@property (nonatomic, strong) NSArray<GiftValueDetailModel *> *giftValueVos;
+@end
+
+@interface GiftValueDetailModel : NSObject
+///用户的uid
+@property (nonatomic, copy) NSString * uid;
+///礼物值
+@property (nonatomic, assign) long long giftValue;
+@end
+
+
+NS_ASSUME_NONNULL_END

YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftValueInfoModel.m

@@ -0,0 +1,23 @@
+//
+//  MicroGiftValueModel.m
+//  YUMI
+//
+//  Created by YUMI on 2021/12/13.
+//
+
+#import "GiftValueInfoModel.h"
+
+@implementation GiftValueInfoModel
+
++ (NSDictionary *)objectClassInArray {
+	return @{@"giftValueVos":GiftValueDetailModel.class};
+}
+
+@end
+
+
+@implementation GiftValueDetailModel
+
+
+
+@end

YuMi/Modules/YMRoom/View/SendGiftView/Model/PresentAbstractMatrix.h

@@ -1,83 +0,0 @@
-//
-//  YMGiftInfoModel.h
-//  YUMI
-//
-//  Created by YUMI on 2021/11/11.
-//
-
-#import <Foundation/Foundation.h>
-#import "PresentMagnificentAbstractMatrix.h"
-#import "YUMIWeekSatelliteRateConsumerMatrix.h"
-
-NS_ASSUME_NONNULL_BEGIN
-typedef NS_ENUM(NSUInteger, PresentGenre) {
-	PresentGenre_Game = 2, 
-	PresentGenre_Lucky = 3, 
-    PresentGenre_LuckyPool = 5, 
-    PresentGenre_Noble = 7, 
-    PresentGenre_WeekStar = 8, 
-	PresentGenre_Graffiti = 10, 
-	PresentGenre_Anchor = 11,  
-    PresentGenre_Punish = 12, 
-	PresentGenre_Twelve_Star = 13, 
-};
-
-typedef NS_ENUM(NSUInteger, PresentSourceGenre) {
-	PresentSourceGenre_Normal = 1, 
-	PresentSourceGenre_Pack = 2, 
-};
-
-typedef NS_ENUM(NSUInteger, PresentOtherRegardGenre) {
-    PresentOtherRegardGenreNormal = 0,
-    PresentOtherRegardGenreMp4 = 1,
-};
-
-
-typedef NS_ENUM(NSUInteger, PresentDischargeGenre) {
-	PresentDischargeGenre_Room = 1,
-	PresentDischargeGenre_Chat = 2,
-	PresentDischargeGenre_OnMic = 3,
-};
-
-
-typedef NS_ENUM(NSUInteger, ChamberDischargePresentGenre) {
-	ChamberDischargePresentGenre_AllMic,
-	ChamberDischargePresentGenre_MutableOnMic,
-	ChamberDischargePresentGenre_ToOne,
-};
-
-@interface PresentAbstractMatrix : NSObject
-@property (nonatomic, assign)NSInteger giftId;
-@property (nonatomic, strong)NSString *giftName;
-@property (nonatomic, assign)double goldPrice;
-@property (nonatomic, copy)NSString *giftUrl;
-@property (nonatomic, copy)NSString *luckyGiftSvgaUrl;
-@property (nonatomic, copy)NSString *giftExplainUrl;
-
-@property (nonatomic, assign) PresentGenre giftType;
-@property (assign, nonatomic) BOOL hasVggPic;
-@property (copy, nonatomic) NSString *vggUrl;
-@property (assign, nonatomic) BOOL hasLatest;
-@property (assign, nonatomic) BOOL hasTimeLimit;
-@property (assign, nonatomic) BOOL hasEffect;
-@property (assign, nonatomic) BOOL roomExclude;
-@property (nonatomic,assign) BOOL isSendMsg;
-@property (nonatomic, assign) PresentOtherRegardGenre otherViewType;
-@property (nonatomic, copy) NSString *viewUrl;
-
-
-@property (nonatomic, assign) NSInteger count;
-@property (nonatomic, assign) NSInteger reciveCount;
-
-@property (nonatomic,assign) BOOL isSelected;
-@property (nonatomic,assign) PresentSourceGenre sourceType;
-@property (nonatomic, strong) PresentMagnificentAbstractMatrix *giftVipInfo;
-
-
-@property (nonatomic, assign) NSInteger lastGiftId;
-@property (nonatomic, strong) YUMIWeekSatelliteRateConsumerMatrix *firstCharmRankUser;
-@property (nonatomic, strong) YUMIWeekSatelliteRateConsumerMatrix *firstLevelRankUser;
-@property (nonatomic,assign) BOOL isEmpty;
-@end
-
-NS_ASSUME_NONNULL_END

YuMi/Modules/YMRoom/View/SendGiftView/Model/PresentAchieveAbstractMatrix.h

@@ -1,65 +0,0 @@
-//
-//  PresentAchieveAbstractMatrix.h
-//  YUMI
-//
-//  Created by YUMI on 2021/11/16.
-//
-#import <Foundation/Foundation.h>
-#import "PresentAbstractMatrix.h"
-NS_ASSUME_NONNULL_BEGIN
-@class PresentStressAbstractMatrix;
-@interface PresentAchieveConsumerAbstractMatrix : NSObject
-@property(nonatomic, strong)NSString *nick;
-@property(nonatomic, strong)NSString *avatar;
-@property(nonatomic, assign) NSInteger uid;
-@end
-
-@interface PresentFortunateConsumerAbstract : NSObject
-@property(nonatomic, copy) NSString *nick;
-@property(nonatomic, assign) NSInteger uid;
-@end
-
-
-@interface PresentStatementsAbstract : NSObject
-@property (nonatomic, assign) NSInteger giftNum;
-@property (nonatomic, assign) NSInteger prizeLevel;
-@property (nonatomic, assign) NSInteger giftId;
-@end
-
-
-
-@interface PresentFortunateBagPresentsAbstract : NSObject
-@property (nonatomic, strong) NSArray <PresentStatementsAbstract *> *giftList;
-@property (nonatomic, strong) PresentFortunateConsumerAbstract *user;
-@end
-
-@interface PresentAchieveAbstractMatrix : NSObject
-@property(nonatomic,copy)NSString * targetUid;
-@property (nonatomic,copy) NSString *targetAvatar;
-@property (nonatomic,copy) NSString *targetNick;
-@property (nonatomic,strong) NSArray<NSString *> *targetUids;
-@property (nonatomic,strong) PresentAbstractMatrix *gift;
-@property (nonatomic,strong) PresentAbstractMatrix *giftInfo;
-@property(nonatomic, assign)NSString * uid;
-@property (nonatomic,copy) NSString *giftId;
-@property(nonatomic, strong)NSString *nick;
-@property(nonatomic, strong)NSString *avatar;
-@property (assign, nonatomic) NSInteger giftNum;
-@property (nonatomic,strong)NSString *giftName;
-@property (copy,nonatomic) NSString *vggUrl;
-@property (nonatomic, copy) NSString *viewUrl;
-@property (nonatomic, copy)NSString *luckyGiftSvgaUrl;
-@property (nonatomic,strong) NSArray<PresentAchieveConsumerAbstractMatrix *> *targetUsers;
-@property (nonatomic,strong) NSArray<PresentAbstractMatrix *> *displayGift;
-@property (nonatomic,strong) NSArray <PresentFortunateBagPresentsAbstract *> *luckyBagGifts;
-@property (nonatomic,strong) PresentFortunateBagPresentsAbstract* luckyGiftList;
-@property (nonatomic,assign) PresentSourceGenre sourceType;
-@property (nonatomic,assign) ChamberDischargePresentGenre roomSendGiftType;
-@property (nonatomic, strong) NSArray<PresentStressAbstractMatrix *> *giftValueVos;
-@property (nonatomic,assign) BOOL isLuckyBagGift;
-@property (nonatomic,assign) BOOL isBatch;
-@property (nonatomic, assign) BOOL isShowAnimation;
-@property(nonatomic,copy) NSString *key;
-@end
-
-NS_ASSUME_NONNULL_END

YuMi/Modules/YMRoom/View/SendGiftView/Model/PresentAchieveAbstractMatrix.m

@@ -1,44 +0,0 @@
-//
-//  PresentAchieveAbstractMatrix.m
-//  YUMI
-//
-//  Created by YUMI on 2021/11/16.
-//
-
-#import "PresentAchieveAbstractMatrix.h"
-#import "NSObject+MJExtension.h"
-
-@implementation PresentAchieveConsumerAbstractMatrix
-
-@end
-
-@implementation PresentFortunateConsumerAbstract
-
-
-@end
-
-@implementation PresentStatementsAbstract
-
-
-@end
-
-@implementation PresentFortunateBagPresentsAbstract
-
-+ (NSDictionary *)objectCtowardsegorizeInGarment {
-	return @{@"giftList":PresentStatementsAbstract.class
-	};
-}
-
-
-@end
-
-@implementation PresentAchieveAbstractMatrix
-
-+ (NSDictionary *)objectCtowardsegorizeInGarment {
-	return @{@"targetUsers":PresentAchieveConsumerAbstractMatrix.class,
-			 @"displayGift":PresentAbstractMatrix.class,
-			 @"luckyBagGifts":PresentFortunateBagPresentsAbstract.class
-	};
-}
-
-@end

YuMi/Modules/YMRoom/View/SendGiftView/Model/PresentFortunatePingbackMatrix.m

@@ -1,14 +0,0 @@
-//
-//  PresentFortunatePingbackMatrix.m
-//  YUMI
-//
-//  Created by YUMI on 2022/10/17.
-//
-
-#import "PresentFortunatePingbackMatrix.h"
-
-@implementation PresentFortunatePingbackMatrix
-
-
-
-@end

YuMi/Modules/YMRoom/View/SendGiftView/Model/PresentMagnificentAbstractMatrix.m

@@ -1,12 +0,0 @@
-//
-//  PresentMagnificentAbstractMatrix.m
-//  YUMI
-//
-//  Created by YUMI on 2021/12/27.
-//
-
-#import "PresentMagnificentAbstractMatrix.h"
-#import "MJExtension.h"
-@implementation PresentMagnificentAbstractMatrix
-MJCodingImplementation
-@end

YuMi/Modules/YMRoom/View/SendGiftView/Model/PresentStressAbstractMatrix.h

@@ -1,23 +0,0 @@
-//
-//  MicroGiftValueModel.h
-//  YUMI
-//
-//  Created by YUMI on 2021/12/13.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-@class PresentStressSpecificMatrix;
-@interface PresentStressAbstractMatrix : NSObject
-@property (nonatomic, copy) NSString *currentTime;
-@property (nonatomic, strong) NSArray<PresentStressSpecificMatrix *> *giftValueVos;
-@end
-
-@interface PresentStressSpecificMatrix : NSObject
-@property (nonatomic, copy) NSString * uid;
-@property (nonatomic, assign) long long giftValue;
-@end
-
-
-NS_ASSUME_NONNULL_END

YuMi/Modules/YMRoom/View/SendGiftView/Model/PresentStressAbstractMatrix.m

@@ -1,23 +0,0 @@
-//
-//  MicroGiftValueModel.m
-//  YUMI
-//
-//  Created by YUMI on 2021/12/13.
-//
-
-#import "PresentStressAbstractMatrix.h"
-
-@implementation PresentStressAbstractMatrix
-
-+ (NSDictionary *)objectCtowardsegorizeInGarment {
-	return @{@"giftValueVos":PresentStressSpecificMatrix.class};
-}
-
-@end
-
-
-@implementation PresentStressSpecificMatrix
-
-
-
-@end

YuMi/Modules/YMRoom/View/SendGiftView/Model/PresentTwelveSatelliteThresholdMatrix.m

@@ -1,12 +0,0 @@
-//
-//  PresentTwelveSatelliteThresholdMatrix.m
-//  YUMI
-//
-//  Created by YUMI on 2022/12/7.
-//
-
-#import "PresentTwelveSatelliteThresholdMatrix.h"
-
-@implementation PresentTwelveSatelliteThresholdMatrix
-
-@end

YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftCountModel.h

@@ -9,13 +9,17 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface YUMIPresentComputationMatrix : NSObject
+@interface XPGiftCountModel : NSObject
+///
 @property (nonatomic,copy) NSString *title;
+///礼物的个数
 @property (nonatomic,copy) NSString *giftNumber;
+/// 背包礼物的时候显示是全部
 @property (nonatomic,assign) BOOL isTotal;
+///是否是自定义数量 默认为NO
 @property (nonatomic, assign) BOOL isCustomCount;
 
-+ (instancetype)initComputtowardsionMtowardsrix:(NSString *)title giftNumber:(NSString *)giftNumber;
++ (instancetype)initCountModel:(NSString *)title giftNumber:(NSString *)giftNumber;
 
 @end
 

YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftCountModel.m

@@ -0,0 +1,22 @@
+//
+//  YMGiftCountModel.m
+//  YUMI
+//
+//  Created by YUMI on 2021/11/11.
+//
+
+#import "XPGiftCountModel.h"
+
+@implementation XPGiftCountModel
+
+
++ (instancetype)initCountModel:(NSString *)title giftNumber:(NSString *)giftNumber {
+	XPGiftCountModel * model = [[XPGiftCountModel alloc] init];
+	model.title = title;
+	model.giftNumber  = giftNumber;
+	model.isTotal = NO;
+	model.isCustomCount = NO;
+	return model;
+}
+
+@end

YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftUserInfoModel.h

@@ -9,12 +9,18 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface YUMIExternalizeConsumerAbstractMatrix : NSObject
+@interface XPGiftUserInfoModel : NSObject
+///头像
 @property (nonatomic,copy) NSString * avatar;
+///昵称
 @property (nonatomic,copy) NSString *nick;
+///用户的uid
 @property (nonatomic,assign) NSInteger uid;
+///坑位 如果用户在坑位的话 就有值  如果没在坑位的话 就没有有值
 @property (nonatomic,copy) NSString * position;
+///是否为相亲模式VIP坑位
 @property (nonatomic,assign) BOOL vipMic;
+///是否选择 本地字段刷新页面使用
 @property (nonatomic,assign) BOOL isSelect;
 
 @end

YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftUserInfoModel.m

@@ -0,0 +1,14 @@
+//
+//  YMGiftUserInfoModel.m
+//  YUMI
+//
+//  Created by YUMI on 2021/11/17.
+//
+
+#import "XPGiftUserInfoModel.h"
+
+@implementation XPGiftUserInfoModel
+
+
+
+@end

YuMi/Modules/YMRoom/View/SendGiftView/Model/XPWeekStarRankUserModel.h

@@ -9,13 +9,19 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface YUMIWeekSatelliteRateConsumerMatrix : NSObject
+@interface XPWeekStarRankUserModel : NSObject
 
+///头像
 @property (nonatomic, copy) NSString *avatar;
+///榜单值
 @property (nonatomic, assign) NSInteger amount;
+///uid
 @property (nonatomic, assign) NSInteger uid;
+///二般号
 @property (nonatomic, assign) NSInteger erbanNo;
+///昵称
 @property (nonatomic, copy) NSString *nick;
+///礼物id
 @property (nonatomic, assign) NSInteger giftId;
 
 @end

YuMi/Modules/YMRoom/View/SendGiftView/Model/XPWeekStarRankUserModel.m

@@ -0,0 +1,12 @@
+//
+//  YMCharmRankUserModel.m
+//  YUMI
+//
+//  Created by YUMI on 2022/5/7.
+//
+
+#import "XPWeekStarRankUserModel.h"
+
+@implementation XPWeekStarRankUserModel
+
+@end

YuMi/Modules/YMRoom/View/SendGiftView/Model/YUMIExternalizeConsumerAbstractMatrix.m

@@ -1,14 +0,0 @@
-//
-//  YMGiftUserInfoModel.m
-//  YUMI
-//
-//  Created by YUMI on 2021/11/17.
-//
-
-#import "YUMIExternalizeConsumerAbstractMatrix.h"
-
-@implementation YUMIExternalizeConsumerAbstractMatrix
-
-
-
-@end

YuMi/Modules/YMRoom/View/SendGiftView/Model/YUMIPresentComputationMatrix.m

@@ -1,22 +0,0 @@
-//
-//  YMGiftCountModel.m
-//  YUMI
-//
-//  Created by YUMI on 2021/11/11.
-//
-
-#import "YUMIPresentComputationMatrix.h"
-
-@implementation YUMIPresentComputationMatrix
-
-
-+ (instancetype)initComputtowardsionMtowardsrix:(NSString *)title giftNumber:(NSString *)giftNumber {
-	YUMIPresentComputationMatrix * model = [[YUMIPresentComputationMatrix alloc] init];
-	model.title = title;
-	model.giftNumber  = giftNumber;
-	model.isTotal = NO;
-	model.isCustomCount = NO;
-	return model;
-}
-
-@end

YuMi/Modules/YMRoom/View/SendGiftView/Model/YUMIWeekSatelliteRateConsumerMatrix.m

@@ -1,12 +0,0 @@
-//
-//  YMCharmRankUserModel.m
-//  YUMI
-//
-//  Created by YUMI on 2022/5/7.
-//
-
-#import "YUMIWeekSatelliteRateConsumerMatrix.h"
-
-@implementation YUMIWeekSatelliteRateConsumerMatrix
-
-@end