#IQRV #comment remove the code aobout pad or il or desks

Framework/Common/SpComm.hpp

@@ -22,20 +22,12 @@ namespace SP
 		{
 			CMB_UNKNOWN,
 			CMB_LIB,       /** 行内大堂*/
-			CMB_SSB,      /** 自助网点*/
-			CMB_LSS,      /** 生活销售机*/
 			CMB_FLB,      /** 离行机器*/
-			CMB_OSB,     /** 外拓PAD*/
-			CMB_SMM     /** 商户终端*/
 		};
 
 #define SITE_ENUM_TYPE(MACRO)	\
 		MACRO(LIB)\
-		MACRO(SSB)\
-		MACRO(LSS)\
-		MACRO(FLB)\
-		MACRO(OSB)\
-		MACRO(SMM)
+		MACRO(FLB)
 
 
 #define ENUM_MAP_CONVERT(elem) \
@@ -63,23 +55,16 @@ namespace SP
 			return "Unkown";
 		}
 
-		enum What 
+		enum What
 		{
 			RVC_UNKNOWN,
 			RVC_Stand2S,          /** 落地式大机*/
-			RVC_PAD,                /** PAD*/
-			RVC_Desk2S,           /** 低柜双屏*/
-			RVC_IL,                    /** 简版*/
-			RVC_Desk1S,          /** 低柜一体机*/
-			RPM_Stand1S         /** 扩展柜*/
+			RVC_Stand1SPlus       /** 单屏大机*/
 		};
 
 #define MACHINE_ENUM_TYPE(MACRO)	\
 		MACRO(Stand2S)\
-		MACRO(PAD)\
-		MACRO(Desk2S)\
-		MACRO(IL)\
-		MACRO(Desk1S)
+		MACRO(Stand1SPlus)
 
 #undef ENUM_MAP_CONVERT
 #define ENUM_MAP_CONVERT(elem) \
@@ -92,10 +77,6 @@ namespace SP
 			if (lpcszTypeName == NULL || strlen(lpcszTypeName) == 0)
 				return RVC_UNKNOWN;
 			MACHINE_ENUM_TYPE(ENUM_MAP_CONVERT)
-
-			if (stricmp(lpcszTypeName, "RPM.Stand1S") == 0)
-				return RPM_Stand1S;
-
 			return RVC_UNKNOWN;
 		}
 
@@ -108,10 +89,6 @@ namespace SP
 			default:
 				break;
 			}
-
-			if (what == RPM_Stand1S)
-				return "RPM.Stand1S";
-
 			return "Unkown";
 		}
 	};

Framework/RVCComm/test/RVCCommTest.cpp

@@ -145,7 +145,7 @@ private:
 #define TEST_IP "99.12.98.156"
 #define TEST_PORT   1050
 #define TEST_TERMINAL   "7715015056"
-#define TEST_MachineType "RVC.PAD"
+#define TEST_MachineType "RVC.Stand2S"
 #define TEST_EnrolAddr  "广东省深圳市南山区科技园北区科技中一路3号"
 
 TEST(RvccommTest, InstallServiceTest)

Framework/spbase/test/SpBaseMiscTest.cpp

@@ -35,28 +35,19 @@ TEST(SpBaseErrorCode, ErrorCode2MsgTest)
 TEST(SpCommTest, MachineSiteTypeTest)
 {
 	EXPECT_TRUE(SP::MachineFormat::Str2Site("cmb.lib") == SP::MachineFormat::CMB_LIB);
-	EXPECT_TRUE(SP::MachineFormat::Str2Site("CMB.SMM") == SP::MachineFormat::CMB_SMM);
 	EXPECT_TRUE(SP::MachineFormat::Str2Site("CMB.XXXX") == SP::MachineFormat::CMB_UNKNOWN);
 	EXPECT_TRUE(SP::MachineFormat::Str2Site("") == SP::MachineFormat::CMB_UNKNOWN);
 	EXPECT_TRUE(SP::MachineFormat::Str2Site(NULL) == SP::MachineFormat::CMB_UNKNOWN);
 
-	ASSERT_STREQ("CMB.SMM", SP::MachineFormat::Site2Str(SP::MachineFormat::CMB_SMM));
-	ASSERT_STREQ("CMB.LSS", SP::MachineFormat::Site2Str(SP::MachineFormat::CMB_LSS));
 	ASSERT_STREQ("Unkown", SP::MachineFormat::Site2Str(SP::MachineFormat::CMB_UNKNOWN));
 }
 
 TEST(SpCommTest, MachineTypeTest)
 {
-	EXPECT_TRUE(SP::MachineFormat::Str2Type("rvc.PAD") == SP::MachineFormat::RVC_PAD);
 	EXPECT_TRUE(SP::MachineFormat::Str2Type("RVC.Stand2S") == SP::MachineFormat::RVC_Stand2S);
 	EXPECT_TRUE(SP::MachineFormat::Str2Type("rvc.XXXX") == SP::MachineFormat::RVC_UNKNOWN);
 	EXPECT_TRUE(SP::MachineFormat::Str2Type("") == SP::MachineFormat::RVC_UNKNOWN);
 	EXPECT_TRUE(SP::MachineFormat::Str2Type(NULL) == SP::MachineFormat::RVC_UNKNOWN);
-	EXPECT_TRUE(SP::MachineFormat::Str2Type("RPM.Stand1S") == SP::MachineFormat::RPM_Stand1S);
-	EXPECT_TRUE(SP::MachineFormat::Str2Type("rpm.Stand1S") == SP::MachineFormat::RPM_Stand1S);
-
-	ASSERT_STREQ("RVC.PAD", SP::MachineFormat::Type2Str(SP::MachineFormat::RVC_PAD));
-	ASSERT_STREQ("RVC.Desk2S", SP::MachineFormat::Type2Str(SP::MachineFormat::RVC_Desk2S));
 	ASSERT_STREQ("Unkown", SP::MachineFormat::Type2Str(SP::MachineFormat::RVC_UNKNOWN));
 }
 

Module/include/test/TestCommEntityUtil.cpp

@@ -7,7 +7,6 @@
 
 TEST_CASE("Test get machine type", "[machine]")
 {
-    REQUIRE(SP::Module::Comm::Str2Type("rvc.PAD") == SP::Module::Comm::RVC_PAD);
     REQUIRE(SP::Module::Comm::Str2Type("RVC.Stand2S") == SP::Module::Comm::RVC_Stand2S);
     REQUIRE(SP::Module::Comm::Str2Type("rvc.XXXX") == SP::Module::Comm::RVC_UNKNOWN);
     REQUIRE(SP::Module::Comm::Str2Type("") == SP::Module::Comm::RVC_UNKNOWN);
@@ -15,8 +14,6 @@ TEST_CASE("Test get machine type", "[machine]")
     REQUIRE(SP::Module::Comm::Str2Type("RPM.Stand1S") == SP::Module::Comm::RPM_Stand1S);
     REQUIRE(SP::Module::Comm::Str2Type("rpm.Stand1S") == SP::Module::Comm::RPM_Stand1S);
 
-    REQUIRE(std::strcmp(SP::Module::Comm::Type2Str(SP::Module::Comm::RVC_PAD), "RVC.PAD") == 0);
-    REQUIRE(std::strcmp(SP::Module::Comm::Type2Str(SP::Module::Comm::RVC_Desk2S), "RVC.Desk2S") == 0);
     REQUIRE(std::strcmp(SP::Module::Comm::Type2Str(SP::Module::Comm::RVC_UNKNOWN), "Unkown") == 0);
 }
 

Module/mod_DeviceControl/mod_DeviceControl.cpp

@@ -111,19 +111,11 @@ void CDeviceControlEntity::QueryHardwareInfo(SpReqAnsContext<DeviceControlServic
 		ipAddrs.Append(&tmpip, 0, 1);
 		macAddrs.Append(&tmpmac, 0, 1);
 	}
-
-    // pad设备厂商为Microsoft， 其他设备读取root中的pinpad字段下的vendor
-    if (info.strMachineType == "RVC.PAD") {
-        DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("This is PAD device.");
-        deviceFct = "Microsoft";
-    } else {
-        CSmartPointer<IConfigInfo> spConfig;
-        GetFunction()->OpenConfig(Config_Root, spConfig);
-        spConfig->ReadConfigValue("Device.PinPad", "Vendor", deviceFct);
-    }
+	CSmartPointer<IConfigInfo> spConfig;
+	GetFunction()->OpenConfig(Config_Root, spConfig);
+	spConfig->ReadConfigValue("Device.PinPad", "Vendor", deviceFct);
 
     //获取操作系统版本信息
-
 #if defined(_MSC_VER)
         //获取windows系统版本
     DWORD dwMajorVer, dwMinorVer, dwBuildNumber;

Module/mod_guiconsole/GUIConsoleFSM.cpp

@@ -71,14 +71,7 @@ void CGUIConsoleFSM::s1_on_entry()
 	{
 		m_pGuiTask->ShowBeginInit(FALSE);
 	}
-
-	CSystemStaticInfo sysInfo;
-	rc = pFunc->GetSystemStaticInfo(sysInfo);
-	if (rc == Error_Succeed && !sysInfo.strMachineType.Compare("RVC.Pad", true) && !sysInfo.strSite.Compare("cmb.FLB", true)) {
-		m_pGuiTask->EnableMobileDialMenu(TRUE);
-	} else {
-		m_pGuiTask->EnableMobileDialMenu(FALSE);
-	}
+	m_pGuiTask->EnableMobileDialMenu(FALSE);
 #endif //RVC_OS_WIN
 }
 

Module/mod_heartbeat/HeartBeatFSM.cpp

@@ -933,21 +933,11 @@ Cleanup:
 		case PDH_CSTATUS_NO_OBJECT  :
 			{
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Unable to find the specified object on the computer or in the log file.");
-				//CSystemStaticInfo sysInfo;
-				//if(GetEntityBase()->GetFunction()->GetSystemStaticInfo(sysInfo) == Error_Succeed)
-				//{
-				//	if(!sysInfo.strMachineType.Compare("RVC.PAD", true))
-				//	{
-				//		Dbg("Pad MachineType, abort lodctr operation.");
-				//		break;
-				//	}
-				//}
-				if(!m_nLodCtrFlag || m_nLodCtrFlag == 2)
-				{
-					LodctrTask* task = new LodctrTask(this);
-					GetEntityBase()->GetFunction()->PostThreadPoolTask(task);
-				}
-
+			if (!m_nLodCtrFlag || m_nLodCtrFlag == 2)
+			{
+				LodctrTask* task = new LodctrTask(this);
+				GetEntityBase()->GetFunction()->PostThreadPoolTask(task);
+			}
 			}
 			break;
 		case PDH_FUNCTION_NOT_FOUND  :

Module/mod_rpc/guitask.cpp

@@ -466,9 +466,6 @@ ErrorCodeEnum GUITask::SetWindowPosition(bool bTop)
 	CSystemStaticInfo info;
 	memset(&info, 0, sizeof(info));
 	auto rc = m_pEntity->GetFunction()->GetSystemStaticInfo(info);
-	if (stricmp(info.strMachineType, "RVC.IL") == 0)
-		return Error_Succeed;			
-
 	if (m_hWndMainFrame) 
 	{
 		if (bTop)