合并 v3.1.0

Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/BlowingDetect.cs

@@ -1129,15 +1129,10 @@ namespace FLY.Thick.Blowing.Server
 
             //信号的状态
             bool status = !Misc.MyBase.CHECKBIT(e.IStatus, Roll_bit - 1);
-<<<<<<< HEAD
 
             DateTime dt = e.Time;//信号更新发生的时间
 
-=======
 
-            DateTime dt = e.Time;//信号更新发生的时间
-
->>>>>>> gitlab/dev-3.1
             if (status)//1->0 触发!!!
             {
                 mRollList.RAdd(
@@ -1300,27 +1295,7 @@ namespace FLY.Thick.Blowing.Server
                 int cnt = 5;
                 if (cnt > mRollList.Count)
                     cnt = mRollList.Count;
-<<<<<<< HEAD
-
-                DateTime dt2 = mRollList[mRollList.Count - cnt].dt;
-
-                DateTime dt11 = mRollList[mRollList.Count - (cnt - 1)].dt;
-
-                TimeSpan ts_last = TimeSpan.FromTicks((dt1 - dt2).Ticks / (cnt - 1));//5次的平均滤波
-                TimeSpan ts_now = TimeSpan.FromTicks((DateTime.Now - dt11).Ticks / (cnt - 1));
-                TimeSpan ts_max;
-                if (ts_now > (ts_last + ts_last))
-                {
-                    ts_max = ts_now;
-                }
-                else
-                {
-                    ts_max = ts_last;
-                }
-
-                FilmVelocity = RollPerimeter / 1000.0 / ts_max.TotalMinutes;
 
-=======
 
                 DateTime dt2 = mRollList[mRollList.Count - cnt].dt;
 
@@ -1340,7 +1315,6 @@ namespace FLY.Thick.Blowing.Server
 
                 FilmVelocity = RollPerimeter / 1000.0 / ts_max.TotalMinutes;
 
->>>>>>> gitlab/dev-3.1
                 BufTotalTime = DateTime.Now - mRollList[0].dt;
             }
         }