From def569bf51283eb56cee9be523ca5105fd120e03 Mon Sep 17 00:00:00 2001 From: Zhong Zhou Date: Tue, 7 Aug 2018 16:07:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E5=BC=B9=E5=B9=95=E6=97=B6=E5=85=A8=E5=B1=8F=E6=92=AD=E6=94=BE?= =?UTF-8?q?=E6=88=AA=E5=B1=8F=E5=B4=A9=E6=BA=83=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dl7/player/media/IjkPlayerView.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/playerview/src/main/java/com/dl7/player/media/IjkPlayerView.java b/playerview/src/main/java/com/dl7/player/media/IjkPlayerView.java index 18907d1..7d7a60e 100644 --- a/playerview/src/main/java/com/dl7/player/media/IjkPlayerView.java +++ b/playerview/src/main/java/com/dl7/player/media/IjkPlayerView.java @@ -2434,6 +2434,9 @@ private void _toggleDanmakuView(boolean isShow) { * 从弹幕编辑状态复原界面 */ private void _recoverScreen() { + if (!mIsEnableDanmaku) { + return; + } // 清除焦点 mEditDanmakuLayout.clearFocus(); mEditDanmakuLayout.setVisibility(GONE); From 25f1b13f519556fcf0d6f4209520b64532c69814 Mon Sep 17 00:00:00 2001 From: Zhong Zhou Date: Tue, 7 Aug 2018 17:42:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E4=BA=AE=E5=BA=A6=E6=97=B6=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BA=AE?= =?UTF-8?q?=E5=BA=A6=E8=AE=BE=E7=BD=AE=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dl7/player/media/IjkPlayerView.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/playerview/src/main/java/com/dl7/player/media/IjkPlayerView.java b/playerview/src/main/java/com/dl7/player/media/IjkPlayerView.java index 7d7a60e..72e9e4e 100644 --- a/playerview/src/main/java/com/dl7/player/media/IjkPlayerView.java +++ b/playerview/src/main/java/com/dl7/player/media/IjkPlayerView.java @@ -1,6 +1,7 @@ package com.dl7.player.media; import android.content.BroadcastReceiver; +import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -332,8 +333,17 @@ private void _initMediaPlayer() { mMaxVolume = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC); // 亮度 try { - int e = Settings.System.getInt(mAttachActivity.getContentResolver(), Settings.System.SCREEN_BRIGHTNESS); - float progress = 1.0F * (float) e / 255.0F; + float progress; + ContentResolver cr = mAttachActivity.getContentResolver(); + boolean autoBrightness = Settings.System.getInt(cr, Settings.System.SCREEN_BRIGHTNESS_MODE) == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC; + if (autoBrightness) { + //[-1,1] + progress = Settings.System.getFloat(cr, "screen_auto_brightness_adj"); + } else { + //[0,255] + int e = Settings.System.getInt(cr, Settings.System.SCREEN_BRIGHTNESS); + progress = 1.0F * (float) e / 255.0F; + } WindowManager.LayoutParams layout = mAttachActivity.getWindow().getAttributes(); layout.screenBrightness = progress; mAttachActivity.getWindow().setAttributes(layout); From 0830d258ae29ea39eafd63778ad1da2b61be3447 Mon Sep 17 00:00:00 2001 From: Zhong Zhou Date: Mon, 10 Sep 2018 20:43:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9F=B3=E9=A2=91ui?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dl7/player/media/IjkPlayerView.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/playerview/src/main/java/com/dl7/player/media/IjkPlayerView.java b/playerview/src/main/java/com/dl7/player/media/IjkPlayerView.java index 72e9e4e..e491a75 100644 --- a/playerview/src/main/java/com/dl7/player/media/IjkPlayerView.java +++ b/playerview/src/main/java/com/dl7/player/media/IjkPlayerView.java @@ -102,6 +102,19 @@ */ public class IjkPlayerView extends FrameLayout implements View.OnClickListener { + private boolean showFullScreen = true; + + public void setShowFullScreen(boolean showFullScreen) { + this.showFullScreen = showFullScreen; + if (showFullScreen) { + mIvFullscreen.setVisibility(VISIBLE); + mIvBack.setVisibility(VISIBLE); + } else { + mIvFullscreen.setVisibility(INVISIBLE); + mIvBack.setVisibility(INVISIBLE); + } + } + // 进度条最大值 private static final int MAX_VIDEO_SEEK = 1000; // 默认隐藏控制栏时间