Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hemei
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
潘栩锋
hemei
Commits
b4df61f6
Commit
b4df61f6
authored
Mar 27, 2021
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复 BlowingDetect angle 计算出很大值
parent
a158e734
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
5 deletions
+18
-5
BlowingDetect.cs
...Y.Thick.Blowing/FLY.Thick.Blowing/Server/BlowingDetect.cs
+17
-4
thick_public
thick_public
+1
-1
No files found.
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/BlowingDetect.cs
View file @
b4df61f6
...
...
@@ -608,8 +608,10 @@ namespace FLY.Thick.Blowing.Server
{
DateTime
dt1
=
mLimitList
[
mLimitList
.
Count
-
1
].
dt_begin
;
DateTime
dt2
=
mLimitList
[
mLimitList
.
Count
-
2
].
dt_end
;
RenZiJiaPeriod
=
dt1
-
dt2
;
//只有这个是正确的!!!
if
(
dt1
>
dt2
)
{
RenZiJiaPeriod
=
dt1
-
dt2
;
//只有这个是正确的!!!
//触发修正事件!!!!!
}
TouchFilmInfoChanged
(
dt2
);
}
else
if
(
mLimitList
.
Count
==
1
)
...
...
@@ -1391,8 +1393,15 @@ namespace FLY.Thick.Blowing.Server
{
TimeSpan
ts1
=
dt
-
dtStart
;
TimeSpan
ts2
=
dtEnd
-
dtStart
;
angle
=
RAngle
*
ts1
.
Ticks
/
ts2
.
Ticks
;
if
(
ts2
.
TotalMinutes
<
1
||
ts1
.
TotalMinutes
<=
0
)
{
//异常
angle
=
0
;
}
else
{
angle
=
RAngle
*
ts1
.
Ticks
/
ts2
.
Ticks
;
}
if
(
noStart
==
0
)
{
...
...
@@ -1475,8 +1484,12 @@ namespace FLY.Thick.Blowing.Server
break
;
case
ListFindIndexResult
.
Past
:
//过去
{
if
(
mDefaultTime
>=
mLimitList
[
0
].
dt_begin
)
{
//异常?!!!!
mDefaultTime
=
mLimitList
[
0
].
dt_begin
-
RenZiJiaPeriod
;
}
dt_start
=
mDefaultTime
;
dt_end
=
mLimitList
[
0
].
dt_begin
;
no
=
(
mLimitList
[
0
].
no
==
0
)
?
1
:
0
;
rotationCnt
=
LimitIndexToRotationCnt
(-
1
);
...
...
thick_public
@
5570eba0
Subproject commit
9512dcc5dd3a842e9f8275fcf185e63f114be2a9
Subproject commit
5570eba0b4a11ab7f1e9c23f033296229733f92f
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment