Merge branch 'feature-1007650' into 'release'

盒子-GB28181配置增加本地SIP端口

See merge request !80

CameraHandle.cpp

@@ -1164,7 +1164,7 @@ void CameraHandle::initWorkSpVMn(vides_data::responseGb28181 *gb28181, QString &
     toJsonObject["uiAlarmStateLoseEnable"] = "0xFFFFFFFF";
     toJsonObject["uiAlarmStateLoseEnable"] = "0xFFFFFFFF";
     toJsonObject["uiAlarmStateMotionEnable"] = "0xFFFFFFFF";
     toJsonObject["uiAlarmStateMotionEnable"] = "0xFFFFFFFF";
     toJsonObject["uiAlarmStatePerformanceEnable"] = "0xFFFFFFFF";
     toJsonObject["uiAlarmStatePerformanceEnable"] = "0xFFFFFFFF";
-    toJsonObject["sUdpPort"] = 5060;
+    toJsonObject["sUdpPort"] = gb28181->sUdpPort;
     
     
     // 生成 workSpWMn
     // 生成 workSpWMn
     QJsonDocument doc(toJsonObject);
     QJsonDocument doc(toJsonObject);
@@ -1312,6 +1312,7 @@ void CameraHandle::updateSdkDevSpvMn(vides_data::responseGb28181 *gb28181){
         const char* szDeviceNO = config.szDeviceNO.ToString();
         const char* szDeviceNO = config.szDeviceNO.ToString();
         const char* szServerDn = config.szServerDn.ToString();
         const char* szServerDn = config.szServerDn.ToString();
         const char* szServerNo = config.szServerNo.ToString();
         const char* szServerNo = config.szServerNo.ToString();
+        int u_port=config.sUdpPort.ToInt();
         bool  isEqual = (szCsIP == gb28181->sip_ip &&
         bool  isEqual = (szCsIP == gb28181->sip_ip &&
                          sCsPort == gb28181->sip_port &&
                          sCsPort == gb28181->sip_port &&
                          szServerNo == gb28181->serial &&
                          szServerNo == gb28181->serial &&
@@ -1320,6 +1321,7 @@ void CameraHandle::updateSdkDevSpvMn(vides_data::responseGb28181 *gb28181){
                          iHsIntervalTime == gb28181->heartbeat_interval &&
                          iHsIntervalTime == gb28181->heartbeat_interval &&
                          szConnPass == gb28181->password &&
                          szConnPass == gb28181->password &&
                          szDeviceNO == gb28181->device_id &&
                          szDeviceNO == gb28181->device_id &&
+                          u_port == gb28181->sUdpPort &&
                          Camreaid == gb28181->channel_id);
                          Camreaid == gb28181->channel_id);
         if(!isEqual){
         if(!isEqual){
             config.Camreaid.InitArraySize(64);
             config.Camreaid.InitArraySize(64);
@@ -1347,7 +1349,7 @@ void CameraHandle::updateSdkDevSpvMn(vides_data::responseGb28181 *gb28181){
             config.szServerNo.SetValue(sz_ServerNo);
             config.szServerNo.SetValue(sz_ServerNo);
             
             
             config.sCsPort.SetValue(gb28181->sip_port);
             config.sCsPort.SetValue(gb28181->sip_port);
-            config.sUdpPort.SetValue(5060);
+            config.sUdpPort.SetValue(gb28181->sUdpPort);
             
             
             QByteArray && bSzServerDn=gb28181->realm.toUtf8();
             QByteArray && bSzServerDn=gb28181->realm.toUtf8();
             char* sz_ServerDn = bSzServerDn.data();
             char* sz_ServerDn = bSzServerDn.data();

FaceReconitionHandle.cpp

@@ -204,7 +204,7 @@ void FaceReconitionHandle::featureRemoveMap(std::map<QString, QString> &maps){
 
 
 }
 }
 
 
-cv::Mat FaceReconitionHandle::loadImageWithSTB(const QString& filename) {
+cv::Mat FaceReconitionHandle::loadImageWithStb(const QString& filename) {
     int width, height, channels;
     int width, height, channels;
     QByteArray && b_filename = filename.toUtf8();
     QByteArray && b_filename = filename.toUtf8();
     char* c_filename = b_filename.data();
     char* c_filename = b_filename.data();

HttpService.cpp

@@ -442,6 +442,7 @@ vides_data::response*HttpService::httpFindGb28181Config(QString &serialNumber){
         response->heartbeat_interval = data["heartbeat_interval"].toInt();
         response->heartbeat_interval = data["heartbeat_interval"].toInt();
         response->device_id = data["device_id"].toString();
         response->device_id = data["device_id"].toString();
         response->channel_id = data["channel_id"].toString();
         response->channel_id = data["channel_id"].toString();
+        response->sUdpPort=data["local_port"].toInt();
         resp->data=response;
         resp->data=response;
         resp->msg=map["message"].toString();
         resp->msg=map["message"].toString();
     }else{
     }else{