diff --git a/xplan-ios/Main/Login/View/LoginPasswordViewController.m b/xplan-ios/Main/Login/View/LoginPasswordViewController.m index b402ea2a..dc622659 100644 --- a/xplan-ios/Main/Login/View/LoginPasswordViewController.m +++ b/xplan-ios/Main/Login/View/LoginPasswordViewController.m @@ -9,6 +9,7 @@ ///第三方 #import #import +#import ///Tool #import "UIImage+Utils.h" #import "ThemeColor.h" @@ -35,7 +36,7 @@ @property (nonatomic,strong) UIButton *nextButton; ///返回按钮 @property (nonatomic,strong) UIButton *backButton; -@property (nonatomic,strong) UIImageView *logoImageView; +@property (nonatomic,strong) SVGAPlayer *logoImageView; @end @implementation LoginPasswordViewController @@ -53,6 +54,7 @@ [self initSubViews]; [self initSubViewConstraints]; [self initEvents]; + [self loginAnimation]; } - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { @@ -120,6 +122,18 @@ }] takeUntil:self.rac_willDeallocSignal]; } +- (void)loginAnimation { + SVGAParser *parser = [[SVGAParser alloc] init]; + @weakify(self); + [parser parseWithNamed:@"login_logo" inBundle:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { + @strongify(self); + if (videoItem != nil) { + self.logoImageView.videoItem = videoItem; + [self.logoImageView startAnimation]; + } + } failureBlock:nil]; +} + - (void)disMissVC { UIViewController *vc = self.presentingViewController; while (vc.presentingViewController) { @@ -245,11 +259,11 @@ return _backButton; } -- (UIImageView *)logoImageView { +- (SVGAPlayer *)logoImageView { if (!_logoImageView) { - _logoImageView = [[UIImageView alloc] init]; - _logoImageView.userInteractionEnabled = YES; - _logoImageView.image = [UIImage imageNamed:@"login_top_bg"]; + _logoImageView = [[SVGAPlayer alloc] init]; + _logoImageView.loops = 1; + _logoImageView.clearsAfterStop = NO; } return _logoImageView; } diff --git a/xplan-ios/Main/Login/View/LoginPhoneViewController.m b/xplan-ios/Main/Login/View/LoginPhoneViewController.m index 19f79c34..d3113335 100644 --- a/xplan-ios/Main/Login/View/LoginPhoneViewController.m +++ b/xplan-ios/Main/Login/View/LoginPhoneViewController.m @@ -9,6 +9,7 @@ ///第三方 #import #import +#import ///Tool #import "UIImage+Utils.h" #import "ThemeColor.h" @@ -30,7 +31,7 @@ @property (nonatomic,copy) NSString *phone; ///返回按钮 @property (nonatomic,strong) UIButton *backButton; -@property (nonatomic,strong) UIImageView *logoImageView; +@property (nonatomic,strong) SVGAPlayer *logoImageView; @end @implementation LoginPhoneViewController @@ -44,6 +45,7 @@ [self initSubViews]; [self initSubViewConstraints]; [self initEevents]; + [self loginAnimation]; } #pragma mark - Private Method @@ -95,6 +97,18 @@ }]; } +- (void)loginAnimation { + SVGAParser *parser = [[SVGAParser alloc] init]; + @weakify(self); + [parser parseWithNamed:@"login_logo" inBundle:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { + @strongify(self); + if (videoItem != nil) { + self.logoImageView.videoItem = videoItem; + [self.logoImageView startAnimation]; + } + } failureBlock:nil]; +} + #pragma mark - Event Response - (void)nextButtonAction:(UIButton *)sender { LoginVerifCodeViewController * codeVC = [[LoginVerifCodeViewController alloc] init]; @@ -164,11 +178,11 @@ return _backButton; } -- (UIImageView *)logoImageView { +- (SVGAPlayer *)logoImageView { if (!_logoImageView) { - _logoImageView = [[UIImageView alloc] init]; - _logoImageView.userInteractionEnabled = YES; - _logoImageView.image = [UIImage imageNamed:@"login_top_bg"]; + _logoImageView = [[SVGAPlayer alloc] init]; + _logoImageView.loops = 1; + _logoImageView.clearsAfterStop = NO; } return _logoImageView; } diff --git a/xplan-ios/Main/Login/View/LoginVerifCodeViewController.m b/xplan-ios/Main/Login/View/LoginVerifCodeViewController.m index 2cf2039a..c88d96cd 100644 --- a/xplan-ios/Main/Login/View/LoginVerifCodeViewController.m +++ b/xplan-ios/Main/Login/View/LoginVerifCodeViewController.m @@ -9,6 +9,7 @@ ///第三方 #import #import +#import ///Tool #import "ThemeColor.h" #import "XPMacro.h" @@ -22,7 +23,7 @@ @interface LoginVerifCodeViewController () ///背景图 -@property (nonatomic,strong) UIImageView *backImageView; +@property (nonatomic,strong) SVGAPlayer *backImageView; ///标题 @property (nonatomic,strong) UILabel *titleLabel; ///验证码 @@ -120,6 +121,18 @@ } +- (void)loginAnimation { + SVGAParser *parser = [[SVGAParser alloc] init]; + @weakify(self); + [parser parseWithNamed:@"login_logo" inBundle:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { + @strongify(self); + if (videoItem != nil) { + self.backImageView.videoItem = videoItem; + [self.backImageView startAnimation]; + } + } failureBlock:nil]; +} + - (void)httpRequestPhoneSmsCode { [self.presenter phoneSmsCode:self.phone type:GetSmsType_Regist]; } @@ -227,12 +240,11 @@ } } #pragma mark - Getters And Setters -- (UIImageView *)backImageView { +- (SVGAPlayer *)backImageView { if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.image = [UIImage imageNamed:@"login_top_bg"]; - _backImageView.backgroundColor = [UIColor greenColor]; + _backImageView = [[SVGAPlayer alloc] init]; + _backImageView.loops = 1; + _backImageView.clearsAfterStop = NO; } return _backImageView; } diff --git a/xplan-ios/Main/Login/View/LoginViewController.m b/xplan-ios/Main/Login/View/LoginViewController.m index 5378ffa6..8d9d3a31 100644 --- a/xplan-ios/Main/Login/View/LoginViewController.m +++ b/xplan-ios/Main/Login/View/LoginViewController.m @@ -176,7 +176,9 @@ typedef NS_ENUM(NSUInteger, XYLoginType) { - (void)loginAnimation { SVGAParser *parser = [[SVGAParser alloc] init]; + @weakify(self); [parser parseWithNamed:@"login_logo" inBundle:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { + @strongify(self); if (videoItem != nil) { self.logoImageView.videoItem = videoItem; [self.logoImageView startAnimation]; @@ -567,6 +569,8 @@ typedef NS_ENUM(NSUInteger, XYLoginType) { - (SVGAPlayer *)logoImageView { if (!_logoImageView) { _logoImageView = [[SVGAPlayer alloc] init]; + _logoImageView.loops = 1; + _logoImageView.clearsAfterStop = NO; } return _logoImageView; }