million/BitGet_API
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

전저점 관련 데이터 추가

Browse Source
This commit is contained in:
kyh
2024-07-25 12:26:45 +09:00
parent bfc3db469e
commit 022acf385e
4 changed files with 266 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BitgetApi/CommonProperty.cs
View File

@@ -112,13 +112,13 @@ namespace BitgetAPI
// 캔들 데이터 (1분) (3분) (5분) (10분) (15분) (30분) (1시간) (4시간)
public enum MCandleTimeType
{
[Description("1m")]
M1 = 1,
{
[Description("3m")]
M3 = 3,
[Description("5m")]
M5 = 5,
[Description("1m")]
M1 = 1,
[Description("15m")]
M15 = 15,
[Description("30m")]

303
BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs
View File

@@ -19,7 +19,7 @@ namespace BitgetAPI.IndicatorConditionSetup
// 스레드 시작/종료 플래그
public bool Is_th_SignalInfo;
public Dictionary<string, Dictionary<string, object>> 전저점 = new Dictionary<string, Dictionary<string, object>>();
public List<object> checkedMarkets;
public List<object> intervalList;
@@ -137,6 +137,15 @@ namespace BitgetAPI.IndicatorConditionSetup
var strInterval = Utils.Convertor.GetEnumDescription((Enum)interval);
if (!intervalList.Contains(strInterval)) continue;
if (!전저점.ContainsKey(market + strInterval))
{
var dic = new Dictionary<string, object>();
dic.Add("val", 0);
dic.Add("clearFlag", true);
dic.Add("flag", false);
전저점.Add(market + strInterval, dic);
}
// 시간별로 정렬하기 (임시 리스트)
var candleDatas = findedMarket.candleDataList[interval];
var candleDatas_정렬 = candleDatas.OrderBy(i => i.Argument).ToList();
@@ -242,9 +251,11 @@ namespace BitgetAPI.IndicatorConditionSetup
var 낮은값_74_24 = Math.Min(candleData.movingAverageDataList[72].Value, candleData.movingAverageDataList[24].Value);
var 전전봉4 = candleData_전전봉.movingAverageDataList[4].Value;
var 전전봉12 = candleData_전전봉.movingAverageDataList[12].Value;
var 전전봉24 = candleData_전전봉.movingAverageDataList[24].Value;
var 전전봉72 = candleData_전전봉.movingAverageDataList[72].Value;
var 전봉4 = candleData_전봉.movingAverageDataList[4].Value;
var 전봉12 = candleData_전봉.movingAverageDataList[12].Value;
var 전봉24 = candleData_전봉.movingAverageDataList[24].Value;
var 전봉72 = candleData_전봉.movingAverageDataList[72].Value;
var 현재봉4 = candleData.movingAverageDataList[4].Value;
@@ -279,19 +290,6 @@ namespace BitgetAPI.IndicatorConditionSetup
//var sellFlag = 전봉Bol12 - 전봉Bol24 < Bol12 - Bol24 || 현재봉4 > 낮은값_74_24;
var buyFlag = 전전봉Bol12 - 전전봉Bol24 > 전봉Bol12 - 전봉Bol24 && 전전봉Bol4 > 전봉Bol4 && 현재봉12 > 낮은값_74_24;
//파는 시점 볼랜저 전전봉 12 - 24 값이 전봉 12 - 24보다 클경우 팜
//var sellFlag = 전봉Bol12 - 전봉Bol24 < Bol12 - Bol24 || 현재봉4 > 낮은값_74_24;
//var sellFlag = 현재봉4 > 낮은값_74_24 || 전전봉Bol12 - 전전봉Bol24 < 전봉Bol12 - 전봉Bol24;
var sellFlag = 현재봉4 > 낮은값_74_24 || 현재봉12 < 현재봉4;// || 전전봉Bol12 - 전전봉Bol24 < 전봉Bol12 - 전봉Bol24;
//파는 시점 볼랜저 전전봉 12 - 24 값이 전봉 12 - 24보다 클경우 팜
//var buyFlag = candleData_전봉.movingAverageDataList[12].BolangerValue > candleData_전봉.movingAverageDataList[24].BolangerValue && 전전봉Bol12 - 전전봉Bol24 > 전봉Bol12 - 전봉Bol24;
////파는 시점 볼랜저 전전봉 12 - 24 값이 전봉 12 - 24보다 클경우 팜
//var sellFlag = 전전봉Bol12 - 전전봉Bol24 < 전봉Bol12 - 전봉Bol24 || 현재봉4 > 낮은값_74_24;
if (영호조건식_상향돌파 &&
// 전전봉의 4가 74, 21 보다 높고
@@ -336,99 +334,234 @@ namespace BitgetAPI.IndicatorConditionSetup
var description = string.Format("{0} 72,24,4 하락", strInterval);
var signalData = signals_SD.Find(i => i.MarketName.Equals(market) && i.Description.Equals(description));
// 없으면 생성
if (signalData == null)
{
SignalInfoData signalInfoData = new SignalInfoData();
signalInfoData.SignalStart = nowTime;
signalInfoData.MarketName = market;
signalInfoData.Description = description;
signalInfoData.Rate = rate;
signalInfoData.Price = price;
signalInfoData.IndicatorPrice = indicatorPrice;
signalInfoData.IndicatorRate = indicatorRate;
signalInfoData.MCandleTimeType = interval;
signals_SD.Add(signalInfoData);
}
try
{
if ((int)interval != 3)
if ((int)interval != 5)
{
continue;
}
//30분봉 관련 처리
var candleDatas30 = findedMarket.candleDataList[MCandleTimeType.M30];
var candleDatas30_정렬 = candleDatas30.OrderBy(i => i.Argument).ToList();
#region 15분봉 처리
//15분봉 관련 처리
var candleDatas15 = findedMarket.candleDataList[MCandleTimeType.M15];
var candleDatas15_정렬 = candleDatas15.OrderBy(i => i.Argument).ToList();
var candleData30 = candleDatas30.Find(i => i.Argument == candleDatas30_정렬.Last().Argument);
if (candleData30 == null) continue;
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas30_정렬, candleData30);
ichimokuConditionSetup.calIchimokuData(candleDatas30_정렬, candleData30);
var candleData15 = candleDatas15.Find(i => i.Argument == candleDatas15_정렬.Last().Argument);
if (candleData15 == null) continue;
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas15_정렬, candleData15);
ichimokuConditionSetup.calIchimokuData(candleDatas15_정렬, candleData15);
candleDatas30_정렬.RemoveAt(candleDatas30_정렬.Count - 1);
var candleData30_전봉 = candleDatas30.Find(i => i.Argument == candleDatas30_정렬.Last().Argument);
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas30_정렬, candleData30_전봉);
ichimokuConditionSetup.calIchimokuData(candleDatas30_정렬, candleData30_전봉);
candleDatas15_정렬.RemoveAt(candleDatas15_정렬.Count - 1);
var candleData15_전봉 = candleDatas15.Find(i => i.Argument == candleDatas15_정렬.Last().Argument);
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas15_정렬, candleData15_전봉);
ichimokuConditionSetup.calIchimokuData(candleDatas15_정렬, candleData15_전봉);
candleDatas30_정렬.RemoveAt(candleDatas30_정렬.Count - 1);
var candleData30_전전봉 = candleDatas30.Find(i => i.Argument == candleDatas30_정렬.Last().Argument);
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas30_정렬, candleData30_전전봉);
ichimokuConditionSetup.calIchimokuData(candleDatas30_정렬, candleData30_전전봉);
candleDatas15_정렬.RemoveAt(candleDatas15_정렬.Count - 1);
var candleData15_전전봉 = candleDatas15.Find(i => i.Argument == candleDatas15_정렬.Last().Argument);
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas15_정렬, candleData15_전전봉);
ichimokuConditionSetup.calIchimokuData(candleDatas15_정렬, candleData15_전전봉);
candleDatas15_정렬.RemoveAt(candleDatas15_정렬.Count - 1);
var candleData15_전전전봉 = candleDatas15.Find(i => i.Argument == candleDatas15_정렬.Last().Argument);
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas15_정렬, candleData15_전전봉);
ichimokuConditionSetup.calIchimokuData(candleDatas15_정렬, candleData15_전전봉);
var 낮은값15_74_24 = Math.Min(candleData15.movingAverageDataList[72].Value, candleData15.movingAverageDataList[24].Value);
var 높은값15_74_24 = Math.Max(candleData15.movingAverageDataList[72].Value, candleData15.movingAverageDataList[24].Value);
var 전봉낮은값15_74_24 = Math.Min(candleData15_전봉.movingAverageDataList[72].Value, candleData15_전봉.movingAverageDataList[24].Value);
var 전봉높은값15_74_24 = Math.Max(candleData15_전봉.movingAverageDataList[72].Value, candleData15_전봉.movingAverageDataList[24].Value);
var 전전봉낮은값15_74_24 = Math.Min(candleData15_전전봉.movingAverageDataList[72].Value, candleData15_전전봉.movingAverageDataList[24].Value);
var 전전봉높은값15_74_24 = Math.Max(candleData15_전전봉.movingAverageDataList[72].Value, candleData15_전전봉.movingAverageDataList[24].Value);
var 현재봉15_12 = candleData15.movingAverageDataList[12].Value;
var 전봉15_12 = candleData15_전봉.movingAverageDataList[12].Value;
var 전전봉15_12 = candleData15_전전봉.movingAverageDataList[12].Value;
var 현재봉15_4 = candleData15.movingAverageDataList[4].Value;
var 전봉15_4 = candleData15_전봉.movingAverageDataList[4].Value;
var 전전봉15_4 = candleData15_전전봉.movingAverageDataList[4].Value;
var 전봉15Bol4 = candleData15_전봉.movingAverageDataList[4].BolangerValue;
var 전봉15Bol12 = candleData15_전봉.movingAverageDataList[12].BolangerValue;
var 전봉15Bol24 = candleData15_전봉.movingAverageDataList[24].BolangerValue;
var 전전봉15Bol4 = candleData15_전전봉.movingAverageDataList[4].BolangerValue;
var 전전봉15Bol12 = candleData15_전전봉.movingAverageDataList[12].BolangerValue;
var 전전봉15Bol24 = candleData15_전전봉.movingAverageDataList[24].BolangerValue;
var 현재봉15Bol4 = candleData15.movingAverageDataList[4].BolangerValue;
var 현재봉15Bol12 = candleData15.movingAverageDataList[12].BolangerValue;
var 현재봉15Bol24 = candleData15.movingAverageDataList[24].BolangerValue;
var candle15Flag = 현재봉15_4 < 높은값15_74_24 &&
candleData15.Open > candleData15.Close &&
현재봉15_4 < 전봉15_4 && 전봉15_4 < 전전봉15_4 &&
현재봉15_12 < 전봉15_12 && 전봉15_12 < 전전봉15_12 &&
전봉15Bol12 - 전봉15Bol24 > 현재봉15Bol12 - 현재봉15Bol24;
#endregion
#region 1분봉 처리
var candleDatas1 = findedMarket.candleDataList[MCandleTimeType.M1];
var candleDatas1_정렬 = candleDatas1.OrderBy(i => i.Argument).ToList();
var candleData1 = candleDatas1.Find(i => i.Argument == candleDatas1_정렬.Last().Argument);
if (candleData1 == null) continue;
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas1_정렬, candleData1);
ichimokuConditionSetup.calIchimokuData(candleDatas1_정렬, candleData1);
var 낮은값30_74_24 = Math.Min(candleData30.movingAverageDataList[72].Value, candleData30.movingAverageDataList[24].Value);
var 높은값30_74_24 = Math.Max(candleData30.movingAverageDataList[72].Value, candleData30.movingAverageDataList[24].Value);
candleDatas1_정렬.RemoveAt(candleDatas1_정렬.Count - 1);
var candleData1_전봉 = candleDatas1.Find(i => i.Argument == candleDatas1_정렬.Last().Argument);
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas1_정렬, candleData1_전봉);
ichimokuConditionSetup.calIchimokuData(candleDatas1_정렬, candleData1_전봉);
var 전봉낮은값30_74_24 = Math.Min(candleData30_전봉.movingAverageDataList[72].Value, candleData30_전봉.movingAverageDataList[24].Value);
var 전봉높은값30_74_24 = Math.Max(candleData30_전봉.movingAverageDataList[72].Value, candleData30_전봉.movingAverageDataList[24].Value);
var 전전봉낮은값30_74_24 = Math.Min(candleData30_전전봉.movingAverageDataList[72].Value, candleData30_전전봉.movingAverageDataList[24].Value);
var 전전봉높은값30_74_24 = Math.Max(candleData30_전전봉.movingAverageDataList[72].Value, candleData30_전전봉.movingAverageDataList[24].Value);
candleDatas1_정렬.RemoveAt(candleDatas1_정렬.Count - 1);
var candleData1_전전봉 = candleDatas1.Find(i => i.Argument == candleDatas1_정렬.Last().Argument);
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas1_정렬, candleData1_전전봉);
ichimokuConditionSetup.calIchimokuData(candleDatas1_정렬, candleData1_전전봉);
var 현재봉30_12 = candleData30.movingAverageDataList[12].Value;
var 전봉30_12 = candleData30_전봉.movingAverageDataList[12].Value;
var 전전봉30_12 = candleData30_전전봉.movingAverageDataList[12].Value;
var 현재봉30_4 = candleData30.movingAverageDataList[4].Value;
var 전봉30_4 = candleData30_전봉.movingAverageDataList[4].Value;
var 전전봉30_4 = candleData30_전전봉.movingAverageDataList[4].Value;
var 낮은값1_74_24 = Math.Min(candleData1.movingAverageDataList[72].Value, candleData1.movingAverageDataList[24].Value);
var 높은값1_74_24 = Math.Max(candleData1.movingAverageDataList[72].Value, candleData1.movingAverageDataList[24].Value);
var 전봉30Bol4 = candleData30_전봉.movingAverageDataList[4].BolangerValue;
var 전봉30Bol12 = candleData30_전봉.movingAverageDataList[12].BolangerValue;
var 전봉30Bol24 = candleData30_전봉.movingAverageDataList[24].BolangerValue;
var 전봉낮은값1_74_24 = Math.Min(candleData1_전봉.movingAverageDataList[72].Value, candleData1_전봉.movingAverageDataList[24].Value);
var 전봉높은값1_74_24 = Math.Max(candleData1_전봉.movingAverageDataList[72].Value, candleData1_전봉.movingAverageDataList[24].Value);
var 전전봉낮은값1_74_24 = Math.Min(candleData1_전전봉.movingAverageDataList[72].Value, candleData1_전전봉.movingAverageDataList[24].Value);
var 전전봉높은값1_74_24 = Math.Max(candleData1_전전봉.movingAverageDataList[72].Value, candleData1_전전봉.movingAverageDataList[24].Value);
var 전전봉30Bol4 = candleData30_전전봉.movingAverageDataList[4].BolangerValue;
var 전전봉30Bol12 = candleData30_전전봉.movingAverageDataList[12].BolangerValue;
var 전전봉30Bol24 = candleData30_전전봉.movingAverageDataList[24].BolangerValue;
var 현재봉30Bol4 = candleData30.movingAverageDataList[4].BolangerValue;
var 현재봉30Bol12 = candleData30.movingAverageDataList[12].BolangerValue;
var 현재봉30Bol24 = candleData30.movingAverageDataList[24].BolangerValue;
var 현재봉1_12 = candleData1.movingAverageDataList[12].Value;
var 전봉1_12 = candleData1_전봉.movingAverageDataList[12].Value;
var 전전봉1_12 = candleData1_전전봉.movingAverageDataList[12].Value;
var candle30Flag = 현재봉30_4 < 낮은값30_74_24 && 현재봉30_4 < 현재봉30_12 &&
candleData30.IchimokData.상한선 > 낮은값30_74_24 &&
//candleData30.Close < candleData30.IchimokData.하한선 &&
전전봉30Bol4 > 전봉30Bol4 && 전봉30_12 < 전전봉30_12;
//전전봉30Bol12 - 전전봉30Bol24 > 전봉30Bol12 - 전봉30Bol24;
//(전봉30_4 > 전봉낮은값30_74_24 || 전전봉30_4 > 전전봉낮은값30_74_24);
var 현재봉1_4 = candleData1.movingAverageDataList[4].Value;
var 전봉1_4 = candleData1_전봉.movingAverageDataList[4].Value;
var 전전봉1_4 = candleData1_전전봉.movingAverageDataList[4].Value;
var 전봉1Bol4 = candleData1_전봉.movingAverageDataList[4].BolangerValue;
var 전봉1Bol12 = candleData1_전봉.movingAverageDataList[12].BolangerValue;
var 전봉1Bol24 = candleData1_전봉.movingAverageDataList[24].BolangerValue;
var 전전봉1Bol4 = candleData1_전전봉.movingAverageDataList[4].BolangerValue;
var 전전봉1Bol12 = candleData1_전전봉.movingAverageDataList[12].BolangerValue;
var 전전봉1Bol24 = candleData1_전전봉.movingAverageDataList[24].BolangerValue;
var 현재봉1Bol4 = candleData1.movingAverageDataList[4].BolangerValue;
var 현재봉1Bol12 = candleData1.movingAverageDataList[12].BolangerValue;
var 현재봉1Bol24 = candleData1.movingAverageDataList[24].BolangerValue;
var candle1Flag = 현재봉1_4 < 낮은값1_74_24 && 전봉1_4 > 현재봉1_4 && 전전봉1_4 > 전봉1_4 &&
candleData1.Close < candleData1.Open &&
candleData1.Close < candleData1.IchimokData.하한선 &&
현재봉1_4 < candleData1.IchimokData.하한선 &&
전봉1_4 > 현재봉1_4 &&
현재봉1_12 < 전봉1_12;// &&
//전봉1Bol12 - 전봉1Bol24 > 현재봉1Bol12 - 현재봉1Bol24;
#endregion
var buyFlag = 전전봉Bol12 - 전전봉Bol24 > 전봉Bol12 - 전봉Bol24 && 전전봉Bol4 > 전봉Bol4;
//파는 시점 볼랜저 전전봉 12 - 24 값이 전봉 12 - 24보다 클경우 팜
//var sellFlag = 전봉Bol12 - 전봉Bol24 < Bol12 - Bol24 || 현재봉4 > 낮은값_74_24;
//var sellFlag = 현재봉4 > 낮은값_74_24 || 전전봉Bol12 - 전전봉Bol24 < 전봉Bol12 - 전봉Bol24;
var sellFlag = 현재봉1_4 > 높은값1_74_24;// 현재봉4 > 낮은값_74_24 || 전봉12 < 전봉4 || (전봉4 > 전전봉4 && 전봉12 > 전전봉12) || 현재봉15_4 > 전봉15_4;// || 전봉4 - 전전봉4 > 0;// || 전전봉Bol12 - 전전봉Bol24 < 전봉Bol12 - 전봉Bol24;
//파는 시점 볼랜저 전전봉 12 - 24 값이 전봉 12 - 24보다 클경우 팜
//var buyFlag = candleData_전봉.movingAverageDataList[12].BolangerValue > candleData_전봉.movingAverageDataList[24].BolangerValue && 전전봉Bol12 - 전전봉Bol24 > 전봉Bol12 - 전봉Bol24;
////파는 시점 볼랜저 전전봉 12 - 24 값이 전봉 12 - 24보다 클경우 팜
//var sellFlag = 전전봉Bol12 - 전전봉Bol24 < 전봉Bol12 - 전봉Bol24 || 현재봉4 > 낮은값_74_24;
var 전저점Data = 전저점[market + strInterval];
double.TryParse(전저점Data["val"].ToString(), out var val);
bool.TryParse(전저점Data["flag"].ToString(), out var flag);
bool.TryParse(전저점Data["clearFlag"].ToString(), out var clearFlag);
if (!flag)
{
if (val == 0)
{
전저점Data["val"] = 전봉4;
val = 전봉4;
}
if (현재봉4 > 높은값_74_24)
{
전저점Data["flag"] = true;
전저점Data["clearFlag"] = true;
전저점Data["val"] = 0;
}
if(전봉4 > 전전봉4 && clearFlag)
{
전저점Data["clearFlag"] = false;
if(전전봉4 > val)
{
전저점Data["flag"] = false;
}
else
{
전저점Data["flag"] = true;
}
}
if(전봉4 < 전전봉4)
{
전저점Data["clearFlag"] = true;
if (val > 전봉4)
{
전저점Data["val"] = 전봉4;
if (!clearFlag)
전저점Data["clearFlag"] = true;
}
}
}
//사는 시점
if (!BuyList.ContainsKey(market + interval))
{
if ((전봉4 > 낮은값_74_24_전봉
&& 전봉4 < 높은값_74_24_전봉) &&
// 현재의 4가 74,21 보다 작고나서
(현재봉4 < 낮은값_74_24 &&
candleData.Close < candleData.IchimokData.상한선 &&
높은값_74_24 < candleData.IchimokData.상한선) &&
if (
(
전전봉4 > 낮은값_74_24_전전봉
&& 전전봉4 < 높은값_74_24_전전봉 &&
전봉4 < 낮은값_74_24_전봉 &&
전봉12 > 낮은값_74_24_전봉 &&
전봉24 < 전전봉24 &&
낮은값_74_24_전봉 < candleData_전봉.IchimokData.하한선 &&
candleData_전봉.Close < candleData_전봉.IchimokData.하한선 &&
candleData_전봉.Open > candleData_전봉.Close &&
(flag)
)
//||
//(
// 전봉4 < 전전봉4 && 전봉12 < 전전봉12 &&
// 전봉24 < 전전봉24 && 전봉72 < 전전봉72 &&
// 현재봉4 < 낮은값_74_24 && 현재봉12 > 현재봉4 &&
// candleData_전봉.Open > candleData_전봉.Close &&
// candleData.Open > candleData.Close
//)
&&
//최초조건Flag.ContainsKey(market + interval) && 최초조건Flag[market + interval] == true &&
//볼랜저 12 24중 12가 크고 전전봉 전봉 12 차이보다 전전봉 전봉 24가 작아야함(하향)
buyFlag //&&
//candle30Flag
buyFlag &&
candle15Flag &&
candle1Flag
)
{
// 없으면 생성
if (signalData == null)
{
SignalInfoData signalInfoData = new SignalInfoData();
signalInfoData.SignalStart = nowTime;
signalInfoData.MarketName = market;
signalInfoData.Description = description;
signalInfoData.Rate = rate;
signalInfoData.Price = price;
signalInfoData.IndicatorPrice = indicatorPrice;
signalInfoData.IndicatorRate = indicatorRate;
signalInfoData.MCandleTimeType = interval;
signals_SD.Add(signalInfoData);
}
var buyDic = new Dictionary<string, object>
{
{ "MarketName", market },
@@ -448,11 +581,15 @@ namespace BitgetAPI.IndicatorConditionSetup
{
판매조건Flag[market + interval] = true;
}
if (val == 0)
전저점Data["val"] = 전봉4;
전저점Data["flag"] = false;
전저점Data["clearFlag"] = false;
}
else
{
if(현재봉30_12 > 전봉30_12)
if(현재봉15_12 > 전봉15_12)
최초조건Flag[market + interval] = true;
}
}

16
BitgetApi/MainForm.cs
View File

@@ -510,15 +510,15 @@ namespace BitgetAPI
var marketList = checkedComboBoxEdit_MarketInfoList.Properties.Items.GetCheckedValues();
if (marketList.Count <=0 ) return;
if (marketList.Count > 50)
{
for(var i = 50; i < marketList.Count; i++)
{
checkedComboBoxEdit_MarketInfoList.Properties.Items[i].CheckState = CheckState.Unchecked;
}
//if (marketList.Count > 50)
//{
// for(var i = 50; i < marketList.Count; i++)
// {
// checkedComboBoxEdit_MarketInfoList.Properties.Items[i].CheckState = CheckState.Unchecked;
// }
marketList = checkedComboBoxEdit_MarketInfoList.Properties.Items.GetCheckedValues();
}
// marketList = checkedComboBoxEdit_MarketInfoList.Properties.Items.GetCheckedValues();
//}
var dic = new Dictionary<string, object>();
dic.Add("op", "subscribe");

43
BitgetApi/WebService/WebConnection.cs
View File

@@ -259,13 +259,17 @@ namespace BitgetAPI.WebService
{
using (var Response = (HttpWebResponse)webEx.Response)
{
var nCode = Response.StatusCode;
using (var reader = new StreamReader(Response.GetResponseStream()))
if (Response != null)
{
var sRespBodyData = reader.ReadToEnd();
//return (JObject.Parse(sRespBodyData));
var nCode = Response.StatusCode;
using (var reader = new StreamReader(Response.GetResponseStream()))
{
var sRespBodyData = reader.ReadToEnd();
//return (JObject.Parse(sRespBodyData));
}
}
}
}
@@ -1098,8 +1102,24 @@ namespace BitgetAPI.WebService
var max = candleDataList.Max(t => t.Argument);
lastCandleData = candleDataList.Find(t => t.Argument == max);
// 최신데이터와 비교하여 교체/등록하기
if (lastCandleData.Argument.Second != 0)
var flag = false;
if (((int)mCandleTimeType) < 60)
{
if (!(lastCandleData.Argument.Millisecond == 0 && lastCandleData.Argument.Second == 0 && lastCandleData.Argument.Minute % ((int)mCandleTimeType) == 0))
{
flag = true;
}
}
else
{
if (!(lastCandleData.Argument.Millisecond == 0 && lastCandleData.Argument.Second == 0 &&
lastCandleData.Argument.Minute == 0 && lastCandleData.Argument.Hour % (((int)mCandleTimeType) / 60) == 0))
{
flag = true;
}
}
if (flag)
{
var beforeList = candleDataList.OrderByDescending(t => t.Argument).ToList();
var beforeArg = beforeList[1].Argument;
@@ -1179,7 +1199,14 @@ namespace BitgetAPI.WebService
}
var dt = candleData.Argument;
dt = dt.AddSeconds(dt.Second * -1);
dt = dt.AddMilliseconds(dt.Millisecond * -1);
dt = dt.AddMilliseconds(dt.Millisecond * -1);
if((int)mCandleTimeType > 60)
{
dt = dt.AddMinutes(dt.Minute * -1);
}
// 새 데이터 등록
candleDataList.Add(candleData);