优化了DSN check和read被禁止时的操作

FactoryTool_CShare/Views/OperationPanel.cs

@@ -4737,7 +4737,7 @@ namespace MOKA_Factory_Tools
                             Log.WriteErrorLog(ErrMsg);
                             goto end;
                         }                       
-                        byte[] DSNData = System.Text.Encoding.ASCII.GetBytes((keyInfo.DSN.data));
+                        byte[] DSNData = System.Text.Encoding.ASCII.GetBytes(keyInfo.DSN.data);
                         Log.WriteInfoLog("Write DSN...");
                         if (SerialCMD.SetFireTVDSN(TVPort, DSNData, out result, out data, out error, SerailDelay))
                         {
@@ -4753,31 +4753,26 @@ namespace MOKA_Factory_Tools
                             }
                             
                             SetsuccessStatus(m_checkDSN);
-                            if (cfg_readcheck.DSNReadcheck ?  !SerialCMD.GetFireTVDSN(TVPort, out result, out data, out error, SerailDelay):false)
+                            if (cfg_readcheck.DSNReadcheck)
                             {
-                                SetfailStatus(m_readDSN);
-                                ErrMsg = string.Format("{0}  read DSN fail!", SN);
-                                Log.WriteErrorLog(ErrMsg);
-                                goto end;
-                            }
-                            else
-                            {
-                                if(cfg_readcheck.DSNReadcheck)
+                                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;
-                                    }
+                                    SetfailStatus(m_readDSN);
+                                    ErrMsg = string.Format("{0}  read DSN fail!", SN);
+                                    Log.WriteErrorLog(ErrMsg);
+                                    goto end;                                    
                                 }
-                            }                      
+
+                                if (!SerialInit.BytesCompare_Base64(data, DSNData))
+                                {
+                                    SetfailStatus(m_readDSN);
+                                    ErrMsg = string.Format("{0}  contrast DSN fail!", SN);
+                                    Log.WriteErrorLog(ErrMsg);
+                                    goto end;
+                                }
+
+                                SetsuccessStatus(m_readDSN);
+                            }                  
                         }
                         else
                         {