#IQRV #comment 调整编译问题

Module/include/CommEntitySettings.hpp

@@ -41,6 +41,7 @@ static inline ErrorCodeEnum StoreHeadBranchServicesMode(CEntityBase* pEntity, BO
  * @param[in]  实体句柄
  * @return : -1：集中配置文件不存在；0：分行服务；1：总行服务
  */
+ //TODO: 移除，现在全部终端已经切总行，过渡的分行逻辑已经不需要了
 static int DetectCenterSettingFilesSyncFromWhere(CEntityBase* pEntity)
 {
     CSimpleStringA strFilePath;

Module/include/DevEntityCommBase.hpp

@@ -20,7 +20,9 @@ struct VendorLibInfo
 	CSimpleStringA strVersion;
 	CSimpleStringA strBatch;
 
+
 	VendorLibInfo() :strDevice(true), strVendor(true), strVersion(true), strBatch(true) {}
+	VendorLibInfo(const CSimpleStringA& strDeviceName) :strDevice(strDeviceName), strVendor(true), strVersion(true), strBatch(true) {}
 	VendorLibInfo(const VendorLibInfo& rhs) :strDevice(rhs.strDevice), strVendor(rhs.strVendor), strVersion(rhs.strVersion), strBatch(rhs.strBatch) {}
 	VendorLibInfo& operator = (const VendorLibInfo& rhs) {
 		strDevice = rhs.strDevice;

Module/include/DeviceCrossHelper.h

@@ -87,6 +87,9 @@ public:
 	virtual ErrorCodeEnum SendAnswer(ErrorCodeEnum eErrorCode, DWORD dwUserError = 0){
 		return Error_NotImpl;
 	}
+	virtual ErrorCodeEnum SendAnswer(ErrorCodeEnum eErrorCode, DWORD dwUserError = 0, CSimpleString str = "") {
+		return Error_NotImpl;
+	}
 	virtual ErrorCodeEnum SetExpireTime(DWORD dwMS){
 		return Error_NotImpl;
 	}

Module/mod_HSPScanner/HSPScanner_def_g.h

@@ -8,9 +8,9 @@
 #include "SpHelper.h"
 
 namespace HSPScanner {
-//
-// const goes here
-//
+	//
+	// const goes here
+	//
 
 #define HSPScannerService_Method_StartPreview 0
 #define HSPScannerService_Method_CancelPreview 1
@@ -34,239 +34,250 @@ namespace HSPScanner {
 #define HSPScannerService_MethodSignature_GetDevInfo 296205965
 #define HSPScannerService_MethodSignature_Exit -1158854104
 
-struct HSPScannerService_StartPreview_Req
-{
-	short rotateType;
-	short scanType;
-	short colorType;
-	short reserved1;
-	short reserved2;
-	short reserved3;
-	short reserved4;
-
-	void Serialize(SpBuffer &Buf)
+#define HSPScannerService_LogCode_StartPreview "QLR040221700"
+#define HSPScannerService_LogCode_CancelPreview "QLR040221701"
+#define HSPScannerService_LogCode_ScanImage "QLR040221702"
+#define HSPScannerService_LogCode_ScanImageEx "QLR040221703"
+#define HSPScannerService_LogCode_SetProperty "QLR040221704"
+#define HSPScannerService_LogCode_SetWinPos "QLR040221705"
+#define HSPScannerService_LogCode_ShowProperty "QLR040221706"
+#define HSPScannerService_LogCode_GetDevStatus "QLR040221707"
+#define HSPScannerService_LogCode_GetDevInfo "QLR040221799"
+#define HSPScannerService_LogCode_Exit "QLR040221708"
+
+	struct HSPScannerService_StartPreview_Req
 	{
-		auto & buf = Buf & rotateType & scanType & colorType & reserved1 & reserved2 & reserved3 & reserved4;
-	}
+		short rotateType;
+		short scanType;
+		short colorType;
+		short reserved1;
+		short reserved2;
+		short reserved3;
+		short reserved4;
+
+		void Serialize(SpBuffer& Buf)
+		{
+			auto& buf = Buf & rotateType & scanType & colorType & reserved1 & reserved2 & reserved3 & reserved4;
+		}
+
+	};
+
+	struct HSPScannerService_StartPreview_Ans
+	{
+		int retCode;
+		int reserved1;
+		CAutoArray<int> reserved2;
 
-};
+		void Serialize(SpBuffer& Buf)
+		{
+			auto& buf = Buf & retCode & reserved1 & reserved2;
+		}
 
-struct HSPScannerService_StartPreview_Ans
-{
-	int retCode;
-	int reserved1;
-	CAutoArray<int> reserved2;
+	};
 
-	void Serialize(SpBuffer &Buf)
+	struct HSPScannerService_CancelPreview_Req
 	{
-		auto & buf = Buf & retCode & reserved1 & reserved2;
-	}
+		bool bOnlyHide;
+		int reserved1;
 
-};
+		void Serialize(SpBuffer& Buf)
+		{
+			auto& buf = Buf & bOnlyHide & reserved1;
+		}
 
-struct HSPScannerService_CancelPreview_Req
-{
-	bool bOnlyHide;
-	int reserved1;
+	};
 
-	void Serialize(SpBuffer &Buf)
+	struct HSPScannerService_CancelPreview_Ans
 	{
-		auto & buf = Buf & bOnlyHide & reserved1;
-	}
 
-};
+		void Serialize(SpBuffer& Buf)
+		{
+		}
 
-struct HSPScannerService_CancelPreview_Ans
-{
+	};
 
-	void Serialize(SpBuffer &Buf)
+	struct HSPScannerService_ScanImage_Req
 	{
-	}
+		int reserved1;
+		int reserved2;
 
-};
+		void Serialize(SpBuffer& Buf)
+		{
+			auto& buf = Buf & reserved1 & reserved2;
+		}
 
-struct HSPScannerService_ScanImage_Req
-{
-	int reserved1;
-	int reserved2;
+	};
 
-	void Serialize(SpBuffer &Buf)
+	struct HSPScannerService_ScanImage_Ans
 	{
-		auto & buf = Buf & reserved1 & reserved2;
-	}
+		CSimpleStringA filePath;
+		CBlob imageData;
+		int reserved1;
+		CSimpleStringA reserved2;
 
-};
+		void Serialize(SpBuffer& Buf)
+		{
+			auto& buf = Buf & filePath & imageData & reserved1 & reserved2;
+		}
 
-struct HSPScannerService_ScanImage_Ans
-{
-	CSimpleStringA filePath;
-	CBlob imageData;
-	int reserved1;
-	CSimpleStringA reserved2;
+	};
 
-	void Serialize(SpBuffer &Buf)
+	struct HSPScannerService_ScanImageEx_Req
 	{
-		auto & buf = Buf & filePath & imageData & reserved1 & reserved2;
-	}
+		int reserved1;
+		int reserved2;
 
-};
+		void Serialize(SpBuffer& Buf)
+		{
+			auto& buf = Buf & reserved1 & reserved2;
+		}
 
-struct HSPScannerService_ScanImageEx_Req
-{
-	int reserved1;
-	int reserved2;
+	};
 
-	void Serialize(SpBuffer &Buf)
+	struct HSPScannerService_ScanImageEx_Ans
 	{
-		auto & buf = Buf & reserved1 & reserved2;
-	}
+		CSimpleStringA filePath;
+		CBlob imageData;
+		int reserved1;
+		CSimpleStringA reserved2;
 
-};
+		void Serialize(SpBuffer& Buf)
+		{
+			auto& buf = Buf & filePath & imageData & reserved1 & reserved2;
+		}
 
-struct HSPScannerService_ScanImageEx_Ans
-{
-	CSimpleStringA filePath;
-	CBlob imageData;
-	int reserved1;
-	CSimpleStringA reserved2;
+	};
 
-	void Serialize(SpBuffer &Buf)
+	struct HSPScannerService_SetProperty_Req
 	{
-		auto & buf = Buf & filePath & imageData & reserved1 & reserved2;
-	}
-
-};
-
-struct HSPScannerService_SetProperty_Req
-{
-	short rotateType;
-	short scanType;
-	short colorType;
-	short reserved1;
-	short reserved2;
-	short reserved3;
-	short reserved4;
-
-	void Serialize(SpBuffer &Buf)
+		short rotateType;
+		short scanType;
+		short colorType;
+		short reserved1;
+		short reserved2;
+		short reserved3;
+		short reserved4;
+
+		void Serialize(SpBuffer& Buf)
+		{
+			auto& buf = Buf & rotateType & scanType & colorType & reserved1 & reserved2 & reserved3 & reserved4;
+		}
+
+	};
+
+	struct HSPScannerService_SetProperty_Ans
 	{
-		auto & buf = Buf & rotateType & scanType & colorType & reserved1 & reserved2 & reserved3 & reserved4;
-	}
+		int retCode;
+		int reserved1;
+		CAutoArray<int> reserved2;
 
-};
+		void Serialize(SpBuffer& Buf)
+		{
+			auto& buf = Buf & retCode & reserved1 & reserved2;
+		}
 
-struct HSPScannerService_SetProperty_Ans
-{
-	int retCode;
-	int reserved1;
-	CAutoArray<int> reserved2;
+	};
 
-	void Serialize(SpBuffer &Buf)
+	struct HSPScannerService_SetWinPos_Req
 	{
-		auto & buf = Buf & retCode & reserved1 & reserved2;
-	}
+		int type;
+		int pointX;
+		int pointY;
+		int nWidth;
+		int reserved4;
 
-};
+		void Serialize(SpBuffer& Buf)
+		{
+			auto& buf = Buf & type & pointX & pointY & nWidth & reserved4;
+		}
 
-struct HSPScannerService_SetWinPos_Req
-{
-	int type;
-	int pointX;
-	int pointY;
-	int nWidth;
-	int reserved4;
+	};
 
-	void Serialize(SpBuffer &Buf)
+	struct HSPScannerService_SetWinPos_Ans
 	{
-		auto & buf = Buf & type & pointX & pointY & nWidth & reserved4;
-	}
 
-};
+		void Serialize(SpBuffer& Buf)
+		{
+		}
 
-struct HSPScannerService_SetWinPos_Ans
-{
+	};
 
-	void Serialize(SpBuffer &Buf)
+	struct HSPScannerService_ShowProperty_Req
 	{
-	}
 
-};
+		void Serialize(SpBuffer& Buf)
+		{
+		}
 
-struct HSPScannerService_ShowProperty_Req
-{
+	};
 
-	void Serialize(SpBuffer &Buf)
+	struct HSPScannerService_ShowProperty_Ans
 	{
-	}
 
-};
+		void Serialize(SpBuffer& Buf)
+		{
+		}
 
-struct HSPScannerService_ShowProperty_Ans
-{
+	};
 
-	void Serialize(SpBuffer &Buf)
+	struct HSPScannerService_GetDevStatus_Req
 	{
-	}
 
-};
+		void Serialize(SpBuffer& Buf)
+		{
+		}
 
-struct HSPScannerService_GetDevStatus_Req
-{
+	};
 
-	void Serialize(SpBuffer &Buf)
+	struct HSPScannerService_GetDevStatus_Ans
 	{
-	}
+		int connected;
+		int showing;
+		int previewing;
+		CAutoArray<int> reserved1;
+		CAutoArray<CSimpleStringA> reserved2;
 
-};
+		void Serialize(SpBuffer& Buf)
+		{
+			auto& buf = Buf & connected & showing & previewing & reserved1 & reserved2;
+		}
 
-struct HSPScannerService_GetDevStatus_Ans
-{
-	int connected;
-	int showing;
-	int previewing;
-	CAutoArray<int> reserved1;
-	CAutoArray<CSimpleStringA> reserved2;
+	};
 
-	void Serialize(SpBuffer &Buf)
+	struct HSPScannerService_GetDevInfo_Req
 	{
-		auto & buf = Buf & connected & showing & previewing & reserved1 & reserved2;
-	}
 
-};
+		void Serialize(SpBuffer& Buf)
+		{
+		}
 
-struct HSPScannerService_GetDevInfo_Req
-{
+	};
 
-	void Serialize(SpBuffer &Buf)
+	struct HSPScannerService_GetDevInfo_Ans
 	{
-	}
+		CSimpleStringA type;
+		CSimpleStringA model;
+		CSimpleStringA version;
+		int state;
 
-};
+		void Serialize(SpBuffer& Buf)
+		{
+			auto& buf = Buf & type & model & version & state;
+		}
 
-struct HSPScannerService_GetDevInfo_Ans
-{
-	CSimpleStringA type;
-	CSimpleStringA model;
-	CSimpleStringA version;
-	int state;
+	};
 
-	void Serialize(SpBuffer &Buf)
+	struct HSPScannerService_Exit_Info
 	{
-		auto & buf = Buf & type & model & version & state;
-	}
-
-};
 
-struct HSPScannerService_Exit_Info
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
+		void Serialize(SpBuffer& Buf)
+		{
+		}
 
-};
+	};
 
 
-///////////////////////////
+	///////////////////////////
 
 } // namespace HSPScanner
 

Module/mod_Initializer/Initializer_client_g.h

@@ -93,7 +93,8 @@ public:
 		ErrorCodeEnum Error = InitializeNew(Req, spAsyncWait, dwTimeout);
 		if (Error == Error_Succeed) {
 			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, dwTimeout);
+			CSimpleString str;
+			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
 			LOG_ASSERT(Error || bEnd);
 		}
 		return Error;