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

Add other required files and saving logics, Change background of complete page

Snoopy 4 жил өмнө
parent
commit
65e6b26db5

BIN
Background/8_complete.bmp


+ 11 - 1
Phihong EVSE UI Tool.csproj

@@ -178,6 +178,16 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </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\22_Config.bin" />
+    <Resource Include="Required\24_Unicode_Roboto_18_22.dzk" />
+    <Resource Include="Required\26_Unicode_Roboto_36_44.dzk" />
+    <Resource Include="Required\28_Unicode_Roboto_28_56.dzk" />
+    <Resource Include="Required\30_Unicode_Roboto_14_28.dzk" />
+    <Resource Include="Required\32_Unicode_Roboto_28_56.dzk" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
@@ -195,7 +205,7 @@
     <Resource Include="Background\9_fix.bmp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Output\" />
+    <Resource Include="Required\CONFIG.txt" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="ICO\60.ICO" />

BIN
Required/0_DWIN_ASC.HZK


BIN
Required/12_HZK.BIN


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

@@ -0,0 +1 @@
+��

BIN
Required/14变量配置文件.bin


BIN
Required/22_Config.bin


BIN
Required/24_Unicode_Roboto_18_22.dzk


BIN
Required/26_Unicode_Roboto_36_44.dzk


BIN
Required/28_Unicode_Roboto_28_56.dzk


BIN
Required/30_Unicode_Roboto_14_28.dzk


BIN
Required/32_Unicode_Roboto_28_56.dzk


+ 7 - 0
Required/CONFIG.txt

@@ -0,0 +1,7 @@
+R1=07      ;波特率,07=115200
+R2=04      ;Sys_CFG
+R3=5A      ;
+RA=A5      ;
+STOP_DWIN_OS;
+RC=00      ;
+

+ 1 - 1
SaveSdCard.xaml

@@ -31,7 +31,7 @@
                     <RadioButton x:Name="uxSaveChangedRadioButton" Tag="Save" GroupName="saveSelect" Style="{StaticResource MaterialDesignRadioButton}" 
                                  Background="{Binding Path=(fd:AccentColors.ImmersiveSystemAccentBrush)}">Save changed files</RadioButton>
                 </StackPanel>
-                <StackPanel Orientation="Horizontal" Margin="22,6,480,12">
+                <StackPanel Orientation="Horizontal" Margin="22,6,350,12">
                     <Button Tag="Save" Content="Save" HorizontalAlignment="Left" Width="90" Height="35"
                             Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click" Foreground="Black"/>
                     <TextBlock x:Name="uxMessageTextBlock" VerticalAlignment="Center" Margin="18,0,0,0"

+ 9 - 3
SaveSdCard.xaml.cs

@@ -54,16 +54,22 @@ namespace Phihong_EVSE_UI_Tool
                           Path.Combine(sdFolderPath, Utility.SDCARD_SUBDIR, fileName), true);
             }
 
+            foreach (string resName in Utility.REQ_FILELIST)
+            {
+                Uri srcPath = new Uri(Path.Combine(Utility.REQ_PARENTFOLDER, resName), UriKind.Relative);
+                Utility.CopyFileFromResource(srcPath, Path.Combine(sdFolderPath, Utility.SDCARD_SUBDIR, resName));
+            }
+
             switch (toBeSavedFiles.Count())
             {
                 case 0:
-                    uxMessageTextBlock.Text = "Saved no file";
+                    uxMessageTextBlock.Text = "Saved no image and 11 required files to SD card";
                     break;
                 case 1:
-                    uxMessageTextBlock.Text = "Saved 1 file to SD card";
+                    uxMessageTextBlock.Text = "Saved 1 image and 11 required files to SD card";
                     break;
                 default:
-                    uxMessageTextBlock.Text = "Saved " + toBeSavedFiles.Count() + " files to SD card";
+                    uxMessageTextBlock.Text = "Saved " + toBeSavedFiles.Count() + " images and 11 required files to SD card";
                     break;
             }
 

+ 10 - 4
Utility.cs

@@ -10,8 +10,7 @@ namespace Phihong_EVSE_UI_Tool
 {
     public static class Utility
     {
-        public const string BG_PARENTFOLDER = @"Background";
-
+        public const string BG_PARENTFOLDER = "Background";
         public const string BG_INITIAL = "0_init.bmp";
         public const string BG_IDLE = "1_idle.bmp";
         public const string BG_VERIFY = "2_verify.bmp";
@@ -23,12 +22,19 @@ namespace Phihong_EVSE_UI_Tool
         public const string BG_COMPLETE = "8_complete.bmp";
         public const string BG_MAINTAIN = "9_fix.bmp";
 
-        public const string ICO_PARENTFOLDER = @"ICO";
-
+        public const string ICO_PARENTFOLDER = "ICO";
         public const string ICO_NAME = "60.ICO";
         public const string ICO_MAINLOGO = "10.bmp";
         public const string ICO_COMPLETELOGO = "62.bmp";
 
+        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",
+            "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"
+        };
+
         public const string SDCARD_SUBDIR = "DWIN_SET";
 
         public static readonly string OUTPUT_DIRECTORY = Environment.CurrentDirectory + @"\Output";