AppManager:Tcp server.
This commit is contained in:
parent
df85a88d62
commit
935c24770a
|
@ -38,12 +38,12 @@ StatusCode AppMonitor::GetDeviceAttr(AppGetDeviceAttr ¶m)
|
|||
param.mWifiReboot = "test";
|
||||
return CreateStatusCode(STATUS_CODE_OK);
|
||||
}
|
||||
StatusCode AppMonitor::GetMediaInfo(AppGetMeidaInfo ¶m)
|
||||
StatusCode AppMonitor::GetMediaInfo(AppGetMediaInfo ¶m)
|
||||
{
|
||||
LogInfo("AppMonitor::GetMediaInfo.\n");
|
||||
param.mRtspUrl = "rtsp://192.168.169.1/live/0";
|
||||
param.mTransport = "tcp";
|
||||
param.mPort = 554;
|
||||
param.mPort = APP_MANAGER_TCP_SERVER_PORT;
|
||||
return CreateStatusCode(STATUS_CODE_OK);
|
||||
}
|
||||
StatusCode AppMonitor::GetSdCardInfo(AppGetSdCardInfo ¶m)
|
||||
|
|
|
@ -22,7 +22,7 @@ public:
|
|||
virtual ~AppMonitor() = default;
|
||||
StatusCode GetProductInfo(AppGetProductInfo ¶m) override;
|
||||
StatusCode GetDeviceAttr(AppGetDeviceAttr ¶m) override;
|
||||
StatusCode GetMediaInfo(AppGetMeidaInfo ¶m) override;
|
||||
StatusCode GetMediaInfo(AppGetMediaInfo ¶m) override;
|
||||
StatusCode GetSdCardInfo(AppGetSdCardInfo ¶m) override;
|
||||
StatusCode GetBatteryInfo(AppGetBatteryInfo ¶m) override;
|
||||
StatusCode GetParamValue(AppParamValue ¶m) override;
|
||||
|
|
|
@ -195,8 +195,8 @@ typedef struct app_get_media_info
|
|||
app_get_media_info();
|
||||
std::string mRtspUrl;
|
||||
std::string mTransport;
|
||||
int mPort;
|
||||
} AppGetMeidaInfo;
|
||||
int mPort; ///< The port number of TCP, which the APP will use to initiate TCP connections to the device (server).
|
||||
} AppGetMediaInfo;
|
||||
typedef struct app_get_sd_card_info
|
||||
{
|
||||
app_get_sd_card_info();
|
||||
|
@ -311,7 +311,7 @@ public:
|
|||
virtual ~VAppMonitor() = default;
|
||||
virtual StatusCode GetProductInfo(AppGetProductInfo ¶m);
|
||||
virtual StatusCode GetDeviceAttr(AppGetDeviceAttr ¶m);
|
||||
virtual StatusCode GetMediaInfo(AppGetMeidaInfo ¶m);
|
||||
virtual StatusCode GetMediaInfo(AppGetMediaInfo ¶m);
|
||||
virtual StatusCode GetSdCardInfo(AppGetSdCardInfo ¶m);
|
||||
virtual StatusCode GetBatteryInfo(AppGetBatteryInfo ¶m);
|
||||
virtual StatusCode GetParamValue(AppParamValue ¶m);
|
||||
|
|
|
@ -159,6 +159,7 @@ void AppManager::TcpServerStart(const AppParam ¶m)
|
|||
if (nullptr == mTcpServer) {
|
||||
LogError("Create tcp server failed.\n");
|
||||
}
|
||||
LogInfo("Create tcp server success.\n");
|
||||
}
|
||||
void AppManager::TcpServerStop(void)
|
||||
{
|
||||
|
|
|
@ -120,7 +120,7 @@ StatusCode VAppMonitor::GetDeviceAttr(AppGetDeviceAttr ¶m)
|
|||
{
|
||||
return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
|
||||
}
|
||||
StatusCode VAppMonitor::GetMediaInfo(AppGetMeidaInfo ¶m)
|
||||
StatusCode VAppMonitor::GetMediaInfo(AppGetMediaInfo ¶m)
|
||||
{
|
||||
return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
|
||||
}
|
||||
|
|
|
@ -221,7 +221,7 @@ void inline SixFrameHandle::ResponseGetDeviceAttr(cJSON *result, const AppGetDev
|
|||
void SixFrameHandle::RequestGetMediaInfo(const std::string &url, ResponseHandle responseHandle, void *context)
|
||||
{
|
||||
LogInfo("RequestGetMediaInfo.\n");
|
||||
AppGetMeidaInfo param;
|
||||
AppGetMediaInfo param;
|
||||
mAppMonitor->GetMediaInfo(param);
|
||||
cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL);
|
||||
if (nullptr == result) {
|
||||
|
@ -233,7 +233,7 @@ void SixFrameHandle::RequestGetMediaInfo(const std::string &url, ResponseHandle
|
|||
ResponseJsonString(result, responseHandle, context);
|
||||
cJSON_Delete(result);
|
||||
}
|
||||
void inline SixFrameHandle::ResponseGetMediaInfo(cJSON *result, const AppGetMeidaInfo ¶m)
|
||||
void inline SixFrameHandle::ResponseGetMediaInfo(cJSON *result, const AppGetMediaInfo ¶m)
|
||||
{
|
||||
cJSON *info = nullptr;
|
||||
cJSON_AddItemToObject(result, CJSON_INFO_STRING, info = cJSON_CreateObject());
|
||||
|
|
|
@ -67,7 +67,7 @@ private:
|
|||
void RequestGetDeviceAttr(const std::string &url, ResponseHandle responseHandle, void *context);
|
||||
void ResponseGetDeviceAttr(cJSON *result, const AppGetDeviceAttr ¶m);
|
||||
void RequestGetMediaInfo(const std::string &url, ResponseHandle responseHandle, void *context);
|
||||
void ResponseGetMediaInfo(cJSON *result, const AppGetMeidaInfo ¶m);
|
||||
void ResponseGetMediaInfo(cJSON *result, const AppGetMediaInfo ¶m);
|
||||
void RequestGetSdCardInfo(const std::string &url, ResponseHandle responseHandle, void *context);
|
||||
void ResponseGetSdCardInfo(cJSON *result, const AppGetSdCardInfo ¶m);
|
||||
void RequestGetBatteryInfo(const std::string &url, ResponseHandle responseHandle, void *context);
|
||||
|
|
|
@ -33,7 +33,7 @@ StatusCode TestMissionStateTest::GetDeviceAttr(AppGetDeviceAttr ¶m)
|
|||
}
|
||||
return code;
|
||||
}
|
||||
StatusCode TestMissionStateTest::GetMediaInfo(AppGetMeidaInfo ¶m)
|
||||
StatusCode TestMissionStateTest::GetMediaInfo(AppGetMediaInfo ¶m)
|
||||
{
|
||||
LogInfo("TestMissionStateTest::GetMediaInfo\n");
|
||||
StatusCode code = GetMediaInfoTrace(param);
|
||||
|
|
|
@ -24,7 +24,7 @@ public:
|
|||
virtual ~TestMissionStateTest() = default;
|
||||
StatusCode GetProductInfo(AppGetProductInfo ¶m) override;
|
||||
StatusCode GetDeviceAttr(AppGetDeviceAttr ¶m) override;
|
||||
StatusCode GetMediaInfo(AppGetMeidaInfo ¶m) override;
|
||||
StatusCode GetMediaInfo(AppGetMediaInfo ¶m) override;
|
||||
StatusCode GetSdCardInfo(AppGetSdCardInfo ¶m) override;
|
||||
StatusCode GetBatteryInfo(AppGetBatteryInfo ¶m) override;
|
||||
StatusCode GetParamValue(AppParamValue ¶m) override;
|
||||
|
|
|
@ -42,7 +42,7 @@ StatusCode AppMonitorTrace::GetDeviceAttrTrace(AppGetDeviceAttr ¶m)
|
|||
LogInfo("AppMonitorTrace::GetDeviceAttrTrace\n");
|
||||
return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
|
||||
}
|
||||
StatusCode AppMonitorTest::GetMediaInfo(AppGetMeidaInfo ¶m)
|
||||
StatusCode AppMonitorTest::GetMediaInfo(AppGetMediaInfo ¶m)
|
||||
{
|
||||
LogInfo("AppMonitorTest::GetMediaInfo\n");
|
||||
StatusCode code = GetMediaInfoTrace(param);
|
||||
|
@ -51,7 +51,7 @@ StatusCode AppMonitorTest::GetMediaInfo(AppGetMeidaInfo ¶m)
|
|||
}
|
||||
return code;
|
||||
}
|
||||
StatusCode AppMonitorTrace::GetMediaInfoTrace(AppGetMeidaInfo ¶m)
|
||||
StatusCode AppMonitorTrace::GetMediaInfoTrace(AppGetMediaInfo ¶m)
|
||||
{
|
||||
LogInfo("AppMonitorTrace::GetMediaInfoTrace\n");
|
||||
return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
|
||||
|
|
|
@ -25,7 +25,7 @@ public:
|
|||
protected:
|
||||
virtual StatusCode GetProductInfoTrace(AppGetProductInfo ¶m);
|
||||
virtual StatusCode GetDeviceAttrTrace(AppGetDeviceAttr ¶m);
|
||||
virtual StatusCode GetMediaInfoTrace(AppGetMeidaInfo ¶m);
|
||||
virtual StatusCode GetMediaInfoTrace(AppGetMediaInfo ¶m);
|
||||
virtual StatusCode GetSdCardInfoTrace(AppGetSdCardInfo ¶m);
|
||||
virtual StatusCode GetBatteryInfoTrace(AppGetBatteryInfo ¶m);
|
||||
virtual StatusCode GetParamValueTrace(AppParamValue ¶m);
|
||||
|
@ -49,7 +49,7 @@ public:
|
|||
virtual ~AppMonitorTest() = default;
|
||||
StatusCode GetProductInfo(AppGetProductInfo ¶m) override;
|
||||
StatusCode GetDeviceAttr(AppGetDeviceAttr ¶m) override;
|
||||
StatusCode GetMediaInfo(AppGetMeidaInfo ¶m) override;
|
||||
StatusCode GetMediaInfo(AppGetMediaInfo ¶m) override;
|
||||
StatusCode GetSdCardInfo(AppGetSdCardInfo ¶m) override;
|
||||
StatusCode GetBatteryInfo(AppGetBatteryInfo ¶m) override;
|
||||
StatusCode GetParamValue(AppParamValue ¶m) override;
|
||||
|
@ -73,7 +73,7 @@ public:
|
|||
virtual ~AppMonitorMock() = default;
|
||||
MOCK_METHOD1(GetProductInfoTrace, StatusCode(AppGetProductInfo &));
|
||||
MOCK_METHOD1(GetDeviceAttrTrace, StatusCode(AppGetDeviceAttr &));
|
||||
MOCK_METHOD1(GetMediaInfoTrace, StatusCode(AppGetMeidaInfo &));
|
||||
MOCK_METHOD1(GetMediaInfoTrace, StatusCode(AppGetMediaInfo &));
|
||||
MOCK_METHOD1(GetSdCardInfoTrace, StatusCode(AppGetSdCardInfo &));
|
||||
MOCK_METHOD1(GetBatteryInfoTrace, StatusCode(AppGetBatteryInfo &));
|
||||
MOCK_METHOD1(GetParamValueTrace, StatusCode(AppParamValue &));
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
// LogInfo("MediaMonitorTrace::GetDeviceAttrTrace\n");
|
||||
// return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
|
||||
// }
|
||||
// StatusCode MediaMonitorTest::GetMediaInfo(AppGetMeidaInfo ¶m)
|
||||
// StatusCode MediaMonitorTest::GetMediaInfo(AppGetMediaInfo ¶m)
|
||||
// {
|
||||
// LogInfo("MediaMonitorTest::GetMediaInfo\n");
|
||||
// StatusCode code = GetMediaInfoTrace(param);
|
||||
|
@ -51,7 +51,7 @@
|
|||
// }
|
||||
// return code;
|
||||
// }
|
||||
// StatusCode MediaMonitorTrace::GetMediaInfoTrace(AppGetMeidaInfo ¶m)
|
||||
// StatusCode MediaMonitorTrace::GetMediaInfoTrace(AppGetMediaInfo ¶m)
|
||||
// {
|
||||
// LogInfo("MediaMonitorTrace::GetMediaInfoTrace\n");
|
||||
// return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
|
||||
|
|
|
@ -25,7 +25,7 @@ public:
|
|||
protected:
|
||||
// virtual StatusCode GetProductInfoTrace(AppGetProductInfo ¶m);
|
||||
// virtual StatusCode GetDeviceAttrTrace(AppGetDeviceAttr ¶m);
|
||||
// virtual StatusCode GetMediaInfoTrace(AppGetMeidaInfo ¶m);
|
||||
// virtual StatusCode GetMediaInfoTrace(AppGetMediaInfo ¶m);
|
||||
// virtual StatusCode GetSdCardInfoTrace(AppGetSdCardInfo ¶m);
|
||||
// virtual StatusCode GetBatteryInfoTrace(AppGetBatteryInfo ¶m);
|
||||
// virtual StatusCode GetParamValueTrace(AppParamValue ¶m);
|
||||
|
@ -49,7 +49,7 @@ public:
|
|||
virtual ~MediaMonitorTest() = default;
|
||||
// StatusCode GetProductInfo(AppGetProductInfo ¶m) override;
|
||||
// StatusCode GetDeviceAttr(AppGetDeviceAttr ¶m) override;
|
||||
// StatusCode GetMediaInfo(AppGetMeidaInfo ¶m) override;
|
||||
// StatusCode GetMediaInfo(AppGetMediaInfo ¶m) override;
|
||||
// StatusCode GetSdCardInfo(AppGetSdCardInfo ¶m) override;
|
||||
// StatusCode GetBatteryInfo(AppGetBatteryInfo ¶m) override;
|
||||
// StatusCode GetParamValue(AppParamValue ¶m) override;
|
||||
|
@ -73,7 +73,7 @@ public:
|
|||
virtual ~MediaMonitorMock() = default;
|
||||
// MOCK_METHOD1(GetProductInfoTrace, StatusCode(AppGetProductInfo &));
|
||||
// MOCK_METHOD1(GetDeviceAttrTrace, StatusCode(AppGetDeviceAttr &));
|
||||
// MOCK_METHOD1(GetMediaInfoTrace, StatusCode(AppGetMeidaInfo &));
|
||||
// MOCK_METHOD1(GetMediaInfoTrace, StatusCode(AppGetMediaInfo &));
|
||||
// MOCK_METHOD1(GetSdCardInfoTrace, StatusCode(AppGetSdCardInfo &));
|
||||
// MOCK_METHOD1(GetBatteryInfoTrace, StatusCode(AppGetBatteryInfo &));
|
||||
// MOCK_METHOD1(GetParamValueTrace, StatusCode(AppParamValue &));
|
||||
|
|
Loading…
Reference in New Issue
Block a user