From 7f9c6c273311d8c8b23d6d50d96018d9a44017d6 Mon Sep 17 00:00:00 2001
From: zcy <290198252@qq.com>
Date: Thu, 3 Mar 2022 23:22:08 +0800
Subject: [PATCH] no message
---
examples/proto_debuger/new_monitor_form.cpp | 4 +-
examples/proto_debuger/proto_debuger.vcxproj | 2 +
.../proto_debuger.vcxproj.filters | 12 +++++
examples/proto_debuger/tcp_client_form.h | 1 -
examples/proto_debuger/tcp_server_form.cpp | 1 -
examples/proto_debuger/uart_script.lua | 40 +--------------
examples/proto_debuger/websocket_client.cpp | 2 -
.../proto_debuger/websocket_client_form.cpp | 29 +++++++++++
.../proto_debuger/websocket_client_form.h | 49 +++++++++++++++++++
9 files changed, 96 insertions(+), 44 deletions(-)
create mode 100644 examples/proto_debuger/websocket_client_form.cpp
create mode 100644 examples/proto_debuger/websocket_client_form.h
diff --git a/examples/proto_debuger/new_monitor_form.cpp b/examples/proto_debuger/new_monitor_form.cpp
index f040a0ea..76ee4b49 100644
--- a/examples/proto_debuger/new_monitor_form.cpp
+++ b/examples/proto_debuger/new_monitor_form.cpp
@@ -348,7 +348,9 @@ void NewMonitorForm::InitWindow()
}
}
if ((text == L"tcp client")|| (text == L"tcp server") ||
- (text == L"udp") || (text == L"udp group")) {
+ (text == L"udp") || (text == L"udp group") || (text == L"websocket server")
+ || (text == L"websocket client")
+ ) {
this->m_ip_config_vbox->SetVisible(true);
this->m_uart_config_vbox->SetVisible(false);
diff --git a/examples/proto_debuger/proto_debuger.vcxproj b/examples/proto_debuger/proto_debuger.vcxproj
index 824413c1..68f51845 100644
--- a/examples/proto_debuger/proto_debuger.vcxproj
+++ b/examples/proto_debuger/proto_debuger.vcxproj
@@ -180,6 +180,7 @@
+
@@ -200,6 +201,7 @@
+
diff --git a/examples/proto_debuger/proto_debuger.vcxproj.filters b/examples/proto_debuger/proto_debuger.vcxproj.filters
index 5413025b..b9c7244a 100644
--- a/examples/proto_debuger/proto_debuger.vcxproj.filters
+++ b/examples/proto_debuger/proto_debuger.vcxproj.filters
@@ -66,6 +66,12 @@
源文件
+
+ 源文件
+
+
+ 源文件
+
@@ -119,6 +125,12 @@
头文件
+
+ 头文件
+
+
+ 头文件
+
diff --git a/examples/proto_debuger/tcp_client_form.h b/examples/proto_debuger/tcp_client_form.h
index d11aadce..c15509ca 100644
--- a/examples/proto_debuger/tcp_client_form.h
+++ b/examples/proto_debuger/tcp_client_form.h
@@ -26,7 +26,6 @@ class TcpClientForm :
public ui::ChildBox,
public TcpClientLibevent::TcpClientObserver,
public LuaBindInterface {
-
public:
TcpClientForm(ui::Window* hwnd,string url, uint32_t port, TcpClientLibevent* p);
~TcpClientForm();
diff --git a/examples/proto_debuger/tcp_server_form.cpp b/examples/proto_debuger/tcp_server_form.cpp
index 80773b5d..2bb99211 100644
--- a/examples/proto_debuger/tcp_server_form.cpp
+++ b/examples/proto_debuger/tcp_server_form.cpp
@@ -18,7 +18,6 @@ TcpServerFrom::~TcpServerFrom() {
}
-
TcpServerFrom::TcpServerFrom(ui::Window* hwnd, string url,
uint32_t port, TcpServerLibevent* p):
mLua(nullptr)
diff --git a/examples/proto_debuger/uart_script.lua b/examples/proto_debuger/uart_script.lua
index c081eb47..930ca7b2 100644
--- a/examples/proto_debuger/uart_script.lua
+++ b/examples/proto_debuger/uart_script.lua
@@ -1,39 +1 @@
-require("string")
-local file = io.open("writetest.txt", "w+")
-
-function OnUartData(data)
- if nil == file then
- print("open file writetest.txt fail")
- end
- file:write("OnUartData from lua " .. data)
- file:flush()
- showdata("OnUartData from lua " .. data)
-end
-
--- function OnNetworkData(addr,data,len)
--- print(addr,data,len)
--- print(len)
--- print(data)
--- -- showbuffer("recv network data: " .. data .. "\r\n")
--- end
-
--- function OnUdpData(addr,data,len)
--- print(addr,data,len)
--- -- showbuffer("recv data: ",data,"\r\n")
--- end
-
-
-
--- function OnNewClient(addr,port,sock)
--- print(addr,port,sock)
--- -- showbuffer("tcp connected: "
--- -- ..addr.."\r\n"..port.."\r\n"..sock.."\r\n")
--- end
-
-
--- function OnClientLeave(addr,port,sock)
--- print(addr,port,sock)
--- -- showbuffer("tcp close: "
--- -- ..addr.."\r\n"..port.."\r\n"..sock.."\r\n")
--- end
-
+require("string")
local file = io.open("writetest.txt", "w+")
function OnUartData(data)
if nil == file then
print("open file writetest.txt fail")
end
file:write("OnUartData from lua " .. data)
file:flush()
showdata("dfasdfsddfasda" .. data)
end
-- function OnNetworkData(addr,data,len)
-- print(addr,data,len)
-- print(len)
-- print(data)
-- -- showbuffer("recv network data: " .. data .. "\r\n")
-- end
-- function OnUdpData(addr,data,len)
-- print(addr,data,len)
-- -- showbuffer("recv data: ",data,"\r\n")
-- end
-- function OnNewClient(addr,port,sock)
-- print(addr,port,sock)
-- -- showbuffer("tcp connected: "
-- -- ..addr.."\r\n"..port.."\r\n"..sock.."\r\n")
-- end
-- function OnClientLeave(addr,port,sock)
-- print(addr,port,sock)
-- -- showbuffer("tcp close: "
-- -- ..addr.."\r\n"..port.."\r\n"..sock.."\r\n")
-- end
\ No newline at end of file
diff --git a/examples/proto_debuger/websocket_client.cpp b/examples/proto_debuger/websocket_client.cpp
index 90c5807c..27977c2a 100644
--- a/examples/proto_debuger/websocket_client.cpp
+++ b/examples/proto_debuger/websocket_client.cpp
@@ -19,8 +19,6 @@ void on_message(client* c, websocketpp::connection_hdl hdl, message_ptr msg) {
std::cout << "on_message called with hdl: " << hdl.lock().get()
<< " and message: " << msg->get_payload()
<< std::endl;
-
-
websocketpp::lib::error_code ec;
c->send(hdl, msg->get_payload(), msg->get_opcode(), ec);
diff --git a/examples/proto_debuger/websocket_client_form.cpp b/examples/proto_debuger/websocket_client_form.cpp
new file mode 100644
index 00000000..d30ad9df
--- /dev/null
+++ b/examples/proto_debuger/websocket_client_form.cpp
@@ -0,0 +1,29 @@
+#include "websocket_client_form.h"
+
+WebsocketClientForm::WebsocketClientForm(ui::Window* hwnd, string url, uint32_t port, TcpClientLibevent* p)
+{
+}
+
+WebsocketClientForm::~WebsocketClientForm()
+{
+}
+
+void WebsocketClientForm::Init()
+{
+ ui::ChildBox::Init();
+ m_label_1 = dynamic_cast(FindSubControl(L"uart_info_label"));
+ m_rich_edit_1 = dynamic_cast(FindSubControl(L"uart_recv_eidt"));
+ m_rich_edit_2 = dynamic_cast(FindSubControl(L"lua_script"));
+ m_uart_send_edit = dynamic_cast(FindSubControl(L"uart_send_edit"));
+ m_btn_send_data = dynamic_cast(FindSubControl(L"btn_send_data"));
+ m_check_box_2 = dynamic_cast(FindSubControl(L"check_time_send"));
+ m_check_box_3 = dynamic_cast(FindSubControl(L"check_hex_send"));
+ m_check_box_4 = dynamic_cast(FindSubControl(L"check_hex_recv"));
+ m_btn_save_lua = dynamic_cast(FindSubControl(L"btn_save_lua"));
+ m_btn_close_form = dynamic_cast(FindSubControl(L"btn_close_uart"));
+}
+
+LuaDelegate* WebsocketClientForm::LuaVM()
+{
+ return nullptr;
+}
diff --git a/examples/proto_debuger/websocket_client_form.h b/examples/proto_debuger/websocket_client_form.h
new file mode 100644
index 00000000..249b8203
--- /dev/null
+++ b/examples/proto_debuger/websocket_client_form.h
@@ -0,0 +1,49 @@
+#pragma once
+#include
+#include "msgdef.h"
+#include
+#include
+#include
+#include
+#include "base/base.h"
+#include "serial_port.h"
+#include "duilib/UIlib.h"
+#include "tcp_client.h"
+#include "lua_wraper.h"
+#include "global.h"
+#include
+#include "udp_libevent.h"
+#include
+
+class WebsocketClientForm :
+ public ui::ChildBox,
+ LuaBindInterface
+{
+public:
+ WebsocketClientForm(ui::Window* hwnd, string url, uint32_t port, TcpClientLibevent* p);
+ ~WebsocketClientForm();
+ virtual void Init() override;
+
+
+
+ LuaDelegate* LuaVM();
+
+private:
+ ui::Label* m_label_1;
+ ui::RichEdit* m_rich_edit_1;
+ ui::RichEdit* m_rich_edit_2;
+ ui::RichEdit* m_uart_send_edit;
+ ui::Button* m_btn_send_data;
+ ui::Button* m_btn_save_lua;
+ ui::Button* m_btn_close_form;
+ ui::CheckBox* m_check_box_1;
+ ui::CheckBox* m_check_box_2;
+ ui::CheckBox* m_check_box_3;
+ ui::CheckBox* m_check_box_4;
+ TcpClientLibevent* mClient;
+ std::fstream mLuaFileRead;
+ std::ofstream mLuaFileEdit;
+
+
+};
+