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

Merge branch 'feature/V1.1' of http://222.96.13.116/Million into feature/V1.1

Browse Source
This commit is contained in:
jwlee
2023-05-17 00:02:42 +09:00
parent 3749475412 3f000635f5
commit 365aad2cc4
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Million/CommonProperty.cs
View File

@@ -154,7 +154,7 @@ namespace Million
H6 = 360,
H8 = 480,
H12 = 720,
D1 = 1000,
D1 = 1440,
W1 = 10000,
MT1 = 100000
}

32
Million/Manager/DataManager.cs
View File

@@ -242,6 +242,11 @@ namespace Million.Manager
timeFlag = "hour";
timeFlagValue = ((int) mCandleTimeType) / 60;
}
else if(mCandleTimeType < MCandleTimeType.W1)
{
timeFlag = "day";
timeFlagValue = 1;
}
var firstFlag = true;
@@ -267,6 +272,11 @@ namespace Million.Manager
flag = true;
}
}
else if(timeFlag == "day")
{
if (recentlyData.DateTime.Day != item.DateTime.Day)
flag = true;
}
}
if (firstFlag)
@@ -315,6 +325,11 @@ namespace Million.Manager
timeFlag = "hour";
timeFlagValue = ((int)mCandleTimeType) / 60;
}
else if(mCandleTimeType < MCandleTimeType.W1)
{
timeFlag = "day";
timeFlagValue = 1;
}
var flag = false;
@@ -336,6 +351,11 @@ namespace Million.Manager
flag = true;
}
}
else if(timeFlag == "day")
{
if (recentlyData.DateTime.Day != candleData.DateTime.Day)
flag = true;
}
}
//새로 생성
if (flag)
@@ -352,13 +372,21 @@ namespace Million.Manager
if (timeFlag == "minute")
{
var date = recentlyData.DateTime.AddMinutes((int)mCandleTimeType);
var date = recentlyData.DateTime.AddMinutes((int)mCandleTimeType);
date = date.AddSeconds(-1 * date.Second);
candle.DateTime = date;
}
else if (timeFlag == "hour")
{
var date = recentlyData.DateTime.AddHours((int)mCandleTimeType/60);
var date = recentlyData.DateTime.AddHours((int)mCandleTimeType / 60);
date = date.AddMinutes(-1 * date.Minute);
date = date.AddSeconds(-1 * date.Second);
candle.DateTime = date;
}
else if (timeFlag == "day")
{
var date = recentlyData.DateTime.AddDays(1);
date = date.AddHours(-1 * date.Hour);
date = date.AddMinutes(-1 * date.Minute);
date = date.AddSeconds(-1 * date.Second);
candle.DateTime = date;