Explorar o código

修复G客户DSN抄写时,不设置WriteCheck就无法使用ReadCheck功能。

jianfeng1.wang %!s(int64=2) %!d(string=hai) anos
pai
achega
927b0950b6
Modificáronse 1 ficheiros con 25 adicións e 30 borrados
  1. 25 30
      FactoryTool_CShare/Views/OperationPanel.cs

+ 25 - 30
FactoryTool_CShare/Views/OperationPanel.cs

@@ -4721,46 +4721,41 @@ namespace MOKA_Factory_Tools
                     {
                         SetsuccessStatus(m_writeDSN);
                         Log.WriteInfoLog("Check DSN...");
-                        if (cfg_writecheck.DSNCheckcheck)
+
+                        if (cfg_writecheck.DSNCheckcheck ? SerialCMD.CheckFireTVDSN(TVPort, out result, out data, out error, SerailDelay) : true)
                         {
-                            if (SerialCMD.CheckFireTVDSN(TVPort, out result, out data, out error, SerailDelay))
+                            SetsuccessStatus(m_checkDSN);
+                            Log.WriteInfoLog("Read DSN...");
+                            if (cfg_readcheck.DSNReadcheck ? SerialCMD.GetFireTVDSN(TVPort, out result, out data, out error, SerailDelay) : true)
                             {
-                                SetsuccessStatus(m_checkDSN);
-                                Log.WriteInfoLog("Read DSN...");
-                                if (cfg_readcheck.DSNReadcheck)
+                                if (SerialInit.BytesCompare_Base64(data, DSNData))
                                 {
-                                    if (SerialCMD.GetFireTVDSN(TVPort, out result, out data, out error, SerailDelay))
-                                    {
-                                        if (SerialInit.BytesCompare_Base64(data, DSNData))
-                                        {
-                                            SetsuccessStatus(m_readDSN);
-                                            //DSN读取别对成功
-                                        }
-                                        else
-                                        {
-                                            SetfailStatus(m_readDSN);
-                                            ErrMsg = string.Format("{0}  contrast DSN fail!", SN);
-                                            Log.WriteErrorLog(ErrMsg);
-                                            goto end;
-                                        }
-                                    }
-                                    else
-                                    {
-                                        SetfailStatus(m_readDSN);
-                                        ErrMsg = string.Format("{0}  read DSN fail!", SN);
-                                        Log.WriteErrorLog(ErrMsg);
-                                        goto end;
-                                    }
+                                    SetsuccessStatus(m_readDSN);
+                                    //DSN读取别对成功
+                                }
+                                else
+                                {
+                                    SetfailStatus(m_readDSN);
+                                    ErrMsg = string.Format("{0}  contrast DSN fail!", SN);
+                                    Log.WriteErrorLog(ErrMsg);
+                                    goto end;
                                 }
                             }
                             else
                             {
-                                SetfailStatus(m_checkDSN);
-                                ErrMsg = string.Format("{0}  check DSN fail!", SN);
+                                SetfailStatus(m_readDSN);
+                                ErrMsg = string.Format("{0}  read DSN fail!", SN);
                                 Log.WriteErrorLog(ErrMsg);
                                 goto end;
-                            }
+                            }                            
                         }
+                        else
+                        {
+                            SetfailStatus(m_checkDSN);
+                            ErrMsg = string.Format("{0}  check DSN fail!", SN);
+                            Log.WriteErrorLog(ErrMsg);
+                            goto end;
+                        }                        
                     }
                     else
                     {