改造完4个优惠的弹框

bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_cika_dlg.xml

@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Window size="500,369" caption="0,0,0,36" roundcorner="4,4" >
-	<Font id="0" name="微软雅黑" size="26" />
-	<Font id="1" name="微软雅黑" size="20" />
-	
-	<VerticalLayout bkcolor="#FFFFFFFF">
-		<HorizontalLayout height="50" inset="10,2,10,0">
-			<Label name="memo_dlg_title" text="" align="center" valign="center" padding="0,20,0,0" font="0"/>
+<Window size="620,544" caption="0,0,0,44" roundcorner="4,4" >
+	<Font id="0" name="微软雅黑" size="24" />
+	<Font id="1" name="微软雅黑" size="40" />
+	<Font id="2" name="微软雅黑" size="20" />
+	<Font id="3" name="微软雅黑" size="32" />
+	<VerticalLayout bkimage="shoukuan_bkg.png" >
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="2"/>
+			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
 		
-		<Label name="name" text="请扫描顾客次卡二维码"  height="30" width="500" padding="0,50,0,0" align="center"/>
-	
-		<Edit name="content" width="400" height="50" padding="50,20,50,0" textcolor="0xFF3CB371" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="1"/>
-		
-		<Label name="errinfo" text=""  height="60" width="250" float="true" pos="30,230,280,290" align="left" textcolor="#FFFF0000" visible="false"/>
-		
-		<HorizontalLayout height="56" valign="center" padding="30,80,0,20">
-			<Control></Control>
-			<Button name="quit" align="center" width="100" height="45" padding="0,20,0,0" text="取消" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
-			<Button name="save" align="center" width="100" height="45" padding="20,20,90,0" text="确认" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
-			<Control></Control>
-		</HorizontalLayout>
-	</VerticalLayout>
+		<VerticalLayout visible="true" name="shoukuan_before_pay_layout" height="500" padding="0,20,0,0">						
+			<HorizontalLayout padding="0,50,0,0" height="129">
+				<Control></Control>
+				<Control bkimage="qrcode_attention.png" width="129" height="127"></Control>
+				<Control></Control>
+			</HorizontalLayout>
+			
+			<Label text="请扫描顾客次卡二维码" align="center" padding="0,30,0,0" height="40" font="0"></Label>
+
+			<HorizontalLayout height="50" padding="0,30,0,0">
+				<Control></Control>
+				<Label name="errinfo" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Control></Control>
+			</HorizontalLayout>			
+		</VerticalLayout>
+    </VerticalLayout>
 </Window>

bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_quanyika_dlg.xml

@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Window size="500,369" caption="0,0,0,36" roundcorner="4,4" >
+<Window size="620,544" caption="0,0,0,44" roundcorner="4,4" >
 	<Font id="0" name="微软雅黑" size="24" />
-	<Font id="1" name="微软雅黑" size="20" />
-	
-	<VerticalLayout bkcolor="#FFFFFFFF">
-		<HorizontalLayout height="50" inset="10,2,10,0">
-			<Label name="memo_dlg_title" text="" align="center" valign="center" padding="0,20,0,0" font="0"/>
+	<Font id="1" name="微软雅黑" size="40" />
+	<Font id="2" name="微软雅黑" size="20" />
+	<Font id="3" name="微软雅黑" size="32" />
+	<VerticalLayout bkimage="shoukuan_bkg.png" >
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="2"/>
+			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
 		
-		<Label name="name" text="请扫描顾客权益卡二维码"  height="30" width="500" padding="0,50,0,0" align="center"/>
-	
-		<Edit name="content" width="400" height="50" padding="50,20,50,0" textcolor="0xFF3CB371" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="1"/>
-		
-		<Label name="errinfo" text=""  height="60" width="350" float="true" pos="30,230,380,290" align="left" textcolor="#FFFF0000" visible="false"/>
-		
-		<HorizontalLayout height="56" valign="center" padding="30,80,0,20">
-			<Control></Control>
-			<Button name="quit" align="center" width="100" height="45" padding="0,20,0,0" text="取消" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
-			<Button name="save" align="center" width="100" height="45" padding="20,20,90,0" text="确认" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
-			<Control></Control>
-		</HorizontalLayout>
-	</VerticalLayout>
+		<VerticalLayout visible="true" name="shoukuan_before_pay_layout" height="500" padding="0,20,0,0">						
+			<HorizontalLayout padding="0,50,0,0" height="129">
+				<Control></Control>
+				<Control bkimage="qrcode_attention.png" width="129" height="127"></Control>
+				<Control></Control>
+			</HorizontalLayout>
+			
+			<Label text="请扫描顾客权益卡二维码" align="center" padding="0,30,0,0" height="40" font="0"></Label>
+
+			<HorizontalLayout height="50" padding="0,30,0,0">
+				<Control></Control>
+				<Label name="errinfo" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Control></Control>
+			</HorizontalLayout>			
+		</VerticalLayout>
+    </VerticalLayout>
 </Window>

bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_shangpinquan_dlg.xml

@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Window size="500,369" caption="0,0,0,36" roundcorner="4,4" >
-	<Font id="0" name="微软雅黑" size="26" />
-	<Font id="1" name="微软雅黑" size="20" />
-	
-	<VerticalLayout bkcolor="#FFFFFFFF">
-		<HorizontalLayout height="50" inset="10,2,10,0">
-			<Label name="memo_dlg_title" text="" align="center" valign="center" padding="0,20,0,0" font="0"/>
+<Window size="620,544" caption="0,0,0,44" roundcorner="4,4" >
+	<Font id="0" name="微软雅黑" size="24" />
+	<Font id="1" name="微软雅黑" size="40" />
+	<Font id="2" name="微软雅黑" size="20" />
+	<Font id="3" name="微软雅黑" size="32" />
+	<VerticalLayout bkimage="shoukuan_bkg.png" >
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="2"/>
+			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
 		
-		<Label name="name" text="请扫描顾客商品券二维码"  height="30" width="500" padding="0,50,0,0" align="center"/>
-	
-		<Edit name="content" width="400" height="50" padding="50,20,50,0" textcolor="0xFF3CB371" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="1"/>
-		
-		<Label name="errinfo" text=""  height="60" width="250" float="true" pos="30,230,280,290" align="left" textcolor="#FFFF0000" visible="false"/>
-		
-		<HorizontalLayout height="56" valign="center" padding="30,80,0,20">
-			<Control></Control>
-			<Button name="quit" align="center" width="100" height="45" padding="0,20,0,0" text="取消" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
-			<Button name="save" align="center" width="100" height="45" padding="20,20,90,0" text="确认" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
-			<Control></Control>
-		</HorizontalLayout>
-	</VerticalLayout>
+		<VerticalLayout visible="true" name="shoukuan_before_pay_layout" height="500" padding="0,20,0,0">						
+			<HorizontalLayout padding="0,50,0,0" height="129">
+				<Control></Control>
+				<Control bkimage="qrcode_attention.png" width="129" height="127"></Control>
+				<Control></Control>
+			</HorizontalLayout>
+			
+			<Label text="请扫描顾客商品券二维码" align="center" padding="0,30,0,0" height="40" font="0"></Label>
+
+			<HorizontalLayout height="50" padding="0,30,0,0">
+				<Control></Control>
+				<Label name="errinfo" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Control></Control>
+			</HorizontalLayout>			
+		</VerticalLayout>
+    </VerticalLayout>
 </Window>

bin/Win32/Debug/zhipuzi_pos_windows/skin/saoma_youhuiquan_dlg.xml

@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Window size="500,369" caption="0,0,0,36" roundcorner="4,4" >
-	<Font id="0" name="微软雅黑" size="26" />
-	<Font id="1" name="微软雅黑" size="20" />
-	
-	<VerticalLayout bkcolor="#FFFFFFFF">
-		<HorizontalLayout height="50" inset="10,2,10,0">
-			<Label name="memo_dlg_title" text="" align="center" valign="center" padding="0,20,0,0" font="0"/>
+<Window size="620,544" caption="0,0,0,44" roundcorner="4,4" >
+	<Font id="0" name="微软雅黑" size="24" />
+	<Font id="1" name="微软雅黑" size="40" />
+	<Font id="2" name="微软雅黑" size="20" />
+	<Font id="3" name="微软雅黑" size="32" />
+	<VerticalLayout bkimage="shoukuan_bkg.png" >
+		<HorizontalLayout name="shoukuan_title_bkg" height="44" bkcolor="0xFF3CB371">
+			<Label name="memo_dlg_title" text="" height="44" align="center" valign="center" padding="0,0,0,0" textcolor="#FFFFFFFF" font="2"/>
+			<Button name="closebtn" keyboard="false" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
 		
-		<Label name="name" text="请扫描顾客优惠券二维码"  height="30" width="500" padding="0,50,0,0" align="center"/>
-	
-		<Edit name="content" width="400" height="50" padding="50,20,50,0" textcolor="0xFF3CB371" bkcolor="#FFF2F2F2" nativebkcolor="#FFF2F2F2" font="1"/>
-		
-		<Label name="errinfo" text=""  height="60" width="250" float="true" pos="30,230,280,290" align="left" textcolor="#FFFF0000" visible="false"/>
-		
-		<HorizontalLayout height="56" valign="center" padding="30,80,0,20">
-			<Control></Control>
-			<Button name="quit" align="center" width="100" height="45" padding="0,20,0,0" text="取消" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
-			<Button name="save" align="center" width="100" height="45" padding="20,20,90,0" text="确认" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
-			<Control></Control>
-		</HorizontalLayout>
-	</VerticalLayout>
+		<VerticalLayout visible="true" name="shoukuan_before_pay_layout" height="500" padding="0,20,0,0">						
+			<HorizontalLayout padding="0,50,0,0" height="129">
+				<Control></Control>
+				<Control bkimage="qrcode_attention.png" width="129" height="127"></Control>
+				<Control></Control>
+			</HorizontalLayout>
+			
+			<Label text="请扫描顾客优惠券二维码" align="center" padding="0,30,0,0" height="40" font="0"></Label>
+
+			<HorizontalLayout height="50" padding="0,30,0,0">
+				<Control></Control>
+				<Label name="errinfo" font="2" width="400" height="50" multiline="true" text="" visible="false" textcolor="#FF0000" align="center" />
+				<Control></Control>
+			</HorizontalLayout>			
+		</VerticalLayout>
+    </VerticalLayout>
 </Window>

zhipuzi_pos_windows/wnd/CSaomaCikaWnd.cpp

@@ -3,10 +3,6 @@
 
 LRESULT CSaomaCikaWnd::OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
-	CEditUI* pFukuanEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
-
-	pFukuanEdit->SetFocus();
-
 	return 0;
 }
 
@@ -97,8 +93,6 @@ LRESULT CSaomaCikaWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, b
 	{
 		if (wParam == VK_RETURN)
 		{
-			StartYanzheng();
-
 			return true;
 		}
 		else if (wParam == VK_ESCAPE)
@@ -118,15 +112,6 @@ LRESULT CSaomaCikaWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, b
 	else if (uMsg == WM_MEMBER_CHECK_FAIL)
 	{
 		//验证失败了
-		CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
-		pContent->SetEnabled(true);
-
-		CButtonUI* pQuit = static_cast<CButtonUI*>(m_pm.FindControl(_T("quit")));
-		pQuit->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);
@@ -170,40 +155,11 @@ void CSaomaCikaWnd::Notify(TNotifyUI& msg)
 	{
 		DuiLib::CDuiString senderName = msg.pSender->GetName();
 
-		if (senderName == _T("quit"))
+		if (senderName == _T("closebtn"))
 		{
 			Close(IDCANCEL);
 			return;
 		}
-		else if (senderName == _T("save"))
-		{
-			StartYanzheng();
-		}
-	}
-	else if (msg.sType == _T("textchanged"))
-	{
-		//只能输入数字，其他的全部删除
-		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
-		if (!m_pEdit->GetText().IsEmpty())
-		{
-			wstring ws_Value = m_pEdit->GetText();
-			string strValue = CLewaimaiString::UnicodeToUTF8(ws_Value);
-
-			for (size_t nIndex = 0; nIndex < strValue.length(); nIndex++)
-			{
-				unsigned char tmp = strValue.at(nIndex);
-				if (tmp > 122 || tmp < 48)
-				{
-					//ASCII码不是数字的都过滤掉
-					strValue = strValue.substr(0, nIndex);
-
-					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
-
-					break;
-				}
-			}
-		}
 	}
 }
 
@@ -212,12 +168,6 @@ void CSaomaCikaWnd::Init()
 
 }
 
-
-std::string CSaomaCikaWnd::getContent()
-{
-	return m_content;
-}
-
 void CSaomaCikaWnd::SetTitle(std::wstring title)
 {
 	CLabelUI* pLabel = static_cast<CLabelUI*>(m_pm.FindControl(_T("memo_dlg_title")));
@@ -226,23 +176,11 @@ void CSaomaCikaWnd::SetTitle(std::wstring title)
 
 void CSaomaCikaWnd::StartYanzheng()
 {
-	CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
-	wstring wsReason = pContent->GetText();
-
-	m_content = CLewaimaiString::UnicodeToUTF8(wsReason);
-
-	if (m_content.length() == 0)
+	if (m_code.length() == 0)
 	{
 		return;
 	}
 
-	pContent->SetEnabled(false);
-
-	CButtonUI* pQuit = static_cast<CButtonUI*>(m_pm.FindControl(_T("quit")));
-	pQuit->SetEnabled(false);
-	CButtonUI* pSave = static_cast<CButtonUI*>(m_pm.FindControl(_T("save")));
-	pSave->SetEnabled(false);
-
 	//开始处理
 	std::thread(&CSaomaCikaWnd::ConfirmMember, this).detach();
 }
@@ -250,7 +188,7 @@ void CSaomaCikaWnd::StartYanzheng()
 void CSaomaCikaWnd::ConfirmMember()
 {
 	std::map<string, string> params;
-	params["rand_number"] = m_content;
+	params["rand_number"] = m_code;
 
 	std::string response;
 	bool ret = CZhipuziHttpClient::RequestNew("/crm/marketing/timescoupon/gettimescouponinfobyrandnumber", params, response);
@@ -323,4 +261,12 @@ void CSaomaCikaWnd::ConfirmMember()
 
 		PostMessage(WM_MEMBER_CHECK_SUCCESS);
 	}
+}
+
+//处理键盘捕捉结果
+void CSaomaCikaWnd::HandleTextCapture(std::string content)
+{
+	m_code = content;
+
+	StartYanzheng();
 }

zhipuzi_pos_windows/wnd/CSaomaCikaWnd.h

@@ -27,8 +27,6 @@ public:
 
 	void Init();
 
-	std::string getContent();
-
 	void SetTitle(std::wstring title);
 
 	void Notify(TNotifyUI& msg);
@@ -64,15 +62,12 @@ public:
 	void ConfirmMember();
 
 	//´¦Àí¼üÅ̲¶×½½á¹û
-	void HandleTextCapture(std::string content)
-	{
-
-	}
+	void HandleTextCapture(std::string content);
 
 public:
 	CPaintManagerUI m_pm;
 
-	std::string m_content;
+	std::string m_code;
 
 	std::wstring m_errorInfo;
 

zhipuzi_pos_windows/wnd/CSaomaQuanyikaWnd.cpp

@@ -3,10 +3,6 @@
 
 LRESULT CSaomaQuanyikaWnd::OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
-	CEditUI* pFukuanEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
-
-	pFukuanEdit->SetFocus();
-
 	return 0;
 }
 
@@ -97,8 +93,6 @@ LRESULT CSaomaQuanyikaWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lPara
 	{
 		if (wParam == VK_RETURN)
 		{
-			StartYanzheng();
-
 			return true;
 		}
 		else if (wParam == VK_ESCAPE)
@@ -118,15 +112,6 @@ LRESULT CSaomaQuanyikaWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lPara
 	else if (uMsg == WM_MEMBER_CHECK_FAIL)
 	{
 		//验证失败了
-		CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
-		pContent->SetEnabled(true);
-
-		CButtonUI* pQuit = static_cast<CButtonUI*>(m_pm.FindControl(_T("quit")));
-		pQuit->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);
@@ -170,40 +155,11 @@ void CSaomaQuanyikaWnd::Notify(TNotifyUI& msg)
 	{
 		DuiLib::CDuiString senderName = msg.pSender->GetName();
 
-		if (senderName == _T("quit"))
+		if (senderName == _T("closebtn"))
 		{
 			Close(IDCANCEL);
 			return;
 		}
-		else if (senderName == _T("save"))
-		{
-			StartYanzheng();
-		}
-	}
-	else if (msg.sType == _T("textchanged"))
-	{
-		//只能输入数字，其他的全部删除
-		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
-		if (!m_pEdit->GetText().IsEmpty())
-		{
-			wstring ws_Value = m_pEdit->GetText();
-			string strValue = CLewaimaiString::UnicodeToUTF8(ws_Value);
-
-			for (size_t nIndex = 0; nIndex < strValue.length(); nIndex++)
-			{
-				unsigned char tmp = strValue.at(nIndex);
-				if (tmp > 122 || tmp < 48)
-				{
-					//ASCII码不是数字的都过滤掉
-					strValue = strValue.substr(0, nIndex);
-
-					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
-
-					break;
-				}
-			}
-		}
 	}
 }
 
@@ -212,12 +168,6 @@ void CSaomaQuanyikaWnd::Init()
 
 }
 
-
-std::string CSaomaQuanyikaWnd::getContent()
-{
-	return m_content;
-}
-
 void CSaomaQuanyikaWnd::SetTitle(std::wstring title)
 {
 	CLabelUI* pLabel = static_cast<CLabelUI*>(m_pm.FindControl(_T("memo_dlg_title")));
@@ -226,23 +176,11 @@ void CSaomaQuanyikaWnd::SetTitle(std::wstring title)
 
 void CSaomaQuanyikaWnd::StartYanzheng()
 {
-	CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
-	wstring wsReason = pContent->GetText();
-
-	m_content = CLewaimaiString::UnicodeToUTF8(wsReason);
-
-	if (m_content.length() == 0)
+	if (m_code.length() == 0)
 	{
 		return;
 	}
 
-	pContent->SetEnabled(false);
-
-	CButtonUI* pQuit = static_cast<CButtonUI*>(m_pm.FindControl(_T("quit")));
-	pQuit->SetEnabled(false);
-	CButtonUI* pSave = static_cast<CButtonUI*>(m_pm.FindControl(_T("save")));
-	pSave->SetEnabled(false);
-
 	//开始处理
 	std::thread(&CSaomaQuanyikaWnd::ConfirmMember, this).detach();
 }
@@ -250,7 +188,7 @@ void CSaomaQuanyikaWnd::StartYanzheng()
 void CSaomaQuanyikaWnd::ConfirmMember()
 {
 	std::map<string, string> params;
-	params["code"] = m_content;
+	params["code"] = m_code;
 
 	std::string response;
 	bool ret = CZhipuziHttpClient::RequestNew("/crm/marketing/equitycard/getinfobycode", params, response);
@@ -299,4 +237,12 @@ void CSaomaQuanyikaWnd::ConfirmMember()
 
 		PostMessage(WM_MEMBER_CHECK_SUCCESS);
 	}
+}
+
+//处理键盘捕捉结果
+void CSaomaQuanyikaWnd::HandleTextCapture(std::string content)
+{
+	m_code = content;
+
+	StartYanzheng();
 }

zhipuzi_pos_windows/wnd/CSaomaQuanyikaWnd.h

@@ -27,8 +27,6 @@ public:
 
 	void Init();
 
-	std::string getContent();
-
 	void SetTitle(std::wstring title);
 
 	void Notify(TNotifyUI& msg);
@@ -64,15 +62,12 @@ public:
 	void ConfirmMember();
 
 	//´¦Àí¼üÅ̲¶×½½á¹û
-	void HandleTextCapture(std::string content)
-	{
-
-	}
+	void HandleTextCapture(std::string content);
 
 public:
 	CPaintManagerUI m_pm;
 
-	std::string m_content;
+	std::string m_code;
 
 	std::wstring m_errorInfo;
 

zhipuzi_pos_windows/wnd/CSaomaShangpinquanWnd.cpp

@@ -3,10 +3,6 @@
 
 LRESULT CSaomaShangpinquanWnd::OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
-	CEditUI* pFukuanEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
-
-	pFukuanEdit->SetFocus();
-
 	return 0;
 }
 
@@ -97,8 +93,6 @@ LRESULT CSaomaShangpinquanWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM l
 	{
 		if (wParam == VK_RETURN)
 		{
-			StartYanzheng();
-
 			return true;
 		}
 		else if (wParam == VK_ESCAPE)
@@ -118,15 +112,6 @@ LRESULT CSaomaShangpinquanWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM l
 	else if (uMsg == WM_MEMBER_CHECK_FAIL)
 	{
 		//验证失败了
-		CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
-		pContent->SetEnabled(true);
-
-		CButtonUI* pQuit = static_cast<CButtonUI*>(m_pm.FindControl(_T("quit")));
-		pQuit->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);
@@ -170,40 +155,11 @@ void CSaomaShangpinquanWnd::Notify(TNotifyUI& msg)
 	{
 		DuiLib::CDuiString senderName = msg.pSender->GetName();
 
-		if (senderName == _T("quit"))
+		if (senderName == _T("closebtn"))
 		{
 			Close(IDCANCEL);
 			return;
 		}
-		else if (senderName == _T("save"))
-		{
-			StartYanzheng();
-		}
-	}
-	else if (msg.sType == _T("textchanged"))
-	{
-		//只能输入数字，其他的全部删除
-		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
-		if (!m_pEdit->GetText().IsEmpty())
-		{
-			wstring ws_Value = m_pEdit->GetText();
-			string strValue = CLewaimaiString::UnicodeToUTF8(ws_Value);
-
-			for (size_t nIndex = 0; nIndex < strValue.length(); nIndex++)
-			{
-				unsigned char tmp = strValue.at(nIndex);
-				if (tmp > 122 || tmp < 48)
-				{
-					//ASCII码不是数字的都过滤掉
-					strValue = strValue.substr(0, nIndex);
-
-					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
-
-					break;
-				}
-			}
-		}
 	}
 }
 
@@ -212,12 +168,6 @@ void CSaomaShangpinquanWnd::Init()
 
 }
 
-
-std::string CSaomaShangpinquanWnd::getContent()
-{
-	return m_content;
-}
-
 void CSaomaShangpinquanWnd::SetTitle(std::wstring title)
 {
 	CLabelUI* pLabel = static_cast<CLabelUI*>(m_pm.FindControl(_T("memo_dlg_title")));
@@ -226,23 +176,11 @@ void CSaomaShangpinquanWnd::SetTitle(std::wstring title)
 
 void CSaomaShangpinquanWnd::StartYanzheng()
 {
-	CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
-	wstring wsReason = pContent->GetText();
-
-	m_content = CLewaimaiString::UnicodeToUTF8(wsReason);
-
-	if (m_content.length() == 0)
+	if (m_code.length() == 0)
 	{
 		return;
 	}
 
-	pContent->SetEnabled(false);
-
-	CButtonUI* pQuit = static_cast<CButtonUI*>(m_pm.FindControl(_T("quit")));
-	pQuit->SetEnabled(false);
-	CButtonUI* pSave = static_cast<CButtonUI*>(m_pm.FindControl(_T("save")));
-	pSave->SetEnabled(false);
-
 	//开始处理
 	std::thread(&CSaomaShangpinquanWnd::ConfirmMember, this).detach();
 }
@@ -250,7 +188,7 @@ void CSaomaShangpinquanWnd::StartYanzheng()
 void CSaomaShangpinquanWnd::ConfirmMember()
 {
 	std::map<string, string> params;
-	params["rand_number"] = m_content;
+	params["rand_number"] = m_code;
 
 	std::string response;
 	bool ret = CZhipuziHttpClient::RequestNew("/crm/marketing/goodscoupon/getgoodscouponinfobyrandnumber", params, response);
@@ -301,4 +239,12 @@ void CSaomaShangpinquanWnd::ConfirmMember()
 
 		PostMessage(WM_MEMBER_CHECK_SUCCESS);
 	}
+}
+
+//处理键盘捕捉结果
+void CSaomaShangpinquanWnd::HandleTextCapture(std::string content)
+{
+	m_code = content;
+
+	StartYanzheng();
 }

zhipuzi_pos_windows/wnd/CSaomaShangpinquanWnd.h

@@ -27,8 +27,6 @@ public:
 
 	void Init();
 
-	std::string getContent();
-
 	void SetTitle(std::wstring title);
 
 	void Notify(TNotifyUI& msg);
@@ -64,15 +62,12 @@ public:
 	void ConfirmMember();
 
 	//´¦Àí¼üÅ̲¶×½½á¹û
-	void HandleTextCapture(std::string content)
-	{
-
-	}
+	void HandleTextCapture(std::string content);
 
 public:
 	CPaintManagerUI m_pm;
 
-	std::string m_content;
+	std::string m_code;
 
 	std::wstring m_errorInfo;
 

zhipuzi_pos_windows/wnd/CSaomaYouhuiquanWnd.cpp

@@ -3,12 +3,6 @@
 
 LRESULT CSaomaYouhuiquanWnd::OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
-	CEditUI* pFukuanEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
-
-	pFukuanEdit->SetFocus();
-
-	pFukuanEdit->Invalidate();
-
 	return 0;
 }
 
@@ -99,8 +93,6 @@ LRESULT CSaomaYouhuiquanWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lPa
 	{
 		if (wParam == VK_RETURN)
 		{
-			StartYanzheng();
-
 			return true;
 		}
 		else if (wParam == VK_ESCAPE)
@@ -120,15 +112,6 @@ LRESULT CSaomaYouhuiquanWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lPa
 	else if (uMsg == WM_MEMBER_CHECK_FAIL)
 	{
 		//验证失败了
-		CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
-		pContent->SetEnabled(true);
-
-		CButtonUI* pQuit = static_cast<CButtonUI*>(m_pm.FindControl(_T("quit")));
-		pQuit->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);
@@ -172,40 +155,11 @@ void CSaomaYouhuiquanWnd::Notify(TNotifyUI& msg)
 	{
 		DuiLib::CDuiString senderName = msg.pSender->GetName();
 
-		if (senderName == _T("quit"))
+		if (senderName == _T("closebtn"))
 		{
 			Close(IDCANCEL);
 			return;
 		}
-		else if (senderName == _T("save"))
-		{
-			StartYanzheng();
-		}
-	}
-	else if (msg.sType == _T("textchanged"))
-	{
-		//只能输入数字，其他的全部删除
-		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
-		if (!m_pEdit->GetText().IsEmpty())
-		{
-			wstring ws_Value = m_pEdit->GetText();
-			string strValue = CLewaimaiString::UnicodeToUTF8(ws_Value);
-
-			for (size_t nIndex = 0; nIndex < strValue.length(); nIndex++)
-			{
-				unsigned char tmp = strValue.at(nIndex);
-				if (tmp > 122 || tmp < 48)
-				{
-					//ASCII码不是数字的都过滤掉
-					strValue = strValue.substr(0, nIndex);
-
-					m_pEdit->SetText(CLewaimaiString::UTF8ToUnicode(strValue).c_str());
-					m_pEdit->SetSel(strValue.length(), strValue.length());//重设给光标设置位置
-
-					break;
-				}
-			}
-		}
 	}
 }
 
@@ -214,12 +168,6 @@ void CSaomaYouhuiquanWnd::Init()
 
 }
 
-
-std::string CSaomaYouhuiquanWnd::getContent()
-{
-	return m_content;
-}
-
 void CSaomaYouhuiquanWnd::SetTitle(std::wstring title)
 {
 	CLabelUI* pLabel = static_cast<CLabelUI*>(m_pm.FindControl(_T("memo_dlg_title")));
@@ -228,23 +176,11 @@ void CSaomaYouhuiquanWnd::SetTitle(std::wstring title)
 
 void CSaomaYouhuiquanWnd::StartYanzheng()
 {
-	CEditUI* pContent = static_cast<CEditUI*>(m_pm.FindControl(_T("content")));
-	wstring wsReason = pContent->GetText();
-
-	m_content = CLewaimaiString::UnicodeToUTF8(wsReason);
-
-	if (m_content.length() == 0)
+	if (m_code.length() == 0)
 	{
 		return;
 	}
 
-	pContent->SetEnabled(false);
-
-	CButtonUI* pQuit = static_cast<CButtonUI*>(m_pm.FindControl(_T("quit")));
-	pQuit->SetEnabled(false);
-	CButtonUI* pSave = static_cast<CButtonUI*>(m_pm.FindControl(_T("save")));
-	pSave->SetEnabled(false);
-
 	//开始处理
 	std::thread(&CSaomaYouhuiquanWnd::ConfirmMember, this).detach();
 }
@@ -252,7 +188,7 @@ void CSaomaYouhuiquanWnd::StartYanzheng()
 void CSaomaYouhuiquanWnd::ConfirmMember()
 {
 	std::map<string, string> params;
-	params["rand_number"] = m_content;
+	params["rand_number"] = m_code;
 
 	std::string response;
 	bool ret = CZhipuziHttpClient::Request("/coupon/getcouponinfobyrandnumber", params, response);
@@ -317,4 +253,12 @@ void CSaomaYouhuiquanWnd::ConfirmMember()
 
 		PostMessage(WM_MEMBER_CHECK_SUCCESS);
 	}
+
+}
+//处理键盘捕捉结果
+void CSaomaYouhuiquanWnd::HandleTextCapture(std::string content)
+{
+	m_code = content;
+
+	StartYanzheng();
 }

zhipuzi_pos_windows/wnd/CSaomaYouhuiquanWnd.h

@@ -27,8 +27,6 @@ public:
 
 	void Init();
 
-	std::string getContent();
-
 	void SetTitle(std::wstring title);
 
 	void Notify(TNotifyUI& msg);
@@ -64,15 +62,12 @@ public:
 	void ConfirmMember();
 
 	//´¦Àí¼üÅ̲¶×½½á¹û
-	void HandleTextCapture(std::string content)
-	{
-
-	}
+	void HandleTextCapture(std::string content);
 
 public:
 	CPaintManagerUI m_pm;
 
-	std::string m_content;
+	std::string m_code;
 
 	std::wstring m_errorInfo;