소스 검색

1、修正ACAS Key抄写的长度问题导致的错误;
2、添加字符资源描述ACAS Key抄写失败;

sat23 3 년 전
부모
커밋
e26889c305

+ 1 - 1
SCBC Factory Tools/IO/SerialCMD.cs

@@ -2446,7 +2446,7 @@ namespace MOKA_Factory_Tools
         /// <returns></returns>
         public static bool SetACASKey(SerialPort Comport, byte[] param, out byte[] result, out byte[] data, out string error, int waitTime)
         {
-            return Sendcmd(Comport, new byte[] { 0xAA }, new byte[] { 0xFC, 0x00, 0x08 }, param, false, false, out result, out data, out error, waitTime);
+            return Sendcmd(Comport, new byte[] { 0xAA, 0xFE }, new byte[] { 0xFC, 0x00, 0x08 }, param, false, false, out result, out data, out error, waitTime);
         }
 
         /// <summary>

+ 27 - 0
SCBC Factory Tools/LResource.Designer.cs

@@ -402,6 +402,15 @@ namespace MOKA_Factory_Tools {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Contrast ACAS Key Error! 的本地化字符串。
+        /// </summary>
+        internal static string ContrastACASKeyError {
+            get {
+                return ResourceManager.GetString("ContrastACASKeyError", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Contrast attestation key error! 的本地化字符串。
         /// </summary>
@@ -1356,6 +1365,15 @@ namespace MOKA_Factory_Tools {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Read ACAS Key Error! 的本地化字符串。
+        /// </summary>
+        internal static string ReadACASKeyError {
+            get {
+                return ResourceManager.GetString("ReadACASKeyError", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Read attestation fail 的本地化字符串。
         /// </summary>
@@ -1977,6 +1995,15 @@ namespace MOKA_Factory_Tools {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Write ACAS Key Error! 的本地化字符串。
+        /// </summary>
+        internal static string WriteACASKeyError {
+            get {
+                return ResourceManager.GetString("WriteACASKeyError", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Write attestation fail 的本地化字符串。
         /// </summary>

+ 9 - 0
SCBC Factory Tools/LResource.resx

@@ -231,6 +231,9 @@
   <data name="CompareRokuUrlFail" xml:space="preserve">
     <value>Fail to compare roku url!</value>
   </data>
+  <data name="ContrastACASKeyError" xml:space="preserve">
+    <value>Contrast ACAS Key Error!</value>
+  </data>
   <data name="ContrastAttestationError" xml:space="preserve">
     <value>Contrast attestation key error!</value>
   </data>
@@ -549,6 +552,9 @@
   <data name="ReadACASIDError" xml:space="preserve">
     <value>Read ACAS ID Error!</value>
   </data>
+  <data name="ReadACASKeyError" xml:space="preserve">
+    <value>Read ACAS Key Error!</value>
+  </data>
   <data name="ReadAttestationError" xml:space="preserve">
     <value>Read attestation fail</value>
   </data>
@@ -756,6 +762,9 @@
   <data name="WilluseOnlinePID" xml:space="preserve">
     <value>Online project ID will be used!</value>
   </data>
+  <data name="WriteACASKeyError" xml:space="preserve">
+    <value>Write ACAS Key Error!</value>
+  </data>
   <data name="WriteAttestationError" xml:space="preserve">
     <value>Write attestation fail</value>
   </data>

+ 9 - 0
SCBC Factory Tools/LResource.zh-CN.resx

@@ -231,6 +231,9 @@
   <data name="CompareRokuUrlFail" xml:space="preserve">
     <value>ROKU url 比较失败!</value>
   </data>
+  <data name="ContrastACASKeyError" xml:space="preserve">
+    <value>读取的ACAS Key与写入的不符!</value>
+  </data>
   <data name="ContrastAttestationError" xml:space="preserve">
     <value>Attestation key比较失败!</value>
   </data>
@@ -549,6 +552,9 @@
   <data name="ReadACASIDError" xml:space="preserve">
     <value>读取ACAS ID错误!</value>
   </data>
+  <data name="ReadACASKeyError" xml:space="preserve">
+    <value>读取ACAS Key失败!</value>
+  </data>
   <data name="ReadAttestationError" xml:space="preserve">
     <value>串口读取Attestation key失败!</value>
   </data>
@@ -756,6 +762,9 @@
   <data name="WilluseOnlinePID" xml:space="preserve">
     <value>请注意将使用服务器推送的屏ID!</value>
   </data>
+  <data name="WriteACASKeyError" xml:space="preserve">
+    <value>写ACAS Key失败!</value>
+  </data>
   <data name="WriteAttestationError" xml:space="preserve">
     <value>串口写入Attestation key失败!</value>
   </data>

+ 5 - 5
SCBC Factory Tools/Views/OperationPanel.cs

@@ -3804,7 +3804,7 @@ namespace MOKA_Factory_Tools
             // ACAS Key抄写;
             if (WriteACASKey.Checked)
             {
-                byte[] ACASKeyData = Encoding.ASCII.GetBytes(keyInfo.ACASKey);
+                byte[] ACASKeyData = SerialInit.HexToByte(keyInfo.ACASKey);
                 Log.WriteInfoLog("Write ACAC Key...");
                 if (SerialCMD.SetACASKey(TVPort, ACASKeyData, out result, out data, out error, SerailDelay))
                 {
@@ -3827,7 +3827,7 @@ namespace MOKA_Factory_Tools
                                 {
                                     SetfailStatus(m_readACASKey);
                                     Log.WriteErrorLog(SN + "   contrast ACAS Key fail");
-                                    MessageBox.Show(LResource.ContrastEDIDModelNameError);
+                                    MessageBox.Show(LResource.ContrastACASKeyError);
                                     goto end;
                                 }
                             }
@@ -3836,7 +3836,7 @@ namespace MOKA_Factory_Tools
                         {
                             SetfailStatus(m_readACASKey);
                             Log.WriteErrorLog(SN + "   read ACAS Key fail");
-                            MessageBox.Show(LResource.ReadEDIDModelNameError);
+                            MessageBox.Show(LResource.ReadACASKeyError);
                             goto end;
                         }
                     }
@@ -3844,7 +3844,7 @@ namespace MOKA_Factory_Tools
                     {
                         SetfailStatus(m_checkACASKey);
                         Log.WriteErrorLog(SN + "   Check ACAS Key fail");
-                        MessageBox.Show(LResource.WriteEDIDModelNameError);
+                        MessageBox.Show(LResource.WriteACASKeyError);
                         goto end;
                     }
                 }
@@ -3852,7 +3852,7 @@ namespace MOKA_Factory_Tools
                 {
                     SetfailStatus(m_writeACASKey);
                     Log.WriteErrorLog(SN + "   Write ACAS Key fail");
-                    MessageBox.Show(LResource.WriteEDIDModelNameError);
+                    MessageBox.Show(LResource.WriteACASKeyError);
                     goto end;
                 }
             }