一些优化

bin/Win32/Debug/zhipuzi_pay_plugin/skin/system_setting.xml

@@ -14,9 +14,7 @@
 				<Control bkimage="shop_logo.png" width="70" height="70" padding="48,20,0,10"></Control>
 				<Label name="system_setting_shopname" text="店铺名字店铺" font="0" width="140" height="60" padding="10,0,10,0" align="center" multiline="true" ></Label>
 				
-				<Button name="system_setting_logout" height="38" padding="20,20,20,0" text="退出登录" textcolor="#FFFFFFFF" normalimage="file='Btn_Red.png' corner='5,5,5,5'" hotimage="file='Btn_Red_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Red_Click.png' corner='5,5,5,5'"/>
-				
-				<Control width="160" height="1" bkcolor="#FFE0E0E6" padding="0,25,0,25"></Control>
+				<Control width="160" height="1" bkcolor="#FFE0E0E6" padding="0,15,0,25"></Control>
 				
 				<Option name="system_setting_option_zhuaqu" text="金额抓取" font="0" group="system_setting_item" selected="true" height="40" hotimage="tab_hot.bmp" selectedimage="setting_tab_bkg.png" selectedtextcolor="0xFFFFFFFF"/>
 				<Option name="system_setting_option_dayinji" text="打印机" font="0" group="system_setting_item" height="40" hotimage="tab_hot.bmp" selectedimage="setting_tab_bkg.png" selectedtextcolor="0xFFFFFFFF"/>
@@ -24,6 +22,8 @@
 				<Option name="system_setting_option_kuaijiejian" text="快捷键" font="0" group="system_setting_item" height="40" hotimage="tab_hot.bmp" selectedimage="setting_tab_bkg.png" selectedtextcolor="0XFFFFFFFF"/>
 				<Option name="system_setting_option_about" text="关于" font="0" group="system_setting_item" height="40" hotimage="tab_hot.bmp" selectedimage="setting_tab_bkg.png" selectedtextcolor="0XFFFFFFFF"/>
 				
+				<Button name="system_setting_logout" height="38" padding="20,50,20,0" text="退出账号" textcolor="#FFFFFFFF" normalimage="file='Btn_Red.png' corner='5,5,5,5'" hotimage="file='Btn_Red_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Red_Click.png' corner='5,5,5,5'"/>
+				
 				<Control></Control>
    			</VerticalLayout>
 			

zhipuzi_pay_plugin/wnd/CJiaoyijiluWnd.cpp

@@ -10,7 +10,7 @@
 
 void CJiaoyijiluWnd::Init()
 {
-	::SetWindowPos(m_hWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
+	::SetWindowPos(m_hWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);
 
 	//处理时间问题
 	time_t now = time(NULL);
@@ -188,7 +188,7 @@ void CJiaoyijiluWnd::HandleClickMsg(TNotifyUI& msg)
 
 	if (senderName == _T("jiaoyijilu_closebtn"))
 	{
-		Close(IDCANCEL);
+		m_valueWnd->CloseJiaoyijilu();
 		return;
 	}
 	else if (senderName == L"jiaoyijilu_list_last")

zhipuzi_pay_plugin/wnd/CShoukuanWnd.cpp

@@ -11,6 +11,9 @@
 
 void CShoukuanWnd::Init()
 {
+	::SetWindowPos(m_hWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);
+
+
 	//CSpeech::MSSSpeak(L"欢迎使用智铺子收银插件！");
 }
 
@@ -20,7 +23,7 @@ void CShoukuanWnd::Notify(TNotifyUI& msg)
 	{
 		if (msg.pSender->GetName() == _T("closebtn"))
 		{
-			Close();
+			m_valueWnd->CloseShoukuan();
 			return;
 		}
 		else if (msg.pSender->GetName() == _T("shoukuanBtn"))
@@ -172,7 +175,7 @@ LRESULT CShoukuanWnd::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa
 		}
 		else
 		{
-			Close();
+			m_valueWnd->CloseShoukuan();
 		}
 	}
 	else if (m_shoukuan_status == 4)
@@ -190,7 +193,7 @@ LRESULT CShoukuanWnd::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa
 		}
 		else
 		{
-			Close();
+			m_valueWnd->CloseShoukuan();
 		}
 	}
 
@@ -288,7 +291,7 @@ LRESULT CShoukuanWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bo
 			else if (m_shoukuan_status == 3 || m_shoukuan_status == 4)
 			{
 				//已经明确成功或者失败了，那么久直接关闭就可以了
-				Close();
+				m_valueWnd->CloseShoukuan();
 			}
 
 			return true;
@@ -298,7 +301,7 @@ LRESULT CShoukuanWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bo
 			if (m_shoukuan_status == 0)
 			{
 				//还没开始支付，按Esc直接退出
-				Close();
+				m_valueWnd->CloseShoukuan();
 			}
 			else if (m_shoukuan_status == 1 || m_shoukuan_status == 5)
 			{
@@ -312,7 +315,7 @@ LRESULT CShoukuanWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bo
 			else if (m_shoukuan_status == 3 || m_shoukuan_status == 4)
 			{
 				//已经明确成功或者失败了，那么久直接关闭就可以了
-				Close();
+				m_valueWnd->CloseShoukuan();
 			}
 
 			return true;
@@ -321,7 +324,7 @@ LRESULT CShoukuanWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bo
 		if (m_shoukuan_status == 3 || m_shoukuan_status == 4)
 		{
 			//已经明确成功或者失败了，那么久直接关闭就可以了
-			Close();
+			m_valueWnd->CloseShoukuan();
 
 			return true;
 		}

zhipuzi_pay_plugin/wnd/CTuikuanWnd.cpp

@@ -11,7 +11,7 @@
 
 void CTuikuanWnd::Init()
 {
-	//CSpeech::MSSSpeak(L"欢迎使用智铺子收银插件！");
+	::SetWindowPos(m_hWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);
 }
 
 void CTuikuanWnd::Notify(TNotifyUI& msg)
@@ -20,7 +20,7 @@ void CTuikuanWnd::Notify(TNotifyUI& msg)
 	{
 		if (msg.pSender->GetName() == _T("closebtn"))
 		{
-			Close();
+			m_valueWnd->CloseTuikuan();
 			return;
 		}
 		else if (msg.pSender->GetName() == _T("tuikuanBtn"))
@@ -172,7 +172,7 @@ LRESULT CTuikuanWnd::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHan
 		}
 		else
 		{
-			Close();
+			m_valueWnd->CloseTuikuan();
 		}
 	}
 	else if (m_tuikuan_status == 4)
@@ -190,7 +190,7 @@ LRESULT CTuikuanWnd::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHan
 		}
 		else
 		{
-			Close();
+			m_valueWnd->CloseTuikuan();
 		}
 	}
 
@@ -277,7 +277,7 @@ LRESULT CTuikuanWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, boo
 			else if (m_tuikuan_status == 3 || m_tuikuan_status == 4)
 			{
 				//已经明确成功或者失败了，那么久直接关闭就可以了
-				Close();
+				m_valueWnd->CloseTuikuan();
 			}
 
 			return true;
@@ -287,7 +287,7 @@ LRESULT CTuikuanWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, boo
 			if (m_tuikuan_status == 0)
 			{
 				//还没开始支付，按Esc直接退出
-				Close();
+				m_valueWnd->CloseTuikuan();
 			}
 			else if (m_tuikuan_status == 1 || m_tuikuan_status == 5)
 			{
@@ -300,7 +300,7 @@ LRESULT CTuikuanWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, boo
 			else if (m_tuikuan_status == 3 || m_tuikuan_status == 4)
 			{
 				//已经明确成功或者失败了，那么久直接关闭就可以了
-				Close();
+				m_valueWnd->CloseTuikuan();
 			}
 
 			return true;
@@ -309,7 +309,7 @@ LRESULT CTuikuanWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, boo
 		if (m_tuikuan_status == 3 || m_tuikuan_status == 4)
 		{
 			//已经明确成功或者失败了，那么久直接关闭就可以了
-			Close();
+			m_valueWnd->CloseTuikuan();
 
 			return true;
 		}

zhipuzi_pay_plugin/wnd/CValueWnd.cpp

@@ -89,9 +89,9 @@ void CValueWnd::TopMostWnd()
 	{
 		::SetWindowPos(m_hWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
 
-		if (m_is_show_shoukuan && m_shoukuanHWND != NULL)
+		if (m_is_show_shoukuan && m_shoukuanWnd != NULL)
 		{
-			//::SendMessage(m_shoukuanHWND, WM_SHOUKUAN_UPDATE_FOCUS, NULL, NULL);
+			::SendMessage(m_shoukuanWnd->GetHWND(), WM_SHOUKUAN_UPDATE_FOCUS, NULL, NULL);
 		}
 
 		Sleep(100);
@@ -738,11 +738,9 @@ void CValueWnd::ShowShoukuan()
 		pShoukuanWnd->Create(NULL, _T(""), UI_WNDSTYLE_DIALOG, WS_EX_TOOLWINDOW);
 		pShoukuanWnd->SetIcon(IDI_ICON_DUILIB);
 		pShoukuanWnd->CenterWindow();
-		::SetWindowPos(pShoukuanWnd->GetHWND(), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);
 
 		m_is_show_shoukuan = true;
 		m_shoukuanWnd = pShoukuanWnd;
-		m_shoukuanHWND = pShoukuanWnd->GetHWND();
 
 		//只要金额不为0，就初始化
 		std::string utf8_watch_value = CLewaimaiString::UnicodeToUTF8(m_watchValue);
@@ -758,20 +756,16 @@ void CValueWnd::ShowShoukuan()
 			pShoukuanWnd->InitFukuanma(m_catch_string);
 		}
 
-		UINT ret = pShoukuanWnd->ShowModal();
+		pShoukuanWnd->ShowWindow(true);
+	}
+}
 
-		m_is_show_shoukuan = false;
-		m_shoukuanWnd = NULL;
-		m_shoukuanHWND = NULL;
+void CValueWnd::CloseShoukuan()
+{
+	m_is_show_shoukuan = false;
 
-		if (ret == IDOK)
-		{
-			
-		}
-		else if (ret == IDCANCEL)
-		{
-		}
-	}
+	m_shoukuanWnd->Close();
+	m_shoukuanWnd = NULL;
 }
 
 void CValueWnd::ShowTuikuan()
@@ -791,11 +785,9 @@ void CValueWnd::ShowTuikuan()
 		pTuikuanWnd->Create(NULL, _T(""), UI_WNDSTYLE_DIALOG, WS_EX_TOOLWINDOW);
 		pTuikuanWnd->SetIcon(IDI_ICON_DUILIB);
 		pTuikuanWnd->CenterWindow();
-		::SetWindowPos(pTuikuanWnd->GetHWND(), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);
 
 		m_is_show_tuikuan = true;
 		m_tuikuanWnd = pTuikuanWnd;
-		m_tuikuanHWND = pTuikuanWnd->GetHWND();
 
 		//只要金额不为0，就初始化
 		std::string utf8_watch_value = CLewaimaiString::UnicodeToUTF8(m_watchValue);
@@ -806,20 +798,16 @@ void CValueWnd::ShowTuikuan()
 			pTuikuanWnd->InitMoney(m_watchValue);
 		}
 
-		UINT ret = pTuikuanWnd->ShowModal();
-
-		m_is_show_tuikuan = false;
-		m_tuikuanWnd = NULL;
-		m_tuikuanHWND = NULL;
+		pTuikuanWnd->ShowWindow();
+	}
+}
 
-		if (ret == IDOK)
-		{
+void CValueWnd::CloseTuikuan()
+{
+	m_is_show_tuikuan = false;
 
-		}
-		else if (ret == IDCANCEL)
-		{
-		}
-	}
+	m_tuikuanWnd->Close();
+	m_tuikuanWnd = NULL;
 }
 
 void CValueWnd::AddTrayIcon()
@@ -925,19 +913,16 @@ void CValueWnd::ShowJiaoyijilu()
 		pJiaoyijiluFrame->Create(NULL, _T(""), UI_WNDSTYLE_DIALOG, WS_EX_TOOLWINDOW);
 		pJiaoyijiluFrame->SetIcon(IDI_ICON_DUILIB);
 		pJiaoyijiluFrame->CenterWindow();
-		UINT ret = pJiaoyijiluFrame->ShowModal();
-
-		m_is_show_jiaoyijilu = false;
-
-		if (ret == IDOK)
-		{
+		pJiaoyijiluFrame->ShowWindow(true);
+	}
+}
 
-		}
-		else if (ret == IDCANCEL)
-		{
+void CValueWnd::CloseJiaoyijilu()
+{
+	m_is_show_jiaoyijilu = false;
 
-		}
-	}
+	m_jiaoyijiluWnd->Close();
+	m_jiaoyijiluWnd = NULL;
 }
 
 void CValueWnd::ShowJiaoyihuizong()

zhipuzi_pay_plugin/wnd/CValueWnd.h

@@ -76,9 +76,11 @@ public:
 
 	//显示收款界面
 	void ShowShoukuan();
+	void CloseShoukuan();
 
 	//显示退款界面
 	void ShowTuikuan();
+	void CloseTuikuan();
 
 	//添加托盘图标(初始化)
 	void AddTrayIcon();
@@ -97,6 +99,7 @@ public:
 
 	//显示交易记录页面
 	void ShowJiaoyijilu();
+	void CloseJiaoyijilu();
 
 	//显示交易汇总页面
 	void ShowJiaoyihuizong();
@@ -168,12 +171,10 @@ private:
 	//收款窗口的参数
 	bool m_is_show_shoukuan = false;
 	CShoukuanWnd* m_shoukuanWnd = NULL;
-	HWND m_shoukuanHWND = NULL;
 
 	//退款窗口的参数
 	bool m_is_show_tuikuan = false;
 	CTuikuanWnd* m_tuikuanWnd = NULL;
-	HWND m_tuikuanHWND = NULL;
 
 	//设置窗口是否已经展示
 	bool m_is_show_setting = false;