Browse Source

消息改为异步

张洋 1 month ago
parent
commit
4fd890a95d
34 changed files with 735 additions and 678 deletions
  1. 52 32
      zhipuzi_pos_windows/ai/YoloFeatureManager.cpp
  2. 25 25
      zhipuzi_pos_windows/page/CBaobiaoPageUI.cpp
  3. 21 21
      zhipuzi_pos_windows/page/CDianneiOrderListPageUI.cpp
  4. 25 25
      zhipuzi_pos_windows/page/CJiaobanPageUI.cpp
  5. BIN
      zhipuzi_pos_windows/page/CSettingPageUI.cpp
  6. 81 81
      zhipuzi_pos_windows/page/CShangpinCreatePageUI.cpp
  7. 81 81
      zhipuzi_pos_windows/page/CShangpinUpdatePageUI.cpp
  8. 21 21
      zhipuzi_pos_windows/page/CShoukuanOrderListPageUI.cpp
  9. 35 35
      zhipuzi_pos_windows/page/CWaimaiOrderListPageUI.cpp
  10. 21 21
      zhipuzi_pos_windows/page/CZhengcanOrderListPageUI.cpp
  11. 37 0
      zhipuzi_pos_windows/tool/CAppEnv.cpp
  12. 22 22
      zhipuzi_pos_windows/wnd/CFulikaShoukuanWnd.cpp
  13. 14 14
      zhipuzi_pos_windows/wnd/CHuiyuanBangkaWnd.cpp
  14. 30 30
      zhipuzi_pos_windows/wnd/CHuiyuanChongzhiWnd.cpp
  15. 14 14
      zhipuzi_pos_windows/wnd/CHuiyuanShoukuanWnd.cpp
  16. 25 25
      zhipuzi_pos_windows/wnd/CHuiyuanXiugaimimaWnd.cpp
  17. 20 20
      zhipuzi_pos_windows/wnd/CHuiyuanXiugaiziliaoWnd.cpp
  18. 4 4
      zhipuzi_pos_windows/wnd/CMainWnd.cpp
  19. 8 8
      zhipuzi_pos_windows/wnd/CMemberLoginWnd.cpp
  20. 12 12
      zhipuzi_pos_windows/wnd/CSaomaCikaWnd.cpp
  21. 12 12
      zhipuzi_pos_windows/wnd/CSaomaQuanyikaWnd.cpp
  22. 12 12
      zhipuzi_pos_windows/wnd/CSaomaShangpinquanWnd.cpp
  23. 15 15
      zhipuzi_pos_windows/wnd/CSaomaYouhuiquanWnd.cpp
  24. 16 16
      zhipuzi_pos_windows/wnd/CShangpinNewTypeWnd.cpp
  25. 12 12
      zhipuzi_pos_windows/wnd/CShangpinSaomaluruWnd.cpp
  26. 11 11
      zhipuzi_pos_windows/wnd/CUpdateWnd.cpp
  27. 22 22
      zhipuzi_pos_windows/wnd/CWeixinzhifuShoukuanWnd.cpp
  28. 22 22
      zhipuzi_pos_windows/wnd/CXianjinShoukuanWnd.cpp
  29. 16 16
      zhipuzi_pos_windows/wnd/CZhengcanRenshuWnd.cpp
  30. 22 22
      zhipuzi_pos_windows/wnd/CZidingyiShoukuanWnd.cpp
  31. 2 2
      zhipuzi_pos_windows/worker/CChengzhongWorker.cpp
  32. 8 6
      zhipuzi_pos_windows/worker/CDiandanAIShibieWorker.cpp
  33. 10 10
      zhipuzi_pos_windows/worker/CVideoCaptureWorker.cpp
  34. 7 9
      zhipuzi_pos_windows/worker/CVoiceWorker.cpp

+ 52 - 32
zhipuzi_pos_windows/ai/YoloFeatureManager.cpp

@@ -281,53 +281,73 @@ void YoloFeatureManager::drawDetection(cv::Mat & img, const std::vector<cv::Rect
 
 std::string YoloFeatureManager::Class(cv::Mat & image)
 {
-	std::string className = "";
+	try
+	{
+		std::string className = "";
 
-	// ====================== 图像预处理 ======================
-		// 转换为blob格式:归一化(0-1)、通道转换(BGR->RGB)、调整尺寸
-	cv::Mat blob;
-	cv::dnn::blobFromImage(image, blob, 1.0 / 255.0, cv::Size(inputWidth, inputHeight), cv::Scalar(0, 0, 0), true, false);
-	net.setInput(blob);
+		// ====================== 图像预处理 ======================
+			// 转换为blob格式:归一化(0-1)、通道转换(BGR->RGB)、调整尺寸
+		cv::Mat blob;
+		cv::dnn::blobFromImage(image, blob, 1.0 / 255.0, cv::Size(inputWidth, inputHeight), cv::Scalar(0, 0, 0), true, false);
+		net.setInput(blob);
 
-	// ====================== 模型推理 ======================
-	cv::Mat output = net.forward(); // 输出形状:1x1000(对应ImageNet 1000类)
+		// ====================== 模型推理 ======================
+		cv::Mat output = net.forward(); // 输出形状:1x1000(对应ImageNet 1000类)
 
-	// ====================== 解析结果 ======================
-	int topClassIdx = this->getTopClass(output);
-	float topConfidence = output.at<float>(topClassIdx);
+		// ====================== 解析结果 ======================
+		int topClassIdx = this->getTopClass(output);
+		float topConfidence = output.at<float>(topClassIdx);
 
-	// 只显示置信度高于阈值的结果
-	if (topConfidence > 0.8)
-	{
-		className = this->getClassName(topClassIdx);
+		// 只显示置信度高于阈值的结果
+		if (topConfidence > 0.8)
+		{
+			className = this->getClassName(topClassIdx);
+		}
+		else
+		{
+			className = "Unknown";
+		}
+
+		// 在画面上绘制分类结果
+		//std::wstring resultText = CLewaimaiString::ANSIToUnicode(className) + L" : " + std::to_wstring(round(topConfidence * 10000) / 100) + L"%";
+		//this->drawChineseText(image, resultText.c_str(), cv::Point(20, 50), cv::Scalar(0, 255, 0), 24);
+		//cv::imshow("YOLOv8s-cls 实时图像分类", image);
+		//if (cv::waitKey(30) >= 0); // 按任意键退出
+
+		return className;
 	}
-	else
+	catch (const std::exception& e)
 	{
-		className = "Unknown";
+		std::string aa = std::string(e.what());
+		DEBUG_LOG(("YOLO分类失败: " + std::string(e.what())).c_str());
+		return {};
 	}
-
-	// 在画面上绘制分类结果
-	//std::wstring resultText = CLewaimaiString::ANSIToUnicode(className) + L" : " + std::to_wstring(round(topConfidence * 10000) / 100) + L"%";
-	//this->drawChineseText(image, resultText.c_str(), cv::Point(20, 50), cv::Scalar(0, 255, 0), 24);
-	//cv::imshow("YOLOv8s-cls 实时图像分类", image);
-	//if (cv::waitKey(30) >= 0); // 按任意键退出
-
-	return className;
+	
 }
 
 std::string YoloFeatureManager::ClassFromVideoCapture()
 {
-	cv::Mat image;
+	try
+	{
+		cv::Mat image;
 
-	CVideoCaptureWorker::GetInstance()->GetFrame(image);
+		CVideoCaptureWorker::GetInstance()->GetFrame(image);
 
-	if (image.empty())
+		if (image.empty())
+		{
+			DEBUG_LOG("从摄像头获取帧失败");
+			return "Unknown";
+		}
+
+		return Class(image);
+	}
+	catch (const std::exception& e)
 	{
-		DEBUG_LOG("从摄像头获取帧失败");
-		return "Unknown";
+		std::string aa = std::string(e.what());
+		DEBUG_LOG(("YOLO分类失败: " + std::string(e.what())).c_str());
+		return {};
 	}
-
-	return Class(image);
+	
 }
 
 void YoloFeatureManager::drawChineseText(cv::Mat & img, const wchar_t * text, cv::Point pos, cv::Scalar color, int fontSize)

+ 25 - 25
zhipuzi_pos_windows/page/CBaobiaoPageUI.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CBaobiaoPageUI.h"
 
 #include "../wnd/CHuiyuanChongzhiWnd.h"
@@ -14,7 +14,7 @@ CBaobiaoPageUI::~CBaobiaoPageUI()
 
 }
 
-//初始化当前页面的展示,处理默认展示效果,在页面被加载的时候调用
+//初始化当前页面的展示,处理默认展示效果,在页面被加载的时候调用
 void CBaobiaoPageUI::InitShow()
 {
 	time_t now = time(NULL);
@@ -27,7 +27,7 @@ void CBaobiaoPageUI::InitShow()
 	Refresh();
 }
 
-//处理按钮点击类事件
+//处理按钮点击类事件
 void CBaobiaoPageUI::HandleClickMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
@@ -50,19 +50,19 @@ void CBaobiaoPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 }
 
-//处理option切换事件
+//澶勭悊option鍒囨崲浜嬩欢
 void CBaobiaoPageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 {
 
 }
 
-//处理下拉框、radio的切换事件
+//处理下拉框、radio的切换事件
 void CBaobiaoPageUI::HandleItemSelectMsg(TNotifyUI& msg)
 {
 
 }
 
-//处理编辑框输入内容改变事件
+//处理编辑框输入内容改变事件
 void CBaobiaoPageUI::HandleTextChangedMsg(TNotifyUI& msg)
 {
 	DuiLib::CDuiString senderName = msg.pSender->GetName();
@@ -73,7 +73,7 @@ void CBaobiaoPageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 }
 
-//处理扫码枪捕捉到的扫码信息
+//处理扫码枪捕捉到的扫码信息
 void CBaobiaoPageUI::HandleTextCapture(std::string content)
 {
 	if (m_is_show_modal_wnd == true)
@@ -96,7 +96,7 @@ bool CBaobiaoPageUI::HandleCustomMessage(UINT uMsg, WPARAM wParam, LPARAM lParam
 
 void CBaobiaoPageUI::ShowJintian()
 {
-	//先处理顶部按钮状态变化
+	//先处理顶部按钮状态变化
 	CButtonUI* jintian = static_cast<CButtonUI*>(this->FindSubControl(L"btn_jintian"));
 	CControlUI* jintian_line = static_cast<CControlUI*>(this->FindSubControl(L"btn_jintian_line"));
 	jintian->SetTextColor(0xFF43A947);
@@ -117,7 +117,7 @@ void CBaobiaoPageUI::ShowJintian()
 	sanshitian->SetTextColor(0xFF555555);
 	sanshitian_line->SetVisible(false);
 
-	//然后处理日期
+	//鐒跺悗澶勭悊鏃ユ湡
 	time_t now = time(NULL);
 	time_t start = now - 60 * 60 * 24 * 0;
 
@@ -130,7 +130,7 @@ void CBaobiaoPageUI::ShowJintian()
 
 void CBaobiaoPageUI::ShowZuotian()
 {
-	//先处理顶部按钮状态变化
+	//先处理顶部按钮状态变化
 	CButtonUI* jintian = static_cast<CButtonUI*>(this->FindSubControl(L"btn_jintian"));
 	CControlUI* jintian_line = static_cast<CControlUI*>(this->FindSubControl(L"btn_jintian_line"));
 	jintian->SetTextColor(0xFF555555);
@@ -151,7 +151,7 @@ void CBaobiaoPageUI::ShowZuotian()
 	sanshitian->SetTextColor(0xFF555555);
 	sanshitian_line->SetVisible(false);
 
-	//然后处理日期
+	//鐒跺悗澶勭悊鏃ユ湡
 	time_t now = time(NULL);
 	time_t start = now - 60 * 60 * 24 * 1;
 
@@ -164,7 +164,7 @@ void CBaobiaoPageUI::ShowZuotian()
 
 void CBaobiaoPageUI::ShowQitian()
 {
-	//先处理顶部按钮状态变化
+	//先处理顶部按钮状态变化
 	CButtonUI* jintian = static_cast<CButtonUI*>(this->FindSubControl(L"btn_jintian"));
 	CControlUI* jintian_line = static_cast<CControlUI*>(this->FindSubControl(L"btn_jintian_line"));
 	jintian->SetTextColor(0xFF555555);
@@ -185,7 +185,7 @@ void CBaobiaoPageUI::ShowQitian()
 	sanshitian->SetTextColor(0xFF555555);
 	sanshitian_line->SetVisible(false);
 
-	//然后处理日期
+	//鐒跺悗澶勭悊鏃ユ湡
 	time_t now = time(NULL);
 	time_t start = now - 60 * 60 * 24 * 6;
 
@@ -200,7 +200,7 @@ void CBaobiaoPageUI::ShowQitian()
 
 void CBaobiaoPageUI::ShowSanshitian()
 {
-	//先处理顶部按钮状态变化
+	//先处理顶部按钮状态变化
 	CButtonUI* jintian = static_cast<CButtonUI*>(this->FindSubControl(L"btn_jintian"));
 	CControlUI* jintian_line = static_cast<CControlUI*>(this->FindSubControl(L"btn_jintian_line"));
 	jintian->SetTextColor(0xFF555555);
@@ -221,7 +221,7 @@ void CBaobiaoPageUI::ShowSanshitian()
 	sanshitian->SetTextColor(0xFF43A947);
 	sanshitian_line->SetVisible(true);
 
-	//然后处理日期
+	//鐒跺悗澶勭悊鏃ユ湡
 	time_t now = time(NULL);
 	time_t start = now - 60 * 60 * 24 * 29;
 
@@ -236,14 +236,14 @@ void CBaobiaoPageUI::ShowSanshitian()
 
 void CBaobiaoPageUI::Refresh()
 {
-	//根据当前的起始时间,刷新数据显示
-	//开始转菊花
+	//鏍规嵁褰撳墠鐨勮捣濮嬫椂闂达紝鍒锋柊鏁版嵁鏄剧ず
+	//寮€濮嬭浆鑿婅姳
 	CContainerUI* pOrderListLayout = static_cast<CContainerUI*>(this->FindSubControl(_T("data_layout")));
 	pOrderListLayout->SetVisible(false);
 
 	this->FindSubControl(_T("loading"))->SetVisible(true);
 
-	//启动一个线程,进行网络请求操作
+	//鍚�姩涓€涓�嚎绋嬶紝杩涜�缃戠粶璇锋眰鎿嶄綔
 
 	std::thread t(&CBaobiaoPageUI::HandleRefresh, this);
 	t.detach();
@@ -253,7 +253,7 @@ void CBaobiaoPageUI::HandleRefresh()
 {
 	std::string url = "/analysis/index/statistics/index";
 
-	//请求外卖的未处理订单,直接用当前的page值去请求
+	//璇锋眰澶栧崠鐨勬湭澶勭悊璁㈠崟锛岀洿鎺ョ敤褰撳墠鐨刾age鍊煎幓璇锋眰
 	std::map<std::string, std::string> params;
 	params["begin_time"] = m_init_time;
 	params["end_time"] = m_end_time;
@@ -263,7 +263,7 @@ void CBaobiaoPageUI::HandleRefresh()
 
 	m_response = response;
 
-	::PostMessage(m_pManager->GetPaintWindow(), WM_BAOBIAO_REFRESH, 0, 0);
+	PostMessage(m_pManager->GetPaintWindow(), WM_BAOBIAO_REFRESH, 0, 0);
 }
 
 void CBaobiaoPageUI::DoRefresh()
@@ -291,7 +291,7 @@ void CBaobiaoPageUI::DoRefresh()
 		return;
 	}
 
-	//获得数据成功
+	//鑾峰緱鏁版嵁鎴愬姛
 	rapidjson::Value& data = document["data"];
 
 	std::string waimai_num = std::to_string(data["waimai_member"].GetInt());
@@ -302,7 +302,7 @@ void CBaobiaoPageUI::DoRefresh()
 	std::string diannei_value = CLewaimaiString::DoubleToString(data["diannei_money"].GetFloat(), 2);
 	std::string huiyuan_value = CLewaimaiString::DoubleToString(data["today_recharge"].GetFloat(), 2);
 
-	//开始渲染数据
+	//开始渲染数据
 	CLabelUI* waimainumLabel = static_cast<CLabelUI*>(this->FindSubControl(L"waimai_num"));
 	waimainumLabel->SetText(CLewaimaiString::UTF8ToUnicode(waimai_num).c_str());
 
@@ -331,14 +331,14 @@ void CBaobiaoPageUI::SetPos(RECT rc, bool bNeedInvalidate)
 {
 	int m_nPageWidth = rc.right - rc.left;
 
-	//添加支付方式
+	//娣诲姞鏀�粯鏂瑰紡
 	int nWidth = m_nPageWidth;
 	if (nWidth == 0)
 	{
 		return;
 	}
 
-	//根据宽度计算每行显示的数量
+	//根据宽度计算每行显示的数量
 	int nMeihangNum = nWidth / 260;
 
 	if (nMeihangNum < 1)
@@ -368,7 +368,7 @@ void CBaobiaoPageUI::SetPos(RECT rc, bool bNeedInvalidate)
 		num++;
 	}
 
-	//调整区域高度
+	//璋冩暣鍖哄煙楂樺害
 	CVerticalLayoutUI* pLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("data_layout")));
 
 	int lastRow = (num - 1) / nMeihangNum + 1;

+ 21 - 21
zhipuzi_pos_windows/page/CDianneiOrderListPageUI.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CDianneiOrderListPageUI.h"
 
 #include "../control/CDianneiOrderItemUI.h"
@@ -21,14 +21,14 @@ CDianneiOrderListPageUI::~CDianneiOrderListPageUI()
 {
 }
 
-//初始化当前页面的展示,处理默认展示效果,在页面被加载的时候调用
+//初始化当前页面的展示,处理默认展示效果,在页面被加载的时候调用
 void CDianneiOrderListPageUI::InitShow()
 {
 	SetPage(1);
 	Refresh();
 }
 
-//处理按钮点击类事件
+//处理按钮点击类事件
 void CDianneiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
@@ -77,7 +77,7 @@ void CDianneiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 }
 
-//处理option切换事件
+//澶勭悊option鍒囨崲浜嬩欢
 void CDianneiOrderListPageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
@@ -85,19 +85,19 @@ void CDianneiOrderListPageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 	
 }
 
-//处理下拉框、radio的切换事件
+//处理下拉框、radio的切换事件
 void CDianneiOrderListPageUI::HandleItemSelectMsg(TNotifyUI& msg)
 {
 
 }
 
-//处理编辑框输入内容改变事件
+//处理编辑框输入内容改变事件
 void CDianneiOrderListPageUI::HandleTextChangedMsg(TNotifyUI& msg)
 {
 
 }
 
-//处理扫码枪捕捉到的扫码信息
+//处理扫码枪捕捉到的扫码信息
 void CDianneiOrderListPageUI::HandleTextCapture(std::string content)
 {
 
@@ -117,13 +117,13 @@ bool CDianneiOrderListPageUI::HandleCustomMessage(UINT uMsg, WPARAM wParam, LPAR
 
 void CDianneiOrderListPageUI::Refresh()
 {
-	//开始转菊花
+	//寮€濮嬭浆鑿婅姳
 	CContainerUI* pOrderListLayout = static_cast<CContainerUI*>(this->FindSubControl(_T("orderlist")));
 	pOrderListLayout->SetVisible(false);
 
 	this->FindSubControl(_T("main_orderlist_loading"))->SetVisible(true);
 
-	//启动一个线程,进行网络请求操作
+	//鍚�姩涓€涓�嚎绋嬶紝杩涜�缃戠粶璇锋眰鎿嶄綔
 	DianneiOrderListStatus* status = new DianneiOrderListStatus;
 	status->m_page = m_page;
 
@@ -135,7 +135,7 @@ void CDianneiOrderListPageUI::HandleRefresh(DianneiOrderListStatus* status)
 {
 	std::string url= "/diancan/getoldorderlist";
 
-	//请求外卖的未处理订单,直接用当前的page值去请求
+	//璇锋眰澶栧崠鐨勬湭澶勭悊璁㈠崟锛岀洿鎺ョ敤褰撳墠鐨刾age鍊煎幓璇锋眰
 	std::map<std::string, std::string> params;
 	params["page"] = std::to_string(status->m_page);
 	params["content"] = "";
@@ -144,25 +144,25 @@ void CDianneiOrderListPageUI::HandleRefresh(DianneiOrderListStatus* status)
 
 	CZhipuziHttpClient::GetInstance()->Request(url.c_str(), params, response);
 
-	//走到这里,网络请求结束了,对比状态是否发生了改变
+	//璧板埌杩欓噷锛岀綉缁滆�姹傜粨鏉熶簡锛屽�姣旂姸鎬佹槸鍚﹀彂鐢熶簡鏀瑰彉
 	if (status->m_page != m_page)
 	{
-		//用户已经点击了其他状态,这个状态结果无效了,直接返回
+		//用户已经点击了其他状态,这个状态结果无效了,直接返回
 		delete status;
 		return;
 	}
 
-	//将网络返回结果保存起来,等待消息处理重新渲染页面
+	//灏嗙綉缁滆繑鍥炵粨鏋滀繚瀛樿捣鏉ワ紝绛夊緟娑堟伅澶勭悊閲嶆柊娓叉煋椤甸潰
 	m_response = response;
 
-	::PostMessage(m_pManager->GetPaintWindow(), WM_ORDERLIST_REFRESH, 0, 0);
+	PostMessage(m_pManager->GetPaintWindow(), WM_ORDERLIST_REFRESH, 0, 0);
 
 	delete status;
 }
 
 void CDianneiOrderListPageUI::DoRefresh()
 {
-	//请求成功之后,清空之前的数据
+	//璇锋眰鎴愬姛涔嬪悗锛屾竻绌轰箣鍓嶇殑鏁版嵁
 	CContainerUI* pOrderListLayout = static_cast<CContainerUI*>(this->FindSubControl(_T("orderlist")));
 	pOrderListLayout->RemoveAll();
 
@@ -189,13 +189,13 @@ void CDianneiOrderListPageUI::DoRefresh()
 		return;
 	}
 
-	//获得数据成功
+	//鑾峰緱鏁版嵁鎴愬姛
 	rapidjson::Value& data = document["data"];
 
 	rapidjson::Value& v_count = data["count"];
 	std::string count = v_count.GetString();
 
-	//处理页数
+	//澶勭悊椤垫暟
 	int nCount = atoi(count.c_str());
 	m_total_page = (int)ceil(nCount / 20.0);
 	if (m_total_page < 1)
@@ -228,7 +228,7 @@ void CDianneiOrderListPageUI::DoRefresh()
 	}
 
 	CLabelUI* pControl = static_cast<CLabelUI*>(this->FindSubControl(_T("diannei_order_list_page")));
-	std::wstring pageinfo = _T("第 ") + CLewaimaiString::ANSIToUnicode(std::to_string(m_page)) + _T("页/共 ") + CLewaimaiString::ANSIToUnicode(std::to_string(m_total_page)) + _T("页");
+	std::wstring pageinfo = _T("第 ") + CLewaimaiString::ANSIToUnicode(std::to_string(m_page)) + _T("页/共 ") + CLewaimaiString::ANSIToUnicode(std::to_string(m_total_page)) + _T("页");
 	pControl->SetText(pageinfo.c_str());
 
 	rapidjson::Value& v_rows = data["rows"];
@@ -237,14 +237,14 @@ void CDianneiOrderListPageUI::DoRefresh()
 	{
 		rapidjson::Value& v_row_i = v_rows[i];
 
-		//创建一个对象
+		//创建一个对象
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 
 		CDianneiOrderItemUI* pItem = static_cast<CDianneiOrderItemUI*>(builder.Create(_T("diannei_order_item.xml"), (UINT)0, &cb, m_pManager));
 		if (pItem != NULL)
 		{
-			//初始化该对应的数据
+			//初始化该对应的数据
 			pItem->SetData(v_row_i);
 
 			pOrderListLayout->Add(pItem);
@@ -257,7 +257,7 @@ void CDianneiOrderListPageUI::DoRefresh()
 		}
 	}
 
-	//重置滚动条的位置
+	//閲嶇疆婊氬姩鏉$殑浣嶇疆
 	tagSIZE size;
 	size.cx = 0;
 	size.cy = 0;

+ 25 - 25
zhipuzi_pos_windows/page/CJiaobanPageUI.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CJiaobanPageUI.h"
 
 #include "../wnd/CHuiyuanChongzhiWnd.h"
@@ -15,7 +15,7 @@ CJiaobanPageUI::~CJiaobanPageUI()
 
 }
 
-//初始化当前页面的展示,处理默认展示效果,在页面被加载的时候调用
+//初始化当前页面的展示,处理默认展示效果,在页面被加载的时候调用
 void CJiaobanPageUI::InitShow()
 {
 	time_t now = time(NULL);
@@ -33,7 +33,7 @@ void CJiaobanPageUI::InitShow()
 	InitJiaobanShijian();
 }
 
-//处理按钮点击类事件
+//处理按钮点击类事件
 void CJiaobanPageUI::HandleClickMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
@@ -44,13 +44,13 @@ void CJiaobanPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 }
 
-//处理option切换事件
+//澶勭悊option鍒囨崲浜嬩欢
 void CJiaobanPageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 {
 
 }
 
-//处理下拉框、radio的切换事件
+//处理下拉框、radio的切换事件
 void CJiaobanPageUI::HandleItemSelectMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
@@ -66,7 +66,7 @@ void CJiaobanPageUI::HandleItemSelectMsg(TNotifyUI& msg)
 	}
 }
 
-//处理编辑框输入内容改变事件
+//处理编辑框输入内容改变事件
 void CJiaobanPageUI::HandleTextChangedMsg(TNotifyUI& msg)
 {
 	DuiLib::CDuiString senderName = msg.pSender->GetName();
@@ -77,7 +77,7 @@ void CJiaobanPageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 }
 
-//处理扫码枪捕捉到的扫码信息
+//处理扫码枪捕捉到的扫码信息
 void CJiaobanPageUI::HandleTextCapture(std::string content)
 {
 	if (m_is_show_modal_wnd == true)
@@ -105,7 +105,7 @@ void CJiaobanPageUI::InitJiaobanShijian()
 
 	this->FindSubControl(_T("loading"))->SetVisible(true);
 
-	//启动一个线程,进行网络请求操作
+	//鍚�姩涓€涓�嚎绋嬶紝杩涜�缃戠粶璇锋眰鎿嶄綔
 	std::thread t(&CJiaobanPageUI::HandleJiaobanShijian, this);
 	t.detach();
 }
@@ -114,7 +114,7 @@ void CJiaobanPageUI::HandleJiaobanShijian()
 {
 	std::string url = "/user/getlogintime";
 
-	//请求外卖的未处理订单,直接用当前的page值去请求
+	//璇锋眰澶栧崠鐨勬湭澶勭悊璁㈠崟锛岀洿鎺ョ敤褰撳墠鐨刾age鍊煎幓璇锋眰
 	std::map<std::string, std::string> params;
 	std::string response;
 
@@ -143,13 +143,13 @@ void CJiaobanPageUI::HandleJiaobanShijian()
 		return;
 	}
 
-	//获得数据成功
+	//鑾峰緱鏁版嵁鎴愬姛
 	rapidjson::Value& data = document["data"];
 
 	std::string select_time = data["select_time"].GetString();
 	rapidjson::Value& rows = data["rows"];
 
-	//取最后一个时间点
+	//鍙栨渶鍚庝竴涓�椂闂寸偣
 	m_init_time = rows[rows.Size() - 1]["init_time"].GetString();
 
 	m_shangban_times.clear();
@@ -163,7 +163,7 @@ void CJiaobanPageUI::HandleJiaobanShijian()
 	int num = rows.Size();
 	if (num > 10)
 	{
-		//只选最多10个
+		//只选最多10个
 		qidian = rows.Size() - 10;
 		num = 10;
 	}
@@ -183,20 +183,20 @@ void CJiaobanPageUI::HandleJiaobanShijian()
 	com->SelectItem(num - 1, false, false);
 	com->SetText(CLewaimaiString::UTF8ToUnicode(m_init_time).c_str());
 
-	//到这里了,开始处理数据刷新
+	//到这里了,开始处理数据刷新
 	HandleRefresh();
 }
 
 void CJiaobanPageUI::Refresh()
 {
-	//根据当前的起始时间,刷新数据显示
-	//开始转菊花
+	//鏍规嵁褰撳墠鐨勮捣濮嬫椂闂达紝鍒锋柊鏁版嵁鏄剧ず
+	//寮€濮嬭浆鑿婅姳
 	CContainerUI* pOrderListLayout = static_cast<CContainerUI*>(this->FindSubControl(_T("data_layout")));
 	pOrderListLayout->SetVisible(false);
 
 	this->FindSubControl(_T("loading"))->SetVisible(true);
 
-	//启动一个线程,进行网络请求操作
+	//鍚�姩涓€涓�嚎绋嬶紝杩涜�缃戠粶璇锋眰鎿嶄綔
 	std::thread t(&CJiaobanPageUI::HandleRefresh, this);
 	t.detach();
 }
@@ -205,7 +205,7 @@ void CJiaobanPageUI::HandleRefresh()
 {
 	std::string url = "/analysis/index/statistics/index";
 
-	//请求外卖的未处理订单,直接用当前的page值去请求
+	//璇锋眰澶栧崠鐨勬湭澶勭悊璁㈠崟锛岀洿鎺ョ敤褰撳墠鐨刾age鍊煎幓璇锋眰
 	std::map<std::string, std::string> params;
 	params["begin_time"] = m_init_time;
 	params["end_time"] = m_end_time;
@@ -215,7 +215,7 @@ void CJiaobanPageUI::HandleRefresh()
 
 	m_response = response;
 
-	::PostMessage(m_pManager->GetPaintWindow(), WM_JIAOBAN_REFRESH, 0, 0);
+	PostMessage(m_pManager->GetPaintWindow(), WM_JIAOBAN_REFRESH, 0, 0);
 }
 
 void CJiaobanPageUI::DoRefresh()
@@ -243,7 +243,7 @@ void CJiaobanPageUI::DoRefresh()
 		return;
 	}
 
-	//获得数据成功
+	//鑾峰緱鏁版嵁鎴愬姛
 	rapidjson::Value& data = document["data"];
 
 	m_diannei_num = std::to_string(data["diannei_member"].GetInt());
@@ -260,7 +260,7 @@ void CJiaobanPageUI::DoRefresh()
 	m_diannei_xianjin_tuikuan = CLewaimaiString::DoubleToString(data["ready_money_refund"].GetFloat(), 2);
 	m_diannei_xianjin_zengzhang = CLewaimaiString::DoubleToString(data["ready_money_boost"].GetFloat(), 2);
 
-	//开始渲染数据
+	//开始渲染数据
 	CLabelUI* dianneinumLabel = static_cast<CLabelUI*>(this->FindSubControl(L"diannei_num"));
 	dianneinumLabel->SetText(CLewaimaiString::UTF8ToUnicode(m_diannei_num).c_str());
 
@@ -301,7 +301,7 @@ void CJiaobanPageUI::DoRefresh()
 
 void CJiaobanPageUI::StartJiaoban()
 {
-	//先进行打印
+	//先进行打印
 	CJiaobaoOrder order;
 	order.m_init_time = m_init_time;
 	order.m_end_time = m_end_time;
@@ -325,7 +325,7 @@ void CJiaobanPageUI::StartJiaoban()
 	CPosPrinter printer;
 	printer.PirntJiaobanOrder(order);
 
-	//打印完成之后,退出登陆
+	//打印完成之后,退出登陆
 	m_pMainWnd->LoginOut(1);
 }
 
@@ -333,14 +333,14 @@ void CJiaobanPageUI::SetPos(RECT rc, bool bNeedInvalidate)
 {
 	int m_nPageWidth = rc.right - rc.left;
 
-	//添加支付方式
+	//娣诲姞鏀�粯鏂瑰紡
 	int nWidth = m_nPageWidth;
 	if (nWidth == 0)
 	{
 		return;
 	}
 
-	//根据宽度计算每行显示的数量
+	//根据宽度计算每行显示的数量
 	int nMeihangNum = nWidth / 260;
 
 	if (nMeihangNum < 1)
@@ -370,7 +370,7 @@ void CJiaobanPageUI::SetPos(RECT rc, bool bNeedInvalidate)
 		num++;
 	}
 
-	//调整区域高度
+	//璋冩暣鍖哄煙楂樺害
 	CVerticalLayoutUI* pLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("jiaoban_page_yingye_layout")));
 
 	int lastRow = (num - 1) / nMeihangNum + 1;

BIN
zhipuzi_pos_windows/page/CSettingPageUI.cpp


+ 81 - 81
zhipuzi_pos_windows/page/CShangpinCreatePageUI.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CShangpinCreatePageUI.h"
 
 #include "../control/ControlEx.h"
@@ -17,19 +17,19 @@ CShangpinCreatePageUI::~CShangpinCreatePageUI()
 {
 }
 
-//初始化当前页面的展示,处理默认展示效果,在页面被加载的时候调用
+//初始化当前页面的展示,处理默认展示效果,在页面被加载的时候调用
 void CShangpinCreatePageUI::InitShow()
 {
-	//商品名字
+	//鍟嗗搧鍚嶅瓧
 	CEditUI* pName = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_name_edit"));
 	pName->SetText(L"");
 	pName->SetFocus();
 
-	//商品序号
+	//鍟嗗搧搴忓彿
 	CEditUI* pXuhao = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_xuhao_edit"));
 	pXuhao->SetText(L"");
 	
-	//初始化商品分类
+	//初始化商品分类
 	CComboUI* com_fenlei = static_cast<CComboUI*>(this->FindSubControl(_T("shangpin_create_page_foodtype")));
 	com_fenlei->RemoveAll();
 
@@ -64,51 +64,51 @@ void CShangpinCreatePageUI::InitShow()
 
 	com_fenlei->SetText(CLewaimaiString::UTF8ToUnicode(first_food_name).c_str());
 
-	//商品条码
+	//鍟嗗搧鏉$爜
 	CEditUI* pTiaoma = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_barcode_edit"));
 	pTiaoma->SetText(L"");
 
-	//商品价格
+	//鍟嗗搧浠锋牸
 	CEditUI* pPrice = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_price_edit"));
 	pPrice->SetText(L"");
 
-	//商品单位
+	//鍟嗗搧鍗曚綅
 	CEditUI* pDanwei = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_unit_edit"));
 	pDanwei->SetText(L"");
 
-	//是否称重
+	//鏄�惁绉伴噸
 	CCheckBoxUI* pChengzhong = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_chengzhong"));
 	pChengzhong->Selected(false, false);
 
-	//plu编码
+	//plu缂栫爜
 	CEditUI* pPlu = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_plu"));
 	pPlu->SetText(L"");
 
-	//商品编码
+	//鍟嗗搧缂栫爜
 	CEditUI* pShangpin = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_shangpinbianma"));
 	pShangpin->SetText(L"");
 
-	//库存类型
+	//搴撳瓨绫诲瀷
 	CCheckBoxUI* pKucuntype = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_kucun_open"));
 	pKucuntype->Selected(true, false);
 
-	//当前库存
+	//褰撳墠搴撳瓨
 	CEditUI* pDangqiankucun = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_kucun_now"));
 	pDangqiankucun->SetText(L"0");
 
-	//商品状态
+	//商品状态
 	CCheckBoxUI* pStatus = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_status_normal"));
 	pStatus->Selected(true, false);
 
-	//进货价
+	//进货价
 	CEditUI* pJinhuojia = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_buyingprice_edit"));
 	pJinhuojia->SetText(L"0");
 
-	//进货价模式
+	//进货价模式
 	CCheckBoxUI* pJinhuomoshi = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_jinhuojia_normal"));
 	pJinhuomoshi->Selected(true, false);
 
-	//在哪些地方显示
+	//在哪些地方显示
 	CCheckBoxUI* pShouyinji = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_showplace_shouyinji"));
 	CCheckBoxUI* pWaimai = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_showplace_waimai"));
 	CCheckBoxUI* pSaomaidancan = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_showplace_saomadiancan"));
@@ -117,15 +117,15 @@ void CShangpinCreatePageUI::InitShow()
 	pWaimai->Selected(true, false);
 	pSaomaidancan->Selected(true, false);
 
-	//是否开启打包费
+	//鏄�惁寮€鍚�墦鍖呰垂
 	CCheckBoxUI* pDabao = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_is_dabao"));
 	pDabao->Selected(false, false);
 
-	//打包费
+	//打包费
 	CEditUI* pDaobaofei = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_dabao_money"));
 	pDaobaofei->SetText(L"0");
 
-	//商品加工方式
+	//鍟嗗搧鍔犲伐鏂瑰紡
 	CCheckBoxUI* pJiagongfangshi = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_fangan_1"));
 	pJiagongfangshi->Selected(true, false);
 
@@ -139,7 +139,7 @@ void CShangpinCreatePageUI::InitShow()
 	layout->SetScrollPos(pos);
 }
 
-//处理按钮点击类事件
+//处理按钮点击类事件
 void CShangpinCreatePageUI::HandleClickMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
@@ -158,7 +158,7 @@ void CShangpinCreatePageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 }
 
-//处理option切换事件
+//澶勭悊option鍒囨崲浜嬩欢
 void CShangpinCreatePageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
@@ -172,20 +172,20 @@ void CShangpinCreatePageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 	}
 }
 
-//处理下拉框、radio的切换事件
+//处理下拉框、radio的切换事件
 void CShangpinCreatePageUI::HandleItemSelectMsg(TNotifyUI& msg)
 {
 
 }
 
-//处理编辑框输入内容改变事件
+//处理编辑框输入内容改变事件
 void CShangpinCreatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
 
 	if (name == L"shangpin_create_page_xuhao_edit")
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("shangpin_create_page_xuhao_edit")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -197,11 +197,11 @@ void CShangpinCreatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if ((tmp > 57 || tmp < 48))
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -210,7 +210,7 @@ void CShangpinCreatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 	else if (name == L"shangpin_create_page_barcode_edit")
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("shangpin_create_page_barcode_edit")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -222,11 +222,11 @@ void CShangpinCreatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if ((tmp > 57 || tmp < 48))
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -235,7 +235,7 @@ void CShangpinCreatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 	else if (name == L"shangpin_create_page_price_edit")
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("shangpin_create_page_price_edit")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -247,11 +247,11 @@ void CShangpinCreatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if ((tmp > 57 || tmp < 48) && tmp != 46)
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -260,7 +260,7 @@ void CShangpinCreatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 	else if (name == L"shangpin_create_page_buyingprice_edit")
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("shangpin_create_page_buyingprice_edit")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -272,11 +272,11 @@ void CShangpinCreatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if ((tmp > 57 || tmp < 48) && tmp != 46)
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -285,7 +285,7 @@ void CShangpinCreatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 	else if (name == L"shangpin_create_page_plu")
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("shangpin_create_page_plu")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -297,11 +297,11 @@ void CShangpinCreatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if ((tmp > 57 || tmp < 48))
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -310,7 +310,7 @@ void CShangpinCreatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 	else if (name == L"shangpin_create_page_shangpinbianma")
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("shangpin_create_page_shangpinbianma")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -322,11 +322,11 @@ void CShangpinCreatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if ((tmp > 57 || tmp < 48))
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -335,7 +335,7 @@ void CShangpinCreatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 	else if (name == L"shangpin_create_page_dabao_money")
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("shangpin_create_page_dabao_money")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -347,11 +347,11 @@ void CShangpinCreatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if ((tmp > 57 || tmp < 48) && tmp != 46)
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -360,7 +360,7 @@ void CShangpinCreatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 	else if (name == L"shangpin_create_page_kucun_now")
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("shangpin_create_page_kucun_now")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -372,11 +372,11 @@ void CShangpinCreatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if ((tmp > 57 || tmp < 48))
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -385,7 +385,7 @@ void CShangpinCreatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 }
 
-//处理扫码枪捕捉到的扫码信息
+//处理扫码枪捕捉到的扫码信息
 void CShangpinCreatePageUI::HandleTextCapture(std::string content)
 {
 	if (m_is_show_modal_wnd == true)
@@ -400,7 +400,7 @@ bool CShangpinCreatePageUI::HandleCustomMessage(UINT uMsg, WPARAM wParam, LPARAM
 {
 	if (uMsg == WM_FOOD_HANDLE_SUCCESS)
 	{
-		//然后返回到商品页面
+		//然后返回到商品页面
 		m_pMainWnd->SwitchPage(CMainWnd::SHANGPIN);
 
 		return true;
@@ -418,19 +418,19 @@ void CShangpinCreatePageUI::SetPos(RECT rc, bool bNeedInvalidate)
 
 void CShangpinCreatePageUI::StartSave()
 {
-	//把参数一个个读出来
+	//把参数一个个读出来
 
-	//商品名字
+	//鍟嗗搧鍚嶅瓧
 	CEditUI* pName = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_name_edit"));
 	std::wstring ws_name = pName->GetText();
 	m_name = CLewaimaiString::UnicodeToUTF8(ws_name);
 	if (m_name == "")
 	{
-		ShowError(L"商品名字不能为空");
+		ShowError(L"鍟嗗搧鍚嶅瓧涓嶈兘涓虹┖");
 		return;
 	}
 
-	//商品序号
+	//鍟嗗搧搴忓彿
 	CEditUI* pXuhao = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_xuhao_edit"));
 	std::wstring ws_xuhao = pXuhao->GetText();
 	m_xuhao = CLewaimaiString::UnicodeToUTF8(ws_xuhao);
@@ -439,51 +439,51 @@ void CShangpinCreatePageUI::StartSave()
 		m_xuhao = "0";
 	}
 
-	//初始化商品分类
+	//初始化商品分类
 	CComboUI* com_fenlei = static_cast<CComboUI*>(this->FindSubControl(_T("shangpin_create_page_foodtype")));
 	std::wstring ws_type = com_fenlei->GetText();
 	m_fenlei = CLewaimaiString::UnicodeToUTF8(ws_type);
 	if (m_fenlei == "")
 	{
-		ShowError(L"商品分类不能为空,请先创建并选择商品分类");
+		ShowError(L"鍟嗗搧鍒嗙被涓嶈兘涓虹┖锛岃�鍏堝垱寤哄苟閫夋嫨鍟嗗搧鍒嗙被");
 		return;
 	}
 
-	//商品条码
+	//鍟嗗搧鏉$爜
 	CEditUI* pTiaoma = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_barcode_edit"));
 	std::wstring ws_tiaoma = pTiaoma->GetText();
 	m_tiaoma = CLewaimaiString::UnicodeToUTF8(ws_tiaoma);
 
-	//商品价格
+	//鍟嗗搧浠锋牸
 	CEditUI* pPrice = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_price_edit"));
 	std::wstring ws_price = pPrice->GetText();
 	m_price = CLewaimaiString::UnicodeToUTF8(ws_price);
 	if (m_price == "")
 	{
-		ShowError(L"商品价格不能为空");
+		ShowError(L"鍟嗗搧浠锋牸涓嶈兘涓虹┖");
 		return;
 	}
 
-	//商品单位
+	//鍟嗗搧鍗曚綅
 	CEditUI* pDanwei = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_unit_edit"));
 	std::wstring ws_danwei = pDanwei->GetText();
 	m_danwei = CLewaimaiString::UnicodeToUTF8(ws_danwei);
 
-	//是否称重
+	//鏄�惁绉伴噸
 	CCheckBoxUI* pChengzhong = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_chengzhong"));
 	m_is_chengzhong = pChengzhong->IsSelected();
 
-	//plu编码
+	//plu缂栫爜
 	CEditUI* pPlu = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_plu"));
 	std::wstring ws_plu = pPlu->GetText();
 	m_plu = CLewaimaiString::UnicodeToUTF8(ws_plu);
 
-	//商品编码
+	//鍟嗗搧缂栫爜
 	CEditUI* pShangpin = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_shangpinbianma"));
 	std::wstring ws_shangpin = pShangpin->GetText();
 	m_shangpinbianma = CLewaimaiString::UnicodeToUTF8(ws_shangpin);
 
-	//库存类型
+	//搴撳瓨绫诲瀷
 	CCheckBoxUI* pKucuntype = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_kucun_open"));
 	if (pKucuntype->IsSelected())
 	{
@@ -494,7 +494,7 @@ void CShangpinCreatePageUI::StartSave()
 		m_kucuntype = 1;
 	}
 
-	//当前库存
+	//褰撳墠搴撳瓨
 	CEditUI* pDangqiankucun = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_kucun_now"));
 	std::wstring ws_dangqiankucun = pDangqiankucun->GetText();
 	m_dangqiankucun = CLewaimaiString::UnicodeToUTF8(ws_dangqiankucun);
@@ -503,7 +503,7 @@ void CShangpinCreatePageUI::StartSave()
 		m_dangqiankucun = "0";
 	}
 
-	//商品状态
+	//商品状态
 	CCheckBoxUI* pStatus = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_status_normal"));
 	if (pStatus->IsSelected())
 	{
@@ -514,7 +514,7 @@ void CShangpinCreatePageUI::StartSave()
 		m_status = 1;
 	}
 
-	//进货价
+	//进货价
 	CEditUI* pJinhuojia = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_buyingprice_edit"));
 	std::wstring ws_jinhuojia = pJinhuojia->GetText();
 	m_jinhuojia = CLewaimaiString::UnicodeToUTF8(ws_jinhuojia);
@@ -523,7 +523,7 @@ void CShangpinCreatePageUI::StartSave()
 		m_jinhuojia = "0";
 	}
 
-	//进货价模式
+	//进货价模式
 	CCheckBoxUI* pJinhuomoshi = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_jinhuojia_normal"));
 	if (pJinhuomoshi->IsSelected())
 	{
@@ -534,7 +534,7 @@ void CShangpinCreatePageUI::StartSave()
 		m_jinhuo_type = 1;
 	}
 
-	//在哪些地方显示
+	//在哪些地方显示
 	CCheckBoxUI* pShouyinji = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_showplace_shouyinji"));
 	CCheckBoxUI* pWaimai = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_showplace_waimai"));
 	CCheckBoxUI* pSaomaidancan = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_showplace_saomadiancan"));
@@ -543,11 +543,11 @@ void CShangpinCreatePageUI::StartSave()
 	m_is_waimai_show = pWaimai->IsSelected();
 	m_is_saomadiancan_show = pSaomaidancan->IsSelected();
 
-	//是否开启打包费
+	//鏄�惁寮€鍚�墦鍖呰垂
 	CCheckBoxUI* pDabao = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_is_dabao"));
 	m_is_dabao_fei = pDabao->IsSelected();
 
-	//打包费
+	//打包费
 	CEditUI* pDaobaofei = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_dabao_money"));
 	std::wstring ws_dabaofei = pDaobaofei->GetText();
 	m_dabaofei = CLewaimaiString::UnicodeToUTF8(ws_dabaofei);
@@ -556,7 +556,7 @@ void CShangpinCreatePageUI::StartSave()
 		m_dabaofei = "0";
 	}
 
-	//商品加工方式
+	//鍟嗗搧鍔犲伐鏂瑰紡
 	CCheckBoxUI* pJiagongfangshi_1 = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_fangan_1"));
 	CCheckBoxUI* pJiagongfangshi_2 = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_fangan_2"));
 	CCheckBoxUI* pJiagongfangshi_3 = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_fangan_3"));
@@ -574,7 +574,7 @@ void CShangpinCreatePageUI::StartSave()
 		m_jiagong_type = 3;
 	}
 
-	ShowError(L"正在保存商品...");
+	ShowError(L"姝e湪淇濆瓨鍟嗗搧...");
 
 	std::thread(&CShangpinCreatePageUI::HandleSave, this).detach();
 }
@@ -626,7 +626,7 @@ void CShangpinCreatePageUI::HandleSave()
 	
 	params["cost_mode"] = std::to_string(m_jinhuo_type);
 	
-	//哪里显示
+	//鍝�噷鏄剧ず
 	if (m_is_shouyinji_show)
 	{
 		params["is_shouyinji_show"] = "1";
@@ -669,7 +669,7 @@ void CShangpinCreatePageUI::HandleSave()
 
 	params["jiagong_type"] = std::to_string(m_jiagong_type);
 	
-	//这下面是接口要求必传参数
+	//杩欎笅闈㈡槸鎺ュ彛瑕佹眰蹇呬紶鍙傛暟
 	params["goods_img"] = "";
 	params["open_autostock"] = "0";
 	params["stock_warning"] = "0";
@@ -681,7 +681,7 @@ void CShangpinCreatePageUI::HandleSave()
 
 	if (ret == false)
 	{
-		ShowError(L"请求服务器失败,请检查网络设置!");
+		ShowError(L"璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇锋�鏌ョ綉缁滆�缃�紒");
 
 		return;
 	}
@@ -691,13 +691,13 @@ void CShangpinCreatePageUI::HandleSave()
 
 	if (document.HasParseError())
 	{
-		ShowError(L"服务器错误");
+		ShowError(L"服务器错误");
 		return;
 	}
 
 	if (!document.HasMember("errcode") || !document.HasMember("errmsg"))
 	{
-		ShowError(L"服务器错误");
+		ShowError(L"服务器错误");
 		return;
 	}
 
@@ -715,10 +715,10 @@ void CShangpinCreatePageUI::HandleSave()
 
 	std::string id = data["id"].GetString();
 
-	//走到这里说明商品保存成功了,接着把商品的数据更新到数据库
+	//璧板埌杩欓噷璇存槑鍟嗗搧淇濆瓨鎴愬姛浜嗭紝鎺ョ潃鎶婂晢鍝佺殑鏁版嵁鏇存柊鍒版暟鎹�簱
 	CFoodHandle::GetInstance()->UpdateOneFood(id);
 
-	::PostMessage(m_pManager->GetPaintWindow(), WM_FOOD_HANDLE_SUCCESS, 0, 0);
+	PostMessage(m_pManager->GetPaintWindow(), WM_FOOD_HANDLE_SUCCESS, 0, 0);
 }
 
 void CShangpinCreatePageUI::ShowError(std::wstring msg)
@@ -764,7 +764,7 @@ void CShangpinCreatePageUI::ShowSaomaluru()
 			std::string unit = pMemoDlg->m_unit;
 			std::string des = pMemoDlg->m_des;
 
-			//获取到了值,初始化值
+			//获取到了值,初始化值
 			CEditUI* pTiaoma = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_barcode_edit"));
 			pTiaoma->SetText(CLewaimaiString::UTF8ToUnicode(code).c_str());
 

+ 81 - 81
zhipuzi_pos_windows/page/CShangpinUpdatePageUI.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CShangpinUpdatePageUI.h"
 
 #include "../control/ControlEx.h"
@@ -18,18 +18,18 @@ CShangpinUpdatePageUI::~CShangpinUpdatePageUI()
 {
 }
 
-//初始化当前页面的展示,处理默认展示效果,在页面被加载的时候调用
+//初始化当前页面的展示,处理默认展示效果,在页面被加载的时候调用
 void CShangpinUpdatePageUI::InitShow()
 {
-	//商品名字
+	//鍟嗗搧鍚嶅瓧
 	CEditUI* pName = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_name_edit"));
 	pName->SetText(CLewaimaiString::UTF8ToUnicode(m_foodinfo.name).c_str());
 
-	//商品序号
+	//鍟嗗搧搴忓彿
 	CEditUI* pXuhao = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_xuhao_edit"));
 	pXuhao->SetText(CLewaimaiString::UTF8ToUnicode(m_foodinfo.tag).c_str());
 
-	//初始化商品分类
+	//初始化商品分类
 	CComboUI* com_fenlei = static_cast<CComboUI*>(this->FindSubControl(_T("shangpin_create_page_foodtype")));
 	com_fenlei->RemoveAll();
 
@@ -66,19 +66,19 @@ void CShangpinUpdatePageUI::InitShow()
 
 	com_fenlei->SetText(CLewaimaiString::UTF8ToUnicode(select_foodtype_name).c_str());
 
-	//商品条码
+	//鍟嗗搧鏉$爜
 	CEditUI* pTiaoma = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_barcode_edit"));
 	pTiaoma->SetText(CLewaimaiString::UTF8ToUnicode(m_foodinfo.barcode).c_str());
 
-	//商品价格
+	//鍟嗗搧浠锋牸
 	CEditUI* pPrice = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_price_edit"));
 	pPrice->SetText(CLewaimaiString::UTF8ToUnicode(m_foodinfo.price).c_str());
 
-	//商品单位
+	//鍟嗗搧鍗曚綅
 	CEditUI* pDanwei = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_unit_edit"));
 	pDanwei->SetText(CLewaimaiString::UTF8ToUnicode(m_foodinfo.unit).c_str());
 
-	//是否称重
+	//鏄�惁绉伴噸
 	CCheckBoxUI* pChengzhong = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_chengzhong"));
 	if (m_foodinfo.is_weight == "1")
 	{
@@ -89,15 +89,15 @@ void CShangpinUpdatePageUI::InitShow()
 		pChengzhong->Selected(false, false);
 	}
 
-	//plu编码
+	//plu缂栫爜
 	CEditUI* pPlu = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_plu"));
 	pPlu->SetText(CLewaimaiString::UTF8ToUnicode(m_foodinfo.weight_plu_code).c_str());
 
-	//商品编码
+	//鍟嗗搧缂栫爜
 	CEditUI* pShangpin = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_shangpinbianma"));
 	pShangpin->SetText(CLewaimaiString::UTF8ToUnicode(m_foodinfo.weight_food_code).c_str());
 
-	//库存类型
+	//搴撳瓨绫诲瀷
 	CCheckBoxUI* pKucuntypeOpen = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_kucun_open"));	
 	CCheckBoxUI* pKucuntypeWuxian = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_kucun_wuxian"));
 	if (m_foodinfo.stockvalid == "1")
@@ -111,11 +111,11 @@ void CShangpinUpdatePageUI::InitShow()
 		pKucuntypeWuxian->Selected(true, false);
 	}
 
-	//当前库存
+	//褰撳墠搴撳瓨
 	CEditUI* pDangqiankucun = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_kucun_now"));
 	pDangqiankucun->SetText(CLewaimaiString::UTF8ToUnicode(m_foodinfo.stock).c_str());
 
-	//商品状态
+	//商品状态
 	CCheckBoxUI* pStatusNormal = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_status_normal"));
 	CCheckBoxUI* pStatusXiajia = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_status_xiajia"));
 	if (m_foodinfo.status == "NORMAL")
@@ -129,11 +129,11 @@ void CShangpinUpdatePageUI::InitShow()
 		pStatusXiajia->Selected(true, false);
 	}
 
-	//进货价
+	//进货价
 	CEditUI* pJinhuojia = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_buyingprice_edit"));
 	pJinhuojia->SetText(CLewaimaiString::UTF8ToUnicode(m_foodinfo.buying_price).c_str());
 
-	//进货价模式
+	//进货价模式
 	CCheckBoxUI* pJinhuomoshiNormal = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_jinhuojia_normal"));
 	CCheckBoxUI* pJinhuomoshiJiaquan = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_jinhuojia_jiaquan"));
 	if (m_foodinfo.cost_mode == "0")
@@ -147,7 +147,7 @@ void CShangpinUpdatePageUI::InitShow()
 		pJinhuomoshiJiaquan->Selected(true, false);
 	}
 
-	//在哪些地方显示
+	//在哪些地方显示
 	CCheckBoxUI* pShouyinji = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_showplace_shouyinji"));
 	CCheckBoxUI* pWaimai = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_showplace_waimai"));
 	CCheckBoxUI* pSaomaidancan = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_showplace_saomadiancan"));
@@ -179,7 +179,7 @@ void CShangpinUpdatePageUI::InitShow()
 		pSaomaidancan->Selected(false, false);
 	}
 
-	//是否开启打包费
+	//鏄�惁寮€鍚�墦鍖呰垂
 	CCheckBoxUI* pDabao = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_is_dabao"));
 	if (m_foodinfo.is_dabao == "1")
 	{
@@ -190,11 +190,11 @@ void CShangpinUpdatePageUI::InitShow()
 		pDabao->Selected(false, false);
 	}
 
-	//打包费
+	//打包费
 	CEditUI* pDaobaofei = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_dabao_money"));
 	pDaobaofei->SetText(CLewaimaiString::UTF8ToUnicode(m_foodinfo.dabao_money).c_str());
 
-	//商品加工方式
+	//鍟嗗搧鍔犲伐鏂瑰紡
 	CCheckBoxUI* pJiagongfangshi_1 = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_fangan_1"));
 	CCheckBoxUI* pJiagongfangshi_2 = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_fangan_2"));
 	CCheckBoxUI* pJiagongfangshi_3 = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_fangan_3"));
@@ -221,7 +221,7 @@ void CShangpinUpdatePageUI::InitShow()
 	layout->SetScrollPos(pos);
 }
 
-//处理按钮点击类事件
+//处理按钮点击类事件
 void CShangpinUpdatePageUI::HandleClickMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
@@ -244,7 +244,7 @@ void CShangpinUpdatePageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 }
 
-//处理option切换事件
+//澶勭悊option鍒囨崲浜嬩欢
 void CShangpinUpdatePageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
@@ -258,20 +258,20 @@ void CShangpinUpdatePageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 	}
 }
 
-//处理下拉框、radio的切换事件
+//处理下拉框、radio的切换事件
 void CShangpinUpdatePageUI::HandleItemSelectMsg(TNotifyUI& msg)
 {
 
 }
 
-//处理编辑框输入内容改变事件
+//处理编辑框输入内容改变事件
 void CShangpinUpdatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
 
 	if (name == L"shangpin_create_page_xuhao_edit")
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("shangpin_create_page_xuhao_edit")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -283,11 +283,11 @@ void CShangpinUpdatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if ((tmp > 57 || tmp < 48))
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -296,7 +296,7 @@ void CShangpinUpdatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 	else if (name == L"shangpin_create_page_barcode_edit")
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("shangpin_create_page_barcode_edit")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -308,11 +308,11 @@ void CShangpinUpdatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if ((tmp > 57 || tmp < 48))
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -321,7 +321,7 @@ void CShangpinUpdatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 	else if (name == L"shangpin_create_page_price_edit")
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("shangpin_create_page_price_edit")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -333,11 +333,11 @@ void CShangpinUpdatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if ((tmp > 57 || tmp < 48) && tmp != 46)
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -346,7 +346,7 @@ void CShangpinUpdatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 	else if (name == L"shangpin_create_page_buyingprice_edit")
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("shangpin_create_page_buyingprice_edit")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -358,11 +358,11 @@ void CShangpinUpdatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if ((tmp > 57 || tmp < 48) && tmp != 46)
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -371,7 +371,7 @@ void CShangpinUpdatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 	else if (name == L"shangpin_create_page_plu")
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("shangpin_create_page_plu")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -383,11 +383,11 @@ void CShangpinUpdatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if ((tmp > 57 || tmp < 48))
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -396,7 +396,7 @@ void CShangpinUpdatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 	else if (name == L"shangpin_create_page_shangpinbianma")
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("shangpin_create_page_shangpinbianma")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -408,11 +408,11 @@ void CShangpinUpdatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if ((tmp > 57 || tmp < 48))
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -421,7 +421,7 @@ void CShangpinUpdatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 	else if (name == L"shangpin_create_page_dabao_money")
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("shangpin_create_page_dabao_money")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -433,11 +433,11 @@ void CShangpinUpdatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if ((tmp > 57 || tmp < 48) && tmp != 46)
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -446,7 +446,7 @@ void CShangpinUpdatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 	else if (name == L"shangpin_create_page_kucun_now")
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("shangpin_create_page_kucun_now")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -458,11 +458,11 @@ void CShangpinUpdatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if ((tmp > 57 || tmp < 48))
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -471,7 +471,7 @@ void CShangpinUpdatePageUI::HandleTextChangedMsg(TNotifyUI& msg)
 	}
 }
 
-//处理扫码枪捕捉到的扫码信息
+//处理扫码枪捕捉到的扫码信息
 void CShangpinUpdatePageUI::HandleTextCapture(std::string content)
 {
 
@@ -481,7 +481,7 @@ bool CShangpinUpdatePageUI::HandleCustomMessage(UINT uMsg, WPARAM wParam, LPARAM
 {
 	if (uMsg == WM_FOOD_HANDLE_SUCCESS)
 	{
-		//然后返回到商品页面
+		//然后返回到商品页面
 		m_pMainWnd->SwitchPage(CMainWnd::SHANGPIN);
 
 		return true;
@@ -499,53 +499,53 @@ void CShangpinUpdatePageUI::SetPos(RECT rc, bool bNeedInvalidate)
 
 void CShangpinUpdatePageUI::StartSave()
 {
-	//把参数一个个读出来
+	//把参数一个个读出来
 
-	//商品名字
+	//鍟嗗搧鍚嶅瓧
 	CEditUI* pName = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_name_edit"));
 	std::wstring ws_name = pName->GetText();
 	m_name = CLewaimaiString::UnicodeToUTF8(ws_name);
 
-	//商品序号
+	//鍟嗗搧搴忓彿
 	CEditUI* pXuhao = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_xuhao_edit"));
 	std::wstring ws_xuhao = pXuhao->GetText();
 	m_xuhao = CLewaimaiString::UnicodeToUTF8(ws_xuhao);
 
-	//初始化商品分类
+	//初始化商品分类
 	CComboUI* com_fenlei = static_cast<CComboUI*>(this->FindSubControl(_T("shangpin_create_page_foodtype")));
 	std::wstring ws_type = com_fenlei->GetText();
 	m_fenlei = CLewaimaiString::UnicodeToUTF8(ws_type);
 
-	//商品条码
+	//鍟嗗搧鏉$爜
 	CEditUI* pTiaoma = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_barcode_edit"));
 	std::wstring ws_tiaoma = pTiaoma->GetText();
 	m_tiaoma = CLewaimaiString::UnicodeToUTF8(ws_tiaoma);
 
-	//商品价格
+	//鍟嗗搧浠锋牸
 	CEditUI* pPrice = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_price_edit"));
 	std::wstring ws_price = pPrice->GetText();
 	m_price = CLewaimaiString::UnicodeToUTF8(ws_price);
 
-	//商品单位
+	//鍟嗗搧鍗曚綅
 	CEditUI* pDanwei = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_unit_edit"));
 	std::wstring ws_danwei = pDanwei->GetText();
 	m_danwei = CLewaimaiString::UnicodeToUTF8(ws_danwei);
 
-	//是否称重
+	//鏄�惁绉伴噸
 	CCheckBoxUI* pChengzhong = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_chengzhong"));
 	m_is_chengzhong = pChengzhong->IsSelected();
 
-	//plu编码
+	//plu缂栫爜
 	CEditUI* pPlu = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_plu"));
 	std::wstring ws_plu = pPlu->GetText();
 	m_plu = CLewaimaiString::UnicodeToUTF8(ws_plu);
 
-	//商品编码
+	//鍟嗗搧缂栫爜
 	CEditUI* pShangpin = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_shangpinbianma"));
 	std::wstring ws_shangpin = pShangpin->GetText();
 	m_shangpinbianma = CLewaimaiString::UnicodeToUTF8(ws_shangpin);
 
-	//库存类型
+	//搴撳瓨绫诲瀷
 	CCheckBoxUI* pKucuntype = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_kucun_open"));
 	if (pKucuntype->IsSelected())
 	{
@@ -556,12 +556,12 @@ void CShangpinUpdatePageUI::StartSave()
 		m_kucuntype = 1;
 	}
 
-	//当前库存
+	//褰撳墠搴撳瓨
 	CEditUI* pDangqiankucun = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_kucun_now"));
 	std::wstring ws_dangqiankucun = pDangqiankucun->GetText();
 	m_dangqiankucun = CLewaimaiString::UnicodeToUTF8(ws_dangqiankucun);
 
-	//商品状态
+	//商品状态
 	CCheckBoxUI* pStatus = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_status_normal"));
 	if (pStatus->IsSelected())
 	{
@@ -572,12 +572,12 @@ void CShangpinUpdatePageUI::StartSave()
 		m_status = 1;
 	}
 
-	//进货价
+	//进货价
 	CEditUI* pJinhuojia = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_buyingprice_edit"));
 	std::wstring ws_jinhuojia = pJinhuojia->GetText();
 	m_jinhuojia = CLewaimaiString::UnicodeToUTF8(ws_jinhuojia);
 
-	//进货价模式
+	//进货价模式
 	CCheckBoxUI* pJinhuomoshi = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_jinhuojia_normal"));
 	if (pJinhuomoshi->IsSelected())
 	{
@@ -588,7 +588,7 @@ void CShangpinUpdatePageUI::StartSave()
 		m_jinhuo_type = 1;
 	}
 
-	//在哪些地方显示
+	//在哪些地方显示
 	CCheckBoxUI* pShouyinji = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_showplace_shouyinji"));
 	CCheckBoxUI* pWaimai = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_showplace_waimai"));
 	CCheckBoxUI* pSaomaidancan = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_showplace_saomadiancan"));
@@ -597,16 +597,16 @@ void CShangpinUpdatePageUI::StartSave()
 	m_is_waimai_show = pWaimai->IsSelected();
 	m_is_saomadiancan_show = pSaomaidancan->IsSelected();
 
-	//是否开启打包费
+	//鏄�惁寮€鍚�墦鍖呰垂
 	CCheckBoxUI* pDabao = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_is_dabao"));
 	m_is_dabao_fei = pDabao->IsSelected();
 
-	//打包费
+	//打包费
 	CEditUI* pDaobaofei = static_cast<CEditUI*>(this->FindSubControl(L"shangpin_create_page_dabao_money"));
 	std::wstring ws_dabaofei = pDaobaofei->GetText();
 	m_dabaofei = CLewaimaiString::UnicodeToUTF8(ws_dabaofei);
 
-	//商品加工方式
+	//鍟嗗搧鍔犲伐鏂瑰紡
 	CCheckBoxUI* pJiagongfangshi_1 = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_fangan_1"));
 	CCheckBoxUI* pJiagongfangshi_2 = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_fangan_2"));
 	CCheckBoxUI* pJiagongfangshi_3 = static_cast<CCheckBoxUI*>(this->FindSubControl(L"shangpin_create_page_fangan_3"));
@@ -624,7 +624,7 @@ void CShangpinUpdatePageUI::StartSave()
 		m_jiagong_type = 2;
 	}
 
-	ShowError(L"正在保存商品...");
+	ShowError(L"姝e湪淇濆瓨鍟嗗搧...");
 
 	std::thread(&CShangpinUpdatePageUI::HandleSave, this).detach();
 }
@@ -719,7 +719,7 @@ void CShangpinUpdatePageUI::HandleSave()
 
 	params["jiagong_type"] = std::to_string(m_jiagong_type);
 	
-	//这下面是接口要求必传参数
+	//杩欎笅闈㈡槸鎺ュ彛瑕佹眰蹇呬紶鍙傛暟
 	params["goods_img"] = m_foodinfo.goods_img;
 	params["goods_thumb_img"] = m_foodinfo.goods_img;
 
@@ -733,7 +733,7 @@ void CShangpinUpdatePageUI::HandleSave()
 
 	if (ret == false)
 	{
-		ShowError(L"请求服务器失败,请检查网络设置!");
+		ShowError(L"璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇锋�鏌ョ綉缁滆�缃�紒");
 
 		return;
 	}
@@ -743,13 +743,13 @@ void CShangpinUpdatePageUI::HandleSave()
 
 	if (document.HasParseError())
 	{
-		ShowError(L"服务器错误");
+		ShowError(L"服务器错误");
 		return;
 	}
 
 	if (!document.HasMember("errcode") || !document.HasMember("errmsg"))
 	{
-		ShowError(L"服务器错误");
+		ShowError(L"服务器错误");
 		return;
 	}
 
@@ -767,10 +767,10 @@ void CShangpinUpdatePageUI::HandleSave()
 
 	std::string id = data["goods_id"].GetString();
 
-	//走到这里说明商品保存成功了,接着把商品的数据更新到数据库
+	//璧板埌杩欓噷璇存槑鍟嗗搧淇濆瓨鎴愬姛浜嗭紝鎺ョ潃鎶婂晢鍝佺殑鏁版嵁鏇存柊鍒版暟鎹�簱
 	CFoodHandle::GetInstance()->UpdateOneFood(id);
 
-	::PostMessage(m_pManager->GetPaintWindow(), WM_FOOD_HANDLE_SUCCESS, 0, 0);
+	PostMessage(m_pManager->GetPaintWindow(), WM_FOOD_HANDLE_SUCCESS, 0, 0);
 }
 
 void CShangpinUpdatePageUI::StartDelete()
@@ -790,7 +790,7 @@ void CShangpinUpdatePageUI::HandleDelete()
 
 	if (ret == false)
 	{
-		ShowError(L"请求服务器失败,请检查网络设置!");
+		ShowError(L"璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇锋�鏌ョ綉缁滆�缃�紒");
 
 		return;
 	}
@@ -800,13 +800,13 @@ void CShangpinUpdatePageUI::HandleDelete()
 
 	if (document.HasParseError())
 	{
-		ShowError(L"服务器错误");
+		ShowError(L"服务器错误");
 		return;
 	}
 
 	if (!document.HasMember("errcode") || !document.HasMember("errmsg"))
 	{
-		ShowError(L"服务器错误");
+		ShowError(L"服务器错误");
 		return;
 	}
 
@@ -820,10 +820,10 @@ void CShangpinUpdatePageUI::HandleDelete()
 		return;
 	}
 
-	//本地数据库删除这个商品
+	//本地数据库删除这个商品
 	CFoodHandle::GetInstance()->DeleteOndeFood(m_foodinfo.id);
 
-	::PostMessage(m_pManager->GetPaintWindow(), WM_FOOD_HANDLE_SUCCESS, 0, 0);
+	PostMessage(m_pManager->GetPaintWindow(), WM_FOOD_HANDLE_SUCCESS, 0, 0);
 }
 
 void CShangpinUpdatePageUI::ShowError(std::wstring msg)

+ 21 - 21
zhipuzi_pos_windows/page/CShoukuanOrderListPageUI.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CShoukuanOrderListPageUI.h"
 
 #include "../control/CShoukuanOrderItemUI.h"
@@ -21,14 +21,14 @@ CShoukuanOrderListPageUI::~CShoukuanOrderListPageUI()
 {
 }
 
-//初始化当前页面的展示,处理默认展示效果,在页面被加载的时候调用
+//初始化当前页面的展示,处理默认展示效果,在页面被加载的时候调用
 void CShoukuanOrderListPageUI::InitShow()
 {
 	SetPage(1);
 	Refresh();
 }
 
-//处理按钮点击类事件
+//处理按钮点击类事件
 void CShoukuanOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
@@ -81,7 +81,7 @@ void CShoukuanOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 }
 
-//处理option切换事件
+//澶勭悊option鍒囨崲浜嬩欢
 void CShoukuanOrderListPageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
@@ -89,19 +89,19 @@ void CShoukuanOrderListPageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 
 }
 
-//处理下拉框、radio的切换事件
+//处理下拉框、radio的切换事件
 void CShoukuanOrderListPageUI::HandleItemSelectMsg(TNotifyUI& msg)
 {
 
 }
 
-//处理编辑框输入内容改变事件
+//处理编辑框输入内容改变事件
 void CShoukuanOrderListPageUI::HandleTextChangedMsg(TNotifyUI& msg)
 {
 
 }
 
-//处理扫码枪捕捉到的扫码信息
+//处理扫码枪捕捉到的扫码信息
 void CShoukuanOrderListPageUI::HandleTextCapture(std::string content)
 {
 
@@ -121,13 +121,13 @@ bool CShoukuanOrderListPageUI::HandleCustomMessage(UINT uMsg, WPARAM wParam, LPA
 
 void CShoukuanOrderListPageUI::Refresh()
 {
-	//开始转菊花
+	//寮€濮嬭浆鑿婅姳
 	CContainerUI* pOrderListLayout = static_cast<CContainerUI*>(this->FindSubControl(_T("orderlist")));
 	pOrderListLayout->SetVisible(false);
 
 	this->FindSubControl(_T("main_orderlist_loading"))->SetVisible(true);
 
-	//启动一个线程,进行网络请求操作
+	//鍚�姩涓€涓�嚎绋嬶紝杩涜�缃戠粶璇锋眰鎿嶄綔
 	ShoukuanOrderListStatus* status = new ShoukuanOrderListStatus;
 	status->m_page = m_page;
 
@@ -139,7 +139,7 @@ void CShoukuanOrderListPageUI::HandleRefresh(ShoukuanOrderListStatus* status)
 {
 	std::string url = "/shouyin/getoldorderlist";
 
-	//请求外卖的未处理订单,直接用当前的page值去请求
+	//璇锋眰澶栧崠鐨勬湭澶勭悊璁㈠崟锛岀洿鎺ョ敤褰撳墠鐨刾age鍊煎幓璇锋眰
 	std::map<std::string, std::string> params;
 	params["page"] = std::to_string(status->m_page);
 	params["content"] = "";
@@ -148,25 +148,25 @@ void CShoukuanOrderListPageUI::HandleRefresh(ShoukuanOrderListStatus* status)
 
 	CZhipuziHttpClient::GetInstance()->Request(url.c_str(), params, response);
 
-	//走到这里,网络请求结束了,对比状态是否发生了改变
+	//璧板埌杩欓噷锛岀綉缁滆�姹傜粨鏉熶簡锛屽�姣旂姸鎬佹槸鍚﹀彂鐢熶簡鏀瑰彉
 	if (status->m_page != m_page)
 	{
-		//用户已经点击了其他状态,这个状态结果无效了,直接返回
+		//用户已经点击了其他状态,这个状态结果无效了,直接返回
 		delete status;
 		return;
 	}
 
-	//将网络返回结果保存起来,等待消息处理重新渲染页面
+	//灏嗙綉缁滆繑鍥炵粨鏋滀繚瀛樿捣鏉ワ紝绛夊緟娑堟伅澶勭悊閲嶆柊娓叉煋椤甸潰
 	m_response = response;
 
-	::PostMessage(m_pManager->GetPaintWindow(), WM_ORDERLIST_REFRESH, 0, 0);
+	PostMessage(m_pManager->GetPaintWindow(), WM_ORDERLIST_REFRESH, 0, 0);
 
 	delete status;
 }
 
 void CShoukuanOrderListPageUI::DoRefresh()
 {
-	//请求成功之后,清空之前的数据
+	//璇锋眰鎴愬姛涔嬪悗锛屾竻绌轰箣鍓嶇殑鏁版嵁
 	CContainerUI* pOrderListLayout = static_cast<CContainerUI*>(this->FindSubControl(_T("orderlist")));
 	pOrderListLayout->RemoveAll();
 
@@ -193,13 +193,13 @@ void CShoukuanOrderListPageUI::DoRefresh()
 		return;
 	}
 
-	//获得数据成功
+	//鑾峰緱鏁版嵁鎴愬姛
 	rapidjson::Value& data = document["data"];
 
 	rapidjson::Value& v_count = data["count"];
 	std::string count = v_count.GetString();
 
-	//处理页数
+	//澶勭悊椤垫暟
 	int nCount = atoi(count.c_str());
 	m_total_page = (int)ceil(nCount / 20.0);
 	if (m_total_page < 1)
@@ -232,7 +232,7 @@ void CShoukuanOrderListPageUI::DoRefresh()
 	}
 
 	CLabelUI* pControl = static_cast<CLabelUI*>(this->FindSubControl(_T("shoukuan_order_list_page")));
-	std::wstring pageinfo = _T("第 ") + CLewaimaiString::ANSIToUnicode(std::to_string(m_page)) + _T("页/共 ") + CLewaimaiString::ANSIToUnicode(std::to_string(m_total_page)) + _T("页");
+	std::wstring pageinfo = _T("第 ") + CLewaimaiString::ANSIToUnicode(std::to_string(m_page)) + _T("页/共 ") + CLewaimaiString::ANSIToUnicode(std::to_string(m_total_page)) + _T("页");
 	pControl->SetText(pageinfo.c_str());
 
 	rapidjson::Value& v_rows = data["rows"];
@@ -241,14 +241,14 @@ void CShoukuanOrderListPageUI::DoRefresh()
 	{
 		rapidjson::Value& v_row_i = v_rows[i];
 
-		//创建一个对象
+		//创建一个对象
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 
 		CShoukuanOrderItemUI* pItem = static_cast<CShoukuanOrderItemUI*>(builder.Create(_T("shoukuan_order_item.xml"), (UINT)0, &cb, m_pManager));
 		if (pItem != NULL)
 		{
-			//初始化该对应的数据
+			//初始化该对应的数据
 			pItem->SetData(v_row_i);
 
 			pOrderListLayout->Add(pItem);
@@ -261,7 +261,7 @@ void CShoukuanOrderListPageUI::DoRefresh()
 		}
 	}
 
-	//重置滚动条的位置
+	//閲嶇疆婊氬姩鏉$殑浣嶇疆
 	tagSIZE size;
 	size.cx = 0;
 	size.cy = 0;

+ 35 - 35
zhipuzi_pos_windows/page/CWaimaiOrderListPageUI.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CWaimaiOrderListPageUI.h"
 
 #include "../control/ControlEx.h"
@@ -23,10 +23,10 @@ CWaimaiOrderListPageUI::~CWaimaiOrderListPageUI()
 {
 }
 
-//初始化当前页面的展示,处理默认展示效果,在页面被加载的时候调用
+//初始化当前页面的展示,处理默认展示效果,在页面被加载的时候调用
 void CWaimaiOrderListPageUI::InitShow()
 {
-	//默认显示未处理的,主要处理第一次展示,后续切换的时候就不改变状态,直接刷新
+	//榛樿�鏄剧ず鏈��鐞嗙殑锛屼富瑕佸�鐞嗙�涓€娆″睍绀猴紝鍚庣画鍒囨崲鐨勬椂鍊欏氨涓嶆敼鍙樼姸鎬侊紝鐩存帴鍒锋柊
 	if (m_status == 1)
 	{
 		COptionUI* option = static_cast<COptionUI*>(this->FindSubControl(_T("waimai_open_switch")));
@@ -37,7 +37,7 @@ void CWaimaiOrderListPageUI::InitShow()
 	Refresh();
 }
 
-//处理按钮点击类事件
+//处理按钮点击类事件
 void CWaimaiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
@@ -60,7 +60,7 @@ void CWaimaiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 
 		if (ret)
 		{
-			//如果确认成功,将被确认的订单删除掉
+			//如果确认成功,将被确认的订单删除掉
 			CVerticalLayoutUI* orderlist = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("orderlist")));
 			int index = orderlist->GetItemIndex(item);
 			orderlist->RemoveAt(index);
@@ -75,7 +75,7 @@ void CWaimaiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 
 		if (ret)
 		{
-			//如果确认成功,将被确认的订单删除掉
+			//如果确认成功,将被确认的订单删除掉
 			CVerticalLayoutUI* orderlist = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("orderlist")));
 			int index = orderlist->GetItemIndex(item);
 			orderlist->RemoveAt(index);
@@ -83,7 +83,7 @@ void CWaimaiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (name == _T("waimai_order_list_fail"))
 	{
-		//外卖订单的打印
+		//外卖订单的打印
 		CWaimaiOrderItemUI* item = static_cast<CWaimaiOrderItemUI*>(msg.pSender->GetParent()->GetParent()->GetParent());
 		std::string waimai_order_id = item->getOrderID();
 
@@ -101,7 +101,7 @@ void CWaimaiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 
 			if (ret)
 			{
-				//如果设为失败成功,将被设为失败的订单删除掉
+				//如果设为失败成功,将被设为失败的订单删除掉
 				CVerticalLayoutUI* orderlist = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("orderlist")));
 				int index = orderlist->GetItemIndex(item);
 				orderlist->RemoveAt(index);
@@ -119,7 +119,7 @@ void CWaimaiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 
 		if (ret)
 		{
-			//同意退款之后,订单变为失败状态
+			//同意退款之后,订单变为失败状态
 			CVerticalLayoutUI* orderlist = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("orderlist")));
 			int index = orderlist->GetItemIndex(item);
 			orderlist->RemoveAt(index);
@@ -134,7 +134,7 @@ void CWaimaiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 
 		if (ret)
 		{
-			//不同意退款,订单还是退款中,等待第三方客服处理
+			//涓嶅悓鎰忛€€娆撅紝璁㈠崟杩樻槸閫€娆句腑锛岀瓑寰呯�涓夋柟瀹㈡湇澶勭悊
 			//CVerticalLayoutUI* orderlist = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("orderlist")));
 			//int index = orderlist->GetItemIndex(item);
 			//orderlist->RemoveAt(index);
@@ -190,15 +190,15 @@ void CWaimaiOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 }
 
-//处理option切换事件
+//澶勭悊option鍒囨崲浜嬩欢
 void CWaimaiOrderListPageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
 
-	//判断外卖的tab
+	//鍒ゆ柇澶栧崠鐨則ab
 	if (name == _T("waimai_open_switch") || name == _T("waimai_confirmed_switch") || name == _T("waimai_delivery_switch") || name == _T("waimai_success_switch") || name == _T("waimai_fail_switch") || name == _T("waimai_cancel_switch") || name == _T("waimai_refund_switch"))
 	{
-		//切换状态全部重新开始从第1页
+		//切换状态全部重新开始从第1页
 		this->SetPage(1);
 
 		if (name == _T("waimai_open_switch"))
@@ -234,19 +234,19 @@ void CWaimaiOrderListPageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 	}
 }
 
-//处理下拉框、radio的切换事件
+//处理下拉框、radio的切换事件
 void CWaimaiOrderListPageUI::HandleItemSelectMsg(TNotifyUI& msg)
 {
 
 }
 
-//处理编辑框输入内容改变事件
+//处理编辑框输入内容改变事件
 void CWaimaiOrderListPageUI::HandleTextChangedMsg(TNotifyUI& msg)
 {
 
 }
 
-//处理扫码枪捕捉到的扫码信息
+//处理扫码枪捕捉到的扫码信息
 void CWaimaiOrderListPageUI::HandleTextCapture(std::string content)
 {
 
@@ -266,13 +266,13 @@ bool CWaimaiOrderListPageUI::HandleCustomMessage(UINT uMsg, WPARAM wParam, LPARA
 
 void CWaimaiOrderListPageUI::Refresh()
 {
-	//开始转菊花
+	//寮€濮嬭浆鑿婅姳
 	CContainerUI* pOrderListLayout = static_cast<CContainerUI*>(this->FindSubControl(_T("orderlist")));
 	pOrderListLayout->SetVisible(false);
 
 	this->FindSubControl(_T("main_orderlist_loading"))->SetVisible(true);
 
-	//启动一个线程,进行网络请求操作
+	//鍚�姩涓€涓�嚎绋嬶紝杩涜�缃戠粶璇锋眰鎿嶄綔
 	OrderListStatus* status = new OrderListStatus;
 	status->m_status = m_status;
 	status->m_page = m_page;
@@ -313,32 +313,32 @@ void CWaimaiOrderListPageUI::HandleRefresh(OrderListStatus* status)
 		url = "/waimaiorder/getrefundlist";
 	}
 
-	//请求外卖的未处理订单,直接用当前的page值去请求
+	//璇锋眰澶栧崠鐨勬湭澶勭悊璁㈠崟锛岀洿鎺ョ敤褰撳墠鐨刾age鍊煎幓璇锋眰
 	std::map<std::string, std::string> params;
 	params["page"] = std::to_string(status->m_page);
 	std::string response;
 
 	CZhipuziHttpClient::GetInstance()->Request(url.c_str(), params, response);
 
-	//走到这里,网络请求结束了,对比状态是否发生了改变
+	//璧板埌杩欓噷锛岀綉缁滆�姹傜粨鏉熶簡锛屽�姣旂姸鎬佹槸鍚﹀彂鐢熶簡鏀瑰彉
 	if (status->m_page != m_page || status->m_status != m_status)
 	{
-		//用户已经点击了其他状态,这个状态结果无效了,直接返回
+		//用户已经点击了其他状态,这个状态结果无效了,直接返回
 		delete status;
 		return;
 	}
 
-	//将网络返回结果保存起来,等待消息处理重新渲染页面
+	//灏嗙綉缁滆繑鍥炵粨鏋滀繚瀛樿捣鏉ワ紝绛夊緟娑堟伅澶勭悊閲嶆柊娓叉煋椤甸潰
 	m_response = response;
 
-	::PostMessage(m_pManager->GetPaintWindow(), WM_ORDERLIST_REFRESH, 0, 0);
+	PostMessage(m_pManager->GetPaintWindow(), WM_ORDERLIST_REFRESH, 0, 0);
 
 	delete status;
 }
 
 void CWaimaiOrderListPageUI::DoRefresh()
 {
-	//请求成功之后,清空之前的数据
+	//璇锋眰鎴愬姛涔嬪悗锛屾竻绌轰箣鍓嶇殑鏁版嵁
 	CContainerUI* pOrderListLayout = static_cast<CContainerUI*>(this->FindSubControl(_T("orderlist")));
 	pOrderListLayout->RemoveAll();
 
@@ -373,13 +373,13 @@ void CWaimaiOrderListPageUI::DoRefresh()
 		return;
 	}
 
-	//获得数据成功
+	//鑾峰緱鏁版嵁鎴愬姛
 	rapidjson::Value& data = document["data"];
 
 	rapidjson::Value& v_count = data["count"];
 	std::string count = v_count.GetString();
 
-	//处理页数
+	//澶勭悊椤垫暟
 	int nCount = atoi(count.c_str());
 	m_total_page = (int)ceil(nCount / 20.0);
 	if (m_total_page < 1)
@@ -412,7 +412,7 @@ void CWaimaiOrderListPageUI::DoRefresh()
 	}
 
 	CLabelUI* pControl = static_cast<CLabelUI*>(this->FindSubControl(_T("waimai_order_list_page")));
-	std::wstring pageinfo = _T("第 ") + CLewaimaiString::ANSIToUnicode(std::to_string(m_page)) + _T("页/共 ") + CLewaimaiString::ANSIToUnicode(std::to_string(m_total_page)) + _T("页");
+	std::wstring pageinfo = _T("第 ") + CLewaimaiString::ANSIToUnicode(std::to_string(m_page)) + _T("页/共 ") + CLewaimaiString::ANSIToUnicode(std::to_string(m_total_page)) + _T("页");
 	pControl->SetText(pageinfo.c_str());
 
 	rapidjson::Value& v_rows = data["rows"];
@@ -421,14 +421,14 @@ void CWaimaiOrderListPageUI::DoRefresh()
 	{
 		rapidjson::Value& v_row_i = v_rows[i];
 
-		//创建一个对象
+		//创建一个对象
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 
 		CWaimaiOrderItemUI* pItem = static_cast<CWaimaiOrderItemUI*>(builder.Create(_T("waimai_order_item.xml"), (UINT)0, &cb, m_pManager));
 		if (pItem != NULL)
 		{
-			//初始化该对应的数据
+			//初始化该对应的数据
 			pItem->SetStatus(m_status);
 
 			pItem->SetData(v_row_i);
@@ -443,7 +443,7 @@ void CWaimaiOrderListPageUI::DoRefresh()
 		}
 	}
 
-	//重置滚动条的位置
+	//閲嶇疆婊氬姩鏉$殑浣嶇疆
 	tagSIZE size;
 	size.cx = 0;
 	size.cy = 0;
@@ -547,8 +547,8 @@ void CWaimaiOrderListPageUI::Hujiaoqucan(CWaimaiOrderItemUI* item)
 
 	rapidjson::Value& data = document["data"];
 
-	//语音播报
-	CSpeech::MSSSpeak((CLewaimaiString::UTF8ToUnicode(take_food_code) + L"号,请取餐!").c_str());
+	//璇�煶鎾�姤
+	CSpeech::MSSSpeak((CLewaimaiString::UTF8ToUnicode(take_food_code) + L"鍙凤紝璇峰彇椁愶紒").c_str());
 }
 
 void CWaimaiOrderListPageUI::Fadan(CWaimaiOrderItemUI* item)
@@ -613,7 +613,7 @@ void CWaimaiOrderListPageUI::Fadan(CWaimaiOrderItemUI* item)
 		pThirdDeliverySelectDlg->SetIcon(IDI_ICON_DUILIB);
 		pThirdDeliverySelectDlg->CenterWindow();
 
-		pThirdDeliverySelectDlg->SetTitle(L"请选择第三方配送服务商");
+		pThirdDeliverySelectDlg->SetTitle(L"璇烽€夋嫨绗�笁鏂归厤閫佹湇鍔″晢");
 
 		pThirdDeliverySelectDlg->SetInfo(open_kuaifuwu, open_dada, open_shunfeng, open_lewaimai, open_fengniao);
 
@@ -686,7 +686,7 @@ void CWaimaiOrderListPageUI::Quxiaofadan(CWaimaiOrderItemUI* item)
 
 	rapidjson::Value& data = document["data"];
 
-	//取消发单成功,刷新
+	//取消发单成功,刷新
 	Refresh();
 }
 
@@ -760,6 +760,6 @@ void CWaimaiOrderListPageUI::FadanByType(std::string order_id, std::string selec
 
 	rapidjson::Value& data = document["data"];
 
-	//发单成功,刷新
+	//发单成功,刷新
 	Refresh();
 }

+ 21 - 21
zhipuzi_pos_windows/page/CZhengcanOrderListPageUI.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CZhengcanOrderListPageUI.h"
 
 #include "../control/CZhengcanOrderItemUI.h"
@@ -21,14 +21,14 @@ CZhengcanOrderListPageUI::~CZhengcanOrderListPageUI()
 {
 }
 
-//初始化当前页面的展示,处理默认展示效果,在页面被加载的时候调用
+//初始化当前页面的展示,处理默认展示效果,在页面被加载的时候调用
 void CZhengcanOrderListPageUI::InitShow()
 {
 	SetPage(1);
 	Refresh();
 }
 
-//处理按钮点击类事件
+//处理按钮点击类事件
 void CZhengcanOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
@@ -77,7 +77,7 @@ void CZhengcanOrderListPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 }
 
-//处理option切换事件
+//澶勭悊option鍒囨崲浜嬩欢
 void CZhengcanOrderListPageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
@@ -85,19 +85,19 @@ void CZhengcanOrderListPageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 
 }
 
-//处理下拉框、radio的切换事件
+//处理下拉框、radio的切换事件
 void CZhengcanOrderListPageUI::HandleItemSelectMsg(TNotifyUI& msg)
 {
 
 }
 
-//处理编辑框输入内容改变事件
+//处理编辑框输入内容改变事件
 void CZhengcanOrderListPageUI::HandleTextChangedMsg(TNotifyUI& msg)
 {
 
 }
 
-//处理扫码枪捕捉到的扫码信息
+//处理扫码枪捕捉到的扫码信息
 void CZhengcanOrderListPageUI::HandleTextCapture(std::string content)
 {
 
@@ -117,13 +117,13 @@ bool CZhengcanOrderListPageUI::HandleCustomMessage(UINT uMsg, WPARAM wParam, LPA
 
 void CZhengcanOrderListPageUI::Refresh()
 {
-	//开始转菊花
+	//寮€濮嬭浆鑿婅姳
 	CContainerUI* pOrderListLayout = static_cast<CContainerUI*>(this->FindSubControl(_T("orderlist")));
 	pOrderListLayout->SetVisible(false);
 
 	this->FindSubControl(_T("main_orderlist_loading"))->SetVisible(true);
 
-	//启动一个线程,进行网络请求操作
+	//鍚�姩涓€涓�嚎绋嬶紝杩涜�缃戠粶璇锋眰鎿嶄綔
 	ZhengcanOrderListStatus* status = new ZhengcanOrderListStatus;
 	status->m_page = m_page;
 
@@ -135,32 +135,32 @@ void CZhengcanOrderListPageUI::HandleRefresh(ZhengcanOrderListStatus* status)
 {
 	std::string url = "/dinnercash/getpayorderlist";
 
-	//请求外卖的未处理订单,直接用当前的page值去请求
+	//璇锋眰澶栧崠鐨勬湭澶勭悊璁㈠崟锛岀洿鎺ョ敤褰撳墠鐨刾age鍊煎幓璇锋眰
 	std::map<std::string, std::string> params;
 	params["page"] = std::to_string(status->m_page);
 	std::string response;
 
 	CZhipuziHttpClient::GetInstance()->Request(url.c_str(), params, response);
 
-	//走到这里,网络请求结束了,对比状态是否发生了改变
+	//璧板埌杩欓噷锛岀綉缁滆�姹傜粨鏉熶簡锛屽�姣旂姸鎬佹槸鍚﹀彂鐢熶簡鏀瑰彉
 	if (status->m_page != m_page)
 	{
-		//用户已经点击了其他状态,这个状态结果无效了,直接返回
+		//用户已经点击了其他状态,这个状态结果无效了,直接返回
 		delete status;
 		return;
 	}
 
-	//将网络返回结果保存起来,等待消息处理重新渲染页面
+	//灏嗙綉缁滆繑鍥炵粨鏋滀繚瀛樿捣鏉ワ紝绛夊緟娑堟伅澶勭悊閲嶆柊娓叉煋椤甸潰
 	m_response = response;
 
-	::PostMessage(m_pManager->GetPaintWindow(), WM_ORDERLIST_REFRESH, 0, 0);
+	PostMessage(m_pManager->GetPaintWindow(), WM_ORDERLIST_REFRESH, 0, 0);
 
 	delete status;
 }
 
 void CZhengcanOrderListPageUI::DoRefresh()
 {
-	//请求成功之后,清空之前的数据
+	//璇锋眰鎴愬姛涔嬪悗锛屾竻绌轰箣鍓嶇殑鏁版嵁
 	CContainerUI* pOrderListLayout = static_cast<CContainerUI*>(this->FindSubControl(_T("orderlist")));
 	pOrderListLayout->RemoveAll();
 
@@ -187,13 +187,13 @@ void CZhengcanOrderListPageUI::DoRefresh()
 		return;
 	}
 
-	//获得数据成功
+	//鑾峰緱鏁版嵁鎴愬姛
 	rapidjson::Value& data = document["data"];
 
 	rapidjson::Value& v_count = data["count"];
 	std::string count = v_count.GetString();
 
-	//处理页数
+	//澶勭悊椤垫暟
 	int nCount = atoi(count.c_str());
 	m_total_page = (int)ceil(nCount / 20.0);
 	if (m_total_page < 1)
@@ -226,7 +226,7 @@ void CZhengcanOrderListPageUI::DoRefresh()
 	}
 
 	CLabelUI* pControl = static_cast<CLabelUI*>(this->FindSubControl(_T("zhengcan_order_list_page")));
-	std::wstring pageinfo = _T("第 ") + CLewaimaiString::ANSIToUnicode(std::to_string(m_page)) + _T("页/共 ") + CLewaimaiString::ANSIToUnicode(std::to_string(m_total_page)) + _T("页");
+	std::wstring pageinfo = _T("第 ") + CLewaimaiString::ANSIToUnicode(std::to_string(m_page)) + _T("页/共 ") + CLewaimaiString::ANSIToUnicode(std::to_string(m_total_page)) + _T("页");
 	pControl->SetText(pageinfo.c_str());
 
 	rapidjson::Value& v_rows = data["rows"];
@@ -235,14 +235,14 @@ void CZhengcanOrderListPageUI::DoRefresh()
 	{
 		rapidjson::Value& v_row_i = v_rows[i];
 
-		//创建一个对象
+		//创建一个对象
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 
 		CZhengcanOrderItemUI* pItem = static_cast<CZhengcanOrderItemUI*>(builder.Create(_T("zhengcan_order_item.xml"), (UINT)0, &cb, m_pManager));
 		if (pItem != NULL)
 		{
-			//初始化该对应的数据
+			//初始化该对应的数据
 			pItem->SetData(v_row_i);
 
 			pOrderListLayout->Add(pItem);
@@ -255,7 +255,7 @@ void CZhengcanOrderListPageUI::DoRefresh()
 		}
 	}
 
-	//重置滚动条的位置
+	//閲嶇疆婊氬姩鏉$殑浣嶇疆
 	tagSIZE size;
 	size.cx = 0;
 	size.cy = 0;

+ 37 - 0
zhipuzi_pos_windows/tool/CAppEnv.cpp

@@ -51,24 +51,38 @@ void CAppEnv::Start()
 
 void CAppEnv::Stop()
 {
+	auto time_1 = std::chrono::high_resolution_clock::now();
+
 	//停止打印任务
 	CPosPrinterQueue::GetInstance()->StopWork();
 
+	auto time_2 = std::chrono::high_resolution_clock::now();
+
 	//停止称重任务
 	CChengzhongWorker::GetInstance()->StopWork();
 
+	auto time_3 = std::chrono::high_resolution_clock::now();
+
 	//停止声音任务
 	CVoiceWorker::GetInstance()->Stop();
 
+	auto time_4 = std::chrono::high_resolution_clock::now();
+
 	//停止摄像头任务
 	CVideoCaptureWorker::GetInstance()->Stop();
 
+	auto time_5 = std::chrono::high_resolution_clock::now();
+
 	//暂停AI识别任务
 	CDiandanAIShibieWorker::GetInstance()->StopWork();
 
+	auto time_6 = std::chrono::high_resolution_clock::now();
+
 	//停止通用任务
 	CCommonWorker::GetInstance()->Stop();
 
+	auto time_7 = std::chrono::high_resolution_clock::now();
+
 	//必须等所有工作线程都退出了,才能走到这里,否则可能会有一些线程还在访问已经被销毁的资源,导致崩溃
 	while (m_worker_count > 0)
 	{
@@ -76,6 +90,29 @@ void CAppEnv::Stop()
 		Sleep(30);
 	}
 
+	auto time_8 = std::chrono::high_resolution_clock::now();
+
+	auto duration1 = std::chrono::duration_cast<std::chrono::milliseconds>(time_2 - time_1);
+	DEBUG_LOG(("打印任务耗时: " + std::to_string(duration1.count()) + " 毫秒").c_str());
+
+	auto duration2 = std::chrono::duration_cast<std::chrono::milliseconds>(time_3 - time_2);
+	DEBUG_LOG(("称重任务耗时: " + std::to_string(duration2.count()) + " 毫秒").c_str());
+
+	auto duration3 = std::chrono::duration_cast<std::chrono::milliseconds>(time_4 - time_3);
+	DEBUG_LOG(("声音任务耗时: " + std::to_string(duration3.count()) + " 毫秒").c_str());
+
+	auto duration4 = std::chrono::duration_cast<std::chrono::milliseconds>(time_5 - time_4);
+	DEBUG_LOG(("摄像头任务耗时: " + std::to_string(duration4.count()) + " 毫秒").c_str());
+
+	auto duration5 = std::chrono::duration_cast<std::chrono::milliseconds>(time_6 - time_5);
+	DEBUG_LOG(("AI识别任务耗时: " + std::to_string(duration5.count()) + " 毫秒").c_str());
+
+	auto duration6 = std::chrono::duration_cast<std::chrono::milliseconds>(time_7 - time_6);
+	DEBUG_LOG(("通用任务耗时: " + std::to_string(duration6.count()) + " 毫秒").c_str());
+
+	auto duration7 = std::chrono::duration_cast<std::chrono::milliseconds>(time_8 - time_7);
+	DEBUG_LOG(("总耗时: " + std::to_string(duration7.count()) + " 毫秒").c_str());
+
 	int a = 1;
 }
 

+ 22 - 22
zhipuzi_pos_windows/wnd/CFulikaShoukuanWnd.cpp

@@ -942,7 +942,7 @@ void CFulikaShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -956,7 +956,7 @@ void CFulikaShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -967,7 +967,7 @@ void CFulikaShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -991,7 +991,7 @@ void CFulikaShoukuanWnd::HandleShoukuan()
 		std::string errmsg = document["errmsg"].GetString();
 		m_fail_message = CLewaimaiString::UTF8ToUnicode(errmsg);
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1002,7 +1002,7 @@ void CFulikaShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1036,7 +1036,7 @@ void CFulikaShoukuanWnd::HandleShoukuan()
 
 		}
 
-		SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 	}
 	else if (s_status == "fail")
 	{
@@ -1045,14 +1045,14 @@ void CFulikaShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = CLewaimaiString::UTF8ToUnicode(data["message"].GetString());
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 	else if (s_status == "password")
 	{
 		m_shoukuan_status = 2;
 
 		//需要查询支付状态
-		SendMessage(WM_SHOUKUAN_STATUS_NEEDPASSWORD, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_NEEDPASSWORD, 0, 0);
 	}
 	else
 	{
@@ -1060,7 +1060,7 @@ void CFulikaShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 }
 
@@ -1095,7 +1095,7 @@ void CFulikaShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -1109,7 +1109,7 @@ void CFulikaShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -1120,7 +1120,7 @@ void CFulikaShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -1133,7 +1133,7 @@ void CFulikaShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -1157,7 +1157,7 @@ void CFulikaShoukuanWnd::HandleShoukuanPassword()
 				m_take_food_code = data["take_food_code"].GetString();
 			}
 
-			SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 
 			break;
 		}
@@ -1168,7 +1168,7 @@ void CFulikaShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"顾客取消支付,请重新扫码收款";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 
 			break;
 		}
@@ -1183,7 +1183,7 @@ void CFulikaShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			break;
 		}
 	}
@@ -1225,7 +1225,7 @@ void CFulikaShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1239,7 +1239,7 @@ void CFulikaShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1250,7 +1250,7 @@ void CFulikaShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1263,7 +1263,7 @@ void CFulikaShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1278,14 +1278,14 @@ void CFulikaShoukuanWnd::HandleCancelShoukuan()
 		m_shoukuan_status = 4;
 
 		m_fail_message = L"商家取消收款";
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 
 	m_shoukuan_status = 4;
 
 	m_fail_message = L"服务器错误";
 
-	SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+	PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 }
 
 void CFulikaShoukuanWnd::ReadShoukuanValue()

+ 14 - 14
zhipuzi_pos_windows/wnd/CHuiyuanBangkaWnd.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CHuiyuanBangkaWnd.h"
 
 #include "../helper/MD5.h"
@@ -112,16 +112,16 @@ LRESULT CHuiyuanBangkaWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lPara
 
 		m_qingqiu_mutex.unlock();
 
-		//验证成功了
+		//验证成功了
 		Close(IDOK);
 
 		return true;
 	}
 	else if (uMsg == WM_MEMBER_CHECK_FAIL)
 	{
-		//验证失败了
+		//验证失败了
 		
-		//失败原因
+		//澶辫触鍘熷洜
 		CLabelUI* pErrorInfo = static_cast<CLabelUI*>(m_pm.FindControl(_T("shoukuanresult")));
 		pErrorInfo->SetText(m_errorInfo.c_str());
 		pErrorInfo->SetVisible(true);
@@ -144,7 +144,7 @@ LRESULT CHuiyuanBangkaWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOO
 	styleValue &= ~WS_CAPTION;
 	::SetWindowLong(*this, GWL_STYLE, styleValue | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
 
-	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
+	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
 	m_pm.Init(m_hWnd);
 
 	m_pm.AddPreMessageFilter(this);
@@ -154,10 +154,10 @@ LRESULT CHuiyuanBangkaWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOO
 	CControlUI* pRoot = builder.Create(_T("huiyuan_bangka_wnd.xml"), (UINT)0, NULL, &m_pm);
 	ASSERT(pRoot && "Failed to parse XML");
 
-	// 把这些控件绘制到本窗口上
+	// 鎶婅繖浜涙帶浠剁粯鍒跺埌鏈�獥鍙d笂
 	m_pm.AttachDialog(pRoot);
 
-	// 把自己加入到CPaintManagerUI的m_aNotifiers数组中,用于处理Notify函数
+	// 鎶婅嚜宸卞姞鍏ュ埌CPaintManagerUI鐨刴_aNotifiers鏁扮粍涓�紝鐢ㄤ簬澶勭悊Notify鍑芥暟
 	m_pm.AddNotifier(this);
 
 	Init();
@@ -210,7 +210,7 @@ void CHuiyuanBangkaWnd::SetMemberInfo(std::string member_id, std::string phone,
 	m_name = name;
 	m_member_card_no = member_card_no;
 
-	if (CLewaimaiString::UTF8ToUnicode(sex) == L"男")
+	if (CLewaimaiString::UTF8ToUnicode(sex) == L"男")
 	{
 		m_sex = "0";
 	}
@@ -234,7 +234,7 @@ void CHuiyuanBangkaWnd::StartYanzheng()
 
 	m_qingqiu_mutex.unlock();
 
-	//开始处理
+	//开始处理
 	std::thread(&CHuiyuanBangkaWnd::ConfirmMember, this).detach();
 }
 
@@ -257,7 +257,7 @@ void CHuiyuanBangkaWnd::ConfirmMember()
 	bool ret = CZhipuziHttpClient::GetInstance()->Request("/member/changeinfo", params, response);
 	if (!ret)
 	{
-		m_errorInfo = _T("网络请求出错");
+		m_errorInfo = _T("缃戠粶璇锋眰鍑洪敊");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -268,7 +268,7 @@ void CHuiyuanBangkaWnd::ConfirmMember()
 
 	if (document.HasParseError())
 	{
-		m_errorInfo = _T("服务器返回数据格式错误");
+		m_errorInfo = _T("服务器返回数据格式错误");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -277,7 +277,7 @@ void CHuiyuanBangkaWnd::ConfirmMember()
 	{
 		if (!document.HasMember("errcode") || !document.HasMember("errmsg"))
 		{
-			m_errorInfo = _T("服务器返回数据格式错误");
+			m_errorInfo = _T("服务器返回数据格式错误");
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 
 			return;
@@ -287,7 +287,7 @@ void CHuiyuanBangkaWnd::ConfirmMember()
 		int errcode = v_errcode.GetInt();
 		if (errcode != 0)
 		{
-			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"会员绑定实体卡失败:") + std::string(document["errmsg"].GetString());
+			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"浼氬憳缁戝畾瀹炰綋鍗″け璐ワ細") + std::string(document["errmsg"].GetString());
 			m_errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 
@@ -298,7 +298,7 @@ void CHuiyuanBangkaWnd::ConfirmMember()
 	}
 }
 
-//处理键盘捕捉结果
+//澶勭悊閿�洏鎹曟崏缁撴灉
 void CHuiyuanBangkaWnd::HandleTextCapture(std::string content)
 {
 	m_card_identify = content;

+ 30 - 30
zhipuzi_pos_windows/wnd/CHuiyuanChongzhiWnd.cpp

@@ -879,7 +879,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 
 			m_fail_message = L"收款码格式不对,请检查后重新输入!";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -892,7 +892,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 
 				m_fail_message = L"收款码格式不对,请检查后重新输入!";
 
-				SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+				PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 				return;
 			}
 		}
@@ -928,7 +928,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 
 			m_fail_message = L"收款码格式不对,请检查后重新输入!";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 	}
@@ -947,7 +947,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 
 		m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -961,7 +961,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -972,7 +972,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -986,7 +986,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 		std::string errmsg = document["errmsg"].GetString();
 		m_fail_message = CLewaimaiString::UTF8ToUnicode(errmsg);
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -997,7 +997,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1045,7 +1045,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 
 		m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1059,7 +1059,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1070,7 +1070,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1084,7 +1084,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 		std::string errmsg = document["errmsg"].GetString();
 		m_fail_message = CLewaimaiString::UTF8ToUnicode(errmsg);
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1095,7 +1095,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1111,7 +1111,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 
 		m_show_trade_no = data_2["show_trade_no"].GetString();
 
-		SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 	}
 	else if (s_status == "fail")
 	{
@@ -1120,7 +1120,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 
 		m_fail_message = CLewaimaiString::UTF8ToUnicode(data_2["message"].GetString());
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 	else if (s_status == "password")
 	{
@@ -1129,7 +1129,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 		m_trade_no = data_2["trade_no"].GetString();
 
 		//需要查询支付状态
-		SendMessage(WM_SHOUKUAN_STATUS_NEEDPASSWORD, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_NEEDPASSWORD, 0, 0);
 	}
 	else
 	{
@@ -1137,7 +1137,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 }
 
@@ -1159,7 +1159,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -1173,7 +1173,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -1184,7 +1184,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -1197,7 +1197,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -1213,7 +1213,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuanPassword()
 
 			m_show_trade_no = data["show_trade_no"].GetString();
 
-			SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 
 			break;
 		}
@@ -1224,7 +1224,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"顾客取消支付,请重新扫码充值";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 
 			break;
 		}
@@ -1239,7 +1239,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			break;
 		}
 	}
@@ -1268,7 +1268,7 @@ void CHuiyuanChongzhiWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1282,7 +1282,7 @@ void CHuiyuanChongzhiWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1293,7 +1293,7 @@ void CHuiyuanChongzhiWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1306,7 +1306,7 @@ void CHuiyuanChongzhiWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1321,14 +1321,14 @@ void CHuiyuanChongzhiWnd::HandleCancelShoukuan()
 		m_shoukuan_status = 4;
 
 		m_fail_message = L"商家取消充值";
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 
 	m_shoukuan_status = 4;
 
 	m_fail_message = L"服务器错误";
 
-	SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+	PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 }
 
 void CHuiyuanChongzhiWnd::StartClose()

+ 14 - 14
zhipuzi_pos_windows/wnd/CHuiyuanShoukuanWnd.cpp

@@ -486,7 +486,7 @@ void CHuiyuanShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -500,7 +500,7 @@ void CHuiyuanShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -511,7 +511,7 @@ void CHuiyuanShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -525,7 +525,7 @@ void CHuiyuanShoukuanWnd::HandleShoukuan()
 		std::string errmsg = document["errmsg"].GetString();
 		m_fail_message = CLewaimaiString::UTF8ToUnicode(errmsg);
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -536,7 +536,7 @@ void CHuiyuanShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -573,7 +573,7 @@ void CHuiyuanShoukuanWnd::HandleShoukuan()
 		m_balance = CLewaimaiString::DoubleToString(data["balance"].GetFloat(), 2);
 		m_member_number = data["member_number"].GetString();
 
-		SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 	}
 	else if (s_status == "fail")
 	{
@@ -582,7 +582,7 @@ void CHuiyuanShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = CLewaimaiString::UTF8ToUnicode(data["message"].GetString());
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 	else
 	{
@@ -590,7 +590,7 @@ void CHuiyuanShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 }
 
@@ -623,7 +623,7 @@ void CHuiyuanShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -637,7 +637,7 @@ void CHuiyuanShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -648,7 +648,7 @@ void CHuiyuanShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -661,7 +661,7 @@ void CHuiyuanShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -676,14 +676,14 @@ void CHuiyuanShoukuanWnd::HandleCancelShoukuan()
 		m_shoukuan_status = 4;
 
 		m_fail_message = L"商家取消收款";
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 
 	m_shoukuan_status = 4;
 
 	m_fail_message = L"服务器错误";
 
-	SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+	PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 }
 
 void CHuiyuanShoukuanWnd::ReadShoukuanValue()

+ 25 - 25
zhipuzi_pos_windows/wnd/CHuiyuanXiugaimimaWnd.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CHuiyuanXiugaimimaWnd.h"
 
 #include "../helper/MD5.h"
@@ -112,14 +112,14 @@ LRESULT CHuiyuanXiugaimimaWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM l
 
 		m_qingqiu_mutex.unlock();
 
-		//验证成功了
+		//验证成功了
 		Close(IDOK);
 
 		return true;
 	}
 	else if (uMsg == WM_MEMBER_CHECK_FAIL)
 	{
-		//验证失败了
+		//验证失败了
 		CCheckBoxUI* pOpen = static_cast<CCheckBoxUI*>(m_pm.FindControl((L"password_pay_open")));
 		pOpen->SetEnabled(true);
 
@@ -132,7 +132,7 @@ LRESULT CHuiyuanXiugaimimaWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM l
 		CButtonUI* pSave = static_cast<CButtonUI*>(m_pm.FindControl(_T("save")));
 		pSave->SetEnabled(true);
 
-		//失败原因
+		//澶辫触鍘熷洜
 		CLabelUI* pErrorInfo = static_cast<CLabelUI*>(m_pm.FindControl(_T("shoukuanresult")));
 		pErrorInfo->SetText(m_errorInfo.c_str());
 		pErrorInfo->SetVisible(true);
@@ -155,7 +155,7 @@ LRESULT CHuiyuanXiugaimimaWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam,
 	styleValue &= ~WS_CAPTION;
 	::SetWindowLong(*this, GWL_STYLE, styleValue | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
 
-	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
+	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
 	m_pm.Init(m_hWnd);
 
 	m_pm.AddPreMessageFilter(this);
@@ -165,10 +165,10 @@ LRESULT CHuiyuanXiugaimimaWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam,
 	CControlUI* pRoot = builder.Create(_T("huiyuan_xiugaimima_wnd.xml"), (UINT)0, NULL, &m_pm);
 	ASSERT(pRoot && "Failed to parse XML");
 
-	// 把这些控件绘制到本窗口上
+	// 鎶婅繖浜涙帶浠剁粯鍒跺埌鏈�獥鍙d笂
 	m_pm.AttachDialog(pRoot);
 
-	// 把自己加入到CPaintManagerUI的m_aNotifiers数组中,用于处理Notify函数
+	// 鎶婅嚜宸卞姞鍏ュ埌CPaintManagerUI鐨刴_aNotifiers鏁扮粍涓�紝鐢ㄤ簬澶勭悊Notify鍑芥暟
 	m_pm.AddNotifier(this);
 
 	Init();
@@ -203,7 +203,7 @@ void CHuiyuanXiugaimimaWnd::Notify(TNotifyUI& msg)
 		if (senderName == L"password_edit")
 		{
 
-			//只能输入数字,其他的全部删除
+			//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 			CEditUI* m_pEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("password_edit")));
 			if (!m_pEdit->GetText().IsEmpty())
 			{
@@ -215,11 +215,11 @@ void CHuiyuanXiugaimimaWnd::Notify(TNotifyUI& msg)
 					unsigned char tmp = strValue.at(nIndex);
 					if (tmp > 57 || tmp < 48)
 					{
-						//ASCII码不是数字的都过滤掉
+						//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 						strValue = strValue.substr(0, nIndex);
 
 						m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-						m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+						m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 						break;
 					}
@@ -230,7 +230,7 @@ void CHuiyuanXiugaimimaWnd::Notify(TNotifyUI& msg)
 		if (senderName == L"password_edit_2")
 		{
 
-			//只能输入数字,其他的全部删除
+			//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 			CEditUI* m_pEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("password_edit_2")));
 			if (!m_pEdit->GetText().IsEmpty())
 			{
@@ -242,11 +242,11 @@ void CHuiyuanXiugaimimaWnd::Notify(TNotifyUI& msg)
 					unsigned char tmp = strValue.at(nIndex);
 					if (tmp > 57 || tmp < 48)
 					{
-						//ASCII码不是数字的都过滤掉
+						//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 						strValue = strValue.substr(0, nIndex);
 
 						m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-						m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+						m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 						break;
 					}
@@ -269,7 +269,7 @@ void CHuiyuanXiugaimimaWnd::Notify(TNotifyUI& msg)
 
 void CHuiyuanXiugaimimaWnd::Init()
 {
-	m_pm.FindControl(_T("member_phone"))->SetText((L"手机号:" + CLewaimaiString::UTF8ToUnicode(m_phone)).c_str());
+	m_pm.FindControl(_T("member_phone"))->SetText((L"鎵嬫満鍙凤細" + CLewaimaiString::UTF8ToUnicode(m_phone)).c_str());
 
 	CCheckBoxUI* pOpen = static_cast<CCheckBoxUI*>(m_pm.FindControl(L"password_pay_open"));
 	if (m_is_open_pay_password == "1")
@@ -290,7 +290,7 @@ void CHuiyuanXiugaimimaWnd::SetMemberInfo(std::string member_id, std::string pho
 	m_name = name;
 	m_member_card_no = member_card_no;
 
-	if (CLewaimaiString::UTF8ToUnicode(sex) == L"男")
+	if (CLewaimaiString::UTF8ToUnicode(sex) == L"男")
 	{
 		m_sex = "0";
 	}
@@ -323,7 +323,7 @@ void CHuiyuanXiugaimimaWnd::StartYanzheng()
 
 	if (wsPassword.length() == 0)
 	{
-		m_errorInfo = _T("支付密码不能为空");
+		m_errorInfo = _T("鏀�粯瀵嗙爜涓嶈兘涓虹┖");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -331,7 +331,7 @@ void CHuiyuanXiugaimimaWnd::StartYanzheng()
 
 	if (wsPassword.length() != 6)
 	{
-		m_errorInfo = _T("支付密码只能为6位数字");
+		m_errorInfo = _T("支付密码只能为6位数字");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -345,7 +345,7 @@ void CHuiyuanXiugaimimaWnd::StartYanzheng()
 
 	if (wsPassword2.length() == 0)
 	{
-		m_errorInfo = _T("确认密码不能为空");
+		m_errorInfo = _T("纭��瀵嗙爜涓嶈兘涓虹┖");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -353,7 +353,7 @@ void CHuiyuanXiugaimimaWnd::StartYanzheng()
 
 	if (wsPassword2.length() != 6)
 	{
-		m_errorInfo = _T("确认密码只能为6位数字");
+		m_errorInfo = _T("确认密码只能为6位数字");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -361,7 +361,7 @@ void CHuiyuanXiugaimimaWnd::StartYanzheng()
 
 	if (m_password != password_2)
 	{
-		m_errorInfo = _T("两次输入的密码不一样");
+		m_errorInfo = _T("两次输入的密码不一样");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -378,7 +378,7 @@ void CHuiyuanXiugaimimaWnd::StartYanzheng()
 
 	m_qingqiu_mutex.unlock();
 
-	//开始处理
+	//开始处理
 	std::thread(&CHuiyuanXiugaimimaWnd::ConfirmMember, this).detach();
 }
 
@@ -401,7 +401,7 @@ void CHuiyuanXiugaimimaWnd::ConfirmMember()
 	bool ret = CZhipuziHttpClient::GetInstance()->Request("/member/changeinfo", params, response);
 	if (!ret)
 	{
-		m_errorInfo = _T("网络请求出错");
+		m_errorInfo = _T("缃戠粶璇锋眰鍑洪敊");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -412,7 +412,7 @@ void CHuiyuanXiugaimimaWnd::ConfirmMember()
 
 	if (document.HasParseError())
 	{
-		m_errorInfo = _T("服务器返回数据格式错误");
+		m_errorInfo = _T("服务器返回数据格式错误");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -421,7 +421,7 @@ void CHuiyuanXiugaimimaWnd::ConfirmMember()
 	{
 		if (!document.HasMember("errcode") || !document.HasMember("errmsg"))
 		{
-			m_errorInfo = _T("服务器返回数据格式错误");
+			m_errorInfo = _T("服务器返回数据格式错误");
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 
 			return;
@@ -431,7 +431,7 @@ void CHuiyuanXiugaimimaWnd::ConfirmMember()
 		int errcode = v_errcode.GetInt();
 		if (errcode != 0)
 		{
-			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"添加会员失败:") + std::string(document["errmsg"].GetString());
+			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"添加会员失败:") + std::string(document["errmsg"].GetString());
 			m_errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 

+ 20 - 20
zhipuzi_pos_windows/wnd/CHuiyuanXiugaiziliaoWnd.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CHuiyuanXiugaiziliaoWnd.h"
 
 #include "../helper/MD5.h"
@@ -112,18 +112,18 @@ LRESULT CHuiyuanXiugaiziliaoWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM
 
 		m_qingqiu_mutex.unlock();
 
-		//验证成功了
+		//验证成功了
 		Close(IDOK);
 
 		return true;
 	}
 	else if (uMsg == WM_MEMBER_CHECK_FAIL)
 	{
-		//验证失败了
+		//验证失败了
 		CButtonUI* pSave = static_cast<CButtonUI*>(m_pm.FindControl(_T("save")));
 		pSave->SetEnabled(true);
 
-		//失败原因
+		//澶辫触鍘熷洜
 		CLabelUI* pErrorInfo = static_cast<CLabelUI*>(m_pm.FindControl(_T("shoukuanresult")));
 		pErrorInfo->SetText(m_errorInfo.c_str());
 		pErrorInfo->SetVisible(true);
@@ -146,7 +146,7 @@ LRESULT CHuiyuanXiugaiziliaoWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lPara
 	styleValue &= ~WS_CAPTION;
 	::SetWindowLong(*this, GWL_STYLE, styleValue | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
 
-	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
+	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
 	m_pm.Init(m_hWnd);
 
 	m_pm.AddPreMessageFilter(this);
@@ -156,10 +156,10 @@ LRESULT CHuiyuanXiugaiziliaoWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lPara
 	CControlUI* pRoot = builder.Create(_T("huiyuan_xiugaiziliao_wnd.xml"), (UINT)0, NULL, &m_pm);
 	ASSERT(pRoot && "Failed to parse XML");
 
-	// 把这些控件绘制到本窗口上
+	// 鎶婅繖浜涙帶浠剁粯鍒跺埌鏈�獥鍙d笂
 	m_pm.AttachDialog(pRoot);
 
-	// 把自己加入到CPaintManagerUI的m_aNotifiers数组中,用于处理Notify函数
+	// 鎶婅嚜宸卞姞鍏ュ埌CPaintManagerUI鐨刴_aNotifiers鏁扮粍涓�紝鐢ㄤ簬澶勭悊Notify鍑芥暟
 	m_pm.AddNotifier(this);
 
 	Init();
@@ -208,7 +208,7 @@ void CHuiyuanXiugaiziliaoWnd::Notify(TNotifyUI& msg)
 
 void CHuiyuanXiugaiziliaoWnd::Init()
 {
-	m_pm.FindControl(_T("member_phone"))->SetText((L"手机号:" + CLewaimaiString::UTF8ToUnicode(m_phone)).c_str());
+	m_pm.FindControl(_T("member_phone"))->SetText((L"鎵嬫満鍙凤細" + CLewaimaiString::UTF8ToUnicode(m_phone)).c_str());
 
 	m_pm.FindControl(L"kahao_edit")->SetText(CLewaimaiString::UTF8ToUnicode(m_member_card_no).c_str());
 
@@ -243,7 +243,7 @@ void CHuiyuanXiugaiziliaoWnd::SetMemberInfo(std::string member_id, std::string p
 	m_name = name;
 	m_member_card_no = member_card_no;
 
-	if (CLewaimaiString::UTF8ToUnicode(sex) == L"男")
+	if (CLewaimaiString::UTF8ToUnicode(sex) == L"男")
 	{
 		m_sex = "0";
 	}
@@ -261,21 +261,21 @@ void CHuiyuanXiugaiziliaoWnd::SetMemberInfo(std::string member_id, std::string p
 
 void CHuiyuanXiugaiziliaoWnd::StartYanzheng()
 {
-	//会员卡号
+	//浼氬憳鍗″彿
 	CEditUI* pCardNo = static_cast<CEditUI*>(m_pm.FindControl(_T("kahao_edit")));
 	std::wstring wsKahao = pCardNo->GetText();
 	m_member_card_no = CLewaimaiString::UnicodeToUTF8(wsKahao);
 
-	//会员姓名
+	//浼氬憳濮撳悕
 	CEditUI* pName = static_cast<CEditUI*>(m_pm.FindControl(_T("name_edit")));
 	std::wstring wsName = pName->GetText();
 	m_name = CLewaimaiString::UnicodeToUTF8(wsName);
 
-	//会员性别
+	//浼氬憳鎬у埆
 	CCheckBoxUI* pNan = static_cast<CCheckBoxUI*>(m_pm.FindControl((L"xingbie_setting_nan")));
 	if (pNan->IsSelected())
 	{
-		//选中男性
+		//选中男性
 		m_sex = "0";
 	}
 	else
@@ -283,12 +283,12 @@ void CHuiyuanXiugaiziliaoWnd::StartYanzheng()
 		m_sex = "1";
 	}
 
-	//会员地址
+	//浼氬憳鍦板潃
 	CEditUI* pAddress = static_cast<CEditUI*>(m_pm.FindControl(_T("address_edit")));
 	std::wstring wsAddress = pAddress->GetText();
 	m_address = CLewaimaiString::UnicodeToUTF8(wsAddress);
 
-	//会员生日
+	//浼氬憳鐢熸棩
 	CDateTimeUI* pBirthday = static_cast<CDateTimeUI*>(m_pm.FindControl(L"shengri_date"));
 	std::wstring wsBirthday = pBirthday->GetText();
 	m_birthday = CLewaimaiString::UnicodeToUTF8(wsBirthday);
@@ -302,7 +302,7 @@ void CHuiyuanXiugaiziliaoWnd::StartYanzheng()
 
 	m_qingqiu_mutex.unlock();
 
-	//开始处理
+	//开始处理
 	std::thread(&CHuiyuanXiugaiziliaoWnd::ConfirmMember, this).detach();
 }
 
@@ -325,7 +325,7 @@ void CHuiyuanXiugaiziliaoWnd::ConfirmMember()
 	bool ret = CZhipuziHttpClient::GetInstance()->Request("/member/changeinfo", params, response);
 	if (!ret)
 	{
-		m_errorInfo = _T("网络请求出错");
+		m_errorInfo = _T("缃戠粶璇锋眰鍑洪敊");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -336,7 +336,7 @@ void CHuiyuanXiugaiziliaoWnd::ConfirmMember()
 
 	if (document.HasParseError())
 	{
-		m_errorInfo = _T("服务器返回数据格式错误");
+		m_errorInfo = _T("服务器返回数据格式错误");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -345,7 +345,7 @@ void CHuiyuanXiugaiziliaoWnd::ConfirmMember()
 	{
 		if (!document.HasMember("errcode") || !document.HasMember("errmsg"))
 		{
-			m_errorInfo = _T("服务器返回数据格式错误");
+			m_errorInfo = _T("服务器返回数据格式错误");
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 
 			return;
@@ -355,7 +355,7 @@ void CHuiyuanXiugaiziliaoWnd::ConfirmMember()
 		int errcode = v_errcode.GetInt();
 		if (errcode != 0)
 		{
-			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"添加会员失败:") + std::string(document["errmsg"].GetString());
+			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"添加会员失败:") + std::string(document["errmsg"].GetString());
 			m_errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 

+ 4 - 4
zhipuzi_pos_windows/wnd/CMainWnd.cpp

@@ -250,17 +250,17 @@ void CMainWnd::HandleClickMsg(TNotifyUI& msg)
     }
     else if(msg.pSender == m_pMinBtn)
     {
-        SendMessage(WM_SYSCOMMAND, SC_MINIMIZE, 0);
+        PostMessage(WM_SYSCOMMAND, SC_MINIMIZE, 0);
         return;
     }
     else if(msg.pSender == m_pMaxBtn)
     {
-        SendMessage(WM_SYSCOMMAND, SC_MAXIMIZE, 0);
+        PostMessage(WM_SYSCOMMAND, SC_MAXIMIZE, 0);
         return;
     }
     else if(msg.pSender == m_pRestoreBtn)
     {
-        SendMessage(WM_SYSCOMMAND, SC_RESTORE, 0);
+        PostMessage(WM_SYSCOMMAND, SC_RESTORE, 0);
         return;
     }
 	else if (name == L"main_kefubtn")
@@ -990,7 +990,7 @@ LRESULT CMainWnd::OnTrayIcon(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHan
         //显示主窗口
         ShowWindow(SW_SHOWNORMAL);
         //窗口最大化
-        SendMessage(WM_SYSCOMMAND, SC_MAXIMIZE, 0);
+        PostMessage(WM_SYSCOMMAND, SC_MAXIMIZE, 0);
     }
 
     //如果在图标中单击右键则弹出声明式菜单

+ 8 - 8
zhipuzi_pos_windows/wnd/CMemberLoginWnd.cpp

@@ -867,7 +867,7 @@ void CMemberLoginWnd::HandleLogin()
 
 		m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -881,7 +881,7 @@ void CMemberLoginWnd::HandleLogin()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -892,7 +892,7 @@ void CMemberLoginWnd::HandleLogin()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -906,7 +906,7 @@ void CMemberLoginWnd::HandleLogin()
 		std::string errmsg = document["errmsg"].GetString();
 		m_fail_message = CLewaimaiString::UTF8ToUnicode(errmsg);
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -917,7 +917,7 @@ void CMemberLoginWnd::HandleLogin()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -952,7 +952,7 @@ void CMemberLoginWnd::HandleLogin()
 
 			m_fail_message = L"该会员未开启手机号密码登录";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -963,12 +963,12 @@ void CMemberLoginWnd::HandleLogin()
 
 			m_fail_message = L"登录密码错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 	}
 
-	SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
+	PostMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 }
 
 //处理键盘捕捉结果

+ 12 - 12
zhipuzi_pos_windows/wnd/CSaomaCikaWnd.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CSaomaCikaWnd.h"
 
 LRESULT CSaomaCikaWnd::OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
@@ -104,14 +104,14 @@ LRESULT CSaomaCikaWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, b
 	}
 	else if (uMsg == WM_MEMBER_CHECK_SUCCESS)
 	{
-		//验证成功了
+		//验证成功了
 		Close(IDOK);
 
 		return true;
 	}
 	else if (uMsg == WM_MEMBER_CHECK_FAIL)
 	{
-		//验证失败了
+		//验证失败了
 		CLabelUI* pErrorInfo = static_cast<CLabelUI*>(m_pm.FindControl(_T("errinfo")));
 		pErrorInfo->SetText(m_errorInfo.c_str());
 		pErrorInfo->SetVisible(true);
@@ -128,7 +128,7 @@ LRESULT CSaomaCikaWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& b
 	styleValue &= ~WS_CAPTION;
 	::SetWindowLong(*this, GWL_STYLE, styleValue | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
 
-	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
+	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
 	m_pm.Init(m_hWnd);
 
 	m_pm.AddPreMessageFilter(this);
@@ -138,10 +138,10 @@ LRESULT CSaomaCikaWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& b
 	CControlUI* pRoot = builder.Create(_T("saoma_cika_dlg.xml"), (UINT)0, NULL, &m_pm);
 	ASSERT(pRoot && "Failed to parse XML");
 
-	// 把这些控件绘制到本窗口上
+	// 鎶婅繖浜涙帶浠剁粯鍒跺埌鏈�獥鍙d笂
 	m_pm.AttachDialog(pRoot);
 
-	// 把自己加入到CPaintManagerUI的m_aNotifiers数组中,用于处理Notify函数
+	// 鎶婅嚜宸卞姞鍏ュ埌CPaintManagerUI鐨刴_aNotifiers鏁扮粍涓�紝鐢ㄤ簬澶勭悊Notify鍑芥暟
 	m_pm.AddNotifier(this);
 
 	Init();
@@ -181,7 +181,7 @@ void CSaomaCikaWnd::StartYanzheng()
 		return;
 	}
 
-	//开始处理
+	//开始处理
 	std::thread(&CSaomaCikaWnd::ConfirmMember, this).detach();
 }
 
@@ -194,7 +194,7 @@ void CSaomaCikaWnd::ConfirmMember()
 	bool ret = CZhipuziHttpClient::GetInstance()->RequestNew("/crm/marketing/timescoupon/gettimescouponinfobyrandnumber", params, response);
 	if (!ret)
 	{
-		m_errorInfo = _T("网络请求出错");
+		m_errorInfo = _T("缃戠粶璇锋眰鍑洪敊");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -205,7 +205,7 @@ void CSaomaCikaWnd::ConfirmMember()
 
 	if (document.HasParseError())
 	{
-		m_errorInfo = _T("服务器返回数据格式错误");
+		m_errorInfo = _T("服务器返回数据格式错误");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -214,7 +214,7 @@ void CSaomaCikaWnd::ConfirmMember()
 	{
 		if (!document.HasMember("errcode") || !document.HasMember("errmsg"))
 		{
-			m_errorInfo = _T("服务器返回数据格式错误");
+			m_errorInfo = _T("服务器返回数据格式错误");
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 
 			return;
@@ -224,7 +224,7 @@ void CSaomaCikaWnd::ConfirmMember()
 		int errcode = v_errcode.GetInt();
 		if (errcode != 0)
 		{
-			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"次卡扫码失败:") + std::string(document["errmsg"].GetString());
+			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"次卡扫码失败:") + std::string(document["errmsg"].GetString());
 			m_errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 
@@ -264,7 +264,7 @@ void CSaomaCikaWnd::ConfirmMember()
 	}
 }
 
-//处理键盘捕捉结果
+//澶勭悊閿�洏鎹曟崏缁撴灉
 void CSaomaCikaWnd::HandleTextCapture(std::string content)
 {
 	m_code = content;

+ 12 - 12
zhipuzi_pos_windows/wnd/CSaomaQuanyikaWnd.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CSaomaQuanyikaWnd.h"
 
 LRESULT CSaomaQuanyikaWnd::OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
@@ -104,14 +104,14 @@ LRESULT CSaomaQuanyikaWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lPara
 	}
 	else if (uMsg == WM_MEMBER_CHECK_SUCCESS)
 	{
-		//验证成功了
+		//验证成功了
 		Close(IDOK);
 
 		return true;
 	}
 	else if (uMsg == WM_MEMBER_CHECK_FAIL)
 	{
-		//验证失败了
+		//验证失败了
 		CLabelUI* pErrorInfo = static_cast<CLabelUI*>(m_pm.FindControl(_T("errinfo")));
 		pErrorInfo->SetText(m_errorInfo.c_str());
 		pErrorInfo->SetVisible(true);
@@ -128,7 +128,7 @@ LRESULT CSaomaQuanyikaWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOO
 	styleValue &= ~WS_CAPTION;
 	::SetWindowLong(*this, GWL_STYLE, styleValue | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
 
-	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
+	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
 	m_pm.Init(m_hWnd);
 
 	m_pm.AddPreMessageFilter(this);
@@ -138,10 +138,10 @@ LRESULT CSaomaQuanyikaWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOO
 	CControlUI* pRoot = builder.Create(_T("saoma_quanyika_dlg.xml"), (UINT)0, NULL, &m_pm);
 	ASSERT(pRoot && "Failed to parse XML");
 
-	// 把这些控件绘制到本窗口上
+	// 鎶婅繖浜涙帶浠剁粯鍒跺埌鏈�獥鍙d笂
 	m_pm.AttachDialog(pRoot);
 
-	// 把自己加入到CPaintManagerUI的m_aNotifiers数组中,用于处理Notify函数
+	// 鎶婅嚜宸卞姞鍏ュ埌CPaintManagerUI鐨刴_aNotifiers鏁扮粍涓�紝鐢ㄤ簬澶勭悊Notify鍑芥暟
 	m_pm.AddNotifier(this);
 
 	Init();
@@ -181,7 +181,7 @@ void CSaomaQuanyikaWnd::StartYanzheng()
 		return;
 	}
 
-	//开始处理
+	//开始处理
 	std::thread(&CSaomaQuanyikaWnd::ConfirmMember, this).detach();
 }
 
@@ -194,7 +194,7 @@ void CSaomaQuanyikaWnd::ConfirmMember()
 	bool ret = CZhipuziHttpClient::GetInstance()->RequestNew("/crm/marketing/equitycard/getinfobycode", params, response);
 	if (!ret)
 	{
-		m_errorInfo = _T("网络请求出错");
+		m_errorInfo = _T("缃戠粶璇锋眰鍑洪敊");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -205,7 +205,7 @@ void CSaomaQuanyikaWnd::ConfirmMember()
 
 	if (document.HasParseError())
 	{
-		m_errorInfo = _T("服务器返回数据格式错误");
+		m_errorInfo = _T("服务器返回数据格式错误");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -214,7 +214,7 @@ void CSaomaQuanyikaWnd::ConfirmMember()
 	{
 		if (!document.HasMember("errcode") || !document.HasMember("errmsg"))
 		{
-			m_errorInfo = _T("服务器返回数据格式错误");
+			m_errorInfo = _T("服务器返回数据格式错误");
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 
 			return;
@@ -224,7 +224,7 @@ void CSaomaQuanyikaWnd::ConfirmMember()
 		int errcode = v_errcode.GetInt();
 		if (errcode != 0)
 		{
-			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"权益卡扫码失败:") + std::string(document["errmsg"].GetString());
+			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"鏉冪泭鍗℃壂鐮佸け璐ワ細") + std::string(document["errmsg"].GetString());
 			m_errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 
@@ -239,7 +239,7 @@ void CSaomaQuanyikaWnd::ConfirmMember()
 	}
 }
 
-//处理键盘捕捉结果
+//澶勭悊閿�洏鎹曟崏缁撴灉
 void CSaomaQuanyikaWnd::HandleTextCapture(std::string content)
 {
 	m_code = content;

+ 12 - 12
zhipuzi_pos_windows/wnd/CSaomaShangpinquanWnd.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CSaomaShangpinquanWnd.h"
 
 LRESULT CSaomaShangpinquanWnd::OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
@@ -104,14 +104,14 @@ LRESULT CSaomaShangpinquanWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM l
 	}
 	else if (uMsg == WM_MEMBER_CHECK_SUCCESS)
 	{
-		//验证成功了
+		//验证成功了
 		Close(IDOK);
 
 		return true;
 	}
 	else if (uMsg == WM_MEMBER_CHECK_FAIL)
 	{
-		//验证失败了
+		//验证失败了
 		CLabelUI* pErrorInfo = static_cast<CLabelUI*>(m_pm.FindControl(_T("errinfo")));
 		pErrorInfo->SetText(m_errorInfo.c_str());
 		pErrorInfo->SetVisible(true);
@@ -128,7 +128,7 @@ LRESULT CSaomaShangpinquanWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam,
 	styleValue &= ~WS_CAPTION;
 	::SetWindowLong(*this, GWL_STYLE, styleValue | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
 
-	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
+	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
 	m_pm.Init(m_hWnd);
 
 	m_pm.AddPreMessageFilter(this);
@@ -138,10 +138,10 @@ LRESULT CSaomaShangpinquanWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam,
 	CControlUI* pRoot = builder.Create(_T("saoma_shangpinquan_dlg.xml"), (UINT)0, NULL, &m_pm);
 	ASSERT(pRoot && "Failed to parse XML");
 
-	// 把这些控件绘制到本窗口上
+	// 鎶婅繖浜涙帶浠剁粯鍒跺埌鏈�獥鍙d笂
 	m_pm.AttachDialog(pRoot);
 
-	// 把自己加入到CPaintManagerUI的m_aNotifiers数组中,用于处理Notify函数
+	// 鎶婅嚜宸卞姞鍏ュ埌CPaintManagerUI鐨刴_aNotifiers鏁扮粍涓�紝鐢ㄤ簬澶勭悊Notify鍑芥暟
 	m_pm.AddNotifier(this);
 
 	Init();
@@ -181,7 +181,7 @@ void CSaomaShangpinquanWnd::StartYanzheng()
 		return;
 	}
 
-	//开始处理
+	//开始处理
 	std::thread(&CSaomaShangpinquanWnd::ConfirmMember, this).detach();
 }
 
@@ -194,7 +194,7 @@ void CSaomaShangpinquanWnd::ConfirmMember()
 	bool ret = CZhipuziHttpClient::GetInstance()->RequestNew("/crm/marketing/goodscoupon/getgoodscouponinfobyrandnumber", params, response);
 	if (!ret)
 	{
-		m_errorInfo = _T("网络请求出错");
+		m_errorInfo = _T("缃戠粶璇锋眰鍑洪敊");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -205,7 +205,7 @@ void CSaomaShangpinquanWnd::ConfirmMember()
 
 	if (document.HasParseError())
 	{
-		m_errorInfo = _T("服务器返回数据格式错误");
+		m_errorInfo = _T("服务器返回数据格式错误");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -214,7 +214,7 @@ void CSaomaShangpinquanWnd::ConfirmMember()
 	{
 		if (!document.HasMember("errcode") || !document.HasMember("errmsg"))
 		{
-			m_errorInfo = _T("服务器返回数据格式错误");
+			m_errorInfo = _T("服务器返回数据格式错误");
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 
 			return;
@@ -224,7 +224,7 @@ void CSaomaShangpinquanWnd::ConfirmMember()
 		int errcode = v_errcode.GetInt();
 		if (errcode != 0)
 		{
-			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"商品券扫码失败:") + std::string(document["errmsg"].GetString());
+			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"鍟嗗搧鍒告壂鐮佸け璐ワ細") + std::string(document["errmsg"].GetString());
 			m_errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 
@@ -242,7 +242,7 @@ void CSaomaShangpinquanWnd::ConfirmMember()
 	}
 }
 
-//处理键盘捕捉结果
+//澶勭悊閿�洏鎹曟崏缁撴灉
 void CSaomaShangpinquanWnd::HandleTextCapture(std::string content)
 {
 	m_code = content;

+ 15 - 15
zhipuzi_pos_windows/wnd/CSaomaYouhuiquanWnd.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CSaomaYouhuiquanWnd.h"
 
 LRESULT CSaomaYouhuiquanWnd::OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
@@ -104,14 +104,14 @@ LRESULT CSaomaYouhuiquanWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lPa
 	}
 	else if (uMsg == WM_MEMBER_CHECK_SUCCESS)
 	{
-		//验证成功了
+		//验证成功了
 		Close(IDOK);
 
 		return true;
 	}
 	else if (uMsg == WM_MEMBER_CHECK_FAIL)
 	{
-		//验证失败了
+		//验证失败了
 		CLabelUI* pErrorInfo = static_cast<CLabelUI*>(m_pm.FindControl(_T("errinfo")));
 		pErrorInfo->SetText(m_errorInfo.c_str());
 		pErrorInfo->SetVisible(true);
@@ -128,7 +128,7 @@ LRESULT CSaomaYouhuiquanWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, B
 	styleValue &= ~WS_CAPTION;
 	::SetWindowLong(*this, GWL_STYLE, styleValue | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
 
-	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
+	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
 	m_pm.Init(m_hWnd);
 
 	m_pm.AddPreMessageFilter(this);
@@ -138,10 +138,10 @@ LRESULT CSaomaYouhuiquanWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, B
 	CControlUI* pRoot = builder.Create(_T("saoma_youhuiquan_dlg.xml"), (UINT)0, NULL, &m_pm);
 	ASSERT(pRoot && "Failed to parse XML");
 
-	// 把这些控件绘制到本窗口上
+	// 鎶婅繖浜涙帶浠剁粯鍒跺埌鏈�獥鍙d笂
 	m_pm.AttachDialog(pRoot);
 
-	// 把自己加入到CPaintManagerUI的m_aNotifiers数组中,用于处理Notify函数
+	// 鎶婅嚜宸卞姞鍏ュ埌CPaintManagerUI鐨刴_aNotifiers鏁扮粍涓�紝鐢ㄤ簬澶勭悊Notify鍑芥暟
 	m_pm.AddNotifier(this);
 
 	Init();
@@ -181,7 +181,7 @@ void CSaomaYouhuiquanWnd::StartYanzheng()
 		return;
 	}
 
-	//开始处理
+	//开始处理
 	std::thread(&CSaomaYouhuiquanWnd::ConfirmMember, this).detach();
 }
 
@@ -194,7 +194,7 @@ void CSaomaYouhuiquanWnd::ConfirmMember()
 	bool ret = CZhipuziHttpClient::GetInstance()->Request("/coupon/getcouponinfobyrandnumber", params, response);
 	if (!ret)
 	{
-		m_errorInfo = _T("网络请求出错");
+		m_errorInfo = _T("缃戠粶璇锋眰鍑洪敊");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -205,7 +205,7 @@ void CSaomaYouhuiquanWnd::ConfirmMember()
 
 	if (document.HasParseError())
 	{
-		m_errorInfo = _T("服务器返回数据格式错误");
+		m_errorInfo = _T("服务器返回数据格式错误");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -214,7 +214,7 @@ void CSaomaYouhuiquanWnd::ConfirmMember()
 	{
 		if (!document.HasMember("errcode") || !document.HasMember("errmsg"))
 		{
-			m_errorInfo = _T("服务器返回数据格式错误");
+			m_errorInfo = _T("服务器返回数据格式错误");
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 
 			return;
@@ -224,7 +224,7 @@ void CSaomaYouhuiquanWnd::ConfirmMember()
 		int errcode = v_errcode.GetInt();
 		if (errcode != 0)
 		{
-			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"优惠券扫码失败:") + std::string(document["errmsg"].GetString());
+			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"浼樻儬鍒告壂鐮佸け璐ワ細") + std::string(document["errmsg"].GetString());
 			m_errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 
@@ -238,24 +238,24 @@ void CSaomaYouhuiquanWnd::ConfirmMember()
 		m_coupon_deadline = data["coupon_deadline"].GetString();
 		m_coupon_value = data["coupon_value"].GetString();
 
-		//判断优惠券是否过期
+		//判断优惠券是否过期
 		time_t deadline = CLewaimaiTime::StringToDatetime(m_coupon_deadline);
 		time_t now = time(NULL);
 		if (deadline <= now)
 		{
-			m_errorInfo = _T("该优惠券已过期,无法使用");
+			m_errorInfo = _T("璇ヤ紭鎯犲埜宸茶繃鏈燂紝鏃犳硶浣跨敤");
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 
 			return;
 		}
 
-		//这里正常来说还要判断优惠券关联的店铺
+		//杩欓噷姝e父鏉ヨ�杩樿�鍒ゆ柇浼樻儬鍒稿叧鑱旂殑搴楅摵
 
 		PostMessage(WM_MEMBER_CHECK_SUCCESS);
 	}
 
 }
-//处理键盘捕捉结果
+//澶勭悊閿�洏鎹曟崏缁撴灉
 void CSaomaYouhuiquanWnd::HandleTextCapture(std::string content)
 {
 	m_code = content;

+ 16 - 16
zhipuzi_pos_windows/wnd/CShangpinNewTypeWnd.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CShangpinNewTypeWnd.h"
 
 #include "../tool/CSqlite3.h"
@@ -113,7 +113,7 @@ LRESULT CShangpinNewTypeWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lPa
 	{
 		m_status = 2;
 
-		//验证成功了
+		//验证成功了
 		Close(IDOK);
 
 		return true;
@@ -122,7 +122,7 @@ LRESULT CShangpinNewTypeWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lPa
 	{
 		m_status = 2;
 
-		//验证失败了
+		//验证失败了
 		CLabelUI* pErrorInfo = static_cast<CLabelUI*>(m_pm.FindControl(_T("errinfo")));
 		pErrorInfo->SetText(m_errorInfo.c_str());
 		pErrorInfo->SetVisible(true);
@@ -139,7 +139,7 @@ LRESULT CShangpinNewTypeWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, B
 	styleValue &= ~WS_CAPTION;
 	::SetWindowLong(*this, GWL_STYLE, styleValue | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
 
-	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
+	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
 	m_pm.Init(m_hWnd);
 
 	m_pm.AddPreMessageFilter(this);
@@ -149,10 +149,10 @@ LRESULT CShangpinNewTypeWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, B
 	CControlUI* pRoot = builder.Create(_T("shangpin_newtype_wnd.xml"), (UINT)0, NULL, &m_pm);
 	ASSERT(pRoot && "Failed to parse XML");
 
-	// 把这些控件绘制到本窗口上
+	// 鎶婅繖浜涙帶浠剁粯鍒跺埌鏈�獥鍙d笂
 	m_pm.AttachDialog(pRoot);
 
-	// 把自己加入到CPaintManagerUI的m_aNotifiers数组中,用于处理Notify函数
+	// 鎶婅嚜宸卞姞鍏ュ埌CPaintManagerUI鐨刴_aNotifiers鏁扮粍涓�紝鐢ㄤ簬澶勭悊Notify鍑芥暟
 	m_pm.AddNotifier(this);
 
 	Init();
@@ -178,7 +178,7 @@ void CShangpinNewTypeWnd::Notify(TNotifyUI& msg)
 	}
 	else if (msg.sType == _T("textchanged"))
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("fenlei_create_page_xuhao_edit")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -190,11 +190,11 @@ void CShangpinNewTypeWnd::Notify(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if (tmp > 57 || tmp < 48)
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -225,7 +225,7 @@ void CShangpinNewTypeWnd::StartSave()
 {
 	m_status = 1;
 
-	//开始处理
+	//开始处理
 	std::thread(&CShangpinNewTypeWnd::HandleSave, this).detach();
 }
 
@@ -252,7 +252,7 @@ void CShangpinNewTypeWnd::HandleSave()
 	bool ret = CZhipuziHttpClient::GetInstance()->Request("/goods/CreateFoodType", params, response);
 	if (!ret)
 	{
-		m_errorInfo = _T("网络请求出错");
+		m_errorInfo = _T("缃戠粶璇锋眰鍑洪敊");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -263,7 +263,7 @@ void CShangpinNewTypeWnd::HandleSave()
 
 	if (document.HasParseError())
 	{
-		m_errorInfo = _T("服务器返回数据格式错误");
+		m_errorInfo = _T("服务器返回数据格式错误");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -272,7 +272,7 @@ void CShangpinNewTypeWnd::HandleSave()
 	{
 		if (!document.HasMember("errcode") || !document.HasMember("errmsg"))
 		{
-			m_errorInfo = _T("服务器返回数据格式错误");
+			m_errorInfo = _T("服务器返回数据格式错误");
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 
 			return;
@@ -282,7 +282,7 @@ void CShangpinNewTypeWnd::HandleSave()
 		int errcode = v_errcode.GetInt();
 		if (errcode != 0)
 		{
-			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"权益卡扫码失败:") + std::string(document["errmsg"].GetString());
+			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"鏉冪泭鍗℃壂鐮佸け璐ワ細") + std::string(document["errmsg"].GetString());
 			m_errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 
@@ -291,7 +291,7 @@ void CShangpinNewTypeWnd::HandleSave()
 
 		rapidjson::Value& data = document["data"];
 
-		//分类创建成功,开始进行后续处理
+		//分类创建成功,开始进行后续处理
 		std::string type_id = data["type_id"].GetString();
 
 		CSqlite3 sqlite;
@@ -301,7 +301,7 @@ void CShangpinNewTypeWnd::HandleSave()
 	}
 }
 
-//处理键盘捕捉结果
+//澶勭悊閿�洏鎹曟崏缁撴灉
 void CShangpinNewTypeWnd::HandleTextCapture(std::string content)
 {
 

+ 12 - 12
zhipuzi_pos_windows/wnd/CShangpinSaomaluruWnd.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CShangpinSaomaluruWnd.h"
 
 LRESULT CShangpinSaomaluruWnd::OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
@@ -109,7 +109,7 @@ LRESULT CShangpinSaomaluruWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM l
 	{
 		m_status = 2;
 
-		//验证成功了
+		//验证成功了
 		Close(IDOK);
 
 		return true;
@@ -118,7 +118,7 @@ LRESULT CShangpinSaomaluruWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM l
 	{
 		m_status = 2;
 
-		//验证失败了
+		//验证失败了
 		CLabelUI* pErrorInfo = static_cast<CLabelUI*>(m_pm.FindControl(_T("errinfo")));
 		pErrorInfo->SetText(m_errorInfo.c_str());
 		pErrorInfo->SetVisible(true);
@@ -135,7 +135,7 @@ LRESULT CShangpinSaomaluruWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam,
 	styleValue &= ~WS_CAPTION;
 	::SetWindowLong(*this, GWL_STYLE, styleValue | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
 
-	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
+	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
 	m_pm.Init(m_hWnd);
 
 	m_pm.AddPreMessageFilter(this);
@@ -145,10 +145,10 @@ LRESULT CShangpinSaomaluruWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam,
 	CControlUI* pRoot = builder.Create(_T("shangpin_saomaluru_wnd.xml"), (UINT)0, NULL, &m_pm);
 	ASSERT(pRoot && "Failed to parse XML");
 
-	// 把这些控件绘制到本窗口上
+	// 鎶婅繖浜涙帶浠剁粯鍒跺埌鏈�獥鍙d笂
 	m_pm.AttachDialog(pRoot);
 
-	// 把自己加入到CPaintManagerUI的m_aNotifiers数组中,用于处理Notify函数
+	// 鎶婅嚜宸卞姞鍏ュ埌CPaintManagerUI鐨刴_aNotifiers鏁扮粍涓�紝鐢ㄤ簬澶勭悊Notify鍑芥暟
 	m_pm.AddNotifier(this);
 
 	Init();
@@ -192,7 +192,7 @@ void CShangpinSaomaluruWnd::StartYanzheng()
 		return;
 	}
 
-	//开始处理
+	//开始处理
 	std::thread(&CShangpinSaomaluruWnd::ConfirmMember, this).detach();
 }
 
@@ -207,7 +207,7 @@ void CShangpinSaomaluruWnd::ConfirmMember()
 	bool ret = CZhipuziHttpClient::GetInstance()->Request("/goods/getinfobythirdbarcode", params, response);
 	if (!ret)
 	{
-		m_errorInfo = _T("网络请求出错");
+		m_errorInfo = _T("缃戠粶璇锋眰鍑洪敊");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -218,7 +218,7 @@ void CShangpinSaomaluruWnd::ConfirmMember()
 
 	if (document.HasParseError())
 	{
-		m_errorInfo = _T("服务器返回数据格式错误");
+		m_errorInfo = _T("服务器返回数据格式错误");
 		PostMessage(WM_MEMBER_CHECK_FAIL);
 
 		return;
@@ -227,7 +227,7 @@ void CShangpinSaomaluruWnd::ConfirmMember()
 	{
 		if (!document.HasMember("errcode") || !document.HasMember("errmsg"))
 		{
-			m_errorInfo = _T("服务器返回数据格式错误");
+			m_errorInfo = _T("服务器返回数据格式错误");
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 
 			return;
@@ -237,7 +237,7 @@ void CShangpinSaomaluruWnd::ConfirmMember()
 		int errcode = v_errcode.GetInt();
 		if (errcode != 0)
 		{
-			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"扫码失败:") + std::string(document["errmsg"].GetString());
+			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"扫码失败:") + std::string(document["errmsg"].GetString());
 			m_errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
 			PostMessage(WM_MEMBER_CHECK_FAIL);
 
@@ -256,7 +256,7 @@ void CShangpinSaomaluruWnd::ConfirmMember()
 	}
 }
 
-//处理键盘捕捉结果
+//澶勭悊閿�洏鎹曟崏缁撴灉
 void CShangpinSaomaluruWnd::HandleTextCapture(std::string content)
 {
 	m_code = content;

+ 11 - 11
zhipuzi_pos_windows/wnd/CUpdateWnd.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CUpdateWnd.h"
 
 double CUpdateWnd::m_Percent;
@@ -51,7 +51,7 @@ LRESULT CUpdateWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHan
     styleValue &= ~WS_CAPTION;
     ::SetWindowLong(*this, GWL_STYLE, styleValue | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
 
-    // 把自己的窗口句柄与窗口绘制管理器挂接在一起
+    // 把自己的窗口句柄与窗口绘制管理器挂接在一起
     m_pm.Init(m_hWnd);
 
     m_pm.AddPreMessageFilter(this);
@@ -61,10 +61,10 @@ LRESULT CUpdateWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHan
     CControlUI* pRoot = builder.Create(_T("update.xml"), (UINT)0, NULL, &m_pm);
     ASSERT(pRoot && "Failed to parse XML");
 
-    // 把这些控件绘制到本窗口上
+    // 鎶婅繖浜涙帶浠剁粯鍒跺埌鏈�獥鍙d笂
     m_pm.AttachDialog(pRoot);
 
-    // 把自己加入到CPaintManagerUI的m_aNotifiers数组中,用于处理Notify函数
+    // 鎶婅嚜宸卞姞鍏ュ埌CPaintManagerUI鐨刴_aNotifiers鏁扮粍涓�紝鐢ㄤ簬澶勭悊Notify鍑芥暟
     m_pm.AddNotifier(this);
 
     Init();
@@ -79,7 +79,7 @@ LRESULT CUpdateWnd::OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHand
 }
 
 /*
- *这个是窗口被销毁的时候调用的
+ *杩欎釜鏄�獥鍙h�閿€姣佺殑鏃跺€欒皟鐢ㄧ殑
  **/
 LRESULT CUpdateWnd::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
@@ -104,7 +104,7 @@ LRESULT CUpdateWnd::OnNcCalcSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL&
 
 LRESULT CUpdateWnd::OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
-    //在这里设置焦点才有用
+    //鍦ㄨ繖閲岃�缃�劍鐐规墠鏈夌敤
     CEditUI* pAccountEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("accountedit")));
 
     if(pAccountEdit)
@@ -332,7 +332,7 @@ void CUpdateWnd::Run()
 
         fopen_s(&m_outfile, m_filepath.c_str(), "ab+");
 
-        curl_easy_setopt(m_curl, CURLOPT_URL, m_url.c_str());//在此要注意,此url必须是多字节
+        curl_easy_setopt(m_curl, CURLOPT_URL, m_url.c_str());//鍦ㄦ�瑕佹敞鎰忥紝姝�rl蹇呴』鏄��瀛楄妭
 
 		if (m_url.find("https://") == 0)
 		{
@@ -345,7 +345,7 @@ void CUpdateWnd::Run()
         curl_easy_setopt(m_curl, CURLOPT_WRITEFUNCTION, my_write_func);
         curl_easy_setopt(m_curl, CURLOPT_NOPROGRESS, FALSE);
         curl_easy_setopt(m_curl, CURLOPT_PROGRESSFUNCTION, my_progress_func);
-        curl_easy_setopt(m_curl, CURLOPT_PROGRESSDATA, NULL);//给下载进度回调函数传参数,在此是指针
+        curl_easy_setopt(m_curl, CURLOPT_PROGRESSDATA, NULL);//缁欎笅杞借繘搴﹀洖璋冨嚱鏁颁紶鍙傛暟锛屽湪姝ゆ槸鎸囬拡
 
         res = curl_easy_perform(m_curl);
 
@@ -354,8 +354,8 @@ void CUpdateWnd::Run()
         curl_easy_cleanup(m_curl);
     }
 
-	//走到这里,下载完成了
-	HWND hWnd = FindWindow(NULL, L"自动更新");
+	//璧板埌杩欓噷锛屼笅杞藉畬鎴愪簡
+	HWND hWnd = FindWindow(NULL, L"鑷�姩鏇存柊");
 
 	if (hWnd)
 	{
@@ -392,7 +392,7 @@ int CUpdateWnd::my_progress_func(void *progress_data,
 		CUpdateWnd::m_Percent = 0;
 	}
 
-    HWND hWnd = FindWindow(NULL, L"自动更新");
+    HWND hWnd = FindWindow(NULL, L"鑷�姩鏇存柊");
 
     if(hWnd)
     {

+ 22 - 22
zhipuzi_pos_windows/wnd/CWeixinzhifuShoukuanWnd.cpp

@@ -634,7 +634,7 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -648,7 +648,7 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -659,7 +659,7 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -673,7 +673,7 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuan()
 		std::string errmsg = document["errmsg"].GetString();
 		m_fail_message = CLewaimaiString::UTF8ToUnicode(errmsg);
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -684,7 +684,7 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -722,7 +722,7 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuan()
 			m_show_trade_no = data["trade_no"].GetString();
 		}
 
-		SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 	}
 	else if (s_status == "fail")
 	{
@@ -731,7 +731,7 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = CLewaimaiString::UTF8ToUnicode(data["message"].GetString());
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 	else if (s_status == "password")
 	{
@@ -742,7 +742,7 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuan()
 		m_show_trade_no = data["trade_no"].GetString();
 
 		//需要查询支付状态
-		SendMessage(WM_SHOUKUAN_STATUS_NEEDPASSWORD, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_NEEDPASSWORD, 0, 0);
 	}
 	else
 	{
@@ -750,7 +750,7 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 }
 
@@ -787,7 +787,7 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -801,7 +801,7 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -812,7 +812,7 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -825,7 +825,7 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -861,7 +861,7 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuanPassword()
 				
 			}
 
-			SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 
 			break;
 		}
@@ -875,7 +875,7 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuanPassword()
 
 				m_fail_message = L"顾客取消支付,请重新扫码收款";
 
-				SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+				PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 
 				break;
 			}
@@ -891,7 +891,7 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			break;
 		}
 	}
@@ -933,7 +933,7 @@ void CWeixinzhifuShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -947,7 +947,7 @@ void CWeixinzhifuShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -958,7 +958,7 @@ void CWeixinzhifuShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -971,7 +971,7 @@ void CWeixinzhifuShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -986,14 +986,14 @@ void CWeixinzhifuShoukuanWnd::HandleCancelShoukuan()
 		m_shoukuan_status = 4;
 
 		m_fail_message = L"商家取消收款";
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 
 	m_shoukuan_status = 4;
 
 	m_fail_message = L"服务器错误";
 
-	SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+	PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 }
 
 bool CWeixinzhifuShoukuanWnd::IsCanClose()

+ 22 - 22
zhipuzi_pos_windows/wnd/CXianjinShoukuanWnd.cpp

@@ -720,7 +720,7 @@ void CXianjinShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -734,7 +734,7 @@ void CXianjinShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -745,7 +745,7 @@ void CXianjinShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -759,7 +759,7 @@ void CXianjinShoukuanWnd::HandleShoukuan()
 		std::string errmsg = document["errmsg"].GetString();
 		m_fail_message = CLewaimaiString::UTF8ToUnicode(errmsg);
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -770,7 +770,7 @@ void CXianjinShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -804,7 +804,7 @@ void CXianjinShoukuanWnd::HandleShoukuan()
 			m_show_trade_no = data["trade_no"].GetString();
 		}
 
-		SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 	}
 	else if (s_status == "fail")
 	{
@@ -813,14 +813,14 @@ void CXianjinShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = CLewaimaiString::UTF8ToUnicode(data["message"].GetString());
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 	else if (s_status == "password")
 	{
 		m_shoukuan_status = 2;
 
 		//需要查询支付状态
-		SendMessage(WM_SHOUKUAN_STATUS_NEEDPASSWORD, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_NEEDPASSWORD, 0, 0);
 	}
 	else
 	{
@@ -828,7 +828,7 @@ void CXianjinShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 }
 
@@ -863,7 +863,7 @@ void CXianjinShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -877,7 +877,7 @@ void CXianjinShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -888,7 +888,7 @@ void CXianjinShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -901,7 +901,7 @@ void CXianjinShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -925,7 +925,7 @@ void CXianjinShoukuanWnd::HandleShoukuanPassword()
 				m_take_food_code = data["take_food_code"].GetString();
 			}
 
-			SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 
 			break;
 		}
@@ -936,7 +936,7 @@ void CXianjinShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"顾客取消支付,请重新扫码收款";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 
 			break;
 		}
@@ -951,7 +951,7 @@ void CXianjinShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			break;
 		}
 	}
@@ -993,7 +993,7 @@ void CXianjinShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1007,7 +1007,7 @@ void CXianjinShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1018,7 +1018,7 @@ void CXianjinShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1031,7 +1031,7 @@ void CXianjinShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -1046,14 +1046,14 @@ void CXianjinShoukuanWnd::HandleCancelShoukuan()
 		m_shoukuan_status = 4;
 
 		m_fail_message = L"商家取消收款";
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 
 	m_shoukuan_status = 4;
 
 	m_fail_message = L"服务器错误";
 
-	SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+	PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 }
 
 void CXianjinShoukuanWnd::StartClose()

+ 16 - 16
zhipuzi_pos_windows/wnd/CZhengcanRenshuWnd.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CZhengcanRenshuWnd.h"
 
 #define WM_ZHENGCAN_RENSHU_SUCCESS 10001
@@ -113,21 +113,21 @@ LRESULT CZhengcanRenshuWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lPar
 
 		m_qingqiu_mutex.unlock();
 
-		//验证成功了
+		//验证成功了
 		Close(IDOK);
 
 		return true;
 	}
 	else if (uMsg == WM_ZHENGCAN_RENSHU_FAIL)
 	{
-		//验证失败了
+		//验证失败了
 		CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
 		pContent->SetEnabled(true);
 
 		CButtonUI* pSave = static_cast<CButtonUI*>(m_pm.FindControl(_T("save")));
 		pSave->SetEnabled(true);
 
-		//失败原因
+		//澶辫触鍘熷洜
 		CLabelUI* pErrorInfo = static_cast<CLabelUI*>(m_pm.FindControl(_T("errinfo")));
 		pErrorInfo->SetText(m_errorInfo.c_str());
 		pErrorInfo->SetVisible(true);
@@ -150,7 +150,7 @@ LRESULT CZhengcanRenshuWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BO
 	styleValue &= ~WS_CAPTION;
 	::SetWindowLong(*this, GWL_STYLE, styleValue | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
 
-	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
+	// 把自己的窗口句柄与窗口绘制管理器挂接在一起
 	m_pm.Init(m_hWnd);
 
 	m_pm.AddPreMessageFilter(this);
@@ -160,10 +160,10 @@ LRESULT CZhengcanRenshuWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BO
 	CControlUI* pRoot = builder.Create(_T("zhengcan_renshu_dlg.xml"), (UINT)0, NULL, &m_pm);
 	ASSERT(pRoot && "Failed to parse XML");
 
-	// 把这些控件绘制到本窗口上
+	// 鎶婅繖浜涙帶浠剁粯鍒跺埌鏈�獥鍙d笂
 	m_pm.AttachDialog(pRoot);
 
-	// 把自己加入到CPaintManagerUI的m_aNotifiers数组中,用于处理Notify函数
+	// 鎶婅嚜宸卞姞鍏ュ埌CPaintManagerUI鐨刴_aNotifiers鏁扮粍涓�紝鐢ㄤ簬澶勭悊Notify鍑芥暟
 	m_pm.AddNotifier(this);
 
 	Init();
@@ -313,7 +313,7 @@ void CZhengcanRenshuWnd::Notify(TNotifyUI& msg)
 	}
 	else if (msg.sType == _T("textchanged"))
 	{
-		//只能输入数字,其他的全部删除
+		//鍙�兘杈撳叆鏁板瓧锛屽叾浠栫殑鍏ㄩ儴鍒犻櫎
 		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
 		if (!m_pEdit->GetText().IsEmpty())
 		{
@@ -325,11 +325,11 @@ void CZhengcanRenshuWnd::Notify(TNotifyUI& msg)
 				unsigned char tmp = strValue.at(nIndex);
 				if (tmp > 57 || tmp < 48)
 				{
-					//ASCII码不是数字的都过滤掉
+					//ASCII鐮佷笉鏄�暟瀛楃殑閮借繃婊ゆ帀
 					strValue = strValue.substr(0, nIndex);
 
 					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
+					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
 
 					break;
 				}
@@ -368,7 +368,7 @@ void CZhengcanRenshuWnd::StartYanzheng()
 
 	if (wsReason.length() == 0)
 	{
-		m_errorInfo = _T("人数不能为空");
+		m_errorInfo = _T("浜烘暟涓嶈兘涓虹┖");
 		PostMessage(WM_ZHENGCAN_RENSHU_FAIL);
 
 		return;
@@ -387,7 +387,7 @@ void CZhengcanRenshuWnd::StartYanzheng()
 
 	m_qingqiu_mutex.unlock();
 
-	//开始处理
+	//开始处理
 	std::thread(&CZhengcanRenshuWnd::ConfirmMember, this).detach();
 }
 
@@ -403,7 +403,7 @@ void CZhengcanRenshuWnd::ConfirmMember()
 	bool ret = CZhipuziHttpClient::GetInstance()->Request("/dinnercash/changerenshu", params, response);
 	if (!ret)
 	{
-		m_errorInfo = _T("网络请求出错");
+		m_errorInfo = _T("缃戠粶璇锋眰鍑洪敊");
 		PostMessage(WM_ZHENGCAN_RENSHU_FAIL);
 
 		return;
@@ -414,7 +414,7 @@ void CZhengcanRenshuWnd::ConfirmMember()
 
 	if (document.HasParseError())
 	{
-		m_errorInfo = _T("服务器返回数据格式错误");
+		m_errorInfo = _T("服务器返回数据格式错误");
 		PostMessage(WM_ZHENGCAN_RENSHU_FAIL);
 
 		return;
@@ -423,7 +423,7 @@ void CZhengcanRenshuWnd::ConfirmMember()
 	{
 		if (!document.HasMember("errcode") || !document.HasMember("errmsg"))
 		{
-			m_errorInfo = _T("服务器返回数据格式错误");
+			m_errorInfo = _T("服务器返回数据格式错误");
 			PostMessage(WM_ZHENGCAN_RENSHU_FAIL);
 
 			return;
@@ -433,7 +433,7 @@ void CZhengcanRenshuWnd::ConfirmMember()
 		int errcode = v_errcode.GetInt();
 		if (errcode != 0)
 		{
-			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"修改人数失败:") + std::string(document["errmsg"].GetString());
+			std::string errmsg = CLewaimaiString::UnicodeToUTF8(L"修改人数失败:") + std::string(document["errmsg"].GetString());
 			m_errorInfo = CLewaimaiString::UTF8ToUnicode(errmsg);
 			PostMessage(WM_ZHENGCAN_RENSHU_FAIL);
 

+ 22 - 22
zhipuzi_pos_windows/wnd/CZidingyiShoukuanWnd.cpp

@@ -504,7 +504,7 @@ void CZidingyiShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -518,7 +518,7 @@ void CZidingyiShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -529,7 +529,7 @@ void CZidingyiShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -543,7 +543,7 @@ void CZidingyiShoukuanWnd::HandleShoukuan()
 		std::string errmsg = document["errmsg"].GetString();
 		m_fail_message = CLewaimaiString::UTF8ToUnicode(errmsg);
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -554,7 +554,7 @@ void CZidingyiShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -588,7 +588,7 @@ void CZidingyiShoukuanWnd::HandleShoukuan()
 			m_show_trade_no = data["trade_no"].GetString();
 		}
 
-		SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 	}
 	else if (s_status == "fail")
 	{
@@ -597,14 +597,14 @@ void CZidingyiShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = CLewaimaiString::UTF8ToUnicode(data["message"].GetString());
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 	else if (s_status == "password")
 	{
 		m_shoukuan_status = 2;
 
 		//需要查询支付状态
-		SendMessage(WM_SHOUKUAN_STATUS_NEEDPASSWORD, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_NEEDPASSWORD, 0, 0);
 	}
 	else
 	{
@@ -612,7 +612,7 @@ void CZidingyiShoukuanWnd::HandleShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 }
 
@@ -647,7 +647,7 @@ void CZidingyiShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -661,7 +661,7 @@ void CZidingyiShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -672,7 +672,7 @@ void CZidingyiShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -685,7 +685,7 @@ void CZidingyiShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			return;
 		}
 
@@ -709,7 +709,7 @@ void CZidingyiShoukuanWnd::HandleShoukuanPassword()
 				m_take_food_code = data["take_food_code"].GetString();
 			}
 
-			SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 
 			break;
 		}
@@ -720,7 +720,7 @@ void CZidingyiShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"顾客取消支付,请重新扫码收款";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 
 			break;
 		}
@@ -735,7 +735,7 @@ void CZidingyiShoukuanWnd::HandleShoukuanPassword()
 
 			m_fail_message = L"服务器错误";
 
-			SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+			PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 			break;
 		}
 	}
@@ -777,7 +777,7 @@ void CZidingyiShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"请求服务器失败,请检查网络设置!";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -791,7 +791,7 @@ void CZidingyiShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -802,7 +802,7 @@ void CZidingyiShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -815,7 +815,7 @@ void CZidingyiShoukuanWnd::HandleCancelShoukuan()
 
 		m_fail_message = L"服务器错误";
 
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 		return;
 	}
 
@@ -830,14 +830,14 @@ void CZidingyiShoukuanWnd::HandleCancelShoukuan()
 		m_shoukuan_status = 4;
 
 		m_fail_message = L"商家取消收款";
-		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+		PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
 
 	m_shoukuan_status = 4;
 
 	m_fail_message = L"服务器错误";
 
-	SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
+	PostMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 }
 
 void CZidingyiShoukuanWnd::StartClose()

+ 2 - 2
zhipuzi_pos_windows/worker/CChengzhongWorker.cpp

@@ -136,7 +136,7 @@ void CChengzhongWorker::HandleWork()
 
 				if (m_hwnd != NULL)
 				{
-					::SendMessage(m_hwnd, WM_CHENGZHONG_SUCCESS, 0, 0);
+					PostMessage(m_hwnd, WM_CHENGZHONG_SUCCESS, 0, 0);
 				}
 			}
 			else
@@ -191,7 +191,7 @@ void CChengzhongWorker::HandleWork()
 
 				if (m_hwnd != NULL)
 				{
-					::SendMessage(m_hwnd, WM_CHENGZHONG_SUCCESS, 0, 0);
+					PostMessage(m_hwnd, WM_CHENGZHONG_SUCCESS, 0, 0);
 				}
 			}
 			else

+ 8 - 6
zhipuzi_pos_windows/worker/CDiandanAIShibieWorker.cpp

@@ -10,12 +10,14 @@ CDiandanAIShibieWorker::CDiandanAIShibieWorker()
 
 CDiandanAIShibieWorker::~CDiandanAIShibieWorker()
 {
-	
+	int a = 1;
 }
 
 //启动工作线程
 void CDiandanAIShibieWorker::StartWork()
 {
+	long int threadId = GetCurrentThreadId();
+
 	//默认先关闭
 	m_is_work = true;
 
@@ -32,6 +34,8 @@ void CDiandanAIShibieWorker::StopWork()
 
 void CDiandanAIShibieWorker::HandleDiandanAIShibie()
 {
+	long int threadId = GetCurrentThreadId();
+
 	std::wstring wsExePath = CSystem::getExePath();
 	std::wstring wsProgramDir = CSystem::GetProgramDir();
 
@@ -91,19 +95,17 @@ void CDiandanAIShibieWorker::HandleDiandanAIShibie()
 			//主线程里面去处理界面刷新
 			if (m_hwnd != NULL)
 			{
-				::SendMessage(m_hwnd, WM_AI_RECOGNITION_SUCCESS, 0, 0);
+				::PostMessage(m_hwnd, WM_AI_RECOGNITION_SUCCESS, 0, 0);
 			}
 		}
 		catch (const std::exception& e)
 		{
 			std::string aa = std::string(e.what());
 			DEBUG_LOG(("提取特征失败: " + std::string(e.what())).c_str());
-			return;
+			continue;
 		}	
 	}
 
 	//走到这里说明线程要退出了,做一些清理工作
 	CAppEnv::GetInstance()->DelWorkerNum();
-
-	int b = 1;
-}
+}

+ 10 - 10
zhipuzi_pos_windows/worker/CVideoCaptureWorker.cpp

@@ -66,13 +66,13 @@ void CVideoCaptureWorker::HandleVideoCapture()
     DEBUG_LOG("摄像头打开成功!");
 
     /*
-    160×120(QQVGA):适用于低带宽或嵌入式场景,资源占用极低
-    320×240(QVGA):轻量级视频传输常用,适合实时性要求高的应用
-    640×480(VGA):OpenCV 默认常用分辨率,兼容性强,广泛用于基础图像处理
-    800×600(SVGA):中等清晰度,适用于需要细节但不追求高清的场景
-    1024×768(XGA):较高清分辨率,适合文档扫描或静态图像采集
-    1280×720(720p HD):标准高清分辨率,广泛用于人脸识别、目标检测等视觉任务
-    1920×1080(1080p Full HD):全高清分辨率,提供高质量图像,适用于高精度视觉分析
+    160×120(QQVGA):适用于低带宽或嵌入式场景,资源占用极低
+    320×240(QVGA):轻量级视频传输常用,适合实时性要求高的应用
+    640×480(VGA):OpenCV 默认常用分辨率,兼容性强,广泛用于基础图像处理
+    800×600(SVGA):中等清晰度,适用于需要细节但不追求高清的场景
+    1024×768(XGA):较高清分辨率,适合文档扫描或静态图像采集
+    1280×720(720p HD):标准高清分辨率,广泛用于人脸识别、目标检测等视觉任务
+    1920×1080(1080p Full HD):全高清分辨率,提供高质量图像,适用于高精度视觉分析
     */
     int width = 800;
     int height = 600;
@@ -105,9 +105,9 @@ void CVideoCaptureWorker::HandleVideoCapture()
 		// if (cv::waitKey(30) >= 0) break; // 按任意键退出
     }
 
-    // ====================== 资源释放 ======================
-    cap.release();
-    cv::destroyAllWindows();
+    // 程序走到这里,说明收银系统被退出了,这里不释放资源也无所谓了,释放资源太慢了要卡住几百毫秒
+    //cap.release();
+    //cv::destroyAllWindows();
 
 	//走到这里说明线程要退出了,做一些清理工作
 	CAppEnv::GetInstance()->DelWorkerNum();

+ 7 - 9
zhipuzi_pos_windows/worker/CVoiceWorker.cpp

@@ -1,4 +1,4 @@
-#include "../pch/pch.h"
+#include "../pch/pch.h"
 #include "CVoiceWorker.h"
 
 #include "mmsystem.h"
@@ -11,10 +11,10 @@ void CVoiceWorker::Start()
 
 	m_nStopNum = 0;
 
-	//处理声音提醒
+	//澶勭悊澹伴煶鎻愰啋
 	std::thread(&CVoiceWorker::HandleVoice, this).detach();
 
-	//处理文字转语音
+	//处理文字转语音
 	std::thread(&CVoiceWorker::HandleVoiceContent, this).detach();
 }
 
@@ -35,8 +35,6 @@ void CVoiceWorker::Stop()
 	}
 
 	m_voice_mutex.unlock();
-
-	Sleep(100);
 }
 
 void CVoiceWorker::AddVoice(int voice_type)
@@ -48,7 +46,7 @@ void CVoiceWorker::AddVoice(int voice_type)
 	m_voice_mutex.unlock();
 }
 
-//文字转语音播放
+//文字转语音播放
 void CVoiceWorker::AddVoice(std::string voiceContent)
 {
 	m_voice_mutex.lock();
@@ -108,14 +106,14 @@ void CVoiceWorker::HandleVoice()
 			PlaySound(path.c_str(), NULL, SND_FILENAME | SND_ASYNC);
 		}
 
-		//8秒内最多播放一次
+		//8秒内最多播放一次
 		//CSystem::my_sleep(8);
 	}
 
 	AddStopNum();
 }
 
-//处理文字转语音的
+//澶勭悊鏂囧瓧杞��闊崇殑
 void CVoiceWorker::HandleVoiceContent()
 {
 	while (m_is_work)
@@ -135,7 +133,7 @@ void CVoiceWorker::HandleVoiceContent()
 
 		m_voice_mutex.unlock();
 
-		//进行播放
+		//杩涜�鎾�斁
 		std::wstring ws_content = CLewaimaiString::UTF8ToUnicode(content);
 
 		CSpeech::MSSSpeak(ws_content.c_str());