diff --git a/library/src/main/java/cn/jzvd/JZMediaSystem.java b/library/src/main/java/cn/jzvd/JZMediaSystem.java index 565e44a4..5c721999 100644 --- a/library/src/main/java/cn/jzvd/JZMediaSystem.java +++ b/library/src/main/java/cn/jzvd/JZMediaSystem.java @@ -1,7 +1,7 @@ package cn.jzvd; 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 +34,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); 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(); 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; } 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..a41cd8b5 --- /dev/null +++ b/library/src/main/res/values-in/values-in.xml @@ -0,0 +1,10 @@ + + + Klik untuk coba lagi + Tidak ada url + Putar ulang + Anda sedang menggunakan jaringan seluler, Anda akan terus konsumsi data seluler + Berhenti putar + Lanjutkan + Pemuatan video gagal +