From 4537ba9da0b32395c8acc02d7d6280f012e7ff80 Mon Sep 17 00:00:00 2001 From: Howard Wu Date: Fri, 28 Apr 2023 23:12:20 +0800 Subject: [PATCH 1/2] Fix StarAnim didn't stop --- .../components/video/player/intersection-actions/index.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/registry/lib/components/video/player/intersection-actions/index.ts b/registry/lib/components/video/player/intersection-actions/index.ts index 2589d7a052..c11bcf7446 100644 --- a/registry/lib/components/video/player/intersection-actions/index.ts +++ b/registry/lib/components/video/player/intersection-actions/index.ts @@ -4,6 +4,7 @@ import { lightOff, lightOn } from '@/components/video/player-light' import { videoChange } from '@/core/observer' import { addComponentListener, getComponentSettings } from '@/core/settings' import { allVideoUrls } from '@/core/utils/urls' +import { StarAnim } from './animation' enum IntersectionMode { Top = '视频顶部', @@ -79,6 +80,9 @@ export const component = defineComponentMetadata({ !videoEl.paused ) { lightOff() + if (settings.options.starAnimation) { + StarAnim(true) + } } } @@ -92,6 +96,7 @@ export const component = defineComponentMetadata({ } if (settings.light && getComponentSettings('playerAutoLight').enabled && !settings.pause) { lightOn() + StarAnim(false) } } From 8d69d3a4204887f8fc97ca85a1eb614d3ec56999 Mon Sep 17 00:00:00 2001 From: Howard Wu Date: Thu, 18 May 2023 18:44:07 +0800 Subject: [PATCH 2/2] move animation to player components --- .vscode/settings.json | 2 +- .../lib/components/video/player/auto-light/index.ts | 2 +- .../video/player/intersection-actions/index.ts | 10 +++++----- registry/tsconfig.json | 2 +- src/components/video/player-agent/base.ts | 6 +++--- src/components/video/player-agent/types.ts | 1 + .../components/video/player-animation.ts | 2 +- src/components/video/player-light.ts | 1 + 8 files changed, 14 insertions(+), 12 deletions(-) rename registry/lib/components/video/player/auto-light/animation.ts => src/components/video/player-animation.ts (98%) diff --git a/.vscode/settings.json b/.vscode/settings.json index 7e00b24308..e85ccddee3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -116,7 +116,7 @@ }, "eslint.format.enable": true, "[typescript]": { - "editor.defaultFormatter": "dbaeumer.vscode-eslint" + "editor.defaultFormatter": "vscode.typescript-language-features" }, "[vue]": { "editor.defaultFormatter": "dbaeumer.vscode-eslint" diff --git a/registry/lib/components/video/player/auto-light/index.ts b/registry/lib/components/video/player/auto-light/index.ts index 6eda24621b..15eae60e11 100644 --- a/registry/lib/components/video/player/auto-light/index.ts +++ b/registry/lib/components/video/player/auto-light/index.ts @@ -3,7 +3,7 @@ import { lightOn, lightOff } from '@/components/video/player-light' import { videoChange } from '@/core/observer' import { allVideoUrls } from '@/core/utils/urls' import type { PlayerAgent } from '@/components/video/player-agent/base' -import { StarAnim } from './animation' +import { StarAnim } from '@/components/video/player-animation' import { defineComponentMetadata } from '@/components/define' let playerAgentInstance: PlayerAgent diff --git a/registry/lib/components/video/player/intersection-actions/index.ts b/registry/lib/components/video/player/intersection-actions/index.ts index c11bcf7446..5d3ca9abf6 100644 --- a/registry/lib/components/video/player/intersection-actions/index.ts +++ b/registry/lib/components/video/player/intersection-actions/index.ts @@ -4,7 +4,6 @@ import { lightOff, lightOn } from '@/components/video/player-light' import { videoChange } from '@/core/observer' import { addComponentListener, getComponentSettings } from '@/core/settings' import { allVideoUrls } from '@/core/utils/urls' -import { StarAnim } from './animation' enum IntersectionMode { Top = '视频顶部', @@ -25,6 +24,7 @@ export const component = defineComponentMetadata({ triggerLocation: IntersectionMode pause: boolean light: boolean + starAnim: boolean } Promise.resolve().then(async () => { const { @@ -80,9 +80,6 @@ export const component = defineComponentMetadata({ !videoEl.paused ) { lightOff() - if (settings.options.starAnimation) { - StarAnim(true) - } } } @@ -96,7 +93,6 @@ export const component = defineComponentMetadata({ } if (settings.light && getComponentSettings('playerAutoLight').enabled && !settings.pause) { lightOn() - StarAnim(false) } } @@ -149,5 +145,9 @@ export const component = defineComponentMetadata({ defaultValue: true, displayName: '自动开灯', }, + starAnim: { + defaultValue: true, + displayName: '启用星光动画', + }, }, }) diff --git a/registry/tsconfig.json b/registry/tsconfig.json index eb1b91a294..4fad091ea0 100644 --- a/registry/tsconfig.json +++ b/registry/tsconfig.json @@ -11,4 +11,4 @@ "../src/**/*.d.ts", "lib/**/*.ts" ], -} \ No newline at end of file +} diff --git a/src/components/video/player-agent/base.ts b/src/components/video/player-agent/base.ts index 7286e40367..249e1bcd22 100644 --- a/src/components/video/player-agent/base.ts +++ b/src/components/video/player-agent/base.ts @@ -71,11 +71,11 @@ export abstract class PlayerAgent { /** true 开灯，false 关灯 */ async toggleLight(on: boolean) { - const checkbox = (await this.query.control.settings.lightOff()) as HTMLInputElement + const checkboxLight = (await this.query.control.settings.lightOff()) as HTMLInputElement // 关灯状态 && 要开灯 -> 开灯 - checkbox.checked && on && checkbox.click() + checkboxLight.checked && on && checkboxLight.click() // 开灯状态 && 要关灯 -> 关灯 - !checkbox.checked && !on && checkbox.click() + !checkboxLight.checked && !on && checkboxLight.click() } // eslint-disable-next-line class-methods-use-this diff --git a/src/components/video/player-agent/types.ts b/src/components/video/player-agent/types.ts index b91edd5532..4db53b08fb 100644 --- a/src/components/video/player-agent/types.ts +++ b/src/components/video/player-agent/types.ts @@ -59,6 +59,7 @@ export interface PlayerQuery extends CustomNestedQuery settings: { wrap: QueryResult lightOff: QueryResult + starAnimEnable: QueryResult } } toastWrap: QueryResult diff --git a/registry/lib/components/video/player/auto-light/animation.ts b/src/components/video/player-animation.ts similarity index 98% rename from registry/lib/components/video/player/auto-light/animation.ts rename to src/components/video/player-animation.ts index 12df49ff18..d2b635319d 100644 --- a/registry/lib/components/video/player/auto-light/animation.ts +++ b/src/components/video/player-animation.ts @@ -15,7 +15,7 @@ const CreateAnim = (): void => { // 添加一段css 样式到document最后 const style = document.createElement('style') // generate random stars - function generate(numCtrl) { + function generate(numCtrl: number) { let star = '' const max = window.innerWidth * window.innerHeight for (let i = 0; i < max / numCtrl; i++) { diff --git a/src/components/video/player-light.ts b/src/components/video/player-light.ts index f5f07106cd..c46c1d049a 100644 --- a/src/components/video/player-light.ts +++ b/src/components/video/player-light.ts @@ -2,6 +2,7 @@ import { matchUrlPattern, none } from '@/core/utils' import { loadLazyPlayerSettingsPanel } from '@/core/utils/lazy-panel' import { playerUrls } from '@/core/utils/urls' import { playerAgent } from './player-agent' +import { StarAnim } from '@/components/video/player-animation' // let initialized = false