|
@@ -4869,35 +4869,35 @@ namespace MOKA_Factory_Tools
|
|
|
goto end;
|
|
|
}
|
|
|
|
|
|
- if (!SerialCMD.CheckFireTVHashkey(TVPort, out result, out data, out error, SerailDelay))
|
|
|
+ if (writeCheckNow.HashCheckcheck ? !SerialCMD.CheckFireTVHashkey(TVPort, out result, out data, out error, SerailDelay) : false)
|
|
|
{
|
|
|
ErrMsg = string.Format("Check Hashkey失败 {0}", error);
|
|
|
Log.WriteErrorLog(ErrMsg);
|
|
|
goto end;
|
|
|
}
|
|
|
|
|
|
- if (!SerialCMD.CheckCikey(TVPort, out result, out data, out error, SerailDelay))
|
|
|
+ if (writeCheckNow.CI_plusCheckcheck ? !SerialCMD.CheckCikey(TVPort, out result, out data, out error, SerailDelay) : false)
|
|
|
{
|
|
|
ErrMsg = string.Format("Check Cikey失败 {0}", error);
|
|
|
Log.WriteErrorLog(ErrMsg);
|
|
|
goto end;
|
|
|
}
|
|
|
|
|
|
- if (!SerialCMD.CheckECP(TVPort, out result, out data, out error, SerailDelay))
|
|
|
+ if (writeCheckNow.ECPCheckcheck ? !SerialCMD.CheckECP(TVPort, out result, out data, out error, SerailDelay) : false)
|
|
|
{
|
|
|
ErrMsg = string.Format("Check Cikey失败 {0}", error);
|
|
|
Log.WriteErrorLog(ErrMsg);
|
|
|
goto end;
|
|
|
}
|
|
|
|
|
|
- if (!SerialCMD.CheckHDCP(TVPort, out result, out data, out error, SerailDelay))
|
|
|
+ if (writeCheckNow.HDCPCheckcheck ? !SerialCMD.CheckHDCP(TVPort, out result, out data, out error, SerailDelay) : false)
|
|
|
{
|
|
|
ErrMsg = string.Format("Check HDCP 失败 {0}", error);
|
|
|
Log.WriteErrorLog(ErrMsg);
|
|
|
goto end;
|
|
|
}
|
|
|
|
|
|
- if (!SerialCMD.CheckHDCP22(TVPort, out result, out data, out error, SerailDelay))
|
|
|
+ if (writeCheckNow.HDCP22Checkcheck ? !SerialCMD.CheckHDCP22(TVPort, out result, out data, out error, SerailDelay) : false)
|
|
|
{
|
|
|
ErrMsg = string.Format("Check HDCP22 失败 {0}", error);
|
|
|
Log.WriteErrorLog(ErrMsg);
|
|
@@ -4905,24 +4905,24 @@ namespace MOKA_Factory_Tools
|
|
|
}
|
|
|
|
|
|
// 读取HDCP;
|
|
|
- if (!SerialCMD.GetHDCPKey(TVPort, out result, out data, out error, SerailDelay))
|
|
|
+ if (readCheckNow.HDCPReadcheck ? !SerialCMD.GetHDCPKey(TVPort, out result, out data, out error, SerailDelay) : false)
|
|
|
{
|
|
|
ErrMsg = string.Format("读取HDCP失败 {0}", error);
|
|
|
Log.WriteErrorLog(ErrMsg);
|
|
|
goto end;
|
|
|
}
|
|
|
|
|
|
- _MiKey._HDCP14 = data.Length;
|
|
|
+ _MiKey._HDCP14 = readCheckNow.HDCPReadcheck ? data.Length : 0;
|
|
|
|
|
|
// 读取HDCP;
|
|
|
- if (!SerialCMD.GetHDCPKey22(TVPort, out result, out data, out error, SerailDelay))
|
|
|
+ if (readCheckNow.HDCP22Readcheck ? !SerialCMD.GetHDCPKey22(TVPort, out result, out data, out error, SerailDelay) : false)
|
|
|
{
|
|
|
ErrMsg = string.Format("读取HDCP22失败 {0}", error);
|
|
|
Log.WriteErrorLog(ErrMsg);
|
|
|
goto end;
|
|
|
}
|
|
|
|
|
|
- _MiKey._HDCP22 = data.Length;
|
|
|
+ _MiKey._HDCP22 = readCheckNow.HDCP22Readcheck ? data.Length : 0;
|
|
|
}
|
|
|
#endregion
|
|
|
|