wangguannan
/
ShangHaiProjectSurvey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测量数据保留小数点后4位

Browse Source
main
chenglifeng 6 months ago
parent 32996df95a
commit 83c7070764
3 changed files with 43 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      app/src/main/java/com/project/survey/App.kt
  2. 60
      app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java
  3. 20
      app/src/main/java/com/project/survey/ui/pointmeasure/measure/PointSurveyNewActivity.java

3
app/src/main/java/com/project/survey/App.kt
Unescape View File

@ -39,6 +39,9 @@ class App : SurveyorApp() {
// 是否在记录界面显示当前工程全部数据 // 是否在记录界面显示当前工程全部数据
const val isShowAllRecordInCurrentProject = true const val isShowAllRecordInCurrentProject = true
// 小数点位数
const val notNumber = 4
} }
// var lastRecordBrowseType: Int = 0 // var lastRecordBrowseType: Int = 0

60
app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java
Unescape View File

@ -264,9 +264,9 @@ public class PointStakingActivity extends BaseSurveyNewActivity {
ToastUtils.showShort(getString(R.string.disconnect_device_use_input_point)); ToastUtils.showShort(getString(R.string.disconnect_device_use_input_point));
return; return;
} }
String inputSurveyX = currentCoordinate != null ? Util.formatDouble2String(currentCoordinate.getX(), 4) : ""; String inputSurveyX = currentCoordinate != null ? Util.formatDouble2String(currentCoordinate.getX(), App.notNumber) : "";
String inputSurveyY = currentCoordinate != null ? Util.formatDouble2String(currentCoordinate.getY(), 4) : ""; String inputSurveyY = currentCoordinate != null ? Util.formatDouble2String(currentCoordinate.getY(), App.notNumber) : "";
String inputSurveyZ = currentCoordinate != null ? Util.formatDouble2String(currentCoordinate.getZ(), 4) : ""; String inputSurveyZ = currentCoordinate != null ? Util.formatDouble2String(currentCoordinate.getZ(), App.notNumber) : "";
new CustomInputListDialog.Builder(this).setTitle(getString(R.string.input_current_point)) new CustomInputListDialog.Builder(this).setTitle(getString(R.string.input_current_point))
.setInputHint01("X") .setInputHint01("X")
.setInputHint02("Y") .setInputHint02("Y")
@ -857,15 +857,15 @@ public class PointStakingActivity extends BaseSurveyNewActivity {
targetCompassHelper.updateTargetAzimuth(result.targetAzimuth); targetCompassHelper.updateTargetAzimuth(result.targetAzimuth);
distance = TextFactory.distanceFormatDouble2String(getString(R.string.distance) + getString(R.string.colon), PointUtils.getDistance2D(new BasePoint(targetStakePointRecord.x, targetStakePointRecord.y, targetStakePointRecord.h), new BasePoint(currentCoordinate.getX(), currentCoordinate.getY(), currentCoordinate.getZ())), 6); distance = TextFactory.distanceFormatDouble2String(getString(R.string.distance) + getString(R.string.colon), PointUtils.getDistance2D(new BasePoint(targetStakePointRecord.x, targetStakePointRecord.y, targetStakePointRecord.h), new BasePoint(currentCoordinate.getX(), currentCoordinate.getY(), currentCoordinate.getZ())), App.notNumber);
binding.tvDistance.setText(distance); binding.tvDistance.setText(distance);
moveDigFill = currentCoordinate.getZ() > targetStakePointRecord.h moveDigFill = currentCoordinate.getZ() > targetStakePointRecord.h
? TextFactory.distanceFormatDouble2String(getString(R.string.down_dig), currentCoordinate.getZ() - targetStakePointRecord.h, 6) ? TextFactory.distanceFormatDouble2String(getString(R.string.down_dig), currentCoordinate.getZ() - targetStakePointRecord.h, App.notNumber)
: TextFactory.distanceFormatDouble2String(getString(R.string.up_fill), targetStakePointRecord.h - currentCoordinate.getZ(), 6); : TextFactory.distanceFormatDouble2String(getString(R.string.up_fill), targetStakePointRecord.h - currentCoordinate.getZ(), App.notNumber);
binding.tvDigFill.setText(currentCoordinate.getZ() > targetStakePointRecord.h binding.tvDigFill.setText(currentCoordinate.getZ() > targetStakePointRecord.h
? TextFactory.distanceFormatDouble2String(getString(R.string.down_dig) + getString(R.string.colon), currentCoordinate.getZ() - targetStakePointRecord.h, 6) ? TextFactory.distanceFormatDouble2String(getString(R.string.down_dig) + getString(R.string.colon), currentCoordinate.getZ() - targetStakePointRecord.h, App.notNumber)
: TextFactory.distanceFormatDouble2String(getString(R.string.up_fill) + getString(R.string.colon), targetStakePointRecord.h - currentCoordinate.getZ(), 6)); : TextFactory.distanceFormatDouble2String(getString(R.string.up_fill) + getString(R.string.colon), targetStakePointRecord.h - currentCoordinate.getZ(), App.notNumber));
if (Device.getInstance().deviceType == DeviceTypeEnum.DEVICE_TYPE_TS) { if (Device.getInstance().deviceType == DeviceTypeEnum.DEVICE_TYPE_TS) {
switch (PreferencesUtil.getMoveMethodTypeTS()) { switch (PreferencesUtil.getMoveMethodTypeTS()) {
@ -921,39 +921,39 @@ public class PointStakingActivity extends BaseSurveyNewActivity {
double foreBackMoveValue = moveDistance.getX(); double foreBackMoveValue = moveDistance.getX();
moveBeforeAfter = foreBackMoveValue >= 0 moveBeforeAfter = foreBackMoveValue >= 0
? TextFactory.distanceFormatDouble2String("向前", Math.abs(foreBackMoveValue), 6) ? TextFactory.distanceFormatDouble2String("向前", Math.abs(foreBackMoveValue), App.notNumber)
: TextFactory.distanceFormatDouble2String("向后", Math.abs(foreBackMoveValue), 6); : TextFactory.distanceFormatDouble2String("向后", Math.abs(foreBackMoveValue), App.notNumber);
binding.tvTopThree.setText(foreBackMoveValue >= 0 binding.tvTopThree.setText(foreBackMoveValue >= 0
? TextFactory.distanceFormatDouble2String("向前" + getString(R.string.colon), Math.abs(foreBackMoveValue), 6) ? TextFactory.distanceFormatDouble2String("向前" + getString(R.string.colon), Math.abs(foreBackMoveValue), App.notNumber)
: TextFactory.distanceFormatDouble2String("向后" + getString(R.string.colon), Math.abs(foreBackMoveValue), 6)); : TextFactory.distanceFormatDouble2String("向后" + getString(R.string.colon), Math.abs(foreBackMoveValue), App.notNumber));
double leftRightValue = moveDistance.getY(); double leftRightValue = moveDistance.getY();
moveLeftRight = leftRightValue >= 0 moveLeftRight = leftRightValue >= 0
? TextFactory.distanceFormatDouble2String(getString(R.string.to_right), Math.abs(leftRightValue), 6) ? TextFactory.distanceFormatDouble2String(getString(R.string.to_right), Math.abs(leftRightValue), App.notNumber)
: TextFactory.distanceFormatDouble2String(getString(R.string.to_left), Math.abs(leftRightValue), 6); : TextFactory.distanceFormatDouble2String(getString(R.string.to_left), Math.abs(leftRightValue), App.notNumber);
binding.tvTopFour.setText(leftRightValue >= 0 binding.tvTopFour.setText(leftRightValue >= 0
? TextFactory.distanceFormatDouble2String(getString(R.string.to_right) + getString(R.string.colon), Math.abs(leftRightValue), 6) ? TextFactory.distanceFormatDouble2String(getString(R.string.to_right) + getString(R.string.colon), Math.abs(leftRightValue), App.notNumber)
: TextFactory.distanceFormatDouble2String(getString(R.string.to_left) + getString(R.string.colon), Math.abs(leftRightValue), 6)); : TextFactory.distanceFormatDouble2String(getString(R.string.to_left) + getString(R.string.colon), Math.abs(leftRightValue), App.notNumber));
} }
private void moveWestEast() { private void moveWestEast() {
moveWestEast = currentCoordinate.getY() > targetStakePointRecord.y moveWestEast = currentCoordinate.getY() > targetStakePointRecord.y
? TextFactory.distanceFormatDouble2String(getString(R.string.to_west), currentCoordinate.getY() - targetStakePointRecord.y, 6) ? TextFactory.distanceFormatDouble2String(getString(R.string.to_west), currentCoordinate.getY() - targetStakePointRecord.y, App.notNumber)
: TextFactory.distanceFormatDouble2String(getString(R.string.to_east), targetStakePointRecord.y - currentCoordinate.getY(), 6); : TextFactory.distanceFormatDouble2String(getString(R.string.to_east), targetStakePointRecord.y - currentCoordinate.getY(), App.notNumber);
moveSouthNorth = currentCoordinate.getX() > targetStakePointRecord.x moveSouthNorth = currentCoordinate.getX() > targetStakePointRecord.x
? TextFactory.distanceFormatDouble2String(getString(R.string.to_south), currentCoordinate.getX() - targetStakePointRecord.x, 6) ? TextFactory.distanceFormatDouble2String(getString(R.string.to_south), currentCoordinate.getX() - targetStakePointRecord.x, App.notNumber)
: TextFactory.distanceFormatDouble2String(getString(R.string.to_north), targetStakePointRecord.x - currentCoordinate.getX(), 6); : TextFactory.distanceFormatDouble2String(getString(R.string.to_north), targetStakePointRecord.x - currentCoordinate.getX(), App.notNumber);
binding.tvTopThree.setText(currentCoordinate.getY() > targetStakePointRecord.y binding.tvTopThree.setText(currentCoordinate.getY() > targetStakePointRecord.y
? TextFactory.distanceFormatDouble2String(getString(R.string.to_west) + getString(R.string.colon), currentCoordinate.getY() - targetStakePointRecord.y, 6) ? TextFactory.distanceFormatDouble2String(getString(R.string.to_west) + getString(R.string.colon), currentCoordinate.getY() - targetStakePointRecord.y, App.notNumber)
: TextFactory.distanceFormatDouble2String(getString(R.string.to_east) + getString(R.string.colon), targetStakePointRecord.y - currentCoordinate.getY(), 6)); : TextFactory.distanceFormatDouble2String(getString(R.string.to_east) + getString(R.string.colon), targetStakePointRecord.y - currentCoordinate.getY(), App.notNumber));
binding.tvTopFour.setText(currentCoordinate.getX() > targetStakePointRecord.x binding.tvTopFour.setText(currentCoordinate.getX() > targetStakePointRecord.x
? TextFactory.distanceFormatDouble2String(getString(R.string.to_south) + getString(R.string.colon), currentCoordinate.getX() - targetStakePointRecord.x, 6) ? TextFactory.distanceFormatDouble2String(getString(R.string.to_south) + getString(R.string.colon), currentCoordinate.getX() - targetStakePointRecord.x, App.notNumber)
: TextFactory.distanceFormatDouble2String(getString(R.string.to_north) + getString(R.string.colon), targetStakePointRecord.x - currentCoordinate.getX(), 6)); : TextFactory.distanceFormatDouble2String(getString(R.string.to_north) + getString(R.string.colon), targetStakePointRecord.x - currentCoordinate.getX(), App.notNumber));
} }
/** /**
@ -967,13 +967,13 @@ public class PointStakingActivity extends BaseSurveyNewActivity {
private void updateBottomInfo(String stakingName, double x, double y, double z) { private void updateBottomInfo(String stakingName, double x, double y, double z) {
if (!TextUtils.isEmpty(stakingName)) { if (!TextUtils.isEmpty(stakingName)) {
binding.tvStakingPointName.setText(getString(R.string.staking_point_name) + getString(R.string.colon) + stakingName); binding.tvStakingPointName.setText(getString(R.string.staking_point_name) + getString(R.string.colon) + stakingName);
binding.tvTargetX.setText(TextFactory.distanceFormatDouble2String("X" + getString(R.string.colon), x, 6)); binding.tvTargetX.setText(TextFactory.distanceFormatDouble2String("X" + getString(R.string.colon), x, App.notNumber));
binding.tvTargetY.setText(TextFactory.distanceFormatDouble2String("Y" + getString(R.string.colon), y, 6)); binding.tvTargetY.setText(TextFactory.distanceFormatDouble2String("Y" + getString(R.string.colon), y, App.notNumber));
binding.tvTargetZ.setText(TextFactory.distanceFormatDouble2String("Z" + getString(R.string.colon), z, 6)); binding.tvTargetZ.setText(TextFactory.distanceFormatDouble2String("Z" + getString(R.string.colon), z, App.notNumber));
} else { } else {
binding.tvSurveyX.setText(TextFactory.distanceFormatDouble2String("X" + getString(R.string.colon), x, 6)); binding.tvSurveyX.setText(TextFactory.distanceFormatDouble2String("X" + getString(R.string.colon), x, App.notNumber));
binding.tvSurveyY.setText(TextFactory.distanceFormatDouble2String("Y" + getString(R.string.colon), y, 6)); binding.tvSurveyY.setText(TextFactory.distanceFormatDouble2String("Y" + getString(R.string.colon), y, App.notNumber));
binding.tvSurveyZ.setText(TextFactory.distanceFormatDouble2String("Z" + getString(R.string.colon), z, 6)); binding.tvSurveyZ.setText(TextFactory.distanceFormatDouble2String("Z" + getString(R.string.colon), z, App.notNumber));
} }
} }

20
app/src/main/java/com/project/survey/ui/pointmeasure/measure/PointSurveyNewActivity.java
Unescape View File

@ -900,17 +900,17 @@ public class PointSurveyNewActivity extends BaseSurveyNewActivity implements Vie
switch (Integer.parseInt(id)) { switch (Integer.parseInt(id)) {
case FunctionItemID.POINT_SURVEY_ID.SURVEY_X_ID: case FunctionItemID.POINT_SURVEY_ID.SURVEY_X_ID:
if (coordinate != null) { if (coordinate != null) {
info = Util.formatDouble2String(coordinate.getX(), 6); info = Util.formatDouble2String(coordinate.getX(), App.notNumber);
} }
break; break;
case FunctionItemID.POINT_SURVEY_ID.SURVEY_Y_ID: case FunctionItemID.POINT_SURVEY_ID.SURVEY_Y_ID:
if (coordinate != null) { if (coordinate != null) {
info = Util.formatDouble2String(coordinate.getY(), 6); info = Util.formatDouble2String(coordinate.getY(), App.notNumber);
} }
break; break;
case FunctionItemID.POINT_SURVEY_ID.SURVEY_Z_ID: case FunctionItemID.POINT_SURVEY_ID.SURVEY_Z_ID:
if (coordinate != null) { if (coordinate != null) {
info = Util.formatDouble2String(coordinate.getZ(), 6); info = Util.formatDouble2String(coordinate.getZ(), App.notNumber);
} }
break; break;
case FunctionItemID.POINT_SURVEY_ID.SURVEY_LAT_ID: case FunctionItemID.POINT_SURVEY_ID.SURVEY_LAT_ID:
@ -929,7 +929,7 @@ public class PointSurveyNewActivity extends BaseSurveyNewActivity implements Vie
break; break;
case FunctionItemID.POINT_SURVEY_ID.SURVEY_ALT_ID: case FunctionItemID.POINT_SURVEY_ID.SURVEY_ALT_ID:
if (blh != null) { if (blh != null) {
info = Util.formatDouble2String(blh.getAltitude(), 6) + "m"; info = Util.formatDouble2String(blh.getAltitude(), App.notNumber) + "m";
} else { } else {
info = "*"; info = "*";
} }
@ -943,7 +943,7 @@ public class PointSurveyNewActivity extends BaseSurveyNewActivity implements Vie
break; break;
case FunctionItemID.POINT_SURVEY_ID.SURVEY_SIT_DISTANCE_ID: case FunctionItemID.POINT_SURVEY_ID.SURVEY_SIT_DISTANCE_ID:
if (GnssPosition.getInstance().getBaseInfo().isReceivedBase()) { if (GnssPosition.getInstance().getBaseInfo().isReceivedBase()) {
info = CoordUtil.formatDouble2String(GnssPosition.getInstance().baseInfo.getDistanceToBase(), 6) + "m"; info = CoordUtil.formatDouble2String(GnssPosition.getInstance().baseInfo.getDistanceToBase(), App.notNumber) + "m";
} else { } else {
info = getString(R.string.base_info_not_received); info = getString(R.string.base_info_not_received);
} }
@ -956,7 +956,7 @@ public class PointSurveyNewActivity extends BaseSurveyNewActivity implements Vie
double distance = PointUtils.getDistance2D(new BasePoint(coordinate.getX(), coordinate.getY()), new BasePoint(lastRTKBackSurveyPoint.getX(), lastRTKBackSurveyPoint.getY())); double distance = PointUtils.getDistance2D(new BasePoint(coordinate.getX(), coordinate.getY()), new BasePoint(lastRTKBackSurveyPoint.getX(), lastRTKBackSurveyPoint.getY()));
double currdTime = System.currentTimeMillis(); double currdTime = System.currentTimeMillis();
double time = (currdTime - lastTimeStamp) / 1000; double time = (currdTime - lastTimeStamp) / 1000;
info = Util.formatDouble2String(distance / time, 6); info = Util.formatDouble2String(distance / time, App.notNumber);
} }
} }
break; break;
@ -975,7 +975,7 @@ public class PointSurveyNewActivity extends BaseSurveyNewActivity implements Vie
if (coordinate != null) { if (coordinate != null) {
PointRecord pointSurveyData = surveyBaseRecordPointList.get(surveyBaseRecordPointList.size() - 1); PointRecord pointSurveyData = surveyBaseRecordPointList.get(surveyBaseRecordPointList.size() - 1);
double distance2D = PointUtils.getDistance2D(new BasePoint(pointSurveyData.x, pointSurveyData.y), new BasePoint(coordinate.getX(), coordinate.getY())); double distance2D = PointUtils.getDistance2D(new BasePoint(pointSurveyData.x, pointSurveyData.y), new BasePoint(coordinate.getX(), coordinate.getY()));
info = Util.formatDouble2String(distance2D, 6) + "m"; info = Util.formatDouble2String(distance2D, App.notNumber) + "m";
} }
} else { } else {
info = "*"; info = "*";
@ -986,7 +986,7 @@ public class PointSurveyNewActivity extends BaseSurveyNewActivity implements Vie
if (coordinate != null) { if (coordinate != null) {
PointRecord pointSurveyData = surveyBaseRecordPointList.get(surveyBaseRecordPointList.size() - 1); PointRecord pointSurveyData = surveyBaseRecordPointList.get(surveyBaseRecordPointList.size() - 1);
double distance3D = PointUtils.getDistance3D(new BasePoint(pointSurveyData.x, pointSurveyData.y, pointSurveyData.h), new BasePoint(coordinate.getX(), coordinate.getY(), coordinate.getZ())); double distance3D = PointUtils.getDistance3D(new BasePoint(pointSurveyData.x, pointSurveyData.y, pointSurveyData.h), new BasePoint(coordinate.getX(), coordinate.getY(), coordinate.getZ()));
info = Util.formatDouble2String(distance3D, 6) + "m"; info = Util.formatDouble2String(distance3D, App.notNumber) + "m";
} }
} else { } else {
info = "*"; info = "*";
@ -1012,7 +1012,7 @@ public class PointSurveyNewActivity extends BaseSurveyNewActivity implements Vie
} }
} }
} }
return Util.formatDouble2Double(total_distance_2d, 6); return Util.formatDouble2Double(total_distance_2d, App.notNumber);
} }
private double getAccumulat3D() { private double getAccumulat3D() {
@ -1025,7 +1025,7 @@ public class PointSurveyNewActivity extends BaseSurveyNewActivity implements Vie
} }
} }
} }
return Util.formatDouble2Double(total_distance_3d, 6); return Util.formatDouble2Double(total_distance_3d, App.notNumber);
} }
/** /**

Write Preview
Loading…
Cancel
Save