From a6bf2619a67c7fd700b4d61acc2b87d1b1e88645 Mon Sep 17 00:00:00 2001 From: 2409 <95078036+Duck15@users.noreply.github.com> Date: Fri, 25 Jul 2025 11:06:15 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96api=E5=87=BA=E9=94=99?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E8=A1=A8=E7=8E=B0=EF=BC=8C=E5=B9=B6=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E6=96=B9=E4=BE=BF=E5=A4=8D=E5=88=B6=E8=AF=8A=E6=96=AD?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VPet.Plugin.ChatVPet/CVPTTalkAPI.cs | 9 +++++---- VPet.Plugin.ChatVPet/VPet.Plugin.ChatVPet.csproj | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/VPet.Plugin.ChatVPet/CVPTTalkAPI.cs b/VPet.Plugin.ChatVPet/CVPTTalkAPI.cs index 1d4c672..ac97f2a 100644 --- a/VPet.Plugin.ChatVPet/CVPTTalkAPI.cs +++ b/VPet.Plugin.ChatVPet/CVPTTalkAPI.cs @@ -84,13 +84,13 @@ private void VoiceRecognize() //{ // return int.Max(7, (int)Math.Sqrt(like / 16) - 2); //} - public override void Responded(string content) + public override void Responded(string content) // 处理响应内容 { if (string.IsNullOrEmpty(content)) { return; } - DisplayThink(); + DisplayThink(); // 显示思考动画 if (Plugin.CGPTClient == null) { DisplayThinkToSayRnd("请先前往设置中设置 GPT API".Translate()); @@ -104,7 +104,7 @@ public override void Responded(string content) { if (pr.IsError) { - Plugin.MW.Main.LabelDisplayShow("VCP报错: ".Translate() + pr.Reply); + Plugin.MW.Main.LabelDisplayShow("VCP报错: ".Translate() + pr.Reply); // 显示错误消息弹窗Label } else if (!string.IsNullOrWhiteSpace(pr.Reply)) { @@ -158,7 +158,8 @@ public override void Responded(string content) { str = "请检查API token设置".Translate(); } - DisplayThinkToSayRnd("API调用失败".Translate() + $",{str}\n{e}");//, GraphCore.Helper.SayType.Serious); + DisplayThinkToSayRndAutoNoForce("API调用失败".Translate() + $",{str}\n{e}");//, GraphCore.Helper.SayType.Serious); + Plugin.MW.Main.LabelDisplayShow("API调用失败".Translate() + $",{str}\n{e}"); // 显示错误消息弹窗Label } } bool istalksuccess = false; diff --git a/VPet.Plugin.ChatVPet/VPet.Plugin.ChatVPet.csproj b/VPet.Plugin.ChatVPet/VPet.Plugin.ChatVPet.csproj index 6385757..a243e28 100644 --- a/VPet.Plugin.ChatVPet/VPet.Plugin.ChatVPet.csproj +++ b/VPet.Plugin.ChatVPet/VPet.Plugin.ChatVPet.csproj @@ -5,6 +5,8 @@ enable true true + true + true From 2538730e45cf7eb557f3cfa985766bb94d9bc17d Mon Sep 17 00:00:00 2001 From: 2409 <95078036+Duck15@users.noreply.github.com> Date: Fri, 25 Jul 2025 12:06:06 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9D=A1=E8=A7=89?= =?UTF-8?q?=E5=92=8C=E5=81=9C=E6=AD=A2=E5=B7=A5=E4=BD=9C=E7=9A=84=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E8=B0=83=E7=94=A8=E9=97=AE=E9=A2=98=20=E6=94=B9?= =?UTF-8?q?=E5=96=84=E4=BA=86=E6=9B=B4=E5=A4=9A=E6=8A=A5=E9=94=99=E8=A1=A8?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VPet.Plugin.ChatVPet/CVPTTalkAPI.cs | 10 +++++----- VPet.Plugin.ChatVPet/CVP_Tool.cs | 21 ++++++++++++++------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/VPet.Plugin.ChatVPet/CVPTTalkAPI.cs b/VPet.Plugin.ChatVPet/CVPTTalkAPI.cs index ac97f2a..99eaac9 100644 --- a/VPet.Plugin.ChatVPet/CVPTTalkAPI.cs +++ b/VPet.Plugin.ChatVPet/CVPTTalkAPI.cs @@ -93,7 +93,7 @@ public override void Responded(string content) // 处理响应内容 DisplayThink(); // 显示思考动画 if (Plugin.CGPTClient == null) { - DisplayThinkToSayRnd("请先前往设置中设置 GPT API".Translate()); + MessageBox.Show("请先前往设置中设置 GPT API".Translate()); return; } Dispatcher.Invoke(() => this.IsEnabled = false); @@ -104,7 +104,7 @@ public override void Responded(string content) // 处理响应内容 { if (pr.IsError) { - Plugin.MW.Main.LabelDisplayShow("VCP报错: ".Translate() + pr.Reply); // 显示错误消息弹窗Label + MessageBox.Show("VCP报错: ".Translate() + pr.Reply); // 显示错误消息弹窗Label } else if (!string.IsNullOrWhiteSpace(pr.Reply)) { @@ -130,7 +130,7 @@ public override void Responded(string content) // 处理响应内容 { string? model = Plugin.CGPTClient.Completions["vpet"].model?.ToLower(); if (string.IsNullOrWhiteSpace(model) || !model.Contains("gpt-4") || !model.Contains("o1") || !model.Contains("pro") || - !model.Contains("plus") || !model.Contains("max"))//确保提交质量 + !model.Contains("plus") || !model.Contains("max"))//确保提交质量 return; string[]? msg = Plugin.VPetChatProcess.Dialogues.LastOrDefault()?.ToMessages(Plugin.VPetChatProcess.Localization); @@ -158,8 +158,8 @@ public override void Responded(string content) // 处理响应内容 { str = "请检查API token设置".Translate(); } - DisplayThinkToSayRndAutoNoForce("API调用失败".Translate() + $",{str}\n{e}");//, GraphCore.Helper.SayType.Serious); - Plugin.MW.Main.LabelDisplayShow("API调用失败".Translate() + $",{str}\n{e}"); // 显示错误消息弹窗Label + DisplayThinkToSayRndAutoNoForce("API调用失败".Translate() + $",{str}\n{e}"); //, GraphCore.Helper.SayType.Serious); + MessageBox.Show("API调用失败".Translate() + $",{str}\n{e}"); // 显示错误消息弹窗 } } bool istalksuccess = false; diff --git a/VPet.Plugin.ChatVPet/CVP_Tool.cs b/VPet.Plugin.ChatVPet/CVP_Tool.cs index 93b9214..313eab5 100644 --- a/VPet.Plugin.ChatVPet/CVP_Tool.cs +++ b/VPet.Plugin.ChatVPet/CVP_Tool.cs @@ -53,7 +53,7 @@ public partial class CVPPlugin public string? ToolStopWork(Dictionary args) { - MW.Main.WorkTimer.Stop(reason: FinishWorkInfo.StopReason.MenualStop); + MW.Dispatcher.Invoke(() => MW.Main.WorkTimer.Stop(reason: FinishWorkInfo.StopReason.MenualStop)); return null; } public string? ToolDance(Dictionary args) @@ -87,14 +87,21 @@ public partial class CVPPlugin } public string? ToolSleep(Dictionary args) { - MW.Main.WorkTimer.Stop(reason: FinishWorkInfo.StopReason.MenualStop); var m = MW.Main; - if (m.State == Main.WorkingState.Nomal) - m.DisplaySleep(true); - else if (m.State != Main.WorkingState.Sleep) + MW.Dispatcher.Invoke(() => { - m.WorkTimer.Stop(() => m.DisplaySleep(true), WorkTimer.FinishWorkInfo.StopReason.MenualStop); - } + if (m.State == Main.WorkingState.Nomal) + { + // 正常状态直接睡觉 + m.DisplaySleep(true); + } + else if (m.State != Main.WorkingState.Sleep) + { + // 如果正在工作，先停止工作再睡觉 + m.WorkTimer.Stop(() => m.DisplaySleep(true), WorkTimer.FinishWorkInfo.StopReason.MenualStop); + } + // 如果已经是睡眠状态，什么都不做 + }); return null; } public string? ToolWakeup(Dictionary args) From 65af6bbdcdf83845b622d4eb164bd1c9211a26d5 Mon Sep 17 00:00:00 2001 From: 2409 <95078036+Duck15@users.noreply.github.com> Date: Fri, 25 Jul 2025 20:48:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BD=93=E6=A3=80=E6=B5=8B=E5=88=B0?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=97=B6=EF=BC=8C=E4=BE=9D=E6=97=A7=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E6=8C=89=E9=92=AE=E5=8F=AF=E7=94=A8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VPet.Plugin.ChatVPet/CVPTTalkAPI.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/VPet.Plugin.ChatVPet/CVPTTalkAPI.cs b/VPet.Plugin.ChatVPet/CVPTTalkAPI.cs index 99eaac9..4682cf3 100644 --- a/VPet.Plugin.ChatVPet/CVPTTalkAPI.cs +++ b/VPet.Plugin.ChatVPet/CVPTTalkAPI.cs @@ -160,6 +160,7 @@ public override void Responded(string content) // 处理响应内容 } DisplayThinkToSayRndAutoNoForce("API调用失败".Translate() + $",{str}\n{e}"); //, GraphCore.Helper.SayType.Serious); MessageBox.Show("API调用失败".Translate() + $",{str}\n{e}"); // 显示错误消息弹窗 + Dispatcher.Invoke(() => this.IsEnabled = true); // 恢复按钮可用状态 } } bool istalksuccess = false;