1、kayla测试平台局部修改。2、FVP、DAK UI相关修改。

FactoryTool_CShare/Business/CommonMethod.cs

@@ -2392,7 +2392,8 @@ namespace MOKA_Factory_Tools
         {
             Dictionary<string, string> localInfo = new Dictionary<string,string>();
             // 本机信息;
-            localInfo.Add("factory_id_I", "TCL_Moka");
+            localInfo.Add("Item", "Value");
+            localInfo.Add("factory_id_I", "TCL");
             localInfo.Add("operator_I", Line);
             localInfo.Add("station_I", Station);
             localInfo.Add("fixture_id_I", "1_1");
@@ -2444,8 +2445,13 @@ namespace MOKA_Factory_Tools
                 {
                     hightpot = hightpot.Substring(pos+1);
                     pos = hightpot.IndexOf("mA");
-                    dic.Add("AC_I", hightpot.Substring(0, pos + 2));
-                    dic.Add("DC_R", hightpot.Substring(pos + 2));
+                    // 使用正规去除数字+小数点以外的字符;
+                    string AC = hightpot.Substring(0, pos + 2);
+                    string DC = hightpot.Substring(pos + 2);
+                    AC = System.Text.RegularExpressions.Regex.Replace(AC, @"[^\d.]*", "");
+                    DC = System.Text.RegularExpressions.Regex.Replace(DC, @"[^\d.]*", "");
+                    dic.Add("AC_I", AC);
+                    dic.Add("DC_R", DC);
                 }
                 else
                 {
@@ -2592,7 +2598,7 @@ namespace MOKA_Factory_Tools
                 {
                     Directory.CreateDirectory(AppDomain.CurrentDomain.BaseDirectory + "Kayla");
                 }
-                string savefile = string.Format("{0}Kayla\\{1}.csv", AppDomain.CurrentDomain.BaseDirectory, key.DSN.data);
+                string savefile = string.Format("{0}Kayla\\{1}.csv", AppDomain.CurrentDomain.BaseDirectory, sn);
                 using (System.IO.StreamWriter file = new System.IO.StreamWriter(savefile, false))
                 {
                     foreach (KeyValuePair<string, string> kvp in dic)

FactoryTool_CShare/Models/StructList.cs

@@ -320,7 +320,6 @@ namespace MOKA_Factory_Tools
         public string psn { get; set; }
         public string deviceCode { get; set; }
         public string mac { get; set; }
-
     }
 
     public class ReadCheck
@@ -352,6 +351,8 @@ namespace MOKA_Factory_Tools
         public bool EDIDModeNameReadcheck { get; set; }
         public bool ACASKeyReadcheck { get; set; }
         public bool ACASIDReadcheck { get; set; }
+        public bool FVPReadcheck { get; set; }
+        public bool DAKReadcheck { get; set; }
     }
 
     public class WriteCheck
@@ -377,6 +378,8 @@ namespace MOKA_Factory_Tools
         public bool DSNCheckcheck { get; set; }
         public bool YouTubeCheckcheck { get; set; }
         public bool ACASKeyCheckcheck { get; set; }
+        public bool FVPCheckcheck { get; set; }
+        public bool DAKCheckcheck { get; set; }
     }
 
     public class WriteDone
@@ -412,6 +415,8 @@ namespace MOKA_Factory_Tools
         public bool EDIDPIDWrite_YesNo { get; set; }
         public bool EDIDModeNameWrite_YesNo { get; set; }
         public bool ACASKeyWrite_YesNo { get; set; }
+        public bool FVPWrite_YesNo { get; set; }
+        public bool DAKWrite_YesNo { get; set; }
     }
 
     public class ErrorInfo

FactoryTool_CShare/Views/Main.cs

@@ -846,6 +846,8 @@ 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>();
+                ReadCheck1.FVPReadcheck = jObject["ReadCheck"]["FVP"] == null ? CommonMethod.InsertJsonConfig("ReadCheck", "FVP") : jObject["ReadCheck"]["FVP"].Value<bool>();
+                ReadCheck1.DAKReadcheck = jObject["ReadCheck"]["DAK"] == null ? CommonMethod.InsertJsonConfig("ReadCheck", "DAK") : jObject["ReadCheck"]["DAK"].Value<bool>();
                 #endregion
 
                 #region WriteCheck配置读取
@@ -870,7 +872,8 @@ 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>();
-                
+                WriteCheck1.FVPCheckcheck = jObject["WriteCheck"]["FVP"] == null ? CommonMethod.InsertJsonConfig("WriteCheck", "FVP") : jObject["WriteCheck"]["FVP"].Value<bool>();
+                WriteCheck1.DAKCheckcheck = jObject["WriteCheck"]["DAK"] == null ? CommonMethod.InsertJsonConfig("WriteCheck", "DAK") : jObject["WriteCheck"]["DAK"].Value<bool>();
                 #endregion
 
                 #region WriteDone配置读取
@@ -902,6 +905,8 @@ 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>();
+                WriteDone1.FVPWrite_YesNo = jObject["WriteDone"]["FVP"] == null ? CommonMethod.InsertJsonConfig("WriteDone", "FVP") : jObject["WriteDone"]["FVP"].Value<bool>();
+                WriteDone1.DAKWrite_YesNo = jObject["WriteDone"]["DAK"] == null ? CommonMethod.InsertJsonConfig("WriteDone", "DAK") : jObject["WriteDone"]["DAK"].Value<bool>();
                 #endregion
                 file.Close();
                 if (Custom_ProjectID != null)

FactoryTool_CShare/Views/OperationPanel.cs

@@ -192,7 +192,7 @@ namespace MOKA_Factory_Tools
             BaudText.BackColor = Color.FromArgb(128, 255, 128);
             WritePSN.Checked = FunctionSettingNow.BarcodeWrite;
 
-            #region 设置复选框默认状态;
+            #region 设置WriteCheck复选框默认状态;
             if (!writeCheckNow.DIDCheckcheck)
                 SetspecificText(m_checkdid, LResource.Skip, Color.Yellow);
             if (!writeCheckNow.MacCheckcheck)
@@ -235,6 +235,12 @@ namespace MOKA_Factory_Tools
                 SetspecificText(m_checkYouTube, LResource.Skip, Color.Yellow);
             if (!writeCheckNow.ACASKeyCheckcheck)
                 SetspecificText(m_checkACASKey, LResource.Skip, Color.Yellow);
+            if (!writeCheckNow.FVPCheckcheck)
+                SetspecificText(m_checkFVP, LResource.Skip, Color.Yellow);
+            if (!writeCheckNow.DAKCheckcheck)
+                SetspecificText(m_checkDAK, LResource.Skip, Color.Yellow);
+            #endregion
+            #region 设置ReadCheck复选框默认状态
             /////////////////////////////////////////////////////////////////
             if (!readCheckNow.PIDReadcheck)
                 SetspecificText(ProjectIDNote, LResource.SkipReadCheck, Color.Yellow);
@@ -290,6 +296,12 @@ namespace MOKA_Factory_Tools
                 SetspecificText(m_readACASKey, LResource.SkipChecking, Color.Yellow);
             if (FunctionSettingNow.ExportSNACASID)
                 SetspecificText(m_readACASID, LResource.SkipChecking, Color.Yellow);
+            if (!readCheckNow.FVPReadcheck)
+                SetspecificText(m_readFVP, LResource.SkipChecking, Color.Yellow);
+            if (!readCheckNow.DAKReadcheck)
+                SetspecificText(m_readDAK, LResource.SkipChecking, Color.Yellow);
+            #endregion
+            #region 设置WriteDone复选框默认状态
             /////////////////////////////////////////////////////////////////
             if (!writeDoneNow.PIDWrite_YesNo)
                 SetspecificText(ProjectIDNote, LResource.SkipCovering, Color.Yellow);
@@ -343,6 +355,10 @@ namespace MOKA_Factory_Tools
                 SetspecificText(m_writeEDIDName, LResource.Skip, Color.Yellow);
             if (!writeDoneNow.ACASKeyWrite_YesNo)
                 SetspecificText(m_writeACASKey, LResource.Skip, Color.Yellow);
+            if (!writeDoneNow.FVPWrite_YesNo)
+                SetspecificText(m_writeFVP, LResource.Skip, Color.Yellow);
+            if (!writeDoneNow.DAKWrite_YesNo)
+                SetspecificText(m_writeDAK, LResource.Skip, Color.Yellow);
             if (FunctionSettingNow.WriteChannel)
                 ChannelText.Text = FunctionSettingNow.ChannelList;
             else