Skip to content

G
gamera_videos_no_ui
Commit 483aea37 by “liusq”
Options

修改一建配置ip

parent eb6e5838
Showing with 461 additions and 258 deletions
CameraHandle.h
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "Json_Header/NetWork_Wifi.h" #include "Json_Header/NetWork_Wifi.h"
#include "Json_Header/SystemInfo.h" #include "Json_Header/SystemInfo.h"
#include "Json_Header/OPMachine.h" #include "Json_Header/OPMachine.h"
#include "NonConnectedCameraHandle.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "ParkingSpaceInfo.h" #include "ParkingSpaceInfo.h"
#include "hyper_lpr_sdk.h" #include "hyper_lpr_sdk.h"
...@@ -58,7 +59,6 @@ public: ...@@ -58,7 +59,6 @@ public:
void clearCameraHandle(); void clearCameraHandle();
bool distributionNetwork(QString &ip);
// void rebindTimer(int hDevice); // void rebindTimer(int hDevice);
//相机参数更新 //相机参数更新
void cameraParameterUpdate(vides_data::responseConfig &cloudConfig); void cameraParameterUpdate(vides_data::responseConfig &cloudConfig);
...@@ -91,11 +91,6 @@ public: ...@@ -91,11 +91,6 @@ public:
void setCarConfidenceMaxAndMin(float carConfidenceMax,float carConfidenceMin); void setCarConfidenceMaxAndMin(float carConfidenceMax,float carConfidenceMin);
QString DecIpToHexIp(const QString& decIp);
//修改相机IP
bool wifiChangeIp(QString &Ip,bool is_connect, int h_device);
//设置相机连接的wifi //设置相机连接的wifi
bool sdkWifi(QString &pwd,QString &ssid); bool sdkWifi(QString &pwd,QString &ssid);
//时间设置 //时间设置
...@@ -118,8 +113,6 @@ public: ...@@ -118,8 +113,6 @@ public:
void findFirmwareVersion(QString &firmwareVersion); void findFirmwareVersion(QString &firmwareVersion);
//复位GB28181 //复位GB28181
int resetGb28181(); int resetGb28181();
//修改相机ip
bool changeCameraIp(QString &reachableIp);
//获取ip //获取ip
void findIp(QString &ip); void findIp(QString &ip);
......
Common.cpp
...@@ -63,7 +63,36 @@ void Common::setImages(QString images){ ...@@ -63,7 +63,36 @@ void Common::setImages(QString images){
this->images=images; this->images=images;
} }
QString Common::DecIpToHexIp(const QString& decIp) {
// 将 IP 地址按点号分割成多个部分
QStringList parts = decIp.split(".");
// 检查 IP 地址是否有效（应包含 4 个部分）
if (parts.size() != 4) {
return QString(); // 如果无效，返回空字符串
}
QString hexIp; // 用于存储最终的十六进制表示
// 从最后一个部分开始遍历
for (int i = 3; i >= 0; --i) {
// 将每个部分转换为整数
bool ok;
int part = parts[i].toInt(&ok);
if (!ok) return QString(); // 如果转换失败，返回空字符串
// 将整数转换为十六进制字符串，并在必要时补零
QString hexPart = QString::number(part, 16).rightJustified(2, '0');
// 将十六进制字符串添加到结果中
hexIp.append(hexPart);
}
// 在结果前添加 "0x" 以表示十六进制
hexIp.prepend("0x");
return hexIp; // 返回最终的十六进制表示
}
QString Common::GetLocalIp() { QString Common::GetLocalIp() {
QString ipAddress; QString ipAddress;
QList<QHostAddress> list = QNetworkInterface::allAddresses(); QList<QHostAddress> list = QNetworkInterface::allAddresses();
......
Common.h
...@@ -45,6 +45,8 @@ public: ...@@ -45,6 +45,8 @@ public:
QString GetLocalIp(); QString GetLocalIp();
QString DecIpToHexIp(const QString& decIp);
template <typename T> template <typename T>
const T& clamp(const T& v, const T& lo, const T& hi) const T& clamp(const T& v, const T& lo, const T& hi)
{ {
......
MediaFaceImage.cpp
...@@ -281,4 +281,3 @@ int MediaFaceImage::CameraImage(XSDK_HANDLE hMedia,int nChannel,std::vector<ucha ...@@ -281,4 +281,3 @@ int MediaFaceImage::CameraImage(XSDK_HANDLE hMedia,int nChannel,std::vector<ucha
// 返回实际填入Vector的数据大小 // 返回实际填入Vector的数据大小
return pInOutBufferSize; return pInOutBufferSize;
} }
MediaFaceImage.h
...@@ -34,6 +34,7 @@ public: ...@@ -34,6 +34,7 @@ public:
void clearCurrentDevice(int hObject); void clearCurrentDevice(int hObject);
void setMap(int &key,CameraHandle*value); void setMap(int &key,CameraHandle*value);
private: private:
MediaFaceImage(); // 构造函数声明为私有 MediaFaceImage(); // 构造函数声明为私有
~MediaFaceImage(); // 析构函数声明为私有 ~MediaFaceImage(); // 析构函数声明为私有
......
MqttSubscriber.cpp
...@@ -182,15 +182,17 @@ int MqttSubscriber::messageArrived(char* topicName, int topicLen, MQTTAsync_mess ...@@ -182,15 +182,17 @@ int MqttSubscriber::messageArrived(char* topicName, int topicLen, MQTTAsync_mess
response.msg_type = jsonObj["msg_type"].toInt(); response.msg_type = jsonObj["msg_type"].toInt();
response.sn = jsonObj["sn"].toString(); response.sn = jsonObj["sn"].toString();
response.uniq = jsonObj["uniq"].toString(); response.uniq = jsonObj["uniq"].toString();
// 解析 msg_body 字段 if(response.msg_type==6 || response.msg_type==7){
if (jsonObj.contains("msg_body")) { // 解析 msg_body 字段
QString msgBodyStr = jsonObj["msg_body"].toString(); if (jsonObj.contains("msg_body")) {
// 将 msg_body 字符串转换为 QJsonDocument QString msgBodyStr = jsonObj["msg_body"].toString();
QJsonDocument msgBodyDoc = QJsonDocument::fromJson(msgBodyStr.toUtf8()); // 将 msg_body 字符串转换为 QJsonDocument
if (!msgBodyDoc.isNull() && msgBodyDoc.isObject()) { QJsonDocument msgBodyDoc = QJsonDocument::fromJson(msgBodyStr.toUtf8());
msgBodyOb = msgBodyDoc.object(); if (!msgBodyDoc.isNull() && msgBodyDoc.isObject()) {
} else { msgBodyOb = msgBodyDoc.object();
qInfo() << "Failed to parse msg_body as a JSON object."; } else {
qInfo() << "Failed to parse msg_body as a JSON object.";
}
} }
} }
} else { } else {
...@@ -199,51 +201,57 @@ int MqttSubscriber::messageArrived(char* topicName, int topicLen, MQTTAsync_mess ...@@ -199,51 +201,57 @@ int MqttSubscriber::messageArrived(char* topicName, int topicLen, MQTTAsync_mess
//1开 2关 3 重启 4 GB28181开 5 GB28181 关 6 一键配网 7 WIFI配留 8 复位GB28181 //1开 2关 3 重启 4 GB28181开 5 GB28181 关 6 一键配网 7 WIFI配留 8 复位GB28181
int res = -2; int res = -2;
CameraHandle* cameraHandle = MainWindow::sp_this->findHandle(response.sn); CameraHandle* cameraHandle = MainWindow::sp_this->findHandle(response.sn);
if (cameraHandle == nullptr) { int hDevice=0;
qInfo() << "不存在该相机"; if (cameraHandle == nullptr ) {
res = -1; if(response.msg_type == 6){
hDevice=-1;
}else {
qInfo() << "不存在该相机";
res = -1;
}
} else { } else {
if (response.msg_type == 2) { switch (response.msg_type) {
res = cameraHandle->deviceShutdown(); case 2: res = cameraHandle->deviceShutdown(); break;
} else if (response.msg_type == 3) { case 3: res = cameraHandle->deviceReboot(); break;
res = cameraHandle->deviceReboot(); case 4: res = cameraHandle->updateSdkDevStatus(true); break;
} else if (response.msg_type == 4) { case 5: res = cameraHandle->updateSdkDevStatus(false); break;
res = cameraHandle->updateSdkDevStatus(true); case 6: hDevice = cameraHandle->getHdevice(); break;
} else if (response.msg_type == 5) { case 7: {
res = cameraHandle->updateSdkDevStatus(false);
}else if (response.msg_type == 6) {
QString ipAddress ;
// 提取 ip 地址
if (msgBodyOb.contains("ip") && msgBodyOb["ip"].isString()) {
ipAddress = msgBodyOb["ip"].toString();
qInfo() << "IP Address: " << ipAddress;
} else {
qInfo() << "IP address not found in msg_body.";
}
res=cameraHandle->distributionNetwork(ipAddress);
}else if (response.msg_type == 7) {
// 提取 ip 地址
if (msgBodyOb.contains("username") && msgBodyOb.contains("password")) { if (msgBodyOb.contains("username") && msgBodyOb.contains("password")) {
QString username = msgBodyOb["username"].toString(); QString username = msgBodyOb["username"].toString();
QString password = msgBodyOb["password"].toString(); QString password = msgBodyOb["password"].toString();
res=(cameraHandle->sdkWifi(password,username)==true?0:0x01); res = (cameraHandle->sdkWifi(password, username) ? 0 : 0x01);
} else { } else {
qInfo() << "IP username not found in msg_body."; qInfo() << "IP username not found in msg_body.";
qInfo() << "IP password not found in msg_body."; qInfo() << "IP password not found in msg_body.";
} }
break;
} }
else if (response.msg_type == 8) { case 8: res = (cameraHandle->resetGb28181() ? 0 : 0x01); break;
res=(cameraHandle->resetGb28181()==true?0:0x01); default: qInfo() << "Unknown message type"; break;
} }
} }
if (response.msg_type == 6) {
NonConnectedCameraHandle *connectedCameraHandle =NonConnectedCameraHandle::getInstance();
QString ipAddress ;
// 提取 ip 地址
if (msgBodyOb.contains("ip") && msgBodyOb["ip"].isString()) {
ipAddress = msgBodyOb["ip"].toString();
qInfo() << "IP Address: " << ipAddress;
} else {
qInfo() << "IP address not found in msg_body.";
}
res=connectedCameraHandle->distributionNetwork(ipAddress,response.sn,hDevice);
}
vides_data::requestMqttData request; vides_data::requestMqttData request;
request.code = (res >= 0) ? 0 : 0x01; request.code = (res >= 0) ? 0 : 0x01;
request.msg = (res >= 0) ?"成功":"失败"; request.msg = (res >= 0) ?"成功":"失败";
request.uniq= response.uniq; request.uniq= response.uniq;
sendSubscriptionConfirmation(request,response.sn); sendSubscriptionConfirmation(request,response.sn);
MQTTAsync_freeMessage(&m); MQTTAsync_freeMessage(&m);
MQTTAsync_free(topicName); MQTTAsync_free(topicName);
return 1; return 1;
......
NonConnectedCameraHandle.h 0 → 100755
#ifndef NONCONNECTEDCAMERAHANDLE_H
#define NONCONNECTEDCAMERAHANDLE_H
#include "XSDKPublic.h"
#include "XNetSDKSyn.h"
#include "XNetSDKDefine.h"
#include "VidesData.h"
#include "Common.h"
#include "ScopeSemaphoreExit.h"
#include "Json_Header/NetWork_NetCommon.h"
#include "Json_Header/NetWork_Wifi.h"
#include <arpa/inet.h>
class NonConnectedCameraHandle
{
public:
static NonConnectedCameraHandle* getInstance(); // 单例模式获取实例的静态成员函数
//有线修改相机ip
bool changeCameraIp(vides_data::localDevice &device);
//无线修改相机ip
bool wifiChangeIp(QString &Ip, bool is_connect, int h_device,QString &sn);
bool isWifiConnect(XSDK_HANDLE hDevice,XSDK_CFG::NetWork_Wifi &cfg);
void printWifi(XSDK_HANDLE hDevice,XSDK_CFG::NetWork_Wifi &cfg);
bool distributionNetwork(QString &ip,QString &sSn,int hDevice);
int sdkDevLoginSyn(QString sDevId, int nDevPort,
QString sUserName, QString sPassword, int nTimeout) ;
private:
NonConnectedCameraHandle(); // 构造函数声明为私有
~NonConnectedCameraHandle(); // 析构函数声明为私有
static NonConnectedCameraHandle* m_instance; // 指向实例的指针
};
#endif // NONCONNECTEDCAMERAHANDLE_H
VidesData.h
...@@ -107,7 +107,18 @@ struct localDeviceStatus ...@@ -107,7 +107,18 @@ struct localDeviceStatus
QString password; QString password;
localDeviceStatus() {} localDeviceStatus() {}
}; };
struct localDevice
{
QString sSn;
QString reachableIp;
bool isMask;
int nDevPort;
int TCPPort;
int ChannelNum;
QString UserName;
QString password;
localDevice() {}
};
struct requestFaceReconition struct requestFaceReconition
{ {
...@@ -409,14 +420,32 @@ inline void convertQStringToSXSDK_IPAddress(const QString& ipString, SXSDK_IPAdd ...@@ -409,14 +420,32 @@ inline void convertQStringToSXSDK_IPAddress(const QString& ipString, SXSDK_IPAdd
hostIP.c[2] = (ip >> 8) & 0xFF; hostIP.c[2] = (ip >> 8) & 0xFF;
hostIP.c[3] = ip & 0xFF; hostIP.c[3] = ip & 0xFF;
} }
inline bool isInSameSubnet(const QString &ip1, const QString &ip2, const QString &mask)
{
QHostAddress address1(ip1);
QHostAddress address2(ip2);
QHostAddress subnetMask(mask);
// 将IP地址和子网掩码从QHostAddress转换成quint32形式
quint32 addr1 = address1.toIPv4Address();
quint32 addr2 = address2.toIPv4Address();
quint32 maskAddr = subnetMask.toIPv4Address();
// 进行AND操作
quint32 result1 = addr1 & maskAddr;
quint32 result2 = addr2 & maskAddr;
// 比较结果
return result1 == result2;
}
// 获取本地 MAC 地址、子网掩码和网关IP // 获取本地 MAC 地址、子网掩码和网关IP
inline bool GetNetworkInfoByQNetworkInterface(QString &mac, QString &subnetMask, QString &gateway) { inline bool GetNetworkInfoByQNetworkInterface(QString &mac, QString &subnetMask, QString &gateway) {
QList<QNetworkInterface> interfaces = QNetworkInterface::allInterfaces(); QList<QNetworkInterface> interfaces = QNetworkInterface::allInterfaces();
foreach (QNetworkInterface interface, interfaces) { foreach (QNetworkInterface interface, interfaces) {
if (interface.flags().testFlag(QNetworkInterface::IsUp) && if (interface.flags().testFlag(QNetworkInterface::IsUp) &&
interface.flags().testFlag(QNetworkInterface::IsRunning) && interface.flags().testFlag(QNetworkInterface::IsRunning) &&
!interface.flags().testFlag(QNetworkInterface::IsLoopBack)) { !interface.flags().testFlag(QNetworkInterface::IsLoopBack)) {
mac = interface.hardwareAddress(); mac = interface.hardwareAddress();
QList<QNetworkAddressEntry> addressEntries = interface.addressEntries(); QList<QNetworkAddressEntry> addressEntries = interface.addressEntries();
......
gamera_videos.pro
...@@ -108,7 +108,8 @@ SOURCES += \ ...@@ -108,7 +108,8 @@ SOURCES += \
FaceReconitionHandle.cpp \ FaceReconitionHandle.cpp \
AlgorithmTaskManage.cpp \ AlgorithmTaskManage.cpp \
BaseAlgorithm.cpp \ BaseAlgorithm.cpp \
MqttSubscriber.cpp MqttSubscriber.cpp \
NonConnectedCameraHandle.cpp
HEADERS += \ HEADERS += \
Common.h \ Common.h \
...@@ -128,7 +129,8 @@ HEADERS += \ ...@@ -128,7 +129,8 @@ HEADERS += \
FaceReconitionHandle.h \ FaceReconitionHandle.h \
AlgorithmTaskManage.h \ AlgorithmTaskManage.h \
BaseAlgorithm.h \ BaseAlgorithm.h \
MqttSubscriber.h MqttSubscriber.h \
NonConnectedCameraHandle.h
# Default rules for deployment. # Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin qnx: target.path = /tmp/$${TARGET}/bin
......
mainwindow.cpp
...@@ -1061,8 +1061,9 @@ void MainWindow::initCameras(vides_data::cameraParameters &parameter,vides_data: ...@@ -1061,8 +1061,9 @@ void MainWindow::initCameras(vides_data::cameraParameters &parameter,vides_data:
camera_info.sSn=parameter.sSn; camera_info.sSn=parameter.sSn;
camera_info.ip_addr=parameter.sDevId; camera_info.ip_addr=parameter.sDevId;
cameraHandle->findFirmwareVersion(camera_info.firmware_version); cameraHandle->findFirmwareVersion(camera_info.firmware_version);
modifySnMapIp(parameter.sSn,parameter.sDevId);
camera_info_list.push_front(camera_info); camera_info_list.push_front(camera_info);
__uint8_t new_algorithm= intToUint8t(devConfig.faceConfig.isOn,devConfig.licensePlateConfig.isOn,devConfig.uniformConfig.isOn,devConfig.humanConfig.isOn); __uint8_t new_algorithm= intToUint8t(devConfig.faceConfig.isOn,devConfig.licensePlateConfig.isOn,devConfig.uniformConfig.isOn,devConfig.humanConfig.isOn);
cameraHandle->initAlgorithmPermissions(new_algorithm); cameraHandle->initAlgorithmPermissions(new_algorithm);
......
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