v0.4更新

.all-contributorsrc

@@ -27,8 +27,8 @@
       ]
     },
     {
-      "login": "ly-nld",
-      "name": "跨性别",
+      "login": "cvyl",
+      "name": "Mikka",
       "avatar_url": "https://avatars.githubusercontent.com/u/38471793?v=4",
       "profile": "http://lgbt.sh",
       "contributions": [

GUI/DictForm.cs

@@ -9,13 +9,14 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using static System.Net.Mime.MediaTypeNames;
 
 namespace ja_learner
 {
     public partial class DictForm : Form
     {
         public Form mainForm;
         public DictForm()
         {
             InitializeComponent();
         }
@@ -31,7 +32,7 @@
             webView.CoreWebView2.Settings.IsStatusBarEnabled = false;
             webView.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Light;
             // 处理打开新窗口（用默认浏览器打开）
             webView.CoreWebView2.NewWindowRequested += CoreWebView2_NewWindowRequested;
         }
         private void CoreWebView2_NewWindowRequested(object sender, CoreWebView2NewWindowRequestedEventArgs e)
         {
@@ -75,9 +76,29 @@
 #endif
         }
 
-        public void UpdateTranslationPanelText(string text)
+        async public void UpdateTranslationPanelText(string text)
         {
+            await webView.ExecuteScriptAsync($"setCurrentText('{text}')");
             translationPanel.UpdateText(text);
         }
+
+        async private void webView_WebMessageReceived(object sender, CoreWebView2WebMessageReceivedEventArgs e)
+        {
+            string message = e.TryGetWebMessageAsString();
+            if (message == "ANKI_INIT")
+            {
+                if (Program.APP_SETTING.AnkiEnabled)
+                {
+                    await webView.ExecuteScriptAsync($"setAnkiEnabled(true)");
+                    AnkiOptions o = Program.APP_SETTING.Anki;
+                    await webView.ExecuteScriptAsync($"setAnkiConfig('{o.Deck}','{o.Model}','{o.FieldNames.Word}','{o.FieldNames.Example}','{o.FieldNames.Explain}')");
+                }
+                else
+                {
+                    await webView.ExecuteScriptAsync($"setAnkiEnabled(false)");
+                }
+                return;
+            }
+        }
     }
 }

GUI/MainForm.cs

@@ -8,6 +8,8 @@
     {
         DictForm dictForm;
 
+        Size defaultMinSize;
+
         TextAnalyzer textAnalyzer = new TextAnalyzer();
         private string sentence = "";
         private bool immersiveMode = false;
@@ -22,13 +24,15 @@
                     tabControl.Hide();
                     panel1.Hide();
                     FormBorderStyle = FormBorderStyle.None;
+                    MinimumSize = new Size(0,0);
                 }
                 else
                 {
                     webView.Parent = tabControl.TabPages[0];
                     tabControl.Show();
                     panel1.Show();
                     FormBorderStyle = FormBorderStyle.Sizable;
+                    MinimumSize = defaultMinSize;
                 }
                 immersiveMode = value;
             }
@@ -49,7 +53,7 @@
             }
         }
 
         public MainForm()
         {
             InitializeComponent();
         }
@@ -59,7 +63,7 @@
             webView.CoreWebView2.Settings.IsStatusBarEnabled = false;
             webView.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Light;
             // 处理打开新窗口（用默认浏览器打开）
             webView.CoreWebView2.NewWindowRequested += CoreWebView2_NewWindowRequested;
             // 接收js消息（查词典）
             webView.CoreWebView2.WebMessageReceived += CoreWebView2_WebMessageReceived;
         }
@@ -76,14 +80,23 @@
             // 初始化 HTTP 服务器
             HttpServer.StartServer();
             webView.Source = new Uri($"http://localhost:{HttpServer.Port}/"); // build
-            Text += $" - 已占用端口：{HttpServer.Port} -";
+            Text += $" - {HttpServer.Port} -";
 #endif
 
+            // 初始化 DictForm
             dictForm = new DictForm(this);
             dictForm.Show();
             dictForm.Hide();
             UpdateExtraPromptCombobox();
+
+            // 初始化 MainForm
+            if (Program.APP_SETTING.HttpProxy != string.Empty)
+            {
+                checkBoxUseProxy.Enabled = true;
+                checkBoxUseProxy.Text = $"HTTP代理：{Program.APP_SETTING.HttpProxy}";
+            }
             comboBoxTranslator.SelectedIndex = 0;
+            defaultMinSize = MinimumSize;
         }
 
         private void CoreWebView2_NewWindowRequested(object sender, CoreWebView2NewWindowRequestedEventArgs e)
@@ -418,5 +431,11 @@
             ReleaseCapture();
             SendMessage(Handle, WM_NCLBUTTONDOWN, HT_CAPTION, 0);
         }
+
+        private void checkBoxUseProxy_CheckedChanged(object sender, EventArgs e)
+        {
+            UserConfig.UseProxy = checkBoxUseProxy.Checked;
+            GptCaller.SetProxy(UserConfig.UseProxy);
+        }
     }
 }

GptCaller.cs

@@ -1,26 +1,39 @@
 using OpenAI_API;
 using OpenAI_API.Chat;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Net;
 
 namespace ja_learner
 {
     internal class GptCaller
     {
         private static OpenAIAPI api;
 
+        private static IHttpClientFactory defaultFactory;
+        private static IHttpClientFactory proxyFactory;
+
         public static void Initialize()
         {
-            api = new(Program.APP_SETTING.ApiKey) { ApiUrlFormat = Program.APP_SETTING.ApiUrl };
+            api = new(Program.APP_SETTING.GPT.ApiKey) { ApiUrlFormat = Program.APP_SETTING.GPT.ApiUrl };
+            defaultFactory = api.HttpClientFactory;
+            proxyFactory = new MyHttpClientFactory(Program.APP_SETTING.HttpProxy);
+        }
+
+        public static void SetProxy(bool useProxy)
+        {
+            if (useProxy)
+            {
+                api.HttpClientFactory = proxyFactory;
+            }
+            else
+            {
+                api.HttpClientFactory = defaultFactory;
+            }
         }
 
         public static Conversation CreateTranslateConversation(string text)
         {
             Conversation conversation = api.Chat.CreateConversation();
-            conversation.AppendSystemMessage("You are a translation engine, translate the text to Simplified Chinese. Don't output anything other than translation results.");
+            conversation.AppendSystemMessage(Program.APP_SETTING.GPT.TranslatePrompt);
             if (UserConfig.useExtraPrompt)
             {
                 AddExtraSystemPrompt(conversation);
@@ -32,7 +45,7 @@
         public static Conversation CreateInterpretConversation(string text)
         {
             Conversation conversation = api.Chat.CreateConversation();
-            conversation.AppendSystemMessage("You are a Japanese teacher, List and explain the vocabulary (except prepositions) and grammar of the given text in Simplified Chinese. Your output consists of three parts: translation, vocabulary, grammar. Don't use English and romaji.");
+            conversation.AppendSystemMessage(Program.APP_SETTING.GPT.ExplainPrompt);
             if (UserConfig.useExtraPrompt)
             {
                 AddExtraSystemPrompt(conversation);
@@ -64,4 +77,23 @@
             }
         }
     }
+
+    class MyHttpClientFactory : IHttpClientFactory
+    {
+        private string proxy;
+        public MyHttpClientFactory(string proxy)
+        {
+            this.proxy = proxy;
+        }
+        HttpClient IHttpClientFactory.CreateClient(string name)
+        {
+            HttpClientHandler handler = new HttpClientHandler()
+            {
+                Proxy = new WebProxy($"http://{proxy}")
+            };
+            var client = new HttpClient(handler);
+            return client;
+        }
+    }
+
 }