diff --git a/README.md b/README.md index 25f39fca..2b35de02 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Qplayer2是一款跨平台的播放器SDK,除了基础的播放器能力外, Platform | Build Status -------- | ------------ Android | https://github.com/pili-engineering/QPlayer2-Android - IOS | Last Version: 1.2.3 + IOS | Last Version: 1.2.4 Windows | 敬请期待 Mac | 敬请期待 ### qplayer2-core 功能列表 @@ -43,7 +43,7 @@ Qplayer2是一款跨平台的播放器SDK,除了基础的播放器能力外, ##### 引入依赖 ```groovy -pod 'qplayer2-core', '1.2.3' +pod 'qplayer2-core', '1.2.4' ``` diff --git a/ReleaseNote/ReleaseNote-1.2.4.md b/ReleaseNote/ReleaseNote-1.2.4.md new file mode 100644 index 00000000..9029c87e --- /dev/null +++ b/ReleaseNote/ReleaseNote-1.2.4.md @@ -0,0 +1,12 @@ +# 1.2.4 ReleaseNote + +#### 能力 + +- 新增VR视频缩放能力 + + +#### 修复问题 + +- 修复填充模式为FUKLL_SCREEN时,渲染控件为正方形时不生效 + + diff --git a/qplayer2-core-Universal.podspec b/qplayer2-core-Universal.podspec index 48db3e35..f3484506 100644 --- a/qplayer2-core-Universal.podspec +++ b/qplayer2-core-Universal.podspec @@ -11,7 +11,7 @@ Pod::Spec.new do |spec| spec.name = "qplayer2-core" - spec.version = "1.2.2" + spec.version = "1.2.4" spec.summary = "Pili iOS video player SDK, RTMP, HLS video streaming supported." diff --git a/qplayer2-core.podspec b/qplayer2-core.podspec index 5525715d..9f6eab2c 100644 --- a/qplayer2-core.podspec +++ b/qplayer2-core.podspec @@ -11,7 +11,7 @@ Pod::Spec.new do |spec| spec.name = "qplayer2-core" - spec.version = "1.2.2" + spec.version = "1.2.4" spec.summary = "Pili iOS video player SDK, RTMP, HLS video streaming supported." diff --git a/qplayer2demo/Podfile b/qplayer2demo/Podfile index f10e9736..baa888ec 100644 --- a/qplayer2demo/Podfile +++ b/qplayer2demo/Podfile @@ -7,5 +7,5 @@ target 'qplayer2demo' do pod 'Bugly' pod 'Masonry', '1.0.1' #pod 'qplayer2-core', :path => '../' - pod 'qplayer2-core', '1.2.2' + pod 'qplayer2-core', '1.2.4' end diff --git a/qplayer2demo/qplayer2demo.xcodeproj/project.pbxproj b/qplayer2demo/qplayer2demo.xcodeproj/project.pbxproj index 2b66fa4a..b278d6c6 100644 --- a/qplayer2demo/qplayer2demo.xcodeproj/project.pbxproj +++ b/qplayer2demo/qplayer2demo.xcodeproj/project.pbxproj @@ -734,7 +734,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.3; + MARKETING_VERSION = 1.2.4; PODS_PODFILE_DIR_PATH = "${SRCROOT}/."; PODS_ROOT = "${SRCROOT}/Pods"; PRODUCT_BUNDLE_IDENTIFIER = com.qiniu.qplayer2demo; @@ -776,7 +776,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.3; + MARKETING_VERSION = 1.2.4; PODS_PODFILE_DIR_PATH = "${SRCROOT}/."; PODS_ROOT = "${SRCROOT}/Pods"; PRODUCT_BUNDLE_IDENTIFIER = com.qiniu.qplayer2demo; diff --git a/qplayer2demo/qplayer2demo/QNDoublePlayerViewController.m b/qplayer2demo/qplayer2demo/QNDoublePlayerViewController.m index 749f47ad..c4fd68af 100644 --- a/qplayer2demo/qplayer2demo/QNDoublePlayerViewController.m +++ b/qplayer2demo/qplayer2demo/QNDoublePlayerViewController.m @@ -78,7 +78,8 @@ - (void)dealloc { - (void)viewWillDisAppear:(BOOL)animated { [super viewWillAppear:animated]; [self.player.controlHandler stop]; - + [self.player_other.controlHandler stop]; + _toastView = nil; [self.player.controlHandler playerRelease]; self.myRenderView = nil; @@ -218,6 +219,7 @@ - (void)setupPlayer_other:(NSArray*)models { } - (void)getBack { [self.player.controlHandler stop]; + [self.player_other.controlHandler stop]; [self.navigationController popViewControllerAnimated:YES]; }