Skip to content

Commit

Permalink
global using
Browse files Browse the repository at this point in the history
  • Loading branch information
@Monika1313
Monika1313 committed Dec 21, 2023
1 parent 4651e5c commit 39d7716
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 93 deletions.
11 changes: 1 addition & 10 deletions Modules/Wu.CommTool.Modules.ModbusRtu/ModbusRtuModule.cs
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
using Prism.Ioc;
using Prism.Modularity;
using Prism.Regions;
using Wu.CommTool.Core;
using Wu.CommTool.Modules.ModbusRtu.Models;
using Wu.CommTool.Modules.ModbusRtu.ViewModels;
using Wu.CommTool.Modules.ModbusRtu.ViewModels.DialogViewModels;
using Wu.CommTool.Modules.ModbusRtu.ViewModels.DialogViewModels.DialogDesignViewModels;
using Wu.CommTool.Modules.ModbusRtu.Views;
using Wu.CommTool.Modules.ModbusRtu.Views.DialogViews;
using Prism.Modularity;

namespace Wu.CommTool.Modules.ModbusRtu
{
Expand Down
20 changes: 2 additions & 18 deletions Modules/Wu.CommTool.Modules.ModbusRtu/ViewModels/AutoResponseViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,4 @@
using MaterialDesignThemes.Wpf;
using Newtonsoft.Json;
using Prism.Commands;
using Prism.Ioc;
using Prism.Mvvm;
using Prism.Regions;
using Prism.Services.Dialogs;
using System;
using System.Collections.ObjectModel;
using System.IO;
using System.Windows;
using Wu.CommTool.Modules.ModbusRtu.Models;
using Wu.CommTool.Modules.ModbusRtu.Views;
using Wu.CommTool.Modules.ModbusRtu.Views.DialogViews;
using Wu.ViewModels;
using Wu.Wpf.Common;
using Wu.Wpf.Models;
using Wu.Wpf.Models;

namespace Wu.CommTool.Modules.ModbusRtu.ViewModels
{
Expand Down Expand Up @@ -94,7 +78,7 @@ public AutoResponseViewModel(IContainerProvider provider, IDialogHostService dia
/// 复制Modbus帧信息
/// </summary>
public DelegateCommand<ModbusRtuMessageData> CopyModbusRtuFrameCommand { get; private set; }

/// <summary>
/// 打开帧解析界面
/// </summary>
Expand Down
16 changes: 1 addition & 15 deletions Modules/Wu.CommTool.Modules.ModbusRtu/ViewModels/CustomFrameViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
using MaterialDesignThemes.Wpf;
using Prism.Commands;
using Prism.Ioc;
using Prism.Mvvm;
using Prism.Regions;
using Prism.Services.Dialogs;
using System;
using System.Collections.ObjectModel;
using System.Windows;
using Wu.CommTool.Modules.ModbusRtu.Models;
using Wu.CommTool.Modules.ModbusRtu.Views;
using Wu.CommTool.Modules.ModbusRtu.Views.DialogViews;
using Wu.ViewModels;
using Wu.Wpf.Common;
using Wu.Wpf.Models;
using Wu.Wpf.Models;

namespace Wu.CommTool.Modules.ModbusRtu.ViewModels
{
Expand Down
18 changes: 1 addition & 17 deletions Modules/Wu.CommTool.Modules.ModbusRtu/ViewModels/DataMonitorViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,4 @@
using MaterialDesignThemes.Wpf;
using Prism.Commands;
using Prism.Ioc;
using Prism.Mvvm;
using Prism.Regions;
using Prism.Services.Dialogs;
using System;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Threading.Tasks;
using System.Windows;
using Wu.CommTool.Modules.ModbusRtu.Models;
using Wu.CommTool.Modules.ModbusRtu.Views;
using Wu.CommTool.Modules.ModbusRtu.Views.DialogViews;
using Wu.ViewModels;
using Wu.Wpf.Common;
using Wu.Wpf.Models;
using Wu.Wpf.Models;

namespace Wu.CommTool.Modules.ModbusRtu.ViewModels
{
Expand Down
19 changes: 2 additions & 17 deletions Modules/Wu.CommTool.Modules.ModbusRtu/ViewModels/ModbusRtuViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
using MaterialDesignThemes.Wpf;
using Prism.Commands;
using Prism.Ioc;
using Prism.Mvvm;
using Prism.Regions;
using Prism.Services.Dialogs;
using System;
using System.Collections.ObjectModel;
using Wu.ViewModels;
using Wu.Wpf.Common;
using Wu.CommTool.Core;
using Wu.CommTool.Modules.ModbusRtu.Views;
using Wu.CommTool.Shared.Models;
using Wu.CommTool.Modules.ModbusRtu.Models;

namespace Wu.CommTool.Modules.ModbusRtu.ViewModels
namespace Wu.CommTool.Modules.ModbusRtu.ViewModels
{
public class ModbusRtuViewModel : NavigationViewModel, IDialogHostAware
{
Expand All @@ -26,7 +11,7 @@ public class ModbusRtuViewModel : NavigationViewModel, IDialogHostAware
#endregion

public ModbusRtuViewModel() { }
public ModbusRtuViewModel(IContainerProvider provider, IDialogHostService dialogHost,IRegionManager regionManager,ModbusRtuModel modbusRtuModel) : base(provider)
public ModbusRtuViewModel(IContainerProvider provider, IDialogHostService dialogHost, IRegionManager regionManager, ModbusRtuModel modbusRtuModel) : base(provider)
{
this.provider = provider;
this.dialogHost = dialogHost;
Expand Down
17 changes: 1 addition & 16 deletions Modules/Wu.CommTool.Modules.ModbusRtu/ViewModels/SearchDeviceViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
using MaterialDesignThemes.Wpf;
using Prism.Commands;
using Prism.Ioc;
using Prism.Mvvm;
using Prism.Regions;
using Prism.Services.Dialogs;
using System;
using System.Collections.ObjectModel;
using System.Windows;
using Wu.CommTool.Modules.ModbusRtu.Models;
using Wu.CommTool.Modules.ModbusRtu.Views;
using Wu.CommTool.Modules.ModbusRtu.Views.DialogViews;
using Wu.ViewModels;
using Wu.Wpf.Common;

namespace Wu.CommTool.Modules.ModbusRtu.ViewModels
namespace Wu.CommTool.Modules.ModbusRtu.ViewModels
{
public class SearchDeviceViewModel : NavigationViewModel, IDialogHostAware
{
Expand Down
29 changes: 29 additions & 0 deletions Modules/Wu.CommTool.Modules.ModbusRtu/globalusings.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
global using System;
global using System.Linq;
global using System.Threading.Tasks;
global using System.Collections.ObjectModel;
global using System.IO;
global using System.Windows;

global using Prism.Commands;
global using Prism.Ioc;
global using Prism.Regions;
global using Prism.Services.Dialogs;

global using MaterialDesignThemes.Wpf;
global using Newtonsoft.Json;


global using Wu.ViewModels;
global using Wu.Wpf.Common;

global using Wu.CommTool.Core;
global using Wu.CommTool.Shared.Models;
global using Wu.CommTool.Modules.ModbusRtu.Views;
global using Wu.CommTool.Modules.ModbusRtu.Models;
global using Wu.CommTool.Modules.ModbusRtu.ViewModels;
global using Wu.CommTool.Modules.ModbusRtu.ViewModels.DialogViewModels;
global using Wu.CommTool.Modules.ModbusRtu.Views.DialogViews;



0 comments on commit 39d7716

Please sign in to comment.