From c3ed3fa087f172dee746423044786372dabd4722 Mon Sep 17 00:00:00 2001 From: Piotr Kosko Date: Fri, 21 Jul 2017 11:43:43 +0200 Subject: [PATCH] [HAM] fixed SVACE issue [Verification] HAM tct 100% Change-Id: Ibba5969d26a0eb95b4320ab1c62c276d7454d68f Signed-off-by: Piotr Kosko --- src/humanactivitymonitor/humanactivitymonitor_manager.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/humanactivitymonitor/humanactivitymonitor_manager.cc b/src/humanactivitymonitor/humanactivitymonitor_manager.cc index de845e9d..dda7ba12 100755 --- a/src/humanactivitymonitor/humanactivitymonitor_manager.cc +++ b/src/humanactivitymonitor/humanactivitymonitor_manager.cc @@ -173,13 +173,13 @@ static int64_t getCurrentTimeStamp(unsigned long long evTime) return timeStamp; } -void InsertStepDifference(float step_difference, float timestamp, picojson::array* out) { +void InsertStepDifference(float step_difference, int64_t timestamp, picojson::array* out) { ScopeLogger(); picojson::object d; d.insert(std::make_pair(kStepCountDifference, picojson::value(step_difference))); - d.insert(std::make_pair(kTimestamp, picojson::value(timestamp))); + d.insert(std::make_pair(kTimestamp, picojson::value(static_cast(timestamp)))); out->push_back(picojson::value{d}); } @@ -1337,11 +1337,11 @@ HumanActivityMonitorManager::HumanActivityMonitorManager() if (pedometer_data->diffs_count > 0) { for (int i = 0; i < pedometer_data->diffs_count; ++i) { InsertStepDifference(pedometer_data->diffs[i].steps, - static_cast(getCurrentTimeStamp(pedometer_data->diffs[i].timestamp) / 1000), &diffs); + getCurrentTimeStamp(pedometer_data->diffs[i].timestamp) / 1000, &diffs); } } else { InsertStepDifference(steps_so_far > 0.0 ? pedometer_data->steps() - steps_so_far : 0.0, - static_cast(getCurrentTimeStamp(pedometer_data->timestamp) / 1000), &diffs); + getCurrentTimeStamp(pedometer_data->timestamp) / 1000, &diffs); } steps_so_far = pedometer_data->steps(); -- 2.34.1