-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -122,7 +133,9 @@ function toggle() {
@import "@/assets/css/style";
.wrapper {
+ width: 100rem;
position: relative;
+ text-align: right;
}
.setting {
diff --git a/src/components/WordItem.vue b/src/components/WordItem.vue
index 2de07d03..a66f0412 100644
--- a/src/components/WordItem.vue
+++ b/src/components/WordItem.vue
@@ -55,6 +55,10 @@ const emit = defineEmits<{
&.active {
background: $second;
color: white;
+
+ .phonetic {
+ color: white!important;
+ }
}
&:hover {
diff --git a/src/components/WordListModal.vue b/src/components/WordListModal.vue
index e443e8e2..1c363270 100644
--- a/src/components/WordListModal.vue
+++ b/src/components/WordListModal.vue
@@ -7,6 +7,7 @@ import {$ref} from "vue/macros";
import {onMounted, onUnmounted} from "vue";
import {usePlayWordAudio} from "@/hooks/sound.ts";
import {emitter, EventKey} from "@/utils/eventBus.ts";
+import WordItem from "@/components/WordItem.vue";
let show = $ref(false)
let list = $ref([])
@@ -50,6 +51,8 @@ onUnmounted(() => {
+
+
diff --git a/src/hooks/sound.ts b/src/hooks/sound.ts
index a079bc10..1bca9d61 100644
--- a/src/hooks/sound.ts
+++ b/src/hooks/sound.ts
@@ -4,115 +4,132 @@ import {PronunciationApi} from "@/types.ts";
import beep from "@/assets/sound/beep.wav";
import correct from "@/assets/sound/correct.wav";
-export function useSound(urlList?: string[], num?: number) {
- let audioList: HTMLAudioElement[] = $ref([])
- let audioLength = $ref(1)
- let index = $ref(0)
+export function useSound(audioSrcList?: string[], audioFileLength?: number) {
+ let audioList: HTMLAudioElement[] = $ref([])
+ let audioLength = $ref(1)
+ let index = $ref(0)
- onMounted(() => {
- if (urlList) setAudio(urlList, num)
- })
+ onMounted(() => {
+ if (audioSrcList) setAudio(audioSrcList, audioFileLength)
+ })
- function setAudio(srcList2: string[], num2?: number) {
- if (num2) audioLength = num2
- audioList = []
- for (let i = 0; i < audioLength; i++) {
- srcList2.map(src => audioList.push(new Audio(src)))
- }
- index = 0
+ function setAudio(audioSrcList2: string[], audioFileLength2?: number) {
+ if (audioFileLength2) audioLength = audioFileLength2
+ audioList = []
+ for (let i = 0; i < audioLength; i++) {
+ audioSrcList2.map(src => audioList.push(new Audio(src)))
}
+ index = 0
+ }
- function play() {
- index++
- if (audioList.length > 1 && audioList.length !== audioLength) {
- audioList[index % audioList.length].play()
- } else {
- audioList[index % audioLength].play()
- }
+ function play() {
+ index++
+ if (audioList.length > 1 && audioList.length !== audioLength) {
+ audioList[index % audioList.length].play()
+ } else {
+ audioList[index % audioLength].play()
}
+ }
- return [
- play,
- setAudio
- ]
+ return {play, setAudio}
}
export function usePlayKeyboardAudio() {
- const settingStore = useSettingStore()
- const [playKeyboardAudio, setAudio] = useSound()
+ const settingStore = useSettingStore()
+ const {play, setAudio} = useSound()
- watchEffect(() => {
- let urlList = getAudioFileUrl(settingStore.keyboardSoundFile)
- setAudio(urlList, urlList.length === 1 ? 3 : 1)
- })
- return playKeyboardAudio
+ watchEffect(() => {
+ let urlList = getAudioFileUrl(settingStore.keyboardSoundFile)
+ setAudio(urlList, urlList.length === 1 ? 3 : 1)
+ })
+
+ function playAudio() {
+ if (settingStore.keyboardSound) {
+ play()
+ }
+ }
+
+ return playAudio
}
export function usePlayBeep() {
- return useSound([beep], 1)[0]
+ const settingStore = useSettingStore()
+ const {play} = useSound([beep], 1)
+
+ function playAudio() {
+ if (settingStore.effectSound) {
+ play()
+ }
+ }
+
+ return playAudio
}
export function usePlayCorrect() {
- return useSound([correct], 1)[0]
+ const settingStore = useSettingStore()
+ const {play} = useSound([correct], 1)
+
+ function playAudio() {
+ if (settingStore.effectSound) {
+ play()
+ }
+ }
+
+ return playAudio
}
export function usePlayWordAudio() {
- const audio = $ref(new Audio())
+ const settingStore = useSettingStore()
+ const audio = $ref(new Audio())
- function generateWordSoundSrc(word: string, pronunciation: string) {
- switch (pronunciation) {
- case 'uk':
- return `${PronunciationApi}${word}&type=1`
- case 'us':
- return `${PronunciationApi}${word}&type=2`
- }
+ function playAudio(word: string) {
+ if (settingStore.wordSoundType === 'uk') {
+ audio.src = `${PronunciationApi}${word}&type=1`
+ } else if (settingStore.wordSoundType === 'us') {
+ audio.src = `${PronunciationApi}${word}&type=2`
}
+ audio.play()
+ }
- function playWordAudio(word: string) {
- audio.src = generateWordSoundSrc(word, 'us')
- audio.play()
- }
-
- return playWordAudio
+ return playAudio
}
export function usePlayAudio(url: string) {
- new Audio(url).play().then(r => void 0)
+ new Audio(url).play().then(r => void 0)
}
export function getAudioFileUrl(name: string) {
- if (name === '机械') {
- return [
- `/sound/key-sounds/jixie/机械0.mp3`,
- `/sound/key-sounds/jixie/机械1.mp3`,
- `/sound/key-sounds/jixie/机械2.mp3`,
- `/sound/key-sounds/jixie/机械3.mp3`,
- ]
- } else {
- return [`/sound/key-sounds/${name}.mp3`]
- }
+ if (name === '机械') {
+ return [
+ `/sound/key-sounds/jixie/机械0.mp3`,
+ `/sound/key-sounds/jixie/机械1.mp3`,
+ `/sound/key-sounds/jixie/机械2.mp3`,
+ `/sound/key-sounds/jixie/机械3.mp3`,
+ ]
+ } else {
+ return [`/sound/key-sounds/${name}.mp3`]
+ }
}
-
export function useWatchAllSound() {
- const settingStore = useSettingStore()
+ const settingStore = useSettingStore()
- watch([
- () => settingStore.wordSound,
- () => settingStore.keyboardSound,
- () => settingStore.translateSound,
- () => settingStore.effectSound,
- ], (n) => {
- settingStore.allSound = n.some(v => v);
- })
+ watch([
+ () => settingStore.wordSound,
+ () => settingStore.keyboardSound,
+ () => settingStore.translateSound,
+ () => settingStore.effectSound,
+ ], (n) => {
+ settingStore.allSound = n.some(v => v);
+ })
}
export function useChangeAllSound(e: boolean) {
- const settingStore = useSettingStore()
+ const settingStore = useSettingStore()
- settingStore.allSound = e
- settingStore.wordSound = e
- settingStore.keyboardSound = e
- settingStore.translateSound = e
- settingStore.effectSound = e
+ settingStore.allSound = e
+ settingStore.wordSound = e
+ settingStore.keyboardSound = e
+ settingStore.translateSound = e
+ settingStore.effectSound = e
}
\ No newline at end of file
diff --git a/src/stores/base.ts b/src/stores/base.ts
index a73ac14c..dce56686 100644
--- a/src/stores/base.ts
+++ b/src/stores/base.ts
@@ -100,9 +100,9 @@ export const useBaseStore = defineStore('base', {
}
],
current: {
- // dictType: DictType.publicDict,
- dictType: DictType.publicArticle,
- index: 0,
+ dictType: DictType.publicDict,
+ // dictType: DictType.publicArticle,
+ index: 1,
editIndex: 0,
repeatNumber: 0,
},
diff --git a/src/stores/setting.ts b/src/stores/setting.ts
index 90c92451..fd53096c 100644
--- a/src/stores/setting.ts
+++ b/src/stores/setting.ts
@@ -8,6 +8,7 @@ export interface SettingState {
wordSound: boolean,
wordSoundVolume: number,
wordSoundSpeed: number,
+ wordSoundType: string,
keyboardSound: boolean,
keyboardSoundVolume: number,
keyboardSoundFile: string,
@@ -43,6 +44,7 @@ export const useSettingStore = defineStore('setting', {
wordSound: true,
wordSoundVolume: 100,
wordSoundSpeed: 1,
+ wordSoundType: 'us',
keyboardSound: true,
keyboardSoundVolume: 100,
keyboardSoundFile: '老式机械',