From 8093a74a1e64cc1be76241351be37edadea99364 Mon Sep 17 00:00:00 2001 From: tusantrey <55271736+tusantrey2@users.noreply.github.com> Date: Tue, 28 Jun 2022 02:20:06 +0700 Subject: [PATCH 1/7] Update Jzvd.java change absurt name **gobakFullscreenTime** to **goNormalFullscreenTime** --- library/src/main/java/cn/jzvd/Jzvd.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/src/main/java/cn/jzvd/Jzvd.java b/library/src/main/java/cn/jzvd/Jzvd.java index 057d982c..291134bd 100644 --- a/library/src/main/java/cn/jzvd/Jzvd.java +++ b/library/src/main/java/cn/jzvd/Jzvd.java @@ -113,7 +113,7 @@ public void onAudioFocusChange(int focusChange) { public ViewGroup topContainer, bottomContainer; public JZTextureView textureView; public boolean preloading = false; - protected long gobakFullscreenTime = 0;//这个应该重写一下，刷新列表，新增列表的刷新，不打断播放，应该是个flag + protected long goNormalFullscreenTime = 0;//这个应该重写一下，刷新列表，新增列表的刷新，不打断播放，应该是个flag protected long gotoFullscreenTime = 0; protected Timer UPDATE_PROGRESS_TIMER; protected int mScreenWidth; @@ -687,7 +687,7 @@ public void onCompletion() { } public void gotoNormalCompletion() { - gobakFullscreenTime = System.currentTimeMillis();//退出全屏 + goNormalFullscreenTime = System.currentTimeMillis();//退出全屏 ViewGroup vg = (ViewGroup) (JZUtils.scanForActivity(jzvdContext)).getWindow().getDecorView(); vg.removeView(this); textureViewContainer.removeView(textureView); @@ -1004,7 +1004,7 @@ public void gotoFullscreen() { } public void gotoNormalScreen() {//goback本质上是goto - gobakFullscreenTime = System.currentTimeMillis();//退出全屏 + goNormalFullscreenTime = System.currentTimeMillis();//退出全屏 ViewGroup vg = (ViewGroup) (JZUtils.scanForActivity(jzvdContext)).getWindow().getDecorView(); vg.removeView(this); // CONTAINER_LIST.getLast().removeAllViews(); From 7ed93a9b6f67847311ec39e25a2953b00988604c Mon Sep 17 00:00:00 2001 From: tusantrey <55271736+tusantrey2@users.noreply.github.com> Date: Tue, 28 Jun 2022 03:15:04 +0700 Subject: [PATCH 2/7] Update JzvdStd.java --- library/src/main/java/cn/jzvd/JzvdStd.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/cn/jzvd/JzvdStd.java b/library/src/main/java/cn/jzvd/JzvdStd.java index 069e1e7d..241c8cfb 100644 --- a/library/src/main/java/cn/jzvd/JzvdStd.java +++ b/library/src/main/java/cn/jzvd/JzvdStd.java @@ -176,7 +176,7 @@ public void init(Context context) { } public void setUp(JZDataSource jzDataSource, int screen, Class mediaInterfaceClass) { - if ((System.currentTimeMillis() - gobakFullscreenTime) < 200) { + if ((System.currentTimeMillis() - goNormalFullscreenTime) < 200) { return; } From 5cf464bdf760baafa81892d7adaaf313cbb7d3b6 Mon Sep 17 00:00:00 2001 From: tusantrey <55271736+tusantrey2@users.noreply.github.com> Date: Sat, 2 Jul 2022 06:01:42 +0700 Subject: [PATCH 3/7] Create values-in.xml add language Indonesia --- library/src/main/res/values-in/values-in.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 library/src/main/res/values-in/values-in.xml diff --git a/library/src/main/res/values-in/values-in.xml b/library/src/main/res/values-in/values-in.xml new file mode 100644 index 00000000..bdebec6e --- /dev/null +++ b/library/src/main/res/values-in/values-in.xml @@ -0,0 +1,10 @@ + + + Klik untuk mencoba lagi + Tidak ada url + Memutar ulang + Anda sedang menggunakan jaringan seluler, pemain akan terus konsumsi lalu lintas + Berhenti bermain + Melanjutkan + Pemuatan video gagal + From 15e348307feaa4a00f91dee215f9c4ce8df7fdf2 Mon Sep 17 00:00:00 2001 From: tusantrey <55271736+tusantrey2@users.noreply.github.com> Date: Thu, 7 Jul 2022 19:06:36 +0700 Subject: [PATCH 4/7] Update values-in.xml --- library/src/main/res/values-in/values-in.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/src/main/res/values-in/values-in.xml b/library/src/main/res/values-in/values-in.xml index bdebec6e..94016f81 100644 --- a/library/src/main/res/values-in/values-in.xml +++ b/library/src/main/res/values-in/values-in.xml @@ -2,9 +2,9 @@ Klik untuk mencoba lagi Tidak ada url - Memutar ulang - Anda sedang menggunakan jaringan seluler, pemain akan terus konsumsi lalu lintas - Berhenti bermain + Putar ulang + Anda sedang menggunakan jaringan seluler, Anda akan terus konsumsi data seluler + Berhenti memutar Melanjutkan Pemuatan video gagal From 50f21856fb7a47d32d228f4e72bc96c024cb4cad Mon Sep 17 00:00:00 2001 From: tusantrey <55271736+tusantrey2@users.noreply.github.com> Date: Thu, 7 Jul 2022 22:19:27 +0700 Subject: [PATCH 5/7] Update JZMediaSystem.java setAudioStreamType is (deprecated) --- library/src/main/java/cn/jzvd/JZMediaSystem.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/cn/jzvd/JZMediaSystem.java b/library/src/main/java/cn/jzvd/JZMediaSystem.java index 565e44a4..74faf351 100644 --- a/library/src/main/java/cn/jzvd/JZMediaSystem.java +++ b/library/src/main/java/cn/jzvd/JZMediaSystem.java @@ -2,6 +2,7 @@ import android.graphics.SurfaceTexture; import android.media.AudioManager; +import android.media.AudioAttributes; import android.media.MediaPlayer; import android.media.PlaybackParams; import android.os.Handler; @@ -34,7 +35,11 @@ public void prepare() { mMediaHandler.post(() -> { try { mediaPlayer = new MediaPlayer(); - mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + mediaPlayer.setAudioAttributes( + new AudioAttributes + .Builder() + .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC) + .build()); mediaPlayer.setLooping(jzvd.jzDataSource.looping); mediaPlayer.setOnPreparedListener(JZMediaSystem.this); mediaPlayer.setOnCompletionListener(JZMediaSystem.this); From fd18055354e2efa8bc9ae59dbf25c9b18f5b05d9 Mon Sep 17 00:00:00 2001 From: tusantrey <55271736+tusantrey2@users.noreply.github.com> Date: Thu, 7 Jul 2022 22:20:52 +0700 Subject: [PATCH 6/7] Update JZMediaSystem.java setAudioStreamType is (deprecated) --- library/src/main/java/cn/jzvd/JZMediaSystem.java | 1 - 1 file changed, 1 deletion(-) diff --git a/library/src/main/java/cn/jzvd/JZMediaSystem.java b/library/src/main/java/cn/jzvd/JZMediaSystem.java index 74faf351..5c721999 100644 --- a/library/src/main/java/cn/jzvd/JZMediaSystem.java +++ b/library/src/main/java/cn/jzvd/JZMediaSystem.java @@ -1,7 +1,6 @@ package cn.jzvd; import android.graphics.SurfaceTexture; -import android.media.AudioManager; import android.media.AudioAttributes; import android.media.MediaPlayer; import android.media.PlaybackParams; From 0fade0745d5be3dccbeac328e7ac3fba8856130d Mon Sep 17 00:00:00 2001 From: tusantrey <55271736+tusantrey2@users.noreply.github.com> Date: Fri, 8 Jul 2022 07:19:21 +0700 Subject: [PATCH 7/7] Update values-in.xml --- library/src/main/res/values-in/values-in.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/src/main/res/values-in/values-in.xml b/library/src/main/res/values-in/values-in.xml index 94016f81..a41cd8b5 100644 --- a/library/src/main/res/values-in/values-in.xml +++ b/library/src/main/res/values-in/values-in.xml @@ -1,10 +1,10 @@ - Klik untuk mencoba lagi + Klik untuk coba lagi Tidak ada url Putar ulang Anda sedang menggunakan jaringan seluler, Anda akan terus konsumsi data seluler - Berhenti memutar - Melanjutkan + Berhenti putar + Lanjutkan Pemuatan video gagal