Просмотр исходного кода

今天要完成扫码录入商品

张洋 4 лет назад
Родитель
Сommit
d4d027be96
39 измененных файлов с 436 добавлено и 43 удалено
  1. 5 5
      bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_page.xml
  2. 3 0
      zhipuzi_pos_windows/page/CBasePageUI.h
  3. 22 15
      zhipuzi_pos_windows/page/CDiandanPageUI.cpp
  4. 7 1
      zhipuzi_pos_windows/page/CDiandanPageUI.h
  5. 6 0
      zhipuzi_pos_windows/page/CSettingPageUI.cpp
  6. 3 0
      zhipuzi_pos_windows/page/CSettingPageUI.h
  7. 6 0
      zhipuzi_pos_windows/page/CWaimaiOrderInfoPageUI.cpp
  8. 3 0
      zhipuzi_pos_windows/page/CWaimaiOrderInfoPageUI.h
  9. 6 0
      zhipuzi_pos_windows/page/CWaimaiOrderListPageUI.cpp
  10. 3 0
      zhipuzi_pos_windows/page/CWaimaiOrderListPageUI.h
  11. 8 1
      zhipuzi_pos_windows/wnd/CCanpaiWnd.h
  12. 8 1
      zhipuzi_pos_windows/wnd/CChengzhongWnd.h
  13. 8 1
      zhipuzi_pos_windows/wnd/CChufangSettingWnd.h
  14. 9 1
      zhipuzi_pos_windows/wnd/CDiandanNatureWnd.h
  15. 8 1
      zhipuzi_pos_windows/wnd/CFulikaShoukuanWnd.h
  16. 8 1
      zhipuzi_pos_windows/wnd/CHuiyuanShoukuanWnd.h
  17. 8 1
      zhipuzi_pos_windows/wnd/CJiajiaWnd.h
  18. 137 1
      zhipuzi_pos_windows/wnd/CMainWnd.cpp
  19. 13 0
      zhipuzi_pos_windows/wnd/CMainWnd.h
  20. 8 1
      zhipuzi_pos_windows/wnd/CMemberLoginWnd.h
  21. 8 1
      zhipuzi_pos_windows/wnd/CMemoWnd.h
  22. 8 1
      zhipuzi_pos_windows/wnd/CMessageboxWnd.h
  23. 10 0
      zhipuzi_pos_windows/wnd/CModalWnd.cpp
  24. 18 0
      zhipuzi_pos_windows/wnd/CModalWnd.h
  25. 8 1
      zhipuzi_pos_windows/wnd/CRengongYouhuiWnd.h
  26. 8 1
      zhipuzi_pos_windows/wnd/CSaomaCikaWnd.h
  27. 8 1
      zhipuzi_pos_windows/wnd/CSaomaQuanyikaWnd.h
  28. 8 1
      zhipuzi_pos_windows/wnd/CSaomaShangpinquanWnd.h
  29. 8 1
      zhipuzi_pos_windows/wnd/CSaomaYouhuiquanWnd.h
  30. 8 1
      zhipuzi_pos_windows/wnd/CWaimaiOrderFailReasonWnd.h
  31. 6 0
      zhipuzi_pos_windows/wnd/CWeixinzhifuShoukuanWnd.cpp
  32. 11 1
      zhipuzi_pos_windows/wnd/CWeixinzhifuShoukuanWnd.h
  33. 8 0
      zhipuzi_pos_windows/wnd/CXianjinShoukuanWnd.cpp
  34. 8 1
      zhipuzi_pos_windows/wnd/CXianjinShoukuanWnd.h
  35. 8 1
      zhipuzi_pos_windows/wnd/CYouhuiShowWnd.h
  36. 8 1
      zhipuzi_pos_windows/wnd/CZhekouWnd.h
  37. 8 1
      zhipuzi_pos_windows/wnd/CZidingyiShoukuanWnd.h
  38. 2 0
      zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj
  39. 6 0
      zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj.filters

Разница между файлами не показана из-за своего большого размера
+ 5 - 5
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_page.xml


+ 3 - 0
zhipuzi_pos_windows/page/CBasePageUI.h

@@ -29,6 +29,9 @@ public:
 	//处理编辑框输入内容改变事件
 	//处理编辑框输入内容改变事件
 	virtual void HandleTextChangedMsg(TNotifyUI& msg) = 0;
 	virtual void HandleTextChangedMsg(TNotifyUI& msg) = 0;
 
 
+	//处理扫码枪捕捉到的扫码信息
+	virtual void HandleTextCapture(std::string content) = 0;
+
 	void SetMainWnd(CMainWnd* wnd)
 	void SetMainWnd(CMainWnd* wnd)
 	{
 	{
 		m_pMainWnd = wnd;
 		m_pMainWnd = wnd;

+ 22 - 15
zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -736,8 +736,15 @@ void CDiandanPageUI::HandleItemSelectMsg(TNotifyUI& msg)
 void CDiandanPageUI::HandleTextChangedMsg(TNotifyUI& msg)
 void CDiandanPageUI::HandleTextChangedMsg(TNotifyUI& msg)
 {
 {
 	CDuiString name = msg.pSender->GetName();
 	CDuiString name = msg.pSender->GetName();
+}
 
 
+//处理扫码枪捕捉到的扫码信息
+void CDiandanPageUI::HandleTextCapture(std::string content)
+{
+	//能收到这个消息,说明当前没有弹框,如果弹框了消息会被弹框本身拦截不会到MainWnd
+	string a = content;
 
 
+	::MessageBox(NULL, L"111", L"222", MB_OK);
 }
 }
 
 
 void CDiandanPageUI::AddDiandanOrderItemShow(int index)
 void CDiandanPageUI::AddDiandanOrderItemShow(int index)
@@ -2361,7 +2368,7 @@ std::map<string, string> CDiandanPageUI::GetSendorderParams()
 
 
 void CDiandanPageUI::StartWeixinzhifuShoukuan()
 void CDiandanPageUI::StartWeixinzhifuShoukuan()
 {
 {
-	if (m_is_show_shoukuan == true)
+	if (m_is_show_modal_wnd == true)
 	{
 	{
 		return;
 		return;
 	}
 	}
@@ -2380,7 +2387,7 @@ void CDiandanPageUI::StartWeixinzhifuShoukuan()
 		pShoukuanWnd->SetIcon(IDI_ICON_DUILIB);
 		pShoukuanWnd->SetIcon(IDI_ICON_DUILIB);
 		pShoukuanWnd->CenterWindow();
 		pShoukuanWnd->CenterWindow();
 
 
-		m_is_show_shoukuan = true;
+		m_is_show_modal_wnd = true;
 
 
 		std::string format_string = CLewaimaiString::DoubleToString(m_cur_total_price, 2);
 		std::string format_string = CLewaimaiString::DoubleToString(m_cur_total_price, 2);
 		std::wstring watchValue = CLewaimaiString::UTF8ToUnicode(format_string);
 		std::wstring watchValue = CLewaimaiString::UTF8ToUnicode(format_string);
@@ -2413,13 +2420,13 @@ void CDiandanPageUI::StartWeixinzhifuShoukuan()
 
 
 		delete pShoukuanWnd;
 		delete pShoukuanWnd;
 
 
-		m_is_show_shoukuan = false;
+		m_is_show_modal_wnd = false;
 	}
 	}
 }
 }
 
 
 void CDiandanPageUI::StartHuiyuanShoukuan()
 void CDiandanPageUI::StartHuiyuanShoukuan()
 {
 {
-	if (m_is_show_shoukuan == true)
+	if (m_is_show_modal_wnd == true)
 	{
 	{
 		return;
 		return;
 	}
 	}
@@ -2438,7 +2445,7 @@ void CDiandanPageUI::StartHuiyuanShoukuan()
 		pShoukuanWnd->SetIcon(IDI_ICON_DUILIB);
 		pShoukuanWnd->SetIcon(IDI_ICON_DUILIB);
 		pShoukuanWnd->CenterWindow();
 		pShoukuanWnd->CenterWindow();
 
 
-		m_is_show_shoukuan = true;
+		m_is_show_modal_wnd = true;
 
 
 		std::string format_string = CLewaimaiString::DoubleToString(m_cur_total_price, 2);
 		std::string format_string = CLewaimaiString::DoubleToString(m_cur_total_price, 2);
 		std::wstring watchValue = CLewaimaiString::UTF8ToUnicode(format_string);
 		std::wstring watchValue = CLewaimaiString::UTF8ToUnicode(format_string);
@@ -2471,14 +2478,14 @@ void CDiandanPageUI::StartHuiyuanShoukuan()
 
 
 		delete pShoukuanWnd;
 		delete pShoukuanWnd;
 
 
-		m_is_show_shoukuan = false;
+		m_is_show_modal_wnd = false;
 	}
 	}
 }
 }
 
 
 //开始进行现金收款
 //开始进行现金收款
 void CDiandanPageUI::StartXianjinShoukuan()
 void CDiandanPageUI::StartXianjinShoukuan()
 {
 {
-	if (m_is_show_shoukuan == true)
+	if (m_is_show_modal_wnd == true)
 	{
 	{
 		return;
 		return;
 	}
 	}
@@ -2497,7 +2504,7 @@ void CDiandanPageUI::StartXianjinShoukuan()
 		pShoukuanWnd->SetIcon(IDI_ICON_DUILIB);
 		pShoukuanWnd->SetIcon(IDI_ICON_DUILIB);
 		pShoukuanWnd->CenterWindow();
 		pShoukuanWnd->CenterWindow();
 
 
-		m_is_show_shoukuan = true;
+		m_is_show_modal_wnd = true;
 
 
 		std::string format_string = CLewaimaiString::DoubleToString(m_cur_total_price, 2);
 		std::string format_string = CLewaimaiString::DoubleToString(m_cur_total_price, 2);
 		std::wstring watchValue = CLewaimaiString::UTF8ToUnicode(format_string);
 		std::wstring watchValue = CLewaimaiString::UTF8ToUnicode(format_string);
@@ -2530,13 +2537,13 @@ void CDiandanPageUI::StartXianjinShoukuan()
 
 
 		delete pShoukuanWnd;
 		delete pShoukuanWnd;
 
 
-		m_is_show_shoukuan = false;
+		m_is_show_modal_wnd = false;
 	}
 	}
 }
 }
 
 
 void CDiandanPageUI::StartFulikaShoukuan()
 void CDiandanPageUI::StartFulikaShoukuan()
 {
 {
-	if (m_is_show_shoukuan == true)
+	if (m_is_show_modal_wnd == true)
 	{
 	{
 		return;
 		return;
 	}
 	}
@@ -2555,7 +2562,7 @@ void CDiandanPageUI::StartFulikaShoukuan()
 		pShoukuanWnd->SetIcon(IDI_ICON_DUILIB);
 		pShoukuanWnd->SetIcon(IDI_ICON_DUILIB);
 		pShoukuanWnd->CenterWindow();
 		pShoukuanWnd->CenterWindow();
 
 
-		m_is_show_shoukuan = true;
+		m_is_show_modal_wnd = true;
 
 
 		std::string format_string = CLewaimaiString::DoubleToString(m_cur_total_price, 2);
 		std::string format_string = CLewaimaiString::DoubleToString(m_cur_total_price, 2);
 		std::wstring watchValue = CLewaimaiString::UTF8ToUnicode(format_string);
 		std::wstring watchValue = CLewaimaiString::UTF8ToUnicode(format_string);
@@ -2588,13 +2595,13 @@ void CDiandanPageUI::StartFulikaShoukuan()
 
 
 		delete pShoukuanWnd;
 		delete pShoukuanWnd;
 
 
-		m_is_show_shoukuan = false;
+		m_is_show_modal_wnd = false;
 	}
 	}
 }
 }
 
 
 void CDiandanPageUI::StartZidingyiShoukuan(std::wstring name, std::wstring selfpay_id)
 void CDiandanPageUI::StartZidingyiShoukuan(std::wstring name, std::wstring selfpay_id)
 {
 {
-	if (m_is_show_shoukuan == true)
+	if (m_is_show_modal_wnd == true)
 	{
 	{
 		return;
 		return;
 	}
 	}
@@ -2613,7 +2620,7 @@ void CDiandanPageUI::StartZidingyiShoukuan(std::wstring name, std::wstring selfp
 		pShoukuanWnd->SetIcon(IDI_ICON_DUILIB);
 		pShoukuanWnd->SetIcon(IDI_ICON_DUILIB);
 		pShoukuanWnd->CenterWindow();
 		pShoukuanWnd->CenterWindow();
 
 
-		m_is_show_shoukuan = true;
+		m_is_show_modal_wnd = true;
 
 
 		std::string format_string = CLewaimaiString::DoubleToString(m_cur_total_price, 2);
 		std::string format_string = CLewaimaiString::DoubleToString(m_cur_total_price, 2);
 		std::wstring watchValue = CLewaimaiString::UTF8ToUnicode(format_string);
 		std::wstring watchValue = CLewaimaiString::UTF8ToUnicode(format_string);
@@ -2649,7 +2656,7 @@ void CDiandanPageUI::StartZidingyiShoukuan(std::wstring name, std::wstring selfp
 
 
 		delete pShoukuanWnd;
 		delete pShoukuanWnd;
 
 
-		m_is_show_shoukuan = false;
+		m_is_show_modal_wnd = false;
 	}
 	}
 }
 }
 
 

+ 7 - 1
zhipuzi_pos_windows/page/CDiandanPageUI.h

@@ -10,6 +10,8 @@
 #include "../control/CDiandanFoodItemUI.h"
 #include "../control/CDiandanFoodItemUI.h"
 #include "../zhipuzi/CDiandanOrder.h"
 #include "../zhipuzi/CDiandanOrder.h"
 
 
+#include "../wnd/CModalWnd.h"
+
 class CDiandanPageUI : public CBasePageUI
 class CDiandanPageUI : public CBasePageUI
 {
 {
 public:
 public:
@@ -49,6 +51,9 @@ public:
 	//处理编辑框输入内容改变事件
 	//处理编辑框输入内容改变事件
 	void HandleTextChangedMsg(TNotifyUI& msg);
 	void HandleTextChangedMsg(TNotifyUI& msg);
 
 
+	//处理扫码枪捕捉到的扫码信息
+	void HandleTextCapture(std::string content);
+
 	//添加一个新的商品到购物车展示
 	//添加一个新的商品到购物车展示
 	void AddDiandanOrderItemShow(int index);
 	void AddDiandanOrderItemShow(int index);
 
 
@@ -247,6 +252,7 @@ private:
 	//餐牌
 	//餐牌
 	std::string m_canpai;
 	std::string m_canpai;
 
 
-	bool m_is_show_shoukuan = false;
+	bool m_is_show_modal_wnd = false;
+	CModalWnd* m_curModalWnd;
 };
 };
 
 

+ 6 - 0
zhipuzi_pos_windows/page/CSettingPageUI.cpp

@@ -1306,3 +1306,9 @@ void CSettingPageUI::HandleTextChangedMsg(TNotifyUI& msg)
 {
 {
 
 
 }
 }
+
+//处理扫码枪捕捉到的扫码信息
+void CSettingPageUI::HandleTextCapture(std::string content)
+{
+
+}

+ 3 - 0
zhipuzi_pos_windows/page/CSettingPageUI.h

@@ -23,5 +23,8 @@ public:
 
 
 	//处理编辑框输入内容改变事件
 	//处理编辑框输入内容改变事件
 	void HandleTextChangedMsg(TNotifyUI& msg);
 	void HandleTextChangedMsg(TNotifyUI& msg);
+
+	//处理扫码枪捕捉到的扫码信息
+	void HandleTextCapture(std::string content);
 };
 };
 
 

+ 6 - 0
zhipuzi_pos_windows/page/CWaimaiOrderInfoPageUI.cpp

@@ -183,6 +183,12 @@ void CWaimaiOrderInfoPageUI::HandleTextChangedMsg(TNotifyUI& msg)
 
 
 }
 }
 
 
+//处理扫码枪捕捉到的扫码信息
+void CWaimaiOrderInfoPageUI::HandleTextCapture(std::string content)
+{
+
+}
+
 //刷新当前页面的内容,注意这个函数不会改变当前的订单状态以及“页数”
 //刷新当前页面的内容,注意这个函数不会改变当前的订单状态以及“页数”
 void CWaimaiOrderInfoPageUI::SetDate(CWaimaiOrder& order)
 void CWaimaiOrderInfoPageUI::SetDate(CWaimaiOrder& order)
 {
 {

+ 3 - 0
zhipuzi_pos_windows/page/CWaimaiOrderInfoPageUI.h

@@ -27,6 +27,9 @@ public:
 	//处理编辑框输入内容改变事件
 	//处理编辑框输入内容改变事件
 	void HandleTextChangedMsg(TNotifyUI& msg);
 	void HandleTextChangedMsg(TNotifyUI& msg);
 
 
+	//处理扫码枪捕捉到的扫码信息
+	void HandleTextCapture(std::string content);
+
 	//刷新当前页面的内容,注意这个函数不会改变当前的订单状态以及“页数”
 	//刷新当前页面的内容,注意这个函数不会改变当前的订单状态以及“页数”
 	void SetDate(CWaimaiOrder& order);
 	void SetDate(CWaimaiOrder& order);
 
 

+ 6 - 0
zhipuzi_pos_windows/page/CWaimaiOrderListPageUI.cpp

@@ -214,6 +214,12 @@ void CWaimaiOrderListPageUI::HandleTextChangedMsg(TNotifyUI& msg)
 
 
 }
 }
 
 
+//处理扫码枪捕捉到的扫码信息
+void CWaimaiOrderListPageUI::HandleTextCapture(std::string content)
+{
+
+}
+
 void CWaimaiOrderListPageUI::Refresh()
 void CWaimaiOrderListPageUI::Refresh()
 {
 {
 	//开始转菊花
 	//开始转菊花

+ 3 - 0
zhipuzi_pos_windows/page/CWaimaiOrderListPageUI.h

@@ -32,6 +32,9 @@ public:
 	//处理编辑框输入内容改变事件
 	//处理编辑框输入内容改变事件
 	void HandleTextChangedMsg(TNotifyUI& msg);
 	void HandleTextChangedMsg(TNotifyUI& msg);
 
 
+	//处理扫码枪捕捉到的扫码信息
+	void HandleTextCapture(std::string content);
+
 	//刷新当前页面的内容,注意这个函数不会改变当前的订单状态以及“页数”
 	//刷新当前页面的内容,注意这个函数不会改变当前的订单状态以及“页数”
 	void Refresh();
 	void Refresh();
 
 

+ 8 - 1
zhipuzi_pos_windows/wnd/CCanpaiWnd.h

@@ -2,8 +2,9 @@
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
 #include "CMainWnd.h"
 #include "CMainWnd.h"
+#include "CModalWnd.h"
 
 
-class CCanpaiWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CCanpaiWnd : public CModalWnd
 {
 {
 public:
 public:
 	LPCTSTR GetWindowClassName() const
 	LPCTSTR GetWindowClassName() const
@@ -61,6 +62,12 @@ public:
 
 
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 

+ 8 - 1
zhipuzi_pos_windows/wnd/CChengzhongWnd.h

@@ -3,8 +3,9 @@
 #include "../pch/pch.h"
 #include "../pch/pch.h"
 #include "CMainWnd.h"
 #include "CMainWnd.h"
 #include "../tool/CSerialPort.h"
 #include "../tool/CSerialPort.h"
+#include "CModalWnd.h"
 
 
-class CChengzhongWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CChengzhongWnd : public CModalWnd
 {
 {
 public:
 public:
 	LPCTSTR GetWindowClassName() const
 	LPCTSTR GetWindowClassName() const
@@ -73,6 +74,12 @@ public:
 
 
 	void Quit();
 	void Quit();
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 

+ 8 - 1
zhipuzi_pos_windows/wnd/CChufangSettingWnd.h

@@ -2,8 +2,9 @@
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
 #include "CMainWnd.h"
 #include "CMainWnd.h"
+#include "CModalWnd.h"
 
 
-class CChufangSettingWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CChufangSettingWnd : public CModalWnd
 {
 {
 public:
 public:
     CChufangSettingWnd(int mode)
     CChufangSettingWnd(int mode)
@@ -338,6 +339,12 @@ public:
 
 
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
     CPaintManagerUI m_pm;
     CPaintManagerUI m_pm;
 
 

+ 9 - 1
zhipuzi_pos_windows/wnd/CDiandanNatureWnd.h

@@ -7,7 +7,9 @@
 #include "../control/CDiandanNatureItemUI.h"
 #include "../control/CDiandanNatureItemUI.h"
 #include "../zhipuzi/CDiandanOrder.h"
 #include "../zhipuzi/CDiandanOrder.h"
 
 
-class CDiandanNatureWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+#include "CModalWnd.h"
+
+class CDiandanNatureWnd : public CModalWnd
 {
 {
 public:
 public:
 	CDiandanNatureWnd(int mode)
 	CDiandanNatureWnd(int mode)
@@ -58,6 +60,12 @@ public:
 
 
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 

+ 8 - 1
zhipuzi_pos_windows/wnd/CFulikaShoukuanWnd.h

@@ -1,8 +1,9 @@
 #pragma once
 #pragma once
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
+#include "CModalWnd.h"
 
 
-class CFulikaShoukuanWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CFulikaShoukuanWnd : public CModalWnd
 {
 {
 public:
 public:
 	CFulikaShoukuanWnd()
 	CFulikaShoukuanWnd()
@@ -86,6 +87,12 @@ public:
 
 
 	void ReadShoukuanValue();
 	void ReadShoukuanValue();
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 

+ 8 - 1
zhipuzi_pos_windows/wnd/CHuiyuanShoukuanWnd.h

@@ -1,8 +1,9 @@
 #pragma once
 #pragma once
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
+#include "CModalWnd.h"
 
 
-class CHuiyuanShoukuanWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CHuiyuanShoukuanWnd : public CModalWnd
 {
 {
 public:
 public:
 	CHuiyuanShoukuanWnd()
 	CHuiyuanShoukuanWnd()
@@ -86,6 +87,12 @@ public:
 
 
 	void ReadShoukuanValue();
 	void ReadShoukuanValue();
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 

+ 8 - 1
zhipuzi_pos_windows/wnd/CJiajiaWnd.h

@@ -2,8 +2,9 @@
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
 #include "CMainWnd.h"
 #include "CMainWnd.h"
+#include "CModalWnd.h"
 
 
-class CjiajiaWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CjiajiaWnd : public CModalWnd
 {
 {
 public:
 public:
 	LPCTSTR GetWindowClassName() const
 	LPCTSTR GetWindowClassName() const
@@ -61,6 +62,12 @@ public:
 
 
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 

+ 137 - 1
zhipuzi_pos_windows/wnd/CMainWnd.cpp

@@ -28,6 +28,9 @@ void CMainWnd::Init()
 	//默认选择点单页面
 	//默认选择点单页面
 	this->SwitchPage(DIANDAN);
 	this->SwitchPage(DIANDAN);
 
 
+	//开启键盘输入监听
+	RegKeyboardRawInput();
+
     //登录成功,启动消息和任务处理
     //登录成功,启动消息和任务处理
     m_push = new CMessagePush(m_hWnd);
     m_push = new CMessagePush(m_hWnd);
     m_push->Start();
     m_push->Start();
@@ -367,10 +370,14 @@ LRESULT CMainWnd::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
         lRes = OnSysCommand(uMsg, wParam, lParam, bHandled);
         lRes = OnSysCommand(uMsg, wParam, lParam, bHandled);
         break;
         break;
 
 
-    case  WM_SHOWTASK:
+    case WM_SHOWTASK:
         lRes = OnTrayIcon(uMsg, wParam, lParam, bHandled);
         lRes = OnTrayIcon(uMsg, wParam, lParam, bHandled);
         break;
         break;
 
 
+	case WM_INPUT:
+		lRes = OnInput(uMsg, wParam, lParam, bHandled);
+		break;
+
     default:
     default:
         bHandled = FALSE;
         bHandled = FALSE;
     }
     }
@@ -633,6 +640,121 @@ LRESULT CMainWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa
     return HTCLIENT;
     return HTCLIENT;
 }
 }
 
 
+LRESULT CMainWnd::OnInput(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+{
+	UINT dwSize = 0;
+	GetRawInputData((HRAWINPUT)lParam, (UINT)RID_INPUT, NULL, &dwSize, sizeof(RAWINPUTHEADER));//取数据,第一次调用函数将获取需要的字节大小		
+	LPBYTE lpbBuffer = new BYTE[dwSize];//分配指定的缓冲区大小
+	GetRawInputData((HRAWINPUT)lParam, (UINT)RID_INPUT, (LPVOID)lpbBuffer, (PUINT)&dwSize, (UINT)sizeof(RAWINPUTHEADER));//第二次调用获取原始输入数据,读入lpbBuffer
+
+	RAWINPUT * raw = (RAWINPUT *)lpbBuffer;
+	if (raw->header.dwType == RIM_TYPEKEYBOARD)//这里可以截获所有键盘信息,如需区分不同的键盘输入信息,可以通过设备句柄判断。
+	{
+		if (raw->data.keyboard.Message == WM_KEYDOWN)
+		{
+
+		}
+		else if (raw->data.keyboard.Message == WM_KEYUP)
+		{
+			char keytext[10] = { 0 };
+			BYTE state[256] = { 0 };
+
+			//通过虚拟键盘码得到名字
+			ToAscii(raw->data.keyboard.VKey, raw->data.keyboard.MakeCode, state, (LPWORD)keytext, 0);
+
+			string a = keytext;
+
+			if (raw->data.keyboard.VKey >= 48 && raw->data.keyboard.VKey <= 57)
+			{
+				//只考虑数字
+				if (m_is_start_catch == false)
+				{
+					m_is_start_catch = true;
+
+					m_catch_string = "";
+
+					char keytext[10] = { 0 };
+					BYTE state[256] = { 0 };
+
+					//通过虚拟键盘码得到名字
+					ToAscii(raw->data.keyboard.VKey, raw->data.keyboard.MakeCode, state, (LPWORD)keytext, 0);
+
+					m_catch_string += string(keytext);
+
+					m_last_catch_clock = clock();
+				}
+				else
+				{
+					//已经是在抓取过程中了
+					clock_t now = clock();
+
+					double total_t = (double)(now - m_last_catch_clock) / CLOCKS_PER_SEC;
+					if (total_t > 0.05)
+					{
+						//如果超过了50ms,说明是人工输入的了,就重置所有状态
+						m_is_start_catch = false;
+
+						m_catch_string = "";
+					}
+					else
+					{
+						char keytext[10] = { 0 };
+						BYTE state[256] = { 0 };
+
+						//通过虚拟键盘码得到名字
+						ToAscii(raw->data.keyboard.VKey, raw->data.keyboard.MakeCode, state, (LPWORD)keytext, 0);
+
+						m_catch_string += string(keytext);
+
+						m_last_catch_clock = clock();
+					}
+				}
+			}
+			else if (raw->data.keyboard.VKey == 13)
+			{
+				//输入了enter
+				if (m_is_start_catch == true)
+				{
+					//正在抓取中,判断enter才有意义,否则没有意义
+
+					clock_t now = clock();
+
+					double total_t = (double)(now - m_last_catch_clock) / CLOCKS_PER_SEC;
+					if (total_t > 0.05)
+					{
+						//如果超过了50ms,说明是人工输入的了,就重置所有状态
+						m_is_start_catch = false;
+						m_catch_string = "";
+					}
+					else
+					{
+						//这种说明是扫码的
+						std::string last = m_catch_string;
+
+						//对抓取结果,进行处理
+						m_curPageUI->HandleTextCapture(last);
+
+						//处理完成后,清空重来
+						m_is_start_catch = false;
+						m_catch_string = "";
+					}
+				}
+			}
+			else
+			{
+				//这种直接忽略,重新开始
+				m_is_start_catch = false;
+
+				m_catch_string = "";
+			}
+		}
+	}
+	delete[] lpbBuffer;
+
+	bHandled = true;
+	return 0;
+}
+
 void CMainWnd::AddTrayIcon()
 void CMainWnd::AddTrayIcon()
 {
 {
     memset(&m_trayIcon, 0, sizeof(NOTIFYICONDATA));
     memset(&m_trayIcon, 0, sizeof(NOTIFYICONDATA));
@@ -736,3 +858,17 @@ void CMainWnd::ShowToast(std::wstring toast_value)
 		pYouhuiDlg->ShowWindow();
 		pYouhuiDlg->ShowWindow();
 	}
 	}
 }
 }
+
+//全局监听键盘输入
+void CMainWnd::RegKeyboardRawInput()
+{
+	RAWINPUTDEVICE rawInputDevice[1];
+	rawInputDevice[0].usUsagePage = 0x01;//设备类
+	rawInputDevice[0].usUsage = 0x06;//设备类内的具体设备
+	rawInputDevice[0].dwFlags = RIDEV_INPUTSINK;//意味着即使窗口失去焦点位置,仍然会一直接收输入消息
+	rawInputDevice[0].hwndTarget = m_hWnd;
+	if (RegisterRawInputDevices(rawInputDevice, 1, sizeof(rawInputDevice[0])) == FALSE)
+	{
+		printf("RegisterRawInputDevices failed");
+	}
+}

+ 13 - 0
zhipuzi_pos_windows/wnd/CMainWnd.h

@@ -77,6 +77,8 @@ public:
 
 
     LRESULT OnSysCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
     LRESULT OnSysCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 
 
+	LRESULT OnInput(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+
     LRESULT HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
     LRESULT HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 
 	//这个是用来处理一些自定义的消息
 	//这个是用来处理一些自定义的消息
@@ -90,14 +92,19 @@ public:
     //处理托盘图标上的事件
     //处理托盘图标上的事件
     LRESULT OnTrayIcon(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
     LRESULT OnTrayIcon(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 
 
+	//退出登陆
 	void LoginOut(int mode);
 	void LoginOut(int mode);
 
 
 	CMessagePush* getMessagePush();
 	CMessagePush* getMessagePush();
 
 
 	void SetInfopageWaimaiorderParam(std::string order_id, std::string order_no);
 	void SetInfopageWaimaiorderParam(std::string order_id, std::string order_no);
 
 
+	//展示toast
 	void ShowToast(std::wstring toast_value);
 	void ShowToast(std::wstring toast_value);
 
 
+	//开启键盘输入监听
+	void RegKeyboardRawInput();
+
 public:
 public:
     CPaintManagerUI m_pm;
     CPaintManagerUI m_pm;
 
 
@@ -122,6 +129,12 @@ private:
 	std::string m_infopage_waimaiorder_id;
 	std::string m_infopage_waimaiorder_id;
 	std::string m_infopage_waimaiorder_no;
 	std::string m_infopage_waimaiorder_no;
 
 
+	//处理左侧tab高亮相关的
 	std::wstring m_curOptionName;
 	std::wstring m_curOptionName;
 	CControlUI* m_curOption;
 	CControlUI* m_curOption;
+
+	//抓取键盘输入相关的
+	bool m_is_start_catch = false;
+	clock_t m_last_catch_clock;
+	std::string m_catch_string;
 };
 };

+ 8 - 1
zhipuzi_pos_windows/wnd/CMemberLoginWnd.h

@@ -2,8 +2,9 @@
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
 #include "CMainWnd.h"
 #include "CMainWnd.h"
+#include "CModalWnd.h"
 
 
-class CMemberLoginWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CMemberLoginWnd : public CModalWnd
 {
 {
 public:
 public:
 	LPCTSTR GetWindowClassName() const
 	LPCTSTR GetWindowClassName() const
@@ -63,6 +64,12 @@ public:
 
 
 	void ConfirmMember();
 	void ConfirmMember();
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 

+ 8 - 1
zhipuzi_pos_windows/wnd/CMemoWnd.h

@@ -2,8 +2,9 @@
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
 #include "CMainWnd.h"
 #include "CMainWnd.h"
+#include "CModalWnd.h"
 
 
-class CMemoWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CMemoWnd : public CModalWnd
 {
 {
 public:
 public:
 	LPCTSTR GetWindowClassName() const
 	LPCTSTR GetWindowClassName() const
@@ -68,6 +69,12 @@ public:
 
 
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 

+ 8 - 1
zhipuzi_pos_windows/wnd/CMessageboxWnd.h

@@ -2,8 +2,9 @@
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
 #include "CMainWnd.h"
 #include "CMainWnd.h"
+#include "CModalWnd.h"
 
 
-class CMessageboxWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CMessageboxWnd : public CModalWnd
 {
 {
 public:
 public:
 	LPCTSTR GetWindowClassName() const
 	LPCTSTR GetWindowClassName() const
@@ -97,6 +98,12 @@ public:
 
 
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 };
 };

+ 10 - 0
zhipuzi_pos_windows/wnd/CModalWnd.cpp

@@ -0,0 +1,10 @@
+#include "CModalWnd.h"
+
+
+
+CModalWnd::CModalWnd()
+{
+}
+
+
+

+ 18 - 0
zhipuzi_pos_windows/wnd/CModalWnd.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "../pch/pch.h"
+
+//这个是所有模态对话框的基类
+class CModalWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+{
+public:
+	CModalWnd();
+	
+	virtual ~CModalWnd()
+	{
+	}
+
+	//处理键盘捕捉结果
+	virtual void HandleTextCapture(std::string content) = 0;
+};
+

+ 8 - 1
zhipuzi_pos_windows/wnd/CRengongYouhuiWnd.h

@@ -2,8 +2,9 @@
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
 #include "CMainWnd.h"
 #include "CMainWnd.h"
+#include "CModalWnd.h"
 
 
-class CRengongYouhuiWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CRengongYouhuiWnd : public CModalWnd
 {
 {
 public:
 public:
 	LPCTSTR GetWindowClassName() const
 	LPCTSTR GetWindowClassName() const
@@ -61,6 +62,12 @@ public:
 
 
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 

+ 8 - 1
zhipuzi_pos_windows/wnd/CSaomaCikaWnd.h

@@ -2,8 +2,9 @@
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
 #include "CMainWnd.h"
 #include "CMainWnd.h"
+#include "CModalWnd.h"
 
 
-class CSaomaCikaWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CSaomaCikaWnd : public CModalWnd
 {
 {
 public:
 public:
 	LPCTSTR GetWindowClassName() const
 	LPCTSTR GetWindowClassName() const
@@ -62,6 +63,12 @@ public:
 
 
 	void ConfirmMember();
 	void ConfirmMember();
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 

+ 8 - 1
zhipuzi_pos_windows/wnd/CSaomaQuanyikaWnd.h

@@ -2,8 +2,9 @@
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
 #include "CMainWnd.h"
 #include "CMainWnd.h"
+#include "CModalWnd.h"
 
 
-class CSaomaQuanyikaWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CSaomaQuanyikaWnd : public CModalWnd
 {
 {
 public:
 public:
 	LPCTSTR GetWindowClassName() const
 	LPCTSTR GetWindowClassName() const
@@ -62,6 +63,12 @@ public:
 
 
 	void ConfirmMember();
 	void ConfirmMember();
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 

+ 8 - 1
zhipuzi_pos_windows/wnd/CSaomaShangpinquanWnd.h

@@ -2,8 +2,9 @@
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
 #include "CMainWnd.h"
 #include "CMainWnd.h"
+#include "CModalWnd.h"
 
 
-class CSaomaShangpinquanWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CSaomaShangpinquanWnd : public CModalWnd
 {
 {
 public:
 public:
 	LPCTSTR GetWindowClassName() const
 	LPCTSTR GetWindowClassName() const
@@ -62,6 +63,12 @@ public:
 
 
 	void ConfirmMember();
 	void ConfirmMember();
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 

+ 8 - 1
zhipuzi_pos_windows/wnd/CSaomaYouhuiquanWnd.h

@@ -2,8 +2,9 @@
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
 #include "CMainWnd.h"
 #include "CMainWnd.h"
+#include "CModalWnd.h"
 
 
-class CSaomaYouhuiquanWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CSaomaYouhuiquanWnd : public CModalWnd
 {
 {
 public:
 public:
 	LPCTSTR GetWindowClassName() const
 	LPCTSTR GetWindowClassName() const
@@ -62,6 +63,12 @@ public:
 
 
 	void ConfirmMember();
 	void ConfirmMember();
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 

+ 8 - 1
zhipuzi_pos_windows/wnd/CWaimaiOrderFailReasonWnd.h

@@ -2,8 +2,9 @@
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
 #include "CMainWnd.h"
 #include "CMainWnd.h"
+#include "CModalWnd.h"
 
 
-class CWaimaiOrderFailReasonWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CWaimaiOrderFailReasonWnd : public CModalWnd
 {
 {
 public:
 public:
 	LPCTSTR GetWindowClassName() const
 	LPCTSTR GetWindowClassName() const
@@ -113,6 +114,12 @@ public:
 
 
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 

+ 6 - 0
zhipuzi_pos_windows/wnd/CWeixinzhifuShoukuanWnd.cpp

@@ -943,3 +943,9 @@ void CWeixinzhifuShoukuanWnd::ReadShoukuanValue()
 {
 {
 	CSpeech::SpeakNum(1, CLewaimaiString::UnicodeToUTF8(m_money));
 	CSpeech::SpeakNum(1, CLewaimaiString::UnicodeToUTF8(m_money));
 }
 }
+
+//处理键盘捕捉结果
+void CWeixinzhifuShoukuanWnd::HandleTextCapture(std::string content)
+{
+
+}

+ 11 - 1
zhipuzi_pos_windows/wnd/CWeixinzhifuShoukuanWnd.h

@@ -1,8 +1,10 @@
 #pragma once
 #pragma once
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
+#include "CModalWnd.h"
+#include "CModalWnd.h"
 
 
-class CWeixinzhifuShoukuanWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CWeixinzhifuShoukuanWnd : public CModalWnd
 {
 {
 public:
 public:
 	CWeixinzhifuShoukuanWnd()
 	CWeixinzhifuShoukuanWnd()
@@ -86,6 +88,9 @@ public:
 
 
 	void ReadShoukuanValue();
 	void ReadShoukuanValue();
 
 
+	//处理键盘捕捉结果
+	void HandleTextCapture(std::string content);
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 
@@ -110,5 +115,10 @@ public:
 
 
 	//更新库存的字符串
 	//更新库存的字符串
 	std::string m_kucun_string;
 	std::string m_kucun_string;
+
+	//抓取键盘输入相关的
+	bool m_is_start_catch = false;
+	clock_t m_last_catch_clock;
+	std::string m_catch_string;
 };
 };
 
 

+ 8 - 0
zhipuzi_pos_windows/wnd/CXianjinShoukuanWnd.cpp

@@ -610,6 +610,14 @@ void CXianjinShoukuanWnd::StartShoukuan()
 		return;
 		return;
 	}
 	}
 
 
+	if (shishou_value > 100000)
+	{
+		pLabel->SetText(L"实收金额不能大于10万");
+		pLabel->SetVisible(true);
+
+		return;
+	}
+
 	//全部验证通过,就可以开始修改状态了
 	//全部验证通过,就可以开始修改状态了
 	m_shoukuan_status = 1;
 	m_shoukuan_status = 1;
 
 

+ 8 - 1
zhipuzi_pos_windows/wnd/CXianjinShoukuanWnd.h

@@ -1,8 +1,9 @@
 #pragma once
 #pragma once
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
+#include "CModalWnd.h"
 
 
-class CXianjinShoukuanWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CXianjinShoukuanWnd : public CModalWnd
 {
 {
 public:
 public:
 	CXianjinShoukuanWnd()
 	CXianjinShoukuanWnd()
@@ -88,6 +89,12 @@ public:
 
 
 	void UpdateZhaoling();
 	void UpdateZhaoling();
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 

+ 8 - 1
zhipuzi_pos_windows/wnd/CYouhuiShowWnd.h

@@ -2,8 +2,9 @@
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
 #include "CMainWnd.h"
 #include "CMainWnd.h"
+#include "CModalWnd.h"
 
 
-class CYouhuiShowWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CYouhuiShowWnd : public CModalWnd
 {
 {
 public:
 public:
 	LPCTSTR GetWindowClassName() const
 	LPCTSTR GetWindowClassName() const
@@ -60,6 +61,12 @@ public:
 
 
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 };
 };

+ 8 - 1
zhipuzi_pos_windows/wnd/CZhekouWnd.h

@@ -2,8 +2,9 @@
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
 #include "CMainWnd.h"
 #include "CMainWnd.h"
+#include "CModalWnd.h"
 
 
-class CZhekouWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CZhekouWnd : public CModalWnd
 {
 {
 public:
 public:
 	LPCTSTR GetWindowClassName() const
 	LPCTSTR GetWindowClassName() const
@@ -61,6 +62,12 @@ public:
 
 
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 	LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool& bHandled);
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 

+ 8 - 1
zhipuzi_pos_windows/wnd/CZidingyiShoukuanWnd.h

@@ -1,8 +1,9 @@
 #pragma once
 #pragma once
 
 
 #include "../pch/pch.h"
 #include "../pch/pch.h"
+#include "CModalWnd.h"
 
 
-class CZidingyiShoukuanWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
+class CZidingyiShoukuanWnd : public CModalWnd
 {
 {
 public:
 public:
 	CZidingyiShoukuanWnd()
 	CZidingyiShoukuanWnd()
@@ -89,6 +90,12 @@ public:
 	void SetZidingyiName(std::wstring name);
 	void SetZidingyiName(std::wstring name);
 	void SetZidingyiId(std::wstring selfpay_id);
 	void SetZidingyiId(std::wstring selfpay_id);
 
 
+	//´¦Àí¼üÅ̲¶×½½á¹û
+	void HandleTextCapture(std::string content)
+	{
+
+	}
+
 public:
 public:
 	CPaintManagerUI m_pm;
 	CPaintManagerUI m_pm;
 
 

+ 2 - 0
zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj

@@ -225,6 +225,7 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     </PostBuildEvent>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   </ItemDefinitionGroup>
   <ItemGroup>
   <ItemGroup>
+    <ClInclude Include="wnd\CModalWnd.h" />
     <ClInclude Include="wnd\CChengzhongWnd.h" />
     <ClInclude Include="wnd\CChengzhongWnd.h" />
     <ClInclude Include="tool\CSerialPort.h" />
     <ClInclude Include="tool\CSerialPort.h" />
     <ClInclude Include="wnd\CZidingyiShoukuanWnd.h" />
     <ClInclude Include="wnd\CZidingyiShoukuanWnd.h" />
@@ -292,6 +293,7 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     <ClInclude Include="helper\CSystem.h" />
     <ClInclude Include="helper\CSystem.h" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
+    <ClCompile Include="wnd\CModalWnd.cpp" />
     <ClCompile Include="wnd\CChengzhongWnd.cpp" />
     <ClCompile Include="wnd\CChengzhongWnd.cpp" />
     <ClCompile Include="tool\CSerialPort.cpp" />
     <ClCompile Include="tool\CSerialPort.cpp" />
     <ClCompile Include="wnd\CZidingyiShoukuanWnd.cpp" />
     <ClCompile Include="wnd\CZidingyiShoukuanWnd.cpp" />

+ 6 - 0
zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj.filters

@@ -210,6 +210,9 @@
     <ClInclude Include="wnd\CChengzhongWnd.h">
     <ClInclude Include="wnd\CChengzhongWnd.h">
       <Filter>头文件</Filter>
       <Filter>头文件</Filter>
     </ClInclude>
     </ClInclude>
+    <ClInclude Include="wnd\CModalWnd.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch\pch.cpp">
     <ClCompile Include="pch\pch.cpp">
@@ -383,6 +386,9 @@
     <ClCompile Include="wnd\CChengzhongWnd.cpp">
     <ClCompile Include="wnd\CChengzhongWnd.cpp">
       <Filter>源文件</Filter>
       <Filter>源文件</Filter>
     </ClCompile>
     </ClCompile>
+    <ClCompile Include="wnd\CModalWnd.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Image Include="resource\zhipuzi.ico">
     <Image Include="resource\zhipuzi.ico">