From 1923978f38a793d3b7447dfb51577002922a4572 Mon Sep 17 00:00:00 2001 From: chenguilong <598604202@qq.com> Date: Thu, 10 Mar 2022 11:50:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AA=E6=92=AD=E6=88=BF?= =?UTF-8?q?=E9=9D=9E=E7=A6=BB=E5=BC=80=E6=A8=A1=E5=BC=8F=E4=B8=8B=E7=A4=BC?= =?UTF-8?q?=E7=89=A9=E9=9D=A2=E6=9D=BF=E6=B2=A1=E6=9C=89=E6=88=BF=E4=B8=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Podfile.lock | 2 +- .../XPRoomMenuContainerView.m | 18 ++++++++++++++++- .../UserCard/View/XPUserCardViewController.m | 20 ++++++++++++++++++- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 5babd586..8bf84631 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -205,4 +205,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 8120dbc8eb506e124ccb97e8ce2ecf2420ac8b5f -COCOAPODS: 1.11.0 +COCOAPODS: 1.11.2 diff --git a/xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.m b/xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.m index fe5091cc..7381ab44 100644 --- a/xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.m +++ b/xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.m @@ -191,7 +191,23 @@ userModel.position = @"-1"; userModel.uid = roomInfo.uid; [array addObject:userModel]; - } + } else if (self.delegate.getRoomInfo.type == RoomType_Anchor) { + RoomInfoModel * roomInfo= self.delegate.getRoomInfo; + BOOL hadContainerOwner = NO; + for (UserInfoModel *userModel in array) { + if (userModel.uid == roomInfo.uid) { + hadContainerOwner = YES; + break; + } + } + if (!hadContainerOwner) { + XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; + userModel.avatar = roomInfo.avatar; + userModel.position = @"-1"; + userModel.uid = roomInfo.uid; + [array addObject:userModel]; + } + } return array; } diff --git a/xplan-ios/Main/Room/View/UserCard/View/XPUserCardViewController.m b/xplan-ios/Main/Room/View/UserCard/View/XPUserCardViewController.m index 6cda5900..65764b78 100644 --- a/xplan-ios/Main/Room/View/UserCard/View/XPUserCardViewController.m +++ b/xplan-ios/Main/Room/View/UserCard/View/XPUserCardViewController.m @@ -416,7 +416,25 @@ userModel.isSelect = YES; } [array addObject:userModel]; - } + } else if (roomInfo.type == RoomType_Anchor) { + BOOL hadContainerOwner = NO; + for (UserInfoModel *userModel in array) { + if (userModel.uid == roomInfo.uid) { + hadContainerOwner = YES; + break; + } + } + if (!hadContainerOwner) { + XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; + userModel.avatar = roomInfo.avatar; + userModel.position = @"-1"; + userModel.uid = self.cardInfo.uid.integerValue; + if (roomInfo.uid == self.cardInfo.uid.integerValue) { + userModel.isSelect = YES; + } + [array addObject:userModel]; + } + } return array; }