Merge branch 'gifur_fixed_everything' into ST2

CMakeLists.txt

@@ -698,29 +698,39 @@ if(DEVOPS_ON)
 		#set(INSTALLSCRIPT_TYPE 2)
 	endif(DEVOPS_ON_CMAKE_PRD)
 endif(DEVOPS_ON)
+
+
 if(MSVC)
 	configure_file("${CMAKE_SOURCE_DIR}/addin/packaging/WIN/installbat.in" "${CMAKE_BINARY_DIR}/install.bat" @ONLY NEWLINE_STYLE CRLF)
 	install(PROGRAMS "${CMAKE_BINARY_DIR}/install.bat" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
 	install(FILES "${CMAKE_SOURCE_DIR}/addin/packaging/WIN/Readme.txt" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
-	if(NOT DEVOPS_ON)
-		install(FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/${ROOT_INI_NAME}" 
-			DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" 
-			RENAME "root.ini"
-			COMPONENT scripts)
-	endif(NOT DEVOPS_ON)
 	if(NOT DEVOPS_ON_CMAKE_PRD)
 		install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/packaging/WIN/kill.bat" DESTINATION ${RVC_BASE_PATH} COMPONENT scripts)
 	endif(NOT DEVOPS_ON_CMAKE_PRD)
+	file(GLOB VENDOR_ROOT_CONFIG_FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/WIN/root*.ini")
+	install(FILES ${VENDOR_ROOT_CONFIG_FILES} DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" COMPONENT scripts)
 else(MSVC)
 	file(GLOB BAT_SCRIPTS "${CMAKE_SOURCE_DIR}/addin/startup_scripts/*.sh")
-	file(GLOB VENDOR_ROOT_CONFIG_FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/root-*.ini")
-	install(FILES ${VENDOR_ROOT_CONFIG_FILES} DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" COMPONENT scripts)
 	install(PROGRAMS ${BAT_SCRIPTS} DESTINATION "${RVC_BASE_PATH}" COMPONENT scripts)
 	configure_file("${CMAKE_SOURCE_DIR}/addin/packaging/UOS/installsh.in" "${CMAKE_BINARY_DIR}/install.sh" @ONLY NEWLINE_STYLE UNIX)
 	install(PROGRAMS "${CMAKE_BINARY_DIR}/install.sh" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
 	install(FILES "${CMAKE_SOURCE_DIR}/addin/packaging/UOS/Readme.txt" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
+	file(GLOB VENDOR_ROOT_CONFIG_FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/UOS/root-*.ini")
+	install(FILES ${VENDOR_ROOT_CONFIG_FILES} DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" COMPONENT scripts)
 endif(MSVC)
 
+if(DEVOPS_ON)
+	file(GLOB VENDOR_ROOT_CONFIG_FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/root-*.ini")
+	install(FILES ${VENDOR_ROOT_CONFIG_FILES}
+		DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" 
+		COMPONENT scripts)
+else()
+	install(FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/${ROOT_INI_NAME}" 
+		DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" 
+		RENAME "root.ini"
+		COMPONENT scripts)
+endif(DEVOPS_ON)
+
 list(REMOVE_DUPLICATES RVC_CONAN_DEP_LIBS)
 if(CONAN_LIB_DIRS_QT)
 	message(STATUS "remote qt dir:${CONAN_LIB_DIRS_QT}")

DevAdapter/DeviceSimulator.h

@@ -1,4 +1,4 @@
-//用于定义实现一些模拟器通用的函数功能
+//鐢ㄤ簬瀹氫箟瀹炵幇涓€浜涙ā鎷熷櫒閫氱敤鐨勫嚱鏁板姛鑳�
 #include <string>
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,7 +9,7 @@
 #include <WinSock2.h>
 #else
 #include <arpa/inet.h>  //ntohl
-#include <unistd.h> // Linux系统中
+#include <unistd.h> // Linux绯荤粺涓�
 #include <netdb.h>  
 #include <net/if.h>  
 #include <arpa/inet.h> 
@@ -19,7 +19,7 @@
 #include <netinet/in.h>
 #endif
 
-//读取配置文件功能类
+//璇诲彇閰嶇疆鏂囦欢鍔熻兘绫�
 class iniReader
 {
 public:
@@ -32,7 +32,7 @@ public:
 	bool ReadConfig(const std::string& filename)
 	{
 		settings_.clear();
-		std::ifstream infile(filename.c_str());//构造默认调用open,所以可以不调用open
+		std::ifstream infile(filename.c_str());//鏋勯€犻粯璁よ皟鐢╫pen,鎵€浠ュ彲浠ヤ笉璋冪敤open
 		//std::ifstream infile;
 		//infile.open(filename.c_str());
 		//bool ret = infile.is_open()
@@ -222,7 +222,7 @@ private:
 };
 
 
-//读取本地IP功能函数
+//璇诲彇鏈�湴IP鍔熻兘鍑芥暟
 std::string GetLocalIP()
 {
 #ifdef RVC_OS_WIN

DevAdapter/simulator/cardissuer.1.1/cardissuer_impl.cpp

@@ -1,4 +1,4 @@
-// dllmain.cpp : 定义 DLL 应用程序的入口点。
+// dllmain.cpp : 定义 DLL 应用程序的入口点。
 #include "stdafx.h"
 #include "cardissuer_impl.h"
 

DevAdapter/simulator/cardissuer.1.1/cardissuer_impl.h

@@ -37,98 +37,98 @@ public:
 	ErrorCodeEnum DevClose();
 	ErrorCodeEnum GetLastErr(DevErrorInfo& devErrInfo);
 
-	//本接口几乎废弃不用。连接卡机，请使用DevOpenEx替代本接口
-	ErrorCodeEnum DevOpen(DWORD dwPort, DWORD dwBaudRate) { return Error_NotImpl; }//废弃
+	//鏈�帴鍙ｅ嚑涔庡簾寮冧笉鐢ㄣ€傝繛鎺ュ崱鏈猴紝璇蜂娇鐢―evOpenEx鏇夸唬鏈�帴鍙�
+	ErrorCodeEnum DevOpen(DWORD dwPort, DWORD dwBaudRate) { return Error_NotImpl; }//搴熷純
 	
 	//	Get card issuer status
-	//使用(卡库，卡机）
+	//浣跨敤(鍗″簱锛屽崱鏈猴級
 	ErrorCodeEnum GetDevStatus(CardIssuerStatus& devStatus);
 	//
 	//	Get device serial number.
-	//	设备唯一标识，且需贴在设备外壳上
-	// 使用(pad)
+	//	璁惧�鍞�竴鏍囪瘑锛屼笖闇€璐村湪璁惧�澶栧３涓�
+	// 浣跨敤(pad)
 	ErrorCodeEnum GetDeviceSN(char*& pDevSN) ;
 	//
 	//	Move card to specified position.
-	//	hopperNo:多卡箱发卡时指定发卡箱号（面对发卡机，从左往右依次是1,2,3，...号卡箱）
-	//		卡库：卡片从卡库加卡箱移动到读卡器，eCardPos为CI_MOVECARD_FROM_HOPPER，hopperNo固定传入99
-	//		卡库：卡片从卡库加卡箱移动到读卡器，若加卡箱已经无卡，返回Error_Dev_HopperHasNoCard
-	//使用(卡库，卡机）*****
+	//	hopperNo:澶氬崱绠卞彂鍗℃椂鎸囧畾鍙戝崱绠卞彿锛堥潰瀵瑰彂鍗℃満锛屼粠宸﹀線鍙充緷娆℃槸1,2,3锛�...鍙峰崱绠憋級
+	//		鍗″簱锛氬崱鐗囦粠鍗″簱鍔犲崱绠辩Щ鍔ㄥ埌璇诲崱鍣�紝eCardPos涓篊I_MOVECARD_FROM_HOPPER锛宧opperNo鍥哄畾浼犲叆99
+	//		鍗″簱锛氬崱鐗囦粠鍗″簱鍔犲崱绠辩Щ鍔ㄥ埌璇诲崱鍣�紝鑻ュ姞鍗＄�宸茬粡鏃犲崱锛岃繑鍥濫rror_Dev_HopperHasNoCard
+	//浣跨敤(鍗″簱锛屽崱鏈猴級*****
 	ErrorCodeEnum MoveCard(CardPosEnum eCardPos, int hopperNo = 1) ;
 	//
 	//	Set card entry
-	//使用(卡库，卡机）*****
+	//浣跨敤(鍗″簱锛屽崱鏈猴級*****
 	ErrorCodeEnum SetCardInType(CardInEnum eCardIn) ;
 
 	//
 	//	Read data from magnetic track.
-	//使用(卡库，卡机）
+	//浣跨敤(鍗″簱锛屽崱鏈猴級
 	ErrorCodeEnum MagRead(MagTracks& magTracks) ;
 	
 	//	Write data to magnetic track.
-	//使用(卡库）*****
+	//浣跨敤(鍗″簱锛�*****
 	ErrorCodeEnum MagWrite(MagTracks magTracks, MagWriteModeEnum eWriteMode) ;
 	//
 	//	Set retract counter
-	ErrorCodeEnum SetRetractCounter(DWORD dwCount) { return Error_NotImpl; }	//废弃
+	ErrorCodeEnum SetRetractCounter(DWORD dwCount) { return Error_NotImpl; }	//搴熷純
 	//
 	//	Set issuer counter
-	//	hopperNo:多卡箱发卡时指定发卡箱号（面对发卡机，从左往右依次是1,2,3，...号卡箱）
-	ErrorCodeEnum SetIssuerCounter(DWORD dwCount, int hopperNo = 1) { return Error_NotImpl; }//废弃
+	//	hopperNo:澶氬崱绠卞彂鍗℃椂鎸囧畾鍙戝崱绠卞彿锛堥潰瀵瑰彂鍗℃満锛屼粠宸﹀線鍙充緷娆℃槸1,2,3锛�...鍙峰崱绠憋級
+	ErrorCodeEnum SetIssuerCounter(DWORD dwCount, int hopperNo = 1) { return Error_NotImpl; }//搴熷純
 	//
 	//	Active contact IC card
-	//使用(卡库，卡机）*****
+	//浣跨敤(鍗″簱锛屽崱鏈猴級*****
 	ErrorCodeEnum ActiveICCard() ;
 	//
 	//	Move IC card to contact position
-	//使用(卡库，卡机）*****
+	//浣跨敤(鍗″簱锛屽崱鏈猴級*****
 	ErrorCodeEnum ContactIC() ;
 	//
 	//	Release IC contact
-	//使用(卡库，卡机）*****
+	//浣跨敤(鍗″簱锛屽崱鏈猴級*****
 	ErrorCodeEnum ReleaseIC() ;
 	//
 	//	Warm reset card(IC)
-	//使用(卡库，卡机）*****
+	//浣跨敤(鍗″簱锛屽崱鏈猴級*****
 	ErrorCodeEnum WarmReset() ;
 	
 	//	APDU:Application Protocol Data Unit
-	//	CmdSend.lpCmd：Command-APDU
-	//	CmdRecv.lpData：Response-APDU
-	//使用(卡库，卡机）
+	//	CmdSend.lpCmd锛欳ommand-APDU
+	//	CmdRecv.lpData锛歊esponse-APDU
+	//浣跨敤(鍗″簱锛屽崱鏈猴級
 	ErrorCodeEnum ICCommand(CmdInfo sendBuf, CmdInfo& recvBuf) ;
-	//////////////////SAM 卡操作部分////////////////////
-	ErrorCodeEnum SAMActive(BYTE vcc = 0x30) { return Error_NotImpl; }//使用(卡库，卡机）
-	ErrorCodeEnum SAMDeactivate() { return Error_NotImpl; }//使用(卡库，卡机）
-	ErrorCodeEnum SAMWarmReset() { return Error_NotImpl; }//使用(卡库，卡机）
-	ErrorCodeEnum SAMQueryStatus(SAMStatus& samStatus) { return Error_NotImpl; }//使用(卡库，卡机）
-	ErrorCodeEnum SAMSelect(const int sn) { return Error_NotImpl; }//使用(卡库，卡机）
-	//即时制卡卡库需要实现SAMCommand，用来执行apdu指令
-	ErrorCodeEnum SAMCommand(CmdInfo sendBuf, CmdInfo& recvBuf) ;//使用(卡库，卡机）
-	//即时制卡卡库需要实现ActiveICCardATR，用来激活卡片，返回ATR
-	ErrorCodeEnum ActiveICCardATR(CmdInfo& atrBuf) ;//使用(卡库，卡机）
-
-	////////////////卡面打印部分（非即时制卡的卡面印刷，即时制卡的卡面打印接口为PrintCardFaceRightNow），部分机型(例如合肥分行大机)有此功能//////////////////
-	ErrorCodeEnum Print(BYTE*& data, const int dataSize, const int side) { return Error_NotImpl; }//废弃
-	ErrorCodeEnum QueryPrinterStatus() { return Error_NotImpl; }//废弃
+	//////////////////SAM 鍗℃搷浣滈儴鍒�////////////////////
+	ErrorCodeEnum SAMActive(BYTE vcc = 0x30) { return Error_NotImpl; }//浣跨敤(鍗″簱锛屽崱鏈猴級
+	ErrorCodeEnum SAMDeactivate() { return Error_NotImpl; }//浣跨敤(鍗″簱锛屽崱鏈猴級
+	ErrorCodeEnum SAMWarmReset() { return Error_NotImpl; }//浣跨敤(鍗″簱锛屽崱鏈猴級
+	ErrorCodeEnum SAMQueryStatus(SAMStatus& samStatus) { return Error_NotImpl; }//浣跨敤(鍗″簱锛屽崱鏈猴級
+	ErrorCodeEnum SAMSelect(const int sn) { return Error_NotImpl; }//浣跨敤(鍗″簱锛屽崱鏈猴級
+	//鍗虫椂鍒跺崱鍗″簱闇€瑕佸疄鐜癝AMCommand锛岀敤鏉ユ墽琛宎pdu鎸囦护
+	ErrorCodeEnum SAMCommand(CmdInfo sendBuf, CmdInfo& recvBuf) ;//浣跨敤(鍗″簱锛屽崱鏈猴級
+	//鍗虫椂鍒跺崱鍗″簱闇€瑕佸疄鐜癆ctiveICCardATR锛岀敤鏉ユ縺娲诲崱鐗囷紝杩斿洖ATR
+	ErrorCodeEnum ActiveICCardATR(CmdInfo& atrBuf) ;//浣跨敤(鍗″簱锛屽崱鏈猴級
+
+	////////////////鍗￠潰鎵撳嵃閮ㄥ垎锛堥潪鍗虫椂鍒跺崱鐨勫崱闈㈠嵃鍒凤紝鍗虫椂鍒跺崱鐨勫崱闈㈡墦鍗版帴鍙ｄ负PrintCardFaceRightNow锛夛紝閮ㄥ垎鏈哄瀷(渚嬪�鍚堣偉鍒嗚�澶ф満)鏈夋�鍔熻兘//////////////////
+	ErrorCodeEnum Print(BYTE*& data, const int dataSize, const int side) { return Error_NotImpl; }//搴熷純
+	ErrorCodeEnum QueryPrinterStatus() { return Error_NotImpl; }//搴熷純
 
 	////////////////////////////////////////////////////////////////////////////
-	////////非接(IC)部分 start，没有此部分，在接口实现中直接返回Error_NotImpl///////////////
+	////////闈炴帴(IC)閮ㄥ垎 start锛屾病鏈夋�閮ㄥ垎锛屽湪鎺ュ彛瀹炵幇涓�洿鎺ヨ繑鍥濫rror_NotImpl///////////////
 	////////////////////////////////////////////////////////////////////////////
 	//	Active contactless IC card(Type A,B,Mifare)
 	//	The first,second,third activation order decided by fstType,scdType,thdType respectively
 	//	fstType,scdType,thdType can be one of 'A','B','M','0'(30H,no type)
 	//	outType indicates the type of  activation result
 	//
-	ErrorCodeEnum ActiveContactlessICCard(char fstType, char scdType, char thdType, char& outType) ;//使用(卡库，卡机）
+	ErrorCodeEnum ActiveContactlessICCard(char fstType, char scdType, char thdType, char& outType) ;//浣跨敤(鍗″簱锛屽崱鏈猴級
 	//
 	//	Deactivate contact IC card *****
 	//
-	ErrorCodeEnum DeactivateICCard() ; //使用(卡库，卡机）
+	ErrorCodeEnum DeactivateICCard() ; //浣跨敤(鍗″簱锛屽崱鏈猴級
 	//
 	//	Deactivate contactless IC card *****
 	//
-	ErrorCodeEnum DeactContactlessICCard() ;//使用(卡库，卡机）
+	ErrorCodeEnum DeactContactlessICCard() ;//浣跨敤(鍗″簱锛屽崱鏈猴級
 	//
 	//	RF Mifare Classic protocol operation
 	//	Arguments:
@@ -136,7 +136,7 @@ public:
 	//	- sendBuf:[parameter][data]
 	//	- recvBuf:[status(1byte)][return data]
 	//
-	ErrorCodeEnum MifareCommand(MifareFuctionEnum eFunType, CmdInfo sendBuf, CmdInfo& recvBuf) { return Error_NotImpl; }//废弃
+	ErrorCodeEnum MifareCommand(MifareFuctionEnum eFunType, CmdInfo sendBuf, CmdInfo& recvBuf) { return Error_NotImpl; }//搴熷純
 	//
 	//	RF Type A,B command.
 	//	APDU:Application Protocol Data Unit
@@ -144,89 +144,89 @@ public:
 	// 	- CmdSend.lpCmd:Command-APDU
 	// 	- CmdRecv.lpData:Response-APDU
 	//
-	ErrorCodeEnum RFTypeABCommand(CmdInfo sendBuf, CmdInfo& recvBuf) ;//使用(卡库，卡机）
-	////////非接(IC)部分 end/////////////////////////////////////////////////////////
-
-	//	发卡机调用打开设备
-	//	1. btOpenType:设定通过哪种方式连接设备，由DevOpenType的枚举值组合。usb及蓝牙设备连接可忽略dwPort，dwBaudRate
-	//	2.通过pDevSN来指定连接对应设备号的蓝牙发卡机（考虑存在多台发卡机的情况）
-	//		例如通过蓝牙或者usb连接设备，则btOpenType = (DEV_OPEN_TYPE_USB|DEV_OPEN_TYPE_BLUETOOTH)
-	//	3. btType返回设备实际通过哪种方式相连，返回值参考DevOpenType（大机，卡库参考下一条）
-	//	4.对于大机（柜式可视柜台，卡库）dwPort,dwBaudRate传入端口，波特率，btOpenType为DEV_OPEN_TYPE_COM，pDevSN为""
-	//		,btType返回值表示卡槽数量（例如目前存在单卡槽1,双卡槽2，三卡槽3的机型）
+	ErrorCodeEnum RFTypeABCommand(CmdInfo sendBuf, CmdInfo& recvBuf) ;//浣跨敤(鍗″簱锛屽崱鏈猴級
+	////////闈炴帴(IC)閮ㄥ垎 end/////////////////////////////////////////////////////////
+
+	//	鍙戝崱鏈鸿皟鐢ㄦ墦寮€璁惧�
+	//	1. btOpenType:璁惧畾閫氳繃鍝��鏂瑰紡杩炴帴璁惧�锛岀敱DevOpenType鐨勬灇涓惧€肩粍鍚堛€倁sb鍙婅摑鐗欒�澶囪繛鎺ュ彲蹇界暐dwPort锛宒wBaudRate
+	//	2.閫氳繃pDevSN鏉ユ寚瀹氳繛鎺ュ�搴旇�澶囧彿鐨勮摑鐗欏彂鍗℃満锛堣€冭檻瀛樺湪澶氬彴鍙戝崱鏈虹殑鎯呭喌锛�
+	//		渚嬪�閫氳繃钃濈墮鎴栬€卽sb杩炴帴璁惧�锛屽垯btOpenType = (DEV_OPEN_TYPE_USB|DEV_OPEN_TYPE_BLUETOOTH)
+	//	3. btType杩斿洖璁惧�瀹為檯閫氳繃鍝��鏂瑰紡鐩歌繛锛岃繑鍥炲€煎弬鑰僁evOpenType锛堝ぇ鏈猴紝鍗″簱鍙傝€冧笅涓€鏉★級
+	//	4.瀵逛簬澶ф満锛堟煖寮忓彲瑙嗘煖鍙帮紝鍗″簱锛塪wPort,dwBaudRate浼犲叆绔�彛锛屾尝鐗圭巼锛宐tOpenType涓篋EV_OPEN_TYPE_COM锛宲DevSN涓�""
+	//		,btType杩斿洖鍊艰〃绀哄崱妲芥暟閲忥紙渚嬪�鐩�墠瀛樺湪鍗曞崱妲�1,鍙屽崱妲�2锛屼笁鍗℃Ы3鐨勬満鍨嬶級
 	//	*****
-	ErrorCodeEnum DevOpenEx(DWORD dwPort, DWORD dwBaudRate, BYTE btOpenType, const char* pDevSN, BYTE& btType) ;//使用(卡库，卡机）
+	ErrorCodeEnum DevOpenEx(DWORD dwPort, DWORD dwBaudRate, BYTE btOpenType, const char* pDevSN, BYTE& btType) ;//浣跨敤(鍗″簱锛屽崱鏈猴級
 
 	/////////////////////////////////////////////////////////////////////////
-	///以下是便携式卡机特有API，接口实现中其他机型直接返回Error_NotImpl即可//
+	///浠ヤ笅鏄�究鎼哄紡鍗℃満鐗规湁API锛屾帴鍙ｅ疄鐜颁腑鍏朵粬鏈哄瀷鐩存帴杩斿洖Error_NotImpl鍗冲彲//
 	/////////////////////////////////////////////////////////////////////////
 
-	//	返回值Error_Succeed表示成功，其他值表示失败
-	//	iStatus   0:成功   -1:银行公钥不存在   -2:产生设备密钥故障  -x:其他厂商自定义故障
-	//	Cr1：随机数r1的密文； Cr3：随机数r3的密文，dKey：用银行公钥加密的设备公钥密文
-	//	r1，r3第16字节为数据完整性校验字节，例如r1为B1B2...B15B16,则B16=B1^B2^...^B15
-	ErrorCodeEnum TransferEnInit(int& iStatus, BYTE*& Cr1, int& lenR1, BYTE*& Cr3, int& lenR3, BYTE*& dKey, int& lenKey) ;//使用(刷卡器）
+	//	杩斿洖鍊糆rror_Succeed琛ㄧず鎴愬姛锛屽叾浠栧€艰〃绀哄け璐�
+	//	iStatus   0:鎴愬姛   -1:閾惰�鍏�挜涓嶅瓨鍦�   -2:浜х敓璁惧�瀵嗛挜鏁呴殰  -x:鍏朵粬鍘傚晢鑷�畾涔夋晠闅�
+	//	Cr1锛氶殢鏈烘暟r1鐨勫瘑鏂囷紱 Cr3锛氶殢鏈烘暟r3鐨勫瘑鏂囷紝dKey锛氱敤閾惰�鍏�挜鍔犲瘑鐨勮�澶囧叕閽ュ瘑鏂�
+	//	r1锛宺3绗�16瀛楄妭涓烘暟鎹�畬鏁存€ф牎楠屽瓧鑺傦紝渚嬪�r1涓築1B2...B15B16,鍒橞16=B1^B2^...^B15
+	ErrorCodeEnum TransferEnInit(int& iStatus, BYTE*& Cr1, int& lenR1, BYTE*& Cr3, int& lenR3, BYTE*& dKey, int& lenKey) ;//浣跨敤(鍒峰崱鍣�級
 
-	//	返回值Error_Succeed表示成功，其他值表示失败
-	//	iStatus   0:成功   -x:厂商自定义故障
-	//	r2第16字节为数据完整性校验字节，例如r2为B1B2...B15B16,则B16=B1^B2^...^B15
-	ErrorCodeEnum SetR2(int& iStatus, BYTE* pCr2, int lenR2) ;//使用(刷卡器）
+	//	杩斿洖鍊糆rror_Succeed琛ㄧず鎴愬姛锛屽叾浠栧€艰〃绀哄け璐�
+	//	iStatus   0:鎴愬姛   -x:鍘傚晢鑷�畾涔夋晠闅�
+	//	r2绗�16瀛楄妭涓烘暟鎹�畬鏁存€ф牎楠屽瓧鑺傦紝渚嬪�r2涓築1B2...B15B16,鍒橞16=B1^B2^...^B15
+	ErrorCodeEnum SetR2(int& iStatus, BYTE* pCr2, int lenR2) ;//浣跨敤(鍒峰崱鍣�級
 	//
-	//	设置会话密钥
-	//	pWorkingKey:会话密钥，传递16进制的字符形式，例如0x123456FFAB  --> "123456FFAB"
-	ErrorCodeEnum SendWorkingKey(const char* pWorkingKey) ;//使用(刷卡器）
+	//	璁剧疆浼氳瘽瀵嗛挜
+	//	pWorkingKey:浼氳瘽瀵嗛挜锛屼紶閫�16杩涘埗鐨勫瓧绗﹀舰寮忥紝渚嬪�0x123456FFAB  --> "123456FFAB"
+	ErrorCodeEnum SendWorkingKey(const char* pWorkingKey) ;//浣跨敤(鍒峰崱鍣�級
 
-	//安全锁接口部分 begin
-	ErrorCodeEnum SLLoadKey(const SCIKeyInfo key) { return Error_NotImpl; }// 使用(刷卡器） 废弃
+	//瀹夊叏閿佹帴鍙ｉ儴鍒� begin
+	ErrorCodeEnum SLLoadKey(const SCIKeyInfo key) { return Error_NotImpl; }// 浣跨敤(鍒峰崱鍣�級 搴熷純
 	//case ParamBeep: value:0,close beep;value:1,open beep
 	//case ParamLed: value:0,close led;value:1,open led
 	//case ParamLevelTime: value:the duration of level,100ms per unit
 	//		ex.	the value 10 means duration time is 1 second
-	 ErrorCodeEnum SLSetParam(SCIParamType eType, int value) { return Error_NotImpl; }//废弃
-	ErrorCodeEnum SLLock() { return Error_NotImpl; }//废弃
-	ErrorCodeEnum SLUnLock(const SCICheckCode checkCode, bool bTemp = true) { return Error_NotImpl; }//废弃
-	ErrorCodeEnum SLGetTempData(SCITempData& ksnData, SCITempData& ramData) { return Error_NotImpl; }//废弃
-	ErrorCodeEnum SLOpenDoor(const SCITempData data) { return Error_NotImpl; }//废弃
-	//安全锁接口部分 end
-
-	//蓝牙控制部分 start
-	//蓝牙指令控制，命令参看SCIBluetoothCMD说明
-	ErrorCodeEnum BluetoothControl(SCIBluetoothCMD eCmd) { return Error_NotImpl; }//废弃
-	//修改配对密码
-	ErrorCodeEnum BluetoothModifyKey(unsigned char* key) { return Error_NotImpl; }//废弃
-	//修改蓝牙设备名称
-	ErrorCodeEnum BluetoothModifyName(unsigned char* name) { return Error_NotImpl; }//废弃
-	//获取版本信息
-	ErrorCodeEnum BluetoothGetVersion(char*& version) { return Error_NotImpl; }//废弃
-	//获取连接设备名称
-	ErrorCodeEnum BluetoothGetConnectName(unsigned char*& name) { return Error_NotImpl; }//废弃
-	//获取连接设备信号强度
-	ErrorCodeEnum BluetoothGetSignalStrength(unsigned char*& signal) { return Error_NotImpl; }//废弃
-	//蓝牙控制部分 end
-
-	//控制灯光
-	//eLight：所控制的灯 ；
-	//bOnOff：true 亮灯；fasle 灭灯
-	ErrorCodeEnum LightControl(SCILightType eLight, bool bOnOff) { return Error_NotImpl; }//废弃
-	//以百分比数值返回剩余电量（1-100），例如剩余51%，则bat赋值为51
-	ErrorCodeEnum QueryBatteryPower(int& bat) { return Error_NotImpl; }//废弃
+	 ErrorCodeEnum SLSetParam(SCIParamType eType, int value) { return Error_NotImpl; }//搴熷純
+	ErrorCodeEnum SLLock() { return Error_NotImpl; }//搴熷純
+	ErrorCodeEnum SLUnLock(const SCICheckCode checkCode, bool bTemp = true) { return Error_NotImpl; }//搴熷純
+	ErrorCodeEnum SLGetTempData(SCITempData& ksnData, SCITempData& ramData) { return Error_NotImpl; }//搴熷純
+	ErrorCodeEnum SLOpenDoor(const SCITempData data) { return Error_NotImpl; }//搴熷純
+	//瀹夊叏閿佹帴鍙ｉ儴鍒� end
+
+	//钃濈墮鎺у埗閮ㄥ垎 start
+	//钃濈墮鎸囦护鎺у埗锛屽懡浠ゅ弬鐪婼CIBluetoothCMD璇存槑
+	ErrorCodeEnum BluetoothControl(SCIBluetoothCMD eCmd) { return Error_NotImpl; }//搴熷純
+	//淇�敼閰嶅�瀵嗙爜
+	ErrorCodeEnum BluetoothModifyKey(unsigned char* key) { return Error_NotImpl; }//搴熷純
+	//淇�敼钃濈墮璁惧�鍚嶇О
+	ErrorCodeEnum BluetoothModifyName(unsigned char* name) { return Error_NotImpl; }//搴熷純
+	//鑾峰彇鐗堟湰淇℃伅
+	ErrorCodeEnum BluetoothGetVersion(char*& version) { return Error_NotImpl; }//搴熷純
+	//鑾峰彇杩炴帴璁惧�鍚嶇О
+	ErrorCodeEnum BluetoothGetConnectName(unsigned char*& name) { return Error_NotImpl; }//搴熷純
+	//鑾峰彇杩炴帴璁惧�淇″彿寮哄害
+	ErrorCodeEnum BluetoothGetSignalStrength(unsigned char*& signal) { return Error_NotImpl; }//搴熷純
+	//钃濈墮鎺у埗閮ㄥ垎 end
+
+	//鎺у埗鐏�厜
+	//eLight锛氭墍鎺у埗鐨勭伅 锛�
+	//bOnOff锛歵rue 浜�伅锛沠asle 鐏�伅
+	ErrorCodeEnum LightControl(SCILightType eLight, bool bOnOff) { return Error_NotImpl; }//搴熷純
+	//浠ョ櫨鍒嗘瘮鏁板€艰繑鍥炲墿浣欑數閲忥紙1-100锛夛紝渚嬪�鍓╀綑51%锛屽垯bat璧嬪€间负51
+	ErrorCodeEnum QueryBatteryPower(int& bat) { return Error_NotImpl; }//搴熷純
 	//oiltest
 	//virtual ErrorCodeEnum EncryptData(TempData ramData, TempData bdk, TempData curksn, TempData &encryptedData) ;
-	//把卡片从读卡器移动到指定卡槽位
-	 ErrorCodeEnum MoveCardToSlot(int slot) ;//使用(卡库，卡机）
-	//把卡片从指定卡槽位移动到读卡器
-	 ErrorCodeEnum MoveCardFromSlot(int slot) ;//使用(卡库，卡机）
-	//读取卡号
-	//优先从IC卡解析卡号，如果纯磁条卡，则返回磁道解析的卡号
-	 ErrorCodeEnum ReadAccount(CardNo& cardNo) ;//使用(卡库，卡机）
-	//获取总卡槽数
-	 ErrorCodeEnum GetSlotSum(int& sum) ;//使用(卡库，卡机）
-	//获取卡槽状态
-	 ErrorCodeEnum QuerySlotsStatus(SlotStatus& slots, const int slot, bool bFull = false) ;//使用(卡库，卡机）
-	//即时制卡卡库专用接口
-	 ErrorCodeEnum PrintCardFaceRightNow(const KakuPrintInfo printInfo) ;//使用(卡库，卡机）
-
-	 /////////////////////////////////////http实现///////////////////////////////////////
+	//鎶婂崱鐗囦粠璇诲崱鍣ㄧЩ鍔ㄥ埌鎸囧畾鍗℃Ы浣�
+	 ErrorCodeEnum MoveCardToSlot(int slot) ;//浣跨敤(鍗″簱锛屽崱鏈猴級
+	//鎶婂崱鐗囦粠鎸囧畾鍗℃Ы浣嶇Щ鍔ㄥ埌璇诲崱鍣�
+	 ErrorCodeEnum MoveCardFromSlot(int slot) ;//浣跨敤(鍗″簱锛屽崱鏈猴級
+	//璇诲彇鍗″彿
+	//浼樺厛浠嶪C鍗¤В鏋愬崱鍙凤紝濡傛灉绾��鏉″崱锛屽垯杩斿洖纾侀亾瑙ｆ瀽鐨勫崱鍙�
+	 ErrorCodeEnum ReadAccount(CardNo& cardNo) ;//浣跨敤(鍗″簱锛屽崱鏈猴級
+	//鑾峰彇鎬诲崱妲芥暟
+	 ErrorCodeEnum GetSlotSum(int& sum) ;//浣跨敤(鍗″簱锛屽崱鏈猴級
+	//鑾峰彇鍗℃Ы鐘舵€�
+	 ErrorCodeEnum QuerySlotsStatus(SlotStatus& slots, const int slot, bool bFull = false) ;//浣跨敤(鍗″簱锛屽崱鏈猴級
+	//鍗虫椂鍒跺崱鍗″簱涓撶敤鎺ュ彛
+	 ErrorCodeEnum PrintCardFaceRightNow(const KakuPrintInfo printInfo) ;//浣跨敤(鍗″簱锛屽崱鏈猴級
+
+	 /////////////////////////////////////http瀹炵幇///////////////////////////////////////
 
 
 	 bool GetDevStatusHttp(CardIssuerStatus& devStatus);
@@ -250,7 +250,7 @@ public:
 	 bool WarmResetHttp();
 
 	 bool ICCommandHttp(CmdInfo sendBuf, CmdInfo& recvBuf);
-	 //////////////////SAM 卡操作部分////////////////////
+	 //////////////////SAM 鍗℃搷浣滈儴鍒�////////////////////
 
 	 bool SAMCommandHttp(CmdInfo sendBuf, CmdInfo& recvBuf);
 
@@ -267,7 +267,7 @@ public:
 	 bool DevOpenExHttp(DWORD dwPort, DWORD dwBaudRate, BYTE btOpenType, const char* pDevSN, BYTE& btType);
 
 	 /////////////////////////////////////////////////////////////////////////
-	 ///以下是便携式卡机刷卡器特有API，接口实现中其他机型直接返回Error_NotImpl即可//
+	 ///浠ヤ笅鏄�究鎼哄紡鍗℃満鍒峰崱鍣ㄧ壒鏈堿PI锛屾帴鍙ｅ疄鐜颁腑鍏朵粬鏈哄瀷鐩存帴杩斿洖Error_NotImpl鍗冲彲//
 	 /////////////////////////////////////////////////////////////////////////
 
 	 bool TransferEnInitHttp(int& iStatus, BYTE*& Cr1, int& lenR1, BYTE*& Cr3, int& lenR3, BYTE*& dKey, int& lenKey);
@@ -276,7 +276,7 @@ public:
 
 	 bool SendWorkingKeyHttp(const char* pWorkingKey);
 
-	 //////////////卡库使用/////////////////////
+	 //////////////鍗″簱浣跨敤/////////////////////
 
 	 bool MoveCardToSlotHttp(int slot);
 
@@ -290,7 +290,7 @@ public:
 
 	 bool PrintCardFaceRightNowHttp(const KakuPrintInfo printInfo);
 
-	 /////////////////////////////////////http实现///////////////////////////////////////
+	 /////////////////////////////////////http瀹炵幇///////////////////////////////////////
 
 	 string depCfgPath;
 	 iniReader iniRead;

Framework/spshell/spshell.cpp

@@ -202,15 +202,15 @@ static void SetEnvPath()
 	strcat(buf+size, ENV_SEP_STR);
 	strcat(buf+size, path);
 	
-	*strrchr(path, SPLIT_SLASH) = 0;
-	strcat(path, SPLIT_SLASH_STR "dev");
-	strcat(buf+size, ENV_SEP_STR);
-	strcat(buf+size, path);
-
-	*strrchr(path, SPLIT_SLASH) = 0;
-	strcat(path, SPLIT_SLASH_STR "imdep");
-	strcat(buf + size, ENV_SEP_STR);
-	strcat(buf + size, path);
+	//*strrchr(path, SPLIT_SLASH) = 0;
+	//strcat(path, SPLIT_SLASH_STR "dev");
+	//strcat(buf+size, ENV_SEP_STR);
+	//strcat(buf+size, path);
+
+	//*strrchr(path, SPLIT_SLASH) = 0;
+	//strcat(path, SPLIT_SLASH_STR "imdep");
+	//strcat(buf + size, ENV_SEP_STR);
+	//strcat(buf + size, path);
 
 	SetEnvironmentVariableA(var, buf);
 	free(buf);

Framework/spshell/svc.cpp

@@ -95,47 +95,35 @@ void on_bluesceen_undisplay(sp_rpc_server_t *server, int epid, int svc_id, int c
 
 #if defined(_MSC_VER)
 ///*TODO(80374374@3/23/2023): 移动到 libtoolkit */
-static BOOL RestartWindows()
+static BOOL RestartWindows(BOOL fShutdownOnly = FALSE)
 {
 	HANDLE hToken;              // handle to process token 
 	TOKEN_PRIVILEGES tkp;       // pointer to token structure 
 	BOOL fResult;               // system shutdown flag 
-
-	// Get the current process token handle so we can get shutdown privilege. 
 	if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken)) {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("get proc token fail");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("get proc token fail GLE=%u", GetLastError());
 		return FALSE;
 	}
-
-	// Get the LUID for shutdown privilege. 
 	LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME, &tkp.Privileges[0].Luid);
-
 	tkp.PrivilegeCount = 1;  // one privilege to set    
 	tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
-
-	// Get shutdown privilege for this process. 
-	AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, (PTOKEN_PRIVILEGES)NULL, 0);
-
-	// Cannot test the return value of AdjustTokenPrivileges. 
-	if (GetLastError() != ERROR_SUCCESS) {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("adjust proc token privilege fail");
+	if (!AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, (PTOKEN_PRIVILEGES)NULL, 0)) {
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("adjust proc token privilege fail GLE=%u", GetLastError());
 		return FALSE;
 	}
 
-	// Display the shutdown dialog box and start the countdown. 
 	fResult = InitiateSystemShutdown(
 		NULL,    // shut down local computer 
 		NULL,   // message for user
 		0,			// time-out period, in seconds 
 		FALSE,   // ask user to close apps 
-		TRUE);   // reboot after shutdown 
+		!fShutdownOnly);   // reboot after shutdown 
 
 	if (!fResult) {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("request windows reboot fail");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("request windows reboot fail GLE=%u", GetLastError());
 		return FALSE;
 	}
 
-	// Disable shutdown privilege. 
 	tkp.Privileges[0].Attributes = 0;
 	AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, (PTOKEN_PRIVILEGES)NULL, 0);
 	return TRUE;
@@ -166,41 +154,46 @@ static int KickoffSpRestartInner(int options)
 {
 #ifdef _WIN32
 
-	STARTUPINFO si;
-	PROCESS_INFORMATION pi;
-
-	ZeroMemory(&si, sizeof(si));
-	si.cb = sizeof(si);
-	ZeroMemory(&pi, sizeof(pi));
-	// Start the child process.
-	char exepath[MAX_PATH] = "";
-	getExePath(exepath);
+	if (options == RESTART_PC || options == SHUTDOWN_PC) {
+		return RestartWindows(options == SHUTDOWN_PC) ? 0 : -1;
+	}
+	else {
+		STARTUPINFO si;
+		PROCESS_INFORMATION pi;
+
+		ZeroMemory(&si, sizeof(si));
+		si.cb = sizeof(si);
+		ZeroMemory(&pi, sizeof(pi));
+		// Start the child process.
+		char exepath[MAX_PATH] = "";
+		getExePath(exepath);
+
+		CSimpleStringA csRestart, csVerPath, csAll, csSep("\""), csBlank(" "), csScript("wscript.exe"), csReFlag("r");
+		csRestart = CSimpleStringA(exepath) + "\\sprestart.exe";
+
+		sp_env_t* env = sp_get_env();
+		csVerPath = env->dir->root_ver_path;
+		csVerPath += "\\VTM.exe";
+		if (options == SHUTDOWN_FRAMEWORK)
+			csReFlag = "n";
+
+		csAll = csRestart + csBlank + csVerPath + csBlank + csReFlag;
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("allpath[%s]", (LPCTSTR)csAll);
+		LPTSTR szCmdline = _strdup(csAll);
+		if (!CreateProcess(NULL, szCmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
+		{
+			DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("CreateProcess failed (%d).\n", GetLastError());
+			return -1;
+		}
 
-	CSimpleStringA csRestart, csVerPath, csAll, csSep("\""), csBlank(" "), csScript("wscript.exe"), csReFlag("r");
-	csRestart = CSimpleStringA(exepath) + "\\sprestart.exe";
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("CreateProcess Success PID:%d.\n", pi.dwProcessId);
+		DWORD dwErr = GetLastError();
 
-	sp_env_t *env = sp_get_env();
-	csVerPath = env->dir->root_ver_path;
-	csVerPath += "\\VTM.exe";
-	if (options == SHUTDOWN_FRAMEWORK)
-		csReFlag = "n";
-	
-	csAll = csRestart + csBlank +  csVerPath + csBlank + csReFlag ;
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("allpath[%s]", (LPCTSTR)csAll);
-	LPTSTR szCmdline = _strdup(csAll);
-	if (!CreateProcess(NULL, szCmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
-	{
-		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("CreateProcess failed (%d).\n", GetLastError());
-		return -1;
+		// Close process and thread handles. 
+		CloseHandle(pi.hProcess);
+		CloseHandle(pi.hThread);
+		return 0;
 	}
-	
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("CreateProcess Success PID:%d.\n", pi.dwProcessId);
-	DWORD dwErr = GetLastError();
-
-	// Close process and thread handles. 
-	CloseHandle(pi.hProcess);
-	CloseHandle(pi.hThread);
-	return 0;
 
 #else
 
@@ -514,7 +507,7 @@ void on_machine_reboot(sp_rpc_server_t *server, int epid, int svc_id, int call_t
 		}
 	}
 
-	else if (eRebootWay == RebootWay_OS)
+	else if (eRebootWay == RebootWay_OS || eRebootWay == RebootWay_Power) /** UPS 下线后，Power类型也兼容到框架  [Gifur@2024511]*/
 	{
 		if (eRebootTrigger != RebootTrigger_DeadForever) {
             DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("reboot operation system now");

Module/mod_ResourceWatcher/ResourceWatcherFSM.cpp

@@ -149,7 +149,6 @@ ResourceWatcherFSM::ResourceWatcherFSM(void)
     m_bFirstRunAfterBoot(FALSE),
     m_csDelFileSuffix(true),
     m_failDelCnt(0),
-    m_bIsConfigMode(FALSE),
     m_cpuTop(0)
 {
     m_iNonSignedTotal = 0;
@@ -221,20 +220,17 @@ void ResourceWatcherFSM::ClearVideoQueue()
 void ResourceWatcherFSM::s0_on_entry()
 {
     LOG_FUNCTION();
-#ifdef RVC_OS_LINUX
-    if (!m_bIsConfigMode) {
-        this->PostEventFIFO(new RunEvent());
-    }
-    else {
-        DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("in config mode, do nothing about clear job");
-    }
-#else
-    this->PostEventFIFO(new RunEvent());
-    BOOL fInstallBySetup(FALSE);
-    if (Error_Succeed == DetectVTMInstalledBySetup(fInstallBySetup) && !fInstallBySetup) {
-        GetEntityBase()->GetFunction()->PostThreadPoolTask(new CreateLinkTask(this));
-    }
-#endif // RVC_OS_LINUX
+#if defined(RVC_OS_WIN)
+	this->PostEventFIFO(new RunEvent());
+	BOOL fInstallBySetup(FALSE);
+	ErrorCodeEnum rc = DetectVTMInstalledBySetup(fInstallBySetup);
+	if (Error_Succeed == rc && !fInstallBySetup) {
+		GetEntityBase()->GetFunction()->PostThreadPoolTask(new CreateLinkTask(this));
+	}
+	else {
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("detect install type return %s, setup type: %d", SpStrError(rc), fInstallBySetup);
+	}
+#endif //RVC_OS_WIN
 }
 
 unsigned int ResourceWatcherFSM::s0_on_event(FSMEvent* e)
@@ -551,17 +547,6 @@ ErrorCodeEnum ResourceWatcherFSM::OnInit()
 #ifdef WIDE_CONDITION
     setlocale(LC_ALL, "chs");
 #endif
-    CSimpleStringA strtermState;
-    GetEntityBase()->GetFunction()->GetSysVar("TerminalStage", strtermState);
-    if (strtermState.IsStartWith("Z=")) {
-        DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("in config mode");
-        m_bIsConfigMode = TRUE;
-    }
-
-    if (m_bIsConfigMode) {
-        return Error_Succeed;
-    }
-
     CSmartPointer<IConfigInfo> spRunConfig;
     CSmartPointer<IConfigInfo> spCtSettingConfig;
     GetEntityBase()->GetFunction()->OpenConfig(Config_Run, spRunConfig);
@@ -607,19 +592,24 @@ ErrorCodeEnum ResourceWatcherFSM::OnInit()
         m_DoneDetectAutostart = false;
 #endif //RVC_OS_WIN
     }
-    DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("to initialize critical section...");
     InitializeCriticalSection(&g_csVideoMoreClear);
 
     if (m_bFirstRunAfterBoot) {
 #if defined(RVC_OS_WIN)
         DetectDestopFileAndWarn();
-        if (0 == m_RvcSysinfo.strMachineType.Compare("RVC.Stand2S", true)) {
-            const int aimScreenNums = 2;
-            const int screenNums = GetSystemMetrics(SM_CMONITORS);
-            if (screenNums != 2) {
-                LogWarn(Severity_Low, Error_Unexpect, LOG_RESOURCEWATCHER_LACK_OF_MONITOR
-                    , CSimpleStringA::Format("lack of monitor! current: %d, aim: %d", screenNums, aimScreenNums));
-            }
+		//GetSystemMetrics (SM_CMONITORS) 计数仅显示可见的显示器
+		const int screenNums = GetSystemMetrics(SM_CMONITORS);
+		const int aimScreenNums4Stand2S = 2;
+		const int aimScreenNums4Other = 1;
+		if (0 == m_RvcSysinfo.strMachineType.Compare("RVC.Stand2S", true) && screenNums != aimScreenNums4Stand2S) {
+			LogWarn(Severity_Low, Error_Unexpect, LOG_RESOURCEWATCHER_LACK_OF_MONITOR
+				, CSimpleStringA::Format("{\"subject\":\"screen_count\",\"machine_type\":\"%s\",\"expect\":%d,\"actual\":%d}"
+                    , m_RvcSysinfo.strMachineType.GetData(), aimScreenNums4Stand2S, screenNums));
+        }
+        else if (0 != m_RvcSysinfo.strMachineType.Compare("RVC.Stand2S", true) && screenNums != aimScreenNums4Other) {
+			LogWarn(Severity_Low, Error_Unexpect, LOG_RESOURCEWATCHER_LACK_OF_MONITOR
+				, CSimpleStringA::Format("{\"subject\":\"screen_count\",\"machine_type\":\"%s\",\"expect\":%d,\"actual\":%d}"
+					, m_RvcSysinfo.strMachineType.GetData(), aimScreenNums4Other, screenNums));
         }
 #endif //RVC_OS_WIN
     }
@@ -3157,7 +3147,7 @@ bool ResourceWatcherFSM::CreateLinkFile(const CSimpleStringA& szStartAppPath, co
     return bRet;
 }
 
-void ResourceWatcherFSM::CreateLink(const CSimpleStringA& exePath)
+void ResourceWatcherFSM::CreateLink(const CSimpleStringA& exePath, const CSimpleStringA& csVersion)
 {
     LPITEMIDLIST lp;
     SHGetSpecialFolderLocation(0, CSIDL_DESKTOPDIRECTORY, &lp);
@@ -3168,86 +3158,52 @@ void ResourceWatcherFSM::CreateLink(const CSimpleStringA& exePath)
 
     CSimpleStringA icoPath;
     ErrorCodeEnum Error = GetEntityBase()->GetFunction()->GetPath("RootVer", icoPath);
-    CSimpleStringA csPath = icoPath;
-    csPath += "\\active.txt";
-    FILE* pFile = fopen(csPath, "r");
-    if (pFile != NULL)
-    {
-        char szTemp[256] = {};
-        char szVersion[32] = {};
-        int n = fread(szTemp, 1, 256, pFile);
-
-        strncpy_s(szVersion, sizeof(szVersion), szTemp, _TRUNCATE);
-        fclose(pFile);
-
-        icoPath = icoPath + "\\" + szVersion + "\\bin\\VTM.ico";
-        if (!CreateLinkFile(exePath, "", s, icoPath))
-        {
-            DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CreateLinkFile DESKTOP fail");
-        }
-
-        SHGetSpecialFolderLocation(0, CSIDL_PROGRAMS, &lp);
-        memset(lstr, 0, strlen(lstr));
-        SHGetPathFromIDList(lp, lstr);
-        s = lstr;
-        s += "\\可视柜台.lnk";
-        if (!CreateLinkFile(exePath, "", s, icoPath))
-        {
-            DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CreateLinkFile CSIDL_PROGRAMS fail");
-        }
-    }
-    else
-    {
-        DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("open active.txt fail");
-    }
+	icoPath = icoPath + "\\" + csVersion.GetData() + "\\bin\\VTM.ico";
+	if (!CreateLinkFile(exePath, "", s, icoPath))
+	{
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CreateLinkFile DESKTOP fail");
+	}
+
+	SHGetSpecialFolderLocation(0, CSIDL_PROGRAMS, &lp);
+	memset(lstr, 0, strlen(lstr));
+	SHGetPathFromIDList(lp, lstr);
+	s = lstr;
+	s += "\\可视柜台.lnk";
+	if (!CreateLinkFile(exePath, "", s, icoPath))
+	{
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CreateLinkFile CSIDL_PROGRAMS fail");
+	}
 }
 
-bool isFileExist(const std::string& name)
-{
-    if (FILE* file = fopen(name.c_str(), "r")) {
-        fclose(file);
-        return true;
-    }
-    else {
-        return false;
-    }
-}
-bool ResourceWatcherFSM::CopyExeToRoot()
+bool ResourceWatcherFSM::CopyExeToRoot(const CSimpleStringA& csVersion)
 {
     CSimpleStringA rootVerPath, exePath;
     ErrorCodeEnum rc = GetEntityBase()->GetFunction()->GetPath("RootVer", rootVerPath);
     exePath = rootVerPath + "\\VTM.exe";
     DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("exePath:%s", exePath.GetData());
-    if (rc == Error_Succeed) //&& !ExistsFileA(exePath)
+    if (rc == Error_Succeed)
     {
         CSimpleStringA srcExePath, csPath = rootVerPath;
-        char szVersion[32] = {};
-        csPath += "\\active.txt";
-        FILE* pFile = fopen(csPath, "r");
-        if (pFile != NULL)
-        {
-            char szTemp[256] = {};
-            int n = fread(szTemp, 1, 256, pFile);
-            strncpy_s(szVersion, sizeof(szVersion), szTemp, _TRUNCATE);
-            fclose(pFile);
-            srcExePath = rootVerPath + "\\" + szVersion + "\\bin\\VTM.exe";
-            DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("srcExePath:%s exePath：%s", srcExePath.GetData(), exePath.GetData());
-            if (!CopyFileA(srcExePath.GetData(), exePath.GetData(), FALSE))
-            {
-                DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CopyFileA Fail error :%d ", GetLastError());
-                return false;
-            }
-        }
-        else
-        {
-            DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("open active.txt fail");
-            return false;
-        }
+		srcExePath = rootVerPath + "\\" + csVersion.GetData() + "\\bin\\VTM.exe";
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("srcExePath:%s exePath：%s", srcExePath.GetData(), exePath.GetData());
+        if (!ExistsFileA(srcExePath)) {
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("%s is not exist!", srcExePath.GetData());
+			return false;
+        }
+		if (!CopyFileA(srcExePath.GetData(), exePath.GetData(), FALSE))
+		{
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CopyFileA Fail error :%d ", GetLastError());
+			return false;
+		}
+    }
+    else {
+        DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetPath 4 RootVer failed: %s", SpStrError(rc));
+        return false;
     }
     return true;
 }
 
-bool ResourceWatcherFSM::GetVtmVersion(CSimpleStringA& csVersion)
+bool ResourceWatcherFSM::GetVtmVersionFromActiveTxt(CSimpleStringA& csVersion)
 {
     bool bRet = false;
     CSimpleStringA rootVerPath;
@@ -3753,7 +3709,7 @@ bool ResourceWatcherFSM::RegWtVtmVersion()
     }
     CSimpleStringA para = "version";
     CSimpleStringA csVersion;
-    if (GetVtmVersion(csVersion))
+    if (GetVtmVersionFromActiveTxt(csVersion))
     {
         //RegSetValueEx(key, para.GetData(), 0, REG_SZ, (BYTE*)csVersion.GetData(), MAX_PATH);
         if (ERROR_SUCCESS != RegSetValueEx(key, para.GetData(), 0, REG_SZ, (BYTE*)csVersion.GetData(), MAX_PATH))
@@ -3775,7 +3731,7 @@ bool ResourceWatcherFSM::RegOperation()
 {
     bool bRet = true;
     CSimpleStringA  csVersion, VtmRegPath, VtmRegVersion;
-    bool bGetActive = GetVtmVersion(csVersion);
+    bool bGetActive = GetVtmVersionFromActiveTxt(csVersion);
     bool bRegRead = RegRdVtmVersion(VtmRegPath, VtmRegVersion);
 
     CSimpleStringA rootVerPath, exePath;
@@ -3785,7 +3741,7 @@ bool ResourceWatcherFSM::RegOperation()
     DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("csVersion :%s ,VtmRegVersion:%s ", csVersion.GetData(), VtmRegVersion.GetData());
     if (!ExistsFileA(exePath) || !bGetActive || !bRegRead || (0 != VtmRegVersion.Compare(csVersion, true)))
     {
-        if (!ExistsFileA(exePath) && !CopyExeToRoot())
+        if (!ExistsFileA(exePath) && !CopyExeToRoot(csVersion))
         {
             DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Copy VTM.exe to version root fail.");
             bRet = false;
@@ -3800,7 +3756,7 @@ bool ResourceWatcherFSM::RegOperation()
             {
                 DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("RegWtVtmVersion failed.");
             }
-            CreateLink(exePath);
+            CreateLink(exePath, csVersion);
         }
     }
 
@@ -4014,7 +3970,7 @@ bool ResourceWatcherFSM::VerifyFirstCertificate(HCERTSTORE hStore, PCMSG_SIGNER_
             {
                 if (CertGetNameString(pCertContext, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0, NULL, pBuff, dwcbSz) == dwcbSz)
                 {
-                    if (!strcmp(pBuff, "China Merchants Bank Co., Ltd"))
+                    if (!strcmp(pBuff, "China Merchants Bank Co., Ltd") || !strcmp(pBuff, "Microsoft Corporation"))
                         ret = true;
                 }
 

Module/mod_ResourceWatcher/ResourceWatcherFSM.h

@@ -257,7 +257,6 @@ public:
 		m_bFirstRunAfterBoot(FALSE),
 		m_csDelFileSuffix(true),
 		m_failDelCnt(0),
-		m_bIsConfigMode(FALSE),
 		m_cpuTop(0)
 	{
 		mAllVideoFileSizeCal = 0;
@@ -312,12 +311,6 @@ public:
 	virtual unsigned int s3_on_event(FSMEvent* e);
 
 	void SelfTest(EntityTestEnum eTestType, CSmartPointer<ITransactionContext> pTransactionContext);
-
-    BOOL IsInitMode() const
-    {
-        DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("%s: %u", __FUNCTION__, m_bIsConfigMode);
-        return m_bIsConfigMode;
-    }
     BOOL IsFirstRunAfterBoot() const
     {
         return m_bFirstRunAfterBoot;
@@ -366,7 +359,6 @@ private:
 	CSimpleStringA m_strDefaultDns;
 	CSimpleStringA m_strBackupDns;
 	int m_nEnableSetDns;
-    BOOL m_bIsConfigMode;
     BOOL m_bFirstRunAfterBoot;
 
 #ifdef RVC_OS_LINUX
@@ -559,15 +551,15 @@ public:
 #else
 	BOOL ClearDirRecursiveEx(LPCSTR lpDirPat);
 
-	bool CopyExeToRoot();
+	bool CopyExeToRoot(const CSimpleStringA& csVersion);
 	bool RegOperation();
 	bool RegRdVtmVersion(CSimpleStringA& VTMpath, CSimpleStringA& vtmVersion);
 	bool RegWtVtmPath();
 	bool RegWtVtmVersion();
-	void CreateLink(const CSimpleStringA& exePath);
+	void CreateLink(const CSimpleStringA& exePath, const CSimpleStringA& csVersion);
 	bool CreateLinkFile(const CSimpleStringA& szStartAppPath, const CSimpleStringA& szAddCmdLine,
 		const CSimpleStringA& szDestLnkPath, const CSimpleStringA& szIconPath);
-	bool GetVtmVersion(CSimpleStringA& csVersion);
+	bool GetVtmVersionFromActiveTxt(CSimpleStringA& csVersion);
 	bool UpdateExe();
 	bool GetRegValue(HKEY hKey, LPCTSTR lpcszParam, CHAR* pSzValue, DWORD* pDwSizeOfSz);
 

Tool/VTMLauncher/VTM_IL.cpp

@@ -123,13 +123,13 @@ int GetVersion(char** pVersion)
 		}
 		else
 		{
-			MessageBoxA(NULL,"获取版本信息失败",NULL,0);
+			MessageBoxA(NULL,"获取版本信息失败：文件内容为空",NULL,0);
 			return 0;
 		}		
 	}
 	else
 	{
-		MessageBoxA(NULL,"获取版本信息失败",NULL,0);	
+		MessageBoxA(NULL,"获取版本信息失败：文件打开失败",NULL,0);	
 		return 0;
 	}
 
@@ -175,7 +175,7 @@ BOOL GetSpShellPath(char** pPath)
 	}
 	else
 	{
-		MessageBoxA(NULL,"获取版本信息失败",NULL,0);
+		MessageBoxA(NULL,"获取执行文件失败：文件无效或文件不存在",NULL,0);
 		return FALSE;
 	}
 }
@@ -190,7 +190,10 @@ BOOL Execute(const char* cExeName)
 	if (!ShellExecuteExA(&sei))
 	{
 		DWORD dwError = GetLastError();
-		MessageBoxA(NULL,"获取版本信息失败",NULL,0);
+		char szError[128];
+		memset(szError, '\0', 128);
+		sprintf_s(szError, 128, "执行应用程序失败：%u", dwError);
+		MessageBoxA(NULL, szError,NULL,0);
 		return FALSE;
 	}
 

Tool/guardian/guardian.cpp

@@ -519,7 +519,7 @@ static void ResetRelateEnviromentVars( const char* prefix)
 
 int FrameworkShutdown(bool bUpgrade=false,bool bRestart = true)
 {
-	cout << "in FrameworkShutdown,bUpgrade:" << bUpgrade << ",bRestart:" << bRestart <<  endl;
+	LOG4VTM(INFO, "in FrameworkShutdown,bUpgrade:" << bUpgrade << ",bRestart:" << bRestart);
 	if (!bUpgrade)
 		g_dwTimeBegin = GetTickCountRVC();
 	NetControl();
@@ -1198,7 +1198,7 @@ DWORD WINAPI DoWork(void* pData)
 				if (ReadRuninfoContent(strRunInfo))
 				{
 					LOG4VTM(INFO, "to check if need rollback.");
-					LOG4VTM(INFO, (char*)strRunInfo.c_str());
+					LOG4VTM(INFO, "runinfo:" << strRunInfo);
 					if (strRunInfo.compare("111") == 0 && IsStartTimeFileExist())
 					{
 						EnterCriticalSectionRVC(g_cs);
@@ -1208,6 +1208,7 @@ DWORD WINAPI DoWork(void* pData)
 				}
 				else
 					LOG4VTM(WARN, "read run info failed.");
+
 				if (g_needToRollBack)
 				{
 					LOG4VTM(INFO, "after upgrade,time elapse,but can't wait the shake hands,so rollback.");

Tool/sprestart/sprestart.c

@@ -127,14 +127,42 @@ int RestartProc(const char* csPath)
 	}
 	return 0;
 }
-int main(int argc, char** argv)
+
+int RunProc(const char* csPath)
+{
+
+	STARTUPINFO si;
+	PROCESS_INFORMATION pi;
+	ZeroMemory(&si, sizeof(si));
+	si.cb = sizeof(si);
+	si.lpReserved = NULL;
+	si.lpDesktop = NULL;
+	si.lpTitle = NULL;
+	si.dwFlags = STARTF_USESHOWWINDOW;
+	si.wShowWindow = SW_HIDE;
+	si.cbReserved2 = NULL;
+	si.lpReserved2 = NULL;
+	ZeroMemory(&pi, sizeof(pi));
+	if (!CreateProcess(NULL, (LPSTR)csPath,	NULL, NULL, FALSE, 0,NULL,NULL,&si,&pi))
+	{
+		printf("CreateProcess failed (%d).\n", GetLastError());
+		return -1;
+	}
+	WaitForSingleObject(pi.hProcess, INFINITE);
+	// Close process and thread handles. 
+	CloseHandle(pi.hProcess);
+	CloseHandle(pi.hThread);
+	return 0;
+}
+
+
+int main(int argc, char **argv)
 {
 	//find and kill the process
 	//
-	int retKill;
 	Sleep(4000);//wait framework to quit oilyang 20140604
-	WinExec("cmd.exe /c taskkill  /f /im spshell.exe", SW_HIDE);
-	WinExec("cmd.exe /c taskkill  /f /im sphost.exe", SW_HIDE);
+	RunProc("taskkill.exe  /f /im spshell.exe");
+	RunProc("taskkill.exe  /f /im sphost.exe");
 	Sleep(2000);
 	bSpshellKilled = 1;
 	if (_strnicmp(argv[2], "r", 1) == 0) {

Tool/sprestart/sprestart.vcxproj

@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6B05BAF8-A066-433F-997B-6C82F9244753}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>sprestart</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <Import Project="..\toolmake.setting" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(FrameworkHeadRoot)\libtoolkit;$(FrameworkHeadRoot)\Common</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-    	<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>    
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(FrameworkHeadRoot)\libtoolkit;$(FrameworkHeadRoot)\Common</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(FrameworkHeadRoot)\Common\precompile.c" />
-    <ClCompile Include="sprestart.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(FrameworkHeadRoot)\Common\precompile.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\Version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

Tool/sprestart/sprestart.vcxproj.filters

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\Common\precompile.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sprestart.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Common\precompile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

addin/hardwarecfg/UOS/root-RVC.Stand1SPlus-CW-CASH35AG-1201.ini

@@ -0,0 +1,116 @@
+[Terminal]
+TerminalNo=
+MachineType=RVC.Stand1SPlus
+MachineVersion=5.0
+Manufacturer=CW
+MachineModel=CASH35AG-1201
+SN=
+Site=cmb.LIB
+Screen=2
+EnrolGPS="0.003,0.003"
+EnrolAddr=XXX省XXX市XXX区XXX分行
+
+[Path]
+SysRoot=/opt/rvc/Run
+ADData=/opt/rvc/adData
+SysLog=/opt/rvc/SysLog
+InterLog=/opt/rvc/InterLog
+UploadVideo=/opt/rvc/UploadVideo
+UploadPhoto=/opt/rvc/UploadPhoto
+LocalVideo=/opt/rvc/Video
+Downloads=/opt/rvc/Downloads
+Upgraded=/opt/rvc/Upgraded
+Temp=/opt/rvc/Temp
+CenterSetting=/opt/rvc/CenterSetting
+
+[Audio]
+handfree_in_dev=
+handfree_out_dev=
+pickup_in_dev=
+pickup_out_dev=
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=100
+handfree_out_volume=100
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+EnvCamera=
+EnvRotate=0
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+;define device category
+[Device]
+Number=2
+1=IDCertificate
+2=CardIssuer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=cw
+Version=1
+Batch=1
+Port=1
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=cw
+Version=1
+Batch=1
+Port=2
+Baudrate=38400
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=cw
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.DeviceControl]
+# parameters such as port 
+Vendor=cmbsz
+Version=1
+Batch=1
+Port=0
+Baudrate=0
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=cw
+Version=1
+Batch=1
+Port=0
+Baudrate=0
+PortNum=4
+InOutDir=65280
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=cw
+Version=1
+Batch=1
+Port=4
+Baudrate=115200
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.FingerPrint]
+Vendor=cw
+Version=1
+Batch=1
+
+
+
+

addin/hardwarecfg/UOS/root-RVC.Stand1SPlus-GRG-DT-7000I64A-048.ini

@@ -0,0 +1,116 @@
+[Terminal]
+TerminalNo=
+MachineType=RVC.Stand1SPlus
+MachineVersion=5.0
+Manufacturer=GRG
+MachineModel=DT-7000I64A-048
+SN=
+Site=cmb.LIB
+Screen=2
+EnrolGPS="0.003,0.003"
+EnrolAddr=XXX省XXX市XXX区XXX分行
+
+[Path]
+SysRoot=/opt/rvc/Run
+ADData=/opt/rvc/adData
+SysLog=/opt/rvc/SysLog
+InterLog=/opt/rvc/InterLog
+UploadVideo=/opt/rvc/UploadVideo
+UploadPhoto=/opt/rvc/UploadPhoto
+LocalVideo=/opt/rvc/Video
+Downloads=/opt/rvc/Downloads
+Upgraded=/opt/rvc/Upgraded
+Temp=/opt/rvc/Temp
+CenterSetting=/opt/rvc/CenterSetting
+
+[Audio]
+handfree_in_dev=
+handfree_out_dev=
+pickup_in_dev=
+pickup_out_dev=
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=100
+handfree_out_volume=100
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+EnvCamera=
+EnvRotate=0
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+;define device category
+[Device]
+Number=2
+1=IDCertificate
+2=CardIssuer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=grg
+Version=1
+Batch=1
+Port=1
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=grg
+Version=1
+Batch=1
+Port=2
+Baudrate=38400
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=grg
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.DeviceControl]
+# parameters such as port 
+Vendor=cmbsz
+Version=1
+Batch=1
+Port=0
+Baudrate=0
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=grg
+Version=1
+Batch=1
+Port=0
+Baudrate=0
+PortNum=4
+InOutDir=65280
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=grg
+Version=1
+Batch=1
+Port=4
+Baudrate=115200
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.FingerPrint]
+Vendor=grg
+Version=1
+Batch=1
+
+
+
+

addin/hardwarecfg/UOS/root-RVC.Stand1SPlus-GWI-VTM700-A03.ini

@@ -0,0 +1,116 @@
+[Terminal]
+TerminalNo=
+MachineType=RVC.Stand1SPlus
+MachineVersion=5.0
+Manufacturer=GWI
+MachineModel=VTM700-A03
+SN=
+Site=cmb.LIB
+Screen=2
+EnrolGPS="0.003,0.003"
+EnrolAddr=XXX省XXX市XXX区XXX分行
+
+[Path]
+SysRoot=/opt/rvc/Run
+ADData=/opt/rvc/adData
+SysLog=/opt/rvc/SysLog
+InterLog=/opt/rvc/InterLog
+UploadVideo=/opt/rvc/UploadVideo
+UploadPhoto=/opt/rvc/UploadPhoto
+LocalVideo=/opt/rvc/Video
+Downloads=/opt/rvc/Downloads
+Upgraded=/opt/rvc/Upgraded
+Temp=/opt/rvc/Temp
+CenterSetting=/opt/rvc/CenterSetting
+
+[Audio]
+handfree_in_dev=
+handfree_out_dev=
+pickup_in_dev=
+pickup_out_dev=
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=100
+handfree_out_volume=100
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+EnvCamera=
+EnvRotate=0
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+;define device category
+[Device]
+Number=2
+1=IDCertificate
+2=CardIssuer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=gwi
+Version=1
+Batch=1
+Port=1
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=gwi
+Version=1
+Batch=1
+Port=2
+Baudrate=38400
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=gwi
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.DeviceControl]
+# parameters such as port 
+Vendor=cmbsz
+Version=1
+Batch=1
+Port=0
+Baudrate=0
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=gwi
+Version=1
+Batch=1
+Port=0
+Baudrate=0
+PortNum=4
+InOutDir=65280
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=gwi
+Version=1
+Batch=1
+Port=4
+Baudrate=115200
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.FingerPrint]
+Vendor=gwi
+Version=1
+Batch=1
+
+
+
+

addin/hardwarecfg/UOS/root-RVC.Stand1SPlus-KEBA-E1090.ini

@@ -0,0 +1,116 @@
+[Terminal]
+TerminalNo=
+MachineType=RVC.Stand1SPlus
+MachineVersion=5.0
+Manufacturer=KEBA
+MachineModel=E1090
+SN=
+Site=cmb.LIB
+Screen=2
+EnrolGPS="0.003,0.003"
+EnrolAddr=XXX省XXX市XXX区XXX分行
+
+[Path]
+SysRoot=/opt/rvc/Run
+ADData=/opt/rvc/adData
+SysLog=/opt/rvc/SysLog
+InterLog=/opt/rvc/InterLog
+UploadVideo=/opt/rvc/UploadVideo
+UploadPhoto=/opt/rvc/UploadPhoto
+LocalVideo=/opt/rvc/Video
+Downloads=/opt/rvc/Downloads
+Upgraded=/opt/rvc/Upgraded
+Temp=/opt/rvc/Temp
+CenterSetting=/opt/rvc/CenterSetting
+
+[Audio]
+handfree_in_dev=
+handfree_out_dev=
+pickup_in_dev=
+pickup_out_dev=
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=100
+handfree_out_volume=100
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+EnvCamera=
+EnvRotate=0
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+;define device category
+[Device]
+Number=2
+1=IDCertificate
+2=CardIssuer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=1
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=2
+Baudrate=38400
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.DeviceControl]
+# parameters such as port 
+Vendor=cmbsz
+Version=1
+Batch=1
+Port=0
+Baudrate=0
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=0
+Baudrate=0
+PortNum=4
+InOutDir=65280
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=4
+Baudrate=115200
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.FingerPrint]
+Vendor=keba
+Version=1
+Batch=1
+
+
+
+

addin/hardwarecfg/UOS/root-RVC.Stand1SPlus-NANTIAN-VTM-6200B15G.ini

@@ -0,0 +1,116 @@
+[Terminal]
+TerminalNo=
+MachineType=RVC.Stand1SPlus
+MachineVersion=5.0
+Manufacturer=NANTIAN
+MachineModel=VTM-6200B15G
+SN=
+Site=cmb.LIB
+Screen=2
+EnrolGPS="0.003,0.003"
+EnrolAddr=XXX省XXX市XXX区XXX分行
+
+[Path]
+SysRoot=/opt/rvc/Run
+ADData=/opt/rvc/adData
+SysLog=/opt/rvc/SysLog
+InterLog=/opt/rvc/InterLog
+UploadVideo=/opt/rvc/UploadVideo
+UploadPhoto=/opt/rvc/UploadPhoto
+LocalVideo=/opt/rvc/Video
+Downloads=/opt/rvc/Downloads
+Upgraded=/opt/rvc/Upgraded
+Temp=/opt/rvc/Temp
+CenterSetting=/opt/rvc/CenterSetting
+
+[Audio]
+handfree_in_dev=
+handfree_out_dev=
+pickup_in_dev=
+pickup_out_dev=
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=100
+handfree_out_volume=100
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+EnvCamera=
+EnvRotate=0
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+;define device category
+[Device]
+Number=2
+1=IDCertificate
+2=CardIssuer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=nantian
+Version=1
+Batch=1
+Port=1
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=nantian
+Version=1
+Batch=1
+Port=2
+Baudrate=38400
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=nantian
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.DeviceControl]
+# parameters such as port 
+Vendor=cmbsz
+Version=1
+Batch=1
+Port=0
+Baudrate=0
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=nantian
+Version=1
+Batch=1
+Port=0
+Baudrate=0
+PortNum=4
+InOutDir=65280
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=nantian
+Version=1
+Batch=1
+Port=4
+Baudrate=115200
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.FingerPrint]
+Vendor=nantian
+Version=1
+Batch=1
+
+
+
+

addin/hardwarecfg/UOS/root-RVC.Stand1SPlus-SZZT-ZT2619.ini

@@ -0,0 +1,116 @@
+[Terminal]
+TerminalNo=
+MachineType=RVC.Stand1SPlus
+MachineVersion=5.0
+Manufacturer=SZZT
+MachineModel=ZT2619
+SN=
+Site=cmb.LIB
+Screen=2
+EnrolGPS="0.003,0.003"
+EnrolAddr=XXX省XXX市XXX区XXX分行
+
+[Path]
+SysRoot=/opt/rvc/Run
+ADData=/opt/rvc/adData
+SysLog=/opt/rvc/SysLog
+InterLog=/opt/rvc/InterLog
+UploadVideo=/opt/rvc/UploadVideo
+UploadPhoto=/opt/rvc/UploadPhoto
+LocalVideo=/opt/rvc/Video
+Downloads=/opt/rvc/Downloads
+Upgraded=/opt/rvc/Upgraded
+Temp=/opt/rvc/Temp
+CenterSetting=/opt/rvc/CenterSetting
+
+[Audio]
+handfree_in_dev=
+handfree_out_dev=
+pickup_in_dev=
+pickup_out_dev=
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=100
+handfree_out_volume=100
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+EnvCamera=
+EnvRotate=0
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+;define device category
+[Device]
+Number=2
+1=IDCertificate
+2=CardIssuer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=szzt
+Version=1
+Batch=1
+Port=1
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=szzt
+Version=1
+Batch=1
+Port=2
+Baudrate=38400
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=szzt
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.DeviceControl]
+# parameters such as port 
+Vendor=cmbsz
+Version=1
+Batch=1
+Port=0
+Baudrate=0
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=szzt
+Version=1
+Batch=1
+Port=0
+Baudrate=0
+PortNum=4
+InOutDir=65280
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=szzt
+Version=1
+Batch=1
+Port=4
+Baudrate=115200
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.FingerPrint]
+Vendor=szzt
+Version=1
+Batch=1
+
+
+
+

addin/hardwarecfg/UOS/root-RVC.Stand2S-CW-CASH35AG-JR10(G).ini

@@ -0,0 +1,154 @@
+[Terminal]
+TerminalNo=
+MachineType=RVC.Stand2S
+MachineVersion=5.0
+Manufacturer=CW
+MachineModel=CASH35AG-JR10(G)
+SN=
+Site=cmb.LIB
+Screen=2
+EnrolGPS="0.003,0.003"
+EnrolAddr=XXX省XXX市XXX区XXX分行
+
+[Path]
+SysRoot=/opt/rvc/Run
+ADData=/opt/rvc/adData
+SysLog=/opt/rvc/SysLog
+InterLog=/opt/rvc/InterLog
+UploadVideo=/opt/rvc/UploadVideo
+UploadPhoto=/opt/rvc/UploadPhoto
+LocalVideo=/opt/rvc/Video
+Downloads=/opt/rvc/Downloads
+Upgraded=/opt/rvc/Upgraded
+Temp=/opt/rvc/Temp
+CenterSetting=/opt/rvc/CenterSetting
+
+[Audio]
+handfree_in_dev=
+handfree_out_dev=
+pickup_in_dev=
+pickup_out_dev=
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=100
+handfree_out_volume=100
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+EnvCamera=
+OptCamera= 
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+;EnvFps=5
+;OptFps=5
+
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=cw
+Version=1
+Batch=1
+Port=1
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=cw
+Version=1
+Batch=1
+Port=2
+Baudrate=38400
+
+[Device.CardSwiper]
+# parameters such as port 
+Vendor=cw
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=cw
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+
+[Device.DeviceControl]
+# parameters such as port 
+Vendor=cmbsz
+Version=1
+Batch=1
+Port=0
+Baudrate=0
+
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=cw
+Version=1
+Batch=1
+Port=8
+Baudrate=9600
+PortNum=4
+InOutDir=65280
+
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=cw
+Version=1
+Batch=1
+Port=6
+Baudrate=9600
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=cw
+Version=1
+Batch=1
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=cw
+Version=1
+Batch=1
+Port=
+
+[Device.HSPScanner]
+Vendor=cw
+Version=1
+Batch=1
+
+[Device.FingerPrint]
+Vendor=cw
+Version=1
+Batch=1
+
+
+

addin/hardwarecfg/UOS/root-RVC.Stand2S-GRG-DT-7000I64A.ini

@@ -0,0 +1,153 @@
+[Terminal]
+TerminalNo=
+MachineType=RVC.Stand2S
+MachineVersion=5.0
+Manufacturer=GRG
+MachineModel=DT-7000I64A
+SN=
+Site=cmb.LIB
+Screen=2
+EnrolGPS="0.003,0.003"
+EnrolAddr=XXX省XXX市XXX区XXX分行
+
+[Path]
+SysRoot=/opt/rvc/Run
+ADData=/opt/rvc/adData
+SysLog=/opt/rvc/SysLog
+InterLog=/opt/rvc/InterLog
+UploadVideo=/opt/rvc/UploadVideo
+UploadPhoto=/opt/rvc/UploadPhoto
+LocalVideo=/opt/rvc/Video
+Downloads=/opt/rvc/Downloads
+Upgraded=/opt/rvc/Upgraded
+Temp=/opt/rvc/Temp
+CenterSetting=/opt/rvc/CenterSetting
+
+[Audio]
+handfree_in_dev=
+handfree_out_dev=
+pickup_in_dev=
+pickup_out_dev=
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=100
+handfree_out_volume=100
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+EnvCamera=
+OptCamera= 
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+;EnvFps=5
+;OptFps=5
+
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=grg
+Version=1
+Batch=1
+Port=1
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=grg
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+
+[Device.CardSwiper]
+# parameters such as port 
+Vendor=grg
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=grg
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.DeviceControl]
+# parameters such as port 
+Vendor=cmbsz
+Version=1
+Batch=1
+Port=0
+Baudrate=0
+
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=grg
+Version=1
+Batch=1
+Port=0
+Baudrate=0
+PortNum=4
+InOutDir=65280
+
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=grg
+Version=1
+Batch=1
+Port=4
+Baudrate=115200
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=grg
+Version=1
+Batch=1
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=grg
+Version=1
+Batch=1
+Port=
+
+[Device.HSPScanner]
+Vendor=grg
+Version=1
+Batch=1
+
+[Device.FingerPrint]
+Vendor=grg
+Version=1
+Batch=1
+

addin/hardwarecfg/UOS/root-RVC.Stand2S-KEBA-E1080-L.ini

@@ -0,0 +1,154 @@
+[Terminal]
+TerminalNo=
+MachineType=RVC.Stand2S
+MachineVersion=5.0
+Manufacturer=KEBA
+MachineModel=E1080-L
+SN=
+Site=cmb.LIB
+Screen=2
+EnrolGPS="0.003,0.003"
+EnrolAddr=XXX省XXX市XXX区XXX分行
+
+[Path]
+SysRoot=/opt/rvc/Run
+ADData=/opt/rvc/adData
+SysLog=/opt/rvc/SysLog
+InterLog=/opt/rvc/InterLog
+UploadVideo=/opt/rvc/UploadVideo
+UploadPhoto=/opt/rvc/UploadPhoto
+LocalVideo=/opt/rvc/Video
+Downloads=/opt/rvc/Downloads
+Upgraded=/opt/rvc/Upgraded
+Temp=/opt/rvc/Temp
+CenterSetting=/opt/rvc/CenterSetting
+
+[Audio]
+handfree_in_dev=
+handfree_out_dev=
+pickup_in_dev=
+pickup_out_dev=
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=100
+handfree_out_volume=100
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+EnvCamera=
+OptCamera= 
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+;EnvFps=5
+;OptFps=5
+
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=1
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=2
+Baudrate=38400
+
+
+[Device.CardSwiper]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.DeviceControl]
+# parameters such as port 
+Vendor=cmbsz
+Version=1
+Batch=1
+Port=0
+Baudrate=0
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=0
+Baudrate=0
+PortNum=4
+InOutDir=65280
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=4
+Baudrate=115200
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=keba
+Version=1
+Batch=1
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=
+
+[Device.HSPScanner]
+Vendor=keba
+Version=1
+Batch=2
+
+[Device.FingerPrint]
+Vendor=keba
+Version=1
+Batch=1
+
+
+
+

addin/hardwarecfg/WIN/root-中钞科堡.ini

@@ -0,0 +1,129 @@
+[Terminal]
+TerminalNo=7715010005
+MachineType=RVC.Stand2S
+MachineVersion=1.0
+Site=CMB.LIB
+Screen=2
+EnrolGPS=0.003,0.003
+EnrolAddr=广东省深圳市南山区科技园北区科技中一路3号
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=麦克风阵列 (Andrea PureAudio US
+handfree_out_dev=扬声器 (Andrea PureAudio USB-SA
+pickup_in_dev=麦克风 (2- High Definition Audi
+pickup_out_dev= 扬声器 (2- High Definition Audi
+;pickup_in_dev=MUSILAND
+;pickup_out_dev=MUSILAND
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=1
+pickup_aec=0
+handfree_in_volume=70
+handfree_out_volume=80
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+OptCamera=Microsoft? LifeCam Studio(TM);558EE9F3018C654F3F1C4E4187FFDD70
+EnvCamera=Microsoft LifeCam Studio;30388F1084386315D4FB28167E05A82A
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.Utility]
+SMSupport=1
+OnlineOnly=1
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=ChinaVision
+Version=1
+Batch=1
+Port=0
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=Sankyo
+Version=1
+Batch=2
+Port=2
+Baudrate=115200
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=6
+Baudrate=9600
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+PortNum=4
+InOutDir=65280
+
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=3
+Baudrate=115200
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=
+Version=
+Batch=
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=
+
+[Device.HSPScanner]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1

addin/hardwarecfg/WIN/root-凯欣达.ini

@@ -0,0 +1,124 @@
+[Terminal]
+TerminalNo=7715010100
+MachineType=RVC.Stand2S
+MachineVersion=1.0
+Site=cmb.LIB
+Screen=2
+EnrolGPS="0.003,0.003"
+EnrolAddr=广东省深圳市南山区科技园北区科技中一路3号
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Andrea
+handfree_out_dev=Andrea
+pickup_in_dev=High
+pickup_out_dev=High
+;pickup_in_dev=MUSILAND
+;pickup_out_dev=MUSILAND
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=1
+pickup_aec=0
+handfree_in_volume=100
+handfree_out_volume=100
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+EnvCamera=Microsoft LifeCam Studio;C43D76E651BFF3163449063A60124D33
+OptCamera=Microsoft LifeCam Studio;B3E87C521D73CEDE23885966A466B84A 
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=ChinaVision
+Version=1
+Batch=1
+Port=1
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=Sankyo
+Version=1
+Batch=2
+Port=2
+Baudrate=115200
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=kxd
+Version=1
+Batch=1
+Port=4
+Baudrate=115200
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=kxd
+Version=1
+Batch=1
+PortNum=4
+InOutDir=65280
+
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=kxd
+Version=1
+Batch=1
+Port=3
+Baudrate=9600
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=
+Version=
+Batch=
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=kxd
+Version=1
+Batch=1
+Port=
+
+[Device.HSPScanner]
+# parameters such as port 
+Vendor=kxd
+Version=1
+Batch=1

addin/hardwarecfg/WIN/root-制卡机-金邦达.ini

@@ -0,0 +1,106 @@
+[Terminal]
+;TerminalNo=75500000004
+;TerminalNo=7555984212
+TerminalNo=7555984701
+MachineType=RVC.CardPrinter
+MachineVersion=1.0
+Site=cmb.LIB
+Screen=1
+EnrolGPS="0.003,0.003"
+EnrolAddr=广东省深圳市南山区科技园北区科技中一路3号
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Andrea
+handfree_out_dev=Andrea
+pickup_in_dev=SB 5.1 VX
+pickup_out_dev=SB 5.1 VX
+;pickup_in_dev=MUSILAND
+;pickup_out_dev=MUSILAND
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=1
+pickup_aec=0
+handfree_in_volume=100
+handfree_out_volume=100
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+EnvCamera=Microsoft LifeCam Studio;99031DC7F5C6E716F32C28BC61559959
+OptCamera=Microsoft LifeCam Studio;FDD8F8845CB89F3F1DC36FCAE98B29A2 
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=Goldpac
+Version=6
+Batch=1
+Port=0
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=Goldpac
+Version=6
+Batch=1
+Port=4
+Baudrate=115200
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=Goldpac
+Version=6
+Batch=1
+Port=7
+InOutDir=65280
+Baudrate=9600
+
+[Device.FingerPrint]
+# parameters such as port 
+Vendor=Goldpac
+Version=6
+Batch=1
+Port=0
+Baudrate=9600
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=Goldpac
+Version=6
+Batch=1
+Port=2
+Baudrate=9600
+Checkdata=0000000000000000
+Keysn=000

addin/hardwarecfg/WIN/root-制卡机-长城.ini

@@ -0,0 +1,106 @@
+[Terminal]
+;TerminalNo=75500000004
+;TerminalNo=7555984212
+TerminalNo=7555984701
+MachineType=RVC.CardPrinter
+MachineVersion=1.0
+Site=cmb.LIB
+Screen=1
+EnrolGPS="0.003,0.003"
+EnrolAddr=广东省深圳市南山区科技园北区科技中一路3号
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Andrea
+handfree_out_dev=Andrea
+pickup_in_dev=SB 5.1 VX
+pickup_out_dev=SB 5.1 VX
+;pickup_in_dev=MUSILAND
+;pickup_out_dev=MUSILAND
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=1
+pickup_aec=0
+handfree_in_volume=100
+handfree_out_volume=100
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+EnvCamera=Microsoft LifeCam Studio;99031DC7F5C6E716F32C28BC61559959
+OptCamera=Microsoft LifeCam Studio;FDD8F8845CB89F3F1DC36FCAE98B29A2 
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=GWI
+Version=6
+Batch=1
+Port=0
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=GWI
+Version=6
+Batch=1
+Port=4
+Baudrate=115200
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=GWI
+Version=6
+Batch=1
+Port=7
+InOutDir=65280
+Baudrate=9600
+
+[Device.FingerPrint]
+# parameters such as port 
+Vendor=GWI
+Version=6
+Batch=1
+Port=0
+Baudrate=9600
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=GWI
+Version=6
+Batch=1
+Port=2
+Baudrate=9600
+Checkdata=0000000000000000
+Keysn=000

addin/hardwarecfg/WIN/root-卡库-东信新版卡库.ini

@@ -0,0 +1,91 @@
+[Terminal]
+TerminalNo=7555934201
+MachineType=RVC.CardStore
+MachineVersion=1.0
+Site=cmb.LIB
+Screen=1
+EnrolGPS="22.53460,114.03343"
+EnrolAddr=广东省深圳市福田区京基滨河时代大厦1楼
+
+[Path]
+SysRoot=d:\rvc\run
+ADData=d:\rvc\addata
+SysLog=d:\rvc\SysLog
+InterLog=d:\rvc\InterLog
+UploadVideo=d:\rvc\UploadVideo
+UploadPhoto=d:\rvc\UploadPhoto
+LocalVideo=d:\rvc\Video
+Downloads=d:\rvc\Downloads
+Upgraded=d:\rvc\Upgraded
+Temp=d:\rvc\Temp
+CenterSetting=d:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Realtek High Definition
+handfree_out_dev=扬声器 (High Definition Audio
+;pickup_in_dev=Microsoft 声音映射器
+;pickup_out_dev= Microsoft 声音映射器
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=5
+handfree_out_volume=5
+;pickup_in_volume=100
+;pickup_out_volume=100
+ews_in_dev=$
+ews_in_agc=0
+ews_in_ns=1
+ews_aec=0
+ews_in_volume=100
+
+
+;define device category
+[Device]
+Number=2
+1=IDCertificate
+2=CardIssuer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=Eastcom
+Version=5
+Batch=1
+Port=1
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=Eastcom
+Version=5
+Batch=1
+Port=1
+Baudrate=115200
+;Vendor=
+;Version=
+;Batch=
+;Baudrate=19200
+
+
+[Device.FingerPrint]
+Vendor=Eastcom
+Version=5
+Batch=1
+Port=3
+Baudrate=9600
+
+
+[Device.Gpio]
+Vendor=Eastcom
+Version=5
+Batch=1
+PortNum=4
+InOutDir=65280
+Extend=1
+Port=8
+Baudrate=9600

addin/hardwarecfg/WIN/root-卡库-东信旧版KK1000I-3.ini

@@ -0,0 +1,73 @@
+[Terminal]
+TerminalNo=7555214001
+MachineType=RVC.CardStore
+MachineVersion=1.0
+Site=cmb.LIB
+Screen=1
+EnrolGPS="113.897749,22.4853"
+EnrolAddr=深圳分行赤湾支行 深圳蛇口赤湾石油大厦附楼一楼
+
+[Path]
+SysRoot=d:\rvc\run
+ADData=d:\rvc\addata
+SysLog=d:\rvc\SysLog
+InterLog=d:\rvc\InterLog
+UploadVideo=d:\rvc\UploadVideo
+UploadPhoto=d:\rvc\UploadPhoto
+LocalVideo=d:\rvc\Video
+Downloads=d:\rvc\Downloads
+Upgraded=d:\rvc\Upgraded
+Temp=d:\rvc\Temp
+CenterSetting=d:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Realtek High Definition
+handfree_out_dev=扬声器 (High Definition Audio
+;pickup_in_dev=Microsoft 声音映射器
+;pickup_out_dev= Microsoft 声音映射器
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=5
+handfree_out_volume=5
+;pickup_in_volume=100
+;pickup_out_volume=100
+ews_in_dev=$
+ews_in_agc=0
+ews_in_ns=1
+ews_aec=0
+ews_in_volume=100
+
+
+;define device category
+[Device]
+Number=2
+1=IDCertificate
+2=CardIssuer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=Eastcom
+Version=2
+Batch=1
+Port=1
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=Eastcom
+Version=1
+Batch=6
+Port=2
+Baudrate=115200
+;Vendor=
+;Version=
+;Batch=
+;Baudrate=19200
+

addin/hardwarecfg/WIN/root-卡库-广电.ini

@@ -0,0 +1,85 @@
+[Terminal]
+TerminalNo=7555574201
+MachineType=RVC.CardStore
+MachineVersion=1.0
+Site=cmb.LIB
+Screen=1
+EnrolGPS="22.547625,113.939374"
+EnrolAddr=广东省深圳市南山区高新中四道研祥科技大厦一楼
+
+[Path]
+SysRoot=d:\rvc\run
+ADData=d:\rvc\addata
+SysLog=d:\rvc\SysLog
+InterLog=d:\rvc\InterLog
+UploadVideo=d:\rvc\UploadVideo
+UploadPhoto=d:\rvc\UploadPhoto
+LocalVideo=d:\rvc\Video
+Downloads=d:\rvc\Downloads
+Upgraded=d:\rvc\Upgraded
+Temp=d:\rvc\Temp
+CenterSetting=d:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Realtek High Definition
+handfree_out_dev=扬声器 (High Definition Audio
+;pickup_in_dev=Microsoft 声音映射器
+;pickup_out_dev= Microsoft 声音映射器
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=5
+handfree_out_volume=5
+;pickup_in_volume=100
+;pickup_out_volume=100
+ews_in_dev=$
+ews_in_agc=0
+ews_in_ns=1
+ews_aec=0
+ews_in_volume=100
+
+
+;define device category
+[Device]
+Number=2
+1=IDCertificate
+2=CardIssuer
+
+[Device.IDCertificate]
+Vendor=grg
+Version=5
+Batch=1
+Port=1
+
+[Device.CardIssuer]
+Vendor=grg
+Version=5
+Batch=1
+Port=4
+Baudrate=38400
+DevSN=HX-FWB-A000001
+
+[Device.FingerPrint]
+Vendor=grg
+Version=5
+Batch=1
+Port=0
+Baudrate=9600
+
+[Device.Gpio]
+Vendor=grg
+Version=5
+Batch=1
+PortNum=4
+InOutDir=65280
+Extend=3
+Port=3
+Baudrate=115200
+

addin/hardwarecfg/WIN/root-卡库-恒银.ini

@@ -0,0 +1,86 @@
+[Terminal]
+TerminalNo=7555124201
+MachineType=RVC.CardStore
+MachineVersion=1.0
+Site=cmb.LIB
+Screen=1
+EnrolGPS="113.927888,22.49636"
+EnrolAddr=深圳分行蛇口支行广东省深圳南山区蛇口招商路招商大厦首层
+
+[Path]
+SysRoot=d:\rvc\run
+ADData=d:\rvc\addata
+SysLog=d:\rvc\SysLog
+InterLog=d:\rvc\InterLog
+UploadVideo=d:\rvc\UploadVideo
+UploadPhoto=d:\rvc\UploadPhoto
+LocalVideo=d:\rvc\Video
+Downloads=d:\rvc\Downloads
+Upgraded=d:\rvc\Upgraded
+Temp=d:\rvc\Temp
+CenterSetting=d:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Realtek High Definition
+handfree_out_dev=扬声器 (High Definition Audio
+;pickup_in_dev=Microsoft 声音映射器
+;pickup_out_dev= Microsoft 声音映射器
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=5
+handfree_out_volume=5
+;pickup_in_volume=100
+;pickup_out_volume=100
+ews_in_dev=$
+ews_in_agc=0
+ews_in_ns=1
+ews_aec=0
+ews_in_volume=100
+
+
+;define device category
+[Device]
+Number=2
+1=IDCertificate
+2=CardIssuer
+
+[Device.IDCertificate] 
+Vendor=CW
+Version=5
+Batch=1
+Port=1
+
+[Device.CardIssuer] 
+Vendor=CW
+Version=5
+Batch=1
+Port=3
+Baudrate=38400
+
+
+[Device.FingerPrint]
+Vendor=CW
+Version=5
+Batch=1
+Port=3
+Baudrate=9600
+
+
+[Device.Gpio]
+Vendor=CW
+Version=5
+Batch=1
+PortNum=4
+InOutDir=65280
+Extend=1
+Port=9
+Baudrate=9600
+  

addin/hardwarecfg/WIN/root-卡库-证通.ini

@@ -0,0 +1,85 @@
+[Terminal]
+TerminalNo=7555574201
+MachineType=RVC.CardStore
+MachineVersion=1.0
+Site=cmb.LIB
+Screen=1
+EnrolGPS="22.547625,113.939374"
+EnrolAddr=广东省深圳市南山区高新中四道研祥科技大厦一楼
+
+[Path]
+SysRoot=d:\rvc\run
+ADData=d:\rvc\addata
+SysLog=d:\rvc\SysLog
+InterLog=d:\rvc\InterLog
+UploadVideo=d:\rvc\UploadVideo
+UploadPhoto=d:\rvc\UploadPhoto
+LocalVideo=d:\rvc\Video
+Downloads=d:\rvc\Downloads
+Upgraded=d:\rvc\Upgraded
+Temp=d:\rvc\Temp
+CenterSetting=d:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Realtek High Definition
+handfree_out_dev=扬声器 (High Definition Audio
+;pickup_in_dev=Microsoft 声音映射器
+;pickup_out_dev= Microsoft 声音映射器
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=5
+handfree_out_volume=5
+;pickup_in_volume=100
+;pickup_out_volume=100
+ews_in_dev=$
+ews_in_agc=0
+ews_in_ns=1
+ews_aec=0
+ews_in_volume=100
+
+
+;define device category
+[Device]
+Number=2
+1=IDCertificate
+2=CardIssuer
+
+[Device.IDCertificate]
+Vendor=szzt
+Version=5
+Batch=1
+Port=1
+
+[Device.CardIssuer]
+Vendor=szzt
+Version=5
+Batch=1
+Port=4
+Baudrate=38400
+DevSN=HX-FWB-A000001
+
+[Device.FingerPrint]
+Vendor=szzt
+Version=5
+Batch=1
+Port=0
+Baudrate=9600
+
+[Device.Gpio]
+Vendor=szzt
+Version=5
+Batch=1
+PortNum=4
+InOutDir=65280
+Extend=3
+Port=3
+Baudrate=115200
+

addin/hardwarecfg/WIN/root-卡库-长城新版卡库.ini

@@ -0,0 +1,91 @@
+[Terminal]
+TerminalNo=7555934201
+MachineType=RVC.CardStore
+MachineVersion=1.0
+Site=cmb.LIB
+Screen=1
+EnrolGPS="22.53460,114.03343"
+EnrolAddr=广东省深圳市福田区京基滨河时代大厦1楼
+
+[Path]
+SysRoot=d:\rvc\run
+ADData=d:\rvc\addata
+SysLog=d:\rvc\SysLog
+InterLog=d:\rvc\InterLog
+UploadVideo=d:\rvc\UploadVideo
+UploadPhoto=d:\rvc\UploadPhoto
+LocalVideo=d:\rvc\Video
+Downloads=d:\rvc\Downloads
+Upgraded=d:\rvc\Upgraded
+Temp=d:\rvc\Temp
+CenterSetting=d:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Realtek High Definition
+handfree_out_dev=扬声器 (High Definition Audio
+;pickup_in_dev=Microsoft 声音映射器
+;pickup_out_dev= Microsoft 声音映射器
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=5
+handfree_out_volume=5
+;pickup_in_volume=100
+;pickup_out_volume=100
+ews_in_dev=$
+ews_in_agc=0
+ews_in_ns=1
+ews_aec=0
+ews_in_volume=100
+
+
+;define device category
+[Device]
+Number=2
+1=IDCertificate
+2=CardIssuer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=gwi
+Version=5
+Batch=1
+Port=1
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=GWI
+Version=5
+Batch=1
+Port=1
+Baudrate=115200
+;Vendor=
+;Version=
+;Batch=
+;Baudrate=19200
+
+
+[Device.FingerPrint]
+Vendor=GWI
+Version=5
+Batch=1
+Port=3
+Baudrate=9600
+
+
+[Device.Gpio]
+Vendor=GWI
+Version=5
+Batch=1
+PortNum=4
+InOutDir=65280
+Extend=1
+Port=8
+Baudrate=9600

addin/hardwarecfg/WIN/root-卡库-长城旧卡库-GWI BST260L-AQ1.ini

@@ -0,0 +1,73 @@
+[Terminal]
+TerminalNo=7555894001
+MachineType=RVC.CardStore
+MachineVersion=1.0
+Site=cmb.LIB
+Screen=1
+EnrolGPS="22.547204,114.116525"
+EnrolAddr=深圳市罗湖区深南东路5015号金丰城大厦首层
+
+[Path]
+SysRoot=d:\rvc\run
+ADData=d:\rvc\addata
+SysLog=d:\rvc\SysLog
+InterLog=d:\rvc\InterLog
+UploadVideo=d:\rvc\UploadVideo
+UploadPhoto=d:\rvc\UploadPhoto
+LocalVideo=d:\rvc\Video
+Downloads=d:\rvc\Downloads
+Upgraded=d:\rvc\Upgraded
+Temp=d:\rvc\Temp
+CenterSetting=d:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Realtek High Definition
+handfree_out_dev=扬声器 (High Definition Audio
+;pickup_in_dev=Microsoft 声音映射器
+;pickup_out_dev= Microsoft 声音映射器
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=5
+handfree_out_volume=5
+;pickup_in_volume=100
+;pickup_out_volume=100
+ews_in_dev=$
+ews_in_agc=0
+ews_in_ns=1
+ews_aec=0
+ews_in_volume=100
+
+
+;define device category
+[Device]
+Number=2
+1=IDCertificate
+2=CardIssuer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=gwi
+Version=1
+Batch=1
+Port=1
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=gwi
+Version=1
+Batch=6
+Port=2
+Baudrate=115200
+;Vendor=
+;Version=
+;Batch=
+;Baudrate=19200
+

addin/hardwarecfg/WIN/root-大机-中世顺ZSS9100.ini

@@ -0,0 +1,120 @@
+[Terminal]
+TerminalNo=5615310003
+MachineType=RVC.Stand2S
+MachineVersion=1.0
+Site=CMB.LIB
+Screen=2
+EnrolGPS=33.5442,116.4537
+EnrolAddr=淮北市濉溪县虎山路与濉河路交叉口西南侧
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=麦克风 (2- Realtek High Definit
+handfree_out_dev=扬声器 (2- Realtek High Definit
+handfree_in_agc=0
+handfree_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+handfree_aec=0
+handfree_in_volume=80
+handfree_out_volume=80
+pickup_in_dev=麦克风 (C-Media PCI Audio Devic
+pickup_out_dev=扬声器 (C-Media PCI Audio Devic
+pickup_in_agc=0
+pickup_out_agc=0
+pickup_in_ns=1
+pickup_out_ns=1
+pickup_aec=0
+pickup_in_volume=80
+pickup_out_volume=80
+
+[Video]
+EnvCamera=CMB camera1;89F006AF15706CC84B4FEBD52C5E8A7A
+EnvRotate=0
+OptCamera=CMB camera2;C2C6DCAE0CB72F9303BE8F8232FAF42C
+OptRotate=270
+mtu=1500
+quant=3
+
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.IDCertificate]
+Vendor=ZSS
+Version=7
+Batch=1
+Port=1
+
+[Device.CardIssuer]
+Vendor=ZSS
+Version=7
+Batch=1
+Port=4
+Baudrate=115200
+
+[Device.ContactlessCard]
+Vendor=ZSS
+Version=7
+Batch=1
+Port=0
+Baudrate=12300
+
+[Device.Gpio]
+Vendor=ZSS
+Version=7
+Batch=1
+PortNum=4
+InOutDir=65280
+
+[Device.PinPad]
+Vendor=ZSS
+Version=7
+Batch=1
+Port=5
+Baudrate=9600
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=ZSS
+Version=7
+Batch=1
+Port=1
+Baudrate=2400
+
+[Device.WatchDog]
+Vendor=ZSS
+Version=7
+Batch=1
+Port=
+
+[Device.ThermalPrint]
+Vendor=ZSS
+Version=7
+Batch=1
+Port=5
+Baudrate=38400
+
+[Device.HSPScanner]
+Vendor=ZSS
+Version=7
+Batch=1
+Port=

addin/hardwarecfg/WIN/root-大机-中钞科堡E1000.ini

@@ -0,0 +1,137 @@
+[Terminal]
+TerminalNo=7554800002
+MachineType=RVC.Stand2S
+MachineVersion=1.0
+Site=CMB.LIB
+Screen=2
+EnrolGPS=23.024,113.754
+EnrolAddr=广东省深圳市南山区南海大道登良路21-3号恒裕中心A座
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=麦克风阵列 (Andrea PureAudio US
+handfree_out_dev=扬声器 (Andrea PureAudio USB-SA
+pickup_in_dev=麦克风 (2- High Definition Audi
+pickup_out_dev= 扬声器 (2- High Definition Audi
+;pickup_in_dev=MUSILAND
+;pickup_out_dev=MUSILAND
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=1
+pickup_aec=0
+handfree_in_volume=70
+handfree_out_volume=80
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+OptCamera=CMB camera2;C2C6DCAE0CB72F9303BE8F8232FAF42C
+EnvCamera=CMB camera1;630419123623780B229E27264E9F78BE
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.Utility]
+SMSupport=1
+OnlineOnly=1
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=ChinaVision
+Version=1
+Batch=1
+Port=0
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=Sankyo
+Version=1
+Batch=2
+Port=2
+Baudrate=115200
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=6
+Baudrate=9600
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+PortNum=4
+InOutDir=65280
+
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=3
+Port=3
+Baudrate=115200
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=
+Version=
+Batch=
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=
+
+[Device.Therma1Print]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=0
+Baudrate=
+
+[Device.HSPScanner]
+Vendor=keba
+Version=1
+Batch=1
+

addin/hardwarecfg/WIN/root-大机-中钞科堡E1080.ini

@@ -0,0 +1,136 @@
+[Terminal]
+TerminalNo=1275710001
+MachineType=RVC.Stand2S
+MachineVersion=1.0
+Site=CMB.LIB
+Screen=2
+EnrolGPS=114.023054,30.029054
+EnrolAddr=武汉分行民族大道支行  湖北省武汉市洪山区民族大道洪福甜美广场
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=麦克风阵列 (Andrea PureAudio US
+handfree_out_dev=扬声器 (Andrea PureAudio USB-SA
+pickup_in_dev=麦克风 (2- High Definition Audi
+pickup_out_dev= 扬声器 (2- High Definition Audi
+;pickup_in_dev=MUSILAND
+;pickup_out_dev=MUSILAND
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=1
+pickup_aec=0
+handfree_in_volume=70
+handfree_out_volume=80
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+OptCamera=CMB camera2;93755A96182ADE48D91DA88CBDAFC4E4
+EnvCamera=CMB camera1;630419123623780B229E27264E9F78BE
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.Utility]
+SMSupport=1
+OnlineOnly=1
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=Keba
+Version=7
+Batch=1
+Port=0
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=Keba
+Version=7
+Batch=1
+Port=2
+Baudrate=38400
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=keba
+Version=7
+Batch=1
+Port=0
+Baudrate=9600
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=keba
+Version=7
+Batch=1
+PortNum=4
+InOutDir=65280
+
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=keba
+Version=7
+Batch=1
+Port=0
+Baudrate=115200
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=Keba
+Version=7
+Batch=1
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=keba
+Version=7
+Batch=1
+Port=
+
+[Device.HSPScanner]
+# parameters such as port 
+Vendor=keba
+Version=7
+Batch=1
+
+[Device.ThermalPrint]
+# parameters such as port 
+Vendor=keba
+Version=7
+Batch=1
+

addin/hardwarecfg/WIN/root-大机-凯欣达295.ini

@@ -0,0 +1,135 @@
+[Terminal]
+TerminalNo=7555610002
+MachineType=RVC.Stand2S
+MachineVersion=1.0
+Site=CMB.LIB
+Screen=2
+EnrolGPS=22.60467,114.12851
+EnrolAddr=深圳分行布吉支行 深圳布吉罗岗路口招商银行
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Andrea
+handfree_out_dev=Andrea
+pickup_in_dev=High
+pickup_out_dev=High
+;pickup_in_dev=MUSILAND
+;pickup_out_dev=MUSILAND
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=1
+pickup_aec=0
+handfree_in_volume=100
+handfree_out_volume=100
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+EnvCamera=Microsoft LifeCam Studio;87BFC4759BB99B37953E0B5140B05B23
+OptCamera=Microsoft LifeCam Studio;792ECA52375E3D80CCBF2F6BFD1DCC01 
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=ChinaVision
+Version=1
+Batch=1
+Port=1
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=Sankyo
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=kxd
+Version=1
+Batch=1
+Port=4
+Baudrate=115200
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=kxd
+Version=1
+Batch=1
+PortNum=4
+InOutDir=65280
+
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=kxd
+Version=1
+Batch=2
+Port=3
+Baudrate=9600
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=
+Version=
+Batch=
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+Port=
+
+[Device.ThermalPrint]
+#parameters such as port
+Vendor=kxd
+Version=1
+Batch=1
+Port=0
+Baudrate=
+
+[Device.HSPScanner]  
+;Vendor配置厂商名称，按实际大机机型配置：Hyosung/keba/kxd
+Vendor=kxd
+;Version和Batch均配置为1
+Version=1
+Batch= 1 
+
+

addin/hardwarecfg/WIN/root-大机-凯欣达KL286.ini

@@ -0,0 +1,132 @@
+[Terminal]
+TerminalNo=7555930001
+MachineType=RVC.Stand2S
+MachineVersion=1.0
+Site=CMB.LIB
+Screen=2
+EnrolGPS=22.52494,114.04319
+EnrolAddr=深圳分行新洲支行 广东省深圳市福田区新洲九街福昌苑首层
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Andrea
+handfree_out_dev=Andrea
+pickup_in_dev=High
+pickup_out_dev=High
+;pickup_in_dev=MUSILAND
+;pickup_out_dev=MUSILAND
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=1
+pickup_aec=0
+handfree_in_volume=100
+handfree_out_volume=100
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+EnvCamera=Microsoft LifeCam Studio;C43D76E651BFF3163449063A60124D33
+OptCamera=Microsoft LifeCam Studio;581208331071C935707CE8F9825A308A 
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=ChinaVision
+Version=1
+Batch=1
+Port=1
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=Sankyo
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=kxd
+Version=1
+Batch=1
+Port=4
+Baudrate=115200
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=kxd
+Version=1
+Batch=1
+PortNum=4
+InOutDir=65280
+
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=kxd
+Version=1
+Batch=2
+Port=3
+Baudrate=115200
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=
+Version=
+Batch=
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=kxd
+Version=1
+Batch=1
+Port=
+
+[Device.ThermalPrint]
+#parameters such as port
+Vendor=kxd
+Version=1
+Batch=1
+Port=0
+Baudrate=
+
+[Device.HSPScanner]  
+Vendor=kxd  
+Version=1
+Batch=1 
+

addin/hardwarecfg/WIN/root-大机-凯欣达KL286D.ini

@@ -0,0 +1,134 @@
+[Terminal]
+TerminalNo=7555930002
+MachineType=RVC.Stand2S
+MachineVersion=1.0
+Site=CMB.LIB
+Screen=2
+EnrolGPS=22.53068,114.049594
+EnrolAddr=深圳分行新洲支行 广东省深圳市福田区新洲九街福昌苑首层
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Andrea
+handfree_out_dev=Andrea
+pickup_in_dev=High
+pickup_out_dev=High
+;pickup_in_dev=MUSILAND
+;pickup_out_dev=MUSILAND
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=1
+pickup_aec=0
+handfree_in_volume=100
+handfree_out_volume=100
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+EnvCamera=Microsoft LifeCam Studio;FDB5965C220C93B3789D04A5233557BA
+OptCamera=Microsoft LifeCam Studio;792ECA52375E3D80CCBF2F6BFD1DCC01 
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=ChinaVision
+Version=1
+Batch=1
+Port=1
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=Sankyo
+Version=1
+Batch=2
+Port=2
+Baudrate=115200
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=kxd
+Version=1
+Batch=1
+Port=4
+Baudrate=115200
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=kxd
+Version=1
+Batch=1
+PortNum=4
+InOutDir=65280
+
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=kxd
+Version=1
+Batch=2
+Port=3
+Baudrate=115200
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=
+Version=
+Batch=
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+Port=
+
+[Device.ThermalPrint]
+#parameters such as port
+Vendor=kxd
+Version=1
+Batch=1
+Port=0
+Baudrate=
+
+[Device.HSPScanner]  
+Vendor=kxd
+Version=1
+Batch= 1 
+
+
+

addin/hardwarecfg/WIN/root-大机-凯欣达KS218.ini

@@ -0,0 +1,113 @@
+[Terminal]
+TerminalNo=5715150004
+MachineType=RVC.Stand2S
+MachineVersion=4.6.3.0
+Site=CMB.LIB
+Screen=2
+EnrolGPS="120.143577,30.279608"
+EnrolAddr=ÕÐÉÌÒøÐнâ·ÅÖ§ÐÐ
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+[Audio]
+handfree_in_dev=Realtek High Definition
+handfree_out_dev=Realtek High Definition
+handfree_in_agc=0
+handfree_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+handfree_aec=0
+handfree_in_volume=80
+handfree_out_volume=80
+pickup_in_dev=C-Media USB Headphone Set
+pickup_out_dev=C-Media USB Headphone Set
+pickup_in_agc=0
+pickup_out_agc=0
+pickup_in_ns=1
+pickup_out_ns=1
+pickup_aec=0
+pickup_in_volume=80
+pickup_out_volume=80
+[Video]
+EnvCamera=CMB camera1;630419123623780B229E27264E9F78BE
+EnvRotate=0
+OptCamera=CMB camera2;712B7E216841DE31966857FAFF90A124
+OptRotate=270
+mtu=1500
+quant=3
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+[Device.IDCertificate]
+Vendor=kxd
+Version=7
+Batch=1
+Port=1
+
+[Device.CardIssuer]
+Vendor=kxd
+Version=7
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.ContactlessCard]
+Vendor=kxd
+Version=7
+Batch=1
+Port=4
+Baudrate=115200
+
+[Device.Gpio]
+Vendor=kxd
+Version=7
+Batch=1
+PortNum=4
+InOutDir=65280
+
+[Device.PinPad]
+Vendor=kxd
+Version=7
+Batch=1
+Port=3
+Baudrate=9600
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=kxd
+Version=7
+Batch=1
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+Vendor=kxd
+Version=7
+Batch=1
+Port=
+
+[Device.HSPScanner]
+Vendor=kxd
+Version=7
+Batch=1
+
+[Device.ThermalPrint]
+# parameters such as port 
+Vendor=kxd
+Version=7
+Batch=1

addin/hardwarecfg/WIN/root-大机-恒银.ini

@@ -0,0 +1,108 @@
+[Terminal]
+TerminalNo=4275170001
+MachineType=RVC.Stand2S
+MachineVersion=1.0
+Site=CMB.LIB
+Screen=2
+EnrolGPS="41.18581,123.04971"
+EnrolAddr=盘锦分行盘锦双台子支行  盘锦市双台子区渤海路39-4号
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+[Audio]
+handfree_in_dev=麦克风 (USB Advanced Audio Devi
+handfree_out_dev=扬声器 (USB Advanced Audio Devi
+handfree_in_agc=0
+handfree_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+handfree_aec=0
+handfree_in_volume=80
+handfree_out_volume=80
+pickup_in_dev=麦克风 (Realtek High Definition
+pickup_out_dev=扬声器 (Realtek High Definition
+pickup_in_agc=0
+pickup_out_agc=0
+pickup_in_ns=1
+pickup_out_ns=1
+pickup_aec=0
+pickup_in_volume=80
+pickup_out_volume=80
+[Video]
+EnvCamera=CMB camera1;630419123623780B229E27264E9F78BE
+EnvRotate=0
+OptCamera=CMB camera2;C2C6DCAE0CB72F9303BE8F8232FAF42C
+OptRotate=270
+mtu=1500
+quant=3
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+[Device.IDCertificate]
+Vendor=cw
+Version=7
+Batch=1
+Port=
+[Device.CardIssuer]
+Vendor=cw
+Version=7
+Batch=1
+Port=2
+Baudrate=38400
+[Device.ContactlessCard]
+Vendor=cw
+Version=7
+Batch=1
+Port=
+Baudrate=115200
+[Device.Gpio]
+Vendor=cw
+Version=7
+Batch=1
+Port=8
+Baudrate=9600
+InOutDir=65280
+[Device.PinPad]
+Vendor=cw
+Version=7
+Batch=1
+Port=3
+Baudrate=9600
+Checkdata=0000000000000000
+Keysn=000
+[Device.Ups]
+Vendor=cw
+Version=7
+Batch=1
+Port=5
+Baudrate=2400
+[Device.WatchDog]
+Vendor=cw
+Version=7
+Batch=1
+Port=
+[Device.HSPScanner]
+Vendor=cw
+Version=7
+Batch=1
+Port=
+[Device.ThermalPrint]
+Vendor=cw
+Version=7
+Batch=1
+Port=

addin/hardwarecfg/WIN/root-大机-晓星BS9000.ini

@@ -0,0 +1,142 @@
+[Terminal]
+TerminalNo=7554950001
+MachineType=RVC.Stand2S
+MachineVersion=1.0
+Site=CMB.LIB
+Screen=2
+EnrolGPS=22.5285,113.9503
+EnrolAddr=深圳分行生态园支行  深市南山区深圳湾科技生态园
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Andrea
+handfree_out_dev=Andrea
+pickup_in_dev=SB 5.1 VX
+pickup_out_dev=SB 5.1 VX
+;pickup_in_dev=MUSILAND
+;pickup_out_dev=MUSILAND
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=1
+pickup_aec=0
+handfree_in_volume=80
+;handfree_out_volume=100
+pickup_in_volume=100
+;pickup_out_volume=100
+
+[Video]
+EnvCamera=Microsoft? LifeCam Studio(TM);736E962731808CBFCB38490B4F9F537D
+OptCamera= 
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=ChinaVision
+Version=1
+Batch=1
+Port=1
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=Sankyo
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=hyosung
+Version=1
+Batch=1
+Port=0
+Baudrate=115200
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+PortNum=4
+InOutDir=65280
+
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=2
+Port=0
+Baudrate=9600
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=
+Version=
+Batch=
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+Port=
+
+[Device.ThermalPrint]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+Port=0
+Baudrate=??
+
+[Device.TheralPrint]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+Port=0
+Baudrate=??
+
+
+[Device.HSPScanner]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+

addin/hardwarecfg/WIN/root-大机-晓星MX9200CM.ini

@@ -0,0 +1,124 @@
+[Terminal]
+TerminalNo=275010001
+MachineType=RVC.Stand2S
+MachineVersion=1.0
+Site=CMB.LIB
+Screen=2
+EnrolGPS=114.24099,30.64467
+EnrolAddr=武汉分行常青花园自助 武汉市常青花园学府南路116号
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Andrea
+handfree_out_dev=Andrea
+pickup_in_dev=SB 5.1 VX
+pickup_out_dev=SB 5.1 VX
+;pickup_in_dev=MUSILAND
+;pickup_out_dev=MUSILAND
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=1
+pickup_aec=0
+handfree_in_volume=60
+;handfree_out_volume=100
+pickup_in_volume=100
+;pickup_out_volume=100
+
+[Video]
+EnvCamera=Microsoft LifeCam Studio;99031DC7F5C6E716F32C28BC61559959
+OptCamera=Microsoft LifeCam Studio;FF2CC549C1A0FBBBDD7F50729E19EC81 
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=ChinaVision
+Version=1
+Batch=1
+Port=1
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=Sankyo
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=hyosung
+Version=1
+Batch=1
+Port=4
+Baudrate=115200 
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+PortNum=4
+InOutDir=65280
+
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=2
+Port=0
+Baudrate=9600
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=
+Version=
+Batch=
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+Port=
+[Device.ThermalPrint]
+Vendor=Hyosung
+Version=1
+Batch=1
+Port=0
+

addin/hardwarecfg/WIN/root-大机-科堡E1000.ini

@@ -0,0 +1,137 @@
+[Terminal]
+TerminalNo=7554800002
+MachineType=RVC.Stand2S
+MachineVersion=1.0
+Site=CMB.LIB
+Screen=2
+EnrolGPS=23.024,113.754
+EnrolAddr=广东省深圳市南山区南海大道登良路21-3号恒裕中心A座
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=麦克风阵列 (Andrea PureAudio US
+handfree_out_dev=扬声器 (Andrea PureAudio USB-SA
+pickup_in_dev=麦克风 (2- High Definition Audi
+pickup_out_dev= 扬声器 (2- High Definition Audi
+;pickup_in_dev=MUSILAND
+;pickup_out_dev=MUSILAND
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=1
+pickup_aec=0
+handfree_in_volume=70
+handfree_out_volume=80
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+OptCamera=CMB camera2;C2C6DCAE0CB72F9303BE8F8232FAF42C
+EnvCamera=CMB camera1;630419123623780B229E27264E9F78BE
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.Utility]
+SMSupport=1
+OnlineOnly=1
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=ChinaVision
+Version=1
+Batch=1
+Port=0
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=Sankyo
+Version=1
+Batch=2
+Port=2
+Baudrate=115200
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=6
+Baudrate=9600
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+PortNum=4
+InOutDir=65280
+
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=3
+Port=3
+Baudrate=115200
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=
+Version=
+Batch=
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=
+
+[Device.Therma1Print]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+Port=0
+Baudrate=
+
+[Device.HSPScanner]
+Vendor=keba
+Version=1
+Batch=1
+

addin/hardwarecfg/WIN/root-大机-科堡E1080.ini

@@ -0,0 +1,148 @@
+[Terminal]
+TerminalNo=1275710001
+MachineType=RVC.Stand2S
+MachineVersion=1.0
+Site=CMB.LIB
+Screen=2
+EnrolGPS=114.023054,30.029054
+EnrolAddr=武汉分行民族大道支行  湖北省武汉市洪山区民族大道洪福甜美广场
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=麦克风阵列 (Andrea PureAudio US
+handfree_out_dev=扬声器 (Andrea PureAudio USB-SA
+pickup_in_dev=麦克风 (2- High Definition Audi
+pickup_out_dev= 扬声器 (2- High Definition Audi
+;pickup_in_dev=MUSILAND
+;pickup_out_dev=MUSILAND
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=1
+pickup_aec=0
+handfree_in_volume=70
+handfree_out_volume=80
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+OptCamera=CMB camera2;93755A96182ADE48D91DA88CBDAFC4E4
+EnvCamera=CMB camera1;630419123623780B229E27264E9F78BE
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.Utility]
+SMSupport=1
+OnlineOnly=1
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=Keba
+Version=1
+Batch=2
+Port=0
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=Keba
+Version=1
+Batch=5
+Port=2
+Baudrate=38400
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=2
+Port=0
+Baudrate=9600
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+PortNum=4
+InOutDir=65280
+
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=4
+Port=0
+Baudrate=115200
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=Keba
+Version=1
+Batch=2
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=2
+Port=
+
+[Device.HSPScanner]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=2
+
+[Device.ThermalPrint]
+# parameters such as port 
+Vendor=keba
+Version=1
+Batch=1
+
+[Device.PrintSeal]
+# parameters such as port 
+count=1
+Name_1=Lexmark MS510 Series XL
+Vendor_1=keba
+Version_1=1
+Batch_1=2
+Printerport_1=198.168.1.188
+Sealport_1=3
+WindowsDriver_1=1
+PaperBoxes_1=2:普通A4|1:存款证明
+

addin/hardwarecfg/WIN/root-大机-长城.ini

@@ -0,0 +1,137 @@
+[Terminal]
+TerminalNo=1275580001
+MachineType=RVC.Stand2S
+MachineVersion=1.0
+Site=CMB.LIB
+Screen=2
+EnrolGPS=114.151201,30.353701
+EnrolAddr=武汉市硚口区解放大道233号
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=麦克风 (Andrea PureAudio USB-SA
+handfree_out_dev=扬声器 (Andrea PureAudio USB-SA
+pickup_in_dev=麦克风 (Realtek High Definition
+pickup_out_dev=扬声器 (Realtek High Definition
+;pickup_in_dev=MUSILAND
+;pickup_out_dev=MUSILAND
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=90
+handfree_out_volume=90
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+OptCamera=cam1;C2C6DCAE0CB72F9303BE8F8232FAF42C
+EnvCamera=cam0;630419123623780B229E27264E9F78BE
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.Utility]
+SMSupport=1
+OnlineOnly=1
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=gwi
+Version=7
+Batch=1
+Port=0
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=gwi
+Version=7
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=gwi
+Version=7
+Batch=1
+Port=6
+Baudrate=9600
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=gwi
+Version=7
+Batch=1
+PortNum=4
+InOutDir=65280
+
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=gwi
+Version=7
+Batch=1
+Port=0
+Baudrate=9600
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=7
+Version=1
+Batch=
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=gwi
+Version=7
+Batch=1
+Port=
+
+[Device.ThermalPrint]
+#parameters such as port
+Vendor=gwi
+Version=7
+Batch=1
+Port=0
+Baudrate=  
+
+[Device.HSPScanner]  
+Vendor=gwi  
+Version=7
+Batch=1 
+

addin/hardwarecfg/WIN/root-晓星一代.ini

@@ -0,0 +1,127 @@
+[Terminal]
+;TerminalNo=75500000004
+TerminalNo=7715010004
+MachineType=RVC.Stand2S
+MachineVersion=1.0
+Site=cmb.LIB
+Screen=2
+EnrolGPS="0.003,0.003"
+EnrolAddr=广东省深圳市南山区科技园北区科技中一路3号
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Andrea
+handfree_out_dev=Andrea
+pickup_in_dev=SB 5.1 VX
+pickup_out_dev=SB 5.1 VX
+;pickup_in_dev=MUSILAND
+;pickup_out_dev=MUSILAND
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=1
+pickup_aec=0
+handfree_in_volume=100
+handfree_out_volume=50
+pickup_in_volume=100
+pickup_out_volume=50
+
+[Video]
+EnvCamera=Microsoft LifeCam Studio;F3BE2698117325F84EEED8D49F563C70
+OptCamera=Microsoft LifeCam Studio;F74984B608DD8148F629C567E2B27E23
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=ChinaVision
+Version=1
+Batch=1
+Port=1
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=Sankyo
+Version=1
+Batch=1
+Port=2
+Baudrate=115200
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=hyosung
+Version=1
+Batch=1
+Port=4
+Baudrate=115200
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+PortNum=4
+InOutDir=65280
+
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+Port=3
+Baudrate=9600
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=
+Version=
+Batch=
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+Port=
+
+[Device.HSPScanner]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1

addin/hardwarecfg/WIN/root-晓星二代.ini

@@ -0,0 +1,130 @@
+[Terminal]
+TerminalNo=7715010007
+MachineType=RVC.Stand2S
+MachineVersion=1.0
+Site=CMB.LIB
+Screen=2
+EnrolGPS=0.003,0.003
+EnrolAddr=广东省深圳市南山区科技园科兴研发测试晓星VTM2
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Andrea
+handfree_out_dev=Andrea
+pickup_in_dev=SB 5.1 VX
+pickup_out_dev=SB 5.1 VX
+;pickup_in_dev=MUSILAND
+;pickup_out_dev=MUSILAND
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=1
+pickup_aec=0
+handfree_in_volume=70
+handfree_out_volume=80
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+EnvCamera=Microsoft? LifeCam Studio(TM);AFFACA1EF797DA16C9DEFA0FB98B375A
+OptCamera=Microsoft? LifeCam Studio(TM);558EE9F3018C654F3F1C4E4187FFDD70
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.Utility]
+SMSupport=1
+OnlineOnly=1
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=ChinaVision
+Version=1
+Batch=1
+Port=1
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=Sankyo
+Version=1
+Batch=2
+Port=2
+Baudrate=115200
+
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=hyosung
+Version=1
+Batch=1
+Port=4
+Baudrate=9600
+
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+PortNum=4
+InOutDir=65280
+
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+Port=3
+Baudrate=9600
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=
+Version=
+Batch=
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+Port=
+
+[Device.HSPScanner]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1

addin/hardwarecfg/WIN/root.RVC.CardStore.ini

@@ -0,0 +1,72 @@
+[Terminal]
+TerminalNo=7715014003
+MachineType=RVC.CardStore
+MachineVersion=1.0
+Site=cmb.LIB
+Screen=1
+EnrolGPS="0.003,0.003"
+EnrolAddr=长城卡库
+
+[Path]
+SysRoot=d:\rvc\run
+ADData=d:\rvc\addata
+SysLog=d:\rvc\SysLog
+InterLog=d:\rvc\InterLog
+UploadVideo=d:\rvc\UploadVideo
+UploadPhoto=d:\rvc\UploadPhoto
+LocalVideo=d:\rvc\Video
+Downloads=d:\rvc\Downloads
+Upgraded=d:\rvc\Upgraded
+Temp=d:\rvc\Temp
+CenterSetting=d:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Realtek High Definition
+handfree_out_dev=扬声器 (High Definition Audio
+;pickup_in_dev=Microsoft 声音映射器
+;pickup_out_dev= Microsoft 声音映射器
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=0
+pickup_aec=0
+handfree_in_volume=5
+handfree_out_volume=5
+;pickup_in_volume=100
+;pickup_out_volume=100
+ews_in_dev=$
+ews_in_agc=0
+ews_in_ns=1
+ews_aec=0
+ews_in_volume=100
+
+
+;define device category
+[Device]
+Number=2
+1=IDCertificate
+2=CardIssuer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=gwi
+Version=1
+Batch=1
+Port=1
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=gwi
+Version=1
+Batch=6
+Port=2
+Baudrate=115200
+;Vendor=
+;Version=
+;Batch=
+;Baudrate=19200

addin/hardwarecfg/WIN/root.RVC.Stand2S.ini

@@ -0,0 +1,159 @@
+[Terminal]
+TerminalNo=75500000004
+MachineType=RVC.Stand2S
+MachineVersion=1.0
+Site=cmb.LIB
+Screen=2
+EnrolGPS="0.003,0.003"
+EnrolAddr=广东省深圳市南山区科技园北区科技中一路3号
+
+[Path]
+SysRoot=D:\rvc\run
+ADData=D:\rvc\addata
+SysLog=D:\rvc\SysLog
+InterLog=D:\rvc\InterLog
+UploadVideo=D:\rvc\UploadVideo
+UploadPhoto=D:\rvc\UploadPhoto
+LocalVideo=D:\rvc\Video
+Downloads=D:\rvc\Downloads
+Upgraded=D:\rvc\Upgraded
+Temp=D:\rvc\Temp
+CenterSetting=D:\rvc\CenterSetting
+
+[Audio]
+handfree_in_dev=Andrea
+handfree_out_dev=Andrea
+pickup_in_dev=SB 5.1 VX
+pickup_out_dev=SB 5.1 VX
+;pickup_in_dev=MUSILAND
+;pickup_out_dev=MUSILAND
+handfree_in_agc=0
+handfree_out_agc=0
+pickup_in_agc=0
+pickup_out_agc=0
+handfree_in_ns=1
+handfree_out_ns=0
+pickup_in_ns=1
+pickup_out_ns=0
+handfree_aec=1
+pickup_aec=0
+handfree_in_volume=100
+handfree_out_volume=100
+pickup_in_volume=100
+pickup_out_volume=100
+
+[Video]
+EnvCamera=Microsoft LifeCam Studio;99031DC7F5C6E716F32C28BC61559959
+OptCamera=Microsoft LifeCam Studio;FDD8F8845CB89F3F1DC36FCAE98B29A2 
+EnvRotate=0
+OptRotate=270
+mtu=1500
+quant=3;0-10, 0:最清晰, 10:最模糊
+
+;define device category
+[Device]
+Number=6
+1=IDCertificate
+2=CardIssuer
+3=Radar
+4=WatchDog
+5=UPS
+6=Printer
+
+[Device.IDCertificate]
+# parameters such as port 
+Vendor=ChinaVision
+Version=1
+Batch=1
+Port=1
+
+
+[Device.CardIssuer]
+# parameters such as port 
+Vendor=Sankyo
+Version=1
+Batch=2
+Port=2
+Baudrate=115200
+
+[Device.ContactlessCard]
+# parameters such as port 
+Vendor=hyosung
+Version=1
+Batch=1
+Port=4
+Baudrate=115200
+
+[Device.Gpio]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+PortNum=4
+InOutDir=65280
+
+
+[Device.PinPad]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+Port=3
+Baudrate=9600
+Checkdata=0000000000000000
+Keysn=000
+
+[Device.Ups]
+Vendor=
+Version=
+Batch=
+Port=5
+Baudrate=2400
+
+[Device.WatchDog]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+Port=
+
+[Device.Print]
+;是否支持打印：0 不支持 , 1 支持
+SupportPrint=0
+
+;通用打印机名称（激光，喷墨）
+Common_PrintName=
+;连接模式：0 本地 , 1 网络tcp/ip连接（非共享）   
+Common_PortType=0
+Common_PrintIP=
+
+[Device.HSPScanner]
+# parameters such as port 
+Vendor=Hyosung
+Version=1
+Batch=1
+
+[Device.ThermalPrint]
+# parameters such as port
+Vendor=Hyosung
+Version=1
+Batch=1
+Port=0
+Baudrate=
+
+[Device.HSPScanner]
+Vendor=
+Version=
+Batch=
+
+[Device.PrintSeal]
+;打印盖章设备是选配件，如启动打印盖章功能，请将下列count参数设置为1
+count=0
+Name_1=
+Vendor_1=
+Version_1=
+Batch_1=
+PrinterPort_1=
+SealPort_1=
+WindowsDriver_1=1
+PaperBoxes_1=2:普通A4|1:存款证明

addin/packaging/UOS/installsh.in

@@ -191,7 +191,9 @@ if [ $installType -eq 4 ]; then
     echo [INFO]恢复桌面组件应用程序的执行权限
     sudo chmod +x /usr/bin/dde-desktop
     sudo chmod +x /usr/bin/dde-dock
-
+    sudo chmod +x /usr/bin/dde-launcher
+    sudo chmod +x /usr/bin/dde-file-manager
+	
     echo -e "\033[42;37m [INFO]: === 所有安装步骤执行成功，正常退出=== \033[0m"
 	exit 0
 fi
@@ -341,8 +343,10 @@ if [ $res -eq 0 ]; then
 
     if [ $installType -eq 1 ]; then
         echo [INFO]去除桌面组件应用程序的执行权限，实现开机黑屏
-        sudo chmod -x /usr/bin/dde-desktop
-        sudo chmod -x /usr/bin/dde-dock
+	sudo chmod -x /usr/bin/dde-desktop
+	sudo chmod -x /usr/bin/dde-dock
+	sudo chmod -x /usr/bin/dde-launcher
+	sudo chmod -x /usr/bin/dde-file-manager
     fi
 else
     echo -e "\033[41;37m [ERROR]: 设置SUDO权限失败！！ \033[0m"
@@ -364,6 +368,7 @@ echo "[INFO]: set menu tool as hidden mode done!"
 browserDownURLDEV="http://99.12.23.78/uos/uosbrowser_5.3.52-1.zip"
 broswerDownPRD="http://ecsnp01.s3ecs.itcenter.cmbchina.cn:9020/lr18.24-upgrade-pack-prd/uosbrowser_5.3.52-1_22061501_02/origin/uosbrowser_5.3.52-1_22061501.zip?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Date=20240508T120010Z&X-Amz-SignedHeaders=host&X-Amz-Expires=604800&X-Amz-Credential=lr18.24-upgrade-prd%2F20240508%2Fcn-north-1%2Fs3%2Faws4_request&X-Amz-Signature=67950161ab9de5d35b7556a6fe4e8d102b1269cc72c22784f009d36d654d4413"
 browserDownURL=${browserDownURLDEV}
+#测试环境才生效，生产环境无法确认下载链接地址
 if [ $installType -eq 0 ]; then
 	echo ${browserDownURL}
 	if [ "`dpkg -l | grep org.deepin.browser | awk '{print $3}'`" == "" ]; then

addin/packaging/UOS/original.sh

@@ -203,7 +203,9 @@ if [ $installType -eq 4 ]; then
     echo [INFO]恢复桌面组件应用程序的执行权限
     sudo chmod +x /usr/bin/dde-desktop
     sudo chmod +x /usr/bin/dde-dock
-
+    sudo chmod +x /usr/bin/dde-launcher
+    sudo chmod +x /usr/bin/dde-file-manager
+	
     echo -e "\033[42;37m [INFO]: === 所有安装步骤执行成功，正常退出=== \033[0m"
 	exit 0
 fi
@@ -353,8 +355,10 @@ if [ $res -eq 0 ]; then
 
     if [ $installType -eq 1 ]; then
         echo [INFO]去除桌面组件应用程序的执行权限，实现开机黑屏
-        sudo chmod -x /usr/bin/dde-desktop
-        sudo chmod -x /usr/bin/dde-dock
+	sudo chmod -x /usr/bin/dde-desktop
+	sudo chmod -x /usr/bin/dde-dock
+	sudo chmod -x /usr/bin/dde-launcher
+	sudo chmod -x /usr/bin/dde-file-manager
     fi
 else
     echo -e "\033[41;37m [ERROR]: 设置SUDO权限失败！！ \033[0m"

addin/packaging/WIN/installbat.in

@@ -58,12 +58,7 @@ tasklist /nh | find /i "spshell.exe"
 @if errorlevel 1 (
 	@echo [INFO] 可视柜台进程不存在，跳过进程清理
 ) else (
-	@echo [INFO] 检测到可视柜台进程存在！5s 后将清理可视柜台相关进程
-	@for /l %%a in (1, 1, 5) do (
-		timeout 1 > nul
-		@echo %%a秒…… 如果不想清理可视柜台应用进程，请及时关闭此窗口！
-	)
-	@echo [INFO] 开始清理可视柜台相关进程……
+	@echo [INFO] 检测到可视柜台进程存在，开始清理可视柜台相关进程……
 	TASKKILL /F /IM spshell.exe
 	TASKKILL /F /IM guardian.exe
 	TASKKILL /F /IM cefclient.exe

addin/packaging/WIN/original.bat

@@ -65,12 +65,7 @@ tasklist /nh | find /i "spshell.exe"
 @if errorlevel 1 (
 	@echo [INFO] 可视柜台进程不存在，跳过进程清理
 ) else (
-	@echo [INFO] 检测到可视柜台进程存在！5s 后将清理可视柜台相关进程
-	@for /l %%a in (1, 1, 5) do (
-		timeout 1 > nul
-		@echo %%a秒…… 如果不想清理可视柜台应用进程，请及时关闭此窗口！
-	)
-	@echo [INFO] 开始清理可视柜台相关进程……
+	@echo [INFO] 检测到可视柜台进程存在，开始清理可视柜台相关进程……
 	TASKKILL /F /IM spshell.exe
 	TASKKILL /F /IM guardian.exe
 	TASKKILL /F /IM cefclient.exe