From 04ca103d9c561e62bbb557c5db30771c17a7bdbf Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期二, 30 六月 2020 17:03:47 +0800 Subject: [PATCH] update --- device/hcnetdisk.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/device/hcnetdisk.c b/device/hcnetdisk.c index a99f339..dfc0e4c 100644 --- a/device/hcnetdisk.c +++ b/device/hcnetdisk.c @@ -118,12 +118,15 @@ request.channel, mktime(&start), i); - - if(downloadByTime_wrapper(userid, request.channel, &start, &end, destfile) != -1) { + std::cout << "destfile:" << destfile << std::endl; + char *destfiledup = strdup(destfile); + if(downloadByTime_wrapper(userid, request.channel, &start, &end, destfiledup) != -1) { if(files != NULL) { + // std::cout << "push destfile:" << destfile << std::endl; files->push_back(destfile); } } + free(destfiledup); start = end; i++; @@ -137,7 +140,7 @@ /** * @return success: 0, failture : -1 */ -int HCNetdisk::downloadByTime_wrapper(long userid, int channel, struct tm *start, struct tm *end, char *destfile) { +int HCNetdisk::downloadByTime_wrapper(const long userid, const int channel, const struct tm *start, const struct tm *end, const char *destfile) { NET_DVR_FILECOND_V40 struFileCond = {0}; struFileCond.dwFileType = 0xFF; @@ -219,9 +222,8 @@ -int HCNetdisk::saveRecordFile(int userId, char * srcfile, char * destfile) +int HCNetdisk::saveRecordFile( int userId, char * srcfile, char * destfile) { - printf("destfile=%s\n", destfile); int bRes = 1; int hPlayback = 0; //鎸夋枃浠跺悕涓嬭浇褰曞儚 @@ -239,12 +241,11 @@ return bRes; } int nPos = 0; + //涓嬭浇杩涘害 for (nPos = 0; nPos < 100 && nPos >= 0; nPos = NET_DVR_GetDownloadPos(hPlayback)) { printf("Be downloading...%d %%\n", nPos); sleep(1); -//涓嬭浇杩涘害 -//millisecond } printf("have got %d\n", nPos); //鍋滄涓嬭浇 -- Gitblit v1.8.0