#IQRV #comment [Vendor] 南天信创国产化项目源码-20221216

DevAdapter/nantian/hspscanner.1.1/hspscanner.nantian.1.1.cpp

@@ -805,7 +805,7 @@ ErrorCodeEnum CHSPScanner::SetPreview(short nValue)
 				throw Error_Succeed;
 			}
 			iretval = g_var->HIGH_CloseWindow();
-			CILIX_AUX_X::Sleep(1000);
+			//CILIX_AUX_X::Sleep(1000);
 			g_var->m_trace->WriteTrace(CILIXTRACE_L_INFO,"SetPreview","HIGH_CloseWindow return %d",iretval);
 			LOG4VTM(WARN, "<SetPreview> - "<<"HIGH_CloseWindow return  "<<iretval);
 			if (iretval != 0)
@@ -861,7 +861,7 @@ ErrorCodeEnum CHSPScanner::ScanImage(const char* pszFileName)
 	LOG4VTM(WARN, "<ScanImage> - "<<"拍照图片存储路径："<<pszFileName);
 	g_var->m_trace->WriteTrace(CILIXTRACE_L_INFO,"ScanImage","拍照图片存储路径：%s",pszFileName);
 	memset(g_function,0,sizeof(g_function));
-	sprintf(g_function,"%s","SetPreview");
+	sprintf(g_function,"%s","ScanImage");
 	g_len = 0;
 	if (strlen(pszFileName) <= 0)
 	{
@@ -1233,10 +1233,12 @@ ErrorCodeEnum CHSPScanner::SetViewPos(int nX, int nY, int nWidth)
 				return iret;
 			}
 		}
+		g_var->m_trace->WriteTrace(CILIXTRACE_L_INFO,"SetViewPos","g_isshow= %d,g_ishide=%d",g_isshow,g_ishide);
 		if((g_isshow == TRUE)&&(g_ishide == FALSE)&&(nWidth == 0))
 		{
 			int iretval = g_var->HIGH_HideWindow(true);
 			CILIX_AUX_X::Sleep(200);
+			g_var->m_trace->WriteTrace(CILIXTRACE_L_INFO,"SetViewPos","传入窗口宽度为0，隐藏窗口，HIGH_HideWindow return %d",iretval);
 			if (iretval != 0)
 			{
 				g_var->m_trace->WriteTrace(CILIXTRACE_L_ERROR,"SetViewPos","传入窗口宽度为0，隐藏窗口，HIGH_HideWindow return %d",iretval);
@@ -1251,6 +1253,25 @@ ErrorCodeEnum CHSPScanner::SetViewPos(int nX, int nY, int nWidth)
 				return iret;
 			}
 		}
+		if((g_isshow == TRUE)&&((nWidth !=0)&&((ix == 0)&&(iy==0)&&(ih==0)&&(iw==0))))
+		{
+			int iretval = g_var->HIGH_HideWindow(false);
+			CILIX_AUX_X::Sleep(200);
+			g_var->m_trace->WriteTrace(CILIXTRACE_L_INFO,"SetViewPos","传入窗口宽度为原来宽度，显示窗口，HIGH_HideWindow return %d",iretval);
+			if (iretval != 0)
+			{
+				g_var->m_trace->WriteTrace(CILIXTRACE_L_ERROR,"SetViewPos","传入窗口宽度为原来宽度，显示窗口，HIGH_HideWindow return %d",iretval);
+				memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
+				strcpy(m_Error.szErrMsg,"传入窗口宽度为之前的宽度，显示窗口失败");
+				m_Error.dwErrMsgLen = strlen(m_Error.szErrMsg);
+				iret = Error_DevCommFailed;
+				g_len = __LINE__;
+				m_code = iret;
+				LOG4VTM(WARN, "<SetViewPos> - "<<"传入窗口宽度为之前的宽度，显示窗口失败，HIGH_HideWindow return "<<iretval);
+				LOG4VTM(WARN, "<SetViewPos> - "<<"Exit-");
+				return iret;
+			}
+		}
 		g_var->m_trace->WriteTrace(CILIXTRACE_L_INFO,"SetViewPos","g_X=%d,g_Y=%d,g_Width=%d,g_Height=%d",g_X,g_Y,g_Width,g_Height);
 		g_var->m_trace->WriteTrace(CILIXTRACE_L_INFO,"SetViewPos","ix=%d,iy=%d,iw=%d,ih=%d",ix,iy,iw,ih);
 		LOG4VTM(WARN, "<SetViewPos> - "<<"g_Height="<<g_Height);
@@ -1285,7 +1306,7 @@ ErrorCodeEnum CHSPScanner::SetProperty()
 	g_var->m_trace->WriteTrace(CILIXTRACE_L_INFO,"SetProperty","Entry.......................");
 	ErrorCodeEnum iret = Error_Succeed;
 	memset(g_function,0,sizeof(g_function));
-	sprintf(g_function,"%s","SetViewPos");
+	sprintf(g_function,"%s","SetProperty");
 	g_len = 0;
 	memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
 	strcpy(m_Error.szErrMsg,"不支持该功能");

DevAdapter/nantian/idcer.1.1/idcertificate.nantian.1.1.cpp

@@ -29,7 +29,7 @@ IDCardReaderNantian::IDCardReaderNantian()
 {
     int ret = g_pGvar.LoadDRVDLL();
 
-    g_pGvar.m_pTrace->WriteTrace("IDCer", "idcer.Nantian.1.1.so - 1.0.0.8");
+    g_pGvar.m_pTrace->WriteTrace("IDCer", "idcer.Nantian.1.1.so - 1.0.0.9");
 	char INIPath[100] = "";
 	CILIX_AUX_X::CILIX_GetModuleCurPath(INIPath);
 	strcat(INIPath, "idcer.nantian.ini");
@@ -47,7 +47,7 @@ IDCardReaderNantian::IDCardReaderNantian()
 	std::string str;
 	cmb::log4vendor::init(config, str);
 	 
-	LOG4VTM(WARN, "<IDCer> - "<<"idcer.Nantian.1.1.so - 1.0.0.6");
+	LOG4VTM(WARN, "<IDCer> - "<<"idcer.Nantian.1.1.so - 1.0.0.9");
 	return;
 }
 
@@ -141,7 +141,7 @@ ErrorCodeEnum IDCardReaderNantian::Reset()
 				"ResetDevice error, return:%d", iRet);
 			memset(g_pGvar.m_errMsg, 0, MAX_LEN);
 			sprintf(g_pGvar.m_errMsg, "reset device error, code:%d", iRet);
-			m_ErrCode_Msg_Input_Struct(Error_Succeed,"Reset",g_pGvar.m_errMsg,__LINE__);
+			m_ErrCode_Msg_Input_Struct(Error_Hardware,"Reset",g_pGvar.m_errMsg,__LINE__);
 			throw Error_Hardware;
 		}
 		//复位后重新连接设备
@@ -384,7 +384,7 @@ ErrorCodeEnum IDCardReaderNantian::Reset()
 				"卡未插入");
 			memset(g_pGvar.m_errMsg, 0, MAX_LEN);
 			sprintf(g_pGvar.m_errMsg, "NO Card In device");
-			m_ErrCode_Msg_Input_Struct(Error_Succeed,"IDCerAuthenticate",g_pGvar.m_errMsg,__LINE__);
+			m_ErrCode_Msg_Input_Struct(Error_Unexpect,"IDCerAuthenticate",g_pGvar.m_errMsg,__LINE__);
             throw Error_Unexpect;
         }
       
@@ -429,7 +429,7 @@ ErrorCodeEnum IDCardReaderNantian::Reset()
 				{
 					memset(g_pGvar.m_errMsg, 0, MAX_LEN);
 					sprintf(g_pGvar.m_errMsg, "NO Card In device");
-					m_ErrCode_Msg_Input_Struct(Error_DevMedia,"IDCerAuthenticate",g_pGvar.m_errMsg,__LINE__);
+					m_ErrCode_Msg_Input_Struct(Error_Unexpect,"IDCerAuthenticate",g_pGvar.m_errMsg,__LINE__);
 					throw Error_Unexpect;
 				}
 			}
@@ -437,7 +437,7 @@ ErrorCodeEnum IDCardReaderNantian::Reset()
 			{
 				memset(g_pGvar.m_errMsg, 0, MAX_LEN);
 				sprintf(g_pGvar.m_errMsg, "device is offline");
-				m_ErrCode_Msg_Input_Struct(Error_DevMedia,"IDCerAuthenticate",g_pGvar.m_errMsg,__LINE__);
+				m_ErrCode_Msg_Input_Struct(Error_Unexpect,"IDCerAuthenticate",g_pGvar.m_errMsg,__LINE__);
 				throw Error_Unexpect;
 			}
 		}
@@ -1199,8 +1199,9 @@ void* thread( void *arg )
 				{
 					if (g_pGvar.TheardEnd == false)
 						break;
-					usleep(100000);
+					usleep(100000);	
 				}
+				g_pGvar.m_pTrace->WriteTrace(CILIXTRACE_L_INFO, "IDCerRFControl","while is end");
 				//查询设备状态
 			for(int i = 1; i <4; i++)
 			{