fix typos

fireWidget/firingwidget.cpp

@@ -47,8 +47,8 @@ firingWidget::firingWidget(const int &row, const bool &select, const QString &uu
     mqttThread->start();
     connect(mqttThread, &MqttThread::projectMqttMessageReceived, this,
             &firingWidget::handleProjectFiringMqttMessage);
-    connect(this, &firingWidget::lastStageChanged, this, &firingWidget::hanldeFiringStageChanged);
-    connect(this, &firingWidget::updateData, this, &firingWidget::onBlastSucess);
+    connect(this, &firingWidget::lastStageChanged, this, &firingWidget::handleFiringStageChanged);
+    connect(this, &firingWidget::updateData, this, &firingWidget::onBlastSuccess);
     startBlasting();
 }
 
@@ -327,7 +327,7 @@ void firingWidget::onButtonPressedReceived(const QString &topic, const QString &
 void firingWidget::onSafeChecked(const QString projectUuid) {
     if (projectUuid == m_uuid) {
         lastStage = 3;  // 设置为待安全确认状态
-        emit projSafeChckSuccess(m_uuid);
+        emit projSafeCheckSuccess(m_uuid);
         emit lastStageChanged(lastStage);
         qDebug() << ANSI_COLOR_GREEN << "安全确认成功，进入待起爆状态" << ANSI_COLOR_RESET;
     } else {
@@ -336,7 +336,7 @@ void firingWidget::onSafeChecked(const QString projectUuid) {
 }
 
 // 状态改变
-void firingWidget::hanldeFiringStageChanged(int newStage) {
+void firingWidget::handleFiringStageChanged(int newStage) {
     QString topic = "hxgc/" + m_uuid + "/P";
     QString message;
     QString buttonText;
@@ -421,9 +421,9 @@ void firingWidget::cancelBlasting() {
 }
 void firingWidget::on_sendTest_4_clicked() {}
 
-void firingWidget::testonBlastSucess(const QJsonObject &jsonObj) { onBlastSucess(jsonObj); }
+void firingWidget::testOnBlastSuccess(const QJsonObject &jsonObj) { onBlastSuccess(jsonObj); }
 // 处理爆破成功，安全验证装置通过MQTT传回的数据
-void firingWidget::onBlastSucess(const QJsonObject &jsonObj) {
+void firingWidget::onBlastSuccess(const QJsonObject &jsonObj) {
     Logger::getInstance("blastRecord.log")
         .info(QJsonDocument(jsonObj).toJson(QJsonDocument::Indented));
     blast_uuid = QUuid::createUuid().toString(QUuid::WithoutBraces).remove(QRegularExpression("-"));
@@ -435,7 +435,7 @@ void firingWidget::saveAndUploadRecord(const QJsonObject &jsonObj) {
     QSqlDatabase db = DatabaseManager::getInstance().getDatabase();
     if (!db.transaction()) {
         Logger::getInstance().critical(
-            QString("Failed to start DB trasaction. Error: %1").arg(db.lastError().text()));
+            QString("Failed to start DB transaction. Error: %1").arg(db.lastError().text()));
         return;
     }
 

fireWidget/firingwidget.h

@@ -61,7 +61,7 @@ class firingWidget : public QWidget {
                           QWidget *parent = nullptr);
     ~firingWidget();
     void cancelBlasting();
-    void testonBlastSucess(const QJsonObject &data);
+    void testOnBlastSuccess(const QJsonObject &data);
 
    public slots:
     void onCountdownFinished(const QString &topic, const QString &message);
@@ -74,13 +74,13 @@ class firingWidget : public QWidget {
     void onMqttConnected();
     // 双键按下
     void onButtonPressedReceived(const QString &topic, const QString &message);
-    void hanldeFiringStageChanged(int newStage);
-    void onBlastSucess(const QJsonObject &data);
+    void handleFiringStageChanged(int newStage);
+    void onBlastSuccess(const QJsonObject &data);
 
    signals:
     void progressChanged(int value, int row);
     void lastStageChanged(int newStage);
-    void projSafeChckSuccess(QString projectUuid);
+    void projSafeCheckSuccess(QString projectUuid);
     void updateBlastStatus(int status, int row);
     void selectSignal(QString uuid);
     void updateButton(int status, int row);

global.cpp

@@ -8,5 +8,5 @@ QString firewidgetPort("COM1");  // 4 for dev; 1: 爆破装
 QString gpsPort("COM3");
 QString databaseHost("192.168.0.241");
 QString mqttClientId("mqttclient_OnDevPC");
-QString MQTT_TOPIC_CAMPANY_PROJECTS("hxgc/companycode/pro/P");
+QString MQTT_TOPIC_COMPANY_PROJECTS("hxgc/companycode/pro/P");
 bool isShowTriggeringWidget = false;

global.h

@@ -15,7 +15,7 @@ extern QString firewidgetPort;               // 点火装置串口号
 extern QString gpsPort;                      // gps串口号
 extern QString databaseHost;                 // pc数据库地址
 extern QString mqttClientId;                 // mqtt客户端ID
-extern QString MQTT_TOPIC_CAMPANY_PROJECTS;  // 每个部署点(公司)唯一地址
+extern QString MQTT_TOPIC_COMPANY_PROJECTS;  // 每个部署点(公司)唯一地址
 extern bool isShowTriggeringWidget;          // 是否显示点火装置触发中调试组件
 
 /* BlastStatus*/
@@ -23,7 +23,7 @@ namespace BlastStatus {
 const QString Created = "1";
 const QString Registered = "2";
 const QString Blasted = "3";
-const QString ErrorOccured = "4";
+const QString ErrorOccurred = "4";
 const QString SafeChecked = "5";
 }  // namespace BlastStatus
 
@@ -31,7 +31,7 @@ namespace BlastStatusNames {
 const QString Created = "未注册";
 const QString Registered = "已注册";
 const QString Blasted = "爆破完成";
-const QString ErrorOccured = "爆破异常";
+const QString ErrorOccurred = "爆破异常";
 const QString SafeChecked = "已安全检查";
 }  // namespace BlastStatusNames
 

mainwindow.cpp

@@ -132,7 +132,7 @@ void MainWindow::initialMqttService() {
     Logger::getInstance().info("Start init Mqtt server.");
     MqttClient *pcMqttInit = MqttClient::getInstance();
     // "hxgc/topic"
-    QStringList topics = {MQTT_TOPIC_CAMPANY_PROJECTS};
+    QStringList topics = {MQTT_TOPIC_COMPANY_PROJECTS};
     pcMqttInit->connectToMqttBroker("114.55.233.194", 1883, "hxgc", "hxgc123456", mqttClientId,
                                     topics);
     connect(pcMqttInit, &MqttClient::proMessageReceived, this,
@@ -317,4 +317,4 @@ QList<QString> MainWindow::findAllChildUuids(const QJsonArray &addressArray,
     }
 
     return childrenUuids;
-}
+}

mqtt/mqttclient.cpp

@@ -99,7 +99,7 @@ void MqttClient::sendMessage(const QString &topic, const QByteArray &message, qu
 }
 
 void MqttClient::onMessageReceived(const QByteArray &message, const QMqttTopicName &topic) {
-    if (topic.name() == MQTT_TOPIC_CAMPANY_PROJECTS) {
+    if (topic.name() == MQTT_TOPIC_COMPANY_PROJECTS) {
         emit proMessageReceived(message, topic);
     } else {
         emit messageReceived(message, topic);
@@ -127,4 +127,4 @@ void MqttClient::onStateChanged(QMqttClient::ClientState state) {
 void MqttClient::onError(QMqttClient::ClientError error) {
     qDebug() << "MQTT 错误: " << error;
     Logger::getInstance().error(QString("MQTT client error: %1").arg(error));
-}
+}