Index: sources/device/DeviceView.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rf0a80523d37c862fd24064522216b0bd53a2cc33 --- sources/device/DeviceView.h (.../DeviceView.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/device/DeviceView.h (.../DeviceView.h) (revision f0a80523d37c862fd24064522216b0bd53a2cc33) @@ -47,6 +47,11 @@ eRole_WifiSignalLevel , eRole_WifiSupported , eRole_WifiConnected , + eRole_WifiIpAddress , + eRole_WifiGateway , + eRole_WifiSubnetMask , + eRole_WifiDns , + // ----- Bluetooth eRole_BLE_UNUSED , }; @@ -59,6 +64,10 @@ { eRole_WifiSignalLevel , "wifiSignalLevel" }, { eRole_WifiSupported , "wifiSupported" }, { eRole_WifiConnected , "wifiConnected" }, + { eRole_WifiIpAddress , "wifiIpAddress" }, + { eRole_WifiGateway , "wifiGateway" }, + { eRole_WifiSubnetMask , "wifiSubnetMask" }, + { eRole_WifiDns , "wifiDns" }, // ----- Bluetooth }; @@ -70,6 +79,11 @@ qint16 mWifiSignalLevel ; bool mWifiSupported = false ; bool mWifiConnected = false ; + QString mWifiIpAddress ; + QString mWifiGateway ; + QString mWifiSubnetMask ; + QString mWifiDns ; + // ----- Bluetooth QString mBle_Unused ; }; @@ -112,14 +126,23 @@ ATTRIBUTE ( QStringList , wifiList , {}, WifiList ) READONLY ( bool , wifiListEnabled , true ) + ATTRIBUTE ( QStringList , wifiInfo , {}, WifiInfo ) + READONLY ( QString , ipAddress , "" ) + READONLY ( QString , gateway , "" ) + READONLY ( QString , subnetMask , "" ) + READONLY ( QString , dns , "" ) VIEW_DEC_CLASS_EX(VDevice, QAbstractListModel) private slots: void onPOSTOSVersionData (const QString &vOSVersion); +signals: + void didGetWifiInfo (); + private: void parseWifiListResult(const QString &vResult); + void parseWifiInfoResult(const QString &vResult); bool isCompleteResponse(Model::MDeviceResponseBase::Data vData) { // Either the script exited successfully or the script failed and the reason is provided // There are situations that the script is using the attribute response to update the UI