RMCA key修改

FactoryTool_CShare/Business/CommonMethod.cs

@@ -338,7 +338,7 @@ namespace MOKA_Factory_Tools
                 }
             };
 
-            // 共21个key需要抄写;
+            // 共22个key需要抄写;
             check_key_type("DeviceID", resultKeyType, cfg_write.DIDWrite_YesNo);
             check_key_type("MAC", resultKeyType, cfg_write.MacWrite_YesNo);
             check_key_type("HDCP_KEY", resultKeyType, cfg_write.HDCPWrite_YesNo);
@@ -361,6 +361,7 @@ namespace MOKA_Factory_Tools
             check_key_type("ACAS_KEY", resultKeyType, cfg_write.ACASKeyWrite_YesNo);
             check_key_type("DAK", resultKeyType, cfg_write.DAKWrite_YesNo);
             check_key_type("KFP_KEY", resultKeyType, cfg_write.KFPWrite_YesNo);
+            check_key_type("RMCA_Key", resultKeyType, cfg_write.RMCAWrite_YesNo);
 
             return resultKeyType.Count == 0 ? false : true;
         }

FactoryTool_CShare/Views/OperationPanel.cs

@@ -94,7 +94,7 @@ namespace MOKA_Factory_Tools
 
         private void SetCheckboxStatusByConfig()
         {
-#if DEBUG
+#if false
             // 非小米的抄写,不处理.需要保证其他工厂的配置不受影响;
             if (!FunctionSettingNow.MITVEnable && !FunctionSettingNow.IndiaMITVEnable)
                 return;
@@ -2535,7 +2535,7 @@ namespace MOKA_Factory_Tools
                             SaveKey(keyInfo.Widevine, OrderText.Text, SN);
                             SaveKey(keyInfo.WiFi_MAC, OrderText.Text, SN);
                             SaveKey(keyInfo.YouTube_KEY, OrderText.Text, SN);
-
+                            SaveKey(keyInfo.RMCA, OrderText.Text, SN);
                             MessageBox.Show("下载完成");
                             goto stop;
                         }
@@ -3876,8 +3876,8 @@ namespace MOKA_Factory_Tools
                 if(WriteRMCA.Checked)
                 {
                     if(!WriteRMCAKey(SerailDelay,out ErrMsg))
-                    {
-                        Log.WriteErrorLog(ErrMsg);
+                    {                    
+                        Log.WriteErrorLog(ErrMsg);                       
                         goto end;
                     }
                 }
@@ -3991,6 +3991,7 @@ namespace MOKA_Factory_Tools
 #endregion
 
                 // Dolby Key抄写;
+
                 if (cfg_writecheck.DolbyCheckcheck)
                 {
                     Log.WriteInfoLog("Check Dolby Key...");
@@ -5573,11 +5574,11 @@ namespace MOKA_Factory_Tools
                 UpdateKeyCountOnline("PlayReady_key", keys["PlayReady_key"], false);
             }
             //RMCA
-            if (keys.ContainsKey("RMCA_key"))
+            if (keys.ContainsKey("RMCA_Key"))
             {
                 if (cfg_writedone.RMCAWrite_YesNo)
                     SetCheckboxStatus(WriteRMCA, true);
-                UpdateKeyCountOnline("RMCA_key", keys["RMCA_key"], false);
+                UpdateKeyCountOnline("RMCA_Key", keys["RMCA_Key"], false);
             }
             if (keys.ContainsKey("Hashkey"))
             {
@@ -5997,7 +5998,7 @@ namespace MOKA_Factory_Tools
                 return false;
             }
              
-            keyInfo.Playready.result = true;
+            keyInfo.RMCA.result = true;
             err = "";
             return true;
         }