diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.h b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.h index e2a6caed..a609aaaf 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.h +++ b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.h @@ -52,9 +52,9 @@ typedef NS_ENUM(NSUInteger, GiftOtherViewType) { - GameRoomSendType_Team 群聊礼物 */ typedef NS_ENUM(NSUInteger, GiftSendType) { - GiftSendType_Room = 1,///zho + GiftSendType_Room = 1, GiftSendType_Chat = 2, -GiftSendType_OnMic = 3, + GiftSendType_OnMic = 3, }; /** diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m index 7f304a54..89a2ac8f 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m @@ -119,7 +119,7 @@ /// @param users 麦序列表 - (NSArray *)findSendGiftAllUsers:(NSArray *)users { NSMutableArray * tempArray = [NSMutableArray array]; - NSString * uid = [AccountInfoStorage instance].getUid; +// NSString * uid = [AccountInfoStorage instance].getUid; NSArray * newArray = [users sortedArrayUsingComparator:^NSComparisonResult(id _Nonnull obj1, id _Nonnull obj2) { XPGiftUserInfoModel * model1 = obj1; XPGiftUserInfoModel * model2 = obj2; @@ -129,7 +129,9 @@ for (int i = 0; i < newArray.count; i++) { XPGiftUserInfoModel * userInfo = [newArray xpSafeObjectAtIndex:i]; - if (userInfo && userInfo.uid > 0 && userInfo.uid != uid.integerValue) { ///自己在麦上不显示在送礼物列表中 + if (userInfo && userInfo.uid > 0 +// && userInfo.uid != uid.integerValue + ) { ///自己在麦上不显示在送礼物列表中 NSString * uid = [NSString stringWithFormat:@"%ld", userInfo.uid]; if (userInfo.isSelect) { [self.selectUserArray addObject:uid];