From 7d14effde2827dd079f0c26ae01416bcc1dd433a Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Thu, 26 Sep 2024 09:48:48 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[Update]=20=E3=83=87=E3=83=90=E3=82=A4?= =?UTF-8?q?=E3=82=B9=E8=87=AA=E5=8B=95=E5=A4=89=E6=9B=B4=E6=99=82=E3=81=AE?= =?UTF-8?q?endpoint(run)=E3=82=92UI=E3=81=A8=E7=B9=8B=E3=81=84=E3=81=A0?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-ui/logics/useReceiveRoutes.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src-ui/logics/useReceiveRoutes.js b/src-ui/logics/useReceiveRoutes.js index 7d529eb3..d0880152 100644 --- a/src-ui/logics/useReceiveRoutes.js +++ b/src-ui/logics/useReceiveRoutes.js @@ -152,6 +152,7 @@ export const useReceiveRoutes = () => { "/set/disable/auto_speaker_select": updateEnableAutoSpeakerSelect, "/get/data/mic_host_list": (payload) => updateMicHostList(arrayToObject(payload)), + "/run/mic_host_list": (payload) => updateMicHostList(arrayToObject(payload)), "/get/data/selected_mic_host": updateSelectedMicHost, "/set/data/selected_mic_host": (payload) => { updateSelectedMicHost(payload.host); @@ -159,12 +160,20 @@ export const useReceiveRoutes = () => { }, "/get/data/mic_device_list": (payload) => updateMicDeviceList(arrayToObject(payload)), + "/run/mic_device_list": (payload) => updateMicDeviceList(arrayToObject(payload)), "/get/data/selected_mic_device": updateSelectedMicDevice, "/set/data/selected_mic_device": updateSelectedMicDevice, + "/run/selected_mic_device": (payload) => { + updateSelectedMicHost(payload.host); + updateSelectedMicDevice(payload.device); + }, + "/get/data/speaker_device_list": (payload) => updateSpeakerDeviceList(arrayToObject(payload)), + "/run/speaker_device_list": (payload) => updateSpeakerDeviceList(arrayToObject(payload)), "/get/data/selected_speaker_device": updateSelectedSpeakerDevice, "/set/data/selected_speaker_device": updateSelectedSpeakerDevice, + "/run/selected_speaker_device": updateSelectedSpeakerDevice, "/run/check_mic_volume": updateVolumeVariable_Mic, "/run/check_speaker_volume": updateVolumeVariable_Speaker, From fbce381e3207b3fcc36c38ec7449552c879d60e8 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Thu, 26 Sep 2024 11:26:29 +0900 Subject: [PATCH 2/2] [Update] Remove the get devices lists function that is working when dropdown menu opens and move to init place(app.jsx). --- src-ui/app/App.jsx | 12 ++++++++++++ .../setting_section/setting_box/device/Device.jsx | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src-ui/app/App.jsx b/src-ui/app/App.jsx index d335ea68..70c6d465 100644 --- a/src-ui/app/App.jsx +++ b/src-ui/app/App.jsx @@ -36,11 +36,19 @@ import { useLanguageSettings } from "@logics_main/useLanguageSettings"; import { useSelectableLanguageList } from "@logics_main/useSelectableLanguageList"; import { useMessageInputBoxRatio } from "@logics_main/useMessageInputBoxRatio"; +import { useMicHostList } from "@logics_configs/useMicHostList"; +import { useMicDeviceList } from "@logics_configs/useMicDeviceList"; +import { useSpeakerDeviceList } from "@logics_configs/useSpeakerDeviceList"; + const StartPythonFacadeComponent = () => { const { asyncStartPython } = useStartPython(); const hasRunRef = useRef(false); const main_page = getCurrent(); + const { getMicHostList } = useMicHostList(); + const { getMicDeviceList } = useMicDeviceList(); + const { getSpeakerDeviceList } = useSpeakerDeviceList(); + const { getIsMainPageCompactMode } = useIsMainPageCompactMode(); const { getSoftwareVersion } = useSoftwareVersion(); const { getEnableAutoMicSelect } = useEnableAutoMicSelect(); @@ -84,6 +92,10 @@ const StartPythonFacadeComponent = () => { getTranslationEngines(); getSelectedTranslationEngines(); + getMicHostList(); + getMicDeviceList(); + getSpeakerDeviceList(); + getEnableAutoMicSelect(); getEnableAutoSpeakerSelect(); getSelectedMicHost(); diff --git a/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx b/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx index 52531d22..e1cd7259 100644 --- a/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx @@ -85,7 +85,7 @@ const Mic_Container = () => { selected_id={currentSelectedMicHost.data} list={currentMicHostList.data} selectFunction={selectFunction_host} - openListFunction={getMicHostList} + // openListFunction={getMicHostList} state={currentSelectedMicHost.state} style={{ maxWidth: "20rem", minWidth: "10rem" }} is_disabled={is_disabled_selector} @@ -99,7 +99,7 @@ const Mic_Container = () => { selected_id={currentSelectedMicDevice.data} list={currentMicDeviceList.data} selectFunction={selectFunction_device} - openListFunction={getMicDeviceList} + // openListFunction={getMicDeviceList} state={currentSelectedMicDevice.state} is_disabled={is_disabled_selector} /> @@ -183,7 +183,7 @@ const Speaker_Container = () => { selected_id={currentSelectedSpeakerDevice.data} list={currentSpeakerDeviceList.data} selectFunction={selectFunction} - openListFunction={getSpeakerDeviceList} + // openListFunction={getSpeakerDeviceList} state={currentSelectedSpeakerDevice.state} is_disabled={is_disabled_selector} />