|
@@ -4792,13 +4792,13 @@ namespace MOKA_Factory_Tools
|
|
|
SetsuccessStatus(ResultStatus);
|
|
|
end:
|
|
|
// 退出工厂模式;
|
|
|
- if ( !SerialCMD.LeaveFactory(TVPort, out result, out data, out error, SerailDelay) )
|
|
|
+ if (FunctionSettingNow.LeaveFactory ? !SerialCMD.LeaveFactory(TVPort, out result, out data, out error, SerailDelay) : false)
|
|
|
{
|
|
|
- ErrMsg = string.Format("LeaveFactory Fail\r\n{1}", SN);
|
|
|
+ ErrMsg = string.Format("LeaveFactory Fail\r\n {0}", SN);
|
|
|
Log.WriteErrorLog(ErrMsg);
|
|
|
}
|
|
|
|
|
|
-#region 只有惠州工厂才启用G客户防呆措施;
|
|
|
+ #region 只有惠州工厂才启用G客户防呆措施;
|
|
|
if (FunctionSettingNow.NTF)
|
|
|
{
|
|
|
string strLastResult = "";
|