Selaa lähdekoodia

新增TTE_Debug和TTE_Release解决方案,用于TTE工厂整机抄写的独立方案输出。

jianfeng1.wang 2 vuotta sitten
vanhempi
commit
85a482b722

+ 19 - 0
FactoryTool_CShare/MOKA Factory Tools.csproj

@@ -81,6 +81,25 @@
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TTE_Release|AnyCPU'">
+    <OutputPath>bin\TTE_Release\</OutputPath>
+    <DefineConstants>TRACE;TTE</DefineConstants>
+    <Optimize>true</Optimize>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>8.0</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TTE_Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\TTE_Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;TTE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>8.0</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CSkin, Version=16.1.14.3, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

+ 21 - 21
FactoryTool_CShare/Models/StructList.cs

@@ -647,29 +647,29 @@ namespace MOKA_Factory_Tools
     #region 小米FireTVKey;
     public class MIKey
     {
-        public string TVSN;
-        public string Batchnum;
-        public string UpdateUser;
-        public string UpdateTime;
-        public string FWVersion;
-        public string Model;
-        public string IsPrint;
-        public string FWVersion_2;
-        public string OPName;
-        public string TVMN;
-        public string EAN;
-        public string SKU;
-        public string DeviceID;
-        public string OPSN;
+        public string TVSN = "";
+        public string Batchnum = "";
+        public string UpdateUser = "";
+        public string UpdateTime = "";
+        public string FWVersion = "";
+        public string Model = "";
+        public string IsPrint = "";
+        public string FWVersion_2 = "";
+        public string OPName = "";
+        public string TVMN = "";
+        public string EAN = "";
+        public string SKU = "";
+        public string DeviceID = "";
+        public string OPSN = "";
         // 实际只抄写以下4项;
-        public string EthernetMac;        
-        public string BTMac;
-        public string WIFIMAC;
-        public string DSN;
+        public string EthernetMac = "";
+        public string BTMac = "";
+        public string WIFIMAC = "";
+        public string DSN = "";
         // 内置值;
-        public string _PSN;
-        public int _HDCP14;
-        public int _HDCP22;
+        public string _PSN = "";
+        public int _HDCP14 = 0;
+        public int _HDCP22 = 0;
     }
 
     public class ReportMIKey

+ 6 - 0
FactoryTool_CShare/SCBC Factory Tools.sln

@@ -11,6 +11,8 @@ Global
 		DownloadOnly|Any CPU = DownloadOnly|Any CPU
 		Release|Any CPU = Release|Any CPU
 		Simulation|Any CPU = Simulation|Any CPU
+		TTE_Debug|Any CPU = TTE_Debug|Any CPU
+		TTE_Release|Any CPU = TTE_Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{865D604D-3E42-401A-9E5D-AAC9D517A04C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -21,6 +23,10 @@ Global
 		{865D604D-3E42-401A-9E5D-AAC9D517A04C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{865D604D-3E42-401A-9E5D-AAC9D517A04C}.Simulation|Any CPU.ActiveCfg = Simulation|Any CPU
 		{865D604D-3E42-401A-9E5D-AAC9D517A04C}.Simulation|Any CPU.Build.0 = Simulation|Any CPU
+		{865D604D-3E42-401A-9E5D-AAC9D517A04C}.TTE_Debug|Any CPU.ActiveCfg = TTE_Debug|Any CPU
+		{865D604D-3E42-401A-9E5D-AAC9D517A04C}.TTE_Debug|Any CPU.Build.0 = TTE_Debug|Any CPU
+		{865D604D-3E42-401A-9E5D-AAC9D517A04C}.TTE_Release|Any CPU.ActiveCfg = TTE_Release|Any CPU
+		{865D604D-3E42-401A-9E5D-AAC9D517A04C}.TTE_Release|Any CPU.Build.0 = TTE_Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 6 - 5
FactoryTool_CShare/Views/OperationPanel.cs

@@ -4827,6 +4827,7 @@ namespace MOKA_Factory_Tools
                 _MiKey._PSN = DateTime.Now.ToString("yyyy-MM-dd-HH-mm:ss");
 #endif
 
+#if !TTE // 小米TTE工厂整机抄写,不需要Check以下key信息;
                 // CVT抄写: Hashkey、HDCP_KEY1.4、HDCP2.2_KEY、CI_PLUS_KEY、ECP_KEY、FVP
                 if (cfg_writecheck.HashCheckcheck ? !SerialCMD.CheckFireTVHashkey(TVPort, out result, out data, out error, SerailDelay) : false)
                 {
@@ -4862,7 +4863,7 @@ namespace MOKA_Factory_Tools
                     Log.WriteErrorLog(ErrMsg);
                     goto end;
                 }
-
+#endif
                 // 读取HDCP;
                 if (cfg_readcheck.HDCPReadcheck)
                 {
@@ -4914,7 +4915,7 @@ namespace MOKA_Factory_Tools
                 }
             }
 
-#region 波兰工厂DHA功能-抄写所有Key后执行Trigger和Check指令;
+                    #region 波兰工厂DHA功能-抄写所有Key后执行Trigger和Check指令;
             if (FunctionSettingNow.DHA == true)
             {
                 Log.WriteInfoLog("Start to Trigger DHA...");
@@ -4936,11 +4937,11 @@ namespace MOKA_Factory_Tools
                     goto end;
                 }
             }
-#endregion
+                    #endregion
 #endregion
 #endif
-            //数据上传
-            if (midListNow.host == "LocalPC" && !preloadNow)
+                    //数据上传
+                    if (midListNow.host == "LocalPC" && !preloadNow)
             {// 离线抄写
                 if (GetLocalKeyCount.DeleteLocalKeys(keypath, keyStream, keyReader))
                 {