浏览代码

添加Dolby key抄写,临时方案在config启动check时,抄写过程进行check

JeffWang 3 年之前
父节点
当前提交
c291ab6016

+ 3 - 0
FactoryTool_CShare/Models/StructList.cs

@@ -359,6 +359,7 @@ namespace MOKA_Factory_Tools
         public bool ACASIDReadcheck { get; set; }
         public bool ACASIDReadcheck { get; set; }
         public bool FVPReadcheck { get; set; }
         public bool FVPReadcheck { get; set; }
         public bool DAKReadcheck { get; set; }
         public bool DAKReadcheck { get; set; }
+        public bool DolbyReadcheck { get; set; }
     }
     }
 
 
     public class Config_WriteCheck
     public class Config_WriteCheck
@@ -386,6 +387,7 @@ namespace MOKA_Factory_Tools
         public bool ACASKeyCheckcheck { get; set; }
         public bool ACASKeyCheckcheck { get; set; }
         public bool FVPCheckcheck { get; set; }
         public bool FVPCheckcheck { get; set; }
         public bool DAKCheckcheck { get; set; }
         public bool DAKCheckcheck { get; set; }
+        public bool DolbyCheckcheck { get; set; }
     }
     }
 
 
     public class Config_WriteDone
     public class Config_WriteDone
@@ -423,6 +425,7 @@ namespace MOKA_Factory_Tools
         public bool ACASKeyWrite_YesNo { get; set; }
         public bool ACASKeyWrite_YesNo { get; set; }
         public bool FVPWrite_YesNo { get; set; }
         public bool FVPWrite_YesNo { get; set; }
         public bool DAKWrite_YesNo { get; set; }
         public bool DAKWrite_YesNo { get; set; }
+        public bool DolbyWrite_YesNo { get;set; }
     }
     }
 
 
     public class ErrorInfo
     public class ErrorInfo

+ 3 - 0
FactoryTool_CShare/Views/Main.cs

@@ -916,6 +916,7 @@ namespace MOKA_Factory_Tools
                 cfg_readcheck.ACASKeyReadcheck = jObject["ReadCheck"]["ACASKey"] == null ? CommonMethod.InsertJsonConfig("ReadCheck", "ACASKey") : jObject["ReadCheck"]["ACASKey"].Value<bool>();
                 cfg_readcheck.ACASKeyReadcheck = jObject["ReadCheck"]["ACASKey"] == null ? CommonMethod.InsertJsonConfig("ReadCheck", "ACASKey") : jObject["ReadCheck"]["ACASKey"].Value<bool>();
                 cfg_readcheck.FVPReadcheck = jObject["ReadCheck"]["FVP"] == null ? CommonMethod.InsertJsonConfig("ReadCheck", "FVP") : jObject["ReadCheck"]["FVP"].Value<bool>();
                 cfg_readcheck.FVPReadcheck = jObject["ReadCheck"]["FVP"] == null ? CommonMethod.InsertJsonConfig("ReadCheck", "FVP") : jObject["ReadCheck"]["FVP"].Value<bool>();
                 cfg_readcheck.DAKReadcheck = jObject["ReadCheck"]["DAK"] == null ? CommonMethod.InsertJsonConfig("ReadCheck", "DAK") : jObject["ReadCheck"]["DAK"].Value<bool>();
                 cfg_readcheck.DAKReadcheck = jObject["ReadCheck"]["DAK"] == null ? CommonMethod.InsertJsonConfig("ReadCheck", "DAK") : jObject["ReadCheck"]["DAK"].Value<bool>();
+                cfg_readcheck.DolbyReadcheck = jObject["ReadCheck"]["Dolby"] == null ? CommonMethod.InsertJsonConfig("ReadCheck", "Dolby") : jObject["ReadCheck"]["Dolby"].Value<bool>();
                 #endregion
                 #endregion
 
 
                 #region WriteCheck配置读取
                 #region WriteCheck配置读取
@@ -942,6 +943,7 @@ namespace MOKA_Factory_Tools
                 cfg_writecheck.ACASKeyCheckcheck = jObject["WriteCheck"]["ACASKey"] == null ? CommonMethod.InsertJsonConfig("WriteCheck", "ACASKey") : jObject["WriteCheck"]["ACASKey"].Value<bool>();
                 cfg_writecheck.ACASKeyCheckcheck = jObject["WriteCheck"]["ACASKey"] == null ? CommonMethod.InsertJsonConfig("WriteCheck", "ACASKey") : jObject["WriteCheck"]["ACASKey"].Value<bool>();
                 cfg_writecheck.FVPCheckcheck = jObject["WriteCheck"]["FVP"] == null ? CommonMethod.InsertJsonConfig("WriteCheck", "FVP") : jObject["WriteCheck"]["FVP"].Value<bool>();
                 cfg_writecheck.FVPCheckcheck = jObject["WriteCheck"]["FVP"] == null ? CommonMethod.InsertJsonConfig("WriteCheck", "FVP") : jObject["WriteCheck"]["FVP"].Value<bool>();
                 cfg_writecheck.DAKCheckcheck = jObject["WriteCheck"]["DAK"] == null ? CommonMethod.InsertJsonConfig("WriteCheck", "DAK") : jObject["WriteCheck"]["DAK"].Value<bool>();
                 cfg_writecheck.DAKCheckcheck = jObject["WriteCheck"]["DAK"] == null ? CommonMethod.InsertJsonConfig("WriteCheck", "DAK") : jObject["WriteCheck"]["DAK"].Value<bool>();
+                cfg_writecheck.DolbyCheckcheck = jObject["WriteCheck"]["Dolby"] == null ? CommonMethod.InsertJsonConfig("WriteCheck", "Dolby") : jObject["WriteCheck"]["Dolby"].Value<bool>();
                 #endregion
                 #endregion
 
 
                 #region WriteDone配置读取
                 #region WriteDone配置读取
@@ -975,6 +977,7 @@ namespace MOKA_Factory_Tools
                 cfg_writedone.ACASKeyWrite_YesNo = jObject["WriteDone"]["ACASKey"] == null ? CommonMethod.InsertJsonConfig("WriteDone", "ACASKey") : jObject["WriteDone"]["ACASKey"].Value<bool>();
                 cfg_writedone.ACASKeyWrite_YesNo = jObject["WriteDone"]["ACASKey"] == null ? CommonMethod.InsertJsonConfig("WriteDone", "ACASKey") : jObject["WriteDone"]["ACASKey"].Value<bool>();
                 cfg_writedone.FVPWrite_YesNo = jObject["WriteDone"]["FVP"] == null ? CommonMethod.InsertJsonConfig("WriteDone", "FVP") : jObject["WriteDone"]["FVP"].Value<bool>();
                 cfg_writedone.FVPWrite_YesNo = jObject["WriteDone"]["FVP"] == null ? CommonMethod.InsertJsonConfig("WriteDone", "FVP") : jObject["WriteDone"]["FVP"].Value<bool>();
                 cfg_writedone.DAKWrite_YesNo = jObject["WriteDone"]["DAK"] == null ? CommonMethod.InsertJsonConfig("WriteDone", "DAK") : jObject["WriteDone"]["DAK"].Value<bool>();
                 cfg_writedone.DAKWrite_YesNo = jObject["WriteDone"]["DAK"] == null ? CommonMethod.InsertJsonConfig("WriteDone", "DAK") : jObject["WriteDone"]["DAK"].Value<bool>();
+                cfg_writedone.DolbyWrite_YesNo = jObject["WriteDone"]["Dolby"] == null ? CommonMethod.InsertJsonConfig("WriteDone", "Dolby") : jObject["WriteDone"]["Dolby"].Value<bool>();
                 #endregion
                 #endregion
                 file.Close();
                 file.Close();
                 if (Custom_ProjectID != null)
                 if (Custom_ProjectID != null)

+ 12 - 1
FactoryTool_CShare/Views/OperationPanel.cs

@@ -3807,7 +3807,6 @@ namespace MOKA_Factory_Tools
                 keyInfo.Playready.result = true;
                 keyInfo.Playready.result = true;
             }
             }
 
 
-
             #region FVP激活-放在Hash key抄写之后,应用于所有FireTV项目-已通过郁沛确认;
             #region FVP激活-放在Hash key抄写之后,应用于所有FireTV项目-已通过郁沛确认;
             if (WriteFVP.Checked)
             if (WriteFVP.Checked)
             {
             {
@@ -3842,6 +3841,18 @@ namespace MOKA_Factory_Tools
             }
             }
             #endregion
             #endregion
 
 
+            // Dolby Key抄写;
+            if ( cfg_writecheck.DolbyCheckcheck )
+            {
+                Log.WriteInfoLog("Check Dolby Key...");
+                if ( !SerialCMD.CheckDolbyKey(TVPort, out result, out data, out error, SerailDelay) )
+                {
+                    ErrMsg = string.Format("{0} check Dolby fail!", SN);
+                    Log.WriteErrorLog(ErrMsg);
+                    goto end;
+                }
+            }
+
             //Hash抄写
             //Hash抄写
             if (WriteHash.Checked)
             if (WriteHash.Checked)
             {
             {