diff --git a/MainModule/ViewModels/AutomatedTestingViewModel.cs b/MainModule/ViewModels/AutomatedTestingViewModel.cs index ff7fa63..768be82 100644 --- a/MainModule/ViewModels/AutomatedTestingViewModel.cs +++ b/MainModule/ViewModels/AutomatedTestingViewModel.cs @@ -69,6 +69,10 @@ namespace MainModule.ViewModels string json = System.IO.File.ReadAllText(filePath); Newtonsoft.Json.JsonConvert.PopulateObject(json, _systemConfig); } + else + { + _systemConfig = new SystemConfig(); + } } //容器解析顺序不要改变!!! _scopedContext = _scope.Resolve(); diff --git a/UIShare/GlobalVariable/ConfigService.cs b/UIShare/GlobalVariable/ConfigService.cs index f8d5de2..f449dbc 100644 --- a/UIShare/GlobalVariable/ConfigService.cs +++ b/UIShare/GlobalVariable/ConfigService.cs @@ -29,52 +29,7 @@ namespace UIShare.GlobalVariable } return true; } - /// - /// 根据标题(格子标识)加载独立的配置文件 - /// - public static SystemConfig Load(string title) - { - if (string.IsNullOrEmpty(title)) - { - throw new ArgumentException("配置标题不能为空", nameof(title)); - } - - // 临时实例化一个对象以获取默认的 SystemPath - var dummy = new SystemConfig(); - string configPath = Path.Combine(dummy.SystemPath, $"{title}.json"); - - if (!File.Exists(configPath)) - { - // 如果不存在,创建一个带 Title 的默认配置并保存 - var defaultConfig = new SystemConfig { Title = title }; - EnsureDefaultCanDevice(defaultConfig); - Save(defaultConfig); - return defaultConfig; - } - - lock (_fileLock) - { - try - { - string json = File.ReadAllText(configPath); - var config = JsonConvert.DeserializeObject(json, new JsonSerializerSettings - { - TypeNameHandling = TypeNameHandling.All - }); - - config ??= new SystemConfig { Title = title }; - EnsureDefaultCanDevice(config); - return config; - } - catch (Exception ex) - { - LoggerHelper.ErrorWithNotify(title, $"格子 [{title}] 配置加载失败: {ex.Message}"); - var fallback = new SystemConfig { Title = title }; - EnsureDefaultCanDevice(fallback); - return fallback; - } - } - } + /// /// 保存指定的配置实例