|
|
@@ -12,14 +12,8 @@
|
|
|
#include "ModuleMix.h"
|
|
|
|
|
|
#include "publicFunExport.h"
|
|
|
-#pragma comment(lib, "libpublicFun.lib")
|
|
|
#include <algorithm>
|
|
|
#include <map>
|
|
|
-#ifdef RVC_OS_WIN
|
|
|
-#define _ATL_NO_AUTOMATIC_NAMESPACE
|
|
|
-#include <atltime.h>
|
|
|
-#endif //RVC_OS_WIN
|
|
|
-
|
|
|
#include "CardIssuerClass.h"
|
|
|
#include "mod_cardissuerStand.h"
|
|
|
#include "stdafx.h"
|
|
|
@@ -28,10 +22,12 @@
|
|
|
//oiltest@20200915 temp for GetTickCount
|
|
|
#ifdef RVC_OS_WIN
|
|
|
#define _ATL_NO_AUTOMATIC_NAMESPACE
|
|
|
+#include <atltime.h>
|
|
|
#else
|
|
|
#include<sys/time.h>
|
|
|
#include <dlfcn.h>
|
|
|
#endif //RVC_OS_WIN
|
|
|
+
|
|
|
unsigned long long GetTickCountRVC() {
|
|
|
#ifdef RVC_OS_WIN
|
|
|
return GetTickCount64();
|
|
|
@@ -4673,6 +4669,7 @@ bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo s
|
|
|
qTempReq.m_url = m_csSyncMaterialUrl.GetData();
|
|
|
qTempReq.m_headers.emplace(std::make_pair("Content-Type", "application/json"));
|
|
|
SyncMaterialCountReq1& req1 = qTempReq.reqInfo;
|
|
|
+ //TODO: CrossPlaform 我记得是可以直接使用 strncpy_s 的 [Gifur@2025630]
|
|
|
#ifdef RVC_OS_WIN
|
|
|
strncpy_s(req1.TerminalNo, sizeof(req1.TerminalNo), info.strTerminalID, _TRUNCATE);
|
|
|
strncpy_s(req1.DeviceNo, sizeof(req1.DeviceNo), syncInfo.strDeviceNo, _TRUNCATE);
|
|
|
@@ -4690,6 +4687,7 @@ bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo s
|
|
|
pReq2.bMaintain = syncInfo.arrMaintainFlag[i];
|
|
|
if (syncInfo.arrMaintainFlag[i])
|
|
|
{
|
|
|
+ //TODO: CrossPlaform [Gifur@2025630]
|
|
|
#ifdef RVC_OS_WIN
|
|
|
strncpy_s(pReq2.Maintainer, sizeof(pReq2.Maintainer), syncInfo.arrMaintainer[i], _TRUNCATE);
|
|
|
#else
|
|
|
@@ -4697,6 +4695,7 @@ bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo s
|
|
|
#endif //RVC_OS_WIN
|
|
|
pReq2.MaintainTime = syncInfo.arrMaintainTime[i];
|
|
|
}
|
|
|
+ //TODO: CrossPlaform [Gifur@2025630]
|
|
|
#ifdef RVC_OS_WIN
|
|
|
strncpy_s(pReq2.CardBoxNo, sizeof(pReq2.CardBoxNo), syncInfo.arrCardBoxNo[i], _TRUNCATE);
|
|
|
strncpy_s(pReq2.PsbCode, sizeof(pReq2.PsbCode), syncInfo.arrPsbCode[i], _TRUNCATE);
|
80374374