no message
This commit is contained in:
parent
253dc96394
commit
8a1cc7a1c8
@ -35,7 +35,7 @@ int gTcpServerCnt = 0;
|
|||||||
int gTcpClientCnt = 0;
|
int gTcpClientCnt = 0;
|
||||||
LRESULT BasicForm::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
|
LRESULT BasicForm::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
wprintf(L"recv message 0x%x\r\n", uMsg);
|
//wprintf(L"recv message 0x%x\r\n", uMsg);
|
||||||
|
|
||||||
if (uMsg == WM_ADD_UART_CLOSE) {
|
if (uMsg == WM_ADD_UART_CLOSE) {
|
||||||
wprintf(L"close %s\r\n", ((wstring*)wParam)->c_str());
|
wprintf(L"close %s\r\n", ((wstring*)wParam)->c_str());
|
||||||
|
@ -88,6 +88,7 @@ void MainThread::Init()
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
auto dpiManager = ui::DpiManager::GetInstance();
|
auto dpiManager = ui::DpiManager::GetInstance();
|
||||||
|
dpiManager->SetAdaptDPI();
|
||||||
// 创建一个默认带有阴影的居中窗口
|
// 创建一个默认带有阴影的居中窗口
|
||||||
BasicForm* window = new BasicForm();
|
BasicForm* window = new BasicForm();
|
||||||
|
|
||||||
|
@ -17,13 +17,14 @@ TcpServerFrom::TcpServerFrom(ui::Window* hwnd, string url, uint32_t port, TcpSer
|
|||||||
m_server = p;
|
m_server = p;
|
||||||
m_url = url;
|
m_url = url;
|
||||||
m_port = port;
|
m_port = port;
|
||||||
|
mFlagSelectClient = true;
|
||||||
|
|
||||||
|
|
||||||
TcpServerLibevent::OnAccept handler = std::bind(&TcpServerFrom::OnNewConnAccept, this,std::placeholders::_1 );
|
TcpServerLibevent::OnAccept handler = std::bind(&TcpServerFrom::OnNewConnAccept, this,std::placeholders::_1 );
|
||||||
m_server->SetNewConnectionHandle(handler);
|
m_server->SetNewConnectionHandle(handler);
|
||||||
TcpServerLibevent::OnDisconnect handler2 = std::bind(&TcpServerFrom::OnDisConnected,
|
TcpServerLibevent::OnDisconnect handler2 = std::bind(&TcpServerFrom::OnDisConnected,
|
||||||
this, std::placeholders::_1);
|
this, std::placeholders::_1);
|
||||||
m_server->SetConnectionLeaveHandle(handler2);
|
m_server->SetConnectionLeaveHandle(handler2);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -50,11 +51,25 @@ void TcpServerFrom::Init()
|
|||||||
m_combo_1 = dynamic_cast<ui::Combo*>(FindSubControl(L"clients"));
|
m_combo_1 = dynamic_cast<ui::Combo*>(FindSubControl(L"clients"));
|
||||||
m_button_3 = dynamic_cast<ui::Button*>(FindSubControl(L"btn_do_lua"));
|
m_button_3 = dynamic_cast<ui::Button*>(FindSubControl(L"btn_do_lua"));
|
||||||
|
|
||||||
|
|
||||||
|
m_button_3->AttachClick([this](ui::EventArgs*ev) {
|
||||||
|
std::cout <<"m_button_3 " << wstring2string(this->m_combo_1->GetText())<<std::endl;
|
||||||
|
return true;
|
||||||
|
});
|
||||||
wchar_t p[200] = L"";
|
wchar_t p[200] = L"";
|
||||||
wsprintf(p,L"监听地址: %s 端口: %d 在线连接数目: %d",string2wstring(m_url).c_str(),
|
wsprintf(p,L"监听地址: %s 端口: %d 在线连接数目: %d",string2wstring(m_url).c_str(),
|
||||||
m_port,
|
m_port,
|
||||||
m_server->ConnectionCount());
|
m_server->ConnectionCount());
|
||||||
m_label_1->SetText(p);
|
m_label_1->SetText(p);
|
||||||
|
|
||||||
|
auto element = new ui::ListContainerElement;
|
||||||
|
element->SetClass(L"listitem");
|
||||||
|
element->SetFixedHeight(30);
|
||||||
|
element->SetBkColor(L"white");
|
||||||
|
element->SetTextPadding({ 6,0,6,0 });
|
||||||
|
element->SetText(L"È«²¿Á¬½Ó");
|
||||||
|
m_combo_1->Add(element);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void TcpServerFrom::OnNewConnAccept(ConnectionLibevent* p)
|
void TcpServerFrom::OnNewConnAccept(ConnectionLibevent* p)
|
||||||
@ -68,6 +83,8 @@ void TcpServerFrom::Init()
|
|||||||
element->SetBkColor(L"white");
|
element->SetBkColor(L"white");
|
||||||
element->SetTextPadding({ 6,0,6,0 });
|
element->SetTextPadding({ 6,0,6,0 });
|
||||||
element->SetText(std::to_wstring(p->SocketFd()));
|
element->SetText(std::to_wstring(p->SocketFd()));
|
||||||
|
mClients[p->SocketFd()] = p;
|
||||||
|
|
||||||
m_combo_1->Add(element);
|
m_combo_1->Add(element);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -75,8 +92,8 @@ void TcpServerFrom::Init()
|
|||||||
void TcpServerFrom::OnDisConnected(ConnectionLibevent* cli)
|
void TcpServerFrom::OnDisConnected(ConnectionLibevent* cli)
|
||||||
{
|
{
|
||||||
std::cout << "TcpServerFrom Disconnected" << cli->IpAddress() << " fd " << cli->SocketFd() << std::endl;
|
std::cout << "TcpServerFrom Disconnected" << cli->IpAddress() << " fd " << cli->SocketFd() << std::endl;
|
||||||
|
|
||||||
updateStatus();
|
updateStatus();
|
||||||
|
mClients.erase(cli->SocketFd());
|
||||||
}
|
}
|
||||||
|
|
||||||
void TcpServerFrom::updateStatus()
|
void TcpServerFrom::updateStatus()
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
// duilib
|
// duilib
|
||||||
#include "duilib/UIlib.h"
|
#include "duilib/UIlib.h"
|
||||||
#include "tcp_server_libevent.h"
|
#include "tcp_server_libevent.h"
|
||||||
|
#include <map>
|
||||||
|
|
||||||
|
|
||||||
class TcpServerFrom :
|
class TcpServerFrom :
|
||||||
@ -23,7 +23,6 @@ protected:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
void updateStatus();
|
void updateStatus();
|
||||||
|
|
||||||
TcpServerLibevent* m_server;
|
TcpServerLibevent* m_server;
|
||||||
std::string m_url;
|
std::string m_url;
|
||||||
uint32_t m_port;
|
uint32_t m_port;
|
||||||
@ -41,6 +40,8 @@ private:
|
|||||||
ui::Label* m_label_2;
|
ui::Label* m_label_2;
|
||||||
ui::Combo* m_combo_1;
|
ui::Combo* m_combo_1;
|
||||||
ui::Button* m_button_3;
|
ui::Button* m_button_3;
|
||||||
|
std::map<uint32_t, ConnectionLibevent*> mClients;
|
||||||
|
bool mFlagSelectClient;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#include "uart_process.h"
|
#include "uart_process.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "msgdef.h"
|
#include "msgdef.h"
|
||||||
|
#include "utils.h"
|
||||||
|
|
||||||
UartForm::UartForm(ui::Window* hwnd,std::wstring name,
|
UartForm::UartForm(ui::Window* hwnd,std::wstring name,
|
||||||
uint32_t baurate,
|
uint32_t baurate,
|
||||||
|
@ -31,6 +31,13 @@ std::string wstring2string(std::wstring wstr)
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int32_t wstring2int32(std::wstring wstr)
|
||||||
|
{
|
||||||
|
auto str = wstring2string(wstr);
|
||||||
|
int ret = atoi(str.c_str());
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
std::string GenerateGuid()
|
std::string GenerateGuid()
|
||||||
|
@ -6,5 +6,7 @@
|
|||||||
std::wstring string2wstring(std::string str);
|
std::wstring string2wstring(std::string str);
|
||||||
std::string wstring2string(std::wstring wstr);
|
std::string wstring2string(std::wstring wstr);
|
||||||
|
|
||||||
|
int32_t wstring2int32(std::wstring );
|
||||||
|
|
||||||
|
|
||||||
std::string GenerateGuid();
|
std::string GenerateGuid();
|
||||||
|
Loading…
Reference in New Issue
Block a user