From: Piotr Kosko
Date: Fri, 21 Jul 2017 09:43:43 +0000 (+0200)
Subject: [HAM] fixed SVACE issue
X-Git-Tag: submit/tizen_3.0/20170721.122334^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F140041%2F1;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git
[HAM] fixed SVACE issue
[Verification] HAM tct 100%
Change-Id: Ibba5969d26a0eb95b4320ab1c62c276d7454d68f
Signed-off-by: Piotr Kosko
---
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();