diff --git a/AppCode/SaveDataOperater.cs b/AppCode/SaveDataOperater.cs index 8e74f56..0201b07 100644 --- a/AppCode/SaveDataOperater.cs +++ b/AppCode/SaveDataOperater.cs @@ -290,7 +290,7 @@ using Newtonsoft.Json; try { var content = new StringContent(jsonContent, Encoding.UTF8, "application/json"); - HttpResponseMessage response = await client.PostAsync(WindowsFormsApp.Form1.apiUrl + "/sdk/v1/dotmatrix/pen/add", content); + HttpResponseMessage response = await client.PostAsync(WindowsFormsApp.InteractiveClassroomLocalDataScan.apiUrl + "/sdk/v1/dotmatrix/pen/add", content); response.EnsureSuccessStatusCode(); ServerResult sr = JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync()); if (sr.success) diff --git a/Form1.Designer.cs b/Form1.Designer.cs index a3741fd..0afee00 100644 --- a/Form1.Designer.cs +++ b/Form1.Designer.cs @@ -1,6 +1,6 @@ namespace WindowsFormsApp { - partial class Form1 + partial class InteractiveClassroomLocalDataScan { /// /// Required designer variable. @@ -30,6 +30,7 @@ { this.components = new System.ComponentModel.Container(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + this.button1 = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.获取信息ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -47,7 +48,6 @@ this.获取笔迹分布时间ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer2 = new System.Windows.Forms.Timer(this.components); - this.button1 = new System.Windows.Forms.Button(); this.flowLayoutPanel1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -61,10 +61,20 @@ this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(600, 360); + this.flowLayoutPanel1.Size = new System.Drawing.Size(491, 364); this.flowLayoutPanel1.TabIndex = 0; this.flowLayoutPanel1.Paint += new System.Windows.Forms.PaintEventHandler(this.flowLayoutPanel1_Paint); // + // button1 + // + this.button1.Location = new System.Drawing.Point(3, 3); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 1; + this.button1.Text = "同步数据"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // // label1 // this.label1.AutoSize = true; @@ -181,25 +191,15 @@ this.timer2.Interval = 1000; this.timer2.Tick += new System.EventHandler(this.timer2_Tick); // - // button1 - // - this.button1.Location = new System.Drawing.Point(3, 3); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); - this.button1.TabIndex = 1; - this.button1.Text = "同步数据"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // Form1 + // InteractiveClassroomLocalDataScan // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 360); + this.ClientSize = new System.Drawing.Size(491, 364); this.ContextMenuStrip = this.contextMenuStrip1; this.Controls.Add(this.flowLayoutPanel1); this.Margin = new System.Windows.Forms.Padding(2); - this.Name = "Form1"; + this.Name = "InteractiveClassroomLocalDataScan"; this.Text = "Form1"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing); this.Load += new System.EventHandler(this.Form1_Load); diff --git a/Form1.cs b/Form1.cs index eaf55a4..d259412 100644 --- a/Form1.cs +++ b/Form1.cs @@ -21,7 +21,7 @@ using System.Net.Http; using System.Xml.Linq; namespace WindowsFormsApp { - public partial class Form1 : Form + public partial class InteractiveClassroomLocalDataScan : Form { static DigitalPenAP digitalPenAP; @@ -35,7 +35,7 @@ namespace WindowsFormsApp //所有已连接笔的绘制窗口 Dictionary AllPenDrawsDic = new Dictionary(); - public Form1() + public InteractiveClassroomLocalDataScan() { InitializeComponent(); // 加载 XML 文件 @@ -46,6 +46,7 @@ namespace WindowsFormsApp SaveDataOperater.DeletePenStatus(); //SaveDataOperater.DropAllPenTable(); WriteData(); + this.Text = "互动课堂数据采集"; } public static async void WriteData() @@ -727,7 +728,7 @@ namespace WindowsFormsApp using (HttpClient client = new HttpClient()) { var content = new StringContent(jsonContent, Encoding.UTF8, "application/json"); - HttpResponseMessage response = await client.PostAsync(WindowsFormsApp.Form1.apiUrl + "/sdk/v1/dotmatrix/pen/report", content); + HttpResponseMessage response = await client.PostAsync(WindowsFormsApp.InteractiveClassroomLocalDataScan.apiUrl + "/sdk/v1/dotmatrix/pen/report", content); response.EnsureSuccessStatusCode(); ServerResult sr = JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync()); } @@ -755,7 +756,7 @@ namespace WindowsFormsApp using (HttpClient client = new HttpClient()) { var content = new StringContent("", Encoding.UTF8, "application/json"); - HttpResponseMessage response = await client.GetAsync(WindowsFormsApp.Form1.apiUrl + "/sdk/v1/class/student/pens?classId=" + ClassID); + HttpResponseMessage response = await client.GetAsync(WindowsFormsApp.InteractiveClassroomLocalDataScan.apiUrl + "/sdk/v1/class/student/pens?classId=" + ClassID); response.EnsureSuccessStatusCode(); ServerResult sr = JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync()); if (sr.success) @@ -771,7 +772,7 @@ namespace WindowsFormsApp using (HttpClient client = new HttpClient()) { var content = new StringContent("", Encoding.UTF8, "application/json"); - HttpResponseMessage response = await client.GetAsync(WindowsFormsApp.Form1.apiUrl + "/sdk/v1/dotmatrix/page/sync"); + HttpResponseMessage response = await client.GetAsync(WindowsFormsApp.InteractiveClassroomLocalDataScan.apiUrl + "/sdk/v1/dotmatrix/page/sync"); response.EnsureSuccessStatusCode(); ServerResult sr = JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync()); diff --git a/Interaction_DigitalPenAP_Csharp_form_demo.csproj b/InteractiveClassroomLocalDataScan.csproj similarity index 100% rename from Interaction_DigitalPenAP_Csharp_form_demo.csproj rename to InteractiveClassroomLocalDataScan.csproj diff --git a/Program.cs b/Program.cs index e59d805..7a9e9c2 100644 --- a/Program.cs +++ b/Program.cs @@ -15,7 +15,7 @@ namespace WindowsFormsApp { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form1()); + Application.Run(new InteractiveClassroomLocalDataScan()); } } } diff --git a/bin/Debug/WindowsFormsApp.exe b/bin/Debug/WindowsFormsApp.exe index 3b7c1f7..8f49195 100644 Binary files a/bin/Debug/WindowsFormsApp.exe and b/bin/Debug/WindowsFormsApp.exe differ diff --git a/bin/Debug/WindowsFormsApp.pdb b/bin/Debug/WindowsFormsApp.pdb index 91f6de3..5b59f7a 100644 Binary files a/bin/Debug/WindowsFormsApp.pdb and b/bin/Debug/WindowsFormsApp.pdb differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index b46605c..3d54611 100644 Binary files a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/obj/x86/Debug/InteractiveClassroomLocalDataScan.csproj.AssemblyReference.cache b/obj/x86/Debug/InteractiveClassroomLocalDataScan.csproj.AssemblyReference.cache new file mode 100644 index 0000000..af84f87 Binary files /dev/null and b/obj/x86/Debug/InteractiveClassroomLocalDataScan.csproj.AssemblyReference.cache differ diff --git a/obj/x86/Debug/InteractiveClassroomLocalDataScan.csproj.CoreCompileInputs.cache b/obj/x86/Debug/InteractiveClassroomLocalDataScan.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..0ec7597 --- /dev/null +++ b/obj/x86/Debug/InteractiveClassroomLocalDataScan.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +fe4507efffa991a223aa4b00f56223e928a22ad38ba4bdb32bfe7b4707e8e9d8 diff --git a/obj/x86/Debug/InteractiveClassroomLocalDataScan.csproj.FileListAbsolute.txt b/obj/x86/Debug/InteractiveClassroomLocalDataScan.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..4190140 --- /dev/null +++ b/obj/x86/Debug/InteractiveClassroomLocalDataScan.csproj.FileListAbsolute.txt @@ -0,0 +1,38 @@ +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\WindowsFormsApp.exe.config +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\WindowsFormsApp.exe +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\WindowsFormsApp.pdb +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\Dapper.dll +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\Fleck.dll +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\Newtonsoft.Json.dll +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\System.Buffers.dll +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\System.IO.Pipelines.dll +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\System.Memory.dll +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\System.Numerics.Vectors.dll +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\System.Text.Encodings.Web.dll +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\System.Text.Json.dll +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\System.Threading.Tasks.Extensions.dll +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\TStudyDigitalPen.AP.dll +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\Dapper.xml +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\Newtonsoft.Json.xml +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\System.Buffers.xml +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\System.IO.Pipelines.xml +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\System.Memory.xml +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\System.Numerics.Vectors.xml +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\System.Text.Encodings.Web.xml +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\System.Text.Json.xml +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\System.Threading.Tasks.Extensions.xml +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\bin\Debug\TStudyDigitalPen.AP.xml +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\obj\x86\Debug\InteractiveClassroomLocalDataScan.csproj.AssemblyReference.cache +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\obj\x86\Debug\WindowsFormsApp.InteractiveClassroomLocalDataScan.resources +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\obj\x86\Debug\WindowsFormsApp.FrmSetPenName.resources +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\obj\x86\Debug\WindowsFormsApp.PenDraw.resources +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\obj\x86\Debug\WindowsFormsApp.Properties.Resources.resources +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\obj\x86\Debug\InteractiveClassroomLocalDataScan.csproj.GenerateResource.cache +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\obj\x86\Debug\InteractiveClassroomLocalDataScan.csproj.CoreCompileInputs.cache +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\obj\x86\Debug\Interact.494DFB82.Up2Date +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\obj\x86\Debug\WindowsFormsApp.exe +D:\tstudy_digital_pen_sdk_for_ap_1.7.5(2)\tstudy_digital_pen_sdk_for_ap_1.7.5\LiteVersionSDK\examples\interaction\Interaction_DigitalPenAP_Csharp_form_demo\obj\x86\Debug\WindowsFormsApp.pdb diff --git a/obj/x86/Debug/InteractiveClassroomLocalDataScan.csproj.GenerateResource.cache b/obj/x86/Debug/InteractiveClassroomLocalDataScan.csproj.GenerateResource.cache new file mode 100644 index 0000000..0412811 Binary files /dev/null and b/obj/x86/Debug/InteractiveClassroomLocalDataScan.csproj.GenerateResource.cache differ diff --git a/obj/x86/Debug/WindowsFormsApp.InteractiveClassroomLocalDataScan.resources b/obj/x86/Debug/WindowsFormsApp.InteractiveClassroomLocalDataScan.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/obj/x86/Debug/WindowsFormsApp.InteractiveClassroomLocalDataScan.resources differ diff --git a/obj/x86/Debug/WindowsFormsApp.exe b/obj/x86/Debug/WindowsFormsApp.exe index 3b7c1f7..8f49195 100644 Binary files a/obj/x86/Debug/WindowsFormsApp.exe and b/obj/x86/Debug/WindowsFormsApp.exe differ diff --git a/obj/x86/Debug/WindowsFormsApp.pdb b/obj/x86/Debug/WindowsFormsApp.pdb index 91f6de3..5b59f7a 100644 Binary files a/obj/x86/Debug/WindowsFormsApp.pdb and b/obj/x86/Debug/WindowsFormsApp.pdb differ