zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Remove debugging code

QGC4.4
Gus Grubba 6 years ago
parent
0f974ebc76
commit
41351f8069
3 changed files with 59 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      custom-example/res/PairingIndicator.qml
  2. 36
      src/PairingManager/PairingManager.cc
  3. 76
      src/PairingManager/PairingManager.h

2
custom-example/res/PairingIndicator.qml
Unescape View File

@ -443,7 +443,7 @@ Item {
Repeater { Repeater {
model: parent._pairModel model: parent._pairModel
delegate: QGCLabel { delegate: QGCLabel {
text: modelData + ' ' + QGroundControl.pairingManager.pairedDeviceNameList.length text: modelData
Layout.row: index Layout.row: index
Layout.column: 0 Layout.column: 0
Layout.minimumWidth:ScreenTools.defaultFontPixelWidth * 14 Layout.minimumWidth:ScreenTools.defaultFontPixelWidth * 14

36
src/PairingManager/PairingManager.cc
Unescape View File

@ -62,6 +62,8 @@ void
PairingManager::setToolbox(QGCToolbox *toolbox) PairingManager::setToolbox(QGCToolbox *toolbox)
{ {
QGCTool::setToolbox(toolbox); QGCTool::setToolbox(toolbox);
_updatePairedDeviceNameList();
emit pairedListChanged();
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -71,19 +73,20 @@ PairingManager::_pairingCompleted(QString name)
_writeJson(_jsonDoc, _pairingCacheFile(name)); _writeJson(_jsonDoc, _pairingCacheFile(name));
_remotePairingMap["NM"] = name; _remotePairingMap["NM"] = name;
_lastPaired = name; _lastPaired = name;
_updatePairedDeviceNameList();
emit pairedListChanged(); emit pairedListChanged();
emit pairedVehicleChanged(); emit pairedVehicleChanged();
_app->informationMessageBoxOnMainThread("", tr("Paired with %1").arg(name)); //_app->informationMessageBoxOnMainThread("", tr("Paired with %1").arg(name));
setPairingStatus(PairingSuccess, tr("Pairing Successfull")); setPairingStatus(PairingSuccess, tr("Pairing Successfull"));
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void void
PairingManager::_connectionCompleted(QString name) PairingManager::_connectionCompleted(QString /*name*/)
{ {
//QString pwd = _remotePairingMap["PWD"].toString(); //QString pwd = _remotePairingMap["PWD"].toString();
//_toolbox->microhardManager()->switchToConnectionEncryptionKey(pwd); //_toolbox->microhardManager()->switchToConnectionEncryptionKey(pwd);
_app->informationMessageBoxOnMainThread("", tr("Connected to %1").arg(name)); //_app->informationMessageBoxOnMainThread("", tr("Connected to %1").arg(name));
setPairingStatus(PairingConnected, tr("Connection Successfull")); setPairingStatus(PairingConnected, tr("Connection Successfull"));
} }
@ -128,7 +131,7 @@ PairingManager::_stopUpload()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void void
PairingManager::_uploadFinished(void) PairingManager::_uploadFinished()
{ {
QMutexLocker lock(&_uploadMutex); QMutexLocker lock(&_uploadMutex);
QNetworkReply* reply = qobject_cast<QNetworkReply*>(QObject::sender()); QNetworkReply* reply = qobject_cast<QNetworkReply*>(QObject::sender());
@ -198,22 +201,21 @@ PairingManager::removePairedDevice(QString name)
{ {
QFile file(_pairingCacheFile(name)); QFile file(_pairingCacheFile(name));
file.remove(); file.remove();
_updatePairedDeviceNameList();
emit pairedListChanged(); emit pairedListChanged();
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
QStringList void
PairingManager::pairedDeviceNameList(void) PairingManager::_updatePairedDeviceNameList()
{ {
QStringList list; _deviceList.clear();
QDirIterator it(_pairingCacheDir().absolutePath(), QDir::Files); QDirIterator it(_pairingCacheDir().absolutePath(), QDir::Files);
while (it.hasNext()) { while (it.hasNext()) {
QFileInfo fileInfo(it.next()); QFileInfo fileInfo(it.next());
list.append(fileInfo.fileName()); _deviceList.append(fileInfo.fileName());
qCDebug(PairingManagerLog) << "Listing: " << fileInfo.fileName(); qCDebug(PairingManagerLog) << "Listing: " << fileInfo.fileName();
} }
return list;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -226,9 +228,9 @@ PairingManager::_assumeMicrohardPairingJson()
jsonObject.insert("LT", "MH"); jsonObject.insert("LT", "MH");
jsonObject.insert("IP", "192.168.168.10"); jsonObject.insert("IP", "192.168.168.10");
jsonObject.insert("AIP", _toolbox->microhardManager()->remoteIPAddr()); jsonObject.insert("AIP", _toolbox->microhardManager()->remoteIPAddr());
jsonObject.insert("CU", _toolbox->microhardManager()->configUserName()); jsonObject.insert("CU", _toolbox->microhardManager()->configUserName());
jsonObject.insert("CP", _toolbox->microhardManager()->configPassword()); jsonObject.insert("CP", _toolbox->microhardManager()->configPassword());
jsonObject.insert("EK", _toolbox->microhardManager()->encryptionKey()); jsonObject.insert("EK", _toolbox->microhardManager()->encryptionKey());
json.setObject(jsonObject); json.setObject(jsonObject);
return QString(json.toJson(QJsonDocument::Compact)); return QString(json.toJson(QJsonDocument::Compact));
@ -266,8 +268,8 @@ PairingManager::_parsePairingJson(QString jsonEnc)
} }
_remotePairingMap = jsonObj.toVariantMap(); _remotePairingMap = jsonObj.toVariantMap();
QString linkType = _remotePairingMap["LT"].toString(); QString linkType = _remotePairingMap["LT"].toString();
QString pport = _remotePairingMap["PP"].toString(); QString pport = _remotePairingMap["PP"].toString();
if (pport.length()==0) { if (pport.length()==0) {
pport = "29351"; pport = "29351";
} }
@ -449,7 +451,7 @@ PairingManager::_createMicrohardConnectJson(QString cert2)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
QStringList QStringList
PairingManager::pairingLinkTypeStrings(void) PairingManager::pairingLinkTypeStrings()
{ {
//-- Must follow same order as enum LinkType in LinkConfiguration.h //-- Must follow same order as enum LinkType in LinkConfiguration.h
static QStringList list; static QStringList list;
@ -478,7 +480,7 @@ PairingManager::_setPairingStatus(PairingStatus status, QString statusStr)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
QString QString
PairingManager::pairingStatusStr(void) const PairingManager::pairingStatusStr() const
{ {
return _statusString; return _statusString;
} }

76
src/PairingManager/PairingManager.h
Unescape View File

@ -61,13 +61,13 @@ public:
Q_ENUM(PairingStatus) Q_ENUM(PairingStatus)
QStringList pairingLinkTypeStrings (void); QStringList pairingLinkTypeStrings ();
QString pairingStatusStr (void) const; QString pairingStatusStr () const;
QStringList pairedDeviceNameList (void); QStringList pairedDeviceNameList () { return _deviceList; }
PairingStatus pairingStatus () { return _status; } PairingStatus pairingStatus () { return _status; }
QString pairedVehicle () { return _lastPaired; } QString pairedVehicle () { return _lastPaired; }
int nfcIndex (void) { return _nfcIndex; } int nfcIndex () { return _nfcIndex; }
int microhardIndex (void) { return _microhardIndex; } int microhardIndex () { return _microhardIndex; }
bool firstBoot () { return _firstBoot; } bool firstBoot () { return _firstBoot; }
bool errorState () { return _status == PairingRejected || _status == PairingConnectionRejected || _status == PairingError; } bool errorState () { return _status == PairingRejected || _status == PairingConnectionRejected || _status == PairingError; }
void setStatusMessage (PairingStatus status, QString statusStr) { emit setPairingStatus(status, statusStr); } void setStatusMessage (PairingStatus status, QString statusStr) { emit setPairingStatus(status, statusStr); }
@ -98,23 +98,23 @@ public:
Q_PROPERTY(bool firstBoot READ firstBoot WRITE setFirstBoot NOTIFY firstBootChanged) Q_PROPERTY(bool firstBoot READ firstBoot WRITE setFirstBoot NOTIFY firstBootChanged)
signals: signals:
void startUpload(QString pairURL, QJsonDocument); void startUpload (QString pairURL, QJsonDocument);
void closeConnection(); void closeConnection ();
void pairingConfigurationsChanged(); void pairingConfigurationsChanged ();
void nameListChanged(); void nameListChanged ();
void pairingStatusChanged(); void pairingStatusChanged ();
void parsePairingJson(QString json); void parsePairingJson (QString json);
void setPairingStatus(PairingStatus status, QString pairingStatus); void setPairingStatus (PairingStatus status, QString pairingStatus);
void pairedListChanged(); void pairedListChanged ();
void pairedVehicleChanged(); void pairedVehicleChanged ();
void firstBootChanged(); void firstBootChanged ();
private slots: private slots:
void _startUpload(QString pairURL, QJsonDocument); void _startUpload (QString pairURL, QJsonDocument);
void _stopUpload(); void _stopUpload ();
void _startUploadRequest(); void _startUploadRequest ();
void _parsePairingJson(QString jsonEnc); void _parsePairingJson (QString jsonEnc);
void _setPairingStatus(PairingStatus status, QString pairingStatus); void _setPairingStatus (PairingStatus status, QString pairingStatus);
private: private:
QString _statusString; QString _statusString;
@ -131,24 +131,26 @@ private:
QNetworkAccessManager* _uploadManager = nullptr; QNetworkAccessManager* _uploadManager = nullptr;
QString _uploadURL{}; QString _uploadURL{};
QString _uploadData{}; QString _uploadData{};
bool _firstBoot = true;
void _parsePairingJsonFile(); QStringList _deviceList;
QJsonDocument _createZeroTierConnectJson(QString cert2);
QJsonDocument _createMicrohardConnectJson(QString cert2); void _parsePairingJsonFile ();
QJsonDocument _createZeroTierPairingJson(QString cert1); QJsonDocument _createZeroTierConnectJson (QString cert2);
QJsonDocument _createMicrohardPairingJson(QString pwd, QString cert1); QJsonDocument _createMicrohardConnectJson (QString cert2);
QString _assumeMicrohardPairingJson(); QJsonDocument _createZeroTierPairingJson (QString cert1);
void _writeJson(QJsonDocument &jsonDoc, QString fileName); QJsonDocument _createMicrohardPairingJson (QString pwd, QString cert1);
QString _getLocalIPInNetwork(QString remoteIP, int num); QString _assumeMicrohardPairingJson ();
void _uploadFinished(void); void _writeJson (QJsonDocument &jsonDoc, QString fileName);
void _uploadError(QNetworkReply::NetworkError code); QString _getLocalIPInNetwork (QString remoteIP, int num);
void _pairingCompleted(QString name); void _uploadFinished ();
void _connectionCompleted(QString name); void _uploadError (QNetworkReply::NetworkError code);
QDir _pairingCacheDir(); void _pairingCompleted (QString name);
QString _pairingCacheFile(QString uavName); void _connectionCompleted (QString name);
bool _firstBoot = true; QDir _pairingCacheDir ();
QString _pairingCacheFile (QString uavName);
void _updatePairedDeviceNameList ();
#if defined QGC_ENABLE_NFC || defined QGC_ENABLE_QTNFC #if defined QGC_ENABLE_NFC || defined QGC_ENABLE_QTNFC
PairingNFC pairingNFC; PairingNFC pairingNFC;
#endif #endif
}; };

Write Preview
Loading…
Cancel
Save