Z991239-5401 #comment feat: pad机型下线指纹仪功能

Signed-Off-By: commit-hook

Module/mod_FingerPrint/FingerPrintFSM.cpp

@@ -332,7 +332,6 @@ int CFingerPrintFSM::Initial()
 		return 2;
 	}
 
-	spConfig->ReadConfigValue("Device.PinPad", "Version", m_version);
 
 	//TODO:device init
 	int initCount = 0;
@@ -362,28 +361,6 @@ int CFingerPrintFSM::Initial()
 					strVersion = "7";
 					//TODO: Support new or old edition machine.
 				}
-				//else if (!m_csMachineType.Compare("RVC.PAD", true)) {
-				//	if (isFWB) {//蓝牙多合一
-				//		GetEntityBase()->GetFunction()->GetSysVar("FWBVendor", strVendor);
-				//		strVersion = "8";
-				//	}
-				//	else if ((!strVendor.Compare("Nantian", true) || !strVendor.Compare("grg", true) || !strVendor.Compare("Yihua", true))
-				//		&& !strVersion.Compare("4", true)) {
-				//		strVersion = "4";
-				//	}
-				//	else
-				//		strVersion = "1";
-				//}
-				else if (!m_csMachineType.Compare("RVC.Desk2S", true)) {
-					strVersion = "4";
-					if (m_machineVersion.Compare("1.0", true)) {//低柜一体机(贵宾理财2.0&非贵宾理财2.1)
-						strBatch = "20";
-					}
-				}
-				else if (!m_csMachineType.Compare("RVC.Desk1S", true) && !m_machineVersion.Compare("1.0", true)) {//低柜一体机(厅堂自助)
-					strVersion = "4";
-					strBatch = "20";
-				}
 				else if (!m_csMachineType.Compare("RVC.CardStore", true)) {
 					strVersion = "5";
 				}

Module/mod_FingerPrint/FingerPrintFSM.h

@@ -235,7 +235,7 @@ public:
 
 	CFingerPrintFSM():m_bCancelRegister(false), m_bCancelMatch(false), m_bExit(false),
 					  m_testResult(Error_Succeed), m_csDevSN(""), m_iInWhatPage(PageType_Other),
-					  m_csMachineType(""), m_terminalNo(""),m_fwbSN(""), m_version(""), m_machineVersion("")
+					  m_csMachineType(""), m_terminalNo(""), m_machineVersion("")
 					{	
 						HARDWARE_ENTITY_RESET_ENTITYID(m_entCode, 0x204); 
 					}
@@ -269,12 +269,11 @@ public:
 	void DeleteBmp(int type);
 	ErrorCodeEnum DeleteFileIfExisted(const char* fileName);
 
-	ErrorCodeEnum GetDevCatInfo(DevCategoryInfo& devInfo);//废弃
-	ErrorCodeEnum GetDevState(int &state);//废弃
+	ErrorCodeEnum GetDevCatInfo(DevCategoryInfo& devInfo);
+	ErrorCodeEnum GetDevState(int &state);
 
 	int Initial();
 	bool GetDevInitFlag() { return m_bOpened; }
-	void ResetDevInitFlag() { m_bOpened = false; }//蓝牙多合一使用
 	void SetInWhatPage(int bValue) { m_iInWhatPage = bValue; }
 
 	DevStateEnum GetDevState(){
@@ -293,12 +292,7 @@ private:
 	bool m_bExit;
 	int m_iInWhatPage/*在哪个页面，区分首页，用户桌面，其他页*/;
 
-	CSimpleStringA m_csDevSN;//蓝牙多合一设备sn
-
-	CSimpleStringA m_csMachineType,m_terminalNo;//site，terminalNo只是临时使用，可以去除
-	CSimpleStringA m_fwbSN;//FWBDevSN值
-	CSimpleStringA m_version;//蓝牙多合一pinpad版本
-	CSimpleStringA m_machineVersion;//终端大版本
+	CSimpleStringA m_csDevSN, m_csMachineType, m_terminalNo, m_machineVersion;
 };
 //废弃
 struct ScanTask : public ITaskSp   

Module/mod_FingerPrint/mod_FingerPrint.cpp

@@ -100,10 +100,6 @@ void CFingerPrintEntity::OnSysVarEvent(const char *pszKey,
 			m_fsm.SetInWhatPage(PageType_Other);
 		}
 	}
-	else if (_strnicmp(pszValue, "D", strlen("D")) == 0 )
-	{
-		m_fsm.ResetDevInitFlag();
-	}
 #endif	
 }