diff --git a/INT63DC_6CH.suo b/INT63DC_6CH.suo index ea4fddb..fc17261 100644 Binary files a/INT63DC_6CH.suo and b/INT63DC_6CH.suo differ diff --git a/INT63DC_6CH/Forms/FormEquipmentSetting.cs b/INT63DC_6CH/Forms/FormEquipmentSetting.cs index 66d1010..d66bc6c 100644 --- a/INT63DC_6CH/Forms/FormEquipmentSetting.cs +++ b/INT63DC_6CH/Forms/FormEquipmentSetting.cs @@ -9,6 +9,7 @@ using System.Windows.Forms; using INT63DC_6CH.DialogForms; using INT63DC_ImageDll; +using INT63DC_6CH.In_UserManager; namespace INT63DC_6CH.Forms { @@ -312,10 +313,20 @@ namespace INT63DC_6CH.Forms this.ParentForm.SystemConfig.WeightLimitIgnoreCount = int.Parse(this.labelWeightLimitIgnoreCount.Text.ToString()); // 로그인 - if (this.buttonLogin.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + if (this.ParentForm.SystemConfig.IsOptPart11 == true) this.ParentForm.SystemConfig.IsLogin = true; else - this.ParentForm.SystemConfig.IsLogin = false; + { + if (this.buttonLogin.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + this.ParentForm.SystemConfig.IsLogin = true; + else + { + this.ParentForm.SystemConfig.IsLogin = false; + + // Delete user list + UserManager.UserManager_UserAllDel(); + } + } // 개별 NG if (this.buttonEachNG.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) diff --git a/INT63DC_6CH/Forms/FormFactoryInitialize.cs b/INT63DC_6CH/Forms/FormFactoryInitialize.cs index 9821990..539e460 100644 --- a/INT63DC_6CH/Forms/FormFactoryInitialize.cs +++ b/INT63DC_6CH/Forms/FormFactoryInitialize.cs @@ -8,6 +8,7 @@ using System.IO; using System.Text; using System.Windows.Forms; using INT63DC_ImageDll; +using INT63DC_6CH.In_UserManager; namespace INT63DC_6CH.Forms { @@ -96,12 +97,14 @@ namespace INT63DC_6CH.Forms this.progressBarResetBar.Value = 0; //this.ParentForm.TransferData(CommunicationCommand.Initialization, CommunicationID.MainBoard); - this.progressBarResetBar.Value += 25; + this.progressBarResetBar.Value += 20; //this.ResetConfigurationFile(); this.ResetProductFile(); - this.progressBarResetBar.Value += 25; + this.progressBarResetBar.Value += 20; this.ResetJudgmentSetFile(); - this.progressBarResetBar.Value += 25; + this.progressBarResetBar.Value += 20; + this.ResetUserListFile(); + this.progressBarResetBar.Value += 20; this.ResetCountFile(); this.progressBarResetBar.Value = 100; @@ -338,6 +341,10 @@ namespace INT63DC_6CH.Forms this.ParentForm.smartFileIO.WriteStructure_End(); this.ParentForm.smartFileIO.Close(); } + private void ResetUserListFile() + { + UserManager.UserManager_UserAllDel(); + } #endregion #region Override Member diff --git a/INT63DC_6CH/Forms/FormInformation.cs b/INT63DC_6CH/Forms/FormInformation.cs index 515daa3..fb3c426 100644 --- a/INT63DC_6CH/Forms/FormInformation.cs +++ b/INT63DC_6CH/Forms/FormInformation.cs @@ -13,6 +13,8 @@ using System.Windows.Forms; using SmartX; using INT63DC_ImageDll; using INT63DC_6CH.DialogForms; +using INT63DC_6CH.In_UserManager; +using INT63DC_6CH.In_Encryption; namespace INT63DC_6CH.Forms { @@ -300,6 +302,11 @@ namespace INT63DC_6CH.Forms public void DisplayRefresh() { + if (this.ParentForm.SystemConfig.IsLogin == true) + UserManager.UserManager_GetVersion(); + if (this.ParentForm.SystemConfig.IsOptPart11 == true) + Encryption.AesEncryption_GetVersion(); + this.ParentForm.SystemConfig.CurrentForm = DataStore.FormStore.FormInformation; this.ParentForm.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._1500_ProgramVersion, ""); } diff --git a/INT63DC_6CH/Forms/FormMain.cs b/INT63DC_6CH/Forms/FormMain.cs index 9354c47..ce983a9 100644 --- a/INT63DC_6CH/Forms/FormMain.cs +++ b/INT63DC_6CH/Forms/FormMain.cs @@ -350,6 +350,9 @@ namespace INT63DC_6CH.Forms this.CurrentComRespone = new CommunicationRespone(); this.CurrentDataViewerFilter = new DataViewerFilter(); + this.ListDllUserName = new List(); + this.ListDllUserName.Clear(); + // SystemFile 폴더 생성 if (Directory.Exists(this.PathSystemFileFolder) == false) Directory.CreateDirectory(this.PathSystemFileFolder); @@ -1999,7 +2002,6 @@ namespace INT63DC_6CH.Forms // bool this.SystemConfig.IsDataBackup = structItem.IsDataBackup; - // bool this.SystemConfig.IsDataBackup = structItem.IsDataBackup; this.SystemConfig.IsEachNG = structItem.IsEachNG; diff --git a/INT63DC_6CH/Forms/FormMenu.cs b/INT63DC_6CH/Forms/FormMenu.cs index 1b16b2a..22e0cf9 100644 --- a/INT63DC_6CH/Forms/FormMenu.cs +++ b/INT63DC_6CH/Forms/FormMenu.cs @@ -708,7 +708,10 @@ namespace INT63DC_6CH.Forms { #region 데이터백업 ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormDataBackup); - this.ParentForm.ChildFormDataBackup.DisplayRefresh(); + if (this.ParentForm.SystemConfig.IsOptPart11 == true) + this.ParentForm.ChildFormDataBackup_Part11.DisplayRefresh(); + else + this.ParentForm.ChildFormDataBackup.DisplayRefresh(); #endregion } else if (button == this.buttonSysConfig) @@ -815,6 +818,13 @@ namespace INT63DC_6CH.Forms this.ParentForm.ChildFormCommunication.DisplayRefresh(); #endregion } + else if (button == this.buttonDataViewer) + { + #region 데이터뷰어 + ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormDataViewer); + this.ParentForm.ChildFormDataViewer.DisplayRefresh(); + #endregion + } } private void buttonFunction_Click(object sender, EventArgs e) { diff --git a/INT63DC_6CH/Forms/FormOptionSetting.cs b/INT63DC_6CH/Forms/FormOptionSetting.cs index be84233..9556709 100644 --- a/INT63DC_6CH/Forms/FormOptionSetting.cs +++ b/INT63DC_6CH/Forms/FormOptionSetting.cs @@ -10,6 +10,7 @@ using System.Windows.Forms; using SmartX; using INT63DC_ImageDll; using INT63DC_6CH.DialogForms; +using INT63DC_6CH.In_UserManager; namespace INT63DC_6CH.Forms { @@ -158,6 +159,14 @@ namespace INT63DC_6CH.Forms this.buttonDataStatistics.ButtonDown(); else this.buttonDataStatistics.ButtonUp(); + + // Part 11 사용 유무 + if (this.ParentForm.SystemConfig.IsOptPart11 == true) + this.buttonPart11.ButtonDown(); + else + this.buttonPart11.ButtonUp(); + + this.buttonSave.Visible = false; } public void DisplayRefresh() @@ -186,6 +195,23 @@ namespace INT63DC_6CH.Forms else this.ParentForm.SystemConfig.IsOptDataStatistics = false; + // Part11 기능 사용 유무 + if (this.buttonPart11.ButtonStatus == SmartButton.BUTSTATUS.DOWN) + { + this.ParentForm.SystemConfig.IsOptPart11 = true; + this.ParentForm.SystemConfig.IsLogin = true; + this.ParentForm.SystemConfig.IsDataBackup = true; + } + else + { + this.ParentForm.SystemConfig.IsOptPart11 = false; + this.ParentForm.SystemConfig.IsLogin = false; + this.ParentForm.SystemConfig.IsDataBackup = false; + + // Delete user list + UserManager.UserManager_UserAllDel(); + } + this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); this.smartGroupBox1.Enabled = false; @@ -208,7 +234,24 @@ namespace INT63DC_6CH.Forms } private void buttonPart11_Click(object sender, EventArgs e) { + if (this.buttonPart11.ButtonStatus == SmartButton.BUTSTATUS.DOWN) + { + this.ParentForm.CurrentUserPasswordType.SetDefinedPassword(OptionPassword.Part11); + DialogFormPasswordKeyPad pass = new DialogFormPasswordKeyPad(this.ParentForm.SystemConfig.Language, this.ParentForm.CurrentUserPasswordType, 8); + if (pass.ShowDialog() == DialogResult.OK) + { + this.buttonPart11.ButtonDown(); + this.buttonDataStatistics.ButtonDown(); + } + else + { + this.buttonPart11.ButtonUp(); + this.buttonDataStatistics.ButtonUp(); + } + } + if (this.buttonSave.Visible == false) + this.buttonSave.Visible = true; } #endregion } diff --git a/INT63DC_6CH/INT63DC_6CH.csproj b/INT63DC_6CH/INT63DC_6CH.csproj index 3eebbfe..6604e2c 100644 --- a/INT63DC_6CH/INT63DC_6CH.csproj +++ b/INT63DC_6CH/INT63DC_6CH.csproj @@ -50,11 +50,11 @@ False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_20210120\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartXCommon.dll + C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_V3대 마지막버전\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartXCommon.dll False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_20210120\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartX_IEC1000.dll + C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_V3대 마지막버전\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartX_IEC1000.dll diff --git a/INT63DC_6CH/bin/Release/DllAes128.dll b/INT63DC_6CH/bin/Release/DllAes128.dll new file mode 100644 index 0000000..93f7eaa Binary files /dev/null and b/INT63DC_6CH/bin/Release/DllAes128.dll differ diff --git a/INT63DC_6CH/bin/Release/INT63DC_6CH.exe b/INT63DC_6CH/bin/Release/INT63DC_6CH.exe index 2b9ff53..699109a 100644 Binary files a/INT63DC_6CH/bin/Release/INT63DC_6CH.exe and b/INT63DC_6CH/bin/Release/INT63DC_6CH.exe differ diff --git a/INT63DC_6CH/bin/Release/INT63DC_6CH.pdb b/INT63DC_6CH/bin/Release/INT63DC_6CH.pdb index e52ca95..a698905 100644 Binary files a/INT63DC_6CH/bin/Release/INT63DC_6CH.pdb and b/INT63DC_6CH/bin/Release/INT63DC_6CH.pdb differ diff --git a/INT63DC_6CH/bin/Release/SmartXCommon.dll b/INT63DC_6CH/bin/Release/SmartXCommon.dll index 4bd057b..2b8fa9d 100644 Binary files a/INT63DC_6CH/bin/Release/SmartXCommon.dll and b/INT63DC_6CH/bin/Release/SmartXCommon.dll differ diff --git a/INT63DC_6CH/bin/Release/SmartX_IEC1000.dll b/INT63DC_6CH/bin/Release/SmartX_IEC1000.dll index 1b97ada..11e2c64 100644 Binary files a/INT63DC_6CH/bin/Release/SmartX_IEC1000.dll and b/INT63DC_6CH/bin/Release/SmartX_IEC1000.dll differ diff --git a/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.csproj.FileListAbsolute.txt b/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.csproj.FileListAbsolute.txt index 31cc395..72204c2 100644 --- a/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.csproj.FileListAbsolute.txt +++ b/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.csproj.FileListAbsolute.txt @@ -19,3 +19,10 @@ D:\Git\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.Resource.resour D:\Git\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.csproj.GenerateResource.Cache D:\Git\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.dll D:\Git\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.pdb +D:\Laboratory\INT63DC_6CH\INT63DC_ImageDll\bin\Release\INT63DC_ImageDll.dll +D:\Laboratory\INT63DC_6CH\INT63DC_ImageDll\bin\Release\INT63DC_ImageDll.pdb +D:\Laboratory\INT63DC_6CH\INT63DC_ImageDll\obj\Release\ResolveAssemblyReference.cache +D:\Laboratory\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.Resource.resources +D:\Laboratory\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.csproj.GenerateResource.Cache +D:\Laboratory\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.dll +D:\Laboratory\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.pdb diff --git a/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.csproj.GenerateResource.Cache b/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.csproj.GenerateResource.Cache index 206ff1b..cf70d75 100644 Binary files a/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.csproj.GenerateResource.Cache and b/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.csproj.GenerateResource.Cache differ diff --git a/INT63DC_ImageDll/obj/Release/Refactor/INT63DC_ImageDll.dll b/INT63DC_ImageDll/obj/Release/Refactor/INT63DC_ImageDll.dll index 25eee52..e4e8f4d 100644 Binary files a/INT63DC_ImageDll/obj/Release/Refactor/INT63DC_ImageDll.dll and b/INT63DC_ImageDll/obj/Release/Refactor/INT63DC_ImageDll.dll differ