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

个人详情星座

Browse Source
This commit is contained in:
chenshuanglin
2023-03-15 19:27:43 +08:00
parent 33d303fb51
commit 7f236c3b7d
4 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,8 @@
14973CA729C16816008E93E0 /* XPHomeGiftRecordModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 14973CA629C16816008E93E0 /* XPHomeGiftRecordModel.m */; };
14973CAA29C1B41F008E93E0 /* XPRoomTopRankView.m in Sources */ = {isa = PBXBuildFile; fileRef = 14973CA929C1B41F008E93E0 /* XPRoomTopRankView.m */; };
14973CAE29C1BD9E008E93E0 /* XPRoomRankListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 14973CAD29C1BD9E008E93E0 /* XPRoomRankListModel.m */; };
1497CCE429C1E1FB0015D135 /* sailing_prize_cowry.svga in Resources */ = {isa = PBXBuildFile; fileRef = 1497CCE229C1E1FB0015D135 /* sailing_prize_cowry.svga */; };
1497CCE529C1E1FB0015D135 /* sailing_prize.svga in Resources */ = {isa = PBXBuildFile; fileRef = 1497CCE329C1E1FB0015D135 /* sailing_prize.svga */; };
14A0CF3B29C014B400B2375A /* moment_living.svga in Resources */ = {isa = PBXBuildFile; fileRef = 14A0CF3A29C014B400B2375A /* moment_living.svga */; };
14A0CF3E29C01E8500B2375A /* XPMineNewRechargeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14A0CF3D29C01E8500B2375A /* XPMineNewRechargeViewController.m */; };
14A0CF4129C01F0400B2375A /* XPMineRechargeCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 14A0CF4029C01F0400B2375A /* XPMineRechargeCollectionViewCell.m */; };
@@ -946,8 +948,6 @@
E896EFB22771C93B00AD2CC1 /* XPMineFriendNumberView.m in Sources */ = {isa = PBXBuildFile; fileRef = E896EFB12771C93B00AD2CC1 /* XPMineFriendNumberView.m */; };
E897ABFC28AF2E71003B3587 /* XPSailingGiftView.m in Sources */ = {isa = PBXBuildFile; fileRef = E897ABFB28AF2E71003B3587 /* XPSailingGiftView.m */; };
E897ABFF28AF39B4003B3587 /* XPSailingAnimationView.m in Sources */ = {isa = PBXBuildFile; fileRef = E897ABFE28AF39B4003B3587 /* XPSailingAnimationView.m */; };
E897AC0128AF6B90003B3587 /* sailing_prize.svga in Resources */ = {isa = PBXBuildFile; fileRef = E897AC0028AF6B90003B3587 /* sailing_prize.svga */; };
E897AC0328AF9DDE003B3587 /* sailing_prize_cowry.svga in Resources */ = {isa = PBXBuildFile; fileRef = E897AC0228AF9DDE003B3587 /* sailing_prize_cowry.svga */; };
E8998D7A2859784200C68558 /* XPSVGAPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = E8998D792859784200C68558 /* XPSVGAPlayer.m */; };
E8998D8028597B0300C68558 /* XPRoomLuckyBigPrizeView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8998D7F28597B0300C68558 /* XPRoomLuckyBigPrizeView.m */; };
E8998D82285982EE00C68558 /* lucky_gift_streamer.svga in Resources */ = {isa = PBXBuildFile; fileRef = E8998D81285982EE00C68558 /* lucky_gift_streamer.svga */; };
@@ -1302,6 +1302,8 @@
14973CA929C1B41F008E93E0 /* XPRoomTopRankView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTopRankView.m; sourceTree = "<group>"; };
14973CAC29C1BD9E008E93E0 /* XPRoomRankListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomRankListModel.h; sourceTree = "<group>"; };
14973CAD29C1BD9E008E93E0 /* XPRoomRankListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomRankListModel.m; sourceTree = "<group>"; };
1497CCE229C1E1FB0015D135 /* sailing_prize_cowry.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = sailing_prize_cowry.svga; sourceTree = "<group>"; };
1497CCE329C1E1FB0015D135 /* sailing_prize.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = sailing_prize.svga; sourceTree = "<group>"; };
14A0CF3A29C014B400B2375A /* moment_living.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = moment_living.svga; sourceTree = "<group>"; };
14A0CF3C29C01E8500B2375A /* XPMineNewRechargeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineNewRechargeViewController.h; sourceTree = "<group>"; };
14A0CF3D29C01E8500B2375A /* XPMineNewRechargeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineNewRechargeViewController.m; sourceTree = "<group>"; };
@@ -3020,8 +3022,6 @@
E897ABFB28AF2E71003B3587 /* XPSailingGiftView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSailingGiftView.m; sourceTree = "<group>"; };
E897ABFD28AF39B4003B3587 /* XPSailingAnimationView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSailingAnimationView.h; sourceTree = "<group>"; };
E897ABFE28AF39B4003B3587 /* XPSailingAnimationView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSailingAnimationView.m; sourceTree = "<group>"; };
E897AC0028AF6B90003B3587 /* sailing_prize.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = sailing_prize.svga; sourceTree = "<group>"; };
E897AC0228AF9DDE003B3587 /* sailing_prize_cowry.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = sailing_prize_cowry.svga; sourceTree = "<group>"; };
E8998D782859784200C68558 /* XPSVGAPlayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSVGAPlayer.h; sourceTree = "<group>"; };
E8998D792859784200C68558 /* XPSVGAPlayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSVGAPlayer.m; sourceTree = "<group>"; };
E8998D7E28597B0300C68558 /* XPRoomLuckyBigPrizeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomLuckyBigPrizeView.h; sourceTree = "<group>"; };
@@ -7526,12 +7526,12 @@
E8A1E45C276220B100B294CA /* Sources */ = {
isa = PBXGroup;
children = (
1497CCE229C1E1FB0015D135 /* sailing_prize_cowry.svga */,
1497CCE329C1E1FB0015D135 /* sailing_prize.svga */,
14A0CF3A29C014B400B2375A /* moment_living.svga */,
14B65C6A29BF439E00EC02EF /* home_living.svga */,
E887531529BB1B4F0017A41A /* candy_tree.mp4 */,
E839806729027D4A0084BFC8 /* room_wish_gift_sendCelebrate.svga */,
E897AC0228AF9DDE003B3587 /* sailing_prize_cowry.svga */,
E897AC0028AF6B90003B3587 /* sailing_prize.svga */,
9B8DE0E7289CFE8100FB6EC2 /* compound_gift_banner.svga */,
E852D7372862C615001465ED /* room_lucky_gift_bg.svga */,
E8998D81285982EE00C68558 /* lucky_gift_streamer.svga */,
@@ -9308,9 +9308,7 @@
buildActionMask = 2147483647;
files = (
9B8DE0E8289CFE8100FB6EC2 /* compound_gift_banner.svga in Resources */,
E897AC0128AF6B90003B3587 /* sailing_prize.svga in Resources */,
E8E859E128264D7B00EE4857 /* images in Resources */,
E897AC0328AF9DDE003B3587 /* sailing_prize_cowry.svga in Resources */,
E80EC88928ACD84000D133C5 /* emoj_s_normal@2x.png in Resources */,
E80EC84628ACD84000D133C5 /* emoji_98@2x.png in Resources */,
E80EC84728ACD84000D133C5 /* emoji_104@2x.png in Resources */,
@@ -9409,6 +9407,7 @@
E80EC89F28ACD84000D133C5 /* emoji_66@2x.png in Resources */,
E80EC87128ACD84000D133C5 /* emoji_160@2x.png in Resources */,
E80EC86D28ACD84000D133C5 /* emoji_35@2x.png in Resources */,
1497CCE529C1E1FB0015D135 /* sailing_prize.svga in Resources */,
E80EC86528ACD84000D133C5 /* emoji_03@2x.png in Resources */,
E80EC85B28ACD84000D133C5 /* emoji_69@2x.png in Resources */,
E80EC8A128ACD84100D133C5 /* emoji_74@2x.png in Resources */,
@@ -9465,6 +9464,7 @@
E80EC8AE28ACD84100D133C5 /* emoji_131@2x.png in Resources */,
E80EC86128ACD84000D133C5 /* emoji_53@2x.png in Resources */,
E80EC89428ACD84000D133C5 /* emoji_105@2x.png in Resources */,
1497CCE429C1E1FB0015D135 /* sailing_prize_cowry.svga in Resources */,
E80EC82A28ACD84000D133C5 /* emoji_36@2x.png in Resources */,
189DD53926DE255600AB55B1 /* Assets.xcassets in Resources */,
E80EC8A028ACD84100D133C5 /* emoji_17@2x.png in Resources */,

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

@@ -50,6 +50,8 @@
@property (nonatomic,strong) UILabel *nameLabel;
///sex
@property (nonatomic,strong) UIImageView *sexImageView;
///星座
@property (nonatomic,strong) UIButton *constellationBtn;
///正在直播中
@property (nonatomic,strong) UIView *onlineView;
///音符
@@ -127,6 +129,7 @@
[self.nickStackView addArrangedSubview:self.nobleImageView];
[self.nickStackView addArrangedSubview:self.nameLabel];
[self.nickStackView addArrangedSubview:self.sexImageView];
[self.nickStackView addArrangedSubview:self.constellationBtn];
[self.idStackView addArrangedSubview:self.beautifulImageViw];
[self.idStackView addArrangedSubview:self.idLabel];
@@ -214,6 +217,10 @@
make.size.mas_equalTo(CGSizeMake(15, 15));
}];
[self.constellationBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(40, 14));
}];
[self.onlineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(20, 20));
make.right.mas_equalTo(self.avatarImageView.mas_right).offset(-2);
@@ -346,6 +353,8 @@
if (_userInfo) {
self.avatarImageView.imageUrl = _userInfo.avatar;
self.nameLabel.text = _userInfo.nick;
[self.constellationBtn setTitle:@"巨蟹座" forState:UIControlStateNormal];
self.constellationBtn.hidden = NO;
self.idLabel.text = [NSString stringWithFormat:@"ID：%ld", (long)_userInfo.erbanNo];
self.copysIdImageView.hidden = NO;
self.signLabel.text = _userInfo.userDesc.length > 0 ? _userInfo.userDesc : @"我是个默认签名";
@@ -480,7 +489,7 @@
_nickStackView.axis = UILayoutConstraintAxisHorizontal;
_nickStackView.distribution = UIStackViewDistributionFill;
_nickStackView.alignment = UIStackViewAlignmentCenter;
_nickStackView.spacing = 10;
_nickStackView.spacing = 6;
}
return _nickStackView;
}
@@ -768,4 +777,18 @@
return _clanBtn;
}
- (UIButton *)constellationBtn {
if (!_constellationBtn) {
_constellationBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[_constellationBtn setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
_constellationBtn.titleLabel.font = [UIFont systemFontOfSize:9 weight:UIFontWeightRegular];
[_constellationBtn setBackgroundImage:[UIImage gradientColorImageFromColors:@[[ThemeColor colorWithHexString:@"#FFA34E"], [ThemeColor colorWithHexString:@"#FFD390"]] gradientType:GradientTypeUpleftToLowright imgSize:CGSizeMake(40, 14)] forState:UIControlStateNormal];
_constellationBtn.layer.cornerRadius = 7;
_constellationBtn.clipsToBounds = YES;
_constellationBtn.userInteractionEnabled = NO;
_constellationBtn.hidden = YES;
}
return _constellationBtn;
}
@end

BIN
xplan-ios/Sources/sailing_prize.svga
View File

Binary file not shown.

BIN
xplan-ios/Sources/sailing_prize_cowry.svga
View File

Binary file not shown.