浏览代码

#IQRV #comment [Vendor] nantian/2021.0924.01

gifur 4 年之前
父节点
当前提交
a4f16092b9

+ 1 - 1
DevAdapter/CMakeLists.txt

@@ -140,7 +140,7 @@ message(STATUS "vendor log library: ${VENDOR_LOG_LIB_NAME}")
 # 通过conan的方式管理厂商库
 if(DEVADAPTER_USING_CONAN)
     set(KEBA_CONAN_LIB_NAME keba/2021.0625.01@LR04.02_VendorLib/testing)
-	set(NANTIAN_CONAN_LIB_NAME nantian/2021.0918.01@LR04.02_VendorLib/testing)
+	set(NANTIAN_CONAN_LIB_NAME nantian/2021.0924.01@LR04.02_VendorLib/testing)
 	set(GRG_CONAN_LIB_NAME grg/2021.0826.01@LR04.02_VendorLib/testing)
 	set(CW_CONAN_LIB_NAME cw/2021.0701.01@LR04.02_VendorLib/testing)
     set(GWI_CONAN_LIB_NAME gwi/2021.0830.01@LR04.02_VendorLib/testing)

文件差异内容过多而无法显示
+ 981 - 966
DevAdapter/nantian/FingerPrint.1.1/CILIX_AUX_UTILS.h


文件差异内容过多而无法显示
+ 981 - 966
DevAdapter/nantian/hspscanner.1.1/CILIX_AUX_UTILS.h


+ 2 - 0
DevAdapter/nantian/idcer.1.1/idcertificate.nantian.1.1.cpp

@@ -1115,7 +1115,9 @@ void* thread( void *arg )
 				{
 					if (g_pGvar.TheardEnd == false)
 						break;
+					usleep(100000);
 				}
+			g_pGvar.m_pTrace->WriteTrace(CILIXTRACE_L_INFO, "IDCerRFControl","while is end");
 				//查询设备状态
 			for(int i = 1; i <4; i++)
 			{

文件差异内容过多而无法显示
+ 981 - 966
DevAdapter/nantian/pinpad.1.1/CILIX_AUX_UTILS.h


部分文件因为文件数量过多而无法显示