From a8e4de2236e476636d755f1ac5663a2d10285b7b Mon Sep 17 00:00:00 2001
From: zcy <290198252@qq.com>
Date: Thu, 3 Feb 2022 11:35:14 +0800
Subject: [PATCH] no message

---
 examples/proto_debuger/uart_form.cpp          | 20 +++++++++++++++++++
 .../themes/default/basic/newmonitor.xml       |  6 +++---
 .../themes/default/basic/tcp_form.xml         |  6 ------
 .../themes/default/basic/tcp_server_form.xml  |  6 ------
 .../themes/default/basic/uart_form.xml        |  1 +
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/examples/proto_debuger/uart_form.cpp b/examples/proto_debuger/uart_form.cpp
index e86bad73..44141370 100644
--- a/examples/proto_debuger/uart_form.cpp
+++ b/examples/proto_debuger/uart_form.cpp
@@ -135,6 +135,26 @@ void UartForm::Init()
 			return true;
 		});
 	}
+	auto mBtnSaveLua = static_cast<ui::Button*>(FindSubControl(L"btn_save_lua"));
+	if (nullptr != mBtnSaveLua) {
+		mBtnSaveLua->AttachClick([this](ui::EventArgs*) {
+			std::cout << "±£´ælua½Å±¾\r\n";
+			std::string lua = wstring2string(mEditLua->GetText());
+			if (0 == this->mLua->UpdateScript(lua)) {
+				this->mLuaScript = lua;
+				mLuaFileEdit = std::ofstream(UART_LUA_SCRIPT, std::ios::out | std::ios::trunc);
+				mLuaFileEdit.write(lua.c_str(), lua.size());
+				mLuaFileEdit.flush();
+				mLuaFileEdit.close();
+			}
+			else {
+				MessageBox(0, L"lua½Å±¾´íÎó", L"", 0);
+				return true;
+			}
+			std::cout << lua.c_str() << "\r\n";
+			return true;
+		});
+	}
 
 	auto mBtnClose = static_cast<ui::Button*>(FindSubControl(L"btn_close_uart"));
 	if (mBtnClose != nullptr) {
diff --git a/examples/x64/Debug/resources/themes/default/basic/newmonitor.xml b/examples/x64/Debug/resources/themes/default/basic/newmonitor.xml
index d4686e6b..bab9267a 100644
--- a/examples/x64/Debug/resources/themes/default/basic/newmonitor.xml
+++ b/examples/x64/Debug/resources/themes/default/basic/newmonitor.xml
@@ -7,18 +7,18 @@
     </HBox>
     <HBox width="stretch" height="35" margin="10,10,10,10">
       <Label name="title" text="类型:" valign="bottom" margin="30,0,0,0" width="60" height="30" font="arial_14"/>
-      <Combo class="list" name="combo_type" height="30" width="80" bkimage="file='../public/combo/normal.png' corner='5,5,30,5'"/>
+      <Combo class="list" name="combo_type" height="30" width="120" bkimage="file='../public/combo/normal.png' corner='5,5,30,5'"/>
       <Control width="stretch"/>
     </HBox>
     <VBox bkcolor="bk_wnd_darkcolor" height="100" visible="false" name="uart_config">
       <HBox width="stretch" height="35" margin="10,10,10,10">
         <Label name="title" text="串�:" valign="bottom" margin="30,0,0,0" width="60" height="30" font="arial_14"/>
-        <Combo class="list" name="uart_type" height="30" width="80" bkimage="file='../public/combo/normal.png' corner='5,5,30,5'"/>
+        <Combo class="list" name="uart_type" height="30" width="120" bkimage="file='../public/combo/normal.png' corner='5,5,30,5'"/>
         <Control width="stretch"/>
       </HBox>
       <HBox width="stretch" height="35" margin="10,10,10,10">
         <Label name="title" text="波特率:" valign="bottom" margin="30,0,0,0" width="60" height="30" font="arial_14"/>
-        <Combo class="list" name="uart_baurate_select" height="30" width="80" bkimage="file='../public/combo/normal.png' corner='5,5,30,5'"/>
+        <Combo class="list" name="uart_baurate_select" height="30" width="120" bkimage="file='../public/combo/normal.png' corner='5,5,30,5'"/>
         <Control width="stretch"/>
       </HBox>
     </VBox>
diff --git a/examples/x64/Debug/resources/themes/default/basic/tcp_form.xml b/examples/x64/Debug/resources/themes/default/basic/tcp_form.xml
index 0163391c..753eed1c 100644
--- a/examples/x64/Debug/resources/themes/default/basic/tcp_form.xml
+++ b/examples/x64/Debug/resources/themes/default/basic/tcp_form.xml
@@ -16,12 +16,6 @@
         <RichEdit class="simple input" width="stretch" name="uart_send_edit" height="30" margin="5,5,5,5" padding="6,6,6" />
         <HBox height="40">
             <Button class="btn_global_blue_80x30" name="btn_send_data" width="100" text="��" bkcolor="lightcolor" margin="25,3,5,3" />
-            <CheckBox class="checkbox_font12" name="check_new_line" text="��新行" margin="10,12,0,0" selected="true"/>
-            <CheckBox class="checkbox_font12" name="check_time_send" text="定时��" margin="10,12,0,0" selected="true"/>
-          <RichEdit class="simple input"  name="cycle_eidt" width="50"  margin="5,5,5,5" padding="6,6,6" />
-          <Label text="ms"  margin="5,5,5,5"  width="50" />
-          <CheckBox class="checkbox_font12" name="check_hex_send" text="hex显示" margin="10,12,0,0" selected="true"/>
-            <CheckBox class="checkbox_font12" name="check_hex_recv" text="hex接�" margin="10,12,0,0" selected="true"/>
             <Button class="btn_global_blue_80x30" name="btn_close_uart" width="100" text="关闭" bkcolor="lightcolor" margin="25,3,5,3" />
             <Button class="btn_global_blue_80x30" name="btn_save_lua" width="100" text="�存lua脚本" bkcolor="lightcolor" margin="25,3,5,3" />
 
diff --git a/examples/x64/Debug/resources/themes/default/basic/tcp_server_form.xml b/examples/x64/Debug/resources/themes/default/basic/tcp_server_form.xml
index 67e4d964..97106684 100644
--- a/examples/x64/Debug/resources/themes/default/basic/tcp_server_form.xml
+++ b/examples/x64/Debug/resources/themes/default/basic/tcp_server_form.xml
@@ -17,12 +17,6 @@
         <RichEdit class="simple input" width="stretch" name="server_send_edit" height="30" margin="5,5,5,5" padding="6,6,6" />
         <HBox height="40">
             <Button class="btn_global_blue_80x30" name="btn_send_data" width="100" text="��" bkcolor="lightcolor" margin="25,3,5,3" />
-            <CheckBox class="checkbox_font12" name="check_new_line" text="��新行" margin="10,12,0,0" selected="true"/>
-            <CheckBox class="checkbox_font12" name="check_time_send" text="定时��" margin="10,12,0,0" selected="true"/>
-          <RichEdit class="simple input"  name="cycle_eidt" width="50"  margin="5,5,5,5" padding="6,6,6" />
-          <Label text="ms"  margin="5,5,5,5"  width="50" />
-          <CheckBox class="checkbox_font12" name="check_hex_send" text="hex显示" margin="10,12,0,0" selected="true"/>
-          <CheckBox class="checkbox_font12" name="check_hex_recv" text="hex接�" margin="10,12,0,0" selected="true"/>
           <Button class="btn_global_blue_80x30" name="btn_close_uart" width="100" text="关闭" bkcolor="lightcolor" margin="25,3,5,3" />
           <Label name="title" text="客户端:" width="60"  valign="bottom" margin="0,0,0,0"  height="30" font="arial_14"/>
           <Combo class="list" name="clients" width="100" height="30" bkimage="file='../public/combo/normal.png' corner='5,5,30,5'"/>
diff --git a/examples/x64/Debug/resources/themes/default/basic/uart_form.xml b/examples/x64/Debug/resources/themes/default/basic/uart_form.xml
index b54e2c4c..8db19dcf 100644
--- a/examples/x64/Debug/resources/themes/default/basic/uart_form.xml
+++ b/examples/x64/Debug/resources/themes/default/basic/uart_form.xml
@@ -22,6 +22,7 @@
             <CheckBox class="checkbox_font12" name="check_hex_send" text="hex显示" margin="10,12,0,0" selected="true"/>
             <CheckBox class="checkbox_font12" name="check_hex_recv" text="hex接�" margin="10,12,0,0" selected="true"/>
             <Button class="btn_global_blue_80x30" name="btn_close_uart" width="100" text="关闭" bkcolor="lightcolor" margin="25,3,5,3" />
+            <Button class="btn_global_blue_80x30" name="btn_save_lua" width="100" text="�存lua脚本" bkcolor="lightcolor" margin="25,3,5,3" />
         </HBox>
     </VBox>
 </ChildBox>