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

修改了魔力号为ID

Browse Source
This commit is contained in:
fengshuo
2023-01-05 16:33:37 +08:00
parent 65bc4b89e4
commit 6e484c5743
20 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xplan-ios/Main/Home/View/SubViews/XPHomeSearchNavView.m
View File

@@ -153,7 +153,7 @@
_searchTextField.textColor = [ThemeColor mainTextColor]; _searchTextField.textColor = [ThemeColor mainTextColor];
_searchTextField.backgroundColor = [UIColor clearColor]; _searchTextField.backgroundColor = [UIColor clearColor];
_searchTextField.font = [UIFont systemFontOfSize:13]; _searchTextField.font = [UIFont systemFontOfSize:13];
NSString *placeholder = [NSString stringWithFormat:@"搜索昵称/%@ID/房间名", AppName]; NSString *placeholder = [NSString stringWithFormat:@"搜索昵称/ID/房间名"];
_searchTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [ThemeColor secondTextColor]}]; _searchTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [ThemeColor secondTextColor]}];
_searchTextField.clearButtonMode = UITextFieldViewModeWhileEditing; _searchTextField.clearButtonMode = UITextFieldViewModeWhileEditing;
_searchTextField.returnKeyType = UIReturnKeySearch; _searchTextField.returnKeyType = UIReturnKeySearch;

2
xplan-ios/Main/Login/View/XPLoginVerifBindPhoneViewController.m
View File

@@ -420,7 +420,7 @@
- (UILabel *)tipsLabel{ - (UILabel *)tipsLabel{
if (!_tipsLabel) { if (!_tipsLabel) {
_tipsLabel = [[UILabel alloc] init]; _tipsLabel = [[UILabel alloc] init];
_tipsLabel.text = [NSString stringWithFormat:@"如果您的手机号已丢失\n请咨询客服，魔力号：%@", @"88001"]; _tipsLabel.text = [NSString stringWithFormat:@"如果您的手机号已丢失\n请咨询客服，ID：%@", @"88001"];
_tipsLabel.textColor = [ThemeColor textThirdColor]; _tipsLabel.textColor = [ThemeColor textThirdColor];
_tipsLabel.font = [UIFont systemFontOfSize:14.f]; _tipsLabel.font = [UIFont systemFontOfSize:14.f];
_tipsLabel.adjustsFontSizeToFitWidth = YES; _tipsLabel.adjustsFontSizeToFitWidth = YES;

2
xplan-ios/Main/Message/View/FindNew/View/Cell/XPSessionFindNewTableViewCell.m
View File

@@ -115,7 +115,7 @@
sexStr = @"common_female"; sexStr = @"common_female";
} }
self.sexImageView.image = [UIImage imageNamed:sexStr]; self.sexImageView.image = [UIImage imageNamed:sexStr];
self.idLabel.text = [NSString stringWithFormat:@"魔力号:%@", _userInfo.erbanNo]; self.idLabel.text = [NSString stringWithFormat:@"ID:%@", _userInfo.erbanNo];
self.greetButton.selected = !_userInfo.hello; self.greetButton.selected = !_userInfo.hello;
UIImage* image = self.experImageView.image; UIImage* image = self.experImageView.image;
if (image) { if (image) {

2
xplan-ios/Main/Mine/View/Cell/Visitor/XPMineVisitorTableViewCell.m
View File

@@ -178,7 +178,7 @@
_item = item; _item = item;
self.nickLabel.text = item.nick; self.nickLabel.text = item.nick;
self.avaterImgView.imageUrl = item.avatar; self.avaterImgView.imageUrl = item.avatar;
self.memberIdLabel.text = [NSString stringWithFormat:@"魔力号：%zd", item.erbanNo]; self.memberIdLabel.text = [NSString stringWithFormat:@"ID：%zd", item.erbanNo];
self.timeLabel.text = item.visitTimeDesc; self.timeLabel.text = item.visitTimeDesc;
self.genderImageView.image = [UIImage imageNamed:item.gender == 1 ? @"common_male" : @"common_female"]; self.genderImageView.image = [UIImage imageNamed:item.gender == 1 ? @"common_male" : @"common_female"];
} }

2
xplan-ios/Main/Mine/View/Guild/Model/ClanInfoModel.h
View File

@@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, copy) NSString *cid; @property (nonatomic, copy) NSString *cid;
/// 族长 uid /// 族长 uid
@property (nonatomic, copy) NSString *elderUid; @property (nonatomic, copy) NSString *elderUid;
/// 族长魔力号 /// 族长ID
@property (nonatomic, copy) NSString *elderErbanNo; @property (nonatomic, copy) NSString *elderErbanNo;
/// 族长 名称 /// 族长 名称
@property (nonatomic, copy) NSString *elderName; @property (nonatomic, copy) NSString *elderName;

2
xplan-ios/Main/Mine/View/Guild/Model/GuildInfoModel.h
View File

@@ -33,7 +33,7 @@ typedef NS_ENUM(NSInteger, GuildRoleType) {
@property (nonatomic, assign) GuildRoleType roleType; @property (nonatomic, assign) GuildRoleType roleType;
/// 厅主的 uid /// 厅主的 uid
@property (nonatomic, copy) NSString *ownerUid; @property (nonatomic, copy) NSString *ownerUid;
/// 厅主的 魔力号 /// 厅主的 ID
@property (nonatomic, copy) NSString *ownerErbanNo; @property (nonatomic, copy) NSString *ownerErbanNo;
/// 模厅名称 /// 模厅名称
@property (nonatomic, copy) NSString *ownerNick; @property (nonatomic, copy) NSString *ownerNick;

2
xplan-ios/Main/Mine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminSetTableViewCell.m
View File

@@ -148,7 +148,7 @@
if (_managerInfo) { if (_managerInfo) {
self.avatarImageView.imageUrl = _managerInfo.avatar; self.avatarImageView.imageUrl = _managerInfo.avatar;
self.nickLabel.text= _managerInfo.nick; self.nickLabel.text= _managerInfo.nick;
self.idLabel.text = [NSString stringWithFormat:@"魔力号:%@", _managerInfo.erbanNo]; self.idLabel.text = [NSString stringWithFormat:@"ID:%@", _managerInfo.erbanNo];
[self.collectionView reloadData]; [self.collectionView reloadData];
} }
} }

2
xplan-ios/Main/Mine/View/Guild/View/Cell/XPMineGuildSearchMemberTableViewCell.m
View File

@@ -102,7 +102,7 @@
self.avatarImageView.imageUrl = _userInfo.avatar; self.avatarImageView.imageUrl = _userInfo.avatar;
self.sexImageView.image = _userInfo.gender == GenderType_Female ? [UIImage imageNamed:@"common_female"] : [UIImage imageNamed:@"common_male"]; self.sexImageView.image = _userInfo.gender == GenderType_Female ? [UIImage imageNamed:@"common_female"] : [UIImage imageNamed:@"common_male"];
self.nickLabel.text = _userInfo.nick; self.nickLabel.text = _userInfo.nick;
self.idLabel.text = [NSString stringWithFormat:@"魔力号：%@", _userInfo.erbanNo]; self.idLabel.text = [NSString stringWithFormat:@"ID：%@", _userInfo.erbanNo];
} }
} }

2
xplan-ios/Main/Mine/View/Guild/View/SubViews/XPGuildHeaderView.m
View File

@@ -204,7 +204,7 @@
elderName = [elderName substringToIndex:8]; elderName = [elderName substringToIndex:8];
} }
self.clanNameLabel.text = elderName; self.clanNameLabel.text = elderName;
self.daeIdLabel.text = [NSString stringWithFormat:@"魔力号：%@", _clanInfo.clan.elderErbanNo]; self.daeIdLabel.text = [NSString stringWithFormat:@"ID：%@", _clanInfo.clan.elderErbanNo];
self.clanLevelImageView.imageUrl = _clanInfo.clan.levelIcon; self.clanLevelImageView.imageUrl = _clanInfo.clan.levelIcon;
if (_clanInfo.clan.elderUid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { if (_clanInfo.clan.elderUid.integerValue == [AccountInfoStorage instance].getUid.integerValue) {
self.menuStackView.hidden = NO; self.menuStackView.hidden = NO;

2
xplan-ios/Main/Mine/View/Guild/View/SubViews/XPGuildSearchNavView.m
View File

@@ -150,7 +150,7 @@
_searchTextField.textColor = [ThemeColor mainTextColor]; _searchTextField.textColor = [ThemeColor mainTextColor];
_searchTextField.backgroundColor = [UIColor clearColor]; _searchTextField.backgroundColor = [UIColor clearColor];
_searchTextField.font = [UIFont systemFontOfSize:13]; _searchTextField.font = [UIFont systemFontOfSize:13];
NSString *placeholder = [NSString stringWithFormat:@"搜索昵称/%@ID", AppName]; NSString *placeholder = [NSString stringWithFormat:@"搜索昵称/ID"];
_searchTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [ThemeColor secondTextColor]}]; _searchTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [ThemeColor secondTextColor]}];
_searchTextField.clearButtonMode = UITextFieldViewModeWhileEditing; _searchTextField.clearButtonMode = UITextFieldViewModeWhileEditing;
_searchTextField.returnKeyType = UIReturnKeySearch; _searchTextField.returnKeyType = UIReturnKeySearch;

4
xplan-ios/Main/Mine/View/Guild/View/XPMineGuildSearchViewController.m
View File

@@ -207,7 +207,7 @@
#pragma mark - XPGuildSearchSuperAdminTableViewCellDelegate #pragma mark - XPGuildSearchSuperAdminTableViewCellDelegate
- (void)xPGuildSearchSuperAdminTableViewCell:(XPGuildSearchSuperAdminTableViewCell *)cell didSelectInfo:(GuildSearchSuperAdminModel *)userInfo { - (void)xPGuildSearchSuperAdminTableViewCell:(XPGuildSearchSuperAdminTableViewCell *)cell didSelectInfo:(GuildSearchSuperAdminModel *)userInfo {
if (userInfo && !userInfo.hasSet) { if (userInfo && !userInfo.hasSet) {
NSString * message = [NSString stringWithFormat:@"确定要添加用户%@(魔力ID:%@)为公会超级管理员吗？", userInfo.nick, userInfo.erbanNo]; NSString * message = [NSString stringWithFormat:@"确定要添加用户%@(ID:%@)为公会超级管理员吗？", userInfo.nick, userInfo.erbanNo];
TTAlertConfig * config =[[TTAlertConfig alloc] init]; TTAlertConfig * config =[[TTAlertConfig alloc] init];
config.message = message; config.message = message;
@@ -253,7 +253,7 @@
switch (_searchType) { switch (_searchType) {
case GuildSearchType_Clan_Add_Super_Admin: case GuildSearchType_Clan_Add_Super_Admin:
self.navView.searchTextField.keyboardType = UIKeyboardTypeNumberPad; self.navView.searchTextField.keyboardType = UIKeyboardTypeNumberPad;
self.navView.placeHolder = @"请输入公会成员魔力号"; self.navView.placeHolder = @"请输入公会成员ID";
break; break;
default: default:

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

@@ -304,7 +304,7 @@
_userInfo = userInfo; _userInfo = userInfo;
if (_userInfo) { if (_userInfo) {
self.nameLabel.text = _userInfo.nick; self.nameLabel.text = _userInfo.nick;
self.idLabel.text = [NSString stringWithFormat:@"魔力号：%ld", (long)_userInfo.erbanNo]; self.idLabel.text = [NSString stringWithFormat:@"ID：%ld", (long)_userInfo.erbanNo];
self.signLabel.text = _userInfo.userDesc.length > 0 ? _userInfo.userDesc : @"我是个默认签名"; self.signLabel.text = _userInfo.userDesc.length > 0 ? _userInfo.userDesc : @"我是个默认签名";
self.fansNumLabel.text =[NSString stringWithFormat:@"%ld粉丝", _userInfo.fansNum]; self.fansNumLabel.text =[NSString stringWithFormat:@"%ld粉丝", _userInfo.fansNum];
self.sexImageView.image = userInfo.gender == GenderType_Female ? [UIImage imageNamed:@"common_female"] : [UIImage imageNamed:@"common_male"]; self.sexImageView.image = userInfo.gender == GenderType_Female ? [UIImage imageNamed:@"common_female"] : [UIImage imageNamed:@"common_male"];

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

@@ -451,7 +451,7 @@
} else { } else {
self.headWearImageView.hidden = YES; self.headWearImageView.hidden = YES;
} }
self.idLabel.text = [NSString stringWithFormat:@"魔力号:%ld", (long)_userInfo.erbanNo]; self.idLabel.text = [NSString stringWithFormat:@"ID:%ld", (long)_userInfo.erbanNo];
self.nameLabel.text = _userInfo.nick.length > 0 ? _userInfo.nick : @""; self.nameLabel.text = _userInfo.nick.length > 0 ? _userInfo.nick : @"";
self.avatarImageView.imageUrl = userInfo.avatar; self.avatarImageView.imageUrl = userInfo.avatar;
if (userInfo.isReview) { if (userInfo.isReview) {

4
xplan-ios/Main/Room/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKTableViewCell.m
View File

@@ -21,7 +21,7 @@
@property (nonatomic, strong) UIButton *selectButton; @property (nonatomic, strong) UIButton *selectButton;
///名字 ///名字
@property (nonatomic, strong) UILabel *nameLabel; @property (nonatomic, strong) UILabel *nameLabel;
///魔力号 ///ID
@property (nonatomic, strong) UILabel *idLabel; @property (nonatomic, strong) UILabel *idLabel;
@end @end
@@ -84,7 +84,7 @@
_roomPKInfo = roomPKInfo; _roomPKInfo = roomPKInfo;
self.avatarImageView.imageUrl = _roomPKInfo.avatar; self.avatarImageView.imageUrl = _roomPKInfo.avatar;
self.nameLabel.text = _roomPKInfo.title; self.nameLabel.text = _roomPKInfo.title;
self.idLabel.text = [NSString stringWithFormat:@"魔力号：%@", _roomPKInfo.erbanNo]; self.idLabel.text = [NSString stringWithFormat:@"ID：%@", _roomPKInfo.erbanNo];
self.selectButton.selected = _roomPKInfo.hadSelected; self.selectButton.selected = _roomPKInfo.hadSelected;
} }

4
xplan-ios/Main/Room/View/AcrossRoomPK/View/XPAcrossRoomPKSelectRoomView.m
View File

@@ -240,7 +240,7 @@
} }
} erbanNo:self.searchTextField.text roomUid:@"" pageNum:@"1" pageSize:@"50"]; } erbanNo:self.searchTextField.text roomUid:@"" pageNum:@"1" pageSize:@"50"];
} else { } else {
[XCHUDTool showErrorWithMessage:@"请输入要搜索的厅魔力号"]; [XCHUDTool showErrorWithMessage:@"请输入要搜索的厅ID"];
} }
} }
@@ -325,7 +325,7 @@
_searchTextField.textColor = [UIColor whiteColor]; _searchTextField.textColor = [UIColor whiteColor];
_searchTextField.backgroundColor = [UIColor clearColor]; _searchTextField.backgroundColor = [UIColor clearColor];
_searchTextField.font = [UIFont systemFontOfSize:13]; _searchTextField.font = [UIFont systemFontOfSize:13];
NSString *placeholder = [NSString stringWithFormat:@"请输入厅的魔力号"]; NSString *placeholder = [NSString stringWithFormat:@"请输入厅的ID"];
_searchTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [UIColor colorWithWhite:1 alpha:0.4]}]; _searchTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [UIColor colorWithWhite:1 alpha:0.4]}];
} }
return _searchTextField; return _searchTextField;

2
xplan-ios/Main/Room/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.m
View File

@@ -278,7 +278,7 @@
self.selectPKButton.hidden= YES; self.selectPKButton.hidden= YES;
self.avatarImageView.imageUrl = pkRoomInfo.avatar; self.avatarImageView.imageUrl = pkRoomInfo.avatar;
self.roomTitleLabel.text = pkRoomInfo.title; self.roomTitleLabel.text = pkRoomInfo.title;
self.idLabel.text = [NSString stringWithFormat:@"魔力号：%@", pkRoomInfo.erbanNo]; self.idLabel.text = [NSString stringWithFormat:@"ID：%@", pkRoomInfo.erbanNo];
self.selectRoomInfo = pkRoomInfo; self.selectRoomInfo = pkRoomInfo;
[self updateDoneButtonState]; [self updateDoneButtonState];
} }

4
xplan-ios/Main/Room/View/AnchorPK/View/Cell/XPAnchorPKTableViewCell.m
View File

@@ -23,7 +23,7 @@
@property (nonatomic, strong) UIButton *selectButton; @property (nonatomic, strong) UIButton *selectButton;
///名字 ///名字
@property (nonatomic, strong) UILabel *nameLabel; @property (nonatomic, strong) UILabel *nameLabel;
///魔力号 ///ID
@property (nonatomic, strong) UILabel *idLabel; @property (nonatomic, strong) UILabel *idLabel;
@end @end
@@ -88,7 +88,7 @@
_roomPKInfo = roomPKInfo; _roomPKInfo = roomPKInfo;
self.avatarImageView.imageUrl = _roomPKInfo.avatar; self.avatarImageView.imageUrl = _roomPKInfo.avatar;
self.nameLabel.text = _roomPKInfo.nick; self.nameLabel.text = _roomPKInfo.nick;
self.idLabel.text = [NSString stringWithFormat:@"魔力号：%@", _roomPKInfo.erbanNo]; self.idLabel.text = [NSString stringWithFormat:@"ID：%@", _roomPKInfo.erbanNo];
self.selectButton.userInteractionEnabled = !roomPKInfo.crossPking; self.selectButton.userInteractionEnabled = !roomPKInfo.crossPking;
if (roomPKInfo.crossPking) { if (roomPKInfo.crossPking) {
[_selectButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x4C4C6A), UIColorFromRGB(0x4C4C6A)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; [_selectButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x4C4C6A), UIColorFromRGB(0x4C4C6A)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal];

4
xplan-ios/Main/Room/View/AnchorPK/View/XPAnchorPKSelectRoomView.m
View File

@@ -241,7 +241,7 @@
} }
} erbanNo:self.searchTextField.text roomUid:@"" pageNum:@"1" pageSize:@"50" pkType:@"2"]; } erbanNo:self.searchTextField.text roomUid:@"" pageNum:@"1" pageSize:@"50" pkType:@"2"];
} else { } else {
[XCHUDTool showErrorWithMessage:@"请输入要搜索的厅魔力号"]; [XCHUDTool showErrorWithMessage:@"请输入要搜索的厅ID"];
} }
} }
@@ -312,7 +312,7 @@
_searchTextField.textColor = [UIColor whiteColor]; _searchTextField.textColor = [UIColor whiteColor];
_searchTextField.backgroundColor = [UIColor clearColor]; _searchTextField.backgroundColor = [UIColor clearColor];
_searchTextField.font = [UIFont systemFontOfSize:13]; _searchTextField.font = [UIFont systemFontOfSize:13];
NSString *placeholder = [NSString stringWithFormat:@"请输入厅的魔力号"]; NSString *placeholder = [NSString stringWithFormat:@"请输入厅的ID"];
_searchTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [UIColor colorWithWhite:1 alpha:0.4]}]; _searchTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [UIColor colorWithWhite:1 alpha:0.4]}];
} }
return _searchTextField; return _searchTextField;

2
xplan-ios/Main/Room/View/AnchorPK/View/XPAnchorPKViewController.m
View File

@@ -268,7 +268,7 @@
self.selectPKButton.hidden= YES; self.selectPKButton.hidden= YES;
self.avatarImageView.imageUrl = pkRoomInfo.avatar; self.avatarImageView.imageUrl = pkRoomInfo.avatar;
self.roomTitleLabel.text = pkRoomInfo.title; self.roomTitleLabel.text = pkRoomInfo.title;
self.idLabel.text = [NSString stringWithFormat:@"魔力号：%@", pkRoomInfo.erbanNo]; self.idLabel.text = [NSString stringWithFormat:@"ID：%@", pkRoomInfo.erbanNo];
self.selectRoomInfo = pkRoomInfo; self.selectRoomInfo = pkRoomInfo;
[self updateDoneButtonState]; [self updateDoneButtonState];
} }

2
xplan-ios/Main/Room/View/UserCard/View/XPUserCardViewController.m
View File

@@ -554,7 +554,7 @@
} else { } else {
self.namePlateView.hidden = YES; self.namePlateView.hidden = YES;
} }
self.idLabel.text = [NSString stringWithFormat:@"魔力号：%ld", userInfo.erbanNo]; self.idLabel.text = [NSString stringWithFormat:@"ID：%ld", userInfo.erbanNo];
NSString * headwearUrl= userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; NSString * headwearUrl= userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic;
self.headWearImageView.hidden = headwearUrl.length <= 0; self.headWearImageView.hidden = headwearUrl.length <= 0;