修复：新接口方式使用了out参数，导致keyinfo信息清空。

FactoryTool_CShare/Business/CommonMethod.cs

@@ -561,10 +561,9 @@ namespace MOKA_Factory_Tools
         /// <param name="error"></param>
         /// <param name="md5"></param>
         /// <returns></returns>
-        public static bool GetIDMKeys(string url, string sn, string order, string psn, string firetv_device_code, List<KeyType> key2Write, SQLiteConnection connection, out KeyInfo keys, out string msg)
+        public static bool GetIDMKeys(string url, string sn, string order, string psn, string firetv_device_code, List<KeyType> key2Write, SQLiteConnection connection, ref KeyInfo keys, out string msg)
         {
             msg = "";
-            keys = new KeyInfo();
             string code;
             bool result = false;
 

FactoryTool_CShare/Views/OperationPanel.cs

@@ -1746,7 +1746,10 @@ namespace MOKA_Factory_Tools
                             Log.WriteErrorLog(ErrMsg);
                             goto end;
                         }
+
                         SetsuccessStatus(m_readPSN);
+                        SetsuccessStatus(ResultStatus);
+                        goto stop;
                     }
                     else
                     {
@@ -2177,7 +2180,7 @@ namespace MOKA_Factory_Tools
                 // 部分订单无key,只有Roku信息;
                 if (midListNow.keytype.Count() != 0)
                 {
-                    if (!CommonMethod.GetIDMKeys(midListNow.host, SN, orderNow, psn, devicecode, key2Write, errorDBNow, out keyInfo, out error))
+                    if (!CommonMethod.GetIDMKeys(midListNow.host, SN, orderNow, psn, devicecode, key2Write, errorDBNow, ref keyInfo, out error))
                     {
                         ErrMsg = string.Format("{0} GetIDMKeys Failed!\r\n{1}", SN, error);
                         Log.WriteErrorLog(ErrMsg);
@@ -4474,40 +4477,46 @@ namespace MOKA_Factory_Tools
                     {
                         SetsuccessStatus(m_writeDSN);
                         Log.WriteInfoLog("Check DSN...");
-                        if (cfg_writecheck.DSNCheckcheck ? SerialCMD.CheckFireTVDSN(TVPort, out result, out data, out error, SerailDelay) : true)
+                        if (cfg_writecheck.DSNCheckcheck)
                         {
-                            SetsuccessStatus(m_checkDSN);
-                            Log.WriteInfoLog("Read DSN...");
-                            if (cfg_readcheck.DSNReadcheck ? SerialCMD.GetFireTVDSN(TVPort, out result, out data, out error, SerailDelay) : true)
+                            if (SerialCMD.CheckFireTVDSN(TVPort, out result, out data, out error, SerailDelay))
                             {
-                                if (SerialInit.BytesCompare_Base64(data, DSNData))
+                                SetsuccessStatus(m_checkDSN);
+                                Log.WriteInfoLog("Read DSN...");
+                                if (cfg_readcheck.DSNReadcheck)
                                 {
-                                    SetsuccessStatus(m_readDSN);
-                                    //DSN读取别对成功
-                                }
-                                else
-                                {
-                                    SetfailStatus(m_readDSN);
-                                    ErrMsg = string.Format("{0}  contrast DSN fail!", SN);
-                                    Log.WriteErrorLog(ErrMsg);
-                                    goto end;
+                                    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;
+                                    }
                                 }
                             }
                             else
                             {
-                                SetfailStatus(m_readDSN);
-                                ErrMsg = string.Format("{0}  read DSN fail!", SN);
+                                SetfailStatus(m_checkDSN);
+                                ErrMsg = string.Format("{0}  check 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
                     {