|
|
@@ -89,6 +89,7 @@ InteractiveCAN::InteractiveCAN()
|
|
|
connect(m_bleClient, &BLEClient::tokenReceived, this, [this](const BLEToken& token) {
|
|
|
if (token.success && m_bleConnectTimer) {
|
|
|
if (m_startGetWorkTicketResultFlag) {
|
|
|
+ ReturnKeyLockManager::instance()->updateStatusMessage("蓝牙已连接,开始获取作业票完成情况...");
|
|
|
m_bleClient->startGetWorkTicketResult();
|
|
|
}
|
|
|
m_okOpenKey = true;
|
|
|
@@ -1046,10 +1047,12 @@ void InteractiveCAN::connectBLEDevice(const QString &keyNfc)
|
|
|
QByteArray jsonData = jsonDoc.toJson(QJsonDocument::Compact);
|
|
|
|
|
|
emit signalGetRequestData(timestampSeconds, url, jsonData, GetInteractiveData()->m_token);
|
|
|
+ ReturnKeyLockManager::instance()->updateStatusMessage("获取钥匙MAC地址中...");
|
|
|
|
|
|
if (m_bleClient) {
|
|
|
qDebug() << "[connectBLEDevice]: " << m_bleClient->isConnected();
|
|
|
if (m_bleClient->isConnected()) {
|
|
|
+ ReturnKeyLockManager::instance()->updateStatusMessage("蓝牙已连接,开始获取作业票完成情况...");
|
|
|
m_bleClient->startGetWorkTicketResult();
|
|
|
}
|
|
|
else {
|
|
|
@@ -1168,11 +1171,13 @@ void InteractiveCAN::slotOkSearchedBLE(bool success)
|
|
|
{
|
|
|
if (success) {
|
|
|
if (m_bleClient->isConnected()) {
|
|
|
+ ReturnKeyLockManager::instance()->updateStatusMessage("蓝牙已连接");
|
|
|
if (!m_okSendJobTicket) {
|
|
|
createColockJobTicket();
|
|
|
}
|
|
|
}
|
|
|
else {
|
|
|
+ ReturnKeyLockManager::instance()->updateStatusMessage("蓝牙连接中...");
|
|
|
m_bleClient->apiConnectDevice(m_currentKeyMAC);
|
|
|
}
|
|
|
}
|