From 2c1b5e5c4cd7a12e7807e12dff628c5b741880d3 Mon Sep 17 00:00:00 2001 From: chenglifeng Date: Tue, 5 Nov 2024 18:14:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=A0=A1=E6=AD=A3->=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E7=82=B9=EF=BC=8C=E5=A4=A7=E5=9C=B0=E5=9D=90?= =?UTF-8?q?=E6=A0=87=E6=95=B0=E6=8D=AE=E6=BA=90=E9=80=9A=E8=BF=87=E5=B9=B3?= =?UTF-8?q?=E6=BB=91=E9=87=87=E9=9B=86=E8=8E=B7=E5=8F=96=EF=BC=8C=E5=B9=B3?= =?UTF-8?q?=E9=9D=A2=E5=9D=90=E6=A0=87=E6=95=B0=E6=8D=AE=E6=BA=90=20?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=BF=9B=E5=85=A5=E6=94=BE=E6=A0=B7=E7=82=B9?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractRtkMatchingPointsActivity.java | 2 + .../base/RtkMatchingPointsActivity.java | 61 +++++++++++-------- 2 files changed, 36 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/AbstractRtkMatchingPointsActivity.java b/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/AbstractRtkMatchingPointsActivity.java index 1c1d249..b310d52 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/AbstractRtkMatchingPointsActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/base/AbstractRtkMatchingPointsActivity.java @@ -113,6 +113,8 @@ public abstract class AbstractRtkMatchingPointsActivity extends AbstractSurveyAc } } }); + // 隐藏，通过平滑采集获取 + mBtnOpen1.setVisibility(View.GONE); mBtnOpen1.setOnClickListener(view -> { et_0.requestFocus(); SoftKeyUtils.hideSoftKey(); 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 45b9eca..1888074 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 @@ -7,6 +7,7 @@ import com.bingce.data.database.ProjectDb; import com.bingce.utils.IOnSingleGetCallback; import com.project.survey.App; import com.project.survey.R; +import com.project.survey.ui.instrument.basestationtranslation.RtkBaseCorrectActivity; import com.project.survey.ui.instrument.setupstation.BingCeBaseSurveyPresenter; import com.project.survey.ui.instrument.setupstation.ControlPointsNewActivity; import com.project.survey.ui.instrument.setupstation.CoordinatePointsLibraryActivity; @@ -46,6 +47,7 @@ public class RtkMatchingPointsActivity extends AbstractRtkMatchingPointsActivity return BingCeBaseSurveyPresenter.volumeDownAction(); } + // 大地坐标数据源 @Override protected void selectBLH() { new MaterialDialog.Builder(RtkMatchingPointsActivity.this) @@ -62,35 +64,40 @@ public class RtkMatchingPointsActivity extends AbstractRtkMatchingPointsActivity }).show(); } + // 平面坐标数据源 @Override protected void selectXYZ() { - new MaterialDialog.Builder(RtkMatchingPointsActivity.this) - .title(R.string.data_source) - .items(new String[]{getString(R.string.road_control_point), getString(R.string.global_control_point), getString(R.string.point_survey_point_library), getString(R.string.staking_point_library)}) - .itemsCallback((dialog, itemView, which, text) -> { - switch (which) { - case 0: - ControlPointsNewActivity.pickPoint(this, false, (name, code, x, y, z, remarks) -> { - onPicked(name, x, y, z); - }); - break; - case 1: - ControlPointsNewActivity.pickPoint(this, true, (name, code, x, y, z, remarks) -> { - onPicked(name, x, y, z); - }); - break; - case 2: - CoordinatePointsLibraryActivity.pickPoint(this, (name, code, x, y, z, b, l, h) -> { - onPicked(name, x, y, z); - }); - break; - case 3: - StakingNewJobActivity.pickPoint(this, (name, x, y, z) -> { - onPicked(name, x, y, z); - }); - break; - } - }).show(); + // 放样点库 + StakingNewJobActivity.pickPoint(this, (name, x, y, z) -> { + onPicked(name, x, y, z); + }); +// new MaterialDialog.Builder(RtkMatchingPointsActivity.this) +// .title(R.string.data_source) +// .items(new String[]{getString(R.string.road_control_point), getString(R.string.global_control_point), getString(R.string.point_survey_point_library), getString(R.string.staking_point_library)}) +// .itemsCallback((dialog, itemView, which, text) -> { +// switch (which) { +// case 0: +// ControlPointsNewActivity.pickPoint(this, false, (name, code, x, y, z, remarks) -> { +// onPicked(name, x, y, z); +// }); +// break; +// case 1: +// ControlPointsNewActivity.pickPoint(this, true, (name, code, x, y, z, remarks) -> { +// onPicked(name, x, y, z); +// }); +// break; +// case 2: +// CoordinatePointsLibraryActivity.pickPoint(this, (name, code, x, y, z, b, l, h) -> { +// onPicked(name, x, y, z); +// }); +// break; +// case 3: +// StakingNewJobActivity.pickPoint(this, (name, x, y, z) -> { +// onPicked(name, x, y, z); +// }); +// break; +// } +// }).show(); } @Override