diff --git a/app_source/qml/components/FrameChooser.qml b/app_source/qml/components/FrameChooser.qml index 62b5f98..5851a6a 100644 --- a/app_source/qml/components/FrameChooser.qml +++ b/app_source/qml/components/FrameChooser.qml @@ -34,7 +34,7 @@ Item { Component.onCompleted: { let result = Config.getArray('Protocol', 'data_frame_name') - if (result) + if (result.length) { frame_model.clear() var name_array=[],type_array=[] diff --git a/app_source/source/zigbeedataresolver.cpp b/app_source/source/zigbeedataresolver.cpp index 9961f02..1ca5f30 100644 --- a/app_source/source/zigbeedataresolver.cpp +++ b/app_source/source/zigbeedataresolver.cpp @@ -254,18 +254,20 @@ void ZigBeeDataResolver::des_port_parser(zigbee_protocol::ZigbeeFrame &zframe, b QStringList name_list, type_list; name_list = Config::instance()->getArray("Protocol", "data_frame_name").toStringList(); type_list = Config::instance()->getArray("Protocol", "data_frame_type").toStringList(); + if (!name_list.length()) + break; note_text += "传感器数据:"; void* pdata = (void *)ddata->data; for (uint8_t i = 0; i < name_list.length(); i++) { note_text += name_list[i]+ ":" + sensor_data_reader(&pdata,type_list[i]) + ' '; } + object.insert("note_text",QJsonValue(note_text)); break; } default: break; } - object.insert("note_text",QJsonValue(note_text)); if (QRandomGenerator::global()->bounded(2)!=0 && is_demo) object.insert("decrypted_text", QJsonValue(QString(zdata.toHex(' ').toUpper()))); emit data_send("zigbee_recv_data_view",object);