1

zhipuzi_pos_windows/page/CSettingPageUI.h

@@ -37,10 +37,17 @@ public:
 private:
 	void SwitchSettingPage(std::wstring page_name);
 
+	//从数据库读取红色边框存储的矩形位置，保存到m_videoBorderRect中
 	void LoadVideoBorderRect();
+
+	//保存当前红色边框矩形位置到数据库中
 	void SaveVideoBorderRect();
+
+	//获取视频图像的显示矩形
 	RECT GetVideoImageRect();
+
 	RECT GetVideoBorderDisplayRect(const RECT& imageRect);
+
 	int HitTestVideoBorder(POINT pt, const RECT& borderRect);
 	bool HandleVideoBorderMouseMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
 

zhipuzi_pos_windows/tool/CAppEnv.cpp

@@ -94,6 +94,12 @@ void CAppEnv::DelWorkerNum()
 {
 	std::lock_guard<std::mutex> lock(m_mutex);
 	m_worker_count--;
+
+	if (m_worker_count == 0)
+	{
+		//最后一个线程退出了，看看是哪个线程这么慢
+		CLewaimaiLog::OutputDebugMessage(L"最后一个线程退出了，剩余线程数：" + std::to_wstring(m_worker_count));
+	}
 }
 
 void CAppEnv::AsyncInit()

zhipuzi_pos_windows/worker/CMqttClientWorker.cpp

@@ -20,11 +20,13 @@ CMqttClientWorker::CMqttClientWorker()
 
 CMqttClientWorker::~CMqttClientWorker()
 {
-
+	m_is_closing = true;
+	m_async_client.reset();
 }
 
 void CMqttClientWorker::Start()
 {
+	m_is_closing = false;
 	m_is_running = true;
 
 	//处理Mqtt消息接收
@@ -34,13 +36,14 @@ void CMqttClientWorker::Start()
 
 void CMqttClientWorker::Stop()
 {
+	m_is_closing = true;
 	m_is_running = false;
 }
 
 void CMqttClientWorker::Run()
 {
 	m_client_id = "GID_ZHIPUZI_WINDOWS_POS@@@" + CSetting::GetInstance()->getUsername();
-	m_async_client = new mqtt::async_client(m_server_address, m_client_id);
+	 m_async_client = std::make_shared<mqtt::async_client>(m_server_address, m_client_id);
 
 	// A subscriber often wants the server to remember its messages when its
 	// disconnected. In that case, it needs a unique ClientID and a
@@ -78,22 +81,34 @@ void CMqttClientWorker::Run()
 		Sleep(100);
 	}
 
-	//代码走到这里，说明退出登录了，要暂停推送了
+	//准备退出，禁止回调里继续重连/处理
+	m_is_closing = true;
 
 	try
 	{
 		LOG_INFO("Disconnecting from the MQTT server...");
-		m_async_client->disconnect()->wait();
-		LOG_INFO("OK...");
+		auto client = m_async_client;
+		if (client)
+		{
+			auto tok = client->disconnect();
+			if (!tok->wait_for(std::chrono::seconds(2)))
+			{
+				LOG_INFO("MQTT disconnect timeout, wait for pending callbacks to finish.");
+			}
+			else
+			{
+				LOG_INFO("OK...");
+			}
+		}
 	}
-	catch (const mqtt::exception & exc)
+	catch (const mqtt::exception& exc)
 	{
 		LOG_INFO(("disconnect error, exc:" + exc.get_message()).c_str());
 		CLewaimaiLog::OutputDebugMessage(("disconnect error, exc:" + exc.get_message()).c_str());
 	}
 
-	//销毁客户端
-	delete m_async_client;
+	//不要 delete，改成释放智能指针
+	m_async_client.reset();
 
 	CAppEnv::GetInstance()->DelWorkerNum();
 
@@ -102,8 +117,19 @@ void CMqttClientWorker::Run()
 
 void CMqttClientWorker::reconnect()
 {
+	if (m_is_closing)
+		return;
+
+	auto client = m_async_client;
+	if (!client)
+		return;
+
 	//暂停10秒后重连
 	std::this_thread::sleep_for(std::chrono::milliseconds(10000));
+
+	if (m_is_closing)
+		return;
+
 	try
 	{
 		m_async_client->connect(m_connOpts, nullptr, *this);
@@ -120,6 +146,9 @@ void CMqttClientWorker::reconnect()
 // Re-connection failure
 void CMqttClientWorker::on_failure(const mqtt::token & tok)
 {
+	if (m_is_closing)
+		return;
+
 	if (m_is_mqtt_connected == false)
 	{
 		//连接失败了
@@ -146,6 +175,9 @@ void CMqttClientWorker::on_failure(const mqtt::token & tok)
 
 void CMqttClientWorker::on_success(const mqtt::token & tok)
 {
+	if (m_is_closing)
+		return;
+
 	if (m_is_mqtt_connected == false)
 	{
 		//连接成功了，再connected里面处理
@@ -170,17 +202,27 @@ void CMqttClientWorker::on_success(const mqtt::token & tok)
 
 void CMqttClientWorker::connected(const std::string & cause)
 {
+	if (m_is_closing)
+		return;
+
 	m_is_mqtt_connected = true;
 
 	std::string info = "Connection success, nSubscribing to topic " + m_topic + " for client " + m_client_id + " using QoS" + std::to_string(MQTT_QOS);
 	LOG_INFO(info.c_str());
 
 	//不管是第一次连接，还是重连，都订阅一次
-	m_async_client->subscribe(m_topic, MQTT_QOS, nullptr, *this);
+	auto client = m_async_client;
+	if (client)
+	{
+		client->subscribe(m_topic, MQTT_QOS, nullptr, *this);
+	}
 }
 
 void CMqttClientWorker::connection_lost(const std::string & cause)
 {
+	if (m_is_closing)
+		return;
+
 	m_is_mqtt_connected = false;
 
 	std::string info = "Connection lost";
@@ -200,6 +242,9 @@ void CMqttClientWorker::connection_lost(const std::string & cause)
 // Callback for when a message arrives.
 void CMqttClientWorker::message_arrived(mqtt::const_message_ptr msg)
 {
+	if (m_is_closing)
+		return;
+
 	std::string info = "Message arrived, ttopic: '" + msg->get_topic() + "', payload: '" + msg->to_string();
 
 	LOG_INFO(info.c_str());

zhipuzi_pos_windows/worker/CMqttClientWorker.h

@@ -30,8 +30,8 @@ private:
     // Counter for the number of connection retries
     int nretry_ = 0;
 
-    // The MQTT client
-    mqtt::async_client * m_async_client;
+	// The MQTT client
+	std::shared_ptr<mqtt::async_client> m_async_client;
 
     // Options to use if we need to reconnect
     mqtt::connect_options m_connOpts;
@@ -41,6 +41,9 @@ private:
     //工作状态
     bool m_is_running = false;
 
+	//正在退出/关闭，禁止重连和回调继续处理
+	std::atomic_bool m_is_closing{ false };
+
     HWND m_hwnd;
 
 public:

zhipuzi_pos_windows/worker/CPosPrinterWorker.cpp

@@ -21,15 +21,12 @@ void CPosPrinterWorker::Start()
 
 	//处理收银打印
 	std::thread(&CPosPrinterWorker::HandleShouyinPrinter, this).detach();
-	CAppEnv::GetInstance()->AddWorkerNum();
 
 	//处理标签打印
 	std::thread(&CPosPrinterWorker::HandleBiaoqianPrinter, this).detach();
-	CAppEnv::GetInstance()->AddWorkerNum();
 
 	//处理厨房打印
 	std::thread(&CPosPrinterWorker::HandleChufangPrinter, this).detach();
-	CAppEnv::GetInstance()->AddWorkerNum();
 }
 
 void CPosPrinterWorker::Stop()
@@ -86,8 +83,6 @@ void CPosPrinterWorker::HandleShouyinPrinter()
 
 		SendDataToShouyinPirnter(data);
 	}
-
-	CAppEnv::GetInstance()->DelWorkerNum();
 }
 
 void CPosPrinterWorker::HandleBiaoqianPrinter()
@@ -112,8 +107,6 @@ void CPosPrinterWorker::HandleBiaoqianPrinter()
 
 		SendDataToBiaoqianPirnter(data);
 	}
-
-	CAppEnv::GetInstance()->DelWorkerNum();
 }
 
 void CPosPrinterWorker::HandleChufangPrinter()
@@ -138,8 +131,6 @@ void CPosPrinterWorker::HandleChufangPrinter()
 
 		SendDataToChufangPirnter(chufang_data);
 	}
-
-	CAppEnv::GetInstance()->DelWorkerNum();
 }
 
 void CPosPrinterWorker::SendDataToShouyinPirnter(std::string data)