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-23 15:02:21 +08:00
parent aace697e45
commit 7601d83deb
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@
14C1F15729B874FB000A960F /* XPMineMoreItemTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 14C1F15629B874FB000A960F /* XPMineMoreItemTableViewCell.m */; };
14C1F15A29B876EC000A960F /* XPMineMoreItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 14C1F15929B876EC000A960F /* XPMineMoreItemModel.m */; };
14C1F15D29B88DEE000A960F /* XPMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14C1F15C29B88DEE000A960F /* XPMessageViewController.m */; };
14E9019829CC2C4700B57C22 /* starred_kitchen_bg.svga in Resources */ = {isa = PBXBuildFile; fileRef = 14E9019729CC2C4600B57C22 /* starred_kitchen_bg.svga */; };
14EDBBAA29B5935F001D3E16 /* XPFindNewFriendViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14EDBBA929B5935F001D3E16 /* XPFindNewFriendViewController.m */; };
14EDBBB329B5F7B2001D3E16 /* XPButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 14EDBBB229B5F7B2001D3E16 /* XPButton.m */; };
14EDBBB629B600DC001D3E16 /* XPNewMomentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14EDBBB529B600DC001D3E16 /* XPNewMomentsViewController.m */; };
@@ -426,7 +427,6 @@
E80DE4102775C34E00BE5BCB /* XPFirstRechargeSuccessView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80DE40F2775C34E00BE5BCB /* XPFirstRechargeSuccessView.m */; };
E80E236F299A195F0013FD40 /* XPStarredKitchenGiftView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80E236E299A195F0013FD40 /* XPStarredKitchenGiftView.m */; };
E80E2372299A1C380013FD40 /* XPStarredKitchenModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E80E2371299A1C380013FD40 /* XPStarredKitchenModel.m */; };
E80E2374299A20050013FD40 /* starred_kitchen_bg.svga in Resources */ = {isa = PBXBuildFile; fileRef = E80E2373299A20050013FD40 /* starred_kitchen_bg.svga */; };
E80E900C27E0358900434B90 /* XPRoomTopicAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80E900B27E0358900434B90 /* XPRoomTopicAlertView.m */; };
E80EC80A28ACD84000D133C5 /* QEmotionBoardView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80EC74C28ACD84000D133C5 /* QEmotionBoardView.m */; };
E80EC80B28ACD84000D133C5 /* QInputBarViewConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = E80EC74E28ACD84000D133C5 /* QInputBarViewConfiguration.m */; };
@@ -1348,6 +1348,7 @@
14C1F15929B876EC000A960F /* XPMineMoreItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineMoreItemModel.m; sourceTree = "<group>"; };
14C1F15B29B88DEE000A960F /* XPMessageViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMessageViewController.h; sourceTree = "<group>"; };
14C1F15C29B88DEE000A960F /* XPMessageViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMessageViewController.m; sourceTree = "<group>"; };
14E9019729CC2C4600B57C22 /* starred_kitchen_bg.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = starred_kitchen_bg.svga; sourceTree = "<group>"; };
14EDBBA829B5935F001D3E16 /* XPFindNewFriendViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPFindNewFriendViewController.h; sourceTree = "<group>"; };
14EDBBA929B5935F001D3E16 /* XPFindNewFriendViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPFindNewFriendViewController.m; sourceTree = "<group>"; };
14EDBBB129B5F7B2001D3E16 /* XPButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPButton.h; sourceTree = "<group>"; };
@@ -2146,7 +2147,6 @@
E80E236E299A195F0013FD40 /* XPStarredKitchenGiftView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPStarredKitchenGiftView.m; sourceTree = "<group>"; };
E80E2370299A1C380013FD40 /* XPStarredKitchenModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPStarredKitchenModel.h; sourceTree = "<group>"; };
E80E2371299A1C380013FD40 /* XPStarredKitchenModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPStarredKitchenModel.m; sourceTree = "<group>"; };
E80E2373299A20050013FD40 /* starred_kitchen_bg.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = starred_kitchen_bg.svga; sourceTree = "<group>"; };
E80E900A27E0358900434B90 /* XPRoomTopicAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTopicAlertView.h; sourceTree = "<group>"; };
E80E900B27E0358900434B90 /* XPRoomTopicAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTopicAlertView.m; sourceTree = "<group>"; };
E80EC74C28ACD84000D133C5 /* QEmotionBoardView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QEmotionBoardView.m; sourceTree = "<group>"; };
@@ -7571,9 +7571,9 @@
1497CCE229C1E1FB0015D135 /* sailing_prize_cowry.svga */,
1497CCE329C1E1FB0015D135 /* sailing_prize.svga */,
14A0CF3A29C014B400B2375A /* moment_living.svga */,
14E9019729CC2C4600B57C22 /* starred_kitchen_bg.svga */,
14B65C6A29BF439E00EC02EF /* home_living.svga */,
E887531529BB1B4F0017A41A /* candy_tree.mp4 */,
E80E2373299A20050013FD40 /* starred_kitchen_bg.svga */,
9B8DE0E7289CFE8100FB6EC2 /* compound_gift_banner.svga */,
E852D7372862C615001465ED /* room_lucky_gift_bg.svga */,
145EC95B29C86A0B003D69B1 /* login_logo.svga */,
@@ -9382,7 +9382,6 @@
E80EC85C28ACD84000D133C5 /* emoji_77@2x.png in Resources */,
E8937AC7276C3EDE00B2C7E1 /* svga_member_in_lv40.svga in Resources */,
E80EC85528ACD84000D133C5 /* emoji_118@2x.png in Resources */,
E80E2374299A20050013FD40 /* starred_kitchen_bg.svga in Resources */,
E80EC8B728ACD84100D133C5 /* emoji_119@2x.png in Resources */,
E80EC86228ACD84000D133C5 /* emoji_22@2x.png in Resources */,
E8A1E461276220DA00B294CA /* candyTree.svga in Resources */,
@@ -9494,6 +9493,7 @@
E88863C3278E7BCC004BCFAB /* crossRoomPk_progress.svga in Resources */,
E8A1E462276220DA00B294CA /* candyTree_light.svga in Resources */,
E80EC86428ACD84000D133C5 /* emoji_60@2x.png in Resources */,
14E9019829CC2C4700B57C22 /* starred_kitchen_bg.svga in Resources */,
E80EC89928ACD84000D133C5 /* emoji_21@2x.png in Resources */,
E80EC8BA28ACD84100D133C5 /* emoji.plist in Resources */,
E80EC82328ACD84000D133C5 /* emoji_57@2x.png in Resources */,

BIN
xplan-ios/Assets.xcassets/Room/Kitchen/room_starred_kitchen_large_gift_bg.imageset/room_starred_kitchen_large_gift_bg@2x.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 25 KiB

BIN
xplan-ios/Assets.xcassets/Room/Kitchen/room_starred_kitchen_large_gift_bg.imageset/room_starred_kitchen_large_gift_bg@3x.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 48 KiB

2
xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.m
View File

@@ -1639,7 +1639,7 @@
}
- (void)createStarredKitchenBannerAnimation:(AttachmentModel *)attatchment {
CGFloat kscale = (CGFloat)60 / (CGFloat)375;
CGFloat kscale = (CGFloat)77 / (CGFloat)375;
XPStarredKitchenGiftView *kitchenView = [[XPStarredKitchenGiftView alloc] initWithFrame:CGRectMake(KScreenWidth, kNavigationHeight + 15, KScreenWidth , KScreenWidth * kscale)];
kitchenView.delegate = self;
kitchenView.isMaxLargeGift = attatchment.second == Custom_Message_Sub_Starred_Kitchen_Banner_Dynamic;

22
xplan-ios/Main/Room/View/AnimationView/XPStarredKitchenGiftView.m
View File

@@ -74,9 +74,9 @@
[self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(33);
make.top.mas_equalTo(self.backImageView).offset(19);
make.left.mas_equalTo(self.backImageView).offset(85);
make.right.mas_equalTo(self.backImageView).offset(-53);
make.centerY.mas_equalTo(self.backImageView).offset(0);
make.left.mas_equalTo(self.backImageView).offset(76*kScreenScale);
make.right.mas_equalTo(self.backImageView).offset(-62*kScreenScale);
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -86,7 +86,7 @@
}
- (NSAttributedString *)createAttribute:(NSString * )text color:(UIColor *)color fontSize:(CGFloat)fonSize {
NSDictionary * attribute = @{NSFontAttributeName:[UIFont systemFontOfSize:fonSize], NSForegroundColorAttributeName:color};
NSDictionary * attribute = @{NSFontAttributeName:[UIFont systemFontOfSize:fonSize weight:UIFontWeightMedium], NSForegroundColorAttributeName:color};
NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:text attributes:attribute];
return attr;
}
@@ -97,25 +97,25 @@
XPStarredKitchenModel * giftInfo = [XPStarredKitchenModel modelWithDictionary:starredKitchenDic];
self.kitchenModel = giftInfo;
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
CGFloat fontSize = self.isMaxLargeGift ? 22 : 13;
CGFloat fontSize = self.isMaxLargeGift ? 22 : 12;
[attribute appendAttributedString:[self createAttribute:@"恭喜" color:[UIColor whiteColor] fontSize:fontSize]];
NSString * nick = giftInfo.nick;
if (nick.length > 6) {
nick = [nick substringToIndex:6];
}
[attribute appendAttributedString:[self createAttribute:nick color:[ThemeColor colorWithHexString:@"#FEF23E"] fontSize:fontSize]];
[attribute appendAttributedString:[self createAttribute:nick color:[ThemeColor colorWithHexString:@"#FFF476"] fontSize:fontSize]];
[attribute appendAttributedString:[self createAttribute:@"在深海奇缘抽中 " color:[UIColor whiteColor] fontSize:fontSize]];
[attribute appendAttributedString:[self createAttribute:[NSString stringWithFormat:@"%ld", giftInfo.itemMultiple] color:[ThemeColor colorWithHexString:@"#00EAFF"] fontSize:fontSize]];
[attribute appendAttributedString:[self createAttribute:@"倍奖励,获得" color:[ThemeColor colorWithHexString:@"#FEF23E"] fontSize:fontSize]];
[attribute appendAttributedString:[self createAttribute:[NSString stringWithFormat:@" %ld", giftInfo.diamonds] color:[ThemeColor colorWithHexString:@"#00EAFF"] fontSize:fontSize]];
[attribute appendAttributedString:[self createAttribute:@"钻石" color:[UIColor whiteColor] fontSize:fontSize]];
[attribute appendAttributedString:[self createAttribute:[NSString stringWithFormat:@"%ld", giftInfo.itemMultiple] color:[ThemeColor colorWithHexString:@"#FFF476"] fontSize:fontSize]];
[attribute appendAttributedString:[self createAttribute:@"倍奖励,获得" color:[UIColor whiteColor] fontSize:fontSize]];
[attribute appendAttributedString:[self createAttribute:[NSString stringWithFormat:@" %ld", giftInfo.diamonds] color:[ThemeColor colorWithHexString:@"#FFF476"] fontSize:fontSize]];
[attribute appendAttributedString:[self createAttribute:@"钻石！" color:[UIColor whiteColor] fontSize:fontSize]];
NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
paragraphStyle.lineBreakMode = NSLineBreakByCharWrapping;
paragraphStyle.lineSpacing = 0.0f;//行间距
paragraphStyle.alignment = NSTextAlignmentCenter;
paragraphStyle.baseWritingDirection = NSWritingDirectionLeftToRight;
[attribute addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, attribute.length)];
[self.candyTreeView setAttributedText:attribute forKey:@"noble_text_tx"];
[self.candyTreeView setAttributedText:attribute forKey:@"noble_text_tx_"];
if (self.isMaxLargeGift) {
self.backImageView.hidden = YES;
self.candyTreeView.hidden = NO;

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

Binary file not shown.