#IQRV #comment 去除高拍仪功能集实体部分简版接口

Module/include/EventCode.h

@@ -490,38 +490,11 @@ ERROR_ACCESSAUTH_CONNECT_ACS_x}
 
 //#define LOG_ERR_DEVICECONTROL_RESTART 0x21480001
 
-#define Sensors_Public_Start					0x21E90000
-#define LOG_EVT_SENSORS_LIGHT_BRIGHT			(Sensors_Public_Start + 1)
-#define LOG_EVT_SENSORS_LIGHT_DARK				(Sensors_Public_Start + 2)
-#define LOG_EVT_SENSORS_INCLINEMETER_CHANGE		(Sensors_Public_Start + 3)
-#define LOG_EVT_SENSORS_COMPASS_CHANGE			(Sensors_Public_Start + 4)
-#define LOG_EVT_SENSORS_DYROMETER_CHANGE		(Sensors_Public_Start + 5)
-#define LOG_EVT_SENSORS_ACCELEROMETER_CHANGE	(Sensors_Public_Start + 6)
-#define LOG_EVT_SENSORS_GNSS_CHANGE				(Sensors_Public_Start + 7)
-//#define LOG_ERR_SENSORS_RESTART 0x21E80001
-
 #define LOG_ERR_HSPS_DEVOPEN_FAILED 0x21700001
 #define LOG_EVT_HSPS_LIGHT_ON 0x21700002
 #define LOG_EVT_HSPS_LIGHT_OFF 0x21700003
 #define LOG_EVT_HSPS_LOST_CONNECT 0x21700004
 
-#define LOG_EVT_SCANNERSET_HSPSCNT_FAILED 0x21800001
-#define LOG_EVT_SCANNERSET_HSPSCNT_TASK_TIMEOUT 0x21800002
-#define LOG_ERR_SCANNERSET_HSPSCNT_ACCESS_ENV_FAILED 0x21800003
-#define LOG_ERR_SCANNERSET_CONNECT_MEDIACONTRLLER_FAILED 0x21800004
-#define LOG_ERR_SCANNERSET_MEDIACONTROLLER_MANIPULATE_FAILED 0x21800005
-
-#define LOG_ERR_WATCHDOG_LOGWARN_TERM_INFO 0x20D00201	//Watchdog适配器信息告警上送
-#define LOG_ERR_WATCHDOG_NO_ADAPTER_FILE	0x20D00202	//未找到适配器文件
-#define LOG_ERR_WATCHDOG_LOGWARN_ROOTINFO 0x20D00203
-#define LOG_ERR_WATCHDOG_REAL_ROOT_CONFIG 0x20D00204
-
-#define LOG_ERR_UPS_LOGWARN_TERM_INFO 0x20E00201	//Ups适配器信息告警上送
-#define LOG_ERR_UPS_NO_ADAPTER_FILE	0x20E00202	//未找到适配器文件
-#define LOG_ERR_UPS_LOGWARN_ROOTINFO 0x20E00203
-#define LOG_ERR_UPS_REAL_ROOT_CONFIG 0x20E00204	//实际root配置
-
-#define LOG_EVT_HEALTH_UPS_NO_ELECTOR 0x50100001			//无市电
 #define LOG_EVT_HEALTH_FIRST_ENTER_MAINPADE 0x50100002			//IE启动以来首次进首页
 #define LOG_EVT_HEALTH_FIRST_ENTER_MAINPADE_FROM_HEALTH_START 0x50100003	//健康启动以来首次进首页
 #define LOG_WARN_HEALTH_INSTALL_FINISHED 0x50100004		//安装成功的标识

Module/mod_ScannerSet/ScannerSet.xml

@@ -129,50 +129,6 @@
      		<param name="reserved2" type="array_string"/>
 			</res>
 		</twoway>
-    <!--下线，简版使用-->
-		<oneway name="CrossTermInvokeInfo" overlap="true">
-				<param name="type" type="int"/>
-				<param name="result" type="int"/>
-				<param name="fromTerminalNo" type="string"/>
-				<param name="toTerminalNo" type="string"/>
-				<param name="nEntityID" type="int"/>
-				<param name="param1" type="string"/>
-				<param name="param2" type="string"/>
-				<param name="param3" type="int"/>
-				<param name="param4" type="int"/>
-				<param name="paramX" type="blob"/>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>
-				<param name="reservedX" type="array_blob"/>	
-		</oneway>
-    <!--下线，简版使用-->
-		<twoway name="CrossTermCall" overlap="true">
-			<req>
-				<param name="type" type="int"/>
-				<param name="fromTerminalNo" type="string"/>
-				<param name="toTerminalNo" type="string"/>
-				<param name="nEntityID" type="int"/>
-				<param name="param1" type="string"/>
-				<param name="param2" type="string"/>
-				<param name="param3" type="int"/>
-				<param name="param4" type="int"/>
-				<param name="paramX" type="blob"/>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>
-				<param name="reservedX" type="array_blob"/>					
-			</req>
-			<res>
-				<param name="retCode" type="int"/>
-				<param name="retParam1" type="string"/>
-				<param name="retParam2" type="string"/>
-				<param name="retParam3" type="int"/>
-				<param name="retParam4" type="int"/>
-				<param name="retParamX" type="blob"/>
-				<param name="reserved1" type="array_int"/>
-				<param name="reserved2" type="array_string"/>
-				<param name="reservedX" type="array_blob"/>
-			</res>				
-		</twoway>
     <!--接口名称和功能：获取硬件属性（硬件通有接口），厂商适配器接口透传返回-->
 		<twoway name="GetDevInfo" overlap="true" method_id="65535">
 			<req>

Module/mod_ScannerSet/ScannerSetFSM.cpp

@@ -694,13 +694,6 @@ int CScannerFSM::GetDevInfo(SpReqAnsContext<ScannerService_GetDevInfo_Req,
 	return nRes;
 }
 
-int CScannerFSM::GetOnlineDevices(SpReqAnsContext<ScannerService_GetOnlineCameras_Req, 
-	ScannerService_GetOnlineCameras_Ans>::Pointer ctx)
-{
-	ctx->Answer(Error_NotSupport);
-	return 0;
-}
-
 ErrorCodeEnum CScannerFSM::OnDevExit()
 {
 	ErrorCodeEnum erroCode = Error_Unexpect;

Module/mod_ScannerSet/ScannerSetFSM.h

@@ -287,9 +287,6 @@ public:
 	int GetDevInfo(SpReqAnsContext<ScannerService_GetDevInfo_Req,
 		ScannerService_GetDevInfo_Ans>::Pointer ctx);
 
-	int GetOnlineDevices(SpReqAnsContext<ScannerService_GetOnlineCameras_Req,
-		ScannerService_GetOnlineCameras_Ans>::Pointer ctx);
-
 	bool IsWorking() {
 		return (GetCurrState()->id == s2);
 	}

Module/mod_ScannerSet/ScannerSet_UserErrorCode.h

@@ -4,21 +4,12 @@
 
 #define LOG_EVT_SCANNERSET_HSPSCNT_FAILED 0x21800001
 #define LOG_EVT_SCANNERSET_HSPSCNT_TASK_TIMEOUT 0x21800002
-#define LOG_ERR_SCANNERSET_HSPSCNT_ACCESS_ENV_FAILED 0x21800003
-#define LOG_ERR_SCANNERSET_CONNECT_MEDIACONTRLLER_FAILED 0x21800004
-#define LOG_ERR_SCANNERSET_MEDIACONTROLLER_MANIPULATE_FAILED 0x21800005
-#define LOG_ERR_SCANNERSET_CONFIGURE_CAMERA 0x21800007
-#define LOG_ERR_SCANNERSET_BIND_CAMERA 0x21800008
-#define LOG_ERR_SCANNERSET_NO_AVAILABLE_CAMERA 0x21800009
 #define LOG_WARN_DUPLICATE_SETWINPOS 0x2180000B
 #define LOG_WARN_INVALID_SETWINPOS 0x2180000C
 #define LOG_WARN_MODULE_INVALID 0x2180000D
 #define LOG_WARN_FSM_INVALID 0x2180000E
-#define LOG_WARN_ATTACH_FAILED 0x2180000F
-#define LOG_EVT_SCANNERSET_BIND_CAMERA 0x21800010
 
 #define LOG_ERR_SCANNERSET_API_INVOKE_START 0x218F0000
-#define LOG_ERR_SCANNERSET_API_INVOKE_BindCameraDevice 0x218F0001
 #define LOG_ERR_SCANNERSET_API_INVOKE_StartPreview 0x218F0002
 #define LOG_ERR_SCANNERSET_API_INVOKE_CancelPreview 0x218F0003
 #define LOG_ERR_SCANNERSET_API_INVOKE_GetDevStatus 0x218F0004

Module/mod_ScannerSet/ScannerSet_client_g.h

@@ -465,70 +465,6 @@ public:
 		return Error;
 	}
 
-	ErrorCodeEnum CrossTermInvokeInfo(ScannerService_CrossTermInvokeInfo_Info &Info)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		CAutoBuffer Buf = SpObject2Buffer(Info);
-		auto ret = pFunc->OnewayCall(ScannerService_Method_CrossTermInvokeInfo, ScannerService_MethodSignature_CrossTermInvokeInfo, Buf, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-	ErrorCodeEnum CrossTermCall(ScannerService_CrossTermCall_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(ScannerService_Method_CrossTermCall, ScannerService_MethodSignature_CrossTermCall, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum CrossTermCall(ScannerService_CrossTermCall_Req &Req, ScannerService_CrossTermCall_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = CrossTermCall(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum CrossTermCall(ScannerService_CrossTermCall_Req &Req, ScannerService_CrossTermCall_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = CrossTermCall(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum CrossTermCall(ScannerService_CrossTermCall_Req &Req, ScannerService_CrossTermCall_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = CrossTermCall(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
 	ErrorCodeEnum GetDevInfo(ScannerService_GetDevInfo_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();

Module/mod_ScannerSet/ScannerSet_def_g.h

@@ -21,8 +21,6 @@ namespace ScannerSet {
 #define ScannerService_Method_GetDevStatus 6
 #define ScannerService_Method_Exit 7
 #define ScannerService_Method_GetOnlineCameras 8
-#define ScannerService_Method_CrossTermInvokeInfo 9
-#define ScannerService_Method_CrossTermCall 10
 #define ScannerService_Method_GetDevInfo 65535
 
 #define ScannerService_MethodSignature_StartPreview 220854261
@@ -34,8 +32,6 @@ namespace ScannerSet {
 #define ScannerService_MethodSignature_GetDevStatus 1693345709
 #define ScannerService_MethodSignature_Exit -1158854104
 #define ScannerService_MethodSignature_GetOnlineCameras -1966467273
-#define ScannerService_MethodSignature_CrossTermInvokeInfo 931240070
-#define ScannerService_MethodSignature_CrossTermCall 74706330
 #define ScannerService_MethodSignature_GetDevInfo 825740532
 
 #define ScannerService_LogCode_StartPreview "QLR040221800"
@@ -47,8 +43,6 @@ namespace ScannerSet {
 #define ScannerService_LogCode_GetDevStatus "QLR040221806"
 #define ScannerService_LogCode_Exit "QLR040221807"
 #define ScannerService_LogCode_GetOnlineCameras "QLR040221808"
-#define ScannerService_LogCode_CrossTermInvokeInfo "QLR040221809"
-#define ScannerService_LogCode_CrossTermCall "QLR040221810"
 #define ScannerService_LogCode_GetDevInfo "QLR040221899"
 
 struct ScannerService_StartPreview_Req
@@ -260,70 +254,6 @@ struct ScannerService_GetOnlineCameras_Ans
 
 };
 
-struct ScannerService_CrossTermInvokeInfo_Info
-{
-	int type;
-	int result;
-	CSimpleStringA fromTerminalNo;
-	CSimpleStringA toTerminalNo;
-	int nEntityID;
-	CSimpleStringA param1;
-	CSimpleStringA param2;
-	int param3;
-	int param4;
-	CBlob paramX;
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-	CAutoArray<CBlob> reservedX;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & type & result & fromTerminalNo & toTerminalNo & nEntityID & param1 & param2 & param3 & param4 & paramX & reserved1 & reserved2 & reservedX;
-	}
-
-};
-
-struct ScannerService_CrossTermCall_Req
-{
-	int type;
-	CSimpleStringA fromTerminalNo;
-	CSimpleStringA toTerminalNo;
-	int nEntityID;
-	CSimpleStringA param1;
-	CSimpleStringA param2;
-	int param3;
-	int param4;
-	CBlob paramX;
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-	CAutoArray<CBlob> reservedX;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & type & fromTerminalNo & toTerminalNo & nEntityID & param1 & param2 & param3 & param4 & paramX & reserved1 & reserved2 & reservedX;
-	}
-
-};
-
-struct ScannerService_CrossTermCall_Ans
-{
-	int retCode;
-	CSimpleStringA retParam1;
-	CSimpleStringA retParam2;
-	int retParam3;
-	int retParam4;
-	CBlob retParamX;
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
-	CAutoArray<CBlob> reservedX;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & retCode & retParam1 & retParam2 & retParam3 & retParam4 & retParamX & reserved1 & reserved2 & reservedX;
-	}
-
-};
-
 struct ScannerService_GetDevInfo_Req
 {
 

Module/mod_ScannerSet/ScannerSet_server_g.h

@@ -93,20 +93,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case ScannerService_Method_CrossTermInvokeInfo:
-			if (dwSignature == ScannerService_MethodSignature_CrossTermInvokeInfo) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case ScannerService_Method_CrossTermCall:
-			if (dwSignature == ScannerService_MethodSignature_CrossTermCall) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case ScannerService_Method_GetDevInfo:
 			if (dwSignature == ScannerService_MethodSignature_GetDevInfo) {
 				bOverlap = true;
@@ -170,16 +156,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case ScannerService_Method_CrossTermInvokeInfo:
-			if (dwSignature != ScannerService_MethodSignature_CrossTermInvokeInfo) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case ScannerService_Method_CrossTermCall:
-			if (dwSignature != ScannerService_MethodSignature_CrossTermCall) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case ScannerService_Method_GetDevInfo:
 			if (dwSignature != ScannerService_MethodSignature_GetDevInfo) {
 				Error = Error_MethodSignatureFailed;
@@ -237,16 +213,6 @@ public:
 	/// override by user
 	}
 
-	virtual void Handle_CrossTermInvokeInfo(SpOnewayCallContext<ScannerService_CrossTermInvokeInfo_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_CrossTermCall(SpReqAnsContext<ScannerService_CrossTermCall_Req, ScannerService_CrossTermCall_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
 	virtual void Handle_GetDevInfo(SpReqAnsContext<ScannerService_GetDevInfo_Req, ScannerService_GetDevInfo_Ans>::Pointer ctx)
 	{
 	/// override by user
@@ -358,26 +324,6 @@ public:
 						Handle_GetOnlineCameras(ctx);
 					}
 					break;
-				case ScannerService_Method_CrossTermInvokeInfo:
-					{
-						SpOnewayCallContext<ScannerService_CrossTermInvokeInfo_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<ScannerService_CrossTermInvokeInfo_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_CrossTermInvokeInfo(ctx);
-					}
-					break;
-				case ScannerService_Method_CrossTermCall:
-					{
-						SpReqAnsContext<ScannerService_CrossTermCall_Req,ScannerService_CrossTermCall_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<ScannerService_CrossTermCall_Req,ScannerService_CrossTermCall_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_CrossTermCall(ctx);
-					}
-					break;
 				case ScannerService_Method_GetDevInfo:
 					{
 						SpReqAnsContext<ScannerService_GetDevInfo_Req,ScannerService_GetDevInfo_Ans>::Pointer ctx;

Module/mod_ScannerSet/mod_ScannerSet.cpp

@@ -53,18 +53,6 @@ void ScannerServerSession::Handle_GetDevStatus(SpReqAnsContext<ScannerService_Ge
 	m_pEntity->GetDevStatus(ctx);
 }
 
-void ScannerServerSession::Handle_CrossTermCall(SpReqAnsContext<ScannerService_CrossTermCall_Req, ScannerService_CrossTermCall_Ans>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	m_pEntity->CrossTermCall(ctx);
-}
-
-void ScannerServerSession::Handle_CrossTermInvokeInfo(SpOnewayCallContext<ScannerService_CrossTermInvokeInfo_Info>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	m_pEntity->CrossTermInvokeInfo(ctx);
-}
-
 void ScannerServerSession::Handle_GetDevInfo(SpReqAnsContext<ScannerService_GetDevInfo_Req,
 	ScannerService_GetDevInfo_Ans>::Pointer ctx)
 {
@@ -76,7 +64,7 @@ void ScannerServerSession::Handle_GetOnlineCameras(SpReqAnsContext<ScannerServic
 	ScannerService_GetOnlineCameras_Ans>::Pointer ctx) {
 	
 	DbgToBeidou(ctx->link, __FUNCTION__)();
-	m_pEntity->GetOnlineCameras(ctx);
+	ctx->Answer(Error_NotSupport);
 }
 
 void ScannerServerSession::Handle_Exit(SpOnewayCallContext<ScannerService_Exit_Info>::Pointer ctx)

Module/mod_ScannerSet/mod_ScannerSet.h

@@ -49,11 +49,6 @@ public:
 	virtual void Handle_GetDevStatus(SpReqAnsContext<ScannerService_GetDevStatus_Req,
 		ScannerService_GetDevStatus_Ans>::Pointer ctx);
 
-	virtual void Handle_CrossTermCall(SpReqAnsContext<ScannerService_CrossTermCall_Req,
-		ScannerService_CrossTermCall_Ans>::Pointer ctx);
-
-	virtual void Handle_CrossTermInvokeInfo(SpOnewayCallContext<ScannerService_CrossTermInvokeInfo_Info>::Pointer ctx);
-
 	virtual void Handle_GetDevInfo(SpReqAnsContext<ScannerService_GetDevInfo_Req,
 		ScannerService_GetDevInfo_Ans>::Pointer ctx);
 
@@ -186,12 +181,6 @@ public:
 		return;
 	}
 
-	void GetOnlineCameras(SpReqAnsContext<ScannerService_GetOnlineCameras_Req,
-		ScannerService_GetOnlineCameras_Ans>::Pointer ctx) 
-	{
-		m_fsm.GetOnlineDevices(ctx);
-	}
-
 	void SetWinPos(SpReqAnsContext<ScannerService_SetWindowPos_Req,
 		ScannerService_SetWindowPos_Ans>::Pointer ctx)
 	{
@@ -246,16 +235,6 @@ public:
 		return;
 	}
 
-	void CrossTermCall(SpReqAnsContext<ScannerService_CrossTermCall_Req, 
-		ScannerService_CrossTermCall_Ans>::Pointer ctx)
-	{
-		ctx->Answer(Error_NotSupport);
-	}
-
-	void CrossTermInvokeInfo(SpOnewayCallContext<ScannerService_CrossTermInvokeInfo_Info>::Pointer ctx)
-	{
-	}
-
 	void OnSelfTest(EntityTestEnum eTestType, CSmartPointer<ITransactionContext> pTransactionContext)
 	{
 		m_fsm.SelfTest(eTestType, pTransactionContext);