Z991239-5694 #comment feat: 模拟器调整，测试版本

DevAdapter/DeviceSimulator.h

@@ -423,13 +423,13 @@ ErrorCodeEnum SimulatorHttpFunction(string entityName, string devFuncName, T& ob
 	simulatorCommonReq.adapterInterName = devFuncName;
 	simulatorCommonReq.m_url = GetSimulatorUrl();
 
-	ErrorCodeEnum err = Error_Unexpect;
+	ErrorCodeEnum err = Error_NotImpl;
 
 	bool ret = client->Post(simulatorCommonReq, obj);
 	if (ret) {
 		if (!obj.success)
 		{
-			return Error_NetBroken;
+			return Error_NotImpl;
 		}
 		else
 		{
@@ -438,7 +438,7 @@ ErrorCodeEnum SimulatorHttpFunction(string entityName, string devFuncName, T& ob
 	}
 	else
 	{
-		return Error_NotExist;
+		return Error_NotImpl;
 	}
 
 	return err;

DevAdapter/simulator/idcer.1.1/idcer_impl.cpp

@@ -205,10 +205,6 @@ ErrorCodeEnum IDCerClassImpl::GetDevCategory(DevCategoryInfo& devCategory)
 {
 
     ErrorCodeEnum err = Error_Succeed;
-    err = Error_Unexpect;
-    lastErrMsg = "{\"Description\": \"测试模式，获取适配器信息失败\"}";
-    return err;
-
     strcpy(devCategory.szModel, "STYLE=IG#FUNCTION=ITF#CODE=UCS2");
     strcpy(devCategory.szType, "szCategory");
     strcpy(devCategory.szVendor, "szVendor=cmbszSimulator");
@@ -271,11 +267,8 @@ ErrorCodeEnum IDCerClassImpl::IDCerRFControl(bool bControl)
     ErrorCodeEnum err = Error_Succeed;
     m_mode = 0;
 
-    if (!bControl)
-    {
-        SimulatorCommonAns ans;
-        err = SimulatorHttpFunction("IDCertificate", "IDCerRFControl", ans);
-    }
+    SimulatorCommonAns ans;
+    err = SimulatorHttpFunction("IDCertificate", "IDCerRFControl", ans);
 
     return err;
 }
@@ -611,6 +604,21 @@ bool IDCerClassImpl::ex2HttpFunction(IDCerInfoEx2& idCerInfoEx2)
         UTF8_to_UCS2((UINT8*)nationality, (UINT16*)idCerInfoEx2.nationality.data);
         idCerInfoEx2.nationality.dwSize = strlen(idCerInfoEx2.nationality.data);
 
+        char idType[1024]; memset(idType, 0, 1024);
+        std::strcpy(idType, idCerRet.idtype.c_str());
+        UTF8_to_UCS2((UINT8*)idType, (UINT16*)idCerInfoEx2.idType.data);
+        idCerInfoEx2.idType.dwSize = strlen(idCerInfoEx2.idType.data);
+
+        char othercode[1024]; memset(othercode, 0, 1024);
+        std::strcpy(othercode, idCerRet.othercode.c_str());
+        UTF8_to_UCS2((UINT8*)othercode, (UINT16*)idCerInfoEx2.reserved2.data);
+        idCerInfoEx2.reserved2.dwSize = strlen(idCerInfoEx2.reserved2.data);
+
+        char reserved[1024]; memset(reserved, 0, 1024);
+        std::strcpy(reserved, idCerRet.reserved.c_str());
+        UTF8_to_UCS2((UINT8*)reserved, (UINT16*)idCerInfoEx2.reserved.data);
+        idCerInfoEx2.reserved.dwSize = strlen(idCerInfoEx2.reserved.data);
+
         return true;
     }
     else

DevAdapter/simulator/idcer.1.1/idcer_impl.h

@@ -94,6 +94,7 @@ typedef struct IDCerDevRet : CHTTPRet {
         idtype = root["data"][REFLECTION(idtype)].asString();
         frontphoto = root["data"][REFLECTION(frontphoto)].asString();
         othercode = root["data"][REFLECTION(othercode)].asString();
+        reserved = root["data"][REFLECTION(reserved)].asString();
         return true;
     }
 } IDCerDevRet;

Module/mod_IDCertificate/IDCertFSM.cpp

@@ -27,7 +27,7 @@ using namespace SP::Module::Comm;
 
 #define IDCER_INIT_COUNT 3
 
-#define IDCER_READ_TIMEOUT 60000
+#define IDCER_READ_TIMEOUT 10000
 #define IDCER_AUTH_INTERVAL 300
 
 #ifdef DEVOPS_ON_ST /*DevOps流水线编译，ST环境*/