From 70063414dbf2dfb64a2c7ed0d75ad65b1fb213d1 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 09 六月 2020 14:43:08 +0800
Subject: [PATCH] udpate

---
 netdisk/include/netdisk.h |   53 ++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/netdisk/include/netdisk.h b/netdisk/include/netdisk.h
index 248a445..1964cc7 100644
--- a/netdisk/include/netdisk.h
+++ b/netdisk/include/netdisk.h
@@ -1,13 +1,15 @@
 #ifndef __NETDISK_H__
 #define __NETDISK_H__
 #include "usg_common.h"
+#include "usg_typedef.h"
+#include <jsoncpp/json/json.h>
 
 typedef struct Netdisk_EnvConfig {
     std::string libpath;
 } Netdisk_EnvConfig;
 
 typedef struct Netdisk_LoginInfo {
-
+    std::string loginUUID;
     std::string username;
     std::string password;
     std::string host;
@@ -16,6 +18,7 @@
 } Netdisk_LoginInfo;
 
 typedef struct Netdisk_DownloadRequest {
+    std::string loginUUID;
     int channel;     		//閫氶亾鍙�
     struct tm start; 		//寮�濮嬫椂闂�
     struct tm end;   		//缁撴潫鏃堕棿
@@ -25,30 +28,50 @@
 
  
 
-
+// 缃戠粶纭洏 鎶借薄绫�
 class Netdisk {
+private:
+    std::string loginDataFile;
+
 protected:
-    std::string devicename;
+    std::string devicename; //璁惧鍚嶇О
+    int startChannel;       //璧峰閫氶亾鍙�
+    int maxChannels;        //鏈�澶ч�氶亾鏁�
 
-    long userid;
-    std::string username;
-    std::string password;
-    std::string host;
-    int port;
+    long userid;            //鐢ㄦ埛id
+    std::string username;   //鐢ㄦ埛鍚�
+    std::string password;   //瀵嗙爜
+    std::string host;       //ip
+    int port;               //绔彛
 
-   
+
+    //Json::FastWriter jsonwriter;
+    
+    Json::Value loginData;
+
+    Netdisk_LoginInfo  getLoginInfo(std::string uuid);
+
+    int addLoginInfo(Netdisk_LoginInfo &loginInfo);
+
 public:
-    HCNetdisk(const std::string &_devicename): devicename(_devicename) {}
+    Netdisk(const std::string &_devicename="");
 
-    ~HCNetdisk() {}
+    virtual ~Netdisk() {}
+    
 
-    static void netdisk_init(HCNetdisk_EnvConfig &config);
+    virtual int login(Netdisk_LoginInfo &loginInfo) = 0;
 
-    int login(Netdisk_LoginInfo &loginInfo);
+    virtual int logout() = 0;
 
-    int logout();
+    virtual int downloadByTime(Netdisk_DownloadRequest &request, std::vector<std::string> *files) = 0;
 
-    int downloadByTime(Netdisk_DownloadRequest &request);
+    void saveLoginInfo();
+
+    int getStartChannel() {return startChannel;}
+
+    int getMaxChannels() {return maxChannels;}
+
 };
 
+
 #endif
\ No newline at end of file

--
Gitblit v1.8.0