|
@@ -111,13 +111,16 @@ public class MusicTunerActivity extends BaseActivity<ActivityMusicTunerLayoutBin
|
|
|
}
|
|
|
viewBinding.tvResult.setText(getResultText(voiceToneBean));
|
|
|
|
|
|
+
|
|
|
viewBinding.tvBeforeResultVoiceTones.setText(voiceToneBean.beforeName);
|
|
|
viewBinding.tvAfter.setText(voiceToneBean.afterName);
|
|
|
- long differenceText = getDifferenceText(voiceToneBean.difference);
|
|
|
- boolean isCorrect = checkIsCorrect(differenceText);
|
|
|
+ long differenceValue = getDifferenceText(voiceToneBean.difference);
|
|
|
+ boolean isCorrect = checkIsCorrect(differenceValue);
|
|
|
viewBinding.ivCorrect.setVisibility(isCorrect ? View.VISIBLE : View.GONE);
|
|
|
- viewBinding.tvDifference.setText(differenceText != -1 ? String.format("%d¢", differenceText) : "");
|
|
|
- viewBinding.viewDashBoard.setProgress((int) differenceText);
|
|
|
+ viewBinding.progress.setProgress(getDiffProgress((int) differenceValue));
|
|
|
+
|
|
|
+ viewBinding.tvDifference.setText(differenceValue != -1 ? String.format("%d¢", differenceValue) : "");
|
|
|
+ viewBinding.viewDashBoard.setProgress((int) differenceValue);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -134,6 +137,14 @@ public class MusicTunerActivity extends BaseActivity<ActivityMusicTunerLayoutBin
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
+ private int getDiffProgress(int value) {
|
|
|
+ int abs = Math.abs(value);
|
|
|
+ if (abs > 50) {
|
|
|
+ abs = 50;
|
|
|
+ }
|
|
|
+ return 50 - abs;
|
|
|
+ }
|
|
|
+
|
|
|
private String getResultText(VoiceToneBean voiceToneBean) {
|
|
|
if (voiceToneBean != null) {
|
|
|
int value = (int) voiceToneBean.voiceFrequencyValue;
|