From f3d11daf941012840aa9761eb06b42c9147fc2f1 Mon Sep 17 00:00:00 2001 From: T001084 Date: Tue, 18 Mar 2025 15:00:37 +0900 Subject: [PATCH] =?UTF-8?q?=ED=95=9C=EA=B8=80=20Encoding,=20=EB=B3=91?= =?UTF-8?q?=ED=95=A9=EC=8B=9C=20=ED=8C=8C=EC=9D=BC=EC=8B=9C=EA=B0=84=20?= =?UTF-8?q?=EA=B8=B0=EC=A4=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DDUtilityApp/FrmMain.cs | 3 +++ DDUtilityApp/MESDOWNLOADER/FrmServerLog.cs | 17 ++++++++++++----- DDUtilityApp/MESDOWNLOADER/Utili.cs | 4 ++-- DDUtilityApp/Properties/AssemblyInfo.cs | 4 ++-- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/DDUtilityApp/FrmMain.cs b/DDUtilityApp/FrmMain.cs index c077740..b37df2d 100644 --- a/DDUtilityApp/FrmMain.cs +++ b/DDUtilityApp/FrmMain.cs @@ -53,6 +53,9 @@ namespace DDUtilityApp bool isAdmin = false; string adminPWD = ConfigurationManager.AppSettings["ADMIN"]; if (adminPWD != null && adminPWD == "daeduck!1") isAdmin = true; +#if DEBUG + isAdmin = true; +#endif int btnWidth = 200; int btnHeight = 32; diff --git a/DDUtilityApp/MESDOWNLOADER/FrmServerLog.cs b/DDUtilityApp/MESDOWNLOADER/FrmServerLog.cs index 6bbe5b2..0a94cf5 100644 --- a/DDUtilityApp/MESDOWNLOADER/FrmServerLog.cs +++ b/DDUtilityApp/MESDOWNLOADER/FrmServerLog.cs @@ -181,7 +181,7 @@ namespace DDUtilityApp.MESDOWNLOADER rowFile["Name"] = file.Name; rowFile["FileName"] = file.Name; rowFile["Size"] = this.GetFileSize(file.Size, FileSizeType.MB); - rowFile["Modified"] = file.Modified.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss"); + rowFile["Modified"] = file.Modified.ToLocalTime(); rowFile["Type"] = file.Type; rowFile["url"] = url; rowFile["dir"] = dir; @@ -289,7 +289,7 @@ namespace DDUtilityApp.MESDOWNLOADER this.gridFiles.Columns.Add(new GridViewTextBoxColumn("Name") { ReadOnly=true, IsVisible = false }); this.gridFiles.Columns.Add(new GridViewTextBoxColumn("FileName") { ReadOnly = true }); this.gridFiles.Columns.Add(new GridViewTextBoxColumn("Size") { ReadOnly = true, TextAlignment = ContentAlignment.MiddleRight }); - this.gridFiles.Columns.Add(new GridViewTextBoxColumn("Modified") { ReadOnly = true }); + this.gridFiles.Columns.Add(new GridViewDateTimeColumn("Modified") { ReadOnly = true }); this.gridFiles.Columns.Add(new GridViewTextBoxColumn("Type") { ReadOnly = true }); } catch (Exception ex) @@ -328,14 +328,21 @@ namespace DDUtilityApp.MESDOWNLOADER else { // 선택된 파일들 추가 + List rowsSRC = new List(); foreach(GridViewRowInfo row in this.gridFiles.SelectedRows) { DataRowView view = row.DataBoundItem as DataRowView; - if (view != null && view.Row != null) rows.Add(view.Row); + if (view != null && view.Row != null) rowsSRC.Add(view.Row); } + + // 수정일자 정렬 + foreach (DataRow row in rowsSRC.OrderBy(row => row.Field("Modified"))) + rows.Add(row); } - // 다운로드 + + + // 다운로드 bool hasZip = false; using (ProgressForm frmProgress = new ProgressForm(rows.Count)) { @@ -438,7 +445,7 @@ namespace DDUtilityApp.MESDOWNLOADER this.DTFileInfo.Columns.Add("Name", typeof(string)); this.DTFileInfo.Columns.Add("FileName", typeof(string)); this.DTFileInfo.Columns.Add("Size", typeof(string)); - this.DTFileInfo.Columns.Add("Modified", typeof(string)); + this.DTFileInfo.Columns.Add("Modified", typeof(DateTime)); this.DTFileInfo.Columns.Add("Type", typeof(string)); this.DTFileInfo.Columns.Add("url", typeof(string)); this.DTFileInfo.Columns.Add("dir", typeof(string)); diff --git a/DDUtilityApp/MESDOWNLOADER/Utili.cs b/DDUtilityApp/MESDOWNLOADER/Utili.cs index 0743b63..8874a9e 100644 --- a/DDUtilityApp/MESDOWNLOADER/Utili.cs +++ b/DDUtilityApp/MESDOWNLOADER/Utili.cs @@ -33,13 +33,13 @@ namespace DDUtilityApp.MESDOWNLOADER try { - using (StreamWriter writer = new StreamWriter(mergedFilePath, false)) // false: 새 파일 생성 + using (StreamWriter writer = new StreamWriter(mergedFilePath, false, Encoding.Default)) { foreach (string file in filePaths) { if (File.Exists(file)) { - using (StreamReader reader = new StreamReader(file)) + using (StreamReader reader = new StreamReader(file, Encoding.Default)) { writer.Write(reader.ReadToEnd()); } diff --git a/DDUtilityApp/Properties/AssemblyInfo.cs b/DDUtilityApp/Properties/AssemblyInfo.cs index af2eafd..3d6b011 100644 --- a/DDUtilityApp/Properties/AssemblyInfo.cs +++ b/DDUtilityApp/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2025.03.18.4")] -[assembly: AssemblyFileVersion("2025.03.18.4")] +[assembly: AssemblyVersion("2025.03.18.5")] +[assembly: AssemblyFileVersion("2025.03.18.5")]