From 086ec74e94654e92b3a1c6f42612d12ef33ff4b2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 28 十月 2022 14:41:08 +0800
Subject: [PATCH] '优化自启动机制'
---
app/appDlg.cpp | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/app/appDlg.cpp b/app/appDlg.cpp
index 1345426..088d024 100644
--- a/app/appDlg.cpp
+++ b/app/appDlg.cpp
@@ -145,6 +145,8 @@
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);
}
BEGIN_MESSAGE_MAP(CappDlg, CDialogEx)
@@ -177,6 +179,7 @@
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)
END_MESSAGE_MAP()
@@ -231,7 +234,7 @@
buy1VolumnTimeLimitCheck.SetCheck(TRUE);
TradeQueueCaptureManager::setTradeTimeCapture(priceTimeLimitCheck.GetCheck());
-
+ onlineCheck.SetCheck(TRUE);
@@ -240,9 +243,11 @@
if (authoritySet.count(AUTHORITY_L2) > 0) {
+ onlineCheck.SetCheck(FALSE);
btnL2.EnableWindow(TRUE);
resetTHSBtn.EnableWindow(TRUE);
refreshHWNDBtn.EnableWindow(TRUE);
+ onlineCheck.EnableWindow(TRUE);
list<string> settings = Tool::getSettings("setting.txt");
if (settings.size() > 0) {
string c = *(settings.begin());
@@ -262,6 +267,7 @@
btnL2.EnableWindow(FALSE);
resetTHSBtn.EnableWindow(FALSE);
refreshHWNDBtn.EnableWindow(FALSE);
+ onlineCheck.EnableWindow(FALSE);
}
if (authoritySet.count(AUTHORITY_LIMIT_UP) > 0) {
@@ -298,12 +304,14 @@
}
if (authoritySet.count(AUTHORITY_UPLOAD_CODE) > 0) {
- uploadGPBtn.EnableWindow(TRUE);
- uploadExcelGPBtn.EnableWindow(TRUE);
+ uploadGPBtn.EnableWindow(FALSE);
+ uploadExcelGPBtn.EnableWindow(FALSE);
+ uploadGPCodeBtn.EnableWindow(TRUE);
}
else {
uploadGPBtn.EnableWindow(FALSE);
uploadExcelGPBtn.EnableWindow(FALSE);
+ uploadGPCodeBtn.EnableWindow(FALSE);
}
@@ -558,7 +566,7 @@
{
//杞负json
CappDlg* app = (CappDlg*)context;
- string data = JsonUtil::loadTradeQueue(index, result.code_name, result.buy_1_volumn, 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("涓婁紶鎴愬姛"));
@@ -574,6 +582,13 @@
{
//杞负json
CappDlg* app = (CappDlg*)context;
+ 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);
@@ -1006,6 +1021,9 @@
try {
checkTHSEnv(app);
app->autoMsgStatic.SetWindowTextW(_T("鍚岃姳椤虹幆澧冩娴嬮�氳繃..."));
+ //鎵ц涓�娆￠噸缃�
+ Sleep(500);
+ app->OnBnClickedButton21();
break;
}
catch (string st) {
@@ -1020,9 +1038,12 @@
app->OnBnClickedButton5();
app->autoMsgStatic.SetWindowTextW(_T("L2琛屾儏璇嗗埆鍚姩瀹屾垚..."));
//鍚姩浜ゆ槗鎴愬姛璇嗗埆
- app->OnBnClickedButtonTrade();
+ //app->OnBnClickedButtonTrade();
//鍚姩娑ㄥ仠璇嗗埆
//OnBnClickedButton12();
+
+ //鍙互鎺ュ彈鍛戒护
+ app->onlineCheck.SetCheck(TRUE);
}
@@ -1870,3 +1891,13 @@
buy1VolumnBtn.SetWindowTextW(_T("鏆傚仠涔�1璇嗗埆"));
}
}
+
+
+void CappDlg::OnBnClickedButtonUploadGpcode()
+{
+ std::list<IndustryData> fresult;
+ codesDataDlog::codeData = fresult;
+ codesDataDlog::upload = TRUE;
+ codesDataDlog dlg;
+ dlg.DoModal();
+}
--
Gitblit v1.8.0