From 0436e5443295395025f89f0d091aab1e9551d1a4 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:26:31 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of ssh://192.168.1.226:29418/development/c++ into ywv1.2
---
QiaoJiaSystem/DataManagerServer/http_configserver.h | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index 69ee27b..a8b8aa6 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.h
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.h
@@ -117,6 +117,12 @@
std::string editDevId(std::string ip, unsigned int port, std::string content, PResponse &response);
+ std::string findSdkRule(std::string ip, unsigned int port, std::string content, PResponse &response);
+
+ std::string editSdkRule(std::string ip, unsigned int port, std::string content, PResponse &response);
+
+ std::string getSnapshot(std::string ip, unsigned int port, std::string content, PResponse &response);
+
private:
void init(void);
@@ -168,13 +174,14 @@
bool getHKDevSerialNumber(const char *ip, const int port, const char *username, const char *passwd,
unsigned char *serialNumber = NULL) const;
- bool createDevId(const int& dev_batch, const int& dev_sequence) ;
- std::string getVideoPathByTime(const std::string& time,const std::string& camId,qint64& sub);
+ bool createDevId(const int &dev_batch, const int &dev_sequence);
+
+ std::string getVideoPathByTime(const std::string &time, const std::string &camId, qint64 &sub);
std::vector<std::string> forEachFile(const std::string &dir_name);
- qint64 getVideoTime(const std::string& videoPath);
+ qint64 getVideoTime(/*const std::string& videoPath*/std::string &str_tmpTime);
};
#endif
--
Gitblit v1.8.0