Commit dce20eb221ab51af13b98fb7d7cbd17aecbd2623
1 parent
4ec187ba
Exists in
master
Adicionada classe cacic_hardware.
Showing
6 changed files
with
76 additions
and
1 deletions
Show diff stats
cacic-teste/cacic-teste.pro
| @@ -23,6 +23,7 @@ SOURCES += \ | @@ -23,6 +23,7 @@ SOURCES += \ | ||
| 23 | ../src/cacic_computer.cpp \ | 23 | ../src/cacic_computer.cpp \ |
| 24 | ../src/operatingsystem.cpp \ | 24 | ../src/operatingsystem.cpp \ |
| 25 | ../src/cacic_software.cpp \ | 25 | ../src/cacic_software.cpp \ |
| 26 | + ../src/cacic_hardware.cpp \ | ||
| 26 | # ../src/qtservice/src/qtservice.cpp \ | 27 | # ../src/qtservice/src/qtservice.cpp \ |
| 27 | # ../src/qtservice/src/qtservice_unix.cpp \ | 28 | # ../src/qtservice/src/qtservice_unix.cpp \ |
| 28 | # ../src/qtservice/src/qtservice_win.cpp \ | 29 | # ../src/qtservice/src/qtservice_win.cpp \ |
| @@ -38,10 +39,12 @@ HEADERS += \ | @@ -38,10 +39,12 @@ HEADERS += \ | ||
| 38 | ../src/console.h \ | 39 | ../src/console.h \ |
| 39 | ../src/operatingsystem.h \ | 40 | ../src/operatingsystem.h \ |
| 40 | ../src/cacic_software.h \ | 41 | ../src/cacic_software.h \ |
| 42 | + ../src/cacic_hardware.h \ | ||
| 41 | # ../src/qtservice/src/qtservice.h \ | 43 | # ../src/qtservice/src/qtservice.h \ |
| 42 | # ../src/qtservice/src/qtservice_p.h \ | 44 | # ../src/qtservice/src/qtservice_p.h \ |
| 43 | # ../src/qtservice/src/qtunixserversocket.h \ | 45 | # ../src/qtservice/src/qtunixserversocket.h \ |
| 44 | # ../src/qtservice/src/qtunixsocket.h | 46 | # ../src/qtservice/src/qtunixsocket.h |
| 47 | + ../src/cacic_hardware.h | ||
| 45 | 48 | ||
| 46 | INCLUDEPATH += ../src \ | 49 | INCLUDEPATH += ../src \ |
| 47 | ../src/crypto++/include/ | 50 | ../src/crypto++/include/ |
gercols/gercols.pro
| @@ -26,6 +26,7 @@ SOURCES += \ | @@ -26,6 +26,7 @@ SOURCES += \ | ||
| 26 | ../src/ccacic.cpp \ | 26 | ../src/ccacic.cpp \ |
| 27 | ../src/cacic_computer.cpp \ | 27 | ../src/cacic_computer.cpp \ |
| 28 | ../src/cacic_software.cpp \ | 28 | ../src/cacic_software.cpp \ |
| 29 | + ../src/cacic_hardware.cpp \ | ||
| 29 | ../src/operatingsystem.cpp \ | 30 | ../src/operatingsystem.cpp \ |
| 30 | ../src/ccoleta.cpp \ | 31 | ../src/ccoleta.cpp \ |
| 31 | ./gercols.cpp | 32 | ./gercols.cpp |
| @@ -35,10 +36,12 @@ HEADERS += \ | @@ -35,10 +36,12 @@ HEADERS += \ | ||
| 35 | ../src/ccacic.h \ | 36 | ../src/ccacic.h \ |
| 36 | ../src/cacic_computer.h \ | 37 | ../src/cacic_computer.h \ |
| 37 | ../src/cacic_software.h \ | 38 | ../src/cacic_software.h \ |
| 39 | + ../src/cacic_hardware.h \ | ||
| 38 | ../src/operatingsystem.h \ | 40 | ../src/operatingsystem.h \ |
| 39 | ../src/console.h \ | 41 | ../src/console.h \ |
| 40 | ../src/ccoleta.h \ | 42 | ../src/ccoleta.h \ |
| 41 | - ./gercols.h | 43 | + ./gercols.h \ |
| 44 | + ../src/cacic_hardware.h | ||
| 42 | 45 | ||
| 43 | INCLUDEPATH += ../src \ | 46 | INCLUDEPATH += ../src \ |
| 44 | ../src/crypto++/include/ | 47 | ../src/crypto++/include/ |
| @@ -0,0 +1,28 @@ | @@ -0,0 +1,28 @@ | ||
| 1 | +#include "cacic_hardware.h" | ||
| 2 | + | ||
| 3 | +cacic_hardware::cacic_hardware() | ||
| 4 | +{ | ||
| 5 | +} | ||
| 6 | + | ||
| 7 | +void cacic_hardware::iniciaColeta() | ||
| 8 | +{ | ||
| 9 | +#ifdef Q_OS_WIN | ||
| 10 | + this->coletaHardware = coletaWin(); | ||
| 11 | +#elif defined(Q_OS_LINUX) | ||
| 12 | + this->coletaHardware = coletaLinux(); | ||
| 13 | + | ||
| 14 | +#endif | ||
| 15 | +} | ||
| 16 | + | ||
| 17 | +QJsonObject cacic_hardware::coletaWin() | ||
| 18 | +{ | ||
| 19 | +#if defined(Q_OS_WIN) | ||
| 20 | + // Implementação seguindo as definições na documentação WMI. | ||
| 21 | +#endif | ||
| 22 | + return QJsonObject(); | ||
| 23 | +} | ||
| 24 | + | ||
| 25 | +QJsonObject cacic_hardware::coletaLinux() | ||
| 26 | +{ | ||
| 27 | + return QJsonObject(); | ||
| 28 | +} |
| @@ -0,0 +1,33 @@ | @@ -0,0 +1,33 @@ | ||
| 1 | +#ifndef CACIC_HARDWARE_H | ||
| 2 | +#define CACIC_HARDWARE_H | ||
| 3 | +#include <QtCore> | ||
| 4 | +#include <ccacic.h> | ||
| 5 | +#include <console.h> | ||
| 6 | +#include <operatingsystem.h> | ||
| 7 | + | ||
| 8 | +#if defined(Q_OS_WIN) | ||
| 9 | + #define _WIN32_DCOM | ||
| 10 | + #include <iostream> | ||
| 11 | + //using namespace std; | ||
| 12 | + #include <wbemidl.h> | ||
| 13 | + #include <windows.h> | ||
| 14 | + # pragma comment(lib, "wbemuuid.lib") | ||
| 15 | + | ||
| 16 | +#endif | ||
| 17 | + | ||
| 18 | +class cacic_hardware | ||
| 19 | +{ | ||
| 20 | +public: | ||
| 21 | + cacic_hardware(); | ||
| 22 | + void iniciaColeta(); | ||
| 23 | + QJsonObject toJsonObject(); | ||
| 24 | + | ||
| 25 | +private: | ||
| 26 | + QJsonObject coletaWin(); | ||
| 27 | + QJsonObject coletaLinux(); | ||
| 28 | + | ||
| 29 | + CCacic oCacic; | ||
| 30 | + QJsonObject coletaHardware; | ||
| 31 | +}; | ||
| 32 | + | ||
| 33 | +#endif // CACIC_HARDWARE_H |
src/ccoleta.cpp
| @@ -34,6 +34,11 @@ cacic_software CColeta::getOSoftware() const | @@ -34,6 +34,11 @@ cacic_software CColeta::getOSoftware() const | ||
| 34 | return oSoftware; | 34 | return oSoftware; |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | +cacic_hardware CColeta::getOHardware() const | ||
| 38 | +{ | ||
| 39 | + return oHardware; | ||
| 40 | +} | ||
| 41 | + | ||
| 37 | void CColeta::run() | 42 | void CColeta::run() |
| 38 | { | 43 | { |
| 39 | QJsonObject coleta = oCacic.getJsonFromFile("configReq.json"); | 44 | QJsonObject coleta = oCacic.getJsonFromFile("configReq.json"); |
src/ccoleta.h
| @@ -7,6 +7,7 @@ | @@ -7,6 +7,7 @@ | ||
| 7 | #include <ccacic.h> | 7 | #include <ccacic.h> |
| 8 | #include <cacic_computer.h> | 8 | #include <cacic_computer.h> |
| 9 | #include <cacic_software.h> | 9 | #include <cacic_software.h> |
| 10 | +#include <cacic_hardware.h> | ||
| 10 | 11 | ||
| 11 | 12 | ||
| 12 | class CColeta : public QObject | 13 | class CColeta : public QObject |
| @@ -17,12 +18,14 @@ private: | @@ -17,12 +18,14 @@ private: | ||
| 17 | CCacic oCacic; | 18 | CCacic oCacic; |
| 18 | CACIC_Computer oComputer; | 19 | CACIC_Computer oComputer; |
| 19 | cacic_software oSoftware; | 20 | cacic_software oSoftware; |
| 21 | + cacic_hardware oHardware; | ||
| 20 | 22 | ||
| 21 | public: | 23 | public: |
| 22 | explicit CColeta(QObject *parent = 0); | 24 | explicit CColeta(QObject *parent = 0); |
| 23 | 25 | ||
| 24 | CACIC_Computer getOComputer() const; | 26 | CACIC_Computer getOComputer() const; |
| 25 | cacic_software getOSoftware() const; | 27 | cacic_software getOSoftware() const; |
| 28 | + cacic_hardware getOHardware() const; | ||
| 26 | 29 | ||
| 27 | QJsonObject toJsonObject(); | 30 | QJsonObject toJsonObject(); |
| 28 | 31 |