2.18.0

easefun · Sep 23, 2022 · fdbec0a · fdbec0a
1 parent 96cfae2
commit fdbec0a
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 8 deletions.
diff --git a/API文档目录.md b/API文档目录.md
@@ -1,3 +1,4 @@
+2.18.0版API文档请看[v2.18.0 API](http://repo.polyv.net/android/sdk/2.18.0/api/index.html)<br/>
 2.16.6版API文档请看[v2.16.6 API](http://repo.polyv.net/android/sdk/2.16.6/api/index.html)<br/>
 2.16.5版API文档请看[v2.16.5 API](http://repo.polyv.net/android/sdk/2.16.5/api/index.html)<br/>2.16.4版API文档请看[v2.16.4 API](http://repo.polyv.net/android/sdk/2.16.4/api/index.html)<br/>
 2.16.0版API文档请看[v2.16.0 API](http://repo.polyv.net/android/sdk/2.16.0/api/index.html)<br/>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+### 2022-09-23 polyv-android-sdk-2.0.0-demo v2.18.0
+
+### 功能完善&bug修复
+* 【SDK】新增支持播放vrm13加密视频
+* 【Demo】修复部分机型小窗播放关闭后播放器未销毁的问题
+* 【SDK】修复部分视频播放未触发 onPlay 回调的问题
+
+### 修改依赖
+``` groovy
+// 修改对应的sdk依赖
+implementation 'net.polyv.android:polyvPlayer:2.18.0'//SDK核心包
+implementation 'net.polyv.android:polyvDownload:2.18.0'//SDK下载功能
+```
+
+API文档请看 [v2.18.0 API](http://repo.polyv.net/android/sdk/2.18.0/api/index.html)
+
 ### 2022-06-21 polyv-android-sdk-2.0.0-demo v2.16.6
 
 由于[ bintray 停服 ](https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/) 导致历史版本依赖将不可使用。旧版本用户请升级至v2.15.2+。如集成Demo层建议同步更新。

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 polyv-android-sdk-2.0.0-demo
 ===
 [![build passing](https://img.shields.io/badge/build-passing-brightgreen.svg)](#)
-[![GitHub release](https://img.shields.io/badge/release-v2.16.6-blue.svg)](https://github.com/easefun/polyv-android-sdk-2.0-demo/releases/tag/v2.16.6)
+[![GitHub release](https://img.shields.io/badge/release-v2.18.0-blue.svg)](https://github.com/easefun/polyv-android-sdk-2.0-demo/releases/tag/v2.18.0)
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->

diff --git a/app/build.gradle b/app/build.gradle
@@ -67,9 +67,9 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support:support-v4:27.1.1'
     implementation 'com.android.support:design:27.1.1'
-    implementation 'net.polyv.android:polyvPlayer:2.17.0'//SDK核心包
+    implementation 'net.polyv.android:polyvPlayer:2.18.0'//SDK核心包
     implementation 'net.polyv.android:polyvModuleABI:1.7.5'//SDK核心包
-    implementation 'net.polyv.android:polyvDownload:2.16.6'//SDK下载功能
+    implementation 'net.polyv.android:polyvDownload:2.18.0'//SDK下载功能
     implementation 'net.polyv.android:polyvUpload:2.3.4'//SDK上传功能
     implementation 'de.hdodenhof:circleimageview:2.2.0'//圆形imageview，音频封面图使用
     implementation 'com.github.bumptech.glide:glide:4.7.1'//demo中的ppt图片加载使用

diff --git a/app/src/main/java/com/easefun/polyvsdk/PolyvApplication.java b/app/src/main/java/com/easefun/polyvsdk/PolyvApplication.java
@@ -14,7 +14,7 @@ public class PolyvApplication extends MultiDexApplication {
 
 	public static final String TAG = PolyvApplication.class.getSimpleName();
 
-	private static final String defaultConfig = "CMWht3MlpVkgpFzrLNAebYi4RdQDY/Nhvk3Kc+qWcck6chwHYKfl9o2aOVBvXVTRZD/14XFzVP7U5un43caq1FXwl0cYmTfimjTmNUYa1sZC1pkHE8gEsRpwpweQtEIiTGVEWrYVNo4/o5jI2/efzA==";
+	private static final String defaultConfig = "yQRmgnzPyCUYDx6weXRATIN8gkp7BYGAl3ATjE/jHZunrULx8CoKa1WGMjfHftVChhIQlCA9bFeDDX+ThiuBHLjsNRjotqxhiz97ZjYaCQH/MhUrbEURv58317PwPuGEf3rbLVPOa4c9jliBcO+22A==";
 
 	@Override
 	public void onCreate() {

diff --git a/app/src/main/java/com/easefun/polyvsdk/activity/PolyvPlayerActivity.java b/app/src/main/java/com/easefun/polyvsdk/activity/PolyvPlayerActivity.java
@@ -254,6 +254,17 @@ public class PolyvPlayerActivity extends FragmentActivity {
 
     private BroadcastReceiver pipReceiver;
     private boolean isInPictureInPictureMode;
+    /**
+     * 画中画模式不同机型回调表现有差异
+     * <p>
+     * 部分机型会正常回调生命周期 {@link #onDestroy()}，可以正常销毁页面
+     * <p>
+     * 部分机型会只会回调 {@link #onStop()} -> {@link #onPictureInPictureModeChanged(boolean, Configuration)}，
+     * 不会回调 {@link #onDestroy()}，引起不能正常销毁页面
+     * <p>
+     * 为了兼容这种情况，在 {@link #onStop()} 中判断是否在画中画模式，触发退出画中画模式并且已经回调 {@link #onStop()} 时主动销毁页面
+     */
+    private boolean isCalledStopOnPipModeChanged = false;
 
     private boolean isOnBackKeyPressed;
     private ServiceConnection playConnection;
@@ -1159,6 +1170,12 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             viewPagerFragment.getTalkFragment().onActivityResult(requestCode, resultCode, data);
     }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+        isCalledStopOnPipModeChanged = false;
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -1183,6 +1200,7 @@ protected void onResume() {
     @Override
     protected void onStop() {
         super.onStop();
+        isCalledStopOnPipModeChanged = isInPipMode();
         mediaController.pause();
         marqueeView.stop();
         if (!isInPipMode()) {
@@ -1273,6 +1291,10 @@ public void onReceive(Context context, Intent intent) {
             }
 
         }
+
+        if (isCalledStopOnPipModeChanged && !isInPictureInPictureMode) {
+            finish();
+        }
     }
 
     /**

diff --git a/app/src/main/java/com/easefun/polyvsdk/player/PolyvPlayerMediaController.java b/app/src/main/java/com/easefun/polyvsdk/player/PolyvPlayerMediaController.java
@@ -6,7 +6,6 @@
 import android.app.RemoteAction;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -296,7 +295,7 @@ public boolean canDragSeek(int seekPosition) {
             canDragSeek = false;
         }
 
-        if (onDragSeekListener == null) {
+        if (onDragSeekListener == null || videoView == null) {
             return canDragSeek;
         }
         if (canDragSeek) {

diff --git a/gradle.properties b/gradle.properties
@@ -17,5 +17,5 @@
 # org.gradle.parallel=true
 android.injected.testOnly=false
 #project
-VERSIONCODE=217000
-VERSIONNAME=2.17.0
+VERSIONCODE=218000
+VERSIONNAME=2.18.0