[HAM] fixed SVACE issue 41/140041/1 accepted/tizen/3.0/common/20170724.092944 accepted/tizen/3.0/ivi/20170724.075543 accepted/tizen/3.0/mobile/20170724.075511 accepted/tizen/3.0/tv/20170724.075516 accepted/tizen/3.0/wearable/20170724.075520 submit/tizen_3.0/20170721.122334
authorPiotr Kosko <p.kosko@samsung.com>
Fri, 21 Jul 2017 09:43:43 +0000 (11:43 +0200)
committerPiotr Kosko <p.kosko@samsung.com>
Fri, 21 Jul 2017 11:42:08 +0000 (13:42 +0200)
[Verification] HAM tct 100%

Change-Id: Ibba5969d26a0eb95b4320ab1c62c276d7454d68f
Signed-off-by: Piotr Kosko <p.kosko@samsung.com>
src/humanactivitymonitor/humanactivitymonitor_manager.cc

index de845e9..dda7ba1 100755 (executable)
@@ -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<float>(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<float>(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<float>(getCurrentTimeStamp(pedometer_data->timestamp) / 1000), &diffs);
+          getCurrentTimeStamp(pedometer_data->timestamp) / 1000, &diffs);
     }
 
     steps_so_far = pedometer_data->steps();