diff --git a/DM_Weight/Port/ModbusHelper.cs b/DM_Weight/Port/ModbusHelper.cs index 4b572a1..b058017 100644 --- a/DM_Weight/Port/ModbusHelper.cs +++ b/DM_Weight/Port/ModbusHelper.cs @@ -23,7 +23,7 @@ namespace DM_Weight.Port private Socket socket; private TcpClient client; private static ModbusHelper instance; - private static readonly object objLock = new object(); + //private static readonly object objLock = new object(); private readonly ILog logger = LogManager.GetLogger(typeof(CheckOrderNewWindowViewModel)); private ModbusHelper() { @@ -45,13 +45,8 @@ namespace DM_Weight.Port //} if (instance == null) { - lock (objLock) - { - if (instance == null) - instance = new ModbusHelper(); - } + instance = new ModbusHelper(); } - return instance; } private void SetModusIpMaster() diff --git a/DM_Weight/ViewModels/HomeWindowViewModel.cs b/DM_Weight/ViewModels/HomeWindowViewModel.cs index 6d9ef39..1b32a0d 100644 --- a/DM_Weight/ViewModels/HomeWindowViewModel.cs +++ b/DM_Weight/ViewModels/HomeWindowViewModel.cs @@ -287,7 +287,7 @@ namespace DM_Weight.ViewModels //} if (SelectedMenu != null && SelectedMenu.PremissionName == "退出") { - bool[] boolArrs = {false,false };//ModbusHelper.GetInstance().GetAllBoxState(); + bool[] boolArrs = ModbusHelper.GetInstance().GetAllBoxState(); bool allTrue = Array.TrueForAll(boolArrs, b => b); //false是关着,true是开着 if (!allTrue)