diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 000000000..b6d8c9980 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 changsanjiang + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/SJVideoPlayer.podspec b/SJVideoPlayer.podspec new file mode 100644 index 000000000..1368b80df --- /dev/null +++ b/SJVideoPlayer.podspec @@ -0,0 +1,17 @@ + +Pod::Spec.new do |s| +s.name = 'SJVideoPlayer' +s.version = '0.0.1' +s.summary = 'video player.' +s.description = 'https://github.com/changsanjiang/SJVideoPlayer/blob/master/README.md' +s.homepage = 'https://github.com/changsanjiang/SJVideoPlayer' +s.license = { :type => 'MIT', :file => 'LICENSE.md' } +s.author = { 'SanJiang' => 'changsanjiang@gmail.com' } +s.platform = :ios, '8.0' +s.source = { :git => 'https://github.com/changsanjiang/SJVideoPlayer.git', :tag => "v#{s.version}" } +s.source_files = 'SJVideoPlayer/**/*.{h,m}' +s.resource = 'SJVideoPlayer/Resource/SJVideoPlayer.bundle' +s.framework = 'UIKit' +s.requires_arc = true +s.dependency 'Masonry' +end diff --git a/SJVideoPlayer/Category/NSTimer+SJExtention.h b/SJVideoPlayer/Category/NSTimer+SJExtension.h similarity index 71% rename from SJVideoPlayer/Category/NSTimer+SJExtention.h rename to SJVideoPlayer/Category/NSTimer+SJExtension.h index bfc333580..9fb7e33e0 100644 --- a/SJVideoPlayer/Category/NSTimer+SJExtention.h +++ b/SJVideoPlayer/Category/NSTimer+SJExtension.h @@ -1,14 +1,14 @@ // -// NSTimer+SJExtention.h +// NSTimer+SJExtension.h // SJVideoPlayerProject // -// Created by BlueDancer on 2017/8/23. +// Created by BlueDancer on 2017/9/6. // Copyright © 2017年 SanJiang. All rights reserved. // #import -@interface NSTimer (SJExtention) +@interface NSTimer (SJExtension) + (instancetype)sj_scheduledTimerWithTimeInterval:(NSTimeInterval)ti exeBlock:(void(^)())block repeats:(BOOL)yesOrNo; diff --git a/SJVideoPlayer/Category/NSTimer+SJExtention.m b/SJVideoPlayer/Category/NSTimer+SJExtension.m similarity index 79% rename from SJVideoPlayer/Category/NSTimer+SJExtention.m rename to SJVideoPlayer/Category/NSTimer+SJExtension.m index 426aa5983..f7fbe3537 100644 --- a/SJVideoPlayer/Category/NSTimer+SJExtention.m +++ b/SJVideoPlayer/Category/NSTimer+SJExtension.m @@ -1,14 +1,14 @@ // -// NSTimer+SJExtention.m +// NSTimer+SJExtension.m // SJVideoPlayerProject // -// Created by BlueDancer on 2017/8/23. +// Created by BlueDancer on 2017/9/6. // Copyright © 2017年 SanJiang. All rights reserved. // -#import "NSTimer+SJExtention.h" +#import "NSTimer+SJExtension.h" -@implementation NSTimer (SJExtention) +@implementation NSTimer (SJExtension) + (instancetype)sj_scheduledTimerWithTimeInterval:(NSTimeInterval)ti exeBlock:(void(^)())block repeats:(BOOL)yesOrNo { NSAssert(block, @"block 不可为空"); diff --git a/SJVideoPlayer/Category/UIView+Extension.h b/SJVideoPlayer/Category/UIView+SJExtension.h similarity index 93% rename from SJVideoPlayer/Category/UIView+Extension.h rename to SJVideoPlayer/Category/UIView+SJExtension.h index 6b5688a5c..4d4dd272f 100644 --- a/SJVideoPlayer/Category/UIView+Extension.h +++ b/SJVideoPlayer/Category/UIView+SJExtension.h @@ -1,14 +1,14 @@ // -// UIView+Extension.h -// CSJQQMusic +// UIView+SJExtension.h +// SJVideoPlayerProject // -// Created by ya on 12/21/16. -// Copyright © 2016 ya. All rights reserved. +// Created by BlueDancer on 2017/9/6. +// Copyright © 2017年 SanJiang. All rights reserved. // #import -@interface UIView (Extension) +@interface UIView (SJExtension) @property (nonatomic, assign) CGFloat csj_x; @property (nonatomic, assign) CGFloat csj_y; @@ -23,13 +23,13 @@ @property (nonatomic, strong, readonly) UIImage *csj_currentSnapshot; @property (nonatomic, strong, readonly) UIViewController *csj_viewController; - // MARK: - 设置中心点 +// MARK: - 设置中心点 - (void)csj_centerWithView:(UIView *)view; - // MARK: - ⚠️ 视图底部 用OC 画虚线, 需要把代码拷贝到 drawRect中. +// MARK: - ⚠️ 视图底部 用OC 画虚线, 需要把代码拷贝到 drawRect中. - (void)csj_lyXuXian; - // MARK: - 切圆 +// MARK: - 切圆 - (void)csj_cornerRadius; /** 设置圆角 */ @@ -65,7 +65,7 @@ - (void)scaleAnimation; - (void)praiseAnimationWithFatherView:(UIView *)fatherView; - + - (void)praiseAnimationWithFatherView:(UIView *)fatherView complete:(void(^)())block; #pragma mark - 创建视图 diff --git a/SJVideoPlayer/Category/UIView+Extension.m b/SJVideoPlayer/Category/UIView+SJExtension.m similarity index 97% rename from SJVideoPlayer/Category/UIView+Extension.m rename to SJVideoPlayer/Category/UIView+SJExtension.m index 8317720d6..e61e6c0d3 100644 --- a/SJVideoPlayer/Category/UIView+Extension.m +++ b/SJVideoPlayer/Category/UIView+SJExtension.m @@ -1,12 +1,12 @@ // -// UIView+Extension.m -// CSJQQMusic +// UIView+SJExtension.m +// SJVideoPlayerProject // -// Created by ya on 12/21/16. -// Copyright © 2016 ya. All rights reserved. +// Created by BlueDancer on 2017/9/6. +// Copyright © 2017年 SanJiang. All rights reserved. // -#import "UIView+Extension.h" +#import "UIView+SJExtension.h" @interface _SJRoundImageView : UIImageView @@ -43,11 +43,11 @@ - (void)layoutSubviews { @end -@implementation UIView (Extension) +@implementation UIView (SJExtension) - (UIViewController *)csj_viewController { - + if ([self isKindOfClass:[UIView class]]) { UIView *view = (UIView *)self; UIResponder *responder = view.nextResponder; @@ -59,11 +59,11 @@ - (UIViewController *)csj_viewController { } return (UIViewController *)responder; } - + return nil; } - /// 截当前视图, 返回Image. +/// 截当前视图, 返回Image. - (UIImage *)csj_currentSnapshot { UIGraphicsBeginImageContextWithOptions(self.bounds.size, YES, 0); [self.layer renderInContext:UIGraphicsGetCurrentContext()]; @@ -72,9 +72,9 @@ - (UIImage *)csj_currentSnapshot { return result; } - /// 视图底部 用OC 画虚线. ⚠️ 需要把代码拷贝到 drawRect中. +/// 视图底部 用OC 画虚线. ⚠️ 需要把代码拷贝到 drawRect中. - (void)csj_lyXuXian { - + CGRect rect = self.bounds; CGFloat width = rect.size.width; CGFloat height = rect.size.height; @@ -82,20 +82,20 @@ - (void)csj_lyXuXian { CGFloat length = width - gapSpace * 2; NSInteger count = length * 0.5; CGFloat startX = gapSpace; - + UIBezierPath *path = [UIBezierPath bezierPath]; for (int i = 0; i < count * 0.5; i ++) { [path moveToPoint:CGPointMake(startX + i * 2.0, height)]; - + [path addLineToPoint:CGPointMake(startX + (i + 1) * 2.0, height)]; startX += 2.0; [path setLineWidth:6.0 / [UIScreen mainScreen].scale]; - + /// 颜色 [UIColor.redColor set]; - + /// 绘制 [path stroke]; } @@ -149,7 +149,7 @@ - (void)setCsj_size:(CGSize)csj_size { CGRect frame = self.frame; frame.size = csj_size; self.frame = frame; - + } - (CGSize)csj_size { @@ -281,7 +281,7 @@ - (void)fadeAnimation { - (void)animationWithType:(NSString *)type key:(NSString *)key { CATransition *anima = [CATransition animation]; - anima.type = type; + anima.type = type; anima.subtype = kCATransitionFromRight; anima.duration = 1.0f; [self.layer addAnimation:anima forKey:key]; @@ -296,7 +296,7 @@ - (void)scaleAnimation { anima.repeatCount = 1; [self.layer addAnimation:anima forKey:@"scaleAnimation"]; } - + - (void)praiseAnimationWithFatherView:(UIView *)fatherView complete:(void(^)())block { UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 50, 50)]; NSInteger random = arc4random() % 8; @@ -381,7 +381,7 @@ - (void)praiseAnimationWithFatherView:(UIView *)fatherView complete:(void(^)())b [imageView removeFromSuperview]; if ( block ) block(); }]; - + } - (void)praiseAnimationWithFatherView:(UIView *)fatherView { @@ -478,12 +478,12 @@ + (UICollectionView *)collectionViewWithItemSize:(CGSize)itemSize backgroundColo flowLayout.scrollDirection = direction; flowLayout.headerReferenceSize = headerSize; flowLayout.footerReferenceSize = footerSize; - + UICollectionView *collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:flowLayout]; collectionView.backgroundColor = backgroundColor; collectionView.showsHorizontalScrollIndicator = YES; collectionView.showsVerticalScrollIndicator = YES; - + return collectionView; } @@ -509,7 +509,7 @@ + (UIButton *)buttonWithImageName:(NSString *)imageName title:(NSString *)title [btn addTarget:target action:sel forControlEvents:UIControlEventTouchUpInside]; btn.titleLabel.font = [UIFont systemFontOfSize:14]; return btn; - + } + (UIButton *)buttonWithTitle:(NSString *)title backgroundColor:(UIColor *)backgroundColor tag:(NSUInteger)tag target:(id)target sel:(SEL)sel fontSize:(CGFloat)fontSize { diff --git a/SJVideoPlayer/Control/SJVideoPlayerControl.m b/SJVideoPlayer/Control/SJVideoPlayerControl.m index f709b8b88..8025542d2 100644 --- a/SJVideoPlayer/Control/SJVideoPlayerControl.m +++ b/SJVideoPlayer/Control/SJVideoPlayerControl.m @@ -15,7 +15,7 @@ #import "SJVideoPlayerStringConstant.h" #import "SJVideoPlayerControlView.h" #import "SJVideoPlayerTipsView.h" -#import "NSTimer+SJExtention.h" +#import "NSTimer+SJExtension.h" #import "SJVideoPlayer.h" #import "SJVideoPlayer.h" diff --git a/SJVideoPlayer/Control/SJVideoPlayerControlView.m b/SJVideoPlayer/Control/SJVideoPlayerControlView.m index eb706bc1c..759fedd7d 100644 --- a/SJVideoPlayer/Control/SJVideoPlayerControlView.m +++ b/SJVideoPlayer/Control/SJVideoPlayerControlView.m @@ -12,7 +12,7 @@ #import -#import "UIView+Extension.h" +#import "UIView+SJExtension.h" #import @@ -20,7 +20,7 @@ #import -#import "NSTimer+SJExtention.h" +#import "NSTimer+SJExtension.h" #import "SJVideoPlayerStringConstant.h" diff --git a/SJVideoPlayer/Control/SJVideoPlayerTipsView.m b/SJVideoPlayer/Control/SJVideoPlayerTipsView.m index ec7ed1a01..a40ed225a 100644 --- a/SJVideoPlayer/Control/SJVideoPlayerTipsView.m +++ b/SJVideoPlayer/Control/SJVideoPlayerTipsView.m @@ -8,7 +8,7 @@ #import "SJVideoPlayerTipsView.h" -#import "UIView+Extension.h" +#import "UIView+SJExtension.h" #import diff --git a/SJVideoPlayer/Present/SJVideoPlayerPresentView.m b/SJVideoPlayer/Present/SJVideoPlayerPresentView.m index 8d1fddef1..f49e47c2e 100644 --- a/SJVideoPlayer/Present/SJVideoPlayerPresentView.m +++ b/SJVideoPlayer/Present/SJVideoPlayerPresentView.m @@ -16,7 +16,7 @@ #import "SJVideoPlayerStringConstant.h" -#import "UIView+Extension.h" +#import "UIView+SJExtension.h" #import @@ -186,6 +186,7 @@ - (void)_installNotifications { - (void)_removeNotifications { [self _removeDeviceOrientationChangeObserver]; + [[NSNotificationCenter defaultCenter] removeObserver:self]; } - (void)playerBeginPlayingNotification { diff --git a/SJVideoPlayer/Prompt/SJVideoPlayerPrompt.m b/SJVideoPlayer/Prompt/SJVideoPlayerPrompt.m index 9565a891e..2c6ac393b 100644 --- a/SJVideoPlayer/Prompt/SJVideoPlayerPrompt.m +++ b/SJVideoPlayer/Prompt/SJVideoPlayerPrompt.m @@ -10,9 +10,9 @@ #import -#import "UIView+Extension.h" +#import "UIView+SJExtension.h" -#import "NSTimer+SJExtention.h" +#import "NSTimer+SJExtension.h" #define SJVideoPlayerPrompt_H (50) diff --git a/SJVideoPlayerProject/SJVideoPlayerProject.xcodeproj/project.pbxproj b/SJVideoPlayerProject/SJVideoPlayerProject.xcodeproj/project.pbxproj index d7b986ce6..9aabacf53 100644 --- a/SJVideoPlayerProject/SJVideoPlayerProject.xcodeproj/project.pbxproj +++ b/SJVideoPlayerProject/SJVideoPlayerProject.xcodeproj/project.pbxproj @@ -10,7 +10,6 @@ 09A4777CDB247E7E1BCAA736 /* libPods-SJVideoPlayerProject.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C49166A356BD4B40CE605A1 /* libPods-SJVideoPlayerProject.a */; }; 7700D0191F4C045B00B043F8 /* sample.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 7700D0181F4C045B00B043F8 /* sample.mp4 */; }; 7700D01F1F4D584500B043F8 /* VideoPlayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7700D01E1F4D584500B043F8 /* VideoPlayerViewController.m */; }; - 7700D0591F502CF700B043F8 /* NSTimer+SJExtention.m in Sources */ = {isa = PBXBuildFile; fileRef = 7700D0441F502CF700B043F8 /* NSTimer+SJExtention.m */; }; 7700D05B1F502CF700B043F8 /* SJVideoPlayerControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 7700D0491F502CF700B043F8 /* SJVideoPlayerControl.m */; }; 7700D05C1F502CF700B043F8 /* SJVideoPlayerControlView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7700D04B1F502CF700B043F8 /* SJVideoPlayerControlView.m */; }; 7700D05D1F502CF700B043F8 /* SJVideoPlayerTipsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7700D04D1F502CF700B043F8 /* SJVideoPlayerTipsView.m */; }; @@ -34,13 +33,14 @@ 7798A31F1F532876004CB9BA /* SJVideoPlayer.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 7798A31E1F532876004CB9BA /* SJVideoPlayer.bundle */; }; 7798A3471F53D9DD004CB9BA /* sample6.png in Resources */ = {isa = PBXBuildFile; fileRef = 7798A3461F53D9DD004CB9BA /* sample6.png */; }; 7798A34C1F540A16004CB9BA /* NSAttributedString+ZFBAdditon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7798A3491F540A16004CB9BA /* NSAttributedString+ZFBAdditon.m */; }; - 7798A34D1F540A16004CB9BA /* UIView+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = 7798A34B1F540A16004CB9BA /* UIView+Extension.m */; }; 7798A3C41F54420B004CB9BA /* VideoPlayerNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7798A3C31F54420B004CB9BA /* VideoPlayerNavigationController.m */; }; 7798A3CA1F54437C004CB9BA /* VideoPlayerTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7798A3C91F54437C004CB9BA /* VideoPlayerTableViewController.m */; }; 7798A3CE1F5443B0004CB9BA /* VideoPlayerTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7798A3CD1F5443B0004CB9BA /* VideoPlayerTableViewCell.m */; }; 7798A3D21F5450DB004CB9BA /* VideoPlayerCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7798A3D11F5450DB004CB9BA /* VideoPlayerCollectionViewController.m */; }; 7798A3D61F5450FF004CB9BA /* VideoPlayerCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7798A3D51F5450FF004CB9BA /* VideoPlayerCollectionViewCell.m */; }; 7798A3E81F567C5C004CB9BA /* JDradualLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7798A3E71F567C5C004CB9BA /* JDradualLoadingView.m */; }; + 77BED2F41F5FBD4F0024D879 /* UIView+SJExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 77BED2F31F5FBD4F0024D879 /* UIView+SJExtension.m */; }; + 77BED2F71F5FBD610024D879 /* NSTimer+SJExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 77BED2F61F5FBD610024D879 /* NSTimer+SJExtension.m */; }; 77CD7AC61F5958A400EDCC25 /* SJVideoPlayerAssetCarrier.m in Sources */ = {isa = PBXBuildFile; fileRef = 77CD7AC51F5958A400EDCC25 /* SJVideoPlayerAssetCarrier.m */; }; /* End PBXBuildFile section */ @@ -49,8 +49,6 @@ 7700D0181F4C045B00B043F8 /* sample.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = sample.mp4; sourceTree = ""; }; 7700D01D1F4D584500B043F8 /* VideoPlayerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoPlayerViewController.h; sourceTree = ""; }; 7700D01E1F4D584500B043F8 /* VideoPlayerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VideoPlayerViewController.m; sourceTree = ""; }; - 7700D0431F502CF700B043F8 /* NSTimer+SJExtention.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSTimer+SJExtention.h"; sourceTree = ""; }; - 7700D0441F502CF700B043F8 /* NSTimer+SJExtention.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSTimer+SJExtention.m"; sourceTree = ""; }; 7700D0481F502CF700B043F8 /* SJVideoPlayerControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SJVideoPlayerControl.h; sourceTree = ""; }; 7700D0491F502CF700B043F8 /* SJVideoPlayerControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SJVideoPlayerControl.m; sourceTree = ""; }; 7700D04A1F502CF700B043F8 /* SJVideoPlayerControlView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SJVideoPlayerControlView.h; sourceTree = ""; }; @@ -86,8 +84,6 @@ 7798A3461F53D9DD004CB9BA /* sample6.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sample6.png; sourceTree = ""; }; 7798A3481F540A16004CB9BA /* NSAttributedString+ZFBAdditon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSAttributedString+ZFBAdditon.h"; sourceTree = ""; }; 7798A3491F540A16004CB9BA /* NSAttributedString+ZFBAdditon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSAttributedString+ZFBAdditon.m"; sourceTree = ""; }; - 7798A34A1F540A16004CB9BA /* UIView+Extension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Extension.h"; sourceTree = ""; }; - 7798A34B1F540A16004CB9BA /* UIView+Extension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Extension.m"; sourceTree = ""; }; 7798A3C21F54420B004CB9BA /* VideoPlayerNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoPlayerNavigationController.h; sourceTree = ""; }; 7798A3C31F54420B004CB9BA /* VideoPlayerNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VideoPlayerNavigationController.m; sourceTree = ""; }; 7798A3C81F54437C004CB9BA /* VideoPlayerTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoPlayerTableViewController.h; sourceTree = ""; }; @@ -100,6 +96,10 @@ 7798A3D51F5450FF004CB9BA /* VideoPlayerCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VideoPlayerCollectionViewCell.m; sourceTree = ""; }; 7798A3E61F567C5C004CB9BA /* JDradualLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JDradualLoadingView.h; sourceTree = ""; }; 7798A3E71F567C5C004CB9BA /* JDradualLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JDradualLoadingView.m; sourceTree = ""; }; + 77BED2F21F5FBD4F0024D879 /* UIView+SJExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+SJExtension.h"; sourceTree = ""; }; + 77BED2F31F5FBD4F0024D879 /* UIView+SJExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+SJExtension.m"; sourceTree = ""; }; + 77BED2F51F5FBD610024D879 /* NSTimer+SJExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSTimer+SJExtension.h"; sourceTree = ""; }; + 77BED2F61F5FBD610024D879 /* NSTimer+SJExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSTimer+SJExtension.m"; sourceTree = ""; }; 77CD7AC41F5958A400EDCC25 /* SJVideoPlayerAssetCarrier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SJVideoPlayerAssetCarrier.h; sourceTree = ""; }; 77CD7AC51F5958A400EDCC25 /* SJVideoPlayerAssetCarrier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SJVideoPlayerAssetCarrier.m; sourceTree = ""; }; 7C49166A356BD4B40CE605A1 /* libPods-SJVideoPlayerProject.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-SJVideoPlayerProject.a"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -151,10 +151,10 @@ children = ( 7798A3481F540A16004CB9BA /* NSAttributedString+ZFBAdditon.h */, 7798A3491F540A16004CB9BA /* NSAttributedString+ZFBAdditon.m */, - 7798A34A1F540A16004CB9BA /* UIView+Extension.h */, - 7798A34B1F540A16004CB9BA /* UIView+Extension.m */, - 7700D0431F502CF700B043F8 /* NSTimer+SJExtention.h */, - 7700D0441F502CF700B043F8 /* NSTimer+SJExtention.m */, + 77BED2F21F5FBD4F0024D879 /* UIView+SJExtension.h */, + 77BED2F31F5FBD4F0024D879 /* UIView+SJExtension.m */, + 77BED2F51F5FBD610024D879 /* NSTimer+SJExtension.h */, + 77BED2F61F5FBD610024D879 /* NSTimer+SJExtension.m */, ); path = Category; sourceTree = ""; @@ -479,14 +479,14 @@ 7798A3C41F54420B004CB9BA /* VideoPlayerNavigationController.m in Sources */, 7798A3D21F5450DB004CB9BA /* VideoPlayerCollectionViewController.m in Sources */, 7798A3E81F567C5C004CB9BA /* JDradualLoadingView.m in Sources */, - 7700D0591F502CF700B043F8 /* NSTimer+SJExtention.m in Sources */, + 77BED2F41F5FBD4F0024D879 /* UIView+SJExtension.m in Sources */, 7798A34C1F540A16004CB9BA /* NSAttributedString+ZFBAdditon.m in Sources */, 7700D0601F502CF700B043F8 /* SJVideoPlayer.m in Sources */, 7700D05B1F502CF700B043F8 /* SJVideoPlayerControl.m in Sources */, 772D46341F46E4CE0047A7BF /* main.m in Sources */, - 7798A34D1F540A16004CB9BA /* UIView+Extension.m in Sources */, 7798A3CA1F54437C004CB9BA /* VideoPlayerTableViewController.m in Sources */, 7700D01F1F4D584500B043F8 /* VideoPlayerViewController.m in Sources */, + 77BED2F71F5FBD610024D879 /* NSTimer+SJExtension.m in Sources */, 7700D05F1F502CF700B043F8 /* SJVideoPlayerPresentView.m in Sources */, 7798A3D61F5450FF004CB9BA /* VideoPlayerCollectionViewCell.m in Sources */, 7700D0611F502CF700B043F8 /* SJVideoPlayerStringConstant.m in Sources */, diff --git a/SJVideoPlayerProject/SJVideoPlayerProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate b/SJVideoPlayerProject/SJVideoPlayerProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate index 23b8b705b..731c5c172 100644 Binary files a/SJVideoPlayerProject/SJVideoPlayerProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate and b/SJVideoPlayerProject/SJVideoPlayerProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SJVideoPlayerProject/SJVideoPlayerProject/VideoPlayerCollectionViewCell.m b/SJVideoPlayerProject/SJVideoPlayerProject/VideoPlayerCollectionViewCell.m index b601ed986..500fb4fc8 100644 --- a/SJVideoPlayerProject/SJVideoPlayerProject/VideoPlayerCollectionViewCell.m +++ b/SJVideoPlayerProject/SJVideoPlayerProject/VideoPlayerCollectionViewCell.m @@ -8,7 +8,7 @@ #import "VideoPlayerCollectionViewCell.h" -#import "UIView+Extension.h" +#import "UIView+SJExtension.h" #import diff --git a/SJVideoPlayerProject/SJVideoPlayerProject/VideoPlayerTableViewCell.m b/SJVideoPlayerProject/SJVideoPlayerProject/VideoPlayerTableViewCell.m index 638b09c11..70a8b01b1 100644 --- a/SJVideoPlayerProject/SJVideoPlayerProject/VideoPlayerTableViewCell.m +++ b/SJVideoPlayerProject/SJVideoPlayerProject/VideoPlayerTableViewCell.m @@ -8,7 +8,7 @@ #import "VideoPlayerTableViewCell.h" -#import "UIView+Extension.h" +#import "UIView+SJExtension.h" #import diff --git a/SJVideoPlayerProject/SJVideoPlayerProject/ViewController.m b/SJVideoPlayerProject/SJVideoPlayerProject/ViewController.m index 6625ab51c..a69d7ae7f 100644 --- a/SJVideoPlayerProject/SJVideoPlayerProject/ViewController.m +++ b/SJVideoPlayerProject/SJVideoPlayerProject/ViewController.m @@ -8,7 +8,7 @@ #import "ViewController.h" -#import "UIView+Extension.h" +#import "UIView+SJExtension.h" #import