|
|
@@ -87,14 +87,23 @@ void GetDeviceConfigResult::parse(const std::string &payload)
|
|
|
resolution_ = value["Resolution"].asString();
|
|
|
if(!value["RetryInterval"].isNull())
|
|
|
retryInterval_ = value["RetryInterval"].asString();
|
|
|
+ if(!value["DeviceId"].isNull())
|
|
|
+ deviceId_ = value["DeviceId"].asString();
|
|
|
+ if(!value["UserName"].isNull())
|
|
|
+ userName_ = value["UserName"].asString();
|
|
|
+ if(!value["PassWord"].isNull())
|
|
|
+ passWord_ = value["PassWord"].asString();
|
|
|
+ if(!value["Protocol"].isNull())
|
|
|
+ protocol_ = value["Protocol"].asString();
|
|
|
+ if(!value["ServerId"].isNull())
|
|
|
+ serverId_ = value["ServerId"].asString();
|
|
|
+ if(!value["ServerPort"].isNull())
|
|
|
+ serverPort_ = value["ServerPort"].asString();
|
|
|
+ if(!value["ServerIp"].isNull())
|
|
|
+ serverIp_ = value["ServerIp"].asString();
|
|
|
|
|
|
}
|
|
|
|
|
|
-std::string GetDeviceConfigResult::getFrameRate()const
|
|
|
-{
|
|
|
- return frameRate_;
|
|
|
-}
|
|
|
-
|
|
|
std::string GetDeviceConfigResult::getEncodeFormat()const
|
|
|
{
|
|
|
return encodeFormat_;
|
|
|
@@ -105,24 +114,24 @@ std::string GetDeviceConfigResult::getMessage()const
|
|
|
return message_;
|
|
|
}
|
|
|
|
|
|
-std::string GetDeviceConfigResult::getLatitude()const
|
|
|
+std::string GetDeviceConfigResult::getDeviceId()const
|
|
|
{
|
|
|
- return latitude_;
|
|
|
+ return deviceId_;
|
|
|
}
|
|
|
|
|
|
-std::string GetDeviceConfigResult::getCode()const
|
|
|
+std::string GetDeviceConfigResult::getLatitude()const
|
|
|
{
|
|
|
- return code_;
|
|
|
+ return latitude_;
|
|
|
}
|
|
|
|
|
|
-std::string GetDeviceConfigResult::getLongitude()const
|
|
|
+std::vector<GetDeviceConfigResult::OSDListItem> GetDeviceConfigResult::getOSDList()const
|
|
|
{
|
|
|
- return longitude_;
|
|
|
+ return oSDList_;
|
|
|
}
|
|
|
|
|
|
-std::vector<GetDeviceConfigResult::OSDListItem> GetDeviceConfigResult::getOSDList()const
|
|
|
+std::string GetDeviceConfigResult::getPassWord()const
|
|
|
{
|
|
|
- return oSDList_;
|
|
|
+ return passWord_;
|
|
|
}
|
|
|
|
|
|
std::string GetDeviceConfigResult::getOSDTimeY()const
|
|
|
@@ -135,6 +144,11 @@ std::string GetDeviceConfigResult::getOSDTimeEnable()const
|
|
|
return oSDTimeEnable_;
|
|
|
}
|
|
|
|
|
|
+std::string GetDeviceConfigResult::getServerId()const
|
|
|
+{
|
|
|
+ return serverId_;
|
|
|
+}
|
|
|
+
|
|
|
std::string GetDeviceConfigResult::getDeviceAddress()const
|
|
|
{
|
|
|
return deviceAddress_;
|
|
|
@@ -150,14 +164,49 @@ int GetDeviceConfigResult::getGovLength()const
|
|
|
return govLength_;
|
|
|
}
|
|
|
|
|
|
-std::string GetDeviceConfigResult::getRetryInterval()const
|
|
|
+std::string GetDeviceConfigResult::getAudioFormat()const
|
|
|
{
|
|
|
- return retryInterval_;
|
|
|
+ return audioFormat_;
|
|
|
}
|
|
|
|
|
|
-std::string GetDeviceConfigResult::getAudioFormat()const
|
|
|
+std::string GetDeviceConfigResult::getProtocol()const
|
|
|
{
|
|
|
- return audioFormat_;
|
|
|
+ return protocol_;
|
|
|
+}
|
|
|
+
|
|
|
+bool GetDeviceConfigResult::getAudioEnable()const
|
|
|
+{
|
|
|
+ return audioEnable_;
|
|
|
+}
|
|
|
+
|
|
|
+std::string GetDeviceConfigResult::getFrameRate()const
|
|
|
+{
|
|
|
+ return frameRate_;
|
|
|
+}
|
|
|
+
|
|
|
+std::string GetDeviceConfigResult::getUserName()const
|
|
|
+{
|
|
|
+ return userName_;
|
|
|
+}
|
|
|
+
|
|
|
+std::string GetDeviceConfigResult::getServerIp()const
|
|
|
+{
|
|
|
+ return serverIp_;
|
|
|
+}
|
|
|
+
|
|
|
+std::string GetDeviceConfigResult::getCode()const
|
|
|
+{
|
|
|
+ return code_;
|
|
|
+}
|
|
|
+
|
|
|
+std::string GetDeviceConfigResult::getLongitude()const
|
|
|
+{
|
|
|
+ return longitude_;
|
|
|
+}
|
|
|
+
|
|
|
+std::string GetDeviceConfigResult::getRetryInterval()const
|
|
|
+{
|
|
|
+ return retryInterval_;
|
|
|
}
|
|
|
|
|
|
std::string GetDeviceConfigResult::getBitRate()const
|
|
|
@@ -165,9 +214,9 @@ std::string GetDeviceConfigResult::getBitRate()const
|
|
|
return bitRate_;
|
|
|
}
|
|
|
|
|
|
-bool GetDeviceConfigResult::getAudioEnable()const
|
|
|
+std::string GetDeviceConfigResult::getServerPort()const
|
|
|
{
|
|
|
- return audioEnable_;
|
|
|
+ return serverPort_;
|
|
|
}
|
|
|
|
|
|
std::string GetDeviceConfigResult::getDeviceName()const
|