Germany/hunting
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master-develop' of gitee.com:shenzhen-jiuyilian/ipc into master-develop

Browse Source
This commit is contained in:
Fancy code 2024-05-08 21:28:02 +08:00
commit f0d002b8b9
13 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/MissionManager/src/AppMonitor.cpp
View File

@ -38,12 +38,12 @@ StatusCode AppMonitor::GetDeviceAttr(AppGetDeviceAttr &param)
param.mWifiReboot = "test"; param.mWifiReboot = "test";
return CreateStatusCode(STATUS_CODE_OK); return CreateStatusCode(STATUS_CODE_OK);
} }
StatusCode AppMonitor::GetMediaInfo(AppGetMeidaInfo &param) StatusCode AppMonitor::GetMediaInfo(AppGetMediaInfo &param)
{ {
LogInfo("AppMonitor::GetMediaInfo.\n"); LogInfo("AppMonitor::GetMediaInfo.\n");
param.mRtspUrl = "rtsp://192.168.169.1/live/0"; param.mRtspUrl = "rtsp://192.168.169.1/live/0";
param.mTransport = "tcp"; param.mTransport = "tcp";
param.mPort = 554; param.mPort = APP_MANAGER_TCP_SERVER_PORT;
return CreateStatusCode(STATUS_CODE_OK); return CreateStatusCode(STATUS_CODE_OK);
} }
StatusCode AppMonitor::GetSdCardInfo(AppGetSdCardInfo &param) StatusCode AppMonitor::GetSdCardInfo(AppGetSdCardInfo &param)

2
application/MissionManager/src/AppMonitor.h
View File

@ -22,7 +22,7 @@ public:
virtual ~AppMonitor() = default; virtual ~AppMonitor() = default;
StatusCode GetProductInfo(AppGetProductInfo &param) override; StatusCode GetProductInfo(AppGetProductInfo &param) override;
StatusCode GetDeviceAttr(AppGetDeviceAttr &param) override; StatusCode GetDeviceAttr(AppGetDeviceAttr &param) override;
StatusCode GetMediaInfo(AppGetMeidaInfo &param) override; StatusCode GetMediaInfo(AppGetMediaInfo &param) override;
StatusCode GetSdCardInfo(AppGetSdCardInfo &param) override; StatusCode GetSdCardInfo(AppGetSdCardInfo &param) override;
StatusCode GetBatteryInfo(AppGetBatteryInfo &param) override; StatusCode GetBatteryInfo(AppGetBatteryInfo &param) override;
StatusCode GetParamValue(AppParamValue &param) override; StatusCode GetParamValue(AppParamValue &param) override;

6
middleware/AppManager/include/IAppManager.h
View File

@ -195,8 +195,8 @@ typedef struct app_get_media_info
app_get_media_info(); app_get_media_info();
std::string mRtspUrl; std::string mRtspUrl;
std::string mTransport; std::string mTransport;
int mPort; int mPort; ///< The port number of TCP, which the APP will use to initiate TCP connections to the device (server).
} AppGetMeidaInfo; } AppGetMediaInfo;
typedef struct app_get_sd_card_info typedef struct app_get_sd_card_info
{ {
app_get_sd_card_info(); app_get_sd_card_info();
@ -311,7 +311,7 @@ public:
virtual ~VAppMonitor() = default; virtual ~VAppMonitor() = default;
virtual StatusCode GetProductInfo(AppGetProductInfo &param); virtual StatusCode GetProductInfo(AppGetProductInfo &param);
virtual StatusCode GetDeviceAttr(AppGetDeviceAttr &param); virtual StatusCode GetDeviceAttr(AppGetDeviceAttr &param);
virtual StatusCode GetMediaInfo(AppGetMeidaInfo &param); virtual StatusCode GetMediaInfo(AppGetMediaInfo &param);
virtual StatusCode GetSdCardInfo(AppGetSdCardInfo &param); virtual StatusCode GetSdCardInfo(AppGetSdCardInfo &param);
virtual StatusCode GetBatteryInfo(AppGetBatteryInfo &param); virtual StatusCode GetBatteryInfo(AppGetBatteryInfo &param);
virtual StatusCode GetParamValue(AppParamValue &param); virtual StatusCode GetParamValue(AppParamValue &param);

1
middleware/AppManager/src/AppManager.cpp
View File

@ -159,6 +159,7 @@ void AppManager::TcpServerStart(const AppParam &param)
if (nullptr == mTcpServer) { if (nullptr == mTcpServer) {
LogError("Create tcp server failed.\n"); LogError("Create tcp server failed.\n");
} }
LogInfo("Create tcp server success.\n");
} }
void AppManager::TcpServerStop(void) void AppManager::TcpServerStop(void)
{ {

2
middleware/AppManager/src/IAppManager.cpp
View File

@ -120,7 +120,7 @@ StatusCode VAppMonitor::GetDeviceAttr(AppGetDeviceAttr &param)
{ {
return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
} }
StatusCode VAppMonitor::GetMediaInfo(AppGetMeidaInfo &param) StatusCode VAppMonitor::GetMediaInfo(AppGetMediaInfo &param)
{ {
return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
} }

4
middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp
View File

@ -221,7 +221,7 @@ void inline SixFrameHandle::ResponseGetDeviceAttr(cJSON *result, const AppGetDev
void SixFrameHandle::RequestGetMediaInfo(const std::string &url, ResponseHandle responseHandle, void *context) void SixFrameHandle::RequestGetMediaInfo(const std::string &url, ResponseHandle responseHandle, void *context)
{ {
LogInfo("RequestGetMediaInfo.\n"); LogInfo("RequestGetMediaInfo.\n");
AppGetMeidaInfo param; AppGetMediaInfo param;
mAppMonitor->GetMediaInfo(param); mAppMonitor->GetMediaInfo(param);
cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL); cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL);
if (nullptr == result) { if (nullptr == result) {
@ -233,7 +233,7 @@ void SixFrameHandle::RequestGetMediaInfo(const std::string &url, ResponseHandle
ResponseJsonString(result, responseHandle, context); ResponseJsonString(result, responseHandle, context);
cJSON_Delete(result); cJSON_Delete(result);
} }
void inline SixFrameHandle::ResponseGetMediaInfo(cJSON *result, const AppGetMeidaInfo &param) void inline SixFrameHandle::ResponseGetMediaInfo(cJSON *result, const AppGetMediaInfo &param)
{ {
cJSON *info = nullptr; cJSON *info = nullptr;
cJSON_AddItemToObject(result, CJSON_INFO_STRING, info = cJSON_CreateObject()); cJSON_AddItemToObject(result, CJSON_INFO_STRING, info = cJSON_CreateObject());

2
middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.h
View File

@ -67,7 +67,7 @@ private:
void RequestGetDeviceAttr(const std::string &url, ResponseHandle responseHandle, void *context); void RequestGetDeviceAttr(const std::string &url, ResponseHandle responseHandle, void *context);
void ResponseGetDeviceAttr(cJSON *result, const AppGetDeviceAttr &param); void ResponseGetDeviceAttr(cJSON *result, const AppGetDeviceAttr &param);
void RequestGetMediaInfo(const std::string &url, ResponseHandle responseHandle, void *context); void RequestGetMediaInfo(const std::string &url, ResponseHandle responseHandle, void *context);
void ResponseGetMediaInfo(cJSON *result, const AppGetMeidaInfo &param); void ResponseGetMediaInfo(cJSON *result, const AppGetMediaInfo &param);
void RequestGetSdCardInfo(const std::string &url, ResponseHandle responseHandle, void *context); void RequestGetSdCardInfo(const std::string &url, ResponseHandle responseHandle, void *context);
void ResponseGetSdCardInfo(cJSON *result, const AppGetSdCardInfo &param); void ResponseGetSdCardInfo(cJSON *result, const AppGetSdCardInfo &param);
void RequestGetBatteryInfo(const std::string &url, ResponseHandle responseHandle, void *context); void RequestGetBatteryInfo(const std::string &url, ResponseHandle responseHandle, void *context);

2
test/application/MissionManager/tool/src/TestMissionStateMock.cpp
View File

@ -33,7 +33,7 @@ StatusCode TestMissionStateTest::GetDeviceAttr(AppGetDeviceAttr &param)
} }
return code; return code;
} }
StatusCode TestMissionStateTest::GetMediaInfo(AppGetMeidaInfo &param) StatusCode TestMissionStateTest::GetMediaInfo(AppGetMediaInfo &param)
{ {
LogInfo("TestMissionStateTest::GetMediaInfo\n"); LogInfo("TestMissionStateTest::GetMediaInfo\n");
StatusCode code = GetMediaInfoTrace(param); StatusCode code = GetMediaInfoTrace(param);

2
test/application/MissionManager/tool/src/TestMissionStateMock.h
View File

@ -24,7 +24,7 @@ public:
virtual ~TestMissionStateTest() = default; virtual ~TestMissionStateTest() = default;
StatusCode GetProductInfo(AppGetProductInfo &param) override; StatusCode GetProductInfo(AppGetProductInfo &param) override;
StatusCode GetDeviceAttr(AppGetDeviceAttr &param) override; StatusCode GetDeviceAttr(AppGetDeviceAttr &param) override;
StatusCode GetMediaInfo(AppGetMeidaInfo &param) override; StatusCode GetMediaInfo(AppGetMediaInfo &param) override;
StatusCode GetSdCardInfo(AppGetSdCardInfo &param) override; StatusCode GetSdCardInfo(AppGetSdCardInfo &param) override;
StatusCode GetBatteryInfo(AppGetBatteryInfo &param) override; StatusCode GetBatteryInfo(AppGetBatteryInfo &param) override;
StatusCode GetParamValue(AppParamValue &param) override; StatusCode GetParamValue(AppParamValue &param) override;

4
test/middleware/AppManager/tool/src/AppMonitorMock.cpp
View File

@ -42,7 +42,7 @@ StatusCode AppMonitorTrace::GetDeviceAttrTrace(AppGetDeviceAttr &param)
LogInfo("AppMonitorTrace::GetDeviceAttrTrace\n"); LogInfo("AppMonitorTrace::GetDeviceAttrTrace\n");
return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
} }
StatusCode AppMonitorTest::GetMediaInfo(AppGetMeidaInfo &param) StatusCode AppMonitorTest::GetMediaInfo(AppGetMediaInfo &param)
{ {
LogInfo("AppMonitorTest::GetMediaInfo\n"); LogInfo("AppMonitorTest::GetMediaInfo\n");
StatusCode code = GetMediaInfoTrace(param); StatusCode code = GetMediaInfoTrace(param);
@ -51,7 +51,7 @@ StatusCode AppMonitorTest::GetMediaInfo(AppGetMeidaInfo &param)
} }
return code; return code;
} }
StatusCode AppMonitorTrace::GetMediaInfoTrace(AppGetMeidaInfo &param) StatusCode AppMonitorTrace::GetMediaInfoTrace(AppGetMediaInfo &param)
{ {
LogInfo("AppMonitorTrace::GetMediaInfoTrace\n"); LogInfo("AppMonitorTrace::GetMediaInfoTrace\n");
return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);

6
test/middleware/AppManager/tool/src/AppMonitorMock.h
View File

@ -25,7 +25,7 @@ public:
protected: protected:
virtual StatusCode GetProductInfoTrace(AppGetProductInfo &param); virtual StatusCode GetProductInfoTrace(AppGetProductInfo &param);
virtual StatusCode GetDeviceAttrTrace(AppGetDeviceAttr &param); virtual StatusCode GetDeviceAttrTrace(AppGetDeviceAttr &param);
virtual StatusCode GetMediaInfoTrace(AppGetMeidaInfo &param); virtual StatusCode GetMediaInfoTrace(AppGetMediaInfo &param);
virtual StatusCode GetSdCardInfoTrace(AppGetSdCardInfo &param); virtual StatusCode GetSdCardInfoTrace(AppGetSdCardInfo &param);
virtual StatusCode GetBatteryInfoTrace(AppGetBatteryInfo &param); virtual StatusCode GetBatteryInfoTrace(AppGetBatteryInfo &param);
virtual StatusCode GetParamValueTrace(AppParamValue &param); virtual StatusCode GetParamValueTrace(AppParamValue &param);
@ -49,7 +49,7 @@ public:
virtual ~AppMonitorTest() = default; virtual ~AppMonitorTest() = default;
StatusCode GetProductInfo(AppGetProductInfo &param) override; StatusCode GetProductInfo(AppGetProductInfo &param) override;
StatusCode GetDeviceAttr(AppGetDeviceAttr &param) override; StatusCode GetDeviceAttr(AppGetDeviceAttr &param) override;
StatusCode GetMediaInfo(AppGetMeidaInfo &param) override; StatusCode GetMediaInfo(AppGetMediaInfo &param) override;
StatusCode GetSdCardInfo(AppGetSdCardInfo &param) override; StatusCode GetSdCardInfo(AppGetSdCardInfo &param) override;
StatusCode GetBatteryInfo(AppGetBatteryInfo &param) override; StatusCode GetBatteryInfo(AppGetBatteryInfo &param) override;
StatusCode GetParamValue(AppParamValue &param) override; StatusCode GetParamValue(AppParamValue &param) override;
@ -73,7 +73,7 @@ public:
virtual ~AppMonitorMock() = default; virtual ~AppMonitorMock() = default;
MOCK_METHOD1(GetProductInfoTrace, StatusCode(AppGetProductInfo &)); MOCK_METHOD1(GetProductInfoTrace, StatusCode(AppGetProductInfo &));
MOCK_METHOD1(GetDeviceAttrTrace, StatusCode(AppGetDeviceAttr &)); MOCK_METHOD1(GetDeviceAttrTrace, StatusCode(AppGetDeviceAttr &));
MOCK_METHOD1(GetMediaInfoTrace, StatusCode(AppGetMeidaInfo &)); MOCK_METHOD1(GetMediaInfoTrace, StatusCode(AppGetMediaInfo &));
MOCK_METHOD1(GetSdCardInfoTrace, StatusCode(AppGetSdCardInfo &)); MOCK_METHOD1(GetSdCardInfoTrace, StatusCode(AppGetSdCardInfo &));
MOCK_METHOD1(GetBatteryInfoTrace, StatusCode(AppGetBatteryInfo &)); MOCK_METHOD1(GetBatteryInfoTrace, StatusCode(AppGetBatteryInfo &));
MOCK_METHOD1(GetParamValueTrace, StatusCode(AppParamValue &)); MOCK_METHOD1(GetParamValueTrace, StatusCode(AppParamValue &));

4
test/middleware/MediaManager/tool/src/MediaMonitorMock.cpp
View File

@ -42,7 +42,7 @@
// LogInfo("MediaMonitorTrace::GetDeviceAttrTrace\n"); // LogInfo("MediaMonitorTrace::GetDeviceAttrTrace\n");
// return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); // return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);
// } // }
// StatusCode MediaMonitorTest::GetMediaInfo(AppGetMeidaInfo &param) // StatusCode MediaMonitorTest::GetMediaInfo(AppGetMediaInfo &param)
// { // {
// LogInfo("MediaMonitorTest::GetMediaInfo\n"); // LogInfo("MediaMonitorTest::GetMediaInfo\n");
// StatusCode code = GetMediaInfoTrace(param); // StatusCode code = GetMediaInfoTrace(param);
@ -51,7 +51,7 @@
// } // }
// return code; // return code;
// } // }
// StatusCode MediaMonitorTrace::GetMediaInfoTrace(AppGetMeidaInfo &param) // StatusCode MediaMonitorTrace::GetMediaInfoTrace(AppGetMediaInfo &param)
// { // {
// LogInfo("MediaMonitorTrace::GetMediaInfoTrace\n"); // LogInfo("MediaMonitorTrace::GetMediaInfoTrace\n");
// return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); // return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION);

6
test/middleware/MediaManager/tool/src/MediaMonitorMock.h
View File

@ -25,7 +25,7 @@ public:
protected: protected:
// virtual StatusCode GetProductInfoTrace(AppGetProductInfo &param); // virtual StatusCode GetProductInfoTrace(AppGetProductInfo &param);
// virtual StatusCode GetDeviceAttrTrace(AppGetDeviceAttr &param); // virtual StatusCode GetDeviceAttrTrace(AppGetDeviceAttr &param);
// virtual StatusCode GetMediaInfoTrace(AppGetMeidaInfo &param); // virtual StatusCode GetMediaInfoTrace(AppGetMediaInfo &param);
// virtual StatusCode GetSdCardInfoTrace(AppGetSdCardInfo &param); // virtual StatusCode GetSdCardInfoTrace(AppGetSdCardInfo &param);
// virtual StatusCode GetBatteryInfoTrace(AppGetBatteryInfo &param); // virtual StatusCode GetBatteryInfoTrace(AppGetBatteryInfo &param);
// virtual StatusCode GetParamValueTrace(AppParamValue &param); // virtual StatusCode GetParamValueTrace(AppParamValue &param);
@ -49,7 +49,7 @@ public:
virtual ~MediaMonitorTest() = default; virtual ~MediaMonitorTest() = default;
// StatusCode GetProductInfo(AppGetProductInfo &param) override; // StatusCode GetProductInfo(AppGetProductInfo &param) override;
// StatusCode GetDeviceAttr(AppGetDeviceAttr &param) override; // StatusCode GetDeviceAttr(AppGetDeviceAttr &param) override;
// StatusCode GetMediaInfo(AppGetMeidaInfo &param) override; // StatusCode GetMediaInfo(AppGetMediaInfo &param) override;
// StatusCode GetSdCardInfo(AppGetSdCardInfo &param) override; // StatusCode GetSdCardInfo(AppGetSdCardInfo &param) override;
// StatusCode GetBatteryInfo(AppGetBatteryInfo &param) override; // StatusCode GetBatteryInfo(AppGetBatteryInfo &param) override;
// StatusCode GetParamValue(AppParamValue &param) override; // StatusCode GetParamValue(AppParamValue &param) override;
@ -73,7 +73,7 @@ public:
virtual ~MediaMonitorMock() = default; virtual ~MediaMonitorMock() = default;
// MOCK_METHOD1(GetProductInfoTrace, StatusCode(AppGetProductInfo &)); // MOCK_METHOD1(GetProductInfoTrace, StatusCode(AppGetProductInfo &));
// MOCK_METHOD1(GetDeviceAttrTrace, StatusCode(AppGetDeviceAttr &)); // MOCK_METHOD1(GetDeviceAttrTrace, StatusCode(AppGetDeviceAttr &));
// MOCK_METHOD1(GetMediaInfoTrace, StatusCode(AppGetMeidaInfo &)); // MOCK_METHOD1(GetMediaInfoTrace, StatusCode(AppGetMediaInfo &));
// MOCK_METHOD1(GetSdCardInfoTrace, StatusCode(AppGetSdCardInfo &)); // MOCK_METHOD1(GetSdCardInfoTrace, StatusCode(AppGetSdCardInfo &));
// MOCK_METHOD1(GetBatteryInfoTrace, StatusCode(AppGetBatteryInfo &)); // MOCK_METHOD1(GetBatteryInfoTrace, StatusCode(AppGetBatteryInfo &));
// MOCK_METHOD1(GetParamValueTrace, StatusCode(AppParamValue &)); // MOCK_METHOD1(GetParamValueTrace, StatusCode(AppParamValue &));