Z991239-5240 #comment 高拍仪合并乱码问题

Module/mod_HSPScanner/HSPScannerFSM.cpp

@@ -226,7 +226,7 @@ unsigned int CHSPScannerFSM::s0_on_event(FSMEvent* e)
 		{
 			SetWinPosEvent* pEvt = dynamic_cast<SetWinPosEvent*>(e);
 			if(pEvt->m_ctx->Req.type == 2)
-			{//ÔÚs0״̬£¬½öÄÜÓÃÓÚÉèÖÃλÖúʹ°Ìå´óС
+			{//在s0状态，仅能用于设置位置和窗体大小
 				SetWinPosTask* pTask = new SetWinPosTask(this);
 				pTask->SetContext(pEvt->m_ctx);
 				GetEntityBase()->GetFunction()->PostThreadPoolTask(pTask);
@@ -515,7 +515,7 @@ unsigned int CHSPScannerFSM::s3_on_event(FSMEvent* e)
 		{
 			StartPreviewEvent* pEvt = dynamic_cast<StartPreviewEvent*>(e);
 			if (!m_bOpened) {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_StartPreview).setResultCode(MapCode2RTAString(GetLastUserCode()))("¸ßÅÄÒÇÉ豸δ´ò¿ª");
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_StartPreview).setResultCode(MapCode2RTAString(GetLastUserCode()))("高拍仪设备未打开");
 				pEvt->m_ctx->Answer(Error_DevNotAvailable, GetLastUserCode());
 			} else {
 				StartPreviewTask* pTask = new StartPreviewTask(this);
@@ -568,7 +568,7 @@ unsigned int CHSPScannerFSM::s3_on_event(FSMEvent* e)
 				}
 			} else if (!m_bOpened) {
 				StopPreviewEvent* pEvt = dynamic_cast<StopPreviewEvent*>(e);
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_CancelPreview).setResultCode(MapCode2RTAString(GetLastUserCode()))("¸ßÅÄÒÇÉ豸δ´ò¿ª");
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_CancelPreview).setResultCode(MapCode2RTAString(GetLastUserCode()))("高拍仪设备未打开");
 				pEvt->m_ctx->Answer(Error_DevNotAvailable, GetLastUserCode());
 			} 
 		}
@@ -726,7 +726,7 @@ unsigned int CHSPScannerFSM::s3_on_event(FSMEvent* e)
 		{
 			GetDevStatusEvent* pEvt = dynamic_cast<GetDevStatusEvent*>(e);
 			if (!m_bOpened) {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_GetDevStatus).setResultCode(MapCode2RTAString(GetLastUserCode()))("¸ßÅÄÒÇÉ豸δ´ò¿ª");
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_GetDevStatus).setResultCode(MapCode2RTAString(GetLastUserCode()))("高拍仪设备未打开");
 				pEvt->m_ctx->Answer(Error_DevNotAvailable, GetLastUserCode());
 			} else {
 				GetDevStatusTask* pTask = new GetDevStatusTask(this);
@@ -740,7 +740,7 @@ unsigned int CHSPScannerFSM::s3_on_event(FSMEvent* e)
 		{
 			GetDevInfoEvent* pEvt = dynamic_cast<GetDevInfoEvent*>(e);
 			if (!m_bOpened) {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_GetDevInfo).setResultCode(MapCode2RTAString(GetLastUserCode()))("¸ßÅÄÒÇÉ豸δ´ò¿ª");
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_GetDevInfo).setResultCode(MapCode2RTAString(GetLastUserCode()))("高拍仪设备未打开");
 				pEvt->m_ctx->Answer(Error_DevNotAvailable, GetLastUserCode());
 			} else {
 				GetDevInfoTask* pTask = new GetDevInfoTask(this);
@@ -754,7 +754,7 @@ unsigned int CHSPScannerFSM::s3_on_event(FSMEvent* e)
 	{
 		SetWinPosEvent* pEvt = dynamic_cast<SetWinPosEvent*>(e);
         if (!m_bOpened) {
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_SetWinPos).setResultCode(MapCode2RTAString(GetLastUserCode()))("¸ßÅÄÒÇÉ豸δ´ò¿ª");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_SetWinPos).setResultCode(MapCode2RTAString(GetLastUserCode()))("高拍仪设备未打开");
             pEvt->m_ctx->Answer(Error_DevNotAvailable, GetLastUserCode());
 			e->SetHandled();
 		}
@@ -834,7 +834,7 @@ unsigned int CHSPScannerFSM::s4_on_event(FSMEvent* e)
 void CHSPScannerFSM::s5_on_entry()
 {
 	m_eDevStatus = DEVICE_STATUS_MAINTAINCE;
-	LogEvent(Severity_Middle,LOG_EVT_HSPS_LOST_CONNECT,"¸ßÅÄÒǶϿªÁ¬½Ó£¡");
+	LogEvent(Severity_Middle,LOG_EVT_HSPS_LOST_CONNECT,"高拍仪断开连接！");
 	SetLastUserCode(HSPScanner_UserErrorCode_DEVICE_OFFLINE);
 	ScheduleTimer(CHECK_CONNECT_TIMER_ID, MILLISECOND_TO_CHECK_CONNECT);
 }
@@ -864,7 +864,7 @@ unsigned int CHSPScannerFSM::s5_on_event(FSMEvent* e)
 				if (status.isConnected == 0) {
 					ScheduleTimer(CHECK_CONNECT_TIMER_ID, MILLISECOND_TO_CHECK_CONNECT);
 				} else if (status.inShow == 1 && status.inPreview == 1) {
-					//»Øµ½Ô¤ÀÀ״̬
+					//回到预览状态
 					uRet = 2;
 				} else {
 					uRet = 1;
@@ -958,7 +958,7 @@ unsigned int CHSPScannerFSM::s6_on_event(FSMEvent* e)
 		{
 			StopPreviewEvent* pEvt = dynamic_cast<StopPreviewEvent*>(e);
 			if(!pEvt->m_ctx->Req.bOnlyHide)
-			{//ÒµÎñÔÚs6״̬½öÄܽøÐг¹µ×È¡ÏûÔ¤ÀÀµÄ²Ù×÷
+			{//业务在s6状态仅能进行彻底取消预览的操作
 				StopPreviewTask* pTask = new StopPreviewTask(this);
 				pTask->SetContext(pEvt->m_ctx);
 				GetEntityBase()->GetFunction()->PostThreadPoolTask(pTask);
@@ -985,7 +985,7 @@ unsigned int CHSPScannerFSM::s6_on_event(FSMEvent* e)
 		{
 			SetWinPosEvent* pEvt = dynamic_cast<SetWinPosEvent*>(e);
 			if(pEvt->m_ctx->Req.type == 2)
-			{//ÔÚs6״̬£¬²»ÔÊÐí½øÐÐÏÔʾºÍÒþ²Ø²Ù×÷£¬ÒµÎñ±ØÐëͨ¹ýXXXPreviewÀ´½øÐÐÏÔʾÒþ²Ø²Ù×÷
+			{//在s6状态，不允许进行显示和隐藏操作，业务必须通过XXXPreview来进行显示隐藏操作
 				SetWinPosTask* pTask = new SetWinPosTask(this);
 				pTask->SetContext(pEvt->m_ctx);
 				GetEntityBase()->GetFunction()->PostThreadPoolTask(pTask);
@@ -1192,7 +1192,7 @@ int CHSPScannerFSM::StartPreview(SpReqAnsContext<HSPScannerService_StartPreview_
 	if (erroCode == Error_Succeed) {
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetDevStatus").setCostTime(ullEnd - ullStart)("{\"connected\": %d, \"previewing\": %d, \"showing\": %d}", status.isConnected, status.inPreview, status.inShow);
 	}
-	if (ISSUCCEEDED(erroCode) && status.inPreview) {// ÓÃÓÚs6״̬ [Josephus in 9:33:48 2016/11/22]
+	if (ISSUCCEEDED(erroCode) && status.inPreview) {// 用于s6状态 [Josephus in 9:33:48 2016/11/22]
 		const ULONGLONG ullStart = SP::Module::Comm::RVCGetTickCount();
 		erroCode = m_hDevHelper->SetParam(HSPS_MODEL_VIEW, HSPS_VIEW_SHOW);
 		const ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
@@ -1857,7 +1857,7 @@ BOOL CHSPScannerFSM::DelAndGetNewFileName(CSimpleStringA& csfileName, bool bInBu
 	strAimPath = strPath + SPLIT_SLASH_STR + fileName;
 
 #if 0
-	///*TODO(80374374@10/11/2022): Õâ¶Î´úÂëÉÏÏßÒ»¶Îʱ¼äºóҪȥ³ý£¬ÒòΪ´ÓÕâ¸ö°æ±¾¿ªÊ¼Õâ¸öÎļþ¾Í²»Éú³ÉÔÚÕâ¸öĿ¼ÁË */
+	///*TODO(80374374@10/11/2022): 这段代码上线一段时间后要去除，因为从这个版本开始这个文件就不生成在这个目录了 */
 	if (ExistsFileA(strAimPath)) {
 		if (DeleteFileA((LPCTSTR)strAimPath) != 0) {
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("DeleteFile(%s) suc.", (LPCTSTR)strAimPath);