From 1e79fdc2de2516bba74d310487b199869ac8b25d Mon Sep 17 00:00:00 2001 From: pandx Date: Fri, 8 Nov 2024 19:51:27 +0800 Subject: [PATCH] refactor codes. --- jsonparse/web_cmd_parse2.cpp | 50 ++++-------------------------------- 1 file changed, 5 insertions(+), 45 deletions(-) diff --git a/jsonparse/web_cmd_parse2.cpp b/jsonparse/web_cmd_parse2.cpp index 3e27b1d..3159701 100644 --- a/jsonparse/web_cmd_parse2.cpp +++ b/jsonparse/web_cmd_parse2.cpp @@ -168,49 +168,9 @@ std::string JsonData::JsonCmd_Cgi_54(Param_54 ¶m) { nodeArray.append(arrRes[j][0]); stringToHex(arrRes[j][1].c_str(), hex); nodeArray.append(hex); - nodeArray.append(arrRes[j][2]); - nodeArray.append(arrRes[j][3]); - nodeArray.append(arrRes[j][4]); - nodeArray.append(arrRes[j][5]); - nodeArray.append(arrRes[j][6]); - nodeArray.append(arrRes[j][7]); - nodeArray.append(arrRes[j][8]); - nodeArray.append(arrRes[j][9]); - nodeArray.append(arrRes[j][10]); - nodeArray.append(arrRes[j][11]); - nodeArray.append(arrRes[j][12]); - nodeArray.append(arrRes[j][13]); - nodeArray.append(arrRes[j][14]); - nodeArray.append(arrRes[j][15]); - nodeArray.append(arrRes[j][16]); - nodeArray.append(arrRes[j][17]); - nodeArray.append(arrRes[j][18]); - nodeArray.append(arrRes[j][19]); - nodeArray.append(arrRes[j][20]); - nodeArray.append(arrRes[j][21]); - nodeArray.append(arrRes[j][22]); - nodeArray.append(arrRes[j][23]); - nodeArray.append(arrRes[j][24]); - nodeArray.append(arrRes[j][25]); - nodeArray.append(arrRes[j][26]); - nodeArray.append(arrRes[j][27]); - nodeArray.append(arrRes[j][28]); - nodeArray.append(arrRes[j][29]); - nodeArray.append(arrRes[j][30]); - nodeArray.append(arrRes[j][31]); - nodeArray.append(arrRes[j][32]); - nodeArray.append(arrRes[j][33]); - nodeArray.append(arrRes[j][34]); - nodeArray.append(arrRes[j][35]); - nodeArray.append(arrRes[j][36]); - nodeArray.append(arrRes[j][37]); - nodeArray.append(arrRes[j][38]); - nodeArray.append(arrRes[j][39]); - nodeArray.append(arrRes[j][40]); - nodeArray.append(arrRes[j][41]); - nodeArray.append(arrRes[j][42]); - nodeArray.append(arrRes[j][43]); - nodeArray.append(arrRes[j][44]); + for (int k = 2; k <= 44; ++k) { + nodeArray.append(arrRes[j][k]); + } jsArray.append(nodeArray); } @@ -350,7 +310,7 @@ std::string JsonData::JsonCmd_Cgi_29(Param_29 ¶m) { jsonVal["success"] = false; jsonVal["message"] = "error"; } else { - float fTemp = 0; + float fTemp = 0.0f; inFile.read((char *)localtimestamp, sizeof(localtimestamp)); while (inFile.read((char *)&fTemp, sizeof(fTemp))) { vecWave.push_back(fTemp); @@ -437,7 +397,7 @@ std::string JsonData::JsonCmd_Cgi_30(Param_30 ¶m) { jsonVal["success"] = "false"; jsonVal["message"] = "error"; } else { - float fTemp = 0; + float fTemp = 0.0f; inFile.read((char *)localtimestamp, sizeof(localtimestamp)); std::string::size_type comper = param.mChannelId.find("Z");