修复IJKPlayerManager暂停播放timer未暂停问题

zhangsiqiang07 · Aug 27, 2020 · 5bc6492 · 5bc6492
1 parent 6f752c0
commit 5bc6492
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 27 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,17 +1,17 @@
 PODS:
  - FDFullscreenPopGesture (1.1)
  - MJRefresh (3.4.3)
- - ZFPlayer (4.0.1):
- - ZFPlayer/AVPlayer (= 4.0.1)
- - ZFPlayer/ControlView (= 4.0.1)
- - ZFPlayer/Core (= 4.0.1)
- - ZFPlayer/ijkplayer (= 4.0.1)
- - ZFPlayer/AVPlayer (4.0.1):
+ - ZFPlayer (4.0.2):
+ - ZFPlayer/AVPlayer (= 4.0.2)
+ - ZFPlayer/ControlView (= 4.0.2)
+ - ZFPlayer/Core (= 4.0.2)
+ - ZFPlayer/ijkplayer (= 4.0.2)
+ - ZFPlayer/AVPlayer (4.0.2):
  - ZFPlayer/Core
- - ZFPlayer/ControlView (4.0.1):
+ - ZFPlayer/ControlView (4.0.2):
  - ZFPlayer/Core
- - ZFPlayer/Core (4.0.1)
- - ZFPlayer/ijkplayer (4.0.1):
+ - ZFPlayer/Core (4.0.2)
+ - ZFPlayer/ijkplayer (4.0.2):
  - ZFPlayer/Core
 
 DEPENDENCIES:
@@ -31,7 +31,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0
  MJRefresh: 53e3e3219f204425ee6d3e62e8733d3295944cd6
- ZFPlayer: c535ad9e213dbc45638f2ef0f68d9e76ceb878a6
+ ZFPlayer: f2a81c41ae8dfded13d30aa42e3d40f11cdf3bb4
 
 PODFILE CHECKSUM: a3fcbbaf309343c1c9575737d409bf95b447eef9
 

diff --git a/Example/Pods/Local Podspecs/ZFPlayer.podspec.json b/Example/Pods/Local Podspecs/ZFPlayer.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/ZFPlayer.xcodeproj/project.pbxproj b/Example/ZFPlayer.xcodeproj/project.pbxproj
@@ -862,6 +862,7 @@
  INFOPLIST_FILE = "ZFPlayer/ZFPlayer-Info.plist";
  IPHONEOS_DEPLOYMENT_TARGET = 8.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ MARKETING_VERSION = 1.0;
  MODULEMAP_FILE = "";
  MODULE_NAME = ExampleApp;
  PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.demo.ZFPlayer;
@@ -890,6 +891,7 @@
  INFOPLIST_FILE = "ZFPlayer/ZFPlayer-Info.plist";
  IPHONEOS_DEPLOYMENT_TARGET = 8.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ MARKETING_VERSION = 1.0;
  MODULEMAP_FILE = "";
  MODULE_NAME = ExampleApp;
  PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.demo.ZFPlayer;

diff --git a/Example/ZFPlayer/ZFPlayer-Info.plist b/Example/ZFPlayer/ZFPlayer-Info.plist
@@ -17,7 +17,7 @@
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>
- <string>3.2.0</string>
+ <string>$(MARKETING_VERSION)</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>

diff --git a/ZFPlayer.podspec b/ZFPlayer.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
  s.name = 'ZFPlayer'
- s.version = '4.0.1'
+ s.version = '4.0.2'
  s.summary = 'A good player made by renzifeng'
  s.homepage = 'https://github.com/renzifeng/ZFPlayer'
  s.license = { :type => 'MIT', :file => 'LICENSE' }

diff --git a/ZFPlayer/Classes/AVPlayer/ZFAVPlayerManager.m b/ZFPlayer/Classes/AVPlayer/ZFAVPlayerManager.m
@@ -202,7 +202,8 @@ - (void)replay {
 - (void)seekToTime:(NSTimeInterval)time completionHandler:(void (^ __nullable)(BOOL finished))completionHandler {
  if (self.totalTime > 0) {
  [_player.currentItem cancelPendingSeeks];
- CMTime seekTime = CMTimeMake(time, 1);
+ int32_t timeScale = _player.currentItem.asset.duration. timescale;
+ CMTime seekTime = CMTimeMakeWithSeconds(time, timeScale);
  [_player seekToTime:seekTime toleranceBefore:kCMTimeZero toleranceAfter:kCMTimeZero completionHandler:completionHandler];
  } else {
  self.seekTime = time;

diff --git a/ZFPlayer/Classes/Core/ZFLandscapeViewController.m b/ZFPlayer/Classes/Core/ZFLandscapeViewController.m
@@ -106,7 +106,11 @@ - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
 }
 
 - (BOOL)prefersHomeIndicatorAutoHidden {
- return YES;
+ UIInterfaceOrientation currentOrientation = (UIInterfaceOrientation)[UIDevice currentDevice].orientation;
+ if (UIInterfaceOrientationIsLandscape(currentOrientation)) {
+ return YES;
+ }
+ return NO;
 }
 
 - (BOOL)prefersStatusBarHidden {

diff --git a/ZFPlayer/Classes/Core/ZFPlayerLogManager.m b/ZFPlayer/Classes/Core/ZFPlayerLogManager.m
@@ -37,7 +37,7 @@ + (BOOL)getLogEnable {
 }
 
 + (NSString *)version {
- return @"4.0.1";
+ return @"4.0.2";
 }
 
 + (void)logWithFunction:(const char *)function lineNumber:(int)lineNumber formatString:(NSString *)formatString {

diff --git a/ZFPlayer/Classes/ijkplayer/ZFIJKPlayerManager.m b/ZFPlayer/Classes/ijkplayer/ZFIJKPlayerManager.m
@@ -102,13 +102,15 @@ - (void)play {
  [self prepareToPlay];
  } else {
  [self.player play];
+ if (self.timer) [self.timer setFireDate:[NSDate date]];
  self.player.playbackRate = self.rate;
  _isPlaying = YES;
  self.playState = ZFPlayerPlayStatePlaying;
  }
 }
 
 - (void)pause {
+ if (self.timer) [self.timer setFireDate:[NSDate distantFuture]];
  [self.player pause];
  _isPlaying = NO;
  self.playState = ZFPlayerPlayStatePaused;