From f0c63da29d3e30cec5354b3767407adcb9e6c5ed Mon Sep 17 00:00:00 2001 From: SHM Date: Fri, 11 Jul 2025 09:21:30 +0900 Subject: [PATCH] =?UTF-8?q?[=EC=84=B1=ED=98=84=EB=AA=A8]=20Svn=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EB=B0=9B=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MainForm.Designer.cs | 2 +- .../SystemX.Net.Middleware.UI/MainForm.cs | 9 +- .../Properties/AssemblyInfo.cs | 14 +- .../MainForm.Designer.cs | 2 +- .../SystemX.Net.Middleware.UI/MainForm.cs | 9 +- .../Properties/AssemblyInfo.cs | 14 +- .../Command Protocol/HOST_INFO_CHECK.cs | 7 +- .../Properties/AssemblyInfo.cs | 10 +- .../SystemX.Net.PCAdaptor/XAdaptor.cs | 2 + .../SystemX.Net.PCAdaptor/XAdaptorManager.cs | 22 +- .../XPCAdaptor/XPCAdaptor.cs | 56 +- .../XPCAdaptor/XPCAdaptorSub/Events.cs | 84 --- .../XAdaptor.PC.Interface.Implement.cs | 35 +- .../XPCAdaptor/XPCAdaptorSub/Tasks.cs | 34 +- .../MainForm.Designer.cs | 595 +++++++----------- .../Properties/AssemblyInfo.cs | 12 +- .../Properties/AssemblyInfo.cs | 12 +- .../SystemX.Net.Comm/AsyncClientSocket.cs | 90 --- .../SystemX.Net.Comm/AsyncComClientSocket.cs | 90 --- .../SystemX.Net.Comm/AsyncServerSocket.cs | 88 --- .../SystemX.PLC/Properties/AssemblyInfo.cs | 12 +- .../Properties/AssemblyInfo.cs | 12 +- 22 files changed, 364 insertions(+), 847 deletions(-) diff --git a/SystemX.Net.CP.Middleware.Log/SystemX.Net.Middleware.UI/MainForm.Designer.cs b/SystemX.Net.CP.Middleware.Log/SystemX.Net.Middleware.UI/MainForm.Designer.cs index 0751822..0484f3b 100644 --- a/SystemX.Net.CP.Middleware.Log/SystemX.Net.Middleware.UI/MainForm.Designer.cs +++ b/SystemX.Net.CP.Middleware.Log/SystemX.Net.Middleware.UI/MainForm.Designer.cs @@ -772,7 +772,7 @@ namespace SystemX.Net.MiddlewareUI this.IconOptions.Image = global::SystemX.Net.MiddlewareUI.Log.Properties.Resources.AppIcon1; this.Name = "MainForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "SystemX.Net.Middleware.UI - Log CPXV2-JSON v240912"; + this.Text = "SystemX.Net.Middleware.UI - Log CPXV2-JSON"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed); diff --git a/SystemX.Net.CP.Middleware.Log/SystemX.Net.Middleware.UI/MainForm.cs b/SystemX.Net.CP.Middleware.Log/SystemX.Net.Middleware.UI/MainForm.cs index 8f621bc..3f8fadb 100644 --- a/SystemX.Net.CP.Middleware.Log/SystemX.Net.Middleware.UI/MainForm.cs +++ b/SystemX.Net.CP.Middleware.Log/SystemX.Net.Middleware.UI/MainForm.cs @@ -46,6 +46,7 @@ using System.Collections.Concurrent; using SystemX.Net.Comm.IIS_FTP; using SystemX.Net.Platform.SystemX.Net.XEFCore.DBContext.CPXV2LogJson; using SystemX.Net.Platform.SystemX.Net.XEFCore; +using System.Reflection; namespace SystemX.Net.MiddlewareUI { @@ -264,9 +265,15 @@ namespace SystemX.Net.MiddlewareUI InitializeComponent(); + AssemblyName assemblyName = Assembly.GetExecutingAssembly().GetName(); + + Version assemblyVersion = assemblyName.Version; + MessageOutput.ConsoleWrite(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss>>") + - @"Use CP-Server[X] Middleware [LOG] Version for [CPXV2][v240912] " + + @"Use CP-Server[X] Middleware [LOG] Version for [CPXV2][" + assemblyVersion.ToString() + "] " + "[SystemX.Net.Middleware.Log : MainForm]", ConsoleColor.Green, LogMessageLevel.FATAL); + + this.Text += " " + assemblyVersion.ToString(); // EnableMenuItem(GetSystemMenu(this.Handle, false), SC_CLOSE, MF_GRAYED); diff --git a/SystemX.Net.CP.Middleware.Log/SystemX.Net.Middleware.UI/Properties/AssemblyInfo.cs b/SystemX.Net.CP.Middleware.Log/SystemX.Net.Middleware.UI/Properties/AssemblyInfo.cs index 5f9d5c0..147a296 100644 --- a/SystemX.Net.CP.Middleware.Log/SystemX.Net.Middleware.UI/Properties/AssemblyInfo.cs +++ b/SystemX.Net.CP.Middleware.Log/SystemX.Net.Middleware.UI/Properties/AssemblyInfo.cs @@ -4,13 +4,13 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("SystemX.Net.MiddlewareUI")] -[assembly: AssemblyDescription("SystemX")] +[assembly: AssemblyTitle("SystemX.Net.MiddlewareUI.Log")] +[assembly: AssemblyDescription("CPX Middleware Log")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("SystemX")] -[assembly: AssemblyProduct("SystemX.Net.MiddlewareUI")] -[assembly: AssemblyCopyright("Copyright © 2022")] -[assembly: AssemblyTrademark("CP-ServerX")] +[assembly: AssemblyProduct("SystemX.Net.MiddlewareUI.Log")] +[assembly: AssemblyCopyright("© 2025 SystemX Co., Ltd. All rights reserved.")] +[assembly: AssemblyTrademark("CPX Middleware")] [assembly: AssemblyCulture("")] // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from @@ -28,5 +28,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("20.22.11.29")] -[assembly: AssemblyFileVersion("20.22.11.29")] +[assembly: AssemblyVersion("2025.05.15.0001")] +[assembly: AssemblyFileVersion("2025.05.15.0001")] diff --git a/SystemX.Net.CP.Middleware.PD/SystemX.Net.Middleware.UI/MainForm.Designer.cs b/SystemX.Net.CP.Middleware.PD/SystemX.Net.Middleware.UI/MainForm.Designer.cs index 4996261..c6fd844 100644 --- a/SystemX.Net.CP.Middleware.PD/SystemX.Net.Middleware.UI/MainForm.Designer.cs +++ b/SystemX.Net.CP.Middleware.PD/SystemX.Net.Middleware.UI/MainForm.Designer.cs @@ -523,7 +523,7 @@ namespace SystemX.Net.MiddlewareUI this.IconOptions.Icon = ((System.Drawing.Icon)(resources.GetObject("MainForm.IconOptions.Icon"))); this.Name = "MainForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "SystemX.Net.Middleware.UI - CPXV2-JSON v240829"; + this.Text = "SystemX.Net.Middleware.UI - CPXV2-JSON"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed); diff --git a/SystemX.Net.CP.Middleware.PD/SystemX.Net.Middleware.UI/MainForm.cs b/SystemX.Net.CP.Middleware.PD/SystemX.Net.Middleware.UI/MainForm.cs index 2350a6b..8cad1ec 100644 --- a/SystemX.Net.CP.Middleware.PD/SystemX.Net.Middleware.UI/MainForm.cs +++ b/SystemX.Net.CP.Middleware.PD/SystemX.Net.Middleware.UI/MainForm.cs @@ -47,6 +47,7 @@ using static SystemX.Net.DB.XDBConnManager; using SystemX.Net.Middleware.Commons; using SystemX.Net.Platform.SystemX.Common; using System.Collections.Concurrent; +using System.Reflection; namespace SystemX.Net.MiddlewareUI { @@ -286,10 +287,16 @@ namespace SystemX.Net.MiddlewareUI { InitializeComponent(); + AssemblyName assemblyName = Assembly.GetExecutingAssembly().GetName(); + + Version assemblyVersion = assemblyName.Version; + MessageOutput.ConsoleWrite(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss>>") + - @"Use CP-Server[X] Middleware Version for [CPXV2][v240829] " + + @"Use CP-Server[X] Middleware Version for [CPXV2][" + assemblyVersion.ToString() + "] " + "[SystemX.Net.MiddlewareUI : MainForm]", ConsoleColor.Green, LogMessageLevel.FATAL); + this.Text += " " + assemblyVersion.ToString(); + EnableMenuItem(GetSystemMenu(this.Handle, false), SC_CLOSE, MF_GRAYED); ConsoleUtil.ConsoleHide(); diff --git a/SystemX.Net.CP.Middleware.PD/SystemX.Net.Middleware.UI/Properties/AssemblyInfo.cs b/SystemX.Net.CP.Middleware.PD/SystemX.Net.Middleware.UI/Properties/AssemblyInfo.cs index 5f9d5c0..56f1dd0 100644 --- a/SystemX.Net.CP.Middleware.PD/SystemX.Net.Middleware.UI/Properties/AssemblyInfo.cs +++ b/SystemX.Net.CP.Middleware.PD/SystemX.Net.Middleware.UI/Properties/AssemblyInfo.cs @@ -4,13 +4,13 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("SystemX.Net.MiddlewareUI")] -[assembly: AssemblyDescription("SystemX")] +[assembly: AssemblyTitle("SystemX.Net.MiddlewareUI.UIM")] +[assembly: AssemblyDescription("CPX Middleware UIM")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("SystemX")] -[assembly: AssemblyProduct("SystemX.Net.MiddlewareUI")] -[assembly: AssemblyCopyright("Copyright © 2022")] -[assembly: AssemblyTrademark("CP-ServerX")] +[assembly: AssemblyProduct("SystemX.Net.MiddlewareUI.UIM")] +[assembly: AssemblyCopyright("© 2025 SystemX Co., Ltd. All rights reserved.")] +[assembly: AssemblyTrademark("CPX Middleware")] [assembly: AssemblyCulture("")] // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from @@ -28,5 +28,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("20.22.11.29")] -[assembly: AssemblyFileVersion("20.22.11.29")] +[assembly: AssemblyVersion("2025.05.15.0001")] +[assembly: AssemblyFileVersion("2025.05.15.0001")] diff --git a/SystemX.Net.CP.Middleware.PD/SystemX.Net.Middleware.UI/Protocol Method/Command Protocol/HOST_INFO_CHECK.cs b/SystemX.Net.CP.Middleware.PD/SystemX.Net.Middleware.UI/Protocol Method/Command Protocol/HOST_INFO_CHECK.cs index 654ee2b..8b5dcc6 100644 --- a/SystemX.Net.CP.Middleware.PD/SystemX.Net.Middleware.UI/Protocol Method/Command Protocol/HOST_INFO_CHECK.cs +++ b/SystemX.Net.CP.Middleware.PD/SystemX.Net.Middleware.UI/Protocol Method/Command Protocol/HOST_INFO_CHECK.cs @@ -81,11 +81,6 @@ namespace SystemX.Net.MiddlewareUI.UIM.Protocol_Method bUseExist = Parent_.GetConnectInfoFindHost(strGetHostID, strGetSection, bGetUseUIM); bExistInformation = (drFindInfo != null ? drFindInfo.Count() > 0 : false); - - if(drFindInfo == null) - { - ;// - } } if (bExistInformation || @@ -104,7 +99,7 @@ namespace SystemX.Net.MiddlewareUI.UIM.Protocol_Method strConnectIP = thisConnInfo.strCommandEndPointInfo; //TODO : For Test Server Code - if (/* true || */ strConnectIP.IndexOf(strRegIP) >= 0 || bGetUseUIM) + if (true || strConnectIP.IndexOf(strRegIP) >= 0 || bGetUseUIM) { ;//IP Address Compare Result PASS } diff --git a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/Properties/AssemblyInfo.cs b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/Properties/AssemblyInfo.cs index 2e88a19..e019f44 100644 --- a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/Properties/AssemblyInfo.cs +++ b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ using System.Runtime.InteropServices; // 제어됩니다. 어셈블리와 관련된 정보를 수정하려면 // 이러한 특성 값을 변경하세요. [assembly: AssemblyTitle("SystemX.Net.XAdaptor.PC")] -[assembly: AssemblyDescription("For Middleware connect dll(XAdaptor.PC)")] +[assembly: AssemblyDescription("CPX Adaptor")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("SystemX")] [assembly: AssemblyProduct("SystemX.Net.XAdaptor.PC")] -[assembly: AssemblyCopyright("SystemX Copyright © 2020")] -[assembly: AssemblyTrademark("SystemX.Net")] +[assembly: AssemblyCopyright("© 2025 SystemX Co., Ltd. All rights reserved.")] +[assembly: AssemblyTrademark("CPX Adaptor")] [assembly: AssemblyCulture("")] // ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에 @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2025.05.15.0001")] +[assembly: AssemblyFileVersion("2025.05.15.0001")] diff --git a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XAdaptor.cs b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XAdaptor.cs index 67e80f6..13cabb7 100644 --- a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XAdaptor.cs +++ b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XAdaptor.cs @@ -186,6 +186,8 @@ namespace SystemX.Net.XAdaptor LoginKEY = string.Empty; ServerTestListLoadState = false; + + ControlFTP = null; } // TODO : FTP ALIS diff --git a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XAdaptorManager.cs b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XAdaptorManager.cs index 7a583db..3d87f22 100644 --- a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XAdaptorManager.cs +++ b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XAdaptorManager.cs @@ -6,6 +6,7 @@ using System.IO; using System.Linq; using System.Net; using System.Net.Sockets; +using System.Reflection; using System.Runtime.InteropServices; using System.Text.RegularExpressions; using System.Threading; @@ -29,8 +30,12 @@ namespace SystemX.Net.XAdaptor.Manager public XAdaptorManager(string strConfigFilePos = "") { + AssemblyName assemblyName = Assembly.GetExecutingAssembly().GetName(); + + Version assemblyVersion = assemblyName.Version; + MessageOutput.ConsoleWrite(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss>>") + - @"Use CP-Server[X] Adaptor Version for [CPXV2][v240829] " + + @"Use CP-Server[X] Adaptor Version for [CPXV2][" + assemblyVersion.ToString() + "] " + "[SystemX.Net.XAdaptor.Manager : XAdaptorManager]", ConsoleColor.Green, LogMessageLevel.FATAL); strCreateConfigFilePos = string.Empty; @@ -183,10 +188,17 @@ namespace SystemX.Net.XAdaptor.Manager return GetAdaptorHandler.StateFTP; } - private eFTPServiceStatus StartFTP() + private eFTPServiceStatus CheckFTP() { - GetAdaptorHandler.StateFTP = xAdaptor.StartFTPService(); + for (int n = 0; n < 3; n++) + { + GetAdaptorHandler.StateFTP = xAdaptor.StartFTPService(); + if (GetAdaptorHandler.StateFTP == eFTPServiceStatus.Connected) + break; + if (GetAdaptorHandler.StateFTP == eFTPServiceStatus.Unused) + break; + } return GetAdaptorHandler.StateFTP; } @@ -202,7 +214,7 @@ namespace SystemX.Net.XAdaptor.Manager } // TODO : FTP ALIS - StartFTP(); + CheckFTP(); xAdaptor.ConnectStartStyleAuto = true; @@ -232,7 +244,7 @@ namespace SystemX.Net.XAdaptor.Manager } // TODO : FTP ALIS - StartFTP(); + CheckFTP(); xAdaptor.ConnectStartStyleAuto = false; diff --git a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XPCAdaptor/XPCAdaptor.cs b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XPCAdaptor/XPCAdaptor.cs index 22320ab..4497201 100644 --- a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XPCAdaptor/XPCAdaptor.cs +++ b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XPCAdaptor/XPCAdaptor.cs @@ -479,51 +479,6 @@ namespace SystemX.Net.XAdaptor.PC } } } - - // - /* - if (START_EVENT_TRIGGER[0]) - { - START_EVENT_TRIGGER[0] = false; - - //CommandConnectAlarmEvent?.BeginInvoke(null, null, null, null); - //CommandConnectAlarmEvent?.Invoke(null, null); - - OnCommandConnectAlarm(null, null); - } - if (START_EVENT_TRIGGER[1]) - { - START_EVENT_TRIGGER[1] = false; - - //StreamConnectAlarmEvent?.BeginInvoke(null, null, null, null); - //StreamConnectAlarmEvent?.Invoke(null, null); - - OnStreamConnectAlarm(null, null); - } - */ - // - /* - //Command Stream Conn Check - if (StateClientSocketConnect == false) - goto ROUTINE_OUT; - if (thisConnInfo.stCommandCheckTime.ElapsedMilliseconds >= 60000) - { - SendCommandConnectState(); - - thisConnInfo.OnCommandCheckTime(); - } - // - if (StateClientStreamSocketConnect == false) - goto ROUTINE_OUT; - if (thisConnInfo.stStreamCheckTime.ElapsedMilliseconds >= 60000) - { - SendStreamConnectState(); - - thisConnInfo.OnStreamCheckTime(); - } - - ROUTINE_OUT: - */ } } @@ -579,7 +534,9 @@ namespace SystemX.Net.XAdaptor.PC // if (StateAdaptorConnect) { - ;// + //if (StateClientAutoConnect) + { + } } // thisConnInfo.OnCommandTime(); @@ -603,7 +560,7 @@ namespace SystemX.Net.XAdaptor.PC if (LoadInfo.FTP_Use) { ControlFTP = new CtrlFTP(LoadInfo.FTP_Use, - IPAddress.Parse(LoadInfo.FTP_IPAddress), Convert.ToInt32(LoadInfo.FTP_Port), + IPAddress.Parse(LoadInfo.FTP_IPAddress), Convert.ToInt32(LoadInfo.FTP_Port), LoadInfo.FTP_Account, LoadInfo.FTP_Password); if (ControlFTP.FTPConnState) @@ -612,7 +569,12 @@ namespace SystemX.Net.XAdaptor.PC return eFTPServiceStatus.Disconnected; } else + { + if (ControlFTP != null) + ControlFTP.FTPConnState = false; + return eFTPServiceStatus.Unused; + } } public DataSet WaitSystemQuery(string strQuery) diff --git a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XPCAdaptor/XPCAdaptorSub/Events.cs b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XPCAdaptor/XPCAdaptorSub/Events.cs index 3fd2031..9d3796a 100644 --- a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XPCAdaptor/XPCAdaptorSub/Events.cs +++ b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XPCAdaptor/XPCAdaptorSub/Events.cs @@ -314,54 +314,6 @@ namespace SystemX.Net.XAdaptor.PC AsyncResult result = (AsyncResult)ar; } - /* - private void WaitTskJoin(WaitParameter wp, PacketFlowControl getPF, byte ucGetLabel, bool bUseDataSet = true, long lTimeOut = COMMAND_TIME_OUT) - { - wp.Init(getPF); - - Thread t = new Thread(delegate () { - QueryResult.Initialize(); - QueryResult.xData = wp.TskCheckResult(ucGetLabel, lTimeOut); - if (QueryResult.xData != null) - { - QueryResult.bQueryResult = QueryResult.xData.bReplayResult; - - if (bUseDataSet) - QueryResult.QueryDataSet = QueryResult.xData.objData as DataSet; - else - { - QueryResult.QueryDataSet = null; - - if (QueryResult.xData.objData is TRANSFER_PACKET) - { - TRANSFER_PACKET TransferResult = (TRANSFER_PACKET)QueryResult.xData.objData; - - byte ucCheckLabel = QueryResult.xData.nLabel; - - QueryResult.bFileRecvResult = TransferResult.bRecvResult; - QueryResult.bFileProcessResult = TransferResult.bProcessResult; - } - else if (QueryResult.xData.objData is COMM_INFO_PACKET) - { - COMM_INFO_PACKET Result = (COMM_INFO_PACKET)QueryResult.xData.objData; - - byte ucCheckLabel = QueryResult.xData.nLabel; - } - } - - QueryResult.strVarParam1 = QueryResult.xData.HeaderPacket.objVarParam1[0].Data; - QueryResult.strVarParam2 = QueryResult.xData.HeaderPacket.objVarParam2[0].Data; - QueryResult.strVarParam3 = QueryResult.xData.HeaderPacket.objVarParam3[0].Data; - } - else - getPF.STM.ClearLabel(ucGetLabel); - }); - - t.Start(); - t.Join(); - } - */ - private void WaitThreadJoin(WaitParameter wp, PacketFlowControl getPF, byte ucGetLabel, bool bUseDataSet = true, long lTimeOut = COMMAND_TIME_OUT) { wp.Init(getPF); @@ -532,42 +484,6 @@ namespace SystemX.Net.XAdaptor.PC fc = getFc; } - /* - public XData TskCheckResult(byte nCheckLabel, long lTimeOut = COMMAND_TIME_OUT) - { - XData getXData = null; - bool bWaitLabel = false; - - if (nCheckLabel < 0 || nCheckLabel >= fc.STM.GetLabelSize()) - return getXData; - - Stopwatch stWaitTImeWatch = new Stopwatch(); - stWaitTImeWatch.Start(); - - while (true) - { - if (stWaitTImeWatch.ElapsedMilliseconds >= lTimeOut) - break; - - if (nSignaled == 1) - { - getXData = fc.STM.CheckLabel(nCheckLabel, ref bWaitLabel); - - if (bWaitLabel) - { - tResult = true; - - break; - } - } - - Thread.Sleep(1); - } - - return getXData; - } - */ - public XData ThreadWaitResult(byte nCheckLabel, long lTimeOut = COMMAND_TIME_OUT) { XData getXData = null; diff --git a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XPCAdaptor/XPCAdaptorSub/Interface Implement/XAdaptor.PC.Interface.Implement.cs b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XPCAdaptor/XPCAdaptorSub/Interface Implement/XAdaptor.PC.Interface.Implement.cs index 56101f3..1532a0b 100644 --- a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XPCAdaptor/XPCAdaptorSub/Interface Implement/XAdaptor.PC.Interface.Implement.cs +++ b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XPCAdaptor/XPCAdaptorSub/Interface Implement/XAdaptor.PC.Interface.Implement.cs @@ -831,13 +831,29 @@ QUERY_TESTLIST: // TODO : FTP ALIS if (LoadInfo.FTP_Use) { - if(ControlFTP.FTPConnState) + if (ControlFTP.FTPConnState == false) { - string strSetSendFTPInfo = strSetBackupInfo; + for (int n = 0; n < 3; n++) + { + StateFTP = StartFTPService(); - strSetSendFTPInfo += (";" + LoadInfo.HOST_ID); - strSetSendFTPInfo += (";" + LoadInfo.SECTION); + //^_^ + if (StateFTP == Comm.IIS_FTP.eFTPServiceStatus.Connected) + break; + if (StateFTP == Comm.IIS_FTP.eFTPServiceStatus.Unused) + break; + if (ControlFTP.FTPConnState) + break; + } + } + string strSetSendFTPInfo = strSetBackupInfo; + + strSetSendFTPInfo += (";" + LoadInfo.HOST_ID); + strSetSendFTPInfo += (";" + LoadInfo.SECTION); + + if (ControlFTP.FTPConnState) + { XAdaptorFileLogWrite(eSetFileLogCategory.FTPFileLog, strYYYY, strMM, strdd, strSetSendFTPInfo, strSetBackupFileName, "LogFileSend[FTP]>Try"); string strSetFilePos = MakeZipIncludeInfoCpLog(strSetSendFTPInfo, strSetBackupFilePos, strSetBackupFileName, ucSetBackupFileData); @@ -848,6 +864,7 @@ QUERY_TESTLIST: if (File.Exists(strSetFilePos)) File.Delete(strSetFilePos); + //string strGetFileName = Path.GetFileName(strSetFilePos); //string ss = await ControlFTP.FileDownload(strGetFileName, @"D:\"); @@ -857,8 +874,18 @@ QUERY_TESTLIST: { XAdaptorFileLogWrite(eSetFileLogCategory.FTPFileLog, strYYYY, strMM, strdd, strSetSendFTPInfo, strSetBackupFileName, "LogFileSend[FTP]>Result>Failed"); XAdaptorFileLogWrite(eSetFileLogCategory.FTPFileLog, strYYYY, strMM, strdd, strSetSendFTPInfo, strSetBackupFileName, "LogFileSend[FTP]>Try By Socket"); + + //실패시 Socket File 전송 + // } } + else + { + XAdaptorFileLogWrite(eSetFileLogCategory.FTPFileLog, strYYYY, strMM, strdd, strSetSendFTPInfo, strSetBackupFileName, "LogFileSend[FTP]>Disconnect State. Please Check FTP State!"); + + //실패시 Socket File 전송 + // + } } try diff --git a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XPCAdaptor/XPCAdaptorSub/Tasks.cs b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XPCAdaptor/XPCAdaptorSub/Tasks.cs index 6cffaa0..58f6e3e 100644 --- a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XPCAdaptor/XPCAdaptorSub/Tasks.cs +++ b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptor/XPCAdaptor/XPCAdaptorSub/Tasks.cs @@ -98,36 +98,6 @@ namespace SystemX.Net.XAdaptor.PC return bSetResult; } - /* - private async void ClientCommandConnect() - { - dbNgCodeFinder = null; - - ConnectCommandWaitEvent.Reset(); - StateAdaptorConnect &= ClientCommandSet(SOCKET_TYPE.TCP, false); - - if (ConnectCommandWaitEvent.WaitOne(CONNECT_TIME_OUT)) - SetCommandWatchTask(); - else - MessageOutput.ConsoleWrite(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss>>") + @"SystemX.Net.XAdaptor.PC Command Connect Error.[SystemX.Net.PCAdaptor : XPCAdaptor.XPCAdaptor]", ConsoleColor.Red, LogMessageLevel.DEBUG); - - await Task.Delay(1).ConfigureAwait(false); - } - - private async void ClientStreamConnect() - { - ConnectStreamWaitEvent.Reset(); - StateAdaptorConnect &= ClientStreamSet(SOCKET_TYPE.TCP, false); - - if (ConnectStreamWaitEvent.WaitOne(CONNECT_TIME_OUT)) - SetStreamWatchTask(); - else - MessageOutput.ConsoleWrite(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss>>") + @"SystemX.Net.XAdaptor.PC Stream Connect Error.[SystemX.Net.PCAdaptor : XPCAdaptor.XPCAdaptor]", ConsoleColor.Red, LogMessageLevel.DEBUG); - - await Task.Delay(1).ConfigureAwait(false); - } - */ - private void ClearCommandClientInstance() { if (FlowCommandControl != null) @@ -214,6 +184,10 @@ namespace SystemX.Net.XAdaptor.PC Random r = new Random(Guid.NewGuid().GetHashCode()); nPortNumber = GetDistributionPort(r, nPortNumber); + + MessageOutput.ConsoleWrite(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss>>") + + @"Get Distribution Port Number " + nPortNumber.ToString("D4") + " [SystemX.Net.XAdaptor.PC : ClientCommandSet]\r\n", + ConsoleColor.Yellow, LogMessageLevel.DEBUG); } try diff --git a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptorUI/MainForm.Designer.cs b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptorUI/MainForm.Designer.cs index 47239ee..2e23171 100644 --- a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptorUI/MainForm.Designer.cs +++ b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptorUI/MainForm.Designer.cs @@ -184,9 +184,8 @@ this.MainPanel.Controls.Add(this.DebugButton); this.MainPanel.Controls.Add(this.StatePanel); this.MainPanel.Location = new System.Drawing.Point(0, 0); - this.MainPanel.Margin = new System.Windows.Forms.Padding(4); this.MainPanel.Name = "MainPanel"; - this.MainPanel.Size = new System.Drawing.Size(920, 784); + this.MainPanel.Size = new System.Drawing.Size(644, 523); this.MainPanel.TabIndex = 30; this.MainPanel.DoubleClick += new System.EventHandler(this.MainPanel_DoubleClick); // @@ -195,10 +194,9 @@ this.panel3.Controls.Add(this.labelFTPConn); this.panel3.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.panel3.ForeColor = System.Drawing.Color.White; - this.panel3.Location = new System.Drawing.Point(359, 124); - this.panel3.Margin = new System.Windows.Forms.Padding(4); + this.panel3.Location = new System.Drawing.Point(251, 83); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(371, 56); + this.panel3.Size = new System.Drawing.Size(260, 37); this.panel3.TabIndex = 37; // // labelFTPConn @@ -207,9 +205,8 @@ this.labelFTPConn.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.labelFTPConn.ForeColor = System.Drawing.Color.Red; this.labelFTPConn.Location = new System.Drawing.Point(0, 0); - this.labelFTPConn.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelFTPConn.Name = "labelFTPConn"; - this.labelFTPConn.Size = new System.Drawing.Size(371, 56); + this.labelFTPConn.Size = new System.Drawing.Size(260, 37); this.labelFTPConn.TabIndex = 0; this.labelFTPConn.Text = "DISCONNECT"; this.labelFTPConn.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -219,11 +216,11 @@ this.pictureBox1.BackColor = System.Drawing.Color.Transparent; this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBox1.Image = global::SystemX.Net.PCAdaptorUI.Properties.Resources.CI; - this.pictureBox1.Location = new System.Drawing.Point(57, 103); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(7, 8, 7, 8); + this.pictureBox1.Location = new System.Drawing.Point(40, 69); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Padding = new System.Windows.Forms.Padding(4); - this.pictureBox1.Size = new System.Drawing.Size(291, 95); + this.pictureBox1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.pictureBox1.Size = new System.Drawing.Size(204, 64); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 36; this.pictureBox1.TabStop = false; @@ -232,11 +229,9 @@ // this.groupBoxMacQuery.Controls.Add(this.panel2); this.groupBoxMacQuery.ForeColor = System.Drawing.Color.White; - this.groupBoxMacQuery.Location = new System.Drawing.Point(17, 314); - this.groupBoxMacQuery.Margin = new System.Windows.Forms.Padding(4); + this.groupBoxMacQuery.Location = new System.Drawing.Point(12, 209); this.groupBoxMacQuery.Name = "groupBoxMacQuery"; - this.groupBoxMacQuery.Padding = new System.Windows.Forms.Padding(4); - this.groupBoxMacQuery.Size = new System.Drawing.Size(886, 454); + this.groupBoxMacQuery.Size = new System.Drawing.Size(620, 303); this.groupBoxMacQuery.TabIndex = 35; this.groupBoxMacQuery.TabStop = false; this.groupBoxMacQuery.Text = "MAC ADDRESS Query"; @@ -268,49 +263,45 @@ this.panel2.Controls.Add(this.FMAFIBtn); this.panel2.Controls.Add(this.FIFMABtn); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(4, 25); - this.panel2.Margin = new System.Windows.Forms.Padding(7, 8, 7, 8); + this.panel2.Location = new System.Drawing.Point(3, 17); + this.panel2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.panel2.Name = "panel2"; - this.panel2.Padding = new System.Windows.Forms.Padding(14, 15, 14, 15); - this.panel2.Size = new System.Drawing.Size(878, 425); + this.panel2.Padding = new System.Windows.Forms.Padding(10, 10, 10, 10); + this.panel2.Size = new System.Drawing.Size(614, 283); this.panel2.TabIndex = 0; // // checkBox2 // this.checkBox2.AutoSize = true; - this.checkBox2.Location = new System.Drawing.Point(19, 262); - this.checkBox2.Margin = new System.Windows.Forms.Padding(4); + this.checkBox2.Location = new System.Drawing.Point(13, 175); this.checkBox2.Name = "checkBox2"; - this.checkBox2.Size = new System.Drawing.Size(128, 22); + this.checkBox2.Size = new System.Drawing.Size(91, 16); this.checkBox2.TabIndex = 94; this.checkBox2.Text = "Reissuance"; this.checkBox2.UseVisualStyleBackColor = true; // // progressBar1 // - this.progressBar1.Location = new System.Drawing.Point(19, 404); - this.progressBar1.Margin = new System.Windows.Forms.Padding(4); + this.progressBar1.Location = new System.Drawing.Point(13, 269); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(837, 15); + this.progressBar1.Size = new System.Drawing.Size(586, 10); this.progressBar1.TabIndex = 93; // // RFIOMAtextBox3 // - this.RFIOMAtextBox3.Location = new System.Drawing.Point(480, 264); - this.RFIOMAtextBox3.Margin = new System.Windows.Forms.Padding(4); + this.RFIOMAtextBox3.Location = new System.Drawing.Point(336, 176); this.RFIOMAtextBox3.Name = "RFIOMAtextBox3"; this.RFIOMAtextBox3.ReadOnly = true; - this.RFIOMAtextBox3.Size = new System.Drawing.Size(288, 28); + this.RFIOMAtextBox3.Size = new System.Drawing.Size(203, 21); this.RFIOMAtextBox3.TabIndex = 92; // // label20 // this.label20.AutoSize = true; this.label20.ForeColor = System.Drawing.Color.Black; - this.label20.Location = new System.Drawing.Point(173, 268); - this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label20.Location = new System.Drawing.Point(121, 179); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(22, 18); + this.label20.Size = new System.Drawing.Size(16, 12); this.label20.TabIndex = 91; this.label20.Text = "ID"; // @@ -318,10 +309,9 @@ // this.label19.AutoSize = true; this.label19.ForeColor = System.Drawing.Color.Black; - this.label19.Location = new System.Drawing.Point(404, 228); - this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label19.Location = new System.Drawing.Point(283, 152); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(146, 18); + this.label19.Size = new System.Drawing.Size(103, 12); this.label19.TabIndex = 90; this.label19.Text = "Mac display type"; // @@ -329,10 +319,9 @@ // this.label18.AutoSize = true; this.label18.ForeColor = System.Drawing.Color.Black; - this.label18.Location = new System.Drawing.Point(713, 128); - this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label18.Location = new System.Drawing.Point(499, 85); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(57, 18); + this.label18.Size = new System.Drawing.Size(40, 12); this.label18.TabIndex = 89; this.label18.Text = "Result"; // @@ -340,10 +329,9 @@ // this.label17.AutoSize = true; this.label17.ForeColor = System.Drawing.Color.Black; - this.label17.Location = new System.Drawing.Point(713, 40); - this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label17.Location = new System.Drawing.Point(499, 27); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(57, 18); + this.label17.Size = new System.Drawing.Size(40, 12); this.label17.TabIndex = 88; this.label17.Text = "Result"; // @@ -351,10 +339,9 @@ // this.label16.AutoSize = true; this.label16.ForeColor = System.Drawing.Color.Black; - this.label16.Location = new System.Drawing.Point(266, 118); - this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label16.Location = new System.Drawing.Point(186, 79); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(146, 18); + this.label16.Size = new System.Drawing.Size(103, 12); this.label16.TabIndex = 87; this.label16.Text = "Mac display type"; // @@ -362,10 +349,9 @@ // this.label15.AutoSize = true; this.label15.ForeColor = System.Drawing.Color.Black; - this.label15.Location = new System.Drawing.Point(173, 156); - this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label15.Location = new System.Drawing.Point(121, 104); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(22, 18); + this.label15.Size = new System.Drawing.Size(16, 12); this.label15.TabIndex = 86; this.label15.Text = "ID"; // @@ -373,10 +359,9 @@ // this.label14.AutoSize = true; this.label14.ForeColor = System.Drawing.Color.Black; - this.label14.Location = new System.Drawing.Point(63, 68); - this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label14.Location = new System.Drawing.Point(44, 45); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(131, 18); + this.label14.Size = new System.Drawing.Size(93, 12); this.label14.TabIndex = 85; this.label14.Text = "MAC ADDRESS"; // @@ -389,37 +374,33 @@ "Colon", "Hyphen", "Dot"}); - this.RFIOMAcomboBox1.Location = new System.Drawing.Point(560, 224); - this.RFIOMAcomboBox1.Margin = new System.Windows.Forms.Padding(4); + this.RFIOMAcomboBox1.Location = new System.Drawing.Point(392, 149); this.RFIOMAcomboBox1.Name = "RFIOMAcomboBox1"; - this.RFIOMAcomboBox1.Size = new System.Drawing.Size(191, 26); + this.RFIOMAcomboBox1.Size = new System.Drawing.Size(135, 20); this.RFIOMAcomboBox1.TabIndex = 84; // // RFIOMAtextBox2 // - this.RFIOMAtextBox2.Location = new System.Drawing.Point(19, 304); - this.RFIOMAtextBox2.Margin = new System.Windows.Forms.Padding(4); + this.RFIOMAtextBox2.Location = new System.Drawing.Point(13, 203); this.RFIOMAtextBox2.Multiline = true; this.RFIOMAtextBox2.Name = "RFIOMAtextBox2"; this.RFIOMAtextBox2.ReadOnly = true; - this.RFIOMAtextBox2.Size = new System.Drawing.Size(835, 96); + this.RFIOMAtextBox2.Size = new System.Drawing.Size(586, 65); this.RFIOMAtextBox2.TabIndex = 83; // // RFIOMAtextBox1 // - this.RFIOMAtextBox1.Location = new System.Drawing.Point(204, 264); - this.RFIOMAtextBox1.Margin = new System.Windows.Forms.Padding(4); + this.RFIOMAtextBox1.Location = new System.Drawing.Point(143, 176); this.RFIOMAtextBox1.Name = "RFIOMAtextBox1"; - this.RFIOMAtextBox1.Size = new System.Drawing.Size(265, 28); + this.RFIOMAtextBox1.Size = new System.Drawing.Size(187, 21); this.RFIOMAtextBox1.TabIndex = 82; // // RFIOMABtn // this.RFIOMABtn.ForeColor = System.Drawing.Color.Black; - this.RFIOMABtn.Location = new System.Drawing.Point(19, 220); - this.RFIOMABtn.Margin = new System.Windows.Forms.Padding(4); + this.RFIOMABtn.Location = new System.Drawing.Point(13, 147); this.RFIOMABtn.Name = "RFIOMABtn"; - this.RFIOMABtn.Size = new System.Drawing.Size(377, 34); + this.RFIOMABtn.Size = new System.Drawing.Size(264, 23); this.RFIOMABtn.TabIndex = 81; this.RFIOMABtn.Text = "Request for issuance of mac address"; this.RFIOMABtn.UseVisualStyleBackColor = true; @@ -427,19 +408,17 @@ // // FMAFItextBox2 // - this.FMAFItextBox2.Location = new System.Drawing.Point(480, 152); - this.FMAFItextBox2.Margin = new System.Windows.Forms.Padding(4); + this.FMAFItextBox2.Location = new System.Drawing.Point(336, 101); this.FMAFItextBox2.Name = "FMAFItextBox2"; this.FMAFItextBox2.ReadOnly = true; - this.FMAFItextBox2.Size = new System.Drawing.Size(288, 28); + this.FMAFItextBox2.Size = new System.Drawing.Size(203, 21); this.FMAFItextBox2.TabIndex = 79; // // FMAFItextBox1 // - this.FMAFItextBox1.Location = new System.Drawing.Point(204, 152); - this.FMAFItextBox1.Margin = new System.Windows.Forms.Padding(4); + this.FMAFItextBox1.Location = new System.Drawing.Point(143, 101); this.FMAFItextBox1.Name = "FMAFItextBox1"; - this.FMAFItextBox1.Size = new System.Drawing.Size(265, 28); + this.FMAFItextBox1.Size = new System.Drawing.Size(187, 21); this.FMAFItextBox1.TabIndex = 78; // // FMAFIcomboBox1 @@ -451,36 +430,32 @@ "Colon", "Hyphen", "Dot"}); - this.FMAFIcomboBox1.Location = new System.Drawing.Point(421, 114); - this.FMAFIcomboBox1.Margin = new System.Windows.Forms.Padding(4); + this.FMAFIcomboBox1.Location = new System.Drawing.Point(295, 76); this.FMAFIcomboBox1.Name = "FMAFIcomboBox1"; - this.FMAFIcomboBox1.Size = new System.Drawing.Size(191, 26); + this.FMAFIcomboBox1.Size = new System.Drawing.Size(135, 20); this.FMAFIcomboBox1.TabIndex = 77; // // FIFMAtextBox2 // - this.FIFMAtextBox2.Location = new System.Drawing.Point(480, 63); - this.FIFMAtextBox2.Margin = new System.Windows.Forms.Padding(4); + this.FIFMAtextBox2.Location = new System.Drawing.Point(336, 42); this.FIFMAtextBox2.Name = "FIFMAtextBox2"; this.FIFMAtextBox2.ReadOnly = true; - this.FIFMAtextBox2.Size = new System.Drawing.Size(288, 28); + this.FIFMAtextBox2.Size = new System.Drawing.Size(203, 21); this.FIFMAtextBox2.TabIndex = 75; // // FIFMAtextBox1 // - this.FIFMAtextBox1.Location = new System.Drawing.Point(204, 63); - this.FIFMAtextBox1.Margin = new System.Windows.Forms.Padding(4); + this.FIFMAtextBox1.Location = new System.Drawing.Point(143, 42); this.FIFMAtextBox1.Name = "FIFMAtextBox1"; - this.FIFMAtextBox1.Size = new System.Drawing.Size(265, 28); + this.FIFMAtextBox1.Size = new System.Drawing.Size(187, 21); this.FIFMAtextBox1.TabIndex = 74; // // FMAFIBtn // this.FMAFIBtn.ForeColor = System.Drawing.Color.Black; - this.FMAFIBtn.Location = new System.Drawing.Point(19, 111); - this.FMAFIBtn.Margin = new System.Windows.Forms.Padding(4); + this.FMAFIBtn.Location = new System.Drawing.Point(13, 74); this.FMAFIBtn.Name = "FMAFIBtn"; - this.FMAFIBtn.Size = new System.Drawing.Size(240, 34); + this.FMAFIBtn.Size = new System.Drawing.Size(168, 23); this.FMAFIBtn.TabIndex = 1; this.FMAFIBtn.Text = "Find MAC Address from ID"; this.FMAFIBtn.UseVisualStyleBackColor = true; @@ -489,10 +464,9 @@ // FIFMABtn // this.FIFMABtn.ForeColor = System.Drawing.Color.Black; - this.FIFMABtn.Location = new System.Drawing.Point(19, 20); - this.FIFMABtn.Margin = new System.Windows.Forms.Padding(4); + this.FIFMABtn.Location = new System.Drawing.Point(13, 13); this.FIFMABtn.Name = "FIFMABtn"; - this.FIFMABtn.Size = new System.Drawing.Size(240, 34); + this.FIFMABtn.Size = new System.Drawing.Size(168, 23); this.FIFMABtn.TabIndex = 0; this.FIFMABtn.Text = "Find ID from MAC Address"; this.FIFMABtn.UseVisualStyleBackColor = true; @@ -510,11 +484,9 @@ this.groupBox1.Controls.Add(this.UserIDtextBox); this.groupBox1.Controls.Add(this.UserConnectButton); this.groupBox1.ForeColor = System.Drawing.Color.White; - this.groupBox1.Location = new System.Drawing.Point(17, 210); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4); + this.groupBox1.Location = new System.Drawing.Point(12, 140); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4); - this.groupBox1.Size = new System.Drawing.Size(886, 86); + this.groupBox1.Size = new System.Drawing.Size(620, 57); this.groupBox1.TabIndex = 34; this.groupBox1.TabStop = false; this.groupBox1.Text = "Login"; @@ -523,29 +495,26 @@ // this.progressBar2.BackColor = System.Drawing.Color.Red; this.progressBar2.ForeColor = System.Drawing.Color.Red; - this.progressBar2.Location = new System.Drawing.Point(270, 64); - this.progressBar2.Margin = new System.Windows.Forms.Padding(4); + this.progressBar2.Location = new System.Drawing.Point(189, 43); this.progressBar2.Name = "progressBar2"; - this.progressBar2.Size = new System.Drawing.Size(609, 15); + this.progressBar2.Size = new System.Drawing.Size(426, 10); this.progressBar2.TabIndex = 94; // // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(701, 18); - this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label13.Location = new System.Drawing.Point(491, 12); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(135, 18); + this.label13.Size = new System.Drawing.Size(96, 12); this.label13.TabIndex = 92; this.label13.Text = "[Session Time]"; // // SessionTimelabel // this.SessionTimelabel.AutoSize = true; - this.SessionTimelabel.Location = new System.Drawing.Point(716, 42); - this.SessionTimelabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.SessionTimelabel.Location = new System.Drawing.Point(501, 28); this.SessionTimelabel.Name = "SessionTimelabel"; - this.SessionTimelabel.Size = new System.Drawing.Size(17, 18); + this.SessionTimelabel.Size = new System.Drawing.Size(11, 12); this.SessionTimelabel.TabIndex = 91; this.SessionTimelabel.Text = "-"; this.SessionTimelabel.DoubleClick += new System.EventHandler(this.SessionTimelabel_DoubleClick); @@ -553,20 +522,18 @@ // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(437, 40); - this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label12.Location = new System.Drawing.Point(306, 27); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(103, 18); + this.label12.Size = new System.Drawing.Size(72, 12); this.label12.TabIndex = 90; this.label12.Text = "PASSWORD"; // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(271, 40); - this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label11.Location = new System.Drawing.Point(190, 27); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(22, 18); + this.label11.Size = new System.Drawing.Size(16, 12); this.label11.TabIndex = 89; this.label11.Text = "ID"; // @@ -575,10 +542,9 @@ this.UserDisconnectButton.Dock = System.Windows.Forms.DockStyle.Left; this.UserDisconnectButton.Enabled = false; this.UserDisconnectButton.ForeColor = System.Drawing.Color.Black; - this.UserDisconnectButton.Location = new System.Drawing.Point(134, 25); - this.UserDisconnectButton.Margin = new System.Windows.Forms.Padding(4); + this.UserDisconnectButton.Location = new System.Drawing.Point(94, 17); this.UserDisconnectButton.Name = "UserDisconnectButton"; - this.UserDisconnectButton.Size = new System.Drawing.Size(130, 57); + this.UserDisconnectButton.Size = new System.Drawing.Size(91, 37); this.UserDisconnectButton.TabIndex = 88; this.UserDisconnectButton.Text = "Disconnect"; this.UserDisconnectButton.UseVisualStyleBackColor = true; @@ -587,30 +553,27 @@ // UserPasswordtextBox // this.UserPasswordtextBox.ForeColor = System.Drawing.Color.Black; - this.UserPasswordtextBox.Location = new System.Drawing.Point(549, 32); - this.UserPasswordtextBox.Margin = new System.Windows.Forms.Padding(4); + this.UserPasswordtextBox.Location = new System.Drawing.Point(384, 21); this.UserPasswordtextBox.Name = "UserPasswordtextBox"; this.UserPasswordtextBox.PasswordChar = '*'; - this.UserPasswordtextBox.Size = new System.Drawing.Size(124, 28); + this.UserPasswordtextBox.Size = new System.Drawing.Size(88, 21); this.UserPasswordtextBox.TabIndex = 87; // // UserIDtextBox // this.UserIDtextBox.ForeColor = System.Drawing.Color.Black; - this.UserIDtextBox.Location = new System.Drawing.Point(303, 32); - this.UserIDtextBox.Margin = new System.Windows.Forms.Padding(4); + this.UserIDtextBox.Location = new System.Drawing.Point(212, 21); this.UserIDtextBox.Name = "UserIDtextBox"; - this.UserIDtextBox.Size = new System.Drawing.Size(124, 28); + this.UserIDtextBox.Size = new System.Drawing.Size(88, 21); this.UserIDtextBox.TabIndex = 86; // // UserConnectButton // this.UserConnectButton.Dock = System.Windows.Forms.DockStyle.Left; this.UserConnectButton.ForeColor = System.Drawing.Color.Black; - this.UserConnectButton.Location = new System.Drawing.Point(4, 25); - this.UserConnectButton.Margin = new System.Windows.Forms.Padding(4); + this.UserConnectButton.Location = new System.Drawing.Point(3, 17); this.UserConnectButton.Name = "UserConnectButton"; - this.UserConnectButton.Size = new System.Drawing.Size(130, 57); + this.UserConnectButton.Size = new System.Drawing.Size(91, 37); this.UserConnectButton.TabIndex = 85; this.UserConnectButton.Text = "Connect"; this.UserConnectButton.UseVisualStyleBackColor = true; @@ -619,10 +582,9 @@ // UserButton // this.UserButton.BackColor = System.Drawing.Color.Blue; - this.UserButton.Location = new System.Drawing.Point(44, 4); - this.UserButton.Margin = new System.Windows.Forms.Padding(4); + this.UserButton.Location = new System.Drawing.Point(31, 3); this.UserButton.Name = "UserButton"; - this.UserButton.Size = new System.Drawing.Size(31, 32); + this.UserButton.Size = new System.Drawing.Size(22, 21); this.UserButton.TabIndex = 33; this.UserButton.UseVisualStyleBackColor = false; this.UserButton.Visible = false; @@ -635,10 +597,9 @@ this.panel1.Controls.Add(this.LastStreamLabel); this.panel1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.panel1.ForeColor = System.Drawing.Color.White; - this.panel1.Location = new System.Drawing.Point(650, 9); - this.panel1.Margin = new System.Windows.Forms.Padding(4); + this.panel1.Location = new System.Drawing.Point(455, 6); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(243, 74); + this.panel1.Size = new System.Drawing.Size(171, 50); this.panel1.TabIndex = 32; // // LastStreamTimeLabel @@ -646,10 +607,9 @@ this.LastStreamTimeLabel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.LastStreamTimeLabel.Dock = System.Windows.Forms.DockStyle.Fill; this.LastStreamTimeLabel.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.LastStreamTimeLabel.Location = new System.Drawing.Point(0, 32); - this.LastStreamTimeLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.LastStreamTimeLabel.Location = new System.Drawing.Point(0, 22); this.LastStreamTimeLabel.Name = "LastStreamTimeLabel"; - this.LastStreamTimeLabel.Size = new System.Drawing.Size(241, 40); + this.LastStreamTimeLabel.Size = new System.Drawing.Size(169, 26); this.LastStreamTimeLabel.TabIndex = 1; this.LastStreamTimeLabel.Text = "-"; this.LastStreamTimeLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -660,9 +620,8 @@ this.LastStreamLabel.Dock = System.Windows.Forms.DockStyle.Top; this.LastStreamLabel.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.LastStreamLabel.Location = new System.Drawing.Point(0, 0); - this.LastStreamLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.LastStreamLabel.Name = "LastStreamLabel"; - this.LastStreamLabel.Size = new System.Drawing.Size(241, 32); + this.LastStreamLabel.Size = new System.Drawing.Size(169, 22); this.LastStreamLabel.TabIndex = 0; this.LastStreamLabel.Text = "Last Stream Time(ms)"; this.LastStreamLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -674,10 +633,9 @@ this.LastCommandPanel.Controls.Add(this.LastCommandLabel); this.LastCommandPanel.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.LastCommandPanel.ForeColor = System.Drawing.Color.White; - this.LastCommandPanel.Location = new System.Drawing.Point(397, 9); - this.LastCommandPanel.Margin = new System.Windows.Forms.Padding(4); + this.LastCommandPanel.Location = new System.Drawing.Point(278, 6); this.LastCommandPanel.Name = "LastCommandPanel"; - this.LastCommandPanel.Size = new System.Drawing.Size(243, 74); + this.LastCommandPanel.Size = new System.Drawing.Size(171, 50); this.LastCommandPanel.TabIndex = 2; // // LastCommandTimeLabel @@ -685,10 +643,9 @@ this.LastCommandTimeLabel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.LastCommandTimeLabel.Dock = System.Windows.Forms.DockStyle.Fill; this.LastCommandTimeLabel.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.LastCommandTimeLabel.Location = new System.Drawing.Point(0, 32); - this.LastCommandTimeLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.LastCommandTimeLabel.Location = new System.Drawing.Point(0, 22); this.LastCommandTimeLabel.Name = "LastCommandTimeLabel"; - this.LastCommandTimeLabel.Size = new System.Drawing.Size(241, 40); + this.LastCommandTimeLabel.Size = new System.Drawing.Size(169, 26); this.LastCommandTimeLabel.TabIndex = 1; this.LastCommandTimeLabel.Text = "-"; this.LastCommandTimeLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -699,9 +656,8 @@ this.LastCommandLabel.Dock = System.Windows.Forms.DockStyle.Top; this.LastCommandLabel.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.LastCommandLabel.Location = new System.Drawing.Point(0, 0); - this.LastCommandLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.LastCommandLabel.Name = "LastCommandLabel"; - this.LastCommandLabel.Size = new System.Drawing.Size(241, 32); + this.LastCommandLabel.Size = new System.Drawing.Size(169, 22); this.LastCommandLabel.TabIndex = 0; this.LastCommandLabel.Text = "Last Command Time(ms)"; this.LastCommandLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -709,10 +665,9 @@ // DebugButton // this.DebugButton.BackColor = System.Drawing.Color.Yellow; - this.DebugButton.Location = new System.Drawing.Point(4, 4); - this.DebugButton.Margin = new System.Windows.Forms.Padding(4); + this.DebugButton.Location = new System.Drawing.Point(3, 3); this.DebugButton.Name = "DebugButton"; - this.DebugButton.Size = new System.Drawing.Size(31, 32); + this.DebugButton.Size = new System.Drawing.Size(22, 21); this.DebugButton.TabIndex = 0; this.DebugButton.UseVisualStyleBackColor = false; this.DebugButton.Visible = false; @@ -723,10 +678,9 @@ this.StatePanel.Controls.Add(this.Statelabel); this.StatePanel.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.StatePanel.ForeColor = System.Drawing.Color.White; - this.StatePanel.Location = new System.Drawing.Point(17, 18); - this.StatePanel.Margin = new System.Windows.Forms.Padding(4); + this.StatePanel.Location = new System.Drawing.Point(12, 12); this.StatePanel.Name = "StatePanel"; - this.StatePanel.Size = new System.Drawing.Size(371, 56); + this.StatePanel.Size = new System.Drawing.Size(260, 37); this.StatePanel.TabIndex = 1; // // Statelabel @@ -735,9 +689,8 @@ this.Statelabel.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.Statelabel.ForeColor = System.Drawing.Color.Red; this.Statelabel.Location = new System.Drawing.Point(0, 0); - this.Statelabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.Statelabel.Name = "Statelabel"; - this.Statelabel.Size = new System.Drawing.Size(371, 56); + this.Statelabel.Size = new System.Drawing.Size(260, 37); this.Statelabel.TabIndex = 0; this.Statelabel.Text = "DISCONNECT"; this.Statelabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -761,20 +714,20 @@ this.toolStripSeparator1, this.toolStripMenuItemExit}); this.contextMenuSubStrip.Name = "contextMenuSubStrip"; - this.contextMenuSubStrip.Size = new System.Drawing.Size(207, 42); + this.contextMenuSubStrip.Size = new System.Drawing.Size(155, 32); this.contextMenuSubStrip.Text = "Menu"; this.contextMenuSubStrip.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.contextMenuSubStrip_ItemClicked); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(203, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(151, 6); // // toolStripMenuItemExit // this.toolStripMenuItemExit.BackColor = System.Drawing.Color.Khaki; this.toolStripMenuItemExit.Name = "toolStripMenuItemExit"; - this.toolStripMenuItemExit.Size = new System.Drawing.Size(206, 32); + this.toolStripMenuItemExit.Size = new System.Drawing.Size(154, 22); this.toolStripMenuItemExit.Text = "Program Exit"; // // Statetimer @@ -784,10 +737,9 @@ // // button_QT // - this.button_QT.Location = new System.Drawing.Point(169, 100); - this.button_QT.Margin = new System.Windows.Forms.Padding(4); + this.button_QT.Location = new System.Drawing.Point(118, 67); this.button_QT.Name = "button_QT"; - this.button_QT.Size = new System.Drawing.Size(143, 28); + this.button_QT.Size = new System.Drawing.Size(100, 19); this.button_QT.TabIndex = 31; this.button_QT.Text = "Query TestList"; this.button_QT.UseVisualStyleBackColor = true; @@ -795,100 +747,89 @@ // // QT_ProdcNoC_Info // - this.QT_ProdcNoC_Info.Location = new System.Drawing.Point(169, 134); - this.QT_ProdcNoC_Info.Margin = new System.Windows.Forms.Padding(4); + this.QT_ProdcNoC_Info.Location = new System.Drawing.Point(118, 89); this.QT_ProdcNoC_Info.Name = "QT_ProdcNoC_Info"; - this.QT_ProdcNoC_Info.Size = new System.Drawing.Size(141, 28); + this.QT_ProdcNoC_Info.Size = new System.Drawing.Size(100, 21); this.QT_ProdcNoC_Info.TabIndex = 32; // // QT_TestType_Info // - this.QT_TestType_Info.Location = new System.Drawing.Point(169, 248); - this.QT_TestType_Info.Margin = new System.Windows.Forms.Padding(4); + this.QT_TestType_Info.Location = new System.Drawing.Point(118, 165); this.QT_TestType_Info.Name = "QT_TestType_Info"; - this.QT_TestType_Info.Size = new System.Drawing.Size(141, 28); + this.QT_TestType_Info.Size = new System.Drawing.Size(100, 21); this.QT_TestType_Info.TabIndex = 33; // // QT_TestCode_Info // - this.QT_TestCode_Info.Location = new System.Drawing.Point(169, 286); - this.QT_TestCode_Info.Margin = new System.Windows.Forms.Padding(4); + this.QT_TestCode_Info.Location = new System.Drawing.Point(118, 191); this.QT_TestCode_Info.Name = "QT_TestCode_Info"; - this.QT_TestCode_Info.Size = new System.Drawing.Size(141, 28); + this.QT_TestCode_Info.Size = new System.Drawing.Size(100, 21); this.QT_TestCode_Info.TabIndex = 34; // // QT_TestListVersion_Info // - this.QT_TestListVersion_Info.Location = new System.Drawing.Point(169, 327); - this.QT_TestListVersion_Info.Margin = new System.Windows.Forms.Padding(4); + this.QT_TestListVersion_Info.Location = new System.Drawing.Point(118, 218); this.QT_TestListVersion_Info.Name = "QT_TestListVersion_Info"; - this.QT_TestListVersion_Info.Size = new System.Drawing.Size(141, 28); + this.QT_TestListVersion_Info.Size = new System.Drawing.Size(100, 21); this.QT_TestListVersion_Info.TabIndex = 35; // // QT_ProductionCode_Info // - this.QT_ProductionCode_Info.Location = new System.Drawing.Point(169, 368); - this.QT_ProductionCode_Info.Margin = new System.Windows.Forms.Padding(4); + this.QT_ProductionCode_Info.Location = new System.Drawing.Point(118, 245); this.QT_ProductionCode_Info.Name = "QT_ProductionCode_Info"; - this.QT_ProductionCode_Info.Size = new System.Drawing.Size(141, 28); + this.QT_ProductionCode_Info.Size = new System.Drawing.Size(100, 21); this.QT_ProductionCode_Info.TabIndex = 36; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(67, 138); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(47, 92); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(90, 18); + this.label1.Size = new System.Drawing.Size(62, 12); this.label1.TabIndex = 37; this.label1.Text = "ProdNo_C"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(71, 252); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(50, 168); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(83, 18); + this.label2.Size = new System.Drawing.Size(59, 12); this.label2.TabIndex = 38; this.label2.Text = "TestType"; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(70, 291); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Location = new System.Drawing.Point(49, 194); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(86, 18); + this.label3.Size = new System.Drawing.Size(60, 12); this.label3.TabIndex = 39; this.label3.Text = "TestCode"; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(17, 332); - this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label4.Location = new System.Drawing.Point(12, 221); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(137, 18); + this.label4.Size = new System.Drawing.Size(97, 12); this.label4.TabIndex = 40; this.label4.Text = "TestList Version"; // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(14, 372); - this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label5.Location = new System.Drawing.Point(10, 248); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(144, 18); + this.label5.Size = new System.Drawing.Size(99, 12); this.label5.TabIndex = 41; this.label5.Text = "Production Code"; // // Button_FindInfo // - this.Button_FindInfo.Location = new System.Drawing.Point(169, 174); - this.Button_FindInfo.Margin = new System.Windows.Forms.Padding(4); + this.Button_FindInfo.Location = new System.Drawing.Point(118, 116); this.Button_FindInfo.Name = "Button_FindInfo"; - this.Button_FindInfo.Size = new System.Drawing.Size(143, 28); + this.Button_FindInfo.Size = new System.Drawing.Size(100, 19); this.Button_FindInfo.TabIndex = 43; this.Button_FindInfo.Text = "Find Info"; this.Button_FindInfo.UseVisualStyleBackColor = true; @@ -896,10 +837,9 @@ // // Button_List // - this.Button_List.Location = new System.Drawing.Point(24, 174); - this.Button_List.Margin = new System.Windows.Forms.Padding(4); + this.Button_List.Location = new System.Drawing.Point(17, 116); this.Button_List.Name = "Button_List"; - this.Button_List.Size = new System.Drawing.Size(143, 27); + this.Button_List.Size = new System.Drawing.Size(100, 18); this.Button_List.TabIndex = 44; this.Button_List.Text = "List"; this.Button_List.UseVisualStyleBackColor = true; @@ -907,10 +847,9 @@ // // richTextBox1 // - this.richTextBox1.Location = new System.Drawing.Point(17, 408); - this.richTextBox1.Margin = new System.Windows.Forms.Padding(4); + this.richTextBox1.Location = new System.Drawing.Point(12, 272); this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(303, 289); + this.richTextBox1.Size = new System.Drawing.Size(213, 194); this.richTextBox1.TabIndex = 45; this.richTextBox1.Text = ""; // @@ -920,10 +859,9 @@ // // button1 // - this.button1.Location = new System.Drawing.Point(331, 794); - this.button1.Margin = new System.Windows.Forms.Padding(4); + this.button1.Location = new System.Drawing.Point(232, 529); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(226, 32); + this.button1.Size = new System.Drawing.Size(158, 21); this.button1.TabIndex = 46; this.button1.Text = "CP Log - FileSend"; this.button1.UseVisualStyleBackColor = true; @@ -933,21 +871,19 @@ // this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Location = new System.Drawing.Point(320, 100); - this.tabControl1.Margin = new System.Windows.Forms.Padding(4); + this.tabControl1.Location = new System.Drawing.Point(224, 67); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(883, 558); + this.tabControl1.Size = new System.Drawing.Size(618, 372); this.tabControl1.TabIndex = 47; // // tabPage1 // this.tabPage1.Controls.Add(this.dataGridView1); - this.tabPage1.Location = new System.Drawing.Point(4, 28); - this.tabPage1.Margin = new System.Windows.Forms.Padding(4); + this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(4); - this.tabPage1.Size = new System.Drawing.Size(875, 526); + this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.tabPage1.Size = new System.Drawing.Size(610, 346); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "TestList"; this.tabPage1.UseVisualStyleBackColor = true; @@ -956,13 +892,12 @@ // this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridView1.Location = new System.Drawing.Point(4, 4); - this.dataGridView1.Margin = new System.Windows.Forms.Padding(4); + this.dataGridView1.Location = new System.Drawing.Point(3, 3); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.ReadOnly = true; this.dataGridView1.RowHeadersWidth = 62; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(867, 518); + this.dataGridView1.Size = new System.Drawing.Size(604, 340); this.dataGridView1.TabIndex = 43; // // tabPage2 @@ -970,21 +905,19 @@ this.tabPage2.Controls.Add(this.button3); this.tabPage2.Controls.Add(this.button2); this.tabPage2.Controls.Add(this.dataGridView2); - this.tabPage2.Location = new System.Drawing.Point(4, 28); - this.tabPage2.Margin = new System.Windows.Forms.Padding(4); + this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(4); - this.tabPage2.Size = new System.Drawing.Size(875, 526); + this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.tabPage2.Size = new System.Drawing.Size(610, 346); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "TestListFile"; this.tabPage2.UseVisualStyleBackColor = true; // // button3 // - this.button3.Location = new System.Drawing.Point(383, 4); - this.button3.Margin = new System.Windows.Forms.Padding(4); + this.button3.Location = new System.Drawing.Point(268, 3); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(366, 32); + this.button3.Size = new System.Drawing.Size(256, 21); this.button3.TabIndex = 48; this.button3.Text = "Next"; this.button3.UseVisualStyleBackColor = true; @@ -992,10 +925,9 @@ // // button2 // - this.button2.Location = new System.Drawing.Point(9, 4); - this.button2.Margin = new System.Windows.Forms.Padding(4); + this.button2.Location = new System.Drawing.Point(6, 3); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(366, 32); + this.button2.Size = new System.Drawing.Size(256, 21); this.button2.TabIndex = 47; this.button2.Text = "Prev"; this.button2.UseVisualStyleBackColor = true; @@ -1005,57 +937,51 @@ // this.dataGridView2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.dataGridView2.Location = new System.Drawing.Point(4, 94); - this.dataGridView2.Margin = new System.Windows.Forms.Padding(4); + this.dataGridView2.Location = new System.Drawing.Point(3, 58); this.dataGridView2.Name = "dataGridView2"; this.dataGridView2.ReadOnly = true; this.dataGridView2.RowHeadersWidth = 62; this.dataGridView2.RowTemplate.Height = 23; - this.dataGridView2.Size = new System.Drawing.Size(867, 428); + this.dataGridView2.Size = new System.Drawing.Size(604, 285); this.dataGridView2.TabIndex = 44; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(71, 214); - this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label6.Location = new System.Drawing.Point(50, 143); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(89, 18); + this.label6.Size = new System.Drawing.Size(61, 12); this.label6.TabIndex = 49; this.label6.Text = "ProdNo_P"; // // QT_ProdNoP_Info // - this.QT_ProdNoP_Info.Location = new System.Drawing.Point(169, 210); - this.QT_ProdNoP_Info.Margin = new System.Windows.Forms.Padding(4); + this.QT_ProdNoP_Info.Location = new System.Drawing.Point(118, 140); this.QT_ProdNoP_Info.Name = "QT_ProdNoP_Info"; - this.QT_ProdNoP_Info.Size = new System.Drawing.Size(141, 28); + this.QT_ProdNoP_Info.Size = new System.Drawing.Size(100, 21); this.QT_ProdNoP_Info.TabIndex = 48; // // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(1, 102); - this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label7.Location = new System.Drawing.Point(1, 68); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(77, 18); + this.label7.Size = new System.Drawing.Size(54, 12); this.label7.TabIndex = 51; this.label7.Text = "StationID"; // // textBox1 // - this.textBox1.Location = new System.Drawing.Point(87, 98); - this.textBox1.Margin = new System.Windows.Forms.Padding(4); + this.textBox1.Location = new System.Drawing.Point(61, 65); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(78, 28); + this.textBox1.Size = new System.Drawing.Size(56, 21); this.textBox1.TabIndex = 50; // // button4 // - this.button4.Location = new System.Drawing.Point(816, 794); - this.button4.Margin = new System.Windows.Forms.Padding(4); + this.button4.Location = new System.Drawing.Point(571, 529); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(110, 32); + this.button4.Size = new System.Drawing.Size(77, 21); this.button4.TabIndex = 52; this.button4.Text = "FileSend"; this.button4.UseVisualStyleBackColor = true; @@ -1063,10 +989,9 @@ // // button5 // - this.button5.Location = new System.Drawing.Point(929, 9); - this.button5.Margin = new System.Windows.Forms.Padding(4); + this.button5.Location = new System.Drawing.Point(650, 6); this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(130, 32); + this.button5.Size = new System.Drawing.Size(91, 21); this.button5.TabIndex = 53; this.button5.Text = "User Query"; this.button5.UseVisualStyleBackColor = true; @@ -1074,18 +999,16 @@ // // textBox2 // - this.textBox2.Location = new System.Drawing.Point(1067, 9); - this.textBox2.Margin = new System.Windows.Forms.Padding(4); + this.textBox2.Location = new System.Drawing.Point(747, 6); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(690, 28); + this.textBox2.Size = new System.Drawing.Size(484, 21); this.textBox2.TabIndex = 54; // // button6 // - this.button6.Location = new System.Drawing.Point(1210, 124); - this.button6.Margin = new System.Windows.Forms.Padding(4); + this.button6.Location = new System.Drawing.Point(847, 83); this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(227, 32); + this.button6.Size = new System.Drawing.Size(159, 21); this.button6.TabIndex = 55; this.button6.Text = "IsIssued by ID"; this.button6.UseVisualStyleBackColor = true; @@ -1093,26 +1016,23 @@ // // textBox3 // - this.textBox3.Location = new System.Drawing.Point(1446, 126); - this.textBox3.Margin = new System.Windows.Forms.Padding(4); + this.textBox3.Location = new System.Drawing.Point(1012, 84); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(191, 28); + this.textBox3.Size = new System.Drawing.Size(135, 21); this.textBox3.TabIndex = 56; // // textBox4 // - this.textBox4.Location = new System.Drawing.Point(1446, 207); - this.textBox4.Margin = new System.Windows.Forms.Padding(4); + this.textBox4.Location = new System.Drawing.Point(1012, 138); this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(191, 28); + this.textBox4.Size = new System.Drawing.Size(135, 21); this.textBox4.TabIndex = 58; // // button7 // - this.button7.Location = new System.Drawing.Point(1210, 206); - this.button7.Margin = new System.Windows.Forms.Padding(4); + this.button7.Location = new System.Drawing.Point(847, 137); this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(227, 32); + this.button7.Size = new System.Drawing.Size(159, 21); this.button7.TabIndex = 57; this.button7.Text = "IsIssued by MAC"; this.button7.UseVisualStyleBackColor = true; @@ -1120,18 +1040,16 @@ // // textBox5 // - this.textBox5.Location = new System.Drawing.Point(1446, 166); - this.textBox5.Margin = new System.Windows.Forms.Padding(4); + this.textBox5.Location = new System.Drawing.Point(1012, 111); this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(191, 28); + this.textBox5.Size = new System.Drawing.Size(135, 21); this.textBox5.TabIndex = 60; // // button8 // - this.button8.Location = new System.Drawing.Point(1210, 165); - this.button8.Margin = new System.Windows.Forms.Padding(4); + this.button8.Location = new System.Drawing.Point(847, 110); this.button8.Name = "button8"; - this.button8.Size = new System.Drawing.Size(227, 32); + this.button8.Size = new System.Drawing.Size(159, 21); this.button8.TabIndex = 59; this.button8.Text = "Check MAC"; this.button8.UseVisualStyleBackColor = true; @@ -1139,18 +1057,16 @@ // // textBox6 // - this.textBox6.Location = new System.Drawing.Point(1446, 286); - this.textBox6.Margin = new System.Windows.Forms.Padding(4); + this.textBox6.Location = new System.Drawing.Point(1012, 191); this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(191, 28); + this.textBox6.Size = new System.Drawing.Size(135, 21); this.textBox6.TabIndex = 62; // // button9 // - this.button9.Location = new System.Drawing.Point(1206, 286); - this.button9.Margin = new System.Windows.Forms.Padding(4); + this.button9.Location = new System.Drawing.Point(844, 191); this.button9.Name = "button9"; - this.button9.Size = new System.Drawing.Size(227, 32); + this.button9.Size = new System.Drawing.Size(159, 21); this.button9.TabIndex = 61; this.button9.Text = "To be issued MAC"; this.button9.UseVisualStyleBackColor = true; @@ -1165,18 +1081,16 @@ "Colon", "Hyphen", "Dot"}); - this.comboBox1.Location = new System.Drawing.Point(1446, 252); - this.comboBox1.Margin = new System.Windows.Forms.Padding(4); + this.comboBox1.Location = new System.Drawing.Point(1012, 168); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(191, 26); + this.comboBox1.Size = new System.Drawing.Size(135, 20); this.comboBox1.TabIndex = 63; // // button10 // - this.button10.Location = new System.Drawing.Point(1211, 332); - this.button10.Margin = new System.Windows.Forms.Padding(4); + this.button10.Location = new System.Drawing.Point(848, 221); this.button10.Name = "button10"; - this.button10.Size = new System.Drawing.Size(227, 32); + this.button10.Size = new System.Drawing.Size(159, 21); this.button10.TabIndex = 64; this.button10.Text = "all"; this.button10.UseVisualStyleBackColor = true; @@ -1184,10 +1098,9 @@ // // button11 // - this.button11.Location = new System.Drawing.Point(1211, 372); - this.button11.Margin = new System.Windows.Forms.Padding(4); + this.button11.Location = new System.Drawing.Point(848, 248); this.button11.Name = "button11"; - this.button11.Size = new System.Drawing.Size(227, 32); + this.button11.Size = new System.Drawing.Size(159, 21); this.button11.TabIndex = 65; this.button11.Text = "curr"; this.button11.UseVisualStyleBackColor = true; @@ -1195,10 +1108,9 @@ // // button12 // - this.button12.Location = new System.Drawing.Point(1211, 412); - this.button12.Margin = new System.Windows.Forms.Padding(4); + this.button12.Location = new System.Drawing.Point(848, 275); this.button12.Name = "button12"; - this.button12.Size = new System.Drawing.Size(227, 32); + this.button12.Size = new System.Drawing.Size(159, 21); this.button12.TabIndex = 66; this.button12.Text = "remain"; this.button12.UseVisualStyleBackColor = true; @@ -1207,39 +1119,35 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(1447, 338); - this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label8.Location = new System.Drawing.Point(1013, 225); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(54, 18); + this.label8.Size = new System.Drawing.Size(38, 12); this.label8.TabIndex = 67; this.label8.Text = "label8"; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(1447, 378); - this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label9.Location = new System.Drawing.Point(1013, 252); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(54, 18); + this.label9.Size = new System.Drawing.Size(38, 12); this.label9.TabIndex = 68; this.label9.Text = "label9"; // // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(1447, 418); - this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label10.Location = new System.Drawing.Point(1013, 279); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(64, 18); + this.label10.Size = new System.Drawing.Size(44, 12); this.label10.TabIndex = 69; this.label10.Text = "label10"; // // button13 // - this.button13.Location = new System.Drawing.Point(1211, 453); - this.button13.Margin = new System.Windows.Forms.Padding(4); + this.button13.Location = new System.Drawing.Point(848, 302); this.button13.Name = "button13"; - this.button13.Size = new System.Drawing.Size(203, 32); + this.button13.Size = new System.Drawing.Size(142, 21); this.button13.TabIndex = 70; this.button13.Text = "LookUpID By MAC"; this.button13.UseVisualStyleBackColor = true; @@ -1247,10 +1155,9 @@ // // button14 // - this.button14.Location = new System.Drawing.Point(1211, 525); - this.button14.Margin = new System.Windows.Forms.Padding(4); + this.button14.Location = new System.Drawing.Point(848, 350); this.button14.Name = "button14"; - this.button14.Size = new System.Drawing.Size(203, 32); + this.button14.Size = new System.Drawing.Size(142, 21); this.button14.TabIndex = 71; this.button14.Text = "LookUpMAC By ID"; this.button14.UseVisualStyleBackColor = true; @@ -1258,36 +1165,32 @@ // // textBox7 // - this.textBox7.Location = new System.Drawing.Point(1343, 486); - this.textBox7.Margin = new System.Windows.Forms.Padding(4); + this.textBox7.Location = new System.Drawing.Point(940, 324); this.textBox7.Name = "textBox7"; - this.textBox7.Size = new System.Drawing.Size(191, 28); + this.textBox7.Size = new System.Drawing.Size(135, 21); this.textBox7.TabIndex = 72; // // textBox8 // - this.textBox8.Location = new System.Drawing.Point(1544, 486); - this.textBox8.Margin = new System.Windows.Forms.Padding(4); + this.textBox8.Location = new System.Drawing.Point(1081, 324); this.textBox8.Name = "textBox8"; this.textBox8.ReadOnly = true; - this.textBox8.Size = new System.Drawing.Size(191, 28); + this.textBox8.Size = new System.Drawing.Size(135, 21); this.textBox8.TabIndex = 73; // // textBox10 // - this.textBox10.Location = new System.Drawing.Point(1544, 562); - this.textBox10.Margin = new System.Windows.Forms.Padding(4); + this.textBox10.Location = new System.Drawing.Point(1081, 375); this.textBox10.Name = "textBox10"; this.textBox10.ReadOnly = true; - this.textBox10.Size = new System.Drawing.Size(191, 28); + this.textBox10.Size = new System.Drawing.Size(135, 21); this.textBox10.TabIndex = 75; // // textBox9 // - this.textBox9.Location = new System.Drawing.Point(1343, 562); - this.textBox9.Margin = new System.Windows.Forms.Padding(4); + this.textBox9.Location = new System.Drawing.Point(940, 375); this.textBox9.Name = "textBox9"; - this.textBox9.Size = new System.Drawing.Size(191, 28); + this.textBox9.Size = new System.Drawing.Size(135, 21); this.textBox9.TabIndex = 74; // // comboBox2 @@ -1299,18 +1202,16 @@ "Colon", "Hyphen", "Dot"}); - this.comboBox2.Location = new System.Drawing.Point(1423, 525); - this.comboBox2.Margin = new System.Windows.Forms.Padding(4); + this.comboBox2.Location = new System.Drawing.Point(996, 350); this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(191, 26); + this.comboBox2.Size = new System.Drawing.Size(135, 20); this.comboBox2.TabIndex = 76; // // button15 // - this.button15.Location = new System.Drawing.Point(1211, 603); - this.button15.Margin = new System.Windows.Forms.Padding(4); + this.button15.Location = new System.Drawing.Point(848, 402); this.button15.Name = "button15"; - this.button15.Size = new System.Drawing.Size(203, 32); + this.button15.Size = new System.Drawing.Size(142, 21); this.button15.TabIndex = 77; this.button15.Text = "IssuanceRequest"; this.button15.UseVisualStyleBackColor = true; @@ -1318,19 +1219,17 @@ // // textBox11 // - this.textBox11.Location = new System.Drawing.Point(1423, 645); - this.textBox11.Margin = new System.Windows.Forms.Padding(4); + this.textBox11.Location = new System.Drawing.Point(996, 430); this.textBox11.Name = "textBox11"; - this.textBox11.Size = new System.Drawing.Size(191, 28); + this.textBox11.Size = new System.Drawing.Size(135, 21); this.textBox11.TabIndex = 78; // // textBox12 // - this.textBox12.Location = new System.Drawing.Point(1211, 686); - this.textBox12.Margin = new System.Windows.Forms.Padding(4); + this.textBox12.Location = new System.Drawing.Point(848, 457); this.textBox12.Name = "textBox12"; this.textBox12.ReadOnly = true; - this.textBox12.Size = new System.Drawing.Size(588, 28); + this.textBox12.Size = new System.Drawing.Size(413, 21); this.textBox12.TabIndex = 79; // // comboBox3 @@ -1342,18 +1241,16 @@ "Colon", "Hyphen", "Dot"}); - this.comboBox3.Location = new System.Drawing.Point(1423, 604); - this.comboBox3.Margin = new System.Windows.Forms.Padding(4); + this.comboBox3.Location = new System.Drawing.Point(996, 403); this.comboBox3.Name = "comboBox3"; - this.comboBox3.Size = new System.Drawing.Size(191, 26); + this.comboBox3.Size = new System.Drawing.Size(135, 20); this.comboBox3.TabIndex = 80; // // button16 // - this.button16.Location = new System.Drawing.Point(929, 60); - this.button16.Margin = new System.Windows.Forms.Padding(4); + this.button16.Location = new System.Drawing.Point(650, 40); this.button16.Name = "button16"; - this.button16.Size = new System.Drawing.Size(130, 32); + this.button16.Size = new System.Drawing.Size(91, 21); this.button16.TabIndex = 81; this.button16.Text = "Connect"; this.button16.UseVisualStyleBackColor = true; @@ -1361,27 +1258,24 @@ // // textBox13 // - this.textBox13.Location = new System.Drawing.Point(1067, 60); - this.textBox13.Margin = new System.Windows.Forms.Padding(4); + this.textBox13.Location = new System.Drawing.Point(747, 40); this.textBox13.Name = "textBox13"; - this.textBox13.Size = new System.Drawing.Size(124, 28); + this.textBox13.Size = new System.Drawing.Size(88, 21); this.textBox13.TabIndex = 82; // // textBox14 // - this.textBox14.Location = new System.Drawing.Point(1201, 60); - this.textBox14.Margin = new System.Windows.Forms.Padding(4); + this.textBox14.Location = new System.Drawing.Point(841, 40); this.textBox14.Name = "textBox14"; this.textBox14.PasswordChar = '*'; - this.textBox14.Size = new System.Drawing.Size(124, 28); + this.textBox14.Size = new System.Drawing.Size(88, 21); this.textBox14.TabIndex = 83; // // button17 // - this.button17.Location = new System.Drawing.Point(1343, 60); - this.button17.Margin = new System.Windows.Forms.Padding(4); + this.button17.Location = new System.Drawing.Point(940, 40); this.button17.Name = "button17"; - this.button17.Size = new System.Drawing.Size(130, 32); + this.button17.Size = new System.Drawing.Size(91, 21); this.button17.TabIndex = 84; this.button17.Text = "Disconnect"; this.button17.UseVisualStyleBackColor = true; @@ -1389,20 +1283,18 @@ // // textBox15 // - this.textBox15.Location = new System.Drawing.Point(1211, 726); - this.textBox15.Margin = new System.Windows.Forms.Padding(4); + this.textBox15.Location = new System.Drawing.Point(848, 484); this.textBox15.Name = "textBox15"; this.textBox15.ReadOnly = true; - this.textBox15.Size = new System.Drawing.Size(588, 28); + this.textBox15.Size = new System.Drawing.Size(413, 21); this.textBox15.TabIndex = 85; // // checkBox1 // this.checkBox1.AutoSize = true; - this.checkBox1.Location = new System.Drawing.Point(1624, 612); - this.checkBox1.Margin = new System.Windows.Forms.Padding(4); + this.checkBox1.Location = new System.Drawing.Point(1137, 408); this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(128, 22); + this.checkBox1.Size = new System.Drawing.Size(91, 16); this.checkBox1.TabIndex = 86; this.checkBox1.Text = "Reissuance"; this.checkBox1.UseVisualStyleBackColor = true; @@ -1416,18 +1308,16 @@ "StartWith", "EndWith", "ContainWith"}); - this.comboBox4.Location = new System.Drawing.Point(1624, 524); - this.comboBox4.Margin = new System.Windows.Forms.Padding(4); + this.comboBox4.Location = new System.Drawing.Point(1137, 349); this.comboBox4.Name = "comboBox4"; - this.comboBox4.Size = new System.Drawing.Size(191, 26); + this.comboBox4.Size = new System.Drawing.Size(135, 20); this.comboBox4.TabIndex = 87; // // button18 // - this.button18.Location = new System.Drawing.Point(929, 766); - this.button18.Margin = new System.Windows.Forms.Padding(4); + this.button18.Location = new System.Drawing.Point(650, 511); this.button18.Name = "button18"; - this.button18.Size = new System.Drawing.Size(366, 32); + this.button18.Size = new System.Drawing.Size(256, 21); this.button18.TabIndex = 88; this.button18.Text = "CheckTestList"; this.button18.UseVisualStyleBackColor = true; @@ -1435,10 +1325,9 @@ // // button19 // - this.button19.Location = new System.Drawing.Point(929, 807); - this.button19.Margin = new System.Windows.Forms.Padding(4); + this.button19.Location = new System.Drawing.Point(650, 538); this.button19.Name = "button19"; - this.button19.Size = new System.Drawing.Size(366, 32); + this.button19.Size = new System.Drawing.Size(256, 21); this.button19.TabIndex = 89; this.button19.Text = "Check Server"; this.button19.UseVisualStyleBackColor = true; @@ -1446,10 +1335,9 @@ // // button20 // - this.button20.Location = new System.Drawing.Point(1574, 412); - this.button20.Margin = new System.Windows.Forms.Padding(4); + this.button20.Location = new System.Drawing.Point(1102, 275); this.button20.Name = "button20"; - this.button20.Size = new System.Drawing.Size(227, 32); + this.button20.Size = new System.Drawing.Size(159, 21); this.button20.TabIndex = 90; this.button20.Text = "sync time"; this.button20.UseVisualStyleBackColor = true; @@ -1457,19 +1345,17 @@ // // textBox16 // - this.textBox16.Location = new System.Drawing.Point(129, 795); - this.textBox16.Margin = new System.Windows.Forms.Padding(4); + this.textBox16.Location = new System.Drawing.Point(90, 530); this.textBox16.Name = "textBox16"; - this.textBox16.Size = new System.Drawing.Size(191, 28); + this.textBox16.Size = new System.Drawing.Size(135, 21); this.textBox16.TabIndex = 91; // // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(4, 800); - this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label21.Location = new System.Drawing.Point(3, 533); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(116, 18); + this.label21.Size = new System.Drawing.Size(81, 12); this.label21.TabIndex = 92; this.label21.Text = "Station Name"; // @@ -1480,10 +1366,9 @@ // // button21 // - this.button21.Location = new System.Drawing.Point(566, 794); - this.button21.Margin = new System.Windows.Forms.Padding(4); + this.button21.Location = new System.Drawing.Point(396, 529); this.button21.Name = "button21"; - this.button21.Size = new System.Drawing.Size(241, 32); + this.button21.Size = new System.Drawing.Size(169, 21); this.button21.TabIndex = 93; this.button21.Text = "CP Log - Folder AutoSend"; this.button21.UseVisualStyleBackColor = true; @@ -1492,18 +1377,17 @@ // label22 // this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(1067, 44); - this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label22.Location = new System.Drawing.Point(747, 29); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(17, 18); + this.label22.Size = new System.Drawing.Size(11, 12); this.label22.TabIndex = 94; this.label22.Text = "-"; // // MainForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 18F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1939, 1030); + this.ClientSize = new System.Drawing.Size(1357, 687); this.Controls.Add(this.label22); this.Controls.Add(this.button21); this.Controls.Add(this.label21); @@ -1570,11 +1454,10 @@ this.Controls.Add(this.button_QT); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(4); this.MaximizeBox = false; this.Name = "MainForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "For ALIS PC Adaptor"; + this.Text = "For ALIS PC Adaptor v250424"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); this.DoubleClick += new System.EventHandler(this.MainForm_DoubleClick); this.MainPanel.ResumeLayout(false); diff --git a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptorUI/Properties/AssemblyInfo.cs b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptorUI/Properties/AssemblyInfo.cs index a26c247..c1f27ae 100644 --- a/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptorUI/Properties/AssemblyInfo.cs +++ b/SystemX.Net.CP.PCAdaptor.UIM/SystemX.Net.PCAdaptorUI/Properties/AssemblyInfo.cs @@ -6,12 +6,12 @@ using System.Runtime.InteropServices; // 제어됩니다. 어셈블리와 관련된 정보를 수정하려면 // 이러한 특성 값을 변경하세요. [assembly: AssemblyTitle("SystemX.Net.XAdaptor.PC.UI")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("CPX Adaptor UI")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("SystemX")] [assembly: AssemblyProduct("SystemX.Net.XAdaptor.PC.UI")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] +[assembly: AssemblyCopyright("© 2025 SystemX Co., Ltd. All rights reserved.")] +[assembly: AssemblyTrademark("CPX Adaptor UI")] [assembly: AssemblyCulture("")] // ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에 @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2025.05.15.0001")] +[assembly: AssemblyFileVersion("2025.05.15.0001")] diff --git a/SystemX.Net.CP.Platform/SystemX.Net.Platform/Properties/AssemblyInfo.cs b/SystemX.Net.CP.Platform/SystemX.Net.Platform/Properties/AssemblyInfo.cs index 1b0ccde..bfaabc6 100644 --- a/SystemX.Net.CP.Platform/SystemX.Net.Platform/Properties/AssemblyInfo.cs +++ b/SystemX.Net.CP.Platform/SystemX.Net.Platform/Properties/AssemblyInfo.cs @@ -6,12 +6,12 @@ using System.Runtime.InteropServices; // 제어됩니다. 어셈블리와 관련된 정보를 수정하려면 // 이러한 특성 값을 변경하세요. [assembly: AssemblyTitle("SystemX.Net.Platform")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("CPX Platform")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("SystemX")] [assembly: AssemblyProduct("SystemX.Net.Platform")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] +[assembly: AssemblyCopyright("© 2025 SystemX Co., Ltd. All rights reserved.")] +[assembly: AssemblyTrademark("CPX Platform")] [assembly: AssemblyCulture("")] // ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에 @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2025.05.15.0001")] +[assembly: AssemblyFileVersion("2025.05.15.0001")] diff --git a/SystemX.Net.CP.Platform/SystemX.Net.Platform/SystemX.Net.Comm/AsyncClientSocket.cs b/SystemX.Net.CP.Platform/SystemX.Net.Platform/SystemX.Net.Comm/AsyncClientSocket.cs index b61e143..c179b91 100644 --- a/SystemX.Net.CP.Platform/SystemX.Net.Platform/SystemX.Net.Comm/AsyncClientSocket.cs +++ b/SystemX.Net.CP.Platform/SystemX.Net.Platform/SystemX.Net.Comm/AsyncClientSocket.cs @@ -679,23 +679,13 @@ namespace SystemX.Net.Comm if (nReadSize != 0) { byte[] ucFindData = new byte[1]; - //byte[] ucSetClearArray; - int iFindDataCnt = 0; - //bool bSegmentFind = false; bool bDataFind = false; - byte ucGetLabel = 0; try { - /* - Array.Copy(recvBuffer, 0, recvStoreBuffer, iStoreCnt, nReadSize); - - iStoreCnt += nReadSize; - */ - if (bQueuePacketClearOn) { bQueuePacketClearOn = false; @@ -795,90 +785,10 @@ namespace SystemX.Net.Comm } QPacketRemainData.Clear(); - - //recvText += Encoding.Unicode.GetString(recvBuffer, 0, nReadSize); - - /* - for (int i = 0; i < iStoreCnt; i++) - { - if (recvStoreBuffer[i] == 0x0D && - recvStoreBuffer[i + 1] == 0x02 && - recvStoreBuffer[i + 6] == 0x08 && - recvStoreBuffer[i + 7] == 0x0A) - { - ucGetLabel = recvStoreBuffer[i - 1]; - - uint uiGetPacketSize = 0x0; - - uiGetPacketSize |= (uint)(recvStoreBuffer[i + 2] << 24); - uiGetPacketSize |= (uint)(recvStoreBuffer[i + 3] << 16); - uiGetPacketSize |= (uint)(recvStoreBuffer[i + 4] << 8); - uiGetPacketSize |= (uint)(recvStoreBuffer[i + 5] << 0); - - int iGetSize = (int)uiGetPacketSize; - - iGetSize += XCommons.PAD_SIZE; - - if (recvStoreBuffer[i + iGetSize - 4] == 0x0D && - recvStoreBuffer[i + iGetSize - 3] == 0x02 && - recvStoreBuffer[i + iGetSize - 2] == 0x08 && - recvStoreBuffer[i + iGetSize - 1] == 0x0A) - { - iFindDataCnt = iGetSize; - - bSegmentFind = true; - } - if (bSegmentFind) - { - iCheckRetryCnt = 0; - - ucFindData = new byte[iFindDataCnt]; - ucSetClearArray = new byte[(iFindDataCnt + 1)]; - - Array.Clear(ucSetClearArray, 0, (iFindDataCnt + 1)); - Array.Copy(recvStoreBuffer, i, ucFindData, 0, iFindDataCnt); - - iStoreCnt -= (iFindDataCnt + 1); - - Buffer.BlockCopy(ucSetClearArray, 0, recvStoreBuffer, 0, (iFindDataCnt + 1)); - Buffer.BlockCopy(recvStoreBuffer, iStoreCnt, recvStoreBuffer, 0, USER_MAX_SIZE - iStoreCnt); - - bDataFind = true; - - break; - } - else - { - iCheckRetryCnt++; - - if (iCheckRetryCnt > MAX_CHECK_COUNT) - { - iCheckRetryCnt = 0; - - ucSetClearArray = new byte[iFindDataCnt]; - Array.Clear(ucSetClearArray, 0, iFindDataCnt); - - iStoreCnt -= iFindDataCnt; - - Buffer.BlockCopy(ucSetClearArray, 0, recvStoreBuffer, 0, iFindDataCnt); - Buffer.BlockCopy(recvStoreBuffer, iStoreCnt, recvStoreBuffer, 0, USER_MAX_SIZE - iStoreCnt); - } - - break; - } - } - } - */ } catch (Exception e) { bDataFind = false; - - /* - iStoreCnt = 0; - - if(recvStoreBuffer != null) Array.Clear(recvStoreBuffer, 0, recvStoreBuffer.Count()); - */ } if (bDataFind) diff --git a/SystemX.Net.CP.Platform/SystemX.Net.Platform/SystemX.Net.Comm/AsyncComClientSocket.cs b/SystemX.Net.CP.Platform/SystemX.Net.Platform/SystemX.Net.Comm/AsyncComClientSocket.cs index 2a56cd0..2c51428 100644 --- a/SystemX.Net.CP.Platform/SystemX.Net.Platform/SystemX.Net.Comm/AsyncComClientSocket.cs +++ b/SystemX.Net.CP.Platform/SystemX.Net.Platform/SystemX.Net.Comm/AsyncComClientSocket.cs @@ -610,23 +610,13 @@ namespace SystemX.Net.Comm if (nReadSize != 0) { byte[] ucFindData = new byte[1]; - //byte[] ucSetClearArray; - int iFindDataCnt = 0; - //bool bSegmentFind = false; bool bDataFind = false; - byte ucGetLabel = 0; try { - /* - Array.Copy(recvBuffer, 0, recvStoreBuffer, iStoreCnt, nReadSize); - - iStoreCnt += nReadSize; - */ - if (bQueuePacketClearOn) { bQueuePacketClearOn = false; @@ -726,90 +716,10 @@ namespace SystemX.Net.Comm } QPacketRemainData.Clear(); - - //recvText += Encoding.Unicode.GetString(recvBuffer, 0, nReadSize); - - /* - for (int i = 0; i < iStoreCnt; i++) - { - if (recvStoreBuffer[i] == 0x0D && - recvStoreBuffer[i + 1] == 0x02 && - recvStoreBuffer[i + 6] == 0x08 && - recvStoreBuffer[i + 7] == 0x0A) - { - ucGetLabel = recvStoreBuffer[i - 1]; - - uint uiGetPacketSize = 0x0; - - uiGetPacketSize |= (uint)(recvStoreBuffer[i + 2] << 24); - uiGetPacketSize |= (uint)(recvStoreBuffer[i + 3] << 16); - uiGetPacketSize |= (uint)(recvStoreBuffer[i + 4] << 8); - uiGetPacketSize |= (uint)(recvStoreBuffer[i + 5] << 0); - - int iGetSize = (int)uiGetPacketSize; - - iGetSize += XCommons.PAD_SIZE; - - if (recvStoreBuffer[i + iGetSize - 4] == 0x0D && - recvStoreBuffer[i + iGetSize - 3] == 0x02 && - recvStoreBuffer[i + iGetSize - 2] == 0x08 && - recvStoreBuffer[i + iGetSize - 1] == 0x0A) - { - iFindDataCnt = iGetSize; - - bSegmentFind = true; - } - if (bSegmentFind) - { - iCheckRetryCnt = 0; - - ucFindData = new byte[iFindDataCnt]; - ucSetClearArray = new byte[(iFindDataCnt + 1)]; - - Array.Clear(ucSetClearArray, 0, (iFindDataCnt + 1)); - Array.Copy(recvStoreBuffer, i, ucFindData, 0, iFindDataCnt); - - iStoreCnt -= (iFindDataCnt + 1); - - Buffer.BlockCopy(ucSetClearArray, 0, recvStoreBuffer, 0, (iFindDataCnt + 1)); - Buffer.BlockCopy(recvStoreBuffer, iStoreCnt, recvStoreBuffer, 0, USER_MAX_SIZE - iStoreCnt); - - bDataFind = true; - - break; - } - else - { - iCheckRetryCnt++; - - if (iCheckRetryCnt > MAX_CHECK_COUNT) - { - iCheckRetryCnt = 0; - - ucSetClearArray = new byte[iFindDataCnt]; - Array.Clear(ucSetClearArray, 0, iFindDataCnt); - - iStoreCnt -= iFindDataCnt; - - Buffer.BlockCopy(ucSetClearArray, 0, recvStoreBuffer, 0, iFindDataCnt); - Buffer.BlockCopy(recvStoreBuffer, iStoreCnt, recvStoreBuffer, 0, USER_MAX_SIZE - iStoreCnt); - } - - break; - } - } - } - */ } catch (Exception e) { bDataFind = false; - - /* - iStoreCnt = 0; - - if (recvStoreBuffer != null) Array.Clear(recvStoreBuffer, 0, recvStoreBuffer.Count()); - */ } if (bDataFind) diff --git a/SystemX.Net.CP.Platform/SystemX.Net.Platform/SystemX.Net.Comm/AsyncServerSocket.cs b/SystemX.Net.CP.Platform/SystemX.Net.Platform/SystemX.Net.Comm/AsyncServerSocket.cs index 6fcfca7..1863c71 100644 --- a/SystemX.Net.CP.Platform/SystemX.Net.Platform/SystemX.Net.Comm/AsyncServerSocket.cs +++ b/SystemX.Net.CP.Platform/SystemX.Net.Platform/SystemX.Net.Comm/AsyncServerSocket.cs @@ -721,20 +721,12 @@ namespace SystemX.Net.Comm byte[] ucSetClearArray; int iFindDataCnt = 0; - - bool bSegmentFind = false; bool bDataFind = false; byte ucGetLabel = 0; try { - /* - Array.Copy(recvBuffer, 0, recvStoreBuffer, iStoreCnt, nReadSize); - - iStoreCnt += nReadSize; - */ - if(bQueuePacketClearOn) { bQueuePacketClearOn = false; @@ -834,90 +826,10 @@ namespace SystemX.Net.Comm } QPacketRemainData.Clear(); - - //recvText += Encoding.Unicode.GetString(recvBuffer, 0, nReadSize); - - /* - for (int i = 0; i < iStoreCnt; i++) - { - if (recvStoreBuffer[i] == 0x0D && - recvStoreBuffer[i + 1] == 0x02 && - recvStoreBuffer[i + 6] == 0x08 && - recvStoreBuffer[i + 7] == 0x0A) - { - ucGetLabel = recvStoreBuffer[i - 1]; - - uint uiGetPacketSize = 0x0; - - uiGetPacketSize |= (uint)(recvStoreBuffer[i + 2] << 24); - uiGetPacketSize |= (uint)(recvStoreBuffer[i + 3] << 16); - uiGetPacketSize |= (uint)(recvStoreBuffer[i + 4] << 8); - uiGetPacketSize |= (uint)(recvStoreBuffer[i + 5] << 0); - - int iGetSize = (int)uiGetPacketSize; - - iGetSize += XCommons.PAD_SIZE; - - if (recvStoreBuffer[i + iGetSize - 4] == 0x0D && - recvStoreBuffer[i + iGetSize - 3] == 0x02 && - recvStoreBuffer[i + iGetSize - 2] == 0x08 && - recvStoreBuffer[i + iGetSize - 1] == 0x0A) - { - iFindDataCnt = iGetSize; - - bSegmentFind = true; - } - if (bSegmentFind) - { - iCheckRetryCnt = 0; - - ucFindData = new byte[iFindDataCnt]; - ucSetClearArray = new byte[(iFindDataCnt + 1)]; - - Array.Clear(ucSetClearArray, 0, (iFindDataCnt + 1)); - Array.Copy(recvStoreBuffer, i, ucFindData, 0, iFindDataCnt); - - iStoreCnt -= (iFindDataCnt + 1); - - Buffer.BlockCopy(ucSetClearArray, 0, recvStoreBuffer, 0, (iFindDataCnt + 1)); - Buffer.BlockCopy(recvStoreBuffer, iStoreCnt, recvStoreBuffer, 0, USER_MAX_SIZE - iStoreCnt); - - bDataFind = true; - - break; - } - else - { - iCheckRetryCnt++; - - if (iCheckRetryCnt > MAX_CHECK_COUNT) - { - iCheckRetryCnt = 0; - - ucSetClearArray = new byte[iFindDataCnt]; - Array.Clear(ucSetClearArray, 0, iFindDataCnt); - - iStoreCnt -= iFindDataCnt; - - Buffer.BlockCopy(ucSetClearArray, 0, recvStoreBuffer, 0, iFindDataCnt); - Buffer.BlockCopy(recvStoreBuffer, iStoreCnt, recvStoreBuffer, 0, USER_MAX_SIZE - iStoreCnt); - } - - break; - } - } - } - */ } catch (Exception e) { bDataFind = false; - - /* - iStoreCnt = 0; - - if (recvStoreBuffer != null) Array.Clear(recvStoreBuffer, 0, recvStoreBuffer.Count()); - */ } // if (bDataFind) diff --git a/SystemX.Net.CP.Platform/SystemX.PLC/Properties/AssemblyInfo.cs b/SystemX.Net.CP.Platform/SystemX.PLC/Properties/AssemblyInfo.cs index cd769e3..fdb4228 100644 --- a/SystemX.Net.CP.Platform/SystemX.PLC/Properties/AssemblyInfo.cs +++ b/SystemX.Net.CP.Platform/SystemX.PLC/Properties/AssemblyInfo.cs @@ -6,12 +6,12 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("SystemX.PLC")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("CPX PLC")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("SystemX")] [assembly: AssemblyProduct("SystemX.PLC")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] +[assembly: AssemblyCopyright("© 2025 SystemX Co., Ltd. All rights reserved.")] +[assembly: AssemblyTrademark("CPX PLC")] [assembly: AssemblyCulture("")] // Setting ComVisible to false makes the types in this assembly not visible @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2025.05.15.0001")] +[assembly: AssemblyFileVersion("2025.05.15.0001")] diff --git a/SystemX.Net.CP.Platform/SystemX.XEFCore/Properties/AssemblyInfo.cs b/SystemX.Net.CP.Platform/SystemX.XEFCore/Properties/AssemblyInfo.cs index dab4e89..c1c3de2 100644 --- a/SystemX.Net.CP.Platform/SystemX.XEFCore/Properties/AssemblyInfo.cs +++ b/SystemX.Net.CP.Platform/SystemX.XEFCore/Properties/AssemblyInfo.cs @@ -6,12 +6,12 @@ using System.Runtime.InteropServices; // 제어됩니다. 어셈블리와 관련된 정보를 수정하려면 // 이러한 특성 값을 변경하세요. [assembly: AssemblyTitle("SystemX.XEFCore")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("CPX XEFCore")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("SystemX")] [assembly: AssemblyProduct("SystemX.XEFCore")] -[assembly: AssemblyCopyright("Copyright © 2024")] -[assembly: AssemblyTrademark("")] +[assembly: AssemblyCopyright("© 2025 SystemX Co., Ltd. All rights reserved.")] +[assembly: AssemblyTrademark("CPX XEFCore")] [assembly: AssemblyCulture("")] // ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에 @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2025.05.15.0001")] +[assembly: AssemblyFileVersion("2025.05.15.0001")]