From b1d3fff96c49dab6e5cecf26032d026146f4e723 Mon Sep 17 00:00:00 2001 From: jiajunhui <309812983@qq.com> Date: Sun, 1 Jul 2018 20:21:05 +0800 Subject: [PATCH] improve function --- .idea/caches/build_file_checksums.ser | Bin 690 -> 690 bytes README.md | 2 +- playerbase/build.gradle | 2 +- .../com/kk/taurus/playerbase/AVPlayer.java | 25 ++++++++++-------- .../playerbase/extension/ProducerGroup.java | 2 -- .../playerbase/receiver/ReceiverGroup.java | 2 +- .../playerbase/window/WindowVideoView.java | 3 ++- 7 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 77a9331d403721da6d201d4fdba9f7f031b8daf4..b02d5881ee11d4aab8855942c979bed9510053bc 100644 GIT binary patch delta 36 ucmV+<0Nekv1+oQ@m;_bBUQDr^W&sesmf85(1zsS`iEY delta 36 ucmV+<0Nekv1+oQ@m;_KSpP;dvW&seaKR)7q|AFgtT=RowW@Xls5(1znHxQ)& diff --git a/README.md b/README.md index 34580019..c5175467 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ demo示例集成了播放控制组件**ControllerCover**、加载中组件**Load ```gradle dependencies { - compile 'com.kk.taurus.playerbase:playerbase:3.2.8.9.1' + compile 'com.kk.taurus.playerbase:playerbase:3.2.9' } ``` diff --git a/playerbase/build.gradle b/playerbase/build.gradle index c69728db..9e013094 100644 --- a/playerbase/build.gradle +++ b/playerbase/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' // 这个version是区分library版本的，因此当我们需要更新library时记得修改这个version -version = "3.2.8.9.1" +version = "3.2.9" android { compileSdkVersion 26 diff --git a/playerbase/src/main/java/com/kk/taurus/playerbase/AVPlayer.java b/playerbase/src/main/java/com/kk/taurus/playerbase/AVPlayer.java index f33f2337..0c6da5b5 100644 --- a/playerbase/src/main/java/com/kk/taurus/playerbase/AVPlayer.java +++ b/playerbase/src/main/java/com/kk/taurus/playerbase/AVPlayer.java @@ -92,11 +92,13 @@ private void loadInternalPlayer(int decoderPlanId) { "init decoder instance failure, please check your configuration" + ", maybe your config classpath not found."); DecoderPlan plan = PlayerConfig.getPlan(mDecoderPlanId); - PLog.d(TAG,"============================="); - PLog.d(TAG,"DecoderPlanInfo : planId = " + plan.getIdNumber()); - PLog.d(TAG,"DecoderPlanInfo : classPath = " + plan.getClassPath()); - PLog.d(TAG,"DecoderPlanInfo : desc = " + plan.getDesc()); - PLog.d(TAG,"============================="); + if(plan!=null){ + PLog.d(TAG,"============================="); + PLog.d(TAG,"DecoderPlanInfo : planId = " + plan.getIdNumber()); + PLog.d(TAG,"DecoderPlanInfo : classPath = " + plan.getClassPath()); + PLog.d(TAG,"DecoderPlanInfo : desc = " + plan.getDesc()); + PLog.d(TAG,"============================="); + } } /** @@ -275,13 +277,14 @@ public void onProviderDataSuccess(int code, Bundle bundle) { //on data provider load data success,need set data to decoder player. case IDataProvider.PROVIDER_CODE_SUCCESS_MEDIA_DATA: if(bundle!=null){ - DataSource data = - (DataSource) bundle.getSerializable(EventKey.SERIALIZABLE_DATA); - PLog.d(TAG,"onProviderDataSuccessMediaData : DataSource = " + data); - if(data!=null){ - interPlayerSetDataSource(data); - internalPlayerStart(data.getStartPos()); + Object obj = bundle.getSerializable(EventKey.SERIALIZABLE_DATA); + if(obj==null || !(obj instanceof DataSource)){ + throw new RuntimeException("provider media success SERIALIZABLE_DATA must type of DataSource!"); } + DataSource data = (DataSource) obj; + PLog.d(TAG,"onProviderDataSuccessMediaData : DataSource = " + data); + interPlayerSetDataSource(data); + internalPlayerStart(data.getStartPos()); //success video data call back. callBackPlayEventListener( OnPlayerEventListener.PLAYER_EVENT_ON_PROVIDER_DATA_SUCCESS, bundle); diff --git a/playerbase/src/main/java/com/kk/taurus/playerbase/extension/ProducerGroup.java b/playerbase/src/main/java/com/kk/taurus/playerbase/extension/ProducerGroup.java index f8c01a5b..9e1bb131 100644 --- a/playerbase/src/main/java/com/kk/taurus/playerbase/extension/ProducerGroup.java +++ b/playerbase/src/main/java/com/kk/taurus/playerbase/extension/ProducerGroup.java @@ -37,8 +37,6 @@ public ProducerGroup(ReceiverEventSender eventSender){ @Override public void addEventProducer(EventProducer eventProducer) { - if(eventProducer==null) - return; eventProducer.attachSender(mEventSender); if(!mEventProducers.contains(eventProducer)){ mEventProducers.add(eventProducer); diff --git a/playerbase/src/main/java/com/kk/taurus/playerbase/receiver/ReceiverGroup.java b/playerbase/src/main/java/com/kk/taurus/playerbase/receiver/ReceiverGroup.java index f3bed8a0..0ec39a96 100644 --- a/playerbase/src/main/java/com/kk/taurus/playerbase/receiver/ReceiverGroup.java +++ b/playerbase/src/main/java/com/kk/taurus/playerbase/receiver/ReceiverGroup.java @@ -54,10 +54,10 @@ public void setOnReceiverGroupChangeListener( @Override public void addReceiver(String key, IReceiver receiver){ + ((BaseReceiver)receiver).setKey(key); receiver.bindGroup(this); //call back method onReceiverBind(). receiver.onReceiverBind(); - ((BaseReceiver)receiver).setKey(key); mReceivers.put(key, receiver); mKeySet = mReceivers.keySet(); if(mOnReceiverGroupChangeListener!=null) diff --git a/playerbase/src/main/java/com/kk/taurus/playerbase/window/WindowVideoView.java b/playerbase/src/main/java/com/kk/taurus/playerbase/window/WindowVideoView.java index 71ade826..188b2573 100644 --- a/playerbase/src/main/java/com/kk/taurus/playerbase/window/WindowVideoView.java +++ b/playerbase/src/main/java/com/kk/taurus/playerbase/window/WindowVideoView.java @@ -17,9 +17,9 @@ package com.kk.taurus.playerbase.window; import android.animation.Animator; +import android.annotation.SuppressLint; import android.content.Context; import android.os.Build; -import android.support.annotation.RequiresApi; import android.view.MotionEvent; import com.kk.taurus.playerbase.widget.BaseVideoView; @@ -30,6 +30,7 @@ * see also IWindow{@link IWindow} * */ +@SuppressLint("ViewConstructor") public class WindowVideoView extends BaseVideoView implements IWindow { private WindowHelper mWindowHelper;