lnk/microser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix rt data and mult front

Browse Source
This commit is contained in:
lnk
2025-02-17 16:58:14 +08:00
parent 322f41a03b
commit a110614220
4 changed files with 76 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
json/create_json.cpp
View File

@@ -1769,28 +1769,29 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
}
#endif
////lnk2024-8-15 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><><EFBFBD>ͽ<EFBFBD><CDBD><EFBFBD>
if (strcmp(v_wiring_type, "01") == 0) //lnk2024-8-15 <20><><EFBFBD>ͽ<EFBFBD><CDBD><EFBFBD>
if (strcmp(v_wiring_type, "1") == 0) //lnk2024-8-15 <20><><EFBFBD>ͽ<EFBFBD><CDBD><EFBFBD>
{
cout << "report v_wiring_type is" << v_wiring_type << endl;
cout << "1 report v_wiring_type is" << v_wiring_type << endl;
if (xmlinfo_list.contains(data->dev_type)) {
cout << "transfer_json_block_data contain data->dev_type" << endl;
ctopic_list = xmlinfo_list[data->dev_type]->topicList;
}
else {
cout << "transfer_json_block_data not contain data->dev_type" << endl;
cout << "transfer_json_block_data not contain data->dev_type:" << data->dev_type.toStdString() << " !!!!"<< endl;
ctopic_list = topicList;
}
}
else //lnk2024-8-15 <20><><EFBFBD>ͽ<EFBFBD><CDBD><EFBFBD>
{
cout << "report v_wiring_type is" << v_wiring_type << endl;
cout << "2 report v_wiring_type is" << v_wiring_type << endl;
if (xmlinfo_list2.contains(data->dev_type)) {
cout << "transfer_json_block_data contain data->dev_type" << endl;
ctopic_list = xmlinfo_list2[data->dev_type]->topicList;
}
else {
cout << "transfer_json_block_data not contain data->dev_type" << endl;
cout << "transfer_json_block_data not contain data->dev_type:" << data->dev_type.toStdString() << " !!!!"<< endl;
ctopic_list = topicList;
}
}
@@ -3733,6 +3734,13 @@ void Set_xml_databaseinfo(char* MODEL_ID, char* TMNL_TYPE, char* FILE_PATH, char
else {
}*/
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
if (xmlinfo_list.contains(type)) {
std::cout << "xmlinfo_list.contains" << type.toStdString() <<std::endl;
}
else{
std::cout << "??????????????????xmlinfo_list not contains" << type.toStdString() <<std::endl;
}
}
//zw<7A>޸<EFBFBD> 2023-9-4 <20><>ȡװ<C8A1><D7B0><EFBFBD><EFBFBD><EFBFBD>Ͷ<EFBFBD>Ӧ<EFBFBD><D3A6>xml<6D>ļ<EFBFBD>
void Set_xml_nodeinfo()