【3.0.7.0】将波兰工厂DHA机制加入正式版本。

Licence.txt

@@ -3,7 +3,7 @@ moka tools
 //////////////////////////////////////
 //         Upgrade content:         // 
 //////////////////////////////////////
-Ver=3.0.5.9
-1.由于FiretvDSN业务接口由scbc-server迁移至IDManage，针对更新对应的GetFireTvDSN接口。
-2.抄写DSN订单时，自动启用条码限制功能，并将订单号作为关键字使用，且FSN要符合数字+大写字母的要求
+Ver=3.0.7.0
+1.将波兰工厂DHA机制加入正式版，通过Config.Json=>DHA开启。
+
 

Models/StructList.cs

@@ -212,8 +212,15 @@ namespace MOKA_Factory_Tools
         /// </summary>
         public string Station { get; set; } = "DataBurning";
 
-        #region 波兰工厂临时解决方案;
+        #region 波兰工厂DHA解决方案;
+        /// <summary>
+        /// DHA抄写完后等待完成时间;
+        /// </summary>
         public int CheckDHAWaitTime { get; set; } = 8000;
+        /// <summary>
+        /// 是否开启DHA功能,默认关闭;
+        /// </summary>
+        public bool DHA { get; set; } = false;
         #endregion
     }
 

Packagescript/setup without net40.nsi

@@ -4,7 +4,7 @@ ${StrRep}
 
 ; °²×°³ÌÐò³õʼ¶¨Òå³£Á¿
 !define PRODUCT_NAME "MOKA Factory Tools"
-!define PRODUCT_VERSION "3.0.6.9"
+!define PRODUCT_VERSION "3.0.7.0"
 !define PRODUCT_PUBLISHER "MOKA"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\MOKA Factory Tools.exe"
 !define UNINSTALL_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall"

Packagescript/setup.nsi

@@ -4,7 +4,7 @@ ${StrRep}
 
 ; °²×°³ÌÐò³õʼ¶¨Òå³£Á¿
 !define PRODUCT_NAME "MOKA Factory Tools"
-!define PRODUCT_VERSION "3.0.6.9"
+!define PRODUCT_VERSION "3.0.7.0"
 !define PRODUCT_PUBLISHER "MOKA"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\MOKA Factory Tools.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.6.9")]
+[assembly: AssemblyVersion("3.0.7.0")]
 [assembly: AssemblyFileVersion("1.0.0.1")]

Views/Main.cs

@@ -720,7 +720,7 @@ namespace MOKA_Factory_Tools
                     functionSetting1.NextCommandWaitTime = SerialCMD.NextCommandWaitTime = jObject["NextCommandWaitTime"].Value<int>();
                 }
 
-                #region 波兰工厂临时解决方案
+                #region 波兰工厂DHA解决方案
                 if (jObject["CheckDHAWaitTime"] == null)
                 {
                     SaveJsonConfig("CheckDHAWaitTime", functionSetting1.CheckDHAWaitTime);
@@ -729,6 +729,15 @@ namespace MOKA_Factory_Tools
                 {
                     functionSetting1.CheckDHAWaitTime = jObject["CheckDHAWaitTime"].Value<int>();
                 }
+
+                if (jObject["DHA"] == null)
+                {
+                    SaveJsonConfig("DHA", functionSetting1.DHA);
+                }
+                else
+                {
+                    functionSetting1.DHA = jObject["DHA"].Value<bool>();
+                }
                 #endregion
 
                 #region G客户NTF功能;

Views/OperationPanel.cs

@@ -4991,23 +4991,28 @@ namespace MOKA_Factory_Tools
                 }
             }
 
-#region 波兰工厂临时功能-抄写所有Key后执行Trigger和Check指令；
-            Log.WriteInfoLog("Start to Trigger DHA...");
-            if (SerialCMD.TriggerDHA(TVPort, out result, out data, out error, SerailDelay))
+#region 波兰工厂DHA功能-抄写所有Key后执行Trigger和Check指令；
+            if (FunctionSettingNow.DHA == true)
             {
-                Thread.Sleep(FunctionSettingNow.CheckDHAWaitTime);
-                Log.WriteInfoLog("Start to Check DHA...");
-                if (!SerialCMD.CheckDHA(TVPort, out result, out data, out error, SerailDelay))
+                Log.WriteInfoLog("Start to Trigger DHA...");
+                if (SerialCMD.TriggerDHA(TVPort, out result, out data, out error, SerailDelay))
                 {
-                    MessageBox.Show("Check DHA Fail!");
+                    Thread.Sleep(FunctionSettingNow.CheckDHAWaitTime);
+                    Log.WriteInfoLog("Start to Check DHA...");
+                    if (!SerialCMD.CheckDHA(TVPort, out result, out data, out error, SerailDelay))
+                    {
+                        ErrMsg = string.Format("{0} Check DHA Fail", SN);
+                        Log.WriteErrorLog(ErrMsg);
+                        goto end;
+                    }
+                }
+                else
+                {
+                    ErrMsg = string.Format("{0} Trigger DHA Fail", SN);
+                    Log.WriteErrorLog(ErrMsg);
                     goto end;
                 }
             }
-            else
-            {
-                MessageBox.Show("Trigger DHA Fail!");
-                goto end;
-            }
 #endregion
 
             //数据上传