From 6fb389df07090a652853e1c3c9ad44acb84fe7da Mon Sep 17 00:00:00 2001 From: chenxingwang <848864817@qq.com> Date: Thu, 6 Feb 2020 20:36:40 +0800 Subject: [PATCH 01/17] add lockscreen demo --- app/src/main/AndroidManifest.xml | 13 +- .../cn/jzvd/demo/CustomJzvd/LockScreen.java | 164 +++++++++++ .../java/cn/jzvd/demo/LockScreenActivity.java | 38 +++ .../main/res/layout/activity_lock_screen.xml | 13 + .../res/layout/lock_screen_jz_layout_std.xml | 256 ++++++++++++++++++ app/src/main/res/mipmap-xxhdpi/lock.png | Bin 0 -> 1233 bytes app/src/main/res/mipmap-xxhdpi/unlock.png | Bin 0 -> 1282 bytes 7 files changed, 480 insertions(+), 4 deletions(-) create mode 100644 app/src/main/java/cn/jzvd/demo/CustomJzvd/LockScreen.java create mode 100644 app/src/main/java/cn/jzvd/demo/LockScreenActivity.java create mode 100644 app/src/main/res/layout/activity_lock_screen.xml create mode 100644 app/src/main/res/layout/lock_screen_jz_layout_std.xml create mode 100644 app/src/main/res/mipmap-xxhdpi/lock.png create mode 100644 app/src/main/res/mipmap-xxhdpi/unlock.png diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f26a3c8f..ba383038 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,11 +18,7 @@ android:name=".ActivityMain" android:configChanges="orientation|screenSize|keyboardHidden" android:screenOrientation="portrait"> - - - - + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/cn/jzvd/demo/CustomJzvd/LockScreen.java b/app/src/main/java/cn/jzvd/demo/CustomJzvd/LockScreen.java new file mode 100644 index 00000000..dd71e3e6 --- /dev/null +++ b/app/src/main/java/cn/jzvd/demo/CustomJzvd/LockScreen.java @@ -0,0 +1,164 @@ + +package cn.jzvd.demo.CustomJzvd; + +import android.content.Context; +import android.content.pm.ActivityInfo; +import android.util.AttributeSet; +import android.util.Log; +import android.view.MotionEvent; +import android.view.View; +import android.view.ViewConfiguration; +import android.widget.ImageView; + +import cn.jzvd.JZUtils; +import cn.jzvd.JzvdStd; +import cn.jzvd.demo.R; + +/** + * 这里是不改源码得情况下 + */ +public class LockScreen extends JzvdStd { + private boolean isLockScreen; + private ImageView lockIv; + float starX, startY; + + public LockScreen(Context context) { + super(context); + } + + public LockScreen(Context context, AttributeSet attrs) { + super(context, attrs); + } + + //这里应该还没有判断完 目前还没有测试出什么问题 这里是拦截父亲得一些事件比如滑动快进 改变亮度 + @Override + public boolean onTouch(View v, MotionEvent event) { + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + starX = event.getX(); + startY = event.getY(); + if (screen == SCREEN_FULLSCREEN && isLockScreen) { + return true; + } + break; + case MotionEvent.ACTION_MOVE: + if (screen == SCREEN_FULLSCREEN && isLockScreen) { + return true; + } + break; + case MotionEvent.ACTION_UP: + if (screen == SCREEN_FULLSCREEN && isLockScreen) { + //&& Math.abs(Math.abs(event.getX() - starX)) > ViewConfiguration.get(getContext()).getScaledTouchSlop() && Math.abs(Math.abs(event.getY() - startY)) > ViewConfiguration.get(getContext()).getScaledTouchSlop() + if (event.getX() == starX || event.getY() == startY) { + startDismissControlViewTimer(); + onClickUiToggle(); + bottomProgressBar.setVisibility(VISIBLE); + } + return true; + } + break; + } + return super.onTouch(v, event); + } + + + @Override + public void changeUiToPlayingShow() { + super.changeUiToPlayingShow(); + if (screen == SCREEN_FULLSCREEN) { + bottomProgressBar.setVisibility(GONE); + if (isLockScreen) { + topContainer.setVisibility(GONE); + bottomContainer.setVisibility(GONE); + startButton.setVisibility(GONE); + + } else { + topContainer.setVisibility(VISIBLE); + bottomContainer.setVisibility(VISIBLE); + startButton.setVisibility(VISIBLE); + } + } + } + + @Override + public void init(Context context) { + super.init(context); + lockIv = findViewById(R.id.lock); + lockIv.setOnClickListener(this); + } + + @Override + public void changeUiToPlayingClear() { + super.changeUiToPlayingClear(); + if (screen == SCREEN_FULLSCREEN) { + bottomProgressBar.setVisibility(GONE); + } + } + + @Override + public void onClickUiToggle() { + super.onClickUiToggle(); + if (screen == SCREEN_FULLSCREEN) { + if (lockIv.getVisibility() == VISIBLE) { + lockIv.setVisibility(View.GONE); + } else { + lockIv.setVisibility(View.VISIBLE); + } + } + } + + @Override + public void setScreenFullscreen() { + super.setScreenFullscreen(); + lockIv.setBackgroundResource(R.mipmap.unlock); + lockIv.setVisibility(View.VISIBLE); + } + + @Override + public void dissmissControlView() { + super.dissmissControlView(); + post(() -> { + if (screen == SCREEN_FULLSCREEN) { + lockIv.setVisibility(View.GONE); + bottomProgressBar.setVisibility(View.GONE); + } + }); + } + + @Override + public void setScreenNormal() { + super.setScreenNormal(); + lockIv.setVisibility(View.GONE); + } + + @Override + public int getLayoutId() { + return R.layout.lock_screen_jz_layout_std; + } + + + @Override + public void onClick(View v) { + super.onClick(v); + switch (v.getId()) { + case R.id.lock: + if (screen == SCREEN_FULLSCREEN) { + if (!isLockScreen) { + isLockScreen = true; + JZUtils.setRequestedOrientation(getContext(), ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); + lockIv.setBackgroundResource(R.mipmap.lock); + dissmissControlView(); + } else { + JZUtils.setRequestedOrientation(getContext(), ActivityInfo.SCREEN_ORIENTATION_SENSOR); + isLockScreen = false; + lockIv.setBackgroundResource(R.mipmap.unlock); + topContainer.setVisibility(VISIBLE); + bottomContainer.setVisibility(VISIBLE); + startButton.setVisibility(VISIBLE); + + } + } + break; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/cn/jzvd/demo/LockScreenActivity.java b/app/src/main/java/cn/jzvd/demo/LockScreenActivity.java new file mode 100644 index 00000000..6af050cd --- /dev/null +++ b/app/src/main/java/cn/jzvd/demo/LockScreenActivity.java @@ -0,0 +1,38 @@ +package cn.jzvd.demo; + +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; + +import com.bumptech.glide.Glide; + +import cn.jzvd.Jzvd; +import cn.jzvd.demo.CustomJzvd.LockScreen; + + +public class LockScreenActivity extends AppCompatActivity { + LockScreen lockScreen; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_lock_screen); + lockScreen = findViewById(R.id.ls); + lockScreen.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4" + , "饺子快长大"); + Glide.with(this).load("http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png").into(lockScreen.thumbImageView); + } + + @Override + protected void onPause() { + super.onPause(); + Jzvd.releaseAllVideos(); + } + + @Override + public void onBackPressed() { + if (Jzvd.backPress()) { + return; + } + super.onBackPressed(); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_lock_screen.xml b/app/src/main/res/layout/activity_lock_screen.xml new file mode 100644 index 00000000..5ebef7e9 --- /dev/null +++ b/app/src/main/res/layout/activity_lock_screen.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/lock_screen_jz_layout_std.xml b/app/src/main/res/layout/lock_screen_jz_layout_std.xml new file mode 100644 index 00000000..ff12b0b8 --- /dev/null +++ b/app/src/main/res/layout/lock_screen_jz_layout_std.xml @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-xxhdpi/lock.png b/app/src/main/res/mipmap-xxhdpi/lock.png new file mode 100644 index 0000000000000000000000000000000000000000..8b2636b66251b017ddae665828dbd33072a1f020 GIT binary patch literal 1233 zcmV;?1TOoDP)-A;9*vDfmSVdAu)?u(ct3GiDkk!1iKb9dOmh{Ugj@n)ZTt9$_ha}xSitU&?G6A-C^ey?lz)DG9kLp}?zU@1Jhx=^q zlyv?mI3p2YdkYX7UQc#Nx?mKC=9+8!65#bdovo6ttBYBi0Nat`9;*Pam2`hyM@r_| zcAx&Ok~Wsu=;_uXARTHx{6B&ZOxvdb{h45Cox@XI0%Et1R2A}~q}Z(|Dz;-|e6|9* zP15pGCyEKM9f1b{A^U+Pl0GX1ZbIMoE0Gc_wjw>oStDEO5D-g0jO1do@tzkvm zrvl+moEt*+NLpF~Q$&F6GlBOKz_01w|Dgo1X0-{55!S48Q&yn zbuQ4j^lTpwd{wc(PSU-(c%=k<0rU!-;_ofjsZu@LQ87lT9kNf-iMcki39x-a7*B@x zONt_<6=M57U~R>jMUuYEajt}b3xT(i(Or_x%>kH%j_oDUM5$mclk|2Db_oG1BIhTg zwQ_EbLv?g)N9p`qW$u-dUdpjmLO^VIPbZ^M<=v12Fex3|(J?wW;oT_dnH=mA0;<*6 zdP(uSHDdb{;N;}cosuFw4wVuDZU@#UiyI_WbMH`~aVyyV6gVm2tdX=K2eX8LC^?@? zMz=^>l>;y-9oxSHhb6pKlA=@}DkTI&i|VzOZh}VwKUJc=Ow#tD(U)|DY@ZG6N=Dz2 zG^p{JgW0&wfb#qtN$=(W&A9?>U!8h!QT!a0W3WX!-=q%oo049h&97MruwAYBTNGC< zS7xnR2NGaAx-HRlSxEAfq?`K#`VRpEIxTU=j>cnklW9FMXn!nMb6Wce*nR@& z<>kjE#Z_D5(q;nURwr(ELdMo$=?M6D!?ZnFz;?F+x=*0n1G-JH%K}{*?9Kt*L1=1E zg7KE;^0Wtx?XtDaN8t#*_n>LTT&?R-Dx}sD5JA~KBOX_myy+<=qtyhI22)4B4gm|T zDO!C#lhqVmXl?N)ft%9m$!d%DKS7frv#!ad&2p3F4)`lTC3J)nmKq9{7A(P-REL{|Zri2sfN_>PEXo6Y87`zfXTrdMJ0 zqy(ZUx`vr|GV>3 zPi)KPT_V~mg!n#nh8<4K41h6a7c)QA@*gKVQz#T(nVg*b@py49EG&q6y}lEG?Jd&U z5YZffZCOFc1b|X%I}ttKmi%ynG2+omT4;(fdM(Ykg@OW7aYAAv}Wh?JuQUTzyH*BHP(LWpAv zpsW+n8`$ zEkS#J-UIRy7{D>0TCJX6EEd-@^VYbGHpHL38~}f3<`07)_#*B7g2aQM)_OgFdjV|m zF@AW|cniQ2Qp!)0XeI(+jJcbcpIqjkmo2_Lw^0BWwEvTc5-r4>0T^S}GV`|phT|3A z3jiJzLj011xNqC}`T4UOjmCYvgG3534k%?OlJPs3O1X~JIdwqi!S25wyD)>w+BJ6 zFD}uuT*}i4K)>%1ODm)y>!Pca zx-$rZpM(%zmeXnCT(KUYwYC>iZ(2|zBO|Aej*kA}0`327`VGJi05kF8s!}eOyMEl2 z14waaY9&h`?*VxU#6h)WXr^NBbh}PzaB!0cv5|QnNvjAp;AlP3jm5%LH sadnUifU9^v*yRBFp_Q_Xao~HvzpOx3ZVJ*FIRF3v07*qoM6N<$f@V-&Q~&?~ literal 0 HcmV?d00001 From 6cfd917ccd75c125377d233bdcf29137963baeb0 Mon Sep 17 00:00:00 2001 From: duguodong <836464017@qq.com> Date: Fri, 28 Feb 2020 22:58:06 +0800 Subject: [PATCH 02/17] add asset play --- README.md | 2 +- .../main/java/cn/jzvd/demo/ActivityApi.java | 2 +- .../cn/jzvd/demo/ActivityApiCustomMedia.java | 2 +- .../jzvd/demo/ActivityApiExtendsNormal.java | 4 +-- .../cn/jzvd/demo/ActivityApiOrientation.java | 4 +-- .../demo/ActivityApiRotationVideoSize.java | 4 +-- .../jzvd/demo/ActivityApiUISmallChange.java | 36 +++++++++---------- .../demo/ActivityListViewMultiHolder.java | 4 +-- .../cn/jzvd/demo/ActivityListViewNormal.java | 2 +- .../main/java/cn/jzvd/demo/ActivityMain.java | 2 +- .../java/cn/jzvd/demo/ActivityPreloading.java | 2 +- .../java/cn/jzvd/demo/ActivityTinyWindow.java | 2 +- ...ivityTinyWindowRecycleViewMultiHolder.java | 2 +- .../java/cn/jzvd/demo/ActivityWebView.java | 8 ++--- .../java/cn/jzvd/demo/AdapterListView.java | 10 +++--- .../cn/jzvd/demo/AdapterRecyclerView.java | 2 +- .../cn/jzvd/demo/AdapterRecyclerViewTiny.java | 2 +- .../cn/jzvd/demo/CustomJzvd/JzvdStdMp3.java | 10 +++--- ...vdStdShowTextureViewAfterAutoComplete.java | 2 +- .../main/java/cn/jzvd/demo/FragmentDemo.java | 2 +- .../main/java/cn/jzvd/demo/VideoConstant.java | 4 +-- .../tiktok/AdapterTikTokRecyclerView.java | 2 +- .../res/layout/jz_layout_standard_mp3.xml | 4 +-- app/src/main/res/layout/layout_std_speed.xml | 4 +-- .../layout/layout_std_with_share_button.xml | 4 +-- .../src/main/java/cn/jzvd/JzvdStd.java | 12 +++---- .../res/drawable/jz_bottom_seek_thumb.xml | 4 +-- .../src/main/res/layout/jz_layout_std.xml | 4 +-- 28 files changed, 71 insertions(+), 71 deletions(-) diff --git a/README.md b/README.md index 95edc182..9f044b02 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ compile 'cn.jzvd:jiaozivideoplayer:7.1.0' MyJzvdStd jzvdStd = (MyJzvdStd) findViewById(R.id.jz_video); jzvdStd.setUp("http://jzvd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4" , "饺子闭眼睛"); -jzvdStd.thumbImageView.setImage("http://p.qpic.cn/videoyun/0/2449_43b6f696980311e59ed467f22794e792_1/640"); +jzvdStd.posterImageView.setImage("http://p.qpic.cn/videoyun/0/2449_43b6f696980311e59ed467f22794e792_1/640"); ``` 4.在`Activity`中 diff --git a/app/src/main/java/cn/jzvd/demo/ActivityApi.java b/app/src/main/java/cn/jzvd/demo/ActivityApi.java index 6f8f08dc..8e6be87a 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityApi.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityApi.java @@ -55,7 +55,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { jzDataSource.headerMap.put("key", "value");//header mJzvdStd.setUp(jzDataSource , JzvdStd.SCREEN_NORMAL); - Glide.with(this).load(VideoConstant.videoThumbList[0]).into(mJzvdStd.thumbImageView); + Glide.with(this).load(VideoConstant.videoposterList[0]).into(mJzvdStd.posterImageView); // mJzvdStd.seekToInAdvance = 20000; // Jzvd.SAVE_PROGRESS = false;//把这些注释的代码放到按钮上，让它可操作可见。 diff --git a/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMedia.java b/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMedia.java index abc3dbed..0ccad735 100755 --- a/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMedia.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMedia.java @@ -55,7 +55,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { Glide.with(this) .load("http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png") - .into(jzvdStd.thumbImageView); + .into(jzvdStd.posterImageView); } diff --git a/app/src/main/java/cn/jzvd/demo/ActivityApiExtendsNormal.java b/app/src/main/java/cn/jzvd/demo/ActivityApiExtendsNormal.java index 6ab14b95..2d704385 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityApiExtendsNormal.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityApiExtendsNormal.java @@ -22,8 +22,8 @@ protected void onCreate(Bundle savedInstanceState) { jzvdStd.setUp(VideoConstant.videoUrlList[0], "饺子不信" , JzvdStd.SCREEN_NORMAL); Glide.with(this) - .load(VideoConstant.videoThumbList[0]) - .into(jzvdStd.thumbImageView); + .load(VideoConstant.videoposterList[0]) + .into(jzvdStd.posterImageView); } @Override diff --git a/app/src/main/java/cn/jzvd/demo/ActivityApiOrientation.java b/app/src/main/java/cn/jzvd/demo/ActivityApiOrientation.java index 5b1c8f97..177debfc 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityApiOrientation.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityApiOrientation.java @@ -30,8 +30,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { mJzvdStd.setUp(VideoConstant.videoUrlList[0], "饺子不信" , JzvdStd.SCREEN_NORMAL); Glide.with(this) - .load(VideoConstant.videoThumbList[0]) - .into(mJzvdStd.thumbImageView); + .load(VideoConstant.videoposterList[0]) + .into(mJzvdStd.posterImageView); } @Override diff --git a/app/src/main/java/cn/jzvd/demo/ActivityApiRotationVideoSize.java b/app/src/main/java/cn/jzvd/demo/ActivityApiRotationVideoSize.java index c1391ba6..6d25a205 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityApiRotationVideoSize.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityApiRotationVideoSize.java @@ -33,8 +33,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { myJzvdStd.setUp(VideoConstant.videoUrls[0][7], VideoConstant.videoTitles[0][7] , JzvdStd.SCREEN_NORMAL); Glide.with(this) - .load(VideoConstant.videoThumbs[0][7]) - .into(myJzvdStd.thumbImageView); + .load(VideoConstant.videoposters[0][7]) + .into(myJzvdStd.posterImageView); // The Point IS 或者这样写也可以 // myJzvdStd.videoRotation = 180; } diff --git a/app/src/main/java/cn/jzvd/demo/ActivityApiUISmallChange.java b/app/src/main/java/cn/jzvd/demo/ActivityApiUISmallChange.java index 3cfbb91f..6c272929 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityApiUISmallChange.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityApiUISmallChange.java @@ -44,63 +44,63 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { jzvdStdWithShareButton = findViewById(R.id.custom_videoplayer_standard_with_share_button); jzvdStdWithShareButton.setUp(VideoConstant.videoUrlList[3], "饺子想呼吸", Jzvd.SCREEN_NORMAL); Glide.with(this) - .load(VideoConstant.videoThumbList[3]) - .into(jzvdStdWithShareButton.thumbImageView); + .load(VideoConstant.videoposterList[3]) + .into(jzvdStdWithShareButton.posterImageView); jzvdStdShowTitleAfterFullscreen = findViewById(R.id.custom_videoplayer_standard_show_title_after_fullscreen); jzvdStdShowTitleAfterFullscreen.setUp(VideoConstant.videoUrlList[4], "饺子想摇头", Jzvd.SCREEN_NORMAL); Glide.with(this) - .load(VideoConstant.videoThumbList[4]) - .into(jzvdStdShowTitleAfterFullscreen.thumbImageView); + .load(VideoConstant.videoposterList[4]) + .into(jzvdStdShowTitleAfterFullscreen.posterImageView); jzvdStdShowTextureViewAfterAutoComplete = findViewById(R.id.custom_videoplayer_standard_show_textureview_aoto_complete); jzvdStdShowTextureViewAfterAutoComplete.setUp(VideoConstant.videoUrlList[5], "饺子想旅行", Jzvd.SCREEN_NORMAL); Glide.with(this) - .load(VideoConstant.videoThumbList[5]) - .into(jzvdStdShowTextureViewAfterAutoComplete.thumbImageView); + .load(VideoConstant.videoposterList[5]) + .into(jzvdStdShowTextureViewAfterAutoComplete.posterImageView); jzvdStdAutoCompleteAfterFullscreen = findViewById(R.id.custom_videoplayer_standard_aoto_complete); jzvdStdAutoCompleteAfterFullscreen.setUp(VideoConstant.videoUrls[0][1], "饺子没来", Jzvd.SCREEN_NORMAL); Glide.with(this) - .load(VideoConstant.videoThumbs[0][1]) - .into(jzvdStdAutoCompleteAfterFullscreen.thumbImageView); + .load(VideoConstant.videoposters[0][1]) + .into(jzvdStdAutoCompleteAfterFullscreen.posterImageView); jzvdStd_1_1 = findViewById(R.id.jz_videoplayer_1_1); jzvdStd_1_1.setUp(VideoConstant.videoUrls[0][1], "饺子有事吗", Jzvd.SCREEN_NORMAL); Glide.with(this) - .load(VideoConstant.videoThumbs[0][1]) - .into(jzvdStd_1_1.thumbImageView); + .load(VideoConstant.videoposters[0][1]) + .into(jzvdStd_1_1.posterImageView); jzvdStd_1_1.widthRatio = 1; jzvdStd_1_1.heightRatio = 1; jzvdStd_16_9 = findViewById(R.id.jz_videoplayer_16_9); jzvdStd_16_9.setUp(VideoConstant.videoUrls[0][1], "饺子来不了", Jzvd.SCREEN_NORMAL); Glide.with(this) - .load(VideoConstant.videoThumbs[0][1]) - .into(jzvdStd_16_9.thumbImageView); + .load(VideoConstant.videoposters[0][1]) + .into(jzvdStd_16_9.posterImageView); jzvdStd_16_9.widthRatio = 16; jzvdStd_16_9.heightRatio = 9; jzvdStdVolumeAfterFullscreen = findViewById(R.id.jz_videoplayer_volume); jzvdStdVolumeAfterFullscreen.setUp(VideoConstant.videoUrls[0][1], "饺子摇摆", Jzvd.SCREEN_NORMAL); Glide.with(this) - .load(VideoConstant.videoThumbs[0][1]) - .into(jzvdStdVolumeAfterFullscreen.thumbImageView); + .load(VideoConstant.videoposters[0][1]) + .into(jzvdStdVolumeAfterFullscreen.posterImageView); jzvdStdMp3 = findViewById(R.id.jz_videoplayer_mp3); jzvdStdMp3.setUp(VideoConstant.videoUrls[0][1], "饺子你听", Jzvd.SCREEN_NORMAL); Glide.with(this) - .load(VideoConstant.videoThumbs[0][1]) - .into(jzvdStdMp3.thumbImageView); + .load(VideoConstant.videoposters[0][1]) + .into(jzvdStdMp3.posterImageView); jzvdStdSpeed = findViewById(R.id.jz_videoplayer_speed); jzvdStdSpeed.setUp(VideoConstant.videoUrls[0][1], "饺子快点", Jzvd.SCREEN_NORMAL); Glide.with(this) - .load(VideoConstant.videoThumbs[0][1]) - .into(jzvdStdSpeed.thumbImageView); + .load(VideoConstant.videoposters[0][1]) + .into(jzvdStdSpeed.posterImageView); } diff --git a/app/src/main/java/cn/jzvd/demo/ActivityListViewMultiHolder.java b/app/src/main/java/cn/jzvd/demo/ActivityListViewMultiHolder.java index d4fd98c2..80b4ddc7 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityListViewMultiHolder.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityListViewMultiHolder.java @@ -133,8 +133,8 @@ public View getView(int position, View convertView, ViewGroup parent) { VideoConstant.videoTitles[0][position], Jzvd.SCREEN_NORMAL); viewHolder.jzvdStd.positionInList = position; Glide.with(ActivityListViewMultiHolder.this) - .load(VideoConstant.videoThumbs[0][position]) - .into(viewHolder.jzvdStd.thumbImageView); + .load(VideoConstant.videoposters[0][position]) + .into(viewHolder.jzvdStd.posterImageView); } else { TextViewHolder textViewHolder; if (convertView != null && convertView.getTag() != null && convertView.getTag() instanceof TextViewHolder) { diff --git a/app/src/main/java/cn/jzvd/demo/ActivityListViewNormal.java b/app/src/main/java/cn/jzvd/demo/ActivityListViewNormal.java index cc153b04..70720807 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityListViewNormal.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityListViewNormal.java @@ -34,7 +34,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { listView.setAdapter(new AdapterListView(this, VideoConstant.videoUrls[0], VideoConstant.videoTitles[0], - VideoConstant.videoThumbs[0])); + VideoConstant.videoposters[0])); listView.setOnScrollListener(new AbsListView.OnScrollListener() { @Override diff --git a/app/src/main/java/cn/jzvd/demo/ActivityMain.java b/app/src/main/java/cn/jzvd/demo/ActivityMain.java index c6f76900..45965ef5 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityMain.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityMain.java @@ -27,7 +27,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { myJzvdStd = findViewById(R.id.jz_video); myJzvdStd.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4" , "饺子快长大"); - Glide.with(this).load("http://jzvd-pic.nathen.cn/jzvd-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.posterImageView); } diff --git a/app/src/main/java/cn/jzvd/demo/ActivityPreloading.java b/app/src/main/java/cn/jzvd/demo/ActivityPreloading.java index 28a206ce..2e1e82b8 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityPreloading.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityPreloading.java @@ -36,7 +36,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { // , "饺子快长大"); // jzvdStd.setUp("http://jzvd.nathen.cn/4f965ad507ef4194a60a943a34cfe147/32af151ea132471f92c9ced2cff785ea-5287d2089db37e62345123a1be272f8b.mp4" // , "饺子快长大"); - Glide.with(this).load("http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png").into(jzvdStd.thumbImageView); + Glide.with(this).load("http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png").into(jzvdStd.posterImageView); } diff --git a/app/src/main/java/cn/jzvd/demo/ActivityTinyWindow.java b/app/src/main/java/cn/jzvd/demo/ActivityTinyWindow.java index 122e330c..63b59501 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) { , JzvdStd.SCREEN_NORMAL); Glide.with(this) .load("http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png") - .into(jzvdStdTinyWindow.thumbImageView); + .into(jzvdStdTinyWindow.posterImageView); } diff --git a/app/src/main/java/cn/jzvd/demo/ActivityTinyWindowRecycleViewMultiHolder.java b/app/src/main/java/cn/jzvd/demo/ActivityTinyWindowRecycleViewMultiHolder.java index 7ae97318..3927786b 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityTinyWindowRecycleViewMultiHolder.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityTinyWindowRecycleViewMultiHolder.java @@ -133,7 +133,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { VideoConstant.videoUrls[0][position], VideoConstant.videoTitles[0][position], Jzvd.SCREEN_NORMAL); videoHolder.jzvdStd.positionInList = position; - Glide.with(ActivityTinyWindowRecycleViewMultiHolder.this).load(VideoConstant.videoThumbs[0][position]).into(videoHolder.jzvdStd.thumbImageView); + Glide.with(ActivityTinyWindowRecycleViewMultiHolder.this).load(VideoConstant.videoposters[0][position]).into(videoHolder.jzvdStd.posterImageView); } } diff --git a/app/src/main/java/cn/jzvd/demo/ActivityWebView.java b/app/src/main/java/cn/jzvd/demo/ActivityWebView.java index b4c64d45..a59230ae 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityWebView.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityWebView.java @@ -73,8 +73,8 @@ public void adViewJiaoZiVideoPlayer(final int width, final int height, final int jzvdStd.setUp(VideoConstant.videoUrlList[1], "饺子骑大马", Jzvd.SCREEN_NORMAL); Glide.with(ActivityWebView.this) - .load(VideoConstant.videoThumbList[1]) - .into(jzvdStd.thumbImageView); + .load(VideoConstant.videoposterList[1]) + .into(jzvdStd.posterImageView); ViewGroup.LayoutParams ll = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); AbsoluteLayout.LayoutParams layoutParams = new AbsoluteLayout.LayoutParams(ll); layoutParams.y = JZUtils.dip2px(ActivityWebView.this, top); @@ -90,8 +90,8 @@ public void adViewJiaoZiVideoPlayer(final int width, final int height, final int jzvdStd.setUp(VideoConstant.videoUrlList[2], "饺子失态了", Jzvd.SCREEN_NORMAL); Glide.with(ActivityWebView.this) - .load(VideoConstant.videoThumbList[2]) - .into(jzvdStd.thumbImageView); + .load(VideoConstant.videoposterList[2]) + .into(jzvdStd.posterImageView); ViewGroup.LayoutParams ll = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); AbsoluteLayout.LayoutParams layoutParams = new AbsoluteLayout.LayoutParams(ll); layoutParams.y = JZUtils.dip2px(ActivityWebView.this, top); diff --git a/app/src/main/java/cn/jzvd/demo/AdapterListView.java b/app/src/main/java/cn/jzvd/demo/AdapterListView.java index ff9ebc36..1ad26071 100644 --- a/app/src/main/java/cn/jzvd/demo/AdapterListView.java +++ b/app/src/main/java/cn/jzvd/demo/AdapterListView.java @@ -23,13 +23,13 @@ public class AdapterListView extends BaseAdapter { String[] videoUrls; String[] videoTitles; - String[] videoThumbs; + String[] videoposters; - public AdapterListView(Context context, String[] videoUrls, String[] videoTitles, String[] videoThumbs) { + public AdapterListView(Context context, String[] videoUrls, String[] videoTitles, String[] videoposters) { this.context = context; this.videoUrls = videoUrls; this.videoTitles = videoTitles; - this.videoThumbs = videoThumbs; + this.videoposters = videoposters; } @Override @@ -64,8 +64,8 @@ public View getView(int position, View convertView, ViewGroup parent) { videoUrls[position], videoTitles[position], Jzvd.SCREEN_NORMAL); Glide.with(convertView.getContext()) - .load(videoThumbs[position]) - .into(viewHolder.jzvdStd.thumbImageView); + .load(videoposters[position]) + .into(viewHolder.jzvdStd.posterImageView); viewHolder.jzvdStd.positionInList = position; return convertView; } diff --git a/app/src/main/java/cn/jzvd/demo/AdapterRecyclerView.java b/app/src/main/java/cn/jzvd/demo/AdapterRecyclerView.java index df6296f5..96510cf0 100644 --- a/app/src/main/java/cn/jzvd/demo/AdapterRecyclerView.java +++ b/app/src/main/java/cn/jzvd/demo/AdapterRecyclerView.java @@ -39,7 +39,7 @@ public void onBindViewHolder(MyViewHolder holder, int position) { holder.jzvdStd.setUp( VideoConstant.videoUrls[0][position], VideoConstant.videoTitles[0][position], Jzvd.SCREEN_NORMAL); - Glide.with(holder.jzvdStd.getContext()).load(VideoConstant.videoThumbs[0][position]).into(holder.jzvdStd.thumbImageView); + Glide.with(holder.jzvdStd.getContext()).load(VideoConstant.videoposters[0][position]).into(holder.jzvdStd.posterImageView); } @Override diff --git a/app/src/main/java/cn/jzvd/demo/AdapterRecyclerViewTiny.java b/app/src/main/java/cn/jzvd/demo/AdapterRecyclerViewTiny.java index 035d5de2..22ecac24 100644 --- a/app/src/main/java/cn/jzvd/demo/AdapterRecyclerViewTiny.java +++ b/app/src/main/java/cn/jzvd/demo/AdapterRecyclerViewTiny.java @@ -40,7 +40,7 @@ public void onBindViewHolder(MyViewHolder holder, int position) { holder.jzvdStd.setUp( VideoConstant.videoUrls[0][position], VideoConstant.videoTitles[0][position], Jzvd.SCREEN_NORMAL); - Glide.with(holder.jzvdStd.getContext()).load(VideoConstant.videoThumbs[0][position]).into(holder.jzvdStd.thumbImageView); + Glide.with(holder.jzvdStd.getContext()).load(VideoConstant.videoposters[0][position]).into(holder.jzvdStd.posterImageView); } @Override diff --git a/app/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdMp3.java b/app/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdMp3.java index cee65631..bf4fa7e7 100644 --- a/app/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdMp3.java +++ b/app/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdMp3.java @@ -27,7 +27,7 @@ public int getLayoutId() { @Override public void onClick(View v) { - if (v.getId() == cn.jzvd.R.id.thumb && + if (v.getId() == cn.jzvd.R.id.poster && (state == STATE_PLAYING || state == STATE_PAUSE)) { onClickUiToggle(); @@ -52,26 +52,26 @@ public void changeUiToPreparing() { @Override public void changeUiToPlayingShow() { super.changeUiToPlayingShow(); - thumbImageView.setVisibility(View.VISIBLE); + posterImageView.setVisibility(View.VISIBLE); } @Override public void changeUiToPlayingClear() { super.changeUiToPlayingClear(); - thumbImageView.setVisibility(View.VISIBLE); + posterImageView.setVisibility(View.VISIBLE); } @Override public void changeUiToPauseShow() { super.changeUiToPauseShow(); - thumbImageView.setVisibility(View.VISIBLE); + posterImageView.setVisibility(View.VISIBLE); } @Override public void changeUiToPauseClear() { super.changeUiToPauseClear(); - thumbImageView.setVisibility(View.VISIBLE); + posterImageView.setVisibility(View.VISIBLE); } @Override diff --git a/app/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdShowTextureViewAfterAutoComplete.java b/app/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdShowTextureViewAfterAutoComplete.java index 7c4e2d79..f7400a90 100644 --- a/app/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdShowTextureViewAfterAutoComplete.java +++ b/app/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdShowTextureViewAfterAutoComplete.java @@ -22,7 +22,7 @@ public JzvdStdShowTextureViewAfterAutoComplete(Context context, AttributeSet att @Override public void onAutoCompletion() { super.onAutoCompletion(); - thumbImageView.setVisibility(View.GONE); + posterImageView.setVisibility(View.GONE); } } diff --git a/app/src/main/java/cn/jzvd/demo/FragmentDemo.java b/app/src/main/java/cn/jzvd/demo/FragmentDemo.java index f9cd084c..db7702b5 100644 --- a/app/src/main/java/cn/jzvd/demo/FragmentDemo.java +++ b/app/src/main/java/cn/jzvd/demo/FragmentDemo.java @@ -36,7 +36,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, listView.setAdapter(new AdapterListView(getActivity(), VideoConstant.videoUrls[index], VideoConstant.videoTitles[index], - VideoConstant.videoThumbs[index])); + VideoConstant.videoposters[index])); listView.setOnScrollListener(new AbsListView.OnScrollListener() { @Override public void onScrollStateChanged(AbsListView view, int scrollState) { diff --git a/app/src/main/java/cn/jzvd/demo/VideoConstant.java b/app/src/main/java/cn/jzvd/demo/VideoConstant.java index 77342738..d222fdb4 100644 --- a/app/src/main/java/cn/jzvd/demo/VideoConstant.java +++ b/app/src/main/java/cn/jzvd/demo/VideoConstant.java @@ -16,7 +16,7 @@ public class VideoConstant { "http://jzvd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4" }; - public static String[] videoThumbList = + public static String[] videoposterList = { "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", @@ -55,7 +55,7 @@ public class VideoConstant { } }; - public static String[][] videoThumbs = + public static String[][] videoposters = { { "http://jzvd-pic.nathen.cn/jzvd-pic/bd7ffc84-8407-4037-a078-7d922ce0fb0f.jpg", diff --git a/app/src/main/java/cn/jzvd/demo/tiktok/AdapterTikTokRecyclerView.java b/app/src/main/java/cn/jzvd/demo/tiktok/AdapterTikTokRecyclerView.java index 43f7b028..de93988e 100644 --- a/app/src/main/java/cn/jzvd/demo/tiktok/AdapterTikTokRecyclerView.java +++ b/app/src/main/java/cn/jzvd/demo/tiktok/AdapterTikTokRecyclerView.java @@ -44,7 +44,7 @@ public void onBindViewHolder(MyViewHolder holder, int position) { VideoConstant.videoTitles[0][position]); jzDataSource.looping = true; holder.jzvdStd.setUp(jzDataSource,Jzvd.SCREEN_NORMAL); - Glide.with(holder.jzvdStd.getContext()).load(VideoConstant.videoThumbs[0][position]).into(holder.jzvdStd.thumbImageView); + Glide.with(holder.jzvdStd.getContext()).load(VideoConstant.videoposters[0][position]).into(holder.jzvdStd.posterImageView); } @Override diff --git a/app/src/main/res/layout/jz_layout_standard_mp3.xml b/app/src/main/res/layout/jz_layout_standard_mp3.xml index 9288a1ea..b2b372f7 100644 --- a/app/src/main/res/layout/jz_layout_standard_mp3.xml +++ b/app/src/main/res/layout/jz_layout_standard_mp3.xml @@ -14,7 +14,7 @@ + android:poster="@drawable/jz_bottom_seek_poster" /> + android:poster="@drawable/jz_bottom_seek_poster" /> + android:poster="@drawable/jz_bottom_seek_poster" /> - - + + diff --git a/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml b/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml index a6b12d55..4de8f2f3 100644 --- a/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml +++ b/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml @@ -13,7 +13,7 @@ + android:poster="@drawable/jz_bottom_seek_poster" /> Date: Sat, 29 Feb 2020 17:23:01 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E9=94=81=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E4=BF=AE=E6=94=B9ui=E6=98=BE=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 13 ++---- .../jzvd/demo/ActivityApiUISmallChange.java | 9 +++++ ...LockScreen.java => JzvdStdLockScreen.java} | 8 ++-- .../java/cn/jzvd/demo/LockScreenActivity.java | 38 ------------------ .../main/res/layout/activity_lock_screen.xml | 13 ------ .../res/layout/activity_ui_small_change.xml | 14 +++++++ app/src/main/res/mipmap-xxhdpi/lock.png | Bin 1233 -> 909 bytes app/src/main/res/mipmap-xxhdpi/unlock.png | Bin 1282 -> 949 bytes 8 files changed, 31 insertions(+), 64 deletions(-) rename app/src/main/java/cn/jzvd/demo/CustomJzvd/{LockScreen.java => JzvdStdLockScreen.java} (95%) delete mode 100644 app/src/main/java/cn/jzvd/demo/LockScreenActivity.java delete mode 100644 app/src/main/res/layout/activity_lock_screen.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ba383038..f26a3c8f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,7 +18,11 @@ android:name=".ActivityMain" android:configChanges="orientation|screenSize|keyboardHidden" android:screenOrientation="portrait"> + + + + - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/cn/jzvd/demo/ActivityApiUISmallChange.java b/app/src/main/java/cn/jzvd/demo/ActivityApiUISmallChange.java index 3cfbb91f..efc6c812 100644 --- a/app/src/main/java/cn/jzvd/demo/ActivityApiUISmallChange.java +++ b/app/src/main/java/cn/jzvd/demo/ActivityApiUISmallChange.java @@ -10,6 +10,7 @@ import cn.jzvd.Jzvd; import cn.jzvd.JzvdStd; import cn.jzvd.demo.CustomJzvd.JzvdStdAutoCompleteAfterFullscreen; +import cn.jzvd.demo.CustomJzvd.JzvdStdLockScreen; import cn.jzvd.demo.CustomJzvd.JzvdStdMp3; import cn.jzvd.demo.CustomJzvd.JzvdStdShowShareButtonAfterFullscreen; import cn.jzvd.demo.CustomJzvd.JzvdStdShowTextureViewAfterAutoComplete; @@ -28,6 +29,7 @@ public class ActivityApiUISmallChange extends AppCompatActivity { JzvdStdVolumeAfterFullscreen jzvdStdVolumeAfterFullscreen; JzvdStdMp3 jzvdStdMp3; JzvdStdSpeed jzvdStdSpeed; + JzvdStdLockScreen lockScreen; JzvdStd jzvdStd_1_1, jzvdStd_16_9; @@ -41,6 +43,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { getSupportActionBar().setTitle("SmallChangeUI"); setContentView(R.layout.activity_ui_small_change); + + lockScreen = findViewById(R.id.lock_screen); + lockScreen.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4" + , "饺子快长大"); + Glide.with(this).load("http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png").into(lockScreen.thumbImageView); + + jzvdStdWithShareButton = findViewById(R.id.custom_videoplayer_standard_with_share_button); jzvdStdWithShareButton.setUp(VideoConstant.videoUrlList[3], "饺子想呼吸", Jzvd.SCREEN_NORMAL); Glide.with(this) diff --git a/app/src/main/java/cn/jzvd/demo/CustomJzvd/LockScreen.java b/app/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdLockScreen.java similarity index 95% rename from app/src/main/java/cn/jzvd/demo/CustomJzvd/LockScreen.java rename to app/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdLockScreen.java index dd71e3e6..8eea2b5e 100644 --- a/app/src/main/java/cn/jzvd/demo/CustomJzvd/LockScreen.java +++ b/app/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdLockScreen.java @@ -17,16 +17,16 @@ /** * 这里是不改源码得情况下 */ -public class LockScreen extends JzvdStd { +public class JzvdStdLockScreen extends JzvdStd { private boolean isLockScreen; private ImageView lockIv; float starX, startY; - public LockScreen(Context context) { + public JzvdStdLockScreen(Context context) { super(context); } - public LockScreen(Context context, AttributeSet attrs) { + public JzvdStdLockScreen(Context context, AttributeSet attrs) { super(context, attrs); } @@ -154,8 +154,8 @@ public void onClick(View v) { lockIv.setBackgroundResource(R.mipmap.unlock); topContainer.setVisibility(VISIBLE); bottomContainer.setVisibility(VISIBLE); + bottomProgressBar.setVisibility(GONE); startButton.setVisibility(VISIBLE); - } } break; diff --git a/app/src/main/java/cn/jzvd/demo/LockScreenActivity.java b/app/src/main/java/cn/jzvd/demo/LockScreenActivity.java deleted file mode 100644 index 6af050cd..00000000 --- a/app/src/main/java/cn/jzvd/demo/LockScreenActivity.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.jzvd.demo; - -import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; - -import com.bumptech.glide.Glide; - -import cn.jzvd.Jzvd; -import cn.jzvd.demo.CustomJzvd.LockScreen; - - -public class LockScreenActivity extends AppCompatActivity { - LockScreen lockScreen; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_lock_screen); - lockScreen = findViewById(R.id.ls); - lockScreen.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4" - , "饺子快长大"); - Glide.with(this).load("http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png").into(lockScreen.thumbImageView); - } - - @Override - protected void onPause() { - super.onPause(); - Jzvd.releaseAllVideos(); - } - - @Override - public void onBackPressed() { - if (Jzvd.backPress()) { - return; - } - super.onBackPressed(); - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_lock_screen.xml b/app/src/main/res/layout/activity_lock_screen.xml deleted file mode 100644 index 5ebef7e9..00000000 --- a/app/src/main/res/layout/activity_lock_screen.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_ui_small_change.xml b/app/src/main/res/layout/activity_ui_small_change.xml index 47930793..163af570 100644 --- a/app/src/main/res/layout/activity_ui_small_change.xml +++ b/app/src/main/res/layout/activity_ui_small_change.xml @@ -12,7 +12,21 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> + + + + + Px#Ay7 z4|)Fwo+2U|HQMcF?4n!OegQ=J@$>n2ramfKeEA)vwck)Q+t(zbTx7)h5|aqV02o88 zV-#{C1bn#Bf(MgOXQYC$x3pjhbplEp8}816JtHB<_JdG32J$6Io4K~5hbDLJUbZ>cFiJy8AnavZfX1P1gLDJxO@P)(5+5~Udx&jf zrv5&2O(2sutTgNdG3RW&k_->TYR08$bp;%2XgXZM>& z>Zv4KmfH2G;{ddh?;DR2Csu`TH^aF{=nqzx)`uRoQbRVC_Fbx@KLD}jn)mz@(4exF z<|eA&K&5Bd$)<%zubzRZbI*3ad8pPQsEU$dQ!3f+V$&M&rhRXoYjI@T&ZWK}--H{- z7W#D4*!R$FGjYQ@UAjaqzwTKvr_97{uV=flR(4TX%I!KjxQ8zDE1$v%j90hTzkDJ zEipSfFg)>k-AMwBp(1ea-&mNR|%r_DI|yon9ez j_gRJV)uq-zXU**g42d%8A1CHE00000NkvXXu0mjfgS@4^ literal 1233 zcmV;?1TOoDP)-A;9*vDfmSVdAu)?u(ct3GiDkk!1iKb9dOmh{Ugj@n)ZTt9$_ha}xSitU&?G6A-C^ey?lz)DG9kLp}?zU@1Jhx=^q zlyv?mI3p2YdkYX7UQc#Nx?mKC=9+8!65#bdovo6ttBYBi0Nat`9;*Pam2`hyM@r_| zcAx&Ok~Wsu=;_uXARTHx{6B&ZOxvdb{h45Cox@XI0%Et1R2A}~q}Z(|Dz;-|e6|9* zP15pGCyEKM9f1b{A^U+Pl0GX1ZbIMoE0Gc_wjw>oStDEO5D-g0jO1do@tzkvm zrvl+moEt*+NLpF~Q$&F6GlBOKz_01w|Dgo1X0-{55!S48Q&yn zbuQ4j^lTpwd{wc(PSU-(c%=k<0rU!-;_ofjsZu@LQ87lT9kNf-iMcki39x-a7*B@x zONt_<6=M57U~R>jMUuYEajt}b3xT(i(Or_x%>kH%j_oDUM5$mclk|2Db_oG1BIhTg zwQ_EbLv?g)N9p`qW$u-dUdpjmLO^VIPbZ^M<=v12Fex3|(J?wW;oT_dnH=mA0;<*6 zdP(uSHDdb{;N;}cosuFw4wVuDZU@#UiyI_WbMH`~aVyyV6gVm2tdX=K2eX8LC^?@? zMz=^>l>;y-9oxSHhb6pKlA=@}DkTI&i|VzOZh}VwKUJc=Ow#tD(U)|DY@ZG6N=Dz2 zG^p{JgW0&wfb#qtN$=(W&A9?>U!8h!QT!a0W3WX!-=q%oo049h&97MruwAYBTNGC< zS7xnR2NGaAx-HRlSxEAfq?`K#`VRpEIxTU=j>cnklW9FMXn!nMb6Wce*nR@& z<>kjE#Z_D5(q;nURwr(ELdMo$=?M6D!?ZnFz;?F+x=*0n1G-JH%K}{*?9Kt*L1=1E zg7KE;^0Wtx?XtDaN8t#*_n>LTT&?R-Dx}sD5JA~KBOX_myy+<=qtyhI22)4B4gm|T zDO!C#lhqVmXl?N)ft%9m$!d%DKS7Px#Bv4FLMF0Q*000020s;dA0}>JvkdTng&CT!c@A>)p zy1KgKmM%m4rHMnKd=)0%l%dM;G12h!GVh(Zi7-n;*@rOG?Ze zId2J0gFNXfe$QqDWIQ@1E-+cU3POPzu|d~`i> zTDswu&`pvu(hN|&Xe&6-asQ24``*f$F_Ly)klQgT z`%Xr=ara%#ZBD1-y5>{s#oa-8?NG~!frv#!ad&2p3F4)`lTC3J)nmKq9{7A(P-REL{|Zri2sfN_>PEXo6Y87`zfXTrdMJ0 zqy(ZUx`vr|GV>3 zPi)KPT_V~mg!n#nh8<4K41h6a7c)QA@*gKVQz#T(nVg*b@py49EG&q6y}lEG?Jd&U z5YZffZCOFc1b|X%I}ttKmi%ynG2+omT4;(fdM(Ykg@OW7aYAAv}Wh?JuQUTzyH*BHP(LWpAv zpsW+n8`$ zEkS#J-UIRy7{D>0TCJX6EEd-@^VYbGHpHL38~}f3<`07)_#*B7g2aQM)_OgFdjV|m zF@AW|cniQ2Qp!)0XeI(+jJcbcpIqjkmo2_Lw^0BWwEvTc5-r4>0T^S}GV`|phT|3A z3jiJzLj011xNqC}`T4UOjmCYvgG3534k%?OlJPs3O1X~JIdwqi!S25wyD)>w+BJ6 zFD}uuT*}i4K)>%1ODm)y>!Pca zx-$rZpM(%zmeXnCT(KUYwYC>iZ(2|zBO|Aej*kA}0`327`VGJi05kF8s!}eOyMEl2 z14waaY9&h`?*VxU#6h)WXr^NBbh}PzaB!0cv5|QnNvjAp;AlP3jm5%LH sadnUifU9^v*yRBFp_Q_Xao~HvzpOx3ZVJ*FIRF3v07*qoM6N<$f@V-&Q~&?~ From 7a8bcac27bdf08319f2ad3603c9dbdd625181db2 Mon Sep 17 00:00:00 2001 From: Nathen <1066666651@qq.com> Date: Fri, 6 Mar 2020 03:39:35 +0800 Subject: [PATCH 04/17] upload manual in future --- gradle/maven_push.gradle | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/gradle/maven_push.gradle b/gradle/maven_push.gradle index 698febe5..ee0a7047 100644 --- a/gradle/maven_push.gradle +++ b/gradle/maven_push.gradle @@ -15,38 +15,11 @@ uploadArchives { mavenDeployer { beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } -// repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { -// authentication(userName: getProperty('ossrhUsername'), -// password: getProperty('ossrhPassword')) -// } + repository(url: uri('build/buildUpload')) pom.project { name 'jiaozivideoplayer' packaging 'aar' - // optionally artifactId can be defined here - description 'android videoplayer videoview 安卓视频播放器 全屏 播放器列表全屏 仿今日头条UI' - url 'https://github.com/Jzvd/JiaoZiVideoPlayer' - - scm { - connection 'https://github.com/Jzvd/JiaoZiVideoPlayer' - developerConnection 'https://github.com/Jzvd/JiaoZiVideoPlayer' - url 'https://github.com/Jzvd/JiaoZiVideoPlayer' - } - - licenses { - license { - name 'MIT' - url 'http://mit-license.org/' - } - } - - developers { - developer { - id 'Nathen' - name 'Nathen' - email '1066666651@qq.com' - } - } } } } From e8d7c2a481bebc32118d7bb3b4d28148a69e387e Mon Sep 17 00:00:00 2001 From: chenxingwang <848864817@qq.com> Date: Sat, 7 Mar 2020 15:13:23 +0800 Subject: [PATCH 05/17] fix ui bug --- .../demo/CustomJzvd/JzvdStdLockScreen.java | 85 ++++++++++++------- .../res/layout/lock_screen_jz_layout_std.xml | 4 +- 2 files changed, 58 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdLockScreen.java b/app/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdLockScreen.java index 8eea2b5e..cf98e0f8 100644 --- a/app/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdLockScreen.java +++ b/app/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdLockScreen.java @@ -62,24 +62,6 @@ public boolean onTouch(View v, MotionEvent event) { } - @Override - public void changeUiToPlayingShow() { - super.changeUiToPlayingShow(); - if (screen == SCREEN_FULLSCREEN) { - bottomProgressBar.setVisibility(GONE); - if (isLockScreen) { - topContainer.setVisibility(GONE); - bottomContainer.setVisibility(GONE); - startButton.setVisibility(GONE); - - } else { - topContainer.setVisibility(VISIBLE); - bottomContainer.setVisibility(VISIBLE); - startButton.setVisibility(VISIBLE); - } - } - } - @Override public void init(Context context) { super.init(context); @@ -87,23 +69,40 @@ public void init(Context context) { lockIv.setOnClickListener(this); } - @Override - public void changeUiToPlayingClear() { - super.changeUiToPlayingClear(); - if (screen == SCREEN_FULLSCREEN) { - bottomProgressBar.setVisibility(GONE); - } - } + @Override public void onClickUiToggle() { super.onClickUiToggle(); if (screen == SCREEN_FULLSCREEN) { - if (lockIv.getVisibility() == VISIBLE) { - lockIv.setVisibility(View.GONE); + if (!isLockScreen) { + if (bottomContainer.getVisibility() == View.VISIBLE) { + lockIv.setVisibility(View.VISIBLE); + } else { + lockIv.setVisibility(View.GONE); + } } else { - lockIv.setVisibility(View.VISIBLE); + if ((int) lockIv.getTag() == 1) { + bottomProgressBar.setVisibility(GONE); + if (lockIv.getVisibility() == View.GONE) { + lockIv.setVisibility(View.VISIBLE); + } else { + lockIv.setVisibility(View.GONE); + } + + } } + + } + } + + @Override + public void changeUiToPauseShow() { + super.changeUiToPauseShow(); + if (isLockScreen) { + bottomContainer.setVisibility(GONE); + topContainer.setVisibility(GONE); + startButton.setVisibility(GONE); } } @@ -125,6 +124,33 @@ public void dissmissControlView() { }); } + @Override + public void changeUiToPlayingShow() { + super.changeUiToPlayingShow(); + if (screen == SCREEN_FULLSCREEN) { + bottomProgressBar.setVisibility(GONE); + if (isLockScreen) { + topContainer.setVisibility(GONE); + bottomContainer.setVisibility(GONE); + startButton.setVisibility(GONE); + } else { + topContainer.setVisibility(VISIBLE); + bottomContainer.setVisibility(VISIBLE); + startButton.setVisibility(VISIBLE); + } + } + } + + @Override + public void changeUiToPlayingClear() { + super.changeUiToPlayingClear(); + if (screen == SCREEN_FULLSCREEN) { + bottomProgressBar.setVisibility(GONE); + lockIv.setVisibility(View.GONE); + } + } + + @Override public void setScreenNormal() { super.setScreenNormal(); @@ -143,6 +169,7 @@ public void onClick(View v) { switch (v.getId()) { case R.id.lock: if (screen == SCREEN_FULLSCREEN) { + lockIv.setTag(1); if (!isLockScreen) { isLockScreen = true; JZUtils.setRequestedOrientation(getContext(), ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); @@ -152,9 +179,9 @@ public void onClick(View v) { JZUtils.setRequestedOrientation(getContext(), ActivityInfo.SCREEN_ORIENTATION_SENSOR); isLockScreen = false; lockIv.setBackgroundResource(R.mipmap.unlock); - topContainer.setVisibility(VISIBLE); bottomContainer.setVisibility(VISIBLE); bottomProgressBar.setVisibility(GONE); + topContainer.setVisibility(VISIBLE); startButton.setVisibility(VISIBLE); } } diff --git a/app/src/main/res/layout/lock_screen_jz_layout_std.xml b/app/src/main/res/layout/lock_screen_jz_layout_std.xml index ff12b0b8..77945ec5 100644 --- a/app/src/main/res/layout/lock_screen_jz_layout_std.xml +++ b/app/src/main/res/layout/lock_screen_jz_layout_std.xml @@ -214,8 +214,8 @@ Date: Sat, 7 Mar 2020 21:56:30 +0800 Subject: [PATCH 06/17] build_upload --- gradle/{maven_push.gradle => build_upload.gradle} | 0 jiaozivideoplayer/build.gradle | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename gradle/{maven_push.gradle => build_upload.gradle} (100%) diff --git a/gradle/maven_push.gradle b/gradle/build_upload.gradle similarity index 100% rename from gradle/maven_push.gradle rename to gradle/build_upload.gradle diff --git a/jiaozivideoplayer/build.gradle b/jiaozivideoplayer/build.gradle index 32037b5c..1a3867b0 100644 --- a/jiaozivideoplayer/build.gradle +++ b/jiaozivideoplayer/build.gradle @@ -14,6 +14,7 @@ android { sourceCompatibility 1.8 targetCompatibility 1.8 } + lintOptions { abortOnError false } @@ -25,4 +26,4 @@ dependencies { compileOnly 'androidx.appcompat:appcompat:1.1.0' } -apply from: '../gradle/maven_push.gradle' +apply from: '../gradle/build_upload.gradle' From f1aec02ebb4741a0aa169ed2f22dfb57b9f229a9 Mon Sep 17 00:00:00 2001 From: Nathen <1066666651@qq.com> Date: Sun, 8 Mar 2020 00:51:55 +0800 Subject: [PATCH 07/17] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3b953f86..fb8e88b0 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,9 @@ ## 置顶消息： -Q群:490442439, 2群:761899104, 验证信息:jzvd, 微信公众号:jzvdjzt，微信:lipanhelloworld，QQ:1066666651，[Telegram](https://t.me/jiaozitoken)，[Weibo](http://weibo.com/2342820395/profile?topnav=1&wvr=6&is_all=1)，[公众号文章](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E5%85%AC%E4%BC%97%E5%8F%B7%E6%96%87%E7%AB%A0) +群主微信进饺子粉丝群，沟通重心从Q群转移到微信群。微信:lipanhelloworld备注JZVD，Q群:490442439, 2群:761899104, 验证信息:jzvd, 微信公众号:jzvdjzt，QQ:1066666651，[Telegram](https://t.me/jiaozitoken)，[Weibo](http://weibo.com/2342820395/profile?topnav=1&wvr=6&is_all=1)，[公众号文章](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E5%85%AC%E4%BC%97%E5%8F%B7%E6%96%87%E7%AB%A0) + + 为了增加项目质量，促进项目进度，调用社群力量，方便社群管理，推出基于以太坊ERC-20的数字通证[JiaoZiToken(JZT)(饺子Token)](https://github.com/JZVD/JZT)，必定大有可为。 From 16e913dcee69d83e49e9d2571d483bce4e9187d0 Mon Sep 17 00:00:00 2001 From: zhaodaizheng <709136855@qq.com> Date: Sun, 8 Mar 2020 20:47:09 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=BF=E6=8A=96?= =?UTF-8?q?=E9=9F=B3=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 1 + .../jzvd/demo/CustomJzvd/JzvdStdTikTok.java | 80 ++++++----- .../main/res/drawable-xxhdpi/btn_share_to.png | Bin 0 -> 923 bytes .../main/res/drawable-xxhdpi/ic_add_star.png | Bin 0 -> 170 bytes .../res/drawable-xxhdpi/ic_comment_normal.png | Bin 0 -> 3365 bytes .../res/drawable-xxhdpi/ic_douyin_icon.png | Bin 0 -> 522 bytes .../res/drawable-xxhdpi/ic_music_play.png | Bin 0 -> 2734 bytes .../res/drawable-xxhdpi/ic_play_tiktok.png | Bin 0 -> 2126 bytes .../res/drawable-xxhdpi/ic_star_normal.png | Bin 0 -> 1714 bytes .../res/drawable-xxhdpi/ic_star_selected.png | Bin 0 -> 1009 bytes app/src/main/res/drawable/ic_border_white.xml | 11 ++ app/src/main/res/drawable/ic_circle_red.xml | 10 ++ .../main/res/drawable/ic_star_selector.xml | 5 + app/src/main/res/layout/activity_tiktok.xml | 68 ++++++++- app/src/main/res/layout/item_tiktok.xml | 133 +++++++++++++++++- app/src/main/res/mipmap-xhdpi/add_bg.png | Bin 0 -> 438 bytes 16 files changed, 270 insertions(+), 38 deletions(-) create mode 100644 app/src/main/res/drawable-xxhdpi/btn_share_to.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_add_star.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_comment_normal.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_douyin_icon.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_music_play.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_play_tiktok.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_star_normal.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_star_selected.png create mode 100644 app/src/main/res/drawable/ic_border_white.xml create mode 100644 app/src/main/res/drawable/ic_circle_red.xml create mode 100644 app/src/main/res/drawable/ic_star_selector.xml create mode 100644 app/src/main/res/mipmap-xhdpi/add_bg.png diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dd7d4735..b728ed8f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -99,6 +99,7 @@ { + bottomContainer.setVisibility(View.INVISIBLE); + topContainer.setVisibility(View.INVISIBLE); + startButton.setVisibility(View.INVISIBLE); + if (clarityPopWindow != null) { + clarityPopWindow.dismiss(); + } + if (screen != SCREEN_TINY) { + bottomProgressBar.setVisibility(View.GONE); + } + }); + } } - @Override - public void changeUiToPlayingClear() { - super.changeUiToPlayingClear(); - bottomProgressBar.setVisibility(VISIBLE); - } - - @Override - public void changeUiToPauseShow() { - super.changeUiToPauseShow(); - bottomProgressBar.setVisibility(VISIBLE); - } - - @Override - public void changeUiToPauseClear() { - super.changeUiToPauseClear(); - bottomProgressBar.setVisibility(VISIBLE); - } - - @Override - public void changeUiToComplete() { - super.changeUiToComplete(); - } - - @Override - public void changeUiToError() { - super.changeUiToError(); - } @Override public void onClickUiToggle() { @@ -80,6 +75,23 @@ public void onClickUiToggle() { startButton.performClick(); bottomContainer.setVisibility(GONE); topContainer.setVisibility(GONE); - bottomProgressBar.setVisibility(VISIBLE); + } + + public void updateStartImage() { + if (state == STATE_PLAYING) { + startButton.setVisibility(VISIBLE); + startButton.setImageResource(R.drawable.ic_play_tiktok); + replayTextView.setVisibility(GONE); + } else if (state == STATE_ERROR) { + startButton.setVisibility(INVISIBLE); + replayTextView.setVisibility(GONE); + } else if (state == STATE_AUTO_COMPLETE) { + startButton.setVisibility(VISIBLE); + startButton.setImageResource(R.drawable.ic_play_tiktok); + replayTextView.setVisibility(VISIBLE); + } else { + startButton.setImageResource(R.drawable.ic_play_tiktok); + replayTextView.setVisibility(GONE); + } } } diff --git a/app/src/main/res/drawable-xxhdpi/btn_share_to.png b/app/src/main/res/drawable-xxhdpi/btn_share_to.png new file mode 100644 index 0000000000000000000000000000000000000000..7a35d10eff6b71250ae3d541153fc5c455ee4172 GIT binary patch literal 923 zcmeAS@N?(olHy`uVBq!ia0vp^t{}|83?#LKZ%YHIp8-B0Ai@9t|1&W$0U2oE)~#DW z5uhv(eEReWs0PCR`0*oL93lcF|NZ;-^XJd^@87?B_wM@j>p=BD@b>Lnpw!>Lf4_hK z{@}p_KR-Vpsi2^6>eQ*7J9k2K0m(mq{`~&^8>s!)uU|kD-n@AO;ePw}?b4-7Km&p5 zj~qDyk=nj}`_rdSfoh&Ve}4M(=|_(q_4oHfi~`yMwClx-7eI3!K70st|K7cOKYaKw zXU?1n6DB-<{5Uc)a^}pLv9Ym0a^m7WMnG=_mjw9*GdyEr;b!F!5q1!Kc(mv)7nr|Ru~%;=;P_(=Hy^$VxX%ndtmL% z*4&KLC^r`~bro?DZq~`o_VXAR82@>?IEF+VetSJK_>qIafsb$B%~bR;NZA=VA^Jnv z-q_OXrSE@#_+2j{=xf?{^27vn-GAp}_rJ0!398(faq%->zIW$^>t3nVEi?Ec+X|P4 zX|bj9=6&Ml2-f)jVB4cle|RpjE=iwoPVtm|(y`E!Ovd@oQUcN%PybIj7Mu8Niosr{ zonprCxQugMp1)q`k@!reFfDQG*8P|7u2|RVYVc}L>M^e^ueU0xh`IHgjkvkGVef~z zb0wwc*H&zq)a$tC)@jD{#CytWO7&R=$xl_-R$gtK86EA|v_3bdzNqIV_IvwzQ9P>$z5RU$J~GqOo~$`1$w3E za%davT9{Srqv6?d`DA8lr=WA7{Cl;ws1=P literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_star.png b/app/src/main/res/drawable-xxhdpi/ic_add_star.png new file mode 100644 index 0000000000000000000000000000000000000000..bb3f53ae41ed47dad811b25531a0ddb45e41945d GIT binary patch literal 170 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 G_udg1RKD2Ay?Ao+=djkzQfkk$bYPRwW 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_tiktok.png b/app/src/main/res/drawable-xxhdpi/ic_play_tiktok.png new file mode 100644 index 0000000000000000000000000000000000000000..707aea899de938c5e991a867d8f85d1067a59e7b GIT binary patch literal 2126 zcmbW2`9Bkk1IML2w8y9S^xkf803-oiTwDT{76|)e79RT}-^t^= z>wC)o7%)3)N3&xd{a*rHhK3xEfe-AF4qTTEbd5F5)GU?cPm1#jf`I@j#5!V|i;K6x z5@F)_i2AonT+}--|Ea#T(NXm5k=Ie`O-PRm@7au_abG@ISR8bk#L;Iqy=<6)Rp%E6 zqEO4R24C+yszeV3c09da7hpVjAXNW-7t#{W(V3dy#xCi5ZLK1h9NT4N0WN!2Q{y}?;ZwA5e6z|Y=n}A zAD=diKV^|iK|lTjoU%CPlxgxSE}7Xy^qWw4bidP7Z1W+ykivA~?b9{+W$=ejt)Rxu z6j_@gu<}l)WI^;Glo77W&VLiJRo2^P0ndi(_^Qh1)m>?}bFUe;ol{hRLyNr8mEsD-O$(udky|vYxrV=&onRa?6)aHpQ3qWh`?S=OUJ#`T zZ!@Gm43iZ8>;ubVGzS^N2zlUP2J`(DZLmEl{`q)%s!BxB!xjtV3h0WqgsSIP2>W_B z!$w#l8)XFzeic+DZb;5X@mE2T`M_$@roleI4EFv0Z`s_G3gw9#M`{;5*4tJ-t9Mx$ zE#xTNm3zh7Db4r1z2AE9=`@v4{F_9_DY!Hm1Sb5i=#sbSxe<{X?H(adX?ZIW*AC(; zpzjlNl#5<55u9fusRLxK4w{)Pu3ki@$Iy_3#)7;YuT3)J2$>LUl9!`bzoUzUJBD3i zxf?|OpgZm)7ASu6p!1D5cgR@pz>>PJ3cp!t--zP+L@s?Ue&*Yr2~>ortmpY)oR2b4 zw59_T=F@{nioMQRoFi}&D8SB{C%p;tIy?Sh@|bh}KA3N!6xKFuQwLL0__pg&v#~<^ z3K#;qhvbw?(?`l*gkt-v&(?jULnHci+^2VHWfuIke$?~yF(S?__$R9~w>lRbE(-{* zPe+H+WU#vd%}kz}VE43HS{Pj{{X@G`x(qS|v7KZHpwDgZ#*}eaNR&vA zn0_9}L!#X8$L>!}JF8YRWQ<&xy-zrX>DCW2^1BuzABm;U_kS462&&VddZd+XMCf2g zY$LXaWiS4n5FhdRiN)7sqO5KQ-mQ7q_6>G625x6^Z1{CzeCh#CA_Qsc>6*PkTw{#P(p9vau{& zx5QI8$v6DcTh1t+sDdA|YS|Btw`kcnRi#s3x;odkRb_>3uy4>Z+Fb838u+~{_9|gx zW~51nxk3eWzZ8B#HdxEa1p|%H<9t{J41}Wrp^nmQD@g$Rt4A3J7|F#B+)gb*kV?xRGd(1 zUg-s&G?WCH27^0KGo~Ht6|h%v0GGX_!s=idqGyV_3!(CI9jib}0iY*U|E~4j401Ie zjU1mWrAog=F1M^|jQ2lZL-aN3kJ#6?X}&lU_+3DjPF-_V9y{;sE{om#5i}Z#_>PJ! z{OY(lQ>3$smoDDBh8tb8`r6_#4p$@jJ$rPAe>Bid5mfIGKd^;<$0lZ}HuFYd!W!N& z6+1$FeOiQsLm9C7@cacJ&hJ6JSlrq5<-Sm?9-HYpL?L;mQE|{k;y7mCT$Q zkoNG$(ueEf@)u_0yM?&f8`D!TB6?WVP4v=O*oHvk#fnJ$vMZ%?A)R)G(nZtgLS^Fy z&7#*&ec{Y_3!lRrS=WcW4irQ`&+LVB-Fd|#&IqN8G&=MxI&GHb22d>PvPKyts6;Pu zdC2EHb@SiNn3ghVqmS(=rEhCTX;~yf zZ|NmT_J)nnE1EQz)mW?|yqC3nC^>ivGzg{d&-IF4V{4Qek-@hr80NWXwqeAUkjP~= zkV?~^Q)HMY;R;nb5BKY~7Hs{o9ms><9nsbKBL%9zjQ;JR@XBmX@3xx%R4O0RBdfl& rkvPXHmd>jZikY>&>O9y1&Y~FIGJsE4=6LxXe><0@84^)z>iP6Pe$zxr literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_star_normal.png b/app/src/main/res/drawable-xxhdpi/ic_star_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..d6c1185bb8da7c4c5de46c055754ed24f749220a GIT binary patch literal 1714 zcmX|>c{Cf?7spK!Q)*vkENyjEwT@cS;8(PkV6>G`Kh*L|>_aTWAhysj6hSrGp;T3; zYO1QCiV2$Z zl)}|3P97kqf}J1(1@Wb>Fb|{^ceK~{2L}hBgg_u$TU(%j!C)Zn@9*#K?uy0YFJHc3 zFc`pWZf>@>w}Yatu5NsM9Ke9t-rfcZSgWh6dwY8T?(XgetwRwUSzlkDo0|i3Mn^}B zi;IOqVMay<(Enu?7Z<@rRaI3q8V!ht`e6jv#>NI1E0IW+mzO~SU=Zi$=fNB>mc!vp zPEPW8yh9t{E`Wh9um`*WGkiWDv<3$U51p*7tt~7pxb0BA!3*6JJ={D+QZSLMlDr5k zO`44{-$3z?2*DVo)E{Lw#$xn7j&(=rey8*4eFZtwPeEpe%lXjJ(OOF)Wv8VkMqn=6 zX-^D1y^XsTAMWdT(cJLtF%);=D=8^y-K$PWuL%AECq9~MulaU0utX49X|BL#4&@l5 z^Fn@LpU34s!I$1^T;v~gR=gLk{gzTIJK$fv!Lut|i#z!!wXj6vZw2q>I<0A0rKiXy&`tGg{1ZezDuikIj*;d~NxV#{Hikne){>_j=k*S791Wy52eb$7YK~ z3Y|b~Eq)r>+W2dWDq4dZI;6h-<{fOLr^c$);^fD-Xn3Y6#y<2`QSuqfKmw$}HK8qM z4w*iL-3)aO3)Xmm54%r$S#oflZ}t&5$3B~Q zd})(zr=O~5mPB)jgXo>#t%PNg?xt;-$_Dg0G28w`tym;FHxl)GXW>J0Iz43qwiI`s zyUW%eqc4UWOnf+@)sxjT@VlKQ3@?T}m=~_xhNNI48Y(-NO^&1JQ^^h0X5q8`N$S4S z8inJgxT&l7`!6Z00WF@22Ld_NN*>b3W+@<}zHiEJ*=JNgC5Hc&?3ooQw6lpQ_-09{ zWsJ?O%4G3AMx8<`=LS3c|6(XiMFj>mEIb-ufYd!^-lys#vnyF{VYG@)9xv1zb1+m| ziLbAJe~m z{AvwdT%N`-c42HXs~U+T^(>CZjC3+WuZ91b)uu+!qadzL>jw{dVUKkZEU>IgJnefp zcH;By0l9_CWWE9L|FJV#iE{khRZbT6G0NKd_!qyw@`& z-NSH1g*V-oMT`y!CNhC=v^PWH9kGxIp*2*@-8Z4C!gh*^&+cMrWx6sqzBbK`Qy_-{`Ls0fVex|1T literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_star_selected.png b/app/src/main/res/drawable-xxhdpi/ic_star_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..19c8823b19f7473cbc1ea0a62e79d2d0a23830c4 GIT binary patch literal 1009 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`v7|ftIx;Y9?C1WI$O_~$76-XI zF|0c$^AgC;4)6(abuaMwZyEYuH}t=80HRO`7sv*Rgn`rmr3_($W^w;@ zqyFoM{&z_DuN(ef53I%@;lExuSbZc&JxCC2)c^k=hIP_^eTXe!agaq}|MkEI0%di9 zTEMm#!$g3B20%l?LE;8Ll|Tke$}kG5807LakVT%kU`HaUftY3x{@*+rtQc$^NDyo( z&~TtGkoK7W4h!O4Or8%PG zuL0#6sm5RcfP+G zjE_}Uy?XyBvfS8o@A2{$_gQlUzOwxPcyDg*j)Ui0`}U;8U-M zjs0btJuNx=J}E3+T)BE@$hB2h4d<9$*?&It_4NwfQ`?S(F`DQ7-n2RDz=W;^+m`Be yy*TL;_ML4~&!sODt{wSs?Z?T-Mq7&hF|L^7%Tq6Qr5%`F7(8A5T-G@yGywoAx8|e( literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_border_white.xml b/app/src/main/res/drawable/ic_border_white.xml new file mode 100644 index 00000000..df48158f --- /dev/null +++ b/app/src/main/res/drawable/ic_border_white.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_circle_red.xml b/app/src/main/res/drawable/ic_circle_red.xml new file mode 100644 index 00000000..4b827735 --- /dev/null +++ b/app/src/main/res/drawable/ic_circle_red.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_star_selector.xml b/app/src/main/res/drawable/ic_star_selector.xml new file mode 100644 index 00000000..7e1a685d --- /dev/null +++ b/app/src/main/res/drawable/ic_star_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_tiktok.xml b/app/src/main/res/layout/activity_tiktok.xml index 0bdb1cbd..a362ebc5 100644 --- a/app/src/main/res/layout/activity_tiktok.xml +++ b/app/src/main/res/layout/activity_tiktok.xml @@ -1,7 +1,8 @@ - - \ No newline at end of file + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_tiktok.xml b/app/src/main/res/layout/item_tiktok.xml index 245d56df..d4d6022d 100755 --- a/app/src/main/res/layout/item_tiktok.xml +++ b/app/src/main/res/layout/item_tiktok.xml @@ -1,5 +1,5 @@ - @@ -9,4 +9,133 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-xhdpi/add_bg.png b/app/src/main/res/mipmap-xhdpi/add_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..a5308d6c8643981b0d916b620caad5bd8ed6b3ae GIT binary patch literal 438 zcmV;n0ZIOeP)5E&1k2k>zLJ%D-1usddAgGjC)_2ED`U{N66 zg$h;bJ&_s4t^Ou9a4hfQ=|DL;Lxdn;5XrSmIN&O;A$T}o5XrTRI`9F^yN==)yxHW_ z4dXSxFHHZ+nSA(U;qFB07*qoM6N<$f}V%AUjP6A literal 0 HcmV?d00001 From 0e3e00d5010d1c64f0b273bd631856ef04db10eb Mon Sep 17 00:00:00 2001 From: Nathen <1066666651@qq.com> Date: Mon, 9 Mar 2020 00:07:49 +0800 Subject: [PATCH 09/17] add tiktok url and poster --- .../main/java/cn/jzvd/demo/VideoConstant.java | 24 +++++++++++++++++++ .../tiktok/AdapterTikTokRecyclerView.java | 4 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/cn/jzvd/demo/VideoConstant.java b/app/src/main/java/cn/jzvd/demo/VideoConstant.java index 77342738..4483b41e 100644 --- a/app/src/main/java/cn/jzvd/demo/VideoConstant.java +++ b/app/src/main/java/cn/jzvd/demo/VideoConstant.java @@ -52,6 +52,18 @@ public class VideoConstant { "http://jzvd.nathen.cn/d525f756aabf4b0588c2152fb94e07f5/d9f59bef829a472a9ca066620d9b871a-5287d2089db37e62345123a1be272f8b.mp4", "http://jzvd.nathen.cn/6e2fdec45dfa44a6802e95f8e4bc3280/a6a5273ac4244333923991be0583ffc7-5287d2089db37e62345123a1be272f8b.mp4", "http://jzvd.nathen.cn/22b4de0e2b1245959c5baa77fe0bf14e/896a137559084b7eb879f5441faff20d-5287d2089db37e62345123a1be272f8b.mp4" + }, + {//tiktok + "http://jzvd.nathen.cn/video/1137e480-170bac9c523-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/e0bd348-170bac9c3b8-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/7bf938c-170bac9c18a-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/2f03c005-170bac9abac-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/47788f38-170bac9ab8a-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/2d6ffe8f-170bac9ab87-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/633e0ce-170bac9ab65-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/2d6ffe8f-170bac9ab87-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/51f7552c-170bac98718-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/2a101070-170bad88892-0007-1823-c86-de200.mp4" } }; @@ -80,6 +92,18 @@ public class VideoConstant { "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://jzvd.nathen.cn/snapshot/5f1bf07d953d4e50989e99cb45ba6b5d00002.jpg", + "http://jzvd.nathen.cn/snapshot/c0d873f60f664bf6a90c9a69bdf52be900002.jpg", + "http://jzvd.nathen.cn/snapshot/c8598fcf365542a28be332c19d666ec600002.jpg", + "http://jzvd.nathen.cn/snapshot/f2e9d9cb796f420faa0903a28800660e00001.jpg", + "http://jzvd.nathen.cn/snapshot/b3bb3dd69c804993bbd155225b873bdf00002.jpg", + "http://jzvd.nathen.cn/snapshot/43902ca792e84b1b8bee65e28a75177200001.jpg", + "http://jzvd.nathen.cn/snapshot/e027c24371d84a6296d824dc7a7d0aa600002.jpg", + "http://jzvd.nathen.cn/snapshot/c904a0e5627f4a48982c7d09c5dc79ec00001.jpg", + "http://jzvd.nathen.cn/snapshot/b6eacc0aae6049afbcf7cb9365c7694200002.jpg", + "http://jzvd.nathen.cn/snapshot/717f9195bac04ea589692a3143aa04b400002.jpg" } }; diff --git a/app/src/main/java/cn/jzvd/demo/tiktok/AdapterTikTokRecyclerView.java b/app/src/main/java/cn/jzvd/demo/tiktok/AdapterTikTokRecyclerView.java index 6e806f56..c6b1042e 100644 --- a/app/src/main/java/cn/jzvd/demo/tiktok/AdapterTikTokRecyclerView.java +++ b/app/src/main/java/cn/jzvd/demo/tiktok/AdapterTikTokRecyclerView.java @@ -40,11 +40,11 @@ public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { public void onBindViewHolder(MyViewHolder holder, int position) { Log.i(TAG, "onBindViewHolder [" + holder.jzvdStd.hashCode() + "] position=" + position); - JZDataSource jzDataSource = new JZDataSource(VideoConstant.videoUrls[0][position], + JZDataSource jzDataSource = new JZDataSource(VideoConstant.videoUrls[3][position], VideoConstant.videoTitles[0][position]); jzDataSource.looping = true; holder.jzvdStd.setUp(jzDataSource,Jzvd.SCREEN_NORMAL); - Glide.with(holder.jzvdStd.getContext()).load(VideoConstant.videoThumbs[0][position]).into(holder.jzvdStd.thumbImageView); + Glide.with(holder.jzvdStd.getContext()).load(VideoConstant.videoThumbs[3][position]).into(holder.jzvdStd.thumbImageView); } @Override From adcacb8fd8696c29204b040c9c6d05d1656efd82 Mon Sep 17 00:00:00 2001 From: zhaodaizheng <709136855@qq.com> Date: Mon, 9 Mar 2020 11:01:28 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_tiktok.xml | 10 +++++----- app/src/main/res/layout/item_tiktok.xml | 14 +++++++------- .../btn_share_to.png | Bin 3 files changed, 12 insertions(+), 12 deletions(-) rename app/src/main/res/{drawable-xxhdpi => mipmap-xhdpi}/btn_share_to.png (100%) diff --git a/app/src/main/res/layout/activity_tiktok.xml b/app/src/main/res/layout/activity_tiktok.xml index a362ebc5..00ebd934 100644 --- a/app/src/main/res/layout/activity_tiktok.xml +++ b/app/src/main/res/layout/activity_tiktok.xml @@ -27,7 +27,7 @@ android:gravity="center" android:text="首页" android:textColor="@android:color/white" - android:textSize="18sp" + android:textSize="16sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/item_tiktok.xml b/app/src/main/res/layout/item_tiktok.xml index d4d6022d..52a1f4f4 100755 --- a/app/src/main/res/layout/item_tiktok.xml +++ b/app/src/main/res/layout/item_tiktok.xml @@ -72,8 +72,8 @@ + android:layout_width="45dp" + android:layout_height="45dp" /> diff --git a/app/src/main/res/drawable-xxhdpi/btn_share_to.png b/app/src/main/res/mipmap-xhdpi/btn_share_to.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/btn_share_to.png rename to app/src/main/res/mipmap-xhdpi/btn_share_to.png From e1f2fa2bcdce88234fce8e346658e8f998d46e57 Mon Sep 17 00:00:00 2001 From: Nathen <1066666651@qq.com> Date: Mon, 9 Mar 2020 20:53:57 +0800 Subject: [PATCH 11/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fb8e88b0..af1f75fe 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ - + ## QuickStart From c356a42bdec2bba818c6f16e62b19444d76f41ec Mon Sep 17 00:00:00 2001 From: Nathen <1066666651@qq.com> Date: Wed, 11 Mar 2020 02:51:28 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=89=E7=94=9F?= =?UTF-8?q?=E4=B8=89=E4=B8=96=E6=9E=95=E4=B8=8A=E4=B9=A6=E5=85=A8=E9=9B=86?= =?UTF-8?q?url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/jzvd/demo/VideoConstant.java | 131 +++++++++++++++++- 1 file changed, 130 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/cn/jzvd/demo/VideoConstant.java b/app/src/main/java/cn/jzvd/demo/VideoConstant.java index 4483b41e..118ff51c 100644 --- a/app/src/main/java/cn/jzvd/demo/VideoConstant.java +++ b/app/src/main/java/cn/jzvd/demo/VideoConstant.java @@ -66,7 +66,136 @@ public class VideoConstant { "http://jzvd.nathen.cn/video/2a101070-170bad88892-0007-1823-c86-de200.mp4" } }; - + public static String[] ssVideos = { + //0 + "http://jzvd.nathen.cn/video/4542c17b-170c25a8e14-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/5ab693c5-170c25a8e2b-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/375dd5c6-170c25a8e44-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/51e8b629-170c25a8e61-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/1fbd7323-170c25a8e7c-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/3697e6a5-170c5a17543-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/3697e6a5-170c5a17543-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/23755490-170c5a23aa2-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/3485af57-170c5a23b57-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/4c40d283-170c5a23bbe-0007-1823-c86-de200.mp4", +//1 + "http://jzvd.nathen.cn/video/33a3d257-170c5a23c2b-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/2aa00271-170c0924702-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/544973c7-170c092471a-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/4da19896-170c092473b-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/3e6b7f3a-170c0924763-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/8c1d8d9-170c0924776-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/3ed29468-170c099b43f-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/3f52bb8f-170c099f9ab-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/1248915c-170c09a1ce6-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/1c6529ed-170c09a2468-0007-1823-c86-de200.mp4", +//2 + "http://jzvd.nathen.cn/video/53e65db2-170c09a6c1d-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/11131240-170c5b076c4-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/5d6f2372-170c09b3ae0-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/5cc9b365-170c5b076d8-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/13ef1d98-170c09b3b9a-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/2f795df7-170c09b3bed-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/4b76aaac-170c09b3c8f-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/3bad72f7-170c09dc89f-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/581fbe-170c09dee3f-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/2aed5c6f-170c09dfbc3-0007-1823-c86-de200.mp4", +//3 + "http://jzvd.nathen.cn/video/3c0038bd-170c0a06ca0-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/15cace49-170c0a075f7-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/ed1d3ef-170c0a078cd-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/1fe7adc2-170c0afd71a-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/2c1d36cc-170c0afd12c-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/2083feba-170c0afd719-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/39105916-170c0afd718-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/2bc8f057-170c0afd716-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/2b8e9a15-170c0afd71c-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/43a91267-170c0afd719-0007-1823-c86-de200.mp4", +//4 + "http://jzvd.nathen.cn/video/33d5835a-170c0afd717-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/259ea2dd-170c0b41b5d-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/4e82a1ea-170c5bc6941-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/460bad24-170c5bc6956-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/5a2bc514-170c261eff0-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/11b3c81-170c261eff3-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/47d75a32-170c0b41c2b-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/10a5d0f8-170c261f25b-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/52cb5649-170c261f720-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/31f18965-170c2621a73-0007-1823-c86-de200.mp4", +//5 + "http://jzvd.nathen.cn/video/4a7b4838-170c267601a-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/554fe55-170c26772b4-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/31dbfe8e-170c2677478-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/30ab99b5-170c2677ca8-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/3acdb082-170c26793c3-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/4bf014a5-170c26aed4b-0007-1823-c86-de200.mp4", + "http://jzvd.nathen.cn/video/2f74432d-170c26afad2-0007-1823-c86-de200.mp4" + }; + public static String[] ssPoster = { + "http://jzvd.nathen.cn/snapshot/f402a0e012b14d41ad07939746844c5e00005.jpg", + "http://jzvd.nathen.cn/snapshot/4105cf36b9b8463ea9151c6ad73717d900005.jpg", + "http://jzvd.nathen.cn/snapshot/1ae064966b8b423887af71c3eba3bca100005.jpg", + "http://jzvd.nathen.cn/snapshot/4061ba7b7005452e81b643580eb4d30200005.jpg", + "http://jzvd.nathen.cn/snapshot/d7505ea52bca48828807bcf96161a9f500005.jpg", + "http://jzvd.nathen.cn/snapshot/9787cbe40b7848e9b82d2cc12d1c943500005.jpg", + "http://jzvd.nathen.cn/snapshot/9787cbe40b7848e9b82d2cc12d1c943500005.jpg", + "http://jzvd.nathen.cn/snapshot/1a78739a54de4575b7cec1d77a8df4a000005.jpg", + "http://jzvd.nathen.cn/snapshot/ef29b1922ea64780a8e77a5676cad95700005.jpg", + "http://jzvd.nathen.cn/snapshot/dabe6ca3c71942fd926a86c8996d750f00005.jpg", +//1 + "http://jzvd.nathen.cn/snapshot/14e8861d87c248ad83704dbe99b969f300005.jpg", + "http://jzvd.nathen.cn/snapshot/8bd6d06878fc4676a62290cbe8b5511f00005.jpg", + "http://jzvd.nathen.cn/snapshot/7254150df078451585464d804d42c71a00005.jpg", + "http://jzvd.nathen.cn/snapshot/c1ff75fcfd0042c4b7ecb762c13884eb00005.jpg", + "http://jzvd.nathen.cn/snapshot/4a5e4b468bce4179a9d97b4b40a80e0f00005.jpg", + "http://jzvd.nathen.cn/snapshot/bbe6f26a9af34ff4aa5d0e7919bd1e2f00005.jpg", + "http://jzvd.nathen.cn/snapshot/2a09ede3702c462db4f0fc8eb56821b700005.jpg", + "http://jzvd.nathen.cn/snapshot/ba84ad1beddf4d699596537b5bbbdd4900005.jpg", + "http://jzvd.nathen.cn/snapshot/9f9f5372013d4494a9fabb1c7df770ba00005.jpg", + "http://jzvd.nathen.cn/snapshot/732eb57fc0d447909eccc1adb60822c700005.jpg", +//2 + "http://jzvd.nathen.cn/snapshot/371ddcdf7bbe46b682913f3d3353192000005.jpg", + "http://jzvd.nathen.cn/snapshot/b0eae85eab344427b77a162a1f7c46ae00005.jpg", + "http://jzvd.nathen.cn/snapshot/99bac3c2114545cf81cf66646c1e93af00005.jpg", + "http://jzvd.nathen.cn/snapshot/b538b1feda4943ffbd84e84cab0a2fce00005.jpg", + "http://jzvd.nathen.cn/snapshot/001ffec854be4c70a2baf3e9219705b100005.jpg", + "http://jzvd.nathen.cn/snapshot/eed4cbff7dce42a9ae2a54606be2573e00005.jpg", + "http://jzvd.nathen.cn/snapshot/b9bf3204fd75493aacdb83ecb9cef71300005.jpg", + "http://jzvd.nathen.cn/snapshot/43b2946bc6f24451b7118dd3861378ab00005.jpg", + "http://jzvd.nathen.cn/snapshot/43b2946bc6f24451b7118dd3861378ab00005.jpg", + "http://jzvd.nathen.cn/snapshot/3fc3f273ea394ec7bb79b668360160f700005.jpg", + "http://jzvd.nathen.cn/snapshot/edac56544e2f43bb827bd0e819db381000005.jpg", +//3 + "http://jzvd.nathen.cn/snapshot/1d32b21e058b4959ba759e7385eb4c7000005.jpg", + "http://jzvd.nathen.cn/snapshot/6625cbf8306843dfb4fd636cf5b237a900005.jpg", + "http://jzvd.nathen.cn/snapshot/04cd0101be0c4b3f8f4f9b1f07b8a6bc00005.jpg", + "http://jzvd.nathen.cn/snapshot/531f1e488eb84b898ae9ca7f6ba758ed00005.jpg", + "http://jzvd.nathen.cn/snapshot/ca387d7d2ea8407aa371c3ce2d346a6d00005.jpg", + "http://jzvd.nathen.cn/snapshot/858001d1e47f416b996eb04b60a4579700005.jpg", + "http://jzvd.nathen.cn/snapshot/397923c6af5a48fd981ee23fafe7095800005.jpg", + "http://jzvd.nathen.cn/snapshot/454c647c597340dc93a361f5bebfad4800005.jpg", + "http://jzvd.nathen.cn/snapshot/b3c23f24c04640aaa5a15b0ad6477e4700005.jpg", + "http://jzvd.nathen.cn/snapshot/7aafec2b6ce74b658cc6ea4268c492c500005.jpg", +//4 + "http://jzvd.nathen.cn/snapshot/48d7a9f34254467bb6a1bdc830a2469300005.jpg", + "http://jzvd.nathen.cn/snapshot/5ecbb98fda1347cd921c0534bbf5d0d300005.jpg", + "http://jzvd.nathen.cn/snapshot/c6bf92f63bea42d687b3a61d2c880d3200005.jpg", + "http://jzvd.nathen.cn/snapshot/ad0331e78393457d88ded2257d9e47c800005.jpg", + "http://jzvd.nathen.cn/snapshot/1f8acb2de146490e867b35f381f26f2900005.jpg", + "http://jzvd.nathen.cn/snapshot/0da5ed87cc1f4f4f9742b6fde232128d00005.jpg", + "http://jzvd.nathen.cn/snapshot/2cf5412fe161439a835371ce0b42f64f00005.jpg", + "http://jzvd.nathen.cn/snapshot/6ae53110f7fd470683587746f027698400005.jpg", + "http://jzvd.nathen.cn/snapshot/39cfa0b8eb0e4875ac0665448a09a9fa00005.jpg", + "http://jzvd.nathen.cn/snapshot/f7622efa12d74d1f955bf4d8d6e8c5a400005.jpg", +//5 + "http://jzvd.nathen.cn/snapshot/ef384b95897b470c80a4aca4dd1112a500005.jpg", + "http://jzvd.nathen.cn/snapshot/8715f1267152404199f900fc72c6521700005.jpg", + "http://jzvd.nathen.cn/snapshot/86a055d08b514c9ca1e76e76862105ec00005.jpg", + "http://jzvd.nathen.cn/snapshot/58c16ac1e01e4a12b7970ecc8d6e789100005.jpg", + "http://jzvd.nathen.cn/snapshot/abd73471be8745d5b90c8fec34f95a7600005.jpg", + "http://jzvd.nathen.cn/snapshot/c9a2dbd1b997417687312741d2efe62300005.jpg", + "http://jzvd.nathen.cn/snapshot/f92487e92d6a4d3faad2d60375416c5200005.jpg" + }; public static String[][] videoThumbs = { { From bd11287aa2c77e7d150f19b2fae4ab7d2de9aaca Mon Sep 17 00:00:00 2001 From: xeh <569283950@qq.com> Date: Thu, 12 Mar 2020 19:46:09 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E5=87=86=E5=A4=87=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/jzvd/Jzvd.java | 54 +++++++++++++++++-- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java b/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java index 2152dbb1..48585368 100644 --- a/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java +++ b/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java @@ -934,8 +934,10 @@ public void onAudioFocusChange(int focusChange) { } }; - - public static void goOnPlayOnResume() { + /** + * 增加准备状态逻辑 + */ + public void goOnPlayOnResume() { if (CURRENT_JZVD != null) { if (CURRENT_JZVD.state == Jzvd.STATE_PAUSE) { if (ON_PLAY_PAUSE_TMP_STATE == STATE_PAUSE) { @@ -946,18 +948,28 @@ public static void goOnPlayOnResume() { CURRENT_JZVD.mediaInterface.start(); } ON_PLAY_PAUSE_TMP_STATE = 0; + }else if (CURRENT_JZVD.state == Jzvd.STATE_PREPARING){ + //准备状态暂停后的 + CURRENT_JZVD.startVideo(); +// CURRENT_JZVD.mediaInterface.start(); } } } - public static void goOnPlayOnPause() { + /** + * 增加准备状态逻辑 + */ + public void goOnPlayOnPause() { if (CURRENT_JZVD != null) { if (CURRENT_JZVD.state == Jzvd.STATE_AUTO_COMPLETE || CURRENT_JZVD.state == Jzvd.STATE_NORMAL || - CURRENT_JZVD.state == Jzvd.STATE_PREPARING || CURRENT_JZVD.state == Jzvd.STATE_ERROR) { Jzvd.releaseAllVideos(); - } else { + } else if (CURRENT_JZVD.state == Jzvd.STATE_PREPARING){ + //准备状态暂停的逻辑 + Jzvd.setCurrentJzvd(CURRENT_JZVD); + state = STATE_PREPARING; + }else { ON_PLAY_PAUSE_TMP_STATE = CURRENT_JZVD.state; CURRENT_JZVD.onStatePause(); CURRENT_JZVD.mediaInterface.pause(); @@ -965,6 +977,38 @@ public static void goOnPlayOnPause() { } } + + +// public static void goOnPlayOnResume() { +// if (CURRENT_JZVD != null) { +// if (CURRENT_JZVD.state == Jzvd.STATE_PAUSE) { +// if (ON_PLAY_PAUSE_TMP_STATE == STATE_PAUSE) { +// CURRENT_JZVD.onStatePause(); +// CURRENT_JZVD.mediaInterface.pause(); +// } else { +// CURRENT_JZVD.onStatePlaying(); +// CURRENT_JZVD.mediaInterface.start(); +// } +// ON_PLAY_PAUSE_TMP_STATE = 0; +// } +// } +// } +// +// public static void goOnPlayOnPause() { +// if (CURRENT_JZVD != null) { +// if (CURRENT_JZVD.state == Jzvd.STATE_AUTO_COMPLETE || +// CURRENT_JZVD.state == Jzvd.STATE_NORMAL || +// CURRENT_JZVD.state == Jzvd.STATE_PREPARING || +// CURRENT_JZVD.state == Jzvd.STATE_ERROR) { +// Jzvd.releaseAllVideos(); +// } else { +// ON_PLAY_PAUSE_TMP_STATE = CURRENT_JZVD.state; +// CURRENT_JZVD.onStatePause(); +// CURRENT_JZVD.mediaInterface.pause(); +// } +// } +// } + public static void startFullscreenDirectly(Context context, Class _class, String url, String title) { startFullscreenDirectly(context, _class, new JZDataSource(url, title)); } From 3544e13bbd43515bf14545f86c33adb007e1b586 Mon Sep 17 00:00:00 2001 From: xeh <569283950@qq.com> Date: Thu, 12 Mar 2020 19:55:18 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E6=94=B9=E6=88=90static=E5=87=BD?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java b/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java index 48585368..ff2e9f50 100644 --- a/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java +++ b/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java @@ -937,7 +937,7 @@ public void onAudioFocusChange(int focusChange) { /** * 增加准备状态逻辑 */ - public void goOnPlayOnResume() { + public static void goOnPlayOnResume() { if (CURRENT_JZVD != null) { if (CURRENT_JZVD.state == Jzvd.STATE_PAUSE) { if (ON_PLAY_PAUSE_TMP_STATE == STATE_PAUSE) { @@ -959,7 +959,7 @@ public void goOnPlayOnResume() { /** * 增加准备状态逻辑 */ - public void goOnPlayOnPause() { + public static void goOnPlayOnPause() { if (CURRENT_JZVD != null) { if (CURRENT_JZVD.state == Jzvd.STATE_AUTO_COMPLETE || CURRENT_JZVD.state == Jzvd.STATE_NORMAL || @@ -968,7 +968,7 @@ public void goOnPlayOnPause() { } else if (CURRENT_JZVD.state == Jzvd.STATE_PREPARING){ //准备状态暂停的逻辑 Jzvd.setCurrentJzvd(CURRENT_JZVD); - state = STATE_PREPARING; + CURRENT_JZVD.state = STATE_PREPARING; }else { ON_PLAY_PAUSE_TMP_STATE = CURRENT_JZVD.state; CURRENT_JZVD.onStatePause(); From e35d00793e8e636ff788275ba188188068cd4e3c Mon Sep 17 00:00:00 2001 From: Nathen <1066666651@qq.com> Date: Thu, 12 Mar 2020 22:08:23 +0800 Subject: [PATCH 15/17] Update Jzvd.java formate code --- .../src/main/java/cn/jzvd/Jzvd.java | 39 ++----------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java b/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java index ff2e9f50..7acf5dc1 100644 --- a/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java +++ b/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java @@ -510,6 +510,7 @@ public void reset() { /** * 里面的的onState...()其实就是setState...()，因为要可以被复写，所以参考Activity的onCreate(),onState..()的方式看着舒服一些，老铁们有何高见。 + * * @param state */ public void setState(int state) { @@ -948,7 +949,7 @@ public static void goOnPlayOnResume() { CURRENT_JZVD.mediaInterface.start(); } ON_PLAY_PAUSE_TMP_STATE = 0; - }else if (CURRENT_JZVD.state == Jzvd.STATE_PREPARING){ + } else if (CURRENT_JZVD.state == Jzvd.STATE_PREPARING) { //准备状态暂停后的 CURRENT_JZVD.startVideo(); // CURRENT_JZVD.mediaInterface.start(); @@ -965,11 +966,11 @@ public static void goOnPlayOnPause() { CURRENT_JZVD.state == Jzvd.STATE_NORMAL || CURRENT_JZVD.state == Jzvd.STATE_ERROR) { Jzvd.releaseAllVideos(); - } else if (CURRENT_JZVD.state == Jzvd.STATE_PREPARING){ + } else if (CURRENT_JZVD.state == Jzvd.STATE_PREPARING) { //准备状态暂停的逻辑 Jzvd.setCurrentJzvd(CURRENT_JZVD); CURRENT_JZVD.state = STATE_PREPARING; - }else { + } else { ON_PLAY_PAUSE_TMP_STATE = CURRENT_JZVD.state; CURRENT_JZVD.onStatePause(); CURRENT_JZVD.mediaInterface.pause(); @@ -977,38 +978,6 @@ public static void goOnPlayOnPause() { } } - - -// public static void goOnPlayOnResume() { -// if (CURRENT_JZVD != null) { -// if (CURRENT_JZVD.state == Jzvd.STATE_PAUSE) { -// if (ON_PLAY_PAUSE_TMP_STATE == STATE_PAUSE) { -// CURRENT_JZVD.onStatePause(); -// CURRENT_JZVD.mediaInterface.pause(); -// } else { -// CURRENT_JZVD.onStatePlaying(); -// CURRENT_JZVD.mediaInterface.start(); -// } -// ON_PLAY_PAUSE_TMP_STATE = 0; -// } -// } -// } -// -// public static void goOnPlayOnPause() { -// if (CURRENT_JZVD != null) { -// if (CURRENT_JZVD.state == Jzvd.STATE_AUTO_COMPLETE || -// CURRENT_JZVD.state == Jzvd.STATE_NORMAL || -// CURRENT_JZVD.state == Jzvd.STATE_PREPARING || -// CURRENT_JZVD.state == Jzvd.STATE_ERROR) { -// Jzvd.releaseAllVideos(); -// } else { -// ON_PLAY_PAUSE_TMP_STATE = CURRENT_JZVD.state; -// CURRENT_JZVD.onStatePause(); -// CURRENT_JZVD.mediaInterface.pause(); -// } -// } -// } - public static void startFullscreenDirectly(Context context, Class _class, String url, String title) { startFullscreenDirectly(context, _class, new JZDataSource(url, title)); } From 18e9348dd9050b3ddbb04636fb6ae03c7e23bdea Mon Sep 17 00:00:00 2001 From: xeh <569283950@qq.com> Date: Sat, 14 Mar 2020 19:17:47 +0800 Subject: [PATCH 16/17] =?UTF-8?q?tikTok=20=E6=9F=90=E4=BA=9B=E6=97=B6?= =?UTF-8?q?=E5=80=99=20jzvd.jzDataSource=E4=BC=9A=E6=9C=89=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E7=9A=84=E6=97=B6=E5=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/cn/jzvd/demo/tiktok/ActivityTikTok.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/cn/jzvd/demo/tiktok/ActivityTikTok.java b/app/src/main/java/cn/jzvd/demo/tiktok/ActivityTikTok.java index 6e8cefc0..b5b7645d 100644 --- a/app/src/main/java/cn/jzvd/demo/tiktok/ActivityTikTok.java +++ b/app/src/main/java/cn/jzvd/demo/tiktok/ActivityTikTok.java @@ -72,7 +72,7 @@ public void onChildViewAttachedToWindow(View view) { @Override public void onChildViewDetachedFromWindow(View view) { Jzvd jzvd = view.findViewById(R.id.videoplayer); - if (jzvd != null && Jzvd.CURRENT_JZVD != null && + if (jzvd != null && Jzvd.CURRENT_JZVD != null && jzvd.jzDataSource!=null&& jzvd.jzDataSource.containsTheUrl(Jzvd.CURRENT_JZVD.jzDataSource.getCurrentUrl())) { if (Jzvd.CURRENT_JZVD != null && Jzvd.CURRENT_JZVD.screen != Jzvd.SCREEN_FULLSCREEN) { Jzvd.releaseAllVideos(); From 3befd3f7328011d289222f0bd8d4adabedd95a97 Mon Sep 17 00:00:00 2001 From: Nathen <1066666651@qq.com> Date: Sun, 15 Mar 2020 14:39:05 +0800 Subject: [PATCH 17/17] v7.2.2 --- README.md | 6 +++--- app/build.gradle | 4 ++-- gradle/build_upload.gradle | 2 +- jiaozivideoplayer/build.gradle | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c5fa7f68..21b92fe5 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ --

- +

@@ -39,7 +39,7 @@ ## 文档 -- [文档 - API](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E6%96%87%E6%A1%A3-%E2%80%94-API)，下载安装demo[jiaozivideoplayer-7.2.1.apk](https://github.com/Jzvd/JiaoZiVideoPlayer/releases/download/v7.2.1/jiaozivideoplayer-7.2.1.apk)，仔细过一遍demo +- [文档 - API](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E6%96%87%E6%A1%A3-%E2%80%94-API)，下载安装demo[jiaozivideoplayer-7.2.2.apk](https://github.com/Jzvd/JiaoZiVideoPlayer/releases/download/v7.2.2/jiaozivideoplayer-7.2.2.apk)，仔细过一遍demo - [文档 - 自定义Jzvd](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E6%96%87%E6%A1%A3-%E2%80%94-%E8%87%AA%E5%AE%9A%E4%B9%89Jzvd)，继承JzvdStd实现自己的播放器 - [文档 - 自定义播放内核](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E6%96%87%E6%A1%A3-%E2%80%94-%E8%87%AA%E5%AE%9A%E4%B9%89%E6%92%AD%E6%94%BE%E5%86%85%E6%A0%B8)，测试哪个播放内核适合自己的项目 @@ -53,7 +53,7 @@ 1.添加类库 ```gradle -compile 'cn.jzvd:jiaozivideoplayer:7.2.1' +compile 'cn.jzvd:jiaozivideoplayer:7.2.2' ``` 2.添加布局 diff --git a/app/build.gradle b/app/build.gradle index 5ed1ff7d..4d64f720 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "cn.jzvd.demo" minSdkVersion 16 targetSdkVersion 29 - versionCode 96 - versionName "7.2.1" + versionCode 97 + versionName "7.2.2" ndk { // add support lib abiFilters 'armeabi-v7a' //, 'arm64-v8a'//, "mips" //,'armeabi''x86',, 'x86_64', diff --git a/gradle/build_upload.gradle b/gradle/build_upload.gradle index ee0a7047..d14dd515 100644 --- a/gradle/build_upload.gradle +++ b/gradle/build_upload.gradle @@ -8,7 +8,7 @@ signing { group = "cn.jzvd" archivesBaseName = "jiaozivideoplayer" -version = "7.2.1" +version = "7.2.2" uploadArchives { repositories { diff --git a/jiaozivideoplayer/build.gradle b/jiaozivideoplayer/build.gradle index 1a3867b0..f4b4f780 100644 --- a/jiaozivideoplayer/build.gradle +++ b/jiaozivideoplayer/build.gradle @@ -6,8 +6,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 29 - versionCode 96 - versionName "7.2.1" + versionCode 97 + versionName "7.2.2" } compileOptions {