diff --git a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs index 2fa9920..efeffbc 100644 --- a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs +++ b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs @@ -487,16 +487,16 @@ namespace BitgetAPI.IndicatorConditionSetup { if(buyType == 1) { - if (전봉Bol12_Up > 전봉Bol24_Up && 전전봉Bol12_Up > 전전봉Bol24_Up - && 전전봉Bol12_Up < 전봉Bol12_Up) + if (Bol12_Up > Bol24_Up && 전봉Bol12_Up > 전봉Bol24_Up + && 전봉Bol12_Up < Bol12_Up) { buyFlag = true; } } else if(buyType == 2) { - if (전봉Bol12_Up > 전봉Bol24_Up && 전전봉Bol12_Up > 전전봉Bol24_Up - && 전전봉Bol12_Up < 전봉Bol12_Up && 전전봉Bol24_Up < 전봉Bol24_Up) + if (Bol12_Up > Bol24_Up && 전봉Bol12_Up > 전봉Bol24_Up + && 전봉Bol12_Up < Bol12_Up && 전봉Bol24_Up < Bol24_Up) { buyFlag = true; } @@ -637,9 +637,9 @@ namespace BitgetAPI.IndicatorConditionSetup // break; //} - if ((전봉24 < 현재봉24 && 전봉12 < 현재봉12) || - (현재봉2 > 현재봉24) || - (현재봉4 < 전봉4 && 전봉Bol12_Up > Bol12_Up && 전봉Bol24_Up > Bol24_Up)) + if ((전봉24 > 현재봉24 && 전봉12 > 현재봉12) || + (현재봉2 < 현재봉24) || + (현재봉4 < 전봉4 && 전봉Bol12_Up < Bol12_Up && 전봉Bol24_Up < Bol24_Up)) { sellFlag = true; BuyLongStep[market + interval] = false; @@ -773,16 +773,16 @@ namespace BitgetAPI.IndicatorConditionSetup { if (buyType == 1) { - if (전봉Bol12_Up > 전봉Bol24_Up && 전전봉Bol12_Up > 전전봉Bol24_Up - && 전전봉Bol12_Up < 전봉Bol12_Up) + if (Bol12_Up > Bol24_Up && 전봉Bol12_Up > 전봉Bol24_Up + && 전봉Bol12_Up < Bol12_Up) { buyFlag = true; } } else if (buyType == 2) { - if (전봉Bol12_Up > 전봉Bol24_Up && 전전봉Bol12_Up > 전전봉Bol24_Up - && 전전봉Bol12_Up < 전봉Bol12_Up && 전전봉Bol24_Up < 전봉Bol24_Up) + if (Bol12_Up > Bol24_Up && 전봉Bol12_Up > 전봉Bol24_Up + && 전봉Bol12_Up < Bol12_Up && 전봉Bol24_Up < Bol24_Up) { buyFlag = true; } @@ -926,8 +926,8 @@ namespace BitgetAPI.IndicatorConditionSetup // } // break; //} - if ((전봉24 > 현재봉24 && 전봉12 > 현재봉12) || - (현재봉2 < 현재봉24) || + if ((전봉24 < 현재봉24 && 전봉12 < 현재봉12) || + (현재봉2 > 현재봉24) || (현재봉4 > 전봉4 && 전봉Bol12_Down < Bol12_Down && 전봉Bol24_Down < Bol24_Down)) { sellFlag = true; diff --git a/BitgetApi/MainForm.cs b/BitgetApi/MainForm.cs index eae0bfb..d7d9185 100644 --- a/BitgetApi/MainForm.cs +++ b/BitgetApi/MainForm.cs @@ -192,6 +192,7 @@ namespace BitgetAPI //속도 개선을 위하여 미리 선언 while (webConnection.Is_th_webSocketThread) { + Thread.Sleep(1000); webConnection.CalculateDataList(type, indicatorProcess.intervalList); if (flag) { diff --git a/BitgetApi/WebService/WebConnection.cs b/BitgetApi/WebService/WebConnection.cs index cf86f43..2ba4870 100644 --- a/BitgetApi/WebService/WebConnection.cs +++ b/BitgetApi/WebService/WebConnection.cs @@ -25,6 +25,7 @@ using DevExpress.XtraExport.Xls; using DevExpress.Utils.Filtering.Internal; using System.Collections.Specialized; using Serilog; +using BitgetAPI.IndicatorConditionSetup; namespace BitgetAPI.WebService { @@ -804,7 +805,7 @@ namespace BitgetAPI.WebService lock (obj) { try - { + { foreach (var item in webSocketDataList) { var dic = new Dictionary();