From 025d0b8d289639d54ab3426983ee89623ea5e0e2 Mon Sep 17 00:00:00 2001 From: zby <24947@USER> Date: Sun, 22 Sep 2024 14:25:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9rfid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Service/Execute/Api/RfidApi.cs | 5 +- Service/Execute/Step/StationReadyState.cs | 8 +- .../Plc/Handler/SummaryFailuresReqHandler.cs | 398 +++++++++--------- WebStarter/appsettings.prod.json | 2 +- .../Release/net6.0/WebStarter.AssemblyInfo.cs | 2 +- .../WebStarter.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../Release/net6.0/WebStarter.assets.cache | Bin 156850 -> 156850 bytes WinFormStarter/WinFormStarter.csproj | 4 +- WinFormStarter/WinFormStarter.csproj.user | 3 + .../WinFormStarter.AssemblyInfo.cs | 2 +- .../WinFormStarter.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../WinFormStarter.assets.cache | Bin 151785 -> 151785 bytes 14 files changed, 217 insertions(+), 217 deletions(-) diff --git a/Service/Execute/Api/RfidApi.cs b/Service/Execute/Api/RfidApi.cs index 1669c0a..4c37a81 100644 --- a/Service/Execute/Api/RfidApi.cs +++ b/Service/Execute/Api/RfidApi.cs @@ -100,15 +100,14 @@ public class RfidApi public static async Task ReadRfid() { - Log.Info("RfidApi ReadRfid"); - string readUrl = BASE_URL + "/Api/BeginRead"; + string readUrl = BASE_URL + "/Api/BeginRead"; string url = BASE_URL + "/Api/ReadRfidData"; Log.Info($"url={url}"); try { - var vBeginRead = await _httpClient.GetStringAsync(readUrl); + var vBeginRead = await _httpClient.GetStringAsync(readUrl); string s = await _httpClient.GetStringAsync(url); Log.Info($"ReadRfid resp={s}"); if (s != String.Empty) diff --git a/Service/Execute/Step/StationReadyState.cs b/Service/Execute/Step/StationReadyState.cs index 2ae9286..a388629 100644 --- a/Service/Execute/Step/StationReadyState.cs +++ b/Service/Execute/Step/StationReadyState.cs @@ -79,6 +79,7 @@ public class StationReadyState : IState _CommonMgr.InsertStep(InfoEnum.BusinessSwappingStep.Plc, machine); + //手动模式 if (StaticStationInfo.VehicleManually == 1) { @@ -106,7 +107,6 @@ public class StationReadyState : IState } } - return new StateResult() { SwappingState = SwappingState.CarPrepare, @@ -252,7 +252,7 @@ public class StationReadyState : IState return Invoker.Invoke(" BeginRead read rfid", 1000, 20, machine.IsCanceled, () => machine.BeginRfidReadFlag, () => { - Task open = RfidApi.Connect(); + // Task open = RfidApi.Connect(); Task beginRead = RfidApi.BeginRead(); beginRead.Wait(); if (!beginRead.Result) @@ -269,7 +269,7 @@ public class StationReadyState : IState { machine.LedTool.WriteProgramContent(InfoEnum.SwapInfo.ErrorReadRfid.GetLed()); SoundClient = AppInfo.Container.Resolve(); - + }, false, () => { machine.ExceptionReason = ExceptionReason.ReadRfidError; } , 3, InvokeStatus.None); } @@ -330,7 +330,7 @@ public class StationReadyState : IState //新增小步 _CommonMgr.InsertStep(InfoEnum.BusinessSwappingStep.RfidReadFlag, machine); - + //RfidApi.StopRead(); _log.Info("stop read rfid"); // RfidApi.DisConnect(); diff --git a/Service/Plc/Handler/SummaryFailuresReqHandler.cs b/Service/Plc/Handler/SummaryFailuresReqHandler.cs index 11aa3de..c45276d 100644 --- a/Service/Plc/Handler/SummaryFailuresReqHandler.cs +++ b/Service/Plc/Handler/SummaryFailuresReqHandler.cs @@ -41,7 +41,7 @@ public class SummaryFailuresReqHandler : SimpleChannelInboundHandler lstEquipAlarmDefine = new List(); - + void Alarm(string number) { @@ -74,211 +74,211 @@ public class SummaryFailuresReqHandler : SimpleChannelInboundHandler i.EquipCode == "plc"); - List lstAlarm = new List(); + //lstEquipAlarmDefine = EquipAlarmDefineRepository.QueryListByClause(i => i.EquipCode == "plc"); + //List lstAlarm = new List(); - if (msg.ScreenEmergencyStop) - Alarm("1"); - if (msg.PassageEmergencyStop) - Alarm("2"); - if (msg.RobotEmergencyStop) - Alarm("3"); - if (msg.FaultyRelays) - Alarm("4"); - if (msg.TelecommFailures) - Alarm("5"); - if (msg.MasterFailures) - Alarm("6"); - if (msg.TitleFailures) - Alarm("7"); - if (msg.TitleXFailures) - Alarm("8"); - if (msg.TitleYFailures) - Alarm("9"); - if (msg.TitleZFailures) - Alarm("10"); - if (msg.TitleMFailures) - Alarm("11"); - if (msg.WireBroken0) - Alarm("12"); - if (msg.WireBroken1) - Alarm("13"); - if (msg.WireBroken2) - Alarm("14"); - if (msg.WireBroken3) - Alarm("15"); - if (msg.XPositiveLimit) - Alarm("16"); - if (msg.XNegativeLimit) - Alarm("17"); - if (msg.YPositiveLimit) - Alarm("18"); - if (msg.YNegativeLimit) - Alarm("19"); - if (msg.ZPositiveLimit) - Alarm("20"); - if (msg.ZNegativeLimit) - Alarm("21"); - if (msg.MPositiveLimit) - Alarm("22"); - if (msg.MNegativeLimit) - Alarm("23"); - if (msg.XDriveFailure) - Alarm("24"); - if (msg.YDriveFailure) - Alarm("25"); - if (msg.ZDriveFailure) - Alarm("26"); - if (msg.MDriveFailure) - Alarm("27"); - if (msg.DoorLeft) - Alarm("28"); - if (msg.DoorcloseLeft) - Alarm("29"); - if (msg.DoorRight) - Alarm("30"); - if (msg.DoorcloseRight) - Alarm("31"); - if (msg.DoorRepaiDhambers) - Alarm("32"); - if (msg.DoorcloseRepairChambers) - Alarm("33"); - if (msg.DoorRepaiCabinet) - Alarm("34"); - if (msg.DoorRowFrames) - Alarm("35"); - if (msg.X1RetractionFailure) - Alarm("36"); - if (msg.X1StickingFault) - Alarm("37"); - if (msg.X2RetractionFailure) - Alarm("38"); - if (msg.X2StickingFault) - Alarm("39"); - if (msg.LocalBattIncorrect) - Alarm("40"); - if (msg.NoLocalBattery) - Alarm("41"); - if (msg.LocalStorageBatteries) - Alarm("42"); - if (msg.RemoteBattIncorrect) - Alarm("43"); - if (msg.RemoteBattery) - Alarm("44"); - if (msg.RemoteStorageBatteries) - Alarm("45"); - if (msg.RemoteMoveLibraryBattery) - Alarm("46"); - if (msg.RemoteLibraryBatteries) - Alarm("47"); - if (msg.RemoteAreBatteries) - Alarm("48"); - if (msg.RemoteMoveElectLibrary) - Alarm("49"); - if (msg.RemoteelectrLibrary) - Alarm("50"); - if (msg.RemoteelectrAreBatteries) - Alarm("51"); - if (msg.RemoteStorageLibrary) - Alarm("52"); - if (msg.RemotStorageAreBatteries) - Alarm("53"); - if (msg.RemoteOutboundLibrary) - Alarm("54"); - if (msg.RemotOutboundAreBatteries) - Alarm("55"); - if (msg.RemoteBackupLibrary) - Alarm("56"); - if (msg.RemotBackupAreBatteries) - Alarm("57"); - if (msg.BatteryCompartAbnormal01) - Alarm("58"); - if (msg.BatteryCompartAbnormal02) - Alarm("59"); - if (msg.BatteryCompartAbnormal03) - Alarm("60"); - if (msg.BatteryCompartAbnormal04) - Alarm("61"); - if (msg.BatteryCompartAbnormal05) - Alarm("62"); - if (msg.BatteryCompartAbnormal06) - Alarm("63"); - if (msg.BatteryCompartAbnormal07) - Alarm("64"); - if (msg.BatteryCompartAbnormal08) - Alarm("65"); - if (msg.BatteryCompartAbnormal09) - Alarm("66"); - if (msg.BatteryWasDetectCompartment) - Alarm("67"); - if (msg.RepairWasDetectCompartment) - Alarm("68"); - if (msg.WasDetectCompartment214) - Alarm("69"); - if (msg.ZSpreaderForceSensor) - Alarm("70"); - if (msg.YZSafetyBitAlarm) - Alarm("71"); - if (msg.YZSafetyWarehouseBitAlarm) - Alarm("72"); + //if (msg.ScreenEmergencyStop) + // Alarm("1"); + //if (msg.PassageEmergencyStop) + // Alarm("2"); + //if (msg.RobotEmergencyStop) + // Alarm("3"); + //if (msg.FaultyRelays) + // Alarm("4"); + //if (msg.TelecommFailures) + // Alarm("5"); + //if (msg.MasterFailures) + // Alarm("6"); + //if (msg.TitleFailures) + // Alarm("7"); + //if (msg.TitleXFailures) + // Alarm("8"); + //if (msg.TitleYFailures) + // Alarm("9"); + //if (msg.TitleZFailures) + // Alarm("10"); + //if (msg.TitleMFailures) + // Alarm("11"); + //if (msg.WireBroken0) + // Alarm("12"); + //if (msg.WireBroken1) + // Alarm("13"); + //if (msg.WireBroken2) + // Alarm("14"); + //if (msg.WireBroken3) + // Alarm("15"); + //if (msg.XPositiveLimit) + // Alarm("16"); + //if (msg.XNegativeLimit) + // Alarm("17"); + //if (msg.YPositiveLimit) + // Alarm("18"); + //if (msg.YNegativeLimit) + // Alarm("19"); + //if (msg.ZPositiveLimit) + // Alarm("20"); + //if (msg.ZNegativeLimit) + // Alarm("21"); + //if (msg.MPositiveLimit) + // Alarm("22"); + //if (msg.MNegativeLimit) + // Alarm("23"); + //if (msg.XDriveFailure) + // Alarm("24"); + //if (msg.YDriveFailure) + // Alarm("25"); + //if (msg.ZDriveFailure) + // Alarm("26"); + //if (msg.MDriveFailure) + // Alarm("27"); + //if (msg.DoorLeft) + // Alarm("28"); + //if (msg.DoorcloseLeft) + // Alarm("29"); + //if (msg.DoorRight) + // Alarm("30"); + //if (msg.DoorcloseRight) + // Alarm("31"); + //if (msg.DoorRepaiDhambers) + // Alarm("32"); + //if (msg.DoorcloseRepairChambers) + // Alarm("33"); + //if (msg.DoorRepaiCabinet) + // Alarm("34"); + //if (msg.DoorRowFrames) + // Alarm("35"); + //if (msg.X1RetractionFailure) + // Alarm("36"); + //if (msg.X1StickingFault) + // Alarm("37"); + //if (msg.X2RetractionFailure) + // Alarm("38"); + //if (msg.X2StickingFault) + // Alarm("39"); + //if (msg.LocalBattIncorrect) + // Alarm("40"); + //if (msg.NoLocalBattery) + // Alarm("41"); + //if (msg.LocalStorageBatteries) + // Alarm("42"); + //if (msg.RemoteBattIncorrect) + // Alarm("43"); + //if (msg.RemoteBattery) + // Alarm("44"); + //if (msg.RemoteStorageBatteries) + // Alarm("45"); + //if (msg.RemoteMoveLibraryBattery) + // Alarm("46"); + //if (msg.RemoteLibraryBatteries) + // Alarm("47"); + //if (msg.RemoteAreBatteries) + // Alarm("48"); + //if (msg.RemoteMoveElectLibrary) + // Alarm("49"); + //if (msg.RemoteelectrLibrary) + // Alarm("50"); + //if (msg.RemoteelectrAreBatteries) + // Alarm("51"); + //if (msg.RemoteStorageLibrary) + // Alarm("52"); + //if (msg.RemotStorageAreBatteries) + // Alarm("53"); + //if (msg.RemoteOutboundLibrary) + // Alarm("54"); + //if (msg.RemotOutboundAreBatteries) + // Alarm("55"); + //if (msg.RemoteBackupLibrary) + // Alarm("56"); + //if (msg.RemotBackupAreBatteries) + // Alarm("57"); + //if (msg.BatteryCompartAbnormal01) + // Alarm("58"); + //if (msg.BatteryCompartAbnormal02) + // Alarm("59"); + //if (msg.BatteryCompartAbnormal03) + // Alarm("60"); + //if (msg.BatteryCompartAbnormal04) + // Alarm("61"); + //if (msg.BatteryCompartAbnormal05) + // Alarm("62"); + //if (msg.BatteryCompartAbnormal06) + // Alarm("63"); + //if (msg.BatteryCompartAbnormal07) + // Alarm("64"); + //if (msg.BatteryCompartAbnormal08) + // Alarm("65"); + //if (msg.BatteryCompartAbnormal09) + // Alarm("66"); + //if (msg.BatteryWasDetectCompartment) + // Alarm("67"); + //if (msg.RepairWasDetectCompartment) + // Alarm("68"); + //if (msg.WasDetectCompartment214) + // Alarm("69"); + //if (msg.ZSpreaderForceSensor) + // Alarm("70"); + //if (msg.YZSafetyBitAlarm) + // Alarm("71"); + //if (msg.YZSafetyWarehouseBitAlarm) + // Alarm("72"); - //查询当前PLC的实时报警信息 - var lstNowEquipAlarmRecord = EquipAlarmRecordRepository.QueryListByClause(i => i.EquipCode == "plc"); - var sqllstAlarm = lstNowEquipAlarmRecord.Select(obj => obj.ErrorCode).ToList(); //当前报警列表 + ////查询当前PLC的实时报警信息 + //var lstNowEquipAlarmRecord = EquipAlarmRecordRepository.QueryListByClause(i => i.EquipCode == "plc"); + //var sqllstAlarm = lstNowEquipAlarmRecord.Select(obj => obj.ErrorCode).ToList(); //当前报警列表 - // 找出实时报警中存在但数据库中不存在的元素 - List uniqueToList1 = lstAlarm.Except(sqllstAlarm).ToList(); + //// 找出实时报警中存在但数据库中不存在的元素 + //List uniqueToList1 = lstAlarm.Except(sqllstAlarm).ToList(); - // 找出数据库中存在但实时报警中不存在的元素 - List uniqueToList2 = sqllstAlarm.Except(lstAlarm).ToList(); - if (uniqueToList1.Count > 0) - { - //这里要添加新的报警数据 - foreach (var errorCode in uniqueToList1) - { - EquipAlarmDefine? alarmDefine = - EquipAlarmDefineRepository.QueryByClause(i => i.ErrorCode == errorCode); - if (alarmDefine != null) - { - EquipAlarmRecord record = new EquipAlarmRecord() - { - EquipTypeCode = alarmDefine.EquipTypeCode, - EquipCode = "plc", - ErrorCode = errorCode, - ErrorLevel = alarmDefine.ErrorLevel, - ErrorMsg = alarmDefine.ErrorMsg, - ProcessMethod = alarmDefine.ProcessMethod, - StartTime = DateTime.Now - }; - EquipAlarmRecordRepository.Insert(record); - } - } - } - else if (uniqueToList2.Count > 0) - { - //这些是要清除实时报警，并且处理记录的。 - // 使用LINQ找出ErrorCode在uniqueToList2中的EquipAlarmRecord对象 - List filteredObjectList = lstNowEquipAlarmRecord - .Where(obj => uniqueToList2.Contains(obj.ErrorCode)) - .ToList(); - foreach (var VARIABLE in filteredObjectList) - { - EquipAlarmProcessRecord EquipAlarmProcessRecord = new EquipAlarmProcessRecord(); - EquipAlarmProcessRecord.EquipTypeCode = VARIABLE.EquipTypeCode; - EquipAlarmProcessRecord.EquipCode = VARIABLE.EquipCode; - EquipAlarmProcessRecord.ErrorCode = VARIABLE.ErrorCode; - EquipAlarmProcessRecord.ErrorLevel = VARIABLE.ErrorLevel; - EquipAlarmProcessRecord.ErrorMsg = VARIABLE.ErrorMsg; - EquipAlarmProcessRecord.ProcessMethod = VARIABLE.ProcessMethod; - EquipAlarmProcessRecord.StartTime = VARIABLE.StartTime; - EquipAlarmProcessRecord.ProcessTime = DateTime.Now; + //// 找出数据库中存在但实时报警中不存在的元素 + //List uniqueToList2 = sqllstAlarm.Except(lstAlarm).ToList(); + //if (uniqueToList1.Count > 0) + //{ + // //这里要添加新的报警数据 + // foreach (var errorCode in uniqueToList1) + // { + // EquipAlarmDefine? alarmDefine = + // EquipAlarmDefineRepository.QueryByClause(i => i.ErrorCode == errorCode); + // if (alarmDefine != null) + // { + // EquipAlarmRecord record = new EquipAlarmRecord() + // { + // EquipTypeCode = alarmDefine.EquipTypeCode, + // EquipCode = "plc", + // ErrorCode = errorCode, + // ErrorLevel = alarmDefine.ErrorLevel, + // ErrorMsg = alarmDefine.ErrorMsg, + // ProcessMethod = alarmDefine.ProcessMethod, + // StartTime = DateTime.Now + // }; + // EquipAlarmRecordRepository.Insert(record); + // } + // } + //} + //else if (uniqueToList2.Count > 0) + //{ + // //这些是要清除实时报警，并且处理记录的。 + // // 使用LINQ找出ErrorCode在uniqueToList2中的EquipAlarmRecord对象 + // List filteredObjectList = lstNowEquipAlarmRecord + // .Where(obj => uniqueToList2.Contains(obj.ErrorCode)) + // .ToList(); + // foreach (var VARIABLE in filteredObjectList) + // { + // EquipAlarmProcessRecord EquipAlarmProcessRecord = new EquipAlarmProcessRecord(); + // EquipAlarmProcessRecord.EquipTypeCode = VARIABLE.EquipTypeCode; + // EquipAlarmProcessRecord.EquipCode = VARIABLE.EquipCode; + // EquipAlarmProcessRecord.ErrorCode = VARIABLE.ErrorCode; + // EquipAlarmProcessRecord.ErrorLevel = VARIABLE.ErrorLevel; + // EquipAlarmProcessRecord.ErrorMsg = VARIABLE.ErrorMsg; + // EquipAlarmProcessRecord.ProcessMethod = VARIABLE.ProcessMethod; + // EquipAlarmProcessRecord.StartTime = VARIABLE.StartTime; + // EquipAlarmProcessRecord.ProcessTime = DateTime.Now; - EquipAlarmProcessRecordRepository.Insert(EquipAlarmProcessRecord); - } + // EquipAlarmProcessRecordRepository.Insert(EquipAlarmProcessRecord); + // } - EquipAlarmRecordRepository.Delete(filteredObjectList); - } + // EquipAlarmRecordRepository.Delete(filteredObjectList); + //} ClientMgr.PlcClient.Auto = msg.T3 == 1; diff --git a/WebStarter/appsettings.prod.json b/WebStarter/appsettings.prod.json index 581f8c5..c38ad2b 100644 --- a/WebStarter/appsettings.prod.json +++ b/WebStarter/appsettings.prod.json @@ -10,7 +10,7 @@ "Url": "http://121.4.95.243:8090/Updates/AutoUpdaterStarter.xml" }, "Redis": { - "Connection": "127.0.0.1:6379,password=12345", + "Connection": "127.0.0.1:6379,password=123456", "InstanceName": "local", "DefaultDB": "8" }, diff --git a/WebStarter/obj/Release/net6.0/WebStarter.AssemblyInfo.cs b/WebStarter/obj/Release/net6.0/WebStarter.AssemblyInfo.cs index e157dff..6e6baaf 100644 --- a/WebStarter/obj/Release/net6.0/WebStarter.AssemblyInfo.cs +++ b/WebStarter/obj/Release/net6.0/WebStarter.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("WebStarter")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e86c8971179fbf600196da8db1bd2db37c2bc45a")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7a4cd6cb77076f93c20d2a7e8baa5b1a1dad3b90")] [assembly: System.Reflection.AssemblyProductAttribute("WebStarter")] [assembly: System.Reflection.AssemblyTitleAttribute("WebStarter")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/WebStarter/obj/Release/net6.0/WebStarter.AssemblyInfoInputs.cache b/WebStarter/obj/Release/net6.0/WebStarter.AssemblyInfoInputs.cache index 73c8793..0c7c8b6 100644 --- a/WebStarter/obj/Release/net6.0/WebStarter.AssemblyInfoInputs.cache +++ b/WebStarter/obj/Release/net6.0/WebStarter.AssemblyInfoInputs.cache @@ -1 +1 @@ -367ff986bed887dd07b57dfbcc0e5fb5f4968d413bf3c6ceb8edd2e0883cb376 +77da7ee31a7818cee6653f2860fe7f0be2aa423335f9c89cf24b68008a0b2653 diff --git a/WebStarter/obj/Release/net6.0/WebStarter.GeneratedMSBuildEditorConfig.editorconfig b/WebStarter/obj/Release/net6.0/WebStarter.GeneratedMSBuildEditorConfig.editorconfig index 1699176..8249bb1 100644 --- a/WebStarter/obj/Release/net6.0/WebStarter.GeneratedMSBuildEditorConfig.editorconfig +++ b/WebStarter/obj/Release/net6.0/WebStarter.GeneratedMSBuildEditorConfig.editorconfig @@ -17,11 +17,11 @@ build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = WebStarter build_property.RootNamespace = WebStarter -build_property.ProjectDir = D:\桌面\nyx\WholeProcess\WebStarter\ +build_property.ProjectDir = D:\桌面\sterma\WebStarter\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.RazorLangVersion = 6.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = D:\桌面\nyx\WholeProcess\WebStarter +build_property.MSBuildProjectDirectory = D:\桌面\sterma\WebStarter build_property._RazorSourceGeneratorDebug = diff --git a/WebStarter/obj/Release/net6.0/WebStarter.assets.cache b/WebStarter/obj/Release/net6.0/WebStarter.assets.cache index 92ef6a996f26d0704d235efd22db493bec815fe7..0890815384a4b67758a4d2456d14cceb0226dbfe 100644 GIT binary patch delta 57 zcmV-90LK5a$qBN_2`ErYM?nk#007&cQ!r^h^@L0i*|%6jC*grViWSs#UC%wo#ocUr Pc87r|g(v~FC<2OPnqL=< delta 57 zcmV-90LK5a$qBN_2`ErYM?nk#000i+K0Lz_d6;T+GRq+YCaiS6tY4M)>1z^YKZeLo PXIX(Lg(v~FC<2OPYyK6} diff --git a/WinFormStarter/WinFormStarter.csproj b/WinFormStarter/WinFormStarter.csproj index 2e56686..951fa81 100644 --- a/WinFormStarter/WinFormStarter.csproj +++ b/WinFormStarter/WinFormStarter.csproj @@ -50,9 +50,7 @@ - - Form - + \ No newline at end of file diff --git a/WinFormStarter/WinFormStarter.csproj.user b/WinFormStarter/WinFormStarter.csproj.user index 82fa05d..dd2daa6 100644 --- a/WinFormStarter/WinFormStarter.csproj.user +++ b/WinFormStarter/WinFormStarter.csproj.user @@ -2,6 +2,9 @@ + + Form + Form diff --git a/WinFormStarter/obj/Release/net6.0-windows/WinFormStarter.AssemblyInfo.cs b/WinFormStarter/obj/Release/net6.0-windows/WinFormStarter.AssemblyInfo.cs index f64b38a..a69e759 100644 --- a/WinFormStarter/obj/Release/net6.0-windows/WinFormStarter.AssemblyInfo.cs +++ b/WinFormStarter/obj/Release/net6.0-windows/WinFormStarter.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("WinFormStarter")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e86c8971179fbf600196da8db1bd2db37c2bc45a")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] [assembly: System.Reflection.AssemblyProductAttribute("WinFormStarter")] [assembly: System.Reflection.AssemblyTitleAttribute("WinFormStarter")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/WinFormStarter/obj/Release/net6.0-windows/WinFormStarter.AssemblyInfoInputs.cache b/WinFormStarter/obj/Release/net6.0-windows/WinFormStarter.AssemblyInfoInputs.cache index 06717c8..514a2f9 100644 --- a/WinFormStarter/obj/Release/net6.0-windows/WinFormStarter.AssemblyInfoInputs.cache +++ b/WinFormStarter/obj/Release/net6.0-windows/WinFormStarter.AssemblyInfoInputs.cache @@ -1 +1 @@ -b00b8e92ae25e09e2081494bb5885f166436b0d5f129604e7e60578a50110aee +e927a79293d807146064f50a391eec4be7cb611c75ca9df1f3fd8a2bf8ff393c diff --git a/WinFormStarter/obj/Release/net6.0-windows/WinFormStarter.GeneratedMSBuildEditorConfig.editorconfig b/WinFormStarter/obj/Release/net6.0-windows/WinFormStarter.GeneratedMSBuildEditorConfig.editorconfig index 9e729c3..cb5569f 100644 --- a/WinFormStarter/obj/Release/net6.0-windows/WinFormStarter.GeneratedMSBuildEditorConfig.editorconfig +++ b/WinFormStarter/obj/Release/net6.0-windows/WinFormStarter.GeneratedMSBuildEditorConfig.editorconfig @@ -22,6 +22,6 @@ build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = WinFormStarter -build_property.ProjectDir = D:\桌面\nyx\WholeProcess\WinFormStarter\ +build_property.ProjectDir = D:\桌面\sterma\WinFormStarter\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/WinFormStarter/obj/Release/net6.0-windows/WinFormStarter.assets.cache b/WinFormStarter/obj/Release/net6.0-windows/WinFormStarter.assets.cache index da44d2044f2c8b2b9ce66c0357957832f47124db..5ee5b6f75b245308c83ccf6c191241e3814ac3a1 100644 GIT binary patch delta 67 zcmV-J0KEU{p$X}s2`*4eM?nk#001Hdp}(hFP4W?6EGe6#W`$g9=*`Esp`DgogA{tC ZSY(2+0RRL5lV4UMfl!4|0ku#9nNWZq8V&#e delta 67 zcmV-J0KEU{p$X}s2`*4eM?nk#0026pUA5LRg?!tnfWKTp;Z8MGjkjIOneN995V&@E ZUi5;o0RRL5lV4UMfl!4|0ku#9nNY!W8=L?D