From 7ca8b96fcfa992fbcc28a7b8ee05b69f31de36a1 Mon Sep 17 00:00:00 2001
From: sunbeam <fcb1995@163.com>
Date: Wed, 12 Oct 2022 17:01:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=8A=E6=96=AD=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 default.aproj         |  4 +++-
 dlg/诊断子窗口.aardio | 11 +++++++++++
 main.aardio           |  7 ++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 dlg/诊断子窗口.aardio

diff --git a/default.aproj b/default.aproj
index 91880c0..bdcaec0 100644
--- a/default.aproj
+++ b/default.aproj
@@ -2,7 +2,9 @@
 <project ver="10" name="CAN_Bootloader" libEmbed="true" icon="..." ui="win" output="CAN_Bootloader.exe" CompanyName="单位名称" FileDescription="CAN_Bootloader" LegalCopyright="Copyright (C) 作者 2022" ProductName="CAN_Bootloader" InternalName="CAN_Bootloader" FileVersion="0.0.0.03" ProductVersion="0.0.0.03" publishDir="/dist/" dstrip="false" local="false" ignored="false">
 	<file name="main.aardio" path="main.aardio" comment="main.aardio"/>
 	<folder name="资源文件" path="res" embed="true" local="false" ignored="false"/>
-	<folder name="窗体文件" path="dlg" comment="目录" embed="true" local="false" ignored="false"/>
+	<folder name="窗体文件" path="dlg" comment="目录" embed="true" local="false" ignored="false">
+		<file name="诊断子窗口.aardio" path="dlg\诊断子窗口.aardio" comment="dlg\诊断子窗口.aardio"/>
+	</folder>
 	<folder name="user" path="user" embed="true" comment="目录" local="false" ignored="false">
 		<file name="CanThread.aardio" path="user\CanThread.aardio" comment="user\CanThread.aardio"/>
 		<file name="Diag10code.aardio" path="user\Diag10code.aardio" comment="user\Diag10code.aardio"/>
diff --git a/dlg/诊断子窗口.aardio b/dlg/诊断子窗口.aardio
new file mode 100644
index 0000000..ad5d33e
--- /dev/null
+++ b/dlg/诊断子窗口.aardio
@@ -0,0 +1,11 @@
+import win.ui;
+/*DSG{{*/
+var winform = win.form(text="aardio form";right=759;bottom=469)
+winform.add(
+btnDID_F187={cls="button";text="车辆备用零部件编号";left=68;top=51;right=195;bottom=82;z=1}
+)
+/*}}*/
+
+winform.show();
+win.loopMessage();
+return winform;
diff --git a/main.aardio b/main.aardio
index 1b87d34..467e5ea 100644
--- a/main.aardio
+++ b/main.aardio
@@ -3,6 +3,7 @@ import win.ui;
 mainForm = win.form(text="CAN_Bootloader";right=599;bottom=465;border="dialog frame";max=false)
 mainForm.add(
 btnConnect={cls="button";text="连接";left=204;top=64;right=289;bottom=90;z=4};
+btnDiag={cls="button";text="诊断";left=149;top=355;right=248;bottom=380;z=25};
 btnFlash={cls="button";text="开始刷写";left=35;top=317;right=134;bottom=345;z=9};
 btnFresh={cls="button";text="刷新";left=204;top=28;right=288;bottom=54;z=2};
 btnOpen={cls="button";text="打开文件";left=36;top=282;right=135;bottom=310;z=8};
@@ -15,7 +16,7 @@ btnReadSw={cls="button";text="读取软件版本号";left=36;top=384;right=135;b
 btnTest={cls="button";text="停止";left=147;top=317;right=246;bottom=345;z=11};
 cbbChannel={cls="combobox";left=58;top=64;right=191;bottom=90;edge=1;items={};mode="dropdown";z=3};
 cbbDev={cls="combobox";left=58;top=27;right=191;bottom=53;edge=1;items={};mode="dropdown";z=1};
-checkbox={cls="checkbox";text="CANFD设备";left=151;top=101;right=248;bottom=120;z=21};
+checkbox={cls="checkbox";text="CANFD设备";left=151;top=101;right=248;bottom=120;checked=1;z=21};
 edFile={cls="richedit";left=8;top=131;right=288;bottom=187;border=1;disabled=1;edge=1;multiline=1;wrap=1;z=14};
 edFile2={cls="richedit";left=8;top=213;right=288;bottom=269;border=1;disabled=1;edge=1;multiline=1;wrap=1;z=22};
 edit={cls="edit";left=294;top=19;right=596;bottom=401;autovscroll=false;edge=1;multiline=1;vscroll=1;z=5};
@@ -228,6 +229,10 @@ mainForm.btnOpenFlashdrv.oncommand = function(id,event){
 	::PostThreadMessage(thrdId,104,0,0)//自定义消息-打开flashdriver
 }
 
+mainForm.btnDiag.oncommand = function(id,event){
+	
+}
+
 thrdHandle,thrdId = thread.create( CanThread )