zhangyang 6 лет назад
Родитель
Сommit
42142faff9

BIN
bin/Win32/Debug/zhipuzi_pay_plugin/db/pos.db


+ 85 - 0
bin/Win32/Debug/zhipuzi_pay_plugin/log/pos.log

@@ -896,3 +896,88 @@
 2019-08-17 19:58:06[INFO] - save params success [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:392]
 2019-08-17 19:58:06[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
 2019-08-17 19:58:06[INFO] - save params success [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:331]
+2019-08-17 20:34:42[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:34:42[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:34:42[INFO] - save params fail [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:396]
+2019-08-17 20:34:42[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:34:42[INFO] - save params fail [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:396]
+2019-08-17 20:34:42[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:34:42[INFO] - save params success [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:331]
+2019-08-17 20:34:43[INFO] - postString:nonce=123456&timestamp=1566045283&url=https://pf-api.zhipuzi.com/pos/userlogin/userlogin&username=zhangyang [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:192]
+2019-08-17 20:34:43[INFO] - sign:F287D45B006A36D5F06640ABB95E01DA [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:202]
+2019-08-17 20:34:43[INFO] - postString:nonce=123456&sign=F287D45B006A36D5F06640ABB95E01DA&timestamp=1566045283&username=zhangyang [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:222]
+2019-08-17 20:34:43[INFO] - response:{"errcode":0,"errmsg":"","data":{"lwm_sess_token":"in31o16biobb3ns51eortgnhf0","version_type":"1"}} [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:227]
+2019-08-17 20:34:43[INFO] - response:{"errcode":0,"errmsg":"","data":{"lwm_sess_token":"in31o16biobb3ns51eortgnhf0","version_type":"1"}} [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:40]
+2019-08-17 20:34:43[INFO] - login success! [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:91]
+2019-08-17 20:34:43[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:34:43[INFO] - save params success [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:392]
+2019-08-17 20:34:43[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:34:43[INFO] - save params success [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:331]
+2019-08-17 20:35:32[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:35:32[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:35:32[INFO] - save params fail [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:396]
+2019-08-17 20:35:32[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:35:32[INFO] - save params fail [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:396]
+2019-08-17 20:35:32[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:35:32[INFO] - save params success [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:331]
+2019-08-17 20:35:32[INFO] - postString:nonce=123456&timestamp=1566045332&url=https://pf-api.zhipuzi.com/pos/userlogin/userlogin&username=zhangyang [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:192]
+2019-08-17 20:35:32[INFO] - sign:4887BA570F6E0700624DEC7E39C57857 [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:202]
+2019-08-17 20:35:32[INFO] - postString:nonce=123456&sign=4887BA570F6E0700624DEC7E39C57857&timestamp=1566045332&username=zhangyang [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:222]
+2019-08-17 20:35:33[INFO] - response:{"errcode":0,"errmsg":"","data":{"lwm_sess_token":"299bdi200andtstmjbg91d7050","version_type":"1"}} [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:227]
+2019-08-17 20:35:33[INFO] - response:{"errcode":0,"errmsg":"","data":{"lwm_sess_token":"299bdi200andtstmjbg91d7050","version_type":"1"}} [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:40]
+2019-08-17 20:35:33[INFO] - login success! [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:91]
+2019-08-17 20:35:33[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:35:33[INFO] - save params success [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:392]
+2019-08-17 20:35:33[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:35:33[INFO] - save params success [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:331]
+2019-08-17 20:36:36[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:36:36[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:36:36[INFO] - save params fail [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:396]
+2019-08-17 20:36:36[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:36:36[INFO] - save params fail [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:396]
+2019-08-17 20:36:36[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:36:36[INFO] - save params success [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:331]
+2019-08-17 20:36:36[INFO] - postString:nonce=123456&timestamp=1566045396&url=https://pf-api.zhipuzi.com/pos/userlogin/userlogin&username=zhangyang [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:192]
+2019-08-17 20:36:36[INFO] - sign:F1802F32C49EC69582B693A8FF1577C8 [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:202]
+2019-08-17 20:36:36[INFO] - postString:nonce=123456&sign=F1802F32C49EC69582B693A8FF1577C8&timestamp=1566045396&username=zhangyang [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:222]
+2019-08-17 20:36:37[INFO] - response:{"errcode":0,"errmsg":"","data":{"lwm_sess_token":"pkco08bl94etslavfqi8hvmug0","version_type":"1"}} [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:227]
+2019-08-17 20:36:37[INFO] - response:{"errcode":0,"errmsg":"","data":{"lwm_sess_token":"pkco08bl94etslavfqi8hvmug0","version_type":"1"}} [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:40]
+2019-08-17 20:36:37[INFO] - login success! [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:91]
+2019-08-17 20:36:37[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:36:37[INFO] - save params success [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:392]
+2019-08-17 20:36:37[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:36:37[INFO] - save params success [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:331]
+2019-08-17 20:39:00[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:39:00[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:39:00[INFO] - save params fail [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:396]
+2019-08-17 20:39:00[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:39:00[INFO] - save params fail [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:396]
+2019-08-17 20:39:00[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:39:00[INFO] - save params success [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:331]
+2019-08-17 20:39:00[INFO] - postString:nonce=123456&timestamp=1566045540&url=https://pf-api.zhipuzi.com/pos/userlogin/userlogin&username=zhangyang [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:192]
+2019-08-17 20:39:00[INFO] - sign:B9FF9B4D3BC0CA3E59872A7884E44540 [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:202]
+2019-08-17 20:39:00[INFO] - postString:nonce=123456&sign=B9FF9B4D3BC0CA3E59872A7884E44540&timestamp=1566045540&username=zhangyang [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:222]
+2019-08-17 20:39:01[INFO] - response:{"errcode":0,"errmsg":"","data":{"lwm_sess_token":"bde2uc6ard6vep979cqv16htv6","version_type":"1"}} [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:227]
+2019-08-17 20:39:01[INFO] - response:{"errcode":0,"errmsg":"","data":{"lwm_sess_token":"bde2uc6ard6vep979cqv16htv6","version_type":"1"}} [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:40]
+2019-08-17 20:39:01[INFO] - login success! [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:91]
+2019-08-17 20:39:01[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:39:01[INFO] - save params success [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:392]
+2019-08-17 20:39:01[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:39:01[INFO] - save params success [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:331]
+2019-08-17 20:42:03[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:42:03[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:42:03[INFO] - save params fail [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:396]
+2019-08-17 20:42:03[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:42:03[INFO] - save params fail [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:396]
+2019-08-17 20:42:03[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:42:03[INFO] - save params success [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:331]
+2019-08-17 20:42:03[INFO] - postString:nonce=123456&timestamp=1566045723&url=https://pf-api.zhipuzi.com/pos/userlogin/userlogin&username=zhangyang [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:192]
+2019-08-17 20:42:03[INFO] - sign:FC22887019CB5FC3DFFF7E122B3903F7 [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:202]
+2019-08-17 20:42:03[INFO] - postString:nonce=123456&sign=FC22887019CB5FC3DFFF7E122B3903F7&timestamp=1566045723&username=zhangyang [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:222]
+2019-08-17 20:42:04[INFO] - response:{"errcode":0,"errmsg":"","data":{"lwm_sess_token":"4lvvdd3uj7reid595ok95e9uh1","version_type":"1"}} [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:227]
+2019-08-17 20:42:04[INFO] - response:{"errcode":0,"errmsg":"","data":{"lwm_sess_token":"4lvvdd3uj7reid595ok95e9uh1","version_type":"1"}} [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:40]
+2019-08-17 20:42:04[INFO] - login success! [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\network\czhipuzihttpclient.cpp:91]
+2019-08-17 20:42:04[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:42:04[INFO] - save params success [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:392]
+2019-08-17 20:42:04[INFO] - Opened database successfully [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:35]
+2019-08-17 20:42:04[INFO] - save params success [d:\work\zhipuzi_pay_plugin\zhipuzi_pay_plugin\tool\csqlite3.cpp:331]

BIN
bin/Win32/Debug/zhipuzi_pay_plugin/zhipuzi_pay_plugin.exe


+ 12 - 3
zhipuzi_pay_plugin/wnd/CSystemSettingWnd.cpp

@@ -667,6 +667,8 @@ void CSystemSettingWnd::SetOcrWnd(RECT rect)
 	//将被截图的进行缩放,用于预览展示
 	HBITMAP h_show_bitmap = helper.Scale(h_bitmap, 320, 200);
 
+	DeleteObject(h_bitmap);
+
 	//获得缩放后的图像的信息
 	BITMAP  Bitmap;
 	GetObject(h_show_bitmap, sizeof(BITMAP), (LPSTR)&Bitmap);	
@@ -691,10 +693,17 @@ void CSystemSettingWnd::SetOcrWnd(RECT rect)
 
 	std::string ocr_result;
 	
-	bool ret = helper.OcrRect(m_valueWnd->GetTess(), &m_ocrRect, ocr_result);
+	tesseract::TessBaseAPI tess;
 
-	DeleteObject(h_bitmap);
-	DeleteObject(h_show_bitmap);
+	if (tess.Init("./tessdata", "eng"))
+	{
+		std::cout << "OCRTesseract: Could not initialize tesseract." << std::endl;
+	}
+
+	tess.SetPageSegMode(tesseract::PageSegMode::PSM_SINGLE_LINE);
+	tess.SetVariable("save_best_choices", "T");
+
+	bool ret = helper.OcrRect(tess, &m_ocrRect, ocr_result);
 
 	//更新识别结果
 	CEditUI* ocr_value_edit = static_cast<CEditUI*>(m_pm.FindControl(_T("jinezhuaqu_setting_ocr_select_value")));