From 0280dd324b7ef53da107b85ea7eddf7915b9b252 Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Mon, 23 May 2022 18:29:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4ve?= =?UTF-8?q?r=5F1=E5=92=8Cver=5F2=E6=9D=A5=E5=8C=BA=E5=88=861.0=E5=92=8C2.0?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../windows/HGWebService/HGWebService.vcxproj | 4 + doc/webservice/新版websdk接口说明.doc | Bin 238597 -> 238609 bytes sdk/webservice/HttpHead.cpp | 707 +++--- sdk/webservice/HttpHead.h | 67 +- sdk/webservice/HttpServer.cpp | 11 +- sdk/webservice/HttpServer.h | 8 +- sdk/webservice/HttpUser.cpp | 13 +- sdk/webservice/HttpUser.h | 7 +- sdk/webservice/Manager.cpp | 2087 +---------------- sdk/webservice/Manager.h | 193 +- sdk/webservice/ManagerV1.cpp | 2082 ++++++++++++++++ sdk/webservice/ManagerV1.h | 194 ++ sdk/webservice/ManagerV2.cpp | 306 +++ sdk/webservice/ManagerV2.h | 72 + sdk/webservice/Msg.h | 93 +- sdk/webservice/MsgPumpCallback.cpp | 86 +- sdk/webservice/MsgPumpCallback.h | 7 +- sdk/webservice/SockIoServer.cpp | 11 +- sdk/webservice/SockIoServer.h | 8 +- sdk/webservice/SockIoUser.cpp | 15 +- sdk/webservice/SockIoUser.h | 7 +- sdk/webservice/WSServer.cpp | 54 + sdk/webservice/WSServer.h | 22 + sdk/webservice/WSUser.cpp | 549 +++++ sdk/webservice/WSUser.h | 32 + sdk/webservice/WebServer.cpp | 365 ++- sdk/webservice/WebServer.h | 52 +- sdk/webservice/WebUser.cpp | 136 +- sdk/webservice/WebUser.h | 54 +- sdk/webservice/main.cpp | 12 +- utility/HGString.cpp | 12 +- utility/HGString.h | 4 +- 32 files changed, 4212 insertions(+), 3058 deletions(-) create mode 100644 sdk/webservice/ManagerV1.cpp create mode 100644 sdk/webservice/ManagerV1.h create mode 100644 sdk/webservice/ManagerV2.cpp create mode 100644 sdk/webservice/ManagerV2.h diff --git a/build/windows/HGWebService/HGWebService.vcxproj b/build/windows/HGWebService/HGWebService.vcxproj index 98b00a9d..05ea1961 100644 --- a/build/windows/HGWebService/HGWebService.vcxproj +++ b/build/windows/HGWebService/HGWebService.vcxproj @@ -24,6 +24,8 @@ + + @@ -41,6 +43,8 @@ + + diff --git a/doc/webservice/新版websdk接口说明.doc b/doc/webservice/新版websdk接口说明.doc index d27aa1f58c36a8c6ecca4ed8b7226e9a8c325384..421ebc4d993f75d3c91cdfa0bf20632cf45ecdba 100644 GIT binary patch delta 26546 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 delta 26259 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 queryList; + return type; +} - char* p = new char[query.size() + 1]; - strcpy(p, query.c_str()); - char* pStr = strtok(p, "&"); +std::string HttpHead::GetValue(const HttpPairs& infos, const std::string& key) +{ + std::string value; + for (int i = 0; i < (int)infos.size(); ++i) + { + if (key == infos[i].first) + { + value = infos[i].second; + break; + } + } + + return value; +} + +void HttpHead::AnalysisURIQuery(const std::string& query, HttpPairs& queryInfos) +{ + std::vector queryList; + + char* p = new char[query.size() + 1]; + strcpy(p, query.c_str()); + char* pStr = strtok(p, "&"); + if (NULL != pStr) + queryList.push_back(pStr); + while (1) + { + pStr = strtok(NULL, "&"); + if (NULL == pStr) + break; + queryList.push_back(pStr); + } + delete[] p; + + queryInfos.clear(); + for (int i = 0; i < (int)queryList.size(); ++i) + { + p = new char[queryList[i].size() + 1]; + strcpy(p, queryList[i].c_str()); + + std::pair pr; + pStr = strtok(p, "="); if (NULL != pStr) - queryList.push_back(pStr); - while (1) - { - pStr = strtok(NULL, "&"); - if (NULL == pStr) - break; - queryList.push_back(pStr); - } + pr.first = AnalyURIString(pStr); + pStr = strtok(NULL, "="); + if (NULL != pStr) + pr.second = AnalyURIString(pStr); + + queryInfos.push_back(pr); delete[] p; + } +} - queryInfos.clear(); - for (int i = 0; i < (int)queryList.size(); ++i) +void HttpHead::AnalysisURI(const std::string& uri, std::string& path, HttpPairs& queryInfos, std::string& fragment) +{ + size_t pathPos = uri.find('/'); + size_t queryPos = uri.find('?'); + size_t fragmentPos = uri.find('#'); + + path.clear(); + if (std::string::npos != pathPos) + { + size_t count = std::string::npos; + if (queryPos != std::string::npos) { - p = new char[queryList[i].size() + 1]; - strcpy(p, queryList[i].c_str()); - - std::pair pr; - pStr = strtok(p, "="); - if (NULL != pStr) - pr.first = AnalyURIString(pStr); - pStr = strtok(NULL, "="); - if (NULL != pStr) - pr.second = AnalyURIString(pStr); - - queryInfos.push_back(pr); - delete[] p; + assert(queryPos > pathPos); + count = queryPos - pathPos; } + else if (fragmentPos != std::string::npos) + { + assert(fragmentPos > pathPos); + count = fragmentPos - pathPos; + } + + path = AnalyURIString(uri.substr(pathPos, count)); } - void HttpHead::AnalysisURI(const std::string& uri, std::string& path, HttpPairs& queryInfos, std::string& fragment) + queryInfos.clear(); + if (std::string::npos != queryPos) { - size_t pathPos = uri.find('/'); - size_t queryPos = uri.find('?'); - size_t fragmentPos = uri.find('#'); - - path.clear(); - if (std::string::npos != pathPos) + size_t count = std::string::npos; + if (fragmentPos != std::string::npos) { - size_t count = std::string::npos; - if (queryPos != std::string::npos) - { - assert(queryPos > pathPos); - count = queryPos - pathPos; - } - else if (fragmentPos != std::string::npos) - { - assert(fragmentPos > pathPos); - count = fragmentPos - pathPos; - } - - path = AnalyURIString(uri.substr(pathPos, count)); + assert(fragmentPos > queryPos); + count = fragmentPos - queryPos; } - queryInfos.clear(); - if (std::string::npos != queryPos) - { - size_t count = std::string::npos; - if (fragmentPos != std::string::npos) - { - assert(fragmentPos > queryPos); - count = fragmentPos - queryPos; - } - - std::string query = uri.substr(queryPos + 1, count - 1); - AnalysisURIQuery(query, queryInfos); - } - - fragment.clear(); - if (std::string::npos != fragmentPos) - { - fragment = AnalyURIString(uri.substr(fragmentPos + 1)); - } + std::string query = uri.substr(queryPos + 1, count - 1); + AnalysisURIQuery(query, queryInfos); } - void HttpHead::AnalysisHead(const std::string& head, std::string& requestMethod, std::string& requestURIPath, - HttpPairs& requestURIQueryInfos, std::string& requestURIFragment, std::string& httpVersion, HttpPairs& headInfos) + fragment.clear(); + if (std::string::npos != fragmentPos) { - requestMethod.clear(); - requestURIPath.clear(); - requestURIQueryInfos.clear(); - requestURIFragment.clear(); - httpVersion.clear(); - headInfos.clear(); + fragment = AnalyURIString(uri.substr(fragmentPos + 1)); + } +} - std::vector headList; +void HttpHead::AnalysisHead(const std::string& head, std::string& requestMethod, std::string& requestURIPath, + HttpPairs& requestURIQueryInfos, std::string& requestURIFragment, std::string& httpVersion, HttpPairs& headInfos) +{ + requestMethod.clear(); + requestURIPath.clear(); + requestURIQueryInfos.clear(); + requestURIFragment.clear(); + httpVersion.clear(); + headInfos.clear(); - char* p = new char[head.size() + 1]; - strcpy(p, head.c_str()); - char* pStr = strtok(p, "\r\n"); + std::vector headList; + + char* p = new char[head.size() + 1]; + strcpy(p, head.c_str()); + char* pStr = strtok(p, "\r\n"); + if (NULL != pStr) + headList.push_back(pStr); + while (1) + { + pStr = strtok(NULL, "\r\n"); + if (NULL == pStr) + break; + headList.push_back(pStr); + } + delete[] p; + + if (headList.size() < 1) + { + return; + } + + std::string requestURI; + + // 解析请求行 + p = new char[headList[0].size() + 1]; + strcpy(p, headList[0].c_str()); + pStr = strtok(p, " "); + if (NULL != pStr) + requestMethod = pStr; + pStr = strtok(NULL, " "); + if (NULL != pStr) + requestURI = pStr; + pStr = strtok(NULL, " "); + if (NULL != pStr) + httpVersion = pStr; + delete[] p; + + // 解析URI + AnalysisURI(requestURI, requestURIPath, requestURIQueryInfos, requestURIFragment); + + // 解析请求头 + for (int i = 1; i < (int)headList.size(); ++i) + { + p = new char[headList[i].size() + 1]; + strcpy(p, headList[i].c_str()); + + std::pair pr; + pStr = strtok(p, ":"); if (NULL != pStr) - headList.push_back(pStr); - while (1) - { - pStr = strtok(NULL, "\r\n"); - if (NULL == pStr) - break; - headList.push_back(pStr); - } + pr.first = pStr; + pStr = strtok(NULL, ":"); + if (NULL != pStr) + pr.second = pStr; + + TrimString(pr.first); + TrimString(pr.second); + headInfos.push_back(pr); + delete[] p; - - if (headList.size() < 1) - { - return; - } - - std::string requestURI; - - // 解析请求行 - p = new char[headList[0].size() + 1]; - strcpy(p, headList[0].c_str()); - pStr = strtok(p, " "); - if (NULL != pStr) - requestMethod = pStr; - pStr = strtok(NULL, " "); - if (NULL != pStr) - requestURI = pStr; - pStr = strtok(NULL, " "); - if (NULL != pStr) - httpVersion = pStr; - delete[] p; - - // 解析URI - AnalysisURI(requestURI, requestURIPath, requestURIQueryInfos, requestURIFragment); - - // 解析请求头 - for (int i = 1; i < (int)headList.size(); ++i) - { - p = new char[headList[i].size() + 1]; - strcpy(p, headList[i].c_str()); - - std::pair pr; - pStr = strtok(p, ":"); - if (NULL != pStr) - pr.first = pStr; - pStr = strtok(NULL, ":"); - if (NULL != pStr) - pr.second = pStr; - - TrimString(pr.first); - TrimString(pr.second); - headInfos.push_back(pr); - - delete[] p; - } } +} - /*判断ascii码是否是数字0-9*/ - static bool asciiIsDigit(char c) - { - /*字符的ascii码&8 结果为0-127，则是数字*/ - return asciiTableData[(unsigned char)c & (1 << 3)]; - } +/*判断ascii码是否是数字0-9*/ +static bool asciiIsDigit(char c) +{ + /*字符的ascii码&8 结果为0-127，则是数字*/ + return asciiTableData[(unsigned char)c & (1 << 3)]; +} - static int asciiDigitValue(char c) - { - if (asciiIsDigit(c)) - return c - '0'; +static int asciiDigitValue(char c) +{ + if (asciiIsDigit(c)) + return c - '0'; + return -1; +} + +static int asciiXdigitValue(char c) +{ + //printf("-->%c\n",c); + if (c >= 'A' && c <= 'F') + return c - 'A' + 10;//(A B C D E F)->(10 11 12 13 14 15) + if (c >= 'a' && c <= 'f') + return c - 'a' + 10; + + return asciiDigitValue(c);//('0'...'9')->(0...9) +} + +static int unescapeCharacter(const char* scanner) +{ + int first = asciiXdigitValue(scanner[0]); + if (first < 0) return -1; - } - static int asciiXdigitValue(char c) + int second = asciiXdigitValue(scanner[1]); + if (second < 0) + return -1; + + return (first << 4) | second; //== (first*16 | second) == (first*16 + second) +} + +static char* unescapeUriString(const char* uriString, bool asciiEscape) +{ + if (NULL == uriString) + return NULL; + + int strLen = (int)strlen(uriString); + char* result = (char*)malloc(strLen + 1);//可推测解码后的长度<=原长度 + char* out = result; + + const char* in, * end; + for (in = uriString, end = in + strLen; in < end; ++in) { - //printf("-->%c\n",c); - if (c >= 'A' && c <= 'F') - return c - 'A' + 10;//(A B C D E F)->(10 11 12 13 14 15) - if (c >= 'a' && c <= 'f') - return c - 'a' + 10; + int c = *in; - return asciiDigitValue(c);//('0'...'9')->(0...9) - } - - static int unescapeCharacter(const char* scanner) - { - int first = asciiXdigitValue(scanner[0]); - if (first < 0) - return -1; - - int second = asciiXdigitValue(scanner[1]); - if (second < 0) - return -1; - - return (first << 4) | second; //== (first*16 | second) == (first*16 + second) - } - - static char* unescapeUriString(const char* uriString, bool asciiEscape) - { - if (NULL == uriString) - return NULL; - - int strLen = (int)strlen(uriString); - char* result = (char*)malloc(strLen + 1);//可推测解码后的长度<=原长度 - char* out = result; - - const char* in, * end; - for (in = uriString, end = in + strLen; in < end; ++in) + //遇到了'%'才去解析 + if ('%' == c) { - int c = *in; + if (in + 3 > end) + break; + //获取%后2个字符的解码值 + c = unescapeCharacter(in + 1); + if (c <= 0) + break; - //遇到了'%'才去解析 - if ('%' == c) - { - if (in + 3 > end) - break; - //获取%后2个字符的解码值 - c = unescapeCharacter(in + 1); - if (c <= 0) - break; + if (asciiEscape && c <= 0x7F) + break; - if (asciiEscape && c <= 0x7F) - break; - - in += 2;//一般的格式为%后加两个ascii码字符 - } - - *out++ = c;//存储转义结果 + in += 2;//一般的格式为%后加两个ascii码字符 } - *out = '\0'; - - if (in != end) - { - free(result); - return NULL; - } - - return result; + *out++ = c;//存储转义结果 } - std::string HttpHead::AnalyURIString(const std::string& str) + *out = '\0'; + + if (in != end) { - std::string ret; - char* decodeStr = unescapeUriString(str.c_str(), false); - if (NULL != decodeStr) - { - ret = decodeStr; - free(decodeStr); - } - - return ret; + free(result); + return NULL; } + + return result; +} + +std::string HttpHead::AnalyURIString(const std::string& str) +{ + std::string ret; + char* decodeStr = unescapeUriString(str.c_str(), false); + if (NULL != decodeStr) + { + ret = decodeStr; + free(decodeStr); + } + + return ret; } \ No newline at end of file diff --git a/sdk/webservice/HttpHead.h b/sdk/webservice/HttpHead.h index a756a10b..4f6d4062 100644 --- a/sdk/webservice/HttpHead.h +++ b/sdk/webservice/HttpHead.h @@ -5,44 +5,41 @@ #include #include -namespace ver_1 +typedef std::pair HttpPair; +typedef std::vector HttpPairs; + +class HttpHead { - typedef std::pair HttpPair; - typedef std::vector HttpPairs; +public: + HttpHead(); + ~HttpHead(); - class HttpHead - { - public: - HttpHead(); - ~HttpHead(); + bool Parse(const std::string& head); + void Clear(); - bool Parse(const std::string& head); - void Clear(); + std::string GetRequestMethod() const; + std::string GetRequestURIPath() const; + HttpPairs GetRequestURIQueryInfos() const; + std::string GetRequestURIFragment() const; + std::string GetRequestHttpVersion() const; + HttpPairs GetHeadInfos() const; + int GetContentLength() const; + std::string GetContentType() const; - std::string GetRequestMethod() const; - std::string GetRequestURIPath() const; - HttpPairs GetRequestURIQueryInfos() const; - std::string GetRequestURIFragment() const; - std::string GetRequestHttpVersion() const; - HttpPairs GetHeadInfos() const; - int GetContentLength() const; - std::string GetContentType() const; + static std::string GetValue(const HttpPairs& infos, const std::string& key); + static void AnalysisURIQuery(const std::string& query, HttpPairs& queryInfos); + static void AnalysisURI(const std::string& uri, std::string& path, HttpPairs& queryInfos, std::string& fragment); + static void AnalysisHead(const std::string& head, std::string& requestMethod, std::string& requestURIPath, + HttpPairs& requestURIQueryInfos, std::string& requestURIFragment, std::string& httpVersion, HttpPairs& headInfos); - static std::string GetValue(const HttpPairs& infos, const std::string& key); - static void AnalysisURIQuery(const std::string& query, HttpPairs& queryInfos); - static void AnalysisURI(const std::string& uri, std::string& path, HttpPairs& queryInfos, std::string& fragment); - static void AnalysisHead(const std::string& head, std::string& requestMethod, std::string& requestURIPath, - HttpPairs& requestURIQueryInfos, std::string& requestURIFragment, std::string& httpVersion, HttpPairs& headInfos); +private: + static std::string AnalyURIString(const std::string& str); - private: - static std::string AnalyURIString(const std::string& str); - - private: - std::string m_requestMethod; - std::string m_requestURIPath; - HttpPairs m_requestURIQueryInfos; - std::string m_requestURIFragment; - std::string m_requestHttpVersion; - HttpPairs m_headInfos; - }; -} \ No newline at end of file +private: + std::string m_requestMethod; + std::string m_requestURIPath; + HttpPairs m_requestURIQueryInfos; + std::string m_requestURIFragment; + std::string m_requestHttpVersion; + HttpPairs m_headInfos; +}; \ No newline at end of file diff --git a/sdk/webservice/HttpServer.cpp b/sdk/webservice/HttpServer.cpp index 3856fd55..7ae0b806 100644 --- a/sdk/webservice/HttpServer.cpp +++ b/sdk/webservice/HttpServer.cpp @@ -4,10 +4,10 @@ namespace ver_1 { - HttpServer::HttpServer(HGMsgPump msgPump, Manager* manager) - : WebServer(msgPump, manager) + HttpServer::HttpServer(HGMsgPump msgPump, ManagerV1* manager) + : WebServer(msgPump) { - + m_manager = manager; } HttpServer::~HttpServer() @@ -15,6 +15,11 @@ namespace ver_1 } + ManagerV1* HttpServer::GetManger() + { + return m_manager; + } + void HttpServer::Connect(const ConnectParam* param) { assert(NULL != param && this == param->svr); diff --git a/sdk/webservice/HttpServer.h b/sdk/webservice/HttpServer.h index aede1bf1..8bce3a6c 100644 --- a/sdk/webservice/HttpServer.h +++ b/sdk/webservice/HttpServer.h @@ -5,15 +5,17 @@ namespace ver_1 { - class Manager; - class HttpServer : public WebServer { public: - HttpServer(HGMsgPump msgPump, Manager* manager); + HttpServer(HGMsgPump msgPump, ManagerV1* manager); virtual ~HttpServer(); + ManagerV1* GetManger(); void Connect(const ConnectParam* param); void Command(const HttpCmdParam* param); + + private: + ManagerV1* m_manager; }; } \ No newline at end of file diff --git a/sdk/webservice/HttpUser.cpp b/sdk/webservice/HttpUser.cpp index 67a27abe..9561b224 100644 --- a/sdk/webservice/HttpUser.cpp +++ b/sdk/webservice/HttpUser.cpp @@ -1,6 +1,6 @@ #include "HttpUser.h" -#include "WebServer.h" -#include "Manager.h" +#include "HttpServer.h" +#include "ManagerV1.h" #include "base/HGInfo.h" #include "cJSON.h" @@ -103,9 +103,9 @@ namespace ver_1 } #if defined(HG_CMP_MSC) - HttpUser::HttpUser(WebServer* server, HGUInt id, const char* ip, uint16_t port, SOCKET sockConn) + HttpUser::HttpUser(WebServer* server, HGUInt id, const std::string& ip, uint16_t port, SOCKET sockConn) #else - HttpUser::HttpUser(WebServer* server, HGUInt id, const char* ip, uint16_t port, int sockConn) + HttpUser::HttpUser(WebServer* server, HGUInt id, const std::string& ip, uint16_t port, int sockConn) #endif : WebUser(server, id, ip, port, sockConn) { @@ -117,6 +117,11 @@ namespace ver_1 } + ManagerV1* HttpUser::GetManager() + { + return ((HttpServer*)m_server)->GetManger(); + } + void HttpUser::HandleCmd(const HttpCmdParam* param) { assert(NULL != param && m_id == param->usrId); diff --git a/sdk/webservice/HttpUser.h b/sdk/webservice/HttpUser.h index 87527ac8..5a559bb7 100644 --- a/sdk/webservice/HttpUser.h +++ b/sdk/webservice/HttpUser.h @@ -5,18 +5,17 @@ namespace ver_1 { - class WebServer; - class HttpUser : public WebUser { public: #if defined(HG_CMP_MSC) - HttpUser(WebServer* server, HGUInt id, const char* ip, uint16_t port, SOCKET sockConn); + HttpUser(WebServer* server, HGUInt id, const std::string& ip, uint16_t port, SOCKET sockConn); #else - HttpUser(WebServer* server, HGUInt id, const char* ip, uint16_t port, int sockConn); + HttpUser(WebServer* server, HGUInt id, const std::string& ip, uint16_t port, int sockConn); #endif virtual ~HttpUser(); + ManagerV1* GetManager(); void HandleCmd(const HttpCmdParam* param); protected: diff --git a/sdk/webservice/Manager.cpp b/sdk/webservice/Manager.cpp index d547ec43..25b40b36 100644 --- a/sdk/webservice/Manager.cpp +++ b/sdk/webservice/Manager.cpp @@ -1,2082 +1,11 @@ #include "Manager.h" -#include "base/HGBuffer.h" -#include "base/HGBase64.h" -#include "base/HGUtility.h" -#include "base/HGInfo.h" -#include "imgfmt/HGJpeg.h" -#include "imgfmt/HGOfd.h" -#include "imgfmt/HGPdf.h" -#include "imgfmt/HGTiff.h" -#include "imgfmt/HGImgFmt.h" -#include "HGString.h" -extern "C" + +Manager::Manager(HGMsgPump msgPump) { -#include "zip.h" -}; -#include -#include -#include - -namespace ver_1 -{ - DevParam::DevParam() - { - Reset(); - } - - DevParam::~DevParam() - { - - } - - void DevParam::Reset() - { - autofeeder = true; - pixel = 1; - white = false; - discardBlankThre = 5; - single = false; - format = "jpg"; - resolution = 200; - orentation = 0; - paperType = "Auto"; - splitImage = 0; - noiseDetachEnable = true; - noiseDetach = 15; - - uploadMode = 2; - ftpPath = "/images"; - ftpPort = 21; - ftpMode = 2; - } - - void DevParam::Load(const std::string& cfgPath) - { - HGInt intValue; - HGChar strValue[256]; - - HGBase_GetProfileString(cfgPath.c_str(), "devParam", "device", "", strValue, 256); - device = strValue; - HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "autofeeder", 1, &intValue); - autofeeder = (bool)intValue; - HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "pixel", 1, &intValue); - pixel = intValue; - HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "white", 0, &intValue); - white = (bool)intValue; - HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "discardBlankThre", 5, &intValue); - discardBlankThre = intValue; - HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "single", 0, &intValue); - single = (bool)intValue; - HGBase_GetProfileString(cfgPath.c_str(), "devParam", "format", "jpg", strValue, 256); - format = strValue; - HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "resolution", 200, &intValue); - resolution = intValue; - HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "orentation", 0, &intValue); - orentation = intValue; - HGBase_GetProfileString(cfgPath.c_str(), "devParam", "paperType", "Auto", strValue, 256); - paperType = strValue; - HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "splitImage", 0, &intValue); - splitImage = intValue; - HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "noiseDetachEnable”", 1, &intValue); - noiseDetachEnable = (bool)intValue; - HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "noiseDetach", 15, &intValue); - noiseDetach = intValue; - - HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "uploadMode", 2, &intValue); - uploadMode = intValue; - HGBase_GetProfileString(cfgPath.c_str(), "devParam", "httpUrl", "", strValue, 256); - httpUrl = strValue; - HGBase_GetProfileString(cfgPath.c_str(), "devParam", "fileName", "", strValue, 256); - fileName = strValue; - HGBase_GetProfileString(cfgPath.c_str(), "devParam", "httpMethod", "", strValue, 256); - httpMethod = strValue; - HGBase_GetProfileString(cfgPath.c_str(), "devParam", "header", "", strValue, 256); - header = strValue; - HGBase_GetProfileString(cfgPath.c_str(), "devParam", "param", "", strValue, 256); - param = strValue; - HGBase_GetProfileString(cfgPath.c_str(), "devParam", "ftpUrl", "", strValue, 256); - ftpUrl = strValue; - HGBase_GetProfileString(cfgPath.c_str(), "devParam", "ftpPath", "", strValue, 256); - ftpPath = strValue; - HGBase_GetProfileString(cfgPath.c_str(), "devParam", "ftpUser", "", strValue, 256); - ftpUser = strValue; - HGBase_GetProfileString(cfgPath.c_str(), "devParam", "ftpPassword", "", strValue, 256); - ftpPassword = strValue; - HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "ftpPort", 21, &intValue); - ftpPort = intValue; - HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "ftpMode", 2, &intValue); - ftpMode = intValue; - } - - void DevParam::Save(const std::string& cfgPath) - { - HGBase_SetProfileString(cfgPath.c_str(), "devParam", "device", device.c_str()); - HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "autofeeder", autofeeder); - HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "pixel", pixel); - HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "white", white); - HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "discardBlankThre", discardBlankThre); - HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "single", single); - HGBase_SetProfileString(cfgPath.c_str(), "devParam", "format", format.c_str()); - HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "resolution", resolution); - HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "orentation", orentation); - HGBase_SetProfileString(cfgPath.c_str(), "devParam", "paperType", paperType.c_str()); - HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "splitImage", splitImage); - HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "noiseDetachEnable", noiseDetachEnable); - HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "noiseDetach", noiseDetach); - - HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "uploadMode", uploadMode); - HGBase_SetProfileString(cfgPath.c_str(), "devParam", "httpUrl", httpUrl.c_str()); - HGBase_SetProfileString(cfgPath.c_str(), "devParam", "fileName", fileName.c_str()); - HGBase_SetProfileString(cfgPath.c_str(), "devParam", "httpMethod", httpMethod.c_str()); - HGBase_SetProfileString(cfgPath.c_str(), "devParam", "header", header.c_str()); - HGBase_SetProfileString(cfgPath.c_str(), "devParam", "param", param.c_str()); - HGBase_SetProfileString(cfgPath.c_str(), "devParam", "ftpUrl", ftpUrl.c_str()); - HGBase_SetProfileString(cfgPath.c_str(), "devParam", "ftpPath", ftpPath.c_str()); - HGBase_SetProfileString(cfgPath.c_str(), "devParam", "ftpUser", ftpUser.c_str()); - HGBase_SetProfileString(cfgPath.c_str(), "devParam", "ftpPassword", ftpPassword.c_str()); - HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "ftpPort", ftpPort); - HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "ftpMode", ftpMode); - } - - Manager::Manager(HGMsgPump msgPump) - { - m_msgPump = msgPump; - HGBase_CreateLock(&m_lock); - m_devName.clear(); - m_devHandle = NULL; - m_scanEvent = NULL; - m_scanParam = NULL; - - m_scanInsertImgName.clear(); - m_scanIsInsert = false; - m_scanning = false; - - SANE_Int version_code = 0; - SANE_Status status = sane_init_ex(&version_code, sane_ex_callback, this); - assert(SANE_STATUS_GOOD == status); - } - - Manager::~Manager() - { - if (NULL != m_devHandle) - { - StopScan(); - - m_devParam.Reset(); - sane_close(m_devHandle); - m_devHandle = NULL; - m_devName.clear(); - } - - sane_exit(); - - HGBase_DestroyLock(m_lock); - m_lock = NULL; - } - - void Manager::OpenDev(const OpenDevParam* param) - { - assert(NULL != param && this == param->mgr); - - if (!m_devName.empty() || NULL != m_devHandle) - { - return; - } - - SANE_Handle devHandle = NULL; - SANE_Status status = sane_open(param->devName.c_str(), &devHandle); - if (SANE_STATUS_GOOD == status) - { - assert(NULL != devHandle); - - m_devName = param->devName; - m_devHandle = devHandle; - - std::string filePath = GetFilePath(m_devName); - std::string cfgPath = filePath + "config.ini"; - m_devParam.Load(cfgPath); - SetDevParam(m_devName, m_devParam); - } - } - - void Manager::CloseDev(const CloseDevParam* param) - { - assert(NULL != param && this == param->mgr); - - if (m_devName.empty() || NULL == m_devHandle || m_devName != param->devName) - { - return; - } - - assert(NULL != m_devHandle); - - StopScan(); - - m_devParam.Reset(); - sane_close(m_devHandle); - m_devHandle = NULL; - m_devName.clear(); - } - - void Manager::ScanFinish(const ScanFinishParam* param) - { - assert(NULL != param && this == param->mgr); - - m_scanInsertImgName.clear(); - m_scanIsInsert = false; - m_scanning = false; - } - - void Manager::SetScanEvent(ScanEvent event, void* param) - { - assert(NULL != event && NULL != param); - - HGBase_EnterLock(m_lock); - m_scanEvent = event; - m_scanParam = param; - HGBase_LeaveLock(m_lock); - } - - void Manager::ResetScanEvent() - { - HGBase_EnterLock(m_lock); - m_scanEvent = NULL; - m_scanParam = NULL; - HGBase_LeaveLock(m_lock); - } - - bool Manager::Scan(const std::string& insertImgName, bool isInsert) - { - if (m_scanning) - { - return false; - } - - bool ret = false; - if (NULL != m_devHandle) - { - m_scanInsertImgName = insertImgName; - m_scanIsInsert = isInsert; - if (SANE_STATUS_GOOD == sane_start(m_devHandle)) - { - m_scanning = true; - ret = true; - } - else - { - m_scanInsertImgName.clear(); - m_scanIsInsert = false; - } - } - - return ret; - } - - bool Manager::StopScan() - { - if (m_scanning) - { - assert(NULL != m_devHandle); - sane_cancel(m_devHandle); - } - - return true; - } - - bool Manager::GetCurDevId(std::string& devId) - { - devId.clear(); - if (m_scanning) - { - return false; - } - - devId = m_devName; - return true; - } - - bool Manager::GetDevNames(std::vector& devNameList) - { - devNameList.clear(); - if (m_scanning) - { - return false; - } - - const SANE_Device** device_list; - if (SANE_STATUS_GOOD == sane_get_devices(&device_list, SANE_TRUE)) - { - const SANE_Device** p; - for (p = device_list; *p != NULL; ++p) - { - devNameList.push_back((*p)->name); - } - } - - return true; - } - - bool Manager::GetImageByDevId(const std::string& devId, std::vector& imgNameList, - std::vector& imgBase64List) - { - imgNameList.clear(); - imgBase64List.clear(); - if (m_scanning) - { - return false; - } - - std::string filePath = GetFilePath(devId); - std::vector fileNameList = GetFileNameList(devId); - HGBase_WriteInfo(HGBASE_INFOTYPE_DEBUG, "filePath=%s", filePath.c_str()); - - for (int i = 0; i < (int)fileNameList.size(); ++i) - { - std::string fileName = filePath + fileNameList[i]; - - HGImage img = NULL; - HGImgFmt_LoadImage(fileName.c_str(), 0, NULL, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); - if (NULL != img) - { - std::string imgBase64 = "data:image/jpeg;base64,"; - imgBase64 += GetBase64(img); - - imgNameList.push_back(fileNameList[i]); - imgBase64List.push_back(imgBase64); - HGBase_DestroyImage(img); - } - } - - SaveFileNameList(devId, imgNameList); - return true; - } - - bool Manager::GetDevParam(const std::string& devId, DevParam& devParam) - { - devParam.Reset(); - if (m_scanning) - { - return false; - } - - bool ret = false; - if (NULL != m_devHandle) - { - m_devParam.device = m_devName; - - // 从设备获取到m_devParam - - SANE_Int num_dev_options = 0; - sane_control_option(m_devHandle, 0, SANE_ACTION_GET_VALUE, &num_dev_options, NULL); - for (int i = 1; i < num_dev_options; ++i) - { - const SANE_Option_Descriptor* desp = sane_get_option_descriptor(m_devHandle, i); - if (NULL == desp) - continue; - - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "title=%s", Utf8ToStdString(desp->title).c_str()); - - if (SANE_TYPE_BOOL == desp->type) - { - SANE_Bool value = 0; - sane_control_option(m_devHandle, i, SANE_ACTION_GET_VALUE, &value, NULL); - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, " valueType=BOOL, value=%s", value ? "TRUE" : "FALSE"); - - if (0 == strcmp(desp->title, OPTION_TITLE_TXCF)) - m_devParam.splitImage = value ? 1 : 0; - else if (0 == strcmp(desp->title, OPTION_TITLE_HBTXZDYH)) - m_devParam.noiseDetachEnable = (bool)value; - } - else if (SANE_TYPE_INT == desp->type) - { - SANE_Int value = 0; - sane_control_option(m_devHandle, i, SANE_ACTION_GET_VALUE, &value, NULL); - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, " valueType=INT, value=%d", value); - - if (0 == strcmp(desp->title, OPTION_TITLE_TGKBYLMD)) - m_devParam.discardBlankThre = value; - else if (0 == strcmp(desp->title, OPTION_TITLE_FBL)) - m_devParam.resolution = value; - } - else if (SANE_TYPE_FIXED == desp->type) - { - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, " valueType=FIXED"); - } - else if (SANE_TYPE_STRING == desp->type) - { - char value[256] = {0}; - sane_control_option(m_devHandle, i, SANE_ACTION_GET_VALUE, value, NULL); - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, " valueType=STRING, value=%s", Utf8ToStdString(value).c_str()); - - if (0 == strcmp(OPTION_TITLE_SMZS, desp->title) && 0 == strcmp(OPTION_VALUE_SMZS_LXSM, value)) - m_devParam.autofeeder = true; - else if (0 == strcmp(OPTION_TITLE_SMZS, desp->title) && 0 == strcmp(OPTION_VALUE_SMZS_SMZDZS, value)) - m_devParam.autofeeder = false; - else if (0 == strcmp(OPTION_TITLE_YSMS, desp->title) && (0 == strcmp(OPTION_VALUE_YSMS_24WCS, value) - || 0 == strcmp(OPTION_VALUE_YSMS_YSZDSB, value))) - m_devParam.pixel = 2; - else if (0 == strcmp(OPTION_TITLE_YSMS, desp->title) && 0 == strcmp(OPTION_VALUE_YSMS_256JHD, value)) - m_devParam.pixel = 1; - else if (0 == strcmp(OPTION_TITLE_YSMS, desp->title) && 0 == strcmp(OPTION_VALUE_YSMS_HB, value)) - m_devParam.pixel = 0; - else if (0 == strcmp(OPTION_TITLE_SMYM, desp->title) && 0 == strcmp(OPTION_VALUE_SMYM_SM, value)) - { - m_devParam.white = false; - m_devParam.single = false; - } - else if (0 == strcmp(OPTION_TITLE_SMYM, desp->title) && 0 == strcmp(OPTION_VALUE_SMYM_DM, value)) - { - m_devParam.white = false; - m_devParam.single = true; - } - else if (0 == strcmp(OPTION_TITLE_SMYM, desp->title) && (0 == strcmp(OPTION_VALUE_SMYM_TGKBYTY, value) - || 0 == strcmp(OPTION_VALUE_SMYM_TGKBYFPZ, value))) - { - m_devParam.white = true; - m_devParam.single = false; - } - else if (0 == strcmp(OPTION_TITLE_WGFX, desp->title) && 0 == strcmp(OPTION_VALUE_WGFX_0, value)) - m_devParam.orentation = 0; - else if (0 == strcmp(OPTION_TITLE_WGFX, desp->title) && 0 == strcmp(OPTION_VALUE_WGFX_90, value)) - m_devParam.orentation = 90; - else if (0 == strcmp(OPTION_TITLE_WGFX, desp->title) && 0 == strcmp(OPTION_VALUE_WGFX_180, value)) - m_devParam.orentation = 180; - else if (0 == strcmp(OPTION_TITLE_WGFX, desp->title) && 0 == strcmp(OPTION_VALUE_WGFX__90, value)) - m_devParam.orentation = 270; - else if (0 == strcmp(OPTION_TITLE_ZZCC, desp->title) && 0 == strcmp(OPTION_VALUE_ZZCC_PPYSCC, value)) - m_devParam.paperType = "Auto"; - else if (0 == strcmp(OPTION_TITLE_ZZCC, desp->title) && 0 == strcmp(OPTION_VALUE_ZZCC_A3, value)) - m_devParam.paperType = "A3"; - else if (0 == strcmp(OPTION_TITLE_ZZCC, desp->title) && 0 == strcmp(OPTION_VALUE_ZZCC_A4, value)) - m_devParam.paperType = "A4"; - } - else if (SANE_TYPE_BUTTON == desp->type) - { - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, " valueType=BUTTON"); - } - else if (SANE_TYPE_GROUP == desp->type) - { - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, " valueType=GROUP"); - } - } - - std::string filePath = GetFilePath(m_devName); - std::string cfgPath = filePath + "config.ini"; - m_devParam.Save(cfgPath); - ret = true; - } - - devParam = m_devParam; - return ret; - } - - bool Manager::SetDevParam(const std::string& devId, const DevParam& devParam) - { - if (m_scanning) - { - return false; - } - - m_devParam = devParam; - - std::string filePath = GetFilePath(m_devName); - std::string cfgPath = filePath + "config.ini"; - m_devParam.Save(cfgPath); - - bool ret = false; - if (NULL != m_devHandle) - { - // 设置m_devParam到设备 - - SANE_Int num_dev_options = 0; - sane_control_option(m_devHandle, 0, SANE_ACTION_GET_VALUE, &num_dev_options, NULL); - for (int i = 1; i < num_dev_options; ++i) - { - const SANE_Option_Descriptor* desp = sane_get_option_descriptor(m_devHandle, i); - if (NULL == desp) - continue; - - if (SANE_TYPE_BOOL == desp->type) - { - if (0 == strcmp(desp->title, OPTION_TITLE_TXCF)) - { - SANE_Bool value = SANE_FALSE; - if (0 != m_devParam.splitImage) - value = SANE_TRUE; - sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, &value, NULL); - } - else if (0 == strcmp(desp->title, OPTION_TITLE_HBTXZDYH)) - { - SANE_Bool value = SANE_FALSE; - if (m_devParam.noiseDetachEnable) - value = SANE_TRUE; - sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, &value, NULL); - } - } - else if (SANE_TYPE_INT == desp->type) - { - if (0 == strcmp(desp->title, OPTION_TITLE_TGKBYLMD)) - { - SANE_Int value = m_devParam.discardBlankThre; - sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, &value, NULL); - } - else if (0 == strcmp(desp->title, OPTION_TITLE_FBL)) - { - SANE_Int value = m_devParam.resolution; - sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, &value, NULL); - } - else if (0 == strcmp(desp->title, OPTION_TITLE_SMSL)) - { - SANE_Int value = 1; - sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, &value, NULL); - } - } - else if (SANE_TYPE_FIXED == desp->type) - { - - } - else if (SANE_TYPE_STRING == desp->type) - { - if (0 == strcmp(OPTION_TITLE_SMZS, desp->title)) - { - char value[256] = { 0 }; - strcpy(value, OPTION_VALUE_SMZS_LXSM); - if (!m_devParam.autofeeder) - strcpy(value, OPTION_VALUE_SMZS_SMZDZS); - sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, (void*)value, NULL); - } - else if (0 == strcmp(OPTION_TITLE_YSMS, desp->title)) - { - char value[256] = { 0 }; - strcpy(value, OPTION_VALUE_YSMS_24WCS); - if (1 == m_devParam.pixel) - strcpy(value, OPTION_VALUE_YSMS_256JHD); - else if (0 == m_devParam.pixel) - strcpy(value, OPTION_VALUE_YSMS_HB); - sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, (void *)value, NULL); - } - else if (0 == strcmp(OPTION_TITLE_SMYM, desp->title)) - { - char value[256] = { 0 }; - strcpy(value, OPTION_VALUE_SMYM_SM); - if (m_devParam.single) - strcpy(value, OPTION_VALUE_SMYM_DM); - else if (m_devParam.white) - strcpy(value, OPTION_VALUE_SMYM_TGKBYTY); - sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, (void*)value, NULL); - } - else if (0 == strcmp(OPTION_TITLE_WGFX, desp->title)) - { - char value[256] = { 0 }; - strcpy(value, OPTION_VALUE_WGFX_0); - if (90 == m_devParam.orentation) - strcpy(value, OPTION_VALUE_WGFX_90); - else if (180 == m_devParam.orentation) - strcpy(value, OPTION_VALUE_WGFX_180); - else if (270 == m_devParam.orentation) - strcpy(value, OPTION_VALUE_WGFX__90); - sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, (void*)value, NULL); - } - else if (0 == strcmp(OPTION_TITLE_ZZCC, desp->title)) - { - char value[256] = { 0 }; - strcpy(value, OPTION_VALUE_ZZCC_PPYSCC); - if ("A3" == m_devParam.paperType) - strcpy(value, OPTION_VALUE_ZZCC_A3); - else if ("A4" == m_devParam.paperType) - strcpy(value, OPTION_VALUE_ZZCC_A4); - sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, (void*)value, NULL); - } - } - else if (SANE_TYPE_BUTTON == desp->type) - { - - } - else if (SANE_TYPE_GROUP == desp->type) - { - - } - } - - ret = true; - } - - return ret; - } - - bool Manager::ExportOfd(const std::string& devId, bool isAuto, std::string& imgBase64) - { - imgBase64.clear(); - if (m_scanning) - { - return false; - } - - HGByte* data = NULL; - HGUInt size = 0; - ExportOfdFile(devId, isAuto, &data, &size); - if (NULL != data) - { - imgBase64 = GetBase64(data, size); - delete[] data; - } - - return !imgBase64.empty(); - } - - bool Manager::ExportOfdFile(const std::string& devId, bool isAuto, const std::string& fileName) - { - std::string filePath = GetFilePath(devId); - std::vector fileNameList = GetFileNameList(devId); - if (fileNameList.empty()) - { - return false; - } - - HGOfdImageWriter writer = NULL; - HGImgFmt_OpenOfdImageWriter(fileName.c_str(), &writer); - if (NULL == writer) - { - return false; - } - - bool ret = false; - for (int i = 0; i < (int)fileNameList.size(); ++i) - { - HGImage img = NULL; - std::string fileName = filePath + fileNameList[i]; - HGImgFmt_LoadImage(fileName.c_str(), 0, NULL, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); - if (NULL != img) - { - if (HGBASE_ERR_OK == HGImgFmt_SaveJpegImageToOfdImageWriter(writer, img, NULL)) - ret = true; - HGBase_DestroyImage(img); - } - } - - HGImgFmt_CloseOfdImageWriter(writer); - - if (!ret) - { - HGBase_DeleteFile(fileName.c_str()); - return false; - } - - return true; - } - - bool Manager::ExportOfdFile(const std::string& devId, bool isAuto, HGByte** data, HGUInt* size) - { - *data = NULL; - *size = 0; - if (m_scanning) - { - return false; - } - - HGChar tmpFileName[512]; - HGBase_GetTmpFileName(tmpFileName, 512); - ExportOfdFile(devId, isAuto, tmpFileName); - - *data = GetBuffer(tmpFileName, size); - HGBase_DeleteFile(tmpFileName); - return (NULL != *data); - } - - bool Manager::ExportPdf(const std::string& devId, std::string& imgBase64) - { - imgBase64.clear(); - if (m_scanning) - { - return false; - } - - HGByte* data = NULL; - HGUInt size = 0; - ExportPdfFile(devId, &data, &size); - if (NULL != data) - { - imgBase64 = GetBase64(data, size); - delete[] data; - } - - return !imgBase64.empty(); - } - - bool Manager::ExportPdfFile(const std::string& devId, const std::string& fileName) - { - std::string filePath = GetFilePath(devId); - std::vector fileNameList = GetFileNameList(devId); - if (fileNameList.empty()) - { - return false; - } - - HGPdfImageWriter writer = NULL; - HGImgFmt_OpenPdfImageWriter(fileName.c_str(), &writer); - if (NULL == writer) - { - return false; - } - - bool ret = false; - for (int i = 0; i < (int)fileNameList.size(); ++i) - { - HGImage img = NULL; - std::string fileName = filePath + fileNameList[i]; - HGImgFmt_LoadImage(fileName.c_str(), 0, NULL, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); - if (NULL != img) - { - if (HGBASE_ERR_OK == HGImgFmt_SaveJpegImageToPdfImageWriter(writer, img, NULL)) - ret = true; - HGBase_DestroyImage(img); - } - } - - HGImgFmt_ClosePdfImageWriter(writer); - - if (!ret) - { - HGBase_DeleteFile(fileName.c_str()); - return false; - } - - return true; - } - - bool Manager::ExportPdfFile(const std::string& devId, HGByte** data, HGUInt* size) - { - *data = NULL; - *size = 0; - if (m_scanning) - { - return false; - } - - HGChar tmpFileName[512]; - HGBase_GetTmpFileName(tmpFileName, 512); - ExportPdfFile(devId, tmpFileName); - - *data = GetBuffer(tmpFileName, size); - HGBase_DeleteFile(tmpFileName); - return (NULL != *data); - } - - bool Manager::ExportTiff(const std::string& devId, std::string& imgBase64) - { - imgBase64.clear(); - if (m_scanning) - { - return false; - } - - HGByte* data = NULL; - HGUInt size = 0; - ExportTiffFile(devId, &data, &size); - if (NULL != data) - { - imgBase64 = GetBase64(data, size); - delete[] data; - } - - return !imgBase64.empty(); - } - - bool Manager::ExportTiff(const std::string& devId, const std::string& fileName) - { - std::string filePath = GetFilePath(devId); - std::vector fileNameList = GetFileNameList(devId); - if (fileNameList.empty()) - { - return false; - } - - HGTiffWriter writer = NULL; - HGImgFmt_OpenTiffWriter(fileName.c_str(), &writer); - if (NULL == writer) - { - return false; - } - - bool ret = false; - for (int i = 0; i < (int)fileNameList.size(); ++i) - { - HGImage img = NULL; - std::string fileName = filePath + fileNameList[i]; - HGImgFmt_LoadImage(fileName.c_str(), 0, NULL, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); - if (NULL != img) - { - if (HGBASE_ERR_OK == HGImgFmt_SaveImageToTiffWriter(writer, img, NULL)) - ret = true; - HGBase_DestroyImage(img); - } - } - - HGImgFmt_CloseTiffWriter(writer); - - if (!ret) - { - HGBase_DeleteFile(fileName.c_str()); - return false; - } - - return true; - } - - bool Manager::ExportTiffFile(const std::string& devId, HGByte** data, HGUInt* size) - { - *data = NULL; - *size = 0; - if (m_scanning) - { - return false; - } - - HGChar tmpFileName[512]; - HGBase_GetTmpFileName(tmpFileName, 512); - ExportTiff(devId, tmpFileName); - - *data = GetBuffer(tmpFileName, size); - HGBase_DeleteFile(tmpFileName); - return (NULL != *data); - } - - bool Manager::ExportZip(const std::string& devId, std::string& imgBase64) - { - imgBase64.clear(); - if (m_scanning) - { - return false; - } - - HGByte* data = NULL; - HGUInt size = 0; - ExportZipFile(devId, &data, &size); - if (NULL != data) - { - imgBase64 = GetBase64(data, size); - delete[] data; - } - - return !imgBase64.empty(); - } - - bool Manager::ExportZipFile(const std::string& devId, const std::string& fileName) - { - std::string filePath = GetFilePath(devId); - std::vector fileNameList = GetFileNameList(devId); - if (fileNameList.empty()) - { - return false; - } - - int error = 0; - zip* z = zip_open(StdStringToUtf8(fileName.c_str()).c_str(), ZIP_CREATE | ZIP_TRUNCATE, &error); - if (NULL == z) - { - return false; - } - - bool ret = false; - for (int i = 0; i < (int)fileNameList.size(); ++i) - { - std::string fileName = filePath + fileNameList[i]; - zip_source_t* s = zip_source_file(z, StdStringToUtf8(fileName.c_str()).c_str(), 0, 0); - if (NULL != s) - { - if (zip_file_add(z, StdStringToUtf8(fileNameList[i].c_str()).c_str(), s, ZIP_FL_OVERWRITE) >= 0) - { - ret = true; - } - else - { - zip_source_free(s); - } - } - } - - zip_close(z); - z = NULL; - - if (!ret) - { - HGBase_DeleteFile(fileName.c_str()); - return false; - } - - return true; - } - - bool Manager::ExportZipFile(const std::string& devId, HGByte** data, HGUInt* size) - { - *data = NULL; - *size = 0; - if (m_scanning) - { - return false; - } - - HGChar tmpFileName[512]; - HGBase_GetTmpFileName(tmpFileName, 512); - ExportZipFile(devId, tmpFileName); - - *data = GetBuffer(tmpFileName, size); - HGBase_DeleteFile(tmpFileName); - return (NULL != *data); - } - - bool Manager::UploadImage(const UploadParam& uploadParam) - { - if (m_scanning) - { - return false; - } - - std::string devId; - GetCurDevId(devId); - - HGChar tmpFileName[512]; - HGBase_GetTmpFileName(tmpFileName, 512); - if (0 == uploadParam.format) - { - strcat(tmpFileName, ".ofd"); - ExportOfdFile(devId, true, tmpFileName); - } - else if (1 == uploadParam.format) - { - strcat(tmpFileName, ".pdf"); - ExportPdfFile(devId, tmpFileName); - } - else - { - strcat(tmpFileName, ".zip"); - ExportZipFile(devId, tmpFileName); - } - - bool ret = false; - if (0 == uploadParam.uploadMode) // HTTP - { - ret = HTTPUpload(tmpFileName, uploadParam.httpUrl, uploadParam.fileName, uploadParam.httpMethod, - uploadParam.header, uploadParam.param); - } - else if (1 == uploadParam.uploadMode) // FTP - { - ret = FTPUpload(tmpFileName, uploadParam.ftpUrl, uploadParam.ftpPort, uploadParam.ftpPath, - uploadParam.ftpUser, uploadParam.ftpPassword, uploadParam.ftpMode); - } - - HGBase_DeleteFile(tmpFileName); - return ret; - } - - bool Manager::SaveImage(const std::string& devId, const std::string& imgName, const std::string& imgBase64) - { - if (m_scanning) - { - return false; - } - - std::string filePath = GetFilePath(devId); - std::string fileName = filePath + imgName; - - size_t pos = imgBase64.find(","); - if (std::string::npos != pos) - return SaveBase64(fileName, imgBase64.c_str() + pos + 1); - else - return SaveBase64(fileName, imgBase64.c_str()); - } - - bool Manager::DeleteImage(const std::string& devId, const std::string& imgName) - { - if (m_scanning) - { - return false; - } - - std::string filePath = GetFilePath(devId); - std::string fileName = filePath + imgName; - - bool ret = false; - if (HGBASE_ERR_OK == HGBase_DeleteFile(fileName.c_str())) - { - std::vector fileNameList = GetFileNameList(devId); - for (int i = 0; i < (int)fileNameList.size(); ++i) - { - if (imgName == fileNameList[i]) - { - fileNameList.erase(fileNameList.begin() + i); - break; - } - } - - SaveFileNameList(devId, fileNameList); - ret = true; - } - - return ret; - } - - bool Manager::DeleteAllImage(const std::string& devId) - { - if (m_scanning) - { - return false; - } - - std::string filePath = GetFilePath(devId); - std::vector fileNameList = GetFileNameList(devId); - - for (int i = 0; i < (int)fileNameList.size(); ++i) - { - std::string fileName = filePath + fileNameList[i]; - HGBase_DeleteFile(fileName.c_str()); - } - fileNameList.clear(); - - SaveFileNameList(devId, fileNameList); - return true; - } - - bool Manager::MergeImage(const std::string& devId, bool isHorizontal, const std::vector& imgIndexList, - std::string& imgName, std::string& imgBase64) - { - imgName.clear(); - imgBase64.clear(); - if (m_scanning) - { - return false; - } - - std::string filePath = GetFilePath(devId); - std::vector fileNameList = GetFileNameList(devId); - - std::vector imgList; - for (int i = 0; i < (int)imgIndexList.size(); ++i) - { - int index = imgIndexList[i]; - if (index >= 0 && index < (int)fileNameList.size()) - { - std::string fileName = filePath + fileNameList[index]; - HGImage img = NULL; - HGImgFmt_LoadImage(fileName.c_str(), 0, NULL, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); - if (NULL != img) - imgList.push_back(img); - } - } - - HGUInt width = 0, height = 0; - for (int i = 0; i < (int)imgList.size(); ++i) - { - HGImageInfo imgInfo; - HGBase_GetImageInfo(imgList[i], &imgInfo); - if (isHorizontal) - { - width += imgInfo.width; - if (imgInfo.height > height) - height = imgInfo.height; - } - else - { - height += imgInfo.height; - if (imgInfo.width > width) - width = imgInfo.width; - } - } - - if (width > 0 && height > 0) - { - HGImage img = NULL; - HGBase_CreateImage(width, height, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); - if (NULL != img) - { - HGUInt x = 0, y = 0; - for (int i = 0; i < (int)imgList.size(); ++i) - { - HGImageInfo imgInfo; - HGBase_GetImageInfo(imgList[i], &imgInfo); - - HGImageRoi roi = {x, y, x + imgInfo.width, y + imgInfo.height}; - HGBase_SetImageROI(img, &roi); - HGBase_CopyImage(imgList[i], img); - HGBase_ResetImageROI(img); - - if (isHorizontal) - x += imgInfo.width; - else - y += imgInfo.height; - } - - int maxIndex = 0; - for (int i = 0; i < (int)fileNameList.size(); ++i) - { - int index = atoi(fileNameList[i].c_str()); - if (index > maxIndex) - maxIndex = index; - } - - HGChar name[256]; - sprintf(name, "%d.%s", maxIndex + 1, m_devParam.format.c_str()); - imgName = name; - - HGBase_CreateDir(filePath.c_str()); - std::string fileName = filePath + imgName; - HGImgFmt_SaveImage(img, 0, NULL, fileName.c_str()); - - fileNameList.push_back(imgName); - SaveFileNameList(devId, fileNameList); - - imgBase64 = "data:image/jpeg;base64,"; - imgBase64 += GetBase64(img); - - HGBase_DestroyImage(img); - } - } - - for (int i = 0; i < (int)imgList.size(); ++i) - { - HGBase_DestroyImage(imgList[i]); - } - - return true; - } - - static bool LowerSort(const std::string &str1, const std::string& str2) - { - return atoi(str1.c_str()) < atoi(str2.c_str()); - } - - bool Manager::BookSort(const std::string& devId, std::vector& imgNameList, - std::vector& imgBase64List) - { - imgNameList.clear(); - imgBase64List.clear(); - if (m_scanning) - { - return false; - } - - std::vector fileNameList = GetFileNameList(devId); - std::sort(fileNameList.begin(), fileNameList.end(), LowerSort); - SaveFileNameList(devId, fileNameList); - - return GetImageByDevId(devId, imgNameList, imgBase64List); - } - - bool Manager::ExchangeImage(const std::string& devId, int index1, int index2) - { - if (m_scanning) - { - return false; - } - - std::string filePath = GetFilePath(devId); - std::vector fileNameList = GetFileNameList(devId); - if (index1 < 0 || index1 >= (int)fileNameList.size() || index2 < 0 || index2 >= (int)fileNameList.size()) - return false; - - std::string imgName1 = fileNameList[index1]; - std::string imgName2 = fileNameList[index2]; - fileNameList[index1] = imgName2; - fileNameList[index2] = imgName1; - - SaveFileNameList(devId, fileNameList); - return true; - } - - bool Manager::GetLastBetch(std::string& devId) - { - devId.clear(); - if (m_scanning) - { - return false; - } - - devId = m_devName; - return true; - } - - bool Manager::ResetPatchIndex() - { - if (m_scanning) - { - return false; - } - - return true; - } - - bool Manager::SplitImage(const std::string& devId, const std::string& imgName, bool isHorizontal, int x1, int y1, int x2, int y2, - std::string& imgName1, std::string& imgBase64_1, std::string& imgName2, std::string& imgBase64_2) - { - imgName1.clear(); - imgBase64_1.clear(); - imgName2.clear(); - imgBase64_2.clear(); - if (m_scanning) - { - return false; - } - - std::string filePath = GetFilePath(devId); - std::string fileName = filePath + imgName; - - HGImage img = NULL; - HGImgFmt_LoadImage(fileName.c_str(), 0, NULL, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); - if (NULL != img) - { - HGImageInfo imgInfo; - HGBase_GetImageInfo(img, &imgInfo); - - for (int i = 0; i < 2; ++i) - { - HGUInt newWidth = isHorizontal ? x1 : imgInfo.width; - if (1 == i) - newWidth = isHorizontal ? (imgInfo.width - x1) : imgInfo.width; - - HGUInt newHeight = isHorizontal ? imgInfo.height : y1; - if (1 == i) - newHeight = isHorizontal ? imgInfo.height : (imgInfo.height - y1); - - HGImage newImg = NULL; - HGBase_CreateImage(newWidth, newHeight, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &newImg); - if (NULL != newImg) - { - HGImageRoi roi; - - if (isHorizontal) - { - roi.left = 0; - roi.top = 0; - roi.right = x1; - roi.bottom = imgInfo.height; - - if (1 == i) - { - roi.left = x1; - roi.right = imgInfo.width; - } - } - else - { - roi.left = 0; - roi.top = 0; - roi.right = imgInfo.width; - roi.bottom = y1; - - if (1 == i) - { - roi.top = y1; - roi.bottom = imgInfo.height; - } - } - - if (1 == i) - { - roi.left = x1; - roi.right = imgInfo.width; - } - - HGBase_SetImageROI(img, &roi); - HGBase_CopyImage(img, newImg); - HGBase_ResetImageROI(img); - - std::vector fileNameList = GetFileNameList(devId); - - int maxIndex = 0; - for (int i = 0; i < (int)fileNameList.size(); ++i) - { - int index = atoi(fileNameList[i].c_str()); - if (index > maxIndex) - maxIndex = index; - } - - HGChar name[256]; - sprintf(name, "%d.%s", maxIndex + 1, m_devParam.format.c_str()); - std::string imgName = name; - - HGBase_CreateDir(filePath.c_str()); - std::string fileName = filePath + imgName; - HGImgFmt_SaveImage(newImg, 0, NULL, fileName.c_str()); - - fileNameList.push_back(imgName); - SaveFileNameList(devId, fileNameList); - - std::string imgBase64 = "data:image/jpeg;base64,"; - imgBase64 += GetBase64(newImg); - - if (0 == i) - { - imgName1 = imgName; - imgBase64_1 = imgBase64; - } - else - { - imgName2 = imgName; - imgBase64_2 = imgBase64; - } - - HGBase_DestroyImage(newImg); - } - } - - HGBase_DestroyImage(img); - } - - return true; - } - - bool Manager::GetDevSerialNo(const std::string& devId, std::string& serialNo) - { - serialNo.clear(); - if (m_scanning) - { - return false; - } - - serialNo = devId; - return true; - } - - bool Manager::GetImageBase64(const std::string& devId, const std::string& imgName, std::string& imgBase64) - { - imgBase64.clear(); - if (m_scanning) - { - return false; - } - - std::string filePath = GetFilePath(devId); - std::string fileName = filePath + imgName; - - HGImage img = NULL; - HGImgFmt_LoadImage(fileName.c_str(), 0, NULL, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); - if (NULL != img) - { - imgBase64 = "data:image/jpeg;base64,"; - imgBase64 += GetBase64(img); - HGBase_DestroyImage(img); - } - - return true; - } - - std::string Manager::GetFilePath(const std::string& devId) - { - HGChar docsPath[256]; - HGBase_GetDocumentsPath(docsPath, 256); - HGChar imgPath[512]; - sprintf(imgPath, "%s%s/", docsPath, Utf8ToStdString(devId.c_str()).c_str()); - HGChar stdImgPath[512]; - HGBase_StandardiseFileName(imgPath, stdImgPath, 512); - - return stdImgPath; - } - - std::vector Manager::GetFileNameList(const std::string& devId) - { - std::vector fileNameList; - - std::string filePath = GetFilePath(devId); - std::string cfgName = filePath + "images.txt"; - FILE* file = fopen(cfgName.c_str(), "r"); - if (NULL != file) - { - while (feof(file) == 0) - { - char lineContent[256] = { 0 }; - if (NULL == fgets(lineContent, 256, file) || '\n' == *lineContent) - { - continue; - } - - if (lineContent[strlen(lineContent) - 1] == '\n') - lineContent[strlen(lineContent) - 1] = 0; - - fileNameList.push_back(lineContent); - } - - fclose(file); - } - - return fileNameList; - } - - bool Manager::SaveFileNameList(const std::string& devId, const std::vector& fileNameList) - { - bool ret = false; - - std::string filePath = GetFilePath(devId); - std::string cfgName = filePath + "images.txt"; - FILE* file = fopen(cfgName.c_str(), "w"); - if (NULL != file) - { - for (int i = 0; i < (int)fileNameList.size(); ++i) - { - fwrite(fileNameList[i].c_str(), 1, fileNameList[i].size(), file); - fwrite("\n", 1, strlen("\n"), file); - } - - fclose(file); - ret = true; - } - - return ret; - } - - std::string Manager::GetBase64(HGImage image) - { - std::string strBase64; - - if (NULL != image) - { - HGBuffer buffer = NULL; - HGImgFmt_SaveJpegImageToBuffer(image, NULL, &buffer); - if (NULL != buffer) - { - HGByte* data; - HGBase_GetBufferData(buffer, &data); - HGUSize size; - HGBase_GetBufferSize(buffer, &size); - - HGSize base64Size = 0; - HGBase_Base64Encode(data, size, NULL, &base64Size); - uint8_t* base64 = new uint8_t[base64Size + 1]; - HGBase_Base64Encode(data, size, base64, &base64Size); - base64[base64Size] = 0; - strBase64 = (const char*)base64; - delete[] base64; - - HGBase_DestroyBuffer(buffer); - } - } - - return strBase64; - } - - std::string Manager::GetBase64(const HGByte* data, HGUInt size) - { - std::string strBase64; - - if (NULL != data && 0 != size) - { - HGSize base64Size = 0; - HGBase_Base64Encode(data, size, NULL, &base64Size); - uint8_t* base64 = new uint8_t[base64Size + 1]; - HGBase_Base64Encode(data, size, base64, &base64Size); - base64[base64Size] = 0; - strBase64 = (const char*)base64; - delete[] base64; - } - - return strBase64; - } - - std::string Manager::GetBase64(const std::string& fileName) - { - std::string strBase64; - - FILE* file = fopen(fileName.c_str(), "rb"); - if (NULL != file) - { - fseek(file, 0, SEEK_END); - long size = ftell(file); - fseek(file, 0, SEEK_SET); - - if (size > 0) - { - HGByte* data = new HGByte[size]; - long readLen = (long)fread(data, 1, size, file); - if (readLen == size) - { - HGSize base64Size = 0; - HGBase_Base64Encode(data, size, NULL, &base64Size); - uint8_t* base64 = new uint8_t[base64Size + 1]; - HGBase_Base64Encode(data, size, base64, &base64Size); - base64[base64Size] = 0; - strBase64 = (const char*)base64; - delete[] base64; - } - - delete[] data; - } - - fclose(file); - } - - return strBase64; - } - - HGByte* Manager::GetBuffer(const std::string& fileName, HGUInt* size) - { - HGByte* data = NULL; - *size = 0; - - FILE* file = fopen(fileName.c_str(), "rb"); - if (NULL != file) - { - fseek(file, 0, SEEK_END); - *size = ftell(file); - fseek(file, 0, SEEK_SET); - - if (*size > 0) - { - data = new HGByte[*size]; - - HGUInt readLen = (HGUInt)fread(data, 1, *size, file); - if (readLen != *size) - { - delete[] data; - data = NULL; - *size = 0; - } - } - - fclose(file); - } - - return data; - } - - bool Manager::SaveBase64(const std::string& fileName, const char* base64) - { - if (NULL == base64 || 0 == *base64) - return false; - - HGUInt base64Size = (HGUInt)strlen(base64); - - bool ret = false; - FILE* file = fopen(fileName.c_str(), "wb"); - if (NULL != file) - { - HGSize size = 0; - HGBase_Base64Decode((const HGByte*)base64, (HGSize)base64Size, NULL, &size); - uint8_t* data = new HGByte[size]; - HGBase_Base64Decode((const HGByte*)base64, (HGSize)base64Size, data, &size); - - size_t writeLen = fwrite(data, 1, size, file); - if (writeLen == (size_t)size) - ret = true; - - delete[] data; - fclose(file); - } - - return ret; - } - - static std::string MakePreFileData(const char* pszBoundary, const char* pszRemoteFileName) - { - char data[512]; - sprintf(data, "--%s\r\nContent-Disposition: form-data; name=\"filedata\"; filename=\"%s\"\r\n", - pszBoundary, pszRemoteFileName); - std::string ret = data; - ret += "Content-Type: application/octet-stream; charset=utf-8\r\n"; - ret += "Content-Transfer-Encoding: binary\r\n"; - ret += "\r\n"; - return ret; - } - - static std::string MakePostFileData(const char* pszBoundary) - { - char data[512]; - sprintf(data, "\r\n--%s\r\nContent-Disposition: form-data; name=\"submitted\"\r\n\r\nsubmit\r\n--%s--\r\n", pszBoundary, pszBoundary); - return data; - } - - static void ParseHttpURL(const std::string &url, std::string &addr, int &port, std::string &path) - { - addr.clear(); - port = 0; - path.clear(); - - std::string url2; - std::string::size_type pos = url.find("//"); - if (std::string::npos != pos) - { - std::string protocal = url.substr(0, pos); - if (protocal != "http:") - { - return; - } - - url2 = url.substr(pos + 2); - } - else - { - url2 = url; - } - - std::string addr_port; - pos = url2.find("/"); - if (std::string::npos != pos) - { - addr_port = url2.substr(0, pos); - path = url2.substr(pos); - } - else - { - addr_port = url2; - } - - pos = addr_port.find(":"); - if (std::string::npos != pos) - { - addr = addr_port.substr(0, pos); - port = atoi(addr_port.substr(pos + 1).c_str()); - } - else - { - addr = addr_port; - port = 80; - } - } - - bool Manager::HTTPUpload(const std::string& localFileName, const std::string& httpUrl, const std::string& remoteFileName, - const std::string& httpMethod, const std::string& header, const std::string& param) - { - unsigned char* fileData = NULL; - long fileSize = 0; - FILE* file = fopen(localFileName.c_str(), "rb"); - if (NULL != file) - { - fseek(file, 0, SEEK_END); - fileSize = ftell(file); - fseek(file, 0, SEEK_SET); - - if (0 != fileSize) - { - fileData = new unsigned char[fileSize]; - fread(fileData, 1, fileSize, file); - } - - fclose(file); - } - - if (NULL == fileData) - { - return false; - } - - std::string addr; - int port; - std::string path; - ParseHttpURL(httpUrl, addr, port, path); - - #if defined(HG_CMP_MSC) - SOCKET sockClient = socket(AF_INET, SOCK_STREAM, 0); - assert(INVALID_SOCKET != sockClient); - #else - int sockClient = socket(AF_INET, SOCK_STREAM, 0); - assert(-1 != sockClient); - #endif - - #if defined(HG_CMP_MSC) - u_long ul = 1; // 设为非阻塞 - ioctlsocket(sockClient, FIONBIO, &ul); - #else - ioctl(sockClient, FIONBIO, 1); - #endif - - #if defined(HG_CMP_MSC) - SOCKADDR_IN addrServer = { 0 }; - addrServer.sin_addr.S_un.S_addr = inet_addr(addr.c_str()); - addrServer.sin_family = AF_INET; - addrServer.sin_port = htons(port); - if (0 != connect(sockClient, (SOCKADDR*)&addrServer, sizeof(SOCKADDR_IN))) - #else - struct sockaddr_in addrServer = { 0 }; - addrServer.sin_addr.s_addr = inet_addr(addr.c_str()); - addrServer.sin_family = AF_INET; - addrServer.sin_port = htons(port); - if (0 != connect(sockClient, (struct sockaddr*)&addrServer, sizeof(addrServer))) - #endif - { - fd_set fds; - FD_ZERO(&fds); - FD_SET(sockClient, &fds); - timeval tm; - tm.tv_sec = 1; - tm.tv_usec = 0; - - if (select((int)(sockClient + 1), NULL, &fds, NULL, &tm) <= 0) - { - #if defined(HG_CMP_MSC) - closesocket(sockClient); - #else - close(sockClient); - #endif - delete[] fileData; - return false; - } - - if (!FD_ISSET(sockClient, &fds)) - { - #if defined(HG_CMP_MSC) - closesocket(sockClient); - #else - close(sockClient); - #endif - delete[] fileData; - return false; - } - } - - #if defined(HG_CMP_MSC) - ul = 0; // 设为阻塞 - ioctlsocket(sockClient, FIONBIO, &ul); - #else - ioctl(sockClient, FIONBIO, 0); - #endif - - char remoteName[256]; - HGBase_GetFileName(localFileName.c_str(), remoteName, 256); - - bool ret = false; - - const char* pszBoundary = "---------------------------7d33a816d302b6"; - - std::string strPreFileData = MakePreFileData(pszBoundary, remoteName); - std::string strPostFileData = MakePostFileData(pszBoundary); - - char hostname[128]; - gethostname(hostname, 128); - - std::string head; - char data[512]; - sprintf(data, "POST %s HTTP/1.1\r\nHost: %s\r\n", path.c_str(), hostname); - head += data; - sprintf(data, "Content-Type: multipart/form-data; boundary=%s\r\n", pszBoundary); - head += data; - sprintf(data, "Content-Length: %d\r\n\r\n", (int)strPreFileData.size() + (int)fileSize + (int)strPostFileData.size()); - head += data; - - send(sockClient, head.c_str(), (int)head.size(), 0); - send(sockClient, strPreFileData.c_str(), (int)strPreFileData.size(), 0); - send(sockClient, (const char *)fileData, (int)fileSize, 0); - send(sockClient, strPostFileData.c_str(), (int)strPostFileData.size(), 0); - - char recvBuf[2048] = {0}; - recv(sockClient, recvBuf, 2048, 0); - - std::string strRecv(recvBuf); - std::string::size_type pos = strRecv.find("\r\n"); - if (pos != std::string::npos) - { - std::string head = strRecv.substr(0, pos); - if (head.find("200") != std::string::npos) - { - ret = true; - } - } - - #if defined(HG_CMP_MSC) - closesocket(sockClient); - #else - close(sockClient); - #endif - delete[] fileData; - return ret; - } - - static size_t read_callback(char* ptr, size_t size, size_t nmemb, void* stream) - { - unsigned long nread; - /* in real-world cases, this would probably get this data differently - as this fread() stuff is exactly what the library already would do - by default internally */ - size_t retcode = fread(ptr, size, nmemb, (FILE*)stream); - - if (retcode > 0) - { - nread = (unsigned long)retcode; - //fprintf(stderr, "*** We read %lu bytes from file\n", nread); - } - - return retcode; - } - - bool Manager::FTPUpload(const std::string& localFileName, const std::string& ftpUrl, int ftpPort, const std::string& ftpPath, - const std::string& ftpUser, const std::string& ftpPassword, int ftpMode) - { - FILE* file = fopen(localFileName.c_str(), "rb"); - if (NULL == file) - { - return false; - } - - bool ret = false; - fseek(file, 0, SEEK_END); - long fsize = ftell(file); - fseek(file, 0, SEEK_SET); - - curl_global_init(CURL_GLOBAL_ALL); - - /* get a curl handle */ - CURL *curl = curl_easy_init(); - if (NULL != curl) - { - char tmpName[256]; - HGBase_GetUuid(tmpName, 256); - char remoteName[256]; - HGBase_GetFileName(localFileName.c_str(), remoteName, 256); - - char ftp_rnfr[512]; - sprintf(ftp_rnfr, "RNFR %s", tmpName); - char ftp_rnto[512]; - sprintf(ftp_rnto, "RNTO %s", remoteName); - - struct curl_slist* headerlist = NULL; - headerlist = curl_slist_append(headerlist, ftp_rnfr); - headerlist = curl_slist_append(headerlist, ftp_rnto); - - /* we want to use our own read function */ - curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback); - - curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L); - - char url[512]; - if (!ftpUser.empty() && !ftpPassword.empty()) - { - sprintf(url, "ftp://%s:%s@%s:%d%s/%s", ftpUser.c_str(), ftpPassword.c_str(), - ftpUrl.c_str(), ftpPort, ftpPath.c_str(), tmpName); - } - else - { - sprintf(url, "ftp://%s:%d%s/%s", ftpUrl.c_str(), ftpPort, ftpPath.c_str(), tmpName); - } - curl_easy_setopt(curl, CURLOPT_URL, url); - - curl_easy_setopt(curl, CURLOPT_FTP_CREATE_MISSING_DIRS, 1); - - /* pass in that last of FTP commands to run after the transfer */ - curl_easy_setopt(curl, CURLOPT_POSTQUOTE, headerlist); - - /* now specify which file to upload */ - curl_easy_setopt(curl, CURLOPT_READDATA, file); - - /* Set the size of the file to upload (optional). If you give a *_LARGE - option you MUST make sure that the type of the passed-in argument is a - curl_off_t. If you use CURLOPT_INFILESIZE (without _LARGE) you must - make sure that to pass in a type 'long' argument. */ - curl_easy_setopt(curl, CURLOPT_INFILESIZE_LARGE, (curl_off_t)fsize); - - /* Now run off and do what you have been told! */ - CURLcode res = curl_easy_perform(curl); - /* Check for errors */ - if (res != CURLE_OK) - fprintf(stderr, "curl_easy_perform() failed: %s\n", curl_easy_strerror(res)); - else - ret = true; - - /* clean up the FTP commands list */ - curl_slist_free_all(headerlist); - - /* always cleanup */ - curl_easy_cleanup(curl); - } - fclose(file); /* close the local file */ - - curl_global_cleanup(); - return ret; - } - - int Manager::sane_ex_callback(SANE_Handle hdev, int code, void* data, unsigned int* len, void* param) - { - (void)hdev; - (void)len; - - Manager* p = (Manager*)param; - switch (code) - { - case SANE_EVENT_DEVICE_ARRIVED: - { - SANE_Device* sane_dev = (SANE_Device*)data; - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "device arrive, name=%s", Utf8ToStdString(sane_dev->name).c_str()); - - HGBase_EnterLock(p->m_lock); - if (NULL != p->m_scanEvent) - p->m_scanEvent(SCANEVENT_ARRIVE, (void*)sane_dev->name, (void*)0, p->m_scanParam); - HGBase_LeaveLock(p->m_lock); - - OpenDevParam* openDevParam = new OpenDevParam; - openDevParam->mgr = p; - openDevParam->devName = sane_dev->name; - - HGMsg msg; - msg.id = MSGID_OPEN_DEVICE; - msg.data = openDevParam; - if (HGBASE_ERR_OK != HGBase_PostPumpMessage(p->m_msgPump, &msg)) - { - delete openDevParam; - } - } - break; - case SANE_EVENT_DEVICE_LEFT: - { - SANE_Device* sane_dev = (SANE_Device*)data; - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "device remove, name=%s", Utf8ToStdString(sane_dev->name).c_str()); - - HGBase_EnterLock(p->m_lock); - if (NULL != p->m_scanEvent) - p->m_scanEvent(SCANEVENT_REMOVE, (void*)sane_dev->name, (void*)0, p->m_scanParam); - HGBase_LeaveLock(p->m_lock); - - CloseDevParam* closeDevParam = new CloseDevParam; - closeDevParam->mgr = p; - closeDevParam->devName = sane_dev->name; - - HGMsg msg; - msg.id = MSGID_CLOSE_DEVICE; - msg.data = closeDevParam; - if (HGBASE_ERR_OK != HGBase_PostPumpMessage(p->m_msgPump, &msg)) - { - delete closeDevParam; - } - } - break; - case SANE_EVENT_STATUS: - { - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "SANE_EVENT_STATUS, msg=%s", Utf8ToStdString((char *)data).c_str()); - - HGBase_EnterLock(p->m_lock); - if (NULL != p->m_scanEvent) - p->m_scanEvent(SCANEVENT_STATUS, (void*)data, (void*)0, p->m_scanParam); - HGBase_LeaveLock(p->m_lock); - } - break; - case SANE_EVENT_ERROR: - { - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "SANE_EVENT_ERROR, msg=%s", Utf8ToStdString((char*)data).c_str()); - - HGBase_EnterLock(p->m_lock); - if (NULL != p->m_scanEvent) - p->m_scanEvent(SCANEVENT_ERROR, (void *)data, (void*)0, p->m_scanParam); - HGBase_LeaveLock(p->m_lock); - } - break; - case SANE_EVENT_WORKING: - { - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "SANE_EVENT_WORKING, msg=%s", Utf8ToStdString((char*)data).c_str()); - - HGBase_EnterLock(p->m_lock); - if (NULL != p->m_scanEvent) - p->m_scanEvent(SCANEVENT_WORKING, (void*)data, (void*)0, p->m_scanParam); - HGBase_LeaveLock(p->m_lock); - } - break; - case SANE_EVENT_IMAGE_OK: - { - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "SANE_EVENT_IMAGE_OK"); - - SANE_Image* sane_img = (SANE_Image*)data; - - HGUInt imgType = 0; - if (sane_img->header.format == SANE_FRAME_GRAY) - imgType = HGBASE_IMGTYPE_GRAY; - else if (sane_img->header.format == SANE_FRAME_RGB) - imgType = HGBASE_IMGTYPE_RGB; - - HGByte* data = sane_img->data; - HGImageInfo imgInfo = { (HGUInt)sane_img->header.pixels_per_line, (HGUInt)sane_img->header.lines, - imgType, (HGUInt)sane_img->header.bytes_per_line, HGBASE_IMGORIGIN_TOP }; - - HGImage img = NULL; - HGBase_CreateImageFromData(data, &imgInfo, nullptr, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); - if (NULL != img) - { - std::string filePath = GetFilePath(p->m_devName); - std::vector fileNameList = GetFileNameList(p->m_devName); - - int maxIndex = 0; - for (int i = 0; i < (int)fileNameList.size(); ++i) - { - int index = atoi(fileNameList[i].c_str()); - if (index > maxIndex) - maxIndex = index; - } - - HGChar name[256]; - sprintf(name, "%d.%s", maxIndex + 1, p->m_devParam.format.c_str()); - std::string imgName = name; - - HGBase_CreateDir(filePath.c_str()); - std::string fileName = filePath + imgName; - HGImgFmt_SaveImage(img, 0, NULL, fileName.c_str()); - - if (0 == p->m_devParam.uploadMode) // HTTP - { - HTTPUpload(fileName, p->m_devParam.httpUrl, p->m_devParam.fileName, p->m_devParam.httpMethod, - p->m_devParam.header, p->m_devParam.param); - } - else if (1 == p->m_devParam.uploadMode) // FTP - { - FTPUpload(fileName, p->m_devParam.ftpUrl, p->m_devParam.ftpPort, p->m_devParam.ftpPath, - p->m_devParam.ftpUser, p->m_devParam.ftpPassword, p->m_devParam.ftpMode); - } - - if (p->m_scanIsInsert) - { - int index = -1; - for (int i = 0; i < (int)fileNameList.size(); ++i) - { - if (fileNameList[i] == p->m_scanInsertImgName) - { - index = i; - break; - } - } - - if (-1 != index) - { - fileNameList.insert(fileNameList.begin() + index, imgName); - } - else - { - fileNameList.push_back(imgName); - } - } - else - { - fileNameList.push_back(imgName); - } - - SaveFileNameList(p->m_devName, fileNameList); - - std::string imgBase64 = "data:image/jpeg;base64,"; - imgBase64 += GetBase64(img); - - HGBase_EnterLock(p->m_lock); - if (NULL != p->m_scanEvent) - p->m_scanEvent(SCANEVENT_IMAGE, (void*)imgName.c_str(), (void *)imgBase64.c_str(), p->m_scanParam); - HGBase_LeaveLock(p->m_lock); - - HGBase_DestroyImage(img); - } - } - break; - case SANE_EVENT_SCAN_FINISHED: - { - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "SANE_EVENT_SCAN_FINISHED, msg=%s", Utf8ToStdString((char*)data).c_str()); - - HGBase_EnterLock(p->m_lock); - if (NULL != p->m_scanEvent) - p->m_scanEvent(SCANEVENT_FINISH, (void*)data, (void*)0, p->m_scanParam); - HGBase_LeaveLock(p->m_lock); - - ScanFinishParam* scanFinishParam = new ScanFinishParam; - scanFinishParam->mgr = p; - - HGMsg msg; - msg.id = MSGID_SCAN_FINISH; - msg.data = scanFinishParam; - if (HGBASE_ERR_OK != HGBase_PostPumpMessage(p->m_msgPump, &msg)) - { - delete scanFinishParam; - } - } - break; - } - - return 0; - } + m_msgPump = msgPump; +} + +Manager::~Manager() +{ + } diff --git a/sdk/webservice/Manager.h b/sdk/webservice/Manager.h index bff26026..04564c5d 100644 --- a/sdk/webservice/Manager.h +++ b/sdk/webservice/Manager.h @@ -2,193 +2,14 @@ #include "base/HGDef.h" #include "base/HGInc.h" -#include "base/HGLock.h" -#include "base/HGImage.h" #include "base/HGMsgPump.h" -#include "sane/sane_ex.h" -#include "sane/sane_option_definitions.h" -#include "Msg.h" -#include -namespace ver_1 +class Manager { - enum - { - SCANEVENT_ARRIVE = 1L, - SCANEVENT_REMOVE, - SCANEVENT_STATUS, - SCANEVENT_WORKING, - SCANEVENT_IMAGE, - SCANEVENT_FINISH, - SCANEVENT_ERROR - }; +public: + Manager(HGMsgPump msgPump); + virtual ~Manager(); - struct DevParam - { - DevParam(); - ~DevParam(); - - void Reset(); - void Load(const std::string& cfgPath); - void Save(const std::string& cfgPath); - - std::string device; // 设备名称，默认null - bool autofeeder; // 自动进纸，默认true - int pixel; // 扫描模式 0：黑白 1：灰度 2：彩色，默认1 - bool white; // 丢弃空白页，默认false - int discardBlankThre; // 跳过空白页阈值 1­-100 默认值5 - bool single; // 单页扫描，默认false - std::string format; // 输出格式 jpg png bmp tiff pdf ofd，默认jpg - int resolution; // 扫描分辨率 范围 100­-600 默认值200 - int orentation; // 图片旋转 0：原图 90：度 180：旋转180度 270：旋转270度，默认0 - std::string paperType; // 扫描幅面 A3：A3幅面 Auto:自适应幅面 A4：A4幅面，默认Auto - int splitImage; // 图像分割 0：disable 1：垂直分割 2： 水平分割，默认0 - bool noiseDetachEnable; // 去除噪点，默认true - int noiseDetach; // 噪点阈值 范围：10­-50 默认值15 - - int uploadMode; // 是否边扫边上传 0：http 1：ftp 2: 不上传，默认2 - std::string httpUrl; // 上传地址，默认null - std::string fileName; // 接收文件参数名，默认null - std::string httpMethod; // 上传方式 GET POST PUT，默认null - std::string header; // 请求头，默认null - std::string param; // 参数 json格式，默认null - std::string ftpUrl; // ftp 地址，默认null - std::string ftpPath; // 路径，默认/images - std::string ftpUser; // ftp 用户名，默认null - std::string ftpPassword; // ftp 密码，默认null - int ftpPort; // 端口号，默认21 - int ftpMode; // 连接模式 1：主动 2：被动，默认2 - }; - - struct UploadParam - { - UploadParam() - { - uploadMode = 2; - ftpPort = 21; - ftpMode = 2; - format = 2; - } - - int uploadMode; // 上传模式 0：http 1：ftp 默认0 - std::string httpUrl; // 上传地址，默认null - std::string fileName; // 接收文件参数名，默认null - std::string httpMethod; // 上传方式 GET POST PUT，默认null - std::string header; // 请求头，默认null - std::string param; // 参数 json格式，默认null - std::string ftpUrl; // ftp 地址，默认null - std::string ftpPath; // 路径，默认/images - std::string ftpUser; // ftp 用户名，默认null - std::string ftpPassword; // ftp 密码，默认null - int ftpPort; // 端口号，默认21 - int ftpMode; // 连接模式 1：主动 2：被动，默认2 - int format; // 上传格式 0: ofd 1: pdf 2: zip, 默认2 - }; - - typedef void (*ScanEvent)(HGUInt event, void* value1, void* value2, void* param); - - class Manager - { - public: - Manager(HGMsgPump msgPump); - ~Manager(); - - // 打开设备 - void OpenDev(const OpenDevParam* param); - // 关闭设备 - void CloseDev(const CloseDevParam* param); - // 扫描完成 - void ScanFinish(const ScanFinishParam* param); - - // 设置回调 - void SetScanEvent(ScanEvent event, void* param); - // 清理回调 - void ResetScanEvent(); - // 扫描 - bool Scan(const std::string& insertImgName, bool isInsert); - // 停止扫描 - bool StopScan(); - // 获取当前连接的设备ID - bool GetCurDevId(std::string& devId); - // 获取连接的设备名列表 - bool GetDevNames(std::vector& devNameList); - // 获取上次的扫描结果 - bool GetImageByDevId(const std::string& devId, std::vector& imgNameList, - std::vector& imgBase64List); - // 获取配置参数 - bool GetDevParam(const std::string& devId, DevParam& devParam); - // 设置配置参数 - bool SetDevParam(const std::string& devId, const DevParam& devParam); - // 生成OFD - bool ExportOfd(const std::string& devId, bool isAuto, std::string& imgBase64); - bool ExportOfdFile(const std::string& devId, bool isAuto, const std::string& fileName); - bool ExportOfdFile(const std::string& devId, bool isAuto, HGByte** data, HGUInt* size); - // 生成PDF - bool ExportPdf(const std::string& devId, std::string& imgBase64); - bool ExportPdfFile(const std::string& devId, const std::string& fileName); - bool ExportPdfFile(const std::string& devId, HGByte** data, HGUInt* size); - // 生成TIFF - bool ExportTiff(const std::string& devId, std::string& imgBase64); - bool ExportTiff(const std::string& devId, const std::string& fileName); - bool ExportTiffFile(const std::string& devId, HGByte** data, HGUInt* size); - // 生成ZIP - bool ExportZip(const std::string& devId, std::string& imgBase64); - bool ExportZipFile(const std::string& devId, const std::string& fileName); - bool ExportZipFile(const std::string& devId, HGByte** data, HGUInt* size); - // 上传图像 - bool UploadImage(const UploadParam& uploadParam); - // 保存图片 - bool SaveImage(const std::string& devId, const std::string& imgName, const std::string& imgBase64); - // 删除图片 - bool DeleteImage(const std::string& devId, const std::string& imgName); - // 删除所有图片 - bool DeleteAllImage(const std::string& devId); - // 图像合并 - bool MergeImage(const std::string& devId, bool isHorizontal, const std::vector& imgIndexList, - std::string& imgName, std::string& imgBase64); - // 自动排序 - bool BookSort(const std::string& devId, std::vector& imgNameList, - std::vector& imgBase64List); - // 交换文件 - bool ExchangeImage(const std::string& devId, int index1, int index2); - // 获取最后批次 - bool GetLastBetch(std::string& devId); - // 重置索引 - bool ResetPatchIndex(); - // 拆分图像 - bool SplitImage(const std::string& devId, const std::string& imgName, bool isHorizontal, int x1, int y1, int x2, int y2, - std::string& imgName1, std::string& imgBase64_1, std::string& imgName2, std::string& imgBase64_2); - // 获取设备序列号 - bool GetDevSerialNo(const std::string& devId, std::string& serialNo); - // 获取图像Base64 - bool GetImageBase64(const std::string& devId, const std::string& imgName, std::string& imgBase64); - - private: - static std::string GetFilePath(const std::string& devId); - static std::vector GetFileNameList(const std::string& devId); - static bool SaveFileNameList(const std::string& devId, const std::vector& fileNameList); - static std::string GetBase64(HGImage image); - static std::string GetBase64(const HGByte* data, HGUInt size); - static std::string GetBase64(const std::string& fileName); - static HGByte* GetBuffer(const std::string& fileName, HGUInt* size); - static bool SaveBase64(const std::string& fileName, const char* base64); - static bool HTTPUpload(const std::string& localFileName, const std::string& httpUrl, const std::string& remoteFileName, - const std::string& httpMethod, const std::string& header, const std::string& param); - static bool FTPUpload(const std::string& localFileName, const std::string& ftpUrl, int ftpPort, const std::string& ftpPath, - const std::string& ftpUser, const std::string& ftpPassword, int ftpMode); - static int sane_ex_callback(SANE_Handle hdev, int code, void* data, unsigned int* len, void* param); - - private: - HGMsgPump m_msgPump; - HGLock m_lock; - std::string m_devName; - SANE_Handle m_devHandle; - DevParam m_devParam; - ScanEvent m_scanEvent; - void* m_scanParam; - - std::string m_scanInsertImgName; - bool m_scanIsInsert; - bool m_scanning; - }; -} +protected: + HGMsgPump m_msgPump; +}; diff --git a/sdk/webservice/ManagerV1.cpp b/sdk/webservice/ManagerV1.cpp new file mode 100644 index 00000000..df992241 --- /dev/null +++ b/sdk/webservice/ManagerV1.cpp @@ -0,0 +1,2082 @@ +#include "ManagerV1.h" +#include "base/HGBuffer.h" +#include "base/HGBase64.h" +#include "base/HGUtility.h" +#include "base/HGInfo.h" +#include "imgfmt/HGJpeg.h" +#include "imgfmt/HGOfd.h" +#include "imgfmt/HGPdf.h" +#include "imgfmt/HGTiff.h" +#include "imgfmt/HGImgFmt.h" +#include "HGString.h" +extern "C" +{ +#include "zip.h" +}; +#include +#include +#include + +namespace ver_1 +{ + DevParam::DevParam() + { + Reset(); + } + + DevParam::~DevParam() + { + + } + + void DevParam::Reset() + { + autofeeder = true; + pixel = 1; + white = false; + discardBlankThre = 5; + single = false; + format = "jpg"; + resolution = 200; + orentation = 0; + paperType = "Auto"; + splitImage = 0; + noiseDetachEnable = true; + noiseDetach = 15; + + uploadMode = 2; + ftpPath = "/images"; + ftpPort = 21; + ftpMode = 2; + } + + void DevParam::Load(const std::string& cfgPath) + { + HGInt intValue; + HGChar strValue[256]; + + HGBase_GetProfileString(cfgPath.c_str(), "devParam", "device", "", strValue, 256); + device = strValue; + HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "autofeeder", 1, &intValue); + autofeeder = (bool)intValue; + HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "pixel", 1, &intValue); + pixel = intValue; + HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "white", 0, &intValue); + white = (bool)intValue; + HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "discardBlankThre", 5, &intValue); + discardBlankThre = intValue; + HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "single", 0, &intValue); + single = (bool)intValue; + HGBase_GetProfileString(cfgPath.c_str(), "devParam", "format", "jpg", strValue, 256); + format = strValue; + HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "resolution", 200, &intValue); + resolution = intValue; + HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "orentation", 0, &intValue); + orentation = intValue; + HGBase_GetProfileString(cfgPath.c_str(), "devParam", "paperType", "Auto", strValue, 256); + paperType = strValue; + HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "splitImage", 0, &intValue); + splitImage = intValue; + HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "noiseDetachEnable", 1, &intValue); + noiseDetachEnable = (bool)intValue; + HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "noiseDetach", 15, &intValue); + noiseDetach = intValue; + + HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "uploadMode", 2, &intValue); + uploadMode = intValue; + HGBase_GetProfileString(cfgPath.c_str(), "devParam", "httpUrl", "", strValue, 256); + httpUrl = strValue; + HGBase_GetProfileString(cfgPath.c_str(), "devParam", "fileName", "", strValue, 256); + fileName = strValue; + HGBase_GetProfileString(cfgPath.c_str(), "devParam", "httpMethod", "", strValue, 256); + httpMethod = strValue; + HGBase_GetProfileString(cfgPath.c_str(), "devParam", "header", "", strValue, 256); + header = strValue; + HGBase_GetProfileString(cfgPath.c_str(), "devParam", "param", "", strValue, 256); + param = strValue; + HGBase_GetProfileString(cfgPath.c_str(), "devParam", "ftpUrl", "", strValue, 256); + ftpUrl = strValue; + HGBase_GetProfileString(cfgPath.c_str(), "devParam", "ftpPath", "", strValue, 256); + ftpPath = strValue; + HGBase_GetProfileString(cfgPath.c_str(), "devParam", "ftpUser", "", strValue, 256); + ftpUser = strValue; + HGBase_GetProfileString(cfgPath.c_str(), "devParam", "ftpPassword", "", strValue, 256); + ftpPassword = strValue; + HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "ftpPort", 21, &intValue); + ftpPort = intValue; + HGBase_GetProfileInt(cfgPath.c_str(), "devParam", "ftpMode", 2, &intValue); + ftpMode = intValue; + } + + void DevParam::Save(const std::string& cfgPath) + { + HGBase_SetProfileString(cfgPath.c_str(), "devParam", "device", device.c_str()); + HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "autofeeder", autofeeder); + HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "pixel", pixel); + HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "white", white); + HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "discardBlankThre", discardBlankThre); + HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "single", single); + HGBase_SetProfileString(cfgPath.c_str(), "devParam", "format", format.c_str()); + HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "resolution", resolution); + HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "orentation", orentation); + HGBase_SetProfileString(cfgPath.c_str(), "devParam", "paperType", paperType.c_str()); + HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "splitImage", splitImage); + HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "noiseDetachEnable", noiseDetachEnable); + HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "noiseDetach", noiseDetach); + + HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "uploadMode", uploadMode); + HGBase_SetProfileString(cfgPath.c_str(), "devParam", "httpUrl", httpUrl.c_str()); + HGBase_SetProfileString(cfgPath.c_str(), "devParam", "fileName", fileName.c_str()); + HGBase_SetProfileString(cfgPath.c_str(), "devParam", "httpMethod", httpMethod.c_str()); + HGBase_SetProfileString(cfgPath.c_str(), "devParam", "header", header.c_str()); + HGBase_SetProfileString(cfgPath.c_str(), "devParam", "param", param.c_str()); + HGBase_SetProfileString(cfgPath.c_str(), "devParam", "ftpUrl", ftpUrl.c_str()); + HGBase_SetProfileString(cfgPath.c_str(), "devParam", "ftpPath", ftpPath.c_str()); + HGBase_SetProfileString(cfgPath.c_str(), "devParam", "ftpUser", ftpUser.c_str()); + HGBase_SetProfileString(cfgPath.c_str(), "devParam", "ftpPassword", ftpPassword.c_str()); + HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "ftpPort", ftpPort); + HGBase_SetProfileInt(cfgPath.c_str(), "devParam", "ftpMode", ftpMode); + } + + ManagerV1::ManagerV1(HGMsgPump msgPump) + : Manager(msgPump) + { + HGBase_CreateLock(&m_lock); + m_devName.clear(); + m_devHandle = NULL; + m_scanEvent = NULL; + m_scanParam = NULL; + + m_scanInsertImgName.clear(); + m_scanIsInsert = false; + m_scanning = false; + + SANE_Int version_code = 0; + SANE_Status status = sane_init_ex(&version_code, sane_ex_callback, this); + assert(SANE_STATUS_GOOD == status); + } + + ManagerV1::~ManagerV1() + { + if (NULL != m_devHandle) + { + StopScan(); + + m_devParam.Reset(); + sane_close(m_devHandle); + m_devHandle = NULL; + m_devName.clear(); + } + + sane_exit(); + + HGBase_DestroyLock(m_lock); + m_lock = NULL; + } + + void ManagerV1::OpenDev(const OpenDevParam* param) + { + assert(NULL != param && this == param->mgr); + + if (!m_devName.empty() || NULL != m_devHandle) + { + return; + } + + SANE_Handle devHandle = NULL; + SANE_Status status = sane_open(param->devName.c_str(), &devHandle); + if (SANE_STATUS_GOOD == status) + { + assert(NULL != devHandle); + + m_devName = param->devName; + m_devHandle = devHandle; + + std::string filePath = GetFilePath(m_devName); + std::string cfgPath = filePath + "config.ini"; + m_devParam.Load(cfgPath); + SetDevParam(m_devName, m_devParam); + } + } + + void ManagerV1::CloseDev(const CloseDevParam* param) + { + assert(NULL != param && this == param->mgr); + + if (m_devName.empty() || NULL == m_devHandle || m_devName != param->devName) + { + return; + } + + assert(NULL != m_devHandle); + + StopScan(); + + m_devParam.Reset(); + sane_close(m_devHandle); + m_devHandle = NULL; + m_devName.clear(); + } + + void ManagerV1::ScanFinish(const ScanFinishParam* param) + { + assert(NULL != param && this == param->mgr); + + m_scanInsertImgName.clear(); + m_scanIsInsert = false; + m_scanning = false; + } + + void ManagerV1::SetScanEvent(ScanEvent event, void* param) + { + assert(NULL != event && NULL != param); + + HGBase_EnterLock(m_lock); + m_scanEvent = event; + m_scanParam = param; + HGBase_LeaveLock(m_lock); + } + + void ManagerV1::ResetScanEvent() + { + HGBase_EnterLock(m_lock); + m_scanEvent = NULL; + m_scanParam = NULL; + HGBase_LeaveLock(m_lock); + } + + bool ManagerV1::Scan(const std::string& insertImgName, bool isInsert) + { + if (m_scanning) + { + return false; + } + + bool ret = false; + if (NULL != m_devHandle) + { + m_scanInsertImgName = insertImgName; + m_scanIsInsert = isInsert; + if (SANE_STATUS_GOOD == sane_start(m_devHandle)) + { + m_scanning = true; + ret = true; + } + else + { + m_scanInsertImgName.clear(); + m_scanIsInsert = false; + } + } + + return ret; + } + + bool ManagerV1::StopScan() + { + if (m_scanning) + { + assert(NULL != m_devHandle); + sane_cancel(m_devHandle); + } + + return true; + } + + bool ManagerV1::GetCurDevId(std::string& devId) + { + devId.clear(); + if (m_scanning) + { + return false; + } + + devId = m_devName; + return true; + } + + bool ManagerV1::GetDevNames(std::vector& devNameList) + { + devNameList.clear(); + if (m_scanning) + { + return false; + } + + const SANE_Device** device_list; + if (SANE_STATUS_GOOD == sane_get_devices(&device_list, SANE_TRUE)) + { + const SANE_Device** p; + for (p = device_list; *p != NULL; ++p) + { + devNameList.push_back((*p)->name); + } + } + + return true; + } + + bool ManagerV1::GetImageByDevId(const std::string& devId, std::vector& imgNameList, + std::vector& imgBase64List) + { + imgNameList.clear(); + imgBase64List.clear(); + if (m_scanning) + { + return false; + } + + std::string filePath = GetFilePath(devId); + std::vector fileNameList = GetFileNameList(devId); + HGBase_WriteInfo(HGBASE_INFOTYPE_DEBUG, "filePath=%s", filePath.c_str()); + + for (int i = 0; i < (int)fileNameList.size(); ++i) + { + std::string fileName = filePath + fileNameList[i]; + + HGImage img = NULL; + HGImgFmt_LoadImage(fileName.c_str(), 0, NULL, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); + if (NULL != img) + { + std::string imgBase64 = "data:image/jpeg;base64,"; + imgBase64 += GetBase64(img); + + imgNameList.push_back(fileNameList[i]); + imgBase64List.push_back(imgBase64); + HGBase_DestroyImage(img); + } + } + + SaveFileNameList(devId, imgNameList); + return true; + } + + bool ManagerV1::GetDevParam(const std::string& devId, DevParam& devParam) + { + devParam.Reset(); + if (m_scanning) + { + return false; + } + + bool ret = false; + if (NULL != m_devHandle) + { + m_devParam.device = m_devName; + + // 豸ȡm_devParam + + SANE_Int num_dev_options = 0; + sane_control_option(m_devHandle, 0, SANE_ACTION_GET_VALUE, &num_dev_options, NULL); + for (int i = 1; i < num_dev_options; ++i) + { + const SANE_Option_Descriptor* desp = sane_get_option_descriptor(m_devHandle, i); + if (NULL == desp) + continue; + + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "title=%s", Utf8ToStdString(desp->title).c_str()); + + if (SANE_TYPE_BOOL == desp->type) + { + SANE_Bool value = 0; + sane_control_option(m_devHandle, i, SANE_ACTION_GET_VALUE, &value, NULL); + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, " valueType=BOOL, value=%s", value ? "TRUE" : "FALSE"); + + if (0 == strcmp(desp->title, OPTION_TITLE_TXCF)) + m_devParam.splitImage = value ? 1 : 0; + else if (0 == strcmp(desp->title, OPTION_TITLE_HBTXZDYH)) + m_devParam.noiseDetachEnable = (bool)value; + } + else if (SANE_TYPE_INT == desp->type) + { + SANE_Int value = 0; + sane_control_option(m_devHandle, i, SANE_ACTION_GET_VALUE, &value, NULL); + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, " valueType=INT, value=%d", value); + + if (0 == strcmp(desp->title, OPTION_TITLE_TGKBYLMD)) + m_devParam.discardBlankThre = value; + else if (0 == strcmp(desp->title, OPTION_TITLE_FBL)) + m_devParam.resolution = value; + } + else if (SANE_TYPE_FIXED == desp->type) + { + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, " valueType=FIXED"); + } + else if (SANE_TYPE_STRING == desp->type) + { + char value[256] = { 0 }; + sane_control_option(m_devHandle, i, SANE_ACTION_GET_VALUE, value, NULL); + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, " valueType=STRING, value=%s", Utf8ToStdString(value).c_str()); + + if (0 == strcmp(OPTION_TITLE_SMZS, desp->title) && 0 == strcmp(OPTION_VALUE_SMZS_LXSM, value)) + m_devParam.autofeeder = true; + else if (0 == strcmp(OPTION_TITLE_SMZS, desp->title) && 0 == strcmp(OPTION_VALUE_SMZS_SMZDZS, value)) + m_devParam.autofeeder = false; + else if (0 == strcmp(OPTION_TITLE_YSMS, desp->title) && (0 == strcmp(OPTION_VALUE_YSMS_24WCS, value) + || 0 == strcmp(OPTION_VALUE_YSMS_YSZDSB, value))) + m_devParam.pixel = 2; + else if (0 == strcmp(OPTION_TITLE_YSMS, desp->title) && 0 == strcmp(OPTION_VALUE_YSMS_256JHD, value)) + m_devParam.pixel = 1; + else if (0 == strcmp(OPTION_TITLE_YSMS, desp->title) && 0 == strcmp(OPTION_VALUE_YSMS_HB, value)) + m_devParam.pixel = 0; + else if (0 == strcmp(OPTION_TITLE_SMYM, desp->title) && 0 == strcmp(OPTION_VALUE_SMYM_SM, value)) + { + m_devParam.white = false; + m_devParam.single = false; + } + else if (0 == strcmp(OPTION_TITLE_SMYM, desp->title) && 0 == strcmp(OPTION_VALUE_SMYM_DM, value)) + { + m_devParam.white = false; + m_devParam.single = true; + } + else if (0 == strcmp(OPTION_TITLE_SMYM, desp->title) && (0 == strcmp(OPTION_VALUE_SMYM_TGKBYTY, value) + || 0 == strcmp(OPTION_VALUE_SMYM_TGKBYFPZ, value))) + { + m_devParam.white = true; + m_devParam.single = false; + } + else if (0 == strcmp(OPTION_TITLE_WGFX, desp->title) && 0 == strcmp(OPTION_VALUE_WGFX_0, value)) + m_devParam.orentation = 0; + else if (0 == strcmp(OPTION_TITLE_WGFX, desp->title) && 0 == strcmp(OPTION_VALUE_WGFX_90, value)) + m_devParam.orentation = 90; + else if (0 == strcmp(OPTION_TITLE_WGFX, desp->title) && 0 == strcmp(OPTION_VALUE_WGFX_180, value)) + m_devParam.orentation = 180; + else if (0 == strcmp(OPTION_TITLE_WGFX, desp->title) && 0 == strcmp(OPTION_VALUE_WGFX__90, value)) + m_devParam.orentation = 270; + else if (0 == strcmp(OPTION_TITLE_ZZCC, desp->title) && 0 == strcmp(OPTION_VALUE_ZZCC_PPYSCC, value)) + m_devParam.paperType = "Auto"; + else if (0 == strcmp(OPTION_TITLE_ZZCC, desp->title) && 0 == strcmp(OPTION_VALUE_ZZCC_A3, value)) + m_devParam.paperType = "A3"; + else if (0 == strcmp(OPTION_TITLE_ZZCC, desp->title) && 0 == strcmp(OPTION_VALUE_ZZCC_A4, value)) + m_devParam.paperType = "A4"; + } + else if (SANE_TYPE_BUTTON == desp->type) + { + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, " valueType=BUTTON"); + } + else if (SANE_TYPE_GROUP == desp->type) + { + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, " valueType=GROUP"); + } + } + + std::string filePath = GetFilePath(m_devName); + std::string cfgPath = filePath + "config.ini"; + m_devParam.Save(cfgPath); + ret = true; + } + + devParam = m_devParam; + return ret; + } + + bool ManagerV1::SetDevParam(const std::string& devId, const DevParam& devParam) + { + if (m_scanning) + { + return false; + } + + m_devParam = devParam; + + std::string filePath = GetFilePath(m_devName); + std::string cfgPath = filePath + "config.ini"; + m_devParam.Save(cfgPath); + + bool ret = false; + if (NULL != m_devHandle) + { + // m_devParam豸 + + SANE_Int num_dev_options = 0; + sane_control_option(m_devHandle, 0, SANE_ACTION_GET_VALUE, &num_dev_options, NULL); + for (int i = 1; i < num_dev_options; ++i) + { + const SANE_Option_Descriptor* desp = sane_get_option_descriptor(m_devHandle, i); + if (NULL == desp) + continue; + + if (SANE_TYPE_BOOL == desp->type) + { + if (0 == strcmp(desp->title, OPTION_TITLE_TXCF)) + { + SANE_Bool value = SANE_FALSE; + if (0 != m_devParam.splitImage) + value = SANE_TRUE; + sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, &value, NULL); + } + else if (0 == strcmp(desp->title, OPTION_TITLE_HBTXZDYH)) + { + SANE_Bool value = SANE_FALSE; + if (m_devParam.noiseDetachEnable) + value = SANE_TRUE; + sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, &value, NULL); + } + } + else if (SANE_TYPE_INT == desp->type) + { + if (0 == strcmp(desp->title, OPTION_TITLE_TGKBYLMD)) + { + SANE_Int value = m_devParam.discardBlankThre; + sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, &value, NULL); + } + else if (0 == strcmp(desp->title, OPTION_TITLE_FBL)) + { + SANE_Int value = m_devParam.resolution; + sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, &value, NULL); + } + else if (0 == strcmp(desp->title, OPTION_TITLE_SMSL)) + { + SANE_Int value = 1; + sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, &value, NULL); + } + } + else if (SANE_TYPE_FIXED == desp->type) + { + + } + else if (SANE_TYPE_STRING == desp->type) + { + if (0 == strcmp(OPTION_TITLE_SMZS, desp->title)) + { + char value[256] = { 0 }; + strcpy(value, OPTION_VALUE_SMZS_LXSM); + if (!m_devParam.autofeeder) + strcpy(value, OPTION_VALUE_SMZS_SMZDZS); + sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, (void*)value, NULL); + } + else if (0 == strcmp(OPTION_TITLE_YSMS, desp->title)) + { + char value[256] = { 0 }; + strcpy(value, OPTION_VALUE_YSMS_24WCS); + if (1 == m_devParam.pixel) + strcpy(value, OPTION_VALUE_YSMS_256JHD); + else if (0 == m_devParam.pixel) + strcpy(value, OPTION_VALUE_YSMS_HB); + sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, (void*)value, NULL); + } + else if (0 == strcmp(OPTION_TITLE_SMYM, desp->title)) + { + char value[256] = { 0 }; + strcpy(value, OPTION_VALUE_SMYM_SM); + if (m_devParam.single) + strcpy(value, OPTION_VALUE_SMYM_DM); + else if (m_devParam.white) + strcpy(value, OPTION_VALUE_SMYM_TGKBYTY); + sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, (void*)value, NULL); + } + else if (0 == strcmp(OPTION_TITLE_WGFX, desp->title)) + { + char value[256] = { 0 }; + strcpy(value, OPTION_VALUE_WGFX_0); + if (90 == m_devParam.orentation) + strcpy(value, OPTION_VALUE_WGFX_90); + else if (180 == m_devParam.orentation) + strcpy(value, OPTION_VALUE_WGFX_180); + else if (270 == m_devParam.orentation) + strcpy(value, OPTION_VALUE_WGFX__90); + sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, (void*)value, NULL); + } + else if (0 == strcmp(OPTION_TITLE_ZZCC, desp->title)) + { + char value[256] = { 0 }; + strcpy(value, OPTION_VALUE_ZZCC_PPYSCC); + if ("A3" == m_devParam.paperType) + strcpy(value, OPTION_VALUE_ZZCC_A3); + else if ("A4" == m_devParam.paperType) + strcpy(value, OPTION_VALUE_ZZCC_A4); + sane_control_option(m_devHandle, i, SANE_ACTION_SET_VALUE, (void*)value, NULL); + } + } + else if (SANE_TYPE_BUTTON == desp->type) + { + + } + else if (SANE_TYPE_GROUP == desp->type) + { + + } + } + + ret = true; + } + + return ret; + } + + bool ManagerV1::ExportOfd(const std::string& devId, bool isAuto, std::string& imgBase64) + { + imgBase64.clear(); + if (m_scanning) + { + return false; + } + + HGByte* data = NULL; + HGUInt size = 0; + ExportOfdFile(devId, isAuto, &data, &size); + if (NULL != data) + { + imgBase64 = GetBase64(data, size); + delete[] data; + } + + return !imgBase64.empty(); + } + + bool ManagerV1::ExportOfdFile(const std::string& devId, bool isAuto, const std::string& fileName) + { + std::string filePath = GetFilePath(devId); + std::vector fileNameList = GetFileNameList(devId); + if (fileNameList.empty()) + { + return false; + } + + HGOfdImageWriter writer = NULL; + HGImgFmt_OpenOfdImageWriter(fileName.c_str(), &writer); + if (NULL == writer) + { + return false; + } + + bool ret = false; + for (int i = 0; i < (int)fileNameList.size(); ++i) + { + HGImage img = NULL; + std::string fileName = filePath + fileNameList[i]; + HGImgFmt_LoadImage(fileName.c_str(), 0, NULL, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); + if (NULL != img) + { + if (HGBASE_ERR_OK == HGImgFmt_SaveJpegImageToOfdImageWriter(writer, img, NULL)) + ret = true; + HGBase_DestroyImage(img); + } + } + + HGImgFmt_CloseOfdImageWriter(writer); + + if (!ret) + { + HGBase_DeleteFile(fileName.c_str()); + return false; + } + + return true; + } + + bool ManagerV1::ExportOfdFile(const std::string& devId, bool isAuto, HGByte** data, HGUInt* size) + { + *data = NULL; + *size = 0; + if (m_scanning) + { + return false; + } + + HGChar tmpFileName[512]; + HGBase_GetTmpFileName(tmpFileName, 512); + ExportOfdFile(devId, isAuto, tmpFileName); + + *data = GetBuffer(tmpFileName, size); + HGBase_DeleteFile(tmpFileName); + return (NULL != *data); + } + + bool ManagerV1::ExportPdf(const std::string& devId, std::string& imgBase64) + { + imgBase64.clear(); + if (m_scanning) + { + return false; + } + + HGByte* data = NULL; + HGUInt size = 0; + ExportPdfFile(devId, &data, &size); + if (NULL != data) + { + imgBase64 = GetBase64(data, size); + delete[] data; + } + + return !imgBase64.empty(); + } + + bool ManagerV1::ExportPdfFile(const std::string& devId, const std::string& fileName) + { + std::string filePath = GetFilePath(devId); + std::vector fileNameList = GetFileNameList(devId); + if (fileNameList.empty()) + { + return false; + } + + HGPdfImageWriter writer = NULL; + HGImgFmt_OpenPdfImageWriter(fileName.c_str(), &writer); + if (NULL == writer) + { + return false; + } + + bool ret = false; + for (int i = 0; i < (int)fileNameList.size(); ++i) + { + HGImage img = NULL; + std::string fileName = filePath + fileNameList[i]; + HGImgFmt_LoadImage(fileName.c_str(), 0, NULL, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); + if (NULL != img) + { + if (HGBASE_ERR_OK == HGImgFmt_SaveJpegImageToPdfImageWriter(writer, img, NULL)) + ret = true; + HGBase_DestroyImage(img); + } + } + + HGImgFmt_ClosePdfImageWriter(writer); + + if (!ret) + { + HGBase_DeleteFile(fileName.c_str()); + return false; + } + + return true; + } + + bool ManagerV1::ExportPdfFile(const std::string& devId, HGByte** data, HGUInt* size) + { + *data = NULL; + *size = 0; + if (m_scanning) + { + return false; + } + + HGChar tmpFileName[512]; + HGBase_GetTmpFileName(tmpFileName, 512); + ExportPdfFile(devId, tmpFileName); + + *data = GetBuffer(tmpFileName, size); + HGBase_DeleteFile(tmpFileName); + return (NULL != *data); + } + + bool ManagerV1::ExportTiff(const std::string& devId, std::string& imgBase64) + { + imgBase64.clear(); + if (m_scanning) + { + return false; + } + + HGByte* data = NULL; + HGUInt size = 0; + ExportTiffFile(devId, &data, &size); + if (NULL != data) + { + imgBase64 = GetBase64(data, size); + delete[] data; + } + + return !imgBase64.empty(); + } + + bool ManagerV1::ExportTiff(const std::string& devId, const std::string& fileName) + { + std::string filePath = GetFilePath(devId); + std::vector fileNameList = GetFileNameList(devId); + if (fileNameList.empty()) + { + return false; + } + + HGTiffWriter writer = NULL; + HGImgFmt_OpenTiffWriter(fileName.c_str(), &writer); + if (NULL == writer) + { + return false; + } + + bool ret = false; + for (int i = 0; i < (int)fileNameList.size(); ++i) + { + HGImage img = NULL; + std::string fileName = filePath + fileNameList[i]; + HGImgFmt_LoadImage(fileName.c_str(), 0, NULL, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); + if (NULL != img) + { + if (HGBASE_ERR_OK == HGImgFmt_SaveImageToTiffWriter(writer, img, NULL)) + ret = true; + HGBase_DestroyImage(img); + } + } + + HGImgFmt_CloseTiffWriter(writer); + + if (!ret) + { + HGBase_DeleteFile(fileName.c_str()); + return false; + } + + return true; + } + + bool ManagerV1::ExportTiffFile(const std::string& devId, HGByte** data, HGUInt* size) + { + *data = NULL; + *size = 0; + if (m_scanning) + { + return false; + } + + HGChar tmpFileName[512]; + HGBase_GetTmpFileName(tmpFileName, 512); + ExportTiff(devId, tmpFileName); + + *data = GetBuffer(tmpFileName, size); + HGBase_DeleteFile(tmpFileName); + return (NULL != *data); + } + + bool ManagerV1::ExportZip(const std::string& devId, std::string& imgBase64) + { + imgBase64.clear(); + if (m_scanning) + { + return false; + } + + HGByte* data = NULL; + HGUInt size = 0; + ExportZipFile(devId, &data, &size); + if (NULL != data) + { + imgBase64 = GetBase64(data, size); + delete[] data; + } + + return !imgBase64.empty(); + } + + bool ManagerV1::ExportZipFile(const std::string& devId, const std::string& fileName) + { + std::string filePath = GetFilePath(devId); + std::vector fileNameList = GetFileNameList(devId); + if (fileNameList.empty()) + { + return false; + } + + int error = 0; + zip* z = zip_open(StdStringToUtf8(fileName).c_str(), ZIP_CREATE | ZIP_TRUNCATE, &error); + if (NULL == z) + { + return false; + } + + bool ret = false; + for (int i = 0; i < (int)fileNameList.size(); ++i) + { + std::string fileName = filePath + fileNameList[i]; + zip_source_t* s = zip_source_file(z, StdStringToUtf8(fileName).c_str(), 0, 0); + if (NULL != s) + { + if (zip_file_add(z, StdStringToUtf8(fileNameList[i]).c_str(), s, ZIP_FL_OVERWRITE) >= 0) + { + ret = true; + } + else + { + zip_source_free(s); + } + } + } + + zip_close(z); + z = NULL; + + if (!ret) + { + HGBase_DeleteFile(fileName.c_str()); + return false; + } + + return true; + } + + bool ManagerV1::ExportZipFile(const std::string& devId, HGByte** data, HGUInt* size) + { + *data = NULL; + *size = 0; + if (m_scanning) + { + return false; + } + + HGChar tmpFileName[512]; + HGBase_GetTmpFileName(tmpFileName, 512); + ExportZipFile(devId, tmpFileName); + + *data = GetBuffer(tmpFileName, size); + HGBase_DeleteFile(tmpFileName); + return (NULL != *data); + } + + bool ManagerV1::UploadImage(const UploadParam& uploadParam) + { + if (m_scanning) + { + return false; + } + + std::string devId; + GetCurDevId(devId); + + HGChar tmpFileName[512]; + HGBase_GetTmpFileName(tmpFileName, 512); + if (0 == uploadParam.format) + { + strcat(tmpFileName, ".ofd"); + ExportOfdFile(devId, true, tmpFileName); + } + else if (1 == uploadParam.format) + { + strcat(tmpFileName, ".pdf"); + ExportPdfFile(devId, tmpFileName); + } + else + { + strcat(tmpFileName, ".zip"); + ExportZipFile(devId, tmpFileName); + } + + bool ret = false; + if (0 == uploadParam.uploadMode) // HTTP + { + ret = HTTPUpload(tmpFileName, uploadParam.httpUrl, uploadParam.fileName, uploadParam.httpMethod, + uploadParam.header, uploadParam.param); + } + else if (1 == uploadParam.uploadMode) // FTP + { + ret = FTPUpload(tmpFileName, uploadParam.ftpUrl, uploadParam.ftpPort, uploadParam.ftpPath, + uploadParam.ftpUser, uploadParam.ftpPassword, uploadParam.ftpMode); + } + + HGBase_DeleteFile(tmpFileName); + return ret; + } + + bool ManagerV1::SaveImage(const std::string& devId, const std::string& imgName, const std::string& imgBase64) + { + if (m_scanning) + { + return false; + } + + std::string filePath = GetFilePath(devId); + std::string fileName = filePath + imgName; + + size_t pos = imgBase64.find(","); + if (std::string::npos != pos) + return SaveBase64(fileName, imgBase64.c_str() + pos + 1); + else + return SaveBase64(fileName, imgBase64.c_str()); + } + + bool ManagerV1::DeleteImage(const std::string& devId, const std::string& imgName) + { + if (m_scanning) + { + return false; + } + + std::string filePath = GetFilePath(devId); + std::string fileName = filePath + imgName; + + bool ret = false; + if (HGBASE_ERR_OK == HGBase_DeleteFile(fileName.c_str())) + { + std::vector fileNameList = GetFileNameList(devId); + for (int i = 0; i < (int)fileNameList.size(); ++i) + { + if (imgName == fileNameList[i]) + { + fileNameList.erase(fileNameList.begin() + i); + break; + } + } + + SaveFileNameList(devId, fileNameList); + ret = true; + } + + return ret; + } + + bool ManagerV1::DeleteAllImage(const std::string& devId) + { + if (m_scanning) + { + return false; + } + + std::string filePath = GetFilePath(devId); + std::vector fileNameList = GetFileNameList(devId); + + for (int i = 0; i < (int)fileNameList.size(); ++i) + { + std::string fileName = filePath + fileNameList[i]; + HGBase_DeleteFile(fileName.c_str()); + } + fileNameList.clear(); + + SaveFileNameList(devId, fileNameList); + return true; + } + + bool ManagerV1::MergeImage(const std::string& devId, bool isHorizontal, const std::vector& imgIndexList, + std::string& imgName, std::string& imgBase64) + { + imgName.clear(); + imgBase64.clear(); + if (m_scanning) + { + return false; + } + + std::string filePath = GetFilePath(devId); + std::vector fileNameList = GetFileNameList(devId); + + std::vector imgList; + for (int i = 0; i < (int)imgIndexList.size(); ++i) + { + int index = imgIndexList[i]; + if (index >= 0 && index < (int)fileNameList.size()) + { + std::string fileName = filePath + fileNameList[index]; + HGImage img = NULL; + HGImgFmt_LoadImage(fileName.c_str(), 0, NULL, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); + if (NULL != img) + imgList.push_back(img); + } + } + + HGUInt width = 0, height = 0; + for (int i = 0; i < (int)imgList.size(); ++i) + { + HGImageInfo imgInfo; + HGBase_GetImageInfo(imgList[i], &imgInfo); + if (isHorizontal) + { + width += imgInfo.width; + if (imgInfo.height > height) + height = imgInfo.height; + } + else + { + height += imgInfo.height; + if (imgInfo.width > width) + width = imgInfo.width; + } + } + + if (width > 0 && height > 0) + { + HGImage img = NULL; + HGBase_CreateImage(width, height, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); + if (NULL != img) + { + HGUInt x = 0, y = 0; + for (int i = 0; i < (int)imgList.size(); ++i) + { + HGImageInfo imgInfo; + HGBase_GetImageInfo(imgList[i], &imgInfo); + + HGImageRoi roi = { x, y, x + imgInfo.width, y + imgInfo.height }; + HGBase_SetImageROI(img, &roi); + HGBase_CopyImage(imgList[i], img); + HGBase_ResetImageROI(img); + + if (isHorizontal) + x += imgInfo.width; + else + y += imgInfo.height; + } + + int maxIndex = 0; + for (int i = 0; i < (int)fileNameList.size(); ++i) + { + int index = atoi(fileNameList[i].c_str()); + if (index > maxIndex) + maxIndex = index; + } + + HGChar name[256]; + sprintf(name, "%d.%s", maxIndex + 1, m_devParam.format.c_str()); + imgName = name; + + HGBase_CreateDir(filePath.c_str()); + std::string fileName = filePath + imgName; + HGImgFmt_SaveImage(img, 0, NULL, fileName.c_str()); + + fileNameList.push_back(imgName); + SaveFileNameList(devId, fileNameList); + + imgBase64 = "data:image/jpeg;base64,"; + imgBase64 += GetBase64(img); + + HGBase_DestroyImage(img); + } + } + + for (int i = 0; i < (int)imgList.size(); ++i) + { + HGBase_DestroyImage(imgList[i]); + } + + return true; + } + + static bool LowerSort(const std::string& str1, const std::string& str2) + { + return atoi(str1.c_str()) < atoi(str2.c_str()); + } + + bool ManagerV1::BookSort(const std::string& devId, std::vector& imgNameList, + std::vector& imgBase64List) + { + imgNameList.clear(); + imgBase64List.clear(); + if (m_scanning) + { + return false; + } + + std::vector fileNameList = GetFileNameList(devId); + std::sort(fileNameList.begin(), fileNameList.end(), LowerSort); + SaveFileNameList(devId, fileNameList); + + return GetImageByDevId(devId, imgNameList, imgBase64List); + } + + bool ManagerV1::ExchangeImage(const std::string& devId, int index1, int index2) + { + if (m_scanning) + { + return false; + } + + std::string filePath = GetFilePath(devId); + std::vector fileNameList = GetFileNameList(devId); + if (index1 < 0 || index1 >= (int)fileNameList.size() || index2 < 0 || index2 >= (int)fileNameList.size()) + return false; + + std::string imgName1 = fileNameList[index1]; + std::string imgName2 = fileNameList[index2]; + fileNameList[index1] = imgName2; + fileNameList[index2] = imgName1; + + SaveFileNameList(devId, fileNameList); + return true; + } + + bool ManagerV1::GetLastBetch(std::string& devId) + { + devId.clear(); + if (m_scanning) + { + return false; + } + + devId = m_devName; + return true; + } + + bool ManagerV1::ResetPatchIndex() + { + if (m_scanning) + { + return false; + } + + return true; + } + + bool ManagerV1::SplitImage(const std::string& devId, const std::string& imgName, bool isHorizontal, int x1, int y1, int x2, int y2, + std::string& imgName1, std::string& imgBase64_1, std::string& imgName2, std::string& imgBase64_2) + { + imgName1.clear(); + imgBase64_1.clear(); + imgName2.clear(); + imgBase64_2.clear(); + if (m_scanning) + { + return false; + } + + std::string filePath = GetFilePath(devId); + std::string fileName = filePath + imgName; + + HGImage img = NULL; + HGImgFmt_LoadImage(fileName.c_str(), 0, NULL, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); + if (NULL != img) + { + HGImageInfo imgInfo; + HGBase_GetImageInfo(img, &imgInfo); + + for (int i = 0; i < 2; ++i) + { + HGUInt newWidth = isHorizontal ? x1 : imgInfo.width; + if (1 == i) + newWidth = isHorizontal ? (imgInfo.width - x1) : imgInfo.width; + + HGUInt newHeight = isHorizontal ? imgInfo.height : y1; + if (1 == i) + newHeight = isHorizontal ? imgInfo.height : (imgInfo.height - y1); + + HGImage newImg = NULL; + HGBase_CreateImage(newWidth, newHeight, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &newImg); + if (NULL != newImg) + { + HGImageRoi roi; + + if (isHorizontal) + { + roi.left = 0; + roi.top = 0; + roi.right = x1; + roi.bottom = imgInfo.height; + + if (1 == i) + { + roi.left = x1; + roi.right = imgInfo.width; + } + } + else + { + roi.left = 0; + roi.top = 0; + roi.right = imgInfo.width; + roi.bottom = y1; + + if (1 == i) + { + roi.top = y1; + roi.bottom = imgInfo.height; + } + } + + if (1 == i) + { + roi.left = x1; + roi.right = imgInfo.width; + } + + HGBase_SetImageROI(img, &roi); + HGBase_CopyImage(img, newImg); + HGBase_ResetImageROI(img); + + std::vector fileNameList = GetFileNameList(devId); + + int maxIndex = 0; + for (int i = 0; i < (int)fileNameList.size(); ++i) + { + int index = atoi(fileNameList[i].c_str()); + if (index > maxIndex) + maxIndex = index; + } + + HGChar name[256]; + sprintf(name, "%d.%s", maxIndex + 1, m_devParam.format.c_str()); + std::string imgName = name; + + HGBase_CreateDir(filePath.c_str()); + std::string fileName = filePath + imgName; + HGImgFmt_SaveImage(newImg, 0, NULL, fileName.c_str()); + + fileNameList.push_back(imgName); + SaveFileNameList(devId, fileNameList); + + std::string imgBase64 = "data:image/jpeg;base64,"; + imgBase64 += GetBase64(newImg); + + if (0 == i) + { + imgName1 = imgName; + imgBase64_1 = imgBase64; + } + else + { + imgName2 = imgName; + imgBase64_2 = imgBase64; + } + + HGBase_DestroyImage(newImg); + } + } + + HGBase_DestroyImage(img); + } + + return true; + } + + bool ManagerV1::GetDevSerialNo(const std::string& devId, std::string& serialNo) + { + serialNo.clear(); + if (m_scanning) + { + return false; + } + + serialNo = devId; + return true; + } + + bool ManagerV1::GetImageBase64(const std::string& devId, const std::string& imgName, std::string& imgBase64) + { + imgBase64.clear(); + if (m_scanning) + { + return false; + } + + std::string filePath = GetFilePath(devId); + std::string fileName = filePath + imgName; + + HGImage img = NULL; + HGImgFmt_LoadImage(fileName.c_str(), 0, NULL, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); + if (NULL != img) + { + imgBase64 = "data:image/jpeg;base64,"; + imgBase64 += GetBase64(img); + HGBase_DestroyImage(img); + } + + return true; + } + + std::string ManagerV1::GetFilePath(const std::string& devId) + { + HGChar docsPath[256]; + HGBase_GetDocumentsPath(docsPath, 256); + HGChar imgPath[512]; + sprintf(imgPath, "%s%s/", docsPath, Utf8ToStdString(devId).c_str()); + HGChar stdImgPath[512]; + HGBase_StandardiseFileName(imgPath, stdImgPath, 512); + + return stdImgPath; + } + + std::vector ManagerV1::GetFileNameList(const std::string& devId) + { + std::vector fileNameList; + + std::string filePath = GetFilePath(devId); + std::string cfgName = filePath + "images.txt"; + FILE* file = fopen(cfgName.c_str(), "r"); + if (NULL != file) + { + while (feof(file) == 0) + { + char lineContent[256] = { 0 }; + if (NULL == fgets(lineContent, 256, file) || '\n' == *lineContent) + { + continue; + } + + if (lineContent[strlen(lineContent) - 1] == '\n') + lineContent[strlen(lineContent) - 1] = 0; + + fileNameList.push_back(lineContent); + } + + fclose(file); + } + + return fileNameList; + } + + bool ManagerV1::SaveFileNameList(const std::string& devId, const std::vector& fileNameList) + { + bool ret = false; + + std::string filePath = GetFilePath(devId); + std::string cfgName = filePath + "images.txt"; + FILE* file = fopen(cfgName.c_str(), "w"); + if (NULL != file) + { + for (int i = 0; i < (int)fileNameList.size(); ++i) + { + fwrite(fileNameList[i].c_str(), 1, fileNameList[i].size(), file); + fwrite("\n", 1, strlen("\n"), file); + } + + fclose(file); + ret = true; + } + + return ret; + } + + std::string ManagerV1::GetBase64(HGImage image) + { + std::string strBase64; + + if (NULL != image) + { + HGBuffer buffer = NULL; + HGImgFmt_SaveJpegImageToBuffer(image, NULL, &buffer); + if (NULL != buffer) + { + HGByte* data; + HGBase_GetBufferData(buffer, &data); + HGUSize size; + HGBase_GetBufferSize(buffer, &size); + + HGSize base64Size = 0; + HGBase_Base64Encode(data, size, NULL, &base64Size); + uint8_t* base64 = new uint8_t[base64Size + 1]; + HGBase_Base64Encode(data, size, base64, &base64Size); + base64[base64Size] = 0; + strBase64 = (const char*)base64; + delete[] base64; + + HGBase_DestroyBuffer(buffer); + } + } + + return strBase64; + } + + std::string ManagerV1::GetBase64(const HGByte* data, HGUInt size) + { + std::string strBase64; + + if (NULL != data && 0 != size) + { + HGSize base64Size = 0; + HGBase_Base64Encode(data, size, NULL, &base64Size); + uint8_t* base64 = new uint8_t[base64Size + 1]; + HGBase_Base64Encode(data, size, base64, &base64Size); + base64[base64Size] = 0; + strBase64 = (const char*)base64; + delete[] base64; + } + + return strBase64; + } + + std::string ManagerV1::GetBase64(const std::string& fileName) + { + std::string strBase64; + + FILE* file = fopen(fileName.c_str(), "rb"); + if (NULL != file) + { + fseek(file, 0, SEEK_END); + long size = ftell(file); + fseek(file, 0, SEEK_SET); + + if (size > 0) + { + HGByte* data = new HGByte[size]; + long readLen = (long)fread(data, 1, size, file); + if (readLen == size) + { + HGSize base64Size = 0; + HGBase_Base64Encode(data, size, NULL, &base64Size); + uint8_t* base64 = new uint8_t[base64Size + 1]; + HGBase_Base64Encode(data, size, base64, &base64Size); + base64[base64Size] = 0; + strBase64 = (const char*)base64; + delete[] base64; + } + + delete[] data; + } + + fclose(file); + } + + return strBase64; + } + + HGByte* ManagerV1::GetBuffer(const std::string& fileName, HGUInt* size) + { + HGByte* data = NULL; + *size = 0; + + FILE* file = fopen(fileName.c_str(), "rb"); + if (NULL != file) + { + fseek(file, 0, SEEK_END); + *size = ftell(file); + fseek(file, 0, SEEK_SET); + + if (*size > 0) + { + data = new HGByte[*size]; + + HGUInt readLen = (HGUInt)fread(data, 1, *size, file); + if (readLen != *size) + { + delete[] data; + data = NULL; + *size = 0; + } + } + + fclose(file); + } + + return data; + } + + bool ManagerV1::SaveBase64(const std::string& fileName, const char* base64) + { + if (NULL == base64 || 0 == *base64) + return false; + + HGUInt base64Size = (HGUInt)strlen(base64); + + bool ret = false; + FILE* file = fopen(fileName.c_str(), "wb"); + if (NULL != file) + { + HGSize size = 0; + HGBase_Base64Decode((const HGByte*)base64, (HGSize)base64Size, NULL, &size); + uint8_t* data = new HGByte[size]; + HGBase_Base64Decode((const HGByte*)base64, (HGSize)base64Size, data, &size); + + size_t writeLen = fwrite(data, 1, size, file); + if (writeLen == (size_t)size) + ret = true; + + delete[] data; + fclose(file); + } + + return ret; + } + + static std::string MakePreFileData(const char* pszBoundary, const char* pszRemoteFileName) + { + char data[512]; + sprintf(data, "--%s\r\nContent-Disposition: form-data; name=\"filedata\"; filename=\"%s\"\r\n", + pszBoundary, pszRemoteFileName); + std::string ret = data; + ret += "Content-Type: application/octet-stream; charset=utf-8\r\n"; + ret += "Content-Transfer-Encoding: binary\r\n"; + ret += "\r\n"; + return ret; + } + + static std::string MakePostFileData(const char* pszBoundary) + { + char data[512]; + sprintf(data, "\r\n--%s\r\nContent-Disposition: form-data; name=\"submitted\"\r\n\r\nsubmit\r\n--%s--\r\n", pszBoundary, pszBoundary); + return data; + } + + static void ParseHttpURL(const std::string& url, std::string& addr, int& port, std::string& path) + { + addr.clear(); + port = 0; + path.clear(); + + std::string url2; + std::string::size_type pos = url.find("//"); + if (std::string::npos != pos) + { + std::string protocal = url.substr(0, pos); + if (protocal != "http:") + { + return; + } + + url2 = url.substr(pos + 2); + } + else + { + url2 = url; + } + + std::string addr_port; + pos = url2.find("/"); + if (std::string::npos != pos) + { + addr_port = url2.substr(0, pos); + path = url2.substr(pos); + } + else + { + addr_port = url2; + } + + pos = addr_port.find(":"); + if (std::string::npos != pos) + { + addr = addr_port.substr(0, pos); + port = atoi(addr_port.substr(pos + 1).c_str()); + } + else + { + addr = addr_port; + port = 80; + } + } + + bool ManagerV1::HTTPUpload(const std::string& localFileName, const std::string& httpUrl, const std::string& remoteFileName, + const std::string& httpMethod, const std::string& header, const std::string& param) + { + unsigned char* fileData = NULL; + long fileSize = 0; + FILE* file = fopen(localFileName.c_str(), "rb"); + if (NULL != file) + { + fseek(file, 0, SEEK_END); + fileSize = ftell(file); + fseek(file, 0, SEEK_SET); + + if (0 != fileSize) + { + fileData = new unsigned char[fileSize]; + fread(fileData, 1, fileSize, file); + } + + fclose(file); + } + + if (NULL == fileData) + { + return false; + } + + std::string addr; + int port; + std::string path; + ParseHttpURL(httpUrl, addr, port, path); + +#if defined(HG_CMP_MSC) + SOCKET sockClient = socket(AF_INET, SOCK_STREAM, 0); + assert(INVALID_SOCKET != sockClient); +#else + int sockClient = socket(AF_INET, SOCK_STREAM, 0); + assert(-1 != sockClient); +#endif + +#if defined(HG_CMP_MSC) + u_long ul = 1; // Ϊ + ioctlsocket(sockClient, FIONBIO, &ul); +#else + ioctl(sockClient, FIONBIO, 1); +#endif + +#if defined(HG_CMP_MSC) + SOCKADDR_IN addrServer = { 0 }; + addrServer.sin_addr.S_un.S_addr = inet_addr(addr.c_str()); + addrServer.sin_family = AF_INET; + addrServer.sin_port = htons(port); + if (0 != connect(sockClient, (SOCKADDR*)&addrServer, sizeof(SOCKADDR_IN))) +#else + struct sockaddr_in addrServer = { 0 }; + addrServer.sin_addr.s_addr = inet_addr(addr.c_str()); + addrServer.sin_family = AF_INET; + addrServer.sin_port = htons(port); + if (0 != connect(sockClient, (struct sockaddr*)&addrServer, sizeof(addrServer))) +#endif + { + fd_set fds; + FD_ZERO(&fds); + FD_SET(sockClient, &fds); + timeval tm; + tm.tv_sec = 1; + tm.tv_usec = 0; + + if (select((int)(sockClient + 1), NULL, &fds, NULL, &tm) <= 0) + { +#if defined(HG_CMP_MSC) + closesocket(sockClient); +#else + close(sockClient); +#endif + delete[] fileData; + return false; + } + + if (!FD_ISSET(sockClient, &fds)) + { +#if defined(HG_CMP_MSC) + closesocket(sockClient); +#else + close(sockClient); +#endif + delete[] fileData; + return false; + } + } + +#if defined(HG_CMP_MSC) + ul = 0; // Ϊ + ioctlsocket(sockClient, FIONBIO, &ul); +#else + ioctl(sockClient, FIONBIO, 0); +#endif + + char remoteName[256]; + HGBase_GetFileName(localFileName.c_str(), remoteName, 256); + + bool ret = false; + + const char* pszBoundary = "---------------------------7d33a816d302b6"; + + std::string strPreFileData = MakePreFileData(pszBoundary, remoteName); + std::string strPostFileData = MakePostFileData(pszBoundary); + + char hostname[128]; + gethostname(hostname, 128); + + std::string head; + char data[512]; + sprintf(data, "POST %s HTTP/1.1\r\nHost: %s\r\n", path.c_str(), hostname); + head += data; + sprintf(data, "Content-Type: multipart/form-data; boundary=%s\r\n", pszBoundary); + head += data; + sprintf(data, "Content-Length: %d\r\n\r\n", (int)strPreFileData.size() + (int)fileSize + (int)strPostFileData.size()); + head += data; + + send(sockClient, head.c_str(), (int)head.size(), 0); + send(sockClient, strPreFileData.c_str(), (int)strPreFileData.size(), 0); + send(sockClient, (const char*)fileData, (int)fileSize, 0); + send(sockClient, strPostFileData.c_str(), (int)strPostFileData.size(), 0); + + char recvBuf[2048] = { 0 }; + recv(sockClient, recvBuf, 2048, 0); + + std::string strRecv(recvBuf); + std::string::size_type pos = strRecv.find("\r\n"); + if (pos != std::string::npos) + { + std::string head = strRecv.substr(0, pos); + if (head.find("200") != std::string::npos) + { + ret = true; + } + } + +#if defined(HG_CMP_MSC) + closesocket(sockClient); +#else + close(sockClient); +#endif + delete[] fileData; + return ret; + } + + static size_t read_callback(char* ptr, size_t size, size_t nmemb, void* stream) + { + unsigned long nread; + /* in real-world cases, this would probably get this data differently + as this fread() stuff is exactly what the library already would do + by default internally */ + size_t retcode = fread(ptr, size, nmemb, (FILE*)stream); + + if (retcode > 0) + { + nread = (unsigned long)retcode; + //fprintf(stderr, "*** We read %lu bytes from file\n", nread); + } + + return retcode; + } + + bool ManagerV1::FTPUpload(const std::string& localFileName, const std::string& ftpUrl, int ftpPort, const std::string& ftpPath, + const std::string& ftpUser, const std::string& ftpPassword, int ftpMode) + { + FILE* file = fopen(localFileName.c_str(), "rb"); + if (NULL == file) + { + return false; + } + + bool ret = false; + fseek(file, 0, SEEK_END); + long fsize = ftell(file); + fseek(file, 0, SEEK_SET); + + curl_global_init(CURL_GLOBAL_ALL); + + /* get a curl handle */ + CURL* curl = curl_easy_init(); + if (NULL != curl) + { + char tmpName[256]; + HGBase_GetUuid(tmpName, 256); + char remoteName[256]; + HGBase_GetFileName(localFileName.c_str(), remoteName, 256); + + char ftp_rnfr[512]; + sprintf(ftp_rnfr, "RNFR %s", tmpName); + char ftp_rnto[512]; + sprintf(ftp_rnto, "RNTO %s", remoteName); + + struct curl_slist* headerlist = NULL; + headerlist = curl_slist_append(headerlist, ftp_rnfr); + headerlist = curl_slist_append(headerlist, ftp_rnto); + + /* we want to use our own read function */ + curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback); + + curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L); + + char url[512]; + if (!ftpUser.empty() && !ftpPassword.empty()) + { + sprintf(url, "ftp://%s:%s@%s:%d%s/%s", ftpUser.c_str(), ftpPassword.c_str(), + ftpUrl.c_str(), ftpPort, ftpPath.c_str(), tmpName); + } + else + { + sprintf(url, "ftp://%s:%d%s/%s", ftpUrl.c_str(), ftpPort, ftpPath.c_str(), tmpName); + } + curl_easy_setopt(curl, CURLOPT_URL, url); + + curl_easy_setopt(curl, CURLOPT_FTP_CREATE_MISSING_DIRS, 1); + + /* pass in that last of FTP commands to run after the transfer */ + curl_easy_setopt(curl, CURLOPT_POSTQUOTE, headerlist); + + /* now specify which file to upload */ + curl_easy_setopt(curl, CURLOPT_READDATA, file); + + /* Set the size of the file to upload (optional). If you give a *_LARGE + option you MUST make sure that the type of the passed-in argument is a + curl_off_t. If you use CURLOPT_INFILESIZE (without _LARGE) you must + make sure that to pass in a type 'long' argument. */ + curl_easy_setopt(curl, CURLOPT_INFILESIZE_LARGE, (curl_off_t)fsize); + + /* Now run off and do what you have been told! */ + CURLcode res = curl_easy_perform(curl); + /* Check for errors */ + if (res != CURLE_OK) + fprintf(stderr, "curl_easy_perform() failed: %s\n", curl_easy_strerror(res)); + else + ret = true; + + /* clean up the FTP commands list */ + curl_slist_free_all(headerlist); + + /* always cleanup */ + curl_easy_cleanup(curl); + } + fclose(file); /* close the local file */ + + curl_global_cleanup(); + return ret; + } + + int ManagerV1::sane_ex_callback(SANE_Handle hdev, int code, void* data, unsigned int* len, void* param) + { + (void)hdev; + (void)len; + + ManagerV1* p = (ManagerV1*)param; + switch (code) + { + case SANE_EVENT_DEVICE_ARRIVED: + { + SANE_Device* sane_dev = (SANE_Device*)data; + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "device arrive, name=%s", Utf8ToStdString(sane_dev->name).c_str()); + + HGBase_EnterLock(p->m_lock); + if (NULL != p->m_scanEvent) + p->m_scanEvent(SCANEVENT_ARRIVE, (void*)sane_dev->name, (void*)0, p->m_scanParam); + HGBase_LeaveLock(p->m_lock); + + OpenDevParam* openDevParam = new OpenDevParam; + openDevParam->mgr = p; + openDevParam->devName = sane_dev->name; + + HGMsg msg; + msg.id = MSGID_OPEN_DEVICE; + msg.data = openDevParam; + if (HGBASE_ERR_OK != HGBase_PostPumpMessage(p->m_msgPump, &msg)) + { + delete openDevParam; + } + } + break; + case SANE_EVENT_DEVICE_LEFT: + { + SANE_Device* sane_dev = (SANE_Device*)data; + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "device remove, name=%s", Utf8ToStdString(sane_dev->name).c_str()); + + HGBase_EnterLock(p->m_lock); + if (NULL != p->m_scanEvent) + p->m_scanEvent(SCANEVENT_REMOVE, (void*)sane_dev->name, (void*)0, p->m_scanParam); + HGBase_LeaveLock(p->m_lock); + + CloseDevParam* closeDevParam = new CloseDevParam; + closeDevParam->mgr = p; + closeDevParam->devName = sane_dev->name; + + HGMsg msg; + msg.id = MSGID_CLOSE_DEVICE; + msg.data = closeDevParam; + if (HGBASE_ERR_OK != HGBase_PostPumpMessage(p->m_msgPump, &msg)) + { + delete closeDevParam; + } + } + break; + case SANE_EVENT_STATUS: + { + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "SANE_EVENT_STATUS, msg=%s", Utf8ToStdString((char*)data).c_str()); + + HGBase_EnterLock(p->m_lock); + if (NULL != p->m_scanEvent) + p->m_scanEvent(SCANEVENT_STATUS, (void*)data, (void*)0, p->m_scanParam); + HGBase_LeaveLock(p->m_lock); + } + break; + case SANE_EVENT_ERROR: + { + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "SANE_EVENT_ERROR, msg=%s", Utf8ToStdString((char*)data).c_str()); + + HGBase_EnterLock(p->m_lock); + if (NULL != p->m_scanEvent) + p->m_scanEvent(SCANEVENT_ERROR, (void*)data, (void*)0, p->m_scanParam); + HGBase_LeaveLock(p->m_lock); + } + break; + case SANE_EVENT_WORKING: + { + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "SANE_EVENT_WORKING, msg=%s", Utf8ToStdString((char*)data).c_str()); + + HGBase_EnterLock(p->m_lock); + if (NULL != p->m_scanEvent) + p->m_scanEvent(SCANEVENT_WORKING, (void*)data, (void*)0, p->m_scanParam); + HGBase_LeaveLock(p->m_lock); + } + break; + case SANE_EVENT_IMAGE_OK: + { + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "SANE_EVENT_IMAGE_OK"); + + SANE_Image* sane_img = (SANE_Image*)data; + + HGUInt imgType = 0; + if (sane_img->header.format == SANE_FRAME_GRAY) + imgType = HGBASE_IMGTYPE_GRAY; + else if (sane_img->header.format == SANE_FRAME_RGB) + imgType = HGBASE_IMGTYPE_RGB; + + HGByte* data = sane_img->data; + HGImageInfo imgInfo = { (HGUInt)sane_img->header.pixels_per_line, (HGUInt)sane_img->header.lines, + imgType, (HGUInt)sane_img->header.bytes_per_line, HGBASE_IMGORIGIN_TOP }; + + HGImage img = NULL; + HGBase_CreateImageFromData(data, &imgInfo, nullptr, HGBASE_IMGTYPE_RGB, HGBASE_IMGORIGIN_TOP, &img); + if (NULL != img) + { + std::string filePath = GetFilePath(p->m_devName); + std::vector fileNameList = GetFileNameList(p->m_devName); + + int maxIndex = 0; + for (int i = 0; i < (int)fileNameList.size(); ++i) + { + int index = atoi(fileNameList[i].c_str()); + if (index > maxIndex) + maxIndex = index; + } + + HGChar name[256]; + sprintf(name, "%d.%s", maxIndex + 1, p->m_devParam.format.c_str()); + std::string imgName = name; + + HGBase_CreateDir(filePath.c_str()); + std::string fileName = filePath + imgName; + HGImgFmt_SaveImage(img, 0, NULL, fileName.c_str()); + + if (0 == p->m_devParam.uploadMode) // HTTP + { + HTTPUpload(fileName, p->m_devParam.httpUrl, p->m_devParam.fileName, p->m_devParam.httpMethod, + p->m_devParam.header, p->m_devParam.param); + } + else if (1 == p->m_devParam.uploadMode) // FTP + { + FTPUpload(fileName, p->m_devParam.ftpUrl, p->m_devParam.ftpPort, p->m_devParam.ftpPath, + p->m_devParam.ftpUser, p->m_devParam.ftpPassword, p->m_devParam.ftpMode); + } + + if (p->m_scanIsInsert) + { + int index = -1; + for (int i = 0; i < (int)fileNameList.size(); ++i) + { + if (fileNameList[i] == p->m_scanInsertImgName) + { + index = i; + break; + } + } + + if (-1 != index) + { + fileNameList.insert(fileNameList.begin() + index, imgName); + } + else + { + fileNameList.push_back(imgName); + } + } + else + { + fileNameList.push_back(imgName); + } + + SaveFileNameList(p->m_devName, fileNameList); + + std::string imgBase64 = "data:image/jpeg;base64,"; + imgBase64 += GetBase64(img); + + HGBase_EnterLock(p->m_lock); + if (NULL != p->m_scanEvent) + p->m_scanEvent(SCANEVENT_IMAGE, (void*)imgName.c_str(), (void*)imgBase64.c_str(), p->m_scanParam); + HGBase_LeaveLock(p->m_lock); + + HGBase_DestroyImage(img); + } + } + break; + case SANE_EVENT_SCAN_FINISHED: + { + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "SANE_EVENT_SCAN_FINISHED, msg=%s", Utf8ToStdString((char*)data).c_str()); + + HGBase_EnterLock(p->m_lock); + if (NULL != p->m_scanEvent) + p->m_scanEvent(SCANEVENT_FINISH, (void*)data, (void*)0, p->m_scanParam); + HGBase_LeaveLock(p->m_lock); + + ScanFinishParam* scanFinishParam = new ScanFinishParam; + scanFinishParam->mgr = p; + + HGMsg msg; + msg.id = MSGID_SCAN_FINISH; + msg.data = scanFinishParam; + if (HGBASE_ERR_OK != HGBase_PostPumpMessage(p->m_msgPump, &msg)) + { + delete scanFinishParam; + } + } + break; + } + + return 0; + } +} \ No newline at end of file diff --git a/sdk/webservice/ManagerV1.h b/sdk/webservice/ManagerV1.h new file mode 100644 index 00000000..9289a6d0 --- /dev/null +++ b/sdk/webservice/ManagerV1.h @@ -0,0 +1,194 @@ +#pragma once + +#include "base/HGDef.h" +#include "base/HGInc.h" +#include "base/HGLock.h" +#include "base/HGImage.h" +#include "base/HGMsgPump.h" +#include "sane/sane_ex.h" +#include "sane/sane_option_definitions.h" +#include "Manager.h" +#include "Msg.h" +#include + +namespace ver_1 +{ + enum + { + SCANEVENT_ARRIVE = 1L, + SCANEVENT_REMOVE, + SCANEVENT_STATUS, + SCANEVENT_WORKING, + SCANEVENT_IMAGE, + SCANEVENT_FINISH, + SCANEVENT_ERROR + }; + + struct DevParam + { + DevParam(); + ~DevParam(); + + void Reset(); + void Load(const std::string& cfgPath); + void Save(const std::string& cfgPath); + + std::string device; // 设备名称，默认null + bool autofeeder; // 自动进纸，默认true + int pixel; // 扫描模式 0：黑白 1：灰度 2：彩色，默认1 + bool white; // 丢弃空白页，默认false + int discardBlankThre; // 跳过空白页阈值 1­-100 默认值5 + bool single; // 单页扫描，默认false + std::string format; // 输出格式 jpg png bmp tiff pdf ofd，默认jpg + int resolution; // 扫描分辨率 范围 100­-600 默认值200 + int orentation; // 图片旋转 0：原图 90：度 180：旋转180度 270：旋转270度，默认0 + std::string paperType; // 扫描幅面 A3：A3幅面 Auto:自适应幅面 A4：A4幅面，默认Auto + int splitImage; // 图像分割 0：disable 1：垂直分割 2： 水平分割，默认0 + bool noiseDetachEnable; // 去除噪点，默认true + int noiseDetach; // 噪点阈值 范围：10­-50 默认值15 + + int uploadMode; // 是否边扫边上传 0：http 1：ftp 2: 不上传，默认2 + std::string httpUrl; // 上传地址，默认null + std::string fileName; // 接收文件参数名，默认null + std::string httpMethod; // 上传方式 GET POST PUT，默认null + std::string header; // 请求头，默认null + std::string param; // 参数 json格式，默认null + std::string ftpUrl; // ftp 地址，默认null + std::string ftpPath; // 路径，默认/images + std::string ftpUser; // ftp 用户名，默认null + std::string ftpPassword; // ftp 密码，默认null + int ftpPort; // 端口号，默认21 + int ftpMode; // 连接模式 1：主动 2：被动，默认2 + }; + + struct UploadParam + { + UploadParam() + { + uploadMode = 2; + ftpPort = 21; + ftpMode = 2; + format = 2; + } + + int uploadMode; // 上传模式 0：http 1：ftp 默认0 + std::string httpUrl; // 上传地址，默认null + std::string fileName; // 接收文件参数名，默认null + std::string httpMethod; // 上传方式 GET POST PUT，默认null + std::string header; // 请求头，默认null + std::string param; // 参数 json格式，默认null + std::string ftpUrl; // ftp 地址，默认null + std::string ftpPath; // 路径，默认/images + std::string ftpUser; // ftp 用户名，默认null + std::string ftpPassword; // ftp 密码，默认null + int ftpPort; // 端口号，默认21 + int ftpMode; // 连接模式 1：主动 2：被动，默认2 + int format; // 上传格式 0: ofd 1: pdf 2: zip, 默认2 + }; + + typedef void (*ScanEvent)(HGUInt event, void* value1, void* value2, void* param); + + class ManagerV1 : public Manager + { + public: + ManagerV1(HGMsgPump msgPump); + virtual ~ManagerV1(); + + // 打开设备 + void OpenDev(const OpenDevParam* param); + // 关闭设备 + void CloseDev(const CloseDevParam* param); + // 扫描完成 + void ScanFinish(const ScanFinishParam* param); + + // 设置回调 + void SetScanEvent(ScanEvent event, void* param); + // 清理回调 + void ResetScanEvent(); + // 扫描 + bool Scan(const std::string& insertImgName, bool isInsert); + // 停止扫描 + bool StopScan(); + // 获取当前连接的设备ID + bool GetCurDevId(std::string& devId); + // 获取连接的设备名列表 + bool GetDevNames(std::vector& devNameList); + // 获取上次的扫描结果 + bool GetImageByDevId(const std::string& devId, std::vector& imgNameList, + std::vector& imgBase64List); + // 获取配置参数 + bool GetDevParam(const std::string& devId, DevParam& devParam); + // 设置配置参数 + bool SetDevParam(const std::string& devId, const DevParam& devParam); + // 生成OFD + bool ExportOfd(const std::string& devId, bool isAuto, std::string& imgBase64); + bool ExportOfdFile(const std::string& devId, bool isAuto, const std::string& fileName); + bool ExportOfdFile(const std::string& devId, bool isAuto, HGByte** data, HGUInt* size); + // 生成PDF + bool ExportPdf(const std::string& devId, std::string& imgBase64); + bool ExportPdfFile(const std::string& devId, const std::string& fileName); + bool ExportPdfFile(const std::string& devId, HGByte** data, HGUInt* size); + // 生成TIFF + bool ExportTiff(const std::string& devId, std::string& imgBase64); + bool ExportTiff(const std::string& devId, const std::string& fileName); + bool ExportTiffFile(const std::string& devId, HGByte** data, HGUInt* size); + // 生成ZIP + bool ExportZip(const std::string& devId, std::string& imgBase64); + bool ExportZipFile(const std::string& devId, const std::string& fileName); + bool ExportZipFile(const std::string& devId, HGByte** data, HGUInt* size); + // 上传图像 + bool UploadImage(const UploadParam& uploadParam); + // 保存图片 + bool SaveImage(const std::string& devId, const std::string& imgName, const std::string& imgBase64); + // 删除图片 + bool DeleteImage(const std::string& devId, const std::string& imgName); + // 删除所有图片 + bool DeleteAllImage(const std::string& devId); + // 图像合并 + bool MergeImage(const std::string& devId, bool isHorizontal, const std::vector& imgIndexList, + std::string& imgName, std::string& imgBase64); + // 自动排序 + bool BookSort(const std::string& devId, std::vector& imgNameList, + std::vector& imgBase64List); + // 交换文件 + bool ExchangeImage(const std::string& devId, int index1, int index2); + // 获取最后批次 + bool GetLastBetch(std::string& devId); + // 重置索引 + bool ResetPatchIndex(); + // 拆分图像 + bool SplitImage(const std::string& devId, const std::string& imgName, bool isHorizontal, int x1, int y1, int x2, int y2, + std::string& imgName1, std::string& imgBase64_1, std::string& imgName2, std::string& imgBase64_2); + // 获取设备序列号 + bool GetDevSerialNo(const std::string& devId, std::string& serialNo); + // 获取图像Base64 + bool GetImageBase64(const std::string& devId, const std::string& imgName, std::string& imgBase64); + + private: + static std::string GetFilePath(const std::string& devId); + static std::vector GetFileNameList(const std::string& devId); + static bool SaveFileNameList(const std::string& devId, const std::vector& fileNameList); + static std::string GetBase64(HGImage image); + static std::string GetBase64(const HGByte* data, HGUInt size); + static std::string GetBase64(const std::string& fileName); + static HGByte* GetBuffer(const std::string& fileName, HGUInt* size); + static bool SaveBase64(const std::string& fileName, const char* base64); + static bool HTTPUpload(const std::string& localFileName, const std::string& httpUrl, const std::string& remoteFileName, + const std::string& httpMethod, const std::string& header, const std::string& param); + static bool FTPUpload(const std::string& localFileName, const std::string& ftpUrl, int ftpPort, const std::string& ftpPath, + const std::string& ftpUser, const std::string& ftpPassword, int ftpMode); + static int sane_ex_callback(SANE_Handle hdev, int code, void* data, unsigned int* len, void* param); + + private: + HGLock m_lock; + std::string m_devName; + SANE_Handle m_devHandle; + DevParam m_devParam; + ScanEvent m_scanEvent; + void* m_scanParam; + + std::string m_scanInsertImgName; + bool m_scanIsInsert; + bool m_scanning; + }; +} \ No newline at end of file diff --git a/sdk/webservice/ManagerV2.cpp b/sdk/webservice/ManagerV2.cpp new file mode 100644 index 00000000..9955177f --- /dev/null +++ b/sdk/webservice/ManagerV2.cpp @@ -0,0 +1,306 @@ +#include "ManagerV2.h" +#include "base/HGBuffer.h" +#include "base/HGBase64.h" +#include "base/HGUtility.h" +#include "base/HGInfo.h" +#include "imgfmt/HGJpeg.h" +#include "imgfmt/HGOfd.h" +#include "imgfmt/HGPdf.h" +#include "imgfmt/HGTiff.h" +#include "imgfmt/HGImgFmt.h" +#include "HGString.h" + +namespace ver_2 +{ + ManagerV2::ManagerV2(HGMsgPump msgPump) + : Manager(msgPump) + { + + } + + ManagerV2::~ManagerV2() + { + + } + + void ManagerV2::ScanFinish(const ScanFinishParam* param) + { + assert(NULL != param && this == param->mgr); + } + + int ManagerV2::SetGlobalConfig(const GlobalConfig& cfg) + { + if ("date_time" != cfg.fileNameMode && "random" != cfg.fileNameMode) + return -1; + if ("jpg" != cfg.imageFormat && "bmp" != cfg.imageFormat && "png" != cfg.imageFormat && "tif" != cfg.imageFormat + && "pdf" != cfg.imageFormat && "ofd" != cfg.imageFormat && "ocr-pdf" != cfg.imageFormat && "ocr-ofd" != cfg.imageFormat) + return -1; + if (cfg.imageJpegQuality < 0 || cfg.imageJpegQuality > 100) + return -1; + if ("none" != cfg.imageTiffCompression && "lzw" != cfg.imageTiffCompression && "jpeg" != cfg.imageTiffCompression) + return -1; + if (cfg.imageTiffJpegQuality < 0 || cfg.imageTiffJpegQuality > 100) + return -1; + + SetCfgStringValue("global", "fileSavePath", Utf8ToStdString(cfg.fileSavePath)); + SetCfgStringValue("global", "fileNamePrefix", Utf8ToStdString(cfg.fileNamePrefix)); + SetCfgStringValue("global", "fileNameMode", cfg.fileNameMode); + SetCfgStringValue("global", "imageFormat", cfg.imageFormat); + SetCfgIntValue("global", "imageJpegQuality", cfg.imageJpegQuality); + SetCfgStringValue("global", "imageTiffCompression", cfg.imageTiffCompression); + SetCfgIntValue("global", "imageTiffJpegQuality", cfg.imageTiffJpegQuality); + SetCfgStringValue("global", "uploadHttpHost", cfg.uploadHttpHost); + SetCfgIntValue("global", "uploadHttpPort", cfg.uploadHttpPort); + SetCfgStringValue("global", "uploadHttpPath", cfg.uploadHttpPath); + SetCfgStringValue("global", "uploadFtpUser", cfg.uploadFtpUser); + SetCfgStringValue("global", "uploadFtpPassword", cfg.uploadFtpPassword); + SetCfgStringValue("global", "uploadFtpHost", cfg.uploadFtpHost); + SetCfgIntValue("global", "uploadFtpPort", cfg.uploadFtpPort); + return 0; + } + + int ManagerV2::GetGlobalConfig(GlobalConfig& cfg) + { + HGChar docPath[256]; + HGBase_GetDocumentsPath(docPath, 256); + cfg.fileSavePath = StdStringToUtf8(GetCfgStringValue("global", "fileSavePath", docPath)); + cfg.fileNamePrefix = StdStringToUtf8(GetCfgStringValue("global", "fileNamePrefix", "Huago")); + cfg.fileNameMode = GetCfgStringValue("global", "fileNameMode", "date_time"); + cfg.imageFormat = GetCfgStringValue("global", "imageFormat", "jpg"); + cfg.imageJpegQuality = GetCfgIntValue("global", "imageJpegQuality", 80); + cfg.imageTiffCompression = GetCfgStringValue("global", "imageTiffCompression", "lzw"); + cfg.imageTiffJpegQuality = GetCfgIntValue("global", "imageTiffJpegQuality", 80); + cfg.uploadHttpHost = GetCfgStringValue("global", "uploadHttpHost", ""); + cfg.uploadHttpPort = GetCfgIntValue("global", "uploadHttpPort", 80); + cfg.uploadHttpPath = GetCfgStringValue("global", "uploadHttpPath", "/upload.cgi"); + cfg.uploadFtpUser = GetCfgStringValue("global", "uploadFtpUser", ""); + cfg.uploadFtpPassword = GetCfgStringValue("global", "uploadFtpPassword", ""); + cfg.uploadFtpHost = GetCfgStringValue("global", "uploadFtpHost", ""); + cfg.uploadFtpPort = GetCfgIntValue("global", "uploadFtpPort", 21); + return 0; + } + + int ManagerV2::LoadLocalImage(const std::string& imagePath, std::string& imgBase64) + { + imgBase64.clear(); + + HGUInt imgType = 0; + HGImgFmt_GetImgFmtType(Utf8ToStdString(imagePath).c_str(), &imgType); + if (0 == imgType) + return -1; + + std::string prefix = "data:image/jpeg;base64,"; + if (HGIMGFMT_TYPE_BMP == imgType) + prefix = "data:image/bmp;base64,"; + else if (HGIMGFMT_TYPE_PNG == imgType) + prefix = "data:image/png;base64,"; + else if (HGIMGFMT_TYPE_TIFF == imgType) + prefix = "data:image/tiff;base64,"; + else if (HGIMGFMT_TYPE_PDF == imgType) + prefix = "data:image/pdf;base64,"; + else if (HGIMGFMT_TYPE_OFD == imgType) + prefix = "data:image/ofd;base64,"; + + int ret = GetBase64(Utf8ToStdString(imagePath), imgBase64); + if (0 != ret) + return ret; + + imgBase64.insert(0, prefix); + return 0; + } + + int ManagerV2::SaveLocalImage(const std::string& imgBase64, std::string& imagePath) + { + imagePath.clear(); + + size_t pos = imgBase64.find(','); + if (std::string::npos == pos) + return -1; + + std::string prefix = imgBase64.substr(0, pos + 1); + + std::string suffix = "jpg"; + if ("data:image/bmp;base64," == prefix) + suffix = "bmp"; + else if ("data:image/png;base64," == prefix) + suffix = "png"; + else if ("data:image/tiff;base64," == prefix) + suffix = "tif"; + else if ("data:image/pdf;base64," == prefix) + suffix = "pdf"; + else if ("data:image/ofd;base64," == prefix) + suffix = "ofd"; + + std::string imagePath2 = GetFilePath(suffix); + int ret = SaveBase64(imagePath2, imagePath.c_str() + pos + 1); + if (0 == ret) + imagePath = StdStringToUtf8(imagePath2); + return ret; + } + + int ManagerV2::DeleteLocalFile(const std::string& filePath) + { + return 0; + } + + std::string ManagerV2::GetCfgStringValue(const std::string& app, const std::string& key, const std::string& def) + { + HGChar cfgPath[256]; + HGBase_GetConfigPath(cfgPath, 256); + strcat(cfgPath, "config2.ini"); + + HGChar val[256] = { 0 }; + HGBase_GetProfileString(cfgPath, app.c_str(), key.c_str(), def.c_str(), val, 256); + return val; + } + + int ManagerV2::GetCfgIntValue(const std::string& app, const std::string& key, int def) + { + HGChar cfgPath[256]; + HGBase_GetConfigPath(cfgPath, 256); + strcat(cfgPath, "config2.ini"); + + HGInt val = 0; + HGBase_GetProfileInt(cfgPath, app.c_str(), key.c_str(), def, &val); + return val; + } + + bool ManagerV2::GetCfgBoolValue(const std::string& app, const std::string& key, bool def) + { + HGChar cfgPath[256]; + HGBase_GetConfigPath(cfgPath, 256); + strcat(cfgPath, "config2.ini"); + + HGInt val = 0; + HGBase_GetProfileInt(cfgPath, app.c_str(), key.c_str(), (HGInt)def, &val); + return (bool)val; + } + + bool ManagerV2::SetCfgStringValue(const std::string& app, const std::string& key, const std::string& val) + { + HGChar cfgPath[256]; + HGBase_GetConfigPath(cfgPath, 256); + HGBase_CreateDir(cfgPath); + strcat(cfgPath, "config2.ini"); + + return (HGBASE_ERR_OK == HGBase_SetProfileString(cfgPath, app.c_str(), key.c_str(), val.c_str())); + } + + bool ManagerV2::SetCfgIntValue(const std::string& app, const std::string& key, int val) + { + HGChar cfgPath[256]; + HGBase_GetConfigPath(cfgPath, 256); + HGBase_CreateDir(cfgPath); + strcat(cfgPath, "config2.ini"); + + return (HGBASE_ERR_OK == HGBase_SetProfileInt(cfgPath, app.c_str(), key.c_str(), val)); + } + + bool ManagerV2::SetCfgBoolValue(const std::string& app, const std::string& key, bool val) + { + HGChar cfgPath[256]; + HGBase_GetConfigPath(cfgPath, 256); + HGBase_CreateDir(cfgPath); + strcat(cfgPath, "config2.ini"); + + return (HGBASE_ERR_OK == HGBase_SetProfileInt(cfgPath, app.c_str(), key.c_str(), (HGInt)val)); + } + + int ManagerV2::GetBase64(const std::string& fileName, std::string& base64) + { + base64.clear(); + + int ret = -1; + FILE* file = fopen(fileName.c_str(), "rb"); + if (NULL != file) + { + fseek(file, 0, SEEK_END); + long size = ftell(file); + fseek(file, 0, SEEK_SET); + + if (size > 0) + { + HGByte* data = new HGByte[size]; + long readLen = (long)fread(data, 1, size, file); + if (readLen == size) + { + HGSize base64Size = 0; + HGBase_Base64Encode(data, size, NULL, &base64Size); + uint8_t* base64Data = new uint8_t[base64Size + 1]; + HGBase_Base64Encode(data, size, base64Data, &base64Size); + base64Data[base64Size] = 0; + base64 = (const char*)base64Data; + delete[] base64Data; + ret = 0; + } + + delete[] data; + } + + fclose(file); + } + + return ret; + } + + int ManagerV2::SaveBase64(const std::string& fileName, const std::string& base64) + { + if (base64.empty()) + return -1; + + const char* base64Data = base64.c_str(); + size_t base64Size = base64.size(); + + int ret = -1; + FILE* file = fopen(fileName.c_str(), "wb"); + if (NULL != file) + { + HGSize size = 0; + HGBase_Base64Decode((const HGByte*)base64Data, (HGSize)base64Size, NULL, &size); + uint8_t* data = new HGByte[size]; + HGBase_Base64Decode((const HGByte*)base64Data, (HGSize)base64Size, data, &size); + + size_t writeLen = fwrite(data, 1, size, file); + if (writeLen == (size_t)size) + ret = 0; + + delete[] data; + fclose(file); + } + + return ret; + } + + std::string ManagerV2::GetFilePath(const std::string& suffix) + { + HGChar docPath[256]; + HGBase_GetDocumentsPath(docPath, 256); + std::string fileSavePath = GetCfgStringValue("global", "fileSavePath", docPath); + std::string fileNamePrefix = GetCfgStringValue("global", "fileNamePrefix", "Huago"); + std::string fileNameMode = GetCfgStringValue("global", "fileNameMode", "date_time"); + + char filePath[256] = { 0 }; + if ("random" == fileNameMode) + { + HGChar uuid[256]; + HGBase_GetUuid(uuid, 256); + sprintf(filePath, "%s%s%s.%s", fileSavePath.c_str(), fileNamePrefix.c_str(), uuid, suffix.c_str()); + } + else + { + timeb tb; + ftime(&tb); + struct tm* p = localtime(&tb.time); + sprintf(filePath, "%s%s%04d%02d%02d%02d%02d%02d.%s", fileSavePath.c_str(), fileNamePrefix.c_str(), (1900 + p->tm_year), + (1 + p->tm_mon), p->tm_mday, p->tm_hour, p->tm_min, p->tm_sec, suffix.c_str()); + } + + return filePath; + } + + std::string ManagerV2::GetImagePath() + { + std::string imageFormat = GetCfgStringValue("global", "imageFormat", "jpg"); + return GetFilePath(imageFormat); + } +} diff --git a/sdk/webservice/ManagerV2.h b/sdk/webservice/ManagerV2.h new file mode 100644 index 00000000..e7804a46 --- /dev/null +++ b/sdk/webservice/ManagerV2.h @@ -0,0 +1,72 @@ +#pragma once + +#include "base/HGDef.h" +#include "base/HGInc.h" +#include "base/HGLock.h" +#include "base/HGImage.h" +#include "base/HGMsgPump.h" +#include "sane/sane_ex.h" +#include "sane/sane_option_definitions.h" +#include "Manager.h" +#include "Msg.h" +#include + +namespace ver_2 +{ + struct GlobalConfig + { + // ļ + std::string fileSavePath; + std::string fileNamePrefix; + std::string fileNameMode; + // ͼ񱣴 + std::string imageFormat; + int imageJpegQuality; + std::string imageTiffCompression; + int imageTiffJpegQuality; + // ϴ + std::string uploadHttpHost; + unsigned short uploadHttpPort; + std::string uploadHttpPath; + std::string uploadFtpUser; + std::string uploadFtpPassword; + std::string uploadFtpHost; + unsigned short uploadFtpPort; + }; + + class ManagerV2 : public Manager + { + public: + ManagerV2(HGMsgPump msgPump); + virtual ~ManagerV2(); + + // ɨ + void ScanFinish(const ScanFinishParam* param); + + // ȫ + int SetGlobalConfig(const GlobalConfig& cfg); + // ȡȫ + int GetGlobalConfig(GlobalConfig& cfg); + // رͼ + int LoadLocalImage(const std::string& imagePath, std::string& imgBase64); + // 汾ͼ + int SaveLocalImage(const std::string& imgBase64, std::string& imagePath); + // ɾļ + int DeleteLocalFile(const std::string& filePath); + + private: + std::string GetCfgStringValue(const std::string& app, const std::string& key, const std::string& def); + int GetCfgIntValue(const std::string& app, const std::string& key, int def); + bool GetCfgBoolValue(const std::string& app, const std::string& key, bool def); + bool SetCfgStringValue(const std::string& app, const std::string& key, const std::string& val); + bool SetCfgIntValue(const std::string& app, const std::string& key, int val); + bool SetCfgBoolValue(const std::string& app, const std::string& key, bool val); + static int GetBase64(const std::string& fileName, std::string& base64); + static int SaveBase64(const std::string& fileName, const std::string& base64); + std::string GetFilePath(const std::string& suffix); + std::string GetImagePath(); + + private: + + }; +} \ No newline at end of file diff --git a/sdk/webservice/Msg.h b/sdk/webservice/Msg.h index fdfdbc58..7c360c2b 100644 --- a/sdk/webservice/Msg.h +++ b/sdk/webservice/Msg.h @@ -2,61 +2,66 @@ #include "base/HGDef.h" #include "base/HGInc.h" -#include "HttpHead.h" #include +#include "HttpHead.h" + +enum +{ + MSGID_CONNECT = 1L, + MSGID_DISCONNECT +}; + +class WebServer; + +struct ConnectParam +{ + WebServer* svr; + std::string ip; + HGUShort port; +#if defined(HG_CMP_MSC) + SOCKET socket; +#else + int socket; +#endif +}; + +struct DisConnectParam +{ + WebServer* svr; + HGUInt usrId; +}; namespace ver_1 { enum { - MSGID_OPEN_DEVICE = 1L, + MSGID_OPEN_DEVICE = 3L, MSGID_CLOSE_DEVICE, MSGID_SCAN_FINISH, - MSGID_CONNECT, - MSGID_DISCONNECT, MSGID_HTTP_COMMAND, MSGID_SOCKIO_COMMAND, MSGID_SOCKIO_EVENT }; - class Manager; - class WebServer; + class ManagerV1; class HttpServer; class SockIoServer; struct OpenDevParam { - Manager* mgr; + ManagerV1* mgr; std::string devName; }; struct CloseDevParam { - Manager* mgr; + ManagerV1* mgr; std::string devName; }; struct ScanFinishParam { - Manager* mgr; - }; - - struct ConnectParam - { - WebServer* svr; - HGChar ip[16]; - HGUShort port; -#if defined(HG_CMP_MSC) - SOCKET socket; -#else - int socket; -#endif - }; - - struct DisConnectParam - { - WebServer* svr; - HGUInt usrId; + ManagerV1* mgr; }; struct HttpCmdParam @@ -83,4 +88,38 @@ namespace ver_1 HGByte* data; HGUInt size; }; +} + +namespace ver_2 +{ + enum + { + MSGID_SCAN_FINISH = 3L, + MSGID_WS_COMMAND, + MSGID_WS_EVENT + }; + + class ManagerV2; + class WSServer; + + struct ScanFinishParam + { + ManagerV2* mgr; + }; + + struct WSCmdParam + { + WSServer* svr; + HGUInt usrId; + HGByte* data; + HGUInt size; + }; + + struct WSEvtParam + { + WSServer* svr; + HGUInt usrId; + HGByte* data; + HGUInt size; + }; } \ No newline at end of file diff --git a/sdk/webservice/MsgPumpCallback.cpp b/sdk/webservice/MsgPumpCallback.cpp index ac981277..2e44c798 100644 --- a/sdk/webservice/MsgPumpCallback.cpp +++ b/sdk/webservice/MsgPumpCallback.cpp @@ -1,9 +1,11 @@ -#include "MsgPumpCallback.h" +#include "MsgPumpCallback.h" #include "base/HGDef.h" #include "base/HGInc.h" -#include "Manager.h" +#include "ManagerV1.h" +#include "ManagerV2.h" #include "HttpServer.h" #include "SockIoServer.h" +#include "WSServer.h" namespace ver_1 { @@ -15,6 +17,20 @@ namespace ver_1 switch (msg->id) { + case MSGID_CONNECT: + { + ConnectParam* param = (ConnectParam*)msg->data; + param->svr->Connect(param); + delete param; + } + break; + case MSGID_DISCONNECT: + { + DisConnectParam* param = (DisConnectParam*)msg->data; + param->svr->DisConnect(param); + delete param; + } + break; case MSGID_OPEN_DEVICE: { OpenDevParam* param = (OpenDevParam*)msg->data; @@ -36,20 +52,6 @@ namespace ver_1 delete param; } break; - case MSGID_CONNECT: - { - ConnectParam* param = (ConnectParam*)msg->data; - param->svr->Connect(param); - delete param; - } - break; - case MSGID_DISCONNECT: - { - DisConnectParam* param = (DisConnectParam*)msg->data; - param->svr->DisConnect(param); - delete param; - } - break; case MSGID_HTTP_COMMAND: { HttpCmdParam* param = (HttpCmdParam*)msg->data; @@ -73,4 +75,54 @@ namespace ver_1 break; } } -} \ No newline at end of file +} + + +namespace ver_2 +{ + void HGMsgPumpCallback(HGMsgPump msgPump, const HGMsg* msg, HGPointer param) + { + (void)msgPump; + (void)param; + assert(NULL != msg); + + switch (msg->id) + { + case MSGID_CONNECT: + { + ConnectParam* param = (ConnectParam*)msg->data; + param->svr->Connect(param); + delete param; + } + break; + case MSGID_DISCONNECT: + { + DisConnectParam* param = (DisConnectParam*)msg->data; + param->svr->DisConnect(param); + delete param; + } + break; + case MSGID_SCAN_FINISH: + { + ScanFinishParam* param = (ScanFinishParam*)msg->data; + param->mgr->ScanFinish(param); + delete param; + } + break; + case MSGID_WS_COMMAND: + { + WSCmdParam* param = (WSCmdParam*)msg->data; + param->svr->Command(param); + delete param; + } + break; + case MSGID_WS_EVENT: + { + WSEvtParam* param = (WSEvtParam*)msg->data; + param->svr->Event(param); + delete param; + } + break; + } + } +} diff --git a/sdk/webservice/MsgPumpCallback.h b/sdk/webservice/MsgPumpCallback.h index 1426f7e3..fc9a0efc 100644 --- a/sdk/webservice/MsgPumpCallback.h +++ b/sdk/webservice/MsgPumpCallback.h @@ -1,8 +1,13 @@ -#pragma once +#pragma once #include "base/HGMsgPump.h" namespace ver_1 +{ + void HGMsgPumpCallback(HGMsgPump msgPump, const HGMsg* msg, HGPointer param); +} + +namespace ver_2 { void HGMsgPumpCallback(HGMsgPump msgPump, const HGMsg* msg, HGPointer param); } \ No newline at end of file diff --git a/sdk/webservice/SockIoServer.cpp b/sdk/webservice/SockIoServer.cpp index f2daa9e1..2024325d 100644 --- a/sdk/webservice/SockIoServer.cpp +++ b/sdk/webservice/SockIoServer.cpp @@ -4,10 +4,10 @@ namespace ver_1 { - SockIoServer::SockIoServer(HGMsgPump msgPump, Manager* manager) - : WebServer(msgPump, manager) + SockIoServer::SockIoServer(HGMsgPump msgPump, ManagerV1* manager) + : WebServer(msgPump) { - + m_manager = manager; } SockIoServer::~SockIoServer() @@ -15,6 +15,11 @@ namespace ver_1 } + ManagerV1* SockIoServer::GetManger() + { + return m_manager; + } + void SockIoServer::Connect(const ConnectParam* param) { assert(NULL != param && this == param->svr); diff --git a/sdk/webservice/SockIoServer.h b/sdk/webservice/SockIoServer.h index 1e73ff08..6696bfce 100644 --- a/sdk/webservice/SockIoServer.h +++ b/sdk/webservice/SockIoServer.h @@ -5,16 +5,18 @@ namespace ver_1 { - class Manager; - class SockIoServer : public WebServer { public: - SockIoServer(HGMsgPump msgPump, Manager* manager); + SockIoServer(HGMsgPump msgPump, ManagerV1* manager); virtual ~SockIoServer(); + ManagerV1* GetManger(); void Connect(const ConnectParam* param); void Command(const SockIoCmdParam* param); void Event(const SockIoEvtParam* param); + + private: + ManagerV1* m_manager; }; } \ No newline at end of file diff --git a/sdk/webservice/SockIoUser.cpp b/sdk/webservice/SockIoUser.cpp index 4c76b245..6a00c7e1 100644 --- a/sdk/webservice/SockIoUser.cpp +++ b/sdk/webservice/SockIoUser.cpp @@ -1,18 +1,18 @@ #include "SockIoUser.h" -#include "WebServer.h" -#include "Manager.h" +#include "SockIoServer.h" +#include "ManagerV1.h" #include "base/HGInfo.h" #include "base/HGUtility.h" +#include "cJSON.h" #include "sha1.h" #include "base64.h" -#include "cJSON.h" namespace ver_1 { #if defined(HG_CMP_MSC) - SockIoUser::SockIoUser(WebServer* server, HGUInt id, const char* ip, uint16_t port, SOCKET sockConn) + SockIoUser::SockIoUser(WebServer* server, HGUInt id, const std::string& ip, uint16_t port, SOCKET sockConn) #else - SockIoUser::SockIoUser(WebServer* server, HGUInt id, const char* ip, uint16_t port, int sockConn) + SockIoUser::SockIoUser(WebServer* server, HGUInt id, const std::string& ip, uint16_t port, int sockConn) #endif : WebUser(server, id, ip, port, sockConn) { @@ -24,6 +24,11 @@ namespace ver_1 GetManager()->ResetScanEvent(); } + ManagerV1* SockIoUser::GetManager() + { + return ((SockIoServer*)m_server)->GetManger(); + } + void SockIoUser::HandleCmd(const SockIoCmdParam* param) { assert(NULL != param && m_id == param->usrId); diff --git a/sdk/webservice/SockIoUser.h b/sdk/webservice/SockIoUser.h index add71447..1f447126 100644 --- a/sdk/webservice/SockIoUser.h +++ b/sdk/webservice/SockIoUser.h @@ -5,18 +5,17 @@ namespace ver_1 { - class WebServer; - class SockIoUser : public WebUser { public: #if defined(HG_CMP_MSC) - SockIoUser(WebServer* server, HGUInt id, const char* ip, uint16_t port, SOCKET sockConn); + SockIoUser(WebServer* server, HGUInt id, const std::string& ip, uint16_t port, SOCKET sockConn); #else - SockIoUser(WebServer* server, HGUInt id, const char* ip, uint16_t port, int sockConn); + SockIoUser(WebServer* server, HGUInt id, const std::string& ip, uint16_t port, int sockConn); #endif virtual ~SockIoUser(); + ManagerV1* GetManager(); void HandleCmd(const SockIoCmdParam* param); void HandleEvent(const SockIoEvtParam* param); diff --git a/sdk/webservice/WSServer.cpp b/sdk/webservice/WSServer.cpp index e69de29b..66220b80 100644 --- a/sdk/webservice/WSServer.cpp +++ b/sdk/webservice/WSServer.cpp @@ -0,0 +1,54 @@ +#include "WSServer.h" +#include "WSUser.h" +#include "base/HGInfo.h" + +namespace ver_2 +{ + WSServer::WSServer(HGMsgPump msgPump, ManagerV2* manager) + : WebServer(msgPump) + { + m_manager = manager; + } + + WSServer::~WSServer() + { + + } + + ManagerV2* WSServer::GetManger() + { + return m_manager; + } + + void WSServer::Connect(const ConnectParam* param) + { + assert(NULL != param && this == param->svr); + + WebUser* user = new WSUser(this, m_currUserId, param->ip, param->port, param->socket); + user->Open(); + ++m_currUserId; + m_vectorUser.push_back(user); + } + + void WSServer::Command(const WSCmdParam* param) + { + assert(NULL != param && this == param->svr); + + int nIndex = GetUserIndex(param->usrId); + if (-1 != nIndex) + { + ((WSUser*)m_vectorUser[nIndex])->HandleCmd(param); + } + } + + void WSServer::Event(const WSEvtParam* param) + { + assert(NULL != param && this == param->svr); + + int nIndex = GetUserIndex(param->usrId); + if (-1 != nIndex) + { + ((WSUser*)m_vectorUser[nIndex])->HandleEvent(param); + } + } +} diff --git a/sdk/webservice/WSServer.h b/sdk/webservice/WSServer.h index e69de29b..488ed594 100644 --- a/sdk/webservice/WSServer.h +++ b/sdk/webservice/WSServer.h @@ -0,0 +1,22 @@ +#pragma once + +#include "WebServer.h" +#include "Msg.h" + +namespace ver_2 +{ + class WSServer : public WebServer + { + public: + WSServer(HGMsgPump msgPump, ManagerV2* manager); + virtual ~WSServer(); + + ManagerV2* GetManger(); + void Connect(const ConnectParam* param); + void Command(const WSCmdParam* param); + void Event(const WSEvtParam* param); + + private: + ManagerV2* m_manager; + }; +} \ No newline at end of file diff --git a/sdk/webservice/WSUser.cpp b/sdk/webservice/WSUser.cpp index e69de29b..59445ad6 100644 --- a/sdk/webservice/WSUser.cpp +++ b/sdk/webservice/WSUser.cpp @@ -0,0 +1,549 @@ +#include "WSUser.h" +#include "WSServer.h" +#include "ManagerV2.h" +#include "base/HGInfo.h" +#include "cJSON.h" +#include "sha1.h" +#include "base64.h" + +namespace ver_2 +{ + static int GetJsonIntValue(cJSON* json, const std::string& key) + { + int ret = 0; + + cJSON* p = json->child; + while (NULL != p) + { + if (0 == strcmp(p->string, key.c_str())) + { + if (p->type == cJSON_Number) + ret = p->valueint; + break; + } + + p = p->next; + } + + return ret; + } + + static bool GetJsonBoolValue(cJSON* json, const std::string& key) + { + bool ret = false; + + cJSON* p = json->child; + while (NULL != p) + { + if (0 == strcmp(p->string, key.c_str())) + { + if (p->type == cJSON_True) + ret = true; + break; + } + + p = p->next; + } + + return ret; + } + + static std::string GetJsonStringValue(cJSON* json, const std::string& key) + { + std::string ret; + + cJSON* p = json->child; + while (NULL != p) + { + if (0 == strcmp(p->string, key.c_str())) + { + if (p->type == cJSON_String) + ret = p->valuestring; + break; + } + + p = p->next; + } + + return ret; + } + +#if defined(HG_CMP_MSC) + WSUser::WSUser(WebServer* server, HGUInt id, const std::string& ip, uint16_t port, SOCKET sockConn) +#else + WSUser::WSUser(WebServer* server, HGUInt id, const std::string& ip, uint16_t port, int sockConn) +#endif + : WebUser(server, id, ip, port, sockConn) + { + + } + + WSUser::~WSUser() + { + + } + + ManagerV2* WSUser::GetManager() + { + return ((WSServer*)m_server)->GetManger(); + } + + void WSUser::HandleCmd(const WSCmdParam* param) + { + assert(NULL != param && m_id == param->usrId); + + std::string cmdData((const char*)param->data, param->size); + cJSON* json = cJSON_Parse(cmdData.c_str()); + if (NULL != json) + { + std::string func = GetJsonStringValue(json, "func"); + if ("set_global_config" == func) + { + + } + else if ("get_global_config" == func) + { + + } + else if ("load_local_image" == func) + { + + } + + cJSON_Delete(json); + } + } + + void WSUser::HandleEvent(const WSEvtParam* param) + { + assert(NULL != param && m_id == param->usrId); + + SendResponse(param->data, param->size, HGTRUE); + } + + void WSUser::PostCmdMsg(const HGByte* data, HGUInt dataSize) + { + WSCmdParam* param = new WSCmdParam; + param->svr = (WSServer*)m_server; + param->usrId = m_id; + param->data = new HGByte[dataSize]; + param->size = dataSize; + memcpy(param->data, data, dataSize); + + HGMsg msg; + msg.id = MSGID_WS_COMMAND; + msg.data = param; + if (HGBASE_ERR_OK != HGBase_PostPumpMessage(m_server->GetMsgPump(), &msg)) + { + delete[] param->data; + param->size = 0; + delete param; + } + } + + void WSUser::PostEventMsg(const HGByte* data, HGUInt dataSize) + { + WSEvtParam* param = new WSEvtParam; + param->svr = (WSServer*)m_server; + param->usrId = m_id; + param->data = new HGByte[dataSize]; + param->size = dataSize; + memcpy(param->data, data, dataSize); + + HGMsg msg; + msg.id = MSGID_WS_EVENT; + msg.data = param; + if (HGBASE_ERR_OK != HGBase_PostPumpMessage(m_server->GetMsgPump(), &msg)) + { + delete[] param->data; + param->size = 0; + delete param; + } + } + + void WSUser::ThreadFunc() + { + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "WSUser::ThreadFunc"); + + char chBuffer[2048]; + const char* pBuffer = chBuffer; + int nBufferSize = 0; + bool bConnect = false; + + unsigned char connectDataTail[4] = { '\r', '\n', '\r', '\n' }; + unsigned int connectDataTailLen = 0; + std::string connectData; + + uint8_t* pData = NULL; + int nDataSize = 0; + uint8_t* pDataEx = NULL; + int nRemainSize = 0; + uint8_t headData[20]; + uint32_t nHeadDataLen = 0; + uint8_t vMask[4]; + uint32_t nMaskCount = 0; + bool bHandle = false; + std::vector vAllData; + + while (1) + { + if (0 == nBufferSize) + { + int len = recv(m_sockConn, chBuffer, 2048, 0); + if (len <= 0) + { + // ǷرsocketConn߿ͻ˹رsocketϿ + PostDisConnectMsg(); + break; + } + else + { + pBuffer = chBuffer; + nBufferSize = len; + } + } + + assert(nBufferSize > 0); + + if (!bConnect) + { + unsigned char b = *pBuffer; + ++pBuffer; + --nBufferSize; + + connectData.push_back(b); + if (b == connectDataTail[connectDataTailLen]) + { + ++connectDataTailLen; + } + else + { + connectDataTailLen = 0; + if (b == connectDataTail[connectDataTailLen]) + { + ++connectDataTailLen; + } + } + + if (4 == connectDataTailLen) + { + connectDataTailLen = 0; + bool shakeRet = ShakeHand(connectData); + connectData.clear(); + + if (!shakeRet) + { + PostDisConnectMsg(); + break; + } + + bConnect = true; + } + } + else + { + if (NULL == pData) + { + assert(0 == nDataSize); + + uint8_t b = *pBuffer; + ++pBuffer; + --nBufferSize; + headData[nHeadDataLen] = b; + ++nHeadDataLen; + + if (1 == nHeadDataLen) + { + if ((0x80 | 0x08) == headData[0]) // Ͽ + { + PostDisConnectMsg(); + break; + } + else if ((0x80 | 0x09) == headData[0]) // PING֡ + { + // + } + else if ((0x80 | 0x0A) == headData[0]) // PONG֡ + { + // + } + else if ((0x00 | 0x01) == headData[0] || (0x00 | 0x02) == headData[0] || (0x00 | 0x00) == headData[0] || (0x80 | 0x00) == headData[0] + || (0x80 | 0x01) == headData[0] || (0x80 | 0x02) == headData[0]) // ֡ + { + if ((0x80 | 0x00) == headData[0] || (0x80 | 0x01) == headData[0] || (0x80 | 0x02) == headData[0]) + { + // Ƭ + bHandle = true; + } + else + { + // Ƭ֡ + bHandle = false; + } + } + else // ֡󣬶Ͽ + { + PostDisConnectMsg(); + break; + } + } + else if (2 == nHeadDataLen) + { + if (0 == (headData[1] & 0x80)) // 뾭봦 + { + PostDisConnectMsg(); + break; + } + + if ((0x80 | 0x09) == headData[0]) // PING֡ + { + if (0x80 != headData[1]) + { + PostDisConnectMsg(); + break; + } + } + else if ((0x80 | 0x0A) == headData[0]) // PONG֡ + { + if (0x80 != headData[1]) + { + PostDisConnectMsg(); + break; + } + } + else + { + if ((headData[1] & 0x7F) <= 125) + { + uint32_t nCmdSize = (headData[1] & 0x7F); + nHeadDataLen = 0; + + if (0 == nCmdSize) + { + PostDisConnectMsg(); + break; + } + + nDataSize = nCmdSize; + nRemainSize = nCmdSize; + pData = new uint8_t[nDataSize]; + pDataEx = pData; + } + } + } + else if (4 == nHeadDataLen) + { + if ((0x80 | 0x09) == headData[0]) // PING֡ + { + // + } + else if ((0x80 | 0x0A) == headData[0]) // PONG֡ + { + // + } + else + { + if ((headData[1] & 0x7F) == 126) + { + uint32_t nCmdSize = ntohs(*(uint16_t*)&headData[2]); + nHeadDataLen = 0; + + if (0 == nCmdSize) + { + PostDisConnectMsg(); + break; + } + + nDataSize = nCmdSize; + nRemainSize = nCmdSize; + pData = new uint8_t[nDataSize]; + pDataEx = pData; + } + } + } + else if (6 == nHeadDataLen) + { + if ((0x80 | 0x09) == headData[0]) // PING֡ + { + nHeadDataLen = 0; + + Pong(); + } + else if ((0x80 | 0x0A) == headData[0]) // PONG֡ + { + nHeadDataLen = 0; + } + } + else if (10 == nHeadDataLen) + { + if ((headData[1] & 0x7F) == 127) // һ127 + { + uint32_t nCmdSizeHigh = ntohl(*(uint32_t*)&headData[2]); + uint32_t nCmdSize = ntohl(*(uint32_t*)&headData[6]); + nHeadDataLen = 0; + + if ((0 != nCmdSizeHigh) || (0 == nCmdSize)) + { + PostDisConnectMsg(); + break; + } + + nDataSize = nCmdSize; + nRemainSize = nCmdSize; + pData = new uint8_t[nDataSize]; + pDataEx = pData; + } + } + } + else + { + if (4 != nMaskCount) + { + uint8_t b = *pBuffer; + ++pBuffer; + --nBufferSize; + vMask[nMaskCount] = b; + ++nMaskCount; + } + else + { + int nWriteSize = HGMIN(nBufferSize, nRemainSize); + memcpy(pDataEx, pBuffer, nWriteSize); + pBuffer += nWriteSize; + nBufferSize -= nWriteSize; + pDataEx += nWriteSize; + nRemainSize -= nWriteSize; + + if (0 == nRemainSize) + { + assert(pDataEx == pData + nDataSize); + + for (int i = 0; i < nDataSize; ++i) + { + int j = i % 4; + pData[i] = pData[i] ^ vMask[j]; + vAllData.push_back(pData[i]); + } + + delete[] pData; + pData = NULL; + nDataSize = 0; + nMaskCount = 0; + + if (bHandle) + { + PostCmdMsg(&vAllData[0], vAllData.size()); + + bHandle = false; + vAllData.clear(); + } + } + } + } + } + } + + if (NULL != pData) + { + delete[] pData; + pData = NULL; + nDataSize = 0; + nMaskCount = 0; + } + } + + bool WSUser::ShakeHand(const std::string& head) + { + std::string requestMethod; + std::string requestURIPath; + HttpPairs requestURIQueryInfos; + std::string requestURIFragment; + std::string httpVersion; + HttpPairs headInfos; + HttpHead::AnalysisHead(head, requestMethod, requestURIPath, requestURIQueryInfos, + requestURIFragment, httpVersion, headInfos); + + if ("Upgrade" != HttpHead::GetValue(headInfos, "Connection")) + return false; + if ("websocket" != HttpHead::GetValue(headInfos, "Upgrade")) + return false; + + std::string key = HttpHead::GetValue(headInfos, "Sec-WebSocket-Key"); + if (key.empty()) + return false; + + key += "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; + + unsigned int message_digest[5]; + SHA1 sha; + sha.Reset(); + sha << key.c_str(); + sha.Result(message_digest); + + for (int i = 0; i < 5; ++i) + message_digest[i] = htonl(message_digest[i]); + std::string serverKey = base64_encode((const unsigned char*)message_digest, 20); + + std::string handShakeResp = "HTTP/1.1 101 Switching Protocols\r\n"; + handShakeResp += "Upgrade: websocket\r\n"; + handShakeResp += "Connection: Upgrade\r\n"; + handShakeResp += "Sec-WebSocket-Accept:"; + handShakeResp += serverKey; + handShakeResp += "\r\n\r\n"; + send(m_sockConn, handShakeResp.c_str(), (int)handShakeResp.length(), 0); + return true; + } + + void WSUser::Pong() + { + uint8_t vHead[2]; + vHead[0] = 0x80 | 0x0A; + vHead[1] = 0; + + HGBase_EnterLock(m_cs); + send(m_sockConn, (const char*)vHead, 2, 0); + HGBase_LeaveLock(m_cs); + } + + bool WSUser::SendResponse(const HGByte* data, HGUInt size, HGBool text) + { + if (NULL == data || 0 == size) + { + return false; + } + + uint32_t nHeadLen = 0; + + uint8_t vHead[20] = { 0 }; + vHead[0] = text ? (0x80 | 0x01) : (0x80 | 0x02); + if (size <= 125) + { + vHead[1] = (uint8_t)size; + nHeadLen = 2; + } + else if (size <= 0xFFFF) + { + vHead[1] = 126; + uint16_t payloadLength16b = htons((uint16_t)size); + memcpy(&vHead[2], &payloadLength16b, 2); + nHeadLen = 4; + } + else + { + vHead[1] = 127; + vHead[2] = 0; + vHead[3] = 0; + vHead[4] = 0; + vHead[5] = 0; + uint32_t payloadLength32b = htonl(size); + memcpy(&vHead[6], &payloadLength32b, 4); + nHeadLen = 10; + } + + HGBase_EnterLock(m_cs); + send(m_sockConn, (const char*)vHead, nHeadLen, 0); + send(m_sockConn, (const char*)data, size, 0); + HGBase_LeaveLock(m_cs); + return true; + } +} \ No newline at end of file diff --git a/sdk/webservice/WSUser.h b/sdk/webservice/WSUser.h index e69de29b..875d944e 100644 --- a/sdk/webservice/WSUser.h +++ b/sdk/webservice/WSUser.h @@ -0,0 +1,32 @@ +#pragma once + +#include "WebUser.h" +#include "Msg.h" + +namespace ver_2 +{ + class WSUser : public WebUser + { + public: +#if defined(HG_CMP_MSC) + WSUser(WebServer* server, HGUInt id, const std::string& ip, uint16_t port, SOCKET sockConn); +#else + WSUser(WebServer* server, HGUInt id, const std::string& ip, uint16_t port, int sockConn); +#endif + virtual ~WSUser(); + + ManagerV2* GetManager(); + void HandleCmd(const WSCmdParam* param); + void HandleEvent(const WSEvtParam* param); + + protected: + void PostCmdMsg(const HGByte* data, HGUInt dataSize); + void PostEventMsg(const HGByte* data, HGUInt dataSize); + virtual void ThreadFunc(); + + private: + bool ShakeHand(const std::string& head); + void Pong(); + bool SendResponse(const HGByte* data, HGUInt size, HGBool text); + }; +} diff --git a/sdk/webservice/WebServer.cpp b/sdk/webservice/WebServer.cpp index 3b6b03cb..8386ec85 100644 --- a/sdk/webservice/WebServer.cpp +++ b/sdk/webservice/WebServer.cpp @@ -2,212 +2,203 @@ #include "WebUser.h" #include "base/HGInfo.h" -namespace ver_1 +WebServer::WebServer(HGMsgPump msgPump) { - WebServer::WebServer(HGMsgPump msgPump, Manager* manager) + m_msgPump = msgPump; + + m_currUserId = 1; +#if defined(HG_CMP_MSC) + m_sockServer = INVALID_SOCKET; +#else + m_sockServer = -1; +#endif + m_listenThread = NULL; +} + +WebServer::~WebServer() +{ + +} + +HGMsgPump WebServer::GetMsgPump() +{ + return m_msgPump; +} + +bool WebServer::Open(HGUShort port) +{ +#if defined(HG_CMP_MSC) + if (INVALID_SOCKET != m_sockServer) +#else + if (-1 != m_sockServer) +#endif { - m_msgPump = msgPump; - m_manager = manager; - - m_currUserId = 1; -#if defined(HG_CMP_MSC) - m_sockServer = INVALID_SOCKET; -#else - m_sockServer = -1; -#endif - m_listenThread = NULL; - } - - WebServer::~WebServer() - { - - } - - HGMsgPump WebServer::GetMsgPump() - { - return m_msgPump; - } - - Manager* WebServer::GetManager() - { - return m_manager; - } - - bool WebServer::Open(HGUShort port) - { -#if defined(HG_CMP_MSC) - if (INVALID_SOCKET != m_sockServer) -#else - if (-1 != m_sockServer) -#endif - { - return false; - } - -#if defined(HG_CMP_MSC) - SOCKET sockServer = socket(AF_INET, SOCK_STREAM, 0); - if (INVALID_SOCKET == sockServer) -#else - int sockServer = socket(AF_INET, SOCK_STREAM, 0); - if (-1 == sockServer) -#endif - { - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "open webserver failed 1, port=%u", port); - return false; - } - - // bind -#if defined(HG_CMP_MSC) - SOCKADDR_IN addrServer; - addrServer.sin_addr.S_un.S_addr = INADDR_ANY; - addrServer.sin_family = AF_INET; - addrServer.sin_port = htons(port); - if (0 != bind(sockServer, (SOCKADDR*)&addrServer, sizeof(SOCKADDR_IN))) -#else - struct sockaddr_in addrServer; - addrServer.sin_addr.s_addr = htonl(INADDR_ANY); - addrServer.sin_family = AF_INET; - addrServer.sin_port = htons(port); - if (0 != bind(sockServer, (struct sockaddr*)&addrServer, sizeof(addrServer))) -#endif - { -#if defined(HG_CMP_MSC) - closesocket(sockServer); -#else - close(sockServer); -#endif - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "open webserver failed 2, port=%u", port); - return false; - } - - // listen - if (0 != listen(sockServer, 5)) - { -#if defined(HG_CMP_MSC) - closesocket(sockServer); -#else - close(sockServer); -#endif - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "open webserver failed 3, port=%u", port); - return false; - } - - m_sockServer = sockServer; - HGBase_OpenThread(ThreadFunc, this, &m_listenThread); - assert(NULL != m_listenThread); - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "open webserver success, port=%u", port); - return true; - } - - bool WebServer::Close() - { -#if defined(HG_CMP_MSC) - if (INVALID_SOCKET == m_sockServer) -#else - if (-1 == m_sockServer) -#endif - { - return false; - } - - while (!m_vectorUser.empty()) - { - WebUser* pUser = m_vectorUser[0]; - m_vectorUser.erase(m_vectorUser.begin()); - delete pUser; - pUser = NULL; - } - -#if defined(HG_CMP_MSC) - closesocket(m_sockServer); - m_sockServer = INVALID_SOCKET; -#else - close(m_sockServer); - m_sockServer = -1; -#endif - HGBase_CloseThread(m_listenThread); - m_listenThread = NULL; - return true; - } - - void WebServer::DisConnect(const DisConnectParam* param) - { - assert(NULL != param && this == param->svr); - - int nIndex = GetUserIndex(param->usrId); - if (-1 != nIndex) - { - WebUser* pUser = m_vectorUser[nIndex]; - m_vectorUser.erase(m_vectorUser.begin() + nIndex); - delete pUser; - pUser = NULL; - } + return false; } #if defined(HG_CMP_MSC) - void WebServer::PostConnectMsg(const char* ip, uint16_t port, SOCKET sockConn) + SOCKET sockServer = socket(AF_INET, SOCK_STREAM, 0); + if (INVALID_SOCKET == sockServer) #else - void WebServer::PostConnectMsg(const char* ip, uint16_t port, int sockConn) + int sockServer = socket(AF_INET, SOCK_STREAM, 0); + if (-1 == sockServer) #endif { - ConnectParam* param = new ConnectParam; - param->svr = this; - strcpy(param->ip, ip); - param->port = port; - param->socket = sockConn; + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "open webserver failed 1, port=%u", port); + return false; + } - HGMsg msg; - msg.id = MSGID_CONNECT; - msg.data = param; - if (HGBASE_ERR_OK != HGBase_PostPumpMessage(m_msgPump, &msg)) - { + // bind #if defined(HG_CMP_MSC) - closesocket(param->socket); + SOCKADDR_IN addrServer; + addrServer.sin_addr.S_un.S_addr = INADDR_ANY; + addrServer.sin_family = AF_INET; + addrServer.sin_port = htons(port); + if (0 != bind(sockServer, (SOCKADDR*)&addrServer, sizeof(SOCKADDR_IN))) #else - close(param->socket); + struct sockaddr_in addrServer; + addrServer.sin_addr.s_addr = htonl(INADDR_ANY); + addrServer.sin_family = AF_INET; + addrServer.sin_port = htons(port); + if (0 != bind(sockServer, (struct sockaddr*)&addrServer, sizeof(addrServer))) #endif - delete param; + { +#if defined(HG_CMP_MSC) + closesocket(sockServer); +#else + close(sockServer); +#endif + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "open webserver failed 2, port=%u", port); + return false; + } + + // listen + if (0 != listen(sockServer, 5)) + { +#if defined(HG_CMP_MSC) + closesocket(sockServer); +#else + close(sockServer); +#endif + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "open webserver failed 3, port=%u", port); + return false; + } + + m_sockServer = sockServer; + HGBase_OpenThread(ThreadFunc, this, &m_listenThread); + assert(NULL != m_listenThread); + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "open webserver success, port=%u", port); + return true; +} + +bool WebServer::Close() +{ +#if defined(HG_CMP_MSC) + if (INVALID_SOCKET == m_sockServer) +#else + if (-1 == m_sockServer) +#endif + { + return false; + } + + while (!m_vectorUser.empty()) + { + WebUser* pUser = m_vectorUser[0]; + m_vectorUser.erase(m_vectorUser.begin()); + delete pUser; + pUser = NULL; + } + +#if defined(HG_CMP_MSC) + closesocket(m_sockServer); + m_sockServer = INVALID_SOCKET; +#else + close(m_sockServer); + m_sockServer = -1; +#endif + HGBase_CloseThread(m_listenThread); + m_listenThread = NULL; + return true; +} + +void WebServer::DisConnect(const DisConnectParam* param) +{ + assert(NULL != param && this == param->svr); + + int nIndex = GetUserIndex(param->usrId); + if (-1 != nIndex) + { + WebUser* pUser = m_vectorUser[nIndex]; + m_vectorUser.erase(m_vectorUser.begin() + nIndex); + delete pUser; + pUser = NULL; + } +} + +#if defined(HG_CMP_MSC) +void WebServer::PostConnectMsg(const std::string& ip, uint16_t port, SOCKET sockConn) +#else +void WebServer::PostConnectMsg(const std::string& ip, uint16_t port, int sockConn) +#endif +{ + ConnectParam* param = new ConnectParam; + param->svr = this; + param->ip = ip; + param->port = port; + param->socket = sockConn; + + HGMsg msg; + msg.id = MSGID_CONNECT; + msg.data = param; + if (HGBASE_ERR_OK != HGBase_PostPumpMessage(m_msgPump, &msg)) + { +#if defined(HG_CMP_MSC) + closesocket(param->socket); +#else + close(param->socket); +#endif + delete param; + } +} + +int WebServer::GetUserIndex(HGUInt id) +{ + int nIndex = -1; + for (int i = 0; i < (int)m_vectorUser.size(); ++i) + { + if (id == m_vectorUser[i]->GetId()) + { + nIndex = i; + break; } } - int WebServer::GetUserIndex(HGUInt id) + return nIndex; +} + +void WebServer::ThreadFunc(HGThread thread, HGPointer param) +{ + WebServer* p = (WebServer*)param; + + while (1) { - int nIndex = -1; - for (int i = 0; i < (int)m_vectorUser.size(); ++i) - { - if (id == m_vectorUser[i]->GetId()) - { - nIndex = i; - break; - } - } - - return nIndex; - } - - void WebServer::ThreadFunc(HGThread thread, HGPointer param) - { - WebServer* p = (WebServer*)param; - - while (1) - { #if defined(HG_CMP_MSC) - SOCKADDR_IN addrClient; - int len = sizeof(SOCKADDR_IN); - SOCKET socketConn = accept(p->m_sockServer, (SOCKADDR*)&addrClient, &len); - if (INVALID_SOCKET == socketConn) + SOCKADDR_IN addrClient; + int len = sizeof(SOCKADDR_IN); + SOCKET socketConn = accept(p->m_sockServer, (SOCKADDR*)&addrClient, &len); + if (INVALID_SOCKET == socketConn) #else - struct sockaddr_in addrClient; - socklen_t len = sizeof(addrClient); - int socketConn = accept(p->m_sockServer, (struct sockaddr*)&addrClient, &len); - if (-1 == socketConn) + struct sockaddr_in addrClient; + socklen_t len = sizeof(addrClient); + int socketConn = accept(p->m_sockServer, (struct sockaddr*)&addrClient, &len); + if (-1 == socketConn) #endif - { - // Ƿرm_sockServer - break; - } - - p->PostConnectMsg(inet_ntoa(addrClient.sin_addr), ntohs(addrClient.sin_port), socketConn); + { + // Ƿرm_sockServer + break; } + + p->PostConnectMsg(inet_ntoa(addrClient.sin_addr), ntohs(addrClient.sin_port), socketConn); } } \ No newline at end of file diff --git a/sdk/webservice/WebServer.h b/sdk/webservice/WebServer.h index 6e5ec69a..702c041f 100644 --- a/sdk/webservice/WebServer.h +++ b/sdk/webservice/WebServer.h @@ -7,45 +7,37 @@ #include "Msg.h" #include -namespace ver_1 +class WebServer { - class Manager; +public: + WebServer(HGMsgPump msgPump); + virtual ~WebServer(); - class WebServer - { - public: - WebServer(HGMsgPump msgPump, Manager* manager); - virtual ~WebServer(); + HGMsgPump GetMsgPump(); + bool Open(HGUShort port); + bool Close(); - HGMsgPump GetMsgPump(); - Manager* GetManager(); + virtual void Connect(const ConnectParam* param) = 0; + void DisConnect(const DisConnectParam* param); - bool Open(HGUShort port); - bool Close(); - - virtual void Connect(const ConnectParam* param) = 0; - void DisConnect(const DisConnectParam* param); - - protected: +protected: #if defined(HG_CMP_MSC) - void PostConnectMsg(const char* ip, uint16_t port, SOCKET sockConn); + void PostConnectMsg(const std::string &ip, uint16_t port, SOCKET sockConn); #else - void PostConnectMsg(const char* ip, uint16_t port, int sockConn); + void PostConnectMsg(const std::string &ip, uint16_t port, int sockConn); #endif - int GetUserIndex(HGUInt id); - static void ThreadFunc(HGThread thread, HGPointer param); + int GetUserIndex(HGUInt id); + static void ThreadFunc(HGThread thread, HGPointer param); - protected: - HGMsgPump m_msgPump; - Manager* m_manager; +protected: + HGMsgPump m_msgPump; - HGUInt m_currUserId; + HGUInt m_currUserId; #if defined(HG_CMP_MSC) - SOCKET m_sockServer; + SOCKET m_sockServer; #else - int m_sockServer; + int m_sockServer; #endif - HGThread m_listenThread; - std::vector m_vectorUser; - }; -} \ No newline at end of file + HGThread m_listenThread; + std::vector m_vectorUser; +}; \ No newline at end of file diff --git a/sdk/webservice/WebUser.cpp b/sdk/webservice/WebUser.cpp index ef5e7d9c..b74f8925 100644 --- a/sdk/webservice/WebUser.cpp +++ b/sdk/webservice/WebUser.cpp @@ -2,82 +2,74 @@ #include "WebServer.h" #include "base/HGInfo.h" -namespace ver_1 +#if defined(HG_CMP_MSC) +WebUser::WebUser(WebServer* server, HGUInt id, const std::string& ip, uint16_t port, SOCKET sockConn) +#else +WebUser::WebUser(WebServer* server, HGUInt id, const std::string& ip, uint16_t port, int sockConn) +#endif +{ + m_server = server; + HGBase_CreateLock(&m_cs); + m_id = id; + m_ip = ip; + m_port = port; + + m_sockConn = sockConn; + m_thread = NULL; +} + +WebUser::~WebUser() { #if defined(HG_CMP_MSC) - WebUser::WebUser(WebServer* server, HGUInt id, const char* ip, uint16_t port, SOCKET sockConn) + closesocket(m_sockConn); + m_sockConn = INVALID_SOCKET; #else - WebUser::WebUser(WebServer* server, HGUInt id, const char* ip, uint16_t port, int sockConn) + close(m_sockConn); + m_sockConn = -1; #endif + HGBase_CloseThread(m_thread); + m_thread = NULL; + + m_port = 0; + m_ip.clear(); + m_id = 0; + HGBase_DestroyLock(m_cs); + m_server = NULL; +} + +void WebUser::Open() +{ + HGBase_OpenThread(ThreadFunc, this, &m_thread); + assert(NULL != m_thread); +} + +HGUInt WebUser::GetId() +{ + return m_id; +} + +void WebUser::PostDisConnectMsg() +{ + DisConnectParam* param = new DisConnectParam; + param->svr = m_server; + param->usrId = m_id; + + HGMsg msg; + msg.id = MSGID_DISCONNECT; + msg.data = param; + if (HGBASE_ERR_OK != HGBase_PostPumpMessage(m_server->GetMsgPump(), &msg)) { - m_server = server; - HGBase_CreateLock(&m_cs); - m_id = id; - strcpy(m_ip, ip); - m_port = port; - - m_sockConn = sockConn; - m_thread = NULL; - } - - WebUser::~WebUser() - { -#if defined(HG_CMP_MSC) - closesocket(m_sockConn); - m_sockConn = INVALID_SOCKET; -#else - close(m_sockConn); - m_sockConn = -1; -#endif - HGBase_CloseThread(m_thread); - m_thread = NULL; - - m_port = 0; - memset(m_ip, 0, sizeof(m_ip)); - m_id = 0; - HGBase_DestroyLock(m_cs); - m_server = NULL; - } - - void WebUser::Open() - { - HGBase_OpenThread(ThreadFunc, this, &m_thread); - assert(NULL != m_thread); - } - - HGUInt WebUser::GetId() - { - return m_id; - } - - Manager* WebUser::GetManager() - { - return m_server->GetManager(); - } - - void WebUser::PostDisConnectMsg() - { - DisConnectParam* param = new DisConnectParam; - param->svr = m_server; - param->usrId = m_id; - - HGMsg msg; - msg.id = MSGID_DISCONNECT; - msg.data = param; - if (HGBASE_ERR_OK != HGBase_PostPumpMessage(m_server->GetMsgPump(), &msg)) - { - delete param; - } - } - - void WebUser::ThreadFunc() - { - HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "WebUser::ThreadFunc"); - } - - void WebUser::ThreadFunc(HGThread thread, HGPointer param) - { - WebUser* p = (WebUser*)param; - p->ThreadFunc(); + delete param; } } + +void WebUser::ThreadFunc() +{ + HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "WebUser::ThreadFunc"); +} + +void WebUser::ThreadFunc(HGThread thread, HGPointer param) +{ + WebUser* p = (WebUser*)param; + p->ThreadFunc(); +} diff --git a/sdk/webservice/WebUser.h b/sdk/webservice/WebUser.h index 0eaecd05..2636ada3 100644 --- a/sdk/webservice/WebUser.h +++ b/sdk/webservice/WebUser.h @@ -5,45 +5,41 @@ #include "base/HGLock.h" #include "base/HGThread.h" #include "base/HGMsgPump.h" +#include -namespace ver_1 +class WebServer; + +class WebUser { - class WebServer; - class Manager; - - class WebUser - { - public: +public: #if defined(HG_CMP_MSC) - WebUser(WebServer* server, HGUInt id, const char* ip, uint16_t port, SOCKET sockConn); + WebUser(WebServer* server, HGUInt id, const std::string& ip, uint16_t port, SOCKET sockConn); #else - WebUser(WebServer* server, HGUInt id, const char* ip, uint16_t port, int sockConn); + WebUser(WebServer* server, HGUInt id, const std::string& ip, uint16_t port, int sockConn); #endif - virtual ~WebUser(); + virtual ~WebUser(); - void Open(); - HGUInt GetId(); - Manager* GetManager(); + void Open(); + HGUInt GetId(); - protected: - void PostDisConnectMsg(); - virtual void ThreadFunc(); +protected: + void PostDisConnectMsg(); + virtual void ThreadFunc(); - private: - static void ThreadFunc(HGThread thread, HGPointer param); +private: + static void ThreadFunc(HGThread thread, HGPointer param); - protected: - WebServer* m_server; - HGLock m_cs; - HGUInt m_id; - char m_ip[16]; - uint16_t m_port; +protected: + WebServer* m_server; + HGLock m_cs; + HGUInt m_id; + std::string m_ip; + uint16_t m_port; #if defined(HG_CMP_MSC) - SOCKET m_sockConn; + SOCKET m_sockConn; #else - int m_sockConn; + int m_sockConn; #endif - HGThread m_thread; - }; -} + HGThread m_thread; +}; diff --git a/sdk/webservice/main.cpp b/sdk/webservice/main.cpp index aeee4761..8c4eda95 100644 --- a/sdk/webservice/main.cpp +++ b/sdk/webservice/main.cpp @@ -3,7 +3,8 @@ #include "base/HGThread.h" #include "base/HGUtility.h" #include "base/HGMsgPump.h" -#include "Manager.h" +#include "ManagerV1.h" +#include "ManagerV2.h" #include "HttpServer.h" #include "SockIoServer.h" #include "WSServer.h" @@ -22,7 +23,7 @@ static void ThreadFunc(HGThread thread, HGPointer param) HGBase_GetProfileInt(cfgPath, "version", "verNum", 2, &verNum); if (1 == verNum) // 使用V1版本接口 { - ver_1::Manager manager(msgPump); + ver_1::ManagerV1 manager(msgPump); ver_1::HttpServer httpServer(msgPump, &manager); ver_1::SockIoServer sockIoServer(msgPump, &manager); @@ -34,7 +35,12 @@ static void ThreadFunc(HGThread thread, HGPointer param) } else // 使用V2版本接口 { - + ver_2::ManagerV2 manager(msgPump); + ver_2::WSServer wsServer(msgPump, &manager); + + wsServer.Open(38999); + HGBase_RunMsgPump(msgPump, ver_2::HGMsgPumpCallback, NULL); + wsServer.Close(); } } diff --git a/utility/HGString.cpp b/utility/HGString.cpp index 4c4ff71e..aa056041 100644 --- a/utility/HGString.cpp +++ b/utility/HGString.cpp @@ -32,20 +32,20 @@ static std::string Utf8ToAnsi(const char* text) } #endif -std::string Utf8ToStdString(const char* utf8) +std::string Utf8ToStdString(const std::string& utf8Str) { #if defined(HG_CMP_MSC) - return Utf8ToAnsi(utf8); + return Utf8ToAnsi(utf8Str.c_str()); #else - return utf8; + return utf8Str; #endif } -std::string StdStringToUtf8(const char* str) +std::string StdStringToUtf8(const std::string& stdStr) { #if defined(HG_CMP_MSC) - return AnsiToUtf8(str); + return AnsiToUtf8(stdStr.c_str()); #else - return str; + return stdStr; #endif } \ No newline at end of file diff --git a/utility/HGString.h b/utility/HGString.h index 79c0180e..5040d1e3 100644 --- a/utility/HGString.h +++ b/utility/HGString.h @@ -6,9 +6,9 @@ // 标准字符串：windows下为ansi编码，linux下为utf8编码 // UTF8转标准字符串 -std::string Utf8ToStdString(const char* utf8); +std::string Utf8ToStdString(const std::string& utf8Str); // 标准字符串转UTF8 -std::string StdStringToUtf8(const char* str); +std::string StdStringToUtf8(const std::string& stdStr); #endif /* __HGSTRING_H__ */ \ No newline at end of file