From 114c53f58d535d9fab158ed669646a0aae5f078a Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 12 六月 2020 14:56:34 +0800
Subject: [PATCH] commit
---
/dev/null | 0
.gitignore | 1
消息体定义.md | 78 ++++++++-----------
service/netdisk_service | 0
device/hcnetdisk.c | 2
service/request_handler.c | 4
service/netdisk_service.c | 26 ++++-
README.md | 96 ------------------------
8 files changed, 57 insertions(+), 150 deletions(-)
diff --git a/.gitignore b/.gitignore
index d37cf8e..86b69a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
*.tar
*.tar.gz
.vscode/
+build/
diff --git a/README.md b/README.md
index 53f9376..e69de29 100644
--- a/README.md
+++ b/README.md
@@ -1,96 +0,0 @@
-## 閫嗚绠楁硶璋冪敤璇存槑
-
-
-### 1. 浠ｇ爜璋冪敤
-```
- /**
- * 绗竴涓弬鏁癅points 缁勬垚瑙傛祴鍖哄煙鐨勫郊姝ょ浉閭荤殑鐐�
- * 绗簩涓弬鏁癅_keepTime 淇濇寔鏃堕棿
- * 绗笁涓弬鏁癅_direction 姝ｇ‘琛岃繘鐨勬柟鍚戞柟鍚�
- */
-IndirectAlg indirectAlg((std::initializer_list<Point>){{0.0, 0.0}, {1000.0, 0.0}, {1000.0, 1000.0}, {0.0, 1000.0} }, 5, {1, 1});
-
-//鍥犱负鏁版嵁鏃舵祦鏁版嵁锛屼笅闈㈢殑璋冪敤搴旇鏃跺湪涓�涓惊鐜噷闈紝澶勭悊瀹屼竴鏉℃帴鐫�澶勭悊涓嬩竴鏉�
-//鏋勫缓浼犲叆鐨勬暟鎹�
-Record record;
-record.id = 1; //鐩爣ID
-record.timestamp = time(0); //鏃堕棿鎴�
-record.coordinate = {2.0, 3.0}; // 鍧愭爣
-//鍒ゆ柇鏄惁閫嗚
-indirectAlg.isRetrograde(record)
-
-```
-
-### 2 娴嬭瘯鐢ㄤ緥
-test_right_walk2.c
-
-```test_right_walk2.c
-#include <usg_common.h> /* cos */
-#include <graph.h>
-#include <IndirectAlg.h>
-using namespace std;
-
-int test2() {
- // IndirectAlg indirectAlg({ {{0.0, 0.0}, {1000.0, 0.0}}, {{1000.0, 0.0}, {1000.0, 1000.0}}, {{1000.0, 1000.0}, {0.0, 1000.0}}, {{0.0, 1000.0}, {0.0, 0.0}} }, 5, {1, 1});
- /**
- * 绗竴涓弬鏁癅points 缁勬垚瑙傛祴鍖哄煙鐨勫郊姝ょ浉閭荤殑鐐�
- * 绗簩涓弬鏁癅_keepTime 淇濇寔鏃堕棿
- * 绗笁涓弬鏁癅_direction 姝ｇ‘琛岃繘鐨勬柟鍚戞柟鍚�
- */
- IndirectAlg indirectAlg((std::initializer_list<Point>){{0.0, 0.0}, {1000.0, 0.0}, {1000.0, 1000.0}, {0.0, 1000.0} }, 5, {1, 1});
-
- int i = 0;
- // time_t start_time;
- srand((unsigned) time(0));
-
- double rx, ry;
- bool isRetrograde;
- //璧风偣
- Point start = {0, 0};
- //浼犲叆鐨勬祦鏁版嵁璁板綍淇℃伅Record
- Record record;
- record.id = 1; //鐩爣ID
- record.timestamp = time(0); //鏃堕棿鎴�
- record.coordinate = start; // 鍧愭爣
- // time(&start_time);
- //鍒ゆ柇鏄惁閫嗚
- while(!(isRetrograde = indirectAlg.isRetrograde(record)) ) {
- rx = ((double)(rand()%10))/100000;
- ry = ((double)(rand()%10))/100000;
-
- //std::cout << timestamp << ":" << << "isRetrograde" << isRetrograde;
- // err_msg(0, "%ld : {%f, %f} %d\n", record.timestamp, record.coordinate.x, record.coordinate.y, isRetrograde);
- record.timestamp = time(0);
-
- //if (difftime(time(0), start_time) > 1)
- if (i > 10)
- {
- record.coordinate = {record.coordinate.x - rx , record.coordinate.y - ry};
- } else {
- record.coordinate = {record.coordinate.x + rx , record.coordinate.y + ry};
- }
-
- if (i > 100)
- break;
-
- sleep(1);
- i++;
- }
- printf("return %ld : {%f, %f} %d\n", record.timestamp, record.coordinate.x, record.coordinate.y, isRetrograde);
- return 0;
-}
-
-
-int main() {
- test2();
-
-}
-```
-
-### 3 缂栬瘧
-
-瀹夎濂絪o鍖呭悗锛岀敤濡備笅鐨勬柟寮忕紪璇戯紝alg鏄�嗚绠楁硶鍖咃紝usgcommon鏄畻娉曠敤鐨勭殑鍏叡鍖咃紝pthread鏄郴缁熺殑绾跨▼鍖�
-```
-g++ -std=c++11 test_right_walk2.c -o test_right_walk2 -lalg -lusgcommon -lpthread
-```
-
diff --git a/README.mk b/README.mk
deleted file mode 100644
index e69de29..0000000
--- a/README.mk
+++ /dev/null
diff --git a/device/hcnetdisk.c b/device/hcnetdisk.c
index 16e3747..4c5353b 100644
--- a/device/hcnetdisk.c
+++ b/device/hcnetdisk.c
@@ -118,7 +118,7 @@
request.channel,
mktime(&start),
i);
- // printf("%s\n", destfile);
+
if(downloadByTime_wrapper(userid, request.channel, &start, &end, destfile) != -1) {
if(files != NULL) {
files->push_back(destfile);
diff --git a/service/client b/service/client
deleted file mode 100755
index a792d7f..0000000
--- a/service/client
+++ /dev/null
Binary files differ
diff --git a/service/netdisk_service b/service/netdisk_service
index ccc9cc3..c3024eb 100755
--- a/service/netdisk_service
+++ b/service/netdisk_service
Binary files differ
diff --git a/service/netdisk_service.c b/service/netdisk_service.c
index 4c1eec2..7ed52da 100644
--- a/service/netdisk_service.c
+++ b/service/netdisk_service.c
@@ -96,18 +96,30 @@
}
- Json::Value response;
- Json::Value payload;
- response["code"] = rv;
- response["msg"] = rmsg;
+ // Json::Value response;
+ // Json::Value payload;
+ // response["code"] = rv;
+ // response["msg"] = rmsg;
+ // Json::Value filelist;
+ // for(std::string f : files) {
+ // filelist.append(f);
+ // }
+ // payload["filelist"] = filelist;
+ // response["payload"] = payload;
+
+ Json::Value request;
+ request["method"] = "downloadByTimeCallBack";
+ Json::Value arguments;
Json::Value filelist;
for(std::string f : files) {
filelist.append(f);
}
- payload["filelist"] = filelist;
- response["payload"] = payload;
- std::string str = response.toStyledString();
+ arguments["fileList"] = filelist;
+ arguments["loginUUID"] = drequest.loginUUID;
+
+ request["arguments"] = arguments;
+ std::string str = request.toStyledString();
std::cout << "download finished, call back" << std::endl;
std::cout << str << std::endl;
diff --git a/service/request_handler.c b/service/request_handler.c
index 8bbd910..2428a39 100644
--- a/service/request_handler.c
+++ b/service/request_handler.c
@@ -179,10 +179,10 @@
int handleDownloadByTimeAsync(nng_socket sock, Json::Value request) {
-std::cout << "accepted handleDownloadByTime request" << std::endl;
+std::cout << "received downloadByTime request" << std::endl;
int rv;
char rmsg[MAXLINE];
- strcpy(rmsg, "received");
+ strcpy(rmsg, "received downloadByTime request");
// char *buf;
Json::Value arguments = request["arguments"];
diff --git a/message_define.md "b/\346\266\210\346\201\257\344\275\223\345\256\232\344\271\211.md"
similarity index 68%
rename from message_define.md
rename to "\346\266\210\346\201\257\344\275\223\345\256\232\344\271\211.md"
index 00b26af..8281a03 100644
--- a/message_define.md
+++ "b/\346\266\210\346\201\257\344\275\223\345\256\232\344\271\211.md"
@@ -30,6 +30,7 @@
```
{
code: 0, // 0琛ㄧず鎴愬姛锛屽叾浠栧�间唬琛ㄧ浉搴旂殑閿欒鐮�
+ msg: "success", //鎴愬姛鎴栧叾浠栭敊璇俊鎭�
payload: {
loginUUID: "11111"
}
@@ -40,6 +41,7 @@
## 2銆佷笅杞�
+
璇锋眰浣�
```
{
@@ -72,49 +74,56 @@
}
```
+涓嬭浇閲囩敤寮傛鐨勬柟寮忋�傝棰戞湇鍔℃敹鍒拌姹傚悗绔嬪嵆杩斿洖涓�涓搷搴旇〃绀烘敹鍒颁簡璇锋眰锛屼絾骞朵笉琛ㄧず涓嬭浇瀹屾垚銆�
鍝嶅簲浣�
```
{
code: 0, // 0琛ㄧず鎴愬姛锛屽叾浠栧�间唬琛ㄧ浉搴旂殑閿欒鐮�
- payload: {
+ msg: "success", //鎴愬姛鎴栧叾浠栭敊璇俊鎭�
+ payload: {
+ }
+
+}
+```
+
+瑙嗛鏈嶅姟瀹屾垚涓嬭浇鍚庡洖璋冨鏂圭殑鏈嶅姟锛屽憡璇夊鏂逛笅杞藉畬鎴愶紝骞舵妸涓嬭浇瀹屾垚鐨勬枃浠跺垪琛ㄥ彂閫佺粰瀵规柟銆� 杩欐椂瑙嗛鏈嶅姟鏄綔涓鸿姹傛柟銆�
+
+璇锋眰浣�
+```
+{
+ method: "downloadByTimeCallBack",
+ arguments: {
//瀹屾垚涓嬭浇鐨勬枃浠剁殑鍒楄〃
- filelist: [
+ fileList: [
"/Downloads/1.mp3",
"/Downloads/2.mp3",
"/Downloads/3.mp3"
]
}
-
-}
-
-```
-
-## 3. 鐧诲嚭
-璇锋眰浣�
-```
-{
- method: "logout",
- arguments: {
- loginUUID: "1"
- }
-
+
}
```
+瀵规柟瑕佽繑鍥炰竴涓搷搴旓紝琛ㄧず鎺ュ彈鍒颁簡銆�
鍝嶅簲浣�
-
```
{
- code: 0 // 0琛ㄧず鎴愬姛锛屽叾浠栧�间唬琛ㄧ浉搴旂殑閿欒鐮�
+ code: 0, // 0琛ㄧず鎴愬姛锛屽叾浠栧�间唬琛ㄧ浉搴旂殑閿欒鐮�
+ msg: "success", //鎴愬姛鎴栧叾浠栭敊璇俊鎭�
+ payload: {
+
+ }
}
+
+
```
-## 4. 鑾峰彇璧峰閫氶亾鍙�
+## 3. 鑾峰彇璁惧淇℃伅
璇锋眰浣�
```
{
- method: "getStartChannel",
+ method: "getDeviceInfo",
arguments: {
loginUUID: "1"
}
@@ -127,33 +136,14 @@
```
{
code: 0, // 0琛ㄧず鎴愬姛锛屽叾浠栧�间唬琛ㄧ浉搴旂殑閿欒鐮�
+ msg: "success", //鎴愬姛鎴栧叾浠栭敊璇俊鎭�
payload: {
- startChanel: 1
+ deviceInfo: {
+ startChannel: 1, //璧峰閫氶亾鍙�
+ maxChannels: 64 //鏈�澶ч�氶亾鏁�
+ }
}
}
```
-## 5. 鑾峰彇鏈�澶ч�氶亾鍙�
-璇锋眰浣�
-```
-{
- method: "getMaxChannels",
- arguments: {
- loginUUID: "1"
- }
-}
-
-```
-
-鍝嶅簲浣�
-
-```
-{
- code: 0, // 0琛ㄧず鎴愬姛锛屽叾浠栧�间唬琛ㄧ浉搴旂殑閿欒鐮�
- payload: {
- maxChanel: 64
- }
-
-}
-```
\ No newline at end of file
--
Gitblit v1.8.0