From f33e8b0ac5646d2b7930ba87cbc1b87a35bd75f6 Mon Sep 17 00:00:00 2001 From: liyuhua <15626451870@163.com> Date: Wed, 27 Sep 2023 20:17:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xcshareddata/xcschemes/YuMi.xcscheme | 2 +- YuMi/Global/YUMIConstant.m | 5 ++--- .../View/Cell/XPSessionFindNewTableViewCell.m | 3 ++- .../View/Cell/XPSessionSayHelloTableViewCell.m | 3 ++- .../Cell/Friend/XPMineAttentionTableViewCell.m | 4 ++-- .../View/Cell/Friend/XPMineFansTableViewCell.m | 5 ++--- .../View/Cell/Friend/XPMineFriendTableViewCell.m | 4 ++-- .../Cell/Visitor/XPMineVisitorTableViewCell.m | 3 ++- .../View/Cell/XPDressShopSearchTableViewCell.m | 3 ++- .../XPMineExchangeAuthorityCell.m | 3 ++- .../XPGuildSearchSuperAdminTableViewCell.m | 3 ++- .../Guild/View/Cell/XPClanMemberTableViewCell.m | 12 +++++++----- .../Cell/XPMineGuildSearchMemberTableViewCell.m | 3 ++- .../SubViews/MineInfo/XPMineUserInfoHeaderView.m | 3 ++- .../YMMine/View/SubViews/XPMineHeadView.m | 3 ++- .../Cell/XPMonentsInteractiveTableViewCell.m | 3 ++- .../View/SubViews/XPMonentsUserInfoView.m | 9 +++++---- .../View/Cell/XPNewHomePartyTableViewCell.m | 5 ++++- .../Cell/XPNewHomePlayItemCollectionViewCell.m | 6 ++++-- .../Search/View/Cell/XPSearchListTableViewCell.m | 4 +++- .../View/Cell/XPArrangeMicTableViewCell.m | 3 ++- .../View/XPRoomLittleGameContainerView.m | 16 ++++++++++++++-- .../View/Cell/XPRoomOnlineTableViewCell.m | 4 +++- .../YMRoom/View/StageView/MicroView/MicroView.m | 3 ++- .../UserCard/View/XPUserCardViewController.m | 3 ++- YuMi/Modules/YMRoom/View/XPRoomViewController.m | 4 +++- .../YMTabbar/View/AnchorCard/XPAnchorCardView.m | 3 ++- 27 files changed, 80 insertions(+), 42 deletions(-) diff --git a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme index d258e3d3..9e3921f5 100644 --- a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme +++ b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme @@ -31,7 +31,7 @@ 0){ _audioView.voiceDura = _roomInfo.voiceDura; _audioView.userVoice = _roomInfo.userVoice; diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayItemCollectionViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayItemCollectionViewCell.m index edb79db1..613210fe 100644 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayItemCollectionViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayItemCollectionViewCell.m @@ -27,6 +27,7 @@ @property(nonatomic,strong) FLAnimatedImageView *onlineGifView; ///用户名 @property(nonatomic,strong) UILabel *nameView; + @end @implementation XPNewHomePlayItemCollectionViewCell @@ -81,11 +82,12 @@ }]; [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_lessThanOrEqualTo(kGetScaleWidth(60)); - make.centerX.equalTo(self.bgView).mas_offset(kGetScaleWidth(10)); + make.width.mas_lessThanOrEqualTo(kGetScaleWidth(65)); + make.centerX.equalTo(self.bgView).mas_offset(kGetScaleWidth(5)); make.height.mas_equalTo(kGetScaleWidth(17)); make.top.equalTo(self.borderImageView.mas_bottom).mas_offset(kGetScaleWidth(3)); }]; + [self.onlineGifView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(9)); make.height.mas_equalTo(kGetScaleWidth(8)); diff --git a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m index e8b4735a..fbb14a49 100644 --- a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m @@ -55,6 +55,7 @@ self.idLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineUserInfoTableViewCell3"),AppName, resultModel.erbanNo]; [self.sexImageView setTitle:[NSString getAgeWithBirth:resultModel.birth] forState:UIControlStateNormal]; self.sexImageView.backgroundColor = resultModel.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); + self.sexImageView.titleEdgeInsets = resultModel.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); self.sexImageView.selected = resultModel.gender != GenderType_Male; if (type == SearchType_Users) { self.numberLabel.text = YMLocalizedString(@"XPSearchListTableViewCell1"); @@ -78,6 +79,7 @@ [self.sexImageView setTitle:[NSString getAgeWithBirth:resultModel.birth] forState:UIControlStateNormal]; self.sexImageView.backgroundColor = resultModel.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); + self.sexImageView.titleEdgeInsets = resultModel.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); self.sexImageView.selected = resultModel.gender != GenderType_Male; if (resultModel.onlineNum > 100) { self.numberLabel.text = [NSString stringWithFormat:@"%ld", resultModel.onlineNum]; @@ -195,7 +197,7 @@ [_sexImageView setImage:kImage(@"home_age_girl_icon") forState:UIControlStateSelected]; _sexImageView.titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; [_sexImageView setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _sexImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 2, 0, 0); + _sexImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0); _sexImageView.layer.cornerRadius = 14/2; _sexImageView.layer.masksToBounds = YES; } diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicTableViewCell.m b/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicTableViewCell.m index 67a51b6a..69ae391c 100644 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicTableViewCell.m @@ -99,6 +99,7 @@ self.avaratImageView.imageUrl = _userInfo.avatar; [self.sexImageView setTitle:[NSString getAgeWithBirth:_userInfo.birth] forState:UIControlStateNormal]; self.sexImageView.backgroundColor = _userInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); + self.sexImageView.titleEdgeInsets = _userInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); self.sexImageView.selected = _userInfo.gender != GenderType_Male; self.rankLabel.text = [NSString stringWithFormat:@"%ld", _userInfo.number]; if (self.isManager) { @@ -195,7 +196,7 @@ [_sexImageView setImage:kImage(@"home_age_girl_icon") forState:UIControlStateSelected]; _sexImageView.titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; [_sexImageView setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _sexImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 2, 0, 0); + _sexImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0); _sexImageView.layer.cornerRadius = 14/2; _sexImageView.layer.masksToBounds = YES; } diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m b/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m index 2819fbe1..197610f1 100644 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m +++ b/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m @@ -111,7 +111,19 @@ NSString * userId = [AccountInfoStorage instance].getUid; NSString * roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; NSLog(@"用户ID：%@，房间ID：%@, 游戏ID：%lld, code:%@", userId, roomId, self.currentmgId, self.code); - self.fsmAPP2MG = [SudMGP loadMG:userId roomId:roomId code:self.code mgId:self.currentmgId language:@"zh-CN" fsmMG:self rootView:self]; +// + + NSString *language = [NSLocale preferredLanguages].firstObject; + if ([language hasPrefix:@"zh"]) { + if ([language rangeOfString:@"Hans"].location != NSNotFound) { + language = @"zh-Hans"; // 简体中文 + } else { + language = @"zh-Hant"; // 繁體中文 + } + }else{ + language = @"zh-Hant"; // 繁體中文 + } + self.fsmAPP2MG = [SudMGP loadMG:userId roomId:roomId code:self.code mgId:self.currentmgId language:[language isEqualToString:@"zh-Hant"]? @"zh-TW" : @"zh-CN" fsmMG:self rootView:self]; } else { /// 初始化失败, 可根据业务重试 NSLog(@"ISudFSMMG:initGameSDKWithAppID:初始化sdk失败 :%@",retMsg); @@ -354,7 +366,7 @@ if (iPhoneXSeries) { bottom = (47+kSafeAreaBottomHeight+30 + 70) * scale; } else { - bottom = (47+10+70 + 30) * scale; + bottom = (47+10+70 ) * scale; } CGFloat width = rect.size.width * scale; CGFloat height = rect.size.height * scale; diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m index 96daccab..fb8e6b19 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m @@ -156,11 +156,13 @@ // [self.sexImageView setTitle:[NSString getAgeWithBirth:userInfo.birth.longLongValue] forState:UIControlStateNormal]; self.sexImageView.backgroundColor = userInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); + self.sexImageView.titleEdgeInsets = userInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); self.sexImageView.selected = userInfo.gender != GenderType_Male; } else { NIMUser *user = [[NIMSDK sharedSDK].userManager userInfo:_member.userId]; [self.sexImageView setTitle:[NSString getAgeWithBirth:user.userInfo.birth.longLongValue] forState:UIControlStateNormal]; self.sexImageView.backgroundColor = user.userInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); + self.sexImageView.titleEdgeInsets = user.userInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); self.sexImageView.selected = user.userInfo.gender != GenderType_Male; } if (extDic.allKeys.count > 0 || (member.type == NIMTeamMemberTypeOwner || member.type == NIMChatroomMemberTypeManager)) { @@ -253,7 +255,7 @@ [_sexImageView setImage:kImage(@"home_age_girl_icon") forState:UIControlStateSelected]; _sexImageView.titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; [_sexImageView setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _sexImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 2, 0, 0); + _sexImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0); _sexImageView.layer.cornerRadius = 14/2; _sexImageView.layer.masksToBounds = YES; } diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m index a81b89f4..264cd1e2 100644 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m +++ b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m @@ -454,6 +454,7 @@ self.postionLabel.hidden = YES; [self.sexImageView setTitle:[NSString getAgeWithBirth:userInfo.birth] forState:UIControlStateNormal]; self.sexImageView.backgroundColor = userInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); + self.sexImageView.titleEdgeInsets = userInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); self.sexImageView.selected = userInfo.gender != GenderType_Male; } self.forbidKickView.hidden = !userInfo.preventKick; @@ -655,7 +656,7 @@ [_sexImageView setImage:kImage(@"home_age_girl_icon") forState:UIControlStateSelected]; _sexImageView.titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; [_sexImageView setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _sexImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 2, 0, 0); + _sexImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0); _sexImageView.layer.cornerRadius = 14/2; _sexImageView.layer.masksToBounds = YES; _sexImageView.hidden = YES; diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m index 280c5068..e78c082e 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m +++ b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m @@ -538,6 +538,7 @@ [self.sexImageView setTitle:[NSString getAgeWithBirth:userInfo.birth] forState:UIControlStateNormal]; self.sexImageView.backgroundColor = userInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); + self.sexImageView.titleEdgeInsets = userInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); self.sexImageView.selected = userInfo.gender != GenderType_Male; self.officalImageView.hidden = userInfo.defUser != UserLevelType_Offical; self.newUserImageView.hidden = !userInfo.newUser; @@ -1208,7 +1209,7 @@ [_sexImageView setImage:kImage(@"home_age_girl_icon") forState:UIControlStateSelected]; _sexImageView.titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; [_sexImageView setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _sexImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 2, 0, 0); + _sexImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0); _sexImageView.layer.cornerRadius = 14/2; _sexImageView.layer.masksToBounds = YES; } diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m index 494866f0..68aebbfb 100644 --- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m +++ b/YuMi/Modules/YMRoom/View/XPRoomViewController.m @@ -276,14 +276,16 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [super viewWillDisappear:animated]; self.freeView.hidden = YES; } + - (void)viewDidDisappear:(BOOL)animated{ [super viewDidDisappear:animated]; - + self.navigationController.interactivePopGestureRecognizer.enabled = YES; [XPSkillCardPlayerManager shareInstance].isInRoomVC = NO; } - (void)viewDidAppear:(BOOL)animated { [super viewDidAppear:animated]; self.freeView.hidden = NO; + self.navigationController.interactivePopGestureRecognizer.enabled = NO; [XPSkillCardPlayerManager shareInstance].isInRoomVC = YES; if([XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge == YES && self.isShowFirstRecharge == NO){ [XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge = NO; diff --git a/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m b/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m index 7b90d5bd..025b9f59 100644 --- a/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m +++ b/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m @@ -340,6 +340,7 @@ self.descLabel.text = cardInfo.userDesc; [_genderImageView setTitle:[NSString getAgeWithBirth:cardInfo.birth] forState:UIControlStateNormal]; self.genderImageView.backgroundColor = cardInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); + self.genderImageView.titleEdgeInsets = cardInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); self.genderImageView.selected = cardInfo.gender != GenderType_Male; [self openCountdownWithTime:11]; [self.collectionView reloadData]; @@ -395,7 +396,7 @@ [_genderImageView setImage:kImage(@"home_age_girl_icon") forState:UIControlStateSelected]; _genderImageView.titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; [_genderImageView setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _genderImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 2, 0, 0); + _genderImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0); _genderImageView.layer.cornerRadius = 14/2; _genderImageView.layer.masksToBounds = YES; }