点校正,获取当前坐标系统。

main
chenglifeng 6 months ago
parent a86f7ef9f3
commit cb7743acbe
  1. 35
      app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkMatchingPointsActivity.java
  2. 8
      app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkPointCorrectActivity.java

@ -3,8 +3,12 @@ package com.project.survey.ui.instrument.mobilestationmode.base;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import com.bingce.coordlib.enums.EllipsoidEnum; import com.bingce.coordlib.enums.EllipsoidEnum;
import com.bingce.coordlib.model.CoordinateSystem; import com.bingce.coordlib.model.CoordinateSystem;
import com.bingce.data.database.DBQueryConstant;
import com.bingce.data.database.KeyValueDb;
import com.bingce.data.database.ProjectDb; import com.bingce.data.database.ProjectDb;
import com.bingce.data.surveyor.designdata.project.ProjectConstants;
import com.bingce.utils.IOnSingleGetCallback; import com.bingce.utils.IOnSingleGetCallback;
import com.bingce.utils.ThreadPoolUtil;
import com.project.survey.App; import com.project.survey.App;
import com.project.survey.R; import com.project.survey.R;
import com.project.survey.ui.instrument.basestationtranslation.RtkBaseCorrectActivity; import com.project.survey.ui.instrument.basestationtranslation.RtkBaseCorrectActivity;
@ -112,20 +116,23 @@ public class RtkMatchingPointsActivity extends AbstractRtkMatchingPointsActivity
@Override @Override
protected void loadCurrentCoordinateSystem(IOnSingleGetCallback<CoordinateSystem> callback) { protected void loadCurrentCoordinateSystem(IOnSingleGetCallback<CoordinateSystem> callback) {
// TODO: 2024/8/15 获取坐标系 // 获取坐标系
// ThreadPoolUtil.execute(() -> { ThreadPoolUtil.execute(() -> {
// String currentProjectId = KeyValueDb.currentProjectId(); String currentProjectId = KeyValueDb.currentProjectId();
// ProjectRecord projectRecord = ProjectDb.getInstance() runOnUiThread(() -> {
// .rawQueryData(DBQueryConstant.findById(ProjectConstants.DB_NAME, currentProjectId)); ProjectDb.getInstance().rawQueryLiveData(
// if (projectRecord != null) { DBQueryConstant.findById(ProjectConstants.DB_NAME, currentProjectId))
// runOnUiThread(() -> { .observe(this, projectRecord -> {
// callback.onGet(projectRecord.coordinateSystem); if (projectRecord == null) {
// }); return;
// } }
// }); callback.onGet(projectRecord.coordinateSystem);
});
});
});
CoordinateSystem coordinateSystem = new CoordinateSystem("2000"); // CoordinateSystem coordinateSystem = new CoordinateSystem("2000");
coordinateSystem.setEllipsoid(EllipsoidEnum.AGD_84); // coordinateSystem.setEllipsoid(EllipsoidEnum.AGD_84);
callback.onGet(coordinateSystem); // callback.onGet(coordinateSystem);
} }
} }

@ -26,7 +26,7 @@ public class RtkPointCorrectActivity extends AbstractRtkPointCorrectActivity {
@Override @Override
protected void observeCurrentCoordinate(IOnSingleGetCallback<CoordinateSystem> callback) { protected void observeCurrentCoordinate(IOnSingleGetCallback<CoordinateSystem> callback) {
// TODO: 2024/8/15 获取坐标系 // 获取坐标系
ThreadPoolUtil.execute(() -> { ThreadPoolUtil.execute(() -> {
String currentProjectId = KeyValueDb.currentProjectId(); String currentProjectId = KeyValueDb.currentProjectId();
runOnUiThread(() -> { runOnUiThread(() -> {
@ -41,9 +41,9 @@ public class RtkPointCorrectActivity extends AbstractRtkPointCorrectActivity {
}); });
}); });
CoordinateSystem coordinateSystem = new CoordinateSystem("2000"); // CoordinateSystem coordinateSystem = new CoordinateSystem("2000");
coordinateSystem.setEllipsoid(EllipsoidEnum.AGD_84); // coordinateSystem.setEllipsoid(EllipsoidEnum.AGD_84);
callback.onGet(coordinateSystem); // callback.onGet(coordinateSystem);
} }
@Override @Override

Loading…
Cancel
Save