From 954ead41d9391bca28a3cc4f9592f73f25b3bbc8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 02 一月 2023 17:55:06 +0800
Subject: [PATCH] '完善批量设置代码'
---
app/appDlg.cpp | 425 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 312 insertions(+), 113 deletions(-)
diff --git a/app/appDlg.cpp b/app/appDlg.cpp
index 1c58e41..3ecba12 100644
--- a/app/appDlg.cpp
+++ b/app/appDlg.cpp
@@ -142,11 +142,11 @@
DDX_Control(pDX, IDC_CHECK_TRADE_TIME_TRADE_SUCCESS, tradeSuccessTimeCheck);
DDX_Control(pDX, IDC_CHECK_TRADE_TIME_DELEGATE, delegateTimeCheck);
DDX_Control(pDX, IDC_CHECK_TRADE_TIME_LIMIT_UP, limitUpTimeCheck);
- DDX_Control(pDX, IDC_BUTTON_UPLOAD_EXCEL_CODE, uploadExcelGPBtn);
DDX_Control(pDX, IDC_CHECK_BUY1_VOLUMN_TIME_LIMIT, buy1VolumnTimeLimitCheck);
DDX_Control(pDX, IDC_BUTTON_BUY_1_VOLUMN, buy1VolumnBtn);
DDX_Control(pDX, IDC_CHECK_ONLINE, onlineCheck);
DDX_Control(pDX, IDC_BUTTON_UPLOAD_GPCODE, uploadGPCodeBtn);
+ DDX_Control(pDX, IDC_BUTTON_GP_CODE_ADD, addGPCodeBtn);
}
BEGIN_MESSAGE_MAP(CappDlg, CDialogEx)
@@ -177,9 +177,10 @@
ON_BN_CLICKED(IDC_CHECK_TRADE_TIME_TRADE_SUCCESS, &CappDlg::OnBnClickedCheckTradeTimeTradeSuccess)
ON_BN_CLICKED(IDC_CHECK_TRADE_TIME_DELEGATE, &CappDlg::OnBnClickedCheckTradeTimeDelegate)
ON_BN_CLICKED(IDC_CHECK_PRICE_TIME_LIMIT, &CappDlg::OnBnClickedCheckPriceTimeLimit)
- ON_BN_CLICKED(IDC_BUTTON_UPLOAD_EXCEL_CODE, &CappDlg::OnBnClickedButtonUploadExcelCode)
ON_BN_CLICKED(IDC_BUTTON_BUY_1_VOLUMN, &CappDlg::OnBnClickedButtonBuy1Volumn)
ON_BN_CLICKED(IDC_BUTTON_UPLOAD_GPCODE, &CappDlg::OnBnClickedButtonUploadGpcode)
+ ON_BN_CLICKED(IDC_CHECK_BUY1_VOLUMN_TIME_LIMIT, &CappDlg::OnBnClickedCheckBuy1VolumnTimeLimit)
+ ON_BN_CLICKED(IDC_BUTTON_GP_CODE_ADD, &CappDlg::OnBnClickedButtonGpCodeAdd)
END_MESSAGE_MAP()
@@ -224,23 +225,41 @@
limitUpTimeCheck.SetCheck(TRUE);
LimitUpCapture::setTradeTimeCapture(limitUpTimeCheck.GetCheck());
-
+
tradeSuccessTimeCheck.SetCheck(TRUE);
TradeListCapture::setTradeTimeCapture_success(tradeSuccessTimeCheck.GetCheck());
delegateTimeCheck.SetCheck(TRUE);
TradeListCapture::setTradeTimeCapture_delegate(delegateTimeCheck.GetCheck());
+ priceTimeLimitCheck.SetCheck(TRUE);
+ CurrentPriceCapture::setTradeTimeCapture(TRUE);
+
+
buy1VolumnTimeLimitCheck.SetCheck(TRUE);
- TradeQueueCaptureManager::setTradeTimeCapture(priceTimeLimitCheck.GetCheck());
+ TradeQueueCaptureManager::setTradeTimeCapture(buy1VolumnTimeLimitCheck.GetCheck());
onlineCheck.SetCheck(TRUE);
-
-
+ //鏄惁鑷姩寮�鍚姛鑳�
+ bool autoOpen = FALSE;
+ list<string> settings = Tool::getSettings("setting.txt");
+ if (settings.size() > 0) {
+ string c = *(settings.begin());
+ if (c == "1") {
+ autoOpen = TRUE;
+ }
+ else {
+ autoMsgStatic.SetWindowTextW(_T(""));
+ autoL2Check.SetCheck(FALSE);
+ }
+ }
+ if (autoOpen) {
+ autoL2Check.SetCheck(TRUE);
+ }
if (authoritySet.count(AUTHORITY_L2) > 0) {
onlineCheck.SetCheck(FALSE);
@@ -248,19 +267,10 @@
resetTHSBtn.EnableWindow(TRUE);
refreshHWNDBtn.EnableWindow(TRUE);
onlineCheck.EnableWindow(TRUE);
- list<string> settings = Tool::getSettings("setting.txt");
- if (settings.size() > 0) {
- string c = *(settings.begin());
- if (c == "1") {
- autoMsgStatic.SetWindowTextW(_T("姝ｅ湪鑷姩鍚姩涓�..."));
- autoL2Check.SetCheck(TRUE);
- thread rt(&(CappDlg::autoStartL2), this);
- rt.detach();
- }
- else {
- autoMsgStatic.SetWindowTextW(_T(""));
- autoL2Check.SetCheck(FALSE);
- }
+ if (autoOpen) {
+ autoMsgStatic.SetWindowTextW(_T("姝ｅ湪鑷姩鍚姩涓�..."));
+ thread rt(&(CappDlg::autoStartL2), this);
+ rt.detach();
}
}
else {
@@ -272,6 +282,26 @@
if (authoritySet.count(AUTHORITY_LIMIT_UP) > 0) {
limitUpBtn.EnableWindow(TRUE);
+ //鑷姩寮�鍚定鍋�
+ if (autoOpen) {
+ //绛夊緟鍚岃姳椤轰富灞忔槸鍚︽墦寮�
+ autoMsgStatic.SetWindowTextW(_T("姝ｅ湪绛夊緟THS涓诲睆鍚姩..."));
+ for (int i = 0; i < 10; i++) {
+ HWND hwnd = THSActionUtil::getMainWin();
+ Sleep(1000);
+ if (hwnd > 0) {
+ break;
+ }
+ }
+ autoMsgStatic.SetWindowTextW(_T("绛夊緟鎵撳紑鍓睆1..."));
+ THSActionUtil::openSecondScreen();
+ autoMsgStatic.SetWindowTextW(_T("鍓睆1宸叉墦寮�..."));
+ Sleep(1000);
+ // 寮�鍚� 娑ㄥ仠璇嗗埆
+ autoMsgStatic.SetWindowTextW(_T("鍚姩娑ㄥ仠璇嗗埆涓�..."));
+ CappDlg::OnBnClickedButton12();
+ autoMsgStatic.SetWindowTextW(_T("鍚姩娑ㄥ仠鍚姩鎴愬姛"));
+ }
}
else {
limitUpBtn.EnableWindow(FALSE);
@@ -279,6 +309,33 @@
if (authoritySet.count(AUTHORITY_TRADE_SUCCESS) > 0) {
tradeBtn.EnableWindow(TRUE);
+ if (autoOpen) {
+ //鑷姩鎵撳紑浜ゆ槗鎴愬姛椤甸潰鎴愬姛
+ HWND hwnd = THSActionUtil::getTradeSuccessWindow();
+ if (hwnd <= 0) {
+ //鎵撳紑浜ゆ槗鎴愬姛椤甸潰锛屽湪涓诲睆涓婃寜F12
+ HWND mainWin = THSActionUtil::getMainWin();
+ if (mainWin > 0) {
+ Win32Util::sendMessage(mainWin, WM_KEYDOWN, VK_F12, 0);
+ Win32Util::sendMessage(mainWin, WM_KEYUP, VK_F12, 0);
+ //绛夊緟椤甸潰鎵撳紑
+ for (int i = 0; i < 10; i++) {
+ hwnd = THSActionUtil::getTradeSuccessWindow();
+ Sleep(1000);
+ if (hwnd > 0) {
+ break;
+ }
+ }
+ }
+ }
+
+ if (hwnd > 0) {
+ //浜ゆ槗椤甸潰鎵撳紑
+ THSActionUtil::openTradeSuccessScreen();
+ //鍚姩浜ゆ槗鎴愬姛璇嗗埆
+ OnBnClickedButtonTrade();
+ }
+ }
}
else {
tradeBtn.EnableWindow(FALSE);
@@ -288,6 +345,12 @@
if (authoritySet.count(AUTHORITY_TRADE_DELEGATE) > 0) {
delegateBtn.EnableWindow(TRUE);
currentPriceBtn.EnableWindow(TRUE);
+ if (autoOpen) {
+ thread rt1(&(CappDlg::autoStartTradeDelegate), this);
+ rt1.detach();
+ thread rt2(&(CappDlg::autoStartCurrentPrice), this);
+ rt2.detach();
+ }
}
else {
delegateBtn.EnableWindow(FALSE);
@@ -305,18 +368,22 @@
if (authoritySet.count(AUTHORITY_UPLOAD_CODE) > 0) {
uploadGPBtn.EnableWindow(FALSE);
- uploadExcelGPBtn.EnableWindow(FALSE);
+ addGPCodeBtn.EnableWindow(TRUE);
uploadGPCodeBtn.EnableWindow(TRUE);
}
else {
uploadGPBtn.EnableWindow(FALSE);
- uploadExcelGPBtn.EnableWindow(FALSE);
+ addGPCodeBtn.EnableWindow(FALSE);
uploadGPCodeBtn.EnableWindow(FALSE);
}
if (authoritySet.count(AUTHORITY_TRADE_QUEUE) > 0) {
buy1VolumnBtn.EnableWindow(TRUE);
+ if (autoOpen) {
+ thread rt3(&(CappDlg::autoStartBuy1Volumn), this);
+ rt3.detach();
+ }
}
else {
buy1VolumnBtn.EnableWindow(FALSE);
@@ -351,8 +418,13 @@
else
{
CDialogEx::OnSysCommand(nID, lParam);
+ // 鍏抽棴鎸夐挳閫�鍑哄簲鐢�
+ if (nID == 61536) {
+ exit(0);
+ }
}
}
+
// 濡傛灉鍚戝璇濇娣诲姞鏈�灏忓寲鎸夐挳锛屽垯闇�瑕佷笅闈㈢殑浠ｇ爜
// 鏉ョ粯鍒惰鍥炬爣銆� 瀵逛簬浣跨敤鏂囨。/瑙嗗浘妯″瀷鐨� MFC 搴旂敤绋嬪簭锛�
@@ -383,10 +455,6 @@
}
}
-void CappDlg::OnClose() {
- MessageBox(_T("鍐呭"), _T("鏍囬"), MB_OKCANCEL);
- CDialogEx::OnClose();
-}
//褰撶敤鎴锋嫋鍔ㄦ渶灏忓寲绐楀彛鏃剁郴缁熻皟鐢ㄦ鍑芥暟鍙栧緱鍏夋爣
//鏄剧ず銆�
@@ -417,22 +485,22 @@
}
}
-void CappDlg::OnTradeQueueDataCallback(int index, string code, list<int> numList, void* context) {
+void CappDlg::OnTradeQueueDataCallback(int index, string code, L2TradeQueue tradeQueue, void* context) {
//杞负json
CappDlg* app = (CappDlg*)context;
//cout << "鍥炶皟:" << std::this_thread::get_id() << ":" << index << endl;
CButton* btn = (CButton*)app->GetDlgItem(IDC_CHECK1);
bool check = btn->GetCheck();
if (check) {
- string data = JsonUtil::loadTradeQueueData(app->clientNum, index, code, numList);
+ string data = JsonUtil::loadTradeQueueData(app->clientNum, index, code, tradeQueue);
clock_t time_start = clock();
try {
- app->socketManager->sendMsg(index, data.c_str());
+ app->socketManager->sendMsg(index + 9, data.c_str());
}
catch (string st) {
//閲嶆柊杩炴帴鏈嶅姟鍣�
- app->socketManager->resetClient(index);
- app->socketManager->Connect(index);
+ app->socketManager->resetClient(index + 9);
+ app->socketManager->Connect(index + 9);
}
//cout << "*****鏁版嵁澶勭悊鏃堕棿锛�" << (clock() - time_start) << endl;
}
@@ -493,7 +561,6 @@
if (check) {
string data = JsonUtil::loadTradeDelegateData(dataList);
clock_t time_start = clock();
-
try {
app->socketManager->sendMsg(8, data.c_str());
@@ -566,7 +633,7 @@
{
//杞负json
CappDlg* app = (CappDlg*)context;
- string data = JsonUtil::loadTradeQueue(index, result.code_name, result.buy_1_volumn, result.buy_1_price,result.time);
+ string data = JsonUtil::loadTradeQueue(index, result.code_name, result.buy_1_volumn, result.buy_1_price, result.time);
try {
app->socketManager->sendMsg(8, data.c_str());
//AfxMessageBox(_T("涓婁紶鎴愬姛"));
@@ -582,16 +649,18 @@
{
//杞负json
CappDlg* app = (CappDlg*)context;
- if (! app->onlineCheck) {
+ if (!app->onlineCheck) {
return "鏈煡閿欒";
}
- if (!app->onlineCheck.GetCheck())
- {
- throw string("瀹㈡埛绔绾�");
- }
+
cout << "action鍥炶皟:" << std::this_thread::get_id() << ":" << data << endl;
//瑙ｆ瀽鍛戒护
Json::Value root = JsonUtil::parseJson(data);
+ bool forceAction = root["force"].asBool();
+ if (!app->onlineCheck.GetCheck() && !forceAction)
+ {
+ throw string("瀹㈡埛绔绾�");
+ }
string action = root["action"].asString();
if (action == "setGPCode") {
//璁剧疆鑲＄エ浠ｇ爜
@@ -627,15 +696,15 @@
//鎵撳紑Level2鐩戞帶灞忓箷
THSActionUtil::openL2Screen();
-
+
map<int, string> results = THSActionUtil::getListenL2GPCodes(recognitionManager);
//璁剧疆浠ｇ爜
- for (map<int, string>::iterator ele = results.begin();ele != results.end();ele++) {
+ for (map<int, string>::iterator ele = results.begin(); ele != results.end(); ele++) {
int key = (*ele).first;
string value = (*ele).second;
app->capture->setGPCode(key, value);
cout << "浠ｇ爜浣嶏細" << key << " CODE:" << value;
- //TODO 璁板綍鏃ュ織
+ //TODO 璁板綍鏃ュ織
}
Sleep(500);
}
@@ -650,6 +719,106 @@
app->capture->start(index);
//鎭㈠娑ㄥ仠璇嗗埆
LimitUpCapture::pause = FALSE;
+ }
+ else if (action == "betchSetGPCodes") {
+ //鎵归噺璁剧疆浠ｇ爜
+ int len = root["data"].size();
+ for (int i = 0; i < len; i++) {
+ int index = root["data"][i]["index"].asInt();
+ string code = root["data"][i]["code"].asString();
+ string quickCode = "5";
+ quickCode.append(to_string(index + 1));
+ list<string> codeList;
+ if (code.length() > 0)
+ {
+ codeList.push_back(code);
+ }
+
+ try {
+
+ if (!app->capture->isInited()) {
+ app->initCapture(false);
+ }
+
+ //鏆傚仠閲囬泦
+ app->capture->stop(index);
+ //鏆傚仠娑ㄥ仠璇嗗埆
+ LimitUpCapture::pause = TRUE;
+
+ //鎵撳紑Level2鐩戞帶灞忓箷
+ THSActionUtil::openL2Screen();
+
+ bool result = THSActionUtil::setGP(quickCode, codeList, recognitionManager);
+ if (!result) {
+ throw string("璁剧疆鐗堝潡鐩戞帶鐨凣P澶辫触");
+ }
+
+ }
+ catch (string e) {
+ throw e;
+ }
+ catch (...) {
+ throw string("鏈煡閿欒(unknown error)");
+ }
+
+ }
+
+ //map<int, string> results = THSActionUtil::getListenL2GPCodes(recognitionManager);
+ //璁剧疆浠ｇ爜
+ //for (map<int, string>::iterator ele = results.begin(); ele != results.end(); ele++) {
+ // int key = (*ele).first;
+ // string value = (*ele).second;
+ // app->capture->setGPCode(key, value);
+ // cout << "浠ｇ爜浣嶏細" << key << " CODE:" << value;
+ //}
+ for (int i = 0; i < len; i++) {
+ try {
+ int index = root["data"][i]["index"].asInt();
+ string code = root["data"][i]["code"].asString();
+ app->capture->setGPCode(index, code);
+ cout << "浠ｇ爜浣嶏細" << index << " CODE:" << code;
+ }
+ catch (...) {
+
+ }
+ Sleep(100);
+ }
+
+
+
+ for (int i = 0; i < len; i++) {
+ try {
+ int index = root["data"][i]["index"].asInt();
+ string code = root["data"][i]["code"].asString();
+ //鍒锋柊L2鏁版嵁
+ THSActionUtil::setListenL2GP(index, code, recognitionManager);
+
+ //鎵撳紑Level2鐩戞帶灞忓箷
+ THSActionUtil::openL2Screen();
+ }
+ catch (...) {
+
+ }
+ Sleep(100);
+ }
+
+
+ //鎭㈠璇嗗埆
+ for (int i = 0; i < len; i++) {
+ int index = root["data"][i]["index"].asInt();
+ app->capture->start(index);
+ }
+
+ //鎭㈠娑ㄥ仠璇嗗埆
+ LimitUpCapture::pause = FALSE;
+ //鍙互鎺ュ彈鍛戒护
+ //app->onlineCheck.SetCheck(TRUE);
+ //app->onlineCheck.PostMessage(WM_LBUTTONDOWN, 0, 0);
+ //app->onlineCheck.PostMessage(WM_LBUTTONUP, 0, 0);
+ RECT rect;
+ Win32Util::getWindowRect(app->onlineCheck.m_hWnd, &rect);
+ Win32Util::click((rect.left + rect.right )/ 2, (rect.top + rect.bottom) / 2, 10);
+
}
else if (action == "repairL2Data") {
//淇浠ｇ爜涓嶭2琛屾儏浠ｇ爜涓嶅搴� 鎴栬�� L2琛屾儏鏃犳暟鎹殑鎯呭喌
@@ -668,6 +837,9 @@
}
catch (string st) {
throw st;
+ }
+ catch (...) {
+ throw string("鏈煡閿欒");
}
}
@@ -713,7 +885,7 @@
//鑾峰彇鐜鐘舵��
int l2_valid_count = 0;
int l2_invalid_count = 0;
- for (int i = 0;i < THS_FRAME_COUNT;i++)
+ for (int i = 0; i < THS_FRAME_COUNT; i++)
{
clock_t latestTime = TaskChecker::clientLiveTime.l2[i];
if (clock() - latestTime > 5000) {
@@ -752,7 +924,7 @@
app->OnBnClickedButton21();
//l2閲囬泦鐜淇
- for (int i = 0;i < THS_FRAME_COUNT;i++)
+ for (int i = 0; i < THS_FRAME_COUNT; i++)
{
clock_t latestTime = TaskChecker::clientLiveTime.l2[i];
if (clock() - latestTime > 5000) {
@@ -774,7 +946,7 @@
else if (action == "syncTargetCodes") {
Json::Value data = root["data"];
list<string> codeList;
- for (int i = 0;i < data.size();i++) {
+ for (int i = 0; i < data.size(); i++) {
string code = data[i].asString();
codeList.push_back(code);
}
@@ -800,7 +972,7 @@
Json::Value root;
Json::Value data;
int index = 0;
- for (std::list<GPCodeArea>::iterator ele = resultList.begin();ele != resultList.end();++ele) {
+ for (std::list<GPCodeArea>::iterator ele = resultList.begin(); ele != resultList.end(); ++ele) {
Json::Value item;
item["index"] = (*ele).cateIndex;
item["code"] = (*ele).code;
@@ -816,6 +988,9 @@
}
catch (string st) {
throw st;
+ }
+ catch (...) {
+ throw string("鏈煡閿欒");
}
}
@@ -840,6 +1015,11 @@
root["msg"] = "鏈煡閿欒";
}
return JsonUtil::jsonValue2String(root);
+}
+
+string CappDlg::OnActionCallbackQueue(string data, void* context)
+{
+ return string();
}
//蹇冭烦淇″彿
@@ -1021,7 +1201,7 @@
CappDlg* app = (CappDlg*)context;
app->autoMsgStatic.SetWindowTextW(_T("寮�濮嬫娴嬪悓鑺遍『鐜..."));
//鐐瑰嚮妫�鏌ュ悓鑺遍『
- for (int i = 0;i < 10;i++)
+ for (int i = 0; i < 10; i++)
{
try {
checkTHSEnv(app);
@@ -1046,10 +1226,56 @@
//app->OnBnClickedButtonTrade();
//鍚姩娑ㄥ仠璇嗗埆
//OnBnClickedButton12();
-
- //鍙互鎺ュ彈鍛戒护
- app->onlineCheck.SetCheck(TRUE);
+ //鍙戦�佽嚜鍔ㄥ寲寮�濮嬫垚鍔�
+ string data = JsonUtil::loadAutoStartL2(clientNum);
+ clock_t time_start = clock();
+ try {
+ string result_msg = app->socketManager->sendMsg(8, data.c_str());
+ Json::Value v_ = JsonUtil::parseJson(result_msg);
+ if (v_["code"] == 0) {
+ //鍒ゆ柇鏄惁闇�瑕佽嚜鍔ㄥ紑鍚湪绾�
+ //鍙互鎺ュ彈鍛戒护
+ app->onlineCheck.SetCheck(TRUE);
+ }
+ else {
+ //涓嶅彲浠ユ帴鍙楀懡浠�
+ app->onlineCheck.SetCheck(FALSE);
+ }
+ }
+ catch (string st) {
+ //閲嶆柊杩炴帴鏈嶅姟鍣�
+ app->socketManager->resetClient(8);
+ app->socketManager->Connect(8);
+ }
+
}
+
+void CappDlg::autoStartTradeDelegate(void* context)
+{
+ CappDlg* app = (CappDlg*)context;
+ app->autoMsgStatic.SetWindowTextW(_T("寮�濮嬪鎵樿瘑鍒�..."));
+ app->OnBnClickedButtonTradeDelegate();
+ app->autoMsgStatic.SetWindowTextW(_T("濮旀墭璇嗗埆鍚姩鎴愬姛"));
+}
+
+void CappDlg::autoStartCurrentPrice(void* context)
+{
+ CappDlg* app = (CappDlg*)context;
+ app->autoMsgStatic.SetWindowTextW(_T("寮�濮嬬幇浠疯瘑鍒�..."));
+ app->OnBnClickedCurrentPrice();
+ app->autoMsgStatic.SetWindowTextW(_T("鐜颁环璇嗗埆鍚姩鎴愬姛"));
+}
+
+void CappDlg::autoStartBuy1Volumn(void* context)
+{
+ CappDlg* app = (CappDlg*)context;
+ app->autoMsgStatic.SetWindowTextW(_T("寮�濮嬩拱1璇嗗埆..."));
+ app->OnBnClickedButtonBuy1Volumn();
+ app->autoMsgStatic.SetWindowTextW(_T("涔�1璇嗗埆鍚姩鎴愬姛"));
+}
+
+
+
@@ -1081,7 +1307,7 @@
void CappDlg::OnBnClickedButton2()
{
- for (int i = 0;i < 8;i++)
+ for (int i = 0; i < 8; i++)
{
socketManager->disConnect(i);
}
@@ -1099,9 +1325,9 @@
for (int i = 0; i < num; i++)
{
try {
- if (socketManager->sendMsg(i, "test")) {
+ socketManager->sendMsg(i, "test");
scount++;
- }
+
}
catch (string st) {
@@ -1129,9 +1355,9 @@
int num = socketManager->getClientsNum();
for (int i = 0; i < num; i++)
{
- if (socketManager->sendMsg(i, "test")) {
- scount++;
- }
+ socketManager->sendMsg(i, "test");
+ scount++;
+
}
@@ -1150,12 +1376,12 @@
return
- initCapture();
+ initCapture();
clock_t time = clock();
CString path = GUITool::selectImage();
- std:string p = Tool::cstring2String(path);
+std:string p = Tool::cstring2String(path);
if (p.length() <= 0) {
return;
}
@@ -1245,7 +1471,7 @@
cout << "灏氭湭鑾峰彇L2鐨勭洃鍚唬鐮�" << endl;
}
//璁剧疆浠ｇ爜
- for (map<int, string>::iterator ele = result.begin();ele != result.end();ele++) {
+ for (map<int, string>::iterator ele = result.begin(); ele != result.end(); ele++) {
int key = (*ele).first;
string value = (*ele).second;
capture->setGPCode(key, value);
@@ -1296,7 +1522,7 @@
list<CString> paths = GUITool::selectMulImages();
std::list<IndustryData> fResultList;
- for (list<CString>::iterator ele = paths.begin();ele != paths.end();ele++) {
+ for (list<CString>::iterator ele = paths.begin(); ele != paths.end(); ele++) {
CString path = *ele;
std:string p = Tool::cstring2String(path);
cv::Mat grayImg = gpDataCapture->grayImgs(cv::imread(p));
@@ -1305,7 +1531,7 @@
list<list<GPDataStruct>> resultList = gpDataCapture->captureGPData(grayImg, types, 6, 1, 2);
- for (list<list<GPDataStruct>>::iterator ele1 = resultList.begin();ele1 != resultList.end();ele1++) {
+ for (list<list<GPDataStruct>>::iterator ele1 = resultList.begin(); ele1 != resultList.end(); ele1++) {
IndustryData industryData = IndustryData();
list<GPDataStruct>::iterator e = (*ele1).begin();
@@ -1320,7 +1546,7 @@
bool contains = false;
- for (std::list<IndustryData>::iterator e = fResultList.begin();e != fResultList.end();e++) {
+ for (std::list<IndustryData>::iterator e = fResultList.begin(); e != fResultList.end(); e++) {
if ((*e).code == industryData.code) {
contains = true;
break;
@@ -1355,7 +1581,7 @@
list<CString> paths = GUITool::selectMulImages();
std::list<IndustryData> fResultList;
- for (list<CString>::iterator ele = paths.begin();ele != paths.end();ele++) {
+ for (list<CString>::iterator ele = paths.begin(); ele != paths.end(); ele++) {
CString path = *ele;
std:string p = Tool::cstring2String(path);
cv::Mat img = cv::imread(p);
@@ -1369,7 +1595,7 @@
list<list<GPDataStruct>> resultList = gpDataCapture->captureGPData(grayImg, types, 6, 1, 2);
- for (list<list<GPDataStruct>>::iterator ele1 = resultList.begin();ele1 != resultList.end();ele1++) {
+ for (list<list<GPDataStruct>>::iterator ele1 = resultList.begin(); ele1 != resultList.end(); ele1++) {
IndustryData industryData = IndustryData();
list<GPDataStruct>::iterator e = (*ele1).begin();
@@ -1384,7 +1610,7 @@
bool contains = false;
- for (std::list<IndustryData>::iterator e = fResultList.begin();e != fResultList.end();e++) {
+ for (std::list<IndustryData>::iterator e = fResultList.begin(); e != fResultList.end(); e++) {
if ((*e).code == industryData.code) {
contains = true;
break;
@@ -1401,51 +1627,6 @@
codesDataDlog dlg;
dlg.DoModal();
}
-
-// Excel涓婁紶鑲＄エ浠ｇ爜
-void CappDlg::OnBnClickedButtonUploadExcelCode()
-{
- CString cpath = GUITool::selectExcel();
- std:string path = Tool::cstring2String(cpath);
- if (path.length() > 0)
- {
- std::list<IndustryData> fresult;
- list<ExcelGPCodeInfo> codesList = ExcelUtil::readGPCodes(path);
- list<ExcelGPCodeInfo>::iterator ele;
- for (ele = codesList.begin();ele != codesList.end();++ele) {
- ExcelGPCodeInfo info= *ele;
- IndustryData finfo;
- if (info.code.length()>0)
- {
-
- finfo.code = info.code.replace(0, 2, "");
- if (info.zyltgb.find("浜�",0) > 0) {
- finfo.zyltMoneyUnit = MONEY_UNIT_Y;
- string zyltgb = info.zyltgb;
- finfo.zyltMoney = zyltgb.substr(0, zyltgb.length()-2);
- }
- else if (info.zyltgb.find("涓�",0) > 0) {
- finfo.zyltMoneyUnit = MONEY_UNIT_W;
- string zyltgb = info.zyltgb;
- finfo.zyltMoney = zyltgb.substr(0, zyltgb.length() - 2);
- }
- else {
- finfo.zyltMoneyUnit = MONEY_UNIT_NO;
- finfo.zyltMoney = info.zyltgb;
- }
- fresult.push_back(finfo);
- }
- }
- codesDataDlog::codeData = fresult;
- codesDataDlog::upload = TRUE;
- codesDataDlog dlg;
- dlg.DoModal();
- }
-
-
-
-}
-
//娑ㄥ仠涓婁紶
@@ -1598,7 +1779,7 @@
else {
try
{
- tradeListCapture->refreshTradeDelegateHWND();
+ tradeListCapture->refreshTradeSimpleDelegateHWND();
}
catch (string st)
{
@@ -1620,7 +1801,7 @@
{
int index = 0;
std::list<TradeData> dataList;
- for (int i = 0;i < 10;i++) {
+ for (int i = 0; i < 10; i++) {
TradeData data = TradeData();
//7.32
data.time = "09:30:00";
@@ -1631,7 +1812,7 @@
dataList.push_back(data);
}
- for (int i = 10;i < 11;i++) {
+ for (int i = 10; i < 11; i++) {
TradeData data = TradeData();
//7.32
data.time = "09:30:00";
@@ -1645,7 +1826,7 @@
- string data = JsonUtil::loadL2Data(clientNum, 0, "002338",0,0, dataList);
+ string data = JsonUtil::loadL2Data(clientNum, 0, "002338", 0, 0, dataList);
clock_t time_start = clock();
try {
socketManager->sendMsg(index, data.c_str());
@@ -1884,7 +2065,7 @@
// 涔�1 璇嗗埆
void CappDlg::OnBnClickedButtonBuy1Volumn()
{
-
+
if (!tradeQueueCaptureManager->isInited()) {
try {
tradeQueueCaptureManager->init(OnTradeQueueCallback, this);
@@ -1917,6 +2098,24 @@
std::list<IndustryData> fresult;
codesDataDlog::codeData = fresult;
codesDataDlog::upload = TRUE;
+ codesDataDlog::add = FALSE;
+ codesDataDlog dlg;
+ dlg.DoModal();
+}
+
+
+void CappDlg::OnBnClickedCheckBuy1VolumnTimeLimit()
+{
+ TradeQueueCaptureManager::setTradeTimeCapture(buy1VolumnTimeLimitCheck.GetCheck());
+}
+
+//鏂板鑲＄エ浠ｇ爜
+void CappDlg::OnBnClickedButtonGpCodeAdd()
+{
+ std::list<IndustryData> fresult;
+ codesDataDlog::codeData = fresult;
+ codesDataDlog::upload = TRUE;
+ codesDataDlog::add = TRUE;
codesDataDlog dlg;
dlg.DoModal();
}
--
Gitblit v1.8.0