From cb7743acbe860289c9aa468824e95fc760948bac Mon Sep 17 00:00:00 2001 From: chenglifeng Date: Tue, 5 Nov 2024 18:54:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=A0=A1=E6=AD=A3=EF=BC=8C=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=BD=93=E5=89=8D=E5=9D=90=E6=A0=87=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/RtkMatchingPointsActivity.java | 35 +++++++++++-------- .../base/RtkPointCorrectActivity.java | 8 ++--- 2 files changed, 25 insertions(+), 18 deletions(-) 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