更新冲突

BPASmartClient.Helper/Json.cs

@@ -27,8 +27,8 @@ namespace BPASmartClient.Helper
         {
             get
             {
-                Directory.CreateDirectory(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"{LocaPath.GetInstance().FilePath}\\JSON"));
-                return $"{AppDomain.CurrentDomain.BaseDirectory}{LocaPath.GetInstance().FilePath}JSON\\{typeof(T).Name}.json";
+                Directory.CreateDirectory(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"JSON"));
+                return $"{AppDomain.CurrentDomain.BaseDirectory}JSON\\{typeof(T).Name}.json";
             }
         }
 

BPASmartClient.ViewModel/LogViewModel.cs

@@ -46,14 +46,14 @@ namespace BPASmartClient.ViewModel
                 LogDataGrid = new ObservableCollection<LogModel>();
             MessageLog.GetInstance.InfoNotify = new Action<string>((s) =>
             {
-                System.Windows.Application.Current.Dispatcher.Invoke((Action)(() =>
+                System.Windows.Application.Current?.Dispatcher.Invoke((Action)(() =>
                 {
                     LogDataGrid.Insert(0,new LogModel { message = s,type = "Info" });
                 }));
             });
             MessageLog.GetInstance.ExInfoNotify = new Action<string>((s) =>
             {
-                System.Windows.Application.Current.Dispatcher.Invoke((Action)(() =>
+                System.Windows.Application.Current?.Dispatcher.Invoke((Action)(() =>
                 {
                     LogDataGrid.Insert(0,new LogModel { message = s,type = "Error" });
                 }));

BPASmartClient/DeviceInfo.xml

@@ -20,10 +20,10 @@
   </Device>-->
 
   <Device Name="MorkS" Module="BPASmartClient.MorkS.Control" DeviceId="2">
-	  <Parameters>
+	  <!--<Parameters>
 		  <IpAddress>127.0.10.1</IpAddress>
 		  <Port>11</Port>
-	  </Parameters>
+	  </Parameters>-->
     <Peripherals>
       <Peripheral Module="BPASmartClient.PLC.MorksMachine">
         <Parameters>