From b59d02731051df6bb355abfd00bc212967c9b328 Mon Sep 17 00:00:00 2001 From: FongMi Date: Sat, 22 Feb 2025 19:19:02 +0800 Subject: [PATCH] Fix danmaku size --- .../java/com/fongmi/android/tv/ui/activity/VideoActivity.java | 4 +++- .../java/com/fongmi/android/tv/player/danmaku/Parser.java | 2 +- .../java/com/fongmi/android/tv/ui/activity/VideoActivity.java | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index ff5b8c8a7..6cc01f035 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -392,7 +392,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List maxLines.put(BaseDanmaku.TYPE_FIX_BOTTOM, 4); mDanmakuContext.setDanmakuSync(new Sync(mPlayers)); mDanmakuContext.setMaximumLines(maxLines).setScrollSpeedFactor(1.2f).setDanmakuTransparency(0.8f); - mDanmakuContext.setDanmakuStyle(IDisplayer.DANMAKU_STYLE_STROKEN, 3).setDanmakuMargin(ResUtil.dp2px(8)); + mDanmakuContext.setDanmakuStyle(IDisplayer.DANMAKU_STYLE_STROKEN, 3).setDanmakuMargin(ResUtil.dp2px(8)).setScaleTextSize(0.8f); } private void setDecode() { @@ -674,6 +674,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List mBinding.video.setForeground(null); mBinding.video.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT)); mBinding.flag.setSelectedPosition(getFlagPosition()); + mDanmakuContext.setScaleTextSize(0.8f); mKeyDown.setFull(true); setFullscreen(true); mFocus2 = null; @@ -682,6 +683,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List private void exitFullscreen() { mBinding.video.setForeground(ResUtil.getDrawable(R.drawable.selector_video)); mBinding.video.setLayoutParams(mFrameParams); + mDanmakuContext.setScaleTextSize(1.2f); getFocus1().requestFocus(); mKeyDown.setFull(false); setFullscreen(false); diff --git a/app/src/main/java/com/fongmi/android/tv/player/danmaku/Parser.java b/app/src/main/java/com/fongmi/android/tv/player/danmaku/Parser.java index f9828ba44..08f6bdd23 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/danmaku/Parser.java +++ b/app/src/main/java/com/fongmi/android/tv/player/danmaku/Parser.java @@ -49,7 +49,7 @@ public class Parser extends BaseDanmakuParser { private void setParam(String[] values) { int type = Integer.parseInt(values[1]); long time = (long) (Float.parseFloat(values[0]) * 1000); - float size = Float.parseFloat(values[2]) * (mDispDensity - 0.66f); + float size = Float.parseFloat(values[2]) * (mDispDensity - 0.6f); int color = (int) ((0x00000000ff000000L | Long.parseLong(values[3])) & 0x00000000ffffffffL); item = mContext.mDanmakuFactory.createDanmaku(type, mContext); item.index = index++; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index c05c31b92..29ede27bc 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -395,7 +395,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo maxLines.put(BaseDanmaku.TYPE_FIX_BOTTOM, 4); mDanmakuContext.setDanmakuSync(new Sync(mPlayers)); mDanmakuContext.setMaximumLines(maxLines).setScrollSpeedFactor(1.2f).setDanmakuTransparency(0.8f); - mDanmakuContext.setDanmakuStyle(IDisplayer.DANMAKU_STYLE_STROKEN, 3).setDanmakuMargin(ResUtil.dp2px(8)); + mDanmakuContext.setDanmakuStyle(IDisplayer.DANMAKU_STYLE_STROKEN, 3).setDanmakuMargin(ResUtil.dp2px(8)).setScaleTextSize(0.8f); } private void setDecode() { @@ -868,6 +868,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo setRequestedOrientation(mPlayers.isPortrait() ? ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT : ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE); mBinding.control.full.setVisibility(View.GONE); setRotate(mPlayers.isPortrait(), true); + mDanmakuContext.setScaleTextSize(1.2f); Util.hideSystemUI(this); App.post(mR3, 2000); hideControl(); @@ -879,6 +880,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo App.post(() -> mBinding.episode.scrollToPosition(mEpisodeAdapter.getPosition()), 50); mBinding.control.full.setVisibility(View.VISIBLE); mBinding.video.setLayoutParams(mFrameParams); + mDanmakuContext.setScaleTextSize(0.8f); setRotate(false, false); App.post(mR3, 2000); hideControl();