修复bug
This commit is contained in:
2
Podfile
2
Podfile
@@ -3,6 +3,8 @@
|
|||||||
source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
|
source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
|
||||||
target 'YuMi' do
|
target 'YuMi' do
|
||||||
use_frameworks!
|
use_frameworks!
|
||||||
|
#pag动画
|
||||||
|
pod 'libpag'
|
||||||
pod 'Bugly'
|
pod 'Bugly'
|
||||||
pod 'Adjust', '~> 4.31.0'
|
pod 'Adjust', '~> 4.31.0'
|
||||||
pod 'Firebase/Analytics'
|
pod 'Firebase/Analytics'
|
||||||
|
@@ -134,6 +134,7 @@
|
|||||||
232C43E72AB0755200D4B2ED /* SudMGP.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 232C43E42AB074AD00D4B2ED /* SudMGP.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
|
232C43E72AB0755200D4B2ED /* SudMGP.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 232C43E42AB074AD00D4B2ED /* SudMGP.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
|
||||||
232C43EA2AB15F4100D4B2ED /* XPRoomTarrowBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 232C43E92AB15F4100D4B2ED /* XPRoomTarrowBannerView.m */; };
|
232C43EA2AB15F4100D4B2ED /* XPRoomTarrowBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 232C43E92AB15F4100D4B2ED /* XPRoomTarrowBannerView.m */; };
|
||||||
232C43EC2AB169EC00D4B2ED /* pi_room_tarrow_banner.svga in Resources */ = {isa = PBXBuildFile; fileRef = 232C43EB2AB169EB00D4B2ED /* pi_room_tarrow_banner.svga */; };
|
232C43EC2AB169EC00D4B2ED /* pi_room_tarrow_banner.svga in Resources */ = {isa = PBXBuildFile; fileRef = 232C43EB2AB169EB00D4B2ED /* pi_room_tarrow_banner.svga */; };
|
||||||
|
232C444B2AB4363200D4B2ED /* pi_room_tarrow_h5_banner.svga in Resources */ = {isa = PBXBuildFile; fileRef = 232C444A2AB4363200D4B2ED /* pi_room_tarrow_h5_banner.svga */; };
|
||||||
2331C0DC2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C0DB2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.m */; };
|
2331C0DC2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C0DB2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.m */; };
|
||||||
2331C1632A5EB71000E1D940 /* XPNobleCenterPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1322A5EB71000E1D940 /* XPNobleCenterPresenter.m */; };
|
2331C1632A5EB71000E1D940 /* XPNobleCenterPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1322A5EB71000E1D940 /* XPNobleCenterPresenter.m */; };
|
||||||
2331C1642A5EB71000E1D940 /* NobleInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1362A5EB71000E1D940 /* NobleInfo.m */; };
|
2331C1642A5EB71000E1D940 /* NobleInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1362A5EB71000E1D940 /* NobleInfo.m */; };
|
||||||
@@ -1647,6 +1648,7 @@
|
|||||||
232C43E82AB15F4100D4B2ED /* XPRoomTarrowBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTarrowBannerView.h; sourceTree = "<group>"; };
|
232C43E82AB15F4100D4B2ED /* XPRoomTarrowBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTarrowBannerView.h; sourceTree = "<group>"; };
|
||||||
232C43E92AB15F4100D4B2ED /* XPRoomTarrowBannerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTarrowBannerView.m; sourceTree = "<group>"; };
|
232C43E92AB15F4100D4B2ED /* XPRoomTarrowBannerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTarrowBannerView.m; sourceTree = "<group>"; };
|
||||||
232C43EB2AB169EB00D4B2ED /* pi_room_tarrow_banner.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_room_tarrow_banner.svga; sourceTree = "<group>"; };
|
232C43EB2AB169EB00D4B2ED /* pi_room_tarrow_banner.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_room_tarrow_banner.svga; sourceTree = "<group>"; };
|
||||||
|
232C444A2AB4363200D4B2ED /* pi_room_tarrow_h5_banner.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_room_tarrow_h5_banner.svga; sourceTree = "<group>"; };
|
||||||
2331C0DA2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIFullScreenBannerAnimation.h; sourceTree = "<group>"; };
|
2331C0DA2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIFullScreenBannerAnimation.h; sourceTree = "<group>"; };
|
||||||
2331C0DB2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIFullScreenBannerAnimation.m; sourceTree = "<group>"; };
|
2331C0DB2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIFullScreenBannerAnimation.m; sourceTree = "<group>"; };
|
||||||
2331C1312A5EB71000E1D940 /* XPNobleCenterPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNobleCenterPresenter.h; sourceTree = "<group>"; };
|
2331C1312A5EB71000E1D940 /* XPNobleCenterPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNobleCenterPresenter.h; sourceTree = "<group>"; };
|
||||||
@@ -8775,6 +8777,7 @@
|
|||||||
E8A1E45C276220B100B294CA /* Resources */ = {
|
E8A1E45C276220B100B294CA /* Resources */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
|
232C444A2AB4363200D4B2ED /* pi_room_tarrow_h5_banner.svga */,
|
||||||
23FF42642AA5AC040055733C /* home_heat.gif */,
|
23FF42642AA5AC040055733C /* home_heat.gif */,
|
||||||
23FF42662AA5CFBB0055733C /* home_sound_wave.gif */,
|
23FF42662AA5CFBB0055733C /* home_sound_wave.gif */,
|
||||||
23E9EB232A84E98300B792F2 /* pi_new_mine_info_online.svga */,
|
23E9EB232A84E98300B792F2 /* pi_new_mine_info_online.svga */,
|
||||||
@@ -10048,6 +10051,7 @@
|
|||||||
232C43EC2AB169EC00D4B2ED /* pi_room_tarrow_banner.svga in Resources */,
|
232C43EC2AB169EC00D4B2ED /* pi_room_tarrow_banner.svga in Resources */,
|
||||||
E80EC8AC28ACD84100D133C5 /* emoji_19@2x.png in Resources */,
|
E80EC8AC28ACD84100D133C5 /* emoji_19@2x.png in Resources */,
|
||||||
E80EC84428ACD84000D133C5 /* emoji_51@2x.png in Resources */,
|
E80EC84428ACD84000D133C5 /* emoji_51@2x.png in Resources */,
|
||||||
|
232C444B2AB4363200D4B2ED /* pi_room_tarrow_h5_banner.svga in Resources */,
|
||||||
E80EC84D28ACD84000D133C5 /* emoji_143@2x.png in Resources */,
|
E80EC84D28ACD84000D133C5 /* emoji_143@2x.png in Resources */,
|
||||||
E80EC81B28ACD84000D133C5 /* emoji_102@2x.png in Resources */,
|
E80EC81B28ACD84000D133C5 /* emoji_102@2x.png in Resources */,
|
||||||
E80EC89028ACD84000D133C5 /* emoji_150@2x.png in Resources */,
|
E80EC89028ACD84000D133C5 /* emoji_150@2x.png in Resources */,
|
||||||
@@ -10171,14 +10175,10 @@
|
|||||||
inputFileListPaths = (
|
inputFileListPaths = (
|
||||||
"${PODS_ROOT}/Target Support Files/Pods-YuMi/Pods-YuMi-resources-${CONFIGURATION}-input-files.xcfilelist",
|
"${PODS_ROOT}/Target Support Files/Pods-YuMi/Pods-YuMi-resources-${CONFIGURATION}-input-files.xcfilelist",
|
||||||
);
|
);
|
||||||
inputPaths = (
|
|
||||||
);
|
|
||||||
name = "[CP] Copy Pods Resources";
|
name = "[CP] Copy Pods Resources";
|
||||||
outputFileListPaths = (
|
outputFileListPaths = (
|
||||||
"${PODS_ROOT}/Target Support Files/Pods-YuMi/Pods-YuMi-resources-${CONFIGURATION}-output-files.xcfilelist",
|
"${PODS_ROOT}/Target Support Files/Pods-YuMi/Pods-YuMi-resources-${CONFIGURATION}-output-files.xcfilelist",
|
||||||
);
|
);
|
||||||
outputPaths = (
|
|
||||||
);
|
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
shellPath = /bin/sh;
|
shellPath = /bin/sh;
|
||||||
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-YuMi/Pods-YuMi-resources.sh\"\n";
|
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-YuMi/Pods-YuMi-resources.sh\"\n";
|
||||||
|
@@ -40,6 +40,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|||||||
@property (nonatomic,copy) NSString *diamonds;
|
@property (nonatomic,copy) NSString *diamonds;
|
||||||
@property (nonatomic,copy) NSString * bannerId;
|
@property (nonatomic,copy) NSString * bannerId;
|
||||||
@property(nonatomic,copy) NSString *drawGoldNum;
|
@property(nonatomic,copy) NSString *drawGoldNum;
|
||||||
|
@property(nonatomic,copy) NSString *content;
|
||||||
@end
|
@end
|
||||||
|
|
||||||
NS_ASSUME_NONNULL_END
|
NS_ASSUME_NONNULL_END
|
||||||
|
@@ -450,7 +450,7 @@
|
|||||||
CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
|
CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
|
||||||
XPRoomTarrowBannerView *tarrowVeiw = [[XPRoomTarrowBannerView alloc]initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth , KScreenWidth * kscale)isH5:YES];
|
XPRoomTarrowBannerView *tarrowVeiw = [[XPRoomTarrowBannerView alloc]initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth , KScreenWidth * kscale)isH5:YES];
|
||||||
tarrowVeiw.isBig = attatchment.second == Custom_Message_Sub_Common_H5_Advanced;
|
tarrowVeiw.isBig = attatchment.second == Custom_Message_Sub_Common_H5_Advanced;
|
||||||
tarrowVeiw.giftInfo = attatchment;
|
tarrowVeiw.giftH5Info = attatchment;
|
||||||
[self.middleLevelView addSubview:tarrowVeiw];
|
[self.middleLevelView addSubview:tarrowVeiw];
|
||||||
|
|
||||||
POPSpringAnimation *springAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewCenter];
|
POPSpringAnimation *springAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewCenter];
|
||||||
|
@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|||||||
@interface XPRoomTarrowBannerView : UIView
|
@interface XPRoomTarrowBannerView : UIView
|
||||||
///礼物信息
|
///礼物信息
|
||||||
@property (nonatomic,strong) PIBaseAnimationViewModel *giftInfo;
|
@property (nonatomic,strong) PIBaseAnimationViewModel *giftInfo;
|
||||||
|
@property(nonatomic,strong) PIBaseAnimationViewModel *giftH5Info;
|
||||||
|
|
||||||
@property(nonatomic,assign) BOOL isBig;
|
@property(nonatomic,assign) BOOL isBig;
|
||||||
-(instancetype)initWithFrame:(CGRect)frame isH5:(BOOL)isH5;
|
-(instancetype)initWithFrame:(CGRect)frame isH5:(BOOL)isH5;
|
||||||
|
@@ -41,6 +41,7 @@
|
|||||||
self.titleView.font = [UIFont systemFontOfSize:12 weight:UIFontWeightRegular];
|
self.titleView.font = [UIFont systemFontOfSize:12 weight:UIFontWeightRegular];
|
||||||
self.titleView.textColor = [UIColor whiteColor];
|
self.titleView.textColor = [UIColor whiteColor];
|
||||||
self.bgImageView.image = kImage(@"room_tarrow_banner_h5_bg");
|
self.bgImageView.image = kImage(@"room_tarrow_banner_h5_bg");
|
||||||
|
self.titleView.fadeLength = 50.0f;
|
||||||
|
|
||||||
}
|
}
|
||||||
-(void)installConstraintsWithH5{
|
-(void)installConstraintsWithH5{
|
||||||
@@ -51,10 +52,11 @@
|
|||||||
make.edges.equalTo(self);
|
make.edges.equalTo(self);
|
||||||
}];
|
}];
|
||||||
[self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
|
[self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||||
make.leading.mas_equalTo(kGetScaleWidth(28.5));
|
make.leading.mas_equalTo(kGetScaleWidth(54.5));
|
||||||
make.trailing.mas_equalTo(-kGetScaleWidth(28.5));
|
make.trailing.mas_equalTo(-kGetScaleWidth(28.5));
|
||||||
make.centerY.equalTo(self);
|
make.centerY.equalTo(self);
|
||||||
}];
|
}];
|
||||||
|
self.titleView.backgroundColor = [UIColor redColor];
|
||||||
}
|
}
|
||||||
-(void)installUI{
|
-(void)installUI{
|
||||||
[self addSubview:self.bgImageView];
|
[self addSubview:self.bgImageView];
|
||||||
@@ -76,6 +78,27 @@
|
|||||||
make.centerY.equalTo(self);
|
make.centerY.equalTo(self);
|
||||||
}];
|
}];
|
||||||
}
|
}
|
||||||
|
- (void)setGiftH5Info:(PIBaseAnimationViewModel *)giftH5Info{
|
||||||
|
_giftH5Info = giftH5Info;
|
||||||
|
NSString *title = _giftH5Info.content;
|
||||||
|
NSMutableAttributedString *titleAtt = [[NSMutableAttributedString alloc]initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12 weight:UIFontWeightRegular],NSForegroundColorAttributeName:[UIColor whiteColor]}];
|
||||||
|
_titleView.attributedText = titleAtt;
|
||||||
|
if(_isBig == YES){
|
||||||
|
self.bgImageView.hidden = YES;
|
||||||
|
[self.parser parseWithNamed:@"pi_room_tarrow_h5_banner" inBundle:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) {
|
||||||
|
self.giftImageView.hidden = NO;
|
||||||
|
self.giftImageView.videoItem = videoItem;
|
||||||
|
self.giftImageView.loops = 1;
|
||||||
|
self.giftImageView.clearsAfterStop = NO;
|
||||||
|
[self.giftImageView startAnimation];
|
||||||
|
} failureBlock:^(NSError * _Nonnull error) {
|
||||||
|
|
||||||
|
}];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
self.giftImageView.hidden = YES;
|
||||||
|
self.bgImageView.hidden = NO;
|
||||||
|
}
|
||||||
-(void)setGiftInfo:(PIBaseAnimationViewModel *)giftInfo{
|
-(void)setGiftInfo:(PIBaseAnimationViewModel *)giftInfo{
|
||||||
_giftInfo = giftInfo;
|
_giftInfo = giftInfo;
|
||||||
if(_giftInfo.nick.length > 5){
|
if(_giftInfo.nick.length > 5){
|
||||||
|
@@ -235,7 +235,7 @@
|
|||||||
CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
|
CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
|
||||||
XPRoomTarrowBannerView *tarrowVeiw = [[XPRoomTarrowBannerView alloc]initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth , KScreenWidth * kscale)isH5:YES];
|
XPRoomTarrowBannerView *tarrowVeiw = [[XPRoomTarrowBannerView alloc]initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth , KScreenWidth * kscale)isH5:YES];
|
||||||
tarrowVeiw.isBig = attatchment.second == Custom_Message_Sub_Common_H5_Advanced;
|
tarrowVeiw.isBig = attatchment.second == Custom_Message_Sub_Common_H5_Advanced;
|
||||||
tarrowVeiw.giftInfo = attatchment;
|
tarrowVeiw.giftH5Info = attatchment;
|
||||||
[kWindow addSubview:tarrowVeiw];
|
[kWindow addSubview:tarrowVeiw];
|
||||||
|
|
||||||
POPSpringAnimation *springAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewCenter];
|
POPSpringAnimation *springAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewCenter];
|
||||||
|
@@ -159,7 +159,19 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
|
|||||||
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showNewUserRecharge) name:kNewUserRechargeKey object:nil];
|
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showNewUserRecharge) name:kNewUserRechargeKey object:nil];
|
||||||
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showAnchorCardKey:) name:kTabShowAnchorCardKey object:nil];
|
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showAnchorCardKey:) name:kTabShowAnchorCardKey object:nil];
|
||||||
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(teenagerStatusChange:) name:kTeenagerStatusChange object:nil];
|
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(teenagerStatusChange:) name:kTeenagerStatusChange object:nil];
|
||||||
|
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
||||||
|
|
||||||
|
dispatch_async(dispatch_get_main_queue(), ^{
|
||||||
|
AttachmentModel *attachment = [[AttachmentModel alloc]init];
|
||||||
|
attachment.first = 100;
|
||||||
|
attachment.second = 1102;
|
||||||
|
attachment.data = @{@"content":@"我潮光明村水果老虎机我潮光明村水果老虎机我潮光明村水果老虎机我潮光明村水果老虎机我潮光明村水果老虎机我潮光明村水果老虎机我潮光明村水果老虎机我潮光明村水果老虎机我潮光明村水果老虎机我潮光明村水果老虎机我潮光明村水果老虎机我潮光明村水果老虎机我潮光明村水果老虎机我潮光明村水果老虎机"};
|
||||||
|
[self.roomAnimation receiveCommonH5Banner:attachment];
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)viewWillAppear:(BOOL)animated {
|
- (void)viewWillAppear:(BOOL)animated {
|
||||||
|
BIN
YuMi/Resources/pi_room_tarrow_h5_banner.svga
Normal file
BIN
YuMi/Resources/pi_room_tarrow_h5_banner.svga
Normal file
Binary file not shown.
Reference in New Issue
Block a user