修改了大部分提示为英文

FactoryTool_CShare/IO/SerialCMD.cs

@@ -126,7 +126,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回did类型错误，应为01";
+                    error = "Return did type error，should 01";
                     return false;
                 }
 
@@ -168,7 +168,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回MAC类型错误，应为00";
+                    error = "return MAC type error，should 00";
                     return false;
                 }
 
@@ -236,7 +236,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回NetflixESN类型错误，应为06";
+                    error = "Return NetflixESN type error，should 06";
                     return false;
                 }
 
@@ -265,7 +265,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回Widevine类型错误，应为00";
+                    error = "return Widevine type error，should 00";
                     return false;
                 }
 
@@ -294,7 +294,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回CiKey类型错误，应为01";
+                    error = "Return CiKey type error，shouuld 01";
                     return false;
                 }
 
@@ -323,7 +323,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回ECP类型错误，应为01";
+                    error = "return ECP type error，should 01";
                     return false;
                 }
 
@@ -352,7 +352,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回MGKKey类型错误，应为06";
+                    error = "Return MGKKey type error,should 06";
                     return false;
                 }
 
@@ -381,7 +381,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回OSD language类型错误，应为00";
+                    error = "Return OSD language type error，should 00";
                     return false;
                 }              
             }
@@ -409,7 +409,7 @@ namespace MOKA_Factory_Tools
                     }
                     else
                     {
-                        error = "返回SHOP language类型错误，应为01";
+                        error = "Return SHOP language type error，should 01";
                         return false;
                     }
                 }            
@@ -1218,7 +1218,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回brand类型错误，应为10";
+                    error = "Return brand type error，should 0x10";
                     return false;
                 }
 
@@ -1247,7 +1247,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回Region类型错误，应为11";
+                    error = "Return Region type error，should 0x11";
                     return false;
                 }
 
@@ -1276,7 +1276,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回Support URL类型错误，应为12";
+                    error = "return Support URL type error，should 0x12";
                     return false;
                 }
 
@@ -1305,7 +1305,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回Support Phone类型错误，应为13";
+                    error = "return Support Phone type error，should 0x13";
                     return false;
                 }
 
@@ -1334,7 +1334,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回Production Date类型错误，应为14";
+                    error = "return Production Date type error，should 0x14";
                     return false;
                 }
 
@@ -1363,7 +1363,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回Remote Type类型错误，应为0x18";
+                    error = "return Remote Typetype error，should 0x18";
                     return false;
                 }
 
@@ -1430,7 +1430,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回Model name类型错误，应为0E";
+                    error = "return Model name type error，should 0x0E";
                     return false;
                 }
 
@@ -1498,7 +1498,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回AttestationKey类型错误，应为0D";
+                    error = "return AttestationKey type error，should 0x0D";
                     return false;
                 }
 
@@ -1647,7 +1647,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回FireTVWiFi_Mac类型错误，应为15";
+                    error = "return FireTVWiFi_Mac type error，should 0x15";
                     return false;
                 }
 
@@ -1676,7 +1676,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回FireTVBT_Mac类型错误，应为16";
+                    error = "return FireTVBT_Mac type error，should 0x16";
                     return false;
                 }
 
@@ -1705,7 +1705,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回FireTVDSN类型错误，应为17";
+                    error = "return FireTVDSN type error，should 0x17";
                     return false;
                 }
 
@@ -1775,7 +1775,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回Fairplay类型错误，应为0F";
+                    error = "returnFairplay type error，should 0x0F";
                     return false;
                 }
 
@@ -1845,11 +1845,11 @@ namespace MOKA_Factory_Tools
                     data = data.Skip(2).Take(data.Length - 2).ToArray();
                     if (data.Length == 3)
                         return true;
-                    error = "返回DevcieCode长度错误，应为3 bytes";
+                    error = "return DevcieCode length error，should 3 bytes";
                 }
                 else
                 {
-                    error = "返回DevcieCode类型错误，应为0x11 0x06";
+                    error = "return DevcieCode type error，should 0x11 0x06";
                 }
             }
 
@@ -1919,7 +1919,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回Playready类型错误，应为0x04, 0x00";
+                    error = "return Playready type error，should 0x04, 0x00";
                     return false;
                 }
 
@@ -1990,7 +1990,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回LEK类型错误，应为0x04,0x02";
+                    error = "return LEK type error，should 0x0x04,0x02";
                     return false;
                 }
 
@@ -2061,7 +2061,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回PEK类型错误，应为0x04 0x01";
+                    error = "return PEK type error，should 0x0x04 0x01";
                     return false;
                 }
 
@@ -2214,7 +2214,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回Hashkey类型错误，应为0x04 0x03";
+                    error = "return Hashkey type error，should 0x0x04 0x03";
                     return false;
                 }
 
@@ -2315,7 +2315,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回Youtube类型错误，应为0x04 0x06";
+                    error = "return Youtube type error，should 0x0x04 0x06";
                     return false;
                 }
 
@@ -2345,7 +2345,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回S/N类型错误，应为0x03";
+                    error = "return S/N type error，should 0x0x03";
                     return false;
                 }
 
@@ -2378,7 +2378,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回PSN类型错误，应为0x04 0x05";
+                    error = "return PSN type error，should 0x0x04 0x05";
                 }
             }
             
@@ -2405,7 +2405,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回ACASID类型错误，应为15";
+                    error = "return ACASID type error，should 0x15";
                     return false;
                 }
             }
@@ -2433,7 +2433,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回EDID PID错误，应为0x04 0x07";
+                    error = "return EDID PID error，should 0x04 0x07";
                 }
             }
 
@@ -2475,7 +2475,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回EDID Mode Name错误，应为01";
+                    error = "return EDID Mode Name error，should01";
                 }
             }
             
@@ -2517,7 +2517,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回ACAS KEY DATA错误!";
+                    error = "return ACAS KEY DATA error!";
                 }
             }
 
@@ -2576,7 +2576,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回ACAS KEY TOOL 错误!";
+                    error = "return ACAS KEY TOOL error!";
                 }
             }
 
@@ -2674,7 +2674,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回Dolby Key错误!";
+                    error = "return Dolby Key error!";
                 }
             }
 
@@ -2724,7 +2724,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回KFP Key错误!";
+                    error = " return KFP Key error!";
                 }
             }
 
@@ -2995,7 +2995,7 @@ namespace MOKA_Factory_Tools
                                 {
                                     receiveData[j] = ACKhead[j];
                                 }
-                                // ACK返回正确;
+                                // ACK return 正确;
                                 return true;
                             }
                         }
@@ -3010,8 +3010,8 @@ namespace MOKA_Factory_Tools
                                 {
                                     receiveData[j] = ACKhead2[2];
                                 }
-                                error = "命令错误或无法识别数据返回";
-                                Log.WriteInfoLog("Received ErrorACK:" + SerialInit.ByteToHex(ACKhead2) + "\r\n" + error);
+                                error = "Command error or data return error";
+                                Log.WriteInfoLog("命令错误或无法识别数据返回:Received ErrorACK:" + SerialInit.ByteToHex(ACKhead2) + "\r\n" + error);
                             }
                         }
                     }
@@ -3025,8 +3025,8 @@ namespace MOKA_Factory_Tools
                                 {
                                     receiveData[j] = ACKhead3[2];
                                 }
-                                Log.WriteInfoLog("Received ErrorACK:" + SerialInit.ByteToHex(ACKhead3) + "\r\n" + error);
-                                error = "CRC16校验错误返回";
+                                Log.WriteInfoLog("CRC16校验错误返回Received ErrorACK:" + SerialInit.ByteToHex(ACKhead3) + "\r\n" + error);
+                                error = "CRC16 check error returned";
                             }
                         }
                     }
@@ -3260,7 +3260,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回RMCA类型错误，应为0x04, 0x18";
+                    error = "返回RMCA type error，should 0x0x04, 0x18";
                     return false;
                 }
 

FactoryTool_CShare/LResource.Designer.cs

@@ -627,6 +627,15 @@ namespace MOKA_Factory_Tools {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Failed to count NTF 的本地化字符串。
+        /// </summary>
+        internal static string CountNTFError {
+            get {
+                return ResourceManager.GetString("CountNTFError", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Covering 的本地化字符串。
         /// </summary>
@@ -870,6 +879,15 @@ namespace MOKA_Factory_Tools {
             }
         }
         
+        /// <summary>
+        ///   查找类似 The first test is FAIL, please test again to confirm the result! 的本地化字符串。
+        /// </summary>
+        internal static string FirstTestFail {
+            get {
+                return ResourceManager.GetString("FirstTestFail", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Get ACAS Key Error! 的本地化字符串。
         /// </summary>
@@ -1005,6 +1023,15 @@ namespace MOKA_Factory_Tools {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Get LEK fail! 的本地化字符串。
+        /// </summary>
+        internal static string GetLEKfail {
+            get {
+                return ResourceManager.GetString("GetLEKfail", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Fail to get Mac! 的本地化字符串。
         /// </summary>
@@ -1059,6 +1086,15 @@ namespace MOKA_Factory_Tools {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Get PEK fail! 的本地化字符串。
+        /// </summary>
+        internal static string GetPEKfail {
+            get {
+                return ResourceManager.GetString("GetPEKfail", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 get project id error 的本地化字符串。
         /// </summary>
@@ -1284,6 +1320,15 @@ namespace MOKA_Factory_Tools {
             }
         }
         
+        /// <summary>
+        ///   查找类似 The result type is NTF. Please mark the product NTF 的本地化字符串。
+        /// </summary>
+        internal static string MarkNTF {
+            get {
+                return ResourceManager.GetString("MarkNTF", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 MGK format error! 的本地化字符串。
         /// </summary>
@@ -1293,6 +1338,15 @@ namespace MOKA_Factory_Tools {
             }
         }
         
+        /// <summary>
+        ///   查找类似 The last test was FAIL, so it needs to PASS twice in a row. Please test again to confirm the result! 的本地化字符串。
+        /// </summary>
+        internal static string NeedTwoTest {
+            get {
+                return ResourceManager.GetString("NeedTwoTest", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Can not find the local DB of the order! 的本地化字符串。
         /// </summary>
@@ -1707,6 +1761,24 @@ namespace MOKA_Factory_Tools {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Failed to report the write key result to MES, please deal with it urgently 的本地化字符串。
+        /// </summary>
+        internal static string ReportMesFail {
+            get {
+                return ResourceManager.GetString("ReportMesFail", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Report results to MID system fail！ 的本地化字符串。
+        /// </summary>
+        internal static string ReportMIDError {
+            get {
+                return ResourceManager.GetString("ReportMIDError", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Saving order&apos;s keys package to local DB...... 的本地化字符串。
         /// </summary>
@@ -1896,6 +1968,15 @@ namespace MOKA_Factory_Tools {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Read PSN fail, please confirm that this is the whole Fire TV + board card copy order 的本地化字符串。
+        /// </summary>
+        internal static string SMTReadPsnError {
+            get {
+                return ResourceManager.GetString("SMTReadPsnError", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Submit 的本地化字符串。
         /// </summary>
@@ -1932,6 +2013,15 @@ namespace MOKA_Factory_Tools {
             }
         }
         
+        /// <summary>
+        ///   查找类似 The test failed for 2 times in total. No further test is allowed. Please mark the machine as bad 的本地化字符串。
+        /// </summary>
+        internal static string TotalTwoFail {
+            get {
+                return ResourceManager.GetString("TotalTwoFail", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Fail to transfer key to DB! 的本地化字符串。
         /// </summary>
@@ -1941,6 +2031,15 @@ namespace MOKA_Factory_Tools {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Trial production order: Please test again 的本地化字符串。
+        /// </summary>
+        internal static string TrialOrder {
+            get {
+                return ResourceManager.GetString("TrialOrder", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Please select a TV COM first! 的本地化字符串。
         /// </summary>
@@ -2058,6 +2157,15 @@ namespace MOKA_Factory_Tools {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Start Writekey without scanning code 的本地化字符串。
+        /// </summary>
+        internal static string WithoutScanToWrite {
+            get {
+                return ResourceManager.GetString("WithoutScanToWrite", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Write ACAS Key Error! 的本地化字符串。
         /// </summary>

FactoryTool_CShare/LResource.resx

@@ -306,6 +306,9 @@
   <data name="ContrastYouTubeError" xml:space="preserve">
     <value>Contrast YouTube key error!</value>
   </data>
+  <data name="CountNTFError" xml:space="preserve">
+    <value>Failed to count NTF</value>
+  </data>
   <data name="Covering" xml:space="preserve">
     <value>Covering</value>
   </data>
@@ -387,6 +390,9 @@
   <data name="FindWBfromServer" xml:space="preserve">
     <value>Find a whitebalance config from server, will write the WB data during testing!</value>
   </data>
+  <data name="FirstTestFail" xml:space="preserve">
+    <value>The first test is FAIL, please test again to confirm the result!</value>
+  </data>
   <data name="GetACASKeyError" xml:space="preserve">
     <value>Get ACAS Key Error!</value>
   </data>
@@ -432,6 +438,9 @@
   <data name="GetLEKError" xml:space="preserve">
     <value>Get LEK error!</value>
   </data>
+  <data name="GetLEKfail" xml:space="preserve">
+    <value>Get LEK fail!</value>
+  </data>
   <data name="GetMacError" xml:space="preserve">
     <value>Fail to get Mac!</value>
   </data>
@@ -450,6 +459,9 @@
   <data name="GetPEKError" xml:space="preserve">
     <value>Get PEK error!</value>
   </data>
+  <data name="GetPEKfail" xml:space="preserve">
+    <value>Get PEK fail!</value>
+  </data>
   <data name="GetPIDError" xml:space="preserve">
     <value>get project id error</value>
   </data>
@@ -525,9 +537,15 @@
   <data name="MainboardPID" xml:space="preserve">
     <value>The mainboard Project ID: </value>
   </data>
+  <data name="MarkNTF" xml:space="preserve">
+    <value>The result type is NTF. Please mark the product NTF</value>
+  </data>
   <data name="MGKFormatError" xml:space="preserve">
     <value>MGK format error!</value>
   </data>
+  <data name="NeedTwoTest" xml:space="preserve">
+    <value>The last test was FAIL, so it needs to PASS twice in a row. Please test again to confirm the result!</value>
+  </data>
   <data name="NofoundLocalDB" xml:space="preserve">
     <value>Can not find the local DB of the order!</value>
   </data>
@@ -666,6 +684,12 @@
   <data name="RefreshPanel" xml:space="preserve">
     <value>Refresh success!</value>
   </data>
+  <data name="ReportMesFail" xml:space="preserve">
+    <value>Failed to report the write key result to MES, please deal with it urgently</value>
+  </data>
+  <data name="ReportMIDError" xml:space="preserve">
+    <value>Report results to MID system fail！</value>
+  </data>
   <data name="SaveKeys" xml:space="preserve">
     <value>Saving order's keys package to local DB......</value>
   </data>
@@ -729,6 +753,9 @@
   <data name="SkipReadCheck" xml:space="preserve">
     <value>SkipReadCheck</value>
   </data>
+  <data name="SMTReadPsnError" xml:space="preserve">
+    <value>Read PSN fail, please confirm that this is the whole Fire TV + board card copy order</value>
+  </data>
   <data name="submitbutton" xml:space="preserve">
     <value>Submit</value>
   </data>
@@ -741,9 +768,15 @@
   <data name="TipMessage" xml:space="preserve">
     <value>This SN has been used twice in succession, which may be misused to other machines. Please confirm whether to continue</value>
   </data>
+  <data name="TotalTwoFail" xml:space="preserve">
+    <value>The test failed for 2 times in total. No further test is allowed. Please mark the machine as bad</value>
+  </data>
   <data name="TransferDBFail" xml:space="preserve">
     <value>Fail to transfer key to DB!</value>
   </data>
+  <data name="TrialOrder" xml:space="preserve">
+    <value>Trial production order: Please test again</value>
+  </data>
   <data name="TVCOMNullError" xml:space="preserve">
     <value>Please select a TV COM first!</value>
   </data>
@@ -783,6 +816,9 @@
   <data name="WilluseOnlinePID" xml:space="preserve">
     <value>Online project ID will be used!</value>
   </data>
+  <data name="WithoutScanToWrite" xml:space="preserve">
+    <value>Start Writekey without scanning code</value>
+  </data>
   <data name="WriteACASKeyError" xml:space="preserve">
     <value>Write ACAS Key Error!</value>
   </data>

FactoryTool_CShare/LResource.zh-CN.resx

@@ -306,6 +306,9 @@
   <data name="ContrastYouTubeError" xml:space="preserve">
     <value>YouTube key读取比对异常！</value>
   </data>
+  <data name="CountNTFError" xml:space="preserve">
+    <value>统计NTF失败</value>
+  </data>
   <data name="Covering" xml:space="preserve">
     <value>写入覆盖</value>
   </data>
@@ -387,6 +390,9 @@
   <data name="FindWBfromServer" xml:space="preserve">
     <value>检测到后台推送的白平衡数据，将进行白平衡抄写，请注意!</value>
   </data>
+  <data name="FirstTestFail" xml:space="preserve">
+    <value>第一次测试为FAIL，请再测试确认结果！</value>
+  </data>
   <data name="GetACASKeyError" xml:space="preserve">
     <value>在线获取ACAS Key失败！</value>
   </data>
@@ -432,6 +438,9 @@
   <data name="GetLEKError" xml:space="preserve">
     <value>获取LEK失败!</value>
   </data>
+  <data name="GetLEKfail" xml:space="preserve">
+    <value>获取LEK失败</value>
+  </data>
   <data name="GetMacError" xml:space="preserve">
     <value>获取Mac失败！</value>
   </data>
@@ -450,6 +459,9 @@
   <data name="GetPEKError" xml:space="preserve">
     <value>获取PEK失败！</value>
   </data>
+  <data name="GetPEKfail" xml:space="preserve">
+    <value>获取PEK失败</value>
+  </data>
   <data name="GetPIDError" xml:space="preserve">
     <value>串口读取屏ID失败！</value>
   </data>
@@ -525,9 +537,15 @@
   <data name="MainboardPID" xml:space="preserve">
     <value>读取的主板屏ID:</value>
   </data>
+  <data name="MarkNTF" xml:space="preserve">
+    <value>结果类型为NTF，请将产品做好NTF标记</value>
+  </data>
   <data name="MGKFormatError" xml:space="preserve">
     <value>MGK key数据异常！</value>
   </data>
+  <data name="NeedTwoTest" xml:space="preserve">
+    <value>上一次测试为FAIL，需要连续2次PASS，请再测试确认结果！</value>
+  </data>
   <data name="NofoundLocalDB" xml:space="preserve">
     <value>获取订单DB文件失败！</value>
   </data>
@@ -666,6 +684,12 @@
   <data name="RefreshPanel" xml:space="preserve">
     <value>刷新成功！</value>
   </data>
+  <data name="ReportMesFail" xml:space="preserve">
+    <value>上报抄写结果到MES失败，请紧急处理</value>
+  </data>
+  <data name="ReportMIDError" xml:space="preserve">
+    <value>上报结果到MID系统失败</value>
+  </data>
   <data name="SaveKeys" xml:space="preserve">
     <value>存储Key包到本地数据库......</value>
   </data>
@@ -729,6 +753,9 @@
   <data name="SkipReadCheck" xml:space="preserve">
     <value>跳过读取检查</value>
   </data>
+  <data name="SMTReadPsnError" xml:space="preserve">
+    <value>读取PSN fail,请确认这是Fire TV整机+板卡抄写订单</value>
+  </data>
   <data name="submitbutton" xml:space="preserve">
     <value>确定</value>
   </data>
@@ -741,9 +768,15 @@
   <data name="TipMessage" xml:space="preserve">
     <value>该SN已连续使用两次，可能误用到其他机器，请确认是否继续</value>
   </data>
+  <data name="TotalTwoFail" xml:space="preserve">
+    <value>累计2次测试失败，禁止再测试，请做好坏机标记</value>
+  </data>
   <data name="TransferDBFail" xml:space="preserve">
     <value>Key包存储到本地数据库失败！</value>
   </data>
+  <data name="TrialOrder" xml:space="preserve">
+    <value>试产订单：请再测试一次</value>
+  </data>
   <data name="TVCOMNullError" xml:space="preserve">
     <value>请先设置电视串口号！</value>
   </data>
@@ -783,6 +816,9 @@
   <data name="WilluseOnlinePID" xml:space="preserve">
     <value>请注意将使用服务器推送的屏ID！</value>
   </data>
+  <data name="WithoutScanToWrite" xml:space="preserve">
+    <value>未扫码启动数据抄写</value>
+  </data>
   <data name="WriteACASKeyError" xml:space="preserve">
     <value>写ACAS Key失败！</value>
   </data>

FactoryTool_CShare/Views/OperationPanel.cs

@@ -992,7 +992,7 @@ namespace MOKA_Factory_Tools
                         string message = string.Empty;
                         if (!SanhuaMethod.ProductRouteCheck(SN, out message))
                         {
-                            Verify dlg = new Verify(string.Format("{0} ProductRouteCheck faild: {1} ", SN, message));
+                            Verify dlg = new Verify(string.Format("{0} ProductRouteCheck failed: {1} ", SN, message));
                             dlg.ShowDialog();
                             SNText.Enabled = true;
                             SNText.Text = "";
@@ -2249,7 +2249,7 @@ namespace MOKA_Factory_Tools
                     }
                     else
                     {
-                        ErrMsg = String.Format("获取LEK失败 {0}", error);
+                        ErrMsg = String.Format("{0} {1}",LResource.GetLEKfail, error);
                         Log.WriteErrorLog(ErrMsg);
                         goto end;
                     }
@@ -2269,7 +2269,7 @@ namespace MOKA_Factory_Tools
                     }
                     else
                     {
-                        ErrMsg = String.Format("获取PEK失败{0}", error);
+                        ErrMsg = String.Format("{0}{1}",LResource.GetPEKfail,error);
                         Log.WriteErrorLog(ErrMsg);
                         goto end;
                     }
@@ -2289,7 +2289,7 @@ namespace MOKA_Factory_Tools
                     }
                     else
                     {
-                        ErrMsg = String.Format("获取Playready失败{0}", error);
+                        ErrMsg = String.Format("{0}{1}",LResource.GetPlayreadyError, error);
                         Log.WriteErrorLog(ErrMsg);
                         goto end;
                     }
@@ -2309,7 +2309,7 @@ namespace MOKA_Factory_Tools
                     }
                     else
                     {
-                        ErrMsg = String.Format("获取hashkey失败 {0}", error);
+                        ErrMsg = String.Format("{0} {1}",LResource.GetHashkeyError, error);
                         Log.WriteErrorLog(ErrMsg);
                         goto end;
                     }
@@ -5022,7 +5022,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    ErrMsg = string.Format("读取PSN失败 {0}", error);
+                    ErrMsg = string.Format("Read PSN fail {0}", error);
                     Log.WriteErrorLog(ErrMsg);
                     goto end;
                 }
@@ -5034,35 +5034,35 @@ namespace MOKA_Factory_Tools
                 // CVT抄写: Hashkey、HDCP_KEY1.4、HDCP2.2_KEY、CI_PLUS_KEY、ECP_KEY、FVP
                 if (cfg_writecheck.HashCheckcheck ? !SerialCMD.CheckFireTVHashkey(TVPort, out result, out data, out error, SerailDelay) : false)
                 {
-                    ErrMsg = string.Format("Check Hashkey失败 {0}", error);
+                    ErrMsg = string.Format("Check Hashkey fail {0}", error);
                     Log.WriteErrorLog(ErrMsg);
                     goto end;
                 }
 
                 if (cfg_writecheck.CI_plusCheckcheck ? !SerialCMD.CheckCikey(TVPort, out result, out data, out error, SerailDelay) : false)
                 {
-                    ErrMsg = string.Format("Check Cikey失败 {0}", error);
+                    ErrMsg = string.Format("Check Cikey fail {0}", error);
                     Log.WriteErrorLog(ErrMsg);
                     goto end;
                 }
 
                 if (cfg_writecheck.ECPCheckcheck ? !SerialCMD.CheckECP(TVPort, out result, out data, out error, SerailDelay) : false)
                 {
-                    ErrMsg = string.Format("Check Cikey失败 {0}", error);
+                    ErrMsg = string.Format("Check Cikey fail {0}", error);
                     Log.WriteErrorLog(ErrMsg);
                     goto end;
                 }
 
                 if (cfg_writecheck.HDCPCheckcheck ? !SerialCMD.CheckHDCP(TVPort, out result, out data, out error, SerailDelay) : false)
                 {
-                    ErrMsg = string.Format("Check HDCP 失败 {0}", error);
+                    ErrMsg = string.Format("Check HDCP  fail {0}", error);
                     Log.WriteErrorLog(ErrMsg);
                     goto end;
                 }
 
                 if (cfg_writecheck.HDCP22Checkcheck ? !SerialCMD.CheckHDCP22(TVPort, out result, out data, out error, SerailDelay) : false)
                 {
-                    ErrMsg = string.Format("Check HDCP22 失败 {0}", error);
+                    ErrMsg = string.Format("Check HDCP22  fail {0}", error);
                     Log.WriteErrorLog(ErrMsg);
                     goto end;
                 }
@@ -5072,7 +5072,7 @@ namespace MOKA_Factory_Tools
                 {
                     if (!SerialCMD.GetHDCPKey(TVPort, out result, out data, out error, SerailDelay))
                     {
-                        ErrMsg = string.Format("读取HDCP失败 {0}", error);
+                        ErrMsg = string.Format("{0} {1}",LResource.ReadHDCPError, error);
                         Log.WriteErrorLog(ErrMsg);
                         _MiKey._HDCP14 = 0;
                         goto end;
@@ -5088,7 +5088,7 @@ namespace MOKA_Factory_Tools
                 {
                     if (!SerialCMD.GetHDCPKey22(TVPort, out result, out data, out error, SerailDelay))
                     { 
-                        ErrMsg = string.Format("读取HDCP22失败 {0}", error);
+                        ErrMsg = string.Format("{0} {1}",LResource.ReadHDCP22Error, error);
                         Log.WriteErrorLog(ErrMsg);
                         _MiKey._HDCP22 = 0;
                         goto end;
@@ -5195,7 +5195,7 @@ namespace MOKA_Factory_Tools
                     }
                     else
                     {
-                        ErrMsg = string.Format("读取PSN失败,请确认这是Fire TV整机+板卡抄写订单 {0}", error);
+                        ErrMsg = string.Format("{0} {1}",LResource.SMTReadPsnError, error);
                         Log.WriteErrorLog(ErrMsg);
                         goto end;
                     }
@@ -5216,7 +5216,7 @@ namespace MOKA_Factory_Tools
                     {
                         TestResult = 0;
                         UploadCopyCount();
-                        ErrMsg = "上报结果到MID系统失败";
+                        ErrMsg = string.Format("{0}",LResource.ReportMIDError);
                         Log.WriteErrorLog(ErrMsg);
                         UpdateKeys(midListNow.keytype, false);
                         goto end;
@@ -5239,7 +5239,7 @@ namespace MOKA_Factory_Tools
                             {
                                 TestResult = 0;
                                 UploadCopyCount();
-                                ErrMsg = "上报结果到MID系统失败";
+                                ErrMsg = string.Format("{0}", LResource.ReportMIDError);
                                 Log.WriteErrorLog(ErrMsg);
                                 UpdateKeys(midListNow.keytype, false);
                                 goto end;
@@ -5254,7 +5254,7 @@ namespace MOKA_Factory_Tools
                             }
                             else
                             {
-                                ErrMsg = "未扫码启动数据抄写";
+                                ErrMsg = string.Format("{0}", LResource.WithoutScanToWrite);
                                 Log.WriteErrorLog(ErrMsg);
                                 MessageBox.Show("You must scan to start the burning!");
                                 TestResult = 0;
@@ -5339,7 +5339,7 @@ namespace MOKA_Factory_Tools
 
                         if (lastCount >= 2)
                         {// 累计2次Fail;
-                            ShowVerifyDelegate("累计2次测试失败，禁止再测试，请做好坏机标记");
+                            ShowVerifyDelegate(string.Format("{0}",LResource.TotalTwoFail));
                         }
                     }
 
@@ -5361,14 +5361,14 @@ namespace MOKA_Factory_Tools
                     if (TestResult == 0 && nOrderType == 0)
                     {
                         Log.WriteErrorLog("试产订单：请再测试一次\r\n第一次测试为FAIL，请再测试确认结果！");
-                        ShowVerifyDelegate("试产订单：请再测试一次\r\n第一次测试为FAIL，请再测试确认结果！");
+                        ShowVerifyDelegate(string.Format("{0}\r\n{1}",LResource.TrialOrder,LResource.FirstTestFail));
                     }
                 }
 
                 if (strLastResult.ToString().Equals("0") && (TestResult == 1) && (nOrderType == 0))
                 {
                     // 上次抄写是失败,这次是成功的,试产NTF要再次要求抄写一次才能上报AMTest.
-                    ErrMsg = "试产订单：请再测试一次\r\n上一次测试为FAIL，需要连续2次PASS，请再测试确认结果！";
+                    ErrMsg = string.Format("{0}\r\n{1}", LResource.TrialOrder,LResource.NeedTwoTest);
                     Log.WriteErrorLog(ErrMsg);
                     ShowVerifyDelegate(ErrMsg);
                     // 仍设置为失败;
@@ -5382,7 +5382,7 @@ namespace MOKA_Factory_Tools
                 if (!ntfBLL.SetDataBuringResult(FunctionSettingNow.Line, FunctionSettingNow.Station, SN, orderNow, keyInfo.DSN, TestResult == 0 ? false : true, strLastSN, nOrderType, TestResult == 0 ? ErrMsg : ""))
                 {
                     //ntf失败,也需要提示;
-                    ErrMsg = string.Format("统计NTF失败:{0}", SN);
+                    ErrMsg = string.Format("{0}:{1}",LResource.CountNTFError, SN);
                     Log.WriteErrorLog(ErrMsg);
                     TestResult = 0;
                 }
@@ -5391,7 +5391,7 @@ namespace MOKA_Factory_Tools
                     if ((TestResult == 1) && ntfBLL.ResultType.Equals("NTF", StringComparison.OrdinalIgnoreCase))
                     {
                         // TestResut == 0 && TestResut == 2时，也不提示NTF;
-                        ErrMsg = string.Format("结果类型为NTF，请将产品做好NTF标记:{0}", SN);
+                        ErrMsg = string.Format("{0}:{1}",LResource.MarkNTF, SN);
                         ShowVerifyDelegate(ErrMsg);
                     }
                 }
@@ -5402,7 +5402,7 @@ namespace MOKA_Factory_Tools
                     string returnObject;
                     if (!GMethod.ReportDataBurningResultToMES(SN, keyInfo.DSN, (TestResult != 0) ? "Pass" : "Fail", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), errorDBNow, out strOutMsg, out returnObject))
                     {
-                        ErrMsg = string.Format("上报抄写结果到MES失败，请紧急处理:{0}", strOutMsg);
+                        ErrMsg = string.Format("{0}:{1}",LResource.ReportMesFail,strOutMsg);
                         Log.WriteErrorLog(ErrMsg);
                         // 上报MES失败,重置为False
                         TestResult = 0;