Z991239-6033 #comment feat: 修复bug

Signed-Off-By: commit-hook

Module/mod_ContactlessCard/ContactlessFSM.cpp

@@ -1701,18 +1701,23 @@ void CContactlessCardFSM::QueryHasCardJS(SpReqAnsContext<ContactlessCardService_
 		{
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetDevStatus").setCostTime(l_endTime - l_beginTime)("QueryInternalHasCardJS::GetDevStatus, eMedia pos:%d", devStatus.eMediaPos);
 
-			switch (devStatus.eMediaPos)
-			{
-			case CI_MEDIA_RF:
-				ret = 1;
-				break;
-			case CI_MEDIA_NOTPRESENT:
-			default:
-				ret = 0;
-				break;
-			}
-
-			ctx->Ans.position = ret;
+			//switch (devStatus.eMediaPos)
+			//{
+			//case CI_MEDIA_RF:
+			//	ret = 6;
+			//	break;
+			//case CI_MEDIA_NOTPRESENT:
+			//	ret = 0;
+			//	break;
+			//case CI_MEDIA_IDCARD:
+			//	ret = 7;
+			//	break;
+			//default:
+			//	ret = 0;
+			//	break;
+			//}
+
+			ctx->Ans.position = (int)devStatus.eMediaPos;
 			ctx->Answer(Error_Succeed);
 		}
 		else
@@ -1752,10 +1757,10 @@ int CContactlessCardFSM::EjectJS(SpReqAnsContext<ContactlessCardService_EjectJS_
 		ErrorCodeEnum eErr = m_hDevHelper->GetDevStatus(devStatus);
 		if (eErr == Error_Succeed)
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("EjectCard, devStatus.eMedia %d", devStatus.eMediaPos);
 			if (devStatus.eMediaPos == CI_MEDIA_RF || devStatus.eMediaPos == CI_MEDIA_NOTPRESENT)
 			{
 				if (devStatus.eMediaPos == CI_MEDIA_NOTPRESENT){
+					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("EjectCard, devStatus.eMedia %d", devStatus.eMediaPos);
 					ret = 0;//取走
 					break;
 				}