V1.16.28

.gitignore

@@ -164,3 +164,6 @@ RecordExtractor/RecordExtractor/RecordExtractor.aps
 VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.26.zip
 RecordExtractor/Debug/RecordExtractor.exe
 VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.27.zip
+VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.28/
+VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.28.zip
+VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor.aps

VaporRecoveryMonitor/VaporRecoveryMonitor/Bin/rar.bat

@@ -1,17 +0,0 @@
-set Path=;"%~dp07z";%SystemRoot%\system32
-
-
-forfiles /p %~dp0log /s /m *.* /d -30 /c "cmd /c del @path"
-
-@echo off
-choice /t 10 /d y /n >nul
-
-forfiles /p "%~dp0log" /s /m "*.log" /d -1 /c "cmd /c 7z a  @file.zip @path"
-
-
-
-forfiles /p %~dp0log /s /m *.log /d -1 /c "cmd /c del @path"
-
-
-forfiles /p C:\TokHeim /m *.xls /d -30 /c "cmd /c del @path" 
-

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRecoveryMonitor.log

@@ -1,7 +1,11 @@
-Build started 2025/9/17 9:16:48.
+Build started 2025/9/29 11:10:52.
      1>Project "C:\bitbucket\apacsys-vaporrecoverymonitor_new\VaporRecoveryMonitor\VaporRecoveryMonitor\VaporRecoveryMonitor\VaporRecoveryMonitor.vcxproj" on node 2 (Build target(s)).
      1>ClCompile:
-         C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\CL.exe /c /I..\..\..\SDK\DuiLib /I..\VaporRecoveryMonitor /I..\..\..\cryptopp /Zi /nologo /W3 /WX- /sdl /Od /Oi /Oy- /GL /D WIN32 /D NDEBUG /D _WINDOWS /D _CRT_NONSTDC_NO_DEPRECATE /D _CRT_SECURE_NO_WARNINGS /D _USING_V110_SDK71_ /D _UNICODE /D UNICODE /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Yu"stdafx.h" /Fp"Release\VaporRecoveryMonitor.pch" /Fo"Release\\" /Fd"Release\vc120.pdb" /Gd /TP /analyze- /errorReport:prompt global.cpp
+         C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\CL.exe /c /I..\..\..\SDK\DuiLib /I..\VaporRecoveryMonitor /I..\..\..\cryptopp /Zi /nologo /W3 /WX- /sdl /Od /Oi /Oy- /GL /D WIN32 /D NDEBUG /D _WINDOWS /D _CRT_NONSTDC_NO_DEPRECATE /D _CRT_SECURE_NO_WARNINGS /D _USING_V110_SDK71_ /D _UNICODE /D UNICODE /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Yu"stdafx.h" /Fp"Release\VaporRecoveryMonitor.pch" /Fo"Release\\" /Fd"Release\vc120.pdb" /Gd /TP /analyze- /errorReport:prompt WebLink_GD_JY.cpp global.cpp
+         WebLink_GD_JY.cpp
+     1>WebLink_GD_JY.cpp(204): warning C4018: '<' : signed/unsigned mismatch
+     1>WebLink_GD_JY.cpp(271): warning C4018: '<' : signed/unsigned mismatch
+     1>WebLink_GD_JY.cpp(790): warning C4018: '<' : signed/unsigned mismatch
          global.cpp
      1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\SM4.h(290): warning C4101: 'szArray' : unreferenced local variable
      1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\SM4.h(315): warning C4101: 'i' : unreferenced local variable
@@ -153,4 +157,4 @@
 
 Build succeeded.
 
-Time Elapsed 00:00:12.39
+Time Elapsed 00:00:14.53

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/WebLink_GD_JY.cpp

@@ -890,8 +890,8 @@ void CWebLink_GD_JY::PackWebData_NozzleInfo(VR::WebData& webdata, nozzle_setting
 	char chDataID[7];
 	sprintf_s(chDataID, "%06d", webdata.ID);
 
-	char chTime[20];
-	get_current_time_symbol(chTime);
+	char chTime[15];
+	get_current_time(chTime);
 
 
 	string data = "";
@@ -903,7 +903,6 @@ void CWebLink_GD_JY::PackWebData_NozzleInfo(VR::WebData& webdata, nozzle_setting
 	}
 
 	data += "<ID>" + string(chID) + "</ID>";
-	data += "<DATE>" + string(chTime) + "</DATE>";
 	data += "<JYJID>" + to_string(ns.pump) + "</JYJID>";
 	data += "<JYQID>" + to_string(ns.id) + "</JYQID>";
 	data += "<FUELTYPE>" + fueltype + "</FUELTYPE>";

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/global.cpp

@@ -25,7 +25,7 @@
 
 using namespace VR::notify;
 
-string g_version = "V1.16.27";
+string g_version = "V1.16.28";
 
 
 int g_read_unuploadday = 31;	//程序开启时读未上传交易的天数 非特殊情况皆为31天