轉傳FarewellMessage

EVCB_OCPP.WSServer/EVCB_OCPP.WSServer.csproj

@@ -12,6 +12,21 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -213,7 +228,18 @@
       <Name>SuperWebSocket.NET45</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.7.1">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.7.1 %28x86 和 x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>GitVersion.exe $(ProjectDir) /updateassemblyinfo</PreBuildEvent>

EVCB_OCPP.WSServer/Message/CoreProfileHandler.cs

@@ -314,10 +314,11 @@ namespace EVCB_OCPP.WSServer.Message
 
                                         if (registerCount > 0)
                                         {
-                                            string voltage_text = item.sampledValue.Where(x => x.measurand == Measurand.Voltage).Select(x => x.value).FirstOrDefault();
-                                            decimal voltage = decimal.Parse(voltage_text);
+                                            string voltage_text = item.sampledValue.Where(x => x.measurand == Measurand.Voltage).Select(x => x.value).FirstOrDefault();                                      
+                                            decimal voltage = decimal.Parse(voltage_text);                                           
                                             string current_text = item.sampledValue.Where(x => x.measurand == Measurand.Current_Import).Select(x => x.value).FirstOrDefault();
                                             decimal current = decimal.Parse(current_text);
+                                       
                                             decimal meterStart = 0;
                                             string energyRegister_text = item.sampledValue.Where(x => x.measurand == Measurand.Energy_Active_Import_Register).Select(x => x.value).FirstOrDefault();
                                             decimal energyRegister = decimal.Parse(energyRegister_text);
@@ -349,6 +350,7 @@ namespace EVCB_OCPP.WSServer.Message
                                         }
                                         foreach (var sampleVaule in item.sampledValue)
                                         {
+                                          
                                             decimal value = Convert.ToDecimal(sampleVaule.value);
 
                                             if (sampleVaule.context == ReadingContext.Sample_Periodic && sampleVaule.measurand == Measurand.Energy_Active_Import_Interval)
@@ -833,6 +835,7 @@ namespace EVCB_OCPP.WSServer.Message
                                     if (_confirm.status == DataTransferStatus.Accepted)
                                     {
                                         decimal couponPoint = 0m;
+                                        string farewellMessage = string.Empty;
                                         string receipt = string.Empty;
                                         List<ChargingBill> bill = new List<ChargingBill>();
                                         List<ChargingPrice> chargingPrices = new List<ChargingPrice>();
@@ -1049,9 +1052,7 @@ namespace EVCB_OCPP.WSServer.Message
 
                                                 if (jo.ContainsKey("FarewellMessage"))
                                                 {
-                                                    string _Message = jo["FarewellMessage"].Value<string>();
-
-
+                                                    farewellMessage = jo["FarewellMessage"].Value<string>();
                                                 }
                                             }
 
@@ -1086,7 +1087,8 @@ namespace EVCB_OCPP.WSServer.Message
                                                                         parkingFee = parkingCost,
                                                                         currency = currency,
                                                                         couponPoint = couponPoint,
-                                                                        accountBalance = accountBalance - tx.Cost
+                                                                        accountBalance = accountBalance - tx.Cost,
+                                                                        farewellMessage= farewellMessage
                                                                     })
                                                                 })
 

EVCB_OCPP.WSServer/Properties/AssemblyInfo.cs

@@ -35,4 +35,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyVersion("1.0.5.0")]
 [assembly: AssemblyFileVersion("1.0.5.0")]
 
-[assembly: AssemblyInformationalVersion("f9f2942")]
+[assembly: AssemblyInformationalVersion("b60c81a")]