From 591aacee97f4a6486631c38a6b418e20b2c4109c Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 10 九月 2020 14:56:47 +0800
Subject: [PATCH] update

---
 device/include/netdisk.h |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/device/include/netdisk.h b/device/include/netdisk.h
index 1964cc7..b2b3fb6 100644
--- a/device/include/netdisk.h
+++ b/device/include/netdisk.h
@@ -10,6 +10,8 @@
 
 typedef struct Netdisk_LoginInfo {
     std::string loginUUID;
+    std::string deviceType;
+    std::string userid;
     std::string username;
     std::string password;
     std::string host;
@@ -26,35 +28,37 @@
 
 } Netdisk_DownloadRequest;
 
- 
+typedef struct DeviceInfo
+{
+    int startChannel;       //璧峰閫氶亾鍙�
+    int maxChannels;        //鏈�澶ч�氶亾鏁� 
+    
+} DeviceInfo;
 
 // 缃戠粶纭洏 鎶借薄绫�
 class Netdisk {
 private:
     std::string loginDataFile;
+   
 
 protected:
-    std::string devicename; //璁惧鍚嶇О
-    int startChannel;       //璧峰閫氶亾鍙�
-    int maxChannels;        //鏈�澶ч�氶亾鏁�
-
-    long userid;            //鐢ㄦ埛id
+    DeviceInfo deviceInfo;
+    std::string deviceType; //璁惧绫诲瀷
+    std::string loginUUID;
     std::string username;   //鐢ㄦ埛鍚�
     std::string password;   //瀵嗙爜
     std::string host;       //ip
     int port;               //绔彛
 
+    long userid;            //鐢ㄦ埛id
 
-    //Json::FastWriter jsonwriter;
-    
-    Json::Value loginData;
 
-    Netdisk_LoginInfo  getLoginInfo(std::string uuid);
+    // Netdisk_LoginInfo  getLoginInfo(std::string uuid);
 
-    int addLoginInfo(Netdisk_LoginInfo &loginInfo);
+    // int addLoginInfo(Netdisk_LoginInfo &loginInfo);
 
 public:
-    Netdisk(const std::string &_devicename="");
+    Netdisk(){};
 
     virtual ~Netdisk() {}
     
@@ -65,13 +69,10 @@
 
     virtual int downloadByTime(Netdisk_DownloadRequest &request, std::vector<std::string> *files) = 0;
 
-    void saveLoginInfo();
 
-    int getStartChannel() {return startChannel;}
-
-    int getMaxChannels() {return maxChannels;}
+    DeviceInfo getDeviceInfo() {return deviceInfo;}
 
 };
 
-
+#include "hcnetdisk.h"
 #endif
\ No newline at end of file

--
Gitblit v1.8.0