From 094e6bec2e282735f743286e4eb10fa37fd2a36c Mon Sep 17 00:00:00 2001 From: YuYang Shen Date: Wed, 11 Jun 2025 10:52:58 +0800 Subject: [PATCH] Bug Fix: ThreadLocker --- Testrong.User.Program/UserProgram.cs | 31 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/Testrong.User.Program/UserProgram.cs b/Testrong.User.Program/UserProgram.cs index 0f3f6df..a61b68a 100644 --- a/Testrong.User.Program/UserProgram.cs +++ b/Testrong.User.Program/UserProgram.cs @@ -1506,10 +1506,11 @@ namespace Testrong.User.Program int SlotNum = context.Communicator.SlotNo; double[,] ExtBoard_Res = ReadRext(EXT_CAL_INIT_PATH + "ExtBoardRes.csv"); + SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true); + //Folder Related File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single"); - SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true); //-----Start Slot Number----- StreamWriter swdata; @@ -1670,12 +1671,12 @@ namespace Testrong.User.Program string arm_dna = BitConverter.ToUInt64(armDnaRaw, 0).ToString(); int SlotNum = context.Communicator.SlotNo; - //-----Move File To History----- - File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single"); - //---------Thread Locker-------- SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true); + //-----Move File To History----- + File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single"); + //-----Start Write MetaData----- StreamWriter swdata; swdata = new StreamWriter(METADATA_PATH, true, Encoding.UTF8) @@ -2376,12 +2377,11 @@ namespace Testrong.User.Program double[,] ExtBoard_Res = ReadRext(EXT_CAL_INIT_PATH + "ExtBoardRes.csv"); #region File/Folder Prepartion - //-----Move File To History----- - File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Normal", isPreCheck: isPreCheck); - //---------Thread Locker-------- SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true); + //-----Move File To History----- + File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Normal", isPreCheck: isPreCheck); //-----Start Slot Number----- // Write MetaData.csv Header @@ -3183,11 +3183,11 @@ namespace Testrong.User.Program int SlotNum = context.Communicator.SlotNo; double[,] ExtBoard_Res = ReadRext(EXT_CAL_INIT_PATH + "ExtBoardRes.csv"); + SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true); + //Folder Related File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single"); - SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL",lockFlag:true); - //-----Start Slot Number----- StreamWriter swdata; swdata = new StreamWriter(METADATA_PATH, true, Encoding.UTF8) @@ -3346,12 +3346,13 @@ namespace Testrong.User.Program {232,240 }, {233,239 } }; - //-----Move File To History----- - File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single"); - //---------Thread Locker-------- SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true); + //-----Move File To History----- + File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single"); + + //-----Start Write MetaData----- StreamWriter swdata; swdata = new StreamWriter(METADATA_PATH, true, Encoding.UTF8) @@ -3679,12 +3680,12 @@ namespace Testrong.User.Program string arm_dna = BitConverter.ToUInt64(armDnaRaw, 0).ToString(); int SlotNum = context.Communicator.SlotNo; - //-----Move File To History----- - File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single"); - //---------Thread Locker-------- SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true); + //-----Move File To History----- + File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single"); + //-----Start Write MetaData----- StreamWriter swdata; swdata = new StreamWriter(METADATA_PATH, true, Encoding.UTF8)