Эх сурвалжийг харах

Version 1.3.0.3
fix upload fail, test pass

Robert 2 жил өмнө
parent
commit
43032622c4

+ 2 - 2
FirmwareHeaderBuilder.cs

@@ -25,7 +25,7 @@ namespace Phihong_EVSE_UI_Tool
                 dataSegment3[i] = 0xFF;
             }
 
-            var Infy_PFC_PrimaryController_Type = new byte[] { 0x10, 0x00, 0x00, 0x10 };
+            var Lcm_Type = new byte[] { 0x10, 0x00, 0x00, 0x0F };
 
             // 0000h
             Array.Copy(modelNameArray, 0, dataSegment1, 0, modelNameArray.Length);
@@ -33,7 +33,7 @@ namespace Phihong_EVSE_UI_Tool
             byte[] imgLenBytes = GetImgLenBytes(imageDataArray);
             byte[] timeBytes = GetCreateTimeBytes();
             //Array.Copy(imageType.CodeArray, 0, dataSegment2, 0, 4);
-            Array.Copy(Infy_PFC_PrimaryController_Type, 0, dataSegment2, 0, 4);
+            Array.Copy(Lcm_Type, 0, dataSegment2, 0, 4);
             Array.Copy(imgLenBytes, 0, dataSegment2, 4, 4);
             Array.Copy(timeBytes, 0, dataSegment2, 8, 8);
             // 0002h

+ 2 - 2
Phihong EVSE UI Tool.csproj

@@ -182,8 +182,8 @@
     </None>
     <Resource Include="Required\0_DWIN_ASC.HZK" />
     <Resource Include="Required\12_HZK.BIN" />
-    <Resource Include="Required\13触控配置文件.bin" />
-    <Resource Include="Required\14变量配置文件.bin" />
+    <Resource Include="Required\13.bin" />
+    <Resource Include="Required\14.bin" />
     <Resource Include="Required\22_Config.bin" />
     <Resource Include="Required\24_Unicode_Roboto_18_22.dzk" />
     <Resource Include="Required\26_Unicode_Roboto_36_44.dzk" />

+ 2 - 2
Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 // 您可以指定所有的值,也可以使用 '*' 將組建和修訂編號
 // 設為預設,如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.3.0.3")]
+[assembly: AssemblyFileVersion("1.3.0.3")]

+ 0 - 0
Required/13触控配置文件.bin → Required/13.bin


+ 0 - 0
Required/14变量配置文件.bin → Required/14.bin


+ 2 - 2
SaveSdCard.xaml.cs

@@ -73,9 +73,9 @@ namespace Phihong_EVSE_UI_Tool
             }
 
             string modelName = uxModelNameTestBox.Text;
-            string zipFileName = string.Format("{0}_{1}.zip", modelName, DateTime.Now.ToString("yyyyMMddHHmmss"));
+            string zipFileName = string.Format("DWIN_SET_{0}_{1}.zip", modelName, DateTime.Now.ToString("yyyyMMddHHmmss"));
             string temZipPath = Path.Combine(Utility.ZIP_FILE_DIRECTORY, Utility.TEMP_ZIP_FILE_NAME);
-            ZipFile.CreateFromDirectory(Utility.ZIP_SOURCE_DIRECTORY, temZipPath);
+            ZipFile.CreateFromDirectory(Utility.ZIP_SOURCE_DIRECTORY, temZipPath, CompressionLevel.Fastest, true);
 
             string tempHeaderBuildedZipPath = Path.Combine(Utility.ZIP_FILE_DIRECTORY, zipFileName);
             FirmwareHeaderBuilder.AddFirmwareHeader(temZipPath, modelName, tempHeaderBuildedZipPath);

+ 2 - 2
Utility.cs

@@ -37,7 +37,7 @@ namespace Phihong_EVSE_UI_Tool
         public const string REQ_PARENTFOLDER = "Required";
         public static List<string> REQ_FILELIST = new List<string>()
         {
-            "0_DWIN_ASC.HZK", "12_HZK.BIN", "13触控配置文件.bin", "14变量配置文件.bin", "22_Config.bin",
+            "0_DWIN_ASC.HZK", "12_HZK.BIN", "13.bin", "14.bin", "22_Config.bin",
             "24_Unicode_Roboto_18_22.dzk", "26_Unicode_Roboto_36_44.dzk", "28_Unicode_Roboto_28_56.dzk",
             "30_Unicode_Roboto_14_28.dzk", "32_Unicode_Roboto_28_56.dzk", "CONFIG.txt"
         };
@@ -46,7 +46,7 @@ namespace Phihong_EVSE_UI_Tool
 
         public static readonly string OUTPUT_DIRECTORY = Environment.CurrentDirectory + @"\Output";
         public static readonly string CUSTOM_DIRECTORY = Environment.CurrentDirectory + @"\CustomTemp";
-        public static readonly string ZIP_SOURCE_DIRECTORY = Environment.CurrentDirectory + @"\ZipSource";
+        public static readonly string ZIP_SOURCE_DIRECTORY = Environment.CurrentDirectory + @"\DWIN_SET";
         public static readonly string ZIP_FILE_DIRECTORY = Environment.CurrentDirectory + @"\ZipFile";
 
         public static Dictionary<string, bool> ChangedFiles = new Dictionary<string, bool>()