浏览代码

Excel 양식 변경 Phone Num 추가 / Sensor Test 기능 추가 /엑셀 덮어씌기 경우의수 수정

Serial Data Recv 함수 내용 변경
YJ 5 年之前
父节点
当前提交
30b6e60fce
共有 9 个文件被更改,包括 1034 次插入175 次删除
  1. 344 117
      Main.Designer.cs
  2. 648 43
      Main.cs
  3. 42 15
      Main.resx
  4. 二进制
      bin/Debug/APL_200221.xls
  5. 二进制
      bin/Debug/APL_TestCheck.exe
  6. 二进制
      bin/Debug/APL_TestCheck.pdb
  7. 二进制
      obj/Debug/APL_TestCheck.csproj.GenerateResource.cache
  8. 二进制
      obj/Debug/APL_TestCheck.exe
  9. 二进制
      obj/Debug/APL_TestCheck.pdb

+ 344 - 117
Main.Designer.cs

@@ -40,7 +40,9 @@
40 40
             this.pictureBox5 = new System.Windows.Forms.PictureBox();
41 41
             this.label6 = new System.Windows.Forms.Label();
42 42
             this.panel1 = new System.Windows.Forms.Panel();
43
-            this.panel2 = new System.Windows.Forms.Panel();
43
+            this.panel_SnCheck = new System.Windows.Forms.Panel();
44
+            this.label_SnCheck = new System.Windows.Forms.Label();
45
+            this.panel_Merge = new System.Windows.Forms.Panel();
44 46
             this.label_Merge = new System.Windows.Forms.Label();
45 47
             this.groupBox9 = new System.Windows.Forms.GroupBox();
46 48
             this.panel_Port = new System.Windows.Forms.Panel();
@@ -57,6 +59,18 @@
57 59
             this.label_Catm1Test = new System.Windows.Forms.Label();
58 60
             this.panel_GpsMode = new System.Windows.Forms.Panel();
59 61
             this.label_GPSTest = new System.Windows.Forms.Label();
62
+            this.panel_MergeMain = new System.Windows.Forms.Panel();
63
+            this.button_PrevFile = new System.Windows.Forms.Button();
64
+            this.button_AfterFile = new System.Windows.Forms.Button();
65
+            this.listBox_AfterFile = new System.Windows.Forms.ListBox();
66
+            this.listBox_PreviousFile = new System.Windows.Forms.ListBox();
67
+            this.progressBar1 = new System.Windows.Forms.ProgressBar();
68
+            this.panel_Catm1Test = new System.Windows.Forms.Panel();
69
+            this.richTextBox_catm1 = new System.Windows.Forms.RichTextBox();
70
+            this.dataGridView_Catm1 = new System.Windows.Forms.DataGridView();
71
+            this.Catm1_SerialNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
72
+            this.Modem_Ver = new System.Windows.Forms.DataGridViewTextBoxColumn();
73
+            this.RSRP = new System.Windows.Forms.DataGridViewTextBoxColumn();
60 74
             this.panel_GpsTest = new System.Windows.Forms.Panel();
61 75
             this.button_GpsTestSave = new System.Windows.Forms.Button();
62 76
             this.richTextBox_Gps = new System.Windows.Forms.RichTextBox();
@@ -79,34 +93,43 @@
79 93
             this.pictureBox_UnCheck1 = new System.Windows.Forms.PictureBox();
80 94
             this.label2 = new System.Windows.Forms.Label();
81 95
             this.dataGridView_Sensor = new System.Windows.Forms.DataGridView();
82
-            this.panel_Catm1Test = new System.Windows.Forms.Panel();
83
-            this.richTextBox_catm1 = new System.Windows.Forms.RichTextBox();
84
-            this.dataGridView_Catm1 = new System.Windows.Forms.DataGridView();
85
-            this.Catm1_SerialNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
86
-            this.Modem_Ver = new System.Windows.Forms.DataGridViewTextBoxColumn();
87
-            this.RSRP = new System.Windows.Forms.DataGridViewTextBoxColumn();
96
+            this.panel_SnCheckMain = new System.Windows.Forms.Panel();
97
+            this.dataGridView1 = new System.Windows.Forms.DataGridView();
98
+            this.button_FileFindLoad = new System.Windows.Forms.Button();
99
+            this.progressBar2 = new System.Windows.Forms.ProgressBar();
88 100
             this.folderBrowserDialog_Mainpath = new System.Windows.Forms.FolderBrowserDialog();
101
+            this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
89 102
             this.ProductNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
103
+            this.SN = new System.Windows.Forms.DataGridViewTextBoxColumn();
90 104
             this.IMEI = new System.Windows.Forms.DataGridViewTextBoxColumn();
105
+            this.Phone = new System.Windows.Forms.DataGridViewTextBoxColumn();
91 106
             this.USIM = new System.Windows.Forms.DataGridViewTextBoxColumn();
92 107
             this.Version = new System.Windows.Forms.DataGridViewTextBoxColumn();
93 108
             this.BatteryVoltage = new System.Windows.Forms.DataGridViewTextBoxColumn();
94 109
             this.SystemVoltage = new System.Windows.Forms.DataGridViewTextBoxColumn();
95 110
             this.Temp = new System.Windows.Forms.DataGridViewTextBoxColumn();
96
-            this.BMA = new System.Windows.Forms.DataGridViewTextBoxColumn();
111
+            this.BMA_X = new System.Windows.Forms.DataGridViewTextBoxColumn();
112
+            this.BMA_Y = new System.Windows.Forms.DataGridViewTextBoxColumn();
113
+            this.BMA_Z = new System.Windows.Forms.DataGridViewTextBoxColumn();
114
+            this.button_Merge = new System.Windows.Forms.Button();
115
+            this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
116
+            this.label_Cnt = new System.Windows.Forms.Label();
97 117
             this.label7 = new System.Windows.Forms.Label();
98
-            this.panel3 = new System.Windows.Forms.Panel();
99 118
             this.panel_Main.SuspendLayout();
100 119
             this.panel4.SuspendLayout();
101 120
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();
102 121
             this.panel1.SuspendLayout();
103
-            this.panel2.SuspendLayout();
122
+            this.panel_SnCheck.SuspendLayout();
123
+            this.panel_Merge.SuspendLayout();
104 124
             this.groupBox9.SuspendLayout();
105 125
             this.panel_Port.SuspendLayout();
106 126
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit();
107 127
             this.panel_SensorMode.SuspendLayout();
108 128
             this.panel_Catm1Mode.SuspendLayout();
109 129
             this.panel_GpsMode.SuspendLayout();
130
+            this.panel_MergeMain.SuspendLayout();
131
+            this.panel_Catm1Test.SuspendLayout();
132
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Catm1)).BeginInit();
110 133
             this.panel_GpsTest.SuspendLayout();
111 134
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Gps)).BeginInit();
112 135
             this.panel_SensorTest.SuspendLayout();
@@ -119,9 +142,9 @@
119 142
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_UnCheck4)).BeginInit();
120 143
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_UnCheck1)).BeginInit();
121 144
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Sensor)).BeginInit();
122
-            this.panel_Catm1Test.SuspendLayout();
123
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Catm1)).BeginInit();
124
-            this.panel3.SuspendLayout();
145
+            this.panel_SnCheckMain.SuspendLayout();
146
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
147
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
125 148
             this.SuspendLayout();
126 149
             // 
127 150
             // serialPort
@@ -138,12 +161,14 @@
138 161
             this.panel_Main.Controls.Add(this.panel4);
139 162
             this.panel_Main.Controls.Add(this.label6);
140 163
             this.panel_Main.Controls.Add(this.panel1);
164
+            this.panel_Main.Controls.Add(this.panel_MergeMain);
165
+            this.panel_Main.Controls.Add(this.panel_Catm1Test);
141 166
             this.panel_Main.Controls.Add(this.panel_GpsTest);
142 167
             this.panel_Main.Controls.Add(this.panel_SensorTest);
143
-            this.panel_Main.Controls.Add(this.panel_Catm1Test);
168
+            this.panel_Main.Controls.Add(this.panel_SnCheckMain);
144 169
             this.panel_Main.Location = new System.Drawing.Point(0, 0);
145 170
             this.panel_Main.Name = "panel_Main";
146
-            this.panel_Main.Size = new System.Drawing.Size(930, 710);
171
+            this.panel_Main.Size = new System.Drawing.Size(1356, 710);
147 172
             this.panel_Main.TabIndex = 1;
148 173
             this.panel_Main.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel_Main_MouseDown);
149 174
             this.panel_Main.MouseMove += new System.Windows.Forms.MouseEventHandler(this.panel_Main_MouseMove);
@@ -197,13 +222,13 @@
197 222
             this.panel4.Controls.Add(this.pictureBox5);
198 223
             this.panel4.Location = new System.Drawing.Point(-10, 642);
199 224
             this.panel4.Name = "panel4";
200
-            this.panel4.Size = new System.Drawing.Size(940, 68);
225
+            this.panel4.Size = new System.Drawing.Size(1372, 68);
201 226
             this.panel4.TabIndex = 85;
202 227
             // 
203 228
             // pictureBox5
204 229
             // 
205 230
             this.pictureBox5.Image = global::APL_TestCheck.Properties.Resources.bluecell_logo;
206
-            this.pictureBox5.Location = new System.Drawing.Point(765, 7);
231
+            this.pictureBox5.Location = new System.Drawing.Point(1193, 7);
207 232
             this.pictureBox5.Name = "pictureBox5";
208 233
             this.pictureBox5.Size = new System.Drawing.Size(159, 50);
209 234
             this.pictureBox5.TabIndex = 26;
@@ -222,8 +247,8 @@
222 247
             // 
223 248
             // panel1
224 249
             // 
225
-            this.panel1.Controls.Add(this.panel3);
226
-            this.panel1.Controls.Add(this.panel2);
250
+            this.panel1.Controls.Add(this.panel_SnCheck);
251
+            this.panel1.Controls.Add(this.panel_Merge);
227 252
             this.panel1.Controls.Add(this.groupBox9);
228 253
             this.panel1.Controls.Add(this.label1);
229 254
             this.panel1.Controls.Add(this.pictureBox6);
@@ -235,14 +260,44 @@
235 260
             this.panel1.Size = new System.Drawing.Size(159, 599);
236 261
             this.panel1.TabIndex = 26;
237 262
             // 
238
-            // panel2
239
-            // 
240
-            this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
241
-            this.panel2.Controls.Add(this.label_Merge);
242
-            this.panel2.Location = new System.Drawing.Point(0, 230);
243
-            this.panel2.Name = "panel2";
244
-            this.panel2.Size = new System.Drawing.Size(156, 53);
245
-            this.panel2.TabIndex = 32;
263
+            // panel_SnCheck
264
+            // 
265
+            this.panel_SnCheck.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
266
+            this.panel_SnCheck.Controls.Add(this.label_SnCheck);
267
+            this.panel_SnCheck.Location = new System.Drawing.Point(1, 290);
268
+            this.panel_SnCheck.Name = "panel_SnCheck";
269
+            this.panel_SnCheck.Size = new System.Drawing.Size(156, 53);
270
+            this.panel_SnCheck.TabIndex = 86;
271
+            this.panel_SnCheck.Click += new System.EventHandler(this.label_SnCheck_Click);
272
+            this.panel_SnCheck.MouseLeave += new System.EventHandler(this.panel_PanelMode_MouseLeave);
273
+            this.panel_SnCheck.MouseMove += new System.Windows.Forms.MouseEventHandler(this.panel_PanelMode_MouseMove);
274
+            // 
275
+            // label_SnCheck
276
+            // 
277
+            this.label_SnCheck.AutoSize = true;
278
+            this.label_SnCheck.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold);
279
+            this.label_SnCheck.ForeColor = System.Drawing.Color.Snow;
280
+            this.label_SnCheck.Location = new System.Drawing.Point(40, 17);
281
+            this.label_SnCheck.Name = "label_SnCheck";
282
+            this.label_SnCheck.Size = new System.Drawing.Size(85, 19);
283
+            this.label_SnCheck.TabIndex = 31;
284
+            this.label_SnCheck.Text = "S/N CHECK";
285
+            this.label_SnCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
286
+            this.label_SnCheck.Click += new System.EventHandler(this.label_SnCheck_Click);
287
+            this.label_SnCheck.MouseLeave += new System.EventHandler(this.label_SnCheck_MouseLeave);
288
+            this.label_SnCheck.MouseMove += new System.Windows.Forms.MouseEventHandler(this.label_SnCheck_MouseMove);
289
+            // 
290
+            // panel_Merge
291
+            // 
292
+            this.panel_Merge.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
293
+            this.panel_Merge.Controls.Add(this.label_Merge);
294
+            this.panel_Merge.Location = new System.Drawing.Point(0, 230);
295
+            this.panel_Merge.Name = "panel_Merge";
296
+            this.panel_Merge.Size = new System.Drawing.Size(156, 53);
297
+            this.panel_Merge.TabIndex = 32;
298
+            this.panel_Merge.Click += new System.EventHandler(this.label_Merge_Click);
299
+            this.panel_Merge.MouseLeave += new System.EventHandler(this.panel_PanelMode_MouseLeave);
300
+            this.panel_Merge.MouseMove += new System.Windows.Forms.MouseEventHandler(this.panel_PanelMode_MouseMove);
246 301
             // 
247 302
             // label_Merge
248 303
             // 
@@ -255,6 +310,9 @@
255 310
             this.label_Merge.TabIndex = 31;
256 311
             this.label_Merge.Text = "Merge 서비스 준비중...";
257 312
             this.label_Merge.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
313
+            this.label_Merge.Click += new System.EventHandler(this.label_Merge_Click);
314
+            this.label_Merge.MouseLeave += new System.EventHandler(this.label_Merge_MouseLeave);
315
+            this.label_Merge.MouseMove += new System.Windows.Forms.MouseEventHandler(this.label_Merge_MouseMove);
258 316
             // 
259 317
             // groupBox9
260 318
             // 
@@ -449,6 +507,120 @@
449 507
             this.label_GPSTest.MouseLeave += new System.EventHandler(this.label_GPSTest_MouseLeave);
450 508
             this.label_GPSTest.MouseMove += new System.Windows.Forms.MouseEventHandler(this.label_GPSTest_MouseMove);
451 509
             // 
510
+            // panel_MergeMain
511
+            // 
512
+            this.panel_MergeMain.Controls.Add(this.label7);
513
+            this.panel_MergeMain.Controls.Add(this.label_Cnt);
514
+            this.panel_MergeMain.Controls.Add(this.numericUpDown1);
515
+            this.panel_MergeMain.Controls.Add(this.button_Merge);
516
+            this.panel_MergeMain.Controls.Add(this.button_PrevFile);
517
+            this.panel_MergeMain.Controls.Add(this.button_AfterFile);
518
+            this.panel_MergeMain.Controls.Add(this.listBox_AfterFile);
519
+            this.panel_MergeMain.Controls.Add(this.listBox_PreviousFile);
520
+            this.panel_MergeMain.Controls.Add(this.progressBar1);
521
+            this.panel_MergeMain.Location = new System.Drawing.Point(160, 44);
522
+            this.panel_MergeMain.Name = "panel_MergeMain";
523
+            this.panel_MergeMain.Size = new System.Drawing.Size(1202, 599);
524
+            this.panel_MergeMain.TabIndex = 88;
525
+            // 
526
+            // button_PrevFile
527
+            // 
528
+            this.button_PrevFile.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
529
+            this.button_PrevFile.Location = new System.Drawing.Point(21, 65);
530
+            this.button_PrevFile.Name = "button_PrevFile";
531
+            this.button_PrevFile.Size = new System.Drawing.Size(75, 522);
532
+            this.button_PrevFile.TabIndex = 3;
533
+            this.button_PrevFile.Text = "PrevFind";
534
+            this.button_PrevFile.UseVisualStyleBackColor = false;
535
+            this.button_PrevFile.Click += new System.EventHandler(this.button_PrevFile_Click);
536
+            // 
537
+            // button_AfterFile
538
+            // 
539
+            this.button_AfterFile.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
540
+            this.button_AfterFile.Location = new System.Drawing.Point(621, 63);
541
+            this.button_AfterFile.Name = "button_AfterFile";
542
+            this.button_AfterFile.Size = new System.Drawing.Size(75, 524);
543
+            this.button_AfterFile.TabIndex = 3;
544
+            this.button_AfterFile.Text = "AfterFile";
545
+            this.button_AfterFile.UseVisualStyleBackColor = false;
546
+            this.button_AfterFile.Click += new System.EventHandler(this.button_AfterFile_Click);
547
+            // 
548
+            // listBox_AfterFile
549
+            // 
550
+            this.listBox_AfterFile.FormattingEnabled = true;
551
+            this.listBox_AfterFile.ItemHeight = 12;
552
+            this.listBox_AfterFile.Location = new System.Drawing.Point(702, 67);
553
+            this.listBox_AfterFile.Name = "listBox_AfterFile";
554
+            this.listBox_AfterFile.Size = new System.Drawing.Size(486, 520);
555
+            this.listBox_AfterFile.TabIndex = 2;
556
+            // 
557
+            // listBox_PreviousFile
558
+            // 
559
+            this.listBox_PreviousFile.FormattingEnabled = true;
560
+            this.listBox_PreviousFile.ItemHeight = 12;
561
+            this.listBox_PreviousFile.Location = new System.Drawing.Point(104, 67);
562
+            this.listBox_PreviousFile.Name = "listBox_PreviousFile";
563
+            this.listBox_PreviousFile.Size = new System.Drawing.Size(511, 520);
564
+            this.listBox_PreviousFile.TabIndex = 2;
565
+            // 
566
+            // progressBar1
567
+            // 
568
+            this.progressBar1.Location = new System.Drawing.Point(621, 21);
569
+            this.progressBar1.Name = "progressBar1";
570
+            this.progressBar1.Size = new System.Drawing.Size(567, 40);
571
+            this.progressBar1.TabIndex = 0;
572
+            // 
573
+            // panel_Catm1Test
574
+            // 
575
+            this.panel_Catm1Test.Controls.Add(this.richTextBox_catm1);
576
+            this.panel_Catm1Test.Controls.Add(this.dataGridView_Catm1);
577
+            this.panel_Catm1Test.Location = new System.Drawing.Point(149, 44);
578
+            this.panel_Catm1Test.Name = "panel_Catm1Test";
579
+            this.panel_Catm1Test.Size = new System.Drawing.Size(1202, 599);
580
+            this.panel_Catm1Test.TabIndex = 87;
581
+            // 
582
+            // richTextBox_catm1
583
+            // 
584
+            this.richTextBox_catm1.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
585
+            this.richTextBox_catm1.Font = new System.Drawing.Font("나눔고딕", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
586
+            this.richTextBox_catm1.ForeColor = System.Drawing.Color.Yellow;
587
+            this.richTextBox_catm1.Location = new System.Drawing.Point(17, 65);
588
+            this.richTextBox_catm1.Name = "richTextBox_catm1";
589
+            this.richTextBox_catm1.Size = new System.Drawing.Size(1176, 502);
590
+            this.richTextBox_catm1.TabIndex = 26;
591
+            this.richTextBox_catm1.Text = "";
592
+            // 
593
+            // dataGridView_Catm1
594
+            // 
595
+            this.dataGridView_Catm1.AllowUserToAddRows = false;
596
+            this.dataGridView_Catm1.BackgroundColor = System.Drawing.Color.Gray;
597
+            this.dataGridView_Catm1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
598
+            this.dataGridView_Catm1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
599
+            this.Catm1_SerialNumber,
600
+            this.Modem_Ver,
601
+            this.RSRP});
602
+            this.dataGridView_Catm1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(230)))));
603
+            this.dataGridView_Catm1.Location = new System.Drawing.Point(17, 3);
604
+            this.dataGridView_Catm1.Name = "dataGridView_Catm1";
605
+            this.dataGridView_Catm1.RowTemplate.Height = 23;
606
+            this.dataGridView_Catm1.Size = new System.Drawing.Size(1176, 56);
607
+            this.dataGridView_Catm1.TabIndex = 15;
608
+            // 
609
+            // Catm1_SerialNumber
610
+            // 
611
+            this.Catm1_SerialNumber.HeaderText = "생산번호";
612
+            this.Catm1_SerialNumber.Name = "Catm1_SerialNumber";
613
+            // 
614
+            // Modem_Ver
615
+            // 
616
+            this.Modem_Ver.HeaderText = "Modem Ver";
617
+            this.Modem_Ver.Name = "Modem_Ver";
618
+            // 
619
+            // RSRP
620
+            // 
621
+            this.RSRP.HeaderText = "RSRP";
622
+            this.RSRP.Name = "RSRP";
623
+            // 
452 624
             // panel_GpsTest
453 625
             // 
454 626
             this.panel_GpsTest.Controls.Add(this.button_GpsTestSave);
@@ -457,14 +629,14 @@
457 629
             this.panel_GpsTest.Controls.Add(this.dataGridView_Gps);
458 630
             this.panel_GpsTest.Location = new System.Drawing.Point(149, 44);
459 631
             this.panel_GpsTest.Name = "panel_GpsTest";
460
-            this.panel_GpsTest.Size = new System.Drawing.Size(777, 599);
632
+            this.panel_GpsTest.Size = new System.Drawing.Size(1202, 599);
461 633
             this.panel_GpsTest.TabIndex = 86;
462 634
             // 
463 635
             // button_GpsTestSave
464 636
             // 
465 637
             this.button_GpsTestSave.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
466 638
             this.button_GpsTestSave.Font = new System.Drawing.Font("굴림", 16F, System.Drawing.FontStyle.Bold);
467
-            this.button_GpsTestSave.Location = new System.Drawing.Point(497, 3);
639
+            this.button_GpsTestSave.Location = new System.Drawing.Point(921, 1);
468 640
             this.button_GpsTestSave.Name = "button_GpsTestSave";
469 641
             this.button_GpsTestSave.Size = new System.Drawing.Size(272, 58);
470 642
             this.button_GpsTestSave.TabIndex = 89;
@@ -479,7 +651,7 @@
479 651
             this.richTextBox_Gps.ForeColor = System.Drawing.Color.Yellow;
480 652
             this.richTextBox_Gps.Location = new System.Drawing.Point(26, 67);
481 653
             this.richTextBox_Gps.Name = "richTextBox_Gps";
482
-            this.richTextBox_Gps.Size = new System.Drawing.Size(743, 500);
654
+            this.richTextBox_Gps.Size = new System.Drawing.Size(1167, 500);
483 655
             this.richTextBox_Gps.TabIndex = 26;
484 656
             this.richTextBox_Gps.Text = "";
485 657
             // 
@@ -505,9 +677,8 @@
505 677
             this.dataGridView_Gps.Location = new System.Drawing.Point(26, 3);
506 678
             this.dataGridView_Gps.Name = "dataGridView_Gps";
507 679
             this.dataGridView_Gps.RowTemplate.Height = 23;
508
-            this.dataGridView_Gps.Size = new System.Drawing.Size(465, 56);
680
+            this.dataGridView_Gps.Size = new System.Drawing.Size(889, 56);
509 681
             this.dataGridView_Gps.TabIndex = 15;
510
-            this.dataGridView_Gps.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView_Gps_CellMouseClick);
511 682
             this.dataGridView_Gps.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView_Gps_KeyDown);
512 683
             // 
513 684
             // Gps_SerialNumber
@@ -538,7 +709,7 @@
538 709
             this.panel_SensorTest.Controls.Add(this.dataGridView_Sensor);
539 710
             this.panel_SensorTest.Location = new System.Drawing.Point(149, 44);
540 711
             this.panel_SensorTest.Name = "panel_SensorTest";
541
-            this.panel_SensorTest.Size = new System.Drawing.Size(777, 599);
712
+            this.panel_SensorTest.Size = new System.Drawing.Size(1207, 599);
542 713
             this.panel_SensorTest.TabIndex = 27;
543 714
             // 
544 715
             // pictureBox_Check2
@@ -635,7 +806,7 @@
635 806
             this.richTextBox_Sensor.ForeColor = System.Drawing.Color.Yellow;
636 807
             this.richTextBox_Sensor.Location = new System.Drawing.Point(132, 67);
637 808
             this.richTextBox_Sensor.Name = "richTextBox_Sensor";
638
-            this.richTextBox_Sensor.Size = new System.Drawing.Size(633, 500);
809
+            this.richTextBox_Sensor.Size = new System.Drawing.Size(1067, 500);
639 810
             this.richTextBox_Sensor.TabIndex = 26;
640 811
             this.richTextBox_Sensor.Text = "";
641 812
             // 
@@ -675,155 +846,187 @@
675 846
             this.dataGridView_Sensor.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
676 847
             this.dataGridView_Sensor.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
677 848
             this.ProductNumber,
849
+            this.SN,
678 850
             this.IMEI,
851
+            this.Phone,
679 852
             this.USIM,
680 853
             this.Version,
681 854
             this.BatteryVoltage,
682 855
             this.SystemVoltage,
683 856
             this.Temp,
684
-            this.BMA});
857
+            this.BMA_X,
858
+            this.BMA_Y,
859
+            this.BMA_Z});
685 860
             this.dataGridView_Sensor.GridColor = System.Drawing.Color.Green;
686 861
             this.dataGridView_Sensor.Location = new System.Drawing.Point(20, 3);
687 862
             this.dataGridView_Sensor.Name = "dataGridView_Sensor";
688 863
             this.dataGridView_Sensor.RowTemplate.Height = 23;
689
-            this.dataGridView_Sensor.Size = new System.Drawing.Size(745, 58);
864
+            this.dataGridView_Sensor.Size = new System.Drawing.Size(1182, 58);
690 865
             this.dataGridView_Sensor.TabIndex = 15;
691
-            this.dataGridView_Sensor.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView_Sensor_CellMouseClick);
692 866
             // 
693
-            // panel_Catm1Test
867
+            // panel_SnCheckMain
694 868
             // 
695
-            this.panel_Catm1Test.Controls.Add(this.richTextBox_catm1);
696
-            this.panel_Catm1Test.Controls.Add(this.dataGridView_Catm1);
697
-            this.panel_Catm1Test.Location = new System.Drawing.Point(149, 44);
698
-            this.panel_Catm1Test.Name = "panel_Catm1Test";
699
-            this.panel_Catm1Test.Size = new System.Drawing.Size(777, 599);
700
-            this.panel_Catm1Test.TabIndex = 87;
869
+            this.panel_SnCheckMain.Controls.Add(this.dataGridView1);
870
+            this.panel_SnCheckMain.Controls.Add(this.button_FileFindLoad);
871
+            this.panel_SnCheckMain.Controls.Add(this.progressBar2);
872
+            this.panel_SnCheckMain.Location = new System.Drawing.Point(162, 44);
873
+            this.panel_SnCheckMain.Name = "panel_SnCheckMain";
874
+            this.panel_SnCheckMain.Size = new System.Drawing.Size(1202, 599);
875
+            this.panel_SnCheckMain.TabIndex = 90;
701 876
             // 
702
-            // richTextBox_catm1
877
+            // dataGridView1
703 878
             // 
704
-            this.richTextBox_catm1.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
705
-            this.richTextBox_catm1.Font = new System.Drawing.Font("나눔고딕", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
706
-            this.richTextBox_catm1.ForeColor = System.Drawing.Color.Yellow;
707
-            this.richTextBox_catm1.Location = new System.Drawing.Point(17, 65);
708
-            this.richTextBox_catm1.Name = "richTextBox_catm1";
709
-            this.richTextBox_catm1.Size = new System.Drawing.Size(748, 502);
710
-            this.richTextBox_catm1.TabIndex = 26;
711
-            this.richTextBox_catm1.Text = "";
879
+            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
880
+            this.dataGridView1.Location = new System.Drawing.Point(102, 65);
881
+            this.dataGridView1.Name = "dataGridView1";
882
+            this.dataGridView1.RowTemplate.Height = 23;
883
+            this.dataGridView1.Size = new System.Drawing.Size(1078, 524);
884
+            this.dataGridView1.TabIndex = 4;
712 885
             // 
713
-            // dataGridView_Catm1
886
+            // button_FileFindLoad
714 887
             // 
715
-            this.dataGridView_Catm1.AllowUserToAddRows = false;
716
-            this.dataGridView_Catm1.BackgroundColor = System.Drawing.Color.Gray;
717
-            this.dataGridView_Catm1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
718
-            this.dataGridView_Catm1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
719
-            this.Catm1_SerialNumber,
720
-            this.Modem_Ver,
721
-            this.RSRP});
722
-            this.dataGridView_Catm1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(230)))));
723
-            this.dataGridView_Catm1.Location = new System.Drawing.Point(17, 3);
724
-            this.dataGridView_Catm1.Name = "dataGridView_Catm1";
725
-            this.dataGridView_Catm1.RowTemplate.Height = 23;
726
-            this.dataGridView_Catm1.Size = new System.Drawing.Size(748, 56);
727
-            this.dataGridView_Catm1.TabIndex = 15;
728
-            this.dataGridView_Catm1.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView_Catm1_CellMouseClick);
888
+            this.button_FileFindLoad.Location = new System.Drawing.Point(21, 65);
889
+            this.button_FileFindLoad.Name = "button_FileFindLoad";
890
+            this.button_FileFindLoad.Size = new System.Drawing.Size(75, 23);
891
+            this.button_FileFindLoad.TabIndex = 3;
892
+            this.button_FileFindLoad.Text = "Load";
893
+            this.button_FileFindLoad.UseVisualStyleBackColor = true;
894
+            this.button_FileFindLoad.Click += new System.EventHandler(this.button_FileFindLoad_Click);
729 895
             // 
730
-            // Catm1_SerialNumber
731
-            // 
732
-            this.Catm1_SerialNumber.HeaderText = "생산번호";
733
-            this.Catm1_SerialNumber.Name = "Catm1_SerialNumber";
896
+            // progressBar2
734 897
             // 
735
-            // Modem_Ver
736
-            // 
737
-            this.Modem_Ver.HeaderText = "Modem Ver";
738
-            this.Modem_Ver.Name = "Modem_Ver";
898
+            this.progressBar2.Location = new System.Drawing.Point(21, 21);
899
+            this.progressBar2.Name = "progressBar2";
900
+            this.progressBar2.Size = new System.Drawing.Size(1159, 40);
901
+            this.progressBar2.TabIndex = 0;
739 902
             // 
740
-            // RSRP
903
+            // openFileDialog
741 904
             // 
742
-            this.RSRP.HeaderText = "RSRP";
743
-            this.RSRP.Name = "RSRP";
905
+            this.openFileDialog.Multiselect = true;
744 906
             // 
745 907
             // ProductNumber
746 908
             // 
747
-            this.ProductNumber.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
909
+            this.ProductNumber.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
748 910
             this.ProductNumber.HeaderText = "생산번호";
749 911
             this.ProductNumber.Name = "ProductNumber";
750 912
             this.ProductNumber.Width = 78;
751 913
             // 
914
+            // SN
915
+            // 
916
+            this.SN.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
917
+            this.SN.HeaderText = "일련번호";
918
+            this.SN.Name = "SN";
919
+            this.SN.Width = 78;
920
+            // 
752 921
             // IMEI
753 922
             // 
754
-            this.IMEI.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
923
+            this.IMEI.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
755 924
             this.IMEI.HeaderText = "IMEI";
756 925
             this.IMEI.Name = "IMEI";
757 926
             this.IMEI.Width = 55;
758 927
             // 
928
+            // Phone
929
+            // 
930
+            this.Phone.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
931
+            this.Phone.HeaderText = "Phone";
932
+            this.Phone.Name = "Phone";
933
+            this.Phone.Width = 66;
934
+            // 
759 935
             // USIM
760 936
             // 
761
-            this.USIM.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
937
+            this.USIM.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
762 938
             this.USIM.HeaderText = "USIM";
763 939
             this.USIM.Name = "USIM";
764 940
             this.USIM.Width = 60;
765 941
             // 
766 942
             // Version
767 943
             // 
768
-            this.Version.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
944
+            this.Version.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
769 945
             this.Version.HeaderText = "버전";
770 946
             this.Version.Name = "Version";
771 947
             this.Version.Width = 54;
772 948
             // 
773 949
             // BatteryVoltage
774 950
             // 
775
-            this.BatteryVoltage.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
951
+            this.BatteryVoltage.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
776 952
             this.BatteryVoltage.HeaderText = "BatteryVoltage";
777 953
             this.BatteryVoltage.Name = "BatteryVoltage";
778 954
             this.BatteryVoltage.Width = 111;
779 955
             // 
780 956
             // SystemVoltage
781 957
             // 
782
-            this.SystemVoltage.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
958
+            this.SystemVoltage.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
783 959
             this.SystemVoltage.HeaderText = "SystemVoltage";
784 960
             this.SystemVoltage.Name = "SystemVoltage";
785 961
             this.SystemVoltage.Width = 115;
786 962
             // 
787 963
             // Temp
788 964
             // 
789
-            this.Temp.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
965
+            this.Temp.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
790 966
             this.Temp.HeaderText = "온도";
791 967
             this.Temp.Name = "Temp";
792 968
             this.Temp.Width = 54;
793 969
             // 
794
-            // BMA
970
+            // BMA_X
971
+            // 
972
+            this.BMA_X.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
973
+            this.BMA_X.HeaderText = "가속도 X";
974
+            this.BMA_X.Name = "BMA_X";
975
+            this.BMA_X.Width = 78;
795 976
             // 
796
-            this.BMA.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
797
-            this.BMA.HeaderText = "가속도";
798
-            this.BMA.Name = "BMA";
799
-            this.BMA.Width = 66;
977
+            // BMA_Y
978
+            // 
979
+            this.BMA_Y.HeaderText = "가속도 Y";
980
+            this.BMA_Y.Name = "BMA_Y";
981
+            // 
982
+            // BMA_Z
983
+            // 
984
+            this.BMA_Z.HeaderText = "가속도 Z";
985
+            this.BMA_Z.Name = "BMA_Z";
986
+            // 
987
+            // button_Merge
988
+            // 
989
+            this.button_Merge.AccessibleRole = System.Windows.Forms.AccessibleRole.None;
990
+            this.button_Merge.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
991
+            this.button_Merge.Location = new System.Drawing.Point(23, 21);
992
+            this.button_Merge.Name = "button_Merge";
993
+            this.button_Merge.Size = new System.Drawing.Size(75, 38);
994
+            this.button_Merge.TabIndex = 4;
995
+            this.button_Merge.Text = "Merge";
996
+            this.button_Merge.UseVisualStyleBackColor = false;
997
+            this.button_Merge.Click += new System.EventHandler(this.button_Merge_Click);
998
+            // 
999
+            // numericUpDown1
1000
+            // 
1001
+            this.numericUpDown1.Location = new System.Drawing.Point(160, 26);
1002
+            this.numericUpDown1.Name = "numericUpDown1";
1003
+            this.numericUpDown1.Size = new System.Drawing.Size(102, 21);
1004
+            this.numericUpDown1.TabIndex = 5;
1005
+            // 
1006
+            // label_Cnt
1007
+            // 
1008
+            this.label_Cnt.AutoSize = true;
1009
+            this.label_Cnt.Font = new System.Drawing.Font("굴림", 14F, System.Drawing.FontStyle.Bold);
1010
+            this.label_Cnt.Location = new System.Drawing.Point(357, 25);
1011
+            this.label_Cnt.Name = "label_Cnt";
1012
+            this.label_Cnt.Size = new System.Drawing.Size(94, 19);
1013
+            this.label_Cnt.TabIndex = 6;
1014
+            this.label_Cnt.Text = "Count : 0";
800 1015
             // 
801 1016
             // label7
802 1017
             // 
803 1018
             this.label7.AutoSize = true;
804
-            this.label7.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold);
805
-            this.label7.ForeColor = System.Drawing.Color.Snow;
806
-            this.label7.Location = new System.Drawing.Point(40, 17);
1019
+            this.label7.Location = new System.Drawing.Point(119, 31);
807 1020
             this.label7.Name = "label7";
808
-            this.label7.Size = new System.Drawing.Size(85, 19);
809
-            this.label7.TabIndex = 31;
810
-            this.label7.Text = "S/N CHECK";
811
-            this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
812
-            // 
813
-            // panel3
814
-            // 
815
-            this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
816
-            this.panel3.Controls.Add(this.label7);
817
-            this.panel3.Location = new System.Drawing.Point(1, 290);
818
-            this.panel3.Name = "panel3";
819
-            this.panel3.Size = new System.Drawing.Size(156, 53);
820
-            this.panel3.TabIndex = 86;
1021
+            this.label7.Size = new System.Drawing.Size(29, 12);
1022
+            this.label7.TabIndex = 7;
1023
+            this.label7.Text = "Line";
821 1024
             // 
822 1025
             // Main
823 1026
             // 
824 1027
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
825 1028
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
826
-            this.ClientSize = new System.Drawing.Size(925, 706);
1029
+            this.ClientSize = new System.Drawing.Size(1354, 706);
827 1030
             this.Controls.Add(this.panel_Main);
828 1031
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
829 1032
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
@@ -836,8 +1039,10 @@
836 1039
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit();
837 1040
             this.panel1.ResumeLayout(false);
838 1041
             this.panel1.PerformLayout();
839
-            this.panel2.ResumeLayout(false);
840
-            this.panel2.PerformLayout();
1042
+            this.panel_SnCheck.ResumeLayout(false);
1043
+            this.panel_SnCheck.PerformLayout();
1044
+            this.panel_Merge.ResumeLayout(false);
1045
+            this.panel_Merge.PerformLayout();
841 1046
             this.groupBox9.ResumeLayout(false);
842 1047
             this.groupBox9.PerformLayout();
843 1048
             this.panel_Port.ResumeLayout(false);
@@ -849,6 +1054,10 @@
849 1054
             this.panel_Catm1Mode.PerformLayout();
850 1055
             this.panel_GpsMode.ResumeLayout(false);
851 1056
             this.panel_GpsMode.PerformLayout();
1057
+            this.panel_MergeMain.ResumeLayout(false);
1058
+            this.panel_MergeMain.PerformLayout();
1059
+            this.panel_Catm1Test.ResumeLayout(false);
1060
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Catm1)).EndInit();
852 1061
             this.panel_GpsTest.ResumeLayout(false);
853 1062
             this.panel_GpsTest.PerformLayout();
854 1063
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Gps)).EndInit();
@@ -863,10 +1072,9 @@
863 1072
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_UnCheck4)).EndInit();
864 1073
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_UnCheck1)).EndInit();
865 1074
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Sensor)).EndInit();
866
-            this.panel_Catm1Test.ResumeLayout(false);
867
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Catm1)).EndInit();
868
-            this.panel3.ResumeLayout(false);
869
-            this.panel3.PerformLayout();
1075
+            this.panel_SnCheckMain.ResumeLayout(false);
1076
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
1077
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
870 1078
             this.ResumeLayout(false);
871 1079
 
872 1080
         }
@@ -925,18 +1133,37 @@
925 1133
         private System.Windows.Forms.CheckBox checkBox_GPGSV;
926 1134
         private System.Windows.Forms.Button button_GpsTestSave;
927 1135
         private System.Windows.Forms.Button button_Path;
928
-        private System.Windows.Forms.Panel panel2;
1136
+        private System.Windows.Forms.Panel panel_Merge;
929 1137
         private System.Windows.Forms.Label label_Merge;
930 1138
         private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog_Mainpath;
1139
+        private System.Windows.Forms.Panel panel_SnCheck;
1140
+        private System.Windows.Forms.Label label_SnCheck;
1141
+        private System.Windows.Forms.Panel panel_MergeMain;
1142
+        private System.Windows.Forms.ProgressBar progressBar1;
1143
+        private System.Windows.Forms.Button button_PrevFile;
1144
+        private System.Windows.Forms.Button button_AfterFile;
1145
+        private System.Windows.Forms.ListBox listBox_AfterFile;
1146
+        private System.Windows.Forms.ListBox listBox_PreviousFile;
1147
+        private System.Windows.Forms.OpenFileDialog openFileDialog;
1148
+        private System.Windows.Forms.Panel panel_SnCheckMain;
1149
+        private System.Windows.Forms.DataGridView dataGridView1;
1150
+        private System.Windows.Forms.Button button_FileFindLoad;
1151
+        private System.Windows.Forms.ProgressBar progressBar2;
931 1152
         private System.Windows.Forms.DataGridViewTextBoxColumn ProductNumber;
1153
+        private System.Windows.Forms.DataGridViewTextBoxColumn SN;
932 1154
         private System.Windows.Forms.DataGridViewTextBoxColumn IMEI;
1155
+        private System.Windows.Forms.DataGridViewTextBoxColumn Phone;
933 1156
         private System.Windows.Forms.DataGridViewTextBoxColumn USIM;
934 1157
         private System.Windows.Forms.DataGridViewTextBoxColumn Version;
935 1158
         private System.Windows.Forms.DataGridViewTextBoxColumn BatteryVoltage;
936 1159
         private System.Windows.Forms.DataGridViewTextBoxColumn SystemVoltage;
937 1160
         private System.Windows.Forms.DataGridViewTextBoxColumn Temp;
938
-        private System.Windows.Forms.DataGridViewTextBoxColumn BMA;
939
-        private System.Windows.Forms.Panel panel3;
1161
+        private System.Windows.Forms.DataGridViewTextBoxColumn BMA_X;
1162
+        private System.Windows.Forms.DataGridViewTextBoxColumn BMA_Y;
1163
+        private System.Windows.Forms.DataGridViewTextBoxColumn BMA_Z;
1164
+        private System.Windows.Forms.Button button_Merge;
1165
+        private System.Windows.Forms.Label label_Cnt;
1166
+        private System.Windows.Forms.NumericUpDown numericUpDown1;
940 1167
         private System.Windows.Forms.Label label7;
941 1168
     }
942 1169
 }

+ 648 - 43
Main.cs

@@ -14,6 +14,7 @@ using System.Windows.Forms;
14 14
 using Excel = Microsoft.Office.Interop.Excel;
15 15
 using System.Reflection;
16 16
 using Microsoft.WindowsAPICodePack.Dialogs;
17
+using System.Threading;
17 18
 
18 19
 
19 20
 //using Microsoft.Office.Interop.Excel;
@@ -52,18 +53,40 @@ namespace APL_TestCheck
52 53
                 panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
53 54
                 panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
54 55
                 panel_GpsMode.BackColor = Color.FromArgb(0, 159, 255);
56
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
57
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
55 58
             }
56 59
             else if (panel_Catm1Test.Visible == true)
57 60
             {
58 61
                 panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 255);
59 62
                 panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
60 63
                 panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
64
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
65
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
61 66
             }
62 67
             else if (panel_SensorTest.Visible == true)
63 68
             {
64 69
                 panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
65 70
                 panel_SensorMode.BackColor = Color.FromArgb(0, 159, 255);
66 71
                 panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
72
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
73
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
74
+            }
75
+            else if (panel_MergeMain.Visible == true)
76
+            {
77
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 255);
78
+                panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
79
+                panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
80
+                panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
81
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
82
+            }
83
+            else if (panel_SnCheckMain.Visible == true)
84
+            {
85
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
86
+                panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
87
+                panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
88
+                panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
89
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 255);
67 90
             }
68 91
         }
69 92
 
@@ -75,18 +98,40 @@ namespace APL_TestCheck
75 98
                 panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
76 99
                 panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
77 100
                 panel_GpsMode.BackColor = Color.FromArgb(0, 159, 255);
101
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
102
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
78 103
             }
79 104
             else if (panel_Catm1Test.Visible == true)
80 105
             {
81 106
                 panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 255);
82 107
                 panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
83 108
                 panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
109
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
110
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
84 111
             }
85 112
             else if (panel_SensorTest.Visible == true)
86 113
             {
87 114
                 panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
88 115
                 panel_SensorMode.BackColor = Color.FromArgb(0, 159, 255);
89 116
                 panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
117
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
118
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
119
+            }
120
+            else if (panel_MergeMain.Visible == true)
121
+            {
122
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 255);
123
+                panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
124
+                panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
125
+                panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
126
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
127
+            }
128
+            else if (panel_SnCheckMain.Visible == true)
129
+            {
130
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
131
+                panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
132
+                panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
133
+                panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
134
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 255);
90 135
             }
91 136
         }
92 137
 
@@ -97,23 +142,138 @@ namespace APL_TestCheck
97 142
                 panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
98 143
                 panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
99 144
                 panel_GpsMode.BackColor = Color.FromArgb(0, 159, 255);
145
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
146
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
100 147
             }
101 148
             else if (panel_Catm1Test.Visible == true)
102 149
             {
103 150
                 panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 255);
104 151
                 panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
105 152
                 panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
153
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
154
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
106 155
             }
107 156
             else if (panel_SensorTest.Visible == true)
108 157
             {
109 158
                 panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
110 159
                 panel_SensorMode.BackColor = Color.FromArgb(0, 159, 255);
111 160
                 panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
161
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
162
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
163
+            }
164
+            else if (panel_MergeMain.Visible == true)
165
+            {
166
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 255);
167
+                panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
168
+                panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
169
+                panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
170
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
171
+            }
172
+            else if (panel_SnCheckMain.Visible == true)
173
+            {
174
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
175
+                panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
176
+                panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
177
+                panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
178
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 255);
112 179
             }
113
-
114 180
         }
115 181
 
182
+        private void label_Merge_MouseLeave(object sender, EventArgs e)
183
+        {
184
+            if (panel_GpsTest.Visible == true)
185
+            {
186
+                panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
187
+                panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
188
+                panel_GpsMode.BackColor = Color.FromArgb(0, 159, 255);
189
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
190
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
191
+            }
192
+            else if (panel_Catm1Test.Visible == true)
193
+            {
194
+                panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 255);
195
+                panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
196
+                panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
197
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
198
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
199
+            }
200
+            else if (panel_SensorTest.Visible == true)
201
+            {
202
+                panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
203
+                panel_SensorMode.BackColor = Color.FromArgb(0, 159, 255);
204
+                panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
205
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
206
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
207
+            }
208
+            else if (panel_MergeMain.Visible == true)
209
+            {
210
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 255);
211
+                panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
212
+                panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
213
+                panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
214
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
215
+            }
216
+            else if(panel_SnCheckMain.Visible == true)
217
+            {
218
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
219
+                panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
220
+                panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
221
+                panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
222
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 255);
223
+            }
224
+        }
225
+        private void label_SnCheck_MouseLeave(object sender, EventArgs e)
226
+        {
227
+            if (panel_GpsTest.Visible == true)
228
+            {
229
+                panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
230
+                panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
231
+                panel_GpsMode.BackColor = Color.FromArgb(0, 159, 255);
232
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
233
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
234
+            }
235
+            else if (panel_Catm1Test.Visible == true)
236
+            {
237
+                panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 255);
238
+                panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
239
+                panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
240
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
241
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
242
+            }
243
+            else if (panel_SensorTest.Visible == true)
244
+            {
245
+                panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
246
+                panel_SensorMode.BackColor = Color.FromArgb(0, 159, 255);
247
+                panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
248
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
249
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
250
+            }
251
+            else if (panel_MergeMain.Visible == true)
252
+            {
253
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 255);
254
+                panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
255
+                panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
256
+                panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
257
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 200);
258
+            }
259
+            else if (panel_SnCheckMain.Visible == true)
260
+            {
261
+                panel_Merge.BackColor = Color.FromArgb(0, 159, 200);
262
+                panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 200);
263
+                panel_SensorMode.BackColor = Color.FromArgb(0, 159, 200);
264
+                panel_GpsMode.BackColor = Color.FromArgb(0, 159, 200);
265
+                panel_SnCheck.BackColor = Color.FromArgb(0, 159, 255);
266
+            }
267
+        }
116 268
 
269
+        private void label_SnCheck_MouseMove(object sender, MouseEventArgs e)
270
+        {
271
+            panel_SnCheck.BackColor = Color.FromArgb(0, 159, 255);
272
+        }
273
+        private void label_Merge_MouseMove(object sender, MouseEventArgs e)
274
+        {
275
+            panel_Merge.BackColor = Color.FromArgb(0, 159, 255);
276
+        }
117 277
         private void label_Catm1Test_MouseMove(object sender, MouseEventArgs e)
118 278
         {
119 279
             panel_Catm1Mode.BackColor = Color.FromArgb(0, 159, 255);
@@ -178,6 +338,8 @@ namespace APL_TestCheck
178 338
             panel_GpsTest.Visible = true;
179 339
             panel_SensorTest.Visible = false;
180 340
             panel_Catm1Test.Visible = false;
341
+            panel_MergeMain.Visible = false;
342
+            panel_SnCheckMain.Visible = false;
181 343
         }
182 344
 
183 345
         private void label_Catm1Test_Click(object sender, EventArgs e)
@@ -185,6 +347,8 @@ namespace APL_TestCheck
185 347
             panel_GpsTest.Visible = false;
186 348
             panel_SensorTest.Visible = false;
187 349
             panel_Catm1Test.Visible = true;
350
+            panel_MergeMain.Visible = false;
351
+            panel_SnCheckMain.Visible = false;
188 352
 
189 353
         }
190 354
 
@@ -193,6 +357,8 @@ namespace APL_TestCheck
193 357
             panel_GpsTest.Visible = false;
194 358
             panel_SensorTest.Visible = true;
195 359
             panel_Catm1Test.Visible = false;
360
+            panel_MergeMain.Visible = false;
361
+            panel_SnCheckMain.Visible = false;
196 362
         }
197 363
 
198 364
         private void Main_Load(object sender, EventArgs e)
@@ -204,16 +370,18 @@ namespace APL_TestCheck
204 370
             panel_GpsTest.Visible = true;
205 371
             panel_SensorTest.Visible = false;
206 372
             panel_Catm1Test.Visible = false;
373
+            panel_MergeMain.Visible = false;
207 374
             pictureBox_Check1.Visible = false;
208 375
             pictureBox_Check2.Visible = false;
209 376
             pictureBox_Check3.Visible = false;
210 377
             pictureBox_Check4.Visible = false;
378
+
211 379
         }
212 380
         public void Serial_Initialize(ref ComboBox cb_port)
213 381
         {
214 382
 
215 383
             this.serialPort = new System.IO.Ports.SerialPort();
216
-            this.serialPort.DataReceived += new System.IO.Ports.SerialDataReceivedEventHandler(this.Serial_DataRecvFunction);
384
+            this.serialPort.DataReceived += new System.IO.Ports.SerialDataReceivedEventHandler(this.sPort_DataReceived);
217 385
 
218 386
             cb_port.BeginUpdate();
219 387
             foreach (string comport in SerialPort.GetPortNames())//foreach (string comport in SerialPort_TestProgram.GetPortNames())
@@ -236,25 +404,88 @@ namespace APL_TestCheck
236 404
 
237 405
         }
238 406
         private delegate void StringSend(string Text);
407
+        private delegate void ByteSend(byte[] Text);
408
+       
409
+        string startStr ="V";
410
+        string endStr = "\n";
239 411
         public void Serial_DataRecvFunction(object sender, SerialDataReceivedEventArgs e)
240 412
         {
241
-
413
+            int TmpLength = 0;
414
+            //System.Threading.Thread.Sleep(50);
242 415
             int nLnegth = serialPort.BytesToRead;
243 416
             byte[] btdata = new byte[nLnegth];
417
+
244 418
             serialPort.Read(btdata, 0, nLnegth);
245 419
             string data = Encoding.Default.GetString(btdata);
246
-
247 420
             if (checkBox_TerminalStop.Checked == true)
248 421
                 return;
249 422
             // string data = serialPort.ReadExisting();
250
-            this.Invoke(new StringSend(Data_Recv_Str), data);
423
+            if (panel_SensorTest.Visible == true)
424
+            {
425
+                if (data.Contains(startStr))
426
+                {
427
+                    data = data.Substring(data.IndexOf(startStr));
428
+                    if (data.Contains(endStr))
429
+                    {
430
+                        this.Invoke(new StringSend(Data_Recv_Str), data);
431
+                    }
432
+                }
433
+                
434
+            }
435
+            else
436
+            {
437
+                this.Invoke(new StringSend(Data_Recv_Str), data);
438
+            }
439
+            /*try
440
+            {
441
+                this.Invoke(new ByteSend(Data_Recv_Str), btdata);
442
+            }
443
+            catch
444
+            {
445
+
446
+            }*/
251 447
             /****
252 448
              *메모리 누수 방지용 코드
253 449
              */
254 450
             System.GC.Collect(0, GCCollectionMode.Forced);
255 451
             System.GC.WaitForFullGCComplete();
256 452
         }
453
+        int offset = 0;
454
+        byte[] rxBuffer;
455
+        private void sPort_DataReceived(object sender, SerialDataReceivedEventArgs e)
456
+        {
457
+
458
+            if (offset == 0)
459
+            {
460
+                rxBuffer = new byte[4096];
461
+            }
257 462
 
463
+            string rxString = "";
464
+            int intRecSize = serialPort.BytesToRead;
465
+
466
+            if (intRecSize != 0)
467
+            {
468
+                serialPort.Read(rxBuffer, offset, intRecSize);
469
+                offset += intRecSize;
470
+
471
+                for (int iTemp = 0; iTemp < offset; iTemp++)
472
+                {
473
+                    rxString += Convert.ToChar(rxBuffer[iTemp]);
474
+                }
475
+
476
+                if (rxString.Contains(startStr))
477
+                {
478
+                    rxString = rxString.Substring(rxString.IndexOf(startStr));
479
+                    if (rxString.Contains(endStr))
480
+                    {
481
+                        this.Invoke(new StringSend(Data_Recv_Str), rxString);
482
+                        //program.dataReceived(rxString, "Receive");
483
+                        offset = 0;
484
+                    }
485
+                }
486
+            }
487
+        }
488
+       
258 489
         private void label_Port_MouseClick(object sender, MouseEventArgs e)
259 490
         {
260 491
 
@@ -306,6 +537,11 @@ namespace APL_TestCheck
306 537
                 {
307 538
                     tbReceived.AppendText(GPS_TestFunc(text));
308 539
                 }
540
+                else if(panel_SensorTest.Visible == true)
541
+                {
542
+                    Sensor_TestFunc(text);
543
+                    tbReceived.AppendText(text);
544
+                }
309 545
                 else
310 546
                 {
311 547
                     tbReceived.AppendText(text);
@@ -315,6 +551,65 @@ namespace APL_TestCheck
315 551
             }
316 552
             catch { try { SendMessage(this.Handle, WM_SETREDRAW, true, 0); } catch { return; } }
317 553
         }
554
+        public void Data_Recv_Str(byte[] text)
555
+        {
556
+            string strtext = Encoding.Default.GetString(text); 
557
+
558
+            System.Windows.Forms.RichTextBox tbReceived = null;
559
+            if (panel_GpsTest.Visible == true)
560
+            {
561
+                tbReceived = richTextBox_Gps;
562
+
563
+            }
564
+            else if (panel_Catm1Test.Visible == true)
565
+            {
566
+                tbReceived = richTextBox_catm1;
567
+            }
568
+            else if (panel_SensorTest.Visible == true)
569
+            {
570
+                tbReceived = richTextBox_Sensor;
571
+            }
572
+
573
+            int nLimitLines = Convert.ToInt32(LineLimit); //제한 라인 수
574
+            try
575
+            {
576
+                try
577
+                {
578
+                    SendMessage(this.Handle, WM_SETREDRAW, false, 0);
579
+                }
580
+                catch (Exception e) { MessageBox.Show(e.StackTrace); }
581
+                if (tbReceived.Lines.Length > nLimitLines)
582
+                {
583
+                    LinkedList<string> tempLines = new LinkedList<string>(tbReceived.Lines);
584
+                    while ((tempLines.Count - nLimitLines) > 0)
585
+                    {
586
+                        tempLines.RemoveFirst();
587
+                    }
588
+                    tbReceived.Lines = tempLines.ToArray();
589
+                }
590
+                try
591
+                {
592
+                    SendMessage(this.Handle, WM_SETREDRAW, true, 0);
593
+                }
594
+                catch { return; }
595
+                if (checkBox_GPGSV.Checked == true && panel_GpsTest.Visible == true)
596
+                {
597
+                    tbReceived.AppendText(GPS_TestFunc(Encoding.Default.GetString(text)));
598
+                }
599
+                else if (panel_SensorTest.Visible == true)
600
+                {
601
+                    Sensor_TestFunc(strtext);
602
+                    tbReceived.AppendText(strtext);
603
+                }
604
+                else
605
+                {
606
+                    tbReceived.AppendText(strtext);
607
+                }
608
+                tbReceived.SelectionStart = tbReceived.Text.Length;//맨 마지막 선택... 
609
+                tbReceived.ScrollToCaret();
610
+            }
611
+            catch { try { SendMessage(this.Handle, WM_SETREDRAW, true, 0); } catch { return; } }
612
+        }
318 613
         public int WordNum(String data, String fixdata)
319 614
         {
320 615
             MatchCollection matches = Regex.Matches(data, fixdata);
@@ -418,6 +713,71 @@ namespace APL_TestCheck
418 713
             catch (Exception e) { /*MessageBox.Show(e.StackTrace); */}
419 714
             return "";
420 715
         }
716
+        string SensorData = null;
717
+        private void Sensor_TestFunc(string data)
718
+        {
719
+            string str = data;
720
+            string[] sp = new string[11]; 
721
+            try
722
+            {
723
+                if (data.Contains("\r\n") == false)
724
+                {
725
+                    return;
726
+                }
727
+                else
728
+                {
729
+                    SensorData += data;
730
+                    str = SensorData;
731
+                }
732
+
733
+                if (dataGridView_Sensor.Rows[0].Cells[0].Value != null)
734
+                {
735
+                    //location1 = str.IndexOf("\r\n");
736
+                    //str = str.Substring(0, location1);
737
+                    sp = str.Split(',');
738
+                    if (sp[0].Contains("V") == false/* || sp.Length != 11*/)
739
+                    {
740
+                        SensorData = null;
741
+                        return;
742
+                    }
743
+
744
+                    dataGridView_Sensor.Rows[0].Cells[5].Value = sp[0]; //version
745
+                    dataGridView_Sensor.Rows[0].Cells[2].Value = sp[2]; //,IMEI
746
+                    dataGridView_Sensor.Rows[0].Cells[3].Value = sp[3];//, Phone Number, 
747
+                    dataGridView_Sensor.Rows[0].Cells[4].Value = sp[4];//USIM Number
748
+                    dataGridView_Sensor.Rows[0].Cells[6].Value = sp[5];//, Battery Voltage,
749
+                    dataGridView_Sensor.Rows[0].Cells[7].Value = sp[6];// System Voltage, 
750
+                    dataGridView_Sensor.Rows[0].Cells[8].Value = sp[7];//Temp, BMA400 값 출력 x, y, z
751
+                    dataGridView_Sensor.Rows[0].Cells[9].Value = sp[8];//Temp, BMA400 값 출력 x, y, z
752
+                    dataGridView_Sensor.Rows[0].Cells[10].Value = sp[9];//Temp, BMA400 값 출력 x, y, z
753
+                    if (sp[10].Contains("\r"))
754
+                    {
755
+                        int loc = sp[10].IndexOf("\r");
756
+                        sp[10] = sp[10].Substring(0, loc);
757
+                    }
758
+                    dataGridView_Sensor.Rows[0].Cells[11].Value = sp[10];//Temp, BMA400 값 출력 x, y, z
759
+                    SensorData = null;
760
+                    string value = "";
761
+                    if (checkBox_Edit.Checked == false)
762
+                    {
763
+                        if (InputBox("번호 입력", "일련 번호:", ref value) == DialogResult.OK)
764
+                        {
765
+                            // SN
766
+                            dataGridView_Sensor.Rows[0].Cells[1].Value  = Name = value;
767
+                            serialPort.Write(value);
768
+                            button_SensorTestSave();
769
+                            for (int i = 0; i < 12; i++)
770
+                                dataGridView_Sensor.Rows[0].Cells[i].Value = null;
771
+
772
+                        }
773
+                    }
774
+                    dataGridView_Sensor.Refresh();
775
+                    
776
+                }
777
+                return;
778
+            }
779
+            catch (Exception ex) { /*MessageBox.Show(ex.StackTrace); */ }
780
+        }
421 781
         private void label_Port_MouseLeave(object sender, EventArgs e)
422 782
         {
423 783
             panel_Port.BackColor = Color.FromArgb(0, 159, 200);
@@ -506,41 +866,7 @@ namespace APL_TestCheck
506 866
             return dialogResult;
507 867
         }
508 868
 
509
-        private void dataGridView_Sensor_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e)
510
-        {
511
-          /*  string value = "";
512
-            if (checkBox_Edit.Checked == false)
513
-            {
514
-                if (InputBox("번호 입력", "일련 번호:", ref value) == DialogResult.OK)
515
-                {
516
-                    Name = value;
517
-                }
518
-            }*/
519
-        }
520
-
521
-        private void dataGridView_Catm1_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e)
522
-        {
523
-          /*  string value = "";
524
-            if (checkBox_Edit.Checked == false)
525
-            {
526
-                if (InputBox("번호 입력", "일련 번호:", ref value) == DialogResult.OK)
527
-                {
528
-                    Name = value;
529
-                }
530
-            }*/
531
-        }
532 869
 
533
-        private void dataGridView_Gps_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e)
534
-        {
535
-          /*  string value = "";
536
-            if (checkBox_Edit.Checked == false)
537
-            {
538
-                if (InputBox("번호 입력", "일련 번호:", ref value) == DialogResult.OK)
539
-                {
540
-                    Name = value;
541
-                }
542
-            }*/
543
-        }
544 870
 
545 871
         private void button_Clear_Click(object sender, EventArgs e)
546 872
         {
@@ -610,7 +936,7 @@ namespace APL_TestCheck
610 936
                             {
611 937
                                 try
612 938
                                 {
613
-                                    File.Copy(Ref_Xls_File, Dst_Xls_File, true);
939
+                                 //   File.Copy(Ref_Xls_File, Dst_Xls_File, true);
614 940
                                 }
615 941
                                 catch (Exception ex)
616 942
                                 {
@@ -644,7 +970,7 @@ namespace APL_TestCheck
644 970
             Gps_DataxlsWrite(Dst_Xls_File);
645 971
             dataGridView_Gps.Rows[0].Cells[0].Value = null;
646 972
             dataGridView_Gps.Rows[0].Cells[1].Value = null;
647
-
973
+            dataGridView_Gps.Refresh();
648 974
             //   if (!di.Exists) { di.Create(); }
649 975
             //string tmppath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
650 976
 #if false
@@ -661,7 +987,107 @@ namespace APL_TestCheck
661 987
             }
662 988
 #endif
663 989
         }
990
+        private void button_SensorTestSave()
991
+        {
992
+            string CheckProductionNum = null;
993
+            try
994
+            {
995
+                CheckProductionNum = dataGridView_Sensor.Rows[0].Cells[0].Value.ToString();
996
+            }
997
+            catch
998
+            {
999
+
1000
+            }
1001
+            try
1002
+            {
1003
+                if (!CheckProductionNum.Contains("BL-VITE00-V"))
1004
+                {
1005
+                    MessageBox.Show("잘못된 생산 번호 입니다.");
1006
+                    return;
1007
+                }
1008
+            }
1009
+            catch
1010
+            {
1011
+                MessageBox.Show("생산번호를 적어주세요.");
1012
+            }
1013
+            string Ref_Xls_File = new System.IO.DirectoryInfo(System.Windows.Forms.Application.StartupPath).ToString();
1014
+            string Dst_Xls_File = null;
1015
+            Ref_Xls_File = Ref_Xls_File + @"\APL_200221.xls";
1016
+            FileInfo SrcfileInfo = new FileInfo(Ref_Xls_File);
1017
+            FileInfo DstfileInfo;
664 1018
 
1019
+            if (dataGridView_Sensor.Rows[0].Cells[0].Value != null)
1020
+            {
1021
+                if (SrcfileInfo.Exists)
1022
+                {
1023
+                    if (FileSaveSet == null)
1024
+                    {
1025
+                        button_Path_Click(null, null);
1026
+                        return;
1027
+                        //                        MessageBox.Show("레퍼런스 엑셀 파일이 존재하지 않습니다. \r\n강차장님에게 문의 하세요.");
1028
+                    }
1029
+                    else
1030
+                    {
1031
+                        // File Copy 후 Data 입력 
1032
+                        Dst_Xls_File = FileSaveSet + @"\" + dataGridView_Sensor.Rows[0].Cells[0].Value.ToString() + @".xls";
1033
+                        DstfileInfo = new FileInfo(Dst_Xls_File);
1034
+                        if (DstfileInfo.Exists)
1035
+                        {
1036
+                            if (MessageBox.Show("이미 파일이 있습니다.\r\n 덮어씌우겠습니까?", "YesOrNo", MessageBoxButtons.YesNo) == DialogResult.Yes)
1037
+                            {
1038
+                                try
1039
+                                {
1040
+                                  //  File.Copy(Ref_Xls_File, Dst_Xls_File, true);
1041
+                                }
1042
+                                catch (Exception ex)
1043
+                                {
1044
+                                    MessageBox.Show(ex.StackTrace);
1045
+                                    return;
1046
+                                }
1047
+                            }
1048
+                            else
1049
+                            {
1050
+                                //MessageBox.Show("아니요 클릭");
1051
+                                return; // 아니오시 Return;
1052
+                            }
1053
+                        }
1054
+                        else
1055
+                        {
1056
+                            File.Copy(Ref_Xls_File, Dst_Xls_File);
1057
+                        }
1058
+                    }
1059
+                }
1060
+                else
1061
+                {
1062
+                    MessageBox.Show("레퍼런스 엑셀 파일이 존재하지 않습니다. \r\n강차장님에게 문의 하세요.");
1063
+                    return;
1064
+                }
1065
+            }
1066
+            else
1067
+            {
1068
+                MessageBox.Show("생산번호 값이 제대로 입력 되지 않았습니다.\r\n확인후 다시 저장하세요.");
1069
+                return;
1070
+            }
1071
+            Sensor_DataxlsWrite(Dst_Xls_File);
1072
+         //  dataGridView_Sensor.Rows[0].Cells[0].Value = null;
1073
+           // dataGridView_Sensor.Rows[0].Cells[1].Value = null;
1074
+
1075
+            //   if (!di.Exists) { di.Create(); }
1076
+            //string tmppath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
1077
+#if false
1078
+            if (dataGridView_Gps.Rows[0].Cells[1].Value != null)
1079
+            {
1080
+                string path = @"xxxx.txt";
1081
+                FileInfo file = new FileInfo(path);
1082
+                if (file.Exists)
1083
+                { //파일이 있는지
1084
+                  //복사(경로,덮어쓰기 옵션 기본값 false)
1085
+                  //만약 덮어쓰기 false일 때 파일이 존재하면 에러남.
1086
+                    file.CopyTo(@"xxx2.txt", true);
1087
+                }
1088
+            }
1089
+#endif
1090
+        }
665 1091
 
666 1092
         Excel.Application ExcelApp = null;
667 1093
         Excel.Workbook wb = null;
@@ -685,8 +1111,8 @@ namespace APL_TestCheck
685 1111
 
686 1112
                 //엑셀 시트 인덱스 번호는 0,0 부터 시작 하는 것이 아니라 1,1 A1 부터 시작 함. 0,0 으로 시작하면 오류...
687 1113
                 //시트에 값 쓰기...
688
-                ws.Cells[8, 8] = dataGridView_Gps.Rows[0].Cells[0].Value;
689
-                ws.Cells[8, 10] = dataGridView_Gps.Rows[0].Cells[1].Value;
1114
+                ws.Cells[8, 9] = dataGridView_Gps.Rows[0].Cells[0].Value;
1115
+                ws.Cells[8, 11] = dataGridView_Gps.Rows[0].Cells[1].Value;
690 1116
                                            /*ws.Cells[1, 3] = "123";
691 1117
                                            ws.Cells[1, 4] = "1234";
692 1118
                                            ws.Cells[2, 1] = "Test1"; //A2
@@ -731,6 +1157,80 @@ namespace APL_TestCheck
731 1157
                 GC.Collect();
732 1158
             }
733 1159
         }
1160
+        private void Sensor_DataxlsWrite(string dst)
1161
+        {
1162
+            //Write
1163
+
1164
+            //파일이 존재 한다면..삭제 하고..
1165
+            /*if (File.Exists("C:\\Test.xls"))
1166
+            {
1167
+                File.Delete("C:\\Test.xls");
1168
+            }*/
1169
+            try
1170
+            {
1171
+                ExcelApp = new Excel.Application();
1172
+                wb = ExcelApp.Workbooks.Open(dst, 0, false, 5, Missing.Value, Missing.Value, false, Missing.Value,
1173
+                   Missing.Value, true, false, Missing.Value, false, false, false);
1174
+                ws = wb.Worksheets["Sheet1"] as Excel.Worksheet;
1175
+
1176
+                //엑셀 시트 인덱스 번호는 0,0 부터 시작 하는 것이 아니라 1,1 A1 부터 시작 함. 0,0 으로 시작하면 오류...
1177
+                //시트에 값 쓰기...
1178
+                ws.Cells[8, 9] = dataGridView_Sensor.Rows[0].Cells[0].Value; // 제조 번호
1179
+                ws.Cells[8, 4] = dataGridView_Sensor.Rows[0].Cells[1].Value; // 일련번호
1180
+                ws.Cells[8, 6] = dataGridView_Sensor.Rows[0].Cells[2].Value; //IMEI 
1181
+                ws.Cells[8, 7] = dataGridView_Sensor.Rows[0].Cells[3].Value;// PHONE
1182
+                ws.Cells[8, 8] = dataGridView_Sensor.Rows[0].Cells[4].Value;//USIM
1183
+                ws.Cells[8, 10] = dataGridView_Sensor.Rows[0].Cells[5].Value;//VER
1184
+                ws.Cells[8, 13] = dataGridView_Sensor.Rows[0].Cells[6].Value;//BATT
1185
+                ws.Cells[8, 14] = dataGridView_Sensor.Rows[0].Cells[7].Value;//SYS
1186
+                ws.Cells[8, 15] = dataGridView_Sensor.Rows[0].Cells[8].Value;//TEMP
1187
+                ws.Cells[8, 16] = dataGridView_Sensor.Rows[0].Cells[9].Value;//BMA
1188
+                ws.Cells[8, 17] = dataGridView_Sensor.Rows[0].Cells[10].Value;//BMA
1189
+                ws.Cells[8, 18] = dataGridView_Sensor.Rows[0].Cells[11].Value;//BMA
1190
+                /*ws.Cells[1, 3] = "123";
1191
+                ws.Cells[1, 4] = "1234";
1192
+                ws.Cells[2, 1] = "Test1"; //A2
1193
+                ws.Cells[3, 1] = "Test12"; //A3
1194
+                ws.Cells[4, 1] = "Test123"; //A4*/
1195
+
1196
+
1197
+                //다른 이름으로 저장하기...
1198
+                wb.Save(); // => 오픈한 파일 그대로 저장...
1199
+                           /* wb.SaveAs("C:\\Test.xls",
1200
+                                      Excel.XlFileFormat.xlWorkbookNormal,
1201
+                                      Type.Missing,
1202
+                                      Type.Missing,
1203
+                                      Type.Missing,
1204
+                                      Type.Missing,
1205
+                                      Excel.XlSaveAsAccessMode.xlNoChange,
1206
+                                      Type.Missing,
1207
+                                      Type.Missing,
1208
+                                      Type.Missing,
1209
+                                      Type.Missing,
1210
+                                      Type.Missing);
1211
+                                      */
1212
+                           //파일 닫기... 
1213
+                wb.Close(false, Type.Missing, Type.Missing);
1214
+                wb = null;
1215
+                ExcelApp.Quit();
1216
+            }
1217
+            catch (Exception ex)
1218
+            {
1219
+                //객체들 메모리 해제
1220
+                ReleaseExcelObject(ws);
1221
+                ReleaseExcelObject(wb);
1222
+                ReleaseExcelObject(ExcelApp);
1223
+                GC.Collect();
1224
+            }
1225
+            finally
1226
+            {
1227
+                //객체들 메모리 해제
1228
+                ReleaseExcelObject(ws);
1229
+                ReleaseExcelObject(wb);
1230
+                ReleaseExcelObject(ExcelApp);
1231
+                GC.Collect();
1232
+            }
1233
+        }
734 1234
         private void ReleaseExcelObject(object obj)
735 1235
         {
736 1236
             try
@@ -779,5 +1279,110 @@ namespace APL_TestCheck
779 1279
                 return;
780 1280
             }
781 1281
         }
1282
+
1283
+        private void button_PrevFile_Click(object sender, EventArgs e)
1284
+        {
1285
+            
1286
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
1287
+            {
1288
+                foreach (string x in openFileDialog.FileNames)
1289
+                {
1290
+                    listBox_PreviousFile.Items.Add(x);
1291
+                }
1292
+            }
1293
+        }
1294
+
1295
+        private void button_AfterFile_Click(object sender, EventArgs e)
1296
+        {
1297
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
1298
+            {
1299
+                foreach (string x in openFileDialog.FileNames)
1300
+                {
1301
+                    listBox_AfterFile.Items.Add(x);
1302
+                }
1303
+            }
1304
+        }
1305
+
1306
+        private void label_Merge_Click(object sender, EventArgs e)
1307
+        {
1308
+            panel_GpsTest.Visible = false;
1309
+            panel_SensorTest.Visible = false;
1310
+            panel_Catm1Test.Visible = false;
1311
+            panel_MergeMain.Visible = true;
1312
+            panel_SnCheckMain.Visible = false;
1313
+        }
1314
+
1315
+        private void label_SnCheck_Click(object sender, EventArgs e)
1316
+        {
1317
+            panel_GpsTest.Visible = false;
1318
+            panel_SensorTest.Visible = false;
1319
+            panel_Catm1Test.Visible = false;
1320
+            panel_MergeMain.Visible = false;
1321
+            panel_SnCheckMain.Visible = true;
1322
+        }
1323
+
1324
+        private void button_FileFindLoad_Click(object sender, EventArgs e)
1325
+        {
1326
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
1327
+            {
1328
+                /*foreach (string x in openFileDialog.FileNames)
1329
+                {
1330
+                    listBox_Previous.Items.Add(x);
1331
+                }*/
1332
+            }
1333
+        }
1334
+
1335
+        private void button_Merge_Click(object sender, EventArgs e)
1336
+        {
1337
+            OpenExcelFile(listBox_PreviousFile.Items[0].ToString());
1338
+        }
1339
+        #region
1340
+        /// <summary>
1341
+        /// 엑셀 정식 파일 형식이 아닌 파일 읽기
1342
+        /// </summary>
1343
+        /// <param name="FileName">파일명.확장자</param>
1344
+        /// <returns></returns>
1345
+
1346
+        public void OpenExcelFile(string FileName)
1347
+        {
1348
+
1349
+            Excel.Application excelApp = new Excel.Application();
1350
+            Excel.Workbook workbook;
1351
+            Excel.Worksheet worksheet;
1352
+            Excel.Range range;
1353
+            workbook = excelApp.Workbooks.Open(FileName); //Environment.CurrentDirectory+ "\\Excel.xlsx");
1354
+            worksheet = (Excel.Worksheet)workbook.Sheets["Sheet1"];
1355
+            try
1356
+            {
1357
+                //MessageWrite(LogTraceLevel.Info, "OpenExcelFile 함수가 시작 되었습니다.", exception);
1358
+
1359
+                int column = 0;
1360
+                int row = 0;
1361
+                string sTmpColumnName = "SKT 일련번호";
1362
+                string[] colHeader = sTmpColumnName.Split(',');
1363
+
1364
+                range = worksheet.UsedRange;
1365
+                String data = "";
1366
+                data += ((range.Cells[4, 5] as Excel.Range).Value2.ToString() + " ");
1367
+                /*                for (int i = 1; i <= range.Rows.Count; ++i)
1368
+                                {
1369
+                                    for (int j = 1; j <= range.Columns.Count; ++j)
1370
+                                    {
1371
+                                        data += ((range.Cells[i, j] as Excel.Range).Value2.ToString() + " ");
1372
+                                    }
1373
+                                    data += "\n";
1374
+                                }*/
1375
+                workbook.Close(false, Type.Missing, Type.Missing);
1376
+                excelApp.Quit();
1377
+                //MessageBox.Show("OpenExcelFile 함수가 종료 되었습니다.");
1378
+            }
1379
+            catch (Exception ex)
1380
+            {
1381
+                MessageBox.Show("OpenExcelFile오류가 발생되었습니다.[{0}]");
1382
+                excelApp.Quit();
1383
+                //throw new Exception(ex.Message);
1384
+            }
1385
+        }
1386
+        #endregion
782 1387
     }
783 1388
 }

+ 42 - 15
Main.resx

@@ -120,6 +120,24 @@
120 120
   <metadata name="serialPort.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121 121
     <value>17, 17</value>
122 122
   </metadata>
123
+  <metadata name="Catm1_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
124
+    <value>True</value>
125
+  </metadata>
126
+  <metadata name="Modem_Ver.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
127
+    <value>True</value>
128
+  </metadata>
129
+  <metadata name="RSRP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
130
+    <value>True</value>
131
+  </metadata>
132
+  <metadata name="Catm1_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
133
+    <value>True</value>
134
+  </metadata>
135
+  <metadata name="Modem_Ver.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
136
+    <value>True</value>
137
+  </metadata>
138
+  <metadata name="RSRP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
139
+    <value>True</value>
140
+  </metadata>
123 141
   <metadata name="Gps_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
124 142
     <value>True</value>
125 143
   </metadata>
@@ -236,9 +254,15 @@
236 254
   <metadata name="ProductNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
237 255
     <value>True</value>
238 256
   </metadata>
257
+  <metadata name="SN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
258
+    <value>True</value>
259
+  </metadata>
239 260
   <metadata name="IMEI.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
240 261
     <value>True</value>
241 262
   </metadata>
263
+  <metadata name="Phone.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
264
+    <value>True</value>
265
+  </metadata>
242 266
   <metadata name="USIM.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
243 267
     <value>True</value>
244 268
   </metadata>
@@ -254,34 +278,31 @@
254 278
   <metadata name="Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
255 279
     <value>True</value>
256 280
   </metadata>
257
-  <metadata name="BMA.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
281
+  <metadata name="BMA_X.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
258 282
     <value>True</value>
259 283
   </metadata>
260
-  <metadata name="Catm1_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
284
+  <metadata name="BMA_Y.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
261 285
     <value>True</value>
262 286
   </metadata>
263
-  <metadata name="Modem_Ver.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
287
+  <metadata name="BMA_Z.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
264 288
     <value>True</value>
265 289
   </metadata>
266
-  <metadata name="RSRP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
267
-    <value>True</value>
290
+  <metadata name="folderBrowserDialog_Mainpath.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
291
+    <value>106, 17</value>
268 292
   </metadata>
269
-  <metadata name="Catm1_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
270
-    <value>True</value>
293
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
294
+    <value>329, 17</value>
271 295
   </metadata>
272
-  <metadata name="Modem_Ver.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
296
+  <metadata name="ProductNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
273 297
     <value>True</value>
274 298
   </metadata>
275
-  <metadata name="RSRP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
299
+  <metadata name="SN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
276 300
     <value>True</value>
277 301
   </metadata>
278
-  <metadata name="folderBrowserDialog_Mainpath.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
279
-    <value>106, 17</value>
280
-  </metadata>
281
-  <metadata name="ProductNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
302
+  <metadata name="IMEI.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
282 303
     <value>True</value>
283 304
   </metadata>
284
-  <metadata name="IMEI.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
305
+  <metadata name="Phone.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
285 306
     <value>True</value>
286 307
   </metadata>
287 308
   <metadata name="USIM.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -299,7 +320,13 @@
299 320
   <metadata name="Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
300 321
     <value>True</value>
301 322
   </metadata>
302
-  <metadata name="BMA.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
323
+  <metadata name="BMA_X.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
324
+    <value>True</value>
325
+  </metadata>
326
+  <metadata name="BMA_Y.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
327
+    <value>True</value>
328
+  </metadata>
329
+  <metadata name="BMA_Z.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
303 330
     <value>True</value>
304 331
   </metadata>
305 332
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

二进制
bin/Debug/APL_200221.xls


二进制
bin/Debug/APL_TestCheck.exe


二进制
bin/Debug/APL_TestCheck.pdb


二进制
obj/Debug/APL_TestCheck.csproj.GenerateResource.cache


二进制
obj/Debug/APL_TestCheck.exe


二进制
obj/Debug/APL_TestCheck.pdb