添加DAK\FVP相关控件

FactoryTool_CShare/Views/Main.cs

@@ -819,7 +819,7 @@ namespace MOKA_Factory_Tools
                     functionSetting1.CustomCMD = JsonConvert.DeserializeObject<Dictionary<string, string>>(ss.ToString());
                 }
 
-                //ReadCheck配置读取
+                #region ReadCheck配置读取
                 ReadCheck1.PIDReadcheck = jObject["ReadCheck"]["PID"].Value<bool>();
                 ReadCheck1.OSDReadcheck = jObject["ReadCheck"]["OSD"].Value<bool>();
                 ReadCheck1.SHOPReadcheck = jObject["ReadCheck"]["SHOP"].Value<bool>();
@@ -846,7 +846,9 @@ namespace MOKA_Factory_Tools
                 ReadCheck1.EDIDPIDReadcheck = jObject["ReadCheck"]["EDIDPID"] == null ? CommonMethod.InsertJsonConfig("ReadCheck", "EDIDPID") : jObject["ReadCheck"]["EDIDPID"].Value<bool>();
                 ReadCheck1.EDIDModeNameReadcheck = jObject["ReadCheck"]["EDIDModeName"] == null ? CommonMethod.InsertJsonConfig("ReadCheck", "EDIDModeName") : jObject["ReadCheck"]["EDIDModeName"].Value<bool>();
                 ReadCheck1.ACASKeyReadcheck = jObject["ReadCheck"]["ACASKey"] == null ? CommonMethod.InsertJsonConfig("ReadCheck", "ACASKey") : jObject["ReadCheck"]["ACASKey"].Value<bool>();
-                //WriteCheck配置读取
+                #endregion
+
+                #region WriteCheck配置读取
                 WriteCheck1.DIDCheckcheck = jObject["WriteCheck"]["DID"].Value<bool>();
                 WriteCheck1.MacCheckcheck = jObject["WriteCheck"]["MAC"].Value<bool>();
                 WriteCheck1.HDCPCheckcheck = jObject["WriteCheck"]["HDCP"].Value<bool>();
@@ -868,7 +870,10 @@ namespace MOKA_Factory_Tools
                 WriteCheck1.DSNCheckcheck = jObject["WriteCheck"]["DSN"] == null ? CommonMethod.InsertJsonConfig("WriteCheck", "DSN") : jObject["WriteCheck"]["DSN"].Value<bool>();
                 WriteCheck1.YouTubeCheckcheck = jObject["WriteCheck"]["YouTube"] == null ? CommonMethod.InsertJsonConfig("WriteCheck", "YouTube") : jObject["WriteCheck"]["YouTube"].Value<bool>();
                 WriteCheck1.ACASKeyCheckcheck = jObject["WriteCheck"]["ACASKey"] == null ? CommonMethod.InsertJsonConfig("WriteCheck", "ACASKey") : jObject["WriteCheck"]["ACASKey"].Value<bool>();
-                //WriteDone配置读取
+                
+                #endregion
+
+                #region WriteDone配置读取
                 WriteDone1.PIDWrite_YesNo = jObject["WriteDone"]["PID"].Value<bool>();
                 WriteDone1.PIDWriteDelay = jObject["WriteDone"]["PIDWirteDelay"].Value<int>();
                 WriteDone1.ClientTypeCheck_YesNo = jObject["WriteDone"]["ClientType"].Value<bool>();
@@ -897,6 +902,7 @@ namespace MOKA_Factory_Tools
                 WriteDone1.EDIDPIDWrite_YesNo = jObject["WriteDone"]["EDIDPID"] == null ? CommonMethod.InsertJsonConfig("WriteDone", "EDIDPID") : jObject["WriteDone"]["EDIDPID"].Value<bool>();
                 WriteDone1.EDIDModeNameWrite_YesNo = jObject["WriteDone"]["EDIDModeName"] == null ? CommonMethod.InsertJsonConfig("WriteDone", "EDIDModeName") : jObject["WriteDone"]["EDIDModeName"].Value<bool>();
                 WriteDone1.ACASKeyWrite_YesNo = jObject["WriteDone"]["ACASKey"] == null ? CommonMethod.InsertJsonConfig("WriteDone", "ACASKey") : jObject["WriteDone"]["ACASKey"].Value<bool>();
+                #endregion
                 file.Close();
                 if (Custom_ProjectID != null)
                     if (Custom_ProjectID.Trim().Length > 0)

FactoryTool_CShare/Views/OperationPanel.Designer.cs

@@ -67,6 +67,16 @@
             this.skinLabel10 = new CCWin.SkinControl.SkinLabel();
             this.skinGroupBox2 = new CCWin.SkinControl.SkinGroupBox();
             this.skinPanel1 = new CCWin.SkinControl.SkinPanel();
+            this.m_readDAK = new CCWin.SkinControl.SkinLabel();
+            this.m_checkDAK = new CCWin.SkinControl.SkinLabel();
+            this.m_writeDAK = new CCWin.SkinControl.SkinLabel();
+            this.skinLabel31 = new CCWin.SkinControl.SkinLabel();
+            this.WriteDAK = new CCWin.SkinControl.SkinCheckBox();
+            this.m_readFVP = new CCWin.SkinControl.SkinLabel();
+            this.m_checkFVP = new CCWin.SkinControl.SkinLabel();
+            this.m_writeFVP = new CCWin.SkinControl.SkinLabel();
+            this.skinLabel22 = new CCWin.SkinControl.SkinLabel();
+            this.WriteFVP = new CCWin.SkinControl.SkinCheckBox();
             this.m_readACASID = new CCWin.SkinControl.SkinLabel();
             this.skinLabel24 = new CCWin.SkinControl.SkinLabel();
             this.skinLabel27 = new CCWin.SkinControl.SkinLabel();
@@ -555,6 +565,16 @@
             // 
             resources.ApplyResources(this.skinPanel1, "skinPanel1");
             this.skinPanel1.BackColor = System.Drawing.Color.Transparent;
+            this.skinPanel1.Controls.Add(this.m_readDAK);
+            this.skinPanel1.Controls.Add(this.m_checkDAK);
+            this.skinPanel1.Controls.Add(this.m_writeDAK);
+            this.skinPanel1.Controls.Add(this.skinLabel31);
+            this.skinPanel1.Controls.Add(this.WriteDAK);
+            this.skinPanel1.Controls.Add(this.m_readFVP);
+            this.skinPanel1.Controls.Add(this.m_checkFVP);
+            this.skinPanel1.Controls.Add(this.m_writeFVP);
+            this.skinPanel1.Controls.Add(this.skinLabel22);
+            this.skinPanel1.Controls.Add(this.WriteFVP);
             this.skinPanel1.Controls.Add(this.m_readACASID);
             this.skinPanel1.Controls.Add(this.skinLabel24);
             this.skinPanel1.Controls.Add(this.skinLabel27);
@@ -686,6 +706,90 @@
             this.skinPanel1.Name = "skinPanel1";
             this.skinPanel1.NormlBack = null;
             // 
+            // m_readDAK
+            // 
+            resources.ApplyResources(this.m_readDAK, "m_readDAK");
+            this.m_readDAK.BackColor = System.Drawing.Color.Transparent;
+            this.m_readDAK.BorderColor = System.Drawing.Color.White;
+            this.m_readDAK.Name = "m_readDAK";
+            // 
+            // m_checkDAK
+            // 
+            resources.ApplyResources(this.m_checkDAK, "m_checkDAK");
+            this.m_checkDAK.BackColor = System.Drawing.Color.Transparent;
+            this.m_checkDAK.BorderColor = System.Drawing.Color.White;
+            this.m_checkDAK.Name = "m_checkDAK";
+            // 
+            // m_writeDAK
+            // 
+            resources.ApplyResources(this.m_writeDAK, "m_writeDAK");
+            this.m_writeDAK.BackColor = System.Drawing.Color.Transparent;
+            this.m_writeDAK.BorderColor = System.Drawing.Color.White;
+            this.m_writeDAK.Name = "m_writeDAK";
+            // 
+            // skinLabel31
+            // 
+            resources.ApplyResources(this.skinLabel31, "skinLabel31");
+            this.skinLabel31.BackColor = System.Drawing.Color.Transparent;
+            this.skinLabel31.BorderColor = System.Drawing.Color.White;
+            this.skinLabel31.Name = "skinLabel31";
+            // 
+            // WriteDAK
+            // 
+            resources.ApplyResources(this.WriteDAK, "WriteDAK");
+            this.WriteDAK.BackColor = System.Drawing.Color.Transparent;
+            this.WriteDAK.ControlState = CCWin.SkinClass.ControlState.Normal;
+            this.WriteDAK.DownBack = null;
+            this.WriteDAK.MouseBack = null;
+            this.WriteDAK.Name = "WriteDAK";
+            this.WriteDAK.NormlBack = null;
+            this.WriteDAK.SelectedDownBack = null;
+            this.WriteDAK.SelectedMouseBack = null;
+            this.WriteDAK.SelectedNormlBack = null;
+            this.WriteDAK.UseVisualStyleBackColor = false;
+            // 
+            // m_readFVP
+            // 
+            resources.ApplyResources(this.m_readFVP, "m_readFVP");
+            this.m_readFVP.BackColor = System.Drawing.Color.Transparent;
+            this.m_readFVP.BorderColor = System.Drawing.Color.White;
+            this.m_readFVP.Name = "m_readFVP";
+            // 
+            // m_checkFVP
+            // 
+            resources.ApplyResources(this.m_checkFVP, "m_checkFVP");
+            this.m_checkFVP.BackColor = System.Drawing.Color.Transparent;
+            this.m_checkFVP.BorderColor = System.Drawing.Color.White;
+            this.m_checkFVP.Name = "m_checkFVP";
+            // 
+            // m_writeFVP
+            // 
+            resources.ApplyResources(this.m_writeFVP, "m_writeFVP");
+            this.m_writeFVP.BackColor = System.Drawing.Color.Transparent;
+            this.m_writeFVP.BorderColor = System.Drawing.Color.White;
+            this.m_writeFVP.Name = "m_writeFVP";
+            // 
+            // skinLabel22
+            // 
+            resources.ApplyResources(this.skinLabel22, "skinLabel22");
+            this.skinLabel22.BackColor = System.Drawing.Color.Transparent;
+            this.skinLabel22.BorderColor = System.Drawing.Color.White;
+            this.skinLabel22.Name = "skinLabel22";
+            // 
+            // WriteFVP
+            // 
+            resources.ApplyResources(this.WriteFVP, "WriteFVP");
+            this.WriteFVP.BackColor = System.Drawing.Color.Transparent;
+            this.WriteFVP.ControlState = CCWin.SkinClass.ControlState.Normal;
+            this.WriteFVP.DownBack = null;
+            this.WriteFVP.MouseBack = null;
+            this.WriteFVP.Name = "WriteFVP";
+            this.WriteFVP.NormlBack = null;
+            this.WriteFVP.SelectedDownBack = null;
+            this.WriteFVP.SelectedMouseBack = null;
+            this.WriteFVP.SelectedNormlBack = null;
+            this.WriteFVP.UseVisualStyleBackColor = false;
+            // 
             // m_readACASID
             // 
             resources.ApplyResources(this.m_readACASID, "m_readACASID");
@@ -1985,5 +2089,15 @@
         private CCWin.SkinControl.SkinLabel m_writeACASKey;
         private CCWin.SkinControl.SkinLabel ACASKeyCount;
         private CCWin.SkinControl.SkinCheckBox WriteACASKey;
+        private CCWin.SkinControl.SkinLabel m_readFVP;
+        private CCWin.SkinControl.SkinLabel m_checkFVP;
+        private CCWin.SkinControl.SkinLabel m_writeFVP;
+        private CCWin.SkinControl.SkinLabel skinLabel22;
+        private CCWin.SkinControl.SkinCheckBox WriteFVP;
+        private CCWin.SkinControl.SkinLabel m_readDAK;
+        private CCWin.SkinControl.SkinLabel m_checkDAK;
+        private CCWin.SkinControl.SkinLabel m_writeDAK;
+        private CCWin.SkinControl.SkinLabel skinLabel31;
+        private CCWin.SkinControl.SkinCheckBox WriteDAK;
     }
 }

FactoryTool_CShare/Views/OperationPanel.cs

@@ -192,6 +192,7 @@ namespace MOKA_Factory_Tools
             BaudText.BackColor = Color.FromArgb(128, 255, 128);
             WritePSN.Checked = FunctionSettingNow.BarcodeWrite;
 
+            #region 设置复选框默认状态;
             if (!writeCheckNow.DIDCheckcheck)
                 SetspecificText(m_checkdid, LResource.Skip, Color.Yellow);
             if (!writeCheckNow.MacCheckcheck)
@@ -363,6 +364,8 @@ namespace MOKA_Factory_Tools
                 SHOPText.Text = LResource.Default;
                 SHOPText.BackColor = Color.Yellow;
             }
+            #endregion
+
             if (midListNow.host != "LocalPC")
             {
                 if ((!FunctionSettingNow.WriteWB) && (!writeDoneNow.AutoWhiteBalance))
@@ -1123,7 +1126,7 @@ namespace MOKA_Factory_Tools
             this.CaptionBackColorBottom = Color.Cyan;
             this.Refresh();
             /////////////////////////////////////////////////////////////
-            /// Set Write;
+            #region  Set Write;
             if (m_writeci.Text != LResource.Skip)
             {
                 m_writeci.Text = "Null";
@@ -1249,8 +1252,9 @@ namespace MOKA_Factory_Tools
                 m_writeEDIDName.Text = "Null";
                 m_writeEDIDName.BackColor = Color.Transparent;
             }
+            #endregion
             /////////////////////////////////////////////////////////////
-            /// Write Check;
+            #region Write Check;
             if (m_checkci.Text != LResource.Skip)
             {
                 m_checkci.Text = "Null";
@@ -1361,8 +1365,9 @@ namespace MOKA_Factory_Tools
                 m_checkACASKey.Text = "Null";
                 m_checkACASKey.BackColor = Color.Transparent;
             }
+            #endregion
             /////////////////////////////////////////////////////////////
-            /// Read Check;
+            #region  Read Check;
             if (m_readci.Text != LResource.Skip)
             {
                 m_readci.Text = "Null";
@@ -1493,7 +1498,8 @@ namespace MOKA_Factory_Tools
                 m_readACASKey.Text = "Null";
                 m_readACASKey.BackColor = Color.Transparent;
             }
-
+            #endregion
+            
             ResultStatus.Text = "Wait";
             ResultStatus.BackColor = Color.Transparent;