Skip to content

Commit 41f9aa8

Browse files
jiajunhuijiajunhui
committed
gesture add onLongPress,exoplayer add 302 support
1 parent 400c803 commit 41f9aa8

16 files changed

Lines changed: 82 additions & 48 deletions

File tree

‎app/src/main/java/com/kk/taurus/avplayer/adapter/ListAdapter.java‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import android.content.Context;
44
import android.support.v4.view.ViewCompat;
55
import android.support.v7.widget.RecyclerView;
6-
import android.text.TextUtils;
76
import android.view.View;
87
import android.view.ViewGroup;
98
import android.view.ViewTreeObserver;
@@ -12,8 +11,6 @@
1211
import android.widget.RelativeLayout;
1312
import android.widget.TextView;
1413

15-
import com.bumptech.glide.Glide;
16-
import com.bumptech.glide.request.RequestOptions;
1714
import com.kk.taurus.avplayer.R;
1815
import com.kk.taurus.avplayer.bean.VideoBean;
1916
import com.kk.taurus.avplayer.utils.ImageDisplayEngine;
@@ -103,19 +100,7 @@ public void onBindViewHolder(final VideoItemHolder holder, final int position) {
103100
ViewCompat.setElevation(holder.card, PUtil.dip2px(mContext, 3));
104101
updateWH(holder);
105102
final VideoBean item = getItem(position);
106-
if(TextUtils.isEmpty(item.getCover())){
107-
Glide.with(mContext)
108-
.setDefaultRequestOptions(
109-
new RequestOptions()
110-
.frame(1500*1000)
111-
.centerCrop()
112-
.error(R.mipmap.ic_launcher)
113-
.placeholder(R.mipmap.ic_launcher))
114-
.load(item.getPath())
115-
.into(holder.albumImage);
116-
}else{
117-
ImageDisplayEngine.display(mContext, holder.albumImage, item.getCover(), R.mipmap.ic_launcher);
118-
}
103+
ImageDisplayEngine.display(mContext, holder.albumImage, item.getPath(), R.mipmap.ic_launcher);
119104
holder.title.setText(item.getDisplayName());
120105
holder.layoutContainer.removeAllViews();
121106
holder.playIcon.setVisibility(mPlayPosition==position?View.GONE:View.VISIBLE);

‎app/src/main/java/com/kk/taurus/avplayer/bean/VideoBean.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ public VideoBean(String displayName, String cover, String path) {
1717
this.path = path;
1818
}
1919

20+
public VideoBean(String displayName, String path) {
21+
this.displayName = displayName;
22+
this.path = path;
23+
}
24+
2025
public String getDisplayName() {
2126
return displayName;
2227
}

‎app/src/main/java/com/kk/taurus/avplayer/cover/ControllerCover.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,11 @@ public void onSingleTapUp(MotionEvent event) {
486486
toggleController();
487487
}
488488

489+
@Override
490+
public void onLongPress(MotionEvent event) {
491+
492+
}
493+
489494
@Override
490495
public void onDoubleTap(MotionEvent event) {
491496
}

‎app/src/main/java/com/kk/taurus/avplayer/cover/GestureCover.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,11 @@ public void onSingleTapUp(MotionEvent event) {
245245

246246
}
247247

248+
@Override
249+
public void onLongPress(MotionEvent event) {
250+
251+
}
252+
248253
@Override
249254
public void onDoubleTap(MotionEvent event) {
250255

‎app/src/main/java/com/kk/taurus/avplayer/ui/BaseVideoViewActivity.java‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -189,19 +189,22 @@ public void onItemClick(SettingAdapter.SettingItemHolder holder, SettingItem ite
189189
mVideoView.setAspectRatio(AspectRatio.AspectRatio_ORIGIN);
190190
break;
191191
case SettingItem.CODE_PLAYER_MEDIA_PLAYER:
192-
if(mVideoView.switchDecoder(PlayerConfig.DEFAULT_PLAN_ID)){
193-
replay();
194-
}
192+
replay();
193+
// if(mVideoView.switchDecoder(PlayerConfig.DEFAULT_PLAN_ID)){
194+
// replay();
195+
// }
195196
break;
196197
case SettingItem.CODE_PLAYER_IJK_PLAYER:
197-
if(mVideoView.switchDecoder(App.PLAN_ID_IJK)){
198-
replay();
199-
}
198+
replay();
199+
// if(mVideoView.switchDecoder(App.PLAN_ID_IJK)){
200+
// replay();
201+
// }
200202
break;
201203
case SettingItem.CODE_PLAYER_EXO_PLAYER:
202-
if(mVideoView.switchDecoder(App.PLAN_ID_EXO)){
203-
replay();
204-
}
204+
replay();
205+
// if(mVideoView.switchDecoder(App.PLAN_ID_EXO)){
206+
// replay();
207+
// }
205208
break;
206209
case SettingItem.CODE_SPEED_0_5:
207210
mVideoView.setSpeed(0.5f);

‎app/src/main/java/com/kk/taurus/avplayer/ui/ViewPagerPlayActivity.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
public class ViewPagerPlayActivity extends AppCompatActivity {
3939

4040
private ViewPager mViewPager;
41+
private ViewPager.OnPageChangeListener mOnPageChangeListener;
4142
private TextView mTvTitle;
4243

4344
private RelationAssist mRelationAssist;
@@ -77,7 +78,7 @@ public void onPlayerEvent(int eventCode, Bundle bundle) {
7778
});
7879
mRelationAssist.getSuperContainer().setBackgroundColor(Color.BLACK);
7980

80-
mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
81+
mViewPager.addOnPageChangeListener(mOnPageChangeListener = new ViewPager.OnPageChangeListener() {
8182
@Override
8283
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
8384

@@ -150,7 +151,8 @@ public void onResult(VideoResult result) {
150151
mViewPager.post(new Runnable() {
151152
@Override
152153
public void run() {
153-
playPosition(0);
154+
if(mOnPageChangeListener!=null)
155+
mOnPageChangeListener.onPageSelected(0);
154156
}
155157
});
156158
}

‎app/src/main/java/com/kk/taurus/avplayer/utils/DataUtils.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,42 +72,34 @@ public static List<VideoBean> getVideoList() {
7272
List<VideoBean> videoList = new ArrayList<>();
7373
videoList.add(new VideoBean(
7474
"你欠缺的也许并不是能力",
75-
"http://open-image.nosdn.127.net/image/snapshot_movie/2016/11/b/a/c36e048e284c459686133e66a79e2eba.jpg",
7675
"https://mov.bn.netease.com/open-movie/nos/mp4/2016/06/22/SBP8G92E3_hd.mp4"));
7776

7877
videoList.add(new VideoBean(
7978
"坚持与放弃",
80-
"http://open-image.nosdn.127.net/image/snapshot_movie/2016/11/0/4/e4c8836bfe154d76a808da38d0733304.jpg",
8179
"https://mov.bn.netease.com/open-movie/nos/mp4/2015/08/27/SB13F5AGJ_sd.mp4"));
8280

8381
videoList.add(new VideoBean(
8482
"不想从被子里出来",
85-
"http://open-image.nosdn.127.net/57baaaeaad4e4fda8bdaceafdb9d45c2.jpg",
8683
"https://mov.bn.netease.com/open-movie/nos/mp4/2018/01/12/SD70VQJ74_sd.mp4"));
8784

8885
videoList.add(new VideoBean(
8986
"不耐烦的中国人?",
90-
"http://open-image.nosdn.127.net/image/snapshot_movie/2016/11/e/9/ac655948c705413b8a63a7aaefd4cde9.jpg",
9187
"https://mov.bn.netease.com/open-movie/nos/mp4/2017/05/31/SCKR8V6E9_hd.mp4"));
9288

9389
videoList.add(new VideoBean(
9490
"神奇的珊瑚",
95-
"http://open-image.nosdn.127.net/image/snapshot_movie/2016/11/e/4/75bc6c5227314e63bbfd5d9f0c5c28e4.jpg",
9691
"https://mov.bn.netease.com/open-movie/nos/mp4/2016/01/11/SBC46Q9DV_hd.mp4"));
9792

9893
videoList.add(new VideoBean(
9994
"怎样经营你的人脉",
100-
"http://open-image.nosdn.127.net/image/snapshot_movie/2018/3/b/c/9d451a2da3cf42b0a049ba3e249222bc.jpg",
10195
"https://mov.bn.netease.com/open-movie/nos/mp4/2018/04/19/SDEQS1GO6_hd.mp4"));
10296

10397
videoList.add(new VideoBean(
10498
"怎么才能不畏将来",
105-
"http://open-image.nosdn.127.net/image/snapshot_movie/2018/1/c/8/1aec3637270f465faae52713a7c191c8.jpg",
10699
"https://mov.bn.netease.com/open-movie/nos/mp4/2018/01/25/SD82Q0AQE_hd.mp4"));
107100

108101
videoList.add(new VideoBean(
109102
"音乐和艺术如何改变世界",
110-
"http://open-image.nosdn.127.net/image/snapshot_movie/2017/12/2/8/f30dd5f2f09c405c98e7eb6c06c89928.jpg",
111103
"https://mov.bn.netease.com/open-movie/nos/mp4/2017/12/04/SD3SUEFFQ_hd.mp4"));
112104

113105
return videoList;

‎exoplayer/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ dependencies {
3434
api 'com.google.android.exoplayer:exoplayer-dash:2.9.1'
3535
api 'com.google.android.exoplayer:exoplayer-hls:2.9.1'
3636
api 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.9.1'
37-
api 'com.kk.taurus.playerbase:playerbase:3.3.5'
38-
// api project(':playerbase')
37+
// api 'com.kk.taurus.playerbase:playerbase:3.3.5'
38+
api project(':playerbase')
3939
}

‎exoplayer/src/main/java/com/kk/taurus/exoplayer/ExoMediaPlayer.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import com.google.android.exoplayer2.upstream.DataSpec;
4747
import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
4848
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
49+
import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
4950
import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
5051
import com.google.android.exoplayer2.upstream.RawResourceDataSource;
5152
import com.google.android.exoplayer2.util.Util;
@@ -161,7 +162,10 @@ public void setDataSource(DataSource dataSource) {
161162
if(extra!=null && extra.size()>0 &&
162163
("http".equalsIgnoreCase(scheme)||"https".equalsIgnoreCase(scheme))){
163164
dataSourceFactory = new DefaultHttpDataSourceFactory(
164-
Util.getUserAgent(mAppContext, mAppContext.getPackageName()));
165+
Util.getUserAgent(mAppContext, mAppContext.getPackageName()),
166+
DefaultHttpDataSource.DEFAULT_CONNECT_TIMEOUT_MILLIS,
167+
DefaultHttpDataSource.DEFAULT_READ_TIMEOUT_MILLIS,
168+
true);
165169
((DefaultHttpDataSourceFactory)dataSourceFactory).getDefaultRequestProperties().set(extra);
166170
}
167171

‎ijkplayer/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ dependencies {
3131
implementation fileTree(include: ['*.jar'], dir: 'libs')
3232

3333
api 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8'
34-
api 'com.kk.taurus.playerbase:playerbase:3.3.5'
35-
// api project(':playerbase')
34+
// api 'com.kk.taurus.playerbase:playerbase:3.3.5'
35+
api project(':playerbase')
3636
}

0 commit comments

Comments
 (0)