diff --git a/sec-incline-server/src/main/java/com/imdroid/inclide_server/service/InclineDataForwarder.java b/sec-incline-server/src/main/java/com/imdroid/inclide_server/service/InclineDataForwarder.java index 82a49629..3c12694e 100644 --- a/sec-incline-server/src/main/java/com/imdroid/inclide_server/service/InclineDataForwarder.java +++ b/sec-incline-server/src/main/java/com/imdroid/inclide_server/service/InclineDataForwarder.java @@ -115,6 +115,7 @@ public class InclineDataForwarder{ float x = surfaceInclineData.getAnglex(); float y = surfaceInclineData.getAngley(); float z = surfaceInclineData.getAnglez(); + // 振幅 float Zx = surfaceInclineData.getMaxaccx()-surfaceInclineData.getMinaccx(); float Zy = surfaceInclineData.getMaxaccx()-surfaceInclineData.getMinaccy(); float Zz = surfaceInclineData.getMaxaccx()-surfaceInclineData.getMinaccz(); @@ -122,9 +123,9 @@ public class InclineDataForwarder{ data.setX(NumberUtils.scale((double) x, 3)); data.setY(NumberUtils.scale((double) y, 3)); data.setZ(NumberUtils.scale((double) z, 3)); - data.setZx(NumberUtils.scale((double) Zx, 3)); - data.setZy(NumberUtils.scale((double) Zy, 3)); - data.setZz(NumberUtils.scale((double) Zz, 3)); + data.setZx(NumberUtils.scale((double) Zx*1000, 3)); //g->mg + data.setZy(NumberUtils.scale((double) Zy*1000, 3)); + data.setZz(NumberUtils.scale((double) Zz*1000, 3)); // 经纬度 if(device.getLongitude()!=null && device.getLatitude()!=null) { data.setDevLng(device.getLongitude());