From 59e193f30966220dd5562437c7f25978de2e9d69 Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Thu, 28 Jul 2022 18:06:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E5=BC=A0=E6=95=B0=E5=92=8C?= =?UTF-8?q?=E6=BB=9A=E8=BD=B4=E8=AE=A1=E6=95=B0=EF=BC=8C=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../windows/HGScannerLib/HGScannerLib.vcxproj | 16 ++++++------ .../windows/HGWebService/HGWebService.vcxproj | 16 ++++++------ modules/version/HGVersionImpl.cpp | 26 +++++++++---------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build/windows/HGScannerLib/HGScannerLib.vcxproj b/build/windows/HGScannerLib/HGScannerLib.vcxproj index 0893d4d8..5b2aae68 100644 --- a/build/windows/HGScannerLib/HGScannerLib.vcxproj +++ b/build/windows/HGScannerLib/HGScannerLib.vcxproj @@ -184,7 +184,7 @@ true false HGScannerLib.def - ../Debug/HGBase.lib;../Debug/HGImgFmt.lib;../Debug/HGImgProc.lib;../../../../sdk/lib/win/x86/Release/sane.lib;%(AdditionalDependencies) + ../Debug/HGBase.lib;../Debug/HGImgFmt.lib;../Debug/HGImgProc.lib;../../../../sdk/lib/win/x86/OEM/huagao/sane.lib;%(AdditionalDependencies) @@ -207,7 +207,7 @@ true false HGScannerLib.def - ../Release/HGBase.lib;../Release/HGImgFmt.lib;../Release/HGImgProc.lib;../../../../sdk/lib/win/x86/Release/sane.lib;%(AdditionalDependencies) + ../Release/HGBase.lib;../Release/HGImgFmt.lib;../Release/HGImgProc.lib;../../../../sdk/lib/win/x86/OEM/huagao/sane.lib;%(AdditionalDependencies) /LTCG %(AdditionalOptions) @@ -238,7 +238,7 @@ copy $(OutDir)HGScannerLib.dll $(SolutionDir)..\..\..\release\win\x86\Release\true false HGScannerLib.def - ../HWRelease/HWBase.lib;../HWRelease/HWImgFmt.lib;../HWRelease/HWImgProc.lib;../../../../sdk/lib/win/x86/Release/sane.lib;%(AdditionalDependencies) + ../HWRelease/HWBase.lib;../HWRelease/HWImgFmt.lib;../HWRelease/HWImgProc.lib;../../../../sdk/lib/win/x86/OEM/hanvon/sane.lib;%(AdditionalDependencies) /LTCG %(AdditionalOptions) @@ -269,7 +269,7 @@ copy $(OutDir)HWScannerLib.dll $(SolutionDir)..\..\..\release\win\x86\Release\true false HGScannerLib.def - ../LSCRelease/LSCBase.lib;../LSCRelease/LSCImgFmt.lib;../LSCRelease/LSCImgProc.lib;../../../../sdk/lib/win/x86/Release/sane.lib;%(AdditionalDependencies) + ../LSCRelease/LSCBase.lib;../LSCRelease/LSCImgFmt.lib;../LSCRelease/LSCImgProc.lib;../../../../sdk/lib/win/x86/OEM/lanxum/sane.lib;%(AdditionalDependencies) /LTCG %(AdditionalOptions) @@ -296,7 +296,7 @@ copy $(OutDir)LSCScannerLib.dll $(SolutionDir)..\..\..\release\win\x86\Release\< true false HGScannerLib.def - ../x64/Debug/HGBase.lib;../x64/Debug/HGImgFmt.lib;../x64/Debug/HGImgProc.lib;../../../../sdk/lib/win/x64/Release/sane.lib;%(AdditionalDependencies) + ../x64/Debug/HGBase.lib;../x64/Debug/HGImgFmt.lib;../x64/Debug/HGImgProc.lib;../../../../sdk/lib/win/x64/OEM/huagao/sane.lib;%(AdditionalDependencies) @@ -319,7 +319,7 @@ copy $(OutDir)LSCScannerLib.dll $(SolutionDir)..\..\..\release\win\x86\Release\< true false HGScannerLib.def - ../x64/Release/HGBase.lib;../x64/Release/HGImgFmt.lib;../x64/Release/HGImgProc.lib;../../../../sdk/lib/win/x64/Release/sane.lib;%(AdditionalDependencies) + ../x64/Release/HGBase.lib;../x64/Release/HGImgFmt.lib;../x64/Release/HGImgProc.lib;../../../../sdk/lib/win/x64/OEM/huagao/sane.lib;%(AdditionalDependencies) /LTCG %(AdditionalOptions) @@ -350,7 +350,7 @@ copy $(OutDir)HGScannerLib.dll $(SolutionDir)..\..\..\release\win\x64\Release\true false HGScannerLib.def - ../x64/HWRelease/HWBase.lib;../x64/HWRelease/HWImgFmt.lib;../x64/HWRelease/HWImgProc.lib;../../../../sdk/lib/win/x64/Release/sane.lib;%(AdditionalDependencies) + ../x64/HWRelease/HWBase.lib;../x64/HWRelease/HWImgFmt.lib;../x64/HWRelease/HWImgProc.lib;../../../../sdk/lib/win/x64/OEM/hanvon/sane.lib;%(AdditionalDependencies) /LTCG %(AdditionalOptions) @@ -381,7 +381,7 @@ copy $(OutDir)HWScannerLib.dll $(SolutionDir)..\..\..\release\win\x64\Release\true false HGScannerLib.def - ../x64/LSCRelease/LSCBase.lib;../x64/LSCRelease/LSCImgFmt.lib;../x64/LSCRelease/LSCImgProc.lib;../../../../sdk/lib/win/x64/Release/sane.lib;%(AdditionalDependencies) + ../x64/LSCRelease/LSCBase.lib;../x64/LSCRelease/LSCImgFmt.lib;../x64/LSCRelease/LSCImgProc.lib;../../../../sdk/lib/win/x64/OEM/lanxum/sane.lib;%(AdditionalDependencies) /LTCG %(AdditionalOptions) diff --git a/build/windows/HGWebService/HGWebService.vcxproj b/build/windows/HGWebService/HGWebService.vcxproj index 241b31fb..ece96bbb 100644 --- a/build/windows/HGWebService/HGWebService.vcxproj +++ b/build/windows/HGWebService/HGWebService.vcxproj @@ -210,7 +210,7 @@ Windows true - ../Debug/HGBase.lib;../Debug/HGImgFmt.lib;../Debug/HGImgProc.lib;../../../../sdk/lib/win/x86/Release/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurld.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) + ../Debug/HGBase.lib;../Debug/HGImgFmt.lib;../Debug/HGImgProc.lib;../../../../sdk/lib/win/x86/OEM/huagao/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurld.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) /ignore:4098,4099,4075 /LTCG %(AdditionalOptions) @@ -230,7 +230,7 @@ true true true - ../Release/HGBase.lib;../Release/HGImgFmt.lib;../Release/HGImgProc.lib;../../../../sdk/lib/win/x86/Release/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) + ../Release/HGBase.lib;../Release/HGImgFmt.lib;../Release/HGImgProc.lib;../../../../sdk/lib/win/x86/OEM/huagao/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) /ignore:4099 /LTCG %(AdditionalOptions) @@ -253,7 +253,7 @@ true true true - ../HWRelease/HWBase.lib;../HWRelease/HWImgFmt.lib;../HWRelease/HWImgProc.lib;../../../../sdk/lib/win/x86/Release/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) + ../HWRelease/HWBase.lib;../HWRelease/HWImgFmt.lib;../HWRelease/HWImgProc.lib;../../../../sdk/lib/win/x86/OEM/hanvon/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) /ignore:4099 /LTCG %(AdditionalOptions) @@ -276,7 +276,7 @@ true true true - ../LSCRelease/LSCBase.lib;../LSCRelease/LSCImgFmt.lib;../LSCRelease/LSCImgProc.lib;../../../../sdk/lib/win/x86/Release/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) + ../LSCRelease/LSCBase.lib;../LSCRelease/LSCImgFmt.lib;../LSCRelease/LSCImgProc.lib;../../../../sdk/lib/win/x86/OEM/lanxum/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) /ignore:4099 /LTCG %(AdditionalOptions) @@ -295,7 +295,7 @@ Windows true - ../x64/Debug/HGBase.lib;../x64/Debug/HGImgFmt.lib;../x64/Debug/HGImgProc.lib;../../../../sdk/lib/win/x64/Release/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;ws2_32.lib;%(AdditionalDependencies) + ../x64/Debug/HGBase.lib;../x64/Debug/HGImgFmt.lib;../x64/Debug/HGImgProc.lib;../../../../sdk/lib/win/x64/OEM/huagao/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;ws2_32.lib;%(AdditionalDependencies) /ignore:4098,4099,4075 /LTCG %(AdditionalOptions) @@ -315,7 +315,7 @@ true true true - ../x64/Release/HGBase.lib;../x64/Release/HGImgFmt.lib;../x64/Release/HGImgProc.lib;../../../../sdk/lib/win/x64/Release/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;ws2_32.lib;%(AdditionalDependencies) + ../x64/Release/HGBase.lib;../x64/Release/HGImgFmt.lib;../x64/Release/HGImgProc.lib;../../../../sdk/lib/win/x64/OEM/huagao/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;ws2_32.lib;%(AdditionalDependencies) /LTCG %(AdditionalOptions) @@ -338,7 +338,7 @@ true true true - ../x64/HWRelease/HWBase.lib;../x64/HWRelease/HWImgFmt.lib;../x64/HWRelease/HWImgProc.lib;../../../../sdk/lib/win/x64/Release/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;ws2_32.lib;%(AdditionalDependencies) + ../x64/HWRelease/HWBase.lib;../x64/HWRelease/HWImgFmt.lib;../x64/HWRelease/HWImgProc.lib;../../../../sdk/lib/win/x64/OEM/hanvon/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;ws2_32.lib;%(AdditionalDependencies) /LTCG %(AdditionalOptions) @@ -361,7 +361,7 @@ true true true - ../x64/LSCRelease/LSCBase.lib;../x64/LSCRelease/LSCImgFmt.lib;../x64/LSCRelease/LSCImgProc.lib;../../../../sdk/lib/win/x64/Release/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;ws2_32.lib;%(AdditionalDependencies) + ../x64/LSCRelease/LSCBase.lib;../x64/LSCRelease/LSCImgFmt.lib;../x64/LSCRelease/LSCImgProc.lib;../../../../sdk/lib/win/x64/OEM/lanxum/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;ws2_32.lib;%(AdditionalDependencies) /LTCG %(AdditionalOptions) diff --git a/modules/version/HGVersionImpl.cpp b/modules/version/HGVersionImpl.cpp index 3989fa16..723ba233 100644 --- a/modules/version/HGVersionImpl.cpp +++ b/modules/version/HGVersionImpl.cpp @@ -655,7 +655,7 @@ static HGResult PostUserFeedback(const std::string& appName, const std::string& } static HGResult PostDeviceInfo(const std::string& devName, const std::string& devSN, const std::string& devType, - const std::string& devFW, HGUInt start, HGUInt close, HGUInt scan, HGUInt clean, HGUInt count, HGUInt pages) + const std::string& devFW, HGUInt start, HGUInt close, HGUInt scan, HGUInt clean, HGInt count, HGInt pages) { HGResult ret = HGBASE_ERR_FAIL; CURL* curl = curl_easy_init(); @@ -1061,7 +1061,7 @@ HGResult HGVersionMgrImpl::PostUserFeedback(const HGChar* appName, const HGChar* HGResult HGVersionMgrImpl::PostDeviceOpenInfo(const HGChar* devName, const HGChar* devSN, const HGChar* devType, const HGChar* devFW) { - if (!m_serverCfg.postDeviceInfo) + if (!m_serverCfg.postDeviceInfo || NULL == devSN || '\0' == *devSN) return HGBASE_ERR_FAIL; PostDeviceInfoParam* param = new PostDeviceInfoParam; @@ -1082,7 +1082,7 @@ HGResult HGVersionMgrImpl::PostDeviceOpenInfo(const HGChar* devName, const HGCha HGResult HGVersionMgrImpl::PostDeviceCloseInfo(const HGChar* devName, const HGChar* devSN, const HGChar* devType, const HGChar* devFW) { - if (!m_serverCfg.postDeviceInfo) + if (!m_serverCfg.postDeviceInfo || NULL == devSN || '\0' == *devSN) return HGBASE_ERR_FAIL; PostDeviceInfoParam* param = new PostDeviceInfoParam; @@ -1103,7 +1103,7 @@ HGResult HGVersionMgrImpl::PostDeviceCloseInfo(const HGChar* devName, const HGCh HGResult HGVersionMgrImpl::PostDeviceScanCountInfo(const HGChar* devName, const HGChar* devSN, const HGChar* devType, const HGChar* devFW, HGUInt scanCount) { - if (!m_serverCfg.postDeviceInfo) + if (!m_serverCfg.postDeviceInfo || NULL == devSN || '\0' == *devSN) return HGBASE_ERR_FAIL; PostDeviceScanCountInfoParam* param = new PostDeviceScanCountInfoParam; @@ -1125,7 +1125,7 @@ HGResult HGVersionMgrImpl::PostDeviceScanCountInfo(const HGChar* devName, const HGResult HGVersionMgrImpl::PostDeviceClearRollerInfo(const HGChar* devName, const HGChar* devSN, const HGChar* devType, const HGChar* devFW) { - if (!m_serverCfg.postDeviceInfo) + if (!m_serverCfg.postDeviceInfo || NULL == devSN || '\0' == *devSN) return HGBASE_ERR_FAIL; PostDeviceInfoParam* param = new PostDeviceInfoParam; @@ -1146,7 +1146,7 @@ HGResult HGVersionMgrImpl::PostDeviceClearRollerInfo(const HGChar* devName, cons HGResult HGVersionMgrImpl::PostDeviceHistroyCountInfo(const HGChar* devName, const HGChar* devSN, const HGChar* devType, const HGChar* devFW, HGUInt histroyCount) { - if (!m_serverCfg.postDeviceInfo) + if (!m_serverCfg.postDeviceInfo || NULL == devSN || '\0' == *devSN) return HGBASE_ERR_FAIL; PostDeviceHistroyCountInfoParam* param = new PostDeviceHistroyCountInfoParam; @@ -1168,7 +1168,7 @@ HGResult HGVersionMgrImpl::PostDeviceHistroyCountInfo(const HGChar* devName, con HGResult HGVersionMgrImpl::PostDeviceRollerCountInfo(const HGChar* devName, const HGChar* devSN, const HGChar* devType, const HGChar* devFW, HGUInt rollerCount) { - if (!m_serverCfg.postDeviceInfo) + if (!m_serverCfg.postDeviceInfo || NULL == devSN || '\0' == *devSN) return HGBASE_ERR_FAIL; PostDeviceRollerCountInfoParam* param = new PostDeviceRollerCountInfoParam; @@ -1366,14 +1366,14 @@ void HGVersionMgrImpl::MsgPumpFunc(HGMsgPump msgPump, const HGMsg* msg, HGPointe case MsgId_PostDeviceOpenInfo: { PostDeviceInfoParam* param = (PostDeviceInfoParam*)msg->data; - ::PostDeviceInfo(param->devName, param->devSN, param->devType, param->devFW, 1, 0, 0, 0, 0, 0); + ::PostDeviceInfo(param->devName, param->devSN, param->devType, param->devFW, 1, 0, 0, 0, -1, -1); delete param; } break; case MsgId_PostDeviceCloseInfo: { PostDeviceInfoParam* param = (PostDeviceInfoParam*)msg->data; - ::PostDeviceInfo(param->devName, param->devSN, param->devType, param->devFW, 0, 1, 0, 0, 0, 0); + ::PostDeviceInfo(param->devName, param->devSN, param->devType, param->devFW, 0, 1, 0, 0, -1, -1); delete param; } break; @@ -1381,14 +1381,14 @@ void HGVersionMgrImpl::MsgPumpFunc(HGMsgPump msgPump, const HGMsg* msg, HGPointe { PostDeviceScanCountInfoParam* param = (PostDeviceScanCountInfoParam*)msg->data; ::PostDeviceInfo(param->baseInfo.devName, param->baseInfo.devSN, param->baseInfo.devType, - param->baseInfo.devFW, 0, 0, param->scanCount, 0, 0, 0); + param->baseInfo.devFW, 0, 0, param->scanCount, 0, -1, -1); delete param; } break; case MsgId_PostDeviceClearRollerInfo: { PostDeviceInfoParam* param = (PostDeviceInfoParam*)msg->data; - ::PostDeviceInfo(param->devName, param->devSN, param->devType, param->devFW, 0, 0, 0, 1, 0, 0); + ::PostDeviceInfo(param->devName, param->devSN, param->devType, param->devFW, 0, 0, 0, 1, -1, -1); delete param; } break; @@ -1396,7 +1396,7 @@ void HGVersionMgrImpl::MsgPumpFunc(HGMsgPump msgPump, const HGMsg* msg, HGPointe { PostDeviceHistroyCountInfoParam* param = (PostDeviceHistroyCountInfoParam*)msg->data; ::PostDeviceInfo(param->baseInfo.devName, param->baseInfo.devSN, param->baseInfo.devType, - param->baseInfo.devFW, 0, 0, 0, 0, 0, param->histroyCount); + param->baseInfo.devFW, 0, 0, 0, 0, -1, param->histroyCount); delete param; } break; @@ -1404,7 +1404,7 @@ void HGVersionMgrImpl::MsgPumpFunc(HGMsgPump msgPump, const HGMsg* msg, HGPointe { PostDeviceRollerCountInfoParam* param = (PostDeviceRollerCountInfoParam*)msg->data; ::PostDeviceInfo(param->baseInfo.devName, param->baseInfo.devSN, param->baseInfo.devType, - param->baseInfo.devFW, 0, 0, 0, 0, param->rollerCount, 0); + param->baseInfo.devFW, 0, 0, 0, 0, param->rollerCount, -1); delete param; } break;