yinmeng/yinmeng-ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
liyuhua
2023-08-31 20:22:18 +08:00
parent 385212a3f5
commit ab9061580a
6 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xplan-ios.xcodeproj/project.pbxproj
View File

@@ -11357,7 +11357,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.2.2;
MARKETING_VERSION = 1.3.0;
PRODUCT_BUNDLE_IDENTIFIER = cn.nnbc123.voice;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -11390,7 +11390,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.2.2;
MARKETING_VERSION = 1.3.0;
PRODUCT_BUNDLE_IDENTIFIER = cn.nnbc123.voice;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";

2
xplan-ios/Main/Home/View/XPFindNewFriendTableViewCell.m
View File

@@ -145,7 +145,7 @@
make.right.mas_equalTo(-10);
make.top.mas_equalTo(self.avatarImageView.mas_top).offset(5);
make.height.mas_equalTo(20);
make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(100));
make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(10));
}];
[self.gameView mas_makeConstraints:^(MASConstraintMaker *make) {

6
xplan-ios/Main/Message/View/Session/SessionViewController.m
View File

@@ -369,9 +369,9 @@
if (userInfo.roomUid && self.openType != SessionListOpenTypeRoom) {
self.isShowfollowInRoomView = YES;
self.sessionNavView.isShowLive = YES;
if ([self showChatRiskView:userInfo]==YES) {
self.riskAlertView.warning = userInfo.banAccount ? @" 温馨提醒：当前对方账号存在异常，请谨慎来往！" : @"温馨提示：对方和您非好友关系，请注意隐私安全！";
self.riskAlertView.warning = userInfo.banAccount ? @" 温馨提醒：当前对方账号存在异常，请谨慎来往！" : @" 温馨提示：对方和您非好友关系，请注意隐私安全！";
self.riskAlertView.hidden = NO;
}else{
self.riskAlertView.hidden = YES;
@@ -379,7 +379,7 @@
}
} else {
if ([self showChatRiskView:userInfo]) {
self.riskAlertView.warning = userInfo.banAccount ? @" 温馨提醒：当前对方账号存在异常，请谨慎来往！" : @"温馨提示：对方和您非好友关系，请注意隐私安全！";
self.riskAlertView.warning = userInfo.banAccount ? @" 温馨提醒：当前对方账号存在异常，请谨慎来往！" : @" 温馨提示：对方和您非好友关系，请注意隐私安全！";
self.riskAlertView.hidden = NO;
}else{
self.riskAlertView.hidden = YES;

20
xplan-ios/Main/Message/View/Session/XPSessionMessageGameCell.m
View File

@@ -92,7 +92,7 @@
[self.tierBgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(kGetScaleWidth(16));
make.width.mas_lessThanOrEqualTo(kGetScaleWidth(72));
make.width.mas_equalTo(kGetScaleWidth(52));
make.centerY.equalTo(self.titleView);
make.leading.equalTo(self.titleView.mas_trailing).mas_offset(kGetScaleWidth(4));
make.trailing.equalTo(self.priceView.mas_leading).mas_offset(-kGetScaleWidth(2));
@@ -151,7 +151,7 @@
self.bgImageView.hidden = NO;
_iconView.imageUrl = _gameInfo.logo;
_payBtn.imageUrl = _gameInfo.btnRgb;
_payBtn.imageUrl = _gameInfo.btnBg;
[_payTitleBnt setTitleColor:UIColorFromRGB(0xBBBCBD) forState:UIControlStateNormal];
self.tierView.textColor = UIColorFromRGB(0xBBBCBD);
self.tierBgView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.6];;
@@ -163,10 +163,22 @@
}];
_tierView.text = _gameInfo.tier;
CGFloat width = [UILabel getWidthWithText:_gameInfo.tier height:kGetScaleWidth(16) font:_tierView.font]+kGetScaleWidth(14);
if(width > kGetScaleWidth(72)){
width = kGetScaleWidth(72);
}
[_tierBgView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(kGetScaleWidth(16));
make.width.mas_equalTo(width);
make.centerY.equalTo(self.titleView);
make.leading.equalTo(self.titleView.mas_trailing).mas_offset(kGetScaleWidth(4));
}];
_tierBgView.hidden = _gameInfo.tier.length == 0;
if(_gameInfo.gameName.length > 6){
_gameInfo.gameName = [NSString stringWithFormat:@"%@...",[_gameInfo.gameName substringToIndex:6]];
}
_titleView.text = _gameInfo.gameName;
NSMutableAttributedString *gameNameAtt = [[NSMutableAttributedString alloc]initWithString:_gameInfo.gameName attributes:@{NSFontAttributeName:kFontMedium(16),NSForegroundColorAttributeName:[UIColor whiteColor]}];
NSString *gameName = @"";
if(_gameInfo.gameName.length > 5 ){

6
xplan-ios/Main/Mine/View/SubViews/MineInfo/XPMineUserGameCell.m
View File

@@ -87,7 +87,7 @@
make.width.mas_lessThanOrEqualTo(kGetScaleWidth(72));
make.centerY.equalTo(self.titleView);
make.leading.equalTo(self.titleView.mas_trailing).mas_offset(kGetScaleWidth(4));
make.trailing.equalTo(self.priceView.mas_leading).mas_offset(-kGetScaleWidth(2));
}];
[self.tierView mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.trailing.equalTo(self.tierBgView).inset(kGetScaleWidth(5));
@@ -129,6 +129,9 @@
_tierView.text = _gameInfo.tier;
_tierBgView.hidden = _gameInfo.tier.length == 0;
if(_gameInfo.gameName.length > 6){
_gameInfo.gameName = [NSString stringWithFormat:@"%@...",[_gameInfo.gameName substringToIndex:6]];
}
_titleView.text = _gameInfo.gameName;
NSMutableAttributedString *gameNameAtt = [[NSMutableAttributedString alloc]initWithString:_gameInfo.gameName attributes:@{NSFontAttributeName:kFontMedium(16),NSForegroundColorAttributeName:[UIColor whiteColor]}];
@@ -141,7 +144,6 @@
_titleView.attributedText = gameNameAtt;
}
_payBtn.hidden = [_gameInfo.uid isEqualToString:[AccountInfoStorage instance].getUid];
_payTitleBnt.hidden = [_gameInfo.uid isEqualToString:[AccountInfoStorage instance].getUid];

2
xplan-ios/Main/Mine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m
View File

@@ -127,7 +127,7 @@
[self.userInfoView addSubview:self.attentionButton];
[self.onlineView addSubview:self.noteView];
[self.nickStackView addArrangedSubview:self.nobleImageView];
[self.nickStackView addArrangedSubview:self.nameLabel];
[self.nickStackView addArrangedSubview:self.sexImageView];