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

Improve:AppManager module.

Browse Source
This commit is contained in:
Fancy code 2024-03-23 09:42:29 +08:00
parent d4f57d78cd
commit 7f5847cbdb
2 changed files with 29 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,23 +106,18 @@ void SixFrameHandle::RequestHandle2(const std::string command, const std::string
}
void SixFrameHandle::DoNothing(const std::string &url, ResponseHandle responseHandle, void *context)
{
// responseHandle("Unknown command.", context);
char *resultStr = nullptr;
cJSON *result = MakeResponseResult(ResposeResult::FAILED);
if (nullptr == result) {
LogError("MakeResponseResult failed.\n");
responseHandle("Device run out of memory.", context);
return;
}
resultStr = cJSON_Print(result);
responseHandle(resultStr, context);
free(resultStr);
ResponseJsonString(result, responseHandle, context);
cJSON_Delete(result);
}
void SixFrameHandle::RequestGetProductInfo(const std::string &url, ResponseHandle responseHandle, void *context)
{
LogInfo("RequestGetProductInfo.\n");
char *resultStr = nullptr;
AppGetProductInfo param;
mAppMonitor->GetProductInfo(param);
cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL);
@ -132,9 +127,7 @@ void SixFrameHandle::RequestGetProductInfo(const std::string &url, ResponseHandl
return;
}
ResponseGetProductInfo(result, param);
resultStr = cJSON_Print(result);
responseHandle(resultStr, context);
free(resultStr);
ResponseJsonString(result, responseHandle, context);
cJSON_Delete(result);
}
void inline SixFrameHandle::ResponseGetProductInfo(cJSON *result, const AppGetProductInfo &param)
@ -149,7 +142,6 @@ void inline SixFrameHandle::ResponseGetProductInfo(cJSON *result, const AppGetPr
void SixFrameHandle::RequestGetDeviceAttr(const std::string &url, ResponseHandle responseHandle, void *context)
{
LogInfo("RequestGetDeviceAttr.\n");
char *resultStr = nullptr;
AppGetDeviceAttr param;
mAppMonitor->GetDeviceAttr(param);
cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL);
@ -159,9 +151,7 @@ void SixFrameHandle::RequestGetDeviceAttr(const std::string &url, ResponseHandle
return;
}
ResponseGetDeviceAttr(result, param);
resultStr = cJSON_Print(result);
responseHandle(resultStr, context);
free(resultStr);
ResponseJsonString(result, responseHandle, context);
cJSON_Delete(result);
}
void inline SixFrameHandle::ResponseGetDeviceAttr(cJSON *result, const AppGetDeviceAttr &param)
@ -181,7 +171,6 @@ void inline SixFrameHandle::ResponseGetDeviceAttr(cJSON *result, const AppGetDev
void SixFrameHandle::RequestGetMediaInfo(const std::string &url, ResponseHandle responseHandle, void *context)
{
LogInfo("RequestGetMediaInfo.\n");
char *resultStr = nullptr;
AppGetMeidaInfo param;
mAppMonitor->GetMediaInfo(param);
cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL);
@ -191,10 +180,7 @@ void SixFrameHandle::RequestGetMediaInfo(const std::string &url, ResponseHandle
return;
}
ResponseGetMediaInfo(result, param);
resultStr = cJSON_Print(result);
responseHandle(resultStr, context);
LogInfo("resultStr = \n%s\n", resultStr);
free(resultStr);
ResponseJsonString(result, responseHandle, context);
cJSON_Delete(result);
}
void inline SixFrameHandle::ResponseGetMediaInfo(cJSON *result, const AppGetMeidaInfo &param)
@ -208,7 +194,6 @@ void inline SixFrameHandle::ResponseGetMediaInfo(cJSON *result, const AppGetMeid
void SixFrameHandle::RequestGetSdCardInfo(const std::string &url, ResponseHandle responseHandle, void *context)
{
LogInfo("RequestGetDeviceAttr.\n");
char *resultStr = nullptr;
AppGetSdCardInfo param;
mAppMonitor->GetSdCardInfo(param);
cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL);
@ -218,9 +203,7 @@ void SixFrameHandle::RequestGetSdCardInfo(const std::string &url, ResponseHandle
return;
}
ResponseGetSdCardInfo(result, param);
resultStr = cJSON_Print(result);
responseHandle(resultStr, context);
free(resultStr);
ResponseJsonString(result, responseHandle, context);
cJSON_Delete(result);
}
void inline SixFrameHandle::ResponseGetSdCardInfo(cJSON *result, const AppGetSdCardInfo &param)
@ -234,7 +217,6 @@ void inline SixFrameHandle::ResponseGetSdCardInfo(cJSON *result, const AppGetSdC
void SixFrameHandle::RequestGetBatteryInfo(const std::string &url, ResponseHandle responseHandle, void *context)
{
LogInfo("RequestGetDeviceAttr.\n");
char *resultStr = nullptr;
AppGetBatteryInfo param;
mAppMonitor->GetBatteryInfo(param);
cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL);
@ -244,9 +226,7 @@ void SixFrameHandle::RequestGetBatteryInfo(const std::string &url, ResponseHandl
return;
}
ResponseGetBatteryInfo(result, param);
resultStr = cJSON_Print(result);
responseHandle(resultStr, context);
free(resultStr);
ResponseJsonString(result, responseHandle, context);
cJSON_Delete(result);
}
void inline SixFrameHandle::ResponseGetBatteryInfo(cJSON *result, const AppGetBatteryInfo &param)
@ -259,7 +239,6 @@ void inline SixFrameHandle::ResponseGetBatteryInfo(cJSON *result, const AppGetBa
void SixFrameHandle::RequestGetParamValue(const std::string &url, ResponseHandle responseHandle, void *context)
{
LogInfo("RequestGetParamValue.\n");
char *resultStr = nullptr;
AppGetParamValue param;
mAppMonitor->GetParamValue(param);
cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL);
@ -269,9 +248,7 @@ void SixFrameHandle::RequestGetParamValue(const std::string &url, ResponseHandle
return;
}
ResponseGetParamValue(result, param);
resultStr = cJSON_Print(result);
responseHandle(resultStr, context);
free(resultStr);
ResponseJsonString(result, responseHandle, context);
cJSON_Delete(result);
}
void inline SixFrameHandle::ResponseGetParamValue(cJSON *result, const AppGetParamValue &param)
@ -284,7 +261,6 @@ void inline SixFrameHandle::ResponseGetParamValue(cJSON *result, const AppGetPar
void SixFrameHandle::RequestGetCapability(const std::string &url, ResponseHandle responseHandle, void *context)
{
LogInfo("RequestGetCapability.\n");
char *resultStr = nullptr;
AppGetCapability param;
mAppMonitor->GetCapability(param);
cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL);
@ -294,9 +270,7 @@ void SixFrameHandle::RequestGetCapability(const std::string &url, ResponseHandle
return;
}
ResponseGetCapability(result, param);
resultStr = cJSON_Print(result);
responseHandle(resultStr, context);
free(resultStr);
ResponseJsonString(result, responseHandle, context);
cJSON_Delete(result);
}
void inline SixFrameHandle::ResponseGetCapability(cJSON *result, const AppGetCapability &param)
@ -309,7 +283,6 @@ void inline SixFrameHandle::ResponseGetCapability(cJSON *result, const AppGetCap
void SixFrameHandle::RequestGetLockVideoStatus(const std::string &url, ResponseHandle responseHandle, void *context)
{
LogInfo("RequestGetLockVideoStatus.\n");
char *resultStr = nullptr;
LockVideoStatus param;
mAppMonitor->GetLockVideoStatus(param);
cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL);
@ -319,9 +292,7 @@ void SixFrameHandle::RequestGetLockVideoStatus(const std::string &url, ResponseH
return;
}
ResponseGetLockVideoStatus(result, param);
resultStr = cJSON_Print(result);
responseHandle(resultStr, context);
free(resultStr);
ResponseJsonString(result, responseHandle, context);
cJSON_Delete(result);
}
void inline SixFrameHandle::ResponseGetLockVideoStatus(cJSON *result, const LockVideoStatus &param)
@ -333,7 +304,6 @@ void inline SixFrameHandle::ResponseGetLockVideoStatus(cJSON *result, const Lock
void SixFrameHandle::RequestGetStorageInfo(const std::string &url, ResponseHandle responseHandle, void *context)
{
LogInfo("RequestGetStorageInfo.\n");
char *resultStr = nullptr;
std::vector<AppGetStorageInfo> param;
mAppMonitor->GetStorageInfo(param);
cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL);
@ -343,9 +313,7 @@ void SixFrameHandle::RequestGetStorageInfo(const std::string &url, ResponseHandl
return;
}
ResponseGetStorageInfo(result, param);
resultStr = cJSON_Print(result);
responseHandle(resultStr, context);
free(resultStr);
ResponseJsonString(result, responseHandle, context);
cJSON_Delete(result);
}
void inline SixFrameHandle::ResponseGetStorageInfo(cJSON *result, const std::vector<AppGetStorageInfo> &param)
@ -401,7 +369,6 @@ AppSetDateTime inline SixFrameHandle::RequestSetDateTimeParse(const std::string
void SixFrameHandle::RequestSetDateTime(const std::string &url, ResponseHandle responseHandle, void *context)
{
LogInfo("RequestGetDeviceAttr.\n");
char *resultStr = nullptr;
AppSetDateTime param = RequestSetDateTimeParse(url);
mAppMonitor->SetDateTime(param);
cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL, SET_REQUEST_RESPONSE);
@ -410,10 +377,7 @@ void SixFrameHandle::RequestSetDateTime(const std::string &url, ResponseHandle r
responseHandle("Device run out of memory.", context);
return;
}
// ResponseGetBatteryInfo(result, param);
resultStr = cJSON_Print(result);
responseHandle(resultStr, context);
free(resultStr);
ResponseJsonString(result, responseHandle, context);
cJSON_Delete(result);
}
int inline SixFrameHandle::RequestSetTimeZoneParse(const std::string &url)
@ -437,7 +401,6 @@ int inline SixFrameHandle::RequestSetTimeZoneParse(const std::string &url)
void SixFrameHandle::RequestSetTimeZone(const std::string &url, ResponseHandle responseHandle, void *context)
{
LogInfo("RequestSetTimeZone.\n");
char *resultStr = nullptr;
int zone = RequestSetTimeZoneParse(url);
mAppMonitor->SetTimeZone(zone);
cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL, SET_REQUEST_RESPONSE);
@ -446,10 +409,7 @@ void SixFrameHandle::RequestSetTimeZone(const std::string &url, ResponseHandle r
responseHandle("Device run out of memory.", context);
return;
}
// ResponseGetBatteryInfo(result, param);
resultStr = cJSON_Print(result);
responseHandle(resultStr, context);
free(resultStr);
ResponseJsonString(result, responseHandle, context);
cJSON_Delete(result);
}
AppSetParamValue inline SixFrameHandle::RequestSetParamValueParse(const std::string &url)
@ -480,7 +440,6 @@ AppSetParamValue inline SixFrameHandle::RequestSetParamValueParse(const std::str
void SixFrameHandle::RequestSetParamValue(const std::string &url, ResponseHandle responseHandle, void *context)
{
LogInfo("RequestSetParamValue.\n");
char *resultStr = nullptr;
AppSetParamValue value = RequestSetParamValueParse(url);
mAppMonitor->SetParamValue(value);
cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL, SET_REQUEST_RESPONSE);
@ -489,16 +448,12 @@ void SixFrameHandle::RequestSetParamValue(const std::string &url, ResponseHandle
responseHandle("Device run out of memory.", context);
return;
}
// ResponseGetBatteryInfo(result, param);
resultStr = cJSON_Print(result);
responseHandle(resultStr, context);
free(resultStr);
ResponseJsonString(result, responseHandle, context);
cJSON_Delete(result);
}
void SixFrameHandle::RequestEnterRecorder(const std::string &url, ResponseHandle responseHandle, void *context)
{
LogInfo("RequestEnterRecorder.\n");
char *resultStr = nullptr;
mAppMonitor->EnterRecorder();
cJSON *result = MakeResponseResult(ResposeResult::SUCCESSFUL);
if (nullptr == result) {
@ -506,15 +461,12 @@ void SixFrameHandle::RequestEnterRecorder(const std::string &url, ResponseHandle
responseHandle("Device run out of memory.", context);
return;
}
resultStr = cJSON_Print(result);
responseHandle(resultStr, context);
free(resultStr);
ResponseJsonString(result, responseHandle, context);
cJSON_Delete(result);
}
void SixFrameHandle::RequestUpload(const std::string &url, ResponseHandle responseHandle, void *context)
{
LogInfo("RequestUpload.\n");
char *resultStr = nullptr;
AppUploadFile info("path", UploadCommand::UPGRADE_CPU);
mAppMonitor->UploadFile(info);
cJSON *result = MakeResponseResult(info.mResult);
@ -523,9 +475,7 @@ void SixFrameHandle::RequestUpload(const std::string &url, ResponseHandle respon
responseHandle("Device run out of memory.", context);
return;
}
resultStr = cJSON_Print(result);
responseHandle(resultStr, context);
free(resultStr);
ResponseJsonString(result, responseHandle, context);
cJSON_Delete(result);
}
cJSON *SixFrameHandle::MakeResponseResult(const ResposeResult result, const bool requestSet)
@ -549,6 +499,19 @@ cJSON *SixFrameHandle::MakeResponseResult(const ResposeResult result, const bool
END:
return resultCJSON;
}
void SixFrameHandle::ResponseJsonString(cJSON *json, ResponseHandle responseHandle, void *context)
{
char *resultStr = nullptr;
resultStr = cJSON_Print(json);
if (nullptr != resultStr) {
responseHandle(resultStr, context);
free(resultStr);
}
else {
LogError("MakeResponseResult failed.\n");
responseHandle("Device run out of memory.", context);
}
}
void SixFrameHandle::SetAppMonitor(std::shared_ptr<VAppMonitor> &monitor)
{
if (monitor) {

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

@ -87,6 +87,7 @@ private:
private:
cJSON *MakeResponseResult(const ResposeResult result, const bool requestSet = false);
void ResponseJsonString(cJSON *json, ResponseHandle responseHandle, void *context);
protected:
void SetAppMonitor(std::shared_ptr<VAppMonitor> &monitor) override;