wangguannan
/
ShangHaiProjectSurvey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

放样记录的声音大小，改为通过音频音量控制（原为通过闹钟音量控制的）

Browse Source
main
chenglifeng 6 months ago
parent 71abe1845a
commit 03198a77bf
8 changed files with 14 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      app/libs/base-java-release.aar
  2. BIN
      app/libs/surveyorBase-release.aar
  3. 8
      app/src/main/java/com/project/survey/ui/MainActivityUtils.java
  4. 6
      app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java
  5. 6
      app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity1.java
  6. 2
      app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingSettingActivity.java
  7. 2
      app/src/main/java/com/project/survey/ui/pointmeasure/measure/PointSurveyNewActivity.java
  8. 4
      app/src/main/java/com/project/survey/util/SurveyUIUtils.java

BIN
app/libs/base-java-release.aar
View File

Binary file not shown.

BIN
app/libs/surveyorBase-release.aar
View File

Binary file not shown.

8
app/src/main/java/com/project/survey/ui/MainActivityUtils.java
Unescape View File

@ -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();

6
app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity.java
Unescape View File

@ -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

6
app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingActivity1.java
Unescape View File

@ -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

2
app/src/main/java/com/project/survey/ui/lofting/pointlofting/PointStakingSettingActivity.java
Unescape View File

@ -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);
}));
}

2
app/src/main/java/com/project/survey/ui/pointmeasure/measure/PointSurveyNewActivity.java
Unescape View File

@ -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();
}
}

4
app/src/main/java/com/project/survey/util/SurveyUIUtils.java
Unescape View File

@ -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);

Write Preview
Loading…
Cancel
Save