GuanM/LLOneBot
1
0
Fork 0
mirror of https://github.com/LLOneBot/LLOneBot.git synced 2024-11-22 01:56:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
linyuchen 2024-02-26 23:24:03 +08:00
commit 1f657f3e84
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/main.ts
View File

@ -326,7 +326,7 @@ function onLoad() {
// 检查ffmpeg // 检查ffmpeg
checkFFMPEG(config.ffmpeg).then(exist => { checkFFMPEG(config.ffmpeg).then(exist => {
if (!exist) { if (!exist) {
llonebotError.ffmpegError = `环境变量${process.env.PATH}中不存在ffmpeg,音频只能发送wav和silk` llonebotError.ffmpegError = `没有找到ffmpeg,音频只能发送wav和silk`
} }
}) })
if (config.ob11.enableHttp) { if (config.ob11.enableHttp) {

22
src/renderer.ts
View File

@ -117,19 +117,20 @@ async function onSettingWindowCreated(view: Element) {
<setting-text>Access Token</setting-text> <setting-text>Access Token</setting-text>
<input id="token" type="text" placeholder="可为空" value="${config.token}"/> <input id="token" type="text" placeholder="可为空" value="${config.token}"/>
</setting-item> </setting-item>
<setting-item data-direction="row" class="vertical-list-item">
<setting-item data-direction="row" class="vertical-list-item" style="width: 80%">
<setting-text>ffmpeg路径</setting-text>
<input id="ffmpegPath" class="input-text" type="text"
style="width:80%;padding: 5px"
value="${config.ffmpeg || ''}"/>
</setting-item>
<button id="selectFFMPEG" class="q-button q-button--small q-button--secondary">选择ffmpeg</button>
</setting-item>
<button id="save" class="q-button">保存</button> <button id="save" class="q-button">保存</button>
</setting-list> </setting-list>
</setting-panel> </setting-panel>
<setting-panel> <setting-panel>
<setting-item data-direction="row" class="vertical-list-item">
<setting-item data-direction="row" class="vertical-list-item" style="width: 80%">
<setting-text>ffmpeg路径</setting-text>
<input id="ffmpegPath" class="input-text" type="text"
style="width:80%;padding: 5px"
value="${config.ffmpeg || ''}"/>
</setting-item>
<button id="selectFFMPEG" class="q-button q-button--small q-button--secondary">选择ffmpeg</button>
</setting-item>
<setting-item data-direction="row" class="vertical-list-item"> <setting-item data-direction="row" class="vertical-list-item">
<div> <div>
<setting-text>消息上报数据类型</setting-text> <setting-text>消息上报数据类型</setting-text>
@ -331,7 +332,8 @@ async function onSettingWindowCreated(view: Element) {
doc.getElementById("selectFFMPEG")?.addEventListener("click", ()=>{ doc.getElementById("selectFFMPEG")?.addEventListener("click", ()=>{
window.llonebot.selectFile().then(selectPath=>{ window.llonebot.selectFile().then(selectPath=>{
if (selectPath){ if (selectPath){
(document.getElementById("ffmpegPath") as HTMLInputElement).value = selectPath; config.ffmpeg = (document.getElementById("ffmpegPath") as HTMLInputElement).value = selectPath;
// window.llonebot.setConfig(config);
} }
}); });
}) })