From 4ce3377b90f46f4618ba7172b6a3d4edfce666e5 Mon Sep 17 00:00:00 2001 From: Nathen <821537155@qq.com> Date: Tue, 4 Sep 2018 11:36:51 +0800 Subject: [PATCH 1/6] upgrade build tools --- app/build.gradle | 9 ++++----- jiaozivideoplayer/build.gradle | 7 +++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d98bddcaa..8e84e766d 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 28 defaultConfig { applicationId "cn.jzvd.demo" minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 83 versionName "6.3_preview" } @@ -34,11 +33,11 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') testImplementation 'junit:junit:4.12' - implementation 'com.android.support:appcompat-v7:27.1.0' + implementation 'com.android.support:appcompat-v7:28.0.0-rc02' implementation project(':jiaozivideoplayer') implementation 'tv.danmaku.ijk.media:ijkplayer-java:0.8.4' implementation 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.4' - implementation 'com.android.support:recyclerview-v7:27.1.0' + implementation 'com.android.support:recyclerview-v7:28.0.0-rc02' implementation 'com.danikula:videocache:2.7.0' implementation 'com.github.bumptech.glide:glide:4.6.1' implementation 'com.google.android.exoplayer:exoplayer:2.7.1' diff --git a/jiaozivideoplayer/build.gradle b/jiaozivideoplayer/build.gradle index 59b1be76e..dce6e9d8b 100644 --- a/jiaozivideoplayer/build.gradle +++ b/jiaozivideoplayer/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 28 defaultConfig { minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 83 versionName "6.3_preview" } @@ -24,7 +23,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) testImplementation 'junit:junit:4.12' - compileOnly 'com.android.support:appcompat-v7:27.1.1' + compileOnly 'com.android.support:appcompat-v7:28.0.0-rc02' } apply from: '../gradle/maven_push.gradle' From 0015f34f8cb98878d63dfb45c790ff087e324e2e Mon Sep 17 00:00:00 2001 From: Nathen <821537155@qq.com> Date: Wed, 5 Sep 2018 22:59:29 +0800 Subject: [PATCH 2/6] change to jzvd --- README-ZH.md | 14 +-- README.md | 14 +-- .../demo/ActivityApiCustomMediaPlayer.java | 2 +- .../jzvd/demo/ActivityApiUISmallChange.java | 48 ++++----- .../demo/ActivityListViewMultiHolder.java | 12 +-- .../main/java/cn/jzvd/demo/ActivityMain.java | 10 +- .../java/cn/jzvd/demo/ActivityTinyWindow.java | 4 +- ...ActivityTinyWindowListViewMultiHolder.java | 12 +-- ...ivityTinyWindowRecycleViewMultiHolder.java | 10 +- .../java/cn/jzvd/demo/ActivityWebView.java | 4 +- .../jzvd/demo/AdapterRecyclerViewVideo.java | 10 +- .../java/cn/jzvd/demo/AdapterVideoList.java | 12 +-- .../main/java/cn/jzvd/demo/VideoConstant.java | 98 +++++++++---------- .../src/main/java/cn/jzvd/JZMediaManager.java | 2 +- .../src/main/java/cn/jzvd/JZUtils.java | 2 +- .../src/main/java/cn/jzvd/Jzvd.java | 14 +-- 16 files changed, 134 insertions(+), 134 deletions(-) diff --git a/README-ZH.md b/README-ZH.md index 5d46bd69c..a68d04656 100644 --- a/README-ZH.md +++ b/README-ZH.md @@ -43,7 +43,7 @@ compile 'cn.jzvd:jiaozivideoplayer:6.3_preview' 2.添加布局 ```xml - @@ -51,17 +51,17 @@ compile 'cn.jzvd:jiaozivideoplayer:6.3_preview' 3.设置视频地址、缩略图地址、标题 ```java -JZVideoPlayerStandard jzVideoPlayerStandard = (JZVideoPlayerStandard) findViewById(R.id.videoplayer); -jzVideoPlayerStandard.setUp("http://jzvd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4" - , JZVideoPlayerStandard.SCREEN_WINDOW_NORMAL, "饺子闭眼睛"); -jzVideoPlayerStandard.thumbImageView.setImage("http://p.qpic.cn/videoyun/0/2449_43b6f696980311e59ed467f22794e792_1/640"); +JzvdStd jzvdStd = (JzvdStd) findViewById(R.id.videoplayer); +jzvdStd.setUp("http://jzvd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4" + , Jzvd.SCREEN_WINDOW_NORMAL, "饺子闭眼睛"); +jzvdStd.thumbImageView.setImage("http://p.qpic.cn/videoyun/0/2449_43b6f696980311e59ed467f22794e792_1/640"); ``` 4.在`Activity`中 ```java @Override public void onBackPressed() { - if (JZVideoPlayer.backPress()) { + if (Jzvd.backPress()) { return; } super.onBackPressed(); @@ -69,7 +69,7 @@ public void onBackPressed() { @Override protected void onPause() { super.onPause(); - JZVideoPlayer.releaseAllVideos(); + Jzvd.releaseAllVideos(); } ``` diff --git a/README.md b/README.md index ffebf3b33..5dbf1b363 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Or download [lib](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6. 2.Add `JZVideoPlayer` in your layout: ```xml - @@ -59,18 +59,18 @@ Or download [lib](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6. 3.Set the video uri, video thumb url and video title: ```java -JZVideoPlayerStandard jzVideoPlayerStandard = (JZVideoPlayerStandard) findViewById(R.id.videoplayer); -jzVideoPlayerStandard.setUp("http://jzvd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4", - JZVideoPlayerStandard.SCREEN_WINDOW_NORMAL, +JzvdStd jzvdStd = (JzvdStd) findViewById(R.id.videoplayer); +jzvdStd.setUp("http://jzvd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4", + Jzvd.SCREEN_WINDOW_NORMAL, "饺子闭眼睛"); -jzVideoPlayerStandard.thumbImageView.setImage("http://p.qpic.cn/videoyun/0/2449_43b6f696980311e59ed467f22794e792_1/640"); +jzvdStd.thumbImageView.setImage("http://p.qpic.cn/videoyun/0/2449_43b6f696980311e59ed467f22794e792_1/640"); ``` 4.In `Activity`: ```java @Override public void onBackPressed() { - if (JZVideoPlayer.backPress()) { + if (Jzvd.backPress()) { return; } super.onBackPressed(); @@ -78,7 +78,7 @@ public void onBackPressed() { @Override protected void onPause() { super.onPause(); - JZVideoPlayer.releaseAllVideos(); + Jzvd.releaseAllVideos(); } ``` diff --git a/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMediaPlayer.java b/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMediaPlayer.java index 41bc24294..bef3a8da0 100755 --- a/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMediaPlayer.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMediaPlayer.java @@ -58,7 +58,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { } jzvdStd.setUp(jzDataSource, JzvdStd.SCREEN_WINDOW_NORMAL); Glide.with(this) - .load("http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png") + .load("http://jzvdStd-pic.nathen.cn/jzvdStd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png") .into(jzvdStd.thumbImageView); Jzvd.setMediaInterface(new CustomMediaPlayerAssertFolder());//进入此页面修改MediaInterface,让此页面的jzvd正常工作 diff --git a/app/src/main/java/cn/jzvd/demo/ActivityApiUISmallChange.java b/app/src/main/java/cn/jzvd/demo/ActivityApiUISmallChange.java index ceab8ed19..80a375856 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityApiUISmallChange.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityApiUISmallChange.java @@ -20,12 +20,12 @@ * Created by Nathen on 16/7/31. */ public class ActivityApiUISmallChange extends AppCompatActivity { - JzvdStdShowShareButtonAfterFullscreen jzVideoPlayerStandardWithShareButton; - JzvdStdShowTitleAfterFullscreen jzVideoPlayerStandardShowTitleAfterFullscreen; - JzvdStdShowTextureViewAfterAutoComplete jzVideoPlayerStandardShowTextureViewAfterAutoComplete; - JzvdStdAutoCompleteAfterFullscreen jzVideoPlayerStandardAutoCompleteAfterFullscreen; - JzvdStdVolumeAfterFullscreen jzVideoPlayerStandardVolumeAfterFullscreen; - JzvdStdMp3 jzVideoPlayerStandardMp3; + JzvdStdShowShareButtonAfterFullscreen jzvdStdWithShareButton; + JzvdStdShowTitleAfterFullscreen jzvdStdShowTitleAfterFullscreen; + JzvdStdShowTextureViewAfterAutoComplete jzvdStdShowTextureViewAfterAutoComplete; + JzvdStdAutoCompleteAfterFullscreen jzvdStdAutoCompleteAfterFullscreen; + JzvdStdVolumeAfterFullscreen jzvdStdVolumeAfterFullscreen; + JzvdStdMp3 jzvdStdMp3; JzvdStd jzvdStd_1_1, jzvdStd_16_9; @@ -39,34 +39,34 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { getSupportActionBar().setTitle("SmallChangeUI"); setContentView(R.layout.activity_ui_small_change); - jzVideoPlayerStandardWithShareButton = findViewById(R.id.custom_videoplayer_standard_with_share_button); - jzVideoPlayerStandardWithShareButton.setUp(VideoConstant.videoUrlList[3], "饺子想呼吸", Jzvd.SCREEN_WINDOW_NORMAL + jzvdStdWithShareButton = findViewById(R.id.custom_videoplayer_standard_with_share_button); + jzvdStdWithShareButton.setUp(VideoConstant.videoUrlList[3], "饺子想呼吸", Jzvd.SCREEN_WINDOW_NORMAL ); Glide.with(this) .load(VideoConstant.videoThumbList[3]) - .into(jzVideoPlayerStandardWithShareButton.thumbImageView); + .into(jzvdStdWithShareButton.thumbImageView); - jzVideoPlayerStandardShowTitleAfterFullscreen = findViewById(R.id.custom_videoplayer_standard_show_title_after_fullscreen); - jzVideoPlayerStandardShowTitleAfterFullscreen.setUp(VideoConstant.videoUrlList[4], "饺子想摇头", Jzvd.SCREEN_WINDOW_NORMAL + jzvdStdShowTitleAfterFullscreen = findViewById(R.id.custom_videoplayer_standard_show_title_after_fullscreen); + jzvdStdShowTitleAfterFullscreen.setUp(VideoConstant.videoUrlList[4], "饺子想摇头", Jzvd.SCREEN_WINDOW_NORMAL ); Glide.with(this) .load(VideoConstant.videoThumbList[4]) - .into(jzVideoPlayerStandardShowTitleAfterFullscreen.thumbImageView); + .into(jzvdStdShowTitleAfterFullscreen.thumbImageView); - jzVideoPlayerStandardShowTextureViewAfterAutoComplete = findViewById(R.id.custom_videoplayer_standard_show_textureview_aoto_complete); - jzVideoPlayerStandardShowTextureViewAfterAutoComplete.setUp(VideoConstant.videoUrlList[5], "饺子想旅行", Jzvd.SCREEN_WINDOW_NORMAL + jzvdStdShowTextureViewAfterAutoComplete = findViewById(R.id.custom_videoplayer_standard_show_textureview_aoto_complete); + jzvdStdShowTextureViewAfterAutoComplete.setUp(VideoConstant.videoUrlList[5], "饺子想旅行", Jzvd.SCREEN_WINDOW_NORMAL ); Glide.with(this) .load(VideoConstant.videoThumbList[5]) - .into(jzVideoPlayerStandardShowTextureViewAfterAutoComplete.thumbImageView); + .into(jzvdStdShowTextureViewAfterAutoComplete.thumbImageView); - jzVideoPlayerStandardAutoCompleteAfterFullscreen = findViewById(R.id.custom_videoplayer_standard_aoto_complete); - jzVideoPlayerStandardAutoCompleteAfterFullscreen.setUp(VideoConstant.videoUrls[0][1], "饺子没来", Jzvd.SCREEN_WINDOW_NORMAL + jzvdStdAutoCompleteAfterFullscreen = findViewById(R.id.custom_videoplayer_standard_aoto_complete); + jzvdStdAutoCompleteAfterFullscreen.setUp(VideoConstant.videoUrls[0][1], "饺子没来", Jzvd.SCREEN_WINDOW_NORMAL ); Glide.with(this) .load(VideoConstant.videoThumbs[0][1]) - .into(jzVideoPlayerStandardAutoCompleteAfterFullscreen.thumbImageView); + .into(jzvdStdAutoCompleteAfterFullscreen.thumbImageView); jzvdStd_1_1 = findViewById(R.id.jz_videoplayer_1_1); jzvdStd_1_1.setUp(VideoConstant.videoUrls[0][1], "饺子有事吗", Jzvd.SCREEN_WINDOW_NORMAL @@ -86,19 +86,19 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { jzvdStd_16_9.widthRatio = 16; jzvdStd_16_9.heightRatio = 9; - jzVideoPlayerStandardVolumeAfterFullscreen = findViewById(R.id.jz_videoplayer_volume); - jzVideoPlayerStandardVolumeAfterFullscreen.setUp(VideoConstant.videoUrls[0][1], "饺子摇摆", Jzvd.SCREEN_WINDOW_NORMAL + jzvdStdVolumeAfterFullscreen = findViewById(R.id.jz_videoplayer_volume); + jzvdStdVolumeAfterFullscreen.setUp(VideoConstant.videoUrls[0][1], "饺子摇摆", Jzvd.SCREEN_WINDOW_NORMAL ); Glide.with(this) .load(VideoConstant.videoThumbs[0][1]) - .into(jzVideoPlayerStandardVolumeAfterFullscreen.thumbImageView); + .into(jzvdStdVolumeAfterFullscreen.thumbImageView); - jzVideoPlayerStandardMp3 = findViewById(R.id.jz_videoplayer_mp3); - jzVideoPlayerStandardMp3.setUp("https://in-20170815011809382-q34ludd68h.oss-cn-shanghai.aliyuncs.com/video/401edae1-16431aa8156-0007-1823-c86-de200.mp3?Expires=1532102862&OSSAccessKeyId=LTAIPZHZDaUNpnca&Signature=apruidffjNeN0O584VJiz8q1mJ4%3D", "饺子摇摆", Jzvd.SCREEN_WINDOW_NORMAL + jzvdStdMp3 = findViewById(R.id.jz_videoplayer_mp3); + jzvdStdMp3.setUp("https://in-20170815011809382-q34ludd68h.oss-cn-shanghai.aliyuncs.com/video/401edae1-16431aa8156-0007-1823-c86-de200.mp3?Expires=1532102862&OSSAccessKeyId=LTAIPZHZDaUNpnca&Signature=apruidffjNeN0O584VJiz8q1mJ4%3D", "饺子摇摆", Jzvd.SCREEN_WINDOW_NORMAL ); Glide.with(this) .load(VideoConstant.videoThumbs[0][1]) - .into(jzVideoPlayerStandardMp3.thumbImageView); + .into(jzvdStdMp3.thumbImageView); } diff --git a/app/src/main/java/cn/jzvd/demo/ActivityListViewMultiHolder.java b/app/src/main/java/cn/jzvd/demo/ActivityListViewMultiHolder.java index 50ea7be22..4f45b88a2 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityListViewMultiHolder.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityListViewMultiHolder.java @@ -79,7 +79,7 @@ public boolean onOptionsItemSelected(MenuItem item) { public class VideoListAdapter extends BaseAdapter { - int[] viewtype = {0, 0, 0, 1, 0, 0, 0, 1, 0, 0};//1 = jzvd, 0 = textView + int[] viewtype = {0, 0, 0, 1, 0, 0, 0, 1, 0, 0};//1 = jzvdStd, 0 = textView Context context; LayoutInflater mInflater; @@ -113,17 +113,17 @@ public View getView(int position, View convertView, ViewGroup parent) { } else { viewHolder = new VideoHolder(); convertView = mInflater.inflate(R.layout.item_videoview, null); - viewHolder.jzVideoPlayer = convertView.findViewById(R.id.videoplayer); + viewHolder.jzvdStd = convertView.findViewById(R.id.videoplayer); convertView.setTag(viewHolder); } - viewHolder.jzVideoPlayer.setUp( + viewHolder.jzvdStd.setUp( VideoConstant.videoUrls[0][position], VideoConstant.videoTitles[0][position], Jzvd.SCREEN_WINDOW_LIST); - viewHolder.jzVideoPlayer.positionInList = position; + viewHolder.jzvdStd.positionInList = position; Glide.with(ActivityListViewMultiHolder.this) .load(VideoConstant.videoThumbs[0][position]) - .into(viewHolder.jzVideoPlayer.thumbImageView); + .into(viewHolder.jzvdStd.thumbImageView); } else { TextViewHolder textViewHolder; if (convertView != null && convertView.getTag() != null && convertView.getTag() instanceof TextViewHolder) { @@ -150,7 +150,7 @@ public int getViewTypeCount() { } class VideoHolder { - JzvdStd jzVideoPlayer; + JzvdStd jzvdStd; } class TextViewHolder { diff --git a/app/src/main/java/cn/jzvd/demo/ActivityMain.java b/app/src/main/java/cn/jzvd/demo/ActivityMain.java index dd71741d6..71728c043 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityMain.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityMain.java @@ -22,7 +22,7 @@ public class ActivityMain extends AppCompatActivity implements View.OnClickListener { - MyJzvdStd myJZVideoPlayerStandard; + MyJzvdStd myJzvdStd; Button mTinyWindow, mListView, mDirectFullscreen, mApi, mWebView; @@ -43,10 +43,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { mApi.setOnClickListener(this); mWebView.setOnClickListener(this); - myJZVideoPlayerStandard = findViewById(R.id.jz_video); - myJZVideoPlayerStandard.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4" + myJzvdStd = findViewById(R.id.jz_video); + myJzvdStd.setUp("http://jzvdStd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4" , "饺子快长大", JzvdStd.SCREEN_WINDOW_NORMAL); - Glide.with(this).load("http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png").into(myJZVideoPlayerStandard.thumbImageView); + Glide.with(this).load("http://jzvdStd-pic.nathen.cn/jzvdStd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png").into(myJzvdStd.thumbImageView); Jzvd.setJzUserAction(new MyUserActionStd()); } @@ -86,7 +86,7 @@ public void onClick(View v) { } /** - * 这只是给埋点统计用户数据用的,不能写和播放相关的逻辑,监听事件请参考MyJZVideoPlayerStandard,复写函数取得相应事件 + * 这只是给埋点统计用户数据用的,不能写和播放相关的逻辑,监听事件请参考MyJzvdStd,复写函数取得相应事件 */ class MyUserActionStd implements JZUserActionStd { diff --git a/app/src/main/java/cn/jzvd/demo/ActivityTinyWindow.java b/app/src/main/java/cn/jzvd/demo/ActivityTinyWindow.java index 3ee20a63b..294519d86 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityTinyWindow.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityTinyWindow.java @@ -33,10 +33,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { setContentView(R.layout.activity_tiny_window); mJzvdStd = findViewById(R.id.jz_video); - mJzvdStd.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4", "饺子快长大" + mJzvdStd.setUp("http://jzvdStd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4", "饺子快长大" , JzvdStd.SCREEN_WINDOW_NORMAL); Glide.with(this) - .load("http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png") + .load("http://jzvdStd-pic.nathen.cn/jzvdStd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png") .into(mJzvdStd.thumbImageView); mBtnTinyWindow = findViewById(R.id.tiny_window); diff --git a/app/src/main/java/cn/jzvd/demo/ActivityTinyWindowListViewMultiHolder.java b/app/src/main/java/cn/jzvd/demo/ActivityTinyWindowListViewMultiHolder.java index 6c25ca04b..fc89cf908 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityTinyWindowListViewMultiHolder.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityTinyWindowListViewMultiHolder.java @@ -79,7 +79,7 @@ public boolean onOptionsItemSelected(MenuItem item) { public class VideoListAdapter extends BaseAdapter { - int[] viewtype = {0, 0, 0, 1, 0, 0, 0, 1, 0, 0};//1 = jzvd, 0 = textView + int[] viewtype = {0, 0, 0, 1, 0, 0, 0, 1, 0, 0};//1 = jzvdStd, 0 = textView Context context; LayoutInflater mInflater; @@ -113,15 +113,15 @@ public View getView(int position, View convertView, ViewGroup parent) { } else { viewHolder = new VideoHolder(); convertView = mInflater.inflate(R.layout.item_videoview, null); - viewHolder.jzVideoPlayer = convertView.findViewById(R.id.videoplayer); + viewHolder.jzvdStd = convertView.findViewById(R.id.videoplayer); convertView.setTag(viewHolder); } - viewHolder.jzVideoPlayer.setUp( + viewHolder.jzvdStd.setUp( VideoConstant.videoUrls[0][position], VideoConstant.videoTitles[0][position], Jzvd.SCREEN_WINDOW_LIST); - viewHolder.jzVideoPlayer.positionInList = position; - Glide.with(ActivityTinyWindowListViewMultiHolder.this).load(VideoConstant.videoThumbs[0][position]).into(viewHolder.jzVideoPlayer.thumbImageView); + viewHolder.jzvdStd.positionInList = position; + Glide.with(ActivityTinyWindowListViewMultiHolder.this).load(VideoConstant.videoThumbs[0][position]).into(viewHolder.jzvdStd.thumbImageView); } else { TextViewHolder textViewHolder; if (convertView != null && convertView.getTag() != null && convertView.getTag() instanceof VideoListAdapter.TextViewHolder) { @@ -148,7 +148,7 @@ public int getViewTypeCount() { } class VideoHolder { - JzvdStd jzVideoPlayer; + JzvdStd jzvdStd; } class TextViewHolder { diff --git a/app/src/main/java/cn/jzvd/demo/ActivityTinyWindowRecycleViewMultiHolder.java b/app/src/main/java/cn/jzvd/demo/ActivityTinyWindowRecycleViewMultiHolder.java index 6e9fb9494..1647802f1 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityTinyWindowRecycleViewMultiHolder.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityTinyWindowRecycleViewMultiHolder.java @@ -106,11 +106,11 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { TextHolder textHolder = (TextHolder) holder; } else { VideoHolder videoHolder = (VideoHolder) holder; - videoHolder.jzVideoPlayer.setUp( + videoHolder.jzvdStd.setUp( VideoConstant.videoUrls[0][position], VideoConstant.videoTitles[0][position], Jzvd.SCREEN_WINDOW_LIST); - videoHolder.jzVideoPlayer.positionInList = position; - Glide.with(ActivityTinyWindowRecycleViewMultiHolder.this).load(VideoConstant.videoThumbs[0][position]).into(videoHolder.jzVideoPlayer.thumbImageView); + videoHolder.jzvdStd.positionInList = position; + Glide.with(ActivityTinyWindowRecycleViewMultiHolder.this).load(VideoConstant.videoThumbs[0][position]).into(videoHolder.jzvdStd.thumbImageView); } } @@ -120,11 +120,11 @@ public int getItemCount() { } class VideoHolder extends RecyclerView.ViewHolder { - JzvdStd jzVideoPlayer; + JzvdStd jzvdStd; public VideoHolder(View itemView) { super(itemView); - jzVideoPlayer = itemView.findViewById(R.id.videoplayer); + jzvdStd = itemView.findViewById(R.id.videoplayer); } } diff --git a/app/src/main/java/cn/jzvd/demo/ActivityWebView.java b/app/src/main/java/cn/jzvd/demo/ActivityWebView.java index 619ebba57..1bd27b8b3 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityWebView.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityWebView.java @@ -34,8 +34,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { setContentView(R.layout.activity_webview); mWebView = findViewById(R.id.webview); mWebView.getSettings().setJavaScriptEnabled(true); - mWebView.addJavascriptInterface(new JZCallBack(), "jzvd"); - mWebView.loadUrl("file:///android_asset/jzvd.html"); + mWebView.addJavascriptInterface(new JZCallBack(), "jzvdStd"); + mWebView.loadUrl("file:///android_asset/jzvdStd.html"); } @Override diff --git a/app/src/main/java/cn/jzvd/demo/AdapterRecyclerViewVideo.java b/app/src/main/java/cn/jzvd/demo/AdapterRecyclerViewVideo.java index d452eba02..b0c8418b5 100644 --- a/app/src/main/java/cn/jzvd/demo/AdapterRecyclerViewVideo.java +++ b/app/src/main/java/cn/jzvd/demo/AdapterRecyclerViewVideo.java @@ -34,12 +34,12 @@ public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { @SuppressLint("LongLogTag") @Override public void onBindViewHolder(MyViewHolder holder, int position) { - Log.i(TAG, "onBindViewHolder [" + holder.jzVideoPlayer.hashCode() + "] position=" + position); + Log.i(TAG, "onBindViewHolder [" + holder.jzvdStd.hashCode() + "] position=" + position); - holder.jzVideoPlayer.setUp( + holder.jzvdStd.setUp( VideoConstant.videoUrls[0][position], VideoConstant.videoTitles[0][position], Jzvd.SCREEN_WINDOW_LIST); - Glide.with(holder.jzVideoPlayer.getContext()).load(VideoConstant.videoThumbs[0][position]).into(holder.jzVideoPlayer.thumbImageView); + Glide.with(holder.jzvdStd.getContext()).load(VideoConstant.videoThumbs[0][position]).into(holder.jzvdStd.thumbImageView); } @Override @@ -48,11 +48,11 @@ public int getItemCount() { } class MyViewHolder extends RecyclerView.ViewHolder { - JzvdStd jzVideoPlayer; + JzvdStd jzvdStd; public MyViewHolder(View itemView) { super(itemView); - jzVideoPlayer = itemView.findViewById(R.id.videoplayer); + jzvdStd = itemView.findViewById(R.id.videoplayer); } } diff --git a/app/src/main/java/cn/jzvd/demo/AdapterVideoList.java b/app/src/main/java/cn/jzvd/demo/AdapterVideoList.java index 8e92ee722..121d53ee7 100644 --- a/app/src/main/java/cn/jzvd/demo/AdapterVideoList.java +++ b/app/src/main/java/cn/jzvd/demo/AdapterVideoList.java @@ -17,7 +17,7 @@ */ public class AdapterVideoList extends BaseAdapter { - public static final String TAG = "JiaoZiVideoPlayer"; + public static final String TAG = "JZVD"; Context context; @@ -59,18 +59,18 @@ public View getView(int position, View convertView, ViewGroup parent) { } else { viewHolder = (ViewHolder) convertView.getTag(); } - viewHolder.jzVideoPlayer = convertView.findViewById(R.id.videoplayer); - viewHolder.jzVideoPlayer.setUp( + viewHolder.jzvdStd = convertView.findViewById(R.id.videoplayer); + viewHolder.jzvdStd.setUp( videoUrls[position], videoTitles[position], Jzvd.SCREEN_WINDOW_LIST); Glide.with(convertView.getContext()) .load(videoThumbs[position]) - .into(viewHolder.jzVideoPlayer.thumbImageView); - viewHolder.jzVideoPlayer.positionInList = position; + .into(viewHolder.jzvdStd.thumbImageView); + viewHolder.jzvdStd.positionInList = position; return convertView; } class ViewHolder { - JzvdStd jzVideoPlayer; + JzvdStd jzvdStd; } } diff --git a/app/src/main/java/cn/jzvd/demo/VideoConstant.java b/app/src/main/java/cn/jzvd/demo/VideoConstant.java index 77342738e..70c20243f 100644 --- a/app/src/main/java/cn/jzvd/demo/VideoConstant.java +++ b/app/src/main/java/cn/jzvd/demo/VideoConstant.java @@ -7,79 +7,79 @@ public class VideoConstant { public static String[] videoUrlList = { - "http://jzvd.nathen.cn/c494b340ff704015bb6682ffde3cd302/64929c369124497593205a4190d7d128-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/63f3f73712544394be981d9e4f56b612/69c5767bb9e54156b5b60a1b6edeb3b5-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/b201be3093814908bf987320361c5a73/2f6d913ea25941ffa78cc53a59025383-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/d2438fd1c37c4618a704513ad38d68c5/68626a9d53ca421c896ac8010f172b68-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/25a8d119cfa94b49a7a4117257d8ebd7/f733e65a22394abeab963908f3c336db-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/7512edd1ad834d40bb5b978402274b1a/9691c7f2d7b74b5e811965350a0e5772-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4" + "http://jzvdStd.nathen.cn/c494b340ff704015bb6682ffde3cd302/64929c369124497593205a4190d7d128-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/63f3f73712544394be981d9e4f56b612/69c5767bb9e54156b5b60a1b6edeb3b5-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/b201be3093814908bf987320361c5a73/2f6d913ea25941ffa78cc53a59025383-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/d2438fd1c37c4618a704513ad38d68c5/68626a9d53ca421c896ac8010f172b68-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/25a8d119cfa94b49a7a4117257d8ebd7/f733e65a22394abeab963908f3c336db-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/7512edd1ad834d40bb5b978402274b1a/9691c7f2d7b74b5e811965350a0e5772-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4" }; public static String[] videoThumbList = { - "http://jzvd-pic.nathen.cn/jzvd-pic/00b026e7-b830-4994-bc87-38f4033806a6.jpg", - "http://jzvd-pic.nathen.cn/jzvd-pic/1d935cc5-a1e7-4779-bdfa-20fd7a60724c.jpg", - "http://jzvd-pic.nathen.cn/jzvd-pic/a019ffc1-556c-4a85-b70c-b1b49811d577.jpg", - "http://jzvd-pic.nathen.cn/jzvd-pic/6fc2ae91-36e2-44c5-bb10-29ae5d5c678c.png", - "http://jzvd-pic.nathen.cn/jzvd-pic/f03cee95-9b78-4dd5-986f-d162c06c385c.png", - "http://jzvd-pic.nathen.cn/jzvd-pic/e7ea659f-c3d2-4979-9ea5-f993b05e5930.png", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/00b026e7-b830-4994-bc87-38f4033806a6.jpg", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/1d935cc5-a1e7-4779-bdfa-20fd7a60724c.jpg", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/a019ffc1-556c-4a85-b70c-b1b49811d577.jpg", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/6fc2ae91-36e2-44c5-bb10-29ae5d5c678c.png", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/f03cee95-9b78-4dd5-986f-d162c06c385c.png", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/e7ea659f-c3d2-4979-9ea5-f993b05e5930.png", "" }; public static String[][] videoUrls = { { - "http://jzvd.nathen.cn/6ea7357bc3fa4658b29b7933ba575008/fbbba953374248eb913cb1408dc61d85-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/35b3dc97fbc240219961bd1fccc6400b/8d9b76ab5a584bce84a8afce012b72d3-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/df6096e7878541cbbea3f7298683fbed/ef76450342914427beafe9368a4e0397-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/384d341e000145fb82295bdc54ecef88/103eab5afca34baebc970378dd484942-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/f55530ba8a59403da0621cbf4faef15e/adae4f2e3ecf4ea780beb057e7bce84c-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/6340efd1962946ad80eeffd19b3be89c/65b499c0f16e4dd8900497e51ffa0949-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/f07fa9fddd1e45a6ae1570c7fe7967c1/c6db82685b894e25b523b1cb28d79f2e-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/d2e969f2ec734520b46ab0965d2b68bd/f124edfef6c24be8b1a7b7f996ccc5e0-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/4f965ad507ef4194a60a943a34cfe147/32af151ea132471f92c9ced2cff785ea-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4" + "http://jzvdStd.nathen.cn/6ea7357bc3fa4658b29b7933ba575008/fbbba953374248eb913cb1408dc61d85-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/35b3dc97fbc240219961bd1fccc6400b/8d9b76ab5a584bce84a8afce012b72d3-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/df6096e7878541cbbea3f7298683fbed/ef76450342914427beafe9368a4e0397-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/384d341e000145fb82295bdc54ecef88/103eab5afca34baebc970378dd484942-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/f55530ba8a59403da0621cbf4faef15e/adae4f2e3ecf4ea780beb057e7bce84c-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/6340efd1962946ad80eeffd19b3be89c/65b499c0f16e4dd8900497e51ffa0949-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/f07fa9fddd1e45a6ae1570c7fe7967c1/c6db82685b894e25b523b1cb28d79f2e-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/d2e969f2ec734520b46ab0965d2b68bd/f124edfef6c24be8b1a7b7f996ccc5e0-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/4f965ad507ef4194a60a943a34cfe147/32af151ea132471f92c9ced2cff785ea-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4" }, { - "http://jzvd.nathen.cn/623f75c3beea4b1781ea37940e70bbe4/b9cee3fd1a09487ca99ef789cdc41312-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/d8c137ceba9849f8b2f454a55a96266f/910c8381ff894905b5bc272f8194382a-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/b8a589e5f12c45fdad96674d08affd31/f1d7229f553f414283033af3e292c6c9-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/8abcdf98ec6a418b945a70fe9dd6fc7f/5cb36416a23a4da8b15d3eaa5e19a1e6-5287d2089db37e62345123a1be272f8b.mp4" + "http://jzvdStd.nathen.cn/623f75c3beea4b1781ea37940e70bbe4/b9cee3fd1a09487ca99ef789cdc41312-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/d8c137ceba9849f8b2f454a55a96266f/910c8381ff894905b5bc272f8194382a-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/b8a589e5f12c45fdad96674d08affd31/f1d7229f553f414283033af3e292c6c9-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/8abcdf98ec6a418b945a70fe9dd6fc7f/5cb36416a23a4da8b15d3eaa5e19a1e6-5287d2089db37e62345123a1be272f8b.mp4" }, { - "http://jzvd.nathen.cn/1b61da23555d4ce28c805ea303711aa5/7a33ac2af276441bb4b9838f32d8d710-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/d525f756aabf4b0588c2152fb94e07f5/d9f59bef829a472a9ca066620d9b871a-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/6e2fdec45dfa44a6802e95f8e4bc3280/a6a5273ac4244333923991be0583ffc7-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvd.nathen.cn/22b4de0e2b1245959c5baa77fe0bf14e/896a137559084b7eb879f5441faff20d-5287d2089db37e62345123a1be272f8b.mp4" + "http://jzvdStd.nathen.cn/1b61da23555d4ce28c805ea303711aa5/7a33ac2af276441bb4b9838f32d8d710-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/d525f756aabf4b0588c2152fb94e07f5/d9f59bef829a472a9ca066620d9b871a-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/6e2fdec45dfa44a6802e95f8e4bc3280/a6a5273ac4244333923991be0583ffc7-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvdStd.nathen.cn/22b4de0e2b1245959c5baa77fe0bf14e/896a137559084b7eb879f5441faff20d-5287d2089db37e62345123a1be272f8b.mp4" } }; public static String[][] videoThumbs = { { - "http://jzvd-pic.nathen.cn/jzvd-pic/bd7ffc84-8407-4037-a078-7d922ce0fb0f.jpg", - "http://jzvd-pic.nathen.cn/jzvd-pic/f2dbd12e-b1cb-4daf-aff1-8c6be2f64d1a.jpg", - "http://jzvd-pic.nathen.cn/jzvd-pic/ccd86ca1-66c7-4331-9450-a3b7f765424a.png", - "http://jzvd-pic.nathen.cn/jzvd-pic/2adde364-9be1-4864-b4b9-0b0bcc81ef2e.jpg", - "http://jzvd-pic.nathen.cn/jzvd-pic/2a877211-4b68-4e3a-87be-6d2730faef27.png", - "http://jzvd-pic.nathen.cn/jzvd-pic/aaeb5da9-ac50-4712-a28d-863fe40f1fc6.png", - "http://jzvd-pic.nathen.cn/jzvd-pic/e565f9cc-eedc-45f0-99f8-5b0fa3aed567%281%29.jpg", - "http://jzvd-pic.nathen.cn/jzvd-pic/3430ec64-e6a7-4d8e-b044-9d408e075b7c.jpg", - "http://jzvd-pic.nathen.cn/jzvd-pic/2204a578-609b-440e-8af7-a0ee17ff3aee.jpg", - "http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png" + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/bd7ffc84-8407-4037-a078-7d922ce0fb0f.jpg", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/f2dbd12e-b1cb-4daf-aff1-8c6be2f64d1a.jpg", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/ccd86ca1-66c7-4331-9450-a3b7f765424a.png", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/2adde364-9be1-4864-b4b9-0b0bcc81ef2e.jpg", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/2a877211-4b68-4e3a-87be-6d2730faef27.png", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/aaeb5da9-ac50-4712-a28d-863fe40f1fc6.png", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/e565f9cc-eedc-45f0-99f8-5b0fa3aed567%281%29.jpg", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/3430ec64-e6a7-4d8e-b044-9d408e075b7c.jpg", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/2204a578-609b-440e-8af7-a0ee17ff3aee.jpg", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png" }, { - "http://jzvd-pic.nathen.cn/jzvd-pic/f18ee453-6aec-40a5-a046-3203111dd303.jpg", - "http://jzvd-pic.nathen.cn/jzvd-pic/00f5a243-1e9f-426c-94f4-888971987edb.jpg", - "http://jzvd-pic.nathen.cn/jzvd-pic/7df34ee9-1e4f-48f4-8acd-748c52368298.jpg", - "http://jzvd-pic.nathen.cn/jzvd-pic/ef46e139-e378-4298-8441-144888294f1f.png" + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/f18ee453-6aec-40a5-a046-3203111dd303.jpg", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/00f5a243-1e9f-426c-94f4-888971987edb.jpg", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/7df34ee9-1e4f-48f4-8acd-748c52368298.jpg", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/ef46e139-e378-4298-8441-144888294f1f.png" }, { - "http://jzvd-pic.nathen.cn/jzvd-pic/0e58101d-5b47-4100-8fb3-0cce057fd622.jpg", - "http://jzvd-pic.nathen.cn/jzvd-pic/d6d3a520-b183-4867-8746-5b6aba6c1724.png", - "http://jzvd-pic.nathen.cn/jzvd-pic/caa3dade-5744-486d-a1b7-9780aebb9eb5.jpg", - "http://jzvd-pic.nathen.cn/jzvd-pic/2c3e62bb-6a32-4fb0-a1d5-d1260ad436a4.png" + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/0e58101d-5b47-4100-8fb3-0cce057fd622.jpg", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/d6d3a520-b183-4867-8746-5b6aba6c1724.png", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/caa3dade-5744-486d-a1b7-9780aebb9eb5.jpg", + "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/2c3e62bb-6a32-4fb0-a1d5-d1260ad436a4.png" } }; diff --git a/jiaozivideoplayer/src/main/java/cn/jzvd/JZMediaManager.java b/jiaozivideoplayer/src/main/java/cn/jzvd/JZMediaManager.java index 7aab14afe..f577aa854 100644 --- a/jiaozivideoplayer/src/main/java/cn/jzvd/JZMediaManager.java +++ b/jiaozivideoplayer/src/main/java/cn/jzvd/JZMediaManager.java @@ -15,7 +15,7 @@ */ public class JZMediaManager implements TextureView.SurfaceTextureListener { - public static final String TAG = "JiaoZiVideoPlayer"; + public static final String TAG = "JZVD"; public static final int HANDLER_PREPARE = 0; public static final int HANDLER_RELEASE = 2; diff --git a/jiaozivideoplayer/src/main/java/cn/jzvd/JZUtils.java b/jiaozivideoplayer/src/main/java/cn/jzvd/JZUtils.java index 5d75d7f6b..5b94378f5 100755 --- a/jiaozivideoplayer/src/main/java/cn/jzvd/JZUtils.java +++ b/jiaozivideoplayer/src/main/java/cn/jzvd/JZUtils.java @@ -19,7 +19,7 @@ * On 2016/02/21 12:25 */ public class JZUtils { - public static final String TAG = "JiaoZiVideoPlayer"; + public static final String TAG = "JZVD"; public static String stringForTime(long timeMs) { if (timeMs <= 0 || timeMs >= 24 * 60 * 60 * 1000) { diff --git a/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java b/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java index a91b295e7..13c59418f 100644 --- a/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java +++ b/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java @@ -36,7 +36,7 @@ */ public abstract class Jzvd extends FrameLayout implements View.OnClickListener, SeekBar.OnSeekBarChangeListener, View.OnTouchListener { - public static final String TAG = "JiaoZiVideoPlayer"; + public static final String TAG = "JZVD"; public static final int THRESHOLD = 80; public static final int FULL_SCREEN_NORMAL_DELAY = 300; @@ -320,8 +320,8 @@ public static void onScrollReleaseAllVideos(AbsListView view, int firstVisibleIt public static void onChildViewAttachedToWindow(View view, int jzvdId) { if (JzvdMgr.getCurrentJzvd() != null && JzvdMgr.getCurrentJzvd().currentScreen == Jzvd.SCREEN_WINDOW_TINY) { - Jzvd videoPlayer = view.findViewById(jzvdId); - if (videoPlayer != null && videoPlayer.jzDataSource.containsTheUrl(JZMediaManager.getCurrentUrl())) { + Jzvd jzvd = view.findViewById(jzvdId); + if (jzvd != null && jzvd.jzDataSource.containsTheUrl(JZMediaManager.getCurrentUrl())) { Jzvd.backPress(); } } @@ -329,12 +329,12 @@ public static void onChildViewAttachedToWindow(View view, int jzvdId) { public static void onChildViewDetachedFromWindow(View view) { if (JzvdMgr.getCurrentJzvd() != null && JzvdMgr.getCurrentJzvd().currentScreen != Jzvd.SCREEN_WINDOW_TINY) { - Jzvd videoPlayer = JzvdMgr.getCurrentJzvd(); - if (((ViewGroup) view).indexOfChild(videoPlayer) != -1) { - if (videoPlayer.currentState == Jzvd.CURRENT_STATE_PAUSE) { + Jzvd jzvd = JzvdMgr.getCurrentJzvd(); + if (((ViewGroup) view).indexOfChild(jzvd) != -1) { + if (jzvd.currentState == Jzvd.CURRENT_STATE_PAUSE) { Jzvd.releaseAllVideos(); } else { - videoPlayer.startWindowTiny(); + jzvd.startWindowTiny(); } } } From d32d9f3a70e3a1e8e93457e6cd7ec8c7a4292d28 Mon Sep 17 00:00:00 2001 From: Nathen <821537155@qq.com> Date: Thu, 6 Sep 2018 11:14:25 +0800 Subject: [PATCH 3/6] change url by url --- jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java | 15 +++++++++++++++ .../src/main/java/cn/jzvd/JzvdStd.java | 8 ++++++++ 2 files changed, 23 insertions(+) diff --git a/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java b/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java index 13c59418f..ec47ae57a 100644 --- a/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java +++ b/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java @@ -661,6 +661,21 @@ public void changeUrl(int urlMapIndex, long seekToInAdvance) { JZMediaManager.instance().prepare(); } + public void changeUrl(JZDataSource jzDataSource, long seekToInAdvance) { + currentState = CURRENT_STATE_PREPARING_CHANGING_URL; + this.seekToInAdvance = seekToInAdvance; + this.jzDataSource = jzDataSource; + if (JzvdMgr.getSecondFloor() != null && JzvdMgr.getFirstFloor() != null) { + JzvdMgr.getFirstFloor().jzDataSource = jzDataSource; + } + JZMediaManager.setDataSource(jzDataSource); + JZMediaManager.instance().prepare(); + } + + public void changeUrl(String url, String title, long seekToInAdvance) { + changeUrl(new JZDataSource(url, title), seekToInAdvance); + } + public void onStatePrepared() {//因为这个紧接着就会进入播放状态,所以不设置state if (seekToInAdvance != 0) { JZMediaManager.seekTo(seekToInAdvance); diff --git a/jiaozivideoplayer/src/main/java/cn/jzvd/JzvdStd.java b/jiaozivideoplayer/src/main/java/cn/jzvd/JzvdStd.java index bc54f0dc3..e653d4cc7 100644 --- a/jiaozivideoplayer/src/main/java/cn/jzvd/JzvdStd.java +++ b/jiaozivideoplayer/src/main/java/cn/jzvd/JzvdStd.java @@ -186,6 +186,14 @@ public void changeUrl(int urlMapIndex, long seekToInAdvance) { startButton.setVisibility(INVISIBLE); } + @Override + public void changeUrl(JZDataSource jzDataSource, long seekToInAdvance) { + super.changeUrl(jzDataSource, seekToInAdvance); + titleTextView.setText(jzDataSource.title); + loadingProgressBar.setVisibility(VISIBLE); + startButton.setVisibility(INVISIBLE); + } + @Override public void onStatePlaying() { super.onStatePlaying(); From ce652c21e695d04c8b6b976cd6c9e330755e778e Mon Sep 17 00:00:00 2001 From: Nathen <821537155@qq.com> Date: Thu, 6 Sep 2018 12:28:01 +0800 Subject: [PATCH 4/6] fix url --- .../demo/ActivityApiCustomMediaPlayer.java | 2 +- .../main/java/cn/jzvd/demo/ActivityMain.java | 9 +- .../java/cn/jzvd/demo/ActivityTinyWindow.java | 4 +- .../main/java/cn/jzvd/demo/VideoConstant.java | 98 +++++++++---------- 4 files changed, 58 insertions(+), 55 deletions(-) diff --git a/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMediaPlayer.java b/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMediaPlayer.java index bef3a8da0..32697b9fd 100755 --- a/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMediaPlayer.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMediaPlayer.java @@ -58,7 +58,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { } jzvdStd.setUp(jzDataSource, JzvdStd.SCREEN_WINDOW_NORMAL); Glide.with(this) - .load("http://jzvdStd-pic.nathen.cn/jzvdStd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png") + .load("http://jzvd-pic.nathen.cn/jzvdStd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png") .into(jzvdStd.thumbImageView); Jzvd.setMediaInterface(new CustomMediaPlayerAssertFolder());//进入此页面修改MediaInterface,让此页面的jzvd正常工作 diff --git a/app/src/main/java/cn/jzvd/demo/ActivityMain.java b/app/src/main/java/cn/jzvd/demo/ActivityMain.java index 71728c043..43e2d6fd0 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityMain.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityMain.java @@ -44,10 +44,11 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { mWebView.setOnClickListener(this); myJzvdStd = findViewById(R.id.jz_video); - myJzvdStd.setUp("http://jzvdStd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4" + myJzvdStd.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4" , "饺子快长大", JzvdStd.SCREEN_WINDOW_NORMAL); - Glide.with(this).load("http://jzvdStd-pic.nathen.cn/jzvdStd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png").into(myJzvdStd.thumbImageView); + Glide.with(this).load("http://jzvd-pic.nathen.cn/jzvdStd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png").into(myJzvdStd.thumbImageView); Jzvd.setJzUserAction(new MyUserActionStd()); + } @Override @@ -68,7 +69,9 @@ public void onBackPressed() { public void onClick(View v) { switch (v.getId()) { case R.id.api: - startActivity(new Intent(ActivityMain.this, ActivityApi.class)); + myJzvdStd.changeUrl(VideoConstant.videoUrls[0][3], "fdsfdsfdsa", 0); + +// startActivity(new Intent(ActivityMain.this, ActivityApi.class)); break; case R.id.listview: startActivity(new Intent(ActivityMain.this, ActivityListView.class)); diff --git a/app/src/main/java/cn/jzvd/demo/ActivityTinyWindow.java b/app/src/main/java/cn/jzvd/demo/ActivityTinyWindow.java index 294519d86..7ef1ef153 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityTinyWindow.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityTinyWindow.java @@ -33,10 +33,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { setContentView(R.layout.activity_tiny_window); mJzvdStd = findViewById(R.id.jz_video); - mJzvdStd.setUp("http://jzvdStd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4", "饺子快长大" + mJzvdStd.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4", "饺子快长大" , JzvdStd.SCREEN_WINDOW_NORMAL); Glide.with(this) - .load("http://jzvdStd-pic.nathen.cn/jzvdStd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png") + .load("http://jzvd-pic.nathen.cn/jzvdStd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png") .into(mJzvdStd.thumbImageView); mBtnTinyWindow = findViewById(R.id.tiny_window); diff --git a/app/src/main/java/cn/jzvd/demo/VideoConstant.java b/app/src/main/java/cn/jzvd/demo/VideoConstant.java index 70c20243f..cfabf8edd 100644 --- a/app/src/main/java/cn/jzvd/demo/VideoConstant.java +++ b/app/src/main/java/cn/jzvd/demo/VideoConstant.java @@ -7,79 +7,79 @@ public class VideoConstant { public static String[] videoUrlList = { - "http://jzvdStd.nathen.cn/c494b340ff704015bb6682ffde3cd302/64929c369124497593205a4190d7d128-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/63f3f73712544394be981d9e4f56b612/69c5767bb9e54156b5b60a1b6edeb3b5-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/b201be3093814908bf987320361c5a73/2f6d913ea25941ffa78cc53a59025383-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/d2438fd1c37c4618a704513ad38d68c5/68626a9d53ca421c896ac8010f172b68-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/25a8d119cfa94b49a7a4117257d8ebd7/f733e65a22394abeab963908f3c336db-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/7512edd1ad834d40bb5b978402274b1a/9691c7f2d7b74b5e811965350a0e5772-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4" + "http://jzvd.nathen.cn/c494b340ff704015bb6682ffde3cd302/64929c369124497593205a4190d7d128-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/63f3f73712544394be981d9e4f56b612/69c5767bb9e54156b5b60a1b6edeb3b5-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/b201be3093814908bf987320361c5a73/2f6d913ea25941ffa78cc53a59025383-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/d2438fd1c37c4618a704513ad38d68c5/68626a9d53ca421c896ac8010f172b68-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/25a8d119cfa94b49a7a4117257d8ebd7/f733e65a22394abeab963908f3c336db-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/7512edd1ad834d40bb5b978402274b1a/9691c7f2d7b74b5e811965350a0e5772-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4" }; public static String[] videoThumbList = { - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/00b026e7-b830-4994-bc87-38f4033806a6.jpg", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/1d935cc5-a1e7-4779-bdfa-20fd7a60724c.jpg", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/a019ffc1-556c-4a85-b70c-b1b49811d577.jpg", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/6fc2ae91-36e2-44c5-bb10-29ae5d5c678c.png", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/f03cee95-9b78-4dd5-986f-d162c06c385c.png", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/e7ea659f-c3d2-4979-9ea5-f993b05e5930.png", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/00b026e7-b830-4994-bc87-38f4033806a6.jpg", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/1d935cc5-a1e7-4779-bdfa-20fd7a60724c.jpg", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/a019ffc1-556c-4a85-b70c-b1b49811d577.jpg", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/6fc2ae91-36e2-44c5-bb10-29ae5d5c678c.png", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/f03cee95-9b78-4dd5-986f-d162c06c385c.png", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/e7ea659f-c3d2-4979-9ea5-f993b05e5930.png", "" }; public static String[][] videoUrls = { { - "http://jzvdStd.nathen.cn/6ea7357bc3fa4658b29b7933ba575008/fbbba953374248eb913cb1408dc61d85-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/35b3dc97fbc240219961bd1fccc6400b/8d9b76ab5a584bce84a8afce012b72d3-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/df6096e7878541cbbea3f7298683fbed/ef76450342914427beafe9368a4e0397-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/384d341e000145fb82295bdc54ecef88/103eab5afca34baebc970378dd484942-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/f55530ba8a59403da0621cbf4faef15e/adae4f2e3ecf4ea780beb057e7bce84c-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/6340efd1962946ad80eeffd19b3be89c/65b499c0f16e4dd8900497e51ffa0949-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/f07fa9fddd1e45a6ae1570c7fe7967c1/c6db82685b894e25b523b1cb28d79f2e-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/d2e969f2ec734520b46ab0965d2b68bd/f124edfef6c24be8b1a7b7f996ccc5e0-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/4f965ad507ef4194a60a943a34cfe147/32af151ea132471f92c9ced2cff785ea-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4" + "http://jzvd.nathen.cn/6ea7357bc3fa4658b29b7933ba575008/fbbba953374248eb913cb1408dc61d85-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/35b3dc97fbc240219961bd1fccc6400b/8d9b76ab5a584bce84a8afce012b72d3-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/df6096e7878541cbbea3f7298683fbed/ef76450342914427beafe9368a4e0397-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/384d341e000145fb82295bdc54ecef88/103eab5afca34baebc970378dd484942-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/f55530ba8a59403da0621cbf4faef15e/adae4f2e3ecf4ea780beb057e7bce84c-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/6340efd1962946ad80eeffd19b3be89c/65b499c0f16e4dd8900497e51ffa0949-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/f07fa9fddd1e45a6ae1570c7fe7967c1/c6db82685b894e25b523b1cb28d79f2e-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/d2e969f2ec734520b46ab0965d2b68bd/f124edfef6c24be8b1a7b7f996ccc5e0-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/4f965ad507ef4194a60a943a34cfe147/32af151ea132471f92c9ced2cff785ea-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4" }, { - "http://jzvdStd.nathen.cn/623f75c3beea4b1781ea37940e70bbe4/b9cee3fd1a09487ca99ef789cdc41312-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/d8c137ceba9849f8b2f454a55a96266f/910c8381ff894905b5bc272f8194382a-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/b8a589e5f12c45fdad96674d08affd31/f1d7229f553f414283033af3e292c6c9-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/8abcdf98ec6a418b945a70fe9dd6fc7f/5cb36416a23a4da8b15d3eaa5e19a1e6-5287d2089db37e62345123a1be272f8b.mp4" + "http://jzvd.nathen.cn/623f75c3beea4b1781ea37940e70bbe4/b9cee3fd1a09487ca99ef789cdc41312-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/d8c137ceba9849f8b2f454a55a96266f/910c8381ff894905b5bc272f8194382a-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/b8a589e5f12c45fdad96674d08affd31/f1d7229f553f414283033af3e292c6c9-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/8abcdf98ec6a418b945a70fe9dd6fc7f/5cb36416a23a4da8b15d3eaa5e19a1e6-5287d2089db37e62345123a1be272f8b.mp4" }, { - "http://jzvdStd.nathen.cn/1b61da23555d4ce28c805ea303711aa5/7a33ac2af276441bb4b9838f32d8d710-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/d525f756aabf4b0588c2152fb94e07f5/d9f59bef829a472a9ca066620d9b871a-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/6e2fdec45dfa44a6802e95f8e4bc3280/a6a5273ac4244333923991be0583ffc7-5287d2089db37e62345123a1be272f8b.mp4", - "http://jzvdStd.nathen.cn/22b4de0e2b1245959c5baa77fe0bf14e/896a137559084b7eb879f5441faff20d-5287d2089db37e62345123a1be272f8b.mp4" + "http://jzvd.nathen.cn/1b61da23555d4ce28c805ea303711aa5/7a33ac2af276441bb4b9838f32d8d710-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/d525f756aabf4b0588c2152fb94e07f5/d9f59bef829a472a9ca066620d9b871a-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/6e2fdec45dfa44a6802e95f8e4bc3280/a6a5273ac4244333923991be0583ffc7-5287d2089db37e62345123a1be272f8b.mp4", + "http://jzvd.nathen.cn/22b4de0e2b1245959c5baa77fe0bf14e/896a137559084b7eb879f5441faff20d-5287d2089db37e62345123a1be272f8b.mp4" } }; public static String[][] videoThumbs = { { - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/bd7ffc84-8407-4037-a078-7d922ce0fb0f.jpg", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/f2dbd12e-b1cb-4daf-aff1-8c6be2f64d1a.jpg", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/ccd86ca1-66c7-4331-9450-a3b7f765424a.png", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/2adde364-9be1-4864-b4b9-0b0bcc81ef2e.jpg", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/2a877211-4b68-4e3a-87be-6d2730faef27.png", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/aaeb5da9-ac50-4712-a28d-863fe40f1fc6.png", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/e565f9cc-eedc-45f0-99f8-5b0fa3aed567%281%29.jpg", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/3430ec64-e6a7-4d8e-b044-9d408e075b7c.jpg", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/2204a578-609b-440e-8af7-a0ee17ff3aee.jpg", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png" + "http://jzvd-pic.nathen.cn/jzvdStd-pic/bd7ffc84-8407-4037-a078-7d922ce0fb0f.jpg", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/f2dbd12e-b1cb-4daf-aff1-8c6be2f64d1a.jpg", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/ccd86ca1-66c7-4331-9450-a3b7f765424a.png", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/2adde364-9be1-4864-b4b9-0b0bcc81ef2e.jpg", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/2a877211-4b68-4e3a-87be-6d2730faef27.png", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/aaeb5da9-ac50-4712-a28d-863fe40f1fc6.png", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/e565f9cc-eedc-45f0-99f8-5b0fa3aed567%281%29.jpg", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/3430ec64-e6a7-4d8e-b044-9d408e075b7c.jpg", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/2204a578-609b-440e-8af7-a0ee17ff3aee.jpg", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png" }, { - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/f18ee453-6aec-40a5-a046-3203111dd303.jpg", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/00f5a243-1e9f-426c-94f4-888971987edb.jpg", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/7df34ee9-1e4f-48f4-8acd-748c52368298.jpg", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/ef46e139-e378-4298-8441-144888294f1f.png" + "http://jzvd-pic.nathen.cn/jzvdStd-pic/f18ee453-6aec-40a5-a046-3203111dd303.jpg", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/00f5a243-1e9f-426c-94f4-888971987edb.jpg", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/7df34ee9-1e4f-48f4-8acd-748c52368298.jpg", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/ef46e139-e378-4298-8441-144888294f1f.png" }, { - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/0e58101d-5b47-4100-8fb3-0cce057fd622.jpg", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/d6d3a520-b183-4867-8746-5b6aba6c1724.png", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/caa3dade-5744-486d-a1b7-9780aebb9eb5.jpg", - "http://jzvdStd-pic.nathen.cn/jzvdStd-pic/2c3e62bb-6a32-4fb0-a1d5-d1260ad436a4.png" + "http://jzvd-pic.nathen.cn/jzvdStd-pic/0e58101d-5b47-4100-8fb3-0cce057fd622.jpg", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/d6d3a520-b183-4867-8746-5b6aba6c1724.png", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/caa3dade-5744-486d-a1b7-9780aebb9eb5.jpg", + "http://jzvd-pic.nathen.cn/jzvdStd-pic/2c3e62bb-6a32-4fb0-a1d5-d1260ad436a4.png" } }; From 53b30d7198e087099fe79ae52d67cb83cb6da396 Mon Sep 17 00:00:00 2001 From: Nathen <821537155@qq.com> Date: Thu, 6 Sep 2018 12:30:33 +0800 Subject: [PATCH 5/6] fix url --- .../demo/ActivityApiCustomMediaPlayer.java | 2 +- .../main/java/cn/jzvd/demo/ActivityMain.java | 6 +-- .../java/cn/jzvd/demo/ActivityTinyWindow.java | 2 +- .../main/java/cn/jzvd/demo/VideoConstant.java | 48 +++++++++---------- 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMediaPlayer.java b/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMediaPlayer.java index 32697b9fd..41bc24294 100755 --- a/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMediaPlayer.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMediaPlayer.java @@ -58,7 +58,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { } jzvdStd.setUp(jzDataSource, JzvdStd.SCREEN_WINDOW_NORMAL); Glide.with(this) - .load("http://jzvd-pic.nathen.cn/jzvdStd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png") + .load("http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png") .into(jzvdStd.thumbImageView); Jzvd.setMediaInterface(new CustomMediaPlayerAssertFolder());//进入此页面修改MediaInterface,让此页面的jzvd正常工作 diff --git a/app/src/main/java/cn/jzvd/demo/ActivityMain.java b/app/src/main/java/cn/jzvd/demo/ActivityMain.java index 43e2d6fd0..b848cd645 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityMain.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityMain.java @@ -46,7 +46,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { myJzvdStd = findViewById(R.id.jz_video); myJzvdStd.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4" , "饺子快长大", JzvdStd.SCREEN_WINDOW_NORMAL); - Glide.with(this).load("http://jzvd-pic.nathen.cn/jzvdStd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png").into(myJzvdStd.thumbImageView); + Glide.with(this).load("http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png").into(myJzvdStd.thumbImageView); Jzvd.setJzUserAction(new MyUserActionStd()); } @@ -69,9 +69,7 @@ public void onBackPressed() { public void onClick(View v) { switch (v.getId()) { case R.id.api: - myJzvdStd.changeUrl(VideoConstant.videoUrls[0][3], "fdsfdsfdsa", 0); - -// startActivity(new Intent(ActivityMain.this, ActivityApi.class)); + startActivity(new Intent(ActivityMain.this, ActivityApi.class)); break; case R.id.listview: startActivity(new Intent(ActivityMain.this, ActivityListView.class)); diff --git a/app/src/main/java/cn/jzvd/demo/ActivityTinyWindow.java b/app/src/main/java/cn/jzvd/demo/ActivityTinyWindow.java index 7ef1ef153..3ee20a63b 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityTinyWindow.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityTinyWindow.java @@ -36,7 +36,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { mJzvdStd.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4", "饺子快长大" , JzvdStd.SCREEN_WINDOW_NORMAL); Glide.with(this) - .load("http://jzvd-pic.nathen.cn/jzvdStd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png") + .load("http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png") .into(mJzvdStd.thumbImageView); mBtnTinyWindow = findViewById(R.id.tiny_window); diff --git a/app/src/main/java/cn/jzvd/demo/VideoConstant.java b/app/src/main/java/cn/jzvd/demo/VideoConstant.java index cfabf8edd..77342738e 100644 --- a/app/src/main/java/cn/jzvd/demo/VideoConstant.java +++ b/app/src/main/java/cn/jzvd/demo/VideoConstant.java @@ -18,12 +18,12 @@ public class VideoConstant { public static String[] videoThumbList = { - "http://jzvd-pic.nathen.cn/jzvdStd-pic/00b026e7-b830-4994-bc87-38f4033806a6.jpg", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/1d935cc5-a1e7-4779-bdfa-20fd7a60724c.jpg", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/a019ffc1-556c-4a85-b70c-b1b49811d577.jpg", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/6fc2ae91-36e2-44c5-bb10-29ae5d5c678c.png", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/f03cee95-9b78-4dd5-986f-d162c06c385c.png", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/e7ea659f-c3d2-4979-9ea5-f993b05e5930.png", + "http://jzvd-pic.nathen.cn/jzvd-pic/00b026e7-b830-4994-bc87-38f4033806a6.jpg", + "http://jzvd-pic.nathen.cn/jzvd-pic/1d935cc5-a1e7-4779-bdfa-20fd7a60724c.jpg", + "http://jzvd-pic.nathen.cn/jzvd-pic/a019ffc1-556c-4a85-b70c-b1b49811d577.jpg", + "http://jzvd-pic.nathen.cn/jzvd-pic/6fc2ae91-36e2-44c5-bb10-29ae5d5c678c.png", + "http://jzvd-pic.nathen.cn/jzvd-pic/f03cee95-9b78-4dd5-986f-d162c06c385c.png", + "http://jzvd-pic.nathen.cn/jzvd-pic/e7ea659f-c3d2-4979-9ea5-f993b05e5930.png", "" }; @@ -58,28 +58,28 @@ public class VideoConstant { public static String[][] videoThumbs = { { - "http://jzvd-pic.nathen.cn/jzvdStd-pic/bd7ffc84-8407-4037-a078-7d922ce0fb0f.jpg", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/f2dbd12e-b1cb-4daf-aff1-8c6be2f64d1a.jpg", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/ccd86ca1-66c7-4331-9450-a3b7f765424a.png", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/2adde364-9be1-4864-b4b9-0b0bcc81ef2e.jpg", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/2a877211-4b68-4e3a-87be-6d2730faef27.png", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/aaeb5da9-ac50-4712-a28d-863fe40f1fc6.png", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/e565f9cc-eedc-45f0-99f8-5b0fa3aed567%281%29.jpg", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/3430ec64-e6a7-4d8e-b044-9d408e075b7c.jpg", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/2204a578-609b-440e-8af7-a0ee17ff3aee.jpg", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png" + "http://jzvd-pic.nathen.cn/jzvd-pic/bd7ffc84-8407-4037-a078-7d922ce0fb0f.jpg", + "http://jzvd-pic.nathen.cn/jzvd-pic/f2dbd12e-b1cb-4daf-aff1-8c6be2f64d1a.jpg", + "http://jzvd-pic.nathen.cn/jzvd-pic/ccd86ca1-66c7-4331-9450-a3b7f765424a.png", + "http://jzvd-pic.nathen.cn/jzvd-pic/2adde364-9be1-4864-b4b9-0b0bcc81ef2e.jpg", + "http://jzvd-pic.nathen.cn/jzvd-pic/2a877211-4b68-4e3a-87be-6d2730faef27.png", + "http://jzvd-pic.nathen.cn/jzvd-pic/aaeb5da9-ac50-4712-a28d-863fe40f1fc6.png", + "http://jzvd-pic.nathen.cn/jzvd-pic/e565f9cc-eedc-45f0-99f8-5b0fa3aed567%281%29.jpg", + "http://jzvd-pic.nathen.cn/jzvd-pic/3430ec64-e6a7-4d8e-b044-9d408e075b7c.jpg", + "http://jzvd-pic.nathen.cn/jzvd-pic/2204a578-609b-440e-8af7-a0ee17ff3aee.jpg", + "http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png" }, { - "http://jzvd-pic.nathen.cn/jzvdStd-pic/f18ee453-6aec-40a5-a046-3203111dd303.jpg", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/00f5a243-1e9f-426c-94f4-888971987edb.jpg", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/7df34ee9-1e4f-48f4-8acd-748c52368298.jpg", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/ef46e139-e378-4298-8441-144888294f1f.png" + "http://jzvd-pic.nathen.cn/jzvd-pic/f18ee453-6aec-40a5-a046-3203111dd303.jpg", + "http://jzvd-pic.nathen.cn/jzvd-pic/00f5a243-1e9f-426c-94f4-888971987edb.jpg", + "http://jzvd-pic.nathen.cn/jzvd-pic/7df34ee9-1e4f-48f4-8acd-748c52368298.jpg", + "http://jzvd-pic.nathen.cn/jzvd-pic/ef46e139-e378-4298-8441-144888294f1f.png" }, { - "http://jzvd-pic.nathen.cn/jzvdStd-pic/0e58101d-5b47-4100-8fb3-0cce057fd622.jpg", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/d6d3a520-b183-4867-8746-5b6aba6c1724.png", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/caa3dade-5744-486d-a1b7-9780aebb9eb5.jpg", - "http://jzvd-pic.nathen.cn/jzvdStd-pic/2c3e62bb-6a32-4fb0-a1d5-d1260ad436a4.png" + "http://jzvd-pic.nathen.cn/jzvd-pic/0e58101d-5b47-4100-8fb3-0cce057fd622.jpg", + "http://jzvd-pic.nathen.cn/jzvd-pic/d6d3a520-b183-4867-8746-5b6aba6c1724.png", + "http://jzvd-pic.nathen.cn/jzvd-pic/caa3dade-5744-486d-a1b7-9780aebb9eb5.jpg", + "http://jzvd-pic.nathen.cn/jzvd-pic/2c3e62bb-6a32-4fb0-a1d5-d1260ad436a4.png" } }; From 363fcbca5111b89989b00e385aa08fc566eb7f27 Mon Sep 17 00:00:00 2001 From: Nathen <821537155@qq.com> Date: Sun, 9 Sep 2018 12:51:05 +0800 Subject: [PATCH 6/6] v6.3.1 --- README-ZH.md | 8 ++++---- README.md | 10 +++++----- app/build.gradle | 4 ++-- gradle/maven_push.gradle | 2 +- jiaozivideoplayer/build.gradle | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README-ZH.md b/README-ZH.md index a68d04656..7bdbe8ddd 100644 --- a/README-ZH.md +++ b/README-ZH.md @@ -2,7 +2,7 @@ --

- +

@@ -24,7 +24,7 @@ ## 效果 -**[jiaozivideoplayer-6.3_preview.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.3_preview/jiaozivideoplayer-6.3_preview.apk)** +**[jiaozivideoplayer-6.3.1.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.3.1/jiaozivideoplayer-6.3.1.apk)** ![Demo Screenshot][1] @@ -36,10 +36,10 @@ 1.添加类库 ```gradle -compile 'cn.jzvd:jiaozivideoplayer:6.3_preview' +compile 'cn.jzvd:jiaozivideoplayer:6.3.1' ``` -或直接下载 [jar包](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.3_preview) (不建议) +或直接下载 [jar包](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.3.1) (不建议) 2.添加布局 ```xml diff --git a/README.md b/README.md index 5dbf1b363..858181df3 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,14 @@ --

- +

Perfect list sliding detection, one line of code to replace the system player with IJKplayer, ExoPlayer, Vitamio, etc. -Group Q: 490442439 (group 1 full) 761899104 (group 2) authentication information: jzvd +Q群: 490442439 2群: 761899104 authentication information: jzvd [Wiki](https://github.com/lipangit/JiaoZiVideoPlayer/wiki) [EnglishWiki](https://github.com/felipetorres/VideoPlayer-Wiki) [Chinese README](https://github.com/lipangit/JiaoZiVideoPlayer/blob/develop/README-ZH.md) @@ -34,7 +34,7 @@ Group Q: 490442439 (group 1 full) 761899104 (group 2) authentication information ## Demo apk -A demo apk [jiaozivideoplayer-6.3_preview.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.3_preview/jiaozivideoplayer-6.3_preview.apk) is available on Google Play showing all available features like this [small window effect on list sliding](http://weibo.com/tv/v/FtxpWgqmg?fid=1034:5cda6fc7f394b403d592bd9b1d5a9701). +A demo apk [jiaozivideoplayer-6.3.1.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.3.1/jiaozivideoplayer-6.3.1.apk) is available on Google Play showing all available features like this [small window effect on list sliding](http://weibo.com/tv/v/FtxpWgqmg?fid=1034:5cda6fc7f394b403d592bd9b1d5a9701). ![Demo screenshot][1] @@ -44,10 +44,10 @@ Only five steps to use the player: 1.Import library: ```gradle -compile 'cn.jzvd:jiaozivideoplayer:6.3_preview' +compile 'cn.jzvd:jiaozivideoplayer:6.3.1' ``` -Or download [lib](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.3_preview) (not recommended). +Or download [lib](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.3.1) (not recommended). 2.Add `JZVideoPlayer` in your layout: ```xml diff --git a/app/build.gradle b/app/build.gradle index 8e84e766d..f3ee433ce 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "cn.jzvd.demo" minSdkVersion 16 targetSdkVersion 28 - versionCode 83 - versionName "6.3_preview" + versionCode 84 + versionName "6.3.1" } signingConfigs { releaseConfig { diff --git a/gradle/maven_push.gradle b/gradle/maven_push.gradle index 79e2c2253..12317bc31 100644 --- a/gradle/maven_push.gradle +++ b/gradle/maven_push.gradle @@ -22,7 +22,7 @@ signing { group = "cn.jzvd" archivesBaseName = "jiaozivideoplayer" -version = "6.3_preview" +version = "6.3.1" uploadArchives { repositories { diff --git a/jiaozivideoplayer/build.gradle b/jiaozivideoplayer/build.gradle index dce6e9d8b..fbb65d916 100644 --- a/jiaozivideoplayer/build.gradle +++ b/jiaozivideoplayer/build.gradle @@ -6,8 +6,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 28 - versionCode 83 - versionName "6.3_preview" + versionCode 84 + versionName "6.3.1" } buildTypes { release {