1.15.2

ApiTest/Properties/AssemblyInfo.cs

@@ -50,7 +50,7 @@ using System.Windows;
 //
 // 您可以指定所有的值，也可以使用 '*' 將組建和修訂編號
 // 設為預設，如下所示:
-// [assembly: AssemblyVersion("1.15.0.0")]
-[assembly: AssemblyVersion("1.15.0.0")]
-[assembly: AssemblyFileVersion("1.15.0.0")]
-[assembly: AssemblyInformationalVersion("35c3a1e")]
+// [assembly: AssemblyVersion("1.15.2.0")]
+[assembly: AssemblyVersion("1.15.2.0")]
+[assembly: AssemblyFileVersion("1.15.2.0")]
+[assembly: AssemblyInformationalVersion("bf6c517")]

AwInitilizer/Initializer.csproj

@@ -124,6 +124,7 @@
     <Compile Include="Procedure\FirmwareCheckVersionProcedure.cs" />
     <Compile Include="Procedure\FirmwareUploadProcedure.cs" />
     <Compile Include="Procedure\DsiableChargeAuthProcedure.cs" />
+    <Compile Include="Procedure\InternalTestProcedure.cs" />
     <Compile Include="Procedure\MacAddressLogProcedure.cs" />
     <Compile Include="Procedure\NetworkInterfaceSetupProcedure.cs" />
     <Compile Include="Procedure\VersionLogProcedure.cs" />

AwInitilizer/MainWindow.xaml.cs

@@ -786,7 +786,8 @@ namespace AwInitilizer
             List<ProcedureBase> procedures = new List<ProcedureBase>();
 
             //init intilize procedure list
-            //procedures.Add(new Procedure.BasicInfoUpdate.BasicInfoUpdateProcedure());
+            //procedures.Add(new Procedure.InternalTestProcedure.InternalTestProcedure());
+            procedures.Add(new Procedure.BasicInfoUpdate.BasicInfoUpdateProcedure());
             procedures.Add(new Procedure.FirmwareBundleUpload.FirmwareBundleUploadProcedure()
             {
                 Name = "PreFlash Firmware Upload",

AwInitilizer/Procedure/FirmwareBundleUploadProcedure.cs

@@ -205,9 +205,7 @@ namespace AwInitilizer.Procedure.FirmwareBundleUpload
                 .Where(x => !string.IsNullOrEmpty(x.FirmwareFileName))
                 .Select(x => x.FirmwareFileName)
                 .ToList();
-            MessageBox.Show(JsonConvert.SerializeObject(updateNameList));
             var uploadResult = await EvHttpClient.GetUploadfirmwareResultString(updateNameList);
-            MessageBox.Show(JsonConvert.SerializeObject(uploadResult));
             LogWriter.Log(uploadResult.Msg);
             return uploadResult.IsSuccess;
         }

AwInitilizer/Procedure/InternalTestProcedure.cs

@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace AwInitilizer.Procedure.InternalTestProcedure
+{
+    internal class InternalTestProcedure : ProcedureBase
+    {
+        private HintDialog hintDialog;
+
+        internal override async Task<bool> Run()
+        {
+            string btn, btnLang, imgUrl;
+            for (int btnInt = 0; btnInt < 4; btnInt++)
+            {
+                (btn, btnLang, imgUrl) = GetBtnParam(btnInt);
+
+                if (btnInt == 3)
+                {
+                    ShowEmergencyBtnPressRequestDialog(imgUrl);
+                }
+                else
+                {
+                    ShowBtnPressRequestDialog(btnLang, imgUrl);
+                }
+
+                await Task.Delay(5_000);
+                hintDialog?.Close();
+            }
+            return true;
+        }
+
+        private void ShowEmergencyBtnPressRequestDialog(string imgUrl)
+        {
+            ShowDialog(
+                string.Format(Resx.AppResources.EmergencyBtnPressPressHint),
+                Resx.AppResources.BtnPressHintTitle,
+                "", imgUrl, cancelAble: false);
+        }
+
+        private void ShowBtnPressRequestDialog(string btnLang, string imgUrl)
+        {
+            ShowDialog(
+                string.Format(Resx.AppResources.BtnPressPressHint, btnLang),
+                Resx.AppResources.BtnPressHintTitle,
+                "", imgUrl, cancelAble: false);
+        }
+        private void ShowDialog(string msg, string title, string btnText, string imgUrl, bool cancelAble)
+        {
+            hintDialog = new HintDialog();
+
+            hintDialog.Owner = Application.Current.MainWindow;
+
+            hintDialog.Message = msg;
+            hintDialog.Title = title;
+            hintDialog.IsCancelAble = cancelAble;
+            hintDialog.BtnText = btnText;
+            hintDialog.ImgPath = imgUrl;
+
+            if (cancelAble)
+            {
+                hintDialog.ShowDialog();
+            }
+            else
+            {
+                hintDialog.Show();
+            }
+        }
+
+        private (string btn, string btnLang, string imgUrl) GetBtnParam(int btnInt)
+        {
+            string btn, btnLang, imgUrl;
+            switch (btnInt)
+            {
+                case 0:
+                    btn = "Blue Button";
+                    btnLang = Resx.AppResources.BtnPressBlueBtn;
+                    imgUrl = "pack://application:,,,/AwInitilizer;component/Image/Blue.png";
+                    break;
+                case 1:
+                    btn = "Green Button";
+                    btnLang = Resx.AppResources.BtnPressGreenBtn;
+                    imgUrl = "pack://application:,,,/AwInitilizer;component/Image/Green.png";
+                    break;
+                case 2:
+                    btn = "Third Button";
+                    btnLang = Resx.AppResources.BtnPressThirdBtn;
+                    imgUrl = "";
+                    break;
+                case 3:
+                    btn = "EmergencyButton";
+                    btnLang = Resx.AppResources.BtnPressEmergencyBtn;
+                    imgUrl = "pack://application:,,,/AwInitilizer;component/Image/Emergency.png";
+                    break;
+                default:
+                    btn = "";
+                    btnLang = "";
+                    imgUrl = null;
+                    break;
+            };
+            return (btn, btnLang, imgUrl);
+        }
+    }
+}

AwInitilizer/Properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.15.0.0")]
-[assembly: AssemblyVersion("1.15.0.0")]
-[assembly: AssemblyFileVersion("1.15.0.0")]
-[assembly: AssemblyInformationalVersion("35c3a1e")]
+// [assembly: AssemblyVersion("1.15.2.0")]
+[assembly: AssemblyVersion("1.15.2.0")]
+[assembly: AssemblyFileVersion("1.15.2.0")]
+[assembly: AssemblyInformationalVersion("bf6c517")]

ConfigEditor/Properties/AssemblyInfo.cs

@@ -50,7 +50,7 @@ using System.Windows;
 //
 // 您可以指定所有的值，也可以使用 '*' 將組建和修訂編號
 // 設為預設，如下所示:
-// [assembly: AssemblyVersion("1.15.0.0")]
-[assembly: AssemblyVersion("1.15.0.0")]
-[assembly: AssemblyFileVersion("1.15.0.0")]
-[assembly: AssemblyInformationalVersion("35c3a1e")]
+// [assembly: AssemblyVersion("1.15.2.0")]
+[assembly: AssemblyVersion("1.15.2.0")]
+[assembly: AssemblyFileVersion("1.15.2.0")]
+[assembly: AssemblyInformationalVersion("bf6c517")]

CsuWebApiLib/Properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 //
 // 您可以指定所有的值，也可以使用 '*' 將組建和修訂編號
 // 設為預設，如下所示:
-// [assembly: AssemblyVersion("1.15.0.0")]
-[assembly: AssemblyVersion("1.15.0.0")]
-[assembly: AssemblyFileVersion("1.15.0.0")]
-[assembly: AssemblyInformationalVersion("35c3a1e")]
+// [assembly: AssemblyVersion("1.15.2.0")]
+[assembly: AssemblyVersion("1.15.2.0")]
+[assembly: AssemblyFileVersion("1.15.2.0")]
+[assembly: AssemblyInformationalVersion("bf6c517")]

Editor/Properties/AssemblyInfo.cs

@@ -50,7 +50,7 @@ using System.Windows;
 //
 // 您可以指定所有的值，也可以使用 '*' 將組建和修訂編號
 // 設為預設，如下所示:
-// [assembly: AssemblyVersion("1.15.0.0")]
-[assembly: AssemblyVersion("1.15.0.0")]
-[assembly: AssemblyFileVersion("1.15.0.0")]
-[assembly: AssemblyInformationalVersion("35c3a1e")]
+// [assembly: AssemblyVersion("1.15.2.0")]
+[assembly: AssemblyVersion("1.15.2.0")]
+[assembly: AssemblyFileVersion("1.15.2.0")]
+[assembly: AssemblyInformationalVersion("bf6c517")]

GitVersion.yml

@@ -1,6 +1,6 @@
 assembly-versioning-scheme: MajorMinorPatch
 assembly-informational-format: '{ShortSha}'
-next-version: 1.15.0
+next-version: 1.15.2
 branches: {}
 ignore:
   sha: []

InitializerModel/EvseSettingConfig.cs

@@ -210,6 +210,7 @@ namespace InitializerModel
                                 toReturn.ErrorFirmware = model.Module;
                                 return toReturn;
                             }
+                            model.FirmwareFileName = filePath;
                         }
                     }
                 }
@@ -249,6 +250,7 @@ namespace InitializerModel
                                 toReturn.ErrorFirmware = model.Module;
                                 return toReturn;
                             }
+                            model.FirmwareFileName = filePath;
                         }
                     }
                 }

InitializerModel/Properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 //
 // 您可以指定所有的值，也可以使用 '*' 將組建和修訂編號
 // 設為預設，如下所示:
-// [assembly: AssemblyVersion("1.15.0.0")]
-[assembly: AssemblyVersion("1.15.0.0")]
-[assembly: AssemblyFileVersion("1.15.0.0")]
-[assembly: AssemblyInformationalVersion("35c3a1e")]
+// [assembly: AssemblyVersion("1.15.2.0")]
+[assembly: AssemblyVersion("1.15.2.0")]
+[assembly: AssemblyFileVersion("1.15.2.0")]
+[assembly: AssemblyInformationalVersion("bf6c517")]

Initilizer/AssemblyInfo.cs

@@ -9,7 +9,7 @@
                                               // app, or any theme specific resource dictionaries)
 )]
 
-[assembly: AssemblyVersion("1.15.0.0")]
-[assembly: AssemblyFileVersion("1.15.0.0")]
-[assembly: AssemblyInformationalVersion("35c3a1e")]
+[assembly: AssemblyVersion("1.15.2.0")]
+[assembly: AssemblyFileVersion("1.15.2.0")]
+[assembly: AssemblyInformationalVersion("bf6c517")]
 

MesAdaptor/Properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.15.0.0")]
-[assembly: AssemblyVersion("1.15.0.0")]
-[assembly: AssemblyFileVersion("1.15.0.0")]
-[assembly: AssemblyInformationalVersion("35c3a1e")]
+// [assembly: AssemblyVersion("1.15.2.0")]
+[assembly: AssemblyVersion("1.15.2.0")]
+[assembly: AssemblyFileVersion("1.15.2.0")]
+[assembly: AssemblyInformationalVersion("bf6c517")]