Merge branch 'master' of http://git.jetplasma-oa.com/Jet/EEMS

EEMSUIClient/ViewModels/MainWindowViewModel.cs

@@ -18,7 +18,6 @@ public partial class MainWindowViewModel : ObservableObject
     private readonly string _settingsFolder = $"{Environment.CurrentDirectory}/Settings";
     private readonly string _ipAddressFileName = "IpAddressInformation.json";
     private readonly string _deviceInfoFileName = "DeviceInformation.json";
-    private bool _isInitialized = false;
 
     [ObservableProperty]
     private string _ipAddress = string.Empty;
@@ -152,13 +151,14 @@ public partial class MainWindowViewModel : ObservableObject
         try
         {
             _ = Enum.TryParse<DeviceModel>(DeviceModel, out var deviceModel);
+            var rst=Guid.TryParse(GuidStr, out var guidRst);
             var deviceInfo = new Models.DeviceInfo
             {
                 DeviceModel = deviceModel,
                 DeviceSubModel = DeviceSubModel,
                 DeviceName = DeviceName,
                 Position = Position,
-                Guid = _isInitialized ? Guid.Parse(GuidStr) : null,
+                Guid = rst ? guidRst : null,
                 SoftwareVersion = SoftwareVersion,
                 DBConnectionString = DBConnectionString
             };
@@ -217,8 +217,6 @@ public partial class MainWindowViewModel : ObservableObject
                 SoftwareVersion = deserializedDeviceInfo.SoftwareVersion ?? string.Empty;
                 GuidStr = deserializedDeviceInfo.Guid.ToString() ?? string.Empty;
                 DBConnectionString = deserializedDeviceInfo.DBConnectionString ?? string.Empty;
-
-                _isInitialized = true;
             }
         }
     }