From 1ba15c0319324acb530834b87cd5a1df498aadce Mon Sep 17 00:00:00 2001 From: "DESKTOP-999R8N3\\CJY" Date: Mon, 7 Jul 2025 15:56:08 +0900 Subject: [PATCH] =?UTF-8?q?=20-=20(=EB=B2=84=EA=B7=B8=EC=88=98=EC=A0=95)?= =?UTF-8?q?=20Part11=EC=9D=B4=20=EC=95=84=EB=8B=8C=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20=EC=82=AC=EC=9A=A9=20=EC=8B=9C,=20=EB=A7=8C?= =?UTF-8?q?=EB=A3=8C=EC=9D=BC=20=EB=9C=A8=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=20-=20(=EB=B2=84=EA=B7=B8=EC=88=98?= =?UTF-8?q?=EC=A0=95)=20Password=EA=B0=80=20label=20-=20*=EB=A1=9C=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C=EB=90=98=EC=96=B4=20=EC=83=9D=EA=B8=B0?= =?UTF-8?q?=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DC_7C/Forms/FormInformation.cs | 2 +- INT69DC_7C/Forms/FormMain.cs | 10 +++++++--- INT69DC_7C/Forms/FormUserEditor.cs | 21 ++++++++++++++------- INT69DC_7C/Version.txt | 7 +++++++ 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/INT69DC_7C/Forms/FormInformation.cs b/INT69DC_7C/Forms/FormInformation.cs index 343c1b5..b03796f 100644 --- a/INT69DC_7C/Forms/FormInformation.cs +++ b/INT69DC_7C/Forms/FormInformation.cs @@ -142,7 +142,7 @@ namespace INT69DC_7C.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "12.3.0"; + this.labelDisplayVer.Text = "12.3.1"; if(this.ParentForm.SystemConfig.EquipmentMode == 7) this.labelTitleMainboardName.Text = "INT68M-2A"; diff --git a/INT69DC_7C/Forms/FormMain.cs b/INT69DC_7C/Forms/FormMain.cs index 9158f9a..921c386 100644 --- a/INT69DC_7C/Forms/FormMain.cs +++ b/INT69DC_7C/Forms/FormMain.cs @@ -12041,6 +12041,12 @@ namespace INT69DC_7C.Forms { this.InitializeUserManager(); this.SystemConfig.CurrentUser.Group = DataStore.UserGroup.LogOut; + + if (this.SystemConfig.IsOptPart11 == false) + UserManager.UserManager_AutoLogoutTimeoutPause(); + + // UserManager_GetUserListName + this.timerUserList.Enabled = true; } else this.SystemConfig.CurrentUser.Group = DataStore.UserGroup.NotLogin; @@ -12048,6 +12054,7 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsOptPart11 == true) { this.InitializeAES(); + this.SetTrackingHistoryData(DataStore.TrackingOperation.PowerOn, ""); } // 폼생성 @@ -12077,9 +12084,6 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsOptFeedbackBoardUse == true && this.SystemConfig.Serial3Mode == 4) this.UartCom3FeedbackBoardBooting(); - - // UserManager_GetUserListName - this.timerUserList.Enabled = true; } #endregion diff --git a/INT69DC_7C/Forms/FormUserEditor.cs b/INT69DC_7C/Forms/FormUserEditor.cs index 2e9e018..6ff80b0 100644 --- a/INT69DC_7C/Forms/FormUserEditor.cs +++ b/INT69DC_7C/Forms/FormUserEditor.cs @@ -31,6 +31,7 @@ namespace INT69DC_7C.Forms private string BeforeID; private string BeforePassword; + private string CurrentUserPassword; #endregion #region Constructor @@ -133,6 +134,7 @@ namespace INT69DC_7C.Forms this.PasswordChar = false; this.BeforeID = ""; this.BeforePassword = ""; + this.CurrentUserPassword = ""; this.UpdateAccessRightComboBoxDisplay(); this.comboBoxAccessRight.SelectedIndexChanged -= new EventHandler(this.comboBoxAccessRight_SelectedIndexChanged); @@ -317,20 +319,24 @@ namespace INT69DC_7C.Forms #endregion item.ID = this.labelID.Text; - item.Password = this.labelPassword.Text; - item.ExpireId = int.Parse(this.labelExpiryDateOfAccount.Text); - item.ExpirePassword = int.Parse(this.labelExpiryDateOfPassword.Text); + item.Password = this.CurrentUserPassword; + if (this.ParentForm.SystemConfig.IsOptPart11 == true) + { + item.ExpireId = int.Parse(this.labelExpiryDateOfAccount.Text); + item.ExpirePassword = int.Parse(this.labelExpiryDateOfPassword.Text); + } + else + { + item.ExpireId = 0; + item.ExpirePassword = 0; + } //item.IsAdmin = this.cbAdministrator.Checked; if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin) - { item.ActiveLevel = 9; - } else - { item.ActiveLevel = this.comboBoxAccessRight.SelectedIndex + 1; - } menuId.fMenu = new bool[UserManager.USER_MENU_ID_MAX]; for (int i = 0; i < UserManager.USER_MENU_ID_MAX; i++) @@ -647,6 +653,7 @@ namespace INT69DC_7C.Forms this.labelPassword.Text = item.Password; else this.labelPassword.Text = this.PasswordToAsterisk(item.Password); + this.CurrentUserPassword = item.Password; this.UpdateAccessRightDisplay(item.ActiveLevel); this.buttonSave.Visible = false; diff --git a/INT69DC_7C/Version.txt b/INT69DC_7C/Version.txt index 3322e12..9a1220f 100644 --- a/INT69DC_7C/Version.txt +++ b/INT69DC_7C/Version.txt @@ -23,6 +23,13 @@ Ƽ 8,10,12 /ƽ 跮 */ +@ Ver 12.3.1 by CJY + - 2025.07.07 + - Ver 12.3.0 Modify + - Framework : SmartX Framework V3.2.4(update: 2021.01.20) + - (׼) Part11 ƴ α , ߴ + - (׼) Password label - * ǥõǾ + @ Ver 12.3.0 by LSJ - 2025.02.27 - Ver 12.2.1 Modify