From c6a302283cee53d113d88db89c0a242576dbc8c4 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期六, 13 六月 2020 10:15:50 +0800
Subject: [PATCH] 修改包路径

---
 device/hcnetdisk.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/device/hcnetdisk.c b/device/hcnetdisk.c
index b62aecc..4c5353b 100644
--- a/device/hcnetdisk.c
+++ b/device/hcnetdisk.c
@@ -1,5 +1,4 @@
 #include "netdisk.h"
-#include "hcnetdisk.h"
  
 bool HCNetdisk::envInited = false;
 
@@ -72,8 +71,8 @@
   port = loginInfo.port;
 
 
-  startChannel = struDeviceInfo.struDeviceV30.byStartDChan;
-  maxChannels = struDeviceInfo.struDeviceV30.byIPChanNum + struDeviceInfo.struDeviceV30.byHighDChanNum * 256;
+  deviceInfo.startChannel = struDeviceInfo.struDeviceV30.byStartDChan;
+  deviceInfo.maxChannels = struDeviceInfo.struDeviceV30.byIPChanNum + struDeviceInfo.struDeviceV30.byHighDChanNum * 256;
 
   return 0;
 }
@@ -119,11 +118,13 @@
 		 	request.channel, 
 		 	mktime(&start), 
 		 	i);
-		// printf("%s\n", destfile);
-		// downloadByTime_wrapper(userid, request.channel, &start, &end, destfile);
-		if(files != NULL) {
-			files->push_back(destfile);
-		}
+    
+		if(downloadByTime_wrapper(userid, request.channel, &start, &end, destfile) != -1) {
+      if(files != NULL) {
+        files->push_back(destfile);
+      }
+    }
+		
 		start = end;
 		i++;
 	}

--
Gitblit v1.8.0