区分V2

src/client/client.cpp

@@ -26,6 +26,8 @@
 clock_t  start;
 clock_t  endtime;
 
+//#define VERSION_V2
+
 PostClient* PostClient::getInstance() 
 {
     static PostClient value;
@@ -48,7 +50,12 @@ void PostClient::ClientInit(QString account, QString password)
     connect(manager, &QNetworkAccessManager::finished, this, &PostClient::PostBack);//通信完成后，自动执行getBack
     task = SIGNIN;
     QString str = "{\"type\":\"1\",\"account\":\"" + account + "\",\"password\":\"" + password + "\"}";
+
+#ifdef VERSION_V2
+    SendPost(str, "/login");
+#else
     SendPost(str);
+#endif
     LOG_DEBUG("登录信息发送成功！！");
 }
 /*
@@ -247,19 +254,24 @@ void PostClient::PostImgToServer(std::string data1, std::string data2)
 {
     task = JIER;
     QString str = "{\"type\":\"2\",\"key\":\"" + key + "\",\"img1\":\"" + QString::fromStdString(data1) + "\",\"img2\":\"" + QString::fromStdString(data2) + "\"}";
+
+#ifdef VERSION_V2
+    SendPost(str, "/measure/process");
+#else
     SendPost(str);
+#endif
 }
 /*
  * @brief 向服务器发送请求
  * @param QString sendString 所要发送的json字符串
  * @return void
  */
-void PostClient::SendPost(QString sendString)
+void PostClient::SendPost(QString sendString, QString path)
 {
     QByteArray dataArray = sendString.toUtf8();
     // 构造请求
     static QNetworkRequest request;
-    request.setUrl(QUrl("https://api.chanivision.com/api/"));
+    request.setUrl(QUrl("https://api.chanivision.com/api/" + path));
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json;charset=utf-8");
     // 发送请求
     start = clock();
@@ -311,7 +323,11 @@ void PostClient::PostBack(QNetworkReply* reply)
     QJsonObject jsonObject = doucment.object();
     if (task == SIGNIN) //登录任务解析数据
     {
+#ifdef VERSION_V2
+        if (jsonObject.value("code").toInt() == 0)
+#else
         if (jsonObject.value("code").toInt() == 1)
+#endif
         {
             qDebug() << "Sign in finished!";
             key = jsonObject.value("key").toString();
@@ -357,8 +373,18 @@ void PostClient::ParseJson(QJsonObject jsonObject)
 {
     std::multimap<int, QRect> errorsRect;
 
+#ifdef VERSION_V2
+    if (jsonObject.contains("code") && jsonObject.value("code").toInt() != 0)
+    {
+        // TODO 处理错误
+    }
+
+    // TODO
+
+#else
     if (jsonObject.contains("code"))
     {
+
         if (jsonObject.value("code").toInt() == 3)
         {
             emit(sendInformation(QStringLiteral("执行失败!(code:3)")));
@@ -415,6 +441,7 @@ void PostClient::ParseJson(QJsonObject jsonObject)
     }
     LOG_INFO(rltStr.toStdString().c_str());
     emit(sendParseResult(errorsRect)); //emit检测框的类别以及对应的位置信息
+#endif
 }
 
 

src/client/client.h

@@ -33,7 +33,7 @@ public:
 
 	void ClientInit(QString account, QString password);//客户端初始化，登录
 	void Register(QString account, QString password);//注册账户
-	void SendPost(QString sendString);//向服务器发送请求
+	void SendPost(QString sendString, QString path = "");//向服务器发送请求
 	void PostImgToServer(std::string data1, std::string data2);//发送参考图和检测图到服务器
 	void ParseJson(QJsonObject jsonObject);//解析服务器返回结果