From fe688ff27508b54d39610d6e64f7ae4675cfc1e9 Mon Sep 17 00:00:00 2001
From: eggmanQQQ <3671373519@qq.com>
Date: Fri, 21 Jun 2024 17:23:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=AD=A3=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=20tab=20model=20=E7=9A=84=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=202.=20=E7=A7=BB=E9=99=A4=E6=88=BF=E9=97=B4=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A4=84=E7=9A=84=E7=83=AD=E5=BA=A6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=97=B6=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YuMi/Modules/YMNewHome/View/XPHomeMineViewController.m     | 6 ++++--
 .../View/BaseUIContainerView/XPRoomFunctionContainerView.m | 7 -------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/YuMi/Modules/YMNewHome/View/XPHomeMineViewController.m b/YuMi/Modules/YMNewHome/View/XPHomeMineViewController.m
index 0fea8608..77de81b4 100644
--- a/YuMi/Modules/YMNewHome/View/XPHomeMineViewController.m
+++ b/YuMi/Modules/YMNewHome/View/XPHomeMineViewController.m
@@ -51,8 +51,8 @@
     _model = model;
     if (model) {
         self.avatarImageView.imageUrl = model.avatar;
-        self.roomNameLabel.text = model.title;
-        self.descLabel.text = model.roomDesc;
+        self.roomNameLabel.text = model.title.length > 0 ? model.title : YMLocalizedString(@"XPMinePersonalCenterCell1");
+        self.descLabel.text = model.roomDesc.length > 0 ? model.roomDesc : YMLocalizedString(@"XPHomeMineViewController3");
         self.heatLabel.text = [NSString stringWithFormat:@"%ld", model.onlineNum];
 
         for (UIView *subView in self.miniAvatarsContainer.subviews) {
@@ -86,7 +86,9 @@
         for (UIView *subView in self.miniAvatarsContainer.subviews) {
             [subView removeFromSuperview];
         }
+    }
 
+    if (self.miniAvatarsContainer.subviews.count == 0) {
         NetImageConfig *config = [[NetImageConfig alloc]init];
         config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
         NetImageView *iconView = [[NetImageView alloc]initWithConfig:config];
diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m
index b4ea2c7c..744abfb0 100644
--- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m
+++ b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m
@@ -531,7 +531,6 @@
 }
 - (void)onRoomUpdate {
 	RoomInfoModel * roomInfo = self.delegate.getRoomInfo;
-    self.contributeEnterView.title = roomInfo.serialValue.stringValue;
 
 	MicroQueueModel * model = [self.delegate.getMicroQueue objectForKey:@"-1"];
 	if (roomInfo.roomModeType == RoomModeType_Open_Blind && model.userInfo && model.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) {
@@ -567,7 +566,6 @@
 	}
 	[self updateHourRankEntrance];
 	if (roomInfo.type == RoomType_Anchor) {
-//        self.contributeEnterView.title = YMLocalizedString(@"XPRoomFunctionContainerView7");
         if (roomInfo.hadChangeRoomType) {
             ///切换房间类型初始化当前用户与房间粉丝团关系
             [Api requestInRoomFansTeam:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
@@ -577,7 +575,6 @@
             [self updateContrionEntranceWithRoomUid:[NSString stringWithFormat:@"%ld", roomInfo.uid] type:@"month"];
         }
 	} else {
-//        self.contributeEnterView.title = YMLocalizedString(@"XPRoomFunctionContainerView5");
         [self.fansTeamEntranceView removeFromSuperview];
         if (roomInfo.hadChangeRoomType) {
             [self updateContrionEntranceWithRoomUid:[NSString stringWithFormat:@"%ld", roomInfo.uid] type:@"day"];
@@ -598,7 +595,6 @@
 	NSString * roomUid = [NSString stringWithFormat:@"%ld", roomInfo.uid];
 	[self updateHourRankEntrance];
 	if (roomInfo.type == RoomType_Anchor) {//个播房
-//        self.contributeEnterView.title = YMLocalizedString(@"XPRoomFunctionContainerView7");
         ///进房初始化当前用户与房间粉丝团关系
         [Api requestInRoomFansTeam:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
             XPAnchorFansRelationModel *model = [XPAnchorFansRelationModel modelWithJSON:data.data];
@@ -606,7 +602,6 @@
         } teamUid:roomUid];
         [self updateContrionEntranceWithRoomUid:roomUid type:@"month"];//获取房间榜前三名
     } else {
-//        self.contributeEnterView.title = YMLocalizedString(@"XPRoomFunctionContainerView7");
         [self updateContrionEntranceWithRoomUid:roomUid type:@"day"];//获取房间榜前三名
     }
     if (![[AccountInfoStorage instance].getUid isEqualToString:roomUid]) {//非房主
@@ -1710,7 +1705,6 @@
 
 - (void)configWishGiftEnter {
 	RoomInfoModel * roomInfo = self.delegate.getRoomInfo;
-    self.contributeEnterView.title = roomInfo.serialValue.stringValue;
 	NSString * roomUid = [NSString stringWithFormat:@"%ld", roomInfo.uid];
 	if (roomInfo.hasOpenWishGift) {
 		[Api wishGiftList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
@@ -1745,7 +1739,6 @@
 
 - (void)roomInfoUpdateConfigWishGift {
 	RoomInfoModel * roomInfo = self.delegate.getRoomInfo;
-    self.contributeEnterView.title = roomInfo.serialValue.stringValue;
 	if (roomInfo.datingState == RoomDatingStateChangeType_Close) {
 		if (self.wishGiftView.superview) {
 			self.wishGiftView.hidden = NO;