feat: dev-5.1 分支基线(v1.3.35 发版后代码 + 5.1 声道改造文档)
- 以 main(ccc65af) 为基线提交当前工作区代码
- 新增 5.1 声道改造文档两份
- .gitignore 补充 .vscode/、.screenshots/
This commit is contained in:
12
mediaplayertv/src/main/java/com/pukka/videoplayertv/VideoViewTv.java
Executable file → Normal file
12
mediaplayertv/src/main/java/com/pukka/videoplayertv/VideoViewTv.java
Executable file → Normal file
@@ -328,11 +328,6 @@ public class VideoViewTv extends FrameLayout implements MediaPlayerControl {
|
||||
}
|
||||
|
||||
private void initVideoView() {
|
||||
// Android 4.2 兼容:ExoPlayer 2.19 官方支持 API 19+,低版本强制切系统 MediaPlayer 内核,
|
||||
// 避免 PkExoMediaPlayer/ExoPlayer 类在 Dalvik 上触发 VerifyError
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
|
||||
terminalType = 0;
|
||||
}
|
||||
if (!checkAudioCapability()){
|
||||
terminalType = 0;
|
||||
}
|
||||
@@ -567,9 +562,7 @@ public class VideoViewTv extends FrameLayout implements MediaPlayerControl {
|
||||
reset();
|
||||
mMediaPlayer.release();
|
||||
if(mMediaPlayer != null){
|
||||
// terminalType 短路:非 Exo 内核时跳过 instanceof,避免 Dalvik 解析
|
||||
// PkExoMediaPlayer 引发的 ExoPlayer 类加载 VerifyError(Android 4.2)
|
||||
if(terminalType == 2 && mMediaPlayer instanceof PkExoMediaPlayer){
|
||||
if(mMediaPlayer instanceof PkExoMediaPlayer){
|
||||
PkExoMediaPlayer pkExoMediaPlayer = (PkExoMediaPlayer)mMediaPlayer;
|
||||
pkExoMediaPlayer.resetListeners();
|
||||
}
|
||||
@@ -1498,8 +1491,7 @@ public class VideoViewTv extends FrameLayout implements MediaPlayerControl {
|
||||
onPauseListener = null;
|
||||
onResumeListener = null;
|
||||
if(mMediaPlayer != null){
|
||||
// terminalType 短路:同上,避免非 Exo 内核时 Dalvik 触发 PkExoMediaPlayer 类解析
|
||||
if(terminalType == 2 && mMediaPlayer instanceof PkExoMediaPlayer){
|
||||
if(mMediaPlayer instanceof PkExoMediaPlayer){
|
||||
PkExoMediaPlayer pkExoMediaPlayer = (PkExoMediaPlayer)mMediaPlayer;
|
||||
pkExoMediaPlayer.resetListeners();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user