diff --git a/xplan-ios/Main/Room/View/AnimationView/XPRoomCandyGiftView.m b/xplan-ios/Main/Room/View/AnimationView/XPRoomCandyGiftView.m
index 0d005220..11c29462 100644
--- a/xplan-ios/Main/Room/View/AnimationView/XPRoomCandyGiftView.m
+++ b/xplan-ios/Main/Room/View/AnimationView/XPRoomCandyGiftView.m
@@ -54,12 +54,13 @@
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
- make.edges.mas_equalTo(self.backImageView);
+ make.left.right.mas_equalTo(self).inset(10);
+ make.top.mas_equalTo(self).offset(23);
}];
}
- (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;
}
@@ -71,11 +72,15 @@
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
CGFloat fontSize = self.isMaxLargeGift ? 22 : 12;
[attribute appendAttributedString:[self createAttribute:@"厉害了! " color:[UIColor whiteColor] fontSize:fontSize]];
- [attribute appendAttributedString:[self createAttribute:giftInfo.nick color:[ThemeColor messageNickColor] fontSize:fontSize]];
- [attribute appendAttributedString:[self createAttribute:@"摘下糖果得 " color:[UIColor whiteColor] fontSize:fontSize]];
- [attribute appendAttributedString:[self createAttribute:giftInfo.prizeName color:[ThemeColor appEmphasizeColor] fontSize:fontSize]];
+ NSString * nick = giftInfo.nick;
+ if (nick.length > 6) {
+ nick = [NSString stringWithFormat:@"%@…", [nick substringToIndex:6]];
+ }
+ [attribute appendAttributedString:[self createAttribute:nick color:[ThemeColor colorWithHexString:@"#FFF691"] fontSize:fontSize]];
+ [attribute appendAttributedString:[self createAttribute:@"在魔法帽中获得 " color:[UIColor whiteColor] fontSize:fontSize]];
+ [attribute appendAttributedString:[self createAttribute:giftInfo.prizeName color:[ThemeColor colorWithHexString:@"#FFF691"] fontSize:fontSize]];
if (giftInfo.prizeNum > 1) {
- [attribute appendAttributedString:[self createAttribute:[NSString stringWithFormat:@" X%d", giftInfo.prizeNum] color:[UIColor whiteColor] fontSize:fontSize]];
+ [attribute appendAttributedString:[self createAttribute:[NSString stringWithFormat:@" X%d", giftInfo.prizeNum] color:[ThemeColor colorWithHexString:@"#FFF691"] fontSize:fontSize]];
}
if (self.isMaxLargeGift) {
@@ -87,7 +92,7 @@
self.candyTreeView.loops = 1;
self.candyTreeView.clearsAfterStop = NO;
self.candyTreeView.videoItem = videoItem;
- [self.candyTreeView setAttributedText:attribute forKey:@"tgs_copywriting"];
+ [self.candyTreeView setAttributedText:attribute forKey:@"msm_copywriting"];
[self.candyTreeView startAnimation];
} failureBlock:^(NSError * _Nonnull error) {
diff --git a/xplan-ios/xplan-ios.entitlements b/xplan-ios/xplan-ios.entitlements
index 80b5221d..b9c97654 100644
--- a/xplan-ios/xplan-ios.entitlements
+++ b/xplan-ios/xplan-ios.entitlements
@@ -8,5 +8,9 @@
Default
+ com.apple.developer.associated-domains
+
+ applinks:f02efc69cbad775287063e8ee37733a5.share2dlink.com
+
diff --git a/xplan-ios/xplan-iosRelease.entitlements b/xplan-ios/xplan-iosRelease.entitlements
index 80b5221d..b9c97654 100644
--- a/xplan-ios/xplan-iosRelease.entitlements
+++ b/xplan-ios/xplan-iosRelease.entitlements
@@ -8,5 +8,9 @@
Default
+ com.apple.developer.associated-domains
+
+ applinks:f02efc69cbad775287063e8ee37733a5.share2dlink.com
+