Преглед изворни кода

按G客户要求,FVP set和check要分开上传。

JeffWang пре 2 година
родитељ
комит
cb7c174003
2 измењених фајлова са 8 додато и 3 уклоњено
  1. 1 0
      FactoryTool_CShare/Business/GMethod.cs
  2. 7 3
      FactoryTool_CShare/Views/OperationPanel.cs

+ 1 - 0
FactoryTool_CShare/Business/GMethod.cs

@@ -487,6 +487,7 @@ namespace MOKA_Factory_Tools
 
                 if ( key.FVP.enable )
                 {
+                    dic.Add("FVP_set", key.FVP.data);
                     dic.Add("FVP_check", key.FVP.result ? "PASS" : "FAIL");
                 }
             }

+ 7 - 3
FactoryTool_CShare/Views/OperationPanel.cs

@@ -3518,21 +3518,26 @@ namespace MOKA_Factory_Tools
 #region FVP激活-放在Hash key抄写之后,应用于所有FireTV项目-已通过郁沛确认;
             if (WriteFVP.Checked)
             {
+                keyInfo.FVP.data = "FAIL"; //默认失败;
                 Log.WriteInfoLog("Activate FVP...");
                 byte[] FVPData = new byte[] { };
                 if (SerialCMD.ActiveMiFireTVFVP(TVPort, FVPData, out result, out data, out error, SerailDelay))
                 {
                     SetsuccessStatus(m_writeFVP);
+                    keyInfo.FVP.data = "PASS";  // 激活成功;
                     Log.WriteInfoLog("Check FVP...");
                     if (cfg_writecheck.FVPCheckcheck ? SerialCMD.CheckMiFireTVFVP(TVPort, out result, out data, out error, SerailDelay) : true)
                     {
                         SetsuccessStatus(m_checkFVP);
+                        // result只作为check结果;
+                        keyInfo.FVP.result = true;
                     }
                     else
                     {
                         SetfailStatus(m_checkFVP);
                         ErrMsg = string.Format("{0} check FVP fail!", SN);
                         Log.WriteErrorLog(ErrMsg);
+                        keyInfo.FVP.result = false;
                         goto end;
                     }
                 }
@@ -3541,11 +3546,10 @@ namespace MOKA_Factory_Tools
                     SetfailStatus(m_writeFVP);
                     ErrMsg = string.Format("Activate FVP Failed {0}", error);
                     Log.WriteErrorLog(ErrMsg);
+                    keyInfo.FVP.data = "FAIL";
+                    keyInfo.FVP.result = false;
                     goto end;
                 }
-
-                // fvp激活和check成功;
-                keyInfo.FVP.result = true;
             }
 #endregion