#IQRV #comment [Vendor] keba/2022.0425.01

DevAdapter/CMakeLists.txt

@@ -12,25 +12,6 @@ else()
     set(DEVADAPTER_USING_CONAN FALSE)
 endif(RVC_VERSION)
 
-if(RVC_VERSION)
-    set(CMAKE_AUTOUIC ON)
-    set(CMAKE_AUTOMOC ON)
-    set(CMAKE_AUTORCC ON)
-
-    if(ARCH_AARCH64)
-        if(NOT CONAN_QT_ROOT)
-            conan_cmake_run(REQUIRES qt/5.11.3@LR04.02_ThirdParty/testing BASIC_SETUP CMAKE_TARGETS)
-        endif(NOT CONAN_QT_ROOT)
-        set(QT5_HINT_PATH ${CONAN_QT_ROOT})
-    else()
-    if(MSVC)
-        set(QT5_HINT_PATH "C:/Qt/Qt5.14.2/5.14.2/msvc2017/")
-    else()
-        set(QT5_HINT_PATH "/opt/Qt5.14.2/5.14.2/gcc_64/lib/cmake/")
-    endif(MSVC)
-    endif(ARCH_AARCH64)
-endif(RVC_VERSION)
-
 if(MSVC AND (CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|x86|AMD64") )
     set(DIFF_PLATFORM_SUB_DIR "msvc_x86")
 elseif((NOT MSVC) AND (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64"))
@@ -158,7 +139,7 @@ message(STATUS "vendor log library: ${VENDOR_LOG_LIB_NAME}")
 
 # 通过conan的方式管理厂商库
 if(DEVADAPTER_USING_CONAN)
-    set(KEBA_CONAN_LIB_NAME keba/2022.0419.01@LR04.02_VendorLib/testing)
+    set(KEBA_CONAN_LIB_NAME keba/2022.0425.01@LR04.02_VendorLib/testing)
 	set(NANTIAN_CONAN_LIB_NAME nantian/2022.0224.01@LR04.02_VendorLib/testing)
 	set(GRG_CONAN_LIB_NAME grg/2022.0310.01@LR04.02_VendorLib/testing)
 	set(CW_CONAN_LIB_NAME cw/2021.0927.01@LR04.02_VendorLib/testing)

DevAdapter/keba/CardIssuer.keba.1.1/CMakeLists.txt

@@ -3,16 +3,13 @@ set(${MODULE_PREFIX}_VENDOR "keba")
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 
+#链接QT5 使用<Q..>头文件
+#find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
+
 #设置编译的一些参数
 if(NOT RVC_INTEGRATE_BUILD)
-    #链接QT5 使用<Q..>头文件
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
-
     set(CMAKE_CXX_FLAGS "-std=c++11")
     set(CMAKE_BUILD_TYPE "Release")#Release Debug
-else()
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED 
-        HINTS ${QT5_HINT_PATH} NO_SYSTEM_ENVIRONMENT_PATH )
 endif()
 
 set( INCLUDE_KEBA       ${DEVADAPTER_CURRENT_INCLUDES_DIR}
@@ -50,7 +47,7 @@ target_link_libraries(${MODULE_FULL_NAME} ${VENDOR_LOG_LIB_NAME})
 target_link_libraries(${MODULE_FULL_NAME} Common.keba)
 
 #链接QT5 使用<Q..>头文件
-target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
+#target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
 
 #设置动态库输出路径:/data/home/keba/DevAdapter/cmbsz/lib/gcc_aarch64或者gcc_x64
 

DevAdapter/keba/CardIssuer.keba.1.1/CardIssuerClassImpl_ACT-Sankyo.cpp

@@ -840,6 +840,12 @@ ErrorCodeEnum CardIssuerClassImpl::QueryBatteryPower(int &bat)
 
 void CardIssuerClassImpl::_SaveErrorInfo(CHAR* errMsg, int errCode, const CHAR* strFunc, int nLine)
 {
+    CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
+    sprintf(chJson, "Func:%s,Line:%d,Msg:%s(V%d.%d.%d.%d)", strFunc, nLine, errMsg, FILE_MAJOR, FILE_MINOR, FILE_REVISION, FILE_BUILD);
+    memset(m_szErrMsg, 0, MAX_DEV_ERROR_MSG_LEN);
+    sprintf(m_szErrMsg, "{\"Errcode\":%d,\"Description\":%s}", errCode,chJson);
+    LogM(m_szErrMsg);
+    /*
     CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
     QJsonObject root_Obj;
     QJsonDocument root_Doc;
@@ -858,6 +864,7 @@ void CardIssuerClassImpl::_SaveErrorInfo(CHAR* errMsg, int errCode, const CHAR*
     memset(m_szErrMsg, 0, MAX_DEV_ERROR_MSG_LEN);
     sprintf(m_szErrMsg, strJson.toUtf8().data());
     LogM(m_szErrMsg);
+    */
 }
 
 //String Format

DevAdapter/keba/CardIssuer.keba.1.1/stdafx.h

@@ -9,9 +9,9 @@
 
 #include "wintypes.h"
 
-#include <QJsonDocument>//²Î¿¼Á´½Ó£ºhttps://www.cnblogs.com/whik/p/11234889.html
-#include <QJsonObject>
-#include <QJsonArray>
+//#include <QJsonDocument>//²Î¿¼Á´½Ó£ºhttps://www.cnblogs.com/whik/p/11234889.html
+//#include <QJsonObject>
+//#include <QJsonArray>
 
 #include <string>
 #include <map>

DevAdapter/keba/ContactlessCard.keba.1.1/CMakeLists.txt

@@ -3,13 +3,8 @@ set(${MODULE_PREFIX}_VENDOR "keba")
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 
-if(NOT RVC_INTEGRATE_BUILD)
-    #链接QT5 使用<Q..>头文件
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
-else()
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED 
-        HINTS ${QT5_HINT_PATH} NO_SYSTEM_ENVIRONMENT_PATH )
-endif()
+#链接QT5 使用<Q..>头文件
+#find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
 
 #设置编译的一些参数
 if(NOT RVC_INTEGRATE_BUILD)
@@ -41,7 +36,7 @@ target_include_directories(${MODULE_FULL_NAME} PUBLIC  ${INCLUDE_KEBA})
 target_link_directories(${MODULE_FULL_NAME} PUBLIC  ${DEVADAPTER_CURRENT_LIB_DIR})
 
 #链接QT5 使用<Q..>头文件
-target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
+#target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
 
 #86下依赖的库连接这个文件路径:/data/home/keba/DevAdapter/keba/lib/gcc_x64?gcc_aarch64
 #target_link_directories(${MODULE_FULL_NAME} PUBLIC  ${VENDOR_CURRENT_LIB_DIR})

DevAdapter/keba/ContactlessCard.keba.1.1/rficclassimpl_crt603cz7.cpp

@@ -518,6 +518,12 @@ ErrorCodeEnum RFICClassImpl::HaltCard()
 //Private
 void RFICClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode, const CHAR* strFunc, int nLine)
 {
+    CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
+    sprintf(chJson, "Func:%s,Line:%d,Msg:%s", strFunc, nLine, errMsg);
+    memset(m_szErrMsg, 0, MAX_DEV_ERROR_MSG_LEN);
+    sprintf(m_szErrMsg, "{\"Errcode\":%d,\"Description\":%s}", errCode,chJson);
+    LogM(m_szErrMsg);
+    /*
     CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
     QJsonObject root_Obj;
     QJsonDocument root_Doc;
@@ -531,6 +537,7 @@ void RFICClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode, const CHAR* strFunc
     memset(m_szErrMsg, 0, MAX_DEV_ERROR_MSG_LEN);
     sprintf(m_szErrMsg, strJson.toUtf8().data());
     LogM(m_szErrMsg);
+    */
 }
 ErrorCodeEnum RFICClassImpl::ErrorCodeToCMB(int nRes)
 {

DevAdapter/keba/ContactlessCard.keba.1.1/stdafx.h

@@ -20,8 +20,8 @@
 #include "DepErrorCode.h"
 #include "TraceManager.h"
 #include "CommDef.h"
-#include <QJsonParseError>  //https://www.cnblogs.com/whik/p/11234889.html
-#include <QVariantMap>
-#include <QJsonObject>
-#include <QJsonArray>
+//#include <QJsonParseError>  //https://www.cnblogs.com/whik/p/11234889.html
+//#include <QVariantMap>
+//#include <QJsonObject>
+//#include <QJsonArray>
 #endif // STDAFX_H

DevAdapter/keba/FingerPrint.keba.1.1/CMakeLists.txt

@@ -6,13 +6,8 @@ set(${MODULE_PREFIX}_VENDOR "keba")
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 
-if(NOT RVC_INTEGRATE_BUILD)
-    #链接QT5 使用<Q..>头文件
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
-else()
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED 
-        HINTS ${QT5_HINT_PATH} NO_SYSTEM_ENVIRONMENT_PATH )
-endif()
+#链接QT5 使用<Q..>头文件
+#find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
 
 #设置编译的一些参数
 if(NOT RVC_INTEGRATE_BUILD)
@@ -51,7 +46,7 @@ target_link_libraries(${MODULE_FULL_NAME} ${VENDOR_LOG_LIB_NAME})
 #链接keba日志库
 target_link_libraries(${MODULE_FULL_NAME} Common.keba)
 #链接QT5 使用<Q..>头文件
-target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
+#target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
 #设置动态库输出路径:/data/home/keba/DevAdapter/cmbsz/lib/gcc_aarch64或者gcc_x64
 SET(LIBRARY_OUTPUT_PATH ${VENDOR_CURRENT_LIB_DIR})
 message(STATUS "LIBRARY_OUTPUT_PATH: ${VENDOR_CURRENT_LIB_DIR}")

DevAdapter/keba/FingerPrint.keba.1.1/fingerprint.cpp

@@ -197,6 +197,12 @@ ErrorCodeEnum FingerPrintClassImpl::DevOpen(DWORD dwPort, DWORD dwBaudRate)
 }
 void FingerPrintClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode, const CHAR* strFunc, int nLine)
 {
+    CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
+    sprintf(chJson, "Func:%s,Line:%d,Msg:%s", strFunc, nLine, errMsg);
+    memset(m_szErrMsg, 0, MAX_DEV_ERROR_MSG_LEN);
+    sprintf(m_szErrMsg, "{\"Errcode\":%d,\"Description\":%s}", errCode,chJson);
+    LogM(m_szErrMsg);
+    /*
     CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
     QJsonObject root_Obj;
     QJsonDocument root_Doc;
@@ -210,6 +216,7 @@ void FingerPrintClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode, const CHAR*
     memset(m_szErrMsg, 0, MAX_DEV_ERROR_MSG_LEN);
     sprintf(m_szErrMsg, strJson.toUtf8().data());
     LogM(m_szErrMsg);
+    */
 }
 /*
 void FingerPrintClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode)

DevAdapter/keba/FingerPrint.keba.1.1/stdafx.h

@@ -20,8 +20,8 @@
 #include "DepErrorCode.h"
 #include "TraceManager.h"
 #include "CommDef.h"
-#include <QJsonParseError>  //https://www.cnblogs.com/whik/p/11234889.html
-#include <QVariantMap>
-#include <QJsonObject>
-#include <QJsonArray>
+//#include <QJsonParseError>  //https://www.cnblogs.com/whik/p/11234889.html
+//#include <QVariantMap>
+//#include <QJsonObject>
+//#include <QJsonArray>
 #endif // STDAFX_H

DevAdapter/keba/Gpio.keba.1.1/CMakeLists.txt

@@ -3,13 +3,8 @@ set(${MODULE_PREFIX}_VENDOR "keba")
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 
-if(NOT RVC_INTEGRATE_BUILD)
-    #链接QT5 使用<Q..>头文件
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
-else()
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED 
-        HINTS ${QT5_HINT_PATH} NO_SYSTEM_ENVIRONMENT_PATH )
-endif()
+#链接QT5 使用<Q..>头文件
+#find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
 
 #设置编译的一些参数
 if(NOT RVC_INTEGRATE_BUILD)
@@ -47,7 +42,7 @@ target_link_libraries(${MODULE_FULL_NAME} ${VENDOR_LOG_LIB_NAME})
 #链接keba依赖库
 target_link_libraries(${MODULE_FULL_NAME} Common.keba)
 #链接QT5 使用<Q..>头文件
-target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
+#target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
 #设置动态库输出路径:/data/home/keba/DevAdapter/cmbsz/lib/gcc_aarch64或者gcc_x64
 SET(LIBRARY_OUTPUT_PATH ${VENDOR_CURRENT_LIB_DIR})
 message(STATUS "LIBRARY_OUTPUT_PATH: ${VENDOR_CURRENT_LIB_DIR}")

DevAdapter/keba/Gpio.keba.1.1/GpioClassImpl_DistrBusUSB.cpp

@@ -672,6 +672,14 @@ void GpioClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode)
 
 void GpioClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode, const CHAR* strFunc, int nLine)
 {
+    CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
+    sprintf(chJson, "Func:%s,Line:%d,Msg:%s", strFunc, nLine, errMsg);
+    memset(m_szErrMsg, 0, MAX_DEV_ERROR_MSG_LEN);
+    sprintf(m_szErrMsg, "{\"Errcode\":%d,\"Description\":%s}", errCode,chJson);
+    LogM(m_szErrMsg);
+
+
+    /*
     CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
     QJsonObject root_Obj;
     QJsonDocument root_Doc;
@@ -686,6 +694,7 @@ void GpioClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode, const CHAR* strFunc
     memset(m_szErrMsg, 0, MAX_DEV_ERROR_MSG_LEN);
     sprintf(m_szErrMsg, strJson.toUtf8().data());
     LogM(m_szErrMsg);
+    */
 }
 
 

DevAdapter/keba/Gpio.keba.1.1/stdafx.h

@@ -7,10 +7,10 @@
 
 
 // TODO: 在此处引用程序需要的其他头文件
-#include <QJsonParseError>  //https://www.cnblogs.com/whik/p/11234889.html
-#include <QVariantMap>
-#include <QJsonObject>
-#include <QJsonArray>
+//#include <QJsonParseError>  //https://www.cnblogs.com/whik/p/11234889.html
+//#include <QVariantMap>
+//#include <QJsonObject>
+//#include <QJsonArray>
 
 #include <stdio.h>
 #include <stdlib.h>

DevAdapter/keba/HSPScanner.keba.1.1/CMakeLists.txt

@@ -36,8 +36,11 @@ set(${MODULE_PREFIX}_SRCS SHARED
 )
 
 if(RVC_INTEGRATE_BUILD)
+    if(NOT CONAN_QT_ROOT)
+        conan_cmake_run( REQUIRES  qt/5.11.3@LR04.02_ThirdParty/stable BASIC_SETUP CMAKE_TARGETS)
+    endif(NOT CONAN_QT_ROOT )
     find_package(Qt5 COMPONENTS Core DBus REQUIRED 
-        HINTS ${QT5_HINT_PATH} NO_SYSTEM_ENVIRONMENT_PATH )
+        HINTS ${CONAN_QT_ROOT} NO_SYSTEM_ENVIRONMENT_PATH )
 else()
     find_package(Qt5 COMPONENTS Core DBus REQUIRED)
 endif(RVC_INTEGRATE_BUILD)

DevAdapter/keba/HSPScanner.keba.1.2/CMakeLists.txt

@@ -7,13 +7,8 @@ set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "2")
 #set(CMAKE_PREFIX_PATH $ENV{QTDIR594})
 
-if(NOT RVC_INTEGRATE_BUILD)
-    #链接QT5 使用<Q..>头文件
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
-else()
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED 
-        HINTS ${QT5_HINT_PATH} NO_SYSTEM_ENVIRONMENT_PATH )
-endif()
+#链接QT5 使用<Q..>头文件
+#find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
 
 #设置编译的一些参数
 if(NOT RVC_INTEGRATE_BUILD)
@@ -46,7 +41,7 @@ message(STATUS "KEBA_include_directories: ${INCLUDE_KEBA}")
 target_link_directories(${MODULE_FULL_NAME} PUBLIC  ${DEVADAPTER_CURRENT_LIB_DIR})
 
 #链接QT5 使用<Q..>头文件
-target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
+#target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
 
 #86下依赖的库连接这个文件路径:/data/home/keba/DevAdapter/keba/lib/gcc_x64?gcc_aarch64
 #target_link_directories(${MODULE_FULL_NAME} PUBLIC  ${VENDOR_CURRENT_LIB_DIR})

DevAdapter/keba/HSPScanner.keba.1.2/hspscannerimpl.cpp

@@ -678,6 +678,13 @@ ErrorCodeEnum HSPSClassImpl::GetDevStatus(HspsDevStatus& status)
 
 void HSPSClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode, const CHAR* strFunc, int nLine)
 {
+    CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
+    sprintf(chJson, "Func:%s,Line:%d,Msg:%s", strFunc, nLine, errMsg);
+    memset(m_szErrMsg, 0, MAX_DEV_ERROR_MSG_LEN);
+    sprintf(m_szErrMsg, "{\"Errcode\":%d,\"Description\":%s}", errCode,chJson);
+    LogM(m_szErrMsg);
+
+    /*
     CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
     QJsonObject root_Obj;
     QJsonDocument root_Doc;
@@ -687,13 +694,6 @@ void HSPSClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode, const CHAR* strFunc
     root_Doc.setObject(root_Obj);
     //QByteArray root_str = root_Doc.toJson(QJsonDocument::Compact);  //紧凑格式
     QByteArray root_str = root_Doc.toJson(QJsonDocument::Indented);   //标准JSON格式    QString strJson(root_str);
-
-
-
-
-
-
-
     QString strJson(root_str);
     //QByteArray ba = strJson.toLatin1();
     //char* sErrMsg = ba.data();
@@ -703,6 +703,7 @@ void HSPSClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode, const CHAR* strFunc
     memset(m_szErrMsg, 0, MAX_DEV_ERROR_MSG_LEN);
     sprintf(m_szErrMsg, strJson.toUtf8().data());
     LogM(m_szErrMsg);
+    */
 }
 /*void HSPSClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode)
 {

DevAdapter/keba/HSPScanner.keba.1.2/stdafx.h

@@ -6,10 +6,10 @@
 //#include <QJsonParseError>
 
 //#include <QFile>
-#include <QJsonDocument>
-#include <QVariantMap>
-#include <QJsonObject>
-#include <QJsonArray>
+//#include <QJsonDocument>
+//#include <QVariantMap>
+//#include <QJsonObject>
+//#include <QJsonArray>
 
 #include <stdio.h>
 #include <stdarg.h>

DevAdapter/keba/IDCertificate.keba.1.1/CMakeLists.txt

@@ -3,13 +3,8 @@ set(${MODULE_PREFIX}_VENDOR "keba")
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 
-if(NOT RVC_INTEGRATE_BUILD)
-    #链接QT5 使用<Q..>头文件
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
-else()
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED 
-        HINTS ${QT5_HINT_PATH} NO_SYSTEM_ENVIRONMENT_PATH )
-endif()
+#链接QT5 使用<Q..>头文件
+#find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
 
 #设置编译的一些参数
 if(NOT RVC_INTEGRATE_BUILD)
@@ -46,7 +41,7 @@ target_link_libraries(${MODULE_FULL_NAME} ${VENDOR_LOG_LIB_NAME})
 #链接keba依赖库
 target_link_libraries(${MODULE_FULL_NAME} Common.keba)
 #链接QT5 使用<Q..>头文件
-target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
+#target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
 #设置动态库输出路径:/data/home/keba/DevAdapter/cmbsz/lib/gcc_aarch64或者gcc_x64
 SET(LIBRARY_OUTPUT_PATH ${VENDOR_CURRENT_LIB_DIR})
 message(STATUS "LIBRARY_OUTPUT_PATH: ${VENDOR_CURRENT_LIB_DIR}")

DevAdapter/keba/IDCertificate.keba.1.1/idcertificate.cpp

@@ -1620,6 +1620,17 @@ ErrorCodeEnum IDCerClassImpl::QueryCardPos(int &pos)
 //Private
 void IDCerClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode, const CHAR* strFunc, int nLine)
 {
+
+    CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
+    char chLastStr[MAX_DEV_ERROR_MSG_LEN] = {0};
+    int nErrCode = m_cBS_ID81IDCImpl.LastErrorCode();
+    m_cBS_ID81IDCImpl.LastErrorStr(chLastStr);
+    sprintf(chJson, "Func:%s,Line:%d,Msg:[%d]%s, %s", strFunc, nLine, nErrCode, chLastStr, errMsg);
+    memset(m_szErrMsg, 0, MAX_DEV_ERROR_MSG_LEN);
+    sprintf(m_szErrMsg, "{\"Errcode\":%d,\"Description\":%s}", errCode,chJson);
+    LogM(m_szErrMsg);
+    sprintf(m_szErrMsg, "{\"Errcode\":%d,\"Description\":%s}", errCode,chJson);
+    /*
     CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
     QJsonObject root_Obj;
     QJsonDocument root_Doc;
@@ -1637,6 +1648,7 @@ void IDCerClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode, const CHAR* strFun
     memset(m_szErrMsg, 0, MAX_DEV_ERROR_MSG_LEN);
     sprintf(m_szErrMsg, strJson.toUtf8().data());
     LogM(m_szErrMsg);
+    */
 }
 
 void IDCerClassImpl::SaveErrorInfo(int nLine, const char* chFunction)
@@ -1771,6 +1783,11 @@ void IDCerClassImpl::SaveErrorInfo(int nLine, const char* chFunction)
         sprintf(chJson, "Func:%s,Line:%d,Msg:[%d]%s, %s", chFunction, nLine, nErrCode, chLastStr, "通讯异常");
         break;
     }
+    sprintf(m_szErrMsg, "{\"Errcode\":%d,\"Description\":%s}", shErrCode,chJson);
+
+
+
+    /*
     try
     {
         QJsonObject root_Obj;
@@ -1790,6 +1807,7 @@ void IDCerClassImpl::SaveErrorInfo(int nLine, const char* chFunction)
         sprintf(m_szErrMsg, "{\"Errcode\":%d,\"Description\":%s}", shErrCode,chJson);
     }
     LogM(m_szErrMsg);
+    */
 }
 
 int IDCerClassImpl::string_format(std::string &str, const std::string fmt, ...)

DevAdapter/keba/IDCertificate.keba.1.1/stdafx.h

@@ -7,10 +7,10 @@
 
 
 // TODO: 在此处引用程序需要的其他头文件
-#include <QJsonParseError>  //https://www.cnblogs.com/whik/p/11234889.html
-#include <QVariantMap>
-#include <QJsonObject>
-#include <QJsonArray>
+//#include <QJsonParseError>  //https://www.cnblogs.com/whik/p/11234889.html
+//#include <QVariantMap>
+//#include <QJsonObject>
+//#include <QJsonArray>
 
 #include <stdio.h>
 #include <stdlib.h>

DevAdapter/keba/PinPad.keba.1.1/CMakeLists.txt

@@ -6,13 +6,8 @@ set(${MODULE_PREFIX}_VENDOR "keba")
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 
-if(NOT RVC_INTEGRATE_BUILD)
-    #链接QT5 使用<Q..>头文件
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
-else()
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED 
-        HINTS ${QT5_HINT_PATH} NO_SYSTEM_ENVIRONMENT_PATH )
-endif()
+#链接QT5 使用<Q..>头文件
+#find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
 
 #设置编译的一些参数
 if(NOT RVC_INTEGRATE_BUILD)
@@ -50,7 +45,7 @@ target_link_libraries(${MODULE_FULL_NAME} ${VENDOR_LOG_LIB_NAME})
 #链接keba依赖库
 target_link_libraries(${MODULE_FULL_NAME} Common.keba)
 #链接QT5 使用<Q..>头文件
-target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
+#target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
 #设置动态库输出路径:/data/home/keba/DevAdapter/cmbsz/lib/gcc_aarch64或者gcc_x64
 SET(LIBRARY_OUTPUT_PATH ${VENDOR_CURRENT_LIB_DIR})
 message(STATUS "LIBRARY_OUTPUT_PATH: ${VENDOR_CURRENT_LIB_DIR}")

DevAdapter/keba/PinPad.keba.1.1/PinPadClassImpl_ZT598M.cpp

@@ -1825,6 +1825,17 @@ ErrorCodeEnum PinPadClassImpl::SaveErrorInfo(int iErrCode, const CHAR* strFunc,
         break;
     }
 
+    CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
+    sprintf(chJson, "Func:%s,Line:%d,Msg:%s(V%d.%d.%d.%d)", strFunc, nLine, m_szErrMsg, FILE_MAJOR, FILE_MINOR, FILE_REVISION, FILE_BUILD);
+    memset(m_szErrMsg, 0, MAX_DEV_ERROR_MSG_LEN);
+    sprintf(m_szErrMsg, "{\"Errcode\":%d,\"Description\":%s}", m_shErrCode,chJson);
+    memset(&m_devErrInfo, 0x00, sizeof(m_devErrInfo));
+    m_devErrInfo.dwErrMsgLen = strlen(m_szErrMsg);
+    sprintf(m_devErrInfo.szErrMsg, m_szErrMsg);
+    LogM("ErrorInfo:[0x%x]:%s", ret, m_szErrMsg);
+    memset(m_szErrMsg, 0x00, sizeof(m_szErrMsg));
+
+    /*
     CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
     QJsonObject root_Obj;
     QJsonDocument root_Doc;
@@ -1842,6 +1853,8 @@ ErrorCodeEnum PinPadClassImpl::SaveErrorInfo(int iErrCode, const CHAR* strFunc,
     sprintf(m_devErrInfo.szErrMsg, m_szErrMsg);
     LogM("ErrorInfo:[0x%x]:%s", ret, m_szErrMsg);
     memset(m_szErrMsg, 0x00, sizeof(m_szErrMsg));
+    */
+
     return ret;
 }
 

DevAdapter/keba/PinPad.keba.1.1/stdafx.h

@@ -7,9 +7,9 @@
 
 
 // TODO: 在此处引用程序需要的其他头文件
-#include <QJsonDocument>//参考链接：https://www.cnblogs.com/whik/p/11234889.html
-#include <QJsonObject>
-#include <QJsonArray>
+//#include <QJsonDocument>//参考链接：https://www.cnblogs.com/whik/p/11234889.html
+//#include <QJsonObject>
+//#include <QJsonArray>
 
 #include "cstdlib"
 #include <string.h>

DevAdapter/keba/Ups.keba.1.1/CMakeLists.txt

@@ -6,13 +6,8 @@ set(${MODULE_PREFIX}_VENDOR "keba")
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 
-if(NOT RVC_INTEGRATE_BUILD)
-    #链接QT5 使用<Q..>头文件
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
-else()
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED 
-        HINTS ${QT5_HINT_PATH} NO_SYSTEM_ENVIRONMENT_PATH )
-endif()
+#链接QT5 使用<Q..>头文件
+#find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
 
 #设置编译的一些参数
 if(NOT RVC_INTEGRATE_BUILD)
@@ -42,7 +37,7 @@ message(STATUS "KEBA_include_directories: ${INCLUDE_KEBA}")
 #设置日志依赖库文件的路径变量路径
 target_link_directories(${MODULE_FULL_NAME} PUBLIC  ${DEVADAPTER_CURRENT_LIB_DIR})
 #链接QT5 使用<Q..>头文件
-target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
+#target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
 
 #86下依赖的库连接这个文件路径:/data/home/keba/DevAdapter/keba/lib/gcc_x64?gcc_aarch64
 #target_link_directories(${MODULE_FULL_NAME} PUBLIC  ${VENDOR_CURRENT_LIB_DIR})

DevAdapter/keba/Ups.keba.1.1/UpsClassImpl_East.cpp

@@ -298,6 +298,14 @@ ErrorCodeEnum UpsClassImpl::DevOpen(DWORD dwPort, DWORD dwBaudRate)
 
 void UpsClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode, const CHAR* strFunc, int nLine)
 {
+    CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
+    sprintf(chJson, "Func:%s,Line:%d,Msg:%s(V%d.%d.%d.%d)", strFunc, nLine, errMsg, FILE_MAJOR, FILE_MINOR, FILE_REVISION, FILE_BUILD);
+    memset(m_szErrMsg, 0, MAX_DEV_ERROR_MSG_LEN);
+    sprintf(m_szErrMsg, "{\"Errcode\":%d,\"Description\":%s}", errCode,chJson);
+    LogM(m_szErrMsg);
+
+    /*
+    //QTJson
     CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
     QJsonObject root_Obj;
     QJsonDocument root_Doc;
@@ -316,6 +324,7 @@ void UpsClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode, const CHAR* strFunc,
     memset(m_szErrMsg, 0, MAX_DEV_ERROR_MSG_LEN);
     sprintf(m_szErrMsg, strJson.toUtf8().data());
     LogM(m_szErrMsg);
+    */
 }
 
 char* UpsClassImpl::GetCOMPortString(DWORD dwCOM)

DevAdapter/keba/Ups.keba.1.1/stdafx.h

@@ -7,9 +7,9 @@
 // TODO: 在此处引用程序需要的其他头文件
 //#include <QJsonParseError>  //https://www.cnblogs.com/whik/p/11234889.html
 //#include <QVariantMap>
-#include <QJsonDocument>//参考链接：https://www.cnblogs.com/whik/p/11234889.html
-#include <QJsonObject>
-#include <QJsonArray>
+//#include <QJsonDocument>//参考链接：https://www.cnblogs.com/whik/p/11234889.html
+//#include <QJsonObject>
+//#include <QJsonArray>
 //#include <QApplication>
 
 #include "winfunc.h"

DevAdapter/keba/WatchDog.keba.1.1/CMakeLists.txt

@@ -6,13 +6,8 @@ set(${MODULE_PREFIX}_VENDOR "keba")
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 
-if(NOT RVC_INTEGRATE_BUILD)
-    #链接QT5 使用<Q..>头文件
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
-else()
-    find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED 
-        HINTS ${QT5_HINT_PATH} NO_SYSTEM_ENVIRONMENT_PATH )
-endif()
+#链接QT5 使用<Q..>头文件
+#find_package(Qt5 COMPONENTS Core Gui Qml Quick REQUIRED)
 
 #设置编译的一些参数
 if(NOT RVC_INTEGRATE_BUILD)
@@ -49,7 +44,7 @@ target_link_directories(${MODULE_FULL_NAME} PUBLIC  ${VENDOR_CURRENT_LIB_DIR}/ke
 target_link_libraries(${MODULE_FULL_NAME} ${VENDOR_LOG_LIB_NAME})
 
 #链接QT5 使用<Q..>头文件
-target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
+#target_link_libraries(${MODULE_FULL_NAME}  Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick)
 
 #链接keba依赖库
 #target_link_libraries(${MODULE_FULL_NAME} DevComm.keba Algorithm.keba DataConvert.keba winfunc.keba FileDir.keba INIAccess.keba FileAccess.keba TraceManager.keba TimerCtrl.keba)

DevAdapter/keba/WatchDog.keba.1.1/WatchDogClassImpl.cpp

@@ -1,8 +1,8 @@
 #include "WatchDogClassImpl.h"
-#include <QJsonParseError>  //https://www.cnblogs.com/whik/p/11234889.html
-#include <QVariantMap>
-#include <QJsonObject>
-#include <QJsonArray>
+//#include <QJsonParseError>  //https://www.cnblogs.com/whik/p/11234889.html
+//#include <QVariantMap>
+//#include <QJsonObject>
+//#include <QJsonArray>
 #include "DepErrorCode.h"
 //#include "CkLog.h"
 
@@ -444,6 +444,13 @@ void WatchDogClassImpl::SaveErrorInfo(CHAR *errMsg, int errCode)
 //Private
 void WatchDogClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode, const CHAR* strFunc, int nLine)
 {
+    CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
+    sprintf(chJson, "Func:%s,Line:%d,Msg:%s", strFunc, nLine, errMsg);
+    memset(m_szErrMsg, 0, MAX_DEV_ERROR_MSG_LEN);
+    sprintf(m_szErrMsg, "{\"Errcode\":%d,\"Description\":%s}", errCode,chJson);
+    LogM(m_szErrMsg);
+
+    /*
     CHAR chJson[MAX_DEV_ERROR_MSG_LEN] = {0};
     QJsonObject root_Obj;
     QJsonDocument root_Doc;
@@ -457,6 +464,7 @@ void WatchDogClassImpl::SaveErrorInfo(CHAR* errMsg, int errCode, const CHAR* str
     memset(m_szErrMsg, 0, MAX_DEV_ERROR_MSG_LEN);
     sprintf(m_szErrMsg, strJson.toUtf8().data());
     LogM(m_szErrMsg);
+    */
 }
 void WatchDogClassImpl::DelayTimer(sigval_t ptr)
 {