1、振幅推送改为mg
This commit is contained in:
parent
846e87dcec
commit
319cac5311
@ -115,6 +115,7 @@ public class InclineDataForwarder{
|
|||||||
float x = surfaceInclineData.getAnglex();
|
float x = surfaceInclineData.getAnglex();
|
||||||
float y = surfaceInclineData.getAngley();
|
float y = surfaceInclineData.getAngley();
|
||||||
float z = surfaceInclineData.getAnglez();
|
float z = surfaceInclineData.getAnglez();
|
||||||
|
// 振幅
|
||||||
float Zx = surfaceInclineData.getMaxaccx()-surfaceInclineData.getMinaccx();
|
float Zx = surfaceInclineData.getMaxaccx()-surfaceInclineData.getMinaccx();
|
||||||
float Zy = surfaceInclineData.getMaxaccx()-surfaceInclineData.getMinaccy();
|
float Zy = surfaceInclineData.getMaxaccx()-surfaceInclineData.getMinaccy();
|
||||||
float Zz = surfaceInclineData.getMaxaccx()-surfaceInclineData.getMinaccz();
|
float Zz = surfaceInclineData.getMaxaccx()-surfaceInclineData.getMinaccz();
|
||||||
@ -122,9 +123,9 @@ public class InclineDataForwarder{
|
|||||||
data.setX(NumberUtils.scale((double) x, 3));
|
data.setX(NumberUtils.scale((double) x, 3));
|
||||||
data.setY(NumberUtils.scale((double) y, 3));
|
data.setY(NumberUtils.scale((double) y, 3));
|
||||||
data.setZ(NumberUtils.scale((double) z, 3));
|
data.setZ(NumberUtils.scale((double) z, 3));
|
||||||
data.setZx(NumberUtils.scale((double) Zx, 3));
|
data.setZx(NumberUtils.scale((double) Zx*1000, 3)); //g->mg
|
||||||
data.setZy(NumberUtils.scale((double) Zy, 3));
|
data.setZy(NumberUtils.scale((double) Zy*1000, 3));
|
||||||
data.setZz(NumberUtils.scale((double) Zz, 3));
|
data.setZz(NumberUtils.scale((double) Zz*1000, 3));
|
||||||
// 经纬度
|
// 经纬度
|
||||||
if(device.getLongitude()!=null && device.getLatitude()!=null) {
|
if(device.getLongitude()!=null && device.getLatitude()!=null) {
|
||||||
data.setDevLng(device.getLongitude());
|
data.setDevLng(device.getLongitude());
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user