menu的修改

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Window size="220,300" caption="0,0,0,0" layeredimage="file='value_bkg.png' corner='5,5,5,5'" layeredopacity="255">
+<Window size="220,392" caption="0,0,0,0" layeredimage="file='value_bkg.png' corner='5,5,5,5'" layeredopacity="255">
  <Font id="0" name="微软雅黑" size="16"/>
  <Font id="1" name="微软雅黑" size="20"/>
 <VerticalLayout bkimage="file='value_bkg.png' corner='5,5,5,5'">
@@ -24,15 +24,27 @@
 	</MenuItem>
 	
 	<MenuItem height="36" hotimage="menu_hover.png" inset="10,0,10,0" padding="0, 10, 0, 0">
+		<Control mouse="false" bkimage="jiaoyihuizong.png" float="true" pos="35,5,63,33"></Control>
+		<Button name="value_menu_jiaoyihuizong"></Button>
+		<Label mouse="false" text="交易汇总" font="0" textcolor="0xFFFFFFFF" float="true" pos="75,5,220,36"></Label>
+	</MenuItem>
+	
+	<MenuItem height="36" hotimage="menu_hover.png" inset="10,0,10,0" padding="0, 10, 0, 0">
+		<Control mouse="false" bkimage="jiaoban.png" float="true" pos="35,5,63,33"></Control>
+		<Button name="value_menu_jiaoban"></Button>
+		<Label mouse="false" text="交班" font="0" textcolor="0xFFFFFFFF" float="true" pos="75,5,220,36"></Label>
+	</MenuItem>
+	
+	<MenuItem height="36" hotimage="menu_hover.png" inset="10,0,10,0" padding="0, 10, 0, 0">
 		<Control mouse="false" bkimage="shezhi.png" float="true" pos="35,5,63,33"></Control>
 		<Button name="value_menu_shezhi"></Button>
 		<Label mouse="false" text="设置" font="0" textcolor="0xFFFFFFFF" float="true" pos="75,5,220,36"></Label>
 	</MenuItem>
 	
 	<MenuItem height="36" hotimage="menu_hover.png" inset="10,0,10,0" padding="0, 10, 0, 0">
-		<Control mouse="false" bkimage="guanwang.png" float="true" pos="35,5,63,33"></Control>
-		<Button name="value_menu_guanwang"></Button>
-		<Label mouse="false" text="官方网站" font="0" textcolor="0xFFFFFFFF" float="true" pos="75,5,220,36"></Label>
+		<Control mouse="false" bkimage="guanyuwomen.png" float="true" pos="35,5,63,33"></Control>
+		<Button name="value_menu_guanyuwomen"></Button>
+		<Label mouse="false" text="关于我们" font="0" textcolor="0xFFFFFFFF" float="true" pos="75,5,220,36"></Label>
 	</MenuItem>
 	
 	<MenuItem height="36" hotimage="menu_hover.png" inset="10,0,10,0" padding="0, 10, 0, 0">

zhipuzi_pay_plugin/helper/CBitmapHelper.cpp

@@ -327,7 +327,7 @@ bool CBitmapHelper::OcrRect(tesseract::TessBaseAPI& tess, LPRECT lpRect, std::st
 			//既不是有效数字，也不是空格和换行，那么就是出现了非法字符
 			result = "0.00";
 
-			//break;
+			break;
 		}
 	}
 

zhipuzi_pay_plugin/wnd/CDingweiInfoWnd.cpp

@@ -155,7 +155,7 @@ LRESULT CDingweiInfoWnd::OnLButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam,
 
 LRESULT CDingweiInfoWnd::OnRButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
-	//点击邮件，取消截取
+	//点击右键，取消截取
 	m_valueWnd->CancalDingweiWnd();
 
 	return 0;
@@ -232,7 +232,12 @@ LRESULT CDingweiInfoWnd::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam,
 
 void CDingweiInfoWnd::UpdateInfo(std::wstring value, HWND hwnd)
 {
+	std::wstring oldValue = value;
 	CLewaimaiString::Replace(value, L"¥", L"");
+	if (value == L"123")
+	{
+		int a = 1;
+	}
 
 	m_findValue = value;
 	m_FindWnd = hwnd;

zhipuzi_pay_plugin/wnd/CValueWnd.cpp

@@ -203,28 +203,26 @@ void CValueWnd::WatchWnd()
     {
         if(m_watchWnd != NULL)
         {
-            char szTitle[MAX_PATH] = { 0 };
+			std::wstring value;
 
-            LPSTR lpWindowName = szTitle;
-
-            std::string value;
-
-            int ret = ::SendMessageA(m_watchWnd, WM_GETTEXT, (WPARAM)(MAX_PATH), (LPARAM)lpWindowName);
+			TCHAR szTitle[MAX_PATH] = { 0 };
+			LPWSTR lpWindowName = szTitle;     		
 
+			int ret = ::SendMessageW(m_watchWnd, WM_GETTEXT, (WPARAM)(MAX_PATH), (LPARAM)lpWindowName);
             if(ret == 0)
             {
                 //说明m_watchWnd已经失效了
-                value = "0.00";
+                value = L"0.00";
 
                 m_watchWnd = NULL;
             }
             else
             {
                 value = lpWindowName;
-            }
 
-			//先对获取到的值做一下处理，删除掉人民币符号
-			CLewaimaiString::Replace(CLewaimaiString::UTF8ToUnicode(value), L"¥", L"");
+				//先对获取到的值做一下处理，删除掉人民币符号
+				CLewaimaiString::Replace(value, L"¥", L"");
+            }
 
             if(value != m_watchValue)
             {
@@ -312,10 +310,10 @@ void CValueWnd::StartOcrWork()
 				else
 				{
 					std::string format_value = CLewaimaiString::DoubleToString(atof(ocr_result.c_str()), 2);
-					m_watchValue = format_value;
-
 					std::wstring ws_ocr_result = CLewaimaiString::UTF8ToUnicode(format_value);
 
+					m_watchValue = ws_ocr_result;
+
 					CLabelUI* valueLabel = static_cast<CLabelUI*>(m_pm.FindControl(_T("value")));
 
 					valueLabel->SetText(ws_ocr_result.c_str());
@@ -472,7 +470,9 @@ LRESULT CValueWnd::OnWatchWndUpdate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOO
 {
     CLabelUI* valueLabel = static_cast<CLabelUI*>(m_pm.FindControl(_T("value")));
 
-    std::string money_show = CLewaimaiString::DoubleToString(atof(m_watchValue.c_str()), 2);
+	std::string utf8_watch_value = CLewaimaiString::UnicodeToUTF8(m_watchValue);
+
+    std::string money_show = CLewaimaiString::DoubleToString(atof(utf8_watch_value.c_str()), 2);
     valueLabel->SetText(CLewaimaiString::UTF8ToUnicode(money_show).c_str());
 
     return TRUE;
@@ -581,9 +581,12 @@ void CValueWnd::ShowShoukuan()
 		m_shoukuanHWND = pShoukuanWnd->GetHWND();
 
 		//只要金额不为0，就初始化
-		if (atof(m_watchValue.c_str()) > 0.001)
-		{
-			pShoukuanWnd->InitMoney(CLewaimaiString::UTF8ToUnicode(m_watchValue));
+		std::string utf8_watch_value = CLewaimaiString::UnicodeToUTF8(m_watchValue);
+		if (atof(utf8_watch_value.c_str()) > 0.001)
+		{			
+			std::string format_string = CLewaimaiString::DoubleToString(atof(utf8_watch_value.c_str()), 2);
+			m_watchValue = CLewaimaiString::UTF8ToUnicode(format_string);
+			pShoukuanWnd->InitMoney(m_watchValue);
 		}
 
 		UINT ret = pShoukuanWnd->ShowModal();
@@ -765,7 +768,7 @@ void CValueWnd::UpdateKexian(const char* data, int length)
         CLabelUI* valueLabel = static_cast<CLabelUI*>(m_pm.FindControl(_T("value")));
 
         std::string money_show = CLewaimaiString::DoubleToString(atof(money.c_str()), 2);
-		m_watchValue = money_show;
+		m_watchValue = CLewaimaiString::UTF8ToUnicode(money_show);
 
         valueLabel->SetText(CLewaimaiString::UTF8ToUnicode(money_show).c_str());
     }
@@ -780,7 +783,7 @@ void CValueWnd::UpdateKexian(const char* data, int length)
             CLabelUI* valueLabel = static_cast<CLabelUI*>(m_pm.FindControl(_T("value")));
 
             std::string money_show = CLewaimaiString::DoubleToString(atof(money.c_str()), 2);
-			m_watchValue = money_show;
+			m_watchValue = CLewaimaiString::UTF8ToUnicode(money_show);
 
             valueLabel->SetText(CLewaimaiString::UTF8ToUnicode(money_show).c_str());
         }

zhipuzi_pay_plugin/wnd/CValueWnd.h

@@ -131,7 +131,7 @@ private:
 
 	//窗口监听模式的参数
 	HWND m_watchWnd = NULL;
-	std::string m_watchValue = "0.00";
+	std::wstring m_watchValue = L"0.00";
 
 	//窗口定位参数
 	bool m_is_dingwei_wnd = false;