From 35d14a481c507a05148c63cb9ccb9f63e30c4f1f Mon Sep 17 00:00:00 2001 From: huangwei <983142558@qq.com> Date: Wed, 14 Aug 2024 19:50:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 49 +++++++++++++++++++ .../survey/ui/base/BaseSurveyNewActivity.java | 8 +++ .../RtkBaseCorrectActivity.java | 13 ++--- .../GnssConfigSetActivity.java | 6 +-- .../ControlPointsNewActivity.java | 6 --- .../setupstation/PointFilterActivity.java | 8 ++- 6 files changed, 69 insertions(+), 21 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7649837..77d31c0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -146,6 +146,55 @@ android:name=".ui.lofting.pointlofting.PointStakingActivity" android:exported="true" android:windowSoftInputMode="adjustResize|stateHidden" /> + + + + + + + + + + + + + diff --git a/app/src/main/java/com/project/survey/ui/base/BaseSurveyNewActivity.java b/app/src/main/java/com/project/survey/ui/base/BaseSurveyNewActivity.java index 2318cc8..f75722c 100644 --- a/app/src/main/java/com/project/survey/ui/base/BaseSurveyNewActivity.java +++ b/app/src/main/java/com/project/survey/ui/base/BaseSurveyNewActivity.java @@ -148,6 +148,13 @@ public abstract class BaseSurveyNewActivity extends AppCompatActivity implements defaultMenu.showAsDropDown(baseSurveyActivityUtils.activityBaseSurveyBinding.ivMore, -150, 20); } + /** + * 隐藏三点更多 + */ + public void hideMore() { + baseSurveyActivityUtils.activityBaseSurveyBinding.ivMore.setVisibility(View.GONE); + } + public boolean isHideHelpDoc() { return false; } @@ -208,6 +215,7 @@ public abstract class BaseSurveyNewActivity extends AppCompatActivity implements baseSurveyActivityUtils.activityBaseSurveyBinding.llCommonRight.setOnClickListener(this::onCommonRightClicked); baseSurveyActivityUtils.activityBaseSurveyBinding.llIconHomeSatellite.setOnClickListener(v -> { + //激光 if (Device.getInstance().deviceType == DeviceTypeEnum.DEVICE_TYPE_TS) { tsSettingDialogUtils.showTotalStationSettingDialog(); } else { diff --git a/app/src/main/java/com/project/survey/ui/instrument/basestationtranslation/RtkBaseCorrectActivity.java b/app/src/main/java/com/project/survey/ui/instrument/basestationtranslation/RtkBaseCorrectActivity.java index 7f4af87..d44b228 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/basestationtranslation/RtkBaseCorrectActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/basestationtranslation/RtkBaseCorrectActivity.java @@ -24,9 +24,7 @@ import com.bingce.rtk.gnss.Gnss; import com.bingce.rtk.gnss.setting.BaseCorrect; import com.bingce.rtk.model.GnssPosition; import com.bingce.rtk.util.CoordTransUtil; - import com.bingce.surveyor.agentweb.HelpWebActivity; - import com.bingce.utils.ThreadPoolUtil; import com.bingce.utils.Util; import com.project.survey.App; @@ -160,25 +158,20 @@ public class RtkBaseCorrectActivity extends BaseSurveyNewActivity { CommonUtils.hideSoftInput(); new MaterialDialog.Builder(RtkBaseCorrectActivity.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)}) + .items(new String[]{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: + case 1: CoordinatePointsLibraryActivity.pickPoint(RtkBaseCorrectActivity.this, (name, code, x, y, z, b, l, h) -> { onPicked(name, x, y, z); }); break; - case 3: + case 2: StakingNewJobActivity.pickPoint(RtkBaseCorrectActivity.this, (name, x, y, z) -> { onPicked(name, x, y, z); }); diff --git a/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/GnssConfigSetActivity.java b/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/GnssConfigSetActivity.java index ca10779..4b98a11 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/GnssConfigSetActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/GnssConfigSetActivity.java @@ -416,9 +416,9 @@ public class GnssConfigSetActivity extends ColorfulActivity implements GnssConfi @Override public boolean onCreateOptionsMenu(Menu menu) { - if (sysMode == WorkModeEnum.ROVER || sysMode == WorkModeEnum.BASE) { - getMenuInflater().inflate(R.menu.menu_activity_rtk_station, menu); - } +// if (sysMode == WorkModeEnum.ROVER || sysMode == WorkModeEnum.BASE) { +// getMenuInflater().inflate(R.menu.menu_activity_rtk_station, menu); +// } return super.onCreateOptionsMenu(menu); } diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/ControlPointsNewActivity.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/ControlPointsNewActivity.java index 3260ee6..ba04f81 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/ControlPointsNewActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/ControlPointsNewActivity.java @@ -293,12 +293,6 @@ public class ControlPointsNewActivity extends ColorfulActivity { "X", "Y", "Z", getString(R.string.remarks), getString(R.string.record_time)}; -// binding.tableView.setAdapter(tableAdapter); -// binding.tableView.setTableViewListener(tableClickListener); -// binding.tableView.setSelectedColor(Color.rgb(226, 236, 215)); -// binding.tableView.getSelectionHandler().setShadowEnabled(false); -// binding.tableView.setShowCornerView(true); -// binding.tableView.setRowHeaderWidth(0); binding.bodyRv.setAdapter(controlPointLibraryAdapter); binding.bodyNameRv.setAdapter(controlPointNameLibraryAdapter); binding.bodyHsv.setScrollView(binding.headerHsv); diff --git a/app/src/main/java/com/project/survey/ui/instrument/setupstation/PointFilterActivity.java b/app/src/main/java/com/project/survey/ui/instrument/setupstation/PointFilterActivity.java index 86c0e40..951bf6d 100644 --- a/app/src/main/java/com/project/survey/ui/instrument/setupstation/PointFilterActivity.java +++ b/app/src/main/java/com/project/survey/ui/instrument/setupstation/PointFilterActivity.java @@ -21,6 +21,7 @@ public class PointFilterActivity extends BaseSurveyNewActivity { private TimePicker timePicker = null; private long startTime = -1; private long endTime = -1; + @Override public View getContentView() { binding = ActivityPointFilterBinding.inflate(getLayoutInflater()); @@ -148,6 +149,9 @@ public class PointFilterActivity extends BaseSurveyNewActivity { binding.etName.setText(IntentUtil.stringExtra(this, KEY_NAME)); binding.etCode.setText(IntentUtil.stringExtra(this, KEY_CODE)); binding.etRemarks.setText(IntentUtil.stringExtra(this, KEY_REMARKS)); + + //隐藏三点更多 + hideMore(); } @Override @@ -157,9 +161,9 @@ public class PointFilterActivity extends BaseSurveyNewActivity { if (start < 0 && end < 0) { onAllDayClicked(); } else { - if (end - start == 1000 * 60 * 60 * 24 * 7 - 2000){ + if (end - start == 1000 * 60 * 60 * 24 * 7 - 2000) { on7DayClicked(); - }else { + } else { onTodayClicked(); } }