Explorar el Código

adjust

master
wenqiurong hace 5 años
padre
commit
35bfc849b8
Se han modificado 33 ficheros con 9 adiciones y 5 borrados
  1. BIN
      Config/ConfigDataCentre.o
  2. BIN
      Config/TestCameraConfig.o
  3. BIN
      Config/TestDefaultConfig.o
  4. BIN
      Config/TestDevSystemConfig.o
  5. BIN
      Config/TestEncodeConfig.o
  6. BIN
      Config/TestModifyPassword.o
  7. BIN
      Config/TestRebot.o
  8. +1
    -1
      TestDASServer.cpp
  9. BIN
      TestDASServer.o
  10. BIN
      TestDevAlarmCallback.o
  11. BIN
      TestDevConfig.o
  12. BIN
      TestDevFileFind.o
  13. BIN
      TestDevPTZ.o
  14. BIN
      TestDevSearch.o
  15. BIN
      TestDevSnap.o
  16. BIN
      TestDevTalk.o
  17. BIN
      TestDownload.o
  18. BIN
      TestDownloadFileByName.o
  19. BIN
      TestFuns.o
  20. BIN
      TestMediaFaceImage.o
  21. +3
    -2
      TestMediaRealPlay.cpp
  22. BIN
      TestMediaRealPlay.o
  23. BIN
      TestMediaRecordPlay.o
  24. BIN
      TestOPLogQuery.o
  25. BIN
      TestOSDInfo.o
  26. BIN
      TestOpenTransChannel.o
  27. BIN
      TestPTZPreset.o
  28. BIN
      TestSerialWrite.o
  29. BIN
      TestUpgrade.o
  30. BIN
      TestVideoCfg.o
  31. +5
    -2
      XNetSDKTest.cpp
  32. BIN
      XNetSDKTest.o
  33. BIN
      test

BIN
Config/ConfigDataCentre.o Ver fichero


BIN
Config/TestCameraConfig.o Ver fichero


BIN
Config/TestDefaultConfig.o Ver fichero


BIN
Config/TestDevSystemConfig.o Ver fichero


BIN
Config/TestEncodeConfig.o Ver fichero


BIN
Config/TestModifyPassword.o Ver fichero


BIN
Config/TestRebot.o Ver fichero


+ 1
- 1
TestDASServer.cpp Ver fichero

@@ -10,9 +10,9 @@ void OnDASServerStart(XSDK_HANDLE hServer, int nResult)
void OnDASDeviceReg(XSDK_HANDLE hDevice, SXSDKDASDeviceInfo *pDASInfo, int dPos)
{
printf("hDevice::%d, dPos::%d\r\n",hDevice,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);


BIN
TestDASServer.o Ver fichero


BIN
TestDevAlarmCallback.o Ver fichero


BIN
TestDevConfig.o Ver fichero


BIN
TestDevFileFind.o Ver fichero


BIN
TestDevPTZ.o Ver fichero


BIN
TestDevSearch.o Ver fichero


BIN
TestDevSnap.o Ver fichero


BIN
TestDevTalk.o Ver fichero


BIN
TestDownload.o Ver fichero


BIN
TestDownloadFileByName.o Ver fichero


BIN
TestFuns.o Ver fichero


BIN
TestMediaFaceImage.o Ver fichero


+ 3
- 2
TestMediaRealPlay.cpp Ver fichero

@@ -2,8 +2,9 @@
#include <string>
int getPos(XSDK_HANDLE hMedia) {
int size = sizeof(hDeviceArr) / sizeof(hDeviceArr);
int size = sizeof(hDeviceArr) / sizeof(hDeviceArr[0]);
for (int i = 0; i < size; i++) {
printf("pos:: %d , hMedia:: %d,hMedia::%d\r\n",i,hDeviceArr[i],hMedia);
if (hDeviceArr[i] == hMedia) {
return i;
}
@@ -32,7 +33,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 \r\n", file_name);
printf("path: %d ,%s \r\n", pos,file_name);
// ABFile("video_header.dat", pFrame->pHeader, pFrame->nLength);
ABFile(file_name, pFrame->pContent, pFrame->nFrameLength);
}


BIN
TestMediaRealPlay.o Ver fichero


BIN
TestMediaRecordPlay.o Ver fichero


BIN
TestOPLogQuery.o Ver fichero


BIN
TestOSDInfo.o Ver fichero


BIN
TestOpenTransChannel.o Ver fichero


BIN
TestPTZPreset.o Ver fichero


BIN
TestSerialWrite.o Ver fichero


BIN
TestUpgrade.o Ver fichero


BIN
TestVideoCfg.o Ver fichero


+ 5
- 2
XNetSDKTest.cpp Ver fichero

@@ -6,9 +6,9 @@ SXMediaRecordByFileReq info = {0};
bool bFindFile = false;
#define TEST_DAS_SERVER 1
int dPos = 0 ;
int CALLBACK Main_MessageCallBack(XSDK_HANDLE hDevice, int nMsgId, int nParam1, int nParam2, int nParam3, const char *szString, void *pObject, int nSeq, void *pUserData)
{
int dPos = 0 ;
switch(nMsgId)
{
case ESXSDK_DEV_FIND_FILE:
@@ -70,7 +70,10 @@ int CALLBACK Main_MessageCallBack(XSDK_HANDLE hDevice, int nMsgId, int nParam1,
g_hDevice = hDevice;
#endif
OnDASDeviceReg(hDevice, (SXSDKDASDeviceInfo *)pObject,dPos);
{
OnDASDeviceReg(hDevice, (SXSDKDASDeviceInfo *)pObject,dPos);
dPos++;
}
}
break;
case ESXSDK_DEV_SNAP:


BIN
XNetSDKTest.o Ver fichero


BIN
test Ver fichero


Cargando…
Cancelar
Guardar