refactor codes.
This commit is contained in:
parent
f078a3c04f
commit
1e79fdc2de
@ -168,49 +168,9 @@ std::string JsonData::JsonCmd_Cgi_54(Param_54 ¶m) {
|
|||||||
nodeArray.append(arrRes[j][0]);
|
nodeArray.append(arrRes[j][0]);
|
||||||
stringToHex(arrRes[j][1].c_str(), hex);
|
stringToHex(arrRes[j][1].c_str(), hex);
|
||||||
nodeArray.append(hex);
|
nodeArray.append(hex);
|
||||||
nodeArray.append(arrRes[j][2]);
|
for (int k = 2; k <= 44; ++k) {
|
||||||
nodeArray.append(arrRes[j][3]);
|
nodeArray.append(arrRes[j][k]);
|
||||||
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]);
|
|
||||||
jsArray.append(nodeArray);
|
jsArray.append(nodeArray);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -350,7 +310,7 @@ std::string JsonData::JsonCmd_Cgi_29(Param_29 ¶m) {
|
|||||||
jsonVal["success"] = false;
|
jsonVal["success"] = false;
|
||||||
jsonVal["message"] = "error";
|
jsonVal["message"] = "error";
|
||||||
} else {
|
} else {
|
||||||
float fTemp = 0;
|
float fTemp = 0.0f;
|
||||||
inFile.read((char *)localtimestamp, sizeof(localtimestamp));
|
inFile.read((char *)localtimestamp, sizeof(localtimestamp));
|
||||||
while (inFile.read((char *)&fTemp, sizeof(fTemp))) {
|
while (inFile.read((char *)&fTemp, sizeof(fTemp))) {
|
||||||
vecWave.push_back(fTemp);
|
vecWave.push_back(fTemp);
|
||||||
@ -437,7 +397,7 @@ std::string JsonData::JsonCmd_Cgi_30(Param_30 ¶m) {
|
|||||||
jsonVal["success"] = "false";
|
jsonVal["success"] = "false";
|
||||||
jsonVal["message"] = "error";
|
jsonVal["message"] = "error";
|
||||||
} else {
|
} else {
|
||||||
float fTemp = 0;
|
float fTemp = 0.0f;
|
||||||
|
|
||||||
inFile.read((char *)localtimestamp, sizeof(localtimestamp));
|
inFile.read((char *)localtimestamp, sizeof(localtimestamp));
|
||||||
std::string::size_type comper = param.mChannelId.find("Z");
|
std::string::size_type comper = param.mChannelId.find("Z");
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user