Merge branch 'feture_hsps_gpio' of http://gitee.itc.cmbchina.cn/QD_RemoteBankArea/LR04.02_RVCTerminalPlus into feture_hsps_gpio

DevAdapter/simulator/cardissuerstand.1.1/cardissuer_impl.cpp

@@ -132,7 +132,7 @@ ErrorCodeEnum CardIssuerImpl::GetLastErr(DevErrorInfo& devErrInfo)
 {
 	static int times = 0;
 	char szMessage[1024];
-	string lastErr = "{\"Description\": \"测试模式,硬件执行失败\"}";
+	string lastErr = "{\"Description\": \"test DevAdapter is execute fail\"}";
 	//sprintf(szMessage, "这是第 %d 条错误信息", ++times);
 	strcpy(devErrInfo.szErrMsg, lastErr.c_str());
 	devErrInfo.dwErrMsgLen = lastErr.length();

DevAdapter/simulator/hspscanner.1.1/hspscanner_impl.cpp

@@ -1,6 +1,8 @@
 #include "hspscanner_impl.h"
 #include<cstring>
 #include <cstdio>
+#include "stdlib.h"
+
 HSPSClassImpl::HSPSClassImpl()
         :m_mode(0)
 {
@@ -40,7 +42,7 @@ ErrorCodeEnum HSPSClassImpl::GetLastErr(DevErrorInfo &devErrInfo)
     static int times = 0;
 	char szMessage[128];
 	char szSubMessage[64];
-	sprintf(szSubMessage, "%d", ++times);
+	sprintf(szSubMessage, "simulator test: %d", ++times);
 	sprintf(szMessage, "{\"ErrCode\":9555, \"Description\":\"Func:%s,Line:%d,Msg:%s\"}", __FUNCTION__, __LINE__, szSubMessage);
     strcpy(devErrInfo.szErrMsg, szMessage);
     devErrInfo.dwErrMsgLen = strlen(szMessage);
@@ -78,4 +80,74 @@ DEVICEBASE_API ErrorCodeEnum  GetDevAdapterVersion(DevSoftVersion& retVesion)
     return Error_Succeed;
 }
 
-#endif // NEWER_COMPILER_WORKAROUNDS
+#endif // NEWER_COMPILER_WORKAROUNDS
+
+
+ErrorCodeEnum HSPSClassImpl::SetParam(ParamType type, ParamTypeValue value)
+{
+	static unsigned SetParam_test = 0;
+	if (SetParam_test++ % 4 == 0) {
+		return Error_Debug;
+	}
+	return Error_Succeed;
+}
+
+ErrorCodeEnum HSPSClassImpl::SetPreview(short nValue)
+{
+    static unsigned preview_test = 0;
+    if (nValue == 1) {
+        return Error_Succeed;
+    }
+    if (preview_test++ % 2 == 0) {
+        return Error_Debug;
+    }
+	return Error_Succeed;
+}
+
+ErrorCodeEnum HSPSClassImpl::ScanImage(const char* pszFileName)
+{
+	static unsigned ScanImage_test = 0;
+	if (ScanImage_test++ % 2 == 0) {
+		return Error_Debug;
+	}
+#ifdef _WIN32
+    CopyFileA("D:\\Run\\version\\7.9.4.261\\bin\\agent.jpg", "D:\\Run\\version\\7.9.4.261\\dep\\MaterialImage.jpg", TRUE);
+#else
+	char buff[256] = { 0 };
+	sprintf(buff, "cp /opt/Run/version/2.9.4.420/bin/agent.jpg /opt/Run/version/2.9.4.420/bin/MaterialImage.jpg");
+	system(buff);
+#endif 
+    return Error_Succeed;
+}
+
+ErrorCodeEnum HSPSClassImpl::ScanImageEx(BYTE* pBtImg, int& nBtLen, const char* pszFileName)
+{
+	return Error_NotImpl;
+}
+
+ErrorCodeEnum HSPSClassImpl::SetViewPos(int nX, int nY, int nWidth)
+{
+	static unsigned SetViewPos_test = 0;
+	if (SetViewPos_test++ % 2 == 0) {
+		return Error_Debug;
+	}
+	return Error_Succeed;
+}
+
+
+ErrorCodeEnum HSPSClassImpl::SetProperty()
+{
+	return Error_Succeed;
+}
+
+ErrorCodeEnum HSPSClassImpl::GetDevStatus(HspsDevStatus& status)
+{
+	static unsigned GetDevStatus_test = 0;
+	if (GetDevStatus_test++ % 2 == 0) {
+		return Error_Debug;
+	}
+    status.inPreview = 0;
+    status.inShow = 0;
+    status.isConnected = 1;
+	return Error_Succeed;
+}

DevAdapter/simulator/hspscanner.1.1/hspscanner_impl.h

@@ -25,10 +25,7 @@ public:
     //
     //	Set param, more detail please to see ParamType and its according ParamTypeValue.
     //
-    virtual ErrorCodeEnum SetParam(ParamType type, ParamTypeValue value)
-    {
-        return Error_Succeed;
-    }
+    virtual ErrorCodeEnum SetParam(ParamType type, ParamTypeValue value);
 
     //
     //	Command the device to start to preview or stop previewing.
@@ -40,10 +37,7 @@ public:
     //	nValue值为 0 时关闭预览并隐藏窗口
     //		
     //
-    virtual ErrorCodeEnum SetPreview(short nValue)
-    {
-        return Error_Succeed;
-    }
+    virtual ErrorCodeEnum SetPreview(short nValue);
 
     //
     //	Scan Image from device and store the image.
@@ -51,10 +45,7 @@ public:
     //		specifies that where the image will be located and what it would be named.
     //	拍摄照片，传入的文件名已带绝对路径，无需再进行拼接处理
     //
-    virtual ErrorCodeEnum ScanImage(const char* pszFileName)
-    {
-        return Error_Succeed;
-    }
+    virtual ErrorCodeEnum ScanImage(const char* pszFileName);
 
     //
     //	Scan Image from device and return the image data in byte format.
@@ -70,10 +61,7 @@ public:
     //		文件名长度为零表示不在本地生成图片文件
     //  
     //
-    virtual ErrorCodeEnum ScanImageEx(BYTE* pBtImg, int& nBtLen, const char* pszFileName = "")
-    {
-        return Error_Succeed;
-    }
+    virtual ErrorCodeEnum ScanImageEx(BYTE* pBtImg, int& nBtLen, const char* pszFileName = "");
 
     //
     //	Set position and width of preview dialog with the rate of length to width: 16:9.
@@ -82,28 +70,19 @@ public:
     //	-nWidth[in] The Width of Preview Dialog .
     //	传入预览窗口显示的坐标，左上角的横坐标nX，左上角的纵坐标nY，以及预览窗口的宽，宽与高的比例为 16:9
     //
-    virtual ErrorCodeEnum SetViewPos(int nX, int nY, int nWidth)
-    {
-        return Error_Succeed;
-    }
+    virtual ErrorCodeEnum SetViewPos(int nX, int nY, int nWidth);
 
     //
     //	Show property dialog of HSPS of LiangTian.
     //	If there is no property dialog function, ignore it and return Error_NotImpl(更新20161117).
     //  更新20161117：用于打开良田高拍仪设备的设置属性页，可能用不到
     //
-    virtual ErrorCodeEnum SetProperty()
-    {
-        return Error_Succeed;
-    }
+    virtual ErrorCodeEnum SetProperty();
 
     //
     //	Get current status of device.
     //
-    virtual ErrorCodeEnum GetDevStatus(HspsDevStatus& status)
-    {
-        return Error_Succeed;
-    }
+    virtual ErrorCodeEnum GetDevStatus(HspsDevStatus& status);
 
 private:
     int m_mode;