Commit 8c24e2dc authored by 潘栩锋's avatar 潘栩锋 🚴

修复 厚度纵向趋势图,IBC控制图,称重流量图,单组份称重流量图 这4个带有自动显示最新数据 倒计时的,当先开客户端, 服务器后打开,会导致,倒计时=0, 但没有向服务器获取最新数据

parent d932d1ef
...@@ -172,8 +172,25 @@ namespace FLY.IBC.UI.Client.UiModule ...@@ -172,8 +172,25 @@ namespace FLY.IBC.UI.Client.UiModule
//当不是最新数据时,10秒内无操作,自动按 [最新] //当不是最新数据时,10秒内无操作,自动按 [最新]
timer = new DispatcherTimer(); timer = new DispatcherTimer();
timer.Interval = TimeSpan.FromSeconds(1); timer.Interval = TimeSpan.FromSeconds(1);
timer.Tick += Timer_Tick; timer.Tick += (s, e) =>
timer.Start(); {
if (IsNewest)
return;
if (AutoKeepNewestTimeRemaining > 0)
AutoKeepNewestTimeRemaining--;
if (AutoKeepNewestTimeRemaining <= 0)
{
ToNewest();
}
};
this.PropertyChanged += (s, e) =>
{
if (e.PropertyName == nameof(IsNewest))
{
timer.IsEnabled = !IsNewest;
}
};
} }
private void BulkDb_PropertyChanged(object sender, PropertyChangedEventArgs e) private void BulkDb_PropertyChanged(object sender, PropertyChangedEventArgs e)
...@@ -223,17 +240,7 @@ namespace FLY.IBC.UI.Client.UiModule ...@@ -223,17 +240,7 @@ namespace FLY.IBC.UI.Client.UiModule
} }
} }
private void Timer_Tick(object sender, EventArgs e)
{
if (!IsNewest && AutoKeepNewestTimeRemaining > 0)
{
AutoKeepNewestTimeRemaining--;
if (AutoKeepNewestTimeRemaining == 0)
{
ToNewest();
}
}
}
void UpdateY() void UpdateY()
{ {
......
...@@ -216,19 +216,24 @@ namespace FLY.Thick.Blowing.UI.Fix.Client.UiModule ...@@ -216,19 +216,24 @@ namespace FLY.Thick.Blowing.UI.Fix.Client.UiModule
timer = new DispatcherTimer(); timer = new DispatcherTimer();
timer.Interval = TimeSpan.FromSeconds(1); timer.Interval = TimeSpan.FromSeconds(1);
timer.Tick += Timer_Tick; timer.Tick += (s, e) =>
timer.Start();
}
private void Timer_Tick(object sender, EventArgs e)
{
if (!IsNewest && AutoKeepNewestTimeRemaining > 0)
{ {
AutoKeepNewestTimeRemaining--; if (IsNewest)
if (AutoKeepNewestTimeRemaining == 0) { return;
if (AutoKeepNewestTimeRemaining > 0)
AutoKeepNewestTimeRemaining--;
if (AutoKeepNewestTimeRemaining <= 0)
{
ToNewest(); ToNewest();
} }
} };
this.PropertyChanged += (s, e) =>
{
if (e.PropertyName == nameof(IsNewest)) {
timer.IsEnabled = !IsNewest;
}
};
} }
private void ProfileParam_PropertyChanged(object sender, PropertyChangedEventArgs e) private void ProfileParam_PropertyChanged(object sender, PropertyChangedEventArgs e)
......
...@@ -246,8 +246,25 @@ namespace FLY.Weight.UI.Client.UiModule ...@@ -246,8 +246,25 @@ namespace FLY.Weight.UI.Client.UiModule
timer = new DispatcherTimer(); timer = new DispatcherTimer();
timer.Interval = TimeSpan.FromSeconds(1); timer.Interval = TimeSpan.FromSeconds(1);
timer.Tick += Timer_Tick; timer.Tick += (s, e) =>
timer.Start(); {
if (IsNewest)
return;
if (AutoKeepNewestTimeRemaining > 0)
AutoKeepNewestTimeRemaining--;
if (AutoKeepNewestTimeRemaining <= 0)
{
ToNewest();
}
};
this.PropertyChanged += (s, e) =>
{
if (e.PropertyName == nameof(IsNewest))
{
timer.IsEnabled = !IsNewest;
}
};
} }
private void BulkDb_PropertyChanged(object sender, PropertyChangedEventArgs e) private void BulkDb_PropertyChanged(object sender, PropertyChangedEventArgs e)
...@@ -290,17 +307,6 @@ namespace FLY.Weight.UI.Client.UiModule ...@@ -290,17 +307,6 @@ namespace FLY.Weight.UI.Client.UiModule
UpdateY(); UpdateY();
} }
private void Timer_Tick(object sender, EventArgs e)
{
if (!IsNewest && AutoKeepNewestTimeRemaining > 0)
{
AutoKeepNewestTimeRemaining--;
if (AutoKeepNewestTimeRemaining == 0)
{
ToNewest();
}
}
}
void BindingSeries() void BindingSeries()
......
...@@ -244,8 +244,25 @@ namespace FLY.Weight2.UI.Client.UiModule ...@@ -244,8 +244,25 @@ namespace FLY.Weight2.UI.Client.UiModule
timer = new DispatcherTimer(); timer = new DispatcherTimer();
timer.Interval = TimeSpan.FromSeconds(1); timer.Interval = TimeSpan.FromSeconds(1);
timer.Tick += Timer_Tick; timer.Tick += (s, e) =>
timer.Start(); {
if (IsNewest)
return;
if (AutoKeepNewestTimeRemaining > 0)
AutoKeepNewestTimeRemaining--;
if (AutoKeepNewestTimeRemaining <= 0)
{
ToNewest();
}
};
this.PropertyChanged += (s, e) =>
{
if (e.PropertyName == nameof(IsNewest))
{
timer.IsEnabled = !IsNewest;
}
};
} }
private void BulkDb_PropertyChanged(object sender, PropertyChangedEventArgs e) private void BulkDb_PropertyChanged(object sender, PropertyChangedEventArgs e)
...@@ -288,17 +305,7 @@ namespace FLY.Weight2.UI.Client.UiModule ...@@ -288,17 +305,7 @@ namespace FLY.Weight2.UI.Client.UiModule
UpdateY(); UpdateY();
} }
private void Timer_Tick(object sender, EventArgs e)
{
if (!IsNewest && AutoKeepNewestTimeRemaining > 0)
{
AutoKeepNewestTimeRemaining--;
if (AutoKeepNewestTimeRemaining == 0)
{
ToNewest();
}
}
}
void BindingSeries() void BindingSeries()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment