From 70a8d1502174d681ad1a84d3718de5287b117942 Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Sat, 11 May 2024 17:54:03 +0800 Subject: [PATCH] Backup. --- application/MissionManager/src/AppMonitor.cpp | 2 +- middleware/AppManager/src/AppClient.cpp | 2 ++ middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/application/MissionManager/src/AppMonitor.cpp b/application/MissionManager/src/AppMonitor.cpp index 7aabb56b..1ec20014 100644 --- a/application/MissionManager/src/AppMonitor.cpp +++ b/application/MissionManager/src/AppMonitor.cpp @@ -85,7 +85,7 @@ StatusCode AppMonitor::GetStorageInfo(std::vector ¶m) SdCardInfo sdInfo; IStorageManager::GetInstance()->GetSdCardInfo(sdInfo); info.mIndex = 0; - info.mName = "TF card"; + info.mName = "TF card 1"; info.mType = StorageType::SD_CARD_1; info.mFree = sdInfo.mFreeSizeMB; info.mTotal = sdInfo.mTotalSizeMB; diff --git a/middleware/AppManager/src/AppClient.cpp b/middleware/AppManager/src/AppClient.cpp index acc4186d..53983215 100644 --- a/middleware/AppManager/src/AppClient.cpp +++ b/middleware/AppManager/src/AppClient.cpp @@ -14,6 +14,7 @@ */ #include "AppClient.h" #include "IAppProtocolHandle.h" +#include "ILog.h" #include "TcpModule.h" AppClient::AppClient(const void *clientObject) : mClientObject(clientObject) { @@ -37,6 +38,7 @@ void AppClient::SetBatteryStatus(const BatteryStatus &status, const int &battery void AppClient::SetSdCardStatus(const SdCardStatus &status) { std::shared_ptr packet = IAppProtocolHandle::GetInstance()->SetSdCardStatus(status); + LogInfo("AppClient::SetSdCardStatus: \n%s\n", (const char *)packet->mData); AcceptClientWrite((void *)mClientObject, packet->mData, packet->mDataLength); } void AppClient::DeletedFileMessage(const std::string &file, const StorageFileType &type) diff --git a/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp b/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp index d50a3321..0c48db17 100644 --- a/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp +++ b/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp @@ -869,6 +869,8 @@ void SixFrameHandle::AddTimestamp(cJSON *json) if (current_time == -1) { LogError("Error getting the time\n"); + constexpr long TIME_ERROR = -1; + cJSON_AddNumberToObject(json, "time", TIME_ERROR); return; } cJSON_AddNumberToObject(json, "time", current_time);