中英文修改。设置界面调整。

IDHIKCamera/IDHIK.cs

-using MvCodeReaderSDKNet;
-using MVIDCodeReaderNet;
+using MvCodeReaderSDKNet; 
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing;

SmartScan/Form/FrmDrawText.Designer.cs

@@ -72,7 +72,7 @@
             this.Controls.Add(this.faceButton1);
             this.Controls.Add(this.faceButton1);
             this.Icon = ((System.Drawing.Bitmap)(resources.GetObject("$this.Icon")));
             this.Icon = ((System.Drawing.Bitmap)(resources.GetObject("$this.Icon")));
             this.Name = "FrmDrawText";
             this.Name = "FrmDrawText";
-            this.Text = "Using OCR result";
+            this.Text = "Using OCR Result";
             this.Controls.SetChildIndex(this.faceButton1, 0);
             this.Controls.SetChildIndex(this.faceButton1, 0);
             this.Controls.SetChildIndex(this.faceButton2, 0);
             this.Controls.SetChildIndex(this.faceButton2, 0);
             this.ResumeLayout(false);
             this.ResumeLayout(false);

SmartScan/Language/en-US.lngres

@@ -22,7 +22,7 @@ Dialog_RepeatPrint	该料盘标签已打印	The Label Has Been Printed
 Dialog_MaterialScanning	拍照识别...	In Recognition...	
 Dialog_MaterialScanning	拍照识别...	In Recognition...	
 Dialog_MaterialTemplateMatching	模版匹配...	Template Matching...	
 Dialog_MaterialTemplateMatching	模版匹配...	Template Matching...	
 Dialog_MaterialProcessing	计算结果...	Processing Results...	
 Dialog_MaterialProcessing	计算结果...	Processing Results...	
-Dialog_PleaseWaiting	请稍后...	Please Waiting...	
+Dialog_PleaseWaiting	请稍后...	Please Wait...	
 Dialog_MatchType_max	匹配数量至多	Match Times At Most	
 Dialog_MatchType_max	匹配数量至多	Match Times At Most	
 Dialog_MatchType_equals	匹配数量等于	Match Times Equals	
 Dialog_MatchType_equals	匹配数量等于	Match Times Equals	
 Dialog_MatchType_min	匹配数量至少	Match Times At Least	
 Dialog_MatchType_min	匹配数量至少	Match Times At Least	
@@ -264,3 +264,7 @@ UsrKeywordlabeling_UpdateLabel	修改关键字	Modify keywords	Arial,12,,
 UsrKeywordlabeling_SaveLabel	确认	Confirm	Arial,12,,
 UsrKeywordlabeling_SaveLabel	确认	Confirm	Arial,12,,
 FrmKeyCollection_FrmKeyCollection	选择关键字	Select keywords	Arial,12,,
 FrmKeyCollection_FrmKeyCollection	选择关键字	Select keywords	Arial,12,,
 FrmKeyCollection_faceButton1	确认	Confirm	Arial,12,,
 FrmKeyCollection_faceButton1	确认	Confirm	Arial,12,,
+FrmDataFilePreview_BtnCancel	取消	Cancel	微软雅黑,12,,
+FrmDataFilePreview_BtnOK	 确认	  OK	微软雅黑,12,,
+FrmDataFilePreview_LblEncoding	编码格式	Encoding Format 	微软雅黑,12,,
+FrmDataFilePreview_FrmDataFilePreview	文件预览	File Preview 	微软雅黑,12,, 

SmartScan/Language/zh-CN.lngres

@@ -263,3 +263,8 @@ UsrKeywordlabeling_UpdateLabel	修改关键字	修改关键字	微软雅黑,12,,
 UsrKeywordlabeling_SaveLabel	确认	确认	微软雅黑,12,,
 UsrKeywordlabeling_SaveLabel	确认	确认	微软雅黑,12,,
 FrmKeyCollection_FrmKeyCollection	选择关键字	选择关键字	微软雅黑,12,,
 FrmKeyCollection_FrmKeyCollection	选择关键字	选择关键字	微软雅黑,12,,
 FrmKeyCollection_faceButton1	确认	确认	微软雅黑,12,,
 FrmKeyCollection_faceButton1	确认	确认	微软雅黑,12,,
+FrmDataFilePreview_BtnCancel	取消	取消	微软雅黑,12,,
+FrmDataFilePreview_BtnOK	 确认	确认	微软雅黑,12,,
+FrmDataFilePreview_LblEncoding	编码格式	编码格式	微软雅黑,12,,
+FrmDataFilePreview_FrmDataFilePreview	文件预览	文件预览	微软雅黑,12,, 
+

SmartScan/SetControl/FrmDataFilePreview.Designer.cs

@@ -87,10 +87,10 @@ namespace SmartScan
             this.LblEncoding.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
             this.LblEncoding.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
             this.LblEncoding.BorderWidth = 0;
             this.LblEncoding.BorderWidth = 0;
             this.LblEncoding.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
             this.LblEncoding.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
-            this.LblEncoding.Location = new System.Drawing.Point(354, 44);
+            this.LblEncoding.Location = new System.Drawing.Point(211, 44);
             this.LblEncoding.Name = "LblEncoding";
             this.LblEncoding.Name = "LblEncoding";
             this.LblEncoding.Padding = new System.Windows.Forms.Padding(3);
             this.LblEncoding.Padding = new System.Windows.Forms.Padding(3);
-            this.LblEncoding.Size = new System.Drawing.Size(139, 35);
+            this.LblEncoding.Size = new System.Drawing.Size(282, 35);
             this.LblEncoding.TabIndex = 22;
             this.LblEncoding.TabIndex = 22;
             this.LblEncoding.Text = "编码格式";
             this.LblEncoding.Text = "编码格式";
             this.LblEncoding.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             this.LblEncoding.TextAlign = System.Drawing.ContentAlignment.MiddleRight;

SmartScan/SetControl/FrmDataFilePreview.cs

@@ -25,6 +25,8 @@ namespace SmartScan
             FrmDataFilePreview frmDataFile = new FrmDataFilePreview();
             FrmDataFilePreview frmDataFile = new FrmDataFilePreview();
             frmDataFile.Filename = filename;
             frmDataFile.Filename = filename;
             Encodingtxt = frmDataFile.EncodingTxt;
             Encodingtxt = frmDataFile.EncodingTxt;
+
+            Asa.FaceControl.Language.SetLanguage(frmDataFile);
             if (frmDataFile.ShowDialog() != DialogResult.OK)
             if (frmDataFile.ShowDialog() != DialogResult.OK)
                 return false;
                 return false;