Release 버전 추가 / 저장중 ~ 완료 메세지 박스 출력 /GPS 수정

GPS 관련 인터럽트 과정에서 Gps 데이터 따로 받도록 수정
Sensor/ GPS / Catm1 각각 모두 MessageBox 출력하도록 수정
Sensor DataWrite에서 Thread 추가 하도록 수정
Merge 기능에서 숨겨진 Box 또는 추가된 양식까지 전부 Merge 할 수 있도록 수정

APL_TestCheck.csproj

@@ -24,7 +24,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>

Main.Designer.cs

@@ -174,11 +174,11 @@
             this.panel_Main.Controls.Add(this.panel4);
             this.panel_Main.Controls.Add(this.label6);
             this.panel_Main.Controls.Add(this.panel1);
+            this.panel_Main.Controls.Add(this.panel_MergeMain);
             this.panel_Main.Controls.Add(this.panel_Catm1Test);
             this.panel_Main.Controls.Add(this.panel_SnCheckMain);
             this.panel_Main.Controls.Add(this.panel_GpsTest);
             this.panel_Main.Controls.Add(this.panel_SensorTest);
-            this.panel_Main.Controls.Add(this.panel_MergeMain);
             this.panel_Main.Location = new System.Drawing.Point(0, 0);
             this.panel_Main.Name = "panel_Main";
             this.panel_Main.Size = new System.Drawing.Size(1356, 710);

Main.cs

@@ -471,6 +471,9 @@ namespace APL_TestCheck
         byte[] rxBuffer;
         private void sPort_DataReceived(object sender, SerialDataReceivedEventArgs e)
         {
+            if (checkBox_TerminalStop.Checked == true)
+                return;
+
 
             if (offset == 0)
             {
@@ -485,30 +488,29 @@ namespace APL_TestCheck
                 serialPort.Read(rxBuffer, offset, intRecSize);
                 offset += intRecSize;
 
-                for (int iTemp = 0; iTemp < offset; iTemp++)
+                string data = Encoding.Default.GetString(rxBuffer);
+
+                if (panel_GpsTest.Visible == true)
                 {
-                    rxString += Convert.ToChar(rxBuffer[iTemp]);
+                    this.Invoke(new StringSend(Data_Recv_Str), data);
                 }
-
-                if (panel_SensorTest.Visible == true)
+                else
                 {
-                    startStr = "V";
-                    endStr = "\n";
-                    if (rxString.Contains(startStr))
+                    for (int iTemp = 0; iTemp < offset; iTemp++)
                     {
-                        rxString = rxString.Substring(rxString.IndexOf(startStr));
-                        if (rxString.Contains(endStr))
-                        {
-                            this.Invoke(new StringSend(Data_Recv_Str), rxString);
-                            //program.dataReceived(rxString, "Receive");
-                            offset = 0;
-                        }
+                        rxString += Convert.ToChar(rxBuffer[iTemp]);
+                    }
+                    if (panel_SensorTest.Visible == true)
+                    {
+                        startStr = "V";
+                        endStr = "\n";
+                    }
+
+                    else if (panel_Catm1Test.Visible == true)
+                    {
+                        startStr = "B";
+                        endStr = "\n";
                     }
-                }
-                else if (panel_Catm1Test.Visible == true)
-                {
-                    startStr = "B";
-                    endStr = "\n";
                     if (rxString.Contains(startStr))
                     {
                         rxString = rxString.Substring(rxString.IndexOf(startStr));
@@ -520,10 +522,7 @@ namespace APL_TestCheck
                         }
                     }
                 }
-                else
-                {
-                    this.Invoke(new StringSend(Data_Recv_Str), rxString);
-                }
+
             }
         }
        
@@ -1013,6 +1012,20 @@ namespace APL_TestCheck
             Catm1_thread.Start();
 
         }
+        void Sensor_ThreadRun( object[] data)
+        {
+            //DST    : 위치
+            //Value1 : 생산 번호
+            //Value2 : Modem Ver
+            //Value3 : RSRP
+            //Value4 : RSRQ
+            Thread Catm1_thread = new Thread(delegate ()
+            {
+                Sensor_DataxlsWrite(data);
+            });
+            Catm1_thread.Start();
+
+        }
 
 
 
@@ -1124,13 +1137,16 @@ namespace APL_TestCheck
                 }
             }
 #endif
-            AutoClosingMessageBox.Show("완료 되었습니다.", "알림", 1000);
+            
             //this.Close();
             //MessageBox.
         }
         private void button_SensorTestSave()
         {
             string CheckProductionNum = null;
+            object[] data = new object[12];
+            AutoClosingMessageBox.Show("저장 중.....", "알림", 1000);
+            
             try
             {
                 CheckProductionNum = dataGridView_Sensor.Rows[0].Cells[0].Value.ToString();
@@ -1210,9 +1226,22 @@ namespace APL_TestCheck
                 MessageBox.Show("생산번호 값이 제대로 입력 되지 않았습니다.\r\n확인후 다시 저장하세요.");
                 return;
             }
-            Sensor_DataxlsWrite(Dst_Xls_File);
-         //  dataGridView_Sensor.Rows[0].Cells[0].Value = null;
-           // dataGridView_Sensor.Rows[0].Cells[1].Value = null;
+            //
+            data[0] = Dst_Xls_File;
+            for(int i = 0; i < 12; i++)
+                data[i + 1] = dataGridView_Sensor.Rows[0].Cells[i].Value;
+            
+            //Sensor_DataxlsWrite();
+            Sensor_ThreadRun(data);
+            AutoClosingMessageBox.Show("완료 되었습니다.", "알림", 1000);
+
+
+            for (int i = 0; i < 12; i++)
+                dataGridView_Sensor.Rows[0].Cells[i].Value = null;
+
+            dataGridView_Sensor.Refresh();
+            //  dataGridView_Sensor.Rows[0].Cells[0].Value = null;
+            // dataGridView_Sensor.Rows[0].Cells[1].Value = null;
 
             //   if (!di.Exists) { di.Create(); }
             //string tmppath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
@@ -1233,6 +1262,7 @@ namespace APL_TestCheck
         private void button_Catm1TestSave()
         {
             string CheckProductionNum = null;
+            AutoClosingMessageBox.Show("저장 중.....", "알림", 1000);
             try
             {
                 CheckProductionNum = dataGridView_Catm1.Rows[0].Cells[0].Value.ToString();
@@ -1316,6 +1346,9 @@ namespace APL_TestCheck
             for (int i = 0; i < 4; i++)
                 dataGridView_Catm1.Rows[0].Cells[i].Value = null;
 
+            dataGridView_Catm1.Refresh();
+
+            AutoClosingMessageBox.Show("완료 되었습니다.", "알림", 1000);
             //Catm1_DataxlsWrite(Dst_Xls_File, dataGridView_Catm1.Rows[0].Cells[0].Value, dataGridView_Catm1.Rows[0].Cells[1].Value, dataGridView_Catm1.Rows[0].Cells[2].Value, dataGridView_Catm1.Rows[0].Cells[3].Value);
             //  dataGridView_Catm1.Rows[0].Cells[0].Value = null;
             // dataGridView_Catm1.Rows[0].Cells[1].Value = null;
@@ -1475,7 +1508,7 @@ namespace APL_TestCheck
                 GC.Collect();
             }
         }
-        private void Sensor_DataxlsWrite(object dst)
+        private void Sensor_DataxlsWrite(object[] data)
         {
 
             ExcelKill();
@@ -1501,7 +1534,7 @@ namespace APL_TestCheck
                 Thread.Sleep(1);
                 try
                 {
-                    wb = ExcelApp.Workbooks.Open(dst.ToString(), 0, false, 5, Missing.Value, Missing.Value, false, Missing.Value,
+                    wb = ExcelApp.Workbooks.Open(data[0].ToString(), 0, false, 5, Missing.Value, Missing.Value, false, Missing.Value,
                        Missing.Value, true, false, Missing.Value, false, false, false);
                 }
                 catch { ExcelKill(); return; }
@@ -1511,18 +1544,18 @@ namespace APL_TestCheck
 
                 //엑셀 시트 인덱스 번호는 0,0 부터 시작 하는 것이 아니라 1,1 A1 부터 시작 함. 0,0 으로 시작하면 오류...
                 //시트에 값 쓰기...
-                ws.Cells[8, 9] = dataGridView_Sensor.Rows[0].Cells[0].Value; // 제조 번호
-                ws.Cells[8, 4] = dataGridView_Sensor.Rows[0].Cells[1].Value; // 일련번호
-                ws.Cells[8, 6] = dataGridView_Sensor.Rows[0].Cells[2].Value; //IMEI 
-                ws.Cells[8, 7] = dataGridView_Sensor.Rows[0].Cells[3].Value;// PHONE
-                ws.Cells[8, 8] = dataGridView_Sensor.Rows[0].Cells[4].Value;//USIM
-                ws.Cells[8, 10] = dataGridView_Sensor.Rows[0].Cells[5].Value;//FIRM VER
-                ws.Cells[8, 18] = dataGridView_Sensor.Rows[0].Cells[6].Value;//BATT
-                ws.Cells[8, 19] = dataGridView_Sensor.Rows[0].Cells[7].Value;//SYS
-                ws.Cells[8, 20] = dataGridView_Sensor.Rows[0].Cells[8].Value;//TEMP
-                ws.Cells[8, 21] = dataGridView_Sensor.Rows[0].Cells[9].Value;//BMA
-                ws.Cells[8, 22] = dataGridView_Sensor.Rows[0].Cells[10].Value;//BMA
-                ws.Cells[8, 23] = dataGridView_Sensor.Rows[0].Cells[11].Value;//BMA
+                ws.Cells[8, 9] = data[0].ToString();//dataGridView_Sensor.Rows[0].Cells[0].Value; // 제조 번호
+                ws.Cells[8, 4] = data[1].ToString();//dataGridView_Sensor.Rows[0].Cells[1].Value; // 일련번호
+                ws.Cells[8, 6] = data[2].ToString();//dataGridView_Sensor.Rows[0].Cells[2].Value; //IMEI 
+                ws.Cells[8, 7] = data[3].ToString();//dataGridView_Sensor.Rows[0].Cells[3].Value;// PHONE
+                ws.Cells[8, 8] = data[4].ToString();//dataGridView_Sensor.Rows[0].Cells[4].Value;//USIM
+                ws.Cells[8, 10] = data[5].ToString();//dataGridView_Sensor.Rows[0].Cells[5].Value;//FIRM VER
+                ws.Cells[8, 18] = data[6].ToString();//dataGridView_Sensor.Rows[0].Cells[6].Value;//BATT
+                ws.Cells[8, 19] = data[7].ToString();//dataGridView_Sensor.Rows[0].Cells[7].Value;//SYS
+                ws.Cells[8, 20] = data[8].ToString();//dataGridView_Sensor.Rows[0].Cells[8].Value;//TEMP
+                ws.Cells[8, 21] = data[9].ToString();//dataGridView_Sensor.Rows[0].Cells[9].Value;//BMA
+                ws.Cells[8, 22] = data[10].ToString();//dataGridView_Sensor.Rows[0].Cells[10].Value;//BMA
+                ws.Cells[8, 23] = data[11].ToString();//dataGridView_Sensor.Rows[0].Cells[11].Value;//BMA
                 /*ws.Cells[1, 3] = "123";
                 ws.Cells[1, 4] = "1234";
                 ws.Cells[2, 1] = "Test1"; //A2
@@ -2008,9 +2041,10 @@ namespace APL_TestCheck
         {
             string[] APL_CopyArray = 
             {
-                "D8","E8", "F8", "G8", "H8",//SKT 일련번호 ,VC생산번호,IMEI,PHONE,USIM
-                "I8", "J8", "K8", "L8", "M8",//블루셀 제조번호,Ver,SNR,RSRP,BATT
-                "N8", "O8", "P8", "Q8", "R8",//SySVolt,TEMP,BMAX,BMAY,BMAZ
+                "D8", "E8", "F8", "G8", "H8",//SKT 일련번호   ,VC생산번호 ,IMEI      ,PHONE     ,USIM
+                "I8", "J8", "K8", "L8", "M8",//블루셀 제조번호,Ver        ,SNR       ,모뎀 버전 ,RSRP,
+                "N8", "O8", "P8", "Q8", "R8",//RSRQ           ,"숨기기1"  ,"숨기기2" ,"숨기기3" ,BATT,
+                "S8", "T8", "U8", "V8", "W8",//SySVolt        ,TEMP       ,BMAX      ,BMAY      ,BMAZ
             };
             
             for (int index = 0; index < listBox_PreviousFile.Items.Count; index++)

Main.resx

@@ -132,30 +132,6 @@
   <metadata name="RSRQ.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Catm1_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Modem_Ver.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="RSRP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="RSRQ.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Gps_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="LitmitMinimum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="LitmitMaximum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="Gps_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -305,42 +281,6 @@
   <metadata name="BMA_Z.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="ProductNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="IMEI.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Phone.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="USIM.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Version.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="BatteryVoltage.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SystemVoltage.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="BMA_X.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="BMA_Y.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="BMA_Z.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="folderBrowserDialog_Mainpath.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>106, 17</value>
   </metadata>

bin/Release/APL_TestCheck.exe.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+</configuration>

obj/Debug/APL_TestCheck.csproj.FileListAbsolute.txt

@@ -1,16 +1,16 @@
 D:\C#\APL_TestCheck\APL_TestCheck\bin\Debug\APL_TestCheck.exe.config
 D:\C#\APL_TestCheck\APL_TestCheck\bin\Debug\APL_TestCheck.exe
 D:\C#\APL_TestCheck\APL_TestCheck\bin\Debug\APL_TestCheck.pdb
+D:\C#\APL_TestCheck\APL_TestCheck\bin\Debug\Microsoft.WindowsAPICodePack.dll
+D:\C#\APL_TestCheck\APL_TestCheck\bin\Debug\Microsoft.WindowsAPICodePack.Shell.dll
+D:\C#\APL_TestCheck\APL_TestCheck\bin\Debug\Microsoft.WindowsAPICodePack.xml
+D:\C#\APL_TestCheck\APL_TestCheck\bin\Debug\Microsoft.WindowsAPICodePack.Shell.xml
 D:\C#\APL_TestCheck\APL_TestCheck\obj\Debug\APL_TestCheck.csprojAssemblyReference.cache
+D:\C#\APL_TestCheck\APL_TestCheck\obj\Debug\APL_TestCheck.csproj.ResolveComReference.cache
+D:\C#\APL_TestCheck\APL_TestCheck\obj\Debug\APL_TestCheck.Main.resources
 D:\C#\APL_TestCheck\APL_TestCheck\obj\Debug\APL_TestCheck.Properties.Resources.resources
 D:\C#\APL_TestCheck\APL_TestCheck\obj\Debug\APL_TestCheck.csproj.GenerateResource.cache
 D:\C#\APL_TestCheck\APL_TestCheck\obj\Debug\APL_TestCheck.csproj.CoreCompileInputs.cache
+D:\C#\APL_TestCheck\APL_TestCheck\obj\Debug\APL_TestCheck.csproj.CopyComplete
 D:\C#\APL_TestCheck\APL_TestCheck\obj\Debug\APL_TestCheck.exe
 D:\C#\APL_TestCheck\APL_TestCheck\obj\Debug\APL_TestCheck.pdb
-D:\C#\APL_TestCheck\APL_TestCheck\obj\Debug\APL_TestCheck.csproj.ResolveComReference.cache
-D:\C#\APL_TestCheck\APL_TestCheck\obj\Debug\APL_TestCheck.Main.resources
-D:\C#\APL_TestCheck\APL_TestCheck\bin\Debug\Microsoft.WindowsAPICodePack.dll
-D:\C#\APL_TestCheck\APL_TestCheck\bin\Debug\Microsoft.WindowsAPICodePack.Shell.dll
-D:\C#\APL_TestCheck\APL_TestCheck\bin\Debug\Microsoft.WindowsAPICodePack.xml
-D:\C#\APL_TestCheck\APL_TestCheck\bin\Debug\Microsoft.WindowsAPICodePack.Shell.xml
-D:\C#\APL_TestCheck\APL_TestCheck\obj\Debug\APL_TestCheck.csproj.CopyComplete

obj/Release/APL_TestCheck.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+57ce2f4868139773fb6eb00ba911cc9ffa2653d8

obj/Release/APL_TestCheck.csproj.FileListAbsolute.txt

@@ -0,0 +1,15 @@
+D:\C#\APL_TestCheck\APL_TestCheck\bin\Release\APL_TestCheck.exe.config
+D:\C#\APL_TestCheck\APL_TestCheck\bin\Release\APL_TestCheck.exe
+D:\C#\APL_TestCheck\APL_TestCheck\bin\Release\APL_TestCheck.pdb
+D:\C#\APL_TestCheck\APL_TestCheck\bin\Release\Microsoft.WindowsAPICodePack.dll
+D:\C#\APL_TestCheck\APL_TestCheck\bin\Release\Microsoft.WindowsAPICodePack.Shell.dll
+D:\C#\APL_TestCheck\APL_TestCheck\bin\Release\Microsoft.WindowsAPICodePack.xml
+D:\C#\APL_TestCheck\APL_TestCheck\bin\Release\Microsoft.WindowsAPICodePack.Shell.xml
+D:\C#\APL_TestCheck\APL_TestCheck\obj\Release\APL_TestCheck.csproj.ResolveComReference.cache
+D:\C#\APL_TestCheck\APL_TestCheck\obj\Release\APL_TestCheck.Main.resources
+D:\C#\APL_TestCheck\APL_TestCheck\obj\Release\APL_TestCheck.Properties.Resources.resources
+D:\C#\APL_TestCheck\APL_TestCheck\obj\Release\APL_TestCheck.csproj.GenerateResource.cache
+D:\C#\APL_TestCheck\APL_TestCheck\obj\Release\APL_TestCheck.csproj.CoreCompileInputs.cache
+D:\C#\APL_TestCheck\APL_TestCheck\obj\Release\APL_TestCheck.csproj.CopyComplete
+D:\C#\APL_TestCheck\APL_TestCheck\obj\Release\APL_TestCheck.exe
+D:\C#\APL_TestCheck\APL_TestCheck\obj\Release\APL_TestCheck.pdb