diff --git a/Aucma.Core.PrintTo/App.xaml.cs b/Aucma.Core.PrintTo/App.xaml.cs index 58a1f7b1..272ff14b 100644 --- a/Aucma.Core.PrintTo/App.xaml.cs +++ b/Aucma.Core.PrintTo/App.xaml.cs @@ -9,6 +9,7 @@ using Microsoft.Extensions.Logging; using Autofac.Extensions.DependencyInjection; using Microsoft.AspNetCore.Hosting; using Admin.Core.Common; +using System.Threading; namespace Aucma.Core.PrintTo { @@ -25,6 +26,7 @@ namespace Aucma.Core.PrintTo var host = CreateHostBuilder(e.Args).Build();//生成宿主。 ServiceProvider = host.Services; + host.Services.GetRequiredService()?.Show(); await host.StartAsync(); } diff --git a/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs b/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs index d96f407f..3a8f660e 100644 --- a/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs @@ -28,11 +28,11 @@ namespace Aucma.Core.PrintTo.ViewModels UserContent = firstPage; _sysUserInfoServices = App.ServiceProvider.GetService(); - Task.Run(async () => - { - await RefreshTeamTime();//班组时间 - }); - + //Task.Run(async () => + //{ + // await RefreshTeamTime();//班组时间 + //}); + InitUserInfo(); DispatcherTimer timer = new DispatcherTimer(); timer.Interval = new TimeSpan(0, 0, 1); //间隔1秒 timer.Tick += new EventHandler(timer_Tick); @@ -204,21 +204,26 @@ namespace Aucma.Core.PrintTo.ViewModels } #endregion - #region 切换班组 - public async Task RefreshTeamTime() + + private void InitUserInfo() { - while (true) - { - var list = await _sysUserInfoServices.GetTeamData(); - if (list != null && list.Count > 0) - { - var sysUserInfo = list.First(); - TeamName = $"{appConfig.TeamName}({list.Min(d => d.StartTime).ToString("HH:mm")}~{list.Max(d => d.EndTime).ToString("HH:mm")})"; - //TeamName = $"{sysUserInfo.TeamName}"; - } - Thread.Sleep(5000); - } - } + TeamName = $"班组:{appConfig.TeamName} 用户:{appConfig.Account}"; + } + #region 切换班组 + //public async Task RefreshTeamTime() + //{ + // while (true) + // { + // var list = await _sysUserInfoServices.GetTeamData(); + // if (list != null && list.Count > 0) + // { + // var sysUserInfo = list.First(); + // TeamName = $"{appConfig.TeamName}({list.Min(d => d.StartTime).ToString("HH:mm")}~{list.Max(d => d.EndTime).ToString("HH:mm")})"; + // //TeamName = $"{sysUserInfo.TeamName}"; + // } + // Thread.Sleep(5000); + // } + //} #endregion #region 定时刷新时间 diff --git a/Aucma.Core.PrintTo/Views/MainWindow.xaml b/Aucma.Core.PrintTo/Views/MainWindow.xaml index d5ab1ec1..1f003dd5 100644 --- a/Aucma.Core.PrintTo/Views/MainWindow.xaml +++ b/Aucma.Core.PrintTo/Views/MainWindow.xaml @@ -35,7 +35,7 @@ - + @@ -49,8 +49,8 @@ - - + + diff --git a/Aucma.Core.PrintTo/Views/MainWindow.xaml.cs b/Aucma.Core.PrintTo/Views/MainWindow.xaml.cs index da3e28f0..d8e26bdb 100644 --- a/Aucma.Core.PrintTo/Views/MainWindow.xaml.cs +++ b/Aucma.Core.PrintTo/Views/MainWindow.xaml.cs @@ -32,7 +32,7 @@ namespace Aucma.Core.PrintTo.Views } else { - this.Account.Text = appConfig.Account; + // this.Account.Text = appConfig.Account; //this.Team.Text = appConfig.TeamName; return true; }