Forráskód Böngészése

重新修复提交V1.16.18

DFS_Shuo_Chen 6 hónapja
szülő
commit
c1343fd5bf
19 módosított fájl, 601 hozzáadás és 60 törlés
  1. 2 0
      .gitignore
  2. 2 2
      ChatRoomClient-VR/Release/conn.ini
  3. BIN
      VaporRecoveryMonitor/VaporRecoveryMonitor/Bin/DuiLib_u.dll
  4. BIN
      VaporRecoveryMonitor/VaporRecoveryMonitor/Bin/VaporRecoveryMonitor.exe
  5. BIN
      VaporRecoveryMonitor/VaporRecoveryMonitor/Bin/setting/setting.db
  6. BIN
      VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRec.A31C344F.tlog/CL.read.1.tlog
  7. BIN
      VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRec.A31C344F.tlog/CL.write.1.tlog
  8. BIN
      VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRec.A31C344F.tlog/cl.command.1.tlog
  9. BIN
      VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRec.A31C344F.tlog/link.read.1.tlog
  10. 45 45
      VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRecoveryMonitor.Build.CppClean.log
  11. 517 3
      VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRecoveryMonitor.log
  12. 8 8
      VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/conn.ini
  13. 14 0
      VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_object.cpp
  14. 13 2
      VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_ui.cpp
  15. BIN
      VaporRecoveryMonitor/VaporRecoveryMonitor/lib/DuiLib_u.exp
  16. BIN
      VaporRecoveryMonitor/VaporRecoveryMonitor/lib/DuiLib_u.lib
  17. BIN
      VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控版本.xlsx
  18. BIN
      VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包/files/VR/DuiLib_u.dll
  19. BIN
      VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包/files/VR/VaporRecoveryMonitor.exe

+ 2 - 0
.gitignore

@@ -139,3 +139,5 @@ VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统
 VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.17.zip
 VaporRecoveryMonitor/油气回收系统安装包/1.bat
 VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.18.zip
+VaporRecoveryMonitor/VaporRecoveryMonitor/Bin/data-beijing/
+VaporRecoveryMonitor/VaporRecoveryMonitor/Bin/data-1/

+ 2 - 2
ChatRoomClient-VR/Release/conn.ini

@@ -5,8 +5,8 @@ YLS=10.00
 QLS=10.00
 YL=15.00
 QL=15.00
-VL=1.50
-TTC=13
+VL=1.10
+TTC=39
 ERROR=0
 PRESS=0
 PWM=0

BIN
VaporRecoveryMonitor/VaporRecoveryMonitor/Bin/DuiLib_u.dll


BIN
VaporRecoveryMonitor/VaporRecoveryMonitor/Bin/VaporRecoveryMonitor.exe


BIN
VaporRecoveryMonitor/VaporRecoveryMonitor/Bin/setting/setting.db


BIN
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRec.A31C344F.tlog/CL.read.1.tlog


BIN
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRec.A31C344F.tlog/CL.write.1.tlog


BIN
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRec.A31C344F.tlog/cl.command.1.tlog


BIN
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRec.A31C344F.tlog/link.read.1.tlog


+ 45 - 45
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRecoveryMonitor.Build.CppClean.log

@@ -1,54 +1,28 @@
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vc120.pdb
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vr_webservice.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\https.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_hn.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_fj_xm.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\sm4.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\aes.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\sqlite3.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\shell.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vaporrecoverymonitor.pch
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\stdafx.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vrcobject.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\uploaddetaildlg.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\uploaddata.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\temperaturedetaildlg.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\tankmanage.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\sm4.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\sm3.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\pressuredetaildlg.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\myxml.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\myseries.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\md5.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\liquiddetaildlg.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\jsoncpp.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\instance.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\global.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\gasmanage.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\gasdetaildlg.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\errorinfodlg.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\errordlg.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\des.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\databackup.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\commobject.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\bigscreenmonitor.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\base64.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_cq_2.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_cq.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_bj_zsh.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_bj.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_ah_hf.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vr_ext.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vr_devices.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vr_db.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vr_common.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\sqlite3_engine.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vr_app.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vrcobject.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\uploaddetaildlg.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\uploaddata.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\tool.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\temperaturedetaildlg.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\tankmanage.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_hb_zjk.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_hb_wh.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_hb_ts.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_gd_zs_zh.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_gd_zsh.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_gd_zj.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\aes.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_gd_zh.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_gd_yj.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_gd_yf.obj
@@ -61,12 +35,14 @@ c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecovery
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_gd_gz.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_gd_dg.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_fs_nh.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_fssd.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_fs.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_zj_zsh.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_zj_wz.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_zj_tz.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_zj_sy.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_zj_nb.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_fj_xm.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_cq_2.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_cq.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_bj_zsh.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_bj.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_ah_hf.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_zj_gs.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_zj.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_zhdde.obj
@@ -79,14 +55,38 @@ c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecovery
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_nmg_hhht.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_nj.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_middleware.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_fssd.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_hn_cs.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_hn.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_hb_zjk.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_hb_wh.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_hb_ts.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_gd_zs_zh.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_gd_zsh.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_gd_zj.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vr_ext.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vr_devices.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vr_db.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vr_common.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vr_app.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\tool.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\sqlite3_engine.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\md5.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\jsoncpp.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\instance.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\https.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\global.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\des.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\base64.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\_io.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_zj_zsh.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_zj_wz.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_zj_tz.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_zj_sy.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\weblink_zj_nb.obj
+c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vr_webservice.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vr_ui.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vr_server.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vr_object.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\_io.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\sqlite3.obj
-c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\shell.obj
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\bin\vaporrecoverymonitor.exe
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\bin\vaporrecoverymonitor.pdb
 c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\release\vaporrecoverymonitor.res

+ 517 - 3
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRecoveryMonitor.log

@@ -1,7 +1,353 @@
-Build started 2025/7/3 17:00:35.
+Build started 2025/7/1 10:23:26.
      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 /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(375): 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(415): 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(426): 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(435): 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(545): 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(884): 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(1156): 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 BigScreenMonitor.cpp CommObject.cpp DataBackup.cpp ErrorDlg.cpp ErrorInfoDlg.cpp GasDetailDlg.cpp GasManage.cpp LiquidDetailDlg.cpp MySeries.cpp MyXML.cpp PressureDetailDlg.cpp SM3.cpp SM4.cpp TankManage.cpp TemperatureDetailDlg.cpp UploadData.cpp UploadDetailDlg.cpp VRCObject.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_FSSD.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_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 base64.cpp des.cpp global.cpp https.cpp instance.cpp jsoncpp.cpp md5.cpp sqlite3_engine.cpp tool.cpp vr_app.cpp vr_common.cpp vr_db.cpp vr_devices.cpp vr_ext.cpp vr_object.cpp vr_server.cpp vr_ui.cpp vr_webservice.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
+         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
+         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
+         LiquidDetailDlg.cpp
+         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
+         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
+         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
+         WebLink.cpp
+     1>WebLink.cpp(75): warning C4101: 'time' : unreferenced local variable
+         Compiling...
+         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(465): warning C4018: '<' : signed/unsigned mismatch
+     1>WebLink_BJ.cpp(663): 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
+         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_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_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
+         Compiling...
+         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
+         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_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
+         Compiling...
+         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
+         _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'
+         base64.cpp
+         des.cpp
          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
@@ -18,6 +364,174 @@
      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(340): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
+     1>instance.cpp(345): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
+     1>instance.cpp(350): warning C4244: '=' : conversion from 'double' to 'unsigned int', possible loss of data
+     1>instance.cpp(355): 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
+         md5.cpp
+     1>md5.cpp(142): warning C4244: 'argument' : conversion from 'std::streamsize' to 'size_t', possible loss of data
+         sqlite3_engine.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
+         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(637): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
+     1>vr_app.cpp(641): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
+     1>vr_app.cpp(645): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
+     1>vr_app.cpp(649): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
+     1>vr_app.cpp(653): warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
+     1>vr_app.cpp(902): 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(1619): warning C4018: '>=' : signed/unsigned mismatch
+     1>vr_app.cpp(1700): warning C4018: '>=' : signed/unsigned mismatch
+     1>vr_app.cpp(1712): warning C4018: '>=' : signed/unsigned mismatch
+     1>vr_app.cpp(1726): warning C4018: '>=' : signed/unsigned mismatch
+     1>vr_app.cpp(1741): warning C4018: '>=' : signed/unsigned mismatch
+     1>vr_app.cpp(1753): warning C4018: '>' : signed/unsigned mismatch
+     1>vr_app.cpp(1784): warning C4018: '<' : signed/unsigned mismatch
+     1>vr_app.cpp(1786): warning C4018: '>' : signed/unsigned mismatch
+     1>vr_app.cpp(1816): warning C4018: '>' : signed/unsigned mismatch
+     1>vr_app.cpp(1825): warning C4018: '>' : signed/unsigned mismatch
+     1>vr_app.cpp(1833): warning C4018: '>' : signed/unsigned mismatch
+     1>vr_app.cpp(1841): warning C4018: '>' : signed/unsigned mismatch
+     1>vr_app.cpp(1852): warning C4018: '>' : signed/unsigned mismatch
+     1>vr_app.cpp(1862): warning C4018: '>' : signed/unsigned mismatch
+     1>vr_app.cpp(1874): warning C4018: '>' : signed/unsigned mismatch
+     1>vr_app.cpp(1884): warning C4018: '>' : signed/unsigned mismatch
+     1>vr_app.cpp(2508): warning C4018: '<' : signed/unsigned mismatch
+     1>vr_app.cpp(2601): warning C4302: 'type cast' : truncation from 'LPWSTR' to 'WORD'
+     1>vr_app.cpp(2954): warning C4172: returning address of local variable or temporary
+     1>vr_app.cpp(2955): warning C4172: returning address of local variable or temporary
+     1>vr_app.cpp(3059): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+     1>vr_app.cpp(3379): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+     1>vr_app.cpp(3748): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+     1>vr_app.cpp(4261): warning C4242: '=' : conversion from 'int' to 'byte', possible loss of data
+     1>vr_app.cpp(4389): warning C4018: '<' : signed/unsigned mismatch
+     1>vr_app.cpp(4447): warning C4244: 'initializing' : conversion from 'double' to 'int', possible loss of data
+     1>vr_app.cpp(5175): warning C4018: '<' : signed/unsigned mismatch
+     1>vr_app.cpp(5425): 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(3475) : see reference to function template instantiation 'rapidxml::file<char>::file(const char *)' being compiled
+                 vr_app.cpp(3475) : 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>>>>>>>
+                 ]
+         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(2077): warning C4244: 'argument' : conversion from 'double' to 'int', possible loss of data
+     1>vr_ext.cpp(2079): warning C4244: 'argument' : conversion from 'double' to 'int', possible loss of data
+     1>vr_ext.cpp(2081): warning C4244: 'argument' : conversion from 'double' to 'int', possible loss of data
+     1>vr_ext.cpp(2083): warning C4244: 'argument' : conversion from 'double' to 'int', possible loss of data
+     1>vr_ext.cpp(2122): 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(4772): warning C4018: '<' : signed/unsigned mismatch
+     1>vr_ext.cpp(4872): warning C4018: '<' : signed/unsigned mismatch
+     1>vr_ext.cpp(5274): warning C4018: '<' : signed/unsigned mismatch
+     1>vr_ext.cpp(5572): warning C4018: '>=' : signed/unsigned mismatch
+     1>vr_ext.cpp(5605): warning C4244: '=' : conversion from 'double' to 'UINT', possible loss of data
+     1>vr_ext.cpp(5626): warning C4242: '=' : conversion from 'int' to 'BYTE', possible loss of data
+     1>vr_ext.cpp(5900): warning C4018: '<' : signed/unsigned mismatch
+         Compiling...
+         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(581): warning C4018: '>=' : signed/unsigned mismatch
+     1>vr_object.cpp(596): warning C4018: '>=' : signed/unsigned mismatch
+     1>vr_object.cpp(619): warning C4018: '>=' : signed/unsigned mismatch
+     1>vr_object.cpp(621): warning C4018: '>=' : signed/unsigned mismatch
+     1>vr_object.cpp(630): warning C4018: '>=' : signed/unsigned mismatch
+     1>vr_object.cpp(639): warning C4018: '>=' : signed/unsigned mismatch
+     1>vr_object.cpp(1159): 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(406): warning C4018: '>' : signed/unsigned mismatch
+     1>vr_ui.cpp(406): warning C4018: '<' : signed/unsigned mismatch
+     1>vr_ui.cpp(1267): warning C4018: '<' : signed/unsigned mismatch
+     1>vr_ui.cpp(1394): warning C4018: '<' : signed/unsigned mismatch
+     1>vr_ui.cpp(1559): warning C4018: '<' : signed/unsigned mismatch
+         vr_webservice.cpp
+     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
@@ -152,4 +666,4 @@
 
 Build succeeded.
 
-Time Elapsed 00:00:09.64
+Time Elapsed 00:00:30.08

+ 8 - 8
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/conn.ini

@@ -908,12 +908,12 @@ Port=10000
 
 
 [DataID]
-Record=67106
-Environment=105849
-Config=3220
-Warning=13725
-Error=1625
-NozState=1602
+Record=67134
+Environment=105859
+Config=3228
+Warning=13732
+Error=1626
+NozState=1603
 NozControl=36
 NozzleInfo=153
 StationInfo=94
@@ -939,13 +939,13 @@ enablefillinglog=1
 nozstr=
 tankstr=
 stationname=Öé½­¶þ¼ÓÓÍÕ¾
-Times=1:1;2:0;5:0;6:0;13:0;14:0;15:0;16:0;17:0;18:0;19:0;20:0;23:0;24:0;
+Times=1:0;2:0;5:0;6:0;13:0;14:0;15:0;16:0;17:0;18:0;19:0;20:0;23:0;24:0;
 Times_alert=1:0;2:0;5:0;6:0;13:0;14:0;15:0;16:0;17:0;18:0;19:0;20:0;23:0;24:0;
 configupdatetime=20250703160542
 
 [RunningState]
 UnLockFlag=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Date=20250703
+Date=20250702
 TradeFlag=100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 
 

+ 14 - 0
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_object.cpp

@@ -585,6 +585,13 @@ void nozzle_object::update_warning(int nozzleid,string date)
 						warning_.continue_days++;
 					}
 				}
+				else
+				{
+					if (acc_total >= 5)
+					{
+						warning_.continue_days = 0;
+					}
+				}
 
 				if (acc_rate_alert >= VR::rules::ref_prewarning_index_alert)
 				{
@@ -593,6 +600,13 @@ void nozzle_object::update_warning(int nozzleid,string date)
 						warning_.continue_days_alert++;
 					}
 				}
+				else
+				{
+					if (acc_total >= 5)
+					{
+						warning_.continue_days_alert = 0;
+					}
+				}
 
 				acc_over = 0;//已经算入一天,清零
 				acc_over_2 = 0;//已经算入一天,清零

+ 13 - 2
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_ui.cpp

@@ -280,9 +280,20 @@ void NozzleUI_2::update_warning(const warning_record& warning)
 	{
 		EnableAlarm(2);
 	}
-	else if (m_warning.continue_days >= 1 && m_warning.last >= rules::ref_prewarning_index)
+	else if (m_warning.continue_days >= 1)
 	{
-		EnableAlarm(1);
+		if (rules::ref_reach_count)
+		{
+			EnableAlarm(1);
+		}
+		else
+		{
+			if (m_warning.last >= rules::ref_prewarning_index)
+			{
+				EnableAlarm(1);
+			}
+		}
+		
 	}
 	else
 	{

BIN
VaporRecoveryMonitor/VaporRecoveryMonitor/lib/DuiLib_u.exp


BIN
VaporRecoveryMonitor/VaporRecoveryMonitor/lib/DuiLib_u.lib


BIN
VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控版本.xlsx


BIN
VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包/files/VR/DuiLib_u.dll


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