diff --git a/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkMatchingPointsActivity.java b/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkMatchingPointsActivity.java index 1888074..c5854c6 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkMatchingPointsActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkMatchingPointsActivity.java @@ -3,8 +3,12 @@ package com.project.survey.ui.instrument.mobilestationmode.base; import com.afollestad.materialdialogs.MaterialDialog; import com.bingce.coordlib.enums.EllipsoidEnum; 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.surveyor.designdata.project.ProjectConstants; import com.bingce.utils.IOnSingleGetCallback; +import com.bingce.utils.ThreadPoolUtil; import com.project.survey.App; import com.project.survey.R; import com.project.survey.ui.instrument.basestationtranslation.RtkBaseCorrectActivity; @@ -112,20 +116,23 @@ public class RtkMatchingPointsActivity extends AbstractRtkMatchingPointsActivity @Override protected void loadCurrentCoordinateSystem(IOnSingleGetCallback callback) { - // TODO: 2024/8/15 获取坐标系 -// ThreadPoolUtil.execute(() -> { -// String currentProjectId = KeyValueDb.currentProjectId(); -// ProjectRecord projectRecord = ProjectDb.getInstance() -// .rawQueryData(DBQueryConstant.findById(ProjectConstants.DB_NAME, currentProjectId)); -// if (projectRecord != null) { -// runOnUiThread(() -> { -// callback.onGet(projectRecord.coordinateSystem); -// }); -// } -// }); + // 获取坐标系 + ThreadPoolUtil.execute(() -> { + String currentProjectId = KeyValueDb.currentProjectId(); + runOnUiThread(() -> { + ProjectDb.getInstance().rawQueryLiveData( + DBQueryConstant.findById(ProjectConstants.DB_NAME, currentProjectId)) + .observe(this, projectRecord -> { + if (projectRecord == null) { + return; + } + callback.onGet(projectRecord.coordinateSystem); + }); + }); + }); - CoordinateSystem coordinateSystem = new CoordinateSystem("2000"); - coordinateSystem.setEllipsoid(EllipsoidEnum.AGD_84); - callback.onGet(coordinateSystem); +// CoordinateSystem coordinateSystem = new CoordinateSystem("2000"); +// coordinateSystem.setEllipsoid(EllipsoidEnum.AGD_84); +// callback.onGet(coordinateSystem); } } diff --git a/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkPointCorrectActivity.java b/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkPointCorrectActivity.java index 9f70a24..32a359b 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkPointCorrectActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/RtkPointCorrectActivity.java @@ -26,7 +26,7 @@ public class RtkPointCorrectActivity extends AbstractRtkPointCorrectActivity { @Override protected void observeCurrentCoordinate(IOnSingleGetCallback callback) { - // TODO: 2024/8/15 获取坐标系 + // 获取坐标系 ThreadPoolUtil.execute(() -> { String currentProjectId = KeyValueDb.currentProjectId(); runOnUiThread(() -> { @@ -41,9 +41,9 @@ public class RtkPointCorrectActivity extends AbstractRtkPointCorrectActivity { }); }); - CoordinateSystem coordinateSystem = new CoordinateSystem("2000"); - coordinateSystem.setEllipsoid(EllipsoidEnum.AGD_84); - callback.onGet(coordinateSystem); +// CoordinateSystem coordinateSystem = new CoordinateSystem("2000"); +// coordinateSystem.setEllipsoid(EllipsoidEnum.AGD_84); +// callback.onGet(coordinateSystem); } @Override