From fa74c2e2e272f151a5e05a228df397f7a9b77fb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Mon, 27 Nov 2023 16:27:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=82=BB=E9=80=BC=E6=8A=A5=E9=94=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ImageCompare/ImageCompareModel.cpp | 3 +- src/tpMain/NetProtocol.cpp | 2 +- src/tpMain/NetProtocol.h | 3 +- src/tpMain/cryptokey/lpHardwareInfo.cpp | 42 ++++++++++++++++--------- src/tpMain/cryptokey/lpHardwareInfo.h | 2 ++ src/tpMain/qaddmodel.cpp | 2 ++ src/tpMain/qipconfigdlg.cpp | 3 +- tpvs17/tpMain/QModelMgrDlg.cpp | 3 +- 8 files changed, 39 insertions(+), 21 deletions(-) diff --git a/src/ImageCompare/ImageCompareModel.cpp b/src/ImageCompare/ImageCompareModel.cpp index c310a34..c215287 100644 --- a/src/ImageCompare/ImageCompareModel.cpp +++ b/src/ImageCompare/ImageCompareModel.cpp @@ -1997,7 +1997,8 @@ void ImageCompareModel::preWeightReconstruction(Mat img, Mat &reConImg) } Mat matchImg = img.clone(); - preProcessImage(matchImg, Mat()); + Mat mat = Mat(); + preProcessImage(matchImg, mat); if (!mpMultiScaleModel) { diff --git a/src/tpMain/NetProtocol.cpp b/src/tpMain/NetProtocol.cpp index ba021a3..029addb 100644 --- a/src/tpMain/NetProtocol.cpp +++ b/src/tpMain/NetProtocol.cpp @@ -22,7 +22,7 @@ NetProtocol::~NetProtocol() } -QString NetProtocol::packData(const int nCmd, QList& lstData /*= QList()*/, QString strModel /*= QString()*/) +QString NetProtocol::packData(const int nCmd, QList lstData, QString strModel) { if (lstData.empty()) { lstData = genList(); diff --git a/src/tpMain/NetProtocol.h b/src/tpMain/NetProtocol.h index b631500..2da7708 100644 --- a/src/tpMain/NetProtocol.h +++ b/src/tpMain/NetProtocol.h @@ -12,12 +12,11 @@ public: ~NetProtocol(); static QString genAddressPort(const QString& addr, const QString &nPort); -protected: QString genCmd(int nCmd); QString genData(int nData = 0); QString genModel(QString strModel = QString()); QList genList(); - QString packData(const int nCmd, QList& lstData = QList(), QString strModel = QString()); + QString packData(const int nCmd, QList lstData = QList(), QString strModel = QString()); QByteArray parseData(const QByteArray dataSrc, int &nCmd, QList&lstData, QString &strModel); }; diff --git a/src/tpMain/cryptokey/lpHardwareInfo.cpp b/src/tpMain/cryptokey/lpHardwareInfo.cpp index 2f86d7d..228453d 100644 --- a/src/tpMain/cryptokey/lpHardwareInfo.cpp +++ b/src/tpMain/cryptokey/lpHardwareInfo.cpp @@ -125,34 +125,34 @@ void lpHardwareInfo::deviceQuery() //CPU ID - CHAR* szSelect = "SELECT * FROM Win32_Processor WHERE (ProcessorId IS NOT NULL)"; - WCHAR* szProperty = L"ProcessorId"; + CHAR* szSelect = charReCHAR("SELECT * FROM Win32_Processor WHERE (ProcessorId IS NOT NULL)"); + WCHAR* szProperty = charReWCHAR("ProcessorId"); deviceQuery(szSelect, szProperty, msCpuID); //MotherBoard ID - szSelect = "SELECT * FROM Win32_BaseBoard WHERE (SerialNumber IS NOT NULL)"; - szProperty = L"SerialNumber"; + szSelect = charReCHAR("SELECT * FROM Win32_BaseBoard WHERE(SerialNumber IS NOT NULL)"); + szProperty = charReWCHAR("SerialNumber"); deviceQuery(szSelect, szProperty, msMotherBoardID); //BIOS ID - szSelect = "SELECT * FROM Win32_BIOS WHERE (SerialNumber IS NOT NULL)"; - szProperty = L"SerialNumber"; + szSelect = charReCHAR("SELECT * FROM Win32_BIOS WHERE (SerialNumber IS NOT NULL)"); + szProperty = charReWCHAR("SerialNumber"); deviceQuery(szSelect, szProperty, msBiosID); //MAC Address only Physical and not [virtual, vpn, usb, ...] msMacAddress = ""; - //szSelect = "SELECT * FROM Win32_NetworkAdapter WHERE PhysicalAdapter = true \ + //szSelect = charReCHAR("SELECT * FROM Win32_NetworkAdapter WHERE PhysicalAdapter = true \ // and NOT Name LIKE '%vpn%' and NOT Name LIKE '%virtual%' \ // and NOT Name LIKE '%usb%' and NOT Name LIKE '%Bluetooth%'"; - szSelect = "SELECT * FROM Win32_NetworkAdapter WHERE PhysicalAdapter = true \ - and ( Name LIKE '%pci%' or PNPDeviceID LIKE '%pci%')"; - szProperty = L"MACAddress"; + szSelect = charReCHAR("SELECT * FROM Win32_NetworkAdapter WHERE PhysicalAdapter = true \ + and ( Name LIKE '%pci%' or PNPDeviceID LIKE '%pci%')"); + szProperty = charReWCHAR("MACAddress"); deviceQuery(szSelect, szProperty, msMacAddress); //hard disk only "Fixed hard disk media" msHardDrive = ""; - szSelect = "SELECT * FROM Win32_DiskDrive WHERE MediaType LIKE '%Fixed%'"; - szProperty = L"SerialNumber"; + szSelect = charReCHAR("SELECT * FROM Wi(n32_DiskDrive WHERE MediaType LIKE '%Fixed%'"); + szProperty = charReWCHAR("SerialNumber"); deviceQuery(szSelect, szProperty, msHardDrive); //Desktop or laptop @@ -165,7 +165,7 @@ void lpHardwareInfo::deviceQuery(CHAR* szSelect, WCHAR* szProperty, std::string& DEVICE_PROPERTY dpRst; // TCHAT to std::string - auto tc2string = [&](TCHAR* ts) -> std::string { + auto tc2string = [&](TCHAR* ts) -> std::string& { int iLen = WideCharToMultiByte(CP_ACP, 0, ts, -1, NULL, 0, NULL, NULL); char* chRtn = new char[iLen * sizeof(char)]; @@ -229,14 +229,26 @@ void lpHardwareInfo::deviceQuery(CHAR* szSelect, WCHAR* szProperty, std::string& strRslt.erase(strRslt.length() - 1); } } +CHAR * lpHardwareInfo::charReCHAR(const char myString[]) { + CHAR myCharString[100]; + strcpy(myCharString, myString); + return myCharString; +} +WCHAR* lpHardwareInfo::charReWCHAR(const char myString[]) { + int bufferSize = MultiByteToWideChar(CP_UTF8, 0, myString, -1, nullptr, 0); + WCHAR* wideString = new WCHAR[bufferSize]; + MultiByteToWideChar(CP_UTF8, 0, myString, -1, wideString, bufferSize); + return wideString; + +} void lpHardwareInfo::queryIsDesktop() { HRESULT hres; DEVICE_PROPERTY dpRst; - CHAR* szSelect = "SELECT * FROM Win32_SystemEnclosure"; - WCHAR* szProperty = L"ChassisTypes"; + CHAR* szSelect = charReCHAR("SELECT * FROM Win32_SystemEnclosure"); + WCHAR* szProperty = charReWCHAR("ChassisTypes"); IEnumWbemClassObject *pEnumerator = NULL; hres = mpSvc->ExecQuery(bstr_t("WQL"), bstr_t(szSelect), diff --git a/src/tpMain/cryptokey/lpHardwareInfo.h b/src/tpMain/cryptokey/lpHardwareInfo.h index 399e510..954a3ce 100644 --- a/src/tpMain/cryptokey/lpHardwareInfo.h +++ b/src/tpMain/cryptokey/lpHardwareInfo.h @@ -58,6 +58,8 @@ private: IWbemLocator *mpLoc; IWbemServices *mpSvc; + CHAR* charReCHAR(const char myString[]); + WCHAR* charReWCHAR(const char myString[]); bool mbCoInited; diff --git a/src/tpMain/qaddmodel.cpp b/src/tpMain/qaddmodel.cpp index 620f060..70a1224 100644 --- a/src/tpMain/qaddmodel.cpp +++ b/src/tpMain/qaddmodel.cpp @@ -1,6 +1,8 @@ #include "qaddmodel.h" #include #include +#include +#include #include #include "InfoFile.h" #pragma execution_character_set("utf-8") diff --git a/src/tpMain/qipconfigdlg.cpp b/src/tpMain/qipconfigdlg.cpp index d8e5802..a679d44 100644 --- a/src/tpMain/qipconfigdlg.cpp +++ b/src/tpMain/qipconfigdlg.cpp @@ -1,6 +1,7 @@ #include "qipconfigdlg.h" #include "InfoFile.h" - +#include +#include QIPConfigDlg::QIPConfigDlg(QWidget *parent) : QDialog(parent) { diff --git a/tpvs17/tpMain/QModelMgrDlg.cpp b/tpvs17/tpMain/QModelMgrDlg.cpp index 0c73259..fdc26d5 100644 --- a/tpvs17/tpMain/QModelMgrDlg.cpp +++ b/tpvs17/tpMain/QModelMgrDlg.cpp @@ -461,7 +461,8 @@ Q_SLOT void QModelMgrDlg::onChangeModelName() QString strPath = m_pCtrl->appRoot() + pModel->getPicPath(); dlg.setPixmap(strPath); dlg.setOldModelName(strModel); - dlg.SetModelsStr(m_pModelMgr->getAllModelName()); + auto modelStr = m_pModelMgr->getAllModelName(); + dlg.SetModelsStr(modelStr); if (QDialog::Accepted == dlg.exec()) { m_newName = dlg.getNewModelName();