V1.16.15

.gitignore

@@ -132,3 +132,6 @@ VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统
 EncryptionTool/EncryptionTool/EncryptionTool.aps
 VaporRecoveryMonitor/VaporRecoveryMonitor/ipch/vaporrecoverymonitor-6bc03541/vaporrecoverymonitor-a4cbcf05.ipch
 *.ipch
+VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.15/
+VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.14.zip
+VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.15.zip

SensorDataSimulator/Release/conn.ini

@@ -1,6 +1,6 @@
 [Config]
 val232_0=08 ff
-val232_1=08 86
+val232_1=08 46
 val232_2=08 16
 val232_3=08 16
 val232_4=02 c1
@@ -8,7 +8,7 @@ val232_5=02 b1
 val232_6=02 b1
 val232_7=08 14
 val232_8=02 b1
-PORT_232=22
+PORT_232=11
 PORT_485=
 val485_Addr1=10
 val485_Value1=00 00 00 01

VRC36LogProcessor/.vs/VRC36LogProcessor/v17/DocumentLayout.json

@@ -0,0 +1,12 @@
+{
+  "Version": 1,
+  "WorkspaceRootPath": "C:\\bitbucket\\apacsys-vaporrecoverymonitor_new\\VRC36LogProcessor\\",
+  "Documents": [],
+  "DocumentGroupContainers": [
+    {
+      "Orientation": 0,
+      "VerticalTabListWidth": 256,
+      "DocumentGroups": []
+    }
+  ]
+}

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRecoveryMonitor.log

@@ -1,535 +1,20 @@
-Build started 2025/5/12 11:11:41.
+Build started 2025/5/29 10:14:32.
      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 /Yc"stdafx.h" /Fp"Release\VaporRecoveryMonitor.pch" /Fo"Release\\" /Fd"Release\vc120.pdb" /Gd /TP /analyze- /errorReport:prompt stdafx.cpp
-         stdafx.cpp
-         automatic-linking to duilib...
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_common.h(365): warning C4091: 'typedef ' : ignored on left of 'VR::protocol::msg_cmd4_callback' when no variable is declared
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_common.h(405): warning C4091: 'typedef ' : ignored on left of 'VR::protocol::msg_callback_day_send' when no variable is declared
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_common.h(416): warning C4091: 'typedef ' : ignored on left of 'VR::protocol::msg_callback_day_recv' when no variable is declared
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_common.h(425): warning C4091: 'typedef ' : ignored on left of 'VR::protocol::msg_callback_day_respond' when no variable is declared
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_common.h(535): warning C4091: 'typedef ' : ignored on left of 'VR::notify::upload_data' when no variable is declared
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_common.h(874): warning C4091: 'typedef ' : ignored on left of 'VR::settings::engine_setting' when no variable is declared
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\Report.h(228): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\global.h(1144): warning C4018: '>=' : signed/unsigned mismatch
-         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 AES.cpp base64.cpp BigScreenMonitor.cpp CommObject.cpp DataBackup.cpp des.cpp ErrorDlg.cpp ErrorInfoDlg.cpp GasDetailDlg.cpp GasManage.cpp global.cpp https.cpp instance.cpp jsoncpp.cpp LiquidDetailDlg.cpp md5.cpp MySeries.cpp MyXML.cpp PressureDetailDlg.cpp SM3.cpp SM4.cpp TankManage.cpp TemperatureDetailDlg.cpp tool.cpp UploadData.cpp UploadDetailDlg.cpp VRCObject.cpp vr_app.cpp sqlite3_engine.cpp vr_common.cpp vr_db.cpp vr_devices.cpp vr_ext.cpp vr_webservice.cpp WebLink.cpp WebLink_AH_HF.cpp WebLink_BJ.cpp WebLink_BJ_ZSH.cpp WebLink_CQ.cpp WebLink_CQ_2.cpp WebLink_FJ_XM.cpp WebLink_FS.cpp WebLink_FS_NH.cpp WebLink_GD_DG.cpp WebLink_GD_GZ.cpp WebLink_GD_HZ.cpp WebLink_GD_JM.cpp WebLink_GD_JY.cpp WebLink_GD_QY.cpp WebLink_GD_ST.cpp WebLink_GD_SZ.cpp WebLink_GD_YF.cpp WebLink_GD_YJ.cpp WebLink_GD_ZH.cpp WebLink_GD_ZJ.cpp WebLink_GD_ZSH.cpp WebLink_GD_ZS_ZH.cpp WebLink_HB_TS.cpp WebLink_HB_WH.cpp WebLink_HB_ZJK.cpp WebLink_HN.cpp WebLink_HN_CS.cpp WebLink_FSSD.cpp WebLink_Middleware.cpp WebLink_NJ.cpp WebLink_NMG_HHHT.cpp WebLink_NX.cpp WebLink_SC_CD.cpp WebLink_SD.cpp WebLink_SD_YT.cpp WebLink_SY.cpp WebLink_Test1.cpp WebLink_ZHDDE.cpp WebLink_ZJ.cpp WebLink_ZJ_GS.cpp WebLink_ZJ_NB.cpp WebLink_ZJ_SY.cpp WebLink_ZJ_TZ.cpp WebLink_ZJ_WZ.cpp WebLink_ZJ_ZSH.cpp _io.cpp vr_object.cpp vr_server.cpp vr_ui.cpp
-         AES.cpp
-     1>AES.cpp(1059): warning C4018: '<' : signed/unsigned mismatch
-     1>AES.cpp(1070): warning C4018: '<' : signed/unsigned mismatch
-     1>AES.cpp(1081): warning C4018: '<' : signed/unsigned mismatch
-     1>AES.cpp(1102): warning C4018: '<' : signed/unsigned mismatch
-     1>AES.cpp(1113): warning C4018: '<' : signed/unsigned mismatch
-     1>AES.cpp(1125): warning C4018: '<' : signed/unsigned mismatch
-         base64.cpp
-         BigScreenMonitor.cpp
-         CommObject.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\VRCObject.h(9): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\CommObject.h(7) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(7): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(9) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>CommObject.cpp(82): warning C4018: '<' : signed/unsigned mismatch
-         DataBackup.cpp
-     1>DataBackup.cpp(50): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-         des.cpp
-         ErrorDlg.cpp
-         ErrorInfoDlg.cpp
-         GasDetailDlg.cpp
-         GasManage.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>GasManage.cpp(86): warning C4018: '>' : signed/unsigned mismatch
-     1>GasManage.cpp(96): warning C4018: '<' : signed/unsigned mismatch
-     1>GasManage.cpp(127): warning C4018: '<' : signed/unsigned mismatch
-     1>GasManage.cpp(170): warning C4018: '>' : signed/unsigned mismatch
-     1>GasManage.cpp(216): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>GasManage.cpp(225): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>GasManage.cpp(234): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>GasManage.cpp(242): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-         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
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\SM4.h(527): warning C4101: 'pbIV_pre' : unreferenced local variable
-     1>global.cpp(377): warning C4018: '<' : signed/unsigned mismatch
-     1>global.cpp(391): warning C4018: '<' : signed/unsigned mismatch
-     1>global.cpp(404): warning C4018: '<' : signed/unsigned mismatch
-     1>global.cpp(437): warning C4018: '<' : signed/unsigned mismatch
-     1>global.cpp(475): warning C4018: '<' : signed/unsigned mismatch
-     1>global.cpp(522): warning C4101: 'i' : unreferenced local variable
-     1>global.cpp(650): warning C4244: 'return' : conversion from 'uint64_t' to 'double', possible loss of data
-     1>global.cpp(659): warning C4101: 'Free' : unreferenced local variable
-     1>global.cpp(659): warning C4101: 'Available' : unreferenced local variable
-     1>global.cpp(1028): warning C4018: '<' : signed/unsigned mismatch
-     1>global.cpp(1050): warning C4018: '<' : signed/unsigned mismatch
-     1>global.cpp(1076): warning C4018: '<' : signed/unsigned mismatch
-         https.cpp
-     1>https.cpp(46): warning C4244: 'argument' : conversion from '__int64' to 'SOCKET', possible loss of data
-     1>https.cpp(62): warning C4244: 'argument' : conversion from '__int64' to 'SOCKET', possible loss of data
-     1>https.cpp(63): warning C4244: 'argument' : conversion from '__int64' to 'SOCKET', possible loss of data
-     1>https.cpp(135): warning C4244: 'argument' : conversion from '__int64' to 'int', possible loss of data
-     1>https.cpp(363): warning C4244: 'argument' : conversion from '__int64' to 'SOCKET', possible loss of data
-     1>https.cpp(378): warning C4244: 'argument' : conversion from '__int64' to 'SOCKET', possible loss of data
-     1>https.cpp(379): warning C4244: 'argument' : conversion from '__int64' to 'SOCKET', possible loss of data
-     1>https.cpp(393): warning C4244: 'argument' : conversion from '__int64' to 'SOCKET', possible loss of data
-         instance.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\VRCObject.h(9): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\CommObject.h(7) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(7): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(9) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>instance.cpp(404): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
-     1>instance.cpp(409): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
-     1>instance.cpp(414): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
-     1>instance.cpp(419): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
-         jsoncpp.cpp
-     1>jsoncpp.cpp(270): warning C4005: '_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES' : macro redefinition
-                 C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\crtdefs.h(421) : see previous definition of '_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES'
-     1>jsoncpp.cpp(3959): warning C4018: '<' : signed/unsigned mismatch
-         LiquidDetailDlg.cpp
-         md5.cpp
-     1>md5.cpp(142): warning C4244: 'argument' : conversion from 'std::streamsize' to 'size_t', possible loss of data
-         MySeries.cpp
-         MyXML.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\MyXML.h(36): warning C4018: '<' : signed/unsigned mismatch
-         PressureDetailDlg.cpp
-         SM3.cpp
-         Compiling...
-         SM4.cpp
-         TankManage.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>TankManage.cpp(124): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(162): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(168): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(172): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(301): warning C4018: '>' : signed/unsigned mismatch
-     1>TankManage.cpp(314): warning C4018: '<' : signed/unsigned mismatch
-     1>TankManage.cpp(348): warning C4018: '<' : signed/unsigned mismatch
-     1>TankManage.cpp(398): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(402): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(406): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(410): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(414): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(420): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(424): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(428): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(432): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(437): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(441): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(445): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(449): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(453): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(457): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(461): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(465): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(469): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(473): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(477): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(481): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(485): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(489): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(493): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(497): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(501): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>TankManage.cpp(505): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-         TemperatureDetailDlg.cpp
-         tool.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>tool.cpp(558): warning C4242: '=' : conversion from 'int' to 'char', possible loss of data
-     1>tool.cpp(692): warning C4804: '<=' : unsafe use of type 'bool' in operation
-     1>tool.cpp(695): warning C4018: '>=' : signed/unsigned mismatch
-         UploadData.cpp
-         UploadDetailDlg.cpp
-         VRCObject.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\CommObject.h(6): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\VRCObject.h(10) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(7): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(9) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>VRCObject.cpp(92): warning C4018: '<' : signed/unsigned mismatch
-         vr_app.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\MyXML.h(36): warning C4018: '<' : signed/unsigned mismatch
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\VRCObject.h(9): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\CommObject.h(7) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(7): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(9) : see declaration of 'SocketPackage'
-     1>vr_app.cpp(809): warning C4928: illegal copy-initialization; more than one user-defined conversion has been implicitly applied
-                 while calling the constructor 'std::basic_string<wchar_t,std::char_traits<wchar_t>,std::allocator<wchar_t>>::basic_string(const _Elem *)'
-                 with
-                 [
-                     _Elem=wchar_t
-                 ]
-                 C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\xstring(778) : see declaration of 'std::basic_string<wchar_t,std::char_traits<wchar_t>,std::allocator<wchar_t>>::basic_string'
-     1>vr_app.cpp(1504): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_app.cpp(1585): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_app.cpp(1597): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_app.cpp(1611): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_app.cpp(1626): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_app.cpp(1638): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1669): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_app.cpp(1671): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1701): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1710): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1718): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1726): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1737): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1747): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1759): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(1769): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_app.cpp(2389): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_app.cpp(2482): warning C4302: 'type cast' : truncation from 'LPWSTR' to 'WORD'
-     1>vr_app.cpp(2835): warning C4172: returning address of local variable or temporary
-     1>vr_app.cpp(2836): warning C4172: returning address of local variable or temporary
-     1>vr_app.cpp(2940): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_app.cpp(3260): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_app.cpp(3629): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_app.cpp(4142): warning C4242: '=' : conversion from 'int' to 'byte', possible loss of data
-     1>vr_app.cpp(4270): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_app.cpp(4328): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_app.cpp(5056): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_app.cpp(5306): warning C4018: '<' : signed/unsigned mismatch
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\rapidxml_utils.hpp(40): warning C4244: 'initializing' : conversion from 'std::streamoff' to 'size_t', possible loss of data
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\rapidxml_utils.hpp(28) : while compiling class template member function 'rapidxml::file<char>::file(const char *)'
-                 vr_app.cpp(3356) : see reference to function template instantiation 'rapidxml::file<char>::file(const char *)' being compiled
-                 vr_app.cpp(3356) : see reference to class template instantiation 'rapidxml::file<char>' being compiled
-     1>C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\xtree(836): warning C4503: 'std::_Tree<std::_Tmap_traits<_Kty,_Ty,_Pr,_Alloc,false>>::_Insert_hint' : decorated name length exceeded, name was truncated
-                 with
-                 [
-                     _Kty=int
-         ,            _Ty=std::map<std::string,std::vector<VR::notify::daily_report_record_updated,std::allocator<VR::notify::daily_report_record_updated>>,std::less<std::string>,std::allocator<std::pair<const std::string,std::vector<VR::notify::daily_report_record_updated,std::allocator<VR::notify::daily_report_record_updated>>>>>
-         ,            _Pr=std::less<int>
-         ,            _Alloc=std::allocator<std::pair<const int,std::map<std::string,std::vector<VR::notify::daily_report_record_updated,std::allocator<VR::notify::daily_report_record_updated>>,std::less<std::string>,std::allocator<std::pair<const std::string,std::vector<VR::notify::daily_report_record_updated,std::allocator<VR::notify::daily_report_record_updated>>>>>>>
-                 ]
-         sqlite3_engine.cpp
-         vr_common.cpp
-         vr_db.cpp
-     1>vr_db.cpp(587): warning C4244: '=' : conversion from 'double' to 'float', possible loss of data
-     1>vr_db.cpp(651): warning C4244: '=' : conversion from 'double' to 'float', possible loss of data
-     1>vr_db.cpp(792): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_db.cpp(792): warning C4018: '<' : signed/unsigned mismatch
-         vr_devices.cpp
-         vr_ext.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\VRCObject.h(9): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\CommObject.h(7) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(7): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(9) : see declaration of 'SocketPackage'
-     1>vr_ext.cpp(542): warning C4101: 'time' : unreferenced local variable
-     1>vr_ext.cpp(568): warning C4101: 'time' : unreferenced local variable
-     1>vr_ext.cpp(812): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ext.cpp(827): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ext.cpp(889): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ext.cpp(1309): warning C4244: 'initializing' : conversion from 'double' to 'float', possible loss of data
-     1>vr_ext.cpp(1412): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_ext.cpp(1651): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ext.cpp(1846): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ext.cpp(1998): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_ext.cpp(2063): warning C4244: 'argument' : conversion from 'double' to 'int', possible loss of data
-     1>vr_ext.cpp(2065): warning C4244: 'argument' : conversion from 'double' to 'int', possible loss of data
-     1>vr_ext.cpp(2067): warning C4244: 'argument' : conversion from 'double' to 'int', possible loss of data
-     1>vr_ext.cpp(2069): warning C4244: 'argument' : conversion from 'double' to 'int', possible loss of data
-     1>vr_ext.cpp(2165): warning C4191: 'type cast' : unsafe conversion from 'FARPROC' to 'ADDPROC'
-                 Calling this function through the result pointer may cause your program to fail
-     1>vr_ext.cpp(4815): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ext.cpp(4915): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ext.cpp(5317): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ext.cpp(5629): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_ext.cpp(5662): warning C4244: '=' : conversion from 'double' to 'UINT', possible loss of data
-     1>vr_ext.cpp(5683): warning C4242: '=' : conversion from 'int' to 'BYTE', possible loss of data
-     1>vr_ext.cpp(5957): warning C4018: '<' : signed/unsigned mismatch
+         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 vr_webservice.cpp
          vr_webservice.cpp
-     1>vr_webservice.cpp(744): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_webservice.cpp(4328): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_webservice.cpp(4356): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_webservice.cpp(4618): warning C4244: 'initializing' : conversion from 'double' to 'float', possible loss of data
-     1>vr_webservice.cpp(4664): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
-     1>vr_webservice.cpp(4665): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
-     1>vr_webservice.cpp(4666): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
-     1>vr_webservice.cpp(4667): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
-     1>vr_webservice.cpp(6145): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_webservice.cpp(6173): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_webservice.cpp(6632): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_webservice.cpp(6660): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-         WebLink.cpp
-     1>WebLink.cpp(75): warning C4101: 'time' : unreferenced local variable
-         WebLink_AH_HF.cpp
-     1>WebLink_AH_HF.cpp(160): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_AH_HF.cpp(426): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_AH_HF.cpp(625): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_BJ.cpp
-     1>WebLink_BJ.cpp(167): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_BJ.cpp(466): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_BJ.cpp(664): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_BJ_ZSH.cpp
-     1>WebLink_BJ_ZSH.cpp(246): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_BJ_ZSH.cpp(577): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_BJ_ZSH.cpp(821): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_CQ.cpp
-     1>WebLink_CQ.cpp(168): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_CQ.cpp(452): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_CQ_2.cpp
-     1>WebLink_CQ_2.cpp(184): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_CQ_2.cpp(1192): warning C4018: '<' : signed/unsigned mismatch
-         Compiling...
-         WebLink_FJ_XM.cpp
-         WebLink_FS.cpp
-     1>WebLink_FS.cpp(175): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS.cpp(188): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS.cpp(191): warning C4101: 'warn' : unreferenced local variable
-     1>WebLink_FS.cpp(515): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS.cpp(764): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_FS_NH.cpp
-     1>WebLink_FS_NH.cpp(69): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(348): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(501): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(742): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(1152): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(1229): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(1304): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(1331): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(1474): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(1639): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FS_NH.cpp(1805): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_DG.cpp
-     1>WebLink_GD_DG.cpp(180): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_DG.cpp(612): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_DG.cpp(796): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_GZ.cpp
-     1>WebLink_GD_GZ.cpp(214): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_GZ.cpp(521): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_GZ.cpp(794): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_HZ.cpp
-     1>WebLink_GD_HZ.cpp(65): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(342): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(682): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(923): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(1333): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(1410): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(1485): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(1512): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(1655): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(1790): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_HZ.cpp(2114): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_JM.cpp
-     1>WebLink_GD_JM.cpp(175): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_JM.cpp(466): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_JM.cpp(664): warning C4018: '<' : signed/unsigned mismatch
-         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
-         WebLink_GD_QY.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_QY.cpp(204): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_QY.cpp(600): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_QY.cpp(889): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_ST.cpp
-     1>WebLink_GD_ST.cpp(179): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ST.cpp(810): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_SZ.cpp
-     1>WebLink_GD_SZ.cpp(177): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_SZ.cpp(767): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_SZ.cpp(951): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_YF.cpp
-     1>WebLink_GD_YF.cpp(152): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(197): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(543): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(751): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(1169): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(1242): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(1311): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(1336): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(1450): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(1629): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YF.cpp(1776): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_YJ.cpp
-     1>WebLink_GD_YJ.cpp(203): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YJ.cpp(275): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_YJ.cpp(799): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_ZH.cpp
-     1>WebLink_GD_ZH.cpp(178): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZH.cpp(595): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZH.cpp(779): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_ZJ.cpp
-     1>WebLink_GD_ZJ.cpp(203): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZJ.cpp(275): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZJ.cpp(799): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_GD_ZSH.cpp
-     1>WebLink_GD_ZSH.cpp(336): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZSH.cpp(685): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZSH.cpp(854): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZSH.cpp(1120): warning C4018: '>' : signed/unsigned mismatch
-     1>WebLink_GD_ZSH.cpp(1121): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZSH.cpp(1121): warning C4018: '>' : signed/unsigned mismatch
-     1>WebLink_GD_ZSH.cpp(1275): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-     1>WebLink_GD_ZSH.cpp(1279): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
-         WebLink_GD_ZS_ZH.cpp
-     1>WebLink_GD_ZS_ZH.cpp(65): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(342): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(682): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(923): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(1333): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(1410): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(1485): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(1512): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(1655): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(1776): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_ZS_ZH.cpp(2100): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_HB_TS.cpp
-     1>WebLink_HB_TS.cpp(166): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HB_TS.cpp(457): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HB_TS.cpp(630): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_HB_WH.cpp
-     1>WebLink_HB_WH.cpp(180): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HB_WH.cpp(612): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HB_WH.cpp(796): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_HB_ZJK.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HB_ZJK.cpp(186): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HB_ZJK.cpp(712): warning C4018: '<' : signed/unsigned mismatch
-         Compiling...
-         WebLink_HN.cpp
-     1>WebLink_HN.cpp(167): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HN.cpp(454): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HN.cpp(689): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_HN_CS.cpp
-     1>WebLink_HN_CS.cpp(160): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HN_CS.cpp(426): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_HN_CS.cpp(625): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_FSSD.cpp
-     1>WebLink_FSSD.cpp(172): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FSSD.cpp(471): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_FSSD.cpp(726): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_Middleware.cpp
-     1>WebLink_Middleware.cpp(268): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_Middleware.cpp(552): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_Middleware.cpp(778): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_NJ.cpp
-     1>WebLink_NJ.cpp(60): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NJ.cpp(363): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_NMG_HHHT.cpp
-     1>WebLink_NMG_HHHT.cpp(164): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NMG_HHHT.cpp(286): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NMG_HHHT.cpp(506): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NMG_HHHT.cpp(665): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NMG_HHHT.cpp(832): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NMG_HHHT.cpp(904): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NMG_HHHT.cpp(974): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_NX.cpp
-     1>WebLink_NX.cpp(150): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NX.cpp(328): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NX.cpp(494): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NX.cpp(651): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NX.cpp(844): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_NX.cpp(1011): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_SC_CD.cpp
-     1>WebLink_SC_CD.cpp(150): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_SC_CD.cpp(327): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_SC_CD.cpp(493): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_SC_CD.cpp(649): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_SC_CD.cpp(844): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_SC_CD.cpp(1011): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_SD.cpp
-     1>WebLink_SD.cpp(244): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_SD.cpp(324): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_SD_YT.cpp
-     1>WebLink_SD_YT.cpp(173): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_SY.cpp
-     1>WebLink_SY.cpp(267): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_Test1.cpp
-     1>WebLink_Test1.cpp(179): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_Test1.cpp(494): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_Test1.cpp(775): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_ZHDDE.cpp
-     1>WebLink_ZHDDE.cpp(178): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZHDDE.cpp(595): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZHDDE.cpp(779): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_ZJ.cpp
-     1>WebLink_ZJ.cpp(173): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ.cpp(460): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ.cpp(693): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_ZJ_GS.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_ZJ_NB.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(168): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(221): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(335): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(504): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(552): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(671): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(738): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(811): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(860): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_NB.cpp(915): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_ZJ_SY.cpp
-     1>WebLink_ZJ_SY.cpp(173): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_SY.cpp(472): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_SY.cpp(721): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_ZJ_TZ.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(159): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(212): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(326): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(495): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(543): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(662): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(729): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(802): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(851): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_TZ.cpp(906): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_ZJ_WZ.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(150): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(203): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(317): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(486): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(534): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(653): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(720): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(793): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(842): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_WZ.cpp(897): warning C4018: '<' : signed/unsigned mismatch
-         WebLink_ZJ_ZSH.cpp
-     1>WebLink_ZJ_ZSH.cpp(165): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_ZSH.cpp(445): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_ZJ_ZSH.cpp(667): warning C4018: '<' : signed/unsigned mismatch
-         Compiling...
-         _io.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\VRCObject.h(9): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\CommObject.h(7) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(7): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(9) : see declaration of 'SocketPackage'
-         vr_object.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\VRCObject.h(9): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\CommObject.h(7) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(7): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(9) : see declaration of 'SocketPackage'
-     1>vr_object.cpp(364): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-     1>vr_object.cpp(394): warning C4800: 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)
-     1>vr_object.cpp(580): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_object.cpp(582): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_object.cpp(591): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_object.cpp(600): warning C4018: '>=' : signed/unsigned mismatch
-     1>vr_object.cpp(1119): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
-         vr_server.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\VRCObject.h(9): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\CommObject.h(7) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(7): warning C4348: 'SocketPackage' : redefinition of default parameter : parameter 1
-                 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\_io.h(9) : see declaration of 'SocketPackage'
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_server.cpp(151): warning C4242: '=' : conversion from 'int' to 'byte', possible loss of data
-         vr_ui.cpp
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\tool.h(95): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ui.cpp(395): warning C4018: '>' : signed/unsigned mismatch
-     1>vr_ui.cpp(395): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ui.cpp(1256): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ui.cpp(1383): warning C4018: '<' : signed/unsigned mismatch
-     1>vr_ui.cpp(1548): warning C4018: '<' : signed/unsigned mismatch
-         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 /Fo"Release\\" /Fd"Release\vc120.pdb" /Gd /TC /analyze- /errorReport:prompt sqlite\shell.c sqlite\sqlite3.c
-         shell.c
-         sqlite3.c
-       ResourceCompile:
-         C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\bin\rc.exe /D _USING_V110_SDK71_ /D _UNICODE /D UNICODE /l"0x0409" /nologo /fo"Release\VaporRecoveryMonitor.res" VaporRecoveryMonitor.rc 
+     1>vr_webservice.cpp(661): warning C4018: '<' : signed/unsigned mismatch
+     1>vr_webservice.cpp(4245): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+     1>vr_webservice.cpp(4273): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+     1>vr_webservice.cpp(4535): warning C4244: 'initializing' : conversion from 'double' to 'float', possible loss of data
+     1>vr_webservice.cpp(4581): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
+     1>vr_webservice.cpp(4582): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
+     1>vr_webservice.cpp(4583): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
+     1>vr_webservice.cpp(4584): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
+     1>vr_webservice.cpp(6062): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+     1>vr_webservice.cpp(6090): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+     1>vr_webservice.cpp(6549): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+     1>vr_webservice.cpp(6577): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
        Link:
          C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"C:\bitbucket\apacsys-vaporrecoverymonitor_new\VaporRecoveryMonitor\VaporRecoveryMonitor\Bin\VaporRecoveryMonitor.exe" /INCREMENTAL:NO /NOLOGO /LIBPATH:"C:\bitbucket\apacsys-vaporrecoverymonitor_new\VaporRecoveryMonitor\VaporRecoveryMonitor\Lib\\" /LIBPATH:C:\common\openSSL\lib /LIBPATH:C:\common\openSSL /LIBPATH:"C:\Bitbucket\apacsys-vaporrecoverymonitor\cryptopp\lib\Output\Release" kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /manifestinput:"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\Include\Manifest\dpiaware.manifest" /DEBUG /PDB:"C:\bitbucket\apacsys-vaporrecoverymonitor_new\VaporRecoveryMonitor\VaporRecoveryMonitor\Bin\VaporRecoveryMonitor.pdb" /SUBSYSTEM:WINDOWS,"5.01" /OPT:REF /OPT:ICF /LTCG /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"C:\bitbucket\apacsys-vaporrecoverymonitor_new\VaporRecoveryMonitor\VaporRecoveryMonitor\Bin\VaporRecoveryMonitor.lib" /MACHINE:X86 /SAFESEH Release\VaporRecoveryMonitor.res
          Release\AES.obj
@@ -621,8 +106,8 @@
          Release\vr_ui.obj
          Generating code
      1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\global.h(184): warning C4715: 'Area::getArea' : not all control paths return a value
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_ext.cpp(1082): warning C4715: 'ThreadHandle_Start_3' : not all control paths return a value
      1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_ext.cpp(1034): warning C4715: 'ThreadHandle_Start_2' : not all control paths return a value
+     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_ext.cpp(1082): warning C4715: 'ThreadHandle_Start_3' : not all control paths return a value
      1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_ext.cpp(978): warning C4715: 'ThreadHandle_Start' : not all control paths return a value
          Finished generating code
      1>cryptlib.lib(cryptlib.obj) : warning LNK4099: PDB 'vc120.pdb' was not found with 'cryptlib.lib(cryptlib.obj)' or at 'C:\bitbucket\apacsys-vaporrecoverymonitor_new\VaporRecoveryMonitor\VaporRecoveryMonitor\Bin\vc120.pdb'; linking object as if no debug info
@@ -664,4 +149,4 @@
 
 Build succeeded.
 
-Time Elapsed 00:00:33.78
+Time Elapsed 00:00:20.02

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/StationInfo-o.ini

@@ -0,0 +1,31 @@
+[Config]
+CityCode=440600
+AreaCode=440605
+TownCode=440605126000
+StationName=延长壳牌（广东）石油有限公司佛山润淇加油站
+Company=延长壳牌（广东）石油有限公司
+Lon=113.8.37
+Lat=23.10.2
+Address=佛山市南海区里水镇甘蕉村
+Contact=李新平
+Phone=075785651451
+JYJNum=6
+JYQNum=26 
+Scale=2
+OwnerType=6
+HasSystem=1
+Manufacturer=托肯恒山科技（广州）有限公司
+IsAcceptance=
+OperateStaff=邱绍东
+TriggerUploadFlag=0
+YWSJHM=075785651451
+JYZJC=佛山润淇加油站
+JYZTYPE=4
+CREDITCODE=91440605566690557W
+UNAME=苏德华
+UCONTACT=075785651451
+GASCAPACITY=140
+DIESELCAPACITY=50
+GASSALES=3500
+DIESELS=3400
+ESTDATE=20101223

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/StationInfo.ini

@@ -1,31 +1,14 @@
 [Config]
-CityCode=440600
-AreaCode=440605
-TownCode=440605126000
-StationName=延长壳牌（广东）石油有限公司佛山润淇加油站
-Company=延长壳牌（广东）石油有限公司
-Lon=113.8.37
-Lat=23.10.2
-Address=佛山市南海区里水镇甘蕉村
-Contact=李新平
-Phone=075785651451
-JYJNum=6
-JYQNum=26 
-Scale=2
-OwnerType=6
-HasSystem=1
-Manufacturer=托肯恒山科技（广州）有限公司
-IsAcceptance=
-OperateStaff=邱绍东
-TriggerUploadFlag=0
-YWSJHM=075785651451
-JYZJC=佛山润淇加油站
-JYZTYPE=4
-CREDITCODE=91440605566690557W
-UNAME=苏德华
-UCONTACT=075785651451
-GASCAPACITY=140
-DIESELCAPACITY=50
-GASSALES=3500
-DIESELS=3400
-ESTDATE=20101223
+StationName=义乌市交旅综合能源销售有限公司后宅商城大道加油站
+legal=丁文旭
+orgCode=91330782MA2M5GWEX8
+AreaCode=330782
+Address=浙江省义乌市后宅街道商城大道B399号
+Contact=王旭佳
+Phone=13867920023
+Lon=120.095022
+Lat=29.333086
+username=lanyunliang
+appid=769992545596878702
+token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE2OTI1OTc5MzcsInN1YiI6IntcImFwcElkXCI6XCI3Njk5OTI1NDU1OTY4Nzg3MDJcIixcInVzZXJOYW1lXCI6XCIzOWEyYTA4MGYxOWFkZTBkNzllNmFmZTczMTZkN2FkNjYzODlmMTZlOTNjN2NmYWFjMTk3Y2VhMmJlMGVjNzExXCJ9IiwiYXVkIjoiNmEyYzdiZmZiN2Q4ZTJlMmViODljNDU3ZTkzZDMxNTA2NDcwZmZkNGY4YzVhYTcyZTAwZGY1NDI0ZTEzYzFmZSIsImV4cCI6MTc1NDgwNTkzNywibmJmIjoxNjkyNTk3OTM3fQ.lV6W1r_XF2IlVyJRvEknB4o7pxw3Y7eEZhCV8zQ5_pc
+TriggerUploadFlag=1

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/WebLink_BJ.cpp

@@ -199,21 +199,6 @@ void CWebLink_BJ::PackWebData_Warning(VR::WebData& webdata, int type, int warnin
 			}
 			sprintf_s(chPVZT, "%d", typePVZT);
 
-			if (g_bEnablePostProcess)
-			{
-				int typeHCLZT = 0;
-				if (g_tankwarningstate.poststate)
-				{
-					typeHCLZT = 1;
-				}
-				if (g_tankwarningstate.poststate_w)
-				{
-					typeHCLZT = 2;
-				}
-				sprintf_s(chHCLZT, "%d", typeHCLZT);
-			}
-
-
 			int typePVLJZT = 0;
 			if (g_tankwarningstate.pvcrisisstate)
 			{
@@ -226,6 +211,20 @@ void CWebLink_BJ::PackWebData_Warning(VR::WebData& webdata, int type, int warnin
 			sprintf_s(chPVLJZT, "%d", typePVLJZT);
 		}
 
+
+		if (g_bEnablePostProcess)
+		{
+			int typeHCLZT = 0;
+			if (g_tankwarningstate.poststate)
+			{
+				typeHCLZT = 1;
+			}
+			if (g_tankwarningstate.poststate_w)
+			{
+				typeHCLZT = 2;
+			}
+			sprintf_s(chHCLZT, "%d", typeHCLZT);
+		}
 	}
 	else if (type == 1)
 	{
@@ -712,8 +711,9 @@ void CWebLink_BJ::PackWebData_NozState(VR::WebData& webdata, string strDate)
 	webdata.data = strdata;
 }
 
-//×Ô¶¨ÒåÐÄÌø
 
+/*
+//×Ô¶¨ÒåÐÄÌø
 void CWebLink_BJ::PackWebData_HeartBeat(VR::WebData& webdata)
 {
 	string strdata = "";
@@ -751,5 +751,5 @@ void CWebLink_BJ::PackWebData_HeartBeat(VR::WebData& webdata)
 
 
 }
-
+*/
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/WebLink_BJ.h

@@ -22,7 +22,7 @@ public:
 	void PackWebData_StationInfo(VR::WebData& webdata){}
 	void PackWebData_NozzleInfo(VR::WebData& webdata){}
 
-	void PackWebData_HeartBeat(VR::WebData& webdata);
+	void PackWebData_HeartBeat(VR::WebData& webdata){}
 
 	string getAllString(string dataid, string time, string type, string base64str);
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/WebLink_CQ.cpp

@@ -614,7 +614,7 @@ void CWebLink_CQ::PackWebData_Error(VR::WebData& webdata, string code, string st
 
 
 
-
+/*
 void CWebLink_CQ::PackWebData_HeartBeat(VR::WebData& webdata)
 {
 	string strdata = "";
@@ -651,4 +651,5 @@ void CWebLink_CQ::PackWebData_HeartBeat(VR::WebData& webdata)
 	webdata.data = strdata;
 
 
-}
+}
+*/

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/WebLink_CQ.h

@@ -19,7 +19,7 @@ public:
 
 	void PackWebData_StationInfo(VR::WebData& webdata){}
 	void PackWebData_NozzleInfo(VR::WebData& webdata){}
-	void PackWebData_HeartBeat(VR::WebData& webdata);
+	void PackWebData_HeartBeat(VR::WebData& webdata){};
 
 };
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/WebLink_FSSD.cpp

@@ -778,7 +778,7 @@ void CWebLink_FSSD::PackWebData_NozState(VR::WebData& webdata, string strDate)
 	webdata.data = strdata;
 }
 
-
+/*
 //自定义心跳
 void CWebLink_FSSD::PackWebData_HeartBeat(VR::WebData& webdata)
 {
@@ -820,7 +820,7 @@ void CWebLink_FSSD::PackWebData_HeartBeat(VR::WebData& webdata)
 	
 
 }
-
+*/
 
 //加油站信息  //顺德协议要求上传规则为：上报一次，以后有信息修改时需再次上传。程序实现：由独立的配置工具配置油站信息，每次修改则修改上传标志，程序读到该标志后触发上传
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/WebLink_FSSD.h

@@ -20,7 +20,8 @@ public:
 
 	void PackWebData_StationInfo(VR::WebData& webdata);
 	void PackWebData_NozzleInfo(VR::WebData& webdata);
-	void PackWebData_HeartBeat(VR::WebData& webdata);
+
+	void PackWebData_HeartBeat(VR::WebData& webdata){};
 
 
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/WebLink_HN.cpp

@@ -737,7 +737,7 @@ void CWebLink_HN::PackWebData_NozState(VR::WebData& webdata, string strDate)
 	webdata.data = strdata;
 }
 
-
+/*
 void CWebLink_HN::PackWebData_HeartBeat(VR::WebData& webdata)
 {
 	string strdata = "";
@@ -774,4 +774,5 @@ void CWebLink_HN::PackWebData_HeartBeat(VR::WebData& webdata)
 	webdata.data = strdata;
 
 
-}
+}
+*/

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/WebLink_HN.h

@@ -19,7 +19,7 @@ public:
 	void PackWebData_StationInfo(VR::WebData& webdata){}
 	void PackWebData_NozzleInfo(VR::WebData& webdata){}
 
-	void PackWebData_HeartBeat(VR::WebData& webdata);
+	void PackWebData_HeartBeat(VR::WebData& webdata){}
 
 };
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/WebLink_NMG_HHHT.h

@@ -35,7 +35,7 @@ public:
 	void PackWebData_NozState(VR::WebData& webdata, string strDate){};
 	void PackWebData_NozzleInfo(VR::WebData& webdata){};
 	void PackWebData_HeartBeat(VR::WebData& webdata){};
-	;
+	
 
 	void connectserver();
 	void initialization();

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/WebLink_SD.cpp

@@ -1223,43 +1223,7 @@ void CWebLink_SD::PackWebData_NozState(VR::WebData& webdata, string strDate)
 }
 
 
-void CWebLink_SD::PackWebData_HeartBeat(VR::WebData& webdata)
-{
-	string strdata = "";
-
-	char chDataID[7];
-	sprintf_s(chDataID, "%06d", webdata.ID);
-
-	string data = "";
-
-	//用空环境数据包来做心跳检测
-	data += "<rows>";
-	data += "</rows>";
-
-
-	string base64 = base64_encode((BYTE*)data.data(), data.length());
-	char chType[3];
-	sprintf_s(chType, "%02d", webdata.type);
-
-	char chTime[15];
-	get_current_time(chTime);
 
-	strdata += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-	strdata += "<ROOT>";
-	strdata += "<VERSION>V1.1</VERSION>";
-	strdata += "<DATAID>" + string(chDataID) + "</DATAID>";
-	strdata += "<USERID>" + *m_pUserId + "</USERID>";
-	strdata += "<TIME>" + string(chTime) + "</TIME>";
-	strdata += "<TYPE>" + string(chType) + "</TYPE>";
-	strdata += "<SEC>0</SEC>";
-	strdata += "<BUSINESSCONTENT>" + base64 + "</BUSINESSCONTENT>";
-	strdata += "<HMAC></HMAC>";
-	strdata += "</ROOT>";
-
-	webdata.data = strdata;
-
-
-}
 
 */
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/WebLink_ZJ.cpp

@@ -742,7 +742,7 @@ void CWebLink_ZJ::PackWebData_NozState(VR::WebData& webdata, string strDate)
 }
 
 
-
+/*
 void CWebLink_ZJ::PackWebData_HeartBeat(VR::WebData& webdata)
 {
 	string strdata = "";
@@ -779,4 +779,5 @@ void CWebLink_ZJ::PackWebData_HeartBeat(VR::WebData& webdata)
 	webdata.data = strdata;
 
 
-}
+}
+*/

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/WebLink_ZJ.h

@@ -15,8 +15,8 @@ public:
 	void PackWebData_Error(VR::WebData& webdata, string code, string strDate);
 	void PackWebData_NozControl(VR::WebData& webdata, int fip, int noz, BOOL isEnable, int event);
 	void PackWebData_NozState(VR::WebData& webdata, string strDate);
-	void PackWebData_HeartBeat(VR::WebData& webdata);
 
+	void PackWebData_HeartBeat(VR::WebData& webdata){};
 	void PackWebData_StationInfo(VR::WebData& webdata){}
 	void PackWebData_NozzleInfo(VR::WebData& webdata){}
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/conn.ini

@@ -1,7 +1,7 @@
 ;上传平台选择
 [City]
 ;上传平台1；  0-北京；1-；2-；3-浙江杭州环保局；4-；5-山东省环保；6-广州;7-湖南中石化;8-山东烟台;9-重庆;10-佛山市环保1（当前顺德区使用）;11-浙江金华环保局;12-南京环保局；13-福建厦门环保局；14-东莞市环保局；15-深圳环保局；16-江门环保局；17-沈阳环保局；18-广东惠州环保局;19=汕头环保局；20-云浮环保局；21-揭阳环保局；22-浙江宁波环保局；23-佛山市环保2（当前南海区使用）；24-阳江环保局；25-安徽合肥环保局；26-浙江温州环保局；27-珠海环保局; 28-河北张家口环保局；29-浙江台州环保；30-湛江环保局；31-清远环保局；32-河北唐山环保局；33-内蒙古呼和浩特环保局；34-武汉环保局；35-宁夏环保局；36-成都环保局；999-测试1；1000-不设置
-CityNo=34
+CityNo=0
 ;上传平台2；  0-不设置；1-浙江浙石油；2-浙江中石化；3-山东青岛；4-湖南长沙环保局；5-佛山顺德（佛山市）；6-广东中石化；7-重庆环保2；8-山东烟台；9-中化道达尔；999-测试2
 CityNo2=0
 ;上传平台3；0-不设置；1-浙江高速；2-中山智慧平台
@@ -13,7 +13,7 @@ MainCity=1
 ;远程服务器
 [WebService]
 ;是否开启平台1远程传输。0-关闭；1-开启
-Enable=0
+Enable=1
 ;是否开启平台2远程传输。0-关闭；1-开启
 Enable2=0
 ;是否开启平台3远程传输。0-关闭；1-开启
@@ -717,7 +717,7 @@ maxdelay=300
 ;油罐
 [Tank]
 ;串口号
-Comm=21
+Comm=10
 ;串口号(485)
 Comm_485=0
 ;是否允许油罐压力和温度传感器使用重复串口
@@ -873,13 +873,13 @@ Pressure_N=-1500
 ;后处理装置
 [PostProcess]
 ;是否开启。0-关闭；1-开启
-Enable=0
+Enable=1
 ;开启压力，单位 Pa，  整数
 Pressure=200
 ;停止压力，单位 Pa ，负整数
 Pressure_S=-150
 ;油气处理装置标识（后处理装置的厂家等信息） 
-id=
+id=0
 
 
 
@@ -894,13 +894,13 @@ Port=10000
 [DataID]
 Record=67106
 Environment=105849
-Config=3211
+Config=3216
 Warning=13725
 Error=1625
 NozState=1602
 NozControl=36
-NozzleInfo=132
-StationInfo=87
+NozzleInfo=136
+StationInfo=91
 
 [Skin]
 ;分辨率宽度1366或1024
@@ -929,7 +929,7 @@ configupdatetime=20241029095424
 
 [RunningState]
 UnLockFlag=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Date=20250512
+Date=20250529
 TradeFlag=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/global.cpp

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

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/instance.cpp

@@ -116,7 +116,7 @@ void initpram()
 		{
 			VR::rules::bEnablePV = FALSE;
 			VR::rules::bEnablePVCrisis = FALSE;//协议有，但整改去掉
-			VR::rules::bEnablePost = FALSE;//协议有，但整改去掉
+			VR::rules::bEnablePost = TRUE;
 			VR::rules::bEnableGas = FALSE;
 
 			//零压
@@ -146,6 +146,9 @@ void initpram()
 
 			VR::rules::ref_postgas_unit = GasUnit_GM3;//北京地标
 
+			VR::rules::ref_tankwarning_post_useoffset = FALSE;
+
+
 			VR::rules::bUseVlrOffset = 1;
 			
 		}
@@ -155,39 +158,6 @@ void initpram()
 
 			g_usemiddleware_https = TRUE;
 		}
-		else if (cityno == CITY_FS)
-		{
-			VR::rules::bEnablePV = FALSE;//P/V阀预报警频繁，去掉
-			VR::rules::bEnablePVCrisis = FALSE;
-			VR::rules::bEnablePost = FALSE;//佛山南海不需要后处理预报警
-			VR::rules::bEnableGas = FALSE;
-
-			//零压
-			VR::rules::ref_tankwarning_zero_s = 12 * 3600;  //秒    零压超过12小时
-			VR::rules::ref_tankwarning_zero_offset = 50 * 100;  //两位小数    处于（ - 50～50）Pa范围内
-
-			//气液比
-			VR::rules::trx_vol_min = 1500;  //有效气液比（每次连续加油量大于15L ）
-
-
-			VR::rules::vlr_sys_max = 1300;	//3位小数;  
-			VR::rules::vlr_sys_min = 900;	//3位小数;  
-
-			VR::rules::ref_warning_index = 7;  	     //气液比连续预警7天则报警	
-			VR::rules::ref_tankwarning_zero_d = 7;  //零压超过7天
-
-			VR::rules::ref_tankwarning_pv_day = 7; //压力超出P / V阀超过7天
-
-			VR::rules::ref_tankwarning_pv_offset = 300 ;  //油罐压力大于(P/V阀正压开启压力+300)Pa或小于(P/V阀负压开启压力-300)Pa
-
-			VR::rules::ref_pv_warningtype = 2;
-
-
-
-			//VR::rules::bUseErrorControl = 1;
-
-			VR::rules::bUseOverLock = 1;
-		}
 		else if (cityno == CITY_SD)
 		{
 			useNationalStandard();
@@ -198,6 +168,7 @@ void initpram()
 		}
 		else if (cityno == CITY_SH)
 		{
+			/*
 			VR::rules::bEnablePVCrisis = FALSE;
 			VR::rules::bEnablePost = FALSE;
 			VR::rules::bEnableGas = TRUE;
@@ -217,36 +188,12 @@ void initpram()
 			VR::rules::ref_tankwarning_post_d = 5;  //压力超出后处理超过5天
 
 			VR::rules::ref_pv_warningtype = 2;
-		}
-		else if (cityno == CITY_HN_2)
-		{
-			VR::rules::bEnablePV = TRUE;
-			VR::rules::bEnablePVCrisis = TRUE;
-			VR::rules::bEnablePost = TRUE;
-			VR::rules::bEnableGas = FALSE;
-
-			//零压
-			VR::rules::ref_tankwarning_zero_s = 12 * 3600;  //秒    零压超过12小时
-			VR::rules::ref_tankwarning_zero_offset = 50 * 100;  //两位小数    处于（ - 50～50）Pa范围内
-
-			//气液比
-			VR::rules::trx_vol_min = 1500;  //有效气液比（每次连续加油量大于15L ）
-
-
-			VR::rules::vlr_sys_max = 1200;	//3位小数;  
-			VR::rules::vlr_sys_min = 1000;	//3位小数;  
-
-			VR::rules::ref_warning_index = 5;  	     //气液比连续预警7天则报警	
-			VR::rules::ref_tankwarning_zero_d = 5;  //零压超过7天
-			VR::rules::ref_tankwarning_post_d = 5;  //压力超出后处理超过7天
-
+			*/
 		}
 		else if (cityno == CITY_FS_SD)
 		{
 			useNationalStandard();
 
-			//VR::rules::bUseErrorControl = 1;
-
 			VR::rules::bUseOverLock = 1;
 		}
 		else if (cityno == CITY_GZ)
@@ -258,8 +205,6 @@ void initpram()
 			VR::rules::bEnableWell = TRUE;
 			VR::rules::bEnableOil = TRUE;
 
-			//VR::rules::bUseErrorControl = 1;
-
 			VR::rules::bUseOverLock = 1;
 		}
 		else if (cityno == CITY_NJ)
@@ -269,32 +214,22 @@ void initpram()
 			VR::rules::vlr_sys_min = 900;	//3位小数;  
 
 		}
-		else if (cityno == CITY_GD_JM)
-		{
-			useNationalStandard();
-		}
 		else if (cityno == CITY_SY)
 		{
 			useNationalStandard();
 
-			//2021.12.16 客户要求改为0.9-1.3
-			//VR::rules::vlr_sys_max = 1200;	//3位小数;  //沈阳联网材料2气液比数据字段UnqOilNum解释提到仅此项的气液比合格范围为1.0-1.2，其余判定请按国标执行
-			//VR::rules::vlr_sys_min = 1000;	//3位小数; 
-
-
 			VR::rules::ref_postgas_unit = GasUnit_GM3;//沈阳地标
 		}
 		else if (cityno == CITY_GD_ST)
 		{
 			useNationalStandard(); 
+
 			VR::rules::ref_postgas_unit = GasUnit_GM3;
 		}
 		else if (cityno == CITY_FS_NH)
 		{
 			useNationalStandard();
 
-			//VR::rules::bUseErrorControl = 1;
-
 			VR::rules::bUseOverLock = 1;
 		}
 		else if (cityno == CITY_AH_HF)
@@ -434,29 +369,6 @@ void initpram()
 				VR::rules::yzWarning = atof(web_zj_zsh.getConfigValue("YZYZ").c_str());
 			}
 
-		}
-		else if (cityno == CITY_2_HN_CS)
-		{
-			VR::rules::bEnablePV = TRUE;
-			VR::rules::bEnablePVCrisis = TRUE;
-			VR::rules::bEnablePost = TRUE;
-			VR::rules::bEnableGas = FALSE;
-
-			//零压
-			VR::rules::ref_tankwarning_zero_s = 12 * 3600;  //秒    零压超过12小时
-			VR::rules::ref_tankwarning_zero_offset = 50 * 100;  //两位小数    处于（ - 50～50）Pa范围内
-
-			//气液比
-			VR::rules::trx_vol_min = 1500;  //有效气液比（每次连续加油量大于15L ）
-
-
-			VR::rules::vlr_sys_max = 1200;	//3位小数;  
-			VR::rules::vlr_sys_min = 1000;	//3位小数;  
-
-			VR::rules::ref_warning_index = 5;  	     //气液比连续预警7天则报警	
-			VR::rules::ref_tankwarning_zero_d = 5;  //零压超过7天
-			VR::rules::ref_tankwarning_post_d = 5;  //压力超出后处理超过7天
-
 		}
 		else if (cityno == CITY_2_FS_SD)
 		{
@@ -660,11 +572,7 @@ void initpram2()
 	*/
 
 
-	if (g_CityNo == CITY_BJ || g_CityNo == CITY_HN_2)//有持续发送心跳包的
-	{
-
-	}
-	else if (g_CityNo == CITY_SD)
+	if (g_CityNo == CITY_SD)
 	{
 		g_WebTimeOut = (25 * 60 * 60) * 1000;
 	}

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_app.cpp

@@ -1985,25 +1985,7 @@ void VRMonitorApp::update_tank()
 					}
 
 
-					//
-					if (it.second.poststate == 1)
-					{
-						if (it.second.lastpoststate != it.second.poststate)
-						{
-							g_warningindex = it.second.m_index;
-							SendWebData_Warning_ALL(3, 1);
-						}
-						beeptag = 1;
-					}
-					if (it.second.poststate_w == 1)
-					{
-						if (it.second.lastpoststate_w != it.second.poststate_w)
-						{
-							g_warningindex = it.second.m_index;
-							SendWebData_Warning_ALL(3, 2);
-						}
-						beeptag = 1;
-					}
+
 
 					//
 					if (it.second.pvcrisisstate == 1)
@@ -2026,6 +2008,28 @@ void VRMonitorApp::update_tank()
 					}
 				}
 
+
+				//
+				if (it.second.poststate == 1)
+				{
+					if (it.second.lastpoststate != it.second.poststate)
+					{
+						g_warningindex = it.second.m_index;
+						SendWebData_Warning_ALL(3, 1);
+					}
+					beeptag = 1;
+				}
+				if (it.second.poststate_w == 1)
+				{
+					if (it.second.lastpoststate_w != it.second.poststate_w)
+					{
+						g_warningindex = it.second.m_index;
+						SendWebData_Warning_ALL(3, 2);
+					}
+					beeptag = 1;
+				}
+
+
 				g_nBeginOnlineFlag = 0;
 			}
 		}

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_common.cpp

@@ -43,7 +43,12 @@ namespace VR{
 		unsigned ref_prewarning_index_alert = 100;    //100%;
 		unsigned ref_warning_index_alert = 2;  	     //严重气液比 超过24小时，则可理解是第二天依然超标才报警
 
+
 		unsigned ref_tankwarning_post_d = 5;  //压力超出后处理超过5天
+		int ref_tankwarning_post_useoffset = TRUE;//判断油罐压力大于后处理装置启动压力是使用偏移量还是固定值。当前北京使用固定值
+		int ref_tankwarning_post_offset = 50; //偏移量，油罐压力大于(后处理装置启动压力+50)Pa
+		int ref_tankwarning_post = 550;//固定值，有后处理装置时油罐压力大于xxxpa 
+
 
 		unsigned ref_tankwarning_pv_day = 5; //压力超出P / V阀超过5天
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_common.h

@@ -40,8 +40,8 @@ typedef unsigned char byte;
 
 //上传平台1
 #define CITY_BJ 0	//北京
-#define CITY_SH 1	//上海
-//#define CITY_HN 2	//湖南 旧 不用
+#define CITY_SH 1	//上海 //没有实际使用
+//#define CITY_HN 2	//湖南 旧 不用（长沙环保放到平台2）
 #define CITY_ZJ 3	//浙江杭州环保局
 #define CITY_FS 4	//佛山南海（旧协议，弃用，南海使用CITY_FS_NH）
 #define CITY_SD 5	//山东省
@@ -183,6 +183,11 @@ extern int bUseAlert;
 extern int bCountAllDay;
 extern int nLiquidType;
 extern int bUseGasOffset;
+extern int ref_tankwarning_post_useoffset;
+extern int ref_tankwarning_post_offset;
+extern int ref_tankwarning_post;
+
+
 
 const unsigned ref_tankwarning_pv = 5;  // 压力超出P/V阀超过5分钟
 const unsigned ref_tankwarning_pvcrisis = 5;  // 压力超出P/V阀临界值超过5天
@@ -191,7 +196,11 @@ const unsigned ref_tankwarning_post_s = 2 * 3600;  //
 const unsigned ref_precrisis = 25;    //25%;
 
 
-const int ref_tankwarning_post_offset = 50 * 100; //两位小数    油罐压力大于(后处理装置启动压力+50)Pa
+
+
+
+
+
 
 const unsigned ref_gaspercentage = 40;  //即油气浓度超过爆炸下限的40% 现在没有地区使用LEL单位，但保留
 

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_ext.cpp

@@ -2012,13 +2012,27 @@ void calcwarningtime(int pressure, Sensor_Pressure* ps,int dif, int & zeropressu
 
 	if (VR::rules::bEnablePost && g_bEnablePostProcess)
 	{
-		if (pressure > VR::rules::ref_tankwarning_post_offset + g_nPostProcessPressure * 100)
+		if (VR::rules::ref_tankwarning_post_useoffset)
 		{
-			postprocesstime = dif;
+			if (pressure > VR::rules::ref_tankwarning_post_offset*100 + g_nPostProcessPressure * 100)
+			{
+				postprocesstime = dif;
+			}
+			else
+			{
+				postprocesstime = 0;
+			}
 		}
 		else
 		{
-			postprocesstime = 0;
+			if (pressure > VR::rules::ref_tankwarning_post*100)
+			{
+				postprocesstime = dif;
+			}
+			else
+			{
+				postprocesstime = 0;
+			}
 		}
 	}
 }
@@ -2069,65 +2083,8 @@ void HandleTankData()
 			calcwarningtime(tp.pressure[i], g_pressgroup.GetPress4(), dif, tp.zeropressuretime[i], tp.pvtime[i], tp.pvcrisis[i], tp.postprocesstime[i]);
 
 
-			/*
-			if (g_pressgroup.GetPress1()->getEnable())
-			{
-				if (tp.pressure >= -VR::rules::ref_tankwarning_zero_offset
-					&& tp.pressure <= VR::rules::ref_tankwarning_zero_offset)
-				{
-					tp.zeropressuretime = dif;
-				}
-				else
-				{
-					tp.zeropressuretime = 0; //不在范围内则用触发器触发累计清空
-				}
-			}
-
-			int p1 = (-VR::rules::ref_tankwarning_pv_offset + g_nPVPressure_N) * 100;
-			int p2 = (VR::rules::ref_tankwarning_pv_offset + g_nPVPressure) * 100;
-			if (tp.pressure < p1 || tp.pressure > p2)
-			{
-				tp.pvtime = dif;
-			}
-			else
-			{
-				tp.pvtime = 0;
-			}
-
-			//6.2.2.3  压力/真空阀临界压力状态      油罐压力数据在-1000Pa～+600Pa(或-1000Pa～压力/真空阀正压开启压力的80%)
-			//选其中较大的值
-			int pcri = 600 * 100;
-			int pcri2 = g_nPVPressure * 100 * 0.8;
-			if (pcri < pcri2)
-			{
-				pcri = pcri2;
-			}
-			if (tp.pressure < -1000 * 100 || tp.pressure > pcri)
-			{
-				tp.pvcrisis = 1;
-			}
-			else
-			{
-				tp.pvcrisis = 0;
-			}
-
-
-			if (VR::rules::bEnablePost && g_bEnablePostProcess)
-			{
-				if (tp.pressure > VR::rules::ref_tankwarning_post_offset + g_nPostProcessPressure * 100)
-				{
-					tp.postprocesstime = dif;
-				}
-				else
-				{
-					tp.postprocesstime = 0;
-				}
-			}
-*/
-			//g_tankpressure = tp.pressure;
+			
 			int ret = db_tank.insert_tank(&tp);
-			//g_tankstate = 1;
-			//g_tanktick = GetTickCount();
 			g_nBeepCount = 0;
 		}
 	}
@@ -5531,20 +5488,6 @@ void loopUpload()
 	}
 
 
-
-	if (heartcount == 0)
-	{
-		//目前只有北京和湖南需要30秒检测，其它地区除了启动时检测一次，运行时用环境数据打包上传的周期检测即可
-		if (g_CityNo == CITY_BJ)
-		{
-			web_bj.SendWebData_HeartBeat();
-		}
-		else if (g_CityNo == CITY_HN_2)
-		{
-			web_hn.SendWebData_HeartBeat();
-		}
-	}
-	heartcount = (++heartcount) % 30;
 }
 
 void testUpload()

VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_webservice.cpp

@@ -217,166 +217,105 @@ void vr_webservice::CreateRequestThread()
 
 					if (cityno == CITY_BJ) //北京
 					{
-						char *pdata = new char[2 * webdata.data.size()];
-						memset(pdata, 0, 2 * webdata.data.size());
-						memcpy(pdata, webdata.data.data(), webdata.data.size());
-						strrpc(pdata, "<", "&lt;");
-						strrpc(pdata, ">", "&gt;");
-
-
-
-					
-
-
-						std::string  xml = "<soapenv:Envelope xmlns:soapenv = \"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:web=\"http://webservice.orvr.data.ebp.huazx.cn/\">"
-							+ std::string("<soapenv:Header/>")
-							+ "<soapenv:Body>"
-							+ "<web:post>"
-							+ "<arg0>"
-							+ pdata
-								 
-							+ "</arg0>"
-							+ "</web:post>"
-							+ "</soapenv:Body>"
-							+ "</soapenv:Envelope>";
 
-
-
-						std::string strpath = path_gen + "?wsdl";
-						rtnstr = http_post_xml(ip_gen.c_str(), port_gen, strpath.c_str(), xml.c_str());
-						rtnstr = UTF8_To_GBKA(rtnstr);
-
-						delete[]pdata;
-						pdata = nullptr;
-
-						int index = rtnstr.find_first_of("<");
-						if (index == -1)
-						{
-							char recvlogs[100] = { 0 };
-							sprintf_s(recvlogs, "类型：%s;   接收：", webdata.strtype.c_str());
-							string strlog = recvlogs + rtnstr;
-							log(strlog.c_str());
-
-							Sleep(10 * 1000);
-						}
-						else
+						if (g_strUserID != "")
 						{
-
-							rtnstr = rtnstr.substr(index, rtnstr.length());
+							char *pdata = new char[2 * webdata.data.size()];
+							memset(pdata, 0, 2 * webdata.data.size());
+							memcpy(pdata, webdata.data.data(), webdata.data.size());
+							strrpc(pdata, "<", "&lt;");
+							strrpc(pdata, ">", "&gt;");
 
 
-							char recvlogs[100] = { 0 };
-							sprintf_s(recvlogs, "类型：%s;   接收：", webdata.strtype.c_str());
-							string strlog = recvlogs + rtnstr;
-							log(strlog.c_str());
 
+							std::string  xml = "<soapenv:Envelope xmlns:soapenv = \"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:web=\"http://webservice.orvr.data.ebp.huazx.cn/\">"
+								+ std::string("<soapenv:Header/>")
+								+ "<soapenv:Body>"
+								+ "<web:post>"
+								+ "<arg0>"
+								+ pdata
 
-							std::string rtnstr2 = "";
+								+ "</arg0>"
+								+ "</web:post>"
+								+ "</soapenv:Body>"
+								+ "</soapenv:Envelope>";
 
-							//rapidxml::xml_document<> doc;
-							doc.parse<0>(const_cast<char*>(rtnstr.c_str()));
 
-							//! 获取根节点
-							rapidxml::xml_node<>* root = doc.first_node();
 
-							//! 获取根节点第一个节点
-							rapidxml::xml_node<>* node1 = root->first_node();
-
-							rapidxml::xml_node<>* node11 = node1->first_node();
+							std::string strpath = path_gen + "?wsdl";
+							rtnstr = http_post_xml(ip_gen.c_str(), port_gen, strpath.c_str(), xml.c_str());
+							rtnstr = UTF8_To_GBKA(rtnstr);
 
+							delete[]pdata;
+							pdata = nullptr;
 
-							for (rapidxml::xml_node<char> * node = node11->first_node("return");
-								node != NULL;
-								node = node->next_sibling())
+							int index = rtnstr.find_first_of("<");
+							if (index == -1)
 							{
-								rtnstr2 += node->value();
-							}
-
-
-
-							webtick = GetTickCount();
-
+								char recvlogs[100] = { 0 };
+								sprintf_s(recvlogs, "类型：%s;   接收：", webdata.strtype.c_str());
+								string strlog = recvlogs + rtnstr;
+								log(strlog.c_str());
 
-							if (rtnstr2 == "4849" || webdata.strtype == "HeartBeat") //成功 //心跳数据是自己发的空环境数据，只要能收到回复就算成功
-							{
-								bSuccess = TRUE;
+								Sleep(10 * 1000);
 							}
 							else
 							{
-								errmsg = rtnstr2;
-							}
 
-						}
+								rtnstr = rtnstr.substr(index, rtnstr.length());
 
 
-						/*
-						int cnt = 0;
-						struct soap soap;
-						soap_init(&soap);
-						soap_set_mode(&soap, SOAP_C_UTFSTRING);
-						soap.mode |= SOAP_C_UTFSTRING;
+								char recvlogs[100] = { 0 };
+								sprintf_s(recvlogs, "类型：%s;   接收：", webdata.strtype.c_str());
+								string strlog = recvlogs + rtnstr;
+								log(strlog.c_str());
 
-						Weather1__post post;
-						Weather1__postResponse postResponse;
 
+								std::string rtnstr2 = "";
 
-						post.data = "";
-						post.data = (char*)webdata.data.data();
+								//rapidxml::xml_document<> doc;
+								doc.parse<0>(const_cast<char*>(rtnstr.c_str()));
 
+								//! 获取根节点
+								rapidxml::xml_node<>* root = doc.first_node();
 
+								//! 获取根节点第一个节点
+								rapidxml::xml_node<>* node1 = root->first_node();
 
-						if (SOAP_OK == soap_call___Weather1__post(&soap, NULL, NULL, &post, postResponse))
-						{
-							char *weather = postResponse.result;
+								rapidxml::xml_node<>* node11 = node1->first_node();
 
-						
-							char recvlogs[100] = { 0 };
-							sprintf_s(recvlogs, "类型：%s;   接收：", webdata.strtype.c_str());
-							string strlog = recvlogs + string(weather);
-							log(strlog.c_str());
 
+								for (rapidxml::xml_node<char> * node = node11->first_node("return");
+									node != NULL;
+									node = node->next_sibling())
+								{
+									rtnstr2 += node->value();
+								}
 
-							webtick = GetTickCount();
 
 
-							if (string(weather) == "48 49" || webdata.strtype == "HeartBeat") //成功 //心跳数据是自己发的空环境数据，只要能收到回复就算成功
-							{
-								cloudstate = "在线";
-								bSuccess = TRUE;
-							}
-							else
-							{
-								cloudstate = "上传失败";
-								errmsg = string(weather);
-							}
+								webtick = GetTickCount();
 
-							if (webdata.type == DataTYPE_Record)
-							{
-								
 
-								if (string(weather) == "48 49") //成功
+								if (rtnstr2 == "4849" || webdata.strtype == "HeartBeat") //成功 //心跳数据是自己发的空环境数据，只要能收到回复就算成功
 								{
-									upflag = 1;
+									bSuccess = TRUE;
 								}
-								else //其它错误
+								else
 								{
-									log("其它错误，分析日志");
-									upflag = 2;
+									errmsg = rtnstr2;
 								}
 
-								
 							}
 						}
 						else
 						{
-							rtnstr = "-101";
+							errmsg = "无id";
 						}
-						
 
-						soap_destroy(&soap);
-						soap_end(&soap);
-						soap_done(&soap);
-						*/
+
+
+						
 
 					}
 					else if (cityno == CITY_ZJ)// 浙江杭州
@@ -389,22 +328,7 @@ void vr_webservice::CreateRequestThread()
 						strrpc(pdata, ">", "&gt;");
 
 
-						/*
-						std::string  xml = " <soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:gas=\"http://www.sucsoft.com/hb/gasonline\">"
-							+ std::string("<soapenv:Header/>")
-							+ "<soapenv:Body>"
-							+ "<gas:post>"
-							
-							+ "<arg0>"
-							+ pdata
-							+"</arg0>"
-
-							+ " </gas:post>"
-							+ "</soapenv:Body>"
-							+ "</soapenv:Envelope>";
-							*/
-
-
+					
 						std::string  xml = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:ser=\"http://service.hzorvr.xx7x.com\">"
 							+ std::string("<soapenv:Header/>")
 							+ "<soapenv:Body>"
@@ -437,14 +361,7 @@ void vr_webservice::CreateRequestThread()
 						rtnstr = http_post_json(chip, port_gen, chpath, jsstr.c_str());
 						rtnstr = UTF8_To_GBKA(rtnstr);
 
-						//rtnstr = http_post_xml(ip_gen.c_str(), port_gen, strpath.c_str(), xml.c_str());
-
-						//Https hpp;
-						//hpp.HttpsPost(chip, port_gen, strpath, xml.c_str(), rtnstr,"","xml");
-						//rtnstr = UTF8_To_GBKA(rtnstr);
-
-
-
+					
 
 						delete[]pdata;
 						pdata = nullptr;

VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包/files/VR/conn.ini

@@ -13,7 +13,7 @@ MainCity=1
 ;远程服务器
 [WebService]
 ;是否开启平台1远程传输。0-关闭；1-开启
-Enable=1
+Enable=0
 ;是否开启平台2远程传输。0-关闭；1-开启
 Enable2=0
 ;是否开启平台3远程传输。0-关闭；1-开启

iniConfigTool/iniConfigTool/PvConfig.cpp

@@ -0,0 +1,127 @@
+// PvConfig.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "iniConfigTool.h"
+#include "PvConfig.h"
+#include "afxdialogex.h"
+#include "global.h"
+
+// CPvConfig dialog
+
+IMPLEMENT_DYNAMIC(CPvConfig, CDialogEx)
+
+CPvConfig::CPvConfig(CWnd* pParent /*=NULL*/)
+	: CDialogEx(CPvConfig::IDD, pParent)
+{
+
+}
+
+CPvConfig::~CPvConfig()
+{
+}
+
+void CPvConfig::DoDataExchange(CDataExchange* pDX)
+{
+	CDialogEx::DoDataExchange(pDX);
+	DDX_Control(pDX, IDC_EDIT_PV_PRESS, ED_PV_PRESS);
+	DDX_Control(pDX, IDC_EDIT_PV_PRESS_N, ED_PV_PRESS_N);
+	DDX_Control(pDX, IDC_CHECK_POST, BTN_Enable_Post);
+	DDX_Control(pDX, IDC_EDIT_POST_PRESS, ED_POST_PRESS);
+	DDX_Control(pDX, IDC_EDIT_POST_PRESS_S, ED_POST_PRESS_S);
+	DDX_Control(pDX, IDC_EDIT_POST_ID, ED_POST_ID);
+}
+
+
+BEGIN_MESSAGE_MAP(CPvConfig, CDialogEx)
+	ON_EN_CHANGE(IDC_EDIT_PV_PRESS, &CPvConfig::OnEnChangeEditPvPress)
+	ON_EN_CHANGE(IDC_EDIT_PV_PRESS_N, &CPvConfig::OnEnChangeEditPvPressN)
+	ON_BN_CLICKED(IDC_CHECK_POST, &CPvConfig::OnBnClickedCheckPost)
+	ON_EN_CHANGE(IDC_EDIT_POST_PRESS, &CPvConfig::OnEnChangeEditPostPress)
+	ON_EN_CHANGE(IDC_EDIT_POST_PRESS_S, &CPvConfig::OnEnChangeEditPostPressS)
+	ON_EN_CHANGE(IDC_EDIT_POST_ID, &CPvConfig::OnEnChangeEditPostId)
+END_MESSAGE_MAP()
+
+
+// CPvConfig message handlers
+
+
+BOOL CPvConfig::OnInitDialog()
+{
+	CDialogEx::OnInitDialog();
+
+
+
+
+
+	int PV_Press = GetPrivateProfileIntA("PV", "Pressure", 0, ".//conn.ini");
+	int PV_Press_N = GetPrivateProfileIntA("PV", "Pressure_N", 0, ".//conn.ini");
+
+	int POST_Enable = GetPrivateProfileIntA("PostProcess", "Enable", 0, ".//conn.ini");
+	int POST_Press = GetPrivateProfileIntA("PostProcess", "Pressure", 0, ".//conn.ini");
+	int POST_Press_S = GetPrivateProfileIntA("PostProcess", "Pressure_S", 0, ".//conn.ini");
+	int POST_ID = GetPrivateProfileIntA("PostProcess", "id", 0, ".//conn.ini");
+
+
+	ED_PV_PRESS.SetWindowTextA(to_string(PV_Press).c_str());
+	ED_PV_PRESS_N.SetWindowTextA(to_string(-1* PV_Press_N).c_str());
+
+	BTN_Enable_Post.SetCheck(POST_Enable);
+	ED_POST_PRESS.SetWindowTextA(to_string(POST_Press).c_str());
+	ED_POST_PRESS_S.SetWindowTextA(to_string(-1 * POST_Press_S).c_str());
+	ED_POST_ID.SetWindowTextA(to_string(POST_ID).c_str());
+
+
+
+
+
+	return TRUE;  // return TRUE unless you set the focus to a control
+	// EXCEPTION: OCX Property Pages should return FALSE
+}
+
+
+void CPvConfig::OnEnChangeEditPvPress()
+{
+	CString str;
+	ED_PV_PRESS.GetWindowTextA(str);
+	WritePrivateProfileStringA("PV", "Pressure", str, ".//conn.ini");
+}
+
+
+void CPvConfig::OnEnChangeEditPvPressN()
+{
+	CString str;
+	ED_PV_PRESS_N.GetWindowTextA(str);
+	WritePrivateProfileStringA("PV", "Pressure_N", ("-"+str), ".//conn.ini");
+}
+
+
+void CPvConfig::OnBnClickedCheckPost()
+{
+	int check = BTN_Enable_Post.GetCheck();
+	WritePrivateProfileStringA("PostProcess", "Enable", to_string(check).c_str(), ".//conn.ini");
+}
+
+
+void CPvConfig::OnEnChangeEditPostPress()
+{
+	CString str;
+	ED_POST_PRESS.GetWindowTextA(str);
+	WritePrivateProfileStringA("PostProcess", "Pressure", str, ".//conn.ini");
+}
+
+
+void CPvConfig::OnEnChangeEditPostPressS()
+{
+	CString str;
+	ED_POST_PRESS_S.GetWindowTextA(str);
+	WritePrivateProfileStringA("PostProcess", "Pressure_S", ("-" + str), ".//conn.ini");
+}
+
+
+void CPvConfig::OnEnChangeEditPostId()
+{
+	CString str;
+	ED_POST_ID.GetWindowTextA(str);
+	WritePrivateProfileStringA("PostProcess", "id", str, ".//conn.ini");
+}

iniConfigTool/iniConfigTool/PvConfig.h

@@ -0,0 +1,36 @@
+#pragma once
+#include "afxwin.h"
+
+
+// CPvConfig dialog
+
+class CPvConfig : public CDialogEx
+{
+	DECLARE_DYNAMIC(CPvConfig)
+
+public:
+	CPvConfig(CWnd* pParent = NULL);   // standard constructor
+	virtual ~CPvConfig();
+
+// Dialog Data
+	enum { IDD = IDD_DIALOG1 };
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+
+	DECLARE_MESSAGE_MAP()
+public:
+	virtual BOOL OnInitDialog();
+	CEdit ED_PV_PRESS;
+	CEdit ED_PV_PRESS_N;
+	CButton BTN_Enable_Post;
+	CEdit ED_POST_PRESS;
+	CEdit ED_POST_PRESS_S;
+	CEdit ED_POST_ID;
+	afx_msg void OnEnChangeEditPvPress();
+	afx_msg void OnEnChangeEditPvPressN();
+	afx_msg void OnBnClickedCheckPost();
+	afx_msg void OnEnChangeEditPostPress();
+	afx_msg void OnEnChangeEditPostPressS();
+	afx_msg void OnEnChangeEditPostId();
+};

iniConfigTool/iniConfigTool/conn.ini

@@ -261,9 +261,9 @@ AllowTankConfilt=0
 ;P/V阀
 [PV]
 ;正开启压力，单位 Pa， 整数
-Pressure=2200
+Pressure=1800
 ;负开启压力，单位 Pa , 负整数
-Pressure_N=-2200
+Pressure_N=-1800
 
 
 ;后处理装置
@@ -271,9 +271,10 @@ Pressure_N=-2200
 ;是否开启。0-关闭；1-开启
 Enable=1
 ;开启压力，单位 Pa，  整数
-Pressure=200
+Pressure=250
 ;停止压力，单位 Pa ，负整数
-Pressure_S=-150
+Pressure_S=-250
+id=1
 
 
 

iniConfigTool/iniConfigTool/global.h

@@ -1,4 +1,7 @@
 #pragma once
 
 
+#include <string>
+using namespace std;
+
 CString _I2T(int i);

iniConfigTool/iniConfigTool/iniConfigTool.vcxproj

@@ -106,6 +106,7 @@
     <ClInclude Include="global.h" />
     <ClInclude Include="iniConfigTool.h" />
     <ClInclude Include="iniConfigToolDlg.h" />
+    <ClInclude Include="PvConfig.h" />
     <ClInclude Include="Resource.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
@@ -114,6 +115,7 @@
     <ClCompile Include="global.cpp" />
     <ClCompile Include="iniConfigTool.cpp" />
     <ClCompile Include="iniConfigToolDlg.cpp" />
+    <ClCompile Include="PvConfig.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

iniConfigTool/iniConfigTool/iniConfigTool.vcxproj.filters

@@ -36,6 +36,9 @@
     <ClInclude Include="global.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="PvConfig.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="iniConfigTool.cpp">
@@ -50,6 +53,9 @@
     <ClCompile Include="global.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="PvConfig.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="iniConfigTool.rc">

iniConfigTool/iniConfigTool/iniConfigToolDlg.cpp

@@ -7,7 +7,7 @@
 #include "iniConfigToolDlg.h"
 #include "afxdialogex.h"
 #include "global.h"
-
+#include "PvConfig.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -192,6 +192,7 @@ BEGIN_MESSAGE_MAP(CiniConfigToolDlg, CDialogEx)
 	ON_EN_CHANGE(IDC_EDIT33, &CiniConfigToolDlg::OnEnChangeEdit33)
 	ON_EN_CHANGE(IDC_EDIT34, &CiniConfigToolDlg::OnEnChangeEdit34)
 	ON_BN_CLICKED(IDC_CHECK28, &CiniConfigToolDlg::OnBnClickedCheck28)
+	ON_BN_CLICKED(IDC_BUTTON2, &CiniConfigToolDlg::OnBnClickedButton2)
 END_MESSAGE_MAP()
 
 
@@ -1151,3 +1152,10 @@ void CiniConfigToolDlg::OnBnClickedCheck28()
 
 	WritePrivateProfileString("Tank", "AllowTankConfilt", _I2T(check), ".//conn.ini");
 }
+
+
+void CiniConfigToolDlg::OnBnClickedButton2()
+{
+	CPvConfig dlg;
+	dlg.DoModal();
+}

iniConfigTool/iniConfigTool/iniConfigToolDlg.h

@@ -303,6 +303,7 @@ public:
 	afx_msg void OnEnChangeEdit34();
 	CButton CH_AllowConflict;
 	afx_msg void OnBnClickedCheck28();
+	afx_msg void OnBnClickedButton2();
 };
 
 class COMMS