diff --git a/app/libs/base-java-release.aar b/app/libs/base-java-release.aar index 0be8b2e..dec7cfc 100644 Binary files a/app/libs/base-java-release.aar and b/app/libs/base-java-release.aar differ diff --git a/app/libs/surveyorBase-release.aar b/app/libs/surveyorBase-release.aar index a6fe4cc..7cf01f3 100644 Binary files a/app/libs/surveyorBase-release.aar and b/app/libs/surveyorBase-release.aar differ diff --git a/app/src/main/java/com/project/survey/ui/MainActivityUtils.java b/app/src/main/java/com/project/survey/ui/MainActivityUtils.java index 2a8a4f2..d3d61ca 100644 --- a/app/src/main/java/com/project/survey/ui/MainActivityUtils.java +++ b/app/src/main/java/com/project/survey/ui/MainActivityUtils.java @@ -129,15 +129,15 @@ public class MainActivityUtils extends AppCompatActivityProviderUtils { switch (event) { case ON_CREATE: EventBus.getDefault().register(MainActivityUtils.this); - SoundPoolUtil.getInstance().initHintSing(activity, SoundPoolUtil.TEST, R.raw.savedone); + SoundPoolUtil.getInstanceUsageMedia().initHintSing(activity, SoundPoolUtil.TEST, R.raw.savedone); // SoundPoolUtil.getInstance().initHintSing(activity, SoundPoolUtil.SEPTENTRIO_FILL, R.raw.septentrio_fill); // SoundPoolUtil.getInstance().initHintSing(activity, SoundPoolUtil.SEPTENTRIO_CUT, R.raw.septentrio_cut); - SoundPoolUtil.getInstance().initHintSing(activity, SoundPoolUtil.ALPHA_STAKING, R.raw.alphastaking); - SoundPoolUtil.getInstance().initHintSing(activity, SoundPoolUtil.ALPHA_RECORDING, R.raw.alpharecording); + SoundPoolUtil.getInstanceUsageMedia().initHintSing(activity, SoundPoolUtil.ALPHA_STAKING, R.raw.alphastaking); + SoundPoolUtil.getInstanceUsageMedia().initHintSing(activity, SoundPoolUtil.ALPHA_RECORDING, R.raw.alpharecording); break; case ON_DESTROY: EventBus.getDefault().unregister(MainActivityUtils.this); - SoundPoolUtil.getInstance().onDestroy(); + SoundPoolUtil.getInstanceUsageMedia().onDestroy(); break; case ON_RESUME: checkGnssServerReady(); diff --git a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java index 43a3c01..9b99cf3 100644 --- a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java +++ b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java @@ -1028,7 +1028,7 @@ public class PointStakingActivity extends BaseSurveyNewActivity { effectVerLine.getValues().add(new PointValue(y, (x + disTipsRange2D))); } if (preferences.getBoolean("key_is_tts_open", true)) { - SoundPoolUtil.getInstance().play(SoundPoolUtil.ALPHA_STAKING); + SoundPoolUtil.getInstanceUsageMedia().play(SoundPoolUtil.ALPHA_STAKING); } } else { stopSoundPool(); @@ -1118,7 +1118,7 @@ public class PointStakingActivity extends BaseSurveyNewActivity { stopSoundPool(); recordRemarks = ""; if (preferences.getBoolean("key_is_tts_open", true)) { - SoundPoolUtil.getInstance().singlePlayStopRecord(); + SoundPoolUtil.getInstanceUsageMedia().singlePlayStopRecord(); } ((LineChartRenderer) binding.lineChartView.getChartRenderer()).calculateMaxViewport(1.5f); binding.lineChartView.onChartDataChange(); @@ -1187,7 +1187,7 @@ public class PointStakingActivity extends BaseSurveyNewActivity { } private void stopSoundPool() { - SoundPoolUtil.getInstance().stop(); + SoundPoolUtil.getInstanceUsageMedia().stop(); } @Override diff --git a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity1.java b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity1.java index 0428f1d..24735b3 100644 --- a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity1.java +++ b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity1.java @@ -1014,7 +1014,7 @@ public class PointStakingActivity1 extends BaseSurveyNewActivity { effectVerLine.getValues().add(new PointValue(y, (x + disTipsRange2D))); } if (preferences.getBoolean("key_is_tts_open", true)) { - SoundPoolUtil.getInstance().play(SoundPoolUtil.ALPHA_STAKING); + SoundPoolUtil.getInstanceUsageMedia().play(SoundPoolUtil.ALPHA_STAKING); } } else { stopSoundPool(); @@ -1104,7 +1104,7 @@ public class PointStakingActivity1 extends BaseSurveyNewActivity { stopSoundPool(); recordRemarks = ""; if (preferences.getBoolean("key_is_tts_open", true)) { - SoundPoolUtil.getInstance().singlePlayStopRecord(); + SoundPoolUtil.getInstanceUsageMedia().singlePlayStopRecord(); } ((LineChartRenderer) binding.lineChartView.getChartRenderer()).calculateMaxViewport(1.5f); binding.lineChartView.onChartDataChange(); @@ -1194,7 +1194,7 @@ public class PointStakingActivity1 extends BaseSurveyNewActivity { } private void stopSoundPool() { - SoundPoolUtil.getInstance().stop(); + SoundPoolUtil.getInstanceUsageMedia().stop(); } @Override diff --git a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingSettingActivity.java b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingSettingActivity.java index 59b4398..0f87e19 100644 --- a/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingSettingActivity.java +++ b/app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingSettingActivity.java @@ -325,7 +325,7 @@ public class PointStakingSettingActivity extends BaseSurveyNewActivity { binding.tvUnitLength.setText(unitLengthList.get(PreferencesCadUtil.getCadDrawingUnitLength())); binding.rlSelectUnitLength.setOnClickListener(view -> CustomRecycleDialog.showDialog(PointStakingSettingActivity.this, R.string.unit_length, unitLengthList, PreferencesCadUtil.getCadDrawingUnitLength(), false, (index, itemString) -> { binding.tvUnitLength.setText(unitLengthList.get(index)); - PreferencesCadUtil.putPreference(ConstUtils.preferConst.cadDrawingUnitLength, index); +// PreferencesCadUtil.putPreference(ConstUtils.preferConst.cadDrawingUnitLength, index); })); } diff --git a/app/src/main/java/com/project/survey/ui/pointmeasure/measure/PointSurveyNewActivity.java b/app/src/main/java/com/project/survey/ui/pointmeasure/measure/PointSurveyNewActivity.java index 9798fde..f79d863 100644 --- a/app/src/main/java/com/project/survey/ui/pointmeasure/measure/PointSurveyNewActivity.java +++ b/app/src/main/java/com/project/survey/ui/pointmeasure/measure/PointSurveyNewActivity.java @@ -1039,7 +1039,7 @@ public class PointSurveyNewActivity extends BaseSurveyNewActivity implements Vie boolean isTTSOpen = preferences.getBoolean("key_is_tts_open", true); if (isTTSOpen) { - SoundPoolUtil.getInstance().singlePlayStopRecord(); + SoundPoolUtil.getInstanceUsageMedia().singlePlayStopRecord(); } } diff --git a/app/src/main/java/com/project/survey/util/SurveyUIUtils.java b/app/src/main/java/com/project/survey/util/SurveyUIUtils.java index df3fcf5..61725e0 100644 --- a/app/src/main/java/com/project/survey/util/SurveyUIUtils.java +++ b/app/src/main/java/com/project/survey/util/SurveyUIUtils.java @@ -27,7 +27,7 @@ public class SurveyUIUtils { } public static void stopSoundPool() { - SoundPoolUtil.getInstance().stop(); + SoundPoolUtil.getInstanceUsageMedia().stop(); } private static int dip2px(float dpValue) { @@ -102,7 +102,7 @@ public class SurveyUIUtils { layoutBaseSurveyStakingSettingBinding.tvTiltPrimAuto.setTextColor(activity.getColor(R.color.color_BCBCBC)); } - layoutBaseSurveyStakingSettingBinding.tvTiltPrimAuto.setText(activity.getString(R.string.auto_trun)); + layoutBaseSurveyStakingSettingBinding.tvTiltPrimAuto.setText(activity.getString(R.string.auto_turn)); } else { if (Gnss.getInstance().getDevice().isTiltOpen() && Gnss.getInstance().getDevice().isSupportTilt()) { layoutBaseSurveyStakingSettingBinding.ivTiltPrimAuto.setImageResource(R.drawable.icon_survey_tilt_black);