From 802830dfb3dc81336c69f6087c131b5f9103905f Mon Sep 17 00:00:00 2001 From: huangwei <983142558@qq.com> Date: Tue, 3 Sep 2024 18:53:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=9B=E6=B5=8B=E5=AF=BC=E5=87=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/SurveyorScheduleConstants.java | 10 +- .../event/RefreshRollBackEvent.java | 10 +- ...djustAloneVerOrDistanceDialogFragment.java | 10 +- .../StationDataAdjustDialogFragment.java | 1 - .../StationDataAdjustDialogFragmentTj.java | 26 ++-- .../StationSurveyorRecordFragment.java | 16 +- .../StationSurveyorFragment.java | 8 +- ...ationSurveyorSeparateDistanceFragment.java | 8 +- ...ationSurveyorSeparateHorAngleFragment.java | 26 ++-- ...ationSurveyorSeparateVerAngleFragment.java | 8 +- ...ationSurveyorWellDistanceDataFragment.java | 10 +- .../well/StationSurveyorWellFragment.java | 8 +- ...ionSurveyorWellLevelAngleDataFragment.java | 22 +-- .../surveyor/data/CachedData.java | 20 ++- .../surveyor/method/ExportUtilsPla.java | 140 ++++++++++++------ ...odTj.java => SurveyorAdjustMethodPla.java} | 12 +- ...onstantsTj.java => StateConstantsPla.java} | 6 +- ...ateManagerTj.java => StateManagerPla.java} | 60 ++++---- .../surveyor/state/_Check2CState.java | 8 +- .../state/_CheckHalfCycleZeroState.java | 4 +- .../surveyor/state/_CheckReadDataState.java | 8 +- .../state/_CheckSingleCycleState.java | 2 +- .../surveyor/state/_CheckStationState.java | 2 +- .../state/_CheckStationSuccessState.java | 2 +- .../surveyor/state/_DoAutoSurveyorState.java | 2 +- .../surveyor/state/_DoCalAdjustState.java | 8 +- .../state/_DoCalScheduleInAllCycleState.java | 4 +- .../_DoCalScheduleInSingleCycleState.java | 6 +- .../state/_DoDeleteAllCycleState.java | 2 +- .../state/_DoDeleteCurrentCycleState.java | 2 +- .../state/_DoMove2NextValidateState.java | 2 +- .../surveyor/state/_DoMoveBackState.java | 2 +- .../surveyor/state/_DoRecordCleanState.java | 2 +- .../surveyor/state/_DoSurveyorState.java | 4 +- .../_DoWellMeasureRotationReadyState.java | 5 +- .../surveyor/state/_IdleState.java | 2 +- .../surveyor/state/_Is2CCheckReadyState.java | 2 +- .../state/_IsAllCycleCompletedState.java | 2 +- .../_IsHalfCycleZeroCheckReadyState.java | 2 +- .../state/_IsSingleCycleCompletedState.java | 2 +- .../surveyor/state/_SurveyorFailureState.java | 2 +- .../surveyor/state/__BaseState.java | 2 +- .../state/base/AbstructStateManager.java | 4 +- .../state/base/AdjustmentMeasureWhatUtil.java | 10 +- .../state/base/CheckToleranceUtil.java | 14 +- .../StateManagerHeightTraverse.java | 1 - .../StateManagerSeparateVerAngle.java | 8 +- .../separateVerAngle/_DoSurveyorStateVer.java | 4 +- .../state/wellDistance/StateManagerWell.java | 4 +- .../state/wellDistance/_DoSurveyorState.java | 4 +- .../state/wellDistance/__BaseState.java | 12 +- .../surveyor/surveyor/SurveyorAutoImpl.java | 16 +- .../surveyor/surveyor/SurveyorMock.java | 10 +- .../surveyor/surveyor/SurveyorMockAuto.java | 10 +- .../surveyor/surveyor/SurveyorSingleImpl.java | 10 +- .../controlnetwork/util/StationUtilPla.java | 6 +- control_common | 2 +- 57 files changed, 327 insertions(+), 268 deletions(-) rename app/src/main/java/com/bingce/controlnetwork/surveyor/method/{SurveyorAdjustMethodTj.java => SurveyorAdjustMethodPla.java} (98%) rename app/src/main/java/com/bingce/controlnetwork/surveyor/state/{StateConstantsTj.java => StateConstantsPla.java} (88%) rename app/src/main/java/com/bingce/controlnetwork/surveyor/state/{StateManagerTj.java => StateManagerPla.java} (78%) diff --git a/app/src/main/java/com/bingce/controlnetwork/bean/SurveyorScheduleConstants.java b/app/src/main/java/com/bingce/controlnetwork/bean/SurveyorScheduleConstants.java index 4378fd1..b10c32e 100644 --- a/app/src/main/java/com/bingce/controlnetwork/bean/SurveyorScheduleConstants.java +++ b/app/src/main/java/com/bingce/controlnetwork/bean/SurveyorScheduleConstants.java @@ -1,7 +1,7 @@ package com.bingce.controlnetwork.bean; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; public class SurveyorScheduleConstants { public static final String KEY_ID = "id"; @@ -71,13 +71,13 @@ public class SurveyorScheduleConstants { private static String getSubTypeKey(int measureWhat) { switch (measureWhat) { - case StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE: + case StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE: return STATION_TYPE_WELL_DISTANCE; - case StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR: + case StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR: return STATION_TYPE_SEPARATE_HOR_ANGLE; - case StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_VER: + case StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER: return STATION_TYPE_SEPARATE_VER_ANGLE; - case StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT: + case StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT: // case StateConstants.VALUE_MEASURE_WHAT_ANGLE: default: return ""; diff --git a/app/src/main/java/com/bingce/controlnetwork/event/RefreshRollBackEvent.java b/app/src/main/java/com/bingce/controlnetwork/event/RefreshRollBackEvent.java index 2f33674..b8cb8e8 100644 --- a/app/src/main/java/com/bingce/controlnetwork/event/RefreshRollBackEvent.java +++ b/app/src/main/java/com/bingce/controlnetwork/event/RefreshRollBackEvent.java @@ -1,7 +1,7 @@ package com.bingce.controlnetwork.event; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; /* * 刷新「回退」按钮 @@ -16,13 +16,13 @@ public class RefreshRollBackEvent { } public static int getFragmentPosition(int measureWhat, boolean isSeparateObservation) { - if (measureWhat == StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT + if (measureWhat == StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT // || measureWhat == StateConstants.VALUE_MEASURE_WHAT_ANGLE - || measureWhat == StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR) { + || measureWhat == StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR) { return 0; - } else if (measureWhat == StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_VER) { + } else if (measureWhat == StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER) { return 1; - } else if (measureWhat == StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE) { + } else if (measureWhat == StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE) { if (isSeparateObservation) { return 3; } else { diff --git a/app/src/main/java/com/bingce/controlnetwork/fragment/StationDataAdjustAloneVerOrDistanceDialogFragment.java b/app/src/main/java/com/bingce/controlnetwork/fragment/StationDataAdjustAloneVerOrDistanceDialogFragment.java index 0b897e9..36b9dc5 100644 --- a/app/src/main/java/com/bingce/controlnetwork/fragment/StationDataAdjustAloneVerOrDistanceDialogFragment.java +++ b/app/src/main/java/com/bingce/controlnetwork/fragment/StationDataAdjustAloneVerOrDistanceDialogFragment.java @@ -24,7 +24,7 @@ import com.bingce.controlapphelper.util.Tools; import com.bingce.controlnetwork.R; import com.bingce.controlnetwork.adapter.BaseAdapter; import com.bingce.controlnetwork.model.AloneAdjustItem; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.ui.vh.StationAdjustAloneDistanceViewHolder; import org.jetbrains.annotations.NotNull; @@ -67,9 +67,9 @@ public class StationDataAdjustAloneVerOrDistanceDialogFragment extends DialogFra } private String getTitle() { - if (StateConstantsTj.isMeasureVerAngle(measureWhatAloneAngleOrDistance)) { + if (StateConstantsPla.isMeasureVerAngle(measureWhatAloneAngleOrDistance)) { return "垂直角"; - } else if (StateConstantsTj.isMeasureDistance(measureWhatAloneAngleOrDistance)) { + } else if (StateConstantsPla.isMeasureDistance(measureWhatAloneAngleOrDistance)) { return "距离"; } return ""; @@ -107,9 +107,9 @@ public class StationDataAdjustAloneVerOrDistanceDialogFragment extends DialogFra } private String getShowText(AloneAdjustItem item) { - if (StateConstantsTj.isMeasureVerAngle(measureWhatAloneAngleOrDistance)) { + if (StateConstantsPla.isMeasureVerAngle(measureWhatAloneAngleOrDistance)) { return RadianMethod.dmsStringOf(item.getVerAngle()); - } else if (StateConstantsTj.isMeasureDistance(measureWhatAloneAngleOrDistance)) { + } else if (StateConstantsPla.isMeasureDistance(measureWhatAloneAngleOrDistance)) { return ExportUtils.formatDistance(item.getDistance()); } return ""; diff --git a/app/src/main/java/com/bingce/controlnetwork/fragment/StationDataAdjustDialogFragment.java b/app/src/main/java/com/bingce/controlnetwork/fragment/StationDataAdjustDialogFragment.java index 4fd517e..688fa65 100644 --- a/app/src/main/java/com/bingce/controlnetwork/fragment/StationDataAdjustDialogFragment.java +++ b/app/src/main/java/com/bingce/controlnetwork/fragment/StationDataAdjustDialogFragment.java @@ -23,7 +23,6 @@ import com.bingce.controlapphelper.surveyor.method.SurveyorAdjustMethod; import com.bingce.controlapphelper.util.SettingValueUtil; import com.bingce.controlnetwork.R; import com.bingce.controlnetwork.adapter.BaseAdapter; -import com.bingce.controlnetwork.surveyor.method.SurveyorAdjustMethodTj; import com.bingce.controlnetwork.ui.vh.StationAdjustItemViewHolder; import com.bingce.controlnetwork.ui.widget.ViewFactory; import com.bingce.utils.Util; diff --git a/app/src/main/java/com/bingce/controlnetwork/fragment/StationDataAdjustDialogFragmentTj.java b/app/src/main/java/com/bingce/controlnetwork/fragment/StationDataAdjustDialogFragmentTj.java index def41d0..4db441e 100644 --- a/app/src/main/java/com/bingce/controlnetwork/fragment/StationDataAdjustDialogFragmentTj.java +++ b/app/src/main/java/com/bingce/controlnetwork/fragment/StationDataAdjustDialogFragmentTj.java @@ -4,7 +4,6 @@ package com.bingce.controlnetwork.fragment; import android.content.Context; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.os.Parcelable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -20,12 +19,11 @@ import androidx.recyclerview.widget.RecyclerView; import com.bingce.controlapphelper.model.ViewItemType; import com.bingce.controlapphelper.surveyor.method.RadianMethod; -import com.bingce.controlapphelper.surveyor.method.SurveyorAdjustMethod; import com.bingce.controlapphelper.util.SettingValueUtil; import com.bingce.controlnetwork.R; import com.bingce.controlnetwork.adapter.BaseAdapter; -import com.bingce.controlnetwork.surveyor.method.SurveyorAdjustMethodTj; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.method.SurveyorAdjustMethodPla; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.ui.vh.StationAdjustItemViewHolder; import com.bingce.controlnetwork.ui.widget.ViewFactory; import com.bingce.utils.Util; @@ -49,7 +47,7 @@ public class StationDataAdjustDialogFragmentTj extends DialogFragment { super.onAttach(context); Bundle arguments = getArguments(); if (arguments != null) { - measureWhat = arguments.getInt(KEY_MEASURE_WHAT, StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT); + measureWhat = arguments.getInt(KEY_MEASURE_WHAT, StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT); } } @@ -72,7 +70,7 @@ public class StationDataAdjustDialogFragmentTj extends DialogFragment { public View onCreateView(@NonNull @NotNull LayoutInflater inflater, @Nullable @org.jetbrains.annotations.Nullable ViewGroup container, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) { View rootView = inflater.inflate(R.layout.fragment_station_data_adjust_dialog_layout, container, false); if (getArguments() != null) { - ArrayList items = getArguments().getParcelableArrayList(KEY_LIST); + ArrayList items = getArguments().getParcelableArrayList(KEY_LIST); boolean isShowSlop = getArguments().getBoolean(KEY_IS_SHOW_SLOP_DISTANCE, true); RecyclerView recyclerView = rootView.findViewById(R.id.list); @@ -96,23 +94,23 @@ public class StationDataAdjustDialogFragmentTj extends DialogFragment { private void initShowView(View horView, View verView, View disView) { switch (measureWhat) { - case StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE: + case StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE: horView.setVisibility(View.GONE); verView.setVisibility(View.GONE); disView.setVisibility(View.VISIBLE); break; - case StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR: + case StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR: horView.setVisibility(View.VISIBLE); verView.setVisibility(View.GONE); disView.setVisibility(View.GONE); break; - case StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_VER: + case StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER: horView.setVisibility(View.GONE); verView.setVisibility(View.VISIBLE); disView.setVisibility(View.GONE); break; // case StateConstants.VALUE_MEASURE_WHAT_ANGLE: - case StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT: + case StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT: default: horView.setVisibility(View.VISIBLE); verView.setVisibility(View.VISIBLE); @@ -122,9 +120,9 @@ public class StationDataAdjustDialogFragmentTj extends DialogFragment { } - private class _Adapter extends BaseAdapter { + private class _Adapter extends BaseAdapter { - public _Adapter(List items) { + public _Adapter(List items) { super(items); } @@ -139,7 +137,7 @@ public class StationDataAdjustDialogFragmentTj extends DialogFragment { @Override public void onBindViewHolder(@NonNull @NotNull StationAdjustItemViewHolder holder, int position) { - SurveyorAdjustMethodTj.Item item = getItem(position); + SurveyorAdjustMethodPla.Item item = getItem(position); initShowView(holder.horAngle, holder.verAngle, holder.distance); @@ -171,7 +169,7 @@ public class StationDataAdjustDialogFragmentTj extends DialogFragment { } } - public static void showDialog(int measureWhat, ArrayList finalItemList, + public static void showDialog(int measureWhat, ArrayList finalItemList, Boolean isShowSlopDistance, FragmentManager fragmentManager) { StationDataAdjustDialogFragmentTj dialogFragment = new StationDataAdjustDialogFragmentTj(); diff --git a/app/src/main/java/com/bingce/controlnetwork/fragment/StationSurveyorRecordFragment.java b/app/src/main/java/com/bingce/controlnetwork/fragment/StationSurveyorRecordFragment.java index 568cb93..7cac7c9 100644 --- a/app/src/main/java/com/bingce/controlnetwork/fragment/StationSurveyorRecordFragment.java +++ b/app/src/main/java/com/bingce/controlnetwork/fragment/StationSurveyorRecordFragment.java @@ -31,8 +31,8 @@ import com.bingce.controlnetwork.surveyor.data.IDistanceTypeChangeListener; import com.bingce.controlnetwork.surveyor.data.SurveyorData; import com.bingce.controlnetwork.surveyor.state.ISurveyState; import com.bingce.controlnetwork.surveyor.state.ISurveyorDataScrollDelegate; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; -import com.bingce.controlnetwork.surveyor.state.StateManagerTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; +import com.bingce.controlnetwork.surveyor.state.StateManagerPla; import com.bingce.utils.ThreadPoolUtil; @@ -42,7 +42,7 @@ import com.bingce.utils.ThreadPoolUtil; public class StationSurveyorRecordFragment extends BaseFragment implements IDistanceTypeChangeListener, ISurveyState { private SurveyorStationRecordsAdapter adapter = null; - private StateManagerTj stateManager; + private StateManagerPla stateManager; private RecyclerView recyclerView; private IDistanceTypeChangeListener cachedDataListener = null; private IDistanceTypeChangeListener surveyedDataListener = null; @@ -90,7 +90,7 @@ public class StationSurveyorRecordFragment extends BaseFragment boolean showSlopDistance, ICachedData cachedData, SurveyorData surveyorData, - StateManagerTj stateManager) { + StateManagerPla stateManager) { onCollectStationData(showSlopDistance, cachedData, surveyorData, stateManager); surveyState = stateManager; } @@ -105,7 +105,7 @@ public class StationSurveyorRecordFragment extends BaseFragment boolean showSlopDistance, ICachedData cachedData, SurveyorData surveyorData, - StateManagerTj stateManager) { + StateManagerPla stateManager) { this.stateManager = stateManager; cachedDataListener = cachedData; surveyedDataListener = surveyorData; @@ -156,7 +156,7 @@ public class StationSurveyorRecordFragment extends BaseFragment } ThreadPoolUtil.execute(() -> { - int measureWhat = StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT; + int measureWhat = StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT; //读取当前测站的当前测回--很重要 SurveyorScheduleRecord scheduleRecord = @@ -208,7 +208,7 @@ public class StationSurveyorRecordFragment extends BaseFragment //创建stateManager实例 SurveyorData surveyorDataSource = new SurveyorData(toleranceRecord.getSurveyorCount()); surveyorDataSource.onShowSlopDistance(surveyorStationRecord.isShowSlopDistance()); - StateManagerTj stateManager = StateManagerTj.newInstance(measureWhat, + StateManagerPla stateManager = StateManagerPla.newInstance(measureWhat, surveyorStationRecord, context, fragmentManager, @@ -245,7 +245,7 @@ public class StationSurveyorRecordFragment extends BaseFragment private interface ICollectCacheCallback { void onFailure(); - void onSuccess(boolean showSlopDistance, ICachedData cachedData, SurveyorData surveyorData, StateManagerTj stateManager); + void onSuccess(boolean showSlopDistance, ICachedData cachedData, SurveyorData surveyorData, StateManagerPla stateManager); } public void doSurveyor() { diff --git a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/StationSurveyorFragment.java b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/StationSurveyorFragment.java index ab6ac76..eda64d8 100644 --- a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/StationSurveyorFragment.java +++ b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/StationSurveyorFragment.java @@ -36,7 +36,7 @@ import com.bingce.controlnetwork.fragment.base.BaseFragment; import com.bingce.controlnetwork.newui.stationsetting.StationSettingsActivity; import com.bingce.controlnetwork.newui.stationsurveyor.ISurveyorMenuOperate; import com.bingce.controlnetwork.newui.stationsurveyor.StationSurveyorHomeActivity; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.surveyor.surveyor.TestDataSelectFragment; import com.bingce.controlnetwork.util.StationUtilPla; import com.bingce.utils.ThreadPoolUtil; @@ -192,7 +192,7 @@ public class StationSurveyorFragment extends BaseFragment implements ISurveyorMe return; } - int cycleCount = StationUtilPla.getCycleCount(StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT, + int cycleCount = StationUtilPla.getCycleCount(StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT, surveyorStationRecord, toleranceRecord); pick.setOnClickListener(v -> { ArrayList cycleList = SurveyorCycleUtil.cycleStrings(cycleCount, @@ -229,7 +229,7 @@ public class StationSurveyorFragment extends BaseFragment implements ISurveyorMe getActivity().runOnUiThread(() -> SurveyorDatabaseFactory .instance .getScheduleDataSource() - .findSchedule(SurveyorScheduleConstants.stationCurrentCycleKey(stationId(), StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT)) + .findSchedule(SurveyorScheduleConstants.stationCurrentCycleKey(stationId(), StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT)) .observe(getViewLifecycleOwner(), record -> { TextView circleText = view.findViewById(R.id.circle_text); //测回发生变化的时候，更新相应ui @@ -348,7 +348,7 @@ public class StationSurveyorFragment extends BaseFragment implements ISurveyorMe @Override public void adjust() { //测站平差，平差检测 - StationUtilPla.checkStationCanAdjust(stationId(), StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT, new StationUtilPla.ICanAdjust() { + StationUtilPla.checkStationCanAdjust(stationId(), StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT, new StationUtilPla.ICanAdjust() { @Override public void adjust(boolean isCanAdjust) { if (!isCanAdjust) { diff --git a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/separate/StationSurveyorSeparateDistanceFragment.java b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/separate/StationSurveyorSeparateDistanceFragment.java index 5473b4d..6fe8fb8 100644 --- a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/separate/StationSurveyorSeparateDistanceFragment.java +++ b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/separate/StationSurveyorSeparateDistanceFragment.java @@ -33,7 +33,7 @@ import com.bingce.controlnetwork.surveyor.data.ISurveyorData; import com.bingce.controlnetwork.surveyor.data.SurveyorData; import com.bingce.controlnetwork.surveyor.state.ISurveyState; import com.bingce.controlnetwork.surveyor.state.ISurveyorDataScrollDelegate; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.surveyor.state.wellDistance.StateManagerWell; import com.bingce.controlnetwork.surveyor.state.wellDistance._CheckToleranceState; import com.bingce.utils.ThreadPoolUtil; @@ -231,7 +231,7 @@ public class StationSurveyorSeparateDistanceFragment extends BaseFragmentLazy //如果是联系列表收集的是钢丝 cachedDataPointType = CachedDataPointType.STEEL_POINT; } - CachedData cachedData = CachedData.newInstance(StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE, cachedDataPointType, stationRecord.isAutoClose(), + CachedData cachedData = CachedData.newInstance(StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE, cachedDataPointType, stationRecord.isAutoClose(), stationRecord.isLeftAndRightSurveyor(), stationId, toleranceRecord); if (cachedData == null) { @@ -298,7 +298,7 @@ public class StationSurveyorSeparateDistanceFragment extends BaseFragmentLazy if (isConnection(surveyorStationRecord.projectType)) { cachedDataPointType = CachedDataPointType.STEEL_POINT; } - CachedData cachedData = CachedData.newInstance(StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT, cachedDataPointType, surveyorStationRecord.isAutoClose(), + CachedData cachedData = CachedData.newInstance(StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT, cachedDataPointType, surveyorStationRecord.isAutoClose(), surveyorStationRecord.isLeftAndRightSurveyor(), stationId, toleranceRecord); if (cachedData != null) { @@ -435,7 +435,7 @@ public class StationSurveyorSeparateDistanceFragment extends BaseFragmentLazy @Override public int getMeasureWhat() { - return StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE; + return StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE; } @Override diff --git a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/separate/StationSurveyorSeparateHorAngleFragment.java b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/separate/StationSurveyorSeparateHorAngleFragment.java index 7e951bc..4052963 100644 --- a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/separate/StationSurveyorSeparateHorAngleFragment.java +++ b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/separate/StationSurveyorSeparateHorAngleFragment.java @@ -37,8 +37,8 @@ import com.bingce.controlnetwork.surveyor.data.ISurveyorData; import com.bingce.controlnetwork.surveyor.data.SurveyorData; import com.bingce.controlnetwork.surveyor.state.ISurveyState; import com.bingce.controlnetwork.surveyor.state.ISurveyorDataScrollDelegate; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; -import com.bingce.controlnetwork.surveyor.state.StateManagerTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; +import com.bingce.controlnetwork.surveyor.state.StateManagerPla; import com.bingce.controlnetwork.surveyor.state._IsSingleCycleCompletedState; import com.bingce.controlnetwork.util.StationUtilPla; import com.bingce.utils.ThreadPoolUtil; @@ -54,7 +54,7 @@ import blankj.utilcode.util.ToastUtils; public class StationSurveyorSeparateHorAngleFragment extends BaseFragment implements IDistanceTypeChangeListener, ISurveyState, IMeasureOperate { private StationSurveyorSepatateAdapter adapter = null; - private StateManagerTj stateManager; + private StateManagerPla stateManager; private RecyclerView recyclerView; private ICachedData cachedData = null; @@ -107,11 +107,11 @@ public class StationSurveyorSeparateHorAngleFragment extends BaseFragment new ICollectCacheCallback() { @Override public void onFailure() { - //TODO 收集测站测量信息失败，提示 + //收集测站测量信息失败，提示 } @Override - public void onSuccess(boolean showSlopDistance, ICachedData cachedData, SurveyorData surveyorData, StateManagerTj stateManager) { + public void onSuccess(boolean showSlopDistance, ICachedData cachedData, SurveyorData surveyorData, StateManagerPla stateManager) { onCollectStationData(showSlopDistance, cachedData, surveyorData, stateManager); surveyState = stateManager; } @@ -127,7 +127,7 @@ public class StationSurveyorSeparateHorAngleFragment extends BaseFragment boolean showSlopDistance, ICachedData cachedData, SurveyorData surveyorData, - StateManagerTj stateManager) { + StateManagerPla stateManager) { this.stateManager = stateManager; this.cachedData = cachedData; surveyedData = surveyorData; @@ -187,7 +187,7 @@ public class StationSurveyorSeparateHorAngleFragment extends BaseFragment SurveyorDatabaseFactory .instance .getScheduleDataSource() - .findScheduleSync(SurveyorScheduleConstants.stationCurrentCycleKey(stationId, StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR)); + .findScheduleSync(SurveyorScheduleConstants.stationCurrentCycleKey(stationId, StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR)); int defaultCycle = scheduleRecord == null ? 0 : DigitalUtil.string2Int(scheduleRecord.getStatue(), 0); //加载测站信息 @@ -222,7 +222,7 @@ public class StationSurveyorSeparateHorAngleFragment extends BaseFragment //创建缓存数据 CachedData cachedData = - CachedData.newInstance(StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR, CachedDataPointType.ALL_POINT, surveyorStationRecord.isAutoClose(), + CachedData.newInstance(StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR, CachedDataPointType.ALL_POINT, surveyorStationRecord.isAutoClose(), surveyorStationRecord.isLeftAndRightSurveyor(), stationId, toleranceRecord); if (cachedData == null) { @@ -241,8 +241,8 @@ public class StationSurveyorSeparateHorAngleFragment extends BaseFragment SurveyorData surveyorDataSource = new SurveyorData(toleranceRecord.getSurveyorCount()); surveyorDataSource.onShowSlopDistance(surveyorStationRecord.isShowSlopDistance()); - StateManagerTj stateManager = StateManagerTj.newInstance( - StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR, + StateManagerPla stateManager = StateManagerPla.newInstance( + StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR, surveyorStationRecord, context, fragmentManager, @@ -268,7 +268,7 @@ public class StationSurveyorSeparateHorAngleFragment extends BaseFragment public interface ICollectCacheCallback { void onFailure(); - void onSuccess(boolean showSlopDistance, ICachedData cachedData, SurveyorData surveyorData, StateManagerTj stateManager); + void onSuccess(boolean showSlopDistance, ICachedData cachedData, SurveyorData surveyorData, StateManagerPla stateManager); } @Override @@ -360,7 +360,7 @@ public class StationSurveyorSeparateHorAngleFragment extends BaseFragment @Override public int getMeasureWhat() { - return StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR; + return StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR; } @Override @@ -467,7 +467,7 @@ public class StationSurveyorSeparateHorAngleFragment extends BaseFragment } private String getHorCycleKey() { - return SurveyorScheduleConstants.stationCurrentCycleKey(stationId(), StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR); + return SurveyorScheduleConstants.stationCurrentCycleKey(stationId(), StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR); } } diff --git a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/separate/StationSurveyorSeparateVerAngleFragment.java b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/separate/StationSurveyorSeparateVerAngleFragment.java index 3db9096..b7c26c3 100644 --- a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/separate/StationSurveyorSeparateVerAngleFragment.java +++ b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/separate/StationSurveyorSeparateVerAngleFragment.java @@ -33,7 +33,7 @@ import com.bingce.controlnetwork.surveyor.data.ISurveyorData; import com.bingce.controlnetwork.surveyor.data.SurveyorData; import com.bingce.controlnetwork.surveyor.state.ISurveyState; import com.bingce.controlnetwork.surveyor.state.ISurveyorDataScrollDelegate; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.surveyor.state.separateVerAngle.StateManagerSeparateVerAngle; import com.bingce.utils.ThreadPoolUtil; @@ -213,7 +213,7 @@ public class StationSurveyorSeparateVerAngleFragment extends BaseFragmentLazy } //创建缓存数据 CachedData cachedData = - CachedData.newInstance(StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_VER, CachedDataPointType.ALONE_MEASURE_VER_ANGLE_POINT, surveyorStationRecord.isAutoClose(), + CachedData.newInstance(StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER, CachedDataPointType.ALONE_MEASURE_VER_ANGLE_POINT, surveyorStationRecord.isAutoClose(), surveyorStationRecord.isLeftAndRightSurveyor(), stationId, toleranceRecord); if (cachedData == null) { @@ -244,7 +244,7 @@ public class StationSurveyorSeparateVerAngleFragment extends BaseFragmentLazy surveyorDataSource.setLeftOrRight(verFindTarget.getLeftOrRight()); StateManagerSeparateVerAngle stateManager = StateManagerSeparateVerAngle.newInstance( - StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_VER, + StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER, surveyorStationRecord, context, fragmentManager, @@ -365,7 +365,7 @@ public class StationSurveyorSeparateVerAngleFragment extends BaseFragmentLazy @Override public int getMeasureWhat() { - return StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_VER; + return StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER; } @Override diff --git a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/well/StationSurveyorWellDistanceDataFragment.java b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/well/StationSurveyorWellDistanceDataFragment.java index 48bad39..edc65a4 100644 --- a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/well/StationSurveyorWellDistanceDataFragment.java +++ b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/well/StationSurveyorWellDistanceDataFragment.java @@ -36,7 +36,7 @@ import com.bingce.controlnetwork.surveyor.data.ISurveyorData; import com.bingce.controlnetwork.surveyor.data.SurveyorData; import com.bingce.controlnetwork.surveyor.state.ISurveyState; import com.bingce.controlnetwork.surveyor.state.ISurveyorDataScrollDelegate; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.surveyor.state.wellDistance.StateManagerWell; import com.bingce.controlnetwork.surveyor.state.wellDistance._CheckToleranceState; import com.bingce.utils.ThreadPoolUtil; @@ -225,7 +225,7 @@ public class StationSurveyorWellDistanceDataFragment extends BaseFragmentLazy SurveyorDatabaseFactory .instance .getScheduleDataSource() - .findScheduleSync(SurveyorScheduleConstants.stationCurrentCycleKey(stationId, StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE)); + .findScheduleSync(SurveyorScheduleConstants.stationCurrentCycleKey(stationId, StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE)); int defaultCycle = scheduleRecord == null ? 0 : DigitalUtil.string2Int(scheduleRecord.getStatue(), 0); //加载测站信息 @@ -257,7 +257,7 @@ public class StationSurveyorWellDistanceDataFragment extends BaseFragmentLazy if (isConnection(surveyorStationRecord.projectType)) { cachedDataPointType = CachedDataPointType.STEEL_POINT; } - CachedData cachedData = CachedData.newInstance(StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT, cachedDataPointType, surveyorStationRecord.isAutoClose(), + CachedData cachedData = CachedData.newInstance(StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT, cachedDataPointType, surveyorStationRecord.isAutoClose(), surveyorStationRecord.isLeftAndRightSurveyor(), stationId, toleranceRecord); if (cachedData == null) { @@ -323,7 +323,7 @@ public class StationSurveyorWellDistanceDataFragment extends BaseFragmentLazy if (isConnection(surveyorStationRecord.projectType)) { cachedDataPointType = CachedDataPointType.STEEL_POINT; } - CachedData cachedData = CachedData.newInstance(StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT, cachedDataPointType, surveyorStationRecord.isAutoClose(), + CachedData cachedData = CachedData.newInstance(StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT, cachedDataPointType, surveyorStationRecord.isAutoClose(), surveyorStationRecord.isLeftAndRightSurveyor(), stationId, toleranceRecord); if (cachedData != null) { @@ -461,7 +461,7 @@ public class StationSurveyorWellDistanceDataFragment extends BaseFragmentLazy @Override public int getMeasureWhat() { - return StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE; + return StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE; } @Override diff --git a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/well/StationSurveyorWellFragment.java b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/well/StationSurveyorWellFragment.java index 9504c0e..570afae 100644 --- a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/well/StationSurveyorWellFragment.java +++ b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/well/StationSurveyorWellFragment.java @@ -40,7 +40,7 @@ import com.bingce.controlnetwork.fragment.stationsurvey.IMeasureOperate; import com.bingce.controlnetwork.newui.stationsetting.StationSettingsActivity; import com.bingce.controlnetwork.newui.stationsurveyor.ISurveyorMenuOperate; import com.bingce.controlnetwork.newui.stationsurveyor.StationSurveyorHomeActivity; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.surveyor.surveyor.TestDataSelectFragment; import com.bingce.controlnetwork.util.StationSettingCheckUtil; import com.bingce.controlnetwork.util.StationUtilPla; @@ -206,7 +206,7 @@ public class StationSurveyorWellFragment extends BaseFragment implements ISurvey return; } - int cycleCount = StationUtilPla.getCycleCount(StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE, surveyorStationRecord, toleranceRecord); + int cycleCount = StationUtilPla.getCycleCount(StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE, surveyorStationRecord, toleranceRecord); pick.setOnClickListener(v -> { //测回的点击事件 @@ -317,9 +317,9 @@ public class StationSurveyorWellFragment extends BaseFragment implements ISurvey int currentItem = vp.getCurrentItem(); String scheduleId; if (currentItem == POSITION_DIRECTION_MEASURE) { - scheduleId = SurveyorScheduleConstants.stationCurrentCycleKey(stationId(), StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT); + scheduleId = SurveyorScheduleConstants.stationCurrentCycleKey(stationId(), StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT); } else { - scheduleId = SurveyorScheduleConstants.stationCurrentCycleKey(stationId(), StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE); + scheduleId = SurveyorScheduleConstants.stationCurrentCycleKey(stationId(), StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE); } return scheduleId; } diff --git a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/well/StationSurveyorWellLevelAngleDataFragment.java b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/well/StationSurveyorWellLevelAngleDataFragment.java index df82a5e..beb1606 100644 --- a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/well/StationSurveyorWellLevelAngleDataFragment.java +++ b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/well/StationSurveyorWellLevelAngleDataFragment.java @@ -33,8 +33,8 @@ import com.bingce.controlnetwork.surveyor.data.ISurveyorData; import com.bingce.controlnetwork.surveyor.data.SurveyorData; import com.bingce.controlnetwork.surveyor.state.ISurveyState; import com.bingce.controlnetwork.surveyor.state.ISurveyorDataScrollDelegate; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; -import com.bingce.controlnetwork.surveyor.state.StateManagerTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; +import com.bingce.controlnetwork.surveyor.state.StateManagerPla; import com.bingce.controlnetwork.surveyor.state._IsSingleCycleCompletedState; import com.bingce.controlnetwork.util.StationUtilPla; import com.bingce.utils.ThreadPoolUtil; @@ -47,7 +47,7 @@ import blankj.utilcode.util.ToastUtils; public class StationSurveyorWellLevelAngleDataFragment extends BaseFragment implements IDistanceTypeChangeListener, ISurveyState, IMeasureOperate { private SurveyorStationRecordsWellAdapter adapter = null; - private StateManagerTj stateManager; + private StateManagerPla stateManager; private RecyclerView recyclerView; private ICachedData cachedData = null; private ISurveyorData surveyedData = null; @@ -97,7 +97,7 @@ public class StationSurveyorWellLevelAngleDataFragment extends BaseFragment } @Override - public void onSuccess(boolean showSlopDistance, ICachedData cachedData, SurveyorData surveyorData, StateManagerTj stateManager) { + public void onSuccess(boolean showSlopDistance, ICachedData cachedData, SurveyorData surveyorData, StateManagerPla stateManager) { onCollectStationData(showSlopDistance, cachedData, surveyorData, stateManager); surveyState = stateManager; } @@ -113,7 +113,7 @@ public class StationSurveyorWellLevelAngleDataFragment extends BaseFragment boolean showSlopDistance, ICachedData cachedData, SurveyorData surveyorData, - StateManagerTj stateManager) { + StateManagerPla stateManager) { this.stateManager = stateManager; this.cachedData = cachedData; surveyedData = surveyorData; @@ -170,7 +170,7 @@ public class StationSurveyorWellLevelAngleDataFragment extends BaseFragment SurveyorDatabaseFactory .instance .getScheduleDataSource() - .findScheduleSync(SurveyorScheduleConstants.stationCurrentCycleKey(stationId, StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT)); + .findScheduleSync(SurveyorScheduleConstants.stationCurrentCycleKey(stationId, StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT)); int defaultCycle = scheduleRecord == null ? 0 : DigitalUtil.string2Int(scheduleRecord.getStatue(), 0); //加载测站信息 @@ -199,7 +199,7 @@ public class StationSurveyorWellLevelAngleDataFragment extends BaseFragment } //创建缓存数据 CachedData cachedData = - CachedData.newInstance(StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT, CachedDataPointType.ALL_POINT, surveyorStationRecord.isAutoClose(), + CachedData.newInstance(StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT, CachedDataPointType.ALL_POINT, surveyorStationRecord.isAutoClose(), surveyorStationRecord.isLeftAndRightSurveyor(), stationId, toleranceRecord); if (cachedData == null) { @@ -218,8 +218,8 @@ public class StationSurveyorWellLevelAngleDataFragment extends BaseFragment SurveyorData surveyorDataSource = new SurveyorData(toleranceRecord.getSurveyorCount()); surveyorDataSource.onShowSlopDistance(surveyorStationRecord.isShowSlopDistance()); - StateManagerTj stateManager = StateManagerTj.newInstance( - StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT, + StateManagerPla stateManager = StateManagerPla.newInstance( + StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT, surveyorStationRecord, context, fragmentManager, @@ -240,7 +240,7 @@ public class StationSurveyorWellLevelAngleDataFragment extends BaseFragment public interface ICollectCacheCallback { void onFailure(); - void onSuccess(boolean showSlopDistance, ICachedData cachedData, SurveyorData surveyorData, StateManagerTj stateManager); + void onSuccess(boolean showSlopDistance, ICachedData cachedData, SurveyorData surveyorData, StateManagerPla stateManager); } @Override @@ -331,7 +331,7 @@ public class StationSurveyorWellLevelAngleDataFragment extends BaseFragment @Override public int getMeasureWhat() { - return StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT; + return StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT; } @Override diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/data/CachedData.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/data/CachedData.java index 70e9a7e..e006896 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/data/CachedData.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/data/CachedData.java @@ -26,7 +26,7 @@ import com.bingce.controlapphelper.model.DataCategory; import com.bingce.controlapphelper.model.IAdapter; import com.bingce.controlapphelper.model.LeftOrRight; import com.bingce.controlnetwork.surveyor.method.DeviationValueOfRadianMethod; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.util.IdUtil; import com.bingce.controlnetwork.util.StationUtilPla; import com.bingce.utils.ThreadPoolUtil; @@ -680,7 +680,7 @@ public class CachedData implements ICachedData, IStationPointRecordCollect { int size() { int extra = 0; - if (!(StateConstantsTj.isMeasureVerAngle(measureWhat) || StateConstantsTj.isMeasureDistance(measureWhat))) { + if (!(StateConstantsPla.isMeasureVerAngle(measureWhat) || StateConstantsPla.isMeasureDistance(measureWhat))) { if (autoClose) { extra = 1; } @@ -801,7 +801,7 @@ public class CachedData implements ICachedData, IStationPointRecordCollect { public SurveyorPoint targetItem(int cycleIndex, int itemIndex) { int originSize = originSize(); //当是分开观测垂直角观察幕刃 - if (StateConstantsTj.needLeftRight(measureWhat) + if (StateConstantsPla.needLeftRight(measureWhat) && leftRight && cycleIndex % 2 == 1) { //当开启左右角测量且是偶数测回的时候 //右角测量 @@ -843,6 +843,18 @@ public class CachedData implements ICachedData, IStationPointRecordCollect { } } + /* + * 收集测站信息，创建测量数据缓存实例 + * 会阻塞线程 + * */ + @WorkerThread + public static CachedData newInstance(boolean autoClose, + boolean leftRight, String stationId, + ToleranceDetailRecord toleranceRecord) { + return newInstance(StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT, CachedDataPointType.ALL_POINT, + autoClose, leftRight, stationId, toleranceRecord); + } + /* * 收集测站信息，创建测量数据缓存实例 * 会阻塞线程 @@ -920,7 +932,7 @@ public class CachedData implements ICachedData, IStationPointRecordCollect { surveyorRecordDataSource, sdAngleRecordDataSource, surveyorRecordMap, sdAngleRecordMap); } //添加闭合点数据 - if (StateConstantsTj.isZeroMeasureWhat(measureWhat) && !itemListWithoutClosedItem.isEmpty() && autoClose) { + if (StateConstantsPla.isZeroMeasureWhat(measureWhat) && !itemListWithoutClosedItem.isEmpty() && autoClose) { SurveyorPoint item = itemListWithoutClosedItem.get(0); _cacheRecord(measureWhat, SurveyorPoint.pointClosedId(item.getPointId()), stationId, cycleIndex, surveyorRecordDataSource, sdAngleRecordDataSource, surveyorRecordMap, sdAngleRecordMap); diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/method/ExportUtilsPla.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/method/ExportUtilsPla.java index 479e3ad..46841f4 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/method/ExportUtilsPla.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/method/ExportUtilsPla.java @@ -6,7 +6,6 @@ import android.text.TextUtils; import androidx.annotation.WorkerThread; -import com.bingce.controlapphelper.datasource.database.ProjectType; import com.bingce.controlapphelper.datasource.database.ProjectTypeValue; import com.bingce.controlapphelper.datasource.database.SurveyorDatabaseFactory; import com.bingce.controlapphelper.datasource.database.line.ILineRecordDataSource; @@ -23,20 +22,18 @@ import com.bingce.controlapphelper.datasource.database.tolerance.detail.IToleran import com.bingce.controlapphelper.datasource.database.tolerance.detail.ToleranceDetailRecord; import com.bingce.controlapphelper.datasource.database.tolerance.group.ToleranceGroupRecord; import com.bingce.controlapphelper.datasource.database.tolerance.level.ToleranceLevelRecord; -import com.bingce.controlapphelper.surveyor.data.CachedData; -import com.bingce.controlapphelper.surveyor.data.CachedDataAloneDistance; import com.bingce.controlapphelper.surveyor.method.ExportStationMethod; -import com.bingce.controlapphelper.surveyor.method.ExportUtils; -import com.bingce.controlapphelper.surveyor.method.SurveyorAdjustMethod; import com.bingce.controlapphelper.util.Tools; import com.bingce.controlnetwork.App; import com.bingce.controlnetwork.R; +import com.bingce.controlnetwork.model.AloneAdjustItem; import com.bingce.controlnetwork.newui.configfragment.SelectExportType; +import com.bingce.controlnetwork.surveyor.data.CachedData; +import com.bingce.controlnetwork.surveyor.data.CachedDataPointType; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.util.CheckRegUtil; import com.bingce.utils.DateUtils; -import com.bingce.utils.RegisterUtil; import com.bingce.utils.Util; -import com.bingce.utils.VipManager; import com.bingce.zip.ZipUtil; import org.jetbrains.annotations.NotNull; @@ -236,7 +233,7 @@ public class ExportUtilsPla { ExportStationMethod.save(" ", periodFolder, "边长.TXT"); } - exportProjectAndControlPoint(project,projectCachedDir); + exportProjectAndControlPoint(project, projectCachedDir); } } @@ -355,15 +352,44 @@ public class ExportUtilsPla { private static void collectCustomTj61365(String stationName, SurveyorStationRecord stationRecord, ToleranceDetailRecord toleranceRecord, StringBuilder horSbTianjinOne, StringBuilder verSbTianjinOne, StringBuilder disSbTianjinOne) { -// if (stationRecord.isSeparateObservation()) { -// collectAloneHorAngleTjUnique(stationName, stationRecord, toleranceRecord, horSbTianjinOne); -// } else { -// collectCombineAngleDistanceTjUnique(stationName, stationRecord, toleranceRecord, horSbTianjinOne, verSbTianjinOne, disSbTianjinOne); -// } - collectCombineAngleDistanceTjUnique(stationName, stationRecord, toleranceRecord, horSbTianjinOne, verSbTianjinOne, disSbTianjinOne); + if (stationRecord.isSeparateObservation()) { + collectAloneHorAngleTjUnique(stationName, stationRecord, toleranceRecord, horSbTianjinOne); + } else { + collectCombineAngleDistanceTjUnique(stationName, stationRecord, toleranceRecord, horSbTianjinOne, verSbTianjinOne, disSbTianjinOne); + } + collectAloneVerAngleTjUnique(stationName, stationRecord, toleranceRecord, verSbTianjinOne); collectAloneDistanceTjUnique(stationName, stationRecord, toleranceRecord, disSbTianjinOne); } + private static void collectAloneHorAngleTjUnique(String stationName, SurveyorStationRecord stationRecord, + ToleranceDetailRecord toleranceRecord, StringBuilder horSbTianjinOne) { + SurveyorAdjustMethodPla.AdjustResult adjustResultHorAngle = SurveyorAdjustMethodPla.calStationAdjust(StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR, stationRecord, + CachedData.newInstance( + StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR, + CachedDataPointType.ALL_POINT, + stationRecord.isAutoClose(), + stationRecord.isLeftAndRightSurveyor(), + stationRecord.getId(), + toleranceRecord + )); + + if (adjustResultHorAngle.errorString == null || adjustResultHorAngle.errorString.isEmpty()) { + //水平角 + horSbTianjinOne.append(stationName).append(SPACE).append(formatHeight(Double.parseDouble(stationRecord.getInstrumentHeightDeal()))).append(SPACE); + //遍历测站测点 + for (int i = 0; i < adjustResultHorAngle.result.size(); i++) { + SurveyorAdjustMethodPla.Item item = adjustResultHorAngle.result.get(i); + //水平角 + String exportHorAngle = ExportStationMethod.radianToDmsForTj61365(item.getHorAngle(), true); + if (i != 0) { + horSbTianjinOne.append(SPACE).append(SPACE); + } + horSbTianjinOne.append(item.getPointName()).append(SPACE).append(exportHorAngle).append(SPACE).append(formatHeight(Double.parseDouble(item.getPrismHeightActual()))); + horSbTianjinOne.append(NEW_LINE); + } + } + } + /** * 收集合并观测的水平角，垂直角和距离 * 距离可能存在单独测距 @@ -377,7 +403,7 @@ public class ExportUtilsPla { stationRecord.getId(), toleranceRecord); //测距测角的平差结果 - SurveyorAdjustMethod.AdjustResult adjustResult = SurveyorAdjustMethod.calStationAdjust(stationRecord, cachedData); + SurveyorAdjustMethodPla.AdjustResult adjustResult = SurveyorAdjustMethodPla.calStationAdjust(stationRecord, cachedData); if (adjustResult.errorString == null || adjustResult.errorString.isEmpty()) { //水平角 horSbTianjinOne.append(stationName).append(SPACE).append(formatHeight(Double.parseDouble(stationRecord.getInstrumentHeight()))).append(SPACE); @@ -386,19 +412,19 @@ public class ExportUtilsPla { int verEverySurveyorPoint = 0; //遍历测站测点 for (int i = 0; i < adjustResult.result.size(); i++) { - SurveyorAdjustMethod.Item item = adjustResult.result.get(i); + SurveyorAdjustMethodPla.Item item = adjustResult.result.get(i); //水平角 String exportHorAngle = ExportStationMethod.radianToDmsForTj61365(item.getHorAngle(), true); if (i != 0) { horSbTianjinOne.append(SPACE).append(SPACE); } - horSbTianjinOne.append(item.getPointName()).append(SPACE).append(exportHorAngle).append(SPACE).append(formatHeight(item.getPrismHeight())); + horSbTianjinOne.append(item.getPointName()).append(SPACE).append(exportHorAngle).append(SPACE).append(formatHeight(Double.parseDouble(item.getPrismHeight()))); horSbTianjinOne.append(NEW_LINE); verEverySurveyorPoint++; String exportVerAngle = ExportStationMethod.radianToDmsForTj61365(item.getVerAngle(), false); verSbTianjinEveryStation.append(item.getPointName()).append(SPACE).append(exportVerAngle).append(SPACE).append(formatHeight(Double.parseDouble(stationRecord.getInstrumentHeight()))) - .append(SPACE).append(formatHeight(item.getPrismHeight())); + .append(SPACE).append(formatHeight(Double.parseDouble(item.getPrismHeight()))); verSbTianjinEveryStation.append(NEW_LINE); double distance = item.getDistance(); @@ -416,29 +442,53 @@ public class ExportUtilsPla { } } + private static void collectAloneVerAngleTjUnique(String stationName, SurveyorStationRecord stationRecord, + ToleranceDetailRecord toleranceRecord, StringBuilder verSbTianjinOne) { + List adjustResult = SurveyorAdjustMethodPla.calAloneVer(stationRecord.getId(), + CachedData.newInstance( + StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER, + CachedDataPointType.ALONE_MEASURE_VER_ANGLE_POINT, + stationRecord.isAutoClose(), + stationRecord.isLeftAndRightSurveyor(), + stationRecord.getId(), + toleranceRecord + ), false); + + if (!adjustResult.isEmpty()) { + verSbTianjinOne.append(stationName).append(SPACE).append(adjustResult.size()).append(NEW_LINE); + //遍历测站测点 + for (int i = 0; i < adjustResult.size(); i++) { + AloneAdjustItem item = adjustResult.get(i); + String exportVerAngle = ExportStationMethod.radianToDmsForTj61365(item.getVerAngle(), false); + verSbTianjinOne.append(item.getPointName()).append(SPACE).append(exportVerAngle).append(SPACE) + .append(formatHeight(Double.parseDouble(stationRecord.getInstrumentHeightDeal()))).append(SPACE).append(formatHeight(Double.parseDouble(item.getPrismHeightActual()))); + verSbTianjinOne.append(NEW_LINE); + } + } + + } + /** * 收集天津边长数据 * 合并观测和分开观测的单独测距 */ private static void collectAloneDistanceTjUnique(String stationName, SurveyorStationRecord stationRecord, ToleranceDetailRecord toleranceRecord, StringBuilder disSbTianjinOne) { - SurveyorAdjustMethod.calAloneDistance(stationRecord.getId(), - CachedDataAloneDistance.newInstance(stationRecord.getId()), new SurveyorAdjustMethod.ICallback() { - @Override - public void onGet(ArrayList adjustResult, Boolean isShowSlopDistance) { - if (!adjustResult.isEmpty()) { - for (SurveyorAdjustMethod.Item item : adjustResult) { - appendAloneDistance(disSbTianjinOne, stationName, item.getPointName(), item.getDistance(), - Double.parseDouble(stationRecord.getInstrumentHeightDeal()), String.valueOf(item.getPrismHeight())); - } - } - } - - @Override - public void onFailure(String error) { + List adjustResult = SurveyorAdjustMethodPla.calAloneDistance(stationRecord.getId(), + CachedData.newInstance( + StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE, + CachedDataPointType.ALONE_MEASURE_DISTANCE_POINT, + stationRecord.isAutoClose(), + stationRecord.isLeftAndRightSurveyor(), + stationRecord.getId(), + toleranceRecord + ), false); - } - }); + if (!adjustResult.isEmpty()) { + for (AloneAdjustItem item : adjustResult) { + appendAloneDistance(disSbTianjinOne, stationName, item.getPointName(), item.getDistance(), Double.parseDouble(stationRecord.getInstrumentHeightDeal()), item.getPrismHeightActual()); + } + } } private static void appendAloneDistance(StringBuilder disSbTianjinOne, String stationName, String pointName, double distance, @@ -506,10 +556,10 @@ public class ExportUtilsPla { cachedData.onShowSlopDistance(false);//平距 //计算平差数据 - SurveyorAdjustMethod.AdjustResult adjustResult = SurveyorAdjustMethod.calStationAdjust(stationRecord, cachedData); + SurveyorAdjustMethodPla.AdjustResult adjustResult = SurveyorAdjustMethodPla.calStationAdjust(stationRecord, cachedData); if (TextUtils.isEmpty(adjustResult.errorString)) { ksStringBuilder.append(stationName).append(NEW_LINE); - for (SurveyorAdjustMethod.Item item : adjustResult.result) { + for (SurveyorAdjustMethodPla.Item item : adjustResult.result) { ksStringBuilder .append(item.getPointName()) .append(",L,") @@ -517,7 +567,7 @@ public class ExportUtilsPla { .append(NEW_LINE); } - for (SurveyorAdjustMethod.Item item : adjustResult.result) { + for (SurveyorAdjustMethodPla.Item item : adjustResult.result) { //这里兼容下钢丝测距的距离 String pointName = item.getPointName(); @@ -668,9 +718,9 @@ public class ExportUtilsPla { cachedData.onShowSlopDistance(false); //计算平差数据 - SurveyorAdjustMethod.AdjustResult adjustResult = SurveyorAdjustMethod.calStationAdjust(stationRecord, cachedData); + SurveyorAdjustMethodPla.AdjustResult adjustResult = SurveyorAdjustMethodPla.calStationAdjust(stationRecord, cachedData); if (TextUtils.isEmpty(adjustResult.errorString)) { - for (SurveyorAdjustMethod.Item item : adjustResult.result) { + for (SurveyorAdjustMethodPla.Item item : adjustResult.result) { //这里兼容下钢丝测距的距离 String pointName = item.getPointName(); @@ -859,7 +909,7 @@ public class ExportUtilsPla { } StringBuilder stationSb = new StringBuilder(); - Map> tempDataMap = new LinkedHashMap<>(); + Map> tempDataMap = new LinkedHashMap<>(); for (Map.Entry stationEntry : cycle.stationMap.entrySet()) { String stationId = stationEntry.getValue().stationId; @@ -878,7 +928,7 @@ public class ExportUtilsPla { cachedData.onShowSlopDistance(false); //计算平差数据 - SurveyorAdjustMethod.AdjustResult adjustResult = SurveyorAdjustMethod.calStationAdjust(stationRecord, cachedData); + SurveyorAdjustMethodPla.AdjustResult adjustResult = SurveyorAdjustMethodPla.calStationAdjust(stationRecord, cachedData); if (TextUtils.isEmpty(adjustResult.errorString)) { stationSb.append(cycle.stationMap.keySet().size()); stationSb.append(NEW_LINE); @@ -886,7 +936,7 @@ public class ExportUtilsPla { stationSb.append(stationName).append(",").append(adjustResult.result.size()).append(",").append(NEW_LINE); stationSb.append("照准点").append(NEW_LINE); - for (SurveyorAdjustMethod.Item item : adjustResult.result) { + for (SurveyorAdjustMethodPla.Item item : adjustResult.result) { //这里兼容下钢丝测距的距离 String pointName = item.getPointName(); @@ -1319,16 +1369,16 @@ public class ExportUtilsPla { final double[] verAngle = new double[1]; final double[] distance = new double[1]; - SurveyorAdjustMethod.AdjustResult adjustResult = SurveyorAdjustMethod.calStationAdjust(stationRecord, cachedData); + SurveyorAdjustMethodPla.AdjustResult adjustResult = SurveyorAdjustMethodPla.calStationAdjust(stationRecord, cachedData); if (TextUtils.isEmpty(adjustResult.errorString)) { //展示结果数据 //检测归零值是否为负，如果是需要+2PI - for (SurveyorAdjustMethod.Item item : adjustResult.result) { + for (SurveyorAdjustMethodPla.Item item : adjustResult.result) { if (item.getHorAngle() < 0) { item.setHorAngle(Math.PI * 2 + item.getHorAngle()); } } - SurveyorAdjustMethod.Item item = adjustResult.result.get(adjustResult.result.size() - 1); + SurveyorAdjustMethodPla.Item item = adjustResult.result.get(adjustResult.result.size() - 1); horAngle[0] = item.getHorAngle(); verAngle[0] = item.getVerAngle(); distance[0] = item.getDistance(); diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/method/SurveyorAdjustMethodTj.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/method/SurveyorAdjustMethodPla.java similarity index 98% rename from app/src/main/java/com/bingce/controlnetwork/surveyor/method/SurveyorAdjustMethodTj.java rename to app/src/main/java/com/bingce/controlnetwork/surveyor/method/SurveyorAdjustMethodPla.java index 7bc8279..9f1e32a 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/method/SurveyorAdjustMethodTj.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/method/SurveyorAdjustMethodPla.java @@ -26,7 +26,7 @@ import com.bingce.controlnetwork.model.AloneAdjustItem; import com.bingce.controlnetwork.surveyor.data.FaultTolerantData; import com.bingce.controlnetwork.surveyor.data.ICachedData; import com.bingce.controlnetwork.surveyor.method.model.CacheResult; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.surveyor.state.base.CheckToleranceUtil; import com.bingce.controlnetwork.util.IdUtil; import com.bingce.controlnetwork.util.StationUtilPla; @@ -39,10 +39,15 @@ import java.util.Map; import blankj.utilcode.util.ToastUtils; -public class SurveyorAdjustMethodTj { +public class SurveyorAdjustMethodPla { private final static int ERROR_CODE_LEFT_RIGHT_COUNT_NOT_EQUAL = 1; private final static int ERROR_CODE_ZERO_VALUE_COUNT_NOT_EQUAL = ERROR_CODE_LEFT_RIGHT_COUNT_NOT_EQUAL + 1; + @WorkerThread + public static AdjustResult calStationAdjust(SurveyorStationRecord stationRecord, ICachedData cachedData) { + return calStationAdjust(StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT, stationRecord, cachedData); + } + @WorkerThread public static AdjustResult calStationAdjust(int measureWhat, SurveyorStationRecord stationRecord, ICachedData cachedData) { if (stationRecord == null) { @@ -428,7 +433,7 @@ public class SurveyorAdjustMethodTj { return resultAdjustList; } - int cycleCount = StationUtilPla.getCycleCount(StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_VER, stationRecord, toleranceDetailRecordTj); + int cycleCount = StationUtilPla.getCycleCount(StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER, stationRecord, toleranceDetailRecordTj); int surveyorCount = toleranceDetailRecordTj.getSurveyorCount(); //遍历所有点 for (int pointIndex = 0; pointIndex < cachedData.realPointCount(); pointIndex++) { @@ -575,7 +580,6 @@ public class SurveyorAdjustMethodTj { average += distanceAverageEveryCycle; } - // TODO: 2024/8/30 resultAdjustList.add(new AloneAdjustItem(pointId, pointName, 0, 0, average / cycleCount, prismHeight, true, false, false, null)); diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/StateConstantsTj.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/StateConstantsPla.java similarity index 88% rename from app/src/main/java/com/bingce/controlnetwork/surveyor/state/StateConstantsTj.java rename to app/src/main/java/com/bingce/controlnetwork/surveyor/state/StateConstantsPla.java index 679254e..664e156 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/StateConstantsTj.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/StateConstantsPla.java @@ -1,6 +1,6 @@ package com.bingce.controlnetwork.surveyor.state; -public class StateConstantsTj { +public class StateConstantsPla { /** * --------------------------measureWhat开始-------------------------------- * 值勿改 @@ -19,11 +19,11 @@ public class StateConstantsTj { /** * 仅测水平角 */ - public static final int VALUE_MEASURE_WHAT_ANGLE_HOR = 2;//原3 + public static final int VALUE_MEASURE_WHAT_ANGLE_HOR = 2; /** * 仅测垂直角 */ - public static final int VALUE_MEASURE_WHAT_ANGLE_VER = 3;//原4 + public static final int VALUE_MEASURE_WHAT_ANGLE_VER = 3; /** diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/StateManagerTj.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/StateManagerPla.java similarity index 78% rename from app/src/main/java/com/bingce/controlnetwork/surveyor/state/StateManagerTj.java rename to app/src/main/java/com/bingce/controlnetwork/surveyor/state/StateManagerPla.java index 863ce72..5515b7d 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/StateManagerTj.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/StateManagerPla.java @@ -24,22 +24,22 @@ import com.bingce.controlnetwork.surveyor.surveyor.ISurveyorListener; import com.bingce.controlnetwork.surveyor.surveyor.ISurveyorRemindListener; import com.bingce.controlnetwork.util.SupportAutoSurveyorUtil; -public class StateManagerTj extends AbstructStateManager { - - private StateManagerTj(final int measureWhat, - final boolean supportAutoSurvey,//是否支持自动测量 - final @NonNull SurveyorStationRecord stationRecord, - final @NonNull PointRecord stationPointRecord, - final @NonNull ToleranceDetailRecord toleranceRecord, - final @NonNull Context context, - final @NonNull IStationPointRecordCollect pointRecordCollect, - final @NonNull ISurveyorData surveyorData, - final @NonNull ICycleRecorder cycleRecorder, - final @NonNull ICachedData cachedData, - final @NonNull ISurveyorDataScrollDelegate scrollDelegate, - FragmentManager fragmentManager, - LifecycleOwner lifecycleOwner, - IUIRunner iuiRunner) { +public class StateManagerPla extends AbstructStateManager { + + private StateManagerPla(final int measureWhat, + final boolean supportAutoSurvey,//是否支持自动测量 + final @NonNull SurveyorStationRecord stationRecord, + final @NonNull PointRecord stationPointRecord, + final @NonNull ToleranceDetailRecord toleranceRecord, + final @NonNull Context context, + final @NonNull IStationPointRecordCollect pointRecordCollect, + final @NonNull ISurveyorData surveyorData, + final @NonNull ICycleRecorder cycleRecorder, + final @NonNull ICachedData cachedData, + final @NonNull ISurveyorDataScrollDelegate scrollDelegate, + FragmentManager fragmentManager, + LifecycleOwner lifecycleOwner, + IUIRunner iuiRunner) { super(measureWhat, supportAutoSurvey, stationRecord, stationPointRecord, toleranceRecord, context, pointRecordCollect, surveyorData, cycleRecorder, cachedData, scrollDelegate, fragmentManager, lifecycleOwner, iuiRunner); @@ -111,7 +111,7 @@ public class StateManagerTj extends AbstructStateManager { if (wellMeasureRotationReady) { //当前是钢丝准备状态 //传给测量状态isAlreadyRemindUserAimingAtWire - bundle.putBoolean(StateConstantsTj.KEY_IS_ALREADY_REMIND_USER_AIMING_AT_WIRE, true); + bundle.putBoolean(StateConstantsPla.KEY_IS_ALREADY_REMIND_USER_AIMING_AT_WIRE, true); } enter(StateType.doSurveyor, bundle); } @@ -184,18 +184,18 @@ public class StateManagerTj extends AbstructStateManager { @WorkerThread - public static StateManagerTj newInstance(int measureWhat,//仅测量水平角还是什么... - @NonNull SurveyorStationRecord stationRecord, - @NonNull Context context, - @NonNull FragmentManager fragmentManager, - @NonNull LifecycleOwner lifecycleOwner, - @NonNull ToleranceDetailRecord toleranceRecord, - @NonNull IStationPointRecordCollect pointRecordCollect, - @NonNull ISurveyorData surveyorData, - @NonNull ICycleRecorder cycleRecorder, - @NonNull ICachedData cachedData, - ISurveyorDataScrollDelegate scrollDelegate, - IUIRunner runner) { + public static StateManagerPla newInstance(int measureWhat,//仅测量水平角还是什么... + @NonNull SurveyorStationRecord stationRecord, + @NonNull Context context, + @NonNull FragmentManager fragmentManager, + @NonNull LifecycleOwner lifecycleOwner, + @NonNull ToleranceDetailRecord toleranceRecord, + @NonNull IStationPointRecordCollect pointRecordCollect, + @NonNull ISurveyorData surveyorData, + @NonNull ICycleRecorder cycleRecorder, + @NonNull ICachedData cachedData, + ISurveyorDataScrollDelegate scrollDelegate, + IUIRunner runner) { //读取测点record String stationPointId = null; if (stationRecord.getItems() != null) { @@ -217,7 +217,7 @@ public class StateManagerTj extends AbstructStateManager { return null; } boolean supportAuto = SupportAutoSurveyorUtil.isSupportAuto(); - return new StateManagerTj(measureWhat, supportAuto, + return new StateManagerPla(measureWhat, supportAuto, stationRecord, stationPointRecord, toleranceRecord, diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_Check2CState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_Check2CState.java index e1bc62e..be9a4a9 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_Check2CState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_Check2CState.java @@ -20,7 +20,7 @@ import net.tatans.tensorflowtts.tts.TtsManager; * */ class _Check2CState extends __BaseState { - public _Check2CState(StateManagerTj stateManager) { + public _Check2CState(StateManagerPla stateManager) { super(StateType.check2C, stateManager); } @@ -54,12 +54,12 @@ class _Check2CState extends __BaseState { private String check2C() { int measureWhat = measureWhat(); switch (measureWhat) { - case StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT: + case StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT: // case StateConstants.VALUE_MEASURE_WHAT_ANGLE: return checkAll(); - case StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR: + case StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR: return checkAngleHor(); - case StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_VER: + case StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER: return checkAngleVer(); default: return null; diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckHalfCycleZeroState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckHalfCycleZeroState.java index 0671f64..60aad29 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckHalfCycleZeroState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckHalfCycleZeroState.java @@ -22,7 +22,7 @@ class _CheckHalfCycleZeroState extends __BaseState { private final static int RESULT_SUCCESS = 0; private final static int RESULT_FAILURE = 1; - public _CheckHalfCycleZeroState(StateManagerTj stateManager) { + public _CheckHalfCycleZeroState(StateManagerPla stateManager) { super(StateType.checkHalfCycleZero, stateManager); } @@ -30,7 +30,7 @@ class _CheckHalfCycleZeroState extends __BaseState { public void enter(Bundle args) { if (isStationClosed()) { - if (measureWhat() == StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_VER) { + if (measureWhat() == StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER) { onCompleted(RESULT_SUCCESS); return; } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckReadDataState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckReadDataState.java index eefda7c..d8d1200 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckReadDataState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckReadDataState.java @@ -19,7 +19,7 @@ class _CheckReadDataState extends __BaseState { private static final int RESULT_FAILURE_DISTANCE = 3; private final IAutoModeSwitcher autoModeSwitcher; - public _CheckReadDataState(StateManagerTj stateManager, IAutoModeSwitcher autoModeSwitcher) { + public _CheckReadDataState(StateManagerPla stateManager, IAutoModeSwitcher autoModeSwitcher) { super(StateType.checkReadData, stateManager); this.autoModeSwitcher = autoModeSwitcher; } @@ -39,14 +39,14 @@ class _CheckReadDataState extends __BaseState { int measureWhat = measureWhat(); int resultCode = RESULT_SUCCESS; switch (measureWhat) { - case StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT: + case StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT: // case StateConstants.VALUE_MEASURE_WHAT_ANGLE: resultCode = checkAll(); break; - case StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR: + case StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR: resultCode = checkAngleHor(); break; - case StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_VER: + case StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER: resultCode = checkAngleVer(); break; } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckSingleCycleState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckSingleCycleState.java index 55734c5..e4c0bce 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckSingleCycleState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckSingleCycleState.java @@ -22,7 +22,7 @@ import net.tatans.tensorflowtts.tts.TtsManager; */ class _CheckSingleCycleState extends __BaseState { - public _CheckSingleCycleState(StateManagerTj stateManager) { + public _CheckSingleCycleState(StateManagerPla stateManager) { super(StateType.checkSingleCycle, stateManager); } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckStationState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckStationState.java index c272d38..91cf793 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckStationState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckStationState.java @@ -44,7 +44,7 @@ import java.util.List; */ class _CheckStationState extends __BaseState { - public _CheckStationState(StateManagerTj stateManager) { + public _CheckStationState(StateManagerPla stateManager) { super(StateType.checkStation, stateManager); } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckStationSuccessState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckStationSuccessState.java index 2706f21..89fffe0 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckStationSuccessState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_CheckStationSuccessState.java @@ -11,7 +11,7 @@ import net.tatans.tensorflowtts.tts.TtsManager; class _CheckStationSuccessState extends __BaseState { - public _CheckStationSuccessState(StateManagerTj stateManager) { + public _CheckStationSuccessState(StateManagerPla stateManager) { super(StateType.stationCheckedSuccess, stateManager); } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoAutoSurveyorState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoAutoSurveyorState.java index 1667684..9a29fda 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoAutoSurveyorState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoAutoSurveyorState.java @@ -12,7 +12,7 @@ import net.tatans.tensorflowtts.tts.TtsManager; class _DoAutoSurveyorState extends __BaseState { private final IAutoModeSwitcher autoModeSwitcher; - public _DoAutoSurveyorState(StateManagerTj stateManager, IAutoModeSwitcher autoModeSwitcher) { + public _DoAutoSurveyorState(StateManagerPla stateManager, IAutoModeSwitcher autoModeSwitcher) { super(StateType.doAutoSurveyor, stateManager); this.autoModeSwitcher = autoModeSwitcher; } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoCalAdjustState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoCalAdjustState.java index 9bedfa3..f30de62 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoCalAdjustState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoCalAdjustState.java @@ -6,7 +6,7 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import com.bingce.controlnetwork.fragment.StationDataAdjustDialogFragmentTj; -import com.bingce.controlnetwork.surveyor.method.SurveyorAdjustMethodTj; +import com.bingce.controlnetwork.surveyor.method.SurveyorAdjustMethodPla; /** @@ -14,14 +14,14 @@ import com.bingce.controlnetwork.surveyor.method.SurveyorAdjustMethodTj; */ public class _DoCalAdjustState extends __BaseState { - public _DoCalAdjustState(StateManagerTj stateManager) { + public _DoCalAdjustState(StateManagerPla stateManager) { super(StateType.doCalAdjust, stateManager); } @Override public void enter(@NonNull Bundle args) { runOnBackground(() -> { - SurveyorAdjustMethodTj.AdjustResult adjustResult = SurveyorAdjustMethodTj.calStationAdjust(measureWhat(), getStation(), getCachedData()); + SurveyorAdjustMethodPla.AdjustResult adjustResult = SurveyorAdjustMethodPla.calStationAdjust(measureWhat(), getStation(), getCachedData()); if (!TextUtils.isEmpty(adjustResult.errorString)) { runOnUI(() -> _CheckStationState.showErrorTips(adjustResult.errorString, stationId(), getCycleCount(), getSurveyorData(), getCycleRecorder(), getCachedData(), @@ -35,7 +35,7 @@ public class _DoCalAdjustState extends __BaseState { enterIdleAndClearSurveyStateAndResetAutoMode(true); //展示结果数据 //检测归零值是否为负，如果是需要+2PI - for (SurveyorAdjustMethodTj.Item item : adjustResult.result) { + for (SurveyorAdjustMethodPla.Item item : adjustResult.result) { if (item.getHorAngle() < 0) { item.setHorAngle(Math.PI * 2 + item.getHorAngle()); } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoCalScheduleInAllCycleState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoCalScheduleInAllCycleState.java index 9482f2b..329459c 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoCalScheduleInAllCycleState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoCalScheduleInAllCycleState.java @@ -31,7 +31,7 @@ import com.bingce.utils.ThreadPoolUtil; */ class _DoCalScheduleInAllCycleState extends _DoCalScheduleInSingleCycleState { - public _DoCalScheduleInAllCycleState(StateManagerTj stateManager, IAutoModeSwitcher autoModeSwitcher) { + public _DoCalScheduleInAllCycleState(StateManagerPla stateManager, IAutoModeSwitcher autoModeSwitcher) { super(StateType.doCalScheduleAllCycle, stateManager, autoModeSwitcher); } @@ -127,7 +127,7 @@ class _DoCalScheduleInAllCycleState extends _DoCalScheduleInSingleCycleState { return true; } - static void enter(StateManagerTj stateManager, int cycleIndex) { + static void enter(StateManagerPla stateManager, int cycleIndex) { Bundle args = new Bundle(); args.putInt(KEY_CYCLE_INDEX, cycleIndex); stateManager.enter(StateType.doCalScheduleAllCycle, args); diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoCalScheduleInSingleCycleState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoCalScheduleInSingleCycleState.java index 8574d48..54232ac 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoCalScheduleInSingleCycleState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoCalScheduleInSingleCycleState.java @@ -18,12 +18,12 @@ import com.bingce.controlnetwork.surveyor.method.SingleCycleTipsMethod; class _DoCalScheduleInSingleCycleState extends __BaseState { private final IAutoModeSwitcher autoModeSwitcher; - public _DoCalScheduleInSingleCycleState(StateManagerTj stateManager, IAutoModeSwitcher autoModeSwitcher) { + public _DoCalScheduleInSingleCycleState(StateManagerPla stateManager, IAutoModeSwitcher autoModeSwitcher) { super(StateType.doCalScheduleSingleCycle, stateManager); this.autoModeSwitcher = autoModeSwitcher; } - protected _DoCalScheduleInSingleCycleState(StateType stateType, final StateManagerTj stateManager, IAutoModeSwitcher autoModeSwitcher) { + protected _DoCalScheduleInSingleCycleState(StateType stateType, final StateManagerPla stateManager, IAutoModeSwitcher autoModeSwitcher) { super(stateType, stateManager); this.autoModeSwitcher = autoModeSwitcher; } @@ -103,7 +103,7 @@ class _DoCalScheduleInSingleCycleState extends __BaseState { protected static final String KEY_CYCLE_INDEX = "___cycle__index__"; - static void enter(StateManagerTj stateManager, int cycleIndex) { + static void enter(StateManagerPla stateManager, int cycleIndex) { Bundle args = new Bundle(); args.putInt(KEY_CYCLE_INDEX, cycleIndex); stateManager.enter(StateType.doCalScheduleSingleCycle, args); diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoDeleteAllCycleState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoDeleteAllCycleState.java index 9a53787..2c939d1 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoDeleteAllCycleState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoDeleteAllCycleState.java @@ -12,7 +12,7 @@ import com.bingce.controlnetwork.surveyor.data.ICachedData; * */ class _DoDeleteAllCycleState extends __BaseState { - public _DoDeleteAllCycleState(StateManagerTj stateManager) { + public _DoDeleteAllCycleState(StateManagerPla stateManager) { super(StateType.doDeleteAllCycle, stateManager); } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoDeleteCurrentCycleState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoDeleteCurrentCycleState.java index 6a8dffc..44089d8 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoDeleteCurrentCycleState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoDeleteCurrentCycleState.java @@ -8,7 +8,7 @@ import com.bingce.controlnetwork.surveyor.data.ICachedData; class _DoDeleteCurrentCycleState extends __BaseState { - public _DoDeleteCurrentCycleState(StateManagerTj stateManager) { + public _DoDeleteCurrentCycleState(StateManagerPla stateManager) { super(StateType.doDeleteCurrentCycle, stateManager); } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoMove2NextValidateState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoMove2NextValidateState.java index 347b082..18bc8dc 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoMove2NextValidateState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoMove2NextValidateState.java @@ -19,7 +19,7 @@ import net.tatans.tensorflowtts.tts.TtsManager; */ class _DoMove2NextValidateState extends __BaseState { - public _DoMove2NextValidateState(StateManagerTj stateManager) { + public _DoMove2NextValidateState(StateManagerPla stateManager) { super(StateType.doMove2NextValidate, stateManager); } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoMoveBackState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoMoveBackState.java index 783ab83..2eb482e 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoMoveBackState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoMoveBackState.java @@ -19,7 +19,7 @@ import com.bingce.controlnetwork.util.IdUtil; */ public class _DoMoveBackState extends __BaseState { - public _DoMoveBackState(StateManagerTj stateManager) { + public _DoMoveBackState(StateManagerPla stateManager) { super(StateType.doMoveBack, stateManager); } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoRecordCleanState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoRecordCleanState.java index aa10e54..9114497 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoRecordCleanState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoRecordCleanState.java @@ -11,7 +11,7 @@ import com.bingce.controlnetwork.surveyor.data.ISurveyorData; * 记录测量数据 */ class _DoRecordCleanState extends __BaseState { - public _DoRecordCleanState(StateManagerTj stateManager) { + public _DoRecordCleanState(StateManagerPla stateManager) { super(StateType.doRecordClean, stateManager); } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoSurveyorState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoSurveyorState.java index f9c2425..9e68b32 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoSurveyorState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoSurveyorState.java @@ -42,7 +42,7 @@ class _DoSurveyorState extends __BaseState implements ISurveyorListener, ISurvey private Handler handler; - public _DoSurveyorState(StateManagerTj stateManager, ISurveyState surveyState) { + public _DoSurveyorState(StateManagerPla stateManager, ISurveyState surveyState) { super(StateType.doSurveyor, stateManager); this.surveyState = surveyState; handler = new Handler(Looper.getMainLooper()); @@ -53,7 +53,7 @@ class _DoSurveyorState extends __BaseState implements ISurveyorListener, ISurvey surveyorIndex = 0; isAlreadyRemindUserAimingAtWire = false; if (args != null) { - isAlreadyRemindUserAimingAtWire = args.getBoolean(StateConstantsTj.KEY_IS_ALREADY_REMIND_USER_AIMING_AT_WIRE); + isAlreadyRemindUserAimingAtWire = args.getBoolean(StateConstantsPla.KEY_IS_ALREADY_REMIND_USER_AIMING_AT_WIRE); } ToleranceDetailRecord toleranceRecord = getToleranceRecord(); diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoWellMeasureRotationReadyState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoWellMeasureRotationReadyState.java index 2c1ccb3..3e16c60 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoWellMeasureRotationReadyState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_DoWellMeasureRotationReadyState.java @@ -2,17 +2,14 @@ package com.bingce.controlnetwork.surveyor.state; import android.os.Bundle; -import com.bingce.controlnetwork.R; import com.bingce.controlnetwork.event.SurveyStateEvent; -import net.tatans.tensorflowtts.tts.TtsManager; - /** * 钢丝测量旋转到位状态 */ class _DoWellMeasureRotationReadyState extends __BaseState { - public _DoWellMeasureRotationReadyState(StateManagerTj stateManager) { + public _DoWellMeasureRotationReadyState(StateManagerPla stateManager) { super(StateType.doWellMeasureRotationReady, stateManager); } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_IdleState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_IdleState.java index fcb4328..6d0517e 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_IdleState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_IdleState.java @@ -29,7 +29,7 @@ class _IdleState extends __BaseState { private final @NonNull IAutoModeSwitcher autoModeSwitcher; - public _IdleState(StateManagerTj stateManager, @NonNull IAutoModeSwitcher autoModeSwitcher) { + public _IdleState(StateManagerPla stateManager, @NonNull IAutoModeSwitcher autoModeSwitcher) { super(StateType.idle, stateManager); this.autoModeSwitcher = autoModeSwitcher; } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_Is2CCheckReadyState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_Is2CCheckReadyState.java index 4275157..061535b 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_Is2CCheckReadyState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_Is2CCheckReadyState.java @@ -16,7 +16,7 @@ class _Is2CCheckReadyState extends __BaseState { private static final int RESULT_YES = 0;//可以检测「2C」 private static final int RESULT_NO = 1;//不可以检测「2C」 - public _Is2CCheckReadyState(StateManagerTj stateManager) { + public _Is2CCheckReadyState(StateManagerPla stateManager) { super(StateType.isReady2CCheck, stateManager); } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_IsAllCycleCompletedState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_IsAllCycleCompletedState.java index 11a2f17..3e094f9 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_IsAllCycleCompletedState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_IsAllCycleCompletedState.java @@ -19,7 +19,7 @@ public class _IsAllCycleCompletedState extends __BaseState { private static final int INVALIDATE_CYCLE = -1; private final IAutoModeSwitcher autoModeSwitcher; - public _IsAllCycleCompletedState(@NonNull StateManagerTj stateManager, IAutoModeSwitcher autoModeSwitcher) { + public _IsAllCycleCompletedState(@NonNull StateManagerPla stateManager, IAutoModeSwitcher autoModeSwitcher) { super(StateType.isAllCycleCompleted, stateManager); this.autoModeSwitcher = autoModeSwitcher; } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_IsHalfCycleZeroCheckReadyState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_IsHalfCycleZeroCheckReadyState.java index efc0a8f..00d702e 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_IsHalfCycleZeroCheckReadyState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_IsHalfCycleZeroCheckReadyState.java @@ -18,7 +18,7 @@ class _IsHalfCycleZeroCheckReadyState extends __BaseState { private static final int RESULT_YES = 0;//可以检测「半测回归零差」 private static final int RESULT_NO = 1;//不可以检测「半测回归零差」 - public _IsHalfCycleZeroCheckReadyState(StateManagerTj stateManager) { + public _IsHalfCycleZeroCheckReadyState(StateManagerPla stateManager) { super(StateType.isHalfCycleZeroCheckReady, stateManager); } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_IsSingleCycleCompletedState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_IsSingleCycleCompletedState.java index 4d482ef..cb6ac47 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_IsSingleCycleCompletedState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_IsSingleCycleCompletedState.java @@ -13,7 +13,7 @@ public class _IsSingleCycleCompletedState extends __BaseState { private static final int RESULT_YES = 0;//测回结束 private static final int RESULT_NO = 1;//测回未结束 - public _IsSingleCycleCompletedState(StateManagerTj stateManager) { + public _IsSingleCycleCompletedState(StateManagerPla stateManager) { super(StateType.isSingleCycleCompleted, stateManager); } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_SurveyorFailureState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_SurveyorFailureState.java index e309a6e..39b5a59 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_SurveyorFailureState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/_SurveyorFailureState.java @@ -9,7 +9,7 @@ import android.os.Bundle; * */ public class _SurveyorFailureState extends __BaseState { - public _SurveyorFailureState(StateManagerTj stateManager) { + public _SurveyorFailureState(StateManagerPla stateManager) { super(StateType.SurveyorFailure, stateManager); } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/__BaseState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/__BaseState.java index f5b53f6..fd2c1ab 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/__BaseState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/__BaseState.java @@ -27,7 +27,7 @@ public abstract class __BaseState extends AbstructState { private final int RESET_AUTO_MODE = 1; private final int CLOSE_AUTO_MODE = 2; - public __BaseState(final StateType stateType, final StateManagerTj stateManager) { + public __BaseState(final StateType stateType, final StateManagerPla stateManager) { super(stateType, stateManager); } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/base/AbstructStateManager.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/base/AbstructStateManager.java index a11e03c..f00fa6a 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/base/AbstructStateManager.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/base/AbstructStateManager.java @@ -22,7 +22,7 @@ import com.bingce.controlnetwork.surveyor.state.AutoModeType; import com.bingce.controlnetwork.surveyor.state.IAutoModeSwitcher; import com.bingce.controlnetwork.surveyor.state.ISurveyState; import com.bingce.controlnetwork.surveyor.state.ISurveyorDataScrollDelegate; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.surveyor.state.StateType; import com.bingce.controlnetwork.surveyor.surveyor.IAutoSurveyor; import com.bingce.controlnetwork.surveyor.surveyor.ISurveyor; @@ -102,7 +102,7 @@ public abstract class AbstructStateManager implements IAutoModeSwitcher, ISurvey if (Test.DEBUG) { surveyor = new SurveyorMockAuto(measureWhat, stationRecord.getId(), stationRecord.isAutoClose(), - StationUtilPla.getCycleCount(StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT, stationRecord, toleranceRecord), + StationUtilPla.getCycleCount(StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT, stationRecord, toleranceRecord), cachedData, surveyorData, cycleRecorder, this, this); } else { if (supportAutoSurvey) { diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/base/AdjustmentMeasureWhatUtil.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/base/AdjustmentMeasureWhatUtil.java index adb0f17..8065460 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/base/AdjustmentMeasureWhatUtil.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/base/AdjustmentMeasureWhatUtil.java @@ -1,24 +1,24 @@ package com.bingce.controlnetwork.surveyor.state.base; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; public class AdjustmentMeasureWhatUtil { public static boolean isAdjustHorAngle(int measureWhat) { - return measureWhat == StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR; + return measureWhat == StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR; } public static boolean isAdjustVerAngle(int measureWhat) { - return measureWhat == StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_VER; + return measureWhat == StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER; } public static boolean isAdjustDistance(int measureWhat) { - return measureWhat == StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE; + return measureWhat == StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE; } public static boolean isAdjustAll(int measureWhat) { - return measureWhat == StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT; + return measureWhat == StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT; // || measureWhat == StateConstants.VALUE_MEASURE_WHAT_ANGLE; } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/base/CheckToleranceUtil.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/base/CheckToleranceUtil.java index a85248c..d575d23 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/base/CheckToleranceUtil.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/base/CheckToleranceUtil.java @@ -2,25 +2,25 @@ package com.bingce.controlnetwork.surveyor.state.base; import com.bingce.controlnetwork.surveyor.data.ICachedData; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; public class CheckToleranceUtil { public static boolean checkAngleHor(int measuresWhat) { - return measuresWhat == StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT + return measuresWhat == StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT // || measuresWhat == StateConstants.VALUE_MEASURE_WHAT_ANGLE - || measuresWhat == StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR; + || measuresWhat == StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR; } public static boolean checkAngleVer(int measuresWhat) { - return measuresWhat == StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT + return measuresWhat == StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT // || measuresWhat == StateConstants.VALUE_MEASURE_WHAT_ANGLE - || measuresWhat == StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_VER; + || measuresWhat == StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER; } public static boolean checkDistance(int measuresWhat) { - return measuresWhat == StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT - || measuresWhat == StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE; + return measuresWhat == StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT + || measuresWhat == StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE; } /** diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/heighttraverse/StateManagerHeightTraverse.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/heighttraverse/StateManagerHeightTraverse.java index cf6a85f..1713f55 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/heighttraverse/StateManagerHeightTraverse.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/heighttraverse/StateManagerHeightTraverse.java @@ -40,7 +40,6 @@ import com.bingce.controlapphelper.util.Tools; import com.bingce.controlnetwork.R; import com.bingce.controlnetwork.fragment.StationDataAdjustDialogFragment; import com.bingce.controlnetwork.fragment.TipsFragment; -import com.bingce.controlnetwork.surveyor.method.SurveyorAdjustMethodTj; import com.bingce.controlnetwork.surveyor.state.AutoModeType; import com.bingce.controlnetwork.surveyor.state.IScrollDelegate; import com.bingce.controlnetwork.surveyor.state.StateConstants; diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/separateVerAngle/StateManagerSeparateVerAngle.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/separateVerAngle/StateManagerSeparateVerAngle.java index 314a502..4f657ee 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/separateVerAngle/StateManagerSeparateVerAngle.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/separateVerAngle/StateManagerSeparateVerAngle.java @@ -22,9 +22,9 @@ import com.bingce.controlnetwork.surveyor.data.ICachedData; import com.bingce.controlnetwork.surveyor.data.ICycleRecorder; import com.bingce.controlnetwork.surveyor.data.IStationPointRecordCollect; import com.bingce.controlnetwork.surveyor.data.ISurveyorData; -import com.bingce.controlnetwork.surveyor.method.SurveyorAdjustMethodTj; +import com.bingce.controlnetwork.surveyor.method.SurveyorAdjustMethodPla; import com.bingce.controlnetwork.surveyor.state.ISurveyorDataScrollDelegate; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.surveyor.state.StateType; import com.bingce.controlnetwork.surveyor.state.base.AbstructStateManager; import com.bingce.controlnetwork.surveyor.surveyor.ISurveyorListener; @@ -176,7 +176,7 @@ public class StateManagerSeparateVerAngle extends AbstructStateManager { private void startAdjust() { ThreadPoolUtil.execute(() -> { - List adjustItems = SurveyorAdjustMethodTj.calAloneVer(stationId(), getCachedData(), true); + List adjustItems = SurveyorAdjustMethodPla.calAloneVer(stationId(), getCachedData(), true); StationDataAdjustAloneVerOrDistanceDialogFragment.showDialog(getFragmentManager(), getMeasureWhat(), adjustItems); }); } @@ -252,7 +252,7 @@ public class StateManagerSeparateVerAngle extends AbstructStateManager { if (StateType.doWellMeasureRotationReady == currentStateType) { //当前是钢丝准备状态 //传给测量状态isAlreadyRemindUserAimingAtWire - bundle.putBoolean(StateConstantsTj.KEY_IS_ALREADY_REMIND_USER_AIMING_AT_WIRE, true); + bundle.putBoolean(StateConstantsPla.KEY_IS_ALREADY_REMIND_USER_AIMING_AT_WIRE, true); } enter(StateType.doSurveyor, bundle); } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/separateVerAngle/_DoSurveyorStateVer.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/separateVerAngle/_DoSurveyorStateVer.java index 304b21d..97d3505 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/separateVerAngle/_DoSurveyorStateVer.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/separateVerAngle/_DoSurveyorStateVer.java @@ -8,7 +8,7 @@ import android.widget.Toast; import com.bingce.controlapphelper.datasource.database.surveyorstation.model.SurveyorPoint; import com.bingce.controlnetwork.event.SurveyStateEvent; import com.bingce.controlnetwork.surveyor.state.ISurveyState; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.surveyor.state.StateType; import com.bingce.controlnetwork.surveyor.surveyor.ISurveyorListener; import com.bingce.controlnetwork.surveyor.surveyor.ISurveyorRemindListener; @@ -50,7 +50,7 @@ class _DoSurveyorStateVer extends __BaseStateVer implements ISurveyorListener, I getSurveyorData().setMeasureTimes(0); isAlreadyRemindUserAimingAtWire = false; if (args != null) { - isAlreadyRemindUserAimingAtWire = args.getBoolean(StateConstantsTj.KEY_IS_ALREADY_REMIND_USER_AIMING_AT_WIRE); + isAlreadyRemindUserAimingAtWire = args.getBoolean(StateConstantsPla.KEY_IS_ALREADY_REMIND_USER_AIMING_AT_WIRE); } //3.其他测回没有正在测量数据，则在当前测回执行测量 diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/wellDistance/StateManagerWell.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/wellDistance/StateManagerWell.java index 0329884..a7c51b9 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/wellDistance/StateManagerWell.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/wellDistance/StateManagerWell.java @@ -20,7 +20,7 @@ import com.bingce.controlnetwork.surveyor.data.ICycleRecorder; import com.bingce.controlnetwork.surveyor.data.IStationPointRecordCollect; import com.bingce.controlnetwork.surveyor.data.ISurveyorData; import com.bingce.controlnetwork.surveyor.state.ISurveyorDataScrollDelegate; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.surveyor.state.StateType; import com.bingce.controlnetwork.surveyor.state.base.AbstructStateManager; import com.bingce.controlnetwork.surveyor.surveyor.ISurveyorListener; @@ -47,7 +47,7 @@ public class StateManagerWell extends AbstructStateManager { LifecycleOwner lifecycleOwner, IUIRunner iuiRunner, IWeatherShowDialogListener showWeatherListener) { - super(StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE, supportAutoSurvey, stationRecord, stationPointRecord, + super(StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE, supportAutoSurvey, stationRecord, stationPointRecord, toleranceRecord, context, pointRecordCollect, surveyorData, cycleRecorder, cachedData, scrollDelegate, fragmentManager, lifecycleOwner, iuiRunner); this.showWeatherListener = showWeatherListener; diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/wellDistance/_DoSurveyorState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/wellDistance/_DoSurveyorState.java index 645fccb..9653761 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/wellDistance/_DoSurveyorState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/wellDistance/_DoSurveyorState.java @@ -10,7 +10,7 @@ import com.bingce.controlapphelper.datasource.database.alonedistance.AloneDistan import com.bingce.controlapphelper.datasource.database.surveyorstation.model.SurveyorPoint; import com.bingce.controlnetwork.event.SurveyStateEvent; import com.bingce.controlnetwork.surveyor.state.ISurveyState; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.surveyor.state.StateType; import com.bingce.controlnetwork.surveyor.surveyor.ISurveyorListener; import com.bingce.controlnetwork.surveyor.surveyor.ISurveyorRemindListener; @@ -101,7 +101,7 @@ class _DoSurveyorState extends __BaseState implements ISurveyorListener, ISurvey SurveyorPoint surveyorPoint = getCachedData().getSurveyorPoint(getCycleRecorder().currentCycleIndex(), getCurrentItemIndex()); int index = getSurveyorData().currentIndex(); //isAlreadyRemindUserAimingAtWire为true时就是旋转到位了 - surveyorImpl().requestSurveyor(new RequestParam(StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE, getIsAlreadyRotary(), isWellSteel(), isAloneMeasureDistancePoint(), surveyorIndex, index, surveyorPoint)); + surveyorImpl().requestSurveyor(new RequestParam(StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE, getIsAlreadyRotary(), isWellSteel(), isAloneMeasureDistancePoint(), surveyorIndex, index, surveyorPoint)); } private void onSuccess() { diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/wellDistance/__BaseState.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/wellDistance/__BaseState.java index 7835abf..b823958 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/state/wellDistance/__BaseState.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/state/wellDistance/__BaseState.java @@ -13,8 +13,8 @@ import com.bingce.controlnetwork.event.SurveyStateEvent; import com.bingce.controlnetwork.fragment.StationDataAdjustAloneVerOrDistanceDialogFragment; import com.bingce.controlnetwork.model.AloneAdjustItem; import com.bingce.controlnetwork.surveyor.method.AutoSurveyorMethod; -import com.bingce.controlnetwork.surveyor.method.SurveyorAdjustMethodTj; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.method.SurveyorAdjustMethodPla; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.surveyor.state.StateType; import com.bingce.controlnetwork.surveyor.state.base.AbstructState; import com.bingce.controlnetwork.surveyor.state.base.AbstructStateManager; @@ -101,7 +101,7 @@ public abstract class __BaseState extends AbstructState { .getScheduleDataSource() .record( new SurveyorScheduleRecord( - SurveyorScheduleConstants.stationCurrentCycleKey(stationId(), StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE), + SurveyorScheduleConstants.stationCurrentCycleKey(stationId(), StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE), String.valueOf(cycle))); } @@ -112,7 +112,7 @@ public abstract class __BaseState extends AbstructState { .getScheduleDataSource() .record( new SurveyorScheduleRecord( - SurveyorScheduleConstants.stationSingleCycleScheduleKey(stationId(), StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE, cycleIndex), + SurveyorScheduleConstants.stationSingleCycleScheduleKey(stationId(), StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE, cycleIndex), statue)); } @@ -123,7 +123,7 @@ public abstract class __BaseState extends AbstructState { .getScheduleDataSource() .record( new SurveyorScheduleRecord( - SurveyorScheduleConstants.stationAllCycleScheduleKey(stationId(), StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE), + SurveyorScheduleConstants.stationAllCycleScheduleKey(stationId(), StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE), statue)); } @@ -356,7 +356,7 @@ public abstract class __BaseState extends AbstructState { protected void doAdjust() { runOnBackground(() -> { - List adjustResult = SurveyorAdjustMethodTj.calAloneDistance(stationId(), getCachedData(), true); + List adjustResult = SurveyorAdjustMethodPla.calAloneDistance(stationId(), getCachedData(), true); StationDataAdjustAloneVerOrDistanceDialogFragment.showDialog(fragmentManager(), stateManager.getMeasureWhat(), adjustResult); }); } diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/surveyor/SurveyorAutoImpl.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/surveyor/SurveyorAutoImpl.java index 50f17c0..bdf7639 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/surveyor/SurveyorAutoImpl.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/surveyor/SurveyorAutoImpl.java @@ -17,7 +17,7 @@ import com.bingce.controlnetwork.surveyor.data.IStationPointRecordCollect; import com.bingce.controlnetwork.surveyor.data.ISurveyorData; import com.bingce.controlnetwork.surveyor.data.SpeakCache; import com.bingce.controlnetwork.surveyor.state.IAutoModeSwitcher; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.util.SurveyorOpenAtrUtil; import com.bingce.coordlib.model.Coordinate; import com.bingce.totalstation.TotalStation; @@ -101,11 +101,11 @@ public class SurveyorAutoImpl extends SurveyorSingleImpl { LeftOrRight leftOrRight = surveyorData.leftOrRight(); switch (requestParam.getMeasureWhat()) { - case StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT: - case StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR: - case StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_VER: - if (requestParam.getMeasureWhat() == StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT - || requestParam.getMeasureWhat() == StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR) { + case StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT: + case StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR: + case StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER: + if (requestParam.getMeasureWhat() == StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT + || requestParam.getMeasureWhat() == StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR) { boolean speakSwitchCycle = SpeakCache.getInstance().isSpeakSwitchCycle(); if (speakSwitchCycle) { //已经播放过切换测回，当前测量不再播放测量目标，在下次播放测量目标 @@ -121,7 +121,7 @@ public class SurveyorAutoImpl extends SurveyorSingleImpl { } TtsManager.getInstance().speak(msg); } - } else if (requestParam.getMeasureWhat() == StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_VER) { + } else if (requestParam.getMeasureWhat() == StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER) { if (verAngleSpeakCycleIndex != cycleIndex) { TtsManager.getInstance().speak("开始测量第" + (cycleIndex + 1) + "测回"); } @@ -139,7 +139,7 @@ public class SurveyorAutoImpl extends SurveyorSingleImpl { requestParam.getSurveyorPoint()); break; - case StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE: + case StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE: if (surveyorData.getMeasureTimes() == 0) { Log.d("hwhw", "sendRequest——自动测量 默认"); sendRequestDefault(true,//盘左 diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/surveyor/SurveyorMock.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/surveyor/SurveyorMock.java index 60df8a8..e6fbf14 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/surveyor/SurveyorMock.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/surveyor/SurveyorMock.java @@ -10,7 +10,7 @@ import androidx.annotation.NonNull; import com.bingce.controlapphelper.model.LeftOrRight; import com.bingce.controlnetwork.surveyor.data.ICycleRecorder; import com.bingce.controlnetwork.surveyor.data.ISurveyorData; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.util.SurveyorOpenAtrUtil; import com.bingce.totalstation.TsException; import com.bingce.totalstation.event.TsMeasureSdAngleEvent; @@ -153,14 +153,14 @@ public class SurveyorMock implements ISurveyor { protected void sendRequest(RequestParam requestParam) { switch (requestParam.getMeasureWhat()) { - case StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT: - case StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE: + case StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT: + case StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE: Log.d("hwhw", "发送手动测距测角指令"); mockData(requestParam); break; // case StateConstants.VALUE_MEASURE_WHAT_ANGLE: - case StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR: - case StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_VER: + case StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR: + case StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER: Log.d("hwhw", "发送手动仅测角指令"); mockData(requestParam); break; diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/surveyor/SurveyorMockAuto.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/surveyor/SurveyorMockAuto.java index 662e29f..ba5a943 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/surveyor/SurveyorMockAuto.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/surveyor/SurveyorMockAuto.java @@ -11,7 +11,7 @@ import com.bingce.controlnetwork.surveyor.data.ICycleRecorder; import com.bingce.controlnetwork.surveyor.data.ISurveyorData; import com.bingce.controlnetwork.surveyor.data.SpeakCache; import com.bingce.controlnetwork.surveyor.state.IAutoModeSwitcher; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.surveyor.state.StateType; import com.bingce.controlnetwork.surveyor.state.base.AbstructStateManager; import com.bingce.controlnetwork.util.IdUtil; @@ -237,10 +237,10 @@ public class SurveyorMockAuto extends SurveyorMock { private void requestOpenAtr(RequestParam requestParam) { switch (requestParam.getMeasureWhat()) { - case StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT: + case StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT: // case StateConstants.VALUE_MEASURE_WHAT_ANGLE: - case StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR: - case StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_VER: + case StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR: + case StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER: Log.d("hwhw", "sendRequest——自动测量 驱动马达测角测距"); boolean speakSwitchCycle = SpeakCache.getInstance().isSpeakSwitchCycle(); if (speakSwitchCycle) { @@ -259,7 +259,7 @@ public class SurveyorMockAuto extends SurveyorMock { } mockData(requestParam); break; - case StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE: + case StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE: Log.d("hwhw", "sendRequest——自动测量 仅测距 调用手动测角测距指令"); mockData(requestParam); break; diff --git a/app/src/main/java/com/bingce/controlnetwork/surveyor/surveyor/SurveyorSingleImpl.java b/app/src/main/java/com/bingce/controlnetwork/surveyor/surveyor/SurveyorSingleImpl.java index bef0bf1..1c73297 100644 --- a/app/src/main/java/com/bingce/controlnetwork/surveyor/surveyor/SurveyorSingleImpl.java +++ b/app/src/main/java/com/bingce/controlnetwork/surveyor/surveyor/SurveyorSingleImpl.java @@ -9,7 +9,7 @@ import androidx.annotation.NonNull; import com.bingce.controlapphelper.datasource.database.surveyorstation.model.SurveyorPoint; import com.bingce.controlapphelper.util.SurveyorTransitionUtil; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.controlnetwork.util.SurveyorOpenAtrUtil; import com.bingce.device.Device; import com.bingce.device.enums.DeviceTypeEnum; @@ -86,19 +86,19 @@ public class SurveyorSingleImpl implements ISurveyor, TsListener.MeasSdAnglesLis protected void sendRequest(RequestParam requestParam, INeedOverTime needOverTime) { switch (requestParam.getMeasureWhat()) { - case StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT: + case StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT: if (requestParam.getSurveyorPoint().isWellSteel()) { sendRequestOnlyMeasureAngle(requestParam.getSurveyorPoint()); } else { sendRequestMeasureDistanceManualPrism(requestParam.getSurveyorPoint()); } break; - case StateConstantsTj.VALUE_MEASURE_WHAT_DISTANCE: + case StateConstantsPla.VALUE_MEASURE_WHAT_DISTANCE: sendRequestMeasureDistanceManualPrism(requestParam.getSurveyorPoint()); break; // case StateConstants.VALUE_MEASURE_WHAT_ANGLE: - case StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR: - case StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_VER: + case StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR: + case StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_VER: sendRequestOnlyMeasureAngle(requestParam.getSurveyorPoint()); break; } diff --git a/app/src/main/java/com/bingce/controlnetwork/util/StationUtilPla.java b/app/src/main/java/com/bingce/controlnetwork/util/StationUtilPla.java index 3dbc003..890e0ba 100644 --- a/app/src/main/java/com/bingce/controlnetwork/util/StationUtilPla.java +++ b/app/src/main/java/com/bingce/controlnetwork/util/StationUtilPla.java @@ -11,7 +11,7 @@ import com.bingce.controlapphelper.datasource.database.surveyorstation.model.Sur import com.bingce.controlapphelper.datasource.database.tolerance.detail.ToleranceDetailRecord; import com.bingce.controlnetwork.bean.SurveyorScheduleConstants; import com.bingce.controlnetwork.surveyor.data.CachedDataPointType; -import com.bingce.controlnetwork.surveyor.state.StateConstantsTj; +import com.bingce.controlnetwork.surveyor.state.StateConstantsPla; import com.bingce.utils.ThreadPoolUtil; import java.util.ArrayList; @@ -131,9 +131,9 @@ public class StationUtilPla { // } if (stationRecord.isSeparateObservation()) { - stationStatusList.add(getStationStatus(stationRecord.getId(), StateConstantsTj.VALUE_MEASURE_WHAT_ANGLE_HOR)); + stationStatusList.add(getStationStatus(stationRecord.getId(), StateConstantsPla.VALUE_MEASURE_WHAT_ANGLE_HOR)); }else { - stationStatusList.add(getStationStatus(stationRecord.getId(), StateConstantsTj.VALUE_MEASURE_WHAT_DEFAULT)); + stationStatusList.add(getStationStatus(stationRecord.getId(), StateConstantsPla.VALUE_MEASURE_WHAT_DEFAULT)); } return checkStationCanExport(stationStatusList); diff --git a/control_common b/control_common index 686f68e..3ee78b1 160000 --- a/control_common +++ b/control_common @@ -1 +1 @@ -Subproject commit 686f68e2478454ec4d4903173f6f17d80229137b +Subproject commit 3ee78b12773c04f7efce110b79ca912603cf2db3