From d27b50edb3912e3f1222a5d1f56480bd18899732 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 10 Jan 2020 18:12:11 +0800 Subject: [PATCH] adjust --- TestDASServer.cpp | 8 +++++++- TestMediaRealPlay.cpp | 2 +- XNetSDKTest.cpp | 9 +-------- XNetSDKTest.h | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/TestDASServer.cpp b/TestDASServer.cpp index 520bf3d..62c232b 100644 --- a/TestDASServer.cpp +++ b/TestDASServer.cpp @@ -1,12 +1,18 @@ #include "XNetSDKTest.h" +XSDK_HANDLE hDeviceArr[6]; +char DeviceIdArr[6][128]; + void OnDASServerStart(XSDK_HANDLE hServer, int nResult) { printf("OnDASServerStart-->%d:%d\r\n", hServer, nResult); } -void OnDASDeviceReg(XSDK_HANDLE hDevice, SXSDKDASDeviceInfo *pDASInfo) +void OnDASDeviceReg(XSDK_HANDLE hDevice, SXSDKDASDeviceInfo *pDASInfo, int dPos) { + hDeviceArr[dPos] = hDevice; + strncpy(DeviceIdArr[dPos], pDASInfo->sDevId, 127); + dPos++; // hDevice---等同于XSDK_DevLoginSyn/XSDK_DevLogin的返回值 printf("OnDASDeviceReg-->\r\nIP:%s\r\nPort:%d\r\nDeiveID:%s\r\nUserName:%s\r\nPassword:%s\r\nChannelNum:%d\r\nEncryptyType:%s\r\n", pDASInfo->sDevIP, pDASInfo->nDevPort, pDASInfo->sDevId, pDASInfo->sUserName, pDASInfo->sPassword, pDASInfo->nChannelNum, pDASInfo->sEncryptType); diff --git a/TestMediaRealPlay.cpp b/TestMediaRealPlay.cpp index f48aa65..011ab8f 100644 --- a/TestMediaRealPlay.cpp +++ b/TestMediaRealPlay.cpp @@ -32,7 +32,7 @@ int CALLBACK Test_MediaCallBack(XSDK_HANDLE hMedia, const unsigned char *pData, string fmt("/media-file/origin/%s/%04d-%02d-%02d-%02d.dat"); char file_name[1024]; snprintf(file_name,sizeof(file_name),fmt.c_str(),DeviceIdArr[pos],pFrame->nYear,pFrame->nMonth,pFrame->nDay,pFrame->nHour) ; - printf("path: %s", file_name); + printf("path: %s \r\n", file_name); // ABFile("video_header.dat", pFrame->pHeader, pFrame->nLength); ABFile(file_name, pFrame->pContent, pFrame->nFrameLength); } diff --git a/XNetSDKTest.cpp b/XNetSDKTest.cpp index e0996f0..4a2b1b8 100644 --- a/XNetSDKTest.cpp +++ b/XNetSDKTest.cpp @@ -2,8 +2,6 @@ #include "XNetSDKSyn.h" XSDK_HANDLE g_hDevice ; -XSDK_HANDLE hDeviceArr[6]; -char DeviceIdArr[6][128]; SXMediaRecordByFileReq info = {0}; bool bFindFile = false; @@ -72,12 +70,7 @@ int CALLBACK Main_MessageCallBack(XSDK_HANDLE hDevice, int nMsgId, int nParam1, g_hDevice = hDevice; #endif - { - OnDASDeviceReg(hDevice, (SXSDKDASDeviceInfo *)pObject); - hDeviceArr[dPos] = hDevice ; - strncpy_s(DeviceIdArr[dPos], ((SXSDKDASDeviceInfo*)pObject)->sDevId,127); - dPos++ ; - } + OnDASDeviceReg(hDevice, (SXSDKDASDeviceInfo *)pObject,dPos); } break; case ESXSDK_DEV_SNAP: diff --git a/XNetSDKTest.h b/XNetSDKTest.h index d0de210..6382750 100644 --- a/XNetSDKTest.h +++ b/XNetSDKTest.h @@ -70,7 +70,7 @@ int TestOPMachine(); //接收设备返回的配置数据 extern XSDK_HANDLE g_hDasServer; void OnDASServerStart(XSDK_HANDLE hServer, int nResult); -void OnDASDeviceReg(XSDK_HANDLE hDevice, SXSDKDASDeviceInfo *pDevInfo); +void OnDASDeviceReg(XSDK_HANDLE hDevice, SXSDKDASDeviceInfo *pDevInfo,int dPos); int TestDASServer(); // 测试设备通道抓图