Merge branch 'main' of http://intechrnd.iptime.org:3000/SJ84/INT63DC_6CH

# Conflicts:
#	INT63DC_6CH.suo
#	INT63DC_6CH/bin/Release/INT63DC_6CH.exe
#	INT63DC_6CH/bin/Release/INT63DC_6CH.pdb

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,11 +313,21 @@ namespace INT63DC_6CH.Forms
             this.ParentForm.SystemConfig.WeightLimitIgnoreCount = int.Parse(this.labelWeightLimitIgnoreCount.Text.ToString());
 
             // 로그인
+            if (this.ParentForm.SystemConfig.IsOptPart11 == true)
+                this.ParentForm.SystemConfig.IsLogin = true;
+            else
+            {
                 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)
                 this.ParentForm.SystemConfig.IsEachNG = true;

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

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, "");
         }

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<string>();
+            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;

INT63DC_6CH/Forms/FormMenu.cs

@@ -708,6 +708,9 @@ namespace INT63DC_6CH.Forms
             {
                 #region 데이터백업
                 ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormDataBackup);
+                if (this.ParentForm.SystemConfig.IsOptPart11 == true)
+                    this.ParentForm.ChildFormDataBackup_Part11.DisplayRefresh();
+                else
                     this.ParentForm.ChildFormDataBackup.DisplayRefresh();
                 #endregion
             }
@@ -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)
         {

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
     }

INT63DC_6CH/INT63DC_6CH.csproj

@@ -50,11 +50,11 @@
     <Reference Include="mscorlib" />
     <Reference Include="SmartXCommon, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_20210120\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartXCommon.dll</HintPath>
+      <HintPath>C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_V3대 마지막버전\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartXCommon.dll</HintPath>
     </Reference>
     <Reference Include="SmartX_IEC1000, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_20210120\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartX_IEC1000.dll</HintPath>
+      <HintPath>C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_V3대 마지막버전\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartX_IEC1000.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

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