zhangsheng/WLG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refactor' of http://192.168.0.10:3000/pandx/WLG into refactor

Browse Source
This commit is contained in:
zhangsheng 2024-11-09 16:15:46 +08:00
commit 157b4aaf10
1 changed files with 5 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
jsonparse/web_cmd_parse2.cpp
View File

@ -168,49 +168,9 @@ std::string JsonData::JsonCmd_Cgi_54(Param_54 &param) {
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 &param) {
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 &param) {
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");