Commit 7795de17 by yunpeng.song

凑凑版(posno 为 mac地址)

parent a5eae3da
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <tlhelp32.h> #include <tlhelp32.h>
#include <Userenv.h> #include <Userenv.h>
#include <QProcess> #include <QProcess>
#include <QNetworkInterface>
#include "JlCompress.h" #include "JlCompress.h"
FmControl::FmControl() FmControl::FmControl()
...@@ -484,3 +485,29 @@ bool FmControl::_KillProcess(const QStringList &exeList, QString &error) ...@@ -484,3 +485,29 @@ bool FmControl::_KillProcess(const QStringList &exeList, QString &error)
return true; return true;
} }
//获取机器mac地址
void FmControl::getMac(QString &mac)
{
QStringList mac_list;
QString strMac;
QList<QNetworkInterface> ifaces = QNetworkInterface::allInterfaces();
for (int i=0; i<ifaces.count(); i++)
{
QNetworkInterface iface = ifaces.at(i);
//过滤掉本地回环地址、没有开启的地址
if (iface.flags().testFlag(QNetworkInterface::IsUp) && !iface.flags().testFlag(QNetworkInterface::IsLoopBack))
{
//过滤掉虚拟地址
if (!(iface.humanReadableName().contains("VMware",Qt::CaseInsensitive)))
{
strMac = iface.hardwareAddress();
mac_list.append(strMac);
}
}
}
if(mac_list.size() == 0 || mac_list.at(0).isEmpty()){
mac = "00-00-00-00-00-00-00-00";
}
mac = mac_list.at(0);
}
...@@ -17,6 +17,7 @@ public: ...@@ -17,6 +17,7 @@ public:
* */ * */
void Start(); void Start();
static void getMac(QString &mac);
private: private:
// 程序守护定时器 // 程序守护定时器
QTimer m_keepTimer; QTimer m_keepTimer;
......
...@@ -12,7 +12,8 @@ DEFINES += QUAZIP_STATIC ...@@ -12,7 +12,8 @@ DEFINES += QUAZIP_STATIC
#DEFINES += SHAN_LIN #DEFINES += SHAN_LIN
#DEFINES += BALIBEITIAN #DEFINES += BALIBEITIAN
#DEFINES += AXMX #DEFINES += AXMX
DEFINES += SAAS #DEFINES += SAAS
DEFINES += CHOUCHOU
#DEFINES += AI_SEN #DEFINES += AI_SEN
#DEFINES += TODAY #DEFINES += TODAY
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <QDomComment> #include <QDomComment>
#include <QDomElement> #include <QDomElement>
#include <QSqlQuery> #include <QSqlQuery>
#include <QNetworkInterface>
#include <QFile> #include <QFile>
#include <QDir> #include <QDir>
...@@ -115,6 +116,11 @@ FmTools::FmTools() ...@@ -115,6 +116,11 @@ FmTools::FmTools()
m_partnerId = "66666"; m_partnerId = "66666";
#endif #endif
#ifdef CHOUCHOU
m_partnerId = "2143";
#endif
#ifdef BALIBEITIAN #ifdef BALIBEITIAN
#define MY_CFG "FMPOS.ini" #define MY_CFG "FMPOS.ini"
...@@ -317,7 +323,11 @@ QByteArray FmTools::GetUpdateData() ...@@ -317,7 +323,11 @@ QByteArray FmTools::GetUpdateData()
rObj.insert(JSON_STOREID, storeid); rObj.insert(JSON_STOREID, storeid);
rObj.insert(JSON_POSNO, relposid); rObj.insert(JSON_POSNO, relposid);
#elif CHOUCHOU
QString mac = "";
getMac(mac);
rObj.insert(JSON_STOREID, "coucou6666");
rObj.insert(JSON_POSNO, mac);
#else #else
rObj.insert(JSON_STOREID, setting.value(m_keyStoreId).toString()); rObj.insert(JSON_STOREID, setting.value(m_keyStoreId).toString());
rObj.insert(JSON_POSNO, setting.value(m_keyPosId).toString()); rObj.insert(JSON_POSNO, setting.value(m_keyPosId).toString());
...@@ -366,6 +376,11 @@ QByteArray FmTools::GetReportData(QString planid, QString msg, QString updateSta ...@@ -366,6 +376,11 @@ QByteArray FmTools::GetReportData(QString planid, QString msg, QString updateSta
rObj.insert(JSON_STOREID, storeid); rObj.insert(JSON_STOREID, storeid);
rObj.insert(JSON_POSNO, relposid); rObj.insert(JSON_POSNO, relposid);
#elif CHOUCHOU
QString mac = "";
getMac(mac);
rObj.insert(JSON_STOREID, "coucou6666");
rObj.insert(JSON_POSNO, mac);
#else #else
rObj.insert(JSON_STOREID, setting.value(m_keyStoreId).toString()); rObj.insert(JSON_STOREID, setting.value(m_keyStoreId).toString());
rObj.insert(JSON_POSNO, setting.value(m_keyPosId).toString()); rObj.insert(JSON_POSNO, setting.value(m_keyPosId).toString());
...@@ -377,3 +392,29 @@ QByteArray FmTools::GetReportData(QString planid, QString msg, QString updateSta ...@@ -377,3 +392,29 @@ QByteArray FmTools::GetReportData(QString planid, QString msg, QString updateSta
rObj.insert(JSON_MSG, msg); rObj.insert(JSON_MSG, msg);
return QJsonDocument(rObj).toJson(QJsonDocument::Compact); return QJsonDocument(rObj).toJson(QJsonDocument::Compact);
} }
//获取机器mac地址
void FmTools::getMac(QString &mac)
{
QStringList mac_list;
QString strMac;
QList<QNetworkInterface> ifaces = QNetworkInterface::allInterfaces();
for (int i=0; i<ifaces.count(); i++)
{
QNetworkInterface iface = ifaces.at(i);
//过滤掉本地回环地址、没有开启的地址
if (iface.flags().testFlag(QNetworkInterface::IsUp) && !iface.flags().testFlag(QNetworkInterface::IsLoopBack))
{
//过滤掉虚拟地址
if (!(iface.humanReadableName().contains("VMware",Qt::CaseInsensitive)))
{
strMac = iface.hardwareAddress();
mac_list.append(strMac);
}
}
}
if(mac_list.size() == 0 || mac_list.at(0).isEmpty()){
mac = "00-00-00-00-00-00-00-00";
}
mac = mac_list.at(0);
}
...@@ -59,6 +59,7 @@ public: ...@@ -59,6 +59,7 @@ public:
bool ReadXml(QString xmlfilename, QMap<QString, QString> &value, QString key, QString &outNum, bool flg = true); bool ReadXml(QString xmlfilename, QMap<QString, QString> &value, QString key, QString &outNum, bool flg = true);
static void getMac(QString &mac);
private: private:
FmTools(); FmTools();
~FmTools(); ~FmTools();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment